Date: Tue, 26 Jul 2016 18:01:32 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> 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 Message-ID: <201607261801.u6QI1WqX094068@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607261801.u6QI1WqX094068>