From amdmi3@amdmi3.ru  Mon May 20 20:45:39 2013
Return-Path: <amdmi3@amdmi3.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id DF6FAA3B;
	Mon, 20 May 2013 20:45:39 +0000 (UTC)
	(envelope-from amdmi3@amdmi3.ru)
Received: from smtp.timeweb.ru (smtp.timeweb.ru [92.53.116.43])
	by mx1.freebsd.org (Postfix) with ESMTP id 9E6D01E09;
	Mon, 20 May 2013 20:45:39 +0000 (UTC)
Received: from [213.148.20.85] (helo=hive.panopticon)
	by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_CAMELLIA_256_CBC_SHA1:256)
	(Exim 4.80)
	(envelope-from <amdmi3@amdmi3.ru>)
	id 1UeWxX-0001sq-MG; Tue, 21 May 2013 00:45:31 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
	by hive.panopticon (Postfix) with ESMTP id 15630E7C;
	Tue, 21 May 2013 00:45:31 +0400 (MSK)
Received: by hades.panopticon (Postfix, from userid 1000)
	id B735EA21; Tue, 21 May 2013 00:45:06 +0400 (MSK)
Message-Id: <20130520204506.B735EA21@hades.panopticon>
Date: Tue, 21 May 2013 00:45:06 +0400 (MSK)
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: wxs@FreeBSD.org
Subject: [PATCH] devel/git: properly install git-subtree
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         178797
>Category:       ports
>Synopsis:       [PATCH] devel/git: properly install git-subtree
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wxs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 20 20:50:01 UTC 2013
>Closed-Date:    Thu Jun 13 00:30:23 UTC 2013
>Last-Modified:  Thu Jun 13 00:40:00 UTC 2013
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 9.1-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 9.1-RELEASE-p2 FreeBSD 9.1-RELEASE-p2 #0 r249077: Thu Apr  4 10:42:30
>Description:
Currently git-subtree subcommand is installed along with the rest of contrib/ into share/git-core, but this is not sufficient to make it runnable is in `git subtree ...`.
The patch attached makes it install into proper locations so it works out of box.

Testing shows that it works without problems.

The REINPLACE which changes interpreter for git-subtree from /bin/bash to /bin/sh was also submitted upstream.

Port maintainer (wxs@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_7 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- git-1.8.2.3_1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 318625)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	git
 PORTVERSION=	1.8.2.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -327,6 +328,9 @@
 
 .if ${PORT_OPTIONS:MCONTRIB}
 PLIST_SUB+=	CONTRIB=""
+BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto \
+		asciidoc:${PORTSDIR}/textproc/asciidoc
+MAN1+=		git-subtree.1
 .else
 PLIST_SUB+=	CONTRIB="@comment "
 .endif
@@ -388,6 +392,8 @@
 .if empty(PORT_OPTIONS:MP4)
 	@${REINPLACE_CMD} -e '/^SCRIPT_PYTHON += git-p4.py$$/d' ${WRKSRC}/Makefile
 .endif
+	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \
+		${WRKSRC}/contrib/subtree/git-subtree.sh
 
 post-build:
 .if ${PORT_OPTIONS:MP4} || ${PORT_OPTIONS:MCONTRIB}
