[packages] subversion: subversion-libs depends on unixodbc

[packages.git] / net / subversion / Makefile

diff --git a/net/subversion/Makefile b/net/subversion/Makefile
index 6f8e3d9..e1f4844 100644 (file)
--- a/net/subversion/Makefile
+++ b/net/subversion/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2010 OpenWrt.org
+# Copyright (C) 2007-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,14 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=subversion
-PKG_VERSION:=1.6.11
-PKG_RELEASE:=1
+PKG_VERSION:=1.6.17
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://subversion.tigris.org/downloads
-PKG_MD5SUM:=75419159b50661092c4137449940b5cc
+PKG_MD5SUM:=81e5dc5beee4b3fc025ac70c0b6caa14
 
-PKG_FIXUP:=libtool
+PKG_FIXUP:=autoreconf
+PKG_MACRO_PATHS:=build/ac-macros
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -23,7 +24,7 @@ define Package/subversion/Default
   SECTION:=net
   CATEGORY:=Network
   TITLE:=A compelling replacement for CVS
-  DEPENDS:=+zlib +libneon +libintl +libaprutil
+  DEPENDS:=+zlib +libneon +libaprutil
   URL:=http://subversion.apache.org/
   SUBMENU:=Version Control Systems
 endef
@@ -38,6 +39,7 @@ endef
 
 define Package/subversion-libs
   $(call Package/subversion/Default)
+  DEPENDS+=unixodbc
   TITLE:=subversion libs
 endef
 
@@ -72,6 +74,9 @@ define Package/subversion-server/conffiles
 /etc/config/subversion
 endef
 
+TARGET_CFLAGS += $(FPIC)
+TARGET_CPPFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
+
 CONFIGURE_ARGS += \
        --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
        --with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \
@@ -89,13 +94,15 @@ CONFIGURE_ARGS += \
 
 CONFIGURE_VARS += \
        svn_lib_neon=yes \
-       LDFLAGS="$(TARGET_LDFLAGS) -lcrypt -lm -lintl -L$(STAGING_DIR)/usr/lib/libintl/lib/ \
+       LDFLAGS="$(TARGET_LDFLAGS) -lcrypt -lm \
                -lz -lpthread -L$(TOOLCHAIN_DIR)/usr/lib \
                -L$(TOOLCHAIN_DIR)/lib" \
-       CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/lib/libintl/include" \
+       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