From 465774e9b5543fedc7681e96caf95e0bfb173bf5 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Tue, 8 Dec 2020 00:50:44 -0800 Subject: [PATCH] subversion: update to 1.14.0 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 --- net/subversion/Makefile | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/net/subversion/Makefile b/net/subversion/Makefile index 29d0d6426..d12f1cb92 100644 --- a/net/subversion/Makefile +++ b/net/subversion/Makefile @@ -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 PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE -PKG_MAINTAINER:=Val Kulkov 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