#
-# Copyright (C) 2007-2009 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.
include $(TOPDIR)/rules.mk
PKG_NAME:=subversion
-PKG_VERSION:=1.5.2
-PKG_RELEASE:=3
+PKG_VERSION:=1.6.23
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://subversion.tigris.org/downloads/
-PKG_MD5SUM:=8321d0e1964846090f0174cb6bb18838
+PKG_SOURCE_URL:=http://subversion.tigris.org/downloads
+PKG_MD5SUM:=5d621281ce9d3448e1437cb006331f57
-PKG_FIXUP = libtool
+PKG_FIXUP:=autoreconf
+PKG_MACRO_PATHS:=build/ac-macros
include $(INCLUDE_DIR)/package.mk
SECTION:=net
CATEGORY:=Network
TITLE:=A compelling replacement for CVS
- DEPENDS:=+zlib +libneon +libintl +libapr +libaprutil +libpthread
- 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
define Package/subversion-libs
$(call Package/subversion/Default)
+ DEPENDS+=+unixodbc
TITLE:=subversion libs
endef
This package contains the subversion server.
endef
+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" \
- --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="$(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
$(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