From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jul 19 21:30:22 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 500CA16A4CF for ; Mon, 19 Jul 2004 21:30:22 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 41F6143D5E for ; Mon, 19 Jul 2004 21:30:22 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6JLUMlK025086 for ; Mon, 19 Jul 2004 21:30:22 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6JLUMfa025085; Mon, 19 Jul 2004 21:30:22 GMT (envelope-from gnats) Resent-Date: Mon, 19 Jul 2004 21:30:22 GMT Resent-Message-Id: <200407192130.i6JLUMfa025085@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, Eugene Ossintsev Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4795A16A4CE for ; Mon, 19 Jul 2004 21:24:12 +0000 (GMT) Received: from mail.gmx.net (pop.gmx.de [213.165.64.20]) by mx1.FreeBSD.org (Postfix) with SMTP id 5E1AB43D5A for ; Mon, 19 Jul 2004 21:24:11 +0000 (GMT) (envelope-from eugos@gmx.net) Received: (qmail 12986 invoked by uid 65534); 19 Jul 2004 21:24:09 -0000 Received: from p50847C10.dip.t-dialin.net (EHLO badger.home) (80.132.124.16) by mail.gmx.net (mp018) with SMTP; 19 Jul 2004 23:24:09 +0200 Received: by badger.home (Postfix, from userid 1001) id B995E20CD; Mon, 19 Jul 2004 23:24:40 +0200 (CEST) Message-Id: <20040719212440.B995E20CD@badger.home> Date: Mon, 19 Jul 2004 23:24:40 +0200 (CEST) From: Eugene@badger.home, Ossintsev@badger.home To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: ale@FreeBSD.org Subject: ports/69313: graphics/gqview: support WITHOUT_NLS and delete gqview-devel conflict X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Eugene Ossintsev List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Jul 2004 21:30:22 -0000 >Number: 69313 >Category: ports >Synopsis: graphics/gqview: support WITHOUT_NLS and delete gqview-devel conflict >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jul 19 21:30:21 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Eugene Ossintsev >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD badger.home 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Wed Jul 7 22:59:01 CEST 2004 root@badger.home:/usr/obj/usr/src/sys/BADGER i386 >Description: Add support of WITHOUT_NLS and delete the obsolete conflict with gqview-devel. >How-To-Repeat: >Fix: diff -ruN gqview.orig/Makefile gqview/Makefile --- gqview.orig/Makefile Sat May 1 01:13:14 2004 +++ gqview/Makefile Sat Jul 17 00:31:39 2004 @@ -16,8 +16,6 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png -CONFLICTS= gqview-devel-* - USE_X_PREFIX= yes USE_GNOME= gnomehier gtk20 GNU_CONFIGURE= yes @@ -25,6 +23,14 @@ LDFLAGS="-L${LOCALBASE}/lib" MAN1= gqview.1 + +.if defined(WITHOUT_NLS) +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " +.else +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.endif post-install: ${INSTALL_DATA} ${WRKSRC}/gqview.desktop ${PREFIX}/share/gnome/apps/Graphics diff -ruN gqview.orig/pkg-plist gqview/pkg-plist --- gqview.orig/pkg-plist Mon Mar 1 19:12:20 2004 +++ gqview/pkg-plist Sat Jul 17 00:30:35 2004 @@ -1,32 +1,32 @@ bin/gqview %%PORTDOCS%%%%DOCSDIR%%/README -share/locale/bg/LC_MESSAGES/gqview.mo -share/locale/cs/LC_MESSAGES/gqview.mo -share/locale/da/LC_MESSAGES/gqview.mo -share/locale/de/LC_MESSAGES/gqview.mo -share/locale/es/LC_MESSAGES/gqview.mo -share/locale/et/LC_MESSAGES/gqview.mo -share/locale/fi/LC_MESSAGES/gqview.mo -share/locale/fr/LC_MESSAGES/gqview.mo -share/locale/hu/LC_MESSAGES/gqview.mo -share/locale/id/LC_MESSAGES/gqview.mo -share/locale/it/LC_MESSAGES/gqview.mo -share/locale/ja/LC_MESSAGES/gqview.mo -share/locale/nl/LC_MESSAGES/gqview.mo -share/locale/no/LC_MESSAGES/gqview.mo -share/locale/pl/LC_MESSAGES/gqview.mo -share/locale/pt_BR/LC_MESSAGES/gqview.mo -share/locale/ro/LC_MESSAGES/gqview.mo -share/locale/ru/LC_MESSAGES/gqview.mo -share/locale/sk/LC_MESSAGES/gqview.mo -share/locale/sl/LC_MESSAGES/gqview.mo -share/locale/sv/LC_MESSAGES/gqview.mo -share/locale/th/LC_MESSAGES/gqview.mo -share/locale/tr/LC_MESSAGES/gqview.mo -share/locale/uk/LC_MESSAGES/gqview.mo -share/locale/vi/LC_MESSAGES/gqview.mo -share/locale/zh_CN.GB2312/LC_MESSAGES/gqview.mo -share/locale/zh_TW/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/bg/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/cs/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/da/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/de/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/es/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/et/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/fi/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/fr/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/hu/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/id/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/it/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/ja/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/nl/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/no/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/pl/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/ro/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/ru/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/sk/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/sl/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/sv/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/th/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/tr/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/uk/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/vi/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/zh_CN.GB2312/LC_MESSAGES/gqview.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/gqview.mo share/gnome/apps/Graphics/gqview.desktop share/gnome/pixmaps/gqview.png %%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted: