Index: head/graphics/povray37/Makefile
===================================================================
--- head/graphics/povray37/Makefile	(revision 464262)
+++ head/graphics/povray37/Makefile	(revision 464263)
@@ -1,149 +1,138 @@
 # $FreeBSD$
 
 PORTNAME=	povray
 DISTVERSION=	3.7.0.RC6
 PORTREVISION=	13
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.povray.org/beta/source/
 PKGNAMESUFFIX=	37
 DIST_SUBDIR=	${PORTNAME}${PKGNAMESUFFIX}
 
 MAINTAINER=	bkoenig@alpha-tierchen.de
 COMMENT=	Persistence of Vision Ray Tracer
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 BROKEN_powerpc64=	Does not build: c++: Internal error: Killed (program cc1plus)
 
 OPTIONS_DEFINE=	X11 PNG JPEG TIFF OPENEXR STATIC IO EXAMPLES DOCS
 OPTIONS_DEFAULT=PNG JPEG
 OPTIONS_SUB=	yes
 IO_DESC=	Without I/O restrictions (security risk)
 EXAMPLES_DESC=	Install example scenes
 DOCS_DESC=	Install HTML documentation
 
-USES=		gmake
+USES=		gmake localbase
 GNU_CONFIGURE=	yes
 
 VERSION_BASE=	${PORTVERSION:C/([0-9]+\.[0-9]+).*/\1/}
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${VERSION_BASE}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}-${VERSION_BASE}
 DATADIR=	${PREFIX}/share/${PORTNAME}-${VERSION_BASE}
 ETCDIR=		${PREFIX}/etc/${PORTNAME}/${VERSION_BASE}
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib -lboost_system
+LIBS+=		-lboost_system
 
 CONFIGURE_ARGS=	COMPILED_BY=${MAINTAINER} \
 		--program-transform-name='s/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/' \
 		--disable-optimiz
 
+X11_USE=		XORG=xpm,sm,ice,x11 SDL=sdl
+X11_CONFIGURE_OFF=	--without-x
+STATIC_CONFIGURE_ON=	--enable-static
+IO_CONFIGURE_ON=	--disable-io-restrictions
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MX11}
-USE_XORG=		xpm sm ice x11
-USE_SDL=		sdl
-.else
-CONFIGURE_ARGS+=	--without-x
-.endif
-
-.if ${PORT_OPTIONS:MSTATIC}
-CONFIGURE_ARGS+=--enable-static
-.endif
-
-.if ${PORT_OPTIONS:MIO}
-CONFIGURE_ARGS+=--disable-io-restrictions
-.endif
-
 .if ${PORT_OPTIONS:MPNG}
 .if ${PORT_OPTIONS:MSTATIC}
 BUILD_DEPENDS+=	png>=1.4:graphics/png
 .else
 LIB_DEPENDS+=	libpng.so:graphics/png
 .endif
 .else
 CONFIGURE_ARGS+=--without-libpng
 .endif
 
 .if ${PORT_OPTIONS:MJPEG}
 .if ${PORT_OPTIONS:MSTATIC}
 USES+=		jpeg:build
 .else
 USES+=		jpeg
 .endif
 .else
 CONFIGURE_ARGS+=--without-libjpeg
 .endif
 
 .if ${PORT_OPTIONS:MTIFF}
 .if ${PORT_OPTIONS:MSTATIC}
 BUILD_DEPENDS+=	tiff>=4:graphics/tiff
 .else
 LIB_DEPENDS+=	libtiff.so:graphics/tiff
 .endif
 .else
 CONFIGURE_ARGS+=--without-libtiff
 .endif
 
 .if ${PORT_OPTIONS:MOPENEXR}
 .if ${PORT_OPTIONS:MSTATIC}
 BUILD_DEPENDS+=	OpenEXR>=1.6:graphics/OpenEXR
 .else
 LIB_DEPENDS+=	libIlmImf.so:graphics/OpenEXR
 CPPFLAGS+=	-I${LOCALBASE}/include/OpenEXR
 .endif
 .else
 CONFIGURE_ARGS+=--without-openexr
 .endif
 
 .if !${PORT_OPTIONS:MPNG} || !${PORT_OPTIONS:MJPEG} || !${PORT_OPTIONS:MTIFF}
 CONFIGURE_ARGS+=NON_REDISTRIBUTABLE_BUILD=yes
 .endif
 
 DOC_FILES=	AUTHORS ChangeLog NEWS
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 post-patch:
 # Fix with boost 1.52 and now boost 1.55
 	@${REINPLACE_CMD} -e 's/TIME_UTC/TIME_UTC_/g' ${WRKSRC}/source/backend/scene/view.cpp \
 		${WRKSRC}/source/base/timer.cpp \
 		${WRKSRC}/vfe/vfepovms.cpp \
 		${WRKSRC}/vfe/unix/platformbase.cpp \
 		${WRKSRC}/vfe/vfesession.cpp
-	${FIND} ${WRKSRC}/source/*end \( -name \*.h -o -name \*.cpp \) | \
+	@${FIND} ${WRKSRC}/source/*end \( -name \*.h -o -name \*.cpp \) | \
 		${XARGS} ${GREP} -l shared_ptr | ${SED} '/shellout/d' | \
 		${XARGS} ${REINPLACE_CMD} -e 's|shared_ptr|boost::shared_ptr|g'
 
 pre-build:
 .if ${PORT_OPTIONS:MSTATIC} && ${PORT_OPTIONS:MTIFF}
 #	graphics/tiff adds dependencies on libjpeg and libjbig
 	@${REINPLACE_CMD} -e 's,^\(LIBS = .*\)-ltiff\(.*\),\1-ltiff -ljpeg -ljbig\2,' ${WRKSRC}/unix/Makefile
 .endif
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/unix/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
+	${INSTALL_PROGRAM} ${WRKSRC}/unix/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}${PKGNAMESUFFIX}
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/${PORTNAME}${PKGNAMESUFFIX}.1
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${ETCDIR}
 .for i in include ini scripts
 	${MKDIR} ${STAGEDIR}${DATADIR}/$i
 	cd ${WRKSRC}/$i && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/$i
 .endfor
-.if ${PORT_OPTIONS:MX11}
+
+do-install-X11-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/icons
 	cd ${WRKSRC}/icons && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/icons
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/scenes && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
-.endif
-.if ${PORT_OPTIONS:MDOCS}
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOC_FILES} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>