Update qiv to 2.3.1. Changes:

- Add desktop integration.
- Browse option now starts with first picture on command line.
- Fix direction of scrollwheel for next/previous image
- Center mouse cursor position in magnifying window
- Optimize libmagic calls
- Improve display of exif GPS tags
- New option --vikeys to allow for vi-style movement
- Disable screensaver and DPMS during slideshow
- Improvements to qiv-command.example (filename quoting, extract more
  EXIF infos)
- Fix possible segfaults when dealing with corrupt embedded color
  profiles.
- Do not segfault when "browse" option is called without a further
  argument.
- Fix magnifying window. Zoom factor of magnifying window can be
  changed by +/- keys.
- Make conditional rotate leave images that fit alone.
- Add --followlinks option to all symlinks to dirs.
- Fixed inconsistency with rotate option, add conditional rotation
- Add runtime option to display Exif information
- Add runtime option to toggle grab mode
- Add support for embedded color profiles in tiff
- Better fullscreen handling with multi monitors.  Xinerama is no
  longer needed.
- Notice when a mouse click makes the display-text disappear.
- Simplify image-move checking code and allow it to move an image farther.
- Add support for embedded color profiles in jpg
- Add color profile support via lcms2
- When using "--watch" option, make sure pic is not reloaded while still
  written.

4 files changed, 43 insertions, 30 deletions

diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 08bd08df9f0..68b98705be1 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.49 2014/10/09 14:06:37 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2014/10/10 20:57:32 snj Exp $
 
-DISTNAME=	qiv-2.2.4
-PKGREVISION=	9
+DISTNAME=	qiv-2.3.1
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://spiegl.de/qiv/download/
 EXTRACT_SUFX=	.tgz
@@ -13,9 +12,16 @@ LICENSE=	gnu-gpl-v2
 
 USE_TOOLS+=	gmake pkg-config
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/qiv
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 share/examples/qiv share/pixmaps
+INSTALLATION_DIRS+=	share/applications
 
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
+.include "../../graphics/libexif/buildlink3.mk"
+.include "../../graphics/tiff/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/qiv/PLIST b/graphics/qiv/PLIST
index 7b58a55ab2d..b971687afc1 100644
--- a/graphics/qiv/PLIST
+++ b/graphics/qiv/PLIST
@@ -1,4 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2010/02/07 19:30:35 snj Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/10/10 20:57:32 snj Exp $
 bin/qiv
 man/man1/qiv.1
+share/applications/qiv.desktop
 share/examples/qiv/qiv-command.example
+share/pixmaps/qiv.png
diff --git a/graphics/qiv/distinfo b/graphics/qiv/distinfo
index 78cd3f5be8b..afd887fc275 100644
--- a/graphics/qiv/distinfo
+++ b/graphics/qiv/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2012/12/12 12:56:25 wiz Exp $
+$NetBSD: distinfo,v 1.11 2014/10/10 20:57:32 snj Exp $
 
-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
+SHA1 (qiv-2.3.1.tgz) = 8f8455951047ed41c773b9214375d02f7acaf814
+RMD160 (qiv-2.3.1.tgz) = 04a128a3eb96f68c2465e457ab661e0d2d1be8c0
+Size (qiv-2.3.1.tgz) = 130621 bytes
+SHA1 (patch-aa) = e48c7997153dfc41e7b63f738d65762635f42ba6
diff --git a/graphics/qiv/patches/patch-aa b/graphics/qiv/patches/patch-aa
index 09f983fed60..dfc095aa218 100644
--- a/graphics/qiv/patches/patch-aa
+++ b/graphics/qiv/patches/patch-aa
@@ -1,7 +1,9 @@
-$NetBSD: patch-aa,v 1.8 2012/12/12 12:56:26 wiz Exp $
+$NetBSD: patch-aa,v 1.9 2014/10/10 20:57:32 snj Exp $
 
