diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2015-11-24 04:08:55 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2015-11-24 04:08:55 +0000 |
| commit | 8af40027a956f5793e467a881e9420bb8b9b65eb (patch) | |
| tree | 01c388bfee3eb0079bb5e83bd568b4aba352eccf /x11-toolkits/gtk30 | |
| parent | e4b71897376a5233949fa8610dcbe902fcc132a9 (diff) | |
graphics/gtk-update-icon-cache: restore r297047 after r313633
- Invoke pkg-config(1) instead of checking manually [1]
- Convert to ECHO_MSG which can be silenced
PR: 166279
Reported by: mi (via mail on gnome@ list)
Approved by: gnome (kwm)
Submitted by: John Hein <jh-fbml@snkmail.com> [1]
Differential Revision: https://reviews.freebsd.org/D4260
Notes
Notes:
svn path=/head/; revision=402343
Diffstat (limited to 'x11-toolkits/gtk30')
| -rw-r--r-- | x11-toolkits/gtk30/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index b28f6ff42059..b2fde00a2a7f 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -79,7 +79,6 @@ DEBUG_CONFIGURE_ENABLE=debug # GTK+ 3.17 has a beter way TYPEAHEAD_DESC= Re-enable type-a-head functionality in file chooser -# needed for the exists() check, booo .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MTYPEAHEAD} @@ -94,10 +93,11 @@ post-patch: ${WRKSRC}/gtk/Makefile.in pre-configure: -.if !exists(${LOCALBASE}/libdata/pkgconfig/cairo-xlib.pc) - @${ECHO_CMD} "${PKGNAME}: Needs cairo with X11 support enabled." - @${FALSE} -.endif +# .if !exists() evaluates too early before cairo has a chance to be installed + @if ! pkg-config --exists cairo-xlib; then \ + ${ECHO_MSG} "${PKGNAME}: Needs cairo with X11 support enabled."; \ + ${FALSE}; \ + fi pre-build: @${RM} -rf ${WRKSRC}/docs/gtk.info* |