15 files changed, 25 insertions, 281 deletions

diff --git a/graphics/Makefile b/graphics/Makefile
index 148633560642..11b4d4734643 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -224,7 +224,6 @@
     SUBDIR += gdk-pixbuf2
     SUBDIR += gdtclft
     SUBDIR += geeqie
-    SUBDIR += geeqie-devel
     SUBDIR += gegl
     SUBDIR += generic_image_decoder
     SUBDIR += geoapi
diff --git a/graphics/geeqie-devel/Makefile b/graphics/geeqie-devel/Makefile
deleted file mode 100644
index 5b26b0c8bd45..000000000000
--- a/graphics/geeqie-devel/Makefile
+++ /dev/null
@@ -1,95 +0,0 @@
-# Created by: Martin Tournoij <carpetsmoker@rwxrwxrwx.net>
-# $FreeBSD$
-
-PORTNAME=	geeqie
-PORTVERSION=	1.5.1.git20200724
-PORTREVISION=	2
-CATEGORIES=	graphics
-PKGNAMESUFFIX=	-devel
-
-MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	Lightweight image viewer forked from GQview
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-LIB_DEPENDS=	libpng.so:graphics/png
-RUN_DEPENDS=	bash:shells/bash
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	BestImageViewer
-GH_TAGNAME=	d6195e5
-
-CONFLICTS=	geeqie-[0-9]*
-
-USES=		autoreconf compiler:c++11-lang gettext gmake gnome jpeg \
-		localbase pkgconfig desktop-file-utils tar:xz lua:53 shebangfix
-USE_GNOME=	intltool
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-readmedir="${DOCSDIR}"
-CONFIGURE_ARGS+=--disable-j2k  # not in ports (yet), disable proactively to avoid hidden dependency
-SHEBANG_FILES=	plugins/*/geeqie-*
-
-PORTDOCS=	*
-
-OPTIONS_DEFINE=	EXIV2 LCMS LIRC MAP TIFF PDF FFMPEGTHUMBNAILER DOCS NLS HEIF WEBP DJVU OPENJPEG
-OPTIONS_DEFAULT=EXIV2 LCMS GTK3 PDF FFMPEGTHUMBNAILER HEIF WEBP DJVU OPENJPEG
-OPTIONS_SINGLE=	TOOLKIT
-OPTIONS_SINGLE_TOOLKIT=GTK2 GTK3
-OPTIONS_SUB=	yes
-
-EXIV2_DESC=	Metadata editing
-LCMS_DESC=	Color adjusting
-LIRC_DESC=	Remote control (broken)
-MAP_DESC=	GPS map support via libchamplain
-TOOLKIT_DESC=	Graphical user interface toolkit
-GTK2_DESC=	Use GTK 2
-GTK3_DESC=	Use GTK 3
-HEIF_DESC=	HEIF image format support
-
-EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
-EXIV2_CONFIGURE_ENABLE=	exiv2
-
-LCMS_LIB_DEPENDS=	liblcms2.so:graphics/lcms2
-LCMS_CONFIGURE_ENABLE=	lcms
-
-LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
-LIRC_CONFIGURE_ENABLE=	lirc
-LIRC_CONFIGURE_ON=	--with-lirc-prefix="${LOCALBASE}"
-LIRC_BROKEN=		does not build with old lirc from ports
-
-MAP_LIB_DEPENDS=	libchamplain-0.12.so:graphics/libchamplain \
-			libclutter-gtk-1.0.so:graphics/clutter-gtk3
-MAP_CONFIGURE_ENABLE=	map gpu-accel
-MAP_REQUIRES=		GTK3
-
-TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
-TIFF_CONFIGURE_ENABLE=	tiff
-
-GTK2_USE=		GNOME=gtk20
-GTK3_USE=		GNOME=gtk30
-GTK3_CONFIGURE_ENABLE=	gtk3
-
-PDF_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
-PDF_CONFIGURE_ENABLE=	pdf
-PDF_REQUIRES=		GTK3
-
-FFMPEGTHUMBNAILER_DESC=	Video file thumbnails generating support
-FFMPEGTHUMBNAILER_CONFIGURE_ENABLE=	ffmpegthumbnailer
-FFMPEGTHUMBNAILER_LIB_DEPENDS=	libffmpegthumbnailer.so:multimedia/ffmpegthumbnailer
-
-NLS_CONFIGURE_ENABLE=	nls
-
-HEIF_CONFIGURE_ENABLE=	heif
-HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
-
-WEBP_CONFIGURE_ENABLE=	webp
-WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
-
-DJVU_CONFIGURE_ENABLE=	djvu
-DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
-
-OPENJPEG_CONFIGURE_ENABLE=	j2k
-OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
-
-.include <bsd.port.mk>
diff --git a/graphics/geeqie-devel/distinfo b/graphics/geeqie-devel/distinfo
deleted file mode 100644
index bf5b6bd6aa54..000000000000
--- a/graphics/geeqie-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1598617789
-SHA256 (BestImageViewer-geeqie-1.5.1.git20200724-d6195e5_GH0.tar.gz) = fd7be00cff302c5813c5dd26809506c67bc43a6a3d61e4f91d322d6a80809385
-SIZE (BestImageViewer-geeqie-1.5.1.git20200724-d6195e5_GH0.tar.gz) = 37626411
diff --git a/graphics/geeqie-devel/files/patch-Makefile.am b/graphics/geeqie-devel/files/patch-Makefile.am
deleted file mode 100644
index 4bd94c141248..000000000000
--- a/graphics/geeqie-devel/files/patch-Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.am.orig	2019-08-20 19:01:23 UTC
-+++ Makefile.am
-@@ -2,8 +2,8 @@
- 
- include $(top_srcdir)/aminclude.am
- 
--SUBDIRS = src po doc plugins
--DIST_SUBDIRS = src po doc plugins
-+SUBDIRS = src po plugins
-+DIST_SUBDIRS = src po plugins
- 
- man_MANS = geeqie.1
- 
-@@ -12,7 +12,7 @@ readmedir = @readmedir@
- if HAVE_MARKDOWN
- readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS README.html ChangeLog.html
- else
--readme_DATA = README.md COPYING ChangeLog TODO README.lirc AUTHORS ChangeLog.html
-+readme_DATA = README.md TODO README.lirc AUTHORS
- endif
- 
- desktopdir = $(datadir)/applications
diff --git a/graphics/geeqie-devel/files/patch-configure.ac b/graphics/geeqie-devel/files/patch-configure.ac
deleted file mode 100644
index f3aa9b46c1e1..000000000000
--- a/graphics/geeqie-devel/files/patch-configure.ac
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.ac.orig	2020-07-24 09:03:17 UTC
-+++ configure.ac
-@@ -15,7 +15,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOS
- dnl GNU General Public License for more details.
- 
- AC_PREREQ(2.57)
--AC_INIT([geeqie], m4_esyscmd_s(git rev-parse --quiet --verify --short HEAD), [geeqie@freelists.org], [], [http://www.geeqie.org/])
-+AC_INIT([geeqie], git, [geeqie@freelists.org], [], [http://www.geeqie.org/])
- 
- # Add -Werror to the default CFLAGS
- CFLAGS+=" -Werror -Wno-error=deprecated-declarations -Wno-error=sign-compare -Wno-error=return-type"
-@@ -525,7 +525,7 @@ AC_ARG_ENABLE([lua],
-     [liblua=$enableval], [liblua=auto])
- 
- if test "x${liblua}" != "xno"; then
--  PKG_CHECK_MODULES(LUA, lua5.3 >= 5.3,
-+  PKG_CHECK_MODULES(LUA, lua-5.3 >= 5.3,
-     [
-       HAVE_LUA=yes
-       AC_DEFINE(HAVE_LUA, 1, [define to enable lua support])
-@@ -688,7 +688,7 @@ AC_SUBST(DJVU_LIBS)
- #  Markdown support
- # ----------------------------------------------------------------------
- 
--AM_CONDITIONAL(HAVE_MARKDOWN, [ "$(command -v markdown)" ])
-+AM_CONDITIONAL(HAVE_MARKDOWN, [ "$(false)" ])
- 
- # _NL_TIME_FIRST_WEEKDAY support
- # note that it is an enum and not a define
diff --git a/graphics/geeqie-devel/pkg-descr b/graphics/geeqie-devel/pkg-descr
deleted file mode 100644
index f5c149c97933..000000000000
--- a/graphics/geeqie-devel/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-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://www.geeqie.org/
diff --git a/graphics/geeqie-devel/pkg-plist b/graphics/geeqie-devel/pkg-plist
deleted file mode 100644
index ca690c49dab7..000000000000
--- a/graphics/geeqie-devel/pkg-plist
+++ /dev/null
@@ -1,66 +0,0 @@
-bin/geeqie
-lib/geeqie/geeqie-rotate
-lib/geeqie/geeqie-symlink
-lib/geeqie/geeqie-ufraw
-lib/geeqie/geocode-parameters.awk
-lib/geeqie/geeqie-camera-import
-lib/geeqie/geeqie-camera-import-hook-script
-lib/geeqie/geeqie-export-jpeg
-lib/geeqie/geeqie-image-crop
-lib/geeqie/geeqie-random-image
-lib/geeqie/geeqie-tethered-photography
-lib/geeqie/geeqie-tethered-photography-hook-script
-lib/geeqie/lensID
-man/man1/geeqie.1.gz
-share/applications/geeqie.desktop
-%%DATADIR%%/applications/camera-import.desktop
-%%DATADIR%%/applications/export-jpeg.desktop
-%%DATADIR%%/applications/geeqie-ufraw-id.desktop
-%%DATADIR%%/applications/geeqie-ufraw-recursive.desktop
-%%DATADIR%%/applications/geeqie-ufraw.desktop
-%%DATADIR%%/applications/image-crop.desktop
-%%DATADIR%%/applications/random-image.desktop
-%%DATADIR%%/applications/rotate.desktop
-%%DATADIR%%/applications/symlink.desktop
-%%DATADIR%%/applications/tethered-photography.desktop
-%%DATADIR%%/template.desktop
-%%NLS%%share/locale/ar/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/be/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/bg/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/da/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/de/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/el/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/es/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/et/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/id/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/it/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/sl/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/sr@latin/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/th/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/tlh/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/vi/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/geeqie.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/geeqie.mo
-share/metainfo/org.geeqie.Geeqie.appdata.xml
-share/pixmaps/geeqie.png
diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 9d5993923a73..80cf00e45cbf 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geeqie
-PORTVERSION=	1.5.1
-PORTREVISION=	12
+PORTVERSION=	1.6
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.geeqie.org/
 
@@ -23,12 +22,13 @@ USES=		autoreconf compiler:c++11-lang gettext gmake gnome jpeg \
 USE_GNOME=	intltool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-readmedir="${DOCSDIR}"
+CONFIGURE_ARGS+=--disable-j2k  # not in ports (yet), disable proactively to avoid hidden dependency
 SHEBANG_FILES=	plugins/*/geeqie-*
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	EXIV2 LCMS LIRC MAP TIFF PDF FFMPEGTHUMBNAILER DOCS NLS
-OPTIONS_DEFAULT=EXIV2 LCMS GTK3 PDF FFMPEGTHUMBNAILER
+OPTIONS_DEFINE=	EXIV2 LCMS LIRC MAP TIFF PDF FFMPEGTHUMBNAILER DOCS NLS HEIF WEBP DJVU OPENJPEG
+OPTIONS_DEFAULT=EXIV2 LCMS GTK3 PDF FFMPEGTHUMBNAILER HEIF WEBP DJVU OPENJPEG
 OPTIONS_SINGLE=	TOOLKIT
 OPTIONS_SINGLE_TOOLKIT=GTK2 GTK3
 OPTIONS_SUB=	yes
