diff --git a/srcpkgs/git/git-docs.template b/srcpkgs/git/git-docs.template index ff3445708ec..0ed787081f3 100644 --- a/srcpkgs/git/git-docs.template +++ b/srcpkgs/git/git-docs.template @@ -1,16 +1,13 @@ # Template file for 'git-docs'. # +noarch=yes short_desc="${sourcepkg} documentation" long_desc="${long_desc} This package contains the full git documentation (manual pages)." -noarch=yes - -do_install() -{ - mkdir -p ${DESTDIR}/usr/share/man +do_install() { for f in man1 man5 man7; do - mv ${SRCPKGDESTDIR}/usr/share/man/${f} ${DESTDIR}/usr/share/man + vmove usr/share/man/${f} usr/share/man done } diff --git a/srcpkgs/git/git-perl.template b/srcpkgs/git/git-perl.template index ed402fcf97e..61fa3a2e720 100644 --- a/srcpkgs/git/git-perl.template +++ b/srcpkgs/git/git-perl.template @@ -1,16 +1,13 @@ # Template file for 'git-perl'. # +noarch=yes depends="git perl" short_desc="${sourcepkg} perl bindings" long_desc="${long_desc} This package contains the Perl bindings." -noarch=yes - -do_install() -{ - mkdir -p ${DESTDIR}/usr/share/man - mv ${SRCPKGDESTDIR}/usr/share/perl5 ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man +do_install() { + vmove usr/share/perl5 usr/share + vmove usr/share/man/man3 usr/share/man } diff --git a/srcpkgs/git/git-python.template b/srcpkgs/git/git-python.template index 7fc6c8360c8..9b5908610c2 100644 --- a/srcpkgs/git/git-python.template +++ b/srcpkgs/git/git-python.template @@ -1,17 +1,13 @@ # Template file for 'git-python'. # +noarch=yes +pycompile_module="git_remote_helpers" depends="git python" short_desc="${sourcepkg} python bindings" long_desc="${long_desc} This package contains the Python bindings for GIT." -noarch=yes -pycompile_module="git_remote_helpers" - - -do_install() -{ - install -d ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/python* ${DESTDIR}/usr/lib +do_install() { + vmove "usr/lib/python*" usr/lib } diff --git a/srcpkgs/git/template b/srcpkgs/git/template index 11ef6b249fb..cc891f961ba 100644 --- a/srcpkgs/git/template +++ b/srcpkgs/git/template @@ -1,13 +1,14 @@ # Template build file for 'git". pkgname=git -version=1.7.10.2 -distfiles="http://git-core.googlecode.com/files/git-$version.tar.gz" +version=1.7.10.3 +subpackages="git-docs git-perl git-python" makedepends="asciidoc xmlto perl openssl-devel libcurl-devel expat-devel python-devel" short_desc="GIT Tree History Storage Tool" maintainer="Juan RP " homepage="http://git-scm.com/" license="GPL-2" -checksum=335e978814659f328e377715b13a33336859275ae6f215bf28bbbb2ae711bb43 +distfiles="http://git-core.googlecode.com/files/git-$version.tar.gz" +checksum=b804058554fc58336b3daf8825e314041f24a83e9204c133a58641ed06abd6f7 long_desc=" GIT is a directory content manager designed to handle absolutely massive projects with speed and efficiency, and the release of the 2.6.12 (and later) @@ -19,12 +20,8 @@ long_desc=" GIT working directory is a full-fledged repository with full revision tracking capabilities, not dependent on network access to a central server." -subpackages="git-docs git-perl git-python" - - do_configure() { - ./configure ${CONFIGURE_SHARED_ARGS} --with-curl --with-expat \ - --without-tcltk + ./configure ${CONFIGURE_SHARED_ARGS} --with-curl --with-expat --without-tcltk } do_build() { @@ -33,6 +30,5 @@ do_build() { do_install() { make DESTDIR=${DESTDIR} install install-doc - vinstall contrib/completion/git-completion.bash 644 \ - etc/bash_completion.d git + vinstall contrib/completion/git-completion.bash 644 etc/bash_completion.d git }