Update to 1.2.3. Changes not found.

5 files changed, 42 insertions, 42 deletions

diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 7ff0d10c2e2..ac3dda63a84 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2016/04/11 19:01:53 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.55 2016/04/17 09:45:59 wiz Exp $
 
-DISTNAME=	geeqie-1.2.2
-PKGREVISION=	4
+DISTNAME=	geeqie-1.2.3
 EXTRACT_SUFX=	.tar.xz
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.geeqie.org/
@@ -18,12 +16,15 @@ LDFLAGS.SunOS+=		-lm -lsocket -lnsl
 
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
-USE_TOOLS=		bash:run gmake intltool msgfmt pkg-config
+USE_TOOLS=		bash:run gmake intltool msgfmt pkg-config automake autoconf autoreconf
 
 REPLACE_BASH=		plugins/rotate/geeqie-rotate
 REPLACE_BASH+=		plugins/ufraw/geeqie-ufraw
 REPLACE_BASH+=		plugins/import/geeqie-import
 
+pre-configure:
+	cd ${WRKSRC} && ${SH} ./autogen.sh
+
 post-build:
 	cd ${WRKSRC}/doc && ${MAKE_PROGRAM} html
 
diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo
index 3f871a7cc51..a090ed9ddf1 100644
--- a/graphics/geeqie/distinfo
+++ b/graphics/geeqie/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 21:33:58 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/04/17 09:45:59 wiz Exp $
 
-SHA1 (geeqie-1.2.2.tar.xz) = 9dd094707d7bf7389eb62a218ff7bc86339fc995
-RMD160 (geeqie-1.2.2.tar.xz) = 45e301763f3c174aa664254037ede7a9a508f179
-SHA512 (geeqie-1.2.2.tar.xz) = 0e134802b42061e76ec2f2d9069ab13ebcab17f889b04917e15aba74a208a4c4ffa5a957f45eb5bd14917d98d2d6250c1085cb065a1ae487050e5e2f325c14c4
-Size (geeqie-1.2.2.tar.xz) = 1156616 bytes
-SHA1 (patch-ab) = 6c60aa3ca9e623525cdb6c282c02ed477ecb8b6d
+SHA1 (geeqie-1.2.3.tar.xz) = d01c971ed5906973ff4788d1f7387563dcdbb0e9
+RMD160 (geeqie-1.2.3.tar.xz) = b50e79e1d32ecbda75ed3a0f0b578b64455dee3a
+SHA512 (geeqie-1.2.3.tar.xz) = 1bb2a6e5782cdafb4aeb1ab9247f7d43f4ef341594ea795214c136ba1fe416cf8bc37faa43462780eca3d0b07a7852e27719f8d23c8bdb42c899857846b4f7b1
+Size (geeqie-1.2.3.tar.xz) = 1129804 bytes
 SHA1 (patch-ac) = e551d5e733354902254c1a392be5738da6c88170
-SHA1 (patch-configure) = 0923c577fbe92c6cbf8ec429dd5c149423a649f3
+SHA1 (patch-configure.in) = 4d1ca9003938669651f98cc43a6d525979b737da
+SHA1 (patch-doc_Makefile.am) = 0efedf8892e4a1bc342e6f6ebc757151c33920b2
diff --git a/graphics/geeqie/patches/patch-configure b/graphics/geeqie/patches/patch-configure
deleted file mode 100644
index c1a57299eaa..00000000000
--- a/graphics/geeqie/patches/patch-configure
+++ /dev/null
@@ -1,25 +0,0 @@
-$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;
diff --git a/graphics/geeqie/patches/patch-configure.in b/graphics/geeqie/patches/patch-configure.in
new file mode 100644
index 00000000000..3304d3df74f
--- /dev/null
+++ b/graphics/geeqie/patches/patch-configure.in
@@ -0,0 +1,24 @@
+$NetBSD: patch-configure.in,v 1.1 2016/04/17 09:45:59 wiz Exp $
+
+Fix unportable test(1) operator.
+
+--- configure.in.orig	2016-03-07 10:21:06.000000000 +0000
++++ configure.in
+@@ -192,7 +192,7 @@ fi
+ AM_PATH_GLIB_2_0(2.24.0,,AC_MSG_ERROR(GLIB >= 2.24.0 not installed.))
+ AC_ARG_ENABLE([gtk3], AC_HELP_STRING([--disable-gtk3], [use gtk2 instead of gtk3]),[gtk3="${enableval}"], [gtk3=m4_ifdef([AM_PATH_GTK_3_0], [auto], [no])])
+ 
+-if test x$gtk3 == xyes; then
++if test x$gtk3 = xyes; then
+     AC_MSG_WARN("Gtk3 enabled")
+     m4_ifdef([AM_PATH_GTK_3_0], [AM_PATH_GTK_3_0(3.0.0,,AC_MSG_ERROR(GTK+ >= 3.0.0 not installed.))])
+ else
+@@ -202,7 +202,7 @@ else
+     fi
+ fi
+ 
+-if test x$gtk3 == xno; then
++if test x$gtk3 = xno; then
+     m4_ifdef([AM_PATH_GTK_2_0], [AM_PATH_GTK_2_0(2.20.0,,AC_MSG_ERROR(GTK+ >= 2.20.0 not installed.))])
+     true
+ fi
diff --git a/graphics/geeqie/patches/patch-ab b/graphics/geeqie/patches/patch-doc_Makefile.am
index bb51247c681..eb16eb171de 100644
--- a/graphics/geeqie/patches/patch-ab
+++ b/graphics/geeqie/patches/patch-doc_Makefile.am
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.6 2015/09/10 19:06:57 gdt Exp $
+$NetBSD: patch-doc_Makefile.am,v 1.1 2016/04/17 09:45:59 wiz Exp $
 
 Generate html docs in build phase (instead of install phase).
 gnome-doc-tool seems to ignore "-o html" so manually generate
@@ -8,14 +8,14 @@ Solves PLIST problem due to missing html files.
 
 This is not know to be reported upstream.
 
---- doc/Makefile.in.orig	2015-09-10 14:28:35.000000000 +0000
-+++ doc/Makefile.in
-@@ -496,7 +496,7 @@ uninstall-am:
+--- doc/Makefile.am.orig	2016-03-07 10:21:06.000000000 +0000
++++ doc/Makefile.am
+@@ -7,7 +7,7 @@ EXTRA_DIST = docbook2html.sh docbook
  html/GuideIndex.html: docbook/GuideIndex.xml
  	rm -rf html; mkdir html
  	if [ -x "$(GNOME_DOC_TOOL)" ]; then \
 -		"$(GNOME_DOC_TOOL)" html -o html $(srcdir)/docbook/GuideIndex.xml ; \
-+		cd html && "$(GNOME_DOC_TOOL)" html ../$(srcdir)/docbook/GuideIndex.xml ; \
++		cd html && "$(GNOME_DOC_TOOL)" html $(srcdir)/../docbook/GuideIndex.xml ; \
  	else \
  		echo "gnome-doc-tool not found, html is not built" ; \
  	fi