Index: head/graphics/geeqie/Makefile
===================================================================
--- head/graphics/geeqie/Makefile	(revision 416075)
+++ head/graphics/geeqie/Makefile	(revision 416076)
@@ -1,59 +1,56 @@
 # Created by: Martin Tournoij <carpetsmoker@rwxrwxrwx.net>
 # $FreeBSD$
 
 PORTNAME=	geeqie
-PORTVERSION=	1.1
-PORTREVISION=	4
+PORTVERSION=	1.2.3
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	http://www.geeqie.org/
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Lightweight image viewer forked from GQview
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=		gettext gmake pkgconfig desktop-file-utils
-USE_GNOME=	gtk20 intltool
+USES=		autoreconf gettext gmake jpeg localbase pkgconfig \
+		desktop-file-utils tar:xz lua:51
+USE_GNOME=	gtk30 intltool
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--docdir="${DOCSDIR}" \
-		--htmldir="${DOCSDIR}/html" \
-		--with-htmldir="${DOCSDIR}/html" \
-		--with-readmedir="${DOCSDIR}"
+CONFIGURE_ARGS=	--with-readmedir="${DOCSDIR}"
 
-CFLAGS+=	-I${LOCALBASE}/include
-CPPFLAGS+=	${CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_ARGS+=	top_builddir="${WRKSRC}"
-
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	EXIV2 LCMS LIRC GPS DOCS
+OPTIONS_DEFINE=	EXIV2 LCMS LIRC GPS TIFF DOCS
 OPTIONS_DEFAULT=EXIV2 LCMS
 EXIV2_DESC=	Metadata editing
 LCMS_DESC=	Color adjusting
 LIRC_DESC=	Remote control
 GPS_DESC=	GPS map support via libchamplain (experimental!)
 
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CONFIGURE_ENABLE=	exiv2
 
-LCMS_LIB_DEPENDS=	liblcms.so:graphics/lcms
+LCMS_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
 LCMS_CONFIGURE_ENABLE=	lcms
 
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CONFIGURE_ENABLE=	lirc
 
-GPS_LIB_DEPENDS=	libchamplain-0.8.so:graphics/libchamplain08
-GPS_CONFIGURE_ENABLE=	gps
+GPS_LIB_DEPENDS=	libchamplain-0.12.so:graphics/libchamplain \
+			libclutter-gtk-1.0.so:graphics/clutter-gtk3
+GPS_CONFIGURE_ENABLE=	gps clutter
 
+TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
+TIFF_CONFIGURE_ENABLE=	tiff
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|champlain-0\.4|champlain-0.8|g; \
-		s|champlain-gtk-0\.4|champlain-gtk-0.8|g' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|MAP_ANONYMOUS|MAP_ANON|' ${WRKSRC}/src/main.c
-	@${REINPLACE_CMD} -e 's| -r %F||' ${WRKSRC}/geeqie.desktop
+	@${REINPLACE_CMD} -e 's| -r %F||' ${WRKSRC}/geeqie.desktop.in
+	@${REINPLACE_CMD} -e '/readme_DATA/ s|COPYING||' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|lua5.1|lua-5.1|' ${WRKSRC}/configure.in
 # I cannot get gnome-doc-tool working properly: Outputs gibberish
 	@${REINPLACE_CMD} -Ee '/^(SUBDIRS|DIST_SUBDIRS)/ s|doc||' \
-		${WRKSRC}/Makefile.in
+		${WRKSRC}/Makefile.am
 
 .include <bsd.port.mk>
Index: head/graphics/geeqie/distinfo
===================================================================
--- head/graphics/geeqie/distinfo	(revision 416075)
+++ head/graphics/geeqie/distinfo	(revision 416076)
@@ -1,2 +1,2 @@
-SHA256 (geeqie-1.1.tar.gz) = 5544e81c29917a647f19bfe800d9f0dd1cd5b890329feebd9abd80927e1afecf
-SIZE (geeqie-1.1.tar.gz) = 1966211
+SHA256 (geeqie-1.2.3.tar.xz) = 2629bf33a9070fad4804b1ef051c3bf8a8fdad3bba4e6188dc20588185003248
+SIZE (geeqie-1.2.3.tar.xz) = 1129804
Index: head/graphics/geeqie/files/patch-plugins-ufraw-geeqie-ufraw
===================================================================
--- head/graphics/geeqie/files/patch-plugins-ufraw-geeqie-ufraw	(revision 416075)
+++ head/graphics/geeqie/files/patch-plugins-ufraw-geeqie-ufraw	(nonexistent)
@@ -1,35 +0,0 @@
---- plugins/ufraw/geeqie-ufraw.orig	2010-02-18 00:21:15.000000000 +0300
-+++ plugins/ufraw/geeqie-ufraw	2010-05-22 17:06:21.000000000 +0400
-@@ -37,7 +37,7 @@
- 
-     basename=${input%.*}
-     dirname=${basename%/*}
--    xmp=`find "$dirname" -maxdepth 1 -path "$basename.*" -regextype posix-egrep -iregex "$XMP_REGEX" -print | head -n 1`
-+    xmp=`find -E "$dirname" -maxdepth 1 -path "$basename.*" -iregex "$XMP_REGEX" -print | head -n 1`
-     [ -f "$xmp" ] || return 1
- 
-     output=`get_output_from_id "$idfile"`
-@@ -75,7 +75,7 @@
-     rawfile=$1
-     basename=${rawfile%.*}
-     dirname=${basename%/*}
--    outfiles=`find "$dirname" -maxdepth 1 -path "$basename.*" -regextype posix-egrep \( -iregex "$OUT_REGEX" -o -regex "$ID_REGEX" \) -print `
-+    outfiles=`find -E "$dirname" -maxdepth 1 -path "$basename.*" \( -iregex "$OUT_REGEX" -o -regex "$ID_REGEX" \) -print `
-     [ -z "$outfiles" ] # return true if no possible output file exists
- 
-     # raw+jpeg pair created by the camera is considered processed, 
-@@ -136,12 +136,12 @@
- {
-     list=`mktemp /tmp/geeqie-ufraw-list.XXXXXXXXXX` || exit 1
- 
--    find "$@" -regextype posix-egrep -iregex "$RAW_REGEX" -print | while read rawfile ; do
-+    find -E "$@" -iregex "$RAW_REGEX" -print | while read rawfile ; do
-         raw_file_not_processed "$rawfile" && echo "$rawfile" 
-     done >>$list
-     
-     #refresh output from changed id files
--    find "$@" -regextype posix-egrep -regex "$ID_REGEX" -print | while read idfile ; do
-+    find -E "$@" -regex "$ID_REGEX" -print | while read idfile ; do
-         id_file_changed "$idfile" && echo "$idfile"
-     done >>$list
- 

Property changes on: head/graphics/geeqie/files/patch-plugins-ufraw-geeqie-ufraw
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/graphics/geeqie/files/patch-plugins_ufraw_geeqie-ufraw
===================================================================
--- head/graphics/geeqie/files/patch-plugins_ufraw_geeqie-ufraw	(nonexistent)
+++ head/graphics/geeqie/files/patch-plugins_ufraw_geeqie-ufraw	(revision 416076)
@@ -0,0 +1,35 @@
+--- plugins/ufraw/geeqie-ufraw.orig	2016-03-07 10:21:06 UTC
++++ plugins/ufraw/geeqie-ufraw
+@@ -37,7 +37,7 @@ add_xmp_from_sidecar ()
+ 
+     basename=${input%.*}
+     dirname=${basename%/*}
+-    xmp=`find "$dirname" -maxdepth 1 -path "$basename.*" -regextype posix-egrep -iregex "$XMP_REGEX" -print | head -n 1`
++    xmp=`find -E "$dirname" -maxdepth 1 -path "$basename.*" -iregex "$XMP_REGEX" -print | head -n 1`
+     [ -f "$xmp" ] || return 1
+ 
+     output=`get_output_from_id "$idfile"`
+@@ -75,7 +75,7 @@ raw_file_not_processed ()
+     rawfile=$1
+     basename=${rawfile%.*}
+     dirname=${basename%/*}
+-    outfiles=`find "$dirname" -maxdepth 1 -path "$basename.*" -regextype posix-egrep \( -iregex "$OUT_REGEX" -o -regex "$ID_REGEX" \) -print `
++    outfiles=`find -E "$dirname" -maxdepth 1 -path "$basename.*" \( -iregex "$OUT_REGEX" -o -regex "$ID_REGEX" \) -print `
+     [ -z "$outfiles" ] # return true if no possible output file exists
+ 
+     # raw+jpeg pair created by the camera is considered processed, 
+@@ -136,12 +136,12 @@ process_tree ()
+ {
+     list=`mktemp /tmp/geeqie-ufraw-list.XXXXXXXXXX` || exit 1
+ 
+-    find "$@" -regextype posix-egrep -iregex "$RAW_REGEX" -print | while read rawfile ; do
++    find -E "$@" -iregex "$RAW_REGEX" -print | while read rawfile ; do
+         raw_file_not_processed "$rawfile" && echo "$rawfile" 
+     done >>$list
+     
+     #refresh output from changed id files
+-    find "$@" -regextype posix-egrep -regex "$ID_REGEX" -print | while read idfile ; do
++    find -E "$@" -regex "$ID_REGEX" -print | while read idfile ; do
+         id_file_changed "$idfile" && echo "$idfile"
+     done >>$list
+ 

Property changes on: head/graphics/geeqie/files/patch-plugins_ufraw_geeqie-ufraw
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/graphics/geeqie/files/patch-src_renderer-clutter.c
===================================================================
--- head/graphics/geeqie/files/patch-src_renderer-clutter.c	(nonexistent)
+++ head/graphics/geeqie/files/patch-src_renderer-clutter.c	(revision 416076)
@@ -0,0 +1,30 @@
+From 411ef45d8fbda079d51abeba997017e9508fa7a7 Mon Sep 17 00:00:00 2001
+From: Colin Clark <cclark@mcb.net>
+Date: Tue, 29 Mar 2016 18:18:05 +0100
+Subject: [PATCH 1/1] Update for new cogl version
+
+Parameters for cogl_texture_3d_new_from_data have changed.
+
+--- src/renderer-clutter.c.orig	2016-03-07 10:21:06 UTC
++++ src/renderer-clutter.c
+@@ -234,7 +234,19 @@ static void rc_prepare_post_process_lut(
+ 	g_object_unref(tmp_pixbuf);
+ 
+ 	DEBUG_0("%s clut upload start", get_exec_time());
+-#if CLUTTER_CHECK_VERSION(1,10,0)
++#if COGL_VERSION_CHECK(1,18,2)
++	{
++	CoglContext *ctx = clutter_backend_get_cogl_context(clutter_get_default_backend ());
++
++	tex3d = cogl_texture_3d_new_from_data(ctx,
++					      CLUT_SIZE, CLUT_SIZE, CLUT_SIZE,
++					      COGL_PIXEL_FORMAT_RGB_888,
++					      CLUT_SIZE * 3,
++					      CLUT_SIZE * CLUT_SIZE * 3,
++					      clut,
++					      NULL);
++	}
++#elif COGL_VERSION_CHECK(1,10,4)
+ 	{
+ 	CoglContext *ctx = clutter_backend_get_cogl_context(clutter_get_default_backend ());
+ 

Property changes on: head/graphics/geeqie/files/patch-src_renderer-clutter.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/graphics/geeqie/files/patch-src_view__file_icon.c
===================================================================
--- head/graphics/geeqie/files/patch-src_view__file_icon.c	(nonexistent)
+++ head/graphics/geeqie/files/patch-src_view__file_icon.c	(revision 416076)
@@ -0,0 +1,18 @@
+--- ./src/view_file_icon.c.orig	2016-05-28 21:43:05 UTC
++++ ./src/view_file_icon.c
+@@ -379,6 +379,7 @@ static void vficon_mark_toggled_cb(GtkCe
+ 
+ static void tip_show(ViewFile *vf)
+ {
++	return; // or crash
+ 	GtkWidget *label;
+ 	gint x, y;
+ 
+@@ -460,6 +461,7 @@ static void tip_unschedule(ViewFile *vf)
+ 
+ static void tip_update(ViewFile *vf, IconData *id)
+ {
++	return; // or crash
+ 	if (VFICON(vf)->tip_window)
+ 		{
+ 		gint x, y;

Property changes on: head/graphics/geeqie/files/patch-src_view__file_icon.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/graphics/geeqie/pkg-descr
===================================================================
--- head/graphics/geeqie/pkg-descr	(revision 416075)
+++ head/graphics/geeqie/pkg-descr	(revision 416076)
@@ -1,15 +1,15 @@
 Geeqie is a lightweight Gtk+ based image viewer for Unix operating systems.
 
 Main features
   o EXIF, IPTC and XMP metadata browsing and editing.
   o Interoperability, easy integration with other software.
   o geeqie works on files and directories, there is no need to import images.
   o Fast preview for many raw image formats.
   o Tools for image comparison, sorting and managing photo collection.
 
 History
   Geeqie has been forked from gqview project, because it was not possible to
   contact gqview author and the only maintainer. Geeqie projects goal is to move
   the development forward and also integrate the existing patches.
 
-WWW: http://geeqie.sourceforge.net/
+WWW: http://www.geeqie.org/