Update to qiv-1.9, add x11 to CATEGORIES, take maintainership, use bl3.

Changes since 1.8:
* -R flag, which puts qiv in readonly mode
* Flickering in fullscreen mode has been reduced
* -F flag, which allows filenames to be read in from a text file
* F11/F12 now {de,in}crease the slide show delay by 1 second
* Mouse cursor is hidden after 1 second of inactivity
* Miscellaneous other bugfixes

Okayed by jmmv and wiz.

3 files changed, 39 insertions, 43 deletions

diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 7eb6d41ac25..98059fc1463 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -1,20 +1,20 @@
-# $NetBSD: Makefile,v 1.12 2004/01/24 15:46:44 grant Exp $
-#
+# $NetBSD: Makefile,v 1.13 2004/02/17 15:20:47 snj Exp $
 
-DISTNAME=	qiv-1.8-src
-PKGNAME=	qiv-1.8
-PKGREVISION=	3
-CATEGORIES=	graphics
+DISTNAME=	qiv-1.9-src
+PKGNAME=	${DISTNAME:S/-src//}
+CATEGORIES=	graphics x11
 MASTER_SITES=	http://www.klografx.net/qiv/download/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	tech-pkg@NetBSD.org
+MAINTAINER=	snj@NetBSD.org
 HOMEPAGE=	http://www.klografx.net/qiv/
 COMMENT=	Quick image viewer
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_GNU_TOOLS+=	make
-USE_BUILDLINK2=	yes
+USE_BUILDLINK3=	yes
 
-.include "../../graphics/imlib/buildlink2.mk"
+.include "../../devel/libgetopt/buildlink3.mk"
+.include "../../graphics/imlib/buildlink3.mk"
+.include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/qiv/distinfo b/graphics/qiv/distinfo
index 56999ee8628..588a7db5ef4 100644
--- a/graphics/qiv/distinfo
+++ b/graphics/qiv/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/09/18 19:16:16 wiz Exp $
+$NetBSD: distinfo,v 1.5 2004/02/17 15:20:47 snj Exp $
 
-SHA1 (qiv-1.8-src.tgz) = 33112bac34e5013d89cd4fa2997141820e8353ff
-Size (qiv-1.8-src.tgz) = 90886 bytes
-SHA1 (patch-aa) = b0ec3295cf46558a51b63c24c89daf81265d0b47
+SHA1 (qiv-1.9-src.tgz) = 53d298bfc8ec6618f400f6663c69308d41f5ed2c
+Size (qiv-1.9-src.tgz) = 75507 bytes
+SHA1 (patch-aa) = 4c6ab772238b2789bc0e1d245edb3a189a56c93f
diff --git a/graphics/qiv/patches/patch-aa b/graphics/qiv/patches/patch-aa
index 95bb1b8991e..78e0587d12c 100644
--- a/graphics/qiv/patches/patch-aa
+++ b/graphics/qiv/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2003/09/18 19:16:20 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2004/02/17 15:20:47 snj Exp $
 
---- Makefile.orig	2001-06-10 14:35:06.000000000 +0200
-+++ Makefile
+--- Makefile.orig	2003-01-13 03:57:42.000000000 -0800
++++ Makefile	2004-02-17 07:09:06.000000000 -0800
 @@ -4,7 +4,7 @@
  ######################################################################
  
@@ -11,48 +11,44 @@ $NetBSD: patch-aa,v 1.3 2003/09/18 19:16:20 wiz Exp $
  
  # Font to use for statusbar in fullscreen mode
  STATUSBAR_FONT = "fixed"
-@@ -24,11 +24,11 @@ FILTER = 1
- EXTNS = GIF TIFF XPM XBM PNG PPM PNM PGM PCX BMP EIM JPEG TGA
- 
- # Comment this line out if your system doesn't have getopt_long().
--GETOPT_LONG = -DHAVE_GETOPT_LONG
-+#GETOPT_LONG = -DHAVE_GETOPT_LONG
- 
- # This program will be run on the manual page after it is installed.
- # If you don't want to compress the manpage, change it to 'true'.
--COMPRESS_PROG = gzip -9f 
-+COMPRESS_PROG = true
- 
- ######################################################################
- 
-@@ -53,8 +53,8 @@ SS_RANDOMIZE = -r
+@@ -53,11 +53,6 @@ SS_RANDOMIZE = -r
  # Do not edit below here!
  ######################################################################
  
 -CC        = gcc
 -CFLAGS    = -O2 -Wall -fomit-frame-pointer -finline-functions \
-+CC        ?= gcc
-+CFLAGS    += -Wall -fomit-frame-pointer -finline-functions \
- 	    -fcaller-saves -ffast-math -fno-strength-reduce \
- 	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
+-	    -fcaller-saves -ffast-math -fno-strength-reduce \
+-	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
+-
+ INCLUDES  = `imlib-config --cflags-gdk`
+ LIBS      = `imlib-config --libs-gdk`
+ 
+@@ -87,10 +82,10 @@ SS_PROG   = $(PREFIX)/ss-qiv
+ all: $(PROGRAM)
+ 
+ $(PROGRAM): $(OBJS)
+-	$(CC) $(CFLAGS) $(DEFINES) $(LIBS) $(OBJS) -o $(PROGRAM)
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM)
+ 
+ $(OBJS): %.o: %.c $(HEADERS)
+-	$(CC) -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
++	$(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@
+ 
+ main.o: main.h
  
-@@ -112,13 +112,13 @@ clean :  
+@@ -115,13 +110,8 @@ distclean : clean
  
  install: $(PROGRAM)
  	@echo "Installing..."
 -	install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
 -	install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
-+	install -c -s -m 0755 $(PROGRAM) $(PREFIX)/bin
-+	install -c -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
- 	$(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
+-	$(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
 -	@if ./qiv -o white -f ./intro.jpg ; \
 -	then echo "-- Test Passed --" ; \
 -	else echo "-- Test Failed --" ; \
 -	fi
-+#	@if ./qiv -o white -f ./intro.jpg ; \
-+#	then echo "-- Test Passed --" ; \
-+#	else echo "-- Test Failed --" ; \
-+#	fi
++	$(BSD_INSTALL_PROGRAM) $(PROGRAM) $(PREFIX)/bin
++	$(BSD_INSTALL_DATA) $(PROGRAM).1 $(PREFIX)/man/man1
  
  install-xscreensaver: install
  	@echo "#!/bin/sh" > $(SS_PROG)