Attachment 98158 Details for Bug 137010 – file.diff

[patch] file.diff

file.diff (text/plain), 7.38 KB, created by tkato432 on 2009-07-22 19:10:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2009-07-22 19:10:05 UTC

Size: 7.38 KB

patch

obsolete

>diff -urN /usr/ports/graphics/pixie/Makefile graphics/pixie/Makefile
>--- /usr/ports/graphics/pixie/Makefile	2008-12-21 04:32:20.000000000 +0900
>+++ graphics/pixie/Makefile	2009-05-31 12:49:28.000000000 +0900
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	pixie
>-PORTVERSION=	2.2.4
>+PORTVERSION=	2.2.6
> CATEGORIES=	graphics
> MASTER_SITES=	SF
> DISTNAME=	Pixie-src-${PORTVERSION}
>@@ -15,39 +15,38 @@
> MAINTAINER=	ports@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 \
>-		IlmImf.6:${PORTSDIR}/graphics/OpenEXR
>+BUILD_DEPENDS=	flex:${PORTSDIR}/textproc/flex
>+LIB_DEPENDS=	IlmImf.6:${PORTSDIR}/graphics/OpenEXR \
>+		tiff.4:${PORTSDIR}/graphics/tiff \
>+		fltk_gl.1:${PORTSDIR}/x11-toolkits/fltk
> 
> NOT_FOR_ARCHS=	amd64
> 
>-PORTDOCS=*
>-USE_GL=		yes
>-ACLOCAL_ARGS=	--acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal
>-USE_AUTOTOOLS=	autoconf:262 aclocal:19 automake:19 libtool:15
>-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} \
>-	--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
>-PIXIE_SHLIBS=	file framebuffer rgbe
>-
>-SUB_LIST+=	PORTNAME=${PORTNAME}
>+USE_GNOME=	gnomehack
>+USE_GL=		glu
>+USE_BISON=	build
>+USE_AUTOTOOLS=	libtool:15
>+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
>+CONFIGURE_ARGS=	--includedir=${PREFIX}/include/pixie \
>+		--libdir=${PREFIX}/lib/pixie \
>+		--with-docdir=${DOCSDIR} \
>+		--with-shaderdir=${DATADIR}/shaders \
>+		--with-ribdir=${DATADIR}/ribs \
>+		--with-texturedir=${DATADIR}/textures \
>+		--with-displaysdir=${PREFIX}/lib/pixie/displays \
>+		--with-modulesdir=${PREFIX}/lib/pixie/modules \
>+		--with-openexr-prefix=${LOCALBASE} \
>+		--enable-openexr-threads
>+USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
>+
>+MAN1=		rndr.1 sdrc.1 sdrinfo.1 texmake.1
>+PORTDOCS=	*
>+
>+CFLAGS+=	-fPIC
>+CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>+LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
> 
> .include <bsd.port.pre.mk>
> 
>@@ -56,62 +55,17 @@
> .endif
> 
> post-patch:
>-	@${FIND} -X ${WRKSRC} -name '*.cpp' -or -name '*.h' | \
>-		${XARGS} ${REINPLACE_CMD} -i '' -e 's|malloc\.h|stdlib\.h|g'
>-
>-pre-configure:
>-	@${REINPLACE_CMD} -e '/^_LT_AC_SHELL_INIT/d' ${WRKSRC}/aclocal.m4
>-
>-do-install:
>-# exes
>-.for i in ${PIXIE_EXES}
>-	if [ "`${FILE} -b ${WRKSRC}/src/${i}/${i} | ${GREP} script`" ]; then \
>-	  ${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/.libs/${i} ${PREFIX}/bin; \
>-	else \
>-	  ${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/${i} ${PREFIX}/bin; \
>-	fi;
>-.endfor
>-
>-# libs
>-	# avoid conflicts by installing in separate dir
>-	@${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 \
>-		${PREFIX}/lib/${PORTNAME}
>-	${LN} -sf ${PREFIX}/lib/${PORTNAME}/lib${i}.so.0 \
>-		${PREFIX}/lib/${PORTNAME}/lib${i}.so
>-.endfor
>-
>-.for i in ${PIXIE_SHLIBS}
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/.libs/${i}.so \
>-		${PREFIX}/lib/${PORTNAME}
>-.endfor
>-
>-# includes
>-	@${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}
>+	@${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e '/^SUBDIRS/s|doc||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
> 
>-# shaders
>-	@${INSTALL} -d ${DATADIR}
>-	@${INSTALL} -d ${DATADIR}/shaders
>-	@${INSTALL_DATA} ${WRKSRC}/shaders/* ${DATADIR}/shaders
>-
>-# docs
>-.ifndef (NOPORTDOCS)
>-	@cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
>+post-install:
>+.if !defined(NOPORTDOCS)
>+	@${MKDIR} ${DOCSDIR}
>+	@(cd ${WRKSRC}/doc && ${FIND} . ! -name "*Makefile*" | \
>+		${CPIO} -dump -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR})
> .endif
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/graphics/pixie/distinfo graphics/pixie/distinfo
>--- /usr/ports/graphics/pixie/distinfo	2008-12-21 04:32:20.000000000 +0900
>+++ graphics/pixie/distinfo	2009-05-31 09:14:47.000000000 +0900
>@@ -1,3 +1,3 @@
>-MD5 (Pixie-src-2.2.4.tgz) = adc0be52806a885910456886322fec41
>-SHA256 (Pixie-src-2.2.4.tgz) = a998906d0640ca6838baaae55ec394eb24d851719969a28e7e66bb9db7a1debf
>-SIZE (Pixie-src-2.2.4.tgz) = 10106615
>+MD5 (Pixie-src-2.2.6.tgz) = e2063e35d88c25c4b22b954af31ad87d
>+SHA256 (Pixie-src-2.2.6.tgz) = ffbbc404265aff3d4c0303ec91549708ffba8edefc0368ac119ae2e588f35037
>+SIZE (Pixie-src-2.2.6.tgz) = 9993504
>diff -urN /usr/ports/graphics/pixie/pkg-descr graphics/pixie/pkg-descr
>--- /usr/ports/graphics/pixie/pkg-descr	2004-02-02 00:54:30.000000000 +0900
>+++ graphics/pixie/pkg-descr	2009-05-31 03:19:08.000000000 +0900
>@@ -18,7 +18,7 @@
> * Global illumination
> * Photon mapping
> 
>-WWW:	http://pixie.sourceforge.net/
>+WWW:	http://www.renderpixie.com/
> 
> - Igor Pokrovsky
> tiamat@comset.net
>diff -urN /usr/ports/graphics/pixie/pkg-plist graphics/pixie/pkg-plist
>--- /usr/ports/graphics/pixie/pkg-plist	2008-02-18 00:57:34.000000000 +0900
>+++ graphics/pixie/pkg-plist	2009-05-31 12:49:18.000000000 +0900
>@@ -1,4 +1,3 @@
>-bin/precomp
> bin/rndr
> bin/sdrc
> bin/sdrinfo
>@@ -7,21 +6,37 @@
> include/pixie/dlo.h
> include/pixie/dsply.h
> include/pixie/implicit.h
>+include/pixie/ptcapi.h
> include/pixie/ri.h
> include/pixie/sdr.h
> include/pixie/shadeop.h
>-lib/pixie/file.so
>-lib/pixie/framebuffer.so
>+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/libri.so
> lib/pixie/libri.so.0
> lib/pixie/libsdr.a
>+lib/pixie/libsdr.la
> lib/pixie/libsdr.so
> lib/pixie/libsdr.so.0
>-lib/pixie/rgbe.so
>+lib/pixie/modules/gui.a
>+lib/pixie/modules/gui.la
>+lib/pixie/modules/gui.so
> %%DATADIR%%/shaders/ambientindirect.sdr
> %%DATADIR%%/shaders/ambientindirect.sl
> %%DATADIR%%/shaders/ambientlight.sdr
>@@ -78,5 +93,7 @@
> %%DATADIR%%/shaders/spotlight.sl
> @dirrm %%DATADIR%%/shaders
> @dirrm %%DATADIR%%
>+@dirrm lib/pixie/modules
>+@dirrm lib/pixie/displays
> @dirrm lib/pixie
> @dirrm include/pixie

Actions: View | Diff

Attachments on bug 137010: 98158