Date: Sat, 26 May 2007 17:36:23 +0200 From: Ed Schouten <ed@fxq.nl> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/113030: devel/git: bump to 1.5.2 Message-ID: <20070526153623.GQ23313@hoeg.nl> In-Reply-To: <200705261530.l4QFU3ab044751@freefall.freebsd.org> References: <20070526152126.A4F771CD9A@palm.hoeg.nl> <200705261530.l4QFU3ab044751@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--N7hiGSZV0P2B4+ho Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Argh, I know it would be too perfect to work at once; gitk only gets installed when not using WITHOUT_GUI. Attached is a new patch with a fixed plist. As with the previous patch, don't forget to remove files/patch-Makefile. --=20 Ed Schouten <ed@fxq.nl> WWW: http://g-rave.nl/ --- devel/git/Makefile Fri May 25 19:13:27 2007 +++ devel/git/Makefile Sat May 26 17:11:45 2007 @@ -6,7 +6,7 @@ # =20 PORTNAME=3D git -PORTVERSION=3D 1.5.0.3 +PORTVERSION=3D 1.5.2 CATEGORIES=3D devel MASTER_SITES=3D http://www.kernel.org/pub/software/scm/git/ =20 @@ -36,7 +36,9 @@ git-bisect.1 \ git-blame.1 \ git-branch.1 \ + git-bundle.1 \ git-cat-file.1 \ + git-check-attr.1 \ git-check-ref-format.1 \ git-checkout-index.1 \ git-checkout.1 \ @@ -56,7 +58,6 @@ git-describe.1 \ git-diff-files.1 \ git-diff-index.1 \ - git-diff-stages.1 \ git-diff-tree.1 \ git-diff.1 \ git-fast-import.1 \ @@ -87,6 +88,7 @@ git-mailinfo.1 \ git-mailsplit.1 \ git-merge.1 \ + git-mergetool.1 \ git-merge-base.1 \ git-merge-file.1 \ git-merge-index.1 \ @@ -119,7 +121,6 @@ git-request-pull.1 \ git-rerere.1 \ git-reset.1 \ - git-resolve.1 \ git-rev-list.1 \ git-rev-parse.1 \ git-revert.1 \ @@ -157,6 +158,7 @@ git-write-tree.1 \ gitk.1 MAN3=3D Git.3 +MAN5=3D gitattributes.5 MAN7=3D git.7 =20 USE_BZIP2=3D yes @@ -177,22 +179,14 @@ =20 .ifndef WITHOUT_GUI PLIST_SUB+=3D GUI=3D"" -GITGUIVERSION=3D 0.6-GITGUI RUN_DEPENDS+=3D wish8.4:${PORTSDIR}/x11-toolkits/tk84 .else PLIST_SUB+=3D GUI=3D"@comment " -MAKE_ENV+=3D NO_GUI=3Dyes -.endif - -# We should place version files to avoid git's attempt to figure it by its= elf -post-patch: - ${ECHO} "GIT_VERSION =3D ${PORTVERSION}-dirty" > ${WRKSRC}/GIT-VERSION-FI= LE; ${ECHO} '#!/bin/sh' > ${WRKSRC}/GIT-VERSION-GEN -.ifndef WITHOUT_GUI - ${ECHO} "GIT_VERSION =3D ${GITGUIVERSION}-dirty" > ${WRKSRC}/git-gui/GIT-= VERSION-FILE; ${ECHO} '#!/bin/sh' > ${WRKSRC}/git-gui/GIT-VERSION-GEN +MAKE_ENV+=3D NO_TCLTK=3Dyes .endif =20 post-install: - ${TEST} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod && ${RM= } -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod + -${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod ${MKDIR} ${PREFIX}/share/emacs/site-lisp/git ${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git ${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \ --- devel/git/distinfo Fri May 25 19:13:27 2007 +++ devel/git/distinfo Sat May 26 16:54:53 2007 @@ -1,3 +1,3 @@ -MD5 (git-1.5.0.3.tar.bz2) =3D ea7a01dbde1da8fce235dde689bfeeea -SHA256 (git-1.5.0.3.tar.bz2) =3D 950be95ece89a4c03aa22cd93626a27619536d1b9= d40631b4369c339d63c120a -SIZE (git-1.5.0.3.tar.bz2) =3D 1047037 +MD5 (git-1.5.2.tar.bz2) =3D 79c749b720c29c024d948163fdc47dac +SHA256 (git-1.5.2.tar.bz2) =3D 26e30a20a6ee659018a863f743803811535042454f1= edad8727b375fefac6ff5 +SIZE (git-1.5.2.tar.bz2) =3D 1180424 --- devel/git/pkg-plist Fri May 25 19:13:27 2007 +++ devel/git/pkg-plist Sat May 26 17:29:22 2007 @@ -11,7 +11,9 @@ bin/git-bisect bin/git-blame bin/git-branch +bin/git-bundle bin/git-cat-file +bin/git-check-attr bin/git-check-ref-format bin/git-checkout bin/git-checkout-index @@ -33,10 +35,10 @@ bin/git-diff bin/git-diff-files bin/git-diff-index -bin/git-diff-stages bin/git-diff-tree bin/git-fast-import bin/git-fetch +bin/git-fetch--tool bin/git-fetch-pack bin/git-fmt-merge-msg bin/git-for-each-ref @@ -73,7 +75,9 @@ bin/git-merge-recursive bin/git-merge-resolve bin/git-merge-stupid +bin/git-merge-subtree bin/git-merge-tree +bin/git-mergetool bin/git-mktag bin/git-mktree bin/git-mv @@ -101,7 +105,6 @@ bin/git-request-pull bin/git-rerere bin/git-reset -bin/git-resolve bin/git-rev-list bin/git-rev-parse bin/git-revert @@ -139,7 +142,7 @@ bin/git-verify-tag bin/git-whatchanged bin/git-write-tree -bin/gitk +%%GUI%%bin/gitk %%SITE_PERL%%/Git.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git/.packlist lib/xemacs/site-lisp/git/git.el @@ -150,12 +153,29 @@ share/git-core/templates/hooks/applypatch-msg share/git-core/templates/hooks/commit-msg share/git-core/templates/hooks/post-commit +share/git-core/templates/hooks/post-receive share/git-core/templates/hooks/post-update share/git-core/templates/hooks/pre-applypatch share/git-core/templates/hooks/pre-commit share/git-core/templates/hooks/pre-rebase share/git-core/templates/hooks/update share/git-core/templates/info/exclude +%%GUI%%share/git-gui/lib/blame.tcl +%%GUI%%share/git-gui/lib/branch.tcl +%%GUI%%share/git-gui/lib/browser.tcl +%%GUI%%share/git-gui/lib/class.tcl +%%GUI%%share/git-gui/lib/commit.tcl +%%GUI%%share/git-gui/lib/console.tcl +%%GUI%%share/git-gui/lib/database.tcl +%%GUI%%share/git-gui/lib/diff.tcl +%%GUI%%share/git-gui/lib/error.tcl +%%GUI%%share/git-gui/lib/index.tcl +%%GUI%%share/git-gui/lib/merge.tcl +%%GUI%%share/git-gui/lib/option.tcl +%%GUI%%share/git-gui/lib/remote.tcl +%%GUI%%share/git-gui/lib/shortcut.tcl +%%GUI%%share/git-gui/lib/tclIndex +%%GUI%%share/git-gui/lib/transport.tcl @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git @dirrm lib/xemacs/site-lisp/git @dirrmtry lib/xemacs/site-lisp @@ -168,3 +188,5 @@ @dirrm share/git-core/templates/info @dirrm share/git-core/templates @dirrm share/git-core +%%GUI%%@dirrm share/git-gui/lib +%%GUI%%@dirrm share/git-gui --N7hiGSZV0P2B4+ho Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQFGWFP352SDGA2eCwURAjI/AJ9kRqr1hqhTJqF4g+PBkER3ml5aFACdH9iS J4KdudIqW+usTZYSMILI6Uo= =1txJ -----END PGP SIGNATURE----- --N7hiGSZV0P2B4+ho--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20070526153623.GQ23313>