From tkato@prontomail.com  Sat Jan 25 14:02:08 2003
Return-Path: <tkato@prontomail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B985337B401
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 25 Jan 2003 14:02:08 -0800 (PST)
Received: from socigeog.hmt.toyama-u.ac.jp (socigeog.hmt.toyama-u.ac.jp [160.26.63.48])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5322F43F3F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 25 Jan 2003 14:02:07 -0800 (PST)
	(envelope-from tkato@prontomail.com)
Received: from localhost (localhost [127.0.0.1])
	by socigeog.hmt.toyama-u.ac.jp (Postfix) with SMTP id 36B4C8A4
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 26 Jan 2003 07:02:05 +0900 (JST)
Message-Id: <20030126070108.68ce3953.tkato@prontomail.com>
Date: Sun, 26 Jan 2003 07:01:08 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: graphics/gqview to 1.2.1 (fix ports/46297)

>Number:         47481
>Category:       ports
>Synopsis:       Update port: graphics/gqview to 1.2.1 (fix ports/46297)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    nakai
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 25 14:10:09 PST 2003
>Closed-Date:    Sat Apr 26 15:26:19 PDT 2003
>Last-Modified:  Sat Apr 26 15:26:19 PDT 2003
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.7-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 1.2.1

New file:
files/patch-configure.in

Following PRs shuold be superseded by this one:
[2002/10/01] ports/43551  nakai    update: graphics/gqview
[2002/12/16] ports/46297  nakai    Update port: graphics/gqview to 1.2.0

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/gqview/Makefile graphics/gqview/Makefile
--- /usr/ports/graphics/gqview/Makefile	Tue Sep 10 20:12:06 2002
+++ graphics/gqview/Makefile	Fri Jan 24 22:22:33 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gqview
-PORTVERSION=	1.1.1
+PORTVERSION=	1.2.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,31 +15,21 @@
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gdkpixbuf
-WANT_GNOME=	yes
-GNU_CONFIGURE=	yes
+USE_GNOME=	gdkpixbuf gnomehier
+USE_REINPLACE=	yes
+USE_AUTOCONF_VER=	213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
-
-.include <bsd.port.pre.mk>
-
-.if ${HAVE_GNOME:Mlibcapplet}!=""
-USE_GNOME+=	libcapplet
-PKGNAMESUFFIX=	-gnome
-.endif
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-gnome
 
 MAN1=		gqview.1
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|GNOME_DATADIR\)/gnome/|GNOME_DATADIR\)/|g'
+post-patch:
+	@${REINPLACE_CMD} -e 's|INCLUDED_LIBINTL=yes|INCLUDED_LIBINTL=no|g' \
+		${WRKSRC}/aclocal.m4
 
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/gqview
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/gqview
-.endif
+	${INSTALL_DATA} ${WRKSRC}/gqview.png ${PREFIX}/share/gnome/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/gqview.desktop ${PREFIX}/share/gnome/apps/Graphics
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/graphics/gqview/distinfo graphics/gqview/distinfo
--- /usr/ports/graphics/gqview/distinfo	Wed Feb 20 21:32:45 2002
+++ graphics/gqview/distinfo	Fri Jan 24 21:56:26 2003
@@ -1 +1 @@
-MD5 (gqview-1.1.1.tar.gz) = 777c3ed6905673dd50310ec80b4b0de5
+MD5 (gqview-1.2.1.tar.gz) = 472a619ada342843739cfd9e4a3162c3
diff -urN /usr/ports/graphics/gqview/files/patch-configure.in graphics/gqview/files/patch-configure.in
--- /usr/ports/graphics/gqview/files/patch-configure.in	Thu Jan  1 09:00:00 1970
+++ graphics/gqview/files/patch-configure.in	Fri Dec 13 23:17:50 2002
@@ -0,0 +1,26 @@
+--- configure.in.orig	Fri Dec 13 11:27:07 2002
++++ configure.in	Fri Dec 13 23:17:43 2002
+@@ -59,7 +59,14 @@
+ AC_DEFINE_UNQUOTED(GQVIEW_HELPDIR, "$prefix/share/gqview")
+ 
+ dnl CHECK_GNOME
++AC_ARG_ENABLE(gnome,
++[  --disable-gnome         disable use of gnome],
++    gnome=$enableval, gnome=yes)
++if test "$gnome" = yes; then
+   AC_PATH_PROG(GNOME_CONFIG,gnome-config,no)
++else
++  GNOME_CONFIG=no
++fi
+   AM_CONDITIONAL(HAVE_GNOME, test $GNOME_CONFIG != no)
+   if test "$GNOME_CONFIG" = no; then
+     AC_MSG_RESULT(GNOME icon and menu entry will NOT be installed)
+@@ -73,7 +80,7 @@
+ AC_CHECK_FUNCS(strverscmp)
+ 
+ dnl locale location for po
+-localedir='${datadir}/locale'
++localedir='${prefix}/shara/locale'
+ AC_SUBST(localedir)
+ 
+ ALL_LINGUAS="cs da de es et fi fr hu it ja nl no pl pt_BR ro ru sk sl th tr uk zh_CN.GB2312 zh_TW"
diff -urN /usr/ports/graphics/gqview/pkg-plist graphics/gqview/pkg-plist
--- /usr/ports/graphics/gqview/pkg-plist	Wed Feb 20 21:32:45 2002
+++ graphics/gqview/pkg-plist	Fri Jan 24 22:16:21 2003
@@ -1,7 +1,6 @@
 bin/gqview
-%%PORTDOCS%%share/doc/gqview/README
-%%GNOME:%%share/gnome/apps/Graphics/gqview.desktop
-%%GNOME:%%share/gnome/pixmaps/gqview.png
+share/gnome/pixmaps/gqview.png
+share/gnome/apps/Graphics/gqview.desktop
 share/gqview/README
 share/locale/cs/LC_MESSAGES/gqview.mo
 share/locale/da/LC_MESSAGES/gqview.mo
@@ -17,12 +16,13 @@
 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/th/LC_MESSAGES/gqview.mo
 share/locale/tr/LC_MESSAGES/gqview.mo
 share/locale/uk/LC_MESSAGES/gqview.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/gqview.mo
 share/locale/zh_TW/LC_MESSAGES/gqview.mo
-%%PORTDOCS%%@dirrm share/doc/gqview
 @dirrm share/gqview
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->nakai 
Responsible-Changed-By: arved 
Responsible-Changed-When: Sat Jan 25 15:54:59 PST 2003 
Responsible-Changed-Why:  
Over to Maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=47481 
State-Changed-From-To: open->closed 
State-Changed-By: nork 
State-Changed-When: Sat Apr 26 15:26:09 PDT 2003 
State-Changed-Why:  
Committed, thanks! 

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