MFH: r446083

- Add diff-highlight back to package when CONTRIB option is set
- While here, remove unnecessary lines from pkg-plist
- Bump PORTREVISION

PR:		220804
Submitted by:	martin@sugioarto.com
Sponsored by:	Rubicon Communications, LLC (Netgate)

Approved by:	ports-secteam (with hat)

2 files changed, 10 insertions, 3 deletions

diff --git a/devel/git/Makefile b/devel/git/Makefile
index 0f2618a..3403abc 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	git
 DISTVERSION=	2.13.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -42,7 +43,6 @@ SHEBANG_FILES=	*.perl */*.perl */*/*.perl */*.pl */*/*.pl */*/*/*.pl \
 		contrib/remote-helpers/git-remote-bzr \
 		contrib/remote-helpers/git-remote-hg \
 		contrib/credential/netrc/git-credential-netrc \
-		contrib/diff-highlight/diff-highlight.perl \
 		contrib/buildsystems/generate contrib/contacts/git-contacts \
 		contrib/svn-fe/svnrdump_sim.py
 TEST_TARGET=	test
@@ -155,6 +155,10 @@ post-patch:
 .endfor
 	@${REINPLACE_CMD} -e 's|share/man/man3|man/man3|' ${WRKSRC}/perl/Makefile.PL
 
+post-patch-CONTRIB-on:
+	@${REINPLACE_CMD} -e "s,/usr/bin/perl,${PERL}," \
+		${WRKSRC}/contrib/diff-highlight/Makefile
+
 post-patch-CVS-off:
 	@${REINPLACE_CMD} -e '/git-cvsexportcommit.perl/d; \
 		/git-cvsimport.perl/d; \
@@ -180,6 +184,10 @@ post-build:
 	@${FIND} ${WRKSRC} -name "*.bak" -delete
 .endif
 
+post-build-CONTRIB-on:
+	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC}/contrib/diff-highlight
+	${RM} ${WRKSRC}/contrib/diff-highlight/shebang.perl
+
 post-install:
 	(cd ${WRKDIR}/man1/ && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man1)
 	(cd ${WRKDIR}/man5/ && ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man5)
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index f71e515..7cd7bdb 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -1228,7 +1228,6 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.tcsh
 %%CONTRIB%%share/git-core/contrib/completion/git-completion.zsh
 %%CONTRIB%%share/git-core/contrib/completion/git-prompt.sh
-@comment share/git-core/contrib/contacts/.gitignore
 %%CONTRIB%%share/git-core/contrib/contacts/Makefile
 %%CONTRIB%%share/git-core/contrib/contacts/git-contacts
 %%CONTRIB%%share/git-core/contrib/contacts/git-contacts.txt
@@ -1251,7 +1250,7 @@ share/emacs/site-lisp/git/git.el
 %%CONTRIB%%share/git-core/contrib/diff-highlight/README
 %%CONTRIB%%share/git-core/contrib/diff-highlight/DiffHighlight.pm
 %%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight.perl
-@comment share/git-core/contrib/diff-highlight/t/.gitignore
+%%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight
 %%CONTRIB%%share/git-core/contrib/diff-highlight/t/Makefile
 %%CONTRIB%%share/git-core/contrib/diff-highlight/t/t9400-diff-highlight.sh
 %%CONTRIB%%share/git-core/contrib/emacs/.gitignore