From 509a5b2ac544b51d177ed4e34b010665c15a614c Mon Sep 17 00:00:00 2001
From: jcs <jcs@openbsd.org>
Date: Wed, 21 Nov 2001 02:11:58 +0000
Subject: [PATCH] Update to 0.99.0, takeover as maintainer brad@ ok

---
 graphics/gqview/Makefile                      | 16 +--
 graphics/gqview/distinfo                      |  3 +
 graphics/gqview/files/md5                     |  3 -
 graphics/gqview/patches/patch-Makefile.in     | 12 ---
 graphics/gqview/patches/patch-Makefile_in     | 14 +++
 graphics/gqview/patches/patch-configure       | 21 ----
 .../gqview/patches/patch-po_Makefile.in.in    | 24 -----
 .../gqview/patches/patch-po_Makefile_in_in    | 24 +++++
 graphics/gqview/patches/patch-po_fr_po        | 12 +--
 graphics/gqview/patches/patch-po_pt_BR_po     | 10 +-
 graphics/gqview/patches/patch-po_sl_po        | 12 +++
 .../gqview/patches/patch-po_zh_TW_Big5_po     | 97 ++++++++++++-------
 graphics/gqview/pkg/DESCR                     |  4 +-
 graphics/gqview/pkg/PLIST                     | 12 ++-
 14 files changed, 144 insertions(+), 120 deletions(-)
 create mode 100644 graphics/gqview/distinfo
 delete mode 100644 graphics/gqview/files/md5
 delete mode 100644 graphics/gqview/patches/patch-Makefile.in
 create mode 100644 graphics/gqview/patches/patch-Makefile_in
 delete mode 100644 graphics/gqview/patches/patch-configure
 delete mode 100644 graphics/gqview/patches/patch-po_Makefile.in.in
 create mode 100644 graphics/gqview/patches/patch-po_Makefile_in_in
 create mode 100644 graphics/gqview/patches/patch-po_sl_po

diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index 602f4f4797b..75b220f7bdf 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,19 +1,19 @@
-# $OpenBSD: Makefile,v 1.16 2001/05/06 05:05:46 lebel Exp $
+# $OpenBSD: Makefile,v 1.17 2001/11/21 02:11:58 jcs Exp $
 # $FreeBSD: Makefile,v 1.15 1999/08/25 06:14:08 obrien Exp $
 
 COMMENT=	"gtk-based graphic file viewer"
 
-DISTNAME=	gqview-0.8.2
+DISTNAME=	gqview-0.99.0
 CATEGORIES=	graphics
-NEED_VERSION=	1.402
+NEED_VERSION=	1.499
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= gqview
 
 HOMEPAGE=	http://gqview.sourceforge.net
 
-LIB_DEPENDS=	gdk_imlib.19::graphics/imlib
+LIB_DEPENDS=	gdk_pixbuf.2::graphics/gdk-pixbuf
 
-MAINTAINER=	Brad Smith <brad@openbsd.org>
+MAINTAINER=	Joshua Stein <jcs@rt.fm>
 
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
@@ -24,10 +24,4 @@ CONFIGURE_STYLE= gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-DOCS=	COPYING ChangeLog README
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gqview
-	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/gqview
-
 .include <bsd.port.mk>
diff --git a/graphics/gqview/distinfo b/graphics/gqview/distinfo
new file mode 100644
index 00000000000..0b36f38cdca
--- /dev/null
+++ b/graphics/gqview/distinfo
@@ -0,0 +1,3 @@
+MD5 (gqview-0.99.0.tar.gz) = 8b26caa9edae72d71479dff3e1414bcf
+RMD160 (gqview-0.99.0.tar.gz) = 7d13eb302cf54f6efe39ce981a054ad96b733ca8
+SHA1 (gqview-0.99.0.tar.gz) = 225b08baf4d64b903c752bc6fa75fd06449132fe
diff --git a/graphics/gqview/files/md5 b/graphics/gqview/files/md5
deleted file mode 100644
index b85b08a7ae1..00000000000
--- a/graphics/gqview/files/md5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (gqview-0.8.2.tar.gz) = 198f3d9458a02e01745423026b15a334
-RMD160 (gqview-0.8.2.tar.gz) = 8572c9bfd39d07b36c2fb05e466e9dc9d435ce33
-SHA1 (gqview-0.8.2.tar.gz) = 17ca0c14e290afcb58eb83938853c8b08dd0c5e3
diff --git a/graphics/gqview/patches/patch-Makefile.in b/graphics/gqview/patches/patch-Makefile.in
deleted file mode 100644
index 318ff8b25c0..00000000000
--- a/graphics/gqview/patches/patch-Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile.in,v 1.2 2001/05/14 21:04:11 brad Exp $
---- Makefile.in.orig	Tue Jun  6 01:40:14 2000
-+++ Makefile.in	Mon May 14 22:22:22 2001
-@@ -376,7 +376,7 @@ install-data-am: install-desktopDATA ins
- install-data: install-data-recursive
- 
- install-am: all-am
--	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
- install: install-recursive
- uninstall-am: uninstall-desktopDATA uninstall-iconDATA
- uninstall: uninstall-recursive
diff --git a/graphics/gqview/patches/patch-Makefile_in b/graphics/gqview/patches/patch-Makefile_in
new file mode 100644
index 00000000000..87a9f31f18b
--- /dev/null
+++ b/graphics/gqview/patches/patch-Makefile_in
@@ -0,0 +1,14 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2001/11/21 02:11:58 jcs Exp $
+--- Makefile.in.orig	Tue Nov 20 18:55:45 2001
++++ Makefile.in	Tue Nov 20 18:56:07 2001
+@@ -109,8 +109,8 @@
+ 	gqview.1
+ 
+ 
+-helpdir = $(prefix)/share/gqview
+-help_DATA = README
++helpdir = $(prefix)/share/doc/gqview
++help_DATA = README COPYING ChangeLog TODO
+ 
+ @HAVE_GNOME_TRUE@desktopdir = @HAVE_GNOME_TRUE@$(GNOME_DATADIR)/gnome/apps/Graphics
+ @HAVE_GNOME_TRUE@desktop_DATA = @HAVE_GNOME_TRUE@gqview.desktop
diff --git a/graphics/gqview/patches/patch-configure b/graphics/gqview/patches/patch-configure
deleted file mode 100644
index 9205564c3b2..00000000000
--- a/graphics/gqview/patches/patch-configure
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2001/05/14 21:04:13 brad Exp $
---- configure.orig	Tue Jun  6 01:32:01 2000
-+++ configure	Mon May 14 22:22:22 2001
-@@ -3324,7 +3324,7 @@ else
-   cat conftest.$ac_ext >&5
-   rm -rf conftest*
-   CATOBJEXT=.mo
--		   DATADIRNAME=lib
-+		   DATADIRNAME=share
- fi
- rm -f conftest*
- 		INSTOBJEXT=.mo
-@@ -3586,7 +3586,7 @@ fi
- 		 USE_INCLUDED_LIBINTL=yes
- 		 CATOBJEXT=.cat
- 		 INSTOBJEXT=.cat
--		 DATADIRNAME=lib
-+		 DATADIRNAME=share
- 		 INTLDEPS='$(top_builddir)/intl/libintl.a'
- 		 INTLLIBS=$INTLDEPS
- 		 LIBS=`echo $LIBS | sed -e 's/-lintl//'`
diff --git a/graphics/gqview/patches/patch-po_Makefile.in.in b/graphics/gqview/patches/patch-po_Makefile.in.in
deleted file mode 100644
index 50988b2fef0..00000000000
--- a/graphics/gqview/patches/patch-po_Makefile.in.in
+++ /dev/null
@@ -1,24 +0,0 @@
-$OpenBSD: patch-po_Makefile.in.in,v 1.2 2001/05/14 21:04:13 brad Exp $
---- po/Makefile.in.in.orig	Fri Apr 28 21:49:43 2000
-+++ po/Makefile.in.in	Mon May 14 22:22:22 2001
-@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
- install-data-no: all
- install-data-yes: all
- 	if test -r "$(MKINSTALLDIRS)"; then \
--	  $(MKINSTALLDIRS) $(datadir); \
-+	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
- 	else \
--	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
- 	fi
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
-@@ -123,7 +123,7 @@ install-data-yes: all
- 	    *)     destdir=$(localedir);; \
- 	  esac; \
- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
--	  dir=$$destdir/$$lang/LC_MESSAGES; \
-+	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
- 	  if test -r "$(MKINSTALLDIRS)"; then \
- 	    $(MKINSTALLDIRS) $$dir; \
- 	  else \
diff --git a/graphics/gqview/patches/patch-po_Makefile_in_in b/graphics/gqview/patches/patch-po_Makefile_in_in
new file mode 100644
index 00000000000..fbcbb83658d
--- /dev/null
+++ b/graphics/gqview/patches/patch-po_Makefile_in_in
@@ -0,0 +1,24 @@
+$OpenBSD: patch-po_Makefile_in_in,v 1.1 2001/11/21 02:11:58 jcs Exp $
+--- po/Makefile.in.in.orig	Mon Nov 19 11:02:59 2001
++++ po/Makefile.in.in	Tue Nov 20 19:00:19 2001
+@@ -19,7 +19,7 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = $(prefix)/@DATADIRNAME@
+-localedir = $(datadir)/locale
++localedir = $(DESTDIR)$(prefix)/share/locale
+ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
+@@ -111,9 +111,9 @@
+ install-data-no: all
+ install-data-yes: all
+ 	if test -r "$(MKINSTALLDIRS)"; then \
+-	  $(MKINSTALLDIRS) $(datadir); \
++	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+ 	else \
+-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
++	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+ 	fi
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
diff --git a/graphics/gqview/patches/patch-po_fr_po b/graphics/gqview/patches/patch-po_fr_po
index 587857fba20..bececf0adbb 100644
--- a/graphics/gqview/patches/patch-po_fr_po
+++ b/graphics/gqview/patches/patch-po_fr_po
@@ -1,12 +1,12 @@
-$OpenBSD: patch-po_fr_po,v 1.1 2001/05/14 21:04:14 brad Exp $
---- po/fr.po.orig	Mon May 14 22:23:13 2001
-+++ po/fr.po	Mon May 14 22:23:32 2001
-@@ -10,7 +10,7 @@ msgstr ""
- "Last-Translator: Jean-pierre PEDRON <jppedron@club-internet.fr>\n"
+$OpenBSD: patch-po_fr_po,v 1.2 2001/11/21 02:11:58 jcs Exp $
+--- po/fr.po.orig	Tue Nov 20 18:41:17 2001
++++ po/fr.po	Tue Nov 20 18:41:23 2001
+@@ -11,7 +11,7 @@
+ "Last-Translator: Eric Lassauge <lassauge@mail.dotcom.fr>\n"
  "Language-Team: french <jppedron@club-internet.fr>\n"
  "MIME-Version: 1.0\n"
 -"Content-Type: text/plain; charset=iso8859-1\n"
 +"Content-Type: text/plain; charset=iso-8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: src/config.c:294
