Index: head/graphics/cairo/Makefile
===================================================================
--- head/graphics/cairo/Makefile	(revision 489670)
+++ head/graphics/cairo/Makefile	(revision 489671)
@@ -1,90 +1,87 @@
 # Created by: Michael Johnson <ahze@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cairo
 PORTVERSION=	1.15.12
 PORTEPOCH=	2
 CATEGORIES=	graphics
 #MASTER_SITES=	http://cairographics.org/releases/
 MASTER_SITES=	http://cairographics.org/snapshots/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Vector graphics library with cross-device output support
 
 LICENSE=	LGPL21 MPL11
 LICENSE_COMB=	dual
 LICENSE_FILE_LGPL21=	${WRKSRC}/COPYING-LGPL-2.1
 LICENSE_FILE_MPL11=	${WRKSRC}/COPYING-MPL-1.1
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png \
 		libfontconfig.so:x11-fonts/fontconfig
 
 PORTSCOUT=	skipv:5c-1.1,5c-1.2,5c-1.5
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
-		--disable-directfb \
-		--enable-tee
 USES=		cpe gnome libtool pathfix pkgconfig tar:xz
 CPE_VENDOR=	cairographics
 USE_XORG=	pixman
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-html-dir=${DOCSDIR} \
 		--disable-directfb \
 		--disable-gallium \
 		--disable-glesv2 \
 		--disable-wgl \
 		--enable-tee
 
 OPTIONS_DEFINE=	OPENGL XCB GLIB X11 DOCS
 OPTIONS_DEFAULT=OPENGL XCB GLIB X11
 OPTIONS_SLAVE=	${ARCH:tu}
 OPTIONS_SUB=	yes
 
 X11_USE=	xorg=x11,xext,xrender
 X11_CONFIGURE_ENABLE=xlib
 
 OPENGL_USE=	gl=gl,egl xorg=xorgproto:both
 OPENGL_CONFIGURE_ENABLE=gl egl
 OPENGL_IMPLIES=	X11
 
 GLIB_DESC=	Enable GObject Functions Feature
 GLIB_USES=	gettext-runtime
 GLIB_USE=	gnome=glib20
 GLIB_CONFIGURE_ENABLE=	gobject
 
 XCB_DESC=	Enable XCB (X C-language Binding) Support
 XCB_BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil
 XCB_RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/xcb-renderutil.pc:x11/xcb-util-renderutil
 XCB_USE=	xorg=xcb
 XCB_CONFIGURE_ENABLE=	xcb
 
 # this has another option --enable-xlib-xcb=auto but it is buggy.
 MIPS_BUILD_DEPENDS=	${LOCALBASE}/include/atomic_ops.h:devel/libatomic_ops
 MIPS_USES=	localbase
 MIPS_CONFIGURE_ENV=	cairo_cv_atomic_primitives="libatomic-ops"
 
 PLIST_SUB+=	LIBVER=2.11512.0
 
 post-patch:
 	@${REINPLACE_CMD} -e '/strings/s/ - / -a /' \
 		-e '/test/s/==/=/g' \
 		-e '/LIBS/s/-lrt//' -e '/LIBS/s|-ldld||' \
 		-e '/LIBS/s|-ldl||' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-lcairo|-lcairo -lpthread|' \
 		${WRKSRC}/src/*.pc.in
 	@${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|-ldl||g' \
 		${WRKSRC}/util/*/Makefile.in \
 		${WRKSRC}/boilerplate/Makefile.in
 
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} -e 's|public||g' \
 		${WRKSRC}/doc/Makefile.in
 
 .include <bsd.port.mk>
Index: head/graphics/povray36/Makefile
===================================================================
--- head/graphics/povray36/Makefile	(revision 489670)
+++ head/graphics/povray36/Makefile	(revision 489671)
@@ -1,55 +1,55 @@
 # Created by: paulo@isr.uc.pt
 # $FreeBSD$
 
 PORTNAME=	povray
 PORTVERSION=	3.6.1
 PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
 		ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/
 MASTER_SITE_SUBDIR=	Old-Versions/Official-3.62/Unix
 PKGNAMESUFFIX=	36
 DIST_SUBDIR=	povray36
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Persistence of Vision Ray Tracer
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
 BROKEN_powerpc64=	Does not build: error: 64 bit CPU required
 
 USE_XORG=	x11
 USES=		gmake jpeg tar:bzip2
 GNU_CONFIGURE=	yes
 USE_CXXSTD=	gnu++98
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS DOCS
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-3.6
 DATADIR=	${PREFIX}/share/${PORTNAME}-3.6
 
 .include <bsd.port.options.mk>
 .include <bsd.port.pre.mk>
 
 .if (${ARCH} == "i386" || ${ARCH} == "amd64")
 LIB_DEPENDS+=	libvgagl.so:graphics/svgalib
 .endif
 
 .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
 CFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations
 CXXFLAGS+=	-O3 -ffast-math -finline-functions -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -Wno-multichar
 .if (${ARCH} == "i386" && !${ARCH} == "amd64" )
 CFLAGS+=	-mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double
 CXXFLAGS+=	-mfancy-math-387 -mpreferred-stack-boundary=3 -malign-double
 .endif # i386
 CONFIGURE_ARGS=	--disable-optimiz
 .endif
 
-CONFIGURE_ARGS=	--x-includes="${LOCALBASE}/include" --includedir=${LOCALBASE} \
+CONFIGURE_ARGS+=	--x-includes="${LOCALBASE}/include" --includedir=${LOCALBASE} \
 		CXXFLAGS="${CXXFLAGS} -L${LOCALBASE}/lib" \
 		CFLAGS="${CFLAGS} -L${LOCALBASE}/lib" \
 		LDFLAGS="-L${LOCALBASE}/lib" COMPILED_BY=${MAINTAINER} \
 		--program-transform-name='s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/'
 
 .include <bsd.port.post.mk>