git: update to 2.4.0

- split CVS functionality into the -cvs subpkg
- git-perl: move missing man pages
- git-gui: fix short_desc
This commit is contained in:
Alessio Sergi 2015-05-01 02:25:00 +02:00
parent 05a09d9710
commit 34b3bbc056
2 changed files with 34 additions and 14 deletions

1
srcpkgs/git-cvs Symbolic link
View file

@ -0,0 +1 @@
git

View file

@ -1,6 +1,6 @@
# Template file for "git" # Template file for "git"
pkgname=git pkgname=git
version=2.3.7 version=2.4.0
revision=1 revision=1
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-curl --with-expat --with-tcltk configure_args="--with-curl --with-expat --with-tcltk
@ -10,15 +10,15 @@ hostmakedepends="xmlto asciidoc perl python tk"
makedepends="libressl-devel libcurl-devel expat-devel tk-devel" makedepends="libressl-devel libcurl-devel expat-devel tk-devel"
# Required by https:// # Required by https://
depends="ca-certificates" depends="ca-certificates"
replaces="git-docs>=0" replaces="git<2.3.7_1"
short_desc="GIT Tree History Storage Tool" short_desc="GIT Tree History Storage Tool"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://git-scm.com/" homepage="http://git-scm.com/"
license="GPL-2" license="GPL-2"
distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz" distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
checksum=eb4696943f82ab55be71048d6e640942b78cd179ec501989aff8706b57f6515b checksum=b33438dd94659958a74850aacae4a2b3a626baec36d7f29c266130b08045bb24
subpackages="git-svn git-perl gitk git-gui" subpackages="git-cvs git-svn git-perl gitk git-gui"
post_build() { post_build() {
make ${makejobs} -C Documentation man make ${makejobs} -C Documentation man
@ -32,20 +32,39 @@ post_install() {
git-perl_package() { git-perl_package() {
noarch=yes noarch=yes
depends="git>=${version}_${revision} perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL" replaces="git<2.3.7_1"
short_desc+=" - perl utilities" depends="git-${version}_${revision} perl-Authen-SASL perl-MIME-tools perl-Net-SMTP-SSL"
short_desc+=" - Perl utilities"
pkg_install() { pkg_install() {
for f in add--interactive archimport cvsexportcommit cvsimport \ for f in add--interactive archimport difftool difftool--helper \
cvsserver difftool difftool--helper relink send-email; do relink send-email; do
vmove usr/libexec/git-core/git-${f} vmove usr/libexec/git-core/git-${f}
done done
vmove usr/share/perl5 vmove usr/share/perl5
vmove usr/share/man/man3 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-relink.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"
short_desc+=" - CVS support"
pkg_install() {
vmove usr/bin/git-cvsserver
vmove usr/libexec/git-core/git-cvsexportcommit
vmove usr/libexec/git-core/git-cvsimport
vmove usr/libexec/git-core/git-cvsserver
vmove usr/share/man/man1/git-cvsexportcommit.1
vmove usr/share/man/man1/git-cvsimport.1
vmove usr/share/man/man1/git-cvsserver.1
} }
} }
git-svn_package() { git-svn_package() {
depends="git-perl>=${version}_${revision} subversion-perl perl-Term-ReadKey" depends="git-perl-${version}_${revision} subversion-perl perl-Term-ReadKey"
short_desc+=" - subversion support" short_desc+=" - Subversion support"
pkg_install() { pkg_install() {
vmove "usr/share/perl5/vendor_perl/Git/SVN*" vmove "usr/share/perl5/vendor_perl/Git/SVN*"
vmove usr/libexec/git-core/git-remote-testsvn vmove usr/libexec/git-core/git-remote-testsvn
@ -56,7 +75,7 @@ git-svn_package() {
} }
gitk_package() { gitk_package() {
noarch=yes noarch=yes
depends="git>=${version}_${revision} tk" depends="git-${version}_${revision} tk"
short_desc="The Git repository browser" short_desc="The Git repository browser"
pkg_install() { pkg_install() {
vmove usr/bin/gitk vmove usr/bin/gitk
@ -66,12 +85,12 @@ gitk_package() {
} }
git-gui_package() { git-gui_package() {
noarch=yes noarch=yes
depends="git>=${version}_${revision} tk" depends="git-${version}_${revision} tk"
short_desc+="A portable graphical interface to Git" short_desc+=" - GUI tool"
pkg_install() { pkg_install() {
vmove usr/libexec/git-core/git-gui--askpass vmove usr/libexec/git-core/git-gui--askpass
vmove usr/libexec/git-core/git-gui vmove usr/libexec/git-core/git-gui
vmove usr/share/man/man1/git-gui.1 vmove usr/share/man/man1/git-gui.1
vmove usr/share/git-gui/ vmove usr/share/git-gui
} }
} }