Update to 1.2.2.

(1.2.2 and 1.2.1 are build nits)

Geeqie 1.2
==========

- Support for lcms2
- Basic support for lua scripting (still documentation needed)
- Several bugfixes

5 files changed, 42 insertions, 16 deletions

diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 041a5ffaafc..56d7c2ee96a 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.49 2015/04/25 14:23:10 tnn Exp $
+# $NetBSD: Makefile,v 1.50 2015/09/10 19:06:57 gdt Exp $
 #
 
-DISTNAME=	geeqie-1.1
-PKGREVISION=	24
+DISTNAME=	geeqie-1.2.2
+EXTRACT_SUFX=	.tar.xz
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=geeqie/}
+MASTER_SITES=	http://www.geeqie.org/
 
 MAINTAINER=	gdt@NetBSD.org
-HOMEPAGE=	http://geeqie.sourceforge.net/
+HOMEPAGE=	http://www.geeqie.org/
 COMMENT=	Image viewer
 LICENSE=	gnu-gpl-v2
 
diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo
index fdbb40e828e..1448fc0c6f3 100644
--- a/graphics/geeqie/distinfo
+++ b/graphics/geeqie/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2012/08/28 00:30:44 gdt Exp $
+$NetBSD: distinfo,v 1.8 2015/09/10 19:06:57 gdt Exp $
 
-SHA1 (geeqie-1.1.tar.gz) = 77167479e91e03d9512535a146c5d2d77941257f
-RMD160 (geeqie-1.1.tar.gz) = 060c62c3db32fe4bc05aa6dccd052360d3aac3cf
-Size (geeqie-1.1.tar.gz) = 1966211 bytes
-SHA1 (patch-ab) = a2aa37f813b32b216410515e6e80fe8fdc9c6803
-SHA1 (patch-ac) = 531d7338f1c42c62a738aa8fb4253b3324e71458
+SHA1 (geeqie-1.2.2.tar.xz) = 9dd094707d7bf7389eb62a218ff7bc86339fc995
+RMD160 (geeqie-1.2.2.tar.xz) = 45e301763f3c174aa664254037ede7a9a508f179
+Size (geeqie-1.2.2.tar.xz) = 1156616 bytes
+SHA1 (patch-ab) = 6c60aa3ca9e623525cdb6c282c02ed477ecb8b6d
+SHA1 (patch-ac) = e551d5e733354902254c1a392be5738da6c88170
+SHA1 (patch-configure) = 0923c577fbe92c6cbf8ec429dd5c149423a649f3
diff --git a/graphics/geeqie/patches/patch-ab b/graphics/geeqie/patches/patch-ab
index a328493f0ad..bb51247c681 100644
--- a/graphics/geeqie/patches/patch-ab
+++ b/graphics/geeqie/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2012/08/28 00:30:45 gdt Exp $
+$NetBSD: patch-ab,v 1.6 2015/09/10 19:06:57 gdt Exp $
 
 Generate html docs in build phase (instead of install phase).
 gnome-doc-tool seems to ignore "-o html" so manually generate
@@ -8,9 +8,9 @@ Solves PLIST problem due to missing html files.
 
 This is not know to be reported upstream.
 
---- doc/Makefile.in.orig	2010-09-25 12:02:12.000000000 +0000
+--- doc/Makefile.in.orig	2015-09-10 14:28:35.000000000 +0000
 +++ doc/Makefile.in
-@@ -408,7 +408,7 @@ uninstall-am: uninstall-helpDATA
+@@ -496,7 +496,7 @@ uninstall-am:
  html/GuideIndex.html: docbook/GuideIndex.xml
  	rm -rf html; mkdir html
  	if [ -x "$(GNOME_DOC_TOOL)" ]; then \
diff --git a/graphics/geeqie/patches/patch-ac b/graphics/geeqie/patches/patch-ac
index 57afd2005fe..8cd42bf76e9 100644
--- a/graphics/geeqie/patches/patch-ac
+++ b/graphics/geeqie/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.4 2012/08/28 00:30:45 gdt Exp $
+$NetBSD: patch-ac,v 1.5 2015/09/10 19:06:57 gdt Exp $
 
 Comment from 2009/07/24:
 
@@ -7,7 +7,7 @@ Comment from 2009/07/24:
 
 This is not known to be reported upstream.
 
---- src/main.c.orig	2010-02-17 21:21:19.000000000 +0000
+--- src/main.c.orig	2015-05-23 12:20:43.000000000 +0000
 +++ src/main.c
 @@ -709,6 +709,7 @@ void exit_program(void)
   */
diff --git a/graphics/geeqie/patches/patch-configure b/graphics/geeqie/patches/patch-configure
new file mode 100644
index 00000000000..c1a57299eaa
--- /dev/null
+++ b/graphics/geeqie/patches/patch-configure
@@ -0,0 +1,25 @@
+$NetBSD: patch-configure,v 1.1 2015/09/10 19:06:57 gdt Exp $
+
+Fix bashisms.
+Reported upstream 20150910.
+
+--- configure.orig	2015-09-10 14:28:36.000000000 +0000
++++ configure
+@@ -9146,7 +9146,7 @@ else
+ fi
+ 
+ 
+-if test x$gtk3 == xyes; then
++if test x$gtk3 = xyes; then
+     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \"Gtk3 enabled\"" >&5
+ $as_echo "$as_me: WARNING: \"Gtk3 enabled\"" >&2;}
+ 
+@@ -9158,7 +9158,7 @@ $as_echo "$as_me: WARNING: \"Gtk3 is pre
+     fi
+ fi
+ 
+-if test x$gtk3 == xno; then
++if test x$gtk3 = xno; then
+     # Check whether --enable-gtktest was given.
+ if test "${enable_gtktest+set}" = set; then :
+   enableval=$enable_gtktest;