kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 1.7.1.

Browse source 
[1]: Fix gitk to exec wish8.5 and not wish.
[2]: Add a CONTRIB knob, default to on, which installs contrib scripts.
Use COPYTREE_SHARE for installing GITWEB stuff.
Whitespace cleanup in P4 OPTION definition and installation.
Note CONTRIB information in pkg-message.

Changelog: http://www.kernel.org/pub/software/scm/git/docs/RelNotes-1.7.1.txt

PR:		[1]: ports/146016
Submitted by:	[1]: Bruce Cran <bruce@cran.org.uk>
		[2]: Martin Sugioarto (based upon a patch via private mail)
This commit is contained in:
Wesley Shields 2010-05-07 02:43:37 +00:00
parent ea6a163675
commit 6ded77e4cc
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=253869
5 changed files with 164 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
devel/git/Makefile
View file

@ -6,7 +6,7 @@
#
PORTNAME= git
PORTVERSION= 1.7.0.6
PORTVERSION= 1.7.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_KERNEL_ORG}
MASTER_SITE_SUBDIR= software/scm/${PORTNAME}
@ -188,7 +188,8 @@ SHELLS= /etc/shells
OPTIONS= GUI "Enable building of GUI tools" off \
SVN "Enable required dependencies for SVN tools" off \
GITWEB "Install gitweb" off \
P4 "Enable Perforce support" on \
CONTRIB "Install contributed scripts" on \
P4 "Enable Perforce support" on \
CVS "Enable CVS support" on \
HTMLDOCS "Install additional documentation" off \
PERL "Build perl based git tools" on \
@ -273,6 +274,12 @@ PLIST_SUB+= GITWEB="@comment "
IGNORE= using GITWEB support requires PERL support
.endif
.ifdef (WITH_CONTRIB)
PLIST_SUB+= CONTRIB=""
.else
PLIST_SUB+= CONTRIB="@comment "
.endif
.ifdef (WITH_P4)
PLIST_SUB+= P4=""
.else
@ -332,12 +339,15 @@ post-patch:
.endif
post-build:
.ifdef (WITH_P4)
.ifdef (WITH_P4) || defined (WITH_CONTRIB)
@${REINPLACE_CMD} -e '1s|#!/usr/bin/python|#!${PYTHON_CMD}|' \
${WRKSRC}/contrib/p4import/git-p4import.py
@${CP} ${WRKSRC}/contrib/p4import/git-p4import.py \
${WRKSRC}/contrib/p4import/git-p4import
.endif
@${REINPLACE_CMD} -e 's|#\. /usr/share/doc/git-core/contrib/hooks/post-receive-email|#. ${PREFIX}/share/git-core/contrib/hooks/post-receive-email|' \
${WRKSRC}/templates/blt/hooks/post-receive.sample
@${FIND} ${WRKSRC} -name "*.bak" -delete
post-install:
(cd ${WRKDIR}/man1/ && ${COPYTREE_SHARE} \* ${MANPREFIX}/man/man1)
@ -358,27 +368,30 @@ post-install:
${PREFIX}/lib/xemacs/site-lisp/git/git.el
${LN} -sf ${PREFIX}/share/emacs/site-lisp/git/git-blame.el \
${PREFIX}/lib/xemacs/site-lisp/git/git-blame.el
.ifdef (WITH_GITWEB)
${RM} ${WRKSRC}/gitweb/Makefile \
${WRKSRC}/gitweb/GITWEB-BUILD-OPTIONS \
${WRKSRC}/gitweb/gitweb.perl
@${ECHO_MSG} "===> Installing gitweb files"
${MKDIR} ${EXAMPLESDIR}/gitweb
(cd ${WRKSRC}/gitweb/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/gitweb)
.endif
.ifdef (WITH_CONTRIB)
@${ECHO_MSG} "===> Installing contributed scripts"
${MKDIR} ${PREFIX}/share/git-core/contrib
(cd ${WRKSRC}/contrib/ && \
${COPYTREE_SHARE} \* ${PREFIX}/share/git-core/contrib)
.endif
.ifdef (WITH_P4)
${INSTALL_SCRIPT} ${WRKSRC}/contrib/p4import/git-p4import \
${PREFIX}/bin/
${INSTALL_SCRIPT} ${WRKSRC}/contrib/fast-import/git-p4 \
${PREFIX}/bin/
${INSTALL_SCRIPT} ${WRKSRC}/contrib/p4import/git-p4import ${PREFIX}/bin/
${INSTALL_SCRIPT} ${WRKSRC}/contrib/fast-import/git-p4 ${PREFIX}/bin/
.endif
@${ECHO_MSG} "===> Updating ${SHELLS}"
@${CP} ${SHELLS} ${SHELLS}.bak
@(${GREP} -v ${PREFIX}/libexec/git-core/git-shell ${SHELLS}.bak; \
${ECHO_CMD} ${PREFIX}/libexec/git-core/git-shell) > ${SHELLS}
@${RM} ${SHELLS}.bak
.ifdef (WITH_GITWEB)
@${ECHO_MSG} "===> Installing gitweb files"
${MKDIR} ${EXAMPLESDIR}/gitweb
${INSTALL_DATA} ${WRKSRC}/gitweb/INSTALL ${EXAMPLESDIR}/gitweb/
${INSTALL_DATA} ${WRKSRC}/gitweb/README ${EXAMPLESDIR}/gitweb/
${INSTALL_DATA} ${WRKSRC}/gitweb/git-favicon.png ${EXAMPLESDIR}/gitweb/
${INSTALL_DATA} ${WRKSRC}/gitweb/git-logo.png ${EXAMPLESDIR}/gitweb/
${INSTALL_DATA} ${WRKSRC}/gitweb/gitweb.css ${EXAMPLESDIR}/gitweb/
${INSTALL_SCRIPT} ${WRKSRC}/gitweb/gitweb.cgi ${EXAMPLESDIR}/gitweb/
${INSTALL_SCRIPT} ${WRKSRC}/gitweb/gitweb.js ${EXAMPLESDIR}/gitweb/
.ifdef (WITH_GITWEB) || defined (WITH_CONTRIB)
@${CAT} ${PKGMESSAGE}
.endif

