From c5eaec4c72ec0db1aa310c1106c525f346bebc9c Mon Sep 17 00:00:00 2001
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Wed, 10 Jan 2024 14:39:02 +0000
Subject: [PATCH] x11-wm/wmakerconf: undeprecate the port, assume
 maintainership

- Drop unused run-time dependency on `archivers/rpm4' and bogus
  CONFIGURE_ARGS (esp. --with-wmakeretcprefix=${LOCALBASE}/share
  which is plain wrong), trim some vertical whitespace
- Fix getstyle(1) program invocation and actually capture its
  output; this also gets rid of the segmentation fault on exit
- Limit the scope of the WMWritePropListToFile() calls patching
  so it only touches needed files
---
 x11-wm/wmakerconf/Makefile                    | 21 ++++++-------------
 .../wmakerconf/files/patch-src_themebrowser.c |  9 ++++++++
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 065e02c7e8692..2cafc91ec7535 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -1,38 +1,28 @@
 PORTNAME=	wmakerconf
 PORTVERSION=	2.12
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Configuration tool for Window Maker
 WWW=		https://sourceforge.net/projects/wmakerconf/
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-DEPRECATED=	Last upstream release was in 2007
-EXPIRATION_DATE=	2024-01-17
-
-LIB_DEPENDS=	\
-		libWINGs.so:x11-wm/windowmaker \
+LIB_DEPENDS=	libWINGs.so:x11-wm/windowmaker \
 		libharfbuzz.so:print/harfbuzz \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libwraster.so:x11-wm/libwraster
-RUN_DEPENDS=	rpm:archivers/rpm4
 
 USES=		gettext pkgconfig perl5 gmake gnome localbase shebangfix xorg
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_XORG=	x11
-
 SHEBANG_FILES=	scripts/getfile.pl.in scripts/upgrade.pl.in
-
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-wmakerdataprefix="${LOCALBASE}/share" \
-		--with-wmakeretcprefix="${LOCALBASE}/share"
-
 LIBS=		-lintl -lX11 -lWUtil
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
@@ -53,7 +43,8 @@ post-patch:
 .for file in data/po/ja.po po/ja.po
 	@${REINPLACE_CMD} -e 's|JISX-0208-1983-0|euc-jp|g' ${WRKSRC}/${file}
 .endfor
-	@${FIND} ${WRKSRC}/src -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \
-		'/WMWritePropListToFile/s|,[[:space:]]YES||g'
+	@${REINPLACE_CMD} -e '/WMWritePropListToFile/s|,[[:space:]]YES||' \
+		${WRKSRC}/src/menu.c ${WRKSRC}/src/rootmenu.c \
+		${WRKSRC}/src/wmconfig.c
 
 .include <bsd.port.mk>
diff --git a/x11-wm/wmakerconf/files/patch-src_themebrowser.c b/x11-wm/wmakerconf/files/patch-src_themebrowser.c
index be409657b4100..ec642e89db439 100644
--- a/x11-wm/wmakerconf/files/patch-src_themebrowser.c
+++ b/x11-wm/wmakerconf/files/patch-src_themebrowser.c
@@ -27,6 +27,15 @@
        {
  	 dialog_popup (DIALOG_ERROR, NULL, NULL,
  		       _("Can't save theme file\n`%s'\n"
+@@ -2897,7 +2897,7 @@ getstyle_call (const char *themename)
+  */
+ {
+    char *quotedname = protect_quotes (g_strdup (themename));
+-   char	*cmdline    = g_strconcat (GETSTYLE, " -t \"", quotedname, "\"", NULL);
++   char	*cmdline    = g_strconcat (GETSTYLE, " -t > \"", quotedname, "\"", NULL);
+    bool_t success   = !system (cmdline);
+ 
+    Free (cmdline);
 @@ -3526,17 +3526,17 @@ compute_preview (GtkWidget *progress_bar, GtkWidget *p
     path  = get_pixmap_path (pname);