From eugos@gmx.net  Mon Jul 19 21:24:12 2004
Return-Path: <eugos@gmx.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4795A16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; 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 <FreeBSD-gnats-submit@freebsd.org>; 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
Reply-To: Eugene Ossintsev <eugos@gmx.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: ale@FreeBSD.org
Subject: graphics/gqview: support WITHOUT_NLS and delete gqview-devel conflict
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         69313
>Category:       ports
>Synopsis:       graphics/gqview: support WITHOUT_NLS and delete gqview-devel conflict
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    ale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 19 21:30:21 GMT 2004
>Closed-Date:    Wed Aug 25 10:17:28 GMT 2004
>Last-Modified:  Wed Aug 25 10:17:28 GMT 2004
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Tue Jul 20 00:34:48 GMT 2004 
Responsible-Changed-Why:  
Over to maintainer. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=69313 
State-Changed-From-To: open->closed 
State-Changed-By: ale 
State-Changed-When: Wed Aug 25 10:16:53 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=69313 
>Unformatted:
