Update to 2.2.3. Another gtk1 user bites the dust. Changes:

2.2.3
=====

    add 'Q' icon in qiv-window
    bring back scrollwheel functionality
      Zoom in/out with left/right scroll and forward/back buttons
    change loading of images from imlib2_loader to pixbuf_loader. Adds
      support for additional file types, e.g., pcx, ico, svg, wmf and
      better handling of transparency.
    use gdk_pixbuf to autorotate with EXIF tags instead of libexif.
    Resetting the image (pressing return) no longer destroys "transparency
      checkboard"
    Fix compilation issues with unusual linker defaults.  Update solaris
      Makefile.
    new option to start with default rotation

2.2.2
=====

    fix -x (root window needs colormap)
    patch pango code to avoid garbled output of F1
    fix wrong image size after autorotating

2.2.1
=====

    recognize changed files, using --slideshow and --watch
    sanitize infotextdisplay
    check EXIF tags only after successful file loading
    shuffle now implies not to sort filenames
    fix autorotate with EXIF-tag
    avoid crash calling qiv -x without argument
    fix behaviour of "recursivedir" switch
    added note in README and qiv.h explaining a problem of includes with
      imlib2 up to v1.2
    migrated notes in README from imlib1 to imlib2
    migrated gdk_draw_text() to gdk_draw_layout(), fixing wrong display of
      utf-8 filenames

2.2
===

    migration from imlib1 to imlib2

