Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 5 Oct 2013 17:46:12 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r329482 - head/devel/mercurial
Message-ID:  <201310051746.r95HkCYP037394@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sunpoet
Date: Sat Oct  5 17:46:12 2013
New Revision: 329482
URL: http://svnweb.freebsd.org/changeset/ports/329482

Log:
  - Update to 2.7.2
  - Convert to new OTPIONS helper
  - Support STAGEDIR
  - Cosmetic change
  
  Changes:	http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_2.7.2_.282013-10-01.29

Modified:
  head/devel/mercurial/Makefile
  head/devel/mercurial/distinfo
  head/devel/mercurial/pkg-plist   (contents, props changed)

Modified: head/devel/mercurial/Makefile
==============================================================================
--- head/devel/mercurial/Makefile	Sat Oct  5 17:38:09 2013	(r329481)
+++ head/devel/mercurial/Makefile	Sat Oct  5 17:46:12 2013	(r329482)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mercurial
-PORTVERSION=	2.7.1
+PORTVERSION=	2.7.2
 CATEGORIES=	devel python
 MASTER_SITES=	http://mercurial.selenic.com/release/
 
@@ -11,12 +11,19 @@ COMMENT=	Fast, lightweight source contro
 
 LICENSE=	GPLv2
 
+NO_STAGE=	yes
 USE_PYTHON=	-2.7
 USE_PYDISTUTILS=yes
 
-OPTIONS_DEFINE=	CA_BUNDLE NLS
+OPTIONS_DEFINE=	CA_BUNDLE DATA DOCS NLS
+OPTIONS_DEFAULT=DATA
+OPTIONS_SUB=	yes
 CA_BUNDLE_DESC=	Install CA Certificates
 
+MAN1=		hg.1
+MAN5=		hgignore.5 hgrc.5
+SUB_FILES=	pkg-message
+
 CONTRIB_FILES=	bash_completion \
 		casesmash.py \
 		check-code.py \
@@ -51,40 +58,21 @@ CONTRIB_FILES=	bash_completion \
 		vim/hgtest.vim \
 		vim/patchreview.txt \
 		vim/patchreview.vim
+DOCS=		CONTRIBUTORS README
 
-DOCS=	CONTRIBUTORS README
-
-MAN1=	hg.1
-MAN5=	hgignore.5 hgrc.5
+CA_BUNDLE_RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+NLS_USES=		gettext
 
-SUB_FILES=	pkg-message
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-post-patch:
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
+.if !${PORT_OPTIONS:MNLS}
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-setup.py
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCA_BUNDLE}
-RUN_DEPENDS+=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 .endif
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${PREFIX}/man/man5/
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	for f in ${DOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${f} ${DOCSDIR}; \
-	done
-.endif
-.if !defined(NOPORTDATA)
+.if ${PORT_OPTIONS:MDATA}
 	${MKDIR} ${DATADIR}
 	${MKDIR} ${DATADIR}/contrib
 	${MKDIR} ${DATADIR}/contrib/hgfixes
@@ -97,8 +85,10 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/*.cgi ${DATADIR}/www
 	${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.fcgi ${DATADIR}/www
 	${INSTALL_DATA} ${WRKSRC}/contrib/hgweb.wsgi ${DATADIR}/www
-
-	@${CAT} ${PKGMESSAGE}
+.endif
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>

Modified: head/devel/mercurial/distinfo
==============================================================================
--- head/devel/mercurial/distinfo	Sat Oct  5 17:38:09 2013	(r329481)
+++ head/devel/mercurial/distinfo	Sat Oct  5 17:46:12 2013	(r329482)
@@ -1,2 +1,2 @@
-SHA256 (mercurial-2.7.1.tar.gz) = 8472bf1302db15bdf2c4393a5e9180cdbf29b3f8ed5b06c06bf5c6ba8f433588
-SIZE (mercurial-2.7.1.tar.gz) = 3756146
+SHA256 (mercurial-2.7.2.tar.gz) = b3f067eaa9fdf6818cc78526d4815ab4332252ffa07a2488c8b6939ac6b37c0b
+SIZE (mercurial-2.7.2.tar.gz) = 3787955

Modified: head/devel/mercurial/pkg-plist
==============================================================================
--- head/devel/mercurial/pkg-plist	Sat Oct  5 17:38:09 2013	(r329481)
+++ head/devel/mercurial/pkg-plist	Sat Oct  5 17:46:12 2013	(r329482)
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 bin/hg
 %%PYTHON_SITELIBDIR%%/hgext/__init__.py
 %%PYTHON_SITELIBDIR%%/hgext/__init__.pyc



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