+ #: src/cache_maint.c:245
diff --git a/graphics/gqview/patches/patch-po_pt_BR_po b/graphics/gqview/patches/patch-po_pt_BR_po
index 73607aabcfb..7baf7248a32 100644
--- a/graphics/gqview/patches/patch-po_pt_BR_po
+++ b/graphics/gqview/patches/patch-po_pt_BR_po
@@ -1,7 +1,7 @@
-$OpenBSD: patch-po_pt_BR_po,v 1.1 2001/05/14 21:04:14 brad Exp $
---- po/pt_BR.po.orig	Mon May 14 22:23:40 2001
-+++ po/pt_BR.po	Mon May 14 22:23:50 2001
-@@ -10,7 +10,7 @@ msgstr ""
+$OpenBSD: patch-po_pt_BR_po,v 1.2 2001/11/21 02:11:58 jcs Exp $
+--- po/pt_BR.po.orig	Tue Nov 20 18:42:39 2001
++++ po/pt_BR.po	Tue Nov 20 18:42:44 2001
+@@ -10,7 +10,7 @@
  "Last-Translator: Evandro F. Giovanini <elinux@linuxave.net>\n"
  "Language-Team: Vitor Fernandes <vitor_fernandes@SoftHome.net>\n"
  "MIME-Version: 1.0\n"
