Date: Mon, 3 Sep 2012 17:59:50 GMT From: Olivier Duchateau <duchateau.olivier@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/171287: [UPDATE] devel/mercurial to 2.3.1 Message-ID: <201209031759.q83Hxo3W064248@red.freebsd.org> Resent-Message-ID: <201209031800.q83I0KhW018648@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 171287 >Category: ports >Synopsis: [UPDATE] devel/mercurial to 2.3.1 >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: Mon Sep 03 18:00:20 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Olivier Duchateau >Release: FreeBSD 8.3-RELEASE-p3 i386 >Organization: >Environment: >Description: - Update to 2.3.1, http://mercurial.selenic.com/wiki/WhatsNew#Mercurial_2.3.1_.282012-09-01.29 - Convert to new framework OptionsNG >How-To-Repeat: >Fix: Patch attached with submission follows: Index: distinfo =================================================================== --- distinfo (révision 303607) +++ 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.1.tar.gz) = ef587fdd3b062e08eb4012e7870f4d0a00fd834f11578bfba80313b10f808541 +SIZE (mercurial-2.3.1.tar.gz) = 3558058 Index: files/patch-setup.py =================================================================== --- files/patch-setup.py (révision 303607) +++ 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,29 @@ +--- setup.py.orig 2012-08-02 06:49:31.000000000 +0000 ++++ setup.py 2012-08-05 08:18:26.000000000 +0000 +@@ -212,7 +212,7 @@ + class hgbuild(build): + # Insert hgbuildmo first so that files in mercurial/locale/ are found + # when build_py is run next. +- sub_commands = [('build_mo', None), ++ sub_commands = [ + + # We also need build_ext before build_py. Otherwise, when 2to3 is + # called (in build_py), it will not find osutil & friends, +@@ -402,7 +402,6 @@ + fp.close() + + cmdclass = {'build': hgbuild, +- 'build_mo': hgbuildmo, + 'build_ext': hgbuildext, + 'build_py': hgbuildpy, + 'build_hgextindex': buildhgextindex, +@@ -463,8 +462,7 @@ + extmodules.append(inotify) + packages.extend(['hgext.inotify', 'hgext.inotify.linux']) + +-packagedata = {'mercurial': ['locale/*/LC_MESSAGES/hg.mo', +- 'help/*.txt']} ++packagedata = {'mercurial': ['help/*.txt']} + + def ordinarypath(p): + return p and p[0] != '.' and p[-1] != '~' Index: Makefile =================================================================== --- Makefile (révision 303607) +++ Makefile (copie de travail) @@ -6,7 +6,7 @@ # PORTNAME= mercurial -PORTVERSION= 2.3 +PORTVERSION= 2.3.1 CATEGORIES= devel python MASTER_SITES= http://mercurial.selenic.com/release/ @@ -15,15 +15,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 +63,14 @@ SUB_FILES= pkg-message -post-patch: -.if defined(WITHOUT_NLS) - @${REINPLACE_CMD} -e 's/%%NLS%%//' ${WRKSRC}/${PYSETUP} +.include <bsd.port.options.mk> + +.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?201209031759.q83Hxo3W064248>