subversion: update to 1.14.0
authorRosen Penev <rosenp@gmail.com>
Tue, 8 Dec 2020 08:50:44 +0000 (00:50 -0800)
committerRosen Penev <rosenp@gmail.com>
Tue, 8 Dec 2020 08:58:28 +0000 (00:58 -0800)
Remove several configure options. apr-(utils) has been fixed, which
makes them useless. Also removed PKG_BUILD_DEPENDS for that reason.

Simplify NLS with autoreconf_bool.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
net/subversion/Makefile

index 29d0d642688ed49cb38b0ec21d8e8a5477c2e382..d12f1cb9226a7c64fa03a188dfef165c2de6ea4f 100644 (file)
@@ -6,19 +6,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=subversion
-PKG_RELEASE:=3
-PKG_VERSION:=1.13.0
+PKG_VERSION:=1.14.0
+PKG_RELEASE:=1
+
 PKG_SOURCE_URL:=@APACHE/subversion
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_HASH:=bc50ce2c3faa7b1ae9103c432017df98dfd989c4239f9f8270bb3a314ed9e5bd
+PKG_HASH:=6ba8e218f9f97a83a799e58a3c6da1221d034b18d9d8cbbcb6ec52ab11722102
+
+PKG_MAINTAINER:=Val Kulkov <val.kulkov@gmail.com>
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
-PKG_MAINTAINER:=Val Kulkov <val.kulkov@gmail.com>
 PKG_CPE_ID:=cpe:/a:apache:subversion
 
 PKG_FIXUP:=autoreconf
 PKG_MACRO_PATHS:=build/ac-macros
-PKG_BUILD_DEPENDS:=apr-util
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1
 
@@ -80,9 +81,6 @@ define Package/subversion-server/conffiles
 endef
 
 CONFIGURE_ARGS += \
-       --with-apr="$(STAGING_DIR)/usr/bin/apr-1-config" \
-       --with-apr-util="$(STAGING_DIR)/usr/bin/apu-1-config" \
-       --with-libmagic="$(STAGING_DIR)/usr" \
        --disable-mod-activation \
        --without-ruby-sitedir \
        --without-swig \
@@ -92,13 +90,8 @@ CONFIGURE_ARGS += \
        --without-apxs \
        --without-sasl \
        --with-lz4=internal \
-       --with-utf8proc=internal
-
-ifdef $(INTL_FULL)
-       CONFIGURE_ARGS += --enable-nls
-else
-       CONFIGURE_ARGS += --disable-nls
-endif
+       --with-utf8proc=internal \
+       $(call autoconf_bool,INTL_FULL,nls)
 
 define Package/subversion-libs/install
        $(INSTALL_DIR) $(1)/usr/lib