From owner-svn-ports-head@freebsd.org Tue Aug 25 06:15:16 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5CC323BFF6C; Tue, 25 Aug 2020 06:15:16 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BbJd01mjbz3f0f; Tue, 25 Aug 2020 06:15:16 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2165B25339; Tue, 25 Aug 2020 06:15:16 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07P6FGwZ088494; Tue, 25 Aug 2020 06:15:16 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07P6FFfd088492; Tue, 25 Aug 2020 06:15:15 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202008250615.07P6FFfd088492@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Tue, 25 Aug 2020 06:15:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546140 - in head/x11-wm/wmakerconf: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11-wm/wmakerconf: . files X-SVN-Commit-Revision: 546140 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Aug 2020 06:15:16 -0000 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 # $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