From 2fb2542c7bbce2cae39123eab2b6bac3075c6c62 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Mon, 12 Mar 2018 14:42:20 +0100 Subject: [PATCH] git: merge git-perl into main package. git-perl consisted of only 4 scripts, the Perl extension has been removed in prior versions of git. xbps uses chroot-git, so the perl dependency does not bloat chroots. Most people have perl anyway, and this avoids the FAQ of why "git add -p" is broken. --- srcpkgs/git-perl | 1 - srcpkgs/git/template | 28 +++++++--------------------- 2 files changed, 7 insertions(+), 22 deletions(-) delete mode 120000 srcpkgs/git-perl diff --git a/srcpkgs/git-perl b/srcpkgs/git-perl deleted file mode 120000 index 0899c2993da..00000000000 --- a/srcpkgs/git-perl +++ /dev/null @@ -1 +0,0 @@ -git \ No newline at end of file diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 60d30dad772..e09bc61c9a4 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,7 +1,7 @@ # Template file for "git" pkgname=git version=2.16.2 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-curl --with-expat --with-tcltk --with-libpcre2 ac_cv_fread_reads_directories=no ac_cv_snprintf_returns_bogus=no" @@ -9,7 +9,9 @@ make_install_args="NO_INSTALL_HARDLINKS=1 INSTALLDIRS=vendor" hostmakedepends="xmlto asciidoc perl python tk" makedepends="libressl-devel libcurl-devel expat-devel tk-devel pcre2-devel" # Required by https:// -depends="ca-certificates" +depends="ca-certificates + perl perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL" +replaces="git-perl>=0" short_desc="Git Tree History Storage Tool" maintainer="Juan RP " homepage="http://git-scm.com/" @@ -18,7 +20,7 @@ distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" checksum=5560578bd21468d98637f41515c165d32f69caff0838b8989dee5ce10022c717 make_check_target="test" -subpackages="git-cvs git-svn git-perl gitk git-gui git-all" +subpackages="git-cvs git-svn gitk git-gui git-all" post_build() { make ${makejobs} -C Documentation man @@ -32,25 +34,9 @@ post_install() { make -C contrib/subtree DESTDIR=${DESTDIR} prefix=/usr install install-man } -git-perl_package() { - noarch=yes - 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 difftool difftool--helper \ - send-email; do - vmove usr/libexec/git-core/git-${f} - done - vmove usr/share/perl5 - vmove usr/share/man/man3 - vmove usr/share/man/man1/git-archimport.1 - vmove usr/share/man/man1/git-difftool.1 - vmove usr/share/man/man1/git-send-email.1 - } -} git-cvs_package() { noarch=yes - depends="git-perl-${version}_${revision} cvs cvsps2 perl-DBD-SQLite" + depends="${sourcepkg}-${version}_${revision} cvs cvsps2 perl-DBD-SQLite" short_desc+=" - CVS support" pkg_install() { vmove usr/bin/git-cvsserver @@ -63,7 +49,7 @@ git-cvs_package() { } } git-svn_package() { - depends="git-perl-${version}_${revision} subversion-perl perl-Term-ReadKey" + depends="${sourcepkg}-${version}_${revision} subversion-perl perl-Term-ReadKey" short_desc+=" - Subversion support" pkg_install() { vmove "usr/share/perl5/vendor_perl/Git/SVN*"