36
devel/git/distinfo
View file

@ -1,18 +1,18 @@
MD5 (git-1.7.0.6.tar.bz2) = 0ca52eb23012cf3d96de7a33603309f2
SHA256 (git-1.7.0.6.tar.bz2) = 30378fec08e1a0de6cbdcc45cd25c89caa5c36c1453fbdaa9e3975c599ac0701
SIZE (git-1.7.0.6.tar.bz2) = 2442256
MD5 (git-manpages-1.7.0.6.tar.bz2) = bfd2744698e3cfbed42feb08525630b4
SHA256 (git-manpages-1.7.0.6.tar.bz2) = 5965a95f6b9c96f3cb1d9c0d6410282c7cef5581781b29dd23d914577d86da07
SIZE (git-manpages-1.7.0.6.tar.bz2) = 272820
MD5 (git-htmldocs-1.7.0.6.tar.bz2) = a674816c97495ffce58cd2cdda6b1fc5
SHA256 (git-htmldocs-1.7.0.6.tar.bz2) = cac6ed524bdabc71ee37216abea9de9870fd5ac9a26937103a6b4100919adf35
SIZE (git-htmldocs-1.7.0.6.tar.bz2) = 863541
MD5 (git-1.7.0.6.tar.bz2.sign) = 62c88b2a6271a757bf8d06706a4c8b73
SHA256 (git-1.7.0.6.tar.bz2.sign) = 06f17c0ab45f9e69f200726f17a160f734884ea021ef599a871b057abee2ae4c
SIZE (git-1.7.0.6.tar.bz2.sign) = 248
MD5 (git-manpages-1.7.0.6.tar.bz2.sign) = d682fd2b5c4c55a18934b63d2f7aeb09
SHA256 (git-manpages-1.7.0.6.tar.bz2.sign) = 189694a6881cb4ca470ff375c92639f4dde410d9f2ebc4c236837e5e79bcbe88
SIZE (git-manpages-1.7.0.6.tar.bz2.sign) = 248
MD5 (git-htmldocs-1.7.0.6.tar.bz2.sign) = 737b9fdebc4c4e67b25b30d0b65d12cb
SHA256 (git-htmldocs-1.7.0.6.tar.bz2.sign) = 8add6a4bddbe9a42d438b785d02ca89b87c4ec004557ba9bd936a1d0f00afcbe
SIZE (git-htmldocs-1.7.0.6.tar.bz2.sign) = 248
MD5 (git-1.7.1.tar.bz2) = 3da231dbe82ad103373cb530ae7475d5
SHA256 (git-1.7.1.tar.bz2) = bcf008ec9639480a3ebfdc4708743b6c0978a8bd3103a2dda587ea9473b9dde2
SIZE (git-1.7.1.tar.bz2) = 2475655
MD5 (git-manpages-1.7.1.tar.bz2) = 50c3e1119a2197de208cbb69c7da0a50
SHA256 (git-manpages-1.7.1.tar.bz2) = f4898ba376cfb407ccf266e6fcee95c4cfc36387823629923f9e742cfdffda0c
SIZE (git-manpages-1.7.1.tar.bz2) = 276911
MD5 (git-htmldocs-1.7.1.tar.bz2) = bc4bdafdc1b257c40564d47bc5c97365
SHA256 (git-htmldocs-1.7.1.tar.bz2) = fc4efd0ea040ea7684a0101f6614f9ee6398e77fdbed9338f61426b962a2270a
SIZE (git-htmldocs-1.7.1.tar.bz2) = 873917
MD5 (git-1.7.1.tar.bz2.sign) = 069898955034bfbc8f1765a9ebc95bc2
SHA256 (git-1.7.1.tar.bz2.sign) = eecd9c62befbc0ef44f95a35990e60b82a982767ac432d2c49683ea15cb0a9d5
SIZE (git-1.7.1.tar.bz2.sign) = 248
MD5 (git-manpages-1.7.1.tar.bz2.sign) = bb484921ecb8bbe59d697f09b897a433
SHA256 (git-manpages-1.7.1.tar.bz2.sign) = 1dd3e9b66ee21261002feb4fd9e331d4b45ea54e18de2a27d6fc9bcdc4f66a75
SIZE (git-manpages-1.7.1.tar.bz2.sign) = 248
MD5 (git-htmldocs-1.7.1.tar.bz2.sign) = 443480c9b831cac38812191a59c46c17
SHA256 (git-htmldocs-1.7.1.tar.bz2.sign) = 15c52324ee6c3e6f1866dbdd8dc2f47f9ffeff3c716eaff2b542938247971b4a
SIZE (git-htmldocs-1.7.1.tar.bz2.sign) = 248

