Update gqview to 0.8.1.

Changes: Internationalization, bug fixes (including some memory leaks),
autoconfiscated.

6 files changed, 68 insertions, 34 deletions

diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index b545c8651f7..51f09175d80 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,21 +1,20 @@
-# $NetBSD: Makefile,v 1.4 1999/12/20 18:20:02 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2000/05/25 10:16:45 wiz Exp $
 # FreeBSD Id: Makefile,v 1.7 1998/12/09 06:59:39 vanilla Exp
 #
 
-DISTNAME=	gqview-0.7.0
+DISTNAME=	gqview-0.8.1
 CATEGORIES=	graphics x11
-MASTER_SITES=	http://gqview.netpedia.net/
-EXTRACT_SUFX=	.src.tar.gz
+MASTER_SITES=	http://download.sourceforge.net/gqview/
 
-MAINTAINER=	rxg@ms25.url.com.tw
-HOMEPAGE=	http://gqview.netpedia.net/view-over.html
+MAINTAINER=	wiz@netbsd.org
+HOMEPAGE=	http://gqview.sourceforge.net/index.html
 
-DEPENDS=	imlib-*:../../graphics/imlib
+DEPENDS+=	imlib-*:../../graphics/imlib
+DEPENDS+=	gettext-0.10.*:../../devel/gettext
 
 USE_X11BASE=	yes
-ALL_TARGET=	gqview
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gqview ${PREFIX}/bin
+GNU_CONFIGURE=	yes
+# for libintl detection in configure script
+CFLAGS+=	-I${LOCALBASE}/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gqview/files/md5 b/graphics/gqview/files/md5
index 9c1de5d61eb..9b819ac36c3 100644
--- a/graphics/gqview/files/md5
+++ b/graphics/gqview/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/12/20 18:20:03 wiz Exp $
+$NetBSD: md5,v 1.3 2000/05/25 10:16:46 wiz Exp $
 
-MD5 (gqview-0.7.0.src.tar.gz) = d8adab5af9f0272de3a20bafd21b4350
+MD5 (gqview-0.8.1.tar.gz) = 64499d1bda06c7e08a372dd0494ddf88
diff --git a/graphics/gqview/files/patch-sum b/graphics/gqview/files/patch-sum
index 4ab26180712..2c489f5f6c2 100644
--- a/graphics/gqview/files/patch-sum
+++ b/graphics/gqview/files/patch-sum
@@ -1,3 +1,4 @@
-$NetBSD: patch-sum,v 1.2 1999/12/20 18:20:03 wiz Exp $
+$NetBSD: patch-sum,v 1.3 2000/05/25 10:16:46 wiz Exp $
 
-MD5 (patch-aa) = 60ef66f85bee8b47859542f8ff3cfa00
+MD5 (patch-aa) = 30ef0e1a7b69ec80ecb859b8733f8cfb
+MD5 (patch-ab) = f6bab884d57a9a7fe987b13288196d48
diff --git a/graphics/gqview/patches/patch-aa b/graphics/gqview/patches/patch-aa
index dc31133ae46..eec87076216 100644
--- a/graphics/gqview/patches/patch-aa
+++ b/graphics/gqview/patches/patch-aa
@@ -1,19 +1,13 @@
-$NetBSD: patch-aa,v 1.2 1999/12/20 18:20:04 wiz Exp $
+$NetBSD: patch-aa,v 1.3 2000/05/25 10:16:46 wiz Exp $
 
---- Makefile.orig	Sun Nov 28 13:52:33 1999
-+++ Makefile	Sun Nov 28 13:54:31 1999
-@@ -1,12 +1,10 @@
- 
--PREFIX=/usr/local
--
- GTK_INCLUDE = `gtk-config --cflags`
- GTK_LIB = `gtk-config --libs`
- IMLIB_INCLUDE = `imlib-config --cflags-gdk`
- IMLIB_LIB = `imlib-config --libs-gdk`
--CFLAGS = $(GTK_INCLUDE) $(IMLIB_INCLUDE)
--LDFLAGS = $(GTK_LIB) $(IMLIB_LIB)
-+CFLAGS += $(GTK_INCLUDE) $(IMLIB_INCLUDE)
-+LDFLAGS += $(GTK_LIB) $(IMLIB_LIB)
- CC = gcc -Wall
- 
- GNOME_PREFIX = `gnome-config --prefix`
+--- po/Makefile.in.in.orig	Fri Apr 14 21:51:21 2000
++++ po/Makefile.in.in	Thu May 25 11:58:06 2000
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff --git a/graphics/gqview/patches/patch-ab b/graphics/gqview/patches/patch-ab
new file mode 100644
index 00000000000..1a486f70b55
--- /dev/null
+++ b/graphics/gqview/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.1 2000/05/25 10:16:46 wiz Exp $
+
+Override gnome-specific file installation, and make it find pkgsrc's libintl.
+
+--- configure.orig	Fri Apr 14 21:51:24 2000
++++ configure	Thu May 25 11:49:23 2000
+@@ -1982,6 +1982,7 @@
+   rm -f conf.gdkimlibtest
+ 
+ 
++if false; then
+   # Extract the first word of "gnome-config", so it can be a program name with args.
+ set dummy gnome-config; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+@@ -2018,6 +2019,7 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
++fi
+   
+ 
+ if test $GNOME_CONFIG != no; then
+@@ -3006,7 +3008,7 @@
+ #include "confdefs.h"
+ #include <libintl.h>
+ EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
++ac_try="$ac_cpp $CFLAGS conftest.$ac_ext >/dev/null 2>conftest.out"
+ { (eval echo configure:3011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
diff --git a/graphics/gqview/pkg/PLIST b/graphics/gqview/pkg/PLIST
index 399cce4e97c..321769205f8 100644
--- a/graphics/gqview/pkg/PLIST
+++ b/graphics/gqview/pkg/PLIST
@@ -1,2 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/06/07 08:06:32 frueauf Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/05/25 10:16:46 wiz Exp $
 bin/gqview
+share/locale/de/LC_MESSAGES/gqview.mo
+share/locale/es/LC_MESSAGES/gqview.mo
+share/locale/fr/LC_MESSAGES/gqview.mo
+share/locale/ja/LC_MESSAGES/gqview.mo
+share/locale/pt_BR/LC_MESSAGES/gqview.mo
+share/locale/ru/LC_MESSAGES/gqview.mo
+share/locale/sk/LC_MESSAGES/gqview.mo
+share/locale/zh_TW.Big5/LC_MESSAGES/gqview.mo
+share/locale/tr/LC_MESSAGES/gqview.mo