From 122a6c1e2865691f7faf1446509c72a1bcd2bce5 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Wed, 28 Dec 2022 16:39:57 +0000
Subject: [PATCH] Update to pan-0.153.

---
 news/pan/Makefile                             | 57 ++++++++++---------
 news/pan/distinfo                             |  4 +-
 .../patches/patch-pan_general_string-view_h   | 14 -----
 3 files changed, 32 insertions(+), 43 deletions(-)
 delete mode 100644 news/pan/patches/patch-pan_general_string-view_h

diff --git a/news/pan/Makefile b/news/pan/Makefile
index 4ec99c97ce7..9134b34a61c 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -1,13 +1,20 @@
-COMMENT=	powerful newsreader
+COMMENT=		powerful newsreader
 
-V=		0.149
-DISTNAME=	pan-${V}
-CATEGORIES=	news x11
+GNOME_PROJECT=		pan
+GNOME_VERSION=		v0.153
+PKGNAME=		${GNOME_PROJECT}-${GNOME_VERSION:S/v//}
 
-HOMEPAGE=	http://pan.rebelbase.com/
+# override gnome MODULE
+MASTER_SITES=		https://gitlab.gnome.org/GNOME/pan/-/archive/${GNOME_VERSION}/
+EXTRACT_SUFX=		.tar.gz
+
+CATEGORIES=		news x11
+
+HOMEPAGE=		http://pan.rebelbase.com/
 
 # GPLv2 - GFDLv1.1
-PERMIT_PACKAGE=	Yes
+PERMIT_PACKAGE=		Yes
+
 
 WANTLIB += ${COMPILER_LIBCXX} atk-1.0 c cairo cairo-gobject enchant-2
 WANTLIB += gck-1 gcr-base-3 gcr-ui-3 gdk-3 gdk_pixbuf-2.0 gio-2.0
@@ -15,33 +22,29 @@ WANTLIB += glib-2.0 gmime-3.0 gmodule-2.0 gnutls gobject-2.0 gthread-2.0
 WANTLIB += gtk-3 gtkspell3-3 harfbuzz iconv intl m notify p11-kit
 WANTLIB += pango-1.0 pangocairo-1.0 secret-1 z
 
-COMPILER=	base-clang ports-gcc base-gcc
+MODULES=		x11/gnome
 
-USE_GMAKE= 	Yes
+COMPILER=		base-clang ports-gcc base-gcc
 
-MASTER_SITES=	http://pan.rebelbase.com/download/releases/${V}/source/
+MODGNOME_LDFLAGS=	-L${LOCALBASE}/lib -liconv
+MODGNOME_TOOLS=		desktop-file-utils gtk-update-icon-cache
 
-BUILD_DEPENDS=	devel/gettext,-tools \
-		textproc/itstool
+BUILD_DEPENDS=		devel/gettext,-tools \
+			textproc/itstool
 
-LIB_DEPENDS=	devel/libnotify \
-		mail/gmime30 \
-		security/gnutls \
-		textproc/gtkspell3 \
-		x11/gnome/gcr
+LIB_DEPENDS=		devel/libnotify \
+			mail/gmime30 \
+			security/gnutls \
+			textproc/gtkspell3 \
+			x11/gnome/gcr
 
-RUN_DEPENDS=	devel/desktop-file-utils \
-		x11/gtk+3,-guic
+AUTOCONF_VERSION=	2.71
+AUTOMAKE_VERSION=	1.16
 
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE=	autoreconf
 
-# GLIB_VERSION_MIN_REQUIRED to fix build with GLib >=2.68
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26" \
-		LDFLAGS="-L${LOCALBASE}/lib -liconv"
-
-CONFIGURE_ARGS=	--with-gtk3 \
-		--enable-libnotify \
-		--enable-gkr \
-		--with-gnutls
+CONFIGURE_ARGS=		--enable-libnotify \
+			--enable-gkr \
+			--with-gnutls
 
 .include <bsd.port.mk>
diff --git a/news/pan/distinfo b/news/pan/distinfo
index bfdf0ce3689..26b9c6224da 100644
--- a/news/pan/distinfo
+++ b/news/pan/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pan-0.149.tar.gz) = JEUlISW8VtAi3aEjat+AroUnS0HlACxWZ7DgMnJbMrc=
-SIZE (pan-0.149.tar.gz) = 3339054
+SHA256 (pan-v0.153.tar.gz) = D3HlUYo8trKfRwE03YbGik/ae7zPzJiFbAMB9/Sm3a8=
+SIZE (pan-v0.153.tar.gz) = 2503345
diff --git a/news/pan/patches/patch-pan_general_string-view_h b/news/pan/patches/patch-pan_general_string-view_h
deleted file mode 100644
index 28913ad17fa..00000000000
--- a/news/pan/patches/patch-pan_general_string-view_h
+++ /dev/null
@@ -1,14 +0,0 @@
-text-match.cc:475:8: error: no viable conversion from 'pan::StringView' to 'std::string'
-
-Index: pan/general/string-view.h
---- pan/general/string-view.h.orig
-+++ pan/general/string-view.h
-@@ -95,7 +95,7 @@ namespace pan
-          std::string to_string () const {return empty()
-                                          ? std::string()
-                                          : std::string(str,str+len); }
--         operator const std::string () const { return to_string(); }
-+         operator std::string () const { return to_string(); }
- 
-          StringView substr (const char * start, const char * end) const;
-          void substr (const char * start, const char * end, StringView& setme) const;