@@ -9,4 +9,4 @@ $OpenBSD: patch-po_pt_BR_po,v 1.1 2001/05/14 21:04:14 brad Exp $
 +"Content-Type: text/plain; charset=iso-8859-1\n"
  "Content-Transfer-Encoding: 8bit\n"
  
- #: src/config.c:294
+ #: src/cache_maint.c:245
diff --git a/graphics/gqview/patches/patch-po_sl_po b/graphics/gqview/patches/patch-po_sl_po
new file mode 100644
index 00000000000..0c1b6237f21
--- /dev/null
+++ b/graphics/gqview/patches/patch-po_sl_po
@@ -0,0 +1,12 @@
+$OpenBSD: patch-po_sl_po,v 1.1 2001/11/21 02:11:58 jcs Exp $
+--- po/sl.po.orig	Tue Nov 20 18:44:38 2001
++++ po/sl.po	Tue Nov 20 18:44:41 2001
+@@ -11,7 +11,7 @@
+ "Last-Translator: Matej Erman <matej.erman@guest.arnes.si>\n"
+ "Language-Team: slovene <sl@li.org>\n"
+ "MIME-Version: 1.0\n"
+-"Content-Type: text/plain; charset=ISO8859-2\n"
++"Content-Type: text/plain; charset=iso-8859-2\n"
+ "Content-Transfer-Encoding: 8 bit\n"
+ 
+ #: src/cache_maint.c:245
diff --git a/graphics/gqview/patches/patch-po_zh_TW_Big5_po b/graphics/gqview/patches/patch-po_zh_TW_Big5_po
index 569b9958d1c..d08862660b1 100644
--- a/graphics/gqview/patches/patch-po_zh_TW_Big5_po
+++ b/graphics/gqview/patches/patch-po_zh_TW_Big5_po
@@ -1,49 +1,74 @@
-$OpenBSD: patch-po_zh_TW_Big5_po,v 1.1 2001/05/14 21:04:14 brad Exp $
---- po/zh_TW.Big5.po.orig	Mon May 14 22:24:00 2001
-+++ po/zh_TW.Big5.po	Mon May 14 22:24:46 2001
-@@ -526,11 +526,11 @@ msgid ""
- " %s\n"
- " with:\n"
- " %s"
--msgstr "複蓋\檔案:\n"
-+msgstr "複蓋檔案:\n"
- 
- #: src/utilops.c:183 src/utilops.c:289 src/utilops.c:651 src/utilops.c:835
- msgid "Overwrite file"
--msgstr "複蓋\檔案"
-+msgstr "複蓋檔案"
- 
- #: src/utilops.c:186
- msgid "Skip"
-@@ -589,11 +589,11 @@ msgid ""
- "%s\n"
- " with:\n"
+$OpenBSD: patch-po_zh_TW_Big5_po,v 1.2 2001/11/21 02:11:58 jcs Exp $
+--- po/zh_TW.Big5.po.orig	Mon Nov 19 11:03:31 2001
++++ po/zh_TW.Big5.po	Tue Nov 20 18:52:22 2001
+@@ -65,14 +65,14 @@
+ "Overwrite collection file:\n"
+ "%s"
+ msgstr ""
+-"覆蓋\影像集檔案:\n"
++"覆蓋影像集檔案:\n"
  "%s"
--msgstr "複蓋\檔案:\n"
-+msgstr "複蓋檔案:\n"
  
