Date: Tue, 16 Oct 2012 13:17:42 +0000 (UTC) From: Ruslan Mahmatkhanov <rm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305969 - in head/devel/mercurial: . files Message-ID: <201210161317.q9GDHgwK046583@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rm Date: Tue Oct 16 13:17:41 2012 New Revision: 305969 URL: http://svn.freebsd.org/changeset/ports/305969 Log: - update to 2.3.2 - trim Makefile header - convert to optionsng PR: 172280 Submitted by: olivierd Feature safe: yes Added: head/devel/mercurial/files/extra-patch-setup.py (contents, props changed) Deleted: head/devel/mercurial/files/patch-setup.py Modified: head/devel/mercurial/Makefile head/devel/mercurial/distinfo head/devel/mercurial/pkg-plist Modified: head/devel/mercurial/Makefile ============================================================================== --- head/devel/mercurial/Makefile Tue Oct 16 12:43:55 2012 (r305968) +++ head/devel/mercurial/Makefile Tue Oct 16 13:17:41 2012 (r305969) @@ -1,29 +1,21 @@ -# Ports collection makefile for: mercurial -# Date created: 11 July 2005 -# Whom: Andreas Kohn -# +# Created by: Andreas Kohn # $FreeBSD$ -# PORTNAME= mercurial -PORTVERSION= 2.3 +PORTVERSION= 2.3.2 CATEGORIES= devel python MASTER_SITES= http://mercurial.selenic.com/release/ MAINTAINER= python@FreeBSD.org -COMMENT= A fast, lightweight source control management system +COMMENT= Fast, lightweight source control management system LICENSE= GPLv2 -.if !defined(WITHOUT_NLS) -USE_GETTEXT= yes -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif USE_PYTHON= -2.7 USE_PYDISTUTILS=yes +OPTIONS_DEFINE= NLS + CONTRIB_FILES= bash_completion \ casesmash.py \ check-code.py \ @@ -60,24 +52,28 @@ CONTRIB_FILES= bash_completion \ vim/patchreview.txt \ vim/patchreview.vim -DOCS= CONTRIBUTORS COPYING README +DOCS= CONTRIBUTORS README MAN1= hg.1 MAN5= hgignore.5 hgrc.5 SUB_FILES= pkg-message +.include <bsd.port.options.mk> + post-patch: -.if defined(WITHOUT_NLS) - @${REINPLACE_CMD} -e 's/%%NLS%%//' ${WRKSRC}/${PYSETUP} +.if ${PORT_OPTIONS:MNLS} +USE_GETTEXT= yes +PLIST_SUB+= NLS="" .else - @${REINPLACE_CMD} -e 's/%%NLS%%/# /' ${WRKSRC}/${PYSETUP} +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-setup.py +PLIST_SUB+= NLS="@comment " .endif post-install: ${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${PREFIX}/man/man5/ -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCSDIR} for f in ${DOCS}; do \ ${INSTALL_DATA} ${WRKSRC}/$${f} ${DOCSDIR}; \ Modified: head/devel/mercurial/distinfo ============================================================================== --- head/devel/mercurial/distinfo Tue Oct 16 12:43:55 2012 (r305968) +++ head/devel/mercurial/distinfo Tue Oct 16 13:17:41 2012 (r305969) @@ -1,2 +1,2 @@ -SHA256 (mercurial-2.3.tar.gz) = 456cb8a9fb15606a04d81589a3459d258149170008ca64c62e5a6cbaf5f0fe5f -SIZE (mercurial-2.3.tar.gz) = 3549002 +SHA256 (mercurial-2.3.2.tar.gz) = 33b4f5d4e2f0d506358cf5ee14b0b6b4ccaf52c251c60867e23f93b1116dc7e2 +SIZE (mercurial-2.3.2.tar.gz) = 3559562 Added: head/devel/mercurial/files/extra-patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/mercurial/files/extra-patch-setup.py Tue Oct 16 13:17:41 2012 (r305969) @@ -0,0 +1,34 @@ +--- ./setup.py.orig 2012-10-02 04:11:23.000000000 +0000 ++++ ./setup.py 2012-10-02 18:59:20.000000000 +0000 +@@ -227,30 +227,7 @@ + description = "build translations (.mo files)" + + def run(self): +- if not find_executable('msgfmt'): +- self.warn("could not find msgfmt executable, no translations " +- "will be built") +- return +- +- podir = 'i18n' +- if not os.path.isdir(podir): +- self.warn("could not find %s/ directory" % podir) +- return +- +- join = os.path.join +- for po in os.listdir(podir): +- if not po.endswith('.po'): +- continue +- pofile = join(podir, po) +- modir = join('locale', po[:-3], 'LC_MESSAGES') +- mofile = join(modir, 'hg.mo') +- mobuildfile = join('mercurial', mofile) +- cmd = ['msgfmt', '-v', '-o', mobuildfile, pofile] +- if sys.platform != 'sunos5': +- # msgfmt on Solaris does not know about -c +- cmd.append('-c') +- self.mkpath(join('mercurial', modir)) +- self.make_file([pofile], mobuildfile, spawn, (cmd,)) ++ pass + + + class hgdist(Distribution): Modified: head/devel/mercurial/pkg-plist ============================================================================== --- head/devel/mercurial/pkg-plist Tue Oct 16 12:43:55 2012 (r305968) +++ head/devel/mercurial/pkg-plist Tue Oct 16 13:17:41 2012 (r305969) @@ -662,7 +662,6 @@ bin/hg %%PYTHON_SITELIBDIR%%/mercurial/wireproto.pyc %%PYTHON_SITELIBDIR%%/mercurial/wireproto.pyo %%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTORS -%%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDATA%%%%DATADIR%%/contrib/bash_completion %%PORTDATA%%%%DATADIR%%/contrib/casesmash.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210161317.q9GDHgwK046583>