From owner-svn-ports-branches@freebsd.org Tue Jul 26 18:01:33 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D433BBA5E78; Tue, 26 Jul 2016 18:01:33 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 9986A1201; Tue, 26 Jul 2016 18:01:33 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6QI1Wf3094071; Tue, 26 Jul 2016 18:01:32 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6QI1WqX094068; Tue, 26 Jul 2016 18:01:32 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201607261801.u6QI1WqX094068@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 26 Jul 2016 18:01:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r419141 - in branches/2016Q3: graphics/gegl www/webkit2-gtk3 x11-toolkits/pango X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jul 2016 18:01:33 -0000 Author: jbeich Date: Tue Jul 26 18:01:32 2016 New Revision: 419141 URL: https://svnweb.freebsd.org/changeset/ports/419141 Log: MFH: r419069 Apply r402343 to other gnome@ ports restoring r297047 behavior - Invoke pkg-config(1) instead of checking manually - Convert to ECHO_MSG which can be silenced PR: 166279 Approved by: portmgr blanket Approved by: ports-secteam (feld) Modified: branches/2016Q3/graphics/gegl/Makefile branches/2016Q3/www/webkit2-gtk3/Makefile branches/2016Q3/x11-toolkits/pango/Makefile Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/graphics/gegl/Makefile ============================================================================== --- branches/2016Q3/graphics/gegl/Makefile Tue Jul 26 17:59:54 2016 (r419140) +++ branches/2016Q3/graphics/gegl/Makefile Tue Jul 26 18:01:32 2016 (r419141) @@ -221,10 +221,11 @@ post-patch: .if ${PORT_OPTIONS:MDOCS} pre-configure: -.if !exists(${LOCALBASE}/bin/vimdot) - @${ECHO_CMD} "${PKGNAME}: Needs graphics/graphviz with PANGOCAIRO support enabled." - @${FALSE} -.endif +# .if !exists() evaluates too early before graphviz has a chance to be installed + @if ! hash vimdot 2>/dev/null; then \ + ${ECHO_MSG} "${PKGNAME}: Needs graphics/graphviz with PANGOCAIRO support enabled."; \ + ${FALSE}; \ + fi .endif post-build: Modified: branches/2016Q3/www/webkit2-gtk3/Makefile ============================================================================== --- branches/2016Q3/www/webkit2-gtk3/Makefile Tue Jul 26 17:59:54 2016 (r419140) +++ branches/2016Q3/www/webkit2-gtk3/Makefile Tue Jul 26 18:01:32 2016 (r419141) @@ -69,10 +69,11 @@ post-patch: ${WRKSRC}/Source/WebKit2/UIProcess/Plugins/unix/PluginInfoStoreUnix.cpp pre-configure: -.if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-egl.pc) - @${ECHO_CMD} "${PKGNAME}: Needs cairo with OPENGL support enabled." - @${FALSE} -.endif +# .if !exists() evaluates too early before cairo has a chance to be installed + @if ! pkg-config --exists cairo-egl; then \ + ${ECHO_MSG} "${PKGNAME}: Needs cairo with OPENGL support enabled."; \ + ${FALSE}; \ + fi post-install: ${MV} ${STAGEDIR}${PREFIX}/bin/jsc \ Modified: branches/2016Q3/x11-toolkits/pango/Makefile ============================================================================== --- branches/2016Q3/x11-toolkits/pango/Makefile Tue Jul 26 17:59:54 2016 (r419140) +++ branches/2016Q3/x11-toolkits/pango/Makefile Tue Jul 26 18:01:32 2016 (r419141) @@ -55,10 +55,11 @@ PLIST_SUB+= X11="@comment " .endif pre-configure: -.if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-gobject.pc) - @${ECHO_CMD} "${PKGNAME}: Needs cairo with GLIB (GObject) support enabled." - @${FALSE} -.endif +# .if !exists() evaluates too early before cairo has a chance to be installed + @if ! pkg-config --exists cairo-gobject; then \ + ${ECHO_MSG} "${PKGNAME}: Needs cairo with GLIB (GObject) support enabled."; \ + ${FALSE}; \ + fi .include