- #: src/utilops.c:292 src/utilops.c:654 src/utilops.c:838
+ #
+ # File: src/collect-dlg.c, line: 68
+ #: src/collect-dlg.c:69
+ msgid "Overwrite File"
+-msgstr "覆蓋\檔案"
++msgstr "覆蓋檔案"
+ 
+ #
+ # File: src/collect-dlg.c, line: 72
+@@ -81,7 +81,7 @@
+ # File: src/utilops.c, line: 1036
+ #: src/collect-dlg.c:73 src/utilops.c:463 src/utilops.c:830 src/utilops.c:1036
  msgid "Overwrite"
--msgstr "複蓋\"
-+msgstr "複蓋"
+-msgstr "覆蓋\"
++msgstr "覆蓋"
  
- #: src/utilops.c:318
- #, fuzzy, c-format
-@@ -736,7 +736,7 @@ msgid ""
+ #
+ # File: src/collect-dlg.c, line: 81
+@@ -2003,7 +2003,7 @@
+ msgstr ""
+ "此檔案:\n"
+ " %s\n"
+-" 將被以下檔案覆蓋\:\n"
++" 將被以下檔案覆蓋:\n"
+ " %s"
+ 
+ #
+@@ -2014,7 +2014,7 @@
+ #: src/utilops.c:339 src/utilops.c:459 src/utilops.c:826 src/utilops.c:1032
+ #, fuzzy
+ msgid "Overwrite file"
+-msgstr "覆蓋\檔案"
++msgstr "覆蓋檔案"
+ 
+ #
+ # File: src/utilops.c, line: 343
+@@ -2102,7 +2102,7 @@
+ msgstr ""
+ "此檔案:\n"
  "%s\n"
+-"將被以下檔案覆蓋\:\n"
++"將被以下檔案覆蓋:\n"
+ "%s"
+ 
+ #
+@@ -2268,7 +2268,7 @@
  "by renaming:\n"
  "%s"
--msgstr "複蓋\檔案:\n"
-+msgstr "複蓋檔案:\n"
- 
- #: src/utilops.c:663
- #, fuzzy, c-format
-@@ -840,7 +840,7 @@ msgstr "GQview 工具"
+ msgstr ""
+-"複蓋\檔案:\n"
++"複蓋檔案:\n"
+ "%s\n"
+ "因為改變了以下檔案的名稱:\n"
+ "%s"
+@@ -2451,7 +2451,7 @@
  #~ "%s\n"
  #~ "with:\n"
  #~ "%s"
 -#~ msgstr "複蓋\檔案:\n"
 +#~ msgstr "複蓋檔案:\n"
  
- #~ msgid "Save"
- #~ msgstr "儲存"
+ #
+ #~ msgid "Save settings on exit"
diff --git a/graphics/gqview/pkg/DESCR b/graphics/gqview/pkg/DESCR
index c9038c8c213..8518082c818 100644
--- a/graphics/gqview/pkg/DESCR
+++ b/graphics/gqview/pkg/DESCR
@@ -1,3 +1,5 @@
-a gtk-based graphic file viewer.
+GQview is an image viewer for Unix operating systems.  Its key
+features include single click file viewing, external editor
+support, thumbnail preview, and zoom features.
 
 WWW: ${HOMEPAGE}
diff --git a/graphics/gqview/pkg/PLIST b/graphics/gqview/pkg/PLIST
index 47b8ce97a3e..68bf19100c6 100644
--- a/graphics/gqview/pkg/PLIST
+++ b/graphics/gqview/pkg/PLIST
@@ -1,16 +1,26 @@
-@comment $OpenBSD: PLIST,v 1.4 2001/03/02 20:03:34 brad Exp $
+@comment $OpenBSD: PLIST,v 1.5 2001/11/21 02:11:58 jcs Exp $
 bin/gqview
+man/man1/gqview.1
 share/doc/gqview/COPYING
 share/doc/gqview/ChangeLog
 share/doc/gqview/README
+share/doc/gqview/TODO
 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/it/LC_MESSAGES/gqview.mo
 share/locale/ja/LC_MESSAGES/gqview.mo
+share/locale/nl/LC_MESSAGES/gqview.mo
+share/locale/pl/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/sl/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.Big5/LC_MESSAGES/gqview.mo
 @dirrm share/doc/gqview