Update to 2.0.

Changes:
* changed round(); to myround(); and fixed Makefile.Solaris
* fixed qiv_display_text_window
* added patch by Joachim Kuebart: if images is < 5 and PgUp is pressed,
*  mage_index might become negative..
* small patch that remove a warning with gcc 3.4
* qiv_display_text_window update (Push any key..) - its really cool! :-)
* cleaned up README, qiv-command.example, manpage..
* Fixed Help-Screen remove. Added qiv-command-stdout support, now "metacam"
  (EXIF-Header) or other tools can be used within qiv and the output is shown
  in a box in the pixture like the helpscreen.
* All arrow-keys = normal moving.
  All arrow-keys+Shift = faster moving.
  NumPad-arrow-keys+NumLock = faster moving.
* Added Xinerama patch by Jeff Dairiki
* fixed manpage (ignore_path_sort was wrong)
* Added patch by HaJo Schatz: "--disable_grab, -G" Disable pointer/kbd grab
  in fullscreen mode for Remote-Display stuff.

3 files changed, 17 insertions, 17 deletions

diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index ebb8e3d16c6..00783213aff 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:14:57 tv Exp $
+# $NetBSD: Makefile,v 1.16 2004/11/26 22:18:27 snj Exp $
 
-DISTNAME=	qiv-1.9-src
+DISTNAME=	qiv-2.0-src
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	1
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://www.klografx.net/qiv/download/
 EXTRACT_SUFX=	.tgz
diff --git a/graphics/qiv/distinfo b/graphics/qiv/distinfo
index 588a7db5ef4..bf3d97e2f1a 100644
--- a/graphics/qiv/distinfo
+++ b/graphics/qiv/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2004/02/17 15:20:47 snj Exp $
+$NetBSD: distinfo,v 1.6 2004/11/26 22:18:27 snj Exp $
 
-SHA1 (qiv-1.9-src.tgz) = 53d298bfc8ec6618f400f6663c69308d41f5ed2c
-Size (qiv-1.9-src.tgz) = 75507 bytes
-SHA1 (patch-aa) = 4c6ab772238b2789bc0e1d245edb3a189a56c93f
+SHA1 (qiv-2.0-src.tgz) = 46eef04c492b9f01d79eab7c2fec78b4edd13550
+Size (qiv-2.0-src.tgz) = 76561 bytes
+SHA1 (patch-aa) = bcf9b2b335db8235e46ec4a85df32cf945b185b5
diff --git a/graphics/qiv/patches/patch-aa b/graphics/qiv/patches/patch-aa
index 78e0587d12c..b5168cfa4dd 100644
--- a/graphics/qiv/patches/patch-aa
+++ b/graphics/qiv/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.4 2004/02/17 15:20:47 snj Exp $
+$NetBSD: patch-aa,v 1.5 2004/11/26 22:18:28 snj Exp $
 
---- Makefile.orig	2003-01-13 03:57:42.000000000 -0800
-+++ Makefile	2004-02-17 07:09:06.000000000 -0800
+--- Makefile.orig	2004-05-22 00:21:47.000000000 -0700
++++ Makefile	2004-11-26 14:05:41.000000000 -0800
 @@ -4,7 +4,7 @@
- ######################################################################
+ #######################################################################
  
  # Directory where qiv will be installed under.
 -PREFIX = /usr/local
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2004/02/17 15:20:47 snj Exp $
  
  # Font to use for statusbar in fullscreen mode
  STATUSBAR_FONT = "fixed"
-@@ -53,11 +53,6 @@ SS_RANDOMIZE = -r
+@@ -57,11 +57,6 @@ SS_RANDOMIZE = -r
  # Do not edit below here!
  ######################################################################
  
@@ -23,11 +23,11 @@ $NetBSD: patch-aa,v 1.4 2004/02/17 15:20:47 snj Exp $
  INCLUDES  = `imlib-config --cflags-gdk`
  LIBS      = `imlib-config --libs-gdk`
  
-@@ -87,10 +82,10 @@ SS_PROG   = $(PREFIX)/ss-qiv
+@@ -96,10 +91,10 @@ SS_PROG   = $(PREFIX)/ss-qiv
  all: $(PROGRAM)
  
  $(PROGRAM): $(OBJS)
--	$(CC) $(CFLAGS) $(DEFINES) $(LIBS) $(OBJS) -o $(PROGRAM)
+-	$(CC) $(CFLAGS) $(DEFINES) $(OBJS) $(LIBS) -o $(PROGRAM)
 +	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) $(LDFLAGS) $(OBJS) $(LIBS) -o $(PROGRAM)
  
  $(OBJS): %.o: %.c $(HEADERS)
@@ -36,17 +36,18 @@ $NetBSD: patch-aa,v 1.4 2004/02/17 15:20:47 snj Exp $
  
  main.o: main.h
  
-@@ -115,13 +110,8 @@ distclean : clean
+@@ -124,14 +119,8 @@ distclean : clean
  
  install: $(PROGRAM)
- 	@echo "Installing..."
+ 	@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" 
 +	$(BSD_INSTALL_PROGRAM) $(PROGRAM) $(PREFIX)/bin
 +	$(BSD_INSTALL_DATA) $(PROGRAM).1 $(PREFIX)/man/man1