10
devel/git/files/patch-gitk-git__gitk Normal file
View file

@ -0,0 +1,10 @@
--- gitk-git/gitk.orig 2010-05-05 13:57:21.735128362 -0400
+++ gitk-git/gitk 2010-05-05 13:57:43.312517678 -0400
@@ -1,6 +1,6 @@
#!/bin/sh
# Tcl ignores the next line -*- tcl -*- \
-exec wish "$0" -- "$@"
+exec wish8.5 "$0" -- "$@"
# Copyright © 2005-2009 Paul Mackerras. All rights reserved.
# This program is free software; it may be used, copied, modified

11
devel/git/files/pkg-message.in
View file

@ -1,5 +1,8 @@
------------------------------------------------------------------------
*************************** GITWEB *************************************
If you installed the GITWEB option please follow these instructions:
In the directory %%EXAMPLESDIR%%/gitweb you can find all files to
make gitweb work as a public repository on the web.
@ -10,5 +13,13 @@ All you have to do to make gitweb work is:
2) In gitweb.cgi, adjust the variable $projectroot to point to
your git repository (that is where you have your *.git project
directories).
*************************** GITWEB *************************************
*************************** CONTRIB ************************************
If you installed the CONTRIB option please note that the scripts are
installed in %%PREFIX%%/share/git-core/contrib. Some of them require
other ports to be installed (perl, python, etc), which you may need to
install manually.
*************************** CONTRIB ************************************
------------------------------------------------------------------------

