svn commit: r546140 - in head/x11-wm/wmakerconf: . files
Alexey Dokuchaev
danfe at FreeBSD.org
Tue Aug 25 06:15:16 UTC 2020
Author: danfe
Date: Tue Aug 25 06:15:15 2020
New Revision: 546140
URL: https://svnweb.freebsd.org/changeset/ports/546140
Log:
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.
Added:
head/x11-wm/wmakerconf/files/patch-configure (contents, props changed)
Modified:
head/x11-wm/wmakerconf/Makefile
Modified: head/x11-wm/wmakerconf/Makefile
==============================================================================
--- head/x11-wm/wmakerconf/Makefile Tue Aug 25 05:53:34 2020 (r546139)
+++ head/x11-wm/wmakerconf/Makefile Tue Aug 25 06:15:15 2020 (r546140)
@@ -1,6 +1,5 @@
# Created by: Dominik Rothert <dr at 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
Added: head/x11-wm/wmakerconf/files/patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-wm/wmakerconf/files/patch-configure Tue Aug 25 06:15:15 2020 (r546140)
@@ -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
More information about the svn-ports-head
mailing list