@@ -40,6 +40,7 @@ MAP_DESC=	GPS map support via libchamplain
 TOOLKIT_DESC=	Graphical user interface toolkit
 GTK2_DESC=	Use GTK 2
 GTK3_DESC=	Use GTK 3
+HEIF_DESC=	HEIF image format support
 
 EXIV2_LIB_DEPENDS=	libexiv2.so:graphics/exiv2
 EXIV2_CONFIGURE_ENABLE=	exiv2
@@ -74,8 +75,16 @@ FFMPEGTHUMBNAILER_LIB_DEPENDS=	libffmpegthumbnailer.so:multimedia/ffmpegthumbnai
 
 NLS_CONFIGURE_ENABLE=	nls
 
-pre-build:
-	# fixes threaded build
-	@cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} gq-marshal.c
+HEIF_CONFIGURE_ENABLE=	heif
+HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
+
+WEBP_CONFIGURE_ENABLE=	webp
+WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
+
+DJVU_CONFIGURE_ENABLE=	djvu
+DJVU_LIB_DEPENDS=	libdjvulibre.so:graphics/djvulibre
+
+OPENJPEG_CONFIGURE_ENABLE=	j2k
+OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 
 .include <bsd.port.mk>
diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo
index f3c35be71ba3..ca18b7a41cec 100644
--- a/graphics/geeqie/distinfo
+++ b/graphics/geeqie/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566422244
-SHA256 (geeqie-1.5.1.tar.xz) = 4854d5d323c31f8f4068fd73ab2c454ff91e826c4ca4d37b22c246ad14dea10a
-SIZE (geeqie-1.5.1.tar.xz) = 1587116
+TIMESTAMP = 1606937789
+SHA256 (geeqie-1.6.tar.xz) = 48f8a4474454d182353100e43878754b76227f3b8f30cfc258afc9d90a4e1920
+SIZE (geeqie-1.6.tar.xz) = 1693488
diff --git a/graphics/geeqie/files/patch-Makefile.am b/graphics/geeqie/files/patch-Makefile.am
index 4bd94c141248..00d7be3edc8c 100644
--- a/graphics/geeqie/files/patch-Makefile.am
+++ b/graphics/geeqie/files/patch-Makefile.am
@@ -1,4 +1,4 @@
---- Makefile.am.orig	2019-08-20 19:01:23 UTC
+--- Makefile.am.orig	2020-11-20 21:36:33 UTC
 +++ Makefile.am
 @@ -2,8 +2,8 @@
  