---- Makefile.orig	2011-05-13 13:11:24.000000000 +0000
-+++ Makefile
+Override hardcoded paths/flags.
+
+--- Makefile.orig	2013-12-19 16:50:37.000000000 -0800
++++ Makefile	2014-10-10 12:42:15.000000000 -0700
 @@ -4,7 +4,7 @@
  #######################################################################
  
@@ -10,13 +12,13 @@ $NetBSD: patch-aa,v 1.8 2012/12/12 12:56:26 wiz Exp $
 +#PREFIX = /usr/local
  
  # Font to use for statusbar in fullscreen mode
- STATUSBAR_FONT = "fixed"
-@@ -45,15 +45,6 @@ MAGIC = -DHAVE_MAGIC
+ STATUSBAR_FONT = "Monospace 9"
+@@ -49,15 +49,6 @@ EXIF = -DHAVE_EXIF
  # Do not edit below here!
  ######################################################################
  
 -CC        = gcc
--#CFLAGS    = -O -g -Wall
+-#CFLAGS    = -O0 -g -Wall
 -CFLAGS    = -O2 -Wall \
 -	    -fcaller-saves -ffast-math -fno-strength-reduce \
 -	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
@@ -25,18 +27,9 @@ $NetBSD: patch-aa,v 1.8 2012/12/12 12:56:26 wiz Exp $
 -#	    -fthread-jumps #-march=pentium #-DSTAT_MACROS_BROKEN
 -
  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
+ LIBS      := $(shell pkg-config --libs gdk-2.0 imlib2) -lX11 -lXext
  
- ifdef MAGIC
-@@ -99,10 +90,10 @@ DEFINES_G = $(DEFINES) -DDEBUG
+@@ -110,10 +101,10 @@ DEFINES_G = $(DEFINES) -DDEBUG
  all: $(PROGRAM)
  
  $(PROGRAM): $(OBJS)
@@ -49,7 +42,7 @@ $NetBSD: patch-aa,v 1.8 2012/12/12 12:56:26 wiz Exp $
  
  main.o: main.h
  
-@@ -126,22 +117,9 @@ distclean : clean
+@@ -137,32 +128,11 @@ distclean : clean
  	rm -f $(PROGRAM) $(PROGRAM_G)
  
  install: $(PROGRAM)
@@ -65,14 +58,26 @@ $NetBSD: patch-aa,v 1.8 2012/12/12 12:56:26 wiz Exp $
 -	fi
 -	install -m 0644 $(PROGRAM).1 $(PREFIX)/man/man1
 -	$(COMPRESS_PROG) $(PREFIX)/man/man1/$(PROGRAM).1
+-	@if [ ! -e $(PREFIX)/share/pixmaps ]; then \
+-	  echo install -d -m 0755 $(PREFIX)/share/pixmaps; \
+-	  install -d -m 0755 $(PREFIX)/share/pixmaps; \
+-	fi
+-	install -m 0644 qiv.png $(PREFIX)/share/pixmaps/qiv.png
+-	@if [ ! -e $(PREFIX)/share/applications ]; then \
+-	  echo install -d -m 0755 $(PREFIX)/share/applications; \
+-	  install -d -m 0755 $(PREFIX)/share/applications; \
+-	fi
+-	install -m 0644 qiv.desktop $(PREFIX)/share/applications/qiv.desktop
 -	@if ./qiv -f ./intro.jpg ; \
 -	then echo "-- Test Passed --" ; \
 -	else echo "-- Test Failed --" ; \
 -	fi
--	@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"
+-	@echo "\nDont forget to look into the \"qiv-command\" file and install it!\n-> cp qiv-command.example $(PREFIX)/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 \
++	$(BSD_INSTALL_DATA) qiv.png $(DESTDIR)$(PREFIX)/share/pixmaps
++	$(BSD_INSTALL_DATA) qiv.desktop $(DESTDIR)$(PREFIX)/share/applications
++	$(BSD_INSTALL_SCRIPT) contrib/qiv-command.example \
 +		$(DESTDIR)$(PREFIX)/share/examples/qiv
  
  # the end... ;-)