X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=net%2Fsubversion%2FMakefile;h=54ef224bb4e7d883e575a6b13671238854874e76;hb=31746dfb3bbcd2d9658d1f4fe234e6d09bbf4a12;hp=3d5f8dc080f97ce3d1e46bf521eff06c556df3ba;hpb=bb6f4eb079c479d1d743b0bcabe43941c87d8339;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/net/subversion/Makefile b/net/subversion/Makefile
index 3d5f8dc080..54ef224bb4 100644
--- 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_RELEASE:=1
+PKG_VERSION:=1.5.2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://subversion.tigris.org/downloads/
-PKG_MD5SUM:=4c333a5fe827568c67d195cda7a5e154
+PKG_MD5SUM:=8321d0e1964846090f0174cb6bb18838
+
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -22,31 +23,54 @@ define Package/subversion/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A compelling replacement for CVS
-  DEPENDS:=+zlib +libneon +libintl +libapr +libaprutil
+  DEPENDS:=+zlib +libneon +libintl +libapr +libaprutil +libpthread
   URL:=http://subversion.tigris.org/
   SUBMENU:=subversion
 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
   $(call Package/subversion/Default)
   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
+
 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 +82,23 @@ 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" \
+	LDFLAGS="-lcrypt -lm -lintl -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
+		-lz -L$(STAGING_DIR)/usr/lib/ -lpthread -L$(TOOLCHAIN_DIR)/usr/lib -L$(TOOLCHAIN_DIR)/lib \
+		-L$(TOOLCHAIN_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
-
 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