5 files changed, 75 insertions, 48 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 39957d441215..d7e2a385dc49 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	git
-PORTVERSION=	1.7.0.4
+PORTVERSION=	1.7.0.5
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_KERNEL_ORG}
 MASTER_SITE_SUBDIR=	software/scm/${PORTNAME}
@@ -49,6 +49,7 @@ MAN1=		git.1 \
 		git-describe.1 \
 		git-diff-files.1 \
 		git-diff-index.1 \
+		git-difftool.1 \
 		git-diff-tree.1 \
 		git-diff.1 \
 		git-fast-export.1 \
@@ -66,6 +67,7 @@ MAN1=		git.1 \
 		git-grep.1 \
 		git-hash-object.1 \
 		git-help.1 \
+		git-http-backend.1 \
 		git-http-fetch.1 \
 		git-http-push.1 \
 		git-imap-send.1 \
@@ -84,13 +86,15 @@ MAN1=		git.1 \
 		git-merge-file.1 \
 		git-merge-index.1 \
 		git-merge-one-file.1 \
+		git-mergetool.1 \
 		git-merge-tree.1 \
 		git-merge.1 \
-		git-mergetool.1 \
+		git-mergetool--lib.1 \
 		git-mktag.1 \
 		git-mktree.1 \
 		git-mv.1 \
 		git-name-rev.1 \
+		git-notes.1 \
 		git-pack-objects.1 \
 		git-pack-redundant.1 \
 		git-pack-refs.1 \
@@ -107,8 +111,10 @@ MAN1=		git.1 \
 		git-receive-pack.1 \
 		git-reflog.1 \
 		git-relink.1 \
+		git-remote-helpers.1 \
 		git-remote.1 \
 		git-repack.1 \
+		git-replace.1 \
 		git-repo-config.1 \
 		git-request-pull.1 \
 		git-rerere.1 \
@@ -126,6 +132,7 @@ MAN1=		git.1 \
 		git-show-index.1 \
 		git-show-ref.1 \
 		git-show.1 \
+		git-stage.1 \
 		git-stash.1 \
 		git-status.1 \
 		git-stripspace.1 \
@@ -156,19 +163,21 @@ MAN7=		gitcli.7 \
 		gittutorial.7 \
 		gitcore-tutorial.7 \
 		gitdiffcore.7 \
-		gittutorial-2.7
+		gittutorial-2.7 \
+		gitworkflows.7
 
 SUB_FILES=	pkg-message
 PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PYTHON=	yes
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+CONFIGURE_ARGS+=	--with-python=${LOCALBASE}/bin/python
 MAKE_ENV+=	LIBMD_SHA1=yes \
-		V=1 \
-		PYTHON_PATH=${LOCALBASE}/bin/python
+		V=1
 MAKE_ARGS+=	prefix="${PREFIX}"
 USE_OPENSSL=	yes
 USE_RC_SUBR=	git_daemon
@@ -236,6 +245,9 @@ MAN1+=		git-citool.1 \
 PLIST_SUB+=	GUI=""
 MAKE_ENV+=	TCL_PATH=${TCLSH} TCLTK_PATH=${WISH}
 .else
+RMMAN1+=	git-citool.1 \
+		git-gui.1 \
+		gitk.1
 PLIST_SUB+=	GUI="@comment "
 MAKE_ENV+=	NO_TCLTK=yes
 .endif
@@ -248,6 +260,7 @@ PLIST_SUB+=	SVN=""
 MAN1+=		git-svn.1
 .else
 PLIST_SUB+=	SVN="@comment "
+RMMAN1+=	git-svn.1
 .endif
 
 .ifdef (WITH_GITWEB)
@@ -273,6 +286,8 @@ PLIST_SUB+=	CVS=""
 RUN_DEPENDS+=	cvsps:${PORTSDIR}/devel/cvsps
 .else
 PLIST_SUB+=	CVS="@comment "
+RMMAN1+=	git-cvsimport.1 git-cvsexportcommit.1 git-cvsserver.1
+RMMAN7+=	gitcvs-migration.7
 .endif
 
 .if defined(MAINTAINER_MODE)
@@ -297,6 +312,12 @@ post-extract:
 .endif
 
 post-patch:
+.for FILE in ${RMMAN1}
+	@${RM} ${WRKDIR}/man1/${FILE}
+.endfor
+.for FILE in ${RMMAN7}
+	@${RM} ${WRKDIR}/man7/${FILE}
+.endfor
 	@${REINPLACE_CMD} -e 's|share/man/man3|man/man3|' ${WRKSRC}/perl/Makefile.PL
 .ifndef (WITH_CVS)
 	@${REINPLACE_CMD} -e '/git-cvsexportcommit.perl/d; \
@@ -306,7 +327,6 @@ post-patch:
 		s/git-cvsserver//' \
 		${WRKSRC}/Makefile
 .endif
