pkg/46167: Update to qiv 2.2.4

[ishit%oak.dti.ne.jp@localhost]

>Number:         46167
>Category:       pkg
>Synopsis:       Update to qiv 2.2.4
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Mar 10 15:00:01 +0000 2012
>Originator:     ISIHARA Takanori
>Release:        NetBSD 5.1_STABLE
>Organization:
Nagoya *BSD Users' Group :)
>Environment:
NetBSD ishitPc9.home 5.1_STABLE NetBSD 5.1_STABLE (ISHITPC9) #81: Sun Feb 12 
03:53:00 JST 2012  
sysbuild%ishitPc9.home@localhost:/opt/sysbuild/netbsd-5/obj/i386/sys/arch/i386/compile/ISHITPC9
 i386

>Description:
Update to 2.2.4.

Changelog:

2.2.4
=====
  02.05.2011
                    [as] README: added note about obsoleted GTK v1

  28.12.2010
                    [as] qiv-command: more examples from Clint Pachl 
<pachl%ecentryx.com@localhost>

  02.11.2010
                    [tw] only center image upon reload when center
                         option is active
                    [tw] Do not break install if using a non existing
                         target location (clemens fischer)
                    [tw] make gdk options work again (e.g. --display)
                    [tw] Do not follow symlinked directories, when
                         using recursivedir option (Goswin v. Brederlow)
                    [tw] Add option to change cycle behavior after last
                         picture. (patch by Nicolas Pouillard)
                    [tw] Images were displayed twice when using --browse
                         option. (patch by Adam Lee)
                    [tw] Fix inconsistent behavior when using -x/-y/-z option.

>How-To-Repeat:

>Fix:
Please apply patch.

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/qiv/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile    22 Apr 2011 13:43:50 -0000      1.30
+++ Makefile    10 Mar 2012 14:50:36 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.30 2011/04/22 13:43:50 obache Exp $
 
-DISTNAME=      qiv-2.2.3
-PKGREVISION=   5
+DISTNAME=      qiv-2.2.4
 CATEGORIES=    graphics x11
 MASTER_SITES=  http://spiegl.de/qiv/download/
 EXTRACT_SUFX=  .tgz
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/qiv/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo    7 Feb 2010 19:30:35 -0000       1.9
+++ distinfo    10 Mar 2012 14:50:36 -0000
@@ -1,6 +1,6 @@
 $NetBSD: distinfo,v 1.9 2010/02/07 19:30:35 snj Exp $
 
-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
+SHA1 (qiv-2.2.4.tgz) = 650052cb72820701300b2bfeb09b966625ee3dba
+RMD160 (qiv-2.2.4.tgz) = ec8f99f7edeb6f681d8c76e5fb96e16f64761676
+Size (qiv-2.2.4.tgz) = 98874 bytes
+SHA1 (patch-aa) = 5625ed30f00aaebfb7b0fca13290879169dd1f99
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/graphics/qiv/patches/patch-aa,v
retrieving revision 1.7
diff -u -r1.7 patch-aa
--- patches/patch-aa    7 Feb 2010 19:30:35 -0000       1.7
+++ patches/patch-aa    10 Mar 2012 14:50:36 -0000
@@ -1,7 +1,7 @@
 $NetBSD: patch-aa,v 1.7 2010/02/07 19:30:35 snj Exp $
 
---- Makefile.orig      2010-01-10 13:39:08.000000000 -0800
-+++ Makefile   2010-02-07 11:02:21.000000000 -0800
+--- Makefile.orig      2011-05-13 13:11:24.000000000 +0000
++++ Makefile
 @@ -4,7 +4,7 @@
  #######################################################################
  
@@ -27,6 +27,15 @@
  INCLUDES  := $(shell pkg-config --cflags gdk-2.0 imlib2)
  LIBS      := $(shell pkg-config --libs gdk-2.0 imlib2) -lX11
  
+@@ -83,7 +74,7 @@ OBJS_G   += lib/getopt.g lib/getopt1.g
+ endif
+ 
+ ifdef GTD_XINERAMA
+-LIBS     += -L/usr/X11R6/lib -lXinerama
++LIBS     += -L$(X11BASE)/lib -lXinerama
+ endif
+ 
+ ifdef MAGIC
 @@ -99,10 +90,10 @@ DEFINES_G = $(DEFINES) -DDEBUG
  all: $(PROGRAM)
  
@@ -40,19 +49,27 @@
  
  main.o: main.h
  
-@@ -126,14 +117,9 @@ distclean : clean
+@@ -126,22 +117,9 @@ distclean : clean
        rm -f $(PROGRAM) $(PROGRAM_G)
  
  install: $(PROGRAM)
 -      @echo "Installing QIV..."
+-      @if [ ! -e $(PREFIX)/bin ]; then \
+-        install -d -m 0755 $(PREFIX)/bin; \
+-        echo install -d -m 0755 $(PREFIX)/bin; \
+-        fi
 -      install -s -m 0755 $(PROGRAM) $(PREFIX)/bin
+-      @if [ ! -e $(PREFIX)/man/man1 ]; then \
+-        echo install -d -m 0755 $(PREFIX)/man/man1; \
+-        install -d -m 0755 $(PREFIX)/man/man1; \
+-      fi
 -      install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
 -      $(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
 -      @if ./qiv -f ./intro.jpg ; \
 -      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 "\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 \