#
-# Copyright (C) 2007-2008 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
-# $Id$
include $(TOPDIR)/rules.mk
PKG_NAME:=subversion
-PKG_VERSION:=1.5.0
+PKG_VERSION:=1.6.15
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://subversion.tigris.org/downloads/
-PKG_MD5SUM:=004b57643406dd10957ec87955702189
+PKG_SOURCE_URL:=http://subversion.tigris.org/downloads
+PKG_MD5SUM:=113fca1d9e4aa389d7dc2b210010fa69
-PKG_FIXUP = libtool
+PKG_FIXUP:=libtool
+PKG_REMOVE_FILES:=autogen.sh build/libtool.m4
include $(INCLUDE_DIR)/package.mk
SECTION:=net
CATEGORY:=Network
TITLE:=A compelling replacement for CVS
- DEPENDS:=+zlib +libneon +libintl +libapr +libaprutil
- URL:=http://subversion.tigris.org/
- SUBMENU:=subversion
+ DEPENDS:=+zlib +libneon +libaprutil
+ URL:=http://subversion.apache.org/
+ SUBMENU:=Version Control Systems
endef
define Package/subversion/Default/description
This package contains the subversion server.
endef
+define Package/subversion-server/conffiles
+/etc/config/subversion
+endef
+
CONFIGURE_ARGS += \
--with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
--with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \
- --with-neon="$(STAGING_DIR)/usr/include/neon" \
+ --with-neon="$(STAGING_DIR)/usr" \
--disable-mod-activation \
--without-ruby-sitedir \
--without-swig \
--with-ssl \
--disable-neon-version-check \
--with-apxs=no \
- --with-apache=no \
+ --without-sasl \
CONFIGURE_VARS += \
svn_lib_neon=yes \
- LDFLAGS="-lcrypt -lnsl -lm -lintl -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
- -lz -L$(STAGING_DIR)/usr/lib/ -lpthread -L$(STAGING_DIR)/lib" \
- CPPFLAGS="-I$(STAGING_DIR)/usr/include/ -I$(STAGING_DIR)/usr/lib/libintl/include \
- -I$(STAGING_DIR)/include/" \
+ LDFLAGS="$(TARGET_LDFLAGS) -lcrypt -lm \
+ -lz -lpthread -L$(TOOLCHAIN_DIR)/usr/lib \
+ -L$(TOOLCHAIN_DIR)/lib" \
+ CPPFLAGS="$(TARGET_CPPFLAGS)" \
define Build/Compile
- $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all local-install
+ $(MAKE) -C $(PKG_BUILD_DIR) \
+ DESTDIR="$(PKG_INSTALL_DIR)" \
+ all local-install
endef
define Package/subversion-libs/install
$(INSTALL_DIR) $(1)/usr/lib
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsvn_* $(1)/usr/lib/
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsvn_*.so.* $(1)/usr/lib/
endef
define Package/subversion-client/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/svn{look,admin,dumpfilter,serve} $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/config
- $(INSTALL_DATA) ./files/subversion.config $(1)/etc/config/subversion
+ $(INSTALL_CONF) ./files/subversion.config $(1)/etc/config/subversion
$(INSTALL_DIR) $(1)/etc/init.d
$(INSTALL_BIN) ./files/subversion.init $(1)/etc/init.d/subversion
endef