diff options
| author | rm <rm@FreeBSD.org> | 2012-07-10 15:05:59 +0800 |
|---|---|---|
| committer | rm <rm@FreeBSD.org> | 2012-07-10 15:05:59 +0800 |
| commit | 71d69dc8225a69c702c746774cdf9fb62b77f0ae (patch) | |
| tree | 2aa95b0363e12a0216f1bd47b510e98b2af0de87 /devel | |
| parent | ec5ef832e346164615569ec7a3033c8963a704c8 (diff) | |
| download | freebsd-ports-gnome-71d69dc8225a69c702c746774cdf9fb62b77f0ae.tar.gz freebsd-ports-gnome-71d69dc8225a69c702c746774cdf9fb62b77f0ae.tar.zst freebsd-ports-gnome-71d69dc8225a69c702c746774cdf9fb62b77f0ae.zip | |
- update to 2.2.3 [1]
- fix WITHOUT_NLS handling if gettext is installed [2]
There is upstream bug-report regarding to NLS case:
http://bz.selenic.com/show_bug.cgi?id=3536
PR: 169661 [1]
PR: 168977 [2]
Submitted by: John Hein <jhein at symmetricom dot com> [1],
arrowdodger <6yearold at gmail dot com> [2]
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/mercurial/Makefile | 6 | ||||
| -rw-r--r-- | devel/mercurial/distinfo | 4 | ||||
| -rw-r--r-- | devel/mercurial/files/patch-setup.py | 14 |
3 files changed, 17 insertions, 7 deletions
diff --git a/devel/mercurial/Makefile b/devel/mercurial/Makefile index 34660aa3f623..048cd8ad2253 100644 --- a/devel/mercurial/Makefile +++ b/devel/mercurial/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mercurial -PORTVERSION= 2.2.2 +PORTVERSION= 2.2.3 CATEGORIES= devel python MASTER_SITES= http://mercurial.selenic.com/release/ @@ -69,7 +69,9 @@ SUB_FILES= pkg-message post-patch: .if defined(WITHOUT_NLS) - @${REINPLACE_CMD} '/^build.sub_co.*$$/d' ${WRKSRC}/setup.py + @${REINPLACE_CMD} -e 's/^%%NLS%%//' ${WRKSRC}/${PYSETUP} +.else + @${REINPLACE_CMD} -e 's/^%%NLS%%/# /' ${WRKSRC}/${PYSETUP} .endif post-install: diff --git a/devel/mercurial/distinfo b/devel/mercurial/distinfo index 448b0c2f4c24..7f7c56528a16 100644 --- a/devel/mercurial/distinfo +++ b/devel/mercurial/distinfo @@ -1,2 +1,2 @@ -SHA256 (mercurial-2.2.2.tar.gz) = 3489110ec11fefbd2cbdefb8d715d0a869cef3dd729aaf4d5141108f8be1600a -SIZE (mercurial-2.2.2.tar.gz) = 3430037 +SHA256 (mercurial-2.2.3.tar.gz) = 7c61e38585ba252b31f75df6006bdcf1ff11030321f9fc628f0e1c61929d677b +SIZE (mercurial-2.2.3.tar.gz) = 3441501
\ No newline at end of file diff --git a/devel/mercurial/files/patch-setup.py b/devel/mercurial/files/patch-setup.py index 2b0b914c758b..6ac5f1050a31 100644 --- a/devel/mercurial/files/patch-setup.py +++ b/devel/mercurial/files/patch-setup.py @@ -1,6 +1,14 @@ ---- setup.py.orig 2012-02-01 21:23:54.000000000 +0100 -+++ setup.py 2012-02-02 12:44:12.000000000 +0100 -@@ -379,7 +379,7 @@ +--- setup 1.py 2012-06-02 08:48:21.000000000 +0400 ++++ setup.py 2012-06-12 17:05:27.091982103 +0400 +@@ -223,6 +223,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") +@@ -385,7 +386,7 @@ 'install_scripts': hginstallscripts} packages = ['mercurial', 'mercurial.hgweb', |