- Add staging support

- Convert to new LIB_DEPENDS format, USES=libtool
- Install striped binaries

2 files changed, 29 insertions, 44 deletions

diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index de7225ba09d1..0064a82eea27 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pixie
 PORTVERSION=	2.2.6
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Pixie%20${PORTVERSION}
 DISTNAME=	Pixie-src-${PORTVERSION}
@@ -14,17 +14,13 @@ COMMENT=	Photorealistic renderer with Pixar's RenderMan-like interface
 
 LICENSE=	LGPL21 # (or later)
 
-LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
-		tiff:${PORTSDIR}/graphics/tiff \
-		fltk_gl:${PORTSDIR}/x11-toolkits/fltk
-
-OPTIONS_DEFINE=	DOCS
-
-WRKSRC=		${WRKDIR}/Pixie
+LIB_DEPENDS=	libIlmImf.so:${PORTSDIR}/graphics/OpenEXR \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libfltk_gl.so:${PORTSDIR}/x11-toolkits/fltk
 
 USE_GL=		glu
-USES=		bison pathfix
-USE_AUTOTOOLS=	libtool
+USES=		bison libtool pathfix
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/pixie \
 		--libdir=${PREFIX}/lib/pixie \
 		--with-docdir=${DOCSDIR} \
@@ -35,21 +31,21 @@ CONFIGURE_ARGS=	--includedir=${PREFIX}/include/pixie \
 		--with-modulesdir=${PREFIX}/lib/pixie/modules \
 		--with-openexr-prefix=${LOCALBASE} \
 		--enable-openexr-threads
+WRKSRC=		${WRKDIR}/Pixie
+INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
 
-MAN1=		rndr.1 sdrc.1 sdrinfo.1 texmake.1
 PORTDOCS=	*
 
 CFLAGS+=	-fPIC
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+sparc64_BROKEN=	Does not compile on sparc64
 
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 1000033
 BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
@@ -60,19 +56,17 @@ post-patch:
 	@${REINPLACE_CMD} -e '/test/s|==|=|g ; \
 		 s|-lpthread|-pthread|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||g ; \
-		 /^install-data-am:/s|install-nobase_docDATA||g' ${WRKSRC}/Makefile.in
-.for file in src/ri/Makefile.in src/sdr/Makefile.in
-	@${REINPLACE_CMD} -e '/^includedir/s|=.*$$|= @includedir@|g' ${WRKSRC}/${file}
-.endfor
+		 /^install-data-am:/s|install-nobase_docDATA||g' \
+		 ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/^includedir/s|=.*$$|= @includedir@|g' \
+		${WRKSRC}/src/ri/Makefile.in \
+		${WRKSRC}/src/sdr/Makefile.in
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for file in AUTHORS ChangeLog DEVNOTES NEWS README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-	@(cd ${WRKSRC}/doc && ${FIND} . ! -name "*Makefile*" | \
-		${CPIO} -dump -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR})
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS ChangeLog DEVNOTES NEWS \
+		README ${STAGEDIR}${DOCSDIR})
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \
+		'! -name "*Makefile*"')
 
 .include <bsd.port.post.mk>
diff --git a/graphics/pixie/pkg-plist b/graphics/pixie/pkg-plist
index 349483980a47..874441981c57 100644
--- a/graphics/pixie/pkg-plist
+++ b/graphics/pixie/pkg-plist
@@ -10,33 +10,24 @@ include/pixie/ptcapi.h
 include/pixie/ri.h
 include/pixie/sdr.h
 include/pixie/shadeop.h
-lib/pixie/displays/file.a
-lib/pixie/displays/file.la
 lib/pixie/displays/file.so
-lib/pixie/displays/framebuffer.a
-lib/pixie/displays/framebuffer.la
 lib/pixie/displays/framebuffer.so
-lib/pixie/displays/openexr.a
-lib/pixie/displays/openexr.la
 lib/pixie/displays/openexr.so
-lib/pixie/displays/rgbe.a
-lib/pixie/displays/rgbe.la
 lib/pixie/displays/rgbe.so
-lib/pixie/libpixiecommon.a
-lib/pixie/libpixiecommon.la
 lib/pixie/libpixiecommon.so
 lib/pixie/libpixiecommon.so.0
-lib/pixie/libri.a
-lib/pixie/libri.la
+lib/pixie/libpixiecommon.so.0.0.0
 lib/pixie/libri.so
 lib/pixie/libri.so.0
-lib/pixie/libsdr.a
-lib/pixie/libsdr.la
+lib/pixie/libri.so.0.0.0
 lib/pixie/libsdr.so
 lib/pixie/libsdr.so.0
-lib/pixie/modules/gui.a
-lib/pixie/modules/gui.la
+lib/pixie/libsdr.so.0.0.0
 lib/pixie/modules/gui.so
+man/man1/rndr.1.gz
+man/man1/sdrc.1.gz
+man/man1/sdrinfo.1.gz
+man/man1/texmake.1.gz
 %%DATADIR%%/shaders/ambientindirect.sdr
 %%DATADIR%%/shaders/ambientindirect.sl
 %%DATADIR%%/shaders/ambientlight.sdr