From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jul 1 10:30:10 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6E3C106564A for ; Thu, 1 Jul 2010 10:30:10 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 947088FC19 for ; Thu, 1 Jul 2010 10:30:10 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o61AUA1Q036674 for ; Thu, 1 Jul 2010 10:30:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o61AUABV036669; Thu, 1 Jul 2010 10:30:10 GMT (envelope-from gnats) Resent-Date: Thu, 1 Jul 2010 10:30:10 GMT Resent-Message-Id: <201007011030.o61AUABV036669@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Bapt Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B500F106564A for ; Thu, 1 Jul 2010 10:22:16 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-ew0-f54.google.com (mail-ew0-f54.google.com [209.85.215.54]) by mx1.freebsd.org (Postfix) with ESMTP id 413E78FC13 for ; Thu, 1 Jul 2010 10:22:15 +0000 (UTC) Received: by ewy26 with SMTP id 26so827889ewy.13 for ; Thu, 01 Jul 2010 03:22:09 -0700 (PDT) Received: by 10.213.4.138 with SMTP id 10mr5097608ebr.36.1277979728943; Thu, 01 Jul 2010 03:22:08 -0700 (PDT) Received: from azathoth.lan (stc92-3-82-245-249-89.fbx.proxad.net [82.245.249.89]) by mx.google.com with ESMTPS id a48sm6822659eei.19.2010.07.01.03.22.02 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 01 Jul 2010 03:22:08 -0700 (PDT) Received: from root (uid 0) (envelope-from baptiste.daroussin@gmail.com) id cf4ec by azathoth.lan (DragonFly Mail Agent) Thu, 01 Jul 2010 12:20:55 +0200 Message-Id: Date: Thu, 01 Jul 2010 12:20:55 +0200 From: Bapt To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: roberto@FreeBSD.org Subject: ports/148281: [PATCH] devel/mercurial: support WITHOUT_NLS knob X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Jul 2010 10:30:10 -0000 >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: