svn commit: r408063 - head/devel/git

[Adam Weinberger]

Author: adamw
Date: Thu Feb  4 17:33:13 2016
New Revision: 408063
URL: https://svnweb.freebsd.org/changeset/ports/408063

Log:
  Lighten up the Perl dependencies.
  
  git uses Perl for two things: Perl hooks into git, and the
  git-send-email(1) script.
  
  The Perl hooks only use p5-Error. The other modules dependencies,
  p5-Authen-SASL and p5-Net-SMTP-SSL (which bring in a number of other
  perl module dependencies) are only required for git-send-email(1).
  
  This commit adds a SEND_EMAIL option, defaulted to on, that auto-enables
  the PERL option and installs the git-send-email(1) script with the
  extra perl modules.
  
  With the PERL option on and SEND_EMAIL off, only the p5-Error module
  is required.
  
  No PORTREVISION bump as the default dependencies and plist haven't changed.
  
  PR:		206901
  Approved by:	garga (maintainer)
  Differential Revision:	https://reviews.freebsd.org/D5179

Modified:
  head/devel/git/Makefile
  head/devel/git/pkg-plist

Modified: head/devel/git/Makefile
==============================================================================
--- head/devel/git/Makefile	Thu Feb  4 17:30:36 2016	(r408062)
+++ head/devel/git/Makefile	Thu Feb  4 17:33:13 2016	(r408063)
@@ -41,8 +41,8 @@ SHEBANG_FILES=	*.perl */*.perl */*/*.per
 CONFIGURE_ARGS=	--enable-pthreads=-pthread ac_cv_header_libcharset_h=no
 
 OPTIONS_DEFINE=	GUI SVN GITWEB CONTRIB P4 CVS HTMLDOCS PERL ICONV CURL \
-		ETCSHELLS NLS
-OPTIONS_DEFAULT=	CONTRIB P4 CVS PERL ICONV CURL ETCSHELLS NLS
+		ETCSHELLS SEND_EMAIL NLS
+OPTIONS_DEFAULT=	CONTRIB P4 CVS PERL ICONV CURL ETCSHELLS SEND_EMAIL NLS
 OPTIONS_SUB=	yes
 
 GITWEB_DESC=	Install gitweb
@@ -51,6 +51,7 @@ P4_DESC=	Enable Perforce support
 CVS_DESC=	Enable CVS support
 HTMLDOCS_DESC=	Install additional documentation
 ETCSHELLS_DESC=	Modify /etc/shells
+SEND_EMAIL_DESC=Enable the git-send-email(1) script
 
 NLS_USES=		gettext
 NLS_MAKE_ARGS_OFF=	NO_GETTEXT=yes
@@ -58,11 +59,13 @@ NLS_MAKE_ARGS_OFF=	NO_GETTEXT=yes
 PERL_USES=		perl5
 PERL_MAKE_ENV=		PERL_PATH=${PERL}
 PERL_BUILD_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error
-PERL_RUN_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error \
-			p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL \
-			p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
+PERL_RUN_DEPENDS=	p5-Error>=0:${PORTSDIR}/lang/p5-Error
 PERL_MAKE_ARGS_OFF=	NO_PERL=1
 
+SEND_EMAIL_IMPLIES=	PERL
+SEND_EMAIL_RUN_DEPENDS= p5-Net-SMTP-SSL>=0:${PORTSDIR}/mail/p5-Net-SMTP-SSL \
+			p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL
+
 ICONV_USES=		iconv
 ICONV_MAKE_ARGS_OFF=	NO_ICONV=1
 

Modified: head/devel/git/pkg-plist
==============================================================================
--- head/devel/git/pkg-plist	Thu Feb  4 17:30:36 2016	(r408062)
+++ head/devel/git/pkg-plist	Thu Feb  4 17:33:13 2016	(r408063)
@@ -120,7 +120,7 @@ man/man1/git-rev-list.1.gz
 man/man1/git-rev-parse.1.gz
 man/man1/git-revert.1.gz
 man/man1/git-rm.1.gz
-man/man1/git-send-email.1.gz
+%%SEND_EMAIL%%man/man1/git-send-email.1.gz
 man/man1/git-send-pack.1.gz
 man/man1/git-sh-setup.1.gz
 man/man1/git-sh-i18n.1.gz
@@ -315,7 +315,7 @@ libexec/git-core/git-rev-list
 libexec/git-core/git-rev-parse
 libexec/git-core/git-revert
 libexec/git-core/git-rm
-libexec/git-core/git-send-email
+%%SEND_EMAIL%%libexec/git-core/git-send-email
 libexec/git-core/git-send-pack
 libexec/git-core/git-sh-i18n
 libexec/git-core/git-sh-i18n--envsubst
@@ -604,7 +604,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/git-rev-parse.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-revert.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-rm.html
-%%HTMLDOCS%%%%DOCSDIR%%/git-send-email.html
+%%SEND_EMAIL%%%%HTMLDOCS%%%%DOCSDIR%%/git-send-email.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-send-pack.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-sh-i18n.html
 %%HTMLDOCS%%%%DOCSDIR%%/git-sh-i18n--envsubst.html
@@ -962,7 +962,7 @@ share/git-core/templates/info/exclude
 %%HTMLDOCS%%%%DOCSDIR%%/git-check-attr.txt
 %%HTMLDOCS%%%%DOCSDIR%%/config.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-http-fetch.txt
-%%HTMLDOCS%%%%DOCSDIR%%/git-send-email.txt
+%%SEND_EMAIL%%%%HTMLDOCS%%%%DOCSDIR%%/git-send-email.txt
 %%HTMLDOCS%%%%DOCSDIR%%/git-annotate.txt
 %%HTMLDOCS%%%%DOCSDIR%%/gitmodules.txt
 %%HTMLDOCS%%%%DOCSDIR%%/pull-fetch-param.txt