git: 695cccdd5a00 - main - graphics/imv: Update to 4.3.0

[Nuno Teixeira]

The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=695cccdd5a00e9690e9b0855596cd7ffa7e770b2

commit 695cccdd5a00e9690e9b0855596cd7ffa7e770b2
Author:     Nuno Teixeira <eduardo at FreeBSD.org>
AuthorDate: 2021-08-07 16:06:13 +0000
Commit:     Nuno Teixeira <eduardo at FreeBSD.org>
CommitDate: 2021-08-07 16:11:49 +0000

    graphics/imv: Update to 4.3.0
    
     * use pkg-plist file instead of Makefile PLIST_FILES due to its size
     * reformat Makefile with portfmt
     * pet portlint
    
    ChangeLog: https://github.com/eXeC64/imv/blob/master/CHANGELOG
---
 graphics/imv/Makefile  | 42 +++++++++++++++++++-----------------------
 graphics/imv/distinfo  |  6 +++---
 graphics/imv/pkg-plist | 12 ++++++++++++
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/graphics/imv/Makefile b/graphics/imv/Makefile
index 0d33228e3806..3c3ba03af047 100644
--- a/graphics/imv/Makefile
+++ b/graphics/imv/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	imv
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.2.0
-PORTREVISION=	2
+DISTVERSION=	4.3.0
 CATEGORIES=	graphics
 
 MAINTAINER=	eduardo at FreeBSD.org
@@ -14,42 +13,36 @@ BUILD_DEPENDS=	a2x:textproc/asciidoc
 LIB_DEPENDS=	libicuuc.so:devel/icu \
 		libinih.so:devel/inih \
 		libxkbcommon.so:x11/libxkbcommon
+RUN_DEPENDS=	bash:shells/bash
 
-USES=		compiler:c11 desktop-file-utils gettext-runtime gl gnome \
-		meson pkgconfig
+USES=		compiler:c11 desktop-file-utils gettext-runtime gl gnome meson \
+		pkgconfig shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	eXeC64
 USE_GL=		egl
 USE_GNOME=	cairo glib20 pango
-
-PLIST_FILES=	bin/imv \
-		bin/imv-msg \
-		etc/imv_config \
-		man/man1/imv-msg.1.gz \
-		man/man1/imv.1.gz \
-		man/man5/imv.5.gz \
-		share/applications/imv.desktop
+SHEBANG_FILES=	contrib/imv-folder
 
 OPTIONS_DEFINE=		FREEIMAGE HEIF JPEG NSGIF PNG SVG TEST TIFF
-OPTIONS_DEFAULT=	FREEIMAGE HEIF JPEG NSGIF PNG SVG TIFF ALL
+OPTIONS_DEFAULT=	ALL FREEIMAGE HEIF JPEG NSGIF PNG SVG TIFF
 OPTIONS_SINGLE=		WIN
-OPTIONS_SINGLE_WIN=	WAYLAND X11 ALL
+OPTIONS_SINGLE_WIN=	ALL WAYLAND X11
 OPTIONS_SUB=		yes
 
+ALL_DESC=	Both Wayland and X11 support
 FREEIMAGE_DESC=	FreeImage backend (support for many image formats)
 HEIF_DESC=	HEIF backend
 NSGIF_DESC=	NetSurf GIF backend (support for animated GIF)
 WIN_DESC=	Windowing system
 
 ALL_LIB_DEPENDS+=	libwayland-client.so:graphics/wayland
-ALL_USES=	xorg
-ALL_USE=	gl=glu xorg=x11,xcb
-ALL_MESON_ON=	-Dwindows=all
-ALL_PLIST_FILES=	bin/imv-wayland \
-			bin/imv-x11
+ALL_USES=		xorg
+ALL_USE=		GL=glu \
+			XORG=x11,xcb
+ALL_MESON_ON=		-Dwindows=all
 
-FREEIMAGE_LIB_DEPENDS=	libfreeimage.so:graphics/freeimage
-FREEIMAGE_MESON_ENABLED=freeimage
+FREEIMAGE_LIB_DEPENDS=		libfreeimage.so:graphics/freeimage
+FREEIMAGE_MESON_ENABLED=	freeimage
 
 HEIF_LIB_DEPENDS=	libheif.so:graphics/libheif
 HEIF_MESON_ENABLED=	libheif
@@ -77,8 +70,11 @@ WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland \
 WAYLAND_MESON_ON=	-Dwindows=wayland
 
 X11_USES=	xorg
-X11_USE=	gl=glu \
-		xorg=x11,xcb
+X11_USE=	GL=glu \
+		XORG=x11,xcb
 X11_MESON_ON=	-Dwindows=x11
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|--sort=version|-V|g' ${WRKSRC}/contrib/imv-folder
+
 .include <bsd.port.mk>
diff --git a/graphics/imv/distinfo b/graphics/imv/distinfo
index d0fab260c6f1..35df1c41378d 100644
--- a/graphics/imv/distinfo
+++ b/graphics/imv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618557342
-SHA256 (eXeC64-imv-v4.2.0_GH0.tar.gz) = 7d3de0462ce0cd705a719b12648661c8d91245cc7732eac4e459c465bc6b3d94
-SIZE (eXeC64-imv-v4.2.0_GH0.tar.gz) = 77809
+TIMESTAMP = 1628267179
+SHA256 (eXeC64-imv-v4.3.0_GH0.tar.gz) = ad724a41366bb96d29e272f442f5378465fe163d16ec51d7abaa86b1fff7dbb6
+SIZE (eXeC64-imv-v4.3.0_GH0.tar.gz) = 79031
diff --git a/graphics/imv/pkg-plist b/graphics/imv/pkg-plist
new file mode 100644
index 000000000000..0a093bb04216
--- /dev/null
+++ b/graphics/imv/pkg-plist
@@ -0,0 +1,12 @@
+bin/imv
+bin/imv-folder
+bin/imv-msg
+%%ALL%%bin/imv-wayland
+%%ALL%%bin/imv-x11
+etc/imv_config
+man/man1/imv-folder.1.gz
+man/man1/imv-msg.1.gz
+man/man1/imv.1.gz
+man/man5/imv.5.gz
+share/applications/imv-folder.desktop
+share/applications/imv.desktop