-
 .ifndef (WITH_SVN)
 	@${REINPLACE_CMD} -e '/git-svn.perl/d' ${WRKSRC}/Makefile
 .endif
@@ -320,21 +340,13 @@ post-build:
 .endif
 
 post-install:
-.for i in ${MAN1}
-	${INSTALL_MAN} ${WRKDIR}/man1/${i} ${MANPREFIX}/man/man1/
-.endfor
-.for i in ${MAN5}
-	${INSTALL_MAN} ${WRKDIR}/man5/${i} ${MANPREFIX}/man/man5/
-.endfor
-.for i in ${MAN7}
-	${INSTALL_MAN} ${WRKDIR}/man7/${i} ${MANPREFIX}/man/man7/
-.endfor
-
+	(cd ${WRKDIR}/man1/ && ${COPYTREE_SHARE} \* ${MANPREFIX}/man/man1)
+	(cd ${WRKDIR}/man5/ && ${COPYTREE_SHARE} \* ${MANPREFIX}/man/man5)
+	(cd ${WRKDIR}/man7/ && ${COPYTREE_SHARE} \* ${MANPREFIX}/man/man7)
 .if defined(WITH_HTMLDOCS)
 	${MKDIR} ${DOCSDIR}
 	(cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
 .endif
-
 	-${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/mach/perllocal.pod
 	${MKDIR} ${PREFIX}/share/emacs/site-lisp/git
 	${MKDIR} ${PREFIX}/lib/xemacs/site-lisp/git
@@ -346,14 +358,17 @@ 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_P4)
 	${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
@@ -364,15 +379,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/gitweb/gitweb.css ${EXAMPLESDIR}/gitweb/
 	${INSTALL_SCRIPT} ${WRKSRC}/gitweb/gitweb.cgi ${EXAMPLESDIR}/gitweb/
 	${INSTALL_SCRIPT} ${WRKSRC}/gitweb/gitweb.js ${EXAMPLESDIR}/gitweb/
-.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)
 	@${CAT} ${PKGMESSAGE}
 .endif
 
diff --git a/devel/git/distinfo b/devel/git/distinfo
index d9ad2b7eead1..6a7c687b05d1 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,18 +1,18 @@
-MD5 (git-1.7.0.4.tar.bz2) = 1cc8b2aea57e5e999ccac18ae355f760
-SHA256 (git-1.7.0.4.tar.bz2) = ff283c3799c3f9719d0512bb23cf8854e1934f1ed36f2058b931d8f1c0b63430
-SIZE (git-1.7.0.4.tar.bz2) = 2441048
-MD5 (git-manpages-1.7.0.4.tar.bz2) = 9730c5ed53a12788810ae3681fee149b
-SHA256 (git-manpages-1.7.0.4.tar.bz2) = d13461a388f34aef4ad32fd4103a345392aa503c57b461dd1098473d665cde3d
-SIZE (git-manpages-1.7.0.4.tar.bz2) = 272585
-MD5 (git-htmldocs-1.7.0.4.tar.bz2) = 8c5273d6161121bb127f6d4fa2294196
-SHA256 (git-htmldocs-1.7.0.4.tar.bz2) = 8f6572da459233cfe62c2373c1a081599e597b47704bd49a74a09384d07529c7
-SIZE (git-htmldocs-1.7.0.4.tar.bz2) = 862693
-MD5 (git-1.7.0.4.tar.bz2.sign) = 9a5c6ba612c6b73d4af00b2c79ba69a5
-SHA256 (git-1.7.0.4.tar.bz2.sign) = 5d6b1e8640d5bd1143c670d76c5abaa65954ead8755b8909f1ba86f2f6e38459
-SIZE (git-1.7.0.4.tar.bz2.sign) = 248
-MD5 (git-manpages-1.7.0.4.tar.bz2.sign) = 12881ba3656a9ab8c8815789b0c39741
-SHA256 (git-manpages-1.7.0.4.tar.bz2.sign) = 52917cd5e0028e7d35fad7a5d6e9259b6330551a046c8ddff5dfd90b80d140cf
-SIZE (git-manpages-1.7.0.4.tar.bz2.sign) = 248
-MD5 (git-htmldocs-1.7.0.4.tar.bz2.sign) = 951d03fb240a6c49276945bb1c67085f
-SHA256 (git-htmldocs-1.7.0.4.tar.bz2.sign) = 1397cec4176ab1f05c1050d385eccbfe15d836b54159033c7ffaa7e307390d37
-SIZE (git-htmldocs-1.7.0.4.tar.bz2.sign) = 248
+MD5 (git-1.7.0.5.tar.bz2) = 77d50f41ef282752dc69d9a47765f5c7
+SHA256 (git-1.7.0.5.tar.bz2) = 96b44fcd8652db8a7a30d87096a17200457d3fbcc91aa334cb7644a6da898d53
+SIZE (git-1.7.0.5.tar.bz2) = 2440079
+MD5 (git-manpages-1.7.0.5.tar.bz2) = 90eb5fb193a218176d2d9b841128a717
+SHA256 (git-manpages-1.7.0.5.tar.bz2) = a68b8e9783d850f909f7ad89219f450f2b2c21c77da39a2cdc966428df7539cd
+SIZE (git-manpages-1.7.0.5.tar.bz2) = 272671
+MD5 (git-htmldocs-1.7.0.5.tar.bz2) = 74c7320440049ba497d9efc8b0134474
+SHA256 (git-htmldocs-1.7.0.5.tar.bz2) = 813934a17cd6d93316392bcbdd23f843fe2f347a9f6481350d5fde25603093ad
+SIZE (git-htmldocs-1.7.0.5.tar.bz2) = 863491
+MD5 (git-1.7.0.5.tar.bz2.sign) = b84f793cbc84cd5a15ef4b6da5905870
+SHA256 (git-1.7.0.5.tar.bz2.sign) = b6b5b5c714513d541c1e3a68687c0929154a5401f8d66a95d76a2453c6ab6b9b
+SIZE (git-1.7.0.5.tar.bz2.sign) = 248
+MD5 (git-manpages-1.7.0.5.tar.bz2.sign) = 013c70da2a28f969d4c6f5727b293bb8
+SHA256 (git-manpages-1.7.0.5.tar.bz2.sign) = e1f2cffa5e5f33a6fad9f3568b890f4f5e524b5a5a05e16a96469028fa1926d5
+SIZE (git-manpages-1.7.0.5.tar.bz2.sign) = 248
+MD5 (git-htmldocs-1.7.0.5.tar.bz2.sign) = 6d04b46df4953d1122c91b56bf36555c
+SHA256 (git-htmldocs-1.7.0.5.tar.bz2.sign) = 1808af6fee14b0c911acfaeb5ef8dc4eae40a7b0c37d54908c3ba48df281eb47
+SIZE (git-htmldocs-1.7.0.5.tar.bz2.sign) = 248
diff --git a/devel/git/files/git_daemon.in b/devel/git/files/git_daemon.in
index f44db9347baa..4cb3702e3507 100644
--- a/devel/git/files/git_daemon.in
+++ b/devel/git/files/git_daemon.in
@@ -21,9 +21,9 @@ load_rc_config $name
 
 : ${git_daemon_enable:=NO}
 : ${git_daemon_directory:=%%PREFIX%%/git}
-: ${git_daemon_flags:="--syslog --reuseaddr"}
+: ${git_daemon_flags:="--syslog --reuseaddr --detach"}
 
 command="%%PREFIX%%/libexec/git-core/git-daemon"
-command_args="${git_daemon_directory} &"
+command_args="${git_daemon_directory}"
 
 run_rc_command "$1"
diff --git a/devel/git/files/patch-wrapper.c b/devel/git/files/patch-wrapper.c
new file mode 100644
index 000000000000..c66a97b8f272
--- /dev/null
+++ b/devel/git/files/patch-wrapper.c
@@ -0,0 +1,20 @@
+--- wrapper.c.orig	2010-04-17 10:41:51.454820281 -0400
++++ wrapper.c	2010-04-17 11:00:32.542693956 -0400
+@@ -117,7 +117,7 @@
+ {
+ 	ssize_t nr;
+ 	while (1) {
+-		nr = read(fd, buf, len);
++		nr = read(fd, buf, MIN(INT_MAX, len));
+ 		if ((nr < 0) && (errno == EAGAIN || errno == EINTR))
+ 			continue;
+ 		return nr;
+@@ -133,7 +133,7 @@
+ {
+ 	ssize_t nr;
+ 	while (1) {
+-		nr = write(fd, buf, len);
++		nr = write(fd, buf, MIN(INT_MAX, len));
+ 		if ((nr < 0) && (errno == EAGAIN || errno == EINTR))
+ 			continue;
+ 		return nr;
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index af9eccd763c6..157c57bb0dad 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -756,6 +756,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.2.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.3.txt
 %%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.4.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.5.txt
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
 %%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png