From 63d6666bd019441d694ba72b68c19d0022bc197d Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Wed, 12 Dec 2012 12:56:25 +0000
Subject: Update to 2.2.4, provided by ISIHARA Takanori in PR 46167.

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>

  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.
---
 graphics/qiv/Makefile         |  6 +++---
 graphics/qiv/distinfo         | 10 +++++-----
 graphics/qiv/patches/patch-aa | 27 ++++++++++++++++++++++-----
 3 files changed, 30 insertions(+), 13 deletions(-)

(limited to 'graphics/qiv')

diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index d02bfe500d8..954d6009d2d 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2012/10/08 23:01:48 adam Exp $
+# $NetBSD: Makefile,v 1.39 2012/12/12 12:56:25 wiz Exp $
 
-DISTNAME=	qiv-2.2.3
-PKGREVISION=	12
+DISTNAME=	qiv-2.2.4
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://spiegl.de/qiv/download/
 EXTRACT_SUFX=	.tgz
@@ -9,6 +8,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	snj@NetBSD.org
 HOMEPAGE=	http://spiegl.de/qiv/
 COMMENT=	Quick Image Viewer
+LICENSE=	gnu-gpl-v2
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/graphics/qiv/distinfo b/graphics/qiv/distinfo
index 261ef15c828..78cd3f5be8b 100644
--- a/graphics/qiv/distinfo
+++ b/graphics/qiv/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2010/02/07 19:30:35 snj Exp $
+$NetBSD: distinfo,v 1.10 2012/12/12 12:56:25 wiz 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
diff --git a/graphics/qiv/patches/patch-aa b/graphics/qiv/patches/patch-aa
index f564882c622..09f983fed60 100644
--- a/graphics/qiv/patches/patch-aa
+++ b/graphics/qiv/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2010/02/07 19:30:35 snj Exp $
+$NetBSD: patch-aa,v 1.8 2012/12/12 12:56:26 wiz 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 @@ $NetBSD: patch-aa,v 1.7 2010/02/07 19:30:35 snj Exp $
  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 @@ $NetBSD: patch-aa,v 1.7 2010/02/07 19:30:35 snj Exp $
  
  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 \
-- 
cgit v1.2.3