From e25d44c210aa60f90f2cc1c82a3cb1f42442c20a Mon Sep 17 00:00:00 2001
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Tue, 25 Aug 2020 06:15:15 +0000
Subject: [PATCH] Unbreak the build against recent versions of
 `x11-wm/libwraster' which had removed deprecated
 ``get-{wraster,wutil,wings}-flags'' programs so consumers now have to call
 ``pkg-config wrlib ...'' to obtains various compilation and linking flags.

---
 x11-wm/wmakerconf/Makefile              |  4 +--
 x11-wm/wmakerconf/files/patch-configure | 38 +++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 x11-wm/wmakerconf/files/patch-configure

diff --git a/x11-wm/wmakerconf/Makefile b/x11-wm/wmakerconf/Makefile
index 3aeb1d226c58..a7fe91161f61 100644
--- a/x11-wm/wmakerconf/Makefile
+++ b/x11-wm/wmakerconf/Makefile
@@ -1,6 +1,5 @@
 # Created by: Dominik Rothert <dr@domix.de>
 # $FreeBSD$
-#    $MCom: ports/x11-wm/wmakerconf/Makefile,v 1.2 2006/10/05 07:31:44 mezz Exp $
 
 PORTNAME=	wmakerconf
 PORTVERSION=	2.12
@@ -27,13 +26,12 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-wmakerdataprefix="${LOCALBASE}/share" \
 		--with-wmakeretcprefix="${LOCALBASE}/share"
 USE_XORG=	x11
-LIBS+=		-L${LOCALBASE}/lib -lX11
+LIBS=		-L${LOCALBASE}/lib -lX11 -lWUtil
 
 post-extract:
 	@${FIND} ${WRKSRC} -name "*.gmo" -delete
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|lynx wget|lynx fetch|g' ${WRKSRC}/configure
 	@${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
diff --git a/x11-wm/wmakerconf/files/patch-configure b/x11-wm/wmakerconf/files/patch-configure
new file mode 100644
index 000000000000..c7dcb3cc6a12
--- /dev/null
+++ b/x11-wm/wmakerconf/files/patch-configure
@@ -0,0 +1,38 @@
+--- configure.orig	2007-04-12 10:52:31 UTC
++++ configure
+@@ -3458,7 +3458,7 @@ fi
+ libwmfun="no"
+ # Checks for wraster lib
+ # Extract the first word of "get-wings-flags", so it can be a program name with args.
+-set dummy get-wings-flags; ac_word=$2
++set dummy pkg-config; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_wraster+set}" = set; then
+@@ -3486,7 +3486,7 @@ done
+   ;;
+ esac
+ fi
+-wraster=$ac_cv_path_wraster
++wraster="$ac_cv_path_wraster wrlib"
+ 
+ if test -n "$wraster"; then
+   echo "$as_me:$LINENO: result: $wraster" >&5
+@@ -3497,7 +3497,7 @@ echo "${ECHO_T}no" >&6
+ fi
+ 
+ if test -n "$wraster"; then
+-        WRASTERLIBS=`($wraster --ldflags --libs 2>/dev/null || $wraster --lflags --libs) | xargs`
++        WRASTERLIBS=`$wraster --libs`
+         WRASTERINCLUDES=`$wraster --cflags`
+         MKPREVIEW="mkpreview"
+         OLD_LDFLAGS="$LDFLAGS"
+@@ -5818,7 +5818,7 @@ echo "${ECHO_T}yes" >&6
+         else
+                 echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+-                for ac_prog in lynx wget
++                for ac_prog in lynx fetch
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2