diff options
Diffstat (limited to 'main/subversion/APKBUILD')
| -rw-r--r-- | main/subversion/APKBUILD | 98 |
1 files changed, 62 insertions, 36 deletions
diff --git a/main/subversion/APKBUILD b/main/subversion/APKBUILD index 9df0222254c..4146e5daede 100644 --- a/main/subversion/APKBUILD +++ b/main/subversion/APKBUILD @@ -1,27 +1,49 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=subversion -pkgver=1.14.2 +pkgver=1.14.3 pkgrel=1 _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-pyc + 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 +63,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 +84,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 +109,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,45 +118,52 @@ 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=" -20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc subversion-1.14.2.tar.bz2 +40b172492005fd3b0cd9e457b4444af8ea5d8ff8fc161a9a0c6dc3a7314c6ad4ff75a4676f68a1919ae6273ae03e34d04eba8c1c37b8c0b4ec70d6731b527b41 subversion-1.14.3.tar.bz2 db71db2c19a16ba5a430b676beb357faee5b67b161478932af13dd06be23b5505da85dbaf5b2447f95590fea55b833ee33fa19d3350ba3117f3364a9ab012ee6 py3c-1.4.tar.gz fb219c45b80602d919176cc191394df09f90d0f5c7d24e6a36b166bd92777ecae67eeac1e49c0ffbb0e724396b3d2094dbb0bef17d01dc87d418b1cd554bd7c4 subversion-1.7.0-deplibs.patch fd6e5f45cff4d3cf0d885a34c822b32141b13b199d99ad8e1b04d641c9c1ee27e73f5c556a4ad54a900b6d39cc14afad17b6738d8af44c76758f1a27b4d49f9a subversion-perl-deplibs.patch |