2.1
===

    removed obsoleted GDK_WA_WMCLASS
      see http://library.gnome.org/devel/gdk/2.11/gdk-Windows.html#GdkWindowAttr
      and http://developer.gimp.org/api/2.0/gtk/GtkWindow.html#gtk-window-set-wmclass
    added patch from Debian gtk_includes.diff, closes: #456854
    added patch from Debian cmdbuflen.diff, closes: #441401
    added patch from Debian man_xscreensaver.diff
    remove xscreensaver left overs from Makefiles
    added autorotate patch (using libexif)
    display initial autorotation in status bar, option "autorotate"
    patch to detect image types using libmagic
    added GDK_ENTER_NOTIFY_MASK|GDK_LEAVE_NOTIFY_MASK in image.c
    removed TGA and XBM because not supported by imlib anymore
    exit on unmapped mouse events
    browse option -B, useful when launching qiv from a file manager
    patch to prevent segfault on amd64
    avoid wrapper, include "XLIB_SKIP_ARGB_VISUALS=1" in main.c
    include README and README.TODO in debian package
    README.TODO: fvwm style setting has to be for "therealqiv"
    include Debian changes and package files:
      renamed README.CHANGES to Changelog
      added patch hide_therealqiv (for Debian Bug #326849)
      added patch xmalloc (Debian Bug #383113)
      added patch qiv-manpage-options (Debian Bug #383108)
      don't recurse directories given on command line (better: use -u)
      NOT added: no_background_opts (can't reproduce Debian Bug #351816)
      added patch qiv-nosort
      patch to reset bright/contrast/gamma hitting "o" (2006-06-29)
    more comments and examples in qiv-command
    option -X to set preferred xinerama screen
    key "X" cycles through available xinerama screens
    after 'X' window moves to the new screen right away
    prefix "^" instead "0" for extended call of qiv-command
    workaround-patch by Bart Martens
    for problem with X composite extension
    try keep image on the screen after zooming/rotating
    fixed centering=off behaviour in fullscreen mode
    fixed "magnifying glass" windowsize bug
    fixed compiler warnings "differ in signedness"
    fixed compiler warning "missing sentinel in function call"
    bugfix: statusbar is redrawn after size changes and moves
    "magnifying glass" patch (not perfect yet)
    call of qiv-command with "0"-prefixed option
    Added Patch by Christoph Wegscheider <cw@wegi.net> (new QIV Debian maintainer).
    Now all free Keys can be used by qiv-command
    Another Xinerama bugfix (statusbar: now displayed on the smaller screen if two are used)
    new qiv-command feature:
      if first output line is like "NEWNAME=xxxxxxx"
      then qiv understands that the filename of the currently
      displayed image has changed to this new name
      (very useful when using qiv-command to rename files)
    fix image position when zooming to avoid wild jumps
    delete files from list if they cannot be loaded
    display text popup after qiv-command not only in fullscreen mode
    qiv_display_text_window: adjust minimum width of box
    after qiv-command also check file size and ctime
    avoid file overwrites in .qiv-select (NEEDS IMPROVING)
    updated and added more examples to qiv-command
   added small patch by Nick Clifton, setting WM_CLASS name to "qiv"
     (attr.wmclass_name).
   changed a-key/copy to real copy (no links anymore)
   patch-bugfix by Christian Lademann
   adden patch by Christian Lademann
     now slideshow (-s) can also be combine with -x/y/z
   added -F Patch by Martin Fiedler
     now stdin can also be used..
   Xinerama bugfix
   small changes in delete-command

Closes PR pkg/40555.

4 files changed, 35 insertions, 31 deletions

diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 165e62f3071..c743797d9bc 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -1,26 +1,23 @@
-# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:07 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/02/07 19:30:35 snj Exp $
 
-DISTNAME=	qiv-2.0-src
-PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	4
+DISTNAME=	qiv-2.2.3
 CATEGORIES=	graphics x11
-MASTER_SITES=	http://www.klografx.net/qiv/download/
+MASTER_SITES=	http://spiegl.de/qiv/download/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	snj@NetBSD.org
-HOMEPAGE=	http://www.klografx.net/qiv/
-COMMENT=	Quick image viewer
+HOMEPAGE=	http://spiegl.de/qiv/
+COMMENT=	Quick Image Viewer
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake pkg-config
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/qiv
 
 .include "../../devel/libgetopt/buildlink3.mk"
-.include "../../graphics/imlib/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
+.include "../../graphics/imlib2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/qiv/PLIST b/graphics/qiv/PLIST
index 61e095d6de1..7b58a55ab2d 100644
--- a/graphics/qiv/PLIST
+++ b/graphics/qiv/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/20 14:41:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/02/07 19:30:35 snj Exp $
 bin/qiv
 man/man1/qiv.1
+share/examples/qiv/qiv-command.example
diff --git a/graphics/qiv/distinfo b/graphics/qiv/distinfo
index 5c035faf2de..261ef15c828 100644
--- a/graphics/qiv/distinfo
+++ b/graphics/qiv/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2009/02/17 01:08:24 snj Exp $
+$NetBSD: distinfo,v 1.9 2010/02/07 19:30:35 snj Exp $
 
-SHA1 (qiv-2.0-src.tgz) = 46eef04c492b9f01d79eab7c2fec78b4edd13550
-RMD160 (qiv-2.0-src.tgz) = 82b17c20468228258f7c1e7c61588c80e1c40107
-Size (qiv-2.0-src.tgz) = 76561 bytes
-SHA1 (patch-aa) = 5d37ccd524079fe29b2c8c295cc1f4d35dc15946
+SHA1 (qiv-2.2.3.tgz) = 0bf8cc9a7d8bdad6bbe9e6ba970890da902a27c8
+RMD160 (qiv-2.2.3.tgz) = b52168e67e6b8c65c924b4642944aa592f0bb4a0
+Size (qiv-2.2.3.tgz) = 99530 bytes
+SHA1 (patch-aa) = 9d45649771d498aafca2c21732a623e24899e961
diff --git a/graphics/qiv/patches/patch-aa b/graphics/qiv/patches/patch-aa
index b6c48f9bb8f..f564882c622 100644
--- a/graphics/qiv/patches/patch-aa
+++ b/graphics/qiv/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.6 2009/02/17 01:08:24 snj Exp $
+$NetBSD: patch-aa,v 1.7 2010/02/07 19:30:35 snj Exp $
 
---- Makefile.orig	2004-05-22 00:21:47.000000000 -0700
-+++ Makefile	2004-11-26 14:05:41.000000000 -0800
+--- Makefile.orig	2010-01-10 13:39:08.000000000 -0800
++++ Makefile	2010-02-07 11:02:21.000000000 -0800
 @@ -4,7 +4,7 @@
  #######################################################################
  
@@ -11,19 +11,23 @@ $NetBSD: patch-aa,v 1.6 2009/02/17 01:08:24 snj Exp $
  
  # Font to use for statusbar in fullscreen mode
  STATUSBAR_FONT = "fixed"
-@@ -57,11 +57,6 @@ SS_RANDOMIZE = -r
+@@ -45,15 +45,6 @@ MAGIC = -DHAVE_MAGIC
  # Do not edit below here!
  ######################################################################
  
 -CC        = gcc
--CFLAGS    = -O2 -Wall -fomit-frame-pointer -finline-functions \
+-#CFLAGS    = -O -g -Wall
+-CFLAGS    = -O2 -Wall \
 -	    -fcaller-saves -ffast-math -fno-strength-reduce \
 -	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
+-#CFLAGS    = -O2 -Wall -fomit-frame-pointer -finline-functions \
+-#	    -fcaller-saves -ffast-math -fno-strength-reduce \
+-#	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
 -
- INCLUDES  = `imlib-config --cflags-gdk`
- LIBS      = `imlib-config --libs-gdk`
+ INCLUDES  := $(shell pkg-config --cflags gdk-2.0 imlib2)
+ LIBS      := $(shell pkg-config --libs gdk-2.0 imlib2) -lX11
  
-@@ -96,10 +91,10 @@ SS_PROG   = $(PREFIX)/ss-qiv
+@@ -99,10 +90,10 @@ DEFINES_G = $(DEFINES) -DDEBUG
  all: $(PROGRAM)
  
  $(PROGRAM): $(OBJS)
@@ -36,10 +40,11 @@ $NetBSD: patch-aa,v 1.6 2009/02/17 01:08:24 snj Exp $
  
  main.o: main.h
  
-@@ -124,14 +119,8 @@ distclean : clean
+@@ -126,14 +117,9 @@ distclean : clean
+ 	rm -f $(PROGRAM) $(PROGRAM_G)
  
  install: $(PROGRAM)
- 	@echo "Installing QIV..."
+-	@echo "Installing QIV..."
 -	install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
 -	install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
 -	$(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
@@ -47,9 +52,10 @@ $NetBSD: patch-aa,v 1.6 2009/02/17 01:08:24 snj Exp $
 -	then echo "-- Test Passed --" ; \
 -	else echo "-- Test Failed --" ; \
 -	fi
--	@echo -ne "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n" 
+-	@echo -ne "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example /usr/local/bin/qiv-command\n\n"
 +	$(BSD_INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
 +	$(BSD_INSTALL_DATA) $(PROGRAM).1 $(DESTDIR)$(PREFIX)/man/man1
++	$(BSD_INSTALL_SCRIPT) qiv-command.example \
++		$(DESTDIR)$(PREFIX)/share/examples/qiv
  
- install-xscreensaver: install
- 	@echo "#!/bin/sh" > $(SS_PROG)
+ # the end... ;-)