Attachment 134172 Details for Bug 178797 – git-1.8.2.3_1.patch

[patch] git-1.8.2.3_1.patch

git-1.8.2.3_1.patch (text/plain), 1.64 KB, created by Dmitry Marakasov on 2013-05-20 21:50:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2013-05-20 21:50:01 UTC

Size: 1.64 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 178797: 134172