Index: branches/2016Q3/graphics/gegl/Makefile =================================================================== --- branches/2016Q3/graphics/gegl/Makefile (revision 419140) +++ branches/2016Q3/graphics/gegl/Makefile (revision 419141) @@ -1,255 +1,256 @@ # Created by: Pietro Cerutti # $FreeBSD$ PORTNAME= gegl PORTVERSION= 0.2.0 PORTREVISION= 15 CATEGORIES= graphics MASTER_SITES= GIMP MAINTAINER= gnome@FreeBSD.org COMMENT= Graph based image processing framework LICENSE= GPLv3+ LGPL20+ LGPL3+ LICENSE_COMB= multi LICENSE_FILE_GPLv3+ = ${WRKSRC}/COPYING LICENSE_FILE_LGPL3+ = ${WRKSRC}/COPYING.LESSER LIB_DEPENDS= libbabl-0.1.so:x11/babl # ignore new versions until we can replace this version with gegl 3.x PORTSCOUT= ignore:1 OPTIONS_DEFINE= CAIRO ENSCRIPT EXIV2 FFMPEG PIXBUF GRAPHVIZ JASPER JPEG \ LUA OPENEXR OPENRAW SIMD PANGO PNG LIBRSVG2 SDL SPIRO V4L \ DOCS EXAMPLES OPTIONS_DEFAULT=CAIRO ENSCRIPT EXIV2 PIXBUF GRAPHVIZ JASPER JPEG LUA \ OPENEXR OPENRAW PANGO PNG LIBRSVG2 SDL SPIRO V4L ENSCRIPT_DESC= Enscript support SPIRO_DESC= Spiro support #UMFPACK_DESC= UMFpack support USES= cpe gettext gmake libtool pathfix pkgconfig shebangfix tar:bzip2 USE_GNOME= glib20 intltool USE_LDCONFIG= ${PREFIX}/lib/gegl-0.2 GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_execinfo_h=no CONFIGURE_ARGS= --without-vala --disable-docs INSTALL_TARGET= install-strip CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -lintl GEGL_MINOR= 199 GEGL_VER= 0.2 PLIST_SUB+= GEGL_MINOR="${GEGL_MINOR}" GEGL_VER=${GEGL_VER} EXAMPLES= 2geglbuffer csugar float-lookup \ gegl-convert gegl-slicer geglbuffer-add-image \ geglbuffer-clock hello-world-video hello-world SHEBANG_FILES= tools/xml_insert.sh .include .if ${PORT_OPTIONS:MPIXBUF} USE_GNOME+= gdkpixbuf2 PLIST_SUB+= GDK="" .else CONFIGURE_ARGS+=--without-gdk-pixbuf PLIST_SUB+= GDK="@comment " .endif .if ${PORT_OPTIONS:MCAIRO} LIB_DEPENDS+= libcairo.so:graphics/cairo PLIST_SUB+= CAIRO="" .else CONFIGURE_ARGS+=--without-cairo PLIST_SUB+= CAIRO="@comment " .endif .if ${PORT_OPTIONS:MPANGO} USE_GNOME+= pango PLIST_SUB+= PANGO="" .else CONFIGURE_ARGS+=--without-pango PLIST_SUB+= PANGO="@comment " .endif .if ${PORT_OPTIONS:MPANGO} && ${PORT_OPTIONS:MCAIRO} PLIST_SUB+= PANGOCAIRO="" .else CONFIGURE_ARGS+=--without-pangocairo PLIST_SUB+= PANGOCAIRO="@comment " .endif .if ${PORT_OPTIONS:MENSCRIPT} BUILD_DEPENDS+= enscript:print/enscript-a4 .endif .if ${PORT_OPTIONS:MFFMPEG} LIB_DEPENDS+= libavformat.so:multimedia/ffmpeg PLIST_SUB+= FFMPEG="" .else CONFIGURE_ARGS+=--without-libavformat PLIST_SUB+= FFMPEG="@comment " .endif .if ${PORT_OPTIONS:MGRAPHVIZ} LIB_DEPENDS+= libcgraph.so:graphics/graphviz .else CONFIGURE_ARGS+=--without-graphviz .endif .if ${PORT_OPTIONS:MJASPER} LIB_DEPENDS+= libjasper.so:graphics/jasper PLIST_SUB+= JP2="" .else CONFIGURE_ARGS+=--without-jasper PLIST_SUB+= JP2="@comment " .endif .if ${PORT_OPTIONS:MJPEG} USES+= jpeg PLIST_SUB+= JPEG="" .else CONFIGURE_ARGS+=--without-libjpeg PLIST_SUB+= JPEG="@comment " .endif .if ${PORT_OPTIONS:MLUA} USES+= lua .else CONFIGURE_ARGS+=--without-lua .endif .if ${PORT_OPTIONS:MOPENEXR} LIB_DEPENDS+= libIlmImf.so:graphics/OpenEXR PLIST_SUB+= OPENEXR="" .else CONFIGURE_ARGS+=--without-openexr PLIST_SUB+= OPENEXR="@comment " .endif .if ${PORT_OPTIONS:MOPENRAW} LIB_DEPENDS+= libopenraw.so:graphics/libopenraw PLIST_SUB+= OPENRAW="" .else CONFIGURE_ARGS+=--without-libopenraw PLIST_SUB+= OPENRAW="@comment " .endif .if ! ${PORT_OPTIONS:MSIMD} CONFIGURE_ARGS+=--disable-mmx \ --disable-sse .endif .if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= libpng.so:graphics/png PLIST_SUB+= PNG="" .else CONFIGURE_ARGS+=--without-libpng PLIST_SUB+= PNG="@comment " .endif .if ${PORT_OPTIONS:MLIBRSVG2} LIB_DEPENDS+= librsvg-2.so:graphics/librsvg2 PLIST_SUB+= RSVG="" .else CONFIGURE_ARGS+=--without-librsvg PLIST_SUB+= RSVG="@comment " .endif .if ${PORT_OPTIONS:MSDL} USE_SDL= sdl PLIST_SUB+= SDL="" .else CONFIGURE_ARGS+=--without-sdl PLIST_SUB+= SDL="@comment " .endif .if ${PORT_OPTIONS:MSPIRO} LIB_DEPENDS+= libspiro.so:graphics/libspiro .else CONFIGURE_ARGS+=--without-libspiro .endif .if ${PORT_OPTIONS:MV4L} BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev.h:multimedia/v4l_compat PLIST_SUB+= V4L="" .else CONFIGURE_ARGS+=--without-libv4l PLIST_SUB+= V4L="@comment " .endif # umfpack library is broken #.if ${PORT_OPTIONS:MUMFPACK} #LIB_DEPENDS+= umfpack:math/suitesparse #PLIST_SUB+= UMFPACK="" #.else CONFIGURE_ARGS+=--without-umfpack PLIST_SUB+= UMFPACK="@comment " #.endif .if ${PORT_OPTIONS:MEXIV2} LIB_DEPENDS+= libexiv2.so:graphics/exiv2 PLIST_SUB+= EXIV2="" .else CONFIGURE_ARGS+=--without-exiv2 PLIST_SUB+= EXIV2="@comment " .endif .if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= a2x:textproc/asciidoc \ ${LOCALBASE}/bin/bash:shells/bash \ vimdot:graphics/graphviz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes .else CONFIGURE_ARGS+=--disable-docs .endif post-patch: ${REINPLACE_CMD} "s/lua >/lua-${LUA_VER} >/g" ${WRKSRC}/configure .if ! ${PORT_OPTIONS:MDOCS} ${REINPLACE_CMD} -e 's|tools examples|tools|g' \ ${WRKSRC}/Makefile.in .endif ${REINPLACE_CMD} -e 's|\(lua\)\(5\.1\)|\1-\2|g ; s|x86_64|amd64|g' \ ${WRKSRC}/configure .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: .if ${PORT_OPTIONS:MDOCS} cd ${WRKSRC}/docs && ${MAKE_CMD} index.html cd ${WRKSRC}/docs/gallery && ${MAKE_CMD} index.html .endif post-install: .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR}/gallery (cd ${WRKSRC}/docs && \ ${COPYTREE_SHARE} \*.html ${STAGEDIR}${DOCSDIR} && \ ${INSTALL_DATA} ChangeLog gegl.css gegl.devhelp devhelp.css ${STAGEDIR}${DOCSDIR} && \ ${INSTALL_DATA} gallery/OpenRaster* ${STAGEDIR}${DOCSDIR}/gallery && \ ${INSTALL_DATA} gallery/clones* ${STAGEDIR}${DOCSDIR}/gallery && \ ${INSTALL_DATA} gallery/index.html ${STAGEDIR}${DOCSDIR}/gallery ) .endif .if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/data ${INSTALL_DATA} ${WRKSRC}/examples/data/surfer.png ${STAGEDIR}${EXAMPLESDIR}/data .for ex in ${EXAMPLES} ${INSTALL_DATA} ${WRKSRC}/examples/${ex}.c ${STAGEDIR}${EXAMPLESDIR} .endfor .endif @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gegl-0.2/*.so .include Index: branches/2016Q3/www/webkit2-gtk3/Makefile =================================================================== --- branches/2016Q3/www/webkit2-gtk3/Makefile (revision 419140) +++ branches/2016Q3/www/webkit2-gtk3/Makefile (revision 419141) @@ -1,85 +1,86 @@ # Created by: Michael Johnson # $FreeBSD$ PORTNAME= webkit PORTVERSION= 2.8.5 PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://webkitgtk.org/releases/ PKGNAMESUFFIX= 2-gtk3 DISTNAME= ${PORTNAME}gtk-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Opensource browser engine using the GTK+ 3 toolkit BUILD_DEPENDS= geoclue>=0:net/geoclue LIB_DEPENDS= libenchant.so:textproc/enchant \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libwebp.so:graphics/webp \ libpng.so:graphics/png \ libsecret-1.so:security/libsecret \ libicutu.so:devel/icu \ libharfbuzz.so:print/harfbuzz \ libsoup-2.4.so:devel/libsoup RUN_DEPENDS= geoclue>=0:net/geoclue PORTSCOUT= limitw:1,even USE_GSTREAMER1= yes USE_XORG= x11 xext ice USES= bison cmake compiler:c++11-lib gettext gmake gperf jpeg perl5 \ pkgconfig python:2 sqlite tar:xz USE_RUBY= yes RUBY_NO_RUN_DEPENDS=yes USE_GNOME= cairo gtk20 gtk30 introspection:build libxml2 libxslt USE_GL= gl egl USE_PERL5= build USE_LDCONFIG= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CMAKE_ARGS+= -DPORT=GTK \ -DUSE_LD_GOLD:BOOL=0 CONFIGURE_ENV+= XDG_CACHE_HOME=${WRKDIR} BROWSER_PLUGINS_DIR?= ${LOCALBASE}/lib/browser_plugins/symlinks/webkit-gtk3 #_BROWSER_PLUGINS_DIR= ${BROWSER_PLUGINS_DIR:S|^/|"|:S|/|", "|g}", OPTIONS_DEFINE= DEBUG FULLDEBUG DEBUG_DESC= Just enable debug symbols FULLDEBUG_DESC= Enable asserts and other debug support FULLDEBUG_CONFIGURE_ENABLE= debug DEBUG_CMAKE_OFF= -DCMAKE_BUILD_TYPE=Release .include .if ${ARCH} == powerpc64 CFLAGS+= -mminimal-toc .endif .if ${OSVERSION} < 1000033 BUILD_DEPENDS+= flex>=0:textproc/flex CONFIGURE_ENV+= FLEX_PATH="${LOCALBASE}/bin/flex" .endif post-patch: @${REINPLACE_CMD} -e 's|%%BROWSER_PLUGINS_DIR%%|${BROWSER_PLUGINS_DIR}|' \ ${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 \ ${STAGEDIR}/${PREFIX}/bin/jsc-4 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so.* @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/webkit2gtk-4.0/injected-bundle/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/jsc-4 @${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/webkit2gtk-4.0/WebKit* .include Index: branches/2016Q3/x11-toolkits/pango/Makefile =================================================================== --- branches/2016Q3/x11-toolkits/pango/Makefile (revision 419140) +++ branches/2016Q3/x11-toolkits/pango/Makefile (revision 419141) @@ -1,65 +1,66 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= pango PORTVERSION= 1.38.0 PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= GNOME DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Open-source framework for the layout and rendering of i18n text USES= tar:xz .if !defined(REFERENCE_PORT) BUILD_DEPENDS= fontconfig>=2.10.91:x11-fonts/fontconfig \ cairo>=1.12.10,2:graphics/cairo LIB_DEPENDS= libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype \ ${FONTENCOD}:x11-fonts/encodings PORTSCOUT= limitw:1,even USES+= gettext gmake gnome libtool pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= cairo glib20 introspection:build referencehack CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip VERSION= 1.8.0 LIBVERSION= 0.3800.0 PLIST_SUB+= VERSION=${VERSION} LIBVERSION=${LIBVERSION} FONTSCALE= ${LOCALBASE}/share/fonts/TTF/luximb.ttf FONTENCOD= ${LOCALBASE}/share/fonts/encodings/encodings.dir OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 .include .if ${PORT_OPTIONS:MX11} USE_XORG+= xft xrender #CONFIGURE_ARGS+=--with-xft PLIST_SUB+= X11="" .else CONFIGURE_ARGS+=--without-xft 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 .endif Index: branches/2016Q3 =================================================================== --- branches/2016Q3 (revision 419140) +++ branches/2016Q3 (revision 419141) Property changes on: branches/2016Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r419069