From owner-svn-ports-all@FreeBSD.ORG  Mon Jul  7 05:35:49 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D56BDBA9;
 Mon,  7 Jul 2014 05:35:49 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C35132B03;
 Mon,  7 Jul 2014 05:35:49 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s675ZnVi057876;
 Mon, 7 Jul 2014 05:35:49 GMT (envelope-from koobs@svn.freebsd.org)
Received: (from koobs@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s675ZnXE057875;
 Mon, 7 Jul 2014 05:35:49 GMT (envelope-from koobs@svn.freebsd.org)
Message-Id: <201407070535.s675ZnXE057875@svn.freebsd.org>
From: Kubilay Kocak <koobs@FreeBSD.org>
Date: Mon, 7 Jul 2014 05:35:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r361023 - head/devel/mercurial
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Jul 2014 05:35:49 -0000

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/