From 19367b7aaffecf2452138928a566f357fa1a4847 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 27 Oct 2014 12:27:24 +0100 Subject: [PATCH] git: split svn functionality into the git-svn subpkg. --- srcpkgs/git-svn | 1 + srcpkgs/git/template | 20 ++++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/git-svn diff --git a/srcpkgs/git-svn b/srcpkgs/git-svn new file mode 120000 index 0000000000..0899c2993d --- /dev/null +++ b/srcpkgs/git-svn @@ -0,0 +1 @@ +git \ No newline at end of file diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 5b21605dec..2f565f5e29 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,7 +1,7 @@ # Template build file for "git". pkgname=git version=2.1.2 -revision=1 +revision=2 build_style=gnu-configure configure_args="--with-curl --with-expat --without-tcltk ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" @@ -18,6 +18,8 @@ license="GPL-2" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" checksum=7b27c8978bccf436f3c2b8c6142f35b236edd34ef7c778b1333166c098c7a18b +subpackages="git-svn git-perl" + post_build() { make ${makejobs} -C Documentation man } @@ -30,15 +32,25 @@ post_install() { git-perl_package() { noarch=yes - replaces="git<2.1.0_3" - depends="git perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL" + depends="git-${version}_${revision} perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL" short_desc+=" - perl utilities" pkg_install() { for f in add--interactive archimport cvsexportcommit cvsimport \ - cvsserver relink send-email svn; do + cvsserver relink send-email; do vmove usr/libexec/git-core/git-${f} done vmove usr/share/perl5 vmove usr/share/man/man3 } } +git-svn_package() { + depends="git-perl-${version}_${revision} subversion-perl perl-Term-ReadKey" + short_desc+=" - subversion support" + pkg_install() { + vmove "usr/share/perl5/site_perl/Git/SVN*" + vmove usr/libexec/git-core/git-remote-testsvn + vmove usr/libexec/git-core/git-svn + vmove usr/share/man/man1/git-svn.1 + vmove "usr/share/man/man3/Git::SVN*" + } +}