Update to 0.9.1. Major change is the use of gdk-pixbuf instead of imlib,

also some new features and bugfixes.

7 files changed, 94 insertions, 24 deletions

diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 75cc7da72b3..e785b847092 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,23 +1,24 @@
-# $NetBSD: Makefile,v 1.8 2000/11/11 17:49:25 tron Exp $
+# $NetBSD: Makefile,v 1.9 2000/11/29 20:01:03 wiz Exp $
 # FreeBSD Id: Makefile,v 1.7 1998/12/09 06:59:39 vanilla Exp
 #
 
-DISTNAME=	gqview-0.8.2
+DISTNAME=	gqview-0.9.1
 CATEGORIES=	graphics x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gqview/}
 
 MAINTAINER=	wiz@netbsd.org
 HOMEPAGE=	http://gqview.sourceforge.net/index.html
 
-DEPENDS+=	imlib-*:../../graphics/imlib
-DEPENDS+=	gettext>=0.10.35nb1:../../devel/gettext
+DEPENDS+=	gdk-pixbuf>=0.9.0:../../graphics/gdk-pixbuf
+DEPENDS+=	gtk+-1.2.*:../../x11/gtk
+BUILD_DEPENDS+=	msgfmt:../../devel/gettext
 
+USE_LIBINTL=	yes
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_path_GNOME_CONFIG=no
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
 
-# for libintl detection in configure script
-CPPFLAGS+=	-I${LOCALBASE}/include
+# for libpng recognition
+CFLAGS+=	"-I${LOCALBASE}/include"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gqview/files/md5 b/graphics/gqview/files/md5
index b950f63f9b5..b3f2fde0fe0 100644
--- a/graphics/gqview/files/md5
+++ b/graphics/gqview/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.4 2000/08/03 23:52:04 jlam Exp $
+$NetBSD: md5,v 1.5 2000/11/29 20:01:04 wiz Exp $
 
-MD5 (gqview-0.8.2.tar.gz) = 198f3d9458a02e01745423026b15a334
+MD5 (gqview-0.9.1.tar.gz) = 3e096bf06a76eb4fedefa0fceb5e01a2
diff --git a/graphics/gqview/files/patch-sum b/graphics/gqview/files/patch-sum
index 20e41d6172f..371efc1227a 100644
--- a/graphics/gqview/files/patch-sum
+++ b/graphics/gqview/files/patch-sum
@@ -1,3 +1,5 @@
-$NetBSD: patch-sum,v 1.4 2000/08/03 23:52:04 jlam Exp $
+$NetBSD: patch-sum,v 1.5 2000/11/29 20:01:04 wiz Exp $
 
-MD5 (patch-aa) = 035dfdf12bbc04b53f6b8d489b4057b5
+MD5 (patch-aa) = ac7ab0c1814239a0a8ab979e62126bdb
+MD5 (patch-ab) = 06aa0e21dfdd41230d45918363960ade
+MD5 (patch-ac) = a161888ca59546a7ec368da022090850
diff --git a/graphics/gqview/patches/patch-aa b/graphics/gqview/patches/patch-aa
index 1daf42b2942..3b4478f72c0 100644
--- a/graphics/gqview/patches/patch-aa
+++ b/graphics/gqview/patches/patch-aa
@@ -1,13 +1,14 @@
-$NetBSD: patch-aa,v 1.4 2000/08/03 23:52:04 jlam Exp $
+$NetBSD: patch-aa,v 1.5 2000/11/29 20:01:04 wiz Exp $
 
---- po/Makefile.in.in.orig	Fri Apr 28 15:49:43 2000
-+++ po/Makefile.in.in	Thu Aug  3 19:29:01 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = @localedir@
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
+--- configure.in.orig	Sun Sep 10 15:44:52 2000
++++ configure.in
+@@ -22,9 +22,7 @@
+ 
+ dnl Test for libpng
+   AC_CHECK_LIB(png, png_read_info,
+-    AC_CHECK_HEADER(png.h,
+       png_ok=yes,
+-      png_ok=no),
+     AC_MSG_WARN(*** PNG library (libpng) not found ***), -lz -lm)
+   if test "$png_ok" = yes; then
+     AC_MSG_CHECKING([for png_structp in png.h])
diff --git a/graphics/gqview/patches/patch-ab b/graphics/gqview/patches/patch-ab
new file mode 100644
index 00000000000..e9233c08326
--- /dev/null
+++ b/graphics/gqview/patches/patch-ab
@@ -0,0 +1,52 @@
+$NetBSD: patch-ab,v 1.3 2000/11/29 20:01:04 wiz Exp $
+
+--- configure.orig	Sun Sep 10 15:46:41 2000
++++ configure
+@@ -2035,46 +2035,8 @@
+ LIBS="$ac_save_LIBS"
+ 
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for png.h""... $ac_c" 1>&6
+-echo "configure:2043: checking for png.h" >&5
+-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 2048 "configure"
+-#include "confdefs.h"
+-#include <png.h>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2053: \"$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
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=yes"
+-else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
+-fi
+-rm -f conftest*
+-fi
+-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  png_ok=yes
+-else
+-  echo "$ac_t""no" 1>&6
+-png_ok=no
+-fi
+ 
+-else
+-  echo "$ac_t""no" 1>&6
+-echo "configure: warning: *** PNG library (libpng) not found ***" 1>&2
+-fi
++png_ok=yes
+ 
+   if test "$png_ok" = yes; then
+     echo $ac_n "checking for png_structp in png.h""... $ac_c" 1>&6
diff --git a/graphics/gqview/patches/patch-ac b/graphics/gqview/patches/patch-ac
new file mode 100644
index 00000000000..32f1faf2df6
--- /dev/null
+++ b/graphics/gqview/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2000/11/29 20:01:04 wiz Exp $
+
+--- po/Makefile.in.in.orig	Sun Sep 10 15:46:38 2000
++++ po/Makefile.in.in
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = @localedir@
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
diff --git a/graphics/gqview/pkg/PLIST b/graphics/gqview/pkg/PLIST
index 678c10a0cef..a1660a3e789 100644
--- a/graphics/gqview/pkg/PLIST
+++ b/graphics/gqview/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2000/08/03 23:52:05 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2000/11/29 20:01:04 wiz Exp $
 bin/gqview
 share/locale/de/LC_MESSAGES/gqview.mo
 share/locale/es/LC_MESSAGES/gqview.mo
@@ -6,6 +6,7 @@ share/locale/fr/LC_MESSAGES/gqview.mo
 share/locale/it/LC_MESSAGES/gqview.mo
 share/locale/ja/LC_MESSAGES/gqview.mo
 share/locale/pt_BR/LC_MESSAGES/gqview.mo
+share/locale/pl/LC_MESSAGES/gqview.mo
 share/locale/ru/LC_MESSAGES/gqview.mo
 share/locale/sk/LC_MESSAGES/gqview.mo
 share/locale/tr/LC_MESSAGES/gqview.mo