Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Jul 2014 05:35:49 +0000 (UTC)
From:      Kubilay Kocak <koobs@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r361023 - head/devel/mercurial
Message-ID:  <201407070535.s675ZnXE057875@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: koobs
Date: Mon Jul  7 05:35:49 2014
New Revision: 361023
URL: http://svnweb.freebsd.org/changeset/ports/361023
QAT: https://qat.redports.org/buildarchive/r361023/

Log:
  devel/mercurial: Use OPTIONS helpers
  
  - Use OPTIONS helpers (note: no support yet for SUB_FILES)
  - Sort OPTIONS section
  
  Approved by:	koobs (with python@ hat)

Modified:
  head/devel/mercurial/Makefile

Modified: head/devel/mercurial/Makefile
==============================================================================
--- head/devel/mercurial/Makefile	Mon Jul  7 05:27:17 2014	(r361022)
+++ head/devel/mercurial/Makefile	Mon Jul  7 05:35:49 2014	(r361023)
@@ -18,8 +18,13 @@ USE_PYDISTUTILS=yes
 OPTIONS_DEFINE=	CA_BUNDLE DATA DOCS EXAMPLES NLS FREEBSD
 OPTIONS_DEFAULT=DATA
 OPTIONS_SUB=	yes
-CA_BUNDLE_DESC=	Install CA Certificates
-FREEBSD_DESC=	Patches used internally by the FreeBSD Project
+
+CA_BUNDLE_DESC=		Install CA Certificates
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+FREEBSD_DESC=		Patches used internally by the FreeBSD Project
+FREEBSD_EXTRA_PATCHES=	${FILESDIR}/extra-patch-authormapsuffix
+NLS_EXTRA_PATCHES_OFF=	${FILESDIR}/extra-patch-setup.py
+NLS_USES=		gettext
 
 CONTRIB_FILES=	bash_completion \
 		casesmash.py \
@@ -55,23 +60,12 @@ CONTRIB_FILES=	bash_completion \
 		vim/patchreview.vim
 DOCS=		CONTRIBUTORS README
 
-CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-NLS_USES=		gettext
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDATA}
 SUB_FILES=	pkg-message
 .endif
 
-.if !${PORT_OPTIONS:MNLS}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-setup.py
-.endif
-
-.if ${PORT_OPTIONS:MFREEBSD}
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-authormapsuffix
-.endif
-
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${STAGEDIR}${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${STAGEDIR}${PREFIX}/man/man5/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407070535.s675ZnXE057875>