@@ -427,6 +433,8 @@
 	@${ECHO_MSG} "===> Installing contributed scripts"
 	${MKDIR} ${PREFIX}/share/git-core/contrib
 	${CP} -R ${WRKSRC}/contrib/* ${PREFIX}/share/git-core/contrib
+	cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \
+		${GMAKE} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} install install-doc
 .endif
 .if ${PORT_OPTIONS:MP4}
 	${INSTALL_SCRIPT} ${WRKSRC}/contrib/p4import/git-p4import ${PREFIX}/bin/
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 318625)
+++ pkg-plist	(working copy)
@@ -174,6 +174,7 @@
 libexec/git-core/git-status
 libexec/git-core/git-stripspace
 libexec/git-core/git-submodule
+%%CONTRIB%%libexec/git-core/git-subtree
 %%SVN%%libexec/git-core/git-svn
 libexec/git-core/git-symbolic-ref
 libexec/git-core/git-tag
--- git-1.8.2.3_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wxs 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon May 20 20:50:15 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178797 
State-Changed-From-To: open->closed 
State-Changed-By: wxs 
State-Changed-When: Thu Jun 13 00:30:22 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178797 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/178797: commit references a PR
Date: Thu, 13 Jun 2013 00:30:11 +0000 (UTC)

 Author: wxs
 Date: Thu Jun 13 00:30:02 2013
 New Revision: 320731
 URL: http://svnweb.freebsd.org/changeset/ports/320731
 
 Log:
   Update to 1.8.3.1
   Properly install git-subtree [1]
   
   PR:		[1] ports/178797
   Submitted by:	amdmi3@
 
 Modified:
   head/devel/git/Makefile
   head/devel/git/distinfo
   head/devel/git/files/patch-Makefile   (contents, props changed)
   head/devel/git/pkg-plist
 
 Modified: head/devel/git/Makefile
 ==============================================================================
 --- head/devel/git/Makefile	Thu Jun 13 00:06:17 2013	(r320730)
 +++ head/devel/git/Makefile	Thu Jun 13 00:30:02 2013	(r320731)
 @@ -2,7 +2,7 @@
  # $FreeBSD$
  
  PORTNAME=	git
 -PORTVERSION=	1.8.2.3
 +PORTVERSION=	1.8.3.1
  CATEGORIES=	devel
  MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
  DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 @@ -327,6 +327,9 @@ IGNORE=	using GITWEB support requires PE
  
  .if ${PORT_OPTIONS:MCONTRIB}
  PLIST_SUB+=	CONTRIB=""
 +BUILD_DEPENDS+=	xmlto:${PORTSDIR}/textproc/xmlto \
 +		asciidoc:${PORTSDIR}/textproc/asciidoc
 +MAN1+=		git-subtree.1
  .else
  PLIST_SUB+=	CONTRIB="@comment "
  .endif
 @@ -387,6 +390,8 @@ post-patch:
  .endif
  .if empty(PORT_OPTIONS:MP4)
  	@${REINPLACE_CMD} -e '/^SCRIPT_PYTHON += git-p4.py$$/d' ${WRKSRC}/Makefile
 +	@${REINPLACE_CMD} -e 's|/bin/bash|/bin/sh|' \
 +		${WRKSRC}/contrib/subtree/git-subtree.sh
  .endif
  
  post-build:
 @@ -427,10 +432,12 @@ post-install:
  	@${ECHO_MSG} "===> Installing contributed scripts"
  	${MKDIR} ${PREFIX}/share/git-core/contrib
  	${CP} -R ${WRKSRC}/contrib/* ${PREFIX}/share/git-core/contrib
 +	cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \
 +		${GMAKE} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} install install-doc
  .endif
  .if ${PORT_OPTIONS:MP4}
  	${INSTALL_SCRIPT} ${WRKSRC}/contrib/p4import/git-p4import ${PREFIX}/bin/
 -	${INSTALL_SCRIPT} ${WRKSRC}/git-p4 ${PREFIX}/bin/
 +	${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py ${PREFIX}/bin/
  .endif
  .if ${PORT_OPTIONS:METCSHELLS}
  	@${ECHO_MSG} "===> Updating ${SHELLS}"
 
 Modified: head/devel/git/distinfo
 ==============================================================================
 --- head/devel/git/distinfo	Thu Jun 13 00:06:17 2013	(r320730)
 +++ head/devel/git/distinfo	Thu Jun 13 00:30:02 2013	(r320731)
 @@ -1,6 +1,6 @@
 -SHA256 (git-1.8.2.3.tar.gz) = ba8d42d47b0955b17905af0133b01ab8e3f28f0e39b9967ec446403c0b49991f
 -SIZE (git-1.8.2.3.tar.gz) = 4405610
 -SHA256 (git-manpages-1.8.2.3.tar.gz) = 8e91d7a49cda92ed999eb9632ae3f0f22b1910e54de58c9e53107687c18f1414
 -SIZE (git-manpages-1.8.2.3.tar.gz) = 537688
 -SHA256 (git-htmldocs-1.8.2.3.tar.gz) = 99546c3b96f0d3501e7a2bc69e22d5d61be4693164a252e30850d13729331099
 -SIZE (git-htmldocs-1.8.2.3.tar.gz) = 2097410
 +SHA256 (git-1.8.3.1.tar.gz) = ea2dde231b3f659da92dd0afc092a16720d63f1206cdcb271920e88f328bda83
 +SIZE (git-1.8.3.1.tar.gz) = 4470932
 +SHA256 (git-manpages-1.8.3.1.tar.gz) = ab574826814b9469c91cdb99ecf5ad66228d0e30197e54881a4fe8ce0a17caba
 +SIZE (git-manpages-1.8.3.1.tar.gz) = 542717
 +SHA256 (git-htmldocs-1.8.3.1.tar.gz) = 0be04c5efc831bbc7b1d80707d953bf7e9d500037eb202f6fd042c0fff0538ea
 +SIZE (git-htmldocs-1.8.3.1.tar.gz) = 2114248
 
 Modified: head/devel/git/files/patch-Makefile
 ==============================================================================
 --- head/devel/git/files/patch-Makefile	Thu Jun 13 00:06:17 2013	(r320730)
 +++ head/devel/git/files/patch-Makefile	Thu Jun 13 00:30:02 2013	(r320731)
 @@ -1,6 +1,6 @@
 ---- ./Makefile.orig	2012-02-18 15:17:14.650207401 -0500
 -+++ ./Makefile	2012-02-18 15:19:42.390202289 -0500
 -@@ -301,8 +301,8 @@
 +--- Makefile.orig	2013-06-12 14:17:51.000000000 -0400
 ++++ Makefile	2013-06-12 14:24:27.000000000 -0400
 +@@ -349,8 +349,8 @@
   
   # CFLAGS and LDFLAGS are for the users to override from the command line.
   
 @@ -11,12 +11,12 @@
   ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS)
   ALL_LDFLAGS = $(LDFLAGS)
   STRIP ?= strip
 -@@ -322,15 +322,15 @@
 +@@ -372,15 +372,15 @@
   prefix = $(HOME)
   bindir_relative = bin
   bindir = $(prefix)/$(bindir_relative)
 --mandir = share/man
 --infodir = share/info
 +-mandir = $(prefix)/share/man
 +-infodir = $(prefix)/share/info
  +mandir = $(prefix)/man
  +infodir = $(prefix)/info
   gitexecdir = libexec/git-core
 @@ -26,12 +26,12 @@
  +gitwebdir = $(sharedir)/examples/git/gitweb
   localedir = $(sharedir)/locale
   template_dir = share/git-core/templates
 --htmldir = share/doc/git-doc
 -+htmldir = share/doc/git
 +-htmldir = $(prefix)/share/doc/git-doc
 ++htmldir = $(prefix)/share/doc/git
   ETC_GITCONFIG = $(sysconfdir)/gitconfig
   ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
   lib = lib
 -@@ -339,21 +339,21 @@
 +@@ -393,21 +393,21 @@
   
   export prefix bindir sharedir sysconfdir gitwebdir localedir
   
 @@ -68,7 +68,7 @@
   
   export TCL_PATH TCLTK_PATH
   
 -@@ -1438,9 +1438,9 @@
 +@@ -1136,9 +1136,9 @@
   
   ifndef NO_OPENSSL
   	OPENSSL_LIBSSL = -lssl
 
 Modified: head/devel/git/pkg-plist
 ==============================================================================
 --- head/devel/git/pkg-plist	Thu Jun 13 00:06:17 2013	(r320730)
 +++ head/devel/git/pkg-plist	Thu Jun 13 00:30:02 2013	(r320731)
 @@ -1,5 +1,5 @@
  bin/git
 -%%P4%%bin/git-p4
 +%%P4%%bin/git-p4.py
  %%P4%%bin/git-p4import
  bin/git-upload-pack
  bin/git-receive-pack
 @@ -174,6 +174,7 @@ libexec/git-core/git-stash
  libexec/git-core/git-status
  libexec/git-core/git-stripspace
  libexec/git-core/git-submodule
 +%%CONTRIB%%libexec/git-core/git-subtree
  %%SVN%%libexec/git-core/git-svn
  libexec/git-core/git-symbolic-ref
  libexec/git-core/git-tag
 @@ -999,6 +1000,8 @@ share/git-core/templates/info/exclude
  %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.2.1.txt
  %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.2.2.txt
  %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.2.3.txt
 +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.3.txt
 +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.8.3.1.txt
  %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
  %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
  %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
 @@ -1030,6 +1033,10 @@ share/git-core/templates/info/exclude
  %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/Makefile
  %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
  %%CONTRIB%%share/git-core/contrib/credential/gnome-keyring/.gitignore
 +%%CONTRIB%%share/git-core/contrib/credential/netrc/Makefile
 +%%CONTRIB%%share/git-core/contrib/credential/netrc/git-credential-netrc
 +%%CONTRIB%%share/git-core/contrib/credential/netrc/test.netrc
 +%%CONTRIB%%share/git-core/contrib/credential/netrc/test.pl
  %%CONTRIB%%share/git-core/contrib/credential/osxkeychain/Makefile
  %%CONTRIB%%share/git-core/contrib/credential/osxkeychain/git-credential-osxkeychain.c
  %%CONTRIB%%share/git-core/contrib/credential/osxkeychain/.gitignore
 @@ -1182,6 +1189,7 @@ share/git-core/templates/info/exclude
  %%CONTRIB%%@dirrm share/git-core/contrib/convert-objects
  %%CONTRIB%%@dirrm share/git-core/contrib/credential/gnome-keyring
  %%CONTRIB%%@dirrm share/git-core/contrib/credential/osxkeychain
 +%%CONTRIB%%@dirrm share/git-core/contrib/credential/netrc
  %%CONTRIB%%@dirrm share/git-core/contrib/credential/wincred
  %%CONTRIB%%@dirrm share/git-core/contrib/credential
  %%CONTRIB%%@dirrm share/git-core/contrib/diffall
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
