X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=net%2Fsubversion%2FMakefile;h=d26cce30dbaddfe60751ad7d239f6bbcdbd360ea;hp=10aa657417b573b42b1bcbb70d142a53a078ffcf;hb=289168da7d3b3b20ca039539871483bd25a4e325;hpb=65a822f9fee92915047b5c88843d10705ac60745

diff --git a/net/subversion/Makefile b/net/subversion/Makefile
index 10aa657417..d26cce30db 100644
--- a/net/subversion/Makefile
+++ b/net/subversion/Makefile
@@ -4,21 +4,19 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $ 
+# $Id$ 
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=subversion
-PKG_VERSION:=1.4.3
+PKG_VERSION:=1.4.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://subversion.tigris.org/downloads/
-PKG_MD5SUM:=de0e792c9804c7bce397d267af5eb30d
-PKG_CAT:=bzcat
+PKG_MD5SUM:=4c333a5fe827568c67d195cda7a5e154
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -26,7 +24,7 @@ define Package/subversion/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A compelling replacement for CVS
-  DEPENDS:=+zlib +neon +libintl +apr +apr-util
+  DEPENDS:=+zlib +libneon +libintl +libapr +libaprutil
   URL:=http://subversion.tigris.org/
   SUBMENU:=subversion
 endef
@@ -44,40 +42,34 @@ endef
 
 define Package/subversion-server
   $(call Package/subversion/Default)
-  DEPENDS+=subversion-libs @BROKEN
+  DEPENDS+=subversion-libs
   TITLE:=subversion server
 endef
 
-define Build/Configure	
-	$(call Build/Configure/Default, \
-		--with-apr="$(STAGING_DIR)/usr/bin/apr-config" \
-		--with-apr-util="$(STAGING_DIR)/usr/bin/apu-config" \
-		--with-neon="$(STAGING_DIR)/usr" \
-		--disable-mod-activation \
-		--without-ruby-sitedir \
-		--without-swig \
-		--with-jikes=no \
-		--without-junit \
-		--without-berkeley-db \
-		--with-ssl \
-		--disable-neon-version-check \
-		--with-apxs=no \
-		--with-apache=no \
-		, \
-		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/" \
-	)
-endef
-
-define Build/Compile	
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		all local-install
+CONFIGURE_ARGS += \
+	--with-apr="$(STAGING_DIR)/host/bin/apr-1-config" \
+	--with-apr-util="$(STAGING_DIR)/host/bin/apu-1-config" \
+	--with-neon="$(STAGING_DIR)/usr/include/neon" \
+	--disable-mod-activation \
+	--without-ruby-sitedir \
+	--without-swig \
+	--with-jikes=no \
+	--without-junit \
+	--without-berkeley-db \
+	--with-ssl \
+	--disable-neon-version-check \
+	--with-apxs=no \
+	--with-apache=no \
+
+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/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all local-install
 endef
 
 define Package/subversion-libs/install
@@ -87,18 +79,18 @@ endef
 
 define Package/subversion-client/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/{svn,svnversion,svnsync} $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{svn,svnversion,svnsync} $(1)/usr/bin/
 endef
 
 define Package/subversion-server/install
 	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/svn{look,admin,dumpfilter,serve} $(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_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/subversion.init $(1)/etc/init.d/subversion
 endef
 
 $(eval $(call BuildPackage,subversion-libs))
 $(eval $(call BuildPackage,subversion-client))
 $(eval $(call BuildPackage,subversion-server))
-
-$(eval $(call RequireCommand,/usr/bin/ruby, \
-	$(PKG_NAME) requires ruby installed on the host-system. \
-))