diff options
| author | jbeich <jbeich@FreeBSD.org> | 2015-11-24 12:08:55 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2015-11-24 12:08:55 +0800 |
| commit | a48b129eb6fe8ee565d5c329feb079b4d034b11c (patch) | |
| tree | 01c388bfee3eb0079bb5e83bd568b4aba352eccf /x11-toolkits | |
| parent | 8d2ee2662cc3bf4e099918893ff18bd633fa60e0 (diff) | |
| download | freebsd-ports-gnome-a48b129eb6fe8ee565d5c329feb079b4d034b11c.tar.gz freebsd-ports-gnome-a48b129eb6fe8ee565d5c329feb079b4d034b11c.tar.zst freebsd-ports-gnome-a48b129eb6fe8ee565d5c329feb079b4d034b11c.zip | |
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
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 11 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/Makefile | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index e2c42bd8c16a..9e5f6d624246 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -47,8 +47,6 @@ CUPS_CONFIGURE_ON= --enable-cups=auto CUPS_CONFIGURE_OFF= --disable-cups DEBUG_CONFIGURE_ON= --enable-debug=yes -.include <bsd.port.options.mk> - PLIST_SUB+= LIBGAILVER=18.0.1 LIBGVER=0.2400.28 post-patch: @@ -58,10 +56,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 post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/modules 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* |