svn commit: r419069 - in head: graphics/gegl www/webkit2-gtk3 x11-toolkits/pango
Jan Beich
jbeich at FreeBSD.org
Mon Jul 25 21:46:24 UTC 2016
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 <bsd.port.mk>
More information about the svn-ports-head
mailing list