diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 065e02c7e869..2cafc91ec753 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -1,59 +1,50 @@
 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}
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.gmo" -delete
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$(prefix)/share/locale|${STAGEDIR}${PREFIX}/share/locale|g' \
 		${WRKSRC}/data/po/Makefile.am ${WRKSRC}/data/po/Makefile.in \
 		${WRKSRC}/po/Makefile.in.in
 	@${REINPLACE_CMD} -e '/chmod 0/d' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -E '/\/usr\/share/d; \
 			      s|/usr/local|${LOCALBASE}|g ; \
 			      s|/usr/X11R6|${LOCALBASE}|g; \
 			      s|(share/pixmaps.*),|\1|g' \
 		${WRKSRC}/data/WMWmakerconf*
 .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 be409657b410..ec642e89db43 100644
--- a/x11-wm/wmakerconf/files/patch-src_themebrowser.c
+++ b/x11-wm/wmakerconf/files/patch-src_themebrowser.c
@@ -1,50 +1,59 @@
 --- src/themebrowser.c.orig	2007-04-12 10:38:44 UTC
 +++ src/themebrowser.c
 @@ -917,7 +917,7 @@ append_directory (const char *dirname, GtkCTree *tree,
        GtkCTreeNode *rootsibling = NULL;
  
        if (parent)
 -	 root = append_node ((char *) g_basename (dirname), tree, parent,
 +	 root = append_node ((char *) g_path_get_basename (dirname), tree, parent,
  			     sibling, NO);
        else
  	 root = append_node ((char *) dirname, tree, parent, sibling, NO);
 @@ -2284,7 +2284,7 @@ leave_preview (GtkWidget *button, gpointer ptr)
  	      g_list_length (list) > 1
  	      ? _("Show next preview")
  	      : _("Leave preview mode"), NULL, leave_preview, list,
 -	      _("Preview of `%s'"), g_basename (name));
 +	      _("Preview of `%s'"), g_path_get_basename (name));
     }
  }
  
 @@ -2705,7 +2705,7 @@ save_theme_backend (GtkWidget *widget, gpointer ptr)
  	 oldfiles = g_list_remove (oldfiles, tmp);
  	 Free (tmp);
        }
 -      if (!WMWritePropListToFile (theme, stylename, YES))
 +      if (!WMWritePropListToFile (theme, stylename))
        {
  	 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);
  
     gtk_progress_bar_update (GTK_PROGRESS_BAR (progress_bar), n / (double) nelem);
 -   gtk_label_set_text (GTK_LABEL (progress_label), g_basename (name));
 +   gtk_label_set_text (GTK_LABEL (progress_label), g_path_get_basename (name));
     while (gtk_events_pending ())
        gtk_main_iteration ();
  
     if (!path)
     {
 -      DIR *dir = opendir (g_dirname (pname));
 +      DIR *dir = opendir (g_path_get_dirname (pname));
  
        if (!dir)				/* Make ~/.wmakerconf directory */
        {
 -	 if (make_directory (g_dirname (pname)))
 +	 if (make_directory (g_path_get_dirname (pname)))
  	 {
  	    Free (pname);
  	    return;