From owner-svn-ports-all@freebsd.org Fri Aug 18 20:26:54 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 51612DD4D15; Fri, 18 Aug 2017 20:26:54 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2C894740BC; Fri, 18 Aug 2017 20:26:54 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7IKQr5o015638; Fri, 18 Aug 2017 20:26:53 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7IKQrsn015636; Fri, 18 Aug 2017 20:26:53 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201708182026.v7IKQrsn015636@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 18 Aug 2017 20:26:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r448272 - branches/2017Q3/devel/git X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: branches/2017Q3/devel/git X-SVN-Commit-Revision: 448272 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Aug 2017 20:26:54 -0000 Author: feld Date: Fri Aug 18 20:26:52 2017 New Revision: 448272 URL: https://svnweb.freebsd.org/changeset/ports/448272 Log: 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) Modified: branches/2017Q3/devel/git/Makefile branches/2017Q3/devel/git/pkg-plist Modified: branches/2017Q3/devel/git/Makefile ============================================================================== --- branches/2017Q3/devel/git/Makefile Fri Aug 18 20:24:32 2017 (r448271) +++ branches/2017Q3/devel/git/Makefile Fri Aug 18 20:26:52 2017 (r448272) @@ -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 */*/* 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; \ @@ -179,6 +183,10 @@ post-patch-P4-off: 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) Modified: branches/2017Q3/devel/git/pkg-plist ============================================================================== --- branches/2017Q3/devel/git/pkg-plist Fri Aug 18 20:24:32 2017 (r448271) +++ branches/2017Q3/devel/git/pkg-plist Fri Aug 18 20:26:52 2017 (r448272) @@ -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