From owner-svn-ports-head@freebsd.org Mon Jul 25 21:46:24 2016 Return-Path: Delivered-To: svn-ports-head@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 7893ABA51C9; Mon, 25 Jul 2016 21:46:24 +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 3B0B413C8; Mon, 25 Jul 2016 21:46:24 +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 u6PLkNMN013141; Mon, 25 Jul 2016 21:46:23 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6PLkNKj013138; Mon, 25 Jul 2016 21:46:23 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201607252146.u6PLkNKj013138@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 25 Jul 2016 21:46:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r419069 - in head: graphics/gegl www/webkit2-gtk3 x11-toolkits/pango X-SVN-Group: ports-head 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.22 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: Mon, 25 Jul 2016 21:46:24 -0000 Author: jbeich Date: Mon Jul 25 21:46:22 2016 New Revision: 419069 URL: https://svnweb.freebsd.org/changeset/ports/419069 Log: 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 MFH: 2016Q3 Modified: head/graphics/gegl/Makefile (contents, props changed) head/www/webkit2-gtk3/Makefile (contents, props changed) head/x11-toolkits/pango/Makefile (contents, props changed) Modified: head/graphics/gegl/Makefile ============================================================================== --- head/graphics/gegl/Makefile Mon Jul 25 21:46:08 2016 (r419068) +++ head/graphics/gegl/Makefile Mon Jul 25 21:46:22 2016 (r419069) @@ -219,10 +219,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: head/www/webkit2-gtk3/Makefile ============================================================================== --- head/www/webkit2-gtk3/Makefile Mon Jul 25 21:46:08 2016 (r419068) +++ head/www/webkit2-gtk3/Makefile Mon Jul 25 21:46:22 2016 (r419069) @@ -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: head/x11-toolkits/pango/Makefile ============================================================================== --- head/x11-toolkits/pango/Makefile Mon Jul 25 21:46:08 2016 (r419068) +++ head/x11-toolkits/pango/Makefile Mon Jul 25 21:46:22 2016 (r419069) @@ -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