UPDATE: graphics/qiv

[Jon Trembley <jon_(_at_)_brain-box_(_dot_)_net>]

WWW: http://www.klografx.net/qiv/

Attached is a patch that brings this port up to the latest version, 2.0.
You can view the changlog at http://www.klografx.net/qiv/index2.html.

Only tested on i386 -current.  Please test and comment.

thanks,
jon

diff -ru qiv.orig/Makefile qiv/Makefile
--- qiv.orig/Makefile	Tue Feb  1 13:53:30 2005
+++ qiv/Makefile	Tue Feb  1 13:52:55 2005
@@ -2,7 +2,7 @@
 
 COMMENT=		"very small and pretty fast gdk/Imlib image viewer"
 
-DISTNAME=		qiv-1.8
+DISTNAME=		qiv-2.0
 CATEGORIES=		graphics
 
 EXTRACT_SUFX=		-src.tgz
diff -ru qiv.orig/distinfo qiv/distinfo
--- qiv.orig/distinfo	Tue Feb  1 13:53:30 2005
+++ qiv/distinfo	Tue Feb  1 13:52:55 2005
@@ -1,4 +1,4 @@
-MD5 (qiv-1.8-src.tgz) = 78b62a3419d47b4f4c17df647a4f8abb
-RMD160 (qiv-1.8-src.tgz) = 89630fa3721033205a3ea5382b5eaad6f2c9ff4b
-SHA1 (qiv-1.8-src.tgz) = 33112bac34e5013d89cd4fa2997141820e8353ff
-SIZE (qiv-1.8-src.tgz) = 90886
+MD5 (qiv-2.0-src.tgz) = 165d0c2f264718821f94732196b7f9e1
+RMD160 (qiv-2.0-src.tgz) = 82b17c20468228258f7c1e7c61588c80e1c40107
+SHA1 (qiv-2.0-src.tgz) = 46eef04c492b9f01d79eab7c2fec78b4edd13550
+SIZE (qiv-2.0-src.tgz) = 76561
diff -ru qiv.orig/patches/patch-Makefile qiv/patches/patch-Makefile
--- qiv.orig/patches/patch-Makefile	Tue Feb  1 13:53:30 2005
+++ qiv/patches/patch-Makefile	Tue Feb  1 13:52:55 2005
@@ -1,9 +1,8 @@
-$OpenBSD: patch-Makefile,v 1.3 2002/12/22 03:45:52 naddy Exp $
---- Makefile.orig	Sun Jun 10 14:35:06 2001
-+++ Makefile	Sun Dec 22 02:29:45 2002
+--- Makefile.orig	Sat May 22 02:21:47 2004
++++ Makefile	Mon Jan 31 20:25:33 2005
 @@ -3,9 +3,6 @@
  # User Options
- ######################################################################
+ #######################################################################
  
 -# Directory where qiv will be installed under.
 -PREFIX = /usr/local
@@ -11,7 +10,7 @@
  # Font to use for statusbar in fullscreen mode
  STATUSBAR_FONT = "fixed"
  
-@@ -53,11 +50,6 @@ SS_RANDOMIZE = -r
+@@ -57,11 +54,6 @@
  # Do not edit below here!
  ######################################################################
  
@@ -23,15 +22,16 @@
  INCLUDES  = `imlib-config --cflags-gdk`
  LIBS      = `imlib-config --libs-gdk`
  
-@@ -114,11 +106,6 @@ install: $(PROGRAM)
- 	@echo "Installing..."
+@@ -126,12 +118,6 @@
+ 	@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
--	@if ./qiv -o white -f ./intro.jpg ; \
+-	@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" 
  
  install-xscreensaver: install
  	@echo "#!/bin/sh" > $(SS_PROG)
diff -ru qiv.orig/patches/patch-utils_c qiv/patches/patch-utils_c
--- qiv.orig/patches/patch-utils_c	Tue Feb  1 13:53:30 2005
+++ qiv/patches/patch-utils_c	Tue Feb  1 13:52:55 2005
@@ -1,12 +1,11 @@
-$OpenBSD: patch-utils_c,v 1.1 2002/12/29 09:34:48 pvalchev Exp $
---- utils.c.orig	Sun Dec 29 00:51:47 2002
-+++ utils.c	Sun Dec 29 00:51:57 2002
-@@ -169,7 +169,7 @@ void run_command(qiv_image *q, int n, ch
-     
-     snprintf(nr, sizeof nr, "%i", n);
- 	if (!fork()) {
--	    execlp("qiv-command", "qiv-command", nr, filename, 0);
-+	    execlp("qiv-command", "qiv-command", nr, filename, (void *)NULL);
- 	    perror("error calling qiv-command");
- 	    abort();
- 	}
+--- utils.c.orig	Mon Jan 31 20:03:22 2005
++++ utils.c	Mon Jan 31 20:03:40 2005
+@@ -272,7 +272,7 @@
+     dup2(pipe_stdout[1], 2);
+     close(pipe_stdout[1]);
+ 
+-    execlp("qiv-command", "qiv-command", nr, filename, 0);
++    execlp("qiv-command", "qiv-command", nr, filename, (void *)NULL);
+     perror("Error calling qiv-command");
+     abort();
+   }