svn commit: r427549 - head/devel/git
Renato Botelho
garga at FreeBSD.org
Fri Dec 2 10:35:23 UTC 2016
Author: garga
Date: Fri Dec 2 10:35:22 2016
New Revision: 427549
URL: https://svnweb.freebsd.org/changeset/ports/427549
Log:
When CONTRIB option is ON a good number of extra dependencies is added
(asciidoc, docbook-xml) but they are only used to build git-subtree
manpage and html doc.
Created a new option SUBTREE to make it possible to install all CONTRIB
code except git-subtree and remove extra dependencies from CONTRIB option
PR: 203606
Submitted by: phk@
Modified:
head/devel/git/Makefile
head/devel/git/pkg-plist
Modified: head/devel/git/Makefile
==============================================================================
--- head/devel/git/Makefile Fri Dec 2 09:21:58 2016 (r427548)
+++ head/devel/git/Makefile Fri Dec 2 10:35:22 2016 (r427549)
@@ -3,7 +3,7 @@
PORTNAME= git
DISTVERSION= 2.11.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/scm/git
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -43,8 +43,9 @@ TEST_TARGET= test
CONFIGURE_ARGS= --enable-pthreads=-pthread ac_cv_header_libcharset_h=no
OPTIONS_DEFINE= GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \
- SEND_EMAIL NLS PCRE
-OPTIONS_DEFAULT= CONTRIB P4 CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE
+ SEND_EMAIL NLS PCRE SUBTREE
+OPTIONS_DEFAULT= CONTRIB P4 CVS PERL GITWEB ICONV CURL SEND_EMAIL PCRE \
+ SUBTREE
OPTIONS_SUB= yes
GITWEB_DESC= Install gitweb
@@ -53,6 +54,7 @@ P4_DESC= Enable Perforce support
CVS_DESC= Enable CVS support
HTMLDOCS_DESC= Install additional documentation
SEND_EMAIL_DESC=Enable the git-send-email(1) script
+SUBTREE_DESC= Install git-subtree
NLS_USES= gettext
NLS_MAKE_ARGS_OFF= NO_GETTEXT=yes
@@ -95,7 +97,7 @@ GUI_MAKE_ARGS_OFF= NO_TCLTK=yes
SVN_RUN_DEPENDS= p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
p5-subversion>=0:devel/p5-subversion
-CONTRIB_BUILD_DEPENDS= xmlto:textproc/xmlto \
+SUBTREE_BUILD_DEPENDS= xmlto:textproc/xmlto \
asciidoc:textproc/asciidoc \
docbook-xml>0:textproc/docbook-xml
@@ -192,12 +194,14 @@ post-install-HTMLDOCS-on:
(cd ${WRKDIR}/htmldocs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
${LN} -s git.html ${STAGEDIR}${DOCSDIR}/index.html
+post-install-SUBTREE-on:
+ cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \
+ ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} install install-doc
+
post-install-CONTRIB-on:
@${ECHO_MSG} "===> Installing contributed scripts"
${MKDIR} ${STAGEDIR}${PREFIX}/share/git-core/contrib
${CP} -R ${WRKSRC}/contrib/* ${STAGEDIR}${PREFIX}/share/git-core/contrib
- cd ${WRKSRC}/contrib/subtree && ${SETENV} ${MAKE_ENV} \
- ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} install install-doc
# Symlink the completions from the contrib directory to where they
# will be useful
@${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d
Modified: head/devel/git/pkg-plist
==============================================================================
--- head/devel/git/pkg-plist Fri Dec 2 09:21:58 2016 (r427548)
+++ head/devel/git/pkg-plist Fri Dec 2 10:35:22 2016 (r427549)
@@ -168,7 +168,7 @@ libexec/git-core/git-status
libexec/git-core/git-stripspace
libexec/git-core/git-submodule
libexec/git-core/git-submodule--helper
-%%CONTRIB%%libexec/git-core/git-subtree
+%%SUBTREE%%libexec/git-core/git-subtree
%%SVN%%libexec/git-core/git-svn
libexec/git-core/git-symbolic-ref
libexec/git-core/git-tag
@@ -342,7 +342,7 @@ man/man1/git-stash.1.gz
man/man1/git-status.1.gz
man/man1/git-stripspace.1.gz
man/man1/git-submodule.1.gz
-%%CONTRIB%%man/man1/git-subtree.1.gz
+%%SUBTREE%%man/man1/git-subtree.1.gz
%%SVN%%man/man1/git-svn.1.gz
man/man1/git-symbolic-ref.1.gz
man/man1/git-tag.1.gz
@@ -966,7 +966,7 @@ man/man7/gitworkflows.7.gz
%%HTMLDOCS%%%%DOCSDIR%%/git-stripspace.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-submodule.html
%%HTMLDOCS%%%%DOCSDIR%%/git-submodule.txt
-%%CONTRIB%%%%HTMLDOCS%%%%DOCSDIR%%/git-subtree.html
+%%SUBTREE%%%%HTMLDOCS%%%%DOCSDIR%%/git-subtree.html
%%HTMLDOCS%%%%DOCSDIR%%/git-svn.html
%%HTMLDOCS%%%%DOCSDIR%%/git-svn.txt
%%HTMLDOCS%%%%DOCSDIR%%/git-symbolic-ref.html
More information about the svn-ports-all
mailing list