1 files changed, 38 insertions, 30 deletions

diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 490e14a55563..1e94a8d815fd 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -6,31 +6,41 @@
 #
 
 PORTNAME=	pixie
-PORTVERSION=	1.6.3
-PORTREVISION=	2
+PORTVERSION=	2.2.2
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 DISTNAME=	Pixie-src-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	beech@FreeBSD.org
 COMMENT=	A photorealistic renderer with Pixar's RenderMan-like interface
 
+BUILD_DEPENDS=	flex:${PORTSDIR}/textproc/flex \
+		bison:${PORTSDIR}/devel/bison
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
-		fltk_gl.1:${PORTSDIR}/x11-toolkits/fltk
+		fltk_gl.1:${PORTSDIR}/x11-toolkits/fltk \
+		IlmImf.6:${PORTSDIR}/graphics/OpenEXR
 
+PORTDOCS=*
 USE_GL=		yes
-USE_X_PREFIX=	yes
 ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
 USE_AUTOTOOLS=	autoconf:261 aclocal:19 automake:19 libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
-		CXXFLAGS="${CXXFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+CONFIGURE_ENV=	CFLAGS="-O0 -fPIC -pipe -I${LOCALBASE}/include" \
+		CXXFLAGS="-O0 -pipe -fPIC -I${LOCALBASE}/include \
+			-I${LOCALBASE}/include/OpenEXR" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/${PORTNAME} --with-shaderdir=${PREFIX}/share/${PORTNAME}/shaders --with-modeldir=${PREFIX}/share/${PORTNAME} --with-texturedir=${PREFIX}/share/${PORTNAME} --with-proceduraldir=${PREFIX}/share/${PORTNAME} --with-displaysdir=${PREFIX}/lib/${PORTNAME}
-USE_LDCONFIG=	%%PREFIX%%/lib/${PORTNAME}
+CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/${PORTNAME} \
+	--with-shaderdir=${PREFIX}/share/${PORTNAME}/shaders \
+	--with-modeldir=${PREFIX}/share/${PORTNAME} \
+	--with-texturedir=${PREFIX}/share/${PORTNAME} \
+	--with-proceduraldir=${PREFIX}/share/${PORTNAME} \
+	--with-displaysdir=${PREFIX}/lib/${PORTNAME} \
+	--with-openexr=${LOCALBASE}/lib \
+	--enable-openexr-threads --disable-openexrtest
+
+USE_LDCONFIG=	${LOCALBASE}/lib/${PORTNAME}
 WRKSRC=		${WRKDIR}/Pixie
 
 PIXIE_EXES=	precomp rndr sdrc sdrinfo show texmake
@@ -40,10 +50,6 @@ SUB_LIST+=	PORTNAME=${PORTNAME}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
-
 post-patch:
 	@${FIND} -X ${WRKSRC} -name '*.cpp' -or -name '*.h' | \
 		${XARGS} ${REINPLACE_CMD} -i '' -e 's|malloc\.h|stdlib\.h|g'
@@ -63,8 +69,16 @@ do-install:
 
 # libs
 	# avoid conflicts by installing in separate dir
-	@${MKDIR} ${PREFIX}/lib/${PORTNAME}
-.for i in sdr ri common
+	@${INSTALL} -d ${PREFIX}/lib/${PORTNAME}
+.for i in common
+	${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/libpixie${i}.a \
+		${PREFIX}/lib/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/.libs/libpixie${i}.so.0 \
+		${PREFIX}/lib/${PORTNAME}
+	${LN} -sf ${PREFIX}/lib/${PORTNAME}/libpixie${i}.so.0 \
+		${PREFIX}/lib/${PORTNAME}/libpixie${i}.so
+.endfor
+.for i in sdr ri
 	${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/lib${i}.a \
 		${PREFIX}/lib/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/.libs/lib${i}.so.0 \
@@ -79,26 +93,20 @@ do-install:
 .endfor
 
 # includes
-	@${MKDIR} ${PREFIX}/include/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/src/sdr/sdr.h ${PREFIX}/include/${PORTNAME}
+	@${INSTALL} -d ${PREFIX}/include/${PORTNAME}
+	@${INSTALL_DATA} ${WRKSRC}/src/sdr/sdr.h ${PREFIX}/include/${PORTNAME}
 .for i in dlo dsply implicit ri shadeop
 	${INSTALL_DATA} ${WRKSRC}/src/ri/${i}.h ${PREFIX}/include/${PORTNAME}
 .endfor
 
 # shaders
-	@${MKDIR} ${DATADIR}
-	@${MKDIR} ${DATADIR}/shaders
-	${INSTALL_DATA} ${WRKSRC}/shaders/* ${DATADIR}/shaders
+	@${INSTALL} -d ${DATADIR}
+	@${INSTALL} -d ${DATADIR}/shaders
+	@${INSTALL_DATA} ${WRKSRC}/shaders/* ${DATADIR}/shaders
 
 # docs
 .ifndef (NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.htm ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/*.jpg ${DOCSDIR}
-.for i in figures rayshadow running softshadow
-	@${MKDIR} ${DOCSDIR}/${i}
-	${INSTALL_DATA} ${WRKSRC}/doc/${i}/* ${DOCSDIR}/${i}
-.endfor
+	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>