95
devel/git/pkg-plist
View file

@ -758,6 +758,7 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.4.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.5.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.6.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.1.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png
@ -767,6 +768,80 @@ share/git-core/templates/info/exclude
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.css
%%GITWEB%%@dirrm %%EXAMPLESDIR%%/gitweb
%%GITWEB%%@dirrm %%EXAMPLESDIR%%
%%CONTRIB%%share/git-core/contrib/README
%%CONTRIB%%share/git-core/contrib/blameview/README
%%CONTRIB%%share/git-core/contrib/blameview/blameview.perl
%%CONTRIB%%share/git-core/contrib/buildsystems/Generators.pm
%%CONTRIB%%share/git-core/contrib/buildsystems/Generators/QMake.pm
%%CONTRIB%%share/git-core/contrib/buildsystems/Generators/Vcproj.pm
%%CONTRIB%%share/git-core/contrib/buildsystems/engine.pl
%%CONTRIB%%share/git-core/contrib/buildsystems/generate
%%CONTRIB%%share/git-core/contrib/buildsystems/parse.pl
%%CONTRIB%%share/git-core/contrib/ciabot/README
%%CONTRIB%%share/git-core/contrib/ciabot/ciabot.py
%%CONTRIB%%share/git-core/contrib/ciabot/ciabot.sh
%%CONTRIB%%share/git-core/contrib/completion/git-completion.bash
%%CONTRIB%%share/git-core/contrib/continuous/cidaemon
%%CONTRIB%%share/git-core/contrib/continuous/post-receive-cinotify
%%CONTRIB%%share/git-core/contrib/convert-objects/convert-objects.c
%%CONTRIB%%share/git-core/contrib/convert-objects/git-convert-objects.txt
%%CONTRIB%%share/git-core/contrib/emacs/.gitignore
%%CONTRIB%%share/git-core/contrib/emacs/Makefile
%%CONTRIB%%share/git-core/contrib/emacs/README
%%CONTRIB%%share/git-core/contrib/emacs/git-blame.el
%%CONTRIB%%share/git-core/contrib/emacs/git.el
%%CONTRIB%%share/git-core/contrib/examples/README
%%CONTRIB%%share/git-core/contrib/examples/builtin-fetch--tool.c
%%CONTRIB%%share/git-core/contrib/examples/git-checkout.sh
%%CONTRIB%%share/git-core/contrib/examples/git-clean.sh
%%CONTRIB%%share/git-core/contrib/examples/git-clone.sh
%%CONTRIB%%share/git-core/contrib/examples/git-commit.sh
%%CONTRIB%%share/git-core/contrib/examples/git-fetch.sh
%%CONTRIB%%share/git-core/contrib/examples/git-gc.sh
%%CONTRIB%%share/git-core/contrib/examples/git-ls-remote.sh
%%CONTRIB%%share/git-core/contrib/examples/git-merge-ours.sh
%%CONTRIB%%share/git-core/contrib/examples/git-merge.sh
%%CONTRIB%%share/git-core/contrib/examples/git-notes.sh
%%CONTRIB%%share/git-core/contrib/examples/git-remote.perl
%%CONTRIB%%share/git-core/contrib/examples/git-rerere.perl
%%CONTRIB%%share/git-core/contrib/examples/git-reset.sh
%%CONTRIB%%share/git-core/contrib/examples/git-resolve.sh
%%CONTRIB%%share/git-core/contrib/examples/git-revert.sh
%%CONTRIB%%share/git-core/contrib/examples/git-svnimport.perl
%%CONTRIB%%share/git-core/contrib/examples/git-svnimport.txt
%%CONTRIB%%share/git-core/contrib/examples/git-tag.sh
%%CONTRIB%%share/git-core/contrib/examples/git-verify-tag.sh
%%CONTRIB%%share/git-core/contrib/fast-import/git-import.perl
%%CONTRIB%%share/git-core/contrib/fast-import/git-import.sh
%%CONTRIB%%share/git-core/contrib/fast-import/git-p4
%%CONTRIB%%share/git-core/contrib/fast-import/git-p4.bat
%%CONTRIB%%share/git-core/contrib/fast-import/git-p4.txt
%%CONTRIB%%share/git-core/contrib/fast-import/import-directories.perl
%%CONTRIB%%share/git-core/contrib/fast-import/import-tars.perl
%%CONTRIB%%share/git-core/contrib/fast-import/import-zips.py
%%CONTRIB%%share/git-core/contrib/git-resurrect.sh
%%CONTRIB%%share/git-core/contrib/gitview/gitview
%%CONTRIB%%share/git-core/contrib/gitview/gitview.txt
%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.py
%%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.txt
%%CONTRIB%%share/git-core/contrib/hooks/post-receive-email
%%CONTRIB%%share/git-core/contrib/hooks/pre-auto-gc-battery
%%CONTRIB%%share/git-core/contrib/hooks/setgitperms.perl
%%CONTRIB%%share/git-core/contrib/hooks/update-paranoid
%%CONTRIB%%share/git-core/contrib/p4import/README
%%CONTRIB%%share/git-core/contrib/p4import/git-p4import.py
%%CONTRIB%%share/git-core/contrib/p4import/git-p4import.txt
%%CONTRIB%%share/git-core/contrib/p4import/git-p4import
%%CONTRIB%%share/git-core/contrib/patches/docbook-xsl-manpages-charmap.patch
%%CONTRIB%%share/git-core/contrib/remotes2config.sh
%%CONTRIB%%share/git-core/contrib/rerere-train.sh
%%CONTRIB%%share/git-core/contrib/stats/git-common-hash
%%CONTRIB%%share/git-core/contrib/stats/mailmap.pl
%%CONTRIB%%share/git-core/contrib/stats/packinfo.pl
%%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/README
%%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/appp.sh
%%CONTRIB%%share/git-core/contrib/vim/README
%%CONTRIB%%share/git-core/contrib/workdir/git-new-workdir
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Git
@dirrm lib/xemacs/site-lisp/git
@dirrmtry lib/xemacs/site-lisp
@ -786,6 +861,26 @@ share/git-core/templates/info/exclude
@dirrmtry share/git-core/templates/hooks
@dirrm share/git-core/templates/info
@dirrmtry share/git-core/templates
%%CONTRIB%%@dirrm share/git-core/contrib/blameview
%%CONTRIB%%@dirrm share/git-core/contrib/buildsystems/Generators
%%CONTRIB%%@dirrm share/git-core/contrib/buildsystems
%%CONTRIB%%@dirrm share/git-core/contrib/ciabot
%%CONTRIB%%@dirrm share/git-core/contrib/completion
%%CONTRIB%%@dirrm share/git-core/contrib/continuous
%%CONTRIB%%@dirrm share/git-core/contrib/convert-objects
%%CONTRIB%%@dirrm share/git-core/contrib/emacs
%%CONTRIB%%@dirrm share/git-core/contrib/examples
%%CONTRIB%%@dirrm share/git-core/contrib/fast-import
%%CONTRIB%%@dirrm share/git-core/contrib/gitview
%%CONTRIB%%@dirrm share/git-core/contrib/hg-to-git
%%CONTRIB%%@dirrm share/git-core/contrib/hooks
%%CONTRIB%%@dirrm share/git-core/contrib/p4import
%%CONTRIB%%@dirrm share/git-core/contrib/patches
%%CONTRIB%%@dirrm share/git-core/contrib/stats
%%CONTRIB%%@dirrm share/git-core/contrib/thunderbird-patch-inline
%%CONTRIB%%@dirrm share/git-core/contrib/vim
%%CONTRIB%%@dirrm share/git-core/contrib/workdir
%%CONTRIB%%@dirrm share/git-core/contrib
@dirrm share/git-core
@dirrm %%PYTHON_SITELIBDIR%%/git_remote_helpers/git
@dirrm %%PYTHON_SITELIBDIR%%/git_remote_helpers