Date: Tue, 2 Oct 2012 17:42:41 GMT From: Olivier Duchateau <duchateau.olivier@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/172280: [UPDATE] devel/mercurial to 2.3.2 Message-ID: <201210021742.q92Hgfhe037134@red.freebsd.org> Resent-Message-ID: <201210021750.q92Ho4Sv028216@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 172280 >Category: ports >Synopsis: [UPDATE] devel/mercurial to 2.3.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Oct 02 17:50:03 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Olivier Duchateau >Release: FreeBSD 8.3-RELEASE-p3 i386 >Organization: >Environment: >Description: ChangeLog: http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_2.3.2_.282012-10-01.29 - Convert to OptionsNG - trim headers >How-To-Repeat: >Fix: Patch attached with submission follows: Index: distinfo =================================================================== --- distinfo (révision 305166) +++ distinfo (copie de travail) @@ -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 Index: files/patch-setup.py =================================================================== --- files/patch-setup.py (révision 305166) +++ files/patch-setup.py (copie de travail) @@ -1,10 +0,0 @@ ---- setup.py.orig 2012-08-02 10:49:31.000000000 +0400 -+++ setup.py 2012-08-08 18:34:01.000000000 +0400 -@@ -227,6 +227,7 @@ - description = "build translations (.mo files)" - - def run(self): -+ %%NLS%%return - if not find_executable('msgfmt'): - self.warn("could not find msgfmt executable, no translations " - "will be built") Index: files/extra-patch-setup.py =================================================================== --- files/extra-patch-setup.py (révision 0) +++ files/extra-patch-setup.py (copie de travail) @@ -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): Index: Makefile =================================================================== --- Makefile (révision 305166) +++ Makefile (copie de travail) @@ -1,12 +1,9 @@ -# 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/ @@ -15,15 +12,11 @@ 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 \ @@ -67,11 +60,15 @@ 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: >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210021742.q92Hgfhe037134>