Index: head/graphics/gtk-update-icon-cache/Makefile =================================================================== --- head/graphics/gtk-update-icon-cache/Makefile (revision 402342) +++ head/graphics/gtk-update-icon-cache/Makefile (revision 402343) @@ -1,57 +1,56 @@ # Created by: Koop Mast # $FreeBSD$ PORTNAME= gtk-update-icon-cache PORTVERSION= 2.24.28 CATEGORIES= graphics MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Gtk-update-icon-cache utility from the Gtk+ toolkit LICENSE= LGPL20 LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS+= update-mime-database:${PORTSDIR}/misc/shared-mime-info \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme PORTSCOUT= ignore:1 USES= gettext gmake libtool pathfix perl5 pkgconfig tar:xz USE_PERL5= build MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= atk pango gdkpixbuf2 introspection:build USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite PATCHDIR= ${.CURDIR}/../../x11-toolkits/gtk20/files CONFIGURE_ARGS= --enable-static --with-xinput=yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib BUILD_WRKSRC= ${WRKSRC}/gtk ALL_TARGET= ${PORTNAME} 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 \ ${STAGEDIR}${PREFIX}/bin/ # @${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 (revision 402342) +++ head/x11-toolkits/gtk20/Makefile (revision 402343) @@ -1,74 +1,73 @@ # Created by: Vanilla I. Shu # $FreeBSD$ PORTNAME= gtk PORTVERSION= 2.24.28 PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 2 DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (previous stable version) LICENSE= LGPL20 USES= tar:xz PORTSCOUT= limitw:0,even .if !defined(REFERENCE_PORT) RUN_DEPENDS+= update-mime-database:${PORTSDIR}/misc/shared-mime-info \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \ python:${PORTSDIR}/lang/python USES+= gettext gmake libtool pathfix perl5 pkgconfig GNU_CONFIGURE= yes USE_GNOME= atk pango gdkpixbuf2 introspection:build \ gtk-update-icon-cache USE_LDCONFIG= yes USE_PERL5= build USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite CONFIGURE_ARGS= --with-xinput=yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip OPTIONS_DEFINE= CUPS DEBUG OPTIONS_DEFAULT=CUPS OPTIONS_SUB= yes CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client CUPS_CONFIGURE_ON= --enable-cups=auto CUPS_CONFIGURE_OFF= --disable-cups DEBUG_CONFIGURE_ON= --enable-debug=yes -.include - PLIST_SUB+= LIBGAILVER=18.0.1 LIBGVER=0.2400.28 post-patch: @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \ ${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 @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/engines @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/loaders @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-2.0/${GTK2_VERSION}/modules .include .endif Index: head/x11-toolkits/gtk30/Makefile =================================================================== --- head/x11-toolkits/gtk30/Makefile (revision 402342) +++ head/x11-toolkits/gtk30/Makefile (revision 402343) @@ -1,114 +1,114 @@ # Created by: Vanilla I. Shu # $FreeBSD$ # Please keep gtk30 in sync with the following x11-themes ports: # adwaita-icon-theme, gnome-themes-standard and mate-themes PORTNAME= gtk PORTVERSION= 3.16.6 PORTREVISION?= 0 CATEGORIES= x11-toolkits MASTER_SITES= GNOME/sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} PKGNAMESUFFIX= 3 DISTNAME= gtk+-${PORTVERSION} DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org COMMENT= Gimp Toolkit for X11 GUI (current stable version) LICENSE= LGPL20 USES= tar:xz .if defined(REFERENCE_PORT) PORTSCOUT= ignore:1 .else PORTSCOUT= limit:1,even BUILD_DEPENDS+= at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk LIB_DEPENDS= libepoxy.so:${PORTSDIR}/graphics/libepoxy RUN_DEPENDS+= hicolor-icon-theme>=0:${PORTSDIR}/misc/hicolor-icon-theme \ adwaita-icon-theme>=0:${PORTSDIR}/x11-themes/adwaita-icon-theme \ at-spi2-atk>=0:${PORTSDIR}/accessibility/at-spi2-atk USE_PERL5= build USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= atk gdkpixbuf2 introspection:build pango #gtk-update-icon-cache \ # introspection:build pango USES+= gettext gmake libtool pathfix perl5 pkgconfig USE_XORG= xext xrender x11 xinerama xi xrandr xcursor xfixes xdamage \ xcomposite CONFIGURE_ARGS= --enable-x11-backend \ --disable-wayland-backend \ --enable-introspection CPPFLAGS+= -I${LOCALBASE}/include -fno-omit-frame-pointer LIBS+= -L${LOCALBASE}/lib INSTALLS_ICONS= yes INSTALL_TARGET= install-strip LIBVERSION= 0.1600.6 PLIST_SUB+= LIBVERSION=${LIBVERSION} GLIB_SCHEMAS= org.gtk.Demo.gschema.xml \ org.gtk.Settings.ColorChooser.gschema.xml \ org.gtk.Settings.Debug.gschema.xml \ org.gtk.Settings.FileChooser.gschema.xml OPTIONS_DEFINE= CUPS CLOUDPRINT COLORD DEBUG BROADWAY TYPEAHEAD OPTIONS_DEFAULT=CUPS COLORD BROADWAY OPTIONS_SUB= yes BROADWAY_DESC= Enable GDK Broadway backend for showing GTK+ in the webbrowser using HTML5 and web sockets. BROADWAY_CONFIGURE_ENABLE= broadway-backend COLORD_DESC= Color profile support COLORD_LIB_DEPENDS= libcolord.so:${PORTSDIR}/graphics/colord COLORD_CONFIGURE_ENABLE=colord CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client CUPS_CONFIGURE_ENABLE= cups CLOUDPRINT_DESC= Cloud printing support CLOUDPRINT_CONFIGURE_ENABLE= cloudprint CLOUDPRINT_LIB_DEPENDS= librest-0.7.so:${PORTSDIR}/devel/librest \ libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib 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 .if ${PORT_OPTIONS:MTYPEAHEAD} EXTRA_PATCHES+= ${FILESDIR}/extra-gtk_gtkfilechooserwidget.c \ ${FILESDIR}/extra-gtk_ui_gtkfilechooserwidget.ui .endif post-patch: @${REINPLACE_CMD} -e 's|[{]libdir[}]/locale|{datadir}/locale|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \ ${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* post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/modules @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/engines @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gtk-3.0/${GTK3_VERSION}/loaders ${INSTALL_MAN} ${WRKSRC}/docs/reference/gtk/gtk-query-immodules-3.0.1 \ ${STAGEDIR}${PREFIX}/man/man1 .include .endif