Date: Tue, 4 Sep 2012 07:20:11 GMT From: Ruslan Mahmatkhanov <cvs-src@yandex.ru> To: freebsd-python@FreeBSD.org Subject: Re: ports/171287: [UPDATE] devel/mercurial to 2.3.1 Message-ID: <201209040720.q847KBo7025965@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/171287; it has been noted by GNATS. From: Ruslan Mahmatkhanov <cvs-src@yandex.ru> To: Olivier Duchateau <duchateau.olivier@gmail.com> Cc: bug-followup@FreeBSD.org Subject: Re: ports/171287: [UPDATE] devel/mercurial to 2.3.1 Date: Tue, 04 Sep 2012 11:17:46 +0400 Hi Olivier, there is upstream feature request for providing a way to disable localizations installation [1], that is work in progress now, as I understand. So I prefer to not hack/complicate our port more than it is now and wait for upstream solution, furthermore we already have a working temporary solution anyway. So, at this time I'd suggest to commit only the update itself and optionsng change, but not NLS hacking. What do you think? [1] http://bz.selenic.com/show_bug.cgi?id=3536 PS. By the way, if you have a vision/patch on how to implement this nicely in mercurial's setup.py, you may share this in aforementioned bug-report to ease upstream's job. Olivier Duchateau wrote on 03.09.2012 21:59: >> 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: > _______________________________________________ > freebsd-ports-bugs@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs > To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe@freebsd.org" > > -- Regards, Ruslan Tinderboxing kills... the drives.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209040720.q847KBo7025965>