Index: head/graphics/gtk-update-icon-cache/Makefile =================================================================== --- head/graphics/gtk-update-icon-cache/Makefile +++ head/graphics/gtk-update-icon-cache/Makefile @@ -36,17 +36,16 @@ PLIST_FILES= bin/gtk-update-icon-cache # man/man1/gtk-update-icon-cache.1.gz -.include - post-patch: @${REINPLACE_CMD} -e 's|-DGDK_PIXBUF_DISABLE_DEPRECATED||g' \ ${WRKSRC}/configure 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 do-install: @${INSTALL_PROGRAM} ${WRKSRC}/gtk/gtk-update-icon-cache \ @@ -54,4 +53,4 @@ # @${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-update-icon-cache.1 \ # ${STAGEDIR}${PREFIX}/man/man1/ -.include +.include Index: head/x11-toolkits/gtk20/Makefile =================================================================== --- head/x11-toolkits/gtk20/Makefile +++ head/x11-toolkits/gtk20/Makefile @@ -47,8 +47,6 @@ CUPS_CONFIGURE_OFF= --disable-cups DEBUG_CONFIGURE_ON= --enable-debug=yes -.include - PLIST_SUB+= LIBGAILVER=18.0.1 LIBGVER=0.2400.28 post-patch: @@ -58,10 +56,11 @@ ${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 Index: head/x11-toolkits/gtk30/Makefile =================================================================== --- head/x11-toolkits/gtk30/Makefile +++ head/x11-toolkits/gtk30/Makefile @@ -79,7 +79,6 @@ # 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 .if ${PORT_OPTIONS:MTYPEAHEAD} @@ -94,10 +93,11 @@ ${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*