[packages] subversion: Update to v1.6.4 (closes #5658)

[openwrt/svn-archive/archive.git] / net / subversion / Makefile

diff --git a/net/subversion/Makefile b/net/subversion/Makefile
index 3d5f8dc080f97ce3d1e46bf521eff06c556df3ba..db41abb369101749768344498a1fce51d3169c49 100644 (file)
--- a/net/subversion/Makefile
+++ b/net/subversion/Makefile
@@ -1,20 +1,21 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2009 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.4.5
+PKG_VERSION:=1.6.4
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://subversion.tigris.org/downloads/
-PKG_MD5SUM:=4c333a5fe827568c67d195cda7a5e154
+PKG_MD5SUM:=11e3fa838c9a558cadc378f2807572e2
+
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -22,9 +23,17 @@ define Package/subversion/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A compelling replacement for CVS
-  DEPENDS:=+zlib +libneon +libintl +libapr +libaprutil
+  DEPENDS:=+zlib +libneon +libintl +libaprutil
   URL:=http://subversion.tigris.org/
-  SUBMENU:=subversion
+  SUBMENU:=Version Control Systems
+endef
+
+define Package/subversion/Default/description
+       Subversion is a free/open-source version control system. That is,
+       Subversion manages files and directories, and the changes made to them,
+       over time. This allows you to recover older versions of your data, or
+       examine the history of how your data changed. In this regard, many
+       people think of a version control system as a sort of time machine.
 endef
 
 define Package/subversion-libs
@@ -32,21 +41,40 @@ define Package/subversion-libs
   TITLE:=subversion libs
 endef
 
+define Package/subversion-libs/description
+  $(call Package/subversion/Default/description)
+  This package contains the subversion libraries.
+endef
+
 define Package/subversion-client
   $(call Package/subversion/Default)
   DEPENDS+=subversion-libs
   TITLE:=subversion client tools
 endef
 
+define Package/subversion-client/description
+  $(call Package/subversion/Default/description)
+  This package contains the subversion client tools.
+endef
+
 define Package/subversion-server
   $(call Package/subversion/Default)
   DEPENDS+=subversion-libs
   TITLE:=subversion server
 endef
 
+define Package/subversion-server/description
+  $(call 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_HOST)/bin/apr-1-config" \
-       --with-apr-util="$(STAGING_DIR_HOST)/bin/apu-1-config" \
+       --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" \
        --disable-mod-activation \
        --without-ruby-sitedir \
@@ -58,27 +86,22 @@ CONFIGURE_ARGS += \
        --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/" \
-
-define Build/Configure
-       $(call Build/Configure/Default)
-       $(call libtool_disable_rpath)
-endef
+       LDFLAGS="$(TARGET_LDFLAGS) -lcrypt -lm -lintl -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
+               -lz -lpthread -L$(TOOLCHAIN_DIR)/usr/lib \
+               -L$(TOOLCHAIN_DIR)/lib" \
+       CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libintl/include" \
 
 define Build/Compile
-       $(call libtool_fixup_libdir,$(PKG_INSTALL_DIR))
        $(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
@@ -90,7 +113,7 @@ define Package/subversion-server/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