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: ports/178797: [PATCH] devel/git: properly install git-subtree Message-ID: <20130520204506.B735EA21@hades.panopticon> Resent-Message-ID: <201305202050.r4KKo1RL009490@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 178797
>Category: ports
>Synopsis: [PATCH] devel/git: properly install git-subtree
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon May 20 20:50:01 UTC 2013
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130520204506.B735EA21>