main/subversion: add extra tools, modernise

closes #10078

1 files changed, 60 insertions, 35 deletions

diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD
index 8511314284c..3b182b22904 100644
--- a/main/subversion/APKBUILD
+++ b/main/subversion/APKBUILD
@@ -2,26 +2,47 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=subversion
 pkgver=1.14.2
-pkgrel=6
+pkgrel=7
 _py3c_ver=1.4
 pkgdesc="Replacement for CVS, another versioning system (svn)"
 url="https://subversion.apache.org/"
 arch="all"
-license="Apache-2.0 BSD"
-makedepends="apache2-dev apr-util-dev autoconf automake e2fsprogs-dev libtool
-	lz4-dev neon-dev perl-dev python3-dev serf-dev swig boost-dev"
+license="Apache-2.0 AND BSD-2-Clause"
+makedepends="
+	apache2-dev
+	apr-util-dev
+	autoconf
+	automake
+	boost-dev
+	e2fsprogs-dev
+	libtool
+	lz4-dev
+	neon-dev
+	perl-dev
+	python3-dev
+	serf-dev
+	swig
+	"
 install="$pkgname.pre-install"
-subpackages="$pkgname-dev $pkgname-doc mod_dav_svn
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	mod_dav_svn
 	$pkgname-bash-completion:bashcomp:noarch
-	perl-$pkgname:pl py3-$pkgname:py $pkgname-libs
-	$pkgname-openrc"
+	perl-$pkgname:pl
+	py3-$pkgname:py
+	$pkgname-libs
+	$pkgname-openrc
+	$pkgname-tools
+	"
 source="https://archive.apache.org/dist/subversion/subversion-$pkgver.tar.bz2
 	py3c-$_py3c_ver.tar.gz::https://github.com/encukou/py3c/archive/v$_py3c_ver.tar.gz
 	subversion-1.7.0-deplibs.patch
 	subversion-perl-deplibs.patch
 	subversion-1.12.0-linking.patch
 	svnserve.confd
-	svnserve.initd"
+	svnserve.initd
+	"
 
 # secfixes:
 #   1.14.2-r0:
@@ -41,9 +62,6 @@ prepare() {
 	default_prepare
 	mv build-outputs.mk build-outputs.mk.old
 	PYTHON=python3 LIBTOOL_CONFIG=/usr/share/libtool/build-aux ./autogen.sh --release
-	# fix shebangs
-	sed -i -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
-	sed -e 's|/usr/bin/env python.*|/usr/bin/python3|' subversion/tests/cmdline/svneditor.py
 }
 
 build() {
@@ -65,8 +83,7 @@ build() {
 		--without-jdk \
 		--with-serf \
 		--with-utf8proc=internal
-	make all
-	make swig-pl-lib
+	make all swig-pl-lib tools
 	(cd subversion/bindings/swig/perl/native ; perl Makefile.PL)
 	# need override LD_RUN_PATH with something valid, otherwise we get
 	# empty rpath which is not a good idea.
@@ -91,7 +108,8 @@ package() {
 	make -j1 DESTDIR="$pkgdir" \
 		swig_pydir="$_pydir/libsvn"\
 		swig_pydir_extra="$_pydir/svn" \
-		install install-swig-pl-lib install-swig-py
+		toolsdir=/usr/bin \
+		install install-swig-pl-lib install-swig-py install-tools
 	make pure_vendor_install -C subversion/bindings/swig/perl/native \
 		PERL_INSTALL_ROOT="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
@@ -99,41 +117,48 @@ package() {
 	install -Dm755 "$srcdir"/svnserve.initd "$pkgdir"/etc/init.d/svnserve
 	install -Dm644 "$srcdir"/svnserve.confd "$pkgdir"/etc/conf.d/svnserve
 
-	mkdir -p "pkgdir"/usr/lib
+	mkdir -p "$pkgdir"/usr/lib
 	mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib
+
+	install -Dm644 tools/client-side/bash_completion \
+		"$pkgdir"/usr/share/bash-completion/completions/$pkgname
+	cd "$pkgdir"/usr/share/bash-completion/completions
+	local i; for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
+		ln -sf $pkgname $i
+	done
 }
 
 mod_dav_svn() {
 	pkgdesc="Apache httpd module for $pkgname server"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/apache2 "$subpkgdir"/usr/lib/
-}
-
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completion for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
 
-	install -Dm644 "$builddir"/tools/client-side/bash_completion \
-		"$subpkgdir"/usr/share/bash-completion/completions/$pkgname
-	cd "$subpkgdir"/usr/share/bash-completion/completions
-	local i; for i in svn svnadmin svndumpfilter svnlook svnsync svnversion; do
-		ln -sf $pkgname $i
-	done
+	amove usr/lib/apache2
 }
 
 pl() {
 	pkgdesc="Perl bindings to $pkgname"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/*perl* "$subpkgdir"/usr/lib/
+
+	amove usr/lib/*perl*
 }
 
 py() {
 	pkgdesc="Python bindings to $pkgname"
-	mkdir -p "$subpkgdir"/usr/lib
-	mv "$pkgdir"/usr/lib/lib*swig*py* \
-		"$pkgdir"/usr/lib/python* \
-		"$subpkgdir"/usr/lib/
+
+	amove usr/lib/lib*swig*py*
+	amove usr/lib/python*
+}
+
+tools() {
+	pkgdesc="extra tools for subversion"
+
+	# this is the list from install-tools into toolsdir
+	amove usr/bin/diff* \
+		usr/bin/fsfs-* \
+		usr/bin/svn-* \
+		usr/bin/svnauthz* \
+		usr/bin/svnconflict \
+		usr/bin/svnmover \
+		usr/bin/svnraisetreeconflict \
+		usr/bin/x509-parser
 }
 
 sha512sums="