diff --git a/graphics/geeqie/files/patch-configure.ac b/graphics/geeqie/files/patch-configure.ac
index 9f91619b1723..4f2ee4b8933e 100644
--- a/graphics/geeqie/files/patch-configure.ac
+++ b/graphics/geeqie/files/patch-configure.ac
@@ -1,6 +1,6 @@
---- configure.ac.orig	2019-08-20 19:01:23 UTC
+--- configure.ac.orig	2020-11-20 21:36:33 UTC
 +++ configure.ac
-@@ -518,7 +518,7 @@ AC_ARG_ENABLE([lua],
+@@ -525,7 +525,7 @@ AC_ARG_ENABLE([lua],
      [liblua=$enableval], [liblua=auto])
  
  if test "x${liblua}" != "xno"; then
@@ -9,7 +9,7 @@
      [
        HAVE_LUA=yes
        AC_DEFINE(HAVE_LUA, 1, [define to enable lua support])
-@@ -581,7 +581,7 @@ AC_SUBST(PDF_LIBS)
+@@ -688,7 +688,7 @@ AC_SUBST(DJVU_LIBS)
  #  Markdown support
  # ----------------------------------------------------------------------
  
diff --git a/graphics/geeqie/files/patch-options.c b/graphics/geeqie/files/patch-options.c
deleted file mode 100644
index 71094c6a6166..000000000000
--- a/graphics/geeqie/files/patch-options.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/options.c.orig	2019-08-20 19:01:23 UTC
-+++ src/options.c
-@@ -32,6 +32,9 @@
- #include "ui_fileops.h"
- #include "window.h"
- 
-+ConfOptions *options;
-+CommandLine *command_line;
-+
- ConfOptions *init_options(ConfOptions *options)
- {
- 	gint i;
diff --git a/graphics/geeqie/files/patch-options.h b/graphics/geeqie/files/patch-options.h
deleted file mode 100644
index ffec06f4e03b..000000000000
--- a/graphics/geeqie/files/patch-options.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/options.h.orig	2019-08-20 19:01:23 UTC
-+++ src/options.h
-@@ -321,8 +321,8 @@ struct _ConfOptions
- 	GList *disabled_plugins;
- };
- 
--ConfOptions *options;
--CommandLine *command_line;
-+extern ConfOptions *options;
-+extern CommandLine *command_line;
- 
- ConfOptions *init_options(ConfOptions *options);
- void setup_default_options(ConfOptions *options);
diff --git a/graphics/geeqie/files/patch-src_layout__util.c b/graphics/geeqie/files/patch-src_layout__util.c
deleted file mode 100644
index 8a6b0825fc58..000000000000
--- a/graphics/geeqie/files/patch-src_layout__util.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/layout_util.c.orig	2019-07-26 18:19:11 UTC
-+++ src/layout_util.c
-@@ -62,6 +62,8 @@
- #include <gdk/gdkkeysyms.h> /* for keyboard values */
- #include "keymap_template.c"
- 
-+#include <sys/wait.h> /* for WEXITSTATUS */
-+
- #define MENU_EDIT_ACTION_OFFSET 16
- #define FILE_COLUMN_POINTER 0
- 
diff --git a/graphics/geeqie/pkg-plist b/graphics/geeqie/pkg-plist
index 10cddc97d9a6..ca690c49dab7 100644
--- a/graphics/geeqie/pkg-plist
+++ b/graphics/geeqie/pkg-plist
@@ -10,6 +10,7 @@ lib/geeqie/geeqie-image-crop
 lib/geeqie/geeqie-random-image
 lib/geeqie/geeqie-tethered-photography
 lib/geeqie/geeqie-tethered-photography-hook-script
+lib/geeqie/lensID
 man/man1/geeqie.1.gz
 share/applications/geeqie.desktop
 %%DATADIR%%/applications/camera-import.desktop
@@ -61,4 +62,5 @@ share/applications/geeqie.desktop
 %%NLS%%share/locale/vi/LC_MESSAGES/geeqie.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/geeqie.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/geeqie.mo
+share/metainfo/org.geeqie.Geeqie.appdata.xml
 share/pixmaps/geeqie.png