Date: Thu, 01 Jul 2010 12:20:55 +0200 From: Bapt <baptiste.daroussin@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: roberto@FreeBSD.org Subject: ports/148281: [PATCH] devel/mercurial: support WITHOUT_NLS knob Message-ID: <cf4ec@azathoth.lan> Resent-Message-ID: <201007011030.o61AUABV036669@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 148281
>Category: ports
>Synopsis: [PATCH] devel/mercurial: support WITHOUT_NLS knob
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 01 10:30:10 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Bapt
>Release: FreeBSD 8.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD azathoth.lan 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #5 r208894M: Tue Jun 8 11:03:27
>Description:
Support WITHOUT_NLS knob
Port maintainer (roberto@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- mercurial-1.5.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/mercurial.orig/Makefile /usr/ports/devel/mercurial/Makefile
--- /usr/ports/devel/mercurial.orig/Makefile 2010-06-02 18:45:04.892763000 +0200
+++ /usr/ports/devel/mercurial/Makefile 2010-07-01 12:19:31.653936341 +0200
@@ -13,12 +13,17 @@
MAINTAINER= roberto@FreeBSD.org
COMMENT= A fast, lightweight source control management system
+.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+PLIST_SUB+= NLS="@comment "
+.endif
USE_PYTHON= 2.4+
USE_PYDISTUTILS=yes
-PYDISTUTILS_PKGNAME= ${PORTNAME}
-PYDISTUTILS_PKGVERSION= ${PORTVERSION}
-PYDISTUTILS_EGGINFO= ${PORTNAME}-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg-info
+PYDISTUTILS_PKGNAME= ${PORTNAME}
+PYDISTUTILS_PKGVERSION= ${PORTVERSION}
+PYDISTUTILS_EGGINFO= ${PORTNAME}-${PORTVERSION}-${PYTHON_VERSION:S/thon//}.egg-info
CONTRIB_FILES= bash_completion \
convert-repo \
@@ -63,6 +68,11 @@
SUB_FILES= pkg-message
+post-patch:
+.if defined(WITHOUT_NLS)
+ @${REINPLACE_CMD} '/^build.sub_co.*$$/d' ${WRKSRC}/setup.py
+.endif
+
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1/
${INSTALL_MAN} ${WRKSRC}/doc/*.5 ${PREFIX}/man/man5/
diff -ruN --exclude=CVS /usr/ports/devel/mercurial.orig/pkg-plist /usr/ports/devel/mercurial/pkg-plist
--- /usr/ports/devel/mercurial.orig/pkg-plist 2010-06-02 18:45:04.894763000 +0200
+++ /usr/ports/devel/mercurial/pkg-plist 2010-07-01 12:01:20.812219540 +0200
@@ -285,16 +285,16 @@
%%PYTHON_SITELIBDIR%%/mercurial/keepalive.py
%%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyc
%%PYTHON_SITELIBDIR%%/mercurial/keepalive.pyo
-%%PYTHON_SITELIBDIR%%/mercurial/locale/da/LC_MESSAGES/hg.mo
-%%PYTHON_SITELIBDIR%%/mercurial/locale/de/LC_MESSAGES/hg.mo
-%%PYTHON_SITELIBDIR%%/mercurial/locale/el/LC_MESSAGES/hg.mo
-%%PYTHON_SITELIBDIR%%/mercurial/locale/fr/LC_MESSAGES/hg.mo
-%%PYTHON_SITELIBDIR%%/mercurial/locale/it/LC_MESSAGES/hg.mo
-%%PYTHON_SITELIBDIR%%/mercurial/locale/ja/LC_MESSAGES/hg.mo
-%%PYTHON_SITELIBDIR%%/mercurial/locale/sv/LC_MESSAGES/hg.mo
-%%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
-%%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
-%%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
+%%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/da/LC_MESSAGES/hg.mo
+%%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/de/LC_MESSAGES/hg.mo
+%%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/el/LC_MESSAGES/hg.mo
+%%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/fr/LC_MESSAGES/hg.mo
+%%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/it/LC_MESSAGES/hg.mo
+%%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/ja/LC_MESSAGES/hg.mo
+%%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/sv/LC_MESSAGES/hg.mo
+%%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR/LC_MESSAGES/hg.mo
+%%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN/LC_MESSAGES/hg.mo
+%%NLS%%%%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW/LC_MESSAGES/hg.mo
%%PYTHON_SITELIBDIR%%/mercurial/localrepo.py
%%PYTHON_SITELIBDIR%%/mercurial/localrepo.pyc
%%PYTHON_SITELIBDIR%%/mercurial/localrepo.pyo
@@ -594,27 +594,27 @@
@dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/coal
@dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates/atom
@dirrm %%PYTHON_SITELIBDIR%%/mercurial/templates
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/de/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/de
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/el/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/el
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/fr/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/fr
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/it/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/it
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ja/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ja
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/sv/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/sv
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW/LC_MESSAGES
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW
-@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da/LC_MESSAGES
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/da
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/de/LC_MESSAGES
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/de
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/el/LC_MESSAGES
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/el
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/fr/LC_MESSAGES
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/fr
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/it/LC_MESSAGES
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/it
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ja/LC_MESSAGES
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/ja
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/sv/LC_MESSAGES
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/sv
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR/LC_MESSAGES
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/pt_BR
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN/LC_MESSAGES
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_CN
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW/LC_MESSAGES
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale/zh_TW
+%%NLS%%@dirrm %%PYTHON_SITELIBDIR%%/mercurial/locale
@dirrm %%PYTHON_SITELIBDIR%%/mercurial/help
@dirrm %%PYTHON_SITELIBDIR%%/mercurial/hgweb
@dirrm %%PYTHON_SITELIBDIR%%/mercurial
--- mercurial-1.5.4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?cf4ec>