Attachment 135717 Details for Bug 180688 – file.diff

[patch] file.diff

file.diff (text/plain), 5.35 KB, created by tkato432 on 2013-07-20 19:10:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-07-20 19:10:02 UTC

Size: 5.35 KB

patch

obsolete

>diff -urN /usr/ports/graphics/pixie/Makefile graphics/pixie/Makefile
>--- /usr/ports/graphics/pixie/Makefile	2013-06-21 03:49:53.000000000 +0900
>+++ graphics/pixie/Makefile	2013-07-21 00:00:00.000000000 +0900
>@@ -3,21 +3,22 @@
> 
> PORTNAME=	pixie
> PORTVERSION=	2.2.6
>-PORTREVISION=	5
>+PORTREVISION=	6
> CATEGORIES=	graphics
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Pixie%20${PORTVERSION}
> DISTNAME=	Pixie-src-${PORTVERSION}
> EXTRACT_SUFX=	.tgz
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	A photorealistic renderer with Pixar's RenderMan-like interface
>+COMMENT=	Photorealistic renderer with Pixar's RenderMan-like interface
>+
>+LICENSE=	LGPL21 # (or later)
> 
>-BUILD_DEPENDS=	flex:${PORTSDIR}/textproc/flex
> LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
>-		tiff.4:${PORTSDIR}/graphics/tiff \
>-		fltk_gl.1:${PORTSDIR}/x11-toolkits/fltk
>+		tiff:${PORTSDIR}/graphics/tiff \
>+		fltk_gl:${PORTSDIR}/x11-toolkits/fltk
> 
>-NOT_FOR_ARCHS=	amd64
>+OPTIONS_DEFINE=	DOCS
> 
> WRKSRC=		${WRKDIR}/Pixie
> 
>@@ -40,8 +41,8 @@
> PORTDOCS=	*
> 
> CFLAGS+=	-fPIC
>-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
>-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
>+CPPFLAGS+=	-I${LOCALBASE}/include
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
> .include <bsd.port.pre.mk>
> 
>@@ -49,8 +50,14 @@
> BROKEN=		Does not compile on sparc64
> .endif
> 
>+.if ${OSVERSION} < 1000033
>+BUILD_DEPENDS+=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
>+CONFIGURE_ENV+=	ac_cv_path_FLEX="${LOCALBASE}/bin/flex"
>+.endif
>+
> post-patch:
>-	@${REINPLACE_CMD} -e '/test/s|==|=|g' ${WRKSRC}/configure
>+	@${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
>@@ -58,9 +65,9 @@
> .endfor
> 
> post-install:
>-.if !defined(NOPORTDOCS)
>+.if ${PORT_OPTIONS:MDOCS}
> 	@${MKDIR} ${DOCSDIR}
>-.for file in AUTHORS ChangeLog DEVNOTES LICENSE NEWS README
>+.for file in AUTHORS ChangeLog DEVNOTES NEWS README
> 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
> .endfor
> 	@(cd ${WRKSRC}/doc && ${FIND} . ! -name "*Makefile*" | \
>diff -urN /usr/ports/graphics/pixie/files/patch-src__ri__rib.l graphics/pixie/files/patch-src__ri__rib.l
>--- /usr/ports/graphics/pixie/files/patch-src__ri__rib.l	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/pixie/files/patch-src__ri__rib.l	2013-07-21 00:00:00.000000000 +0900
>@@ -0,0 +1,29 @@
>+--- src/ri/rib.l.orig
>++++ src/ri/rib.l
>+@@ -17,7 +17,7 @@
>+ 
>+ // Overwrite the YYinput so that it uses libz
>+ #undef YY_INPUT
>+-#define YY_INPUT(buf, retval, maxlen)	if ( (retval = gzread(ribin,buf,maxlen)) < 0) 			\
>++#define YY_INPUT(buf, retval, maxlen)	if ( (retval = gzread((gzFile)ribin,buf,maxlen)) < 0) 			\
>+ 											YY_FATAL_ERROR( "input in flex scanner failed" );
>+ 
>+ #endif
>+@@ -223,7 +223,7 @@
>+ 															TRibFile	*nextFile	=	ribStack->next;
>+ 															rib_delete_buffer( YY_CURRENT_BUFFER );
>+ #ifdef HAVE_ZLIB
>+-															gzclose(ribin);
>++															gzclose((gzFile)ribin);
>+ #else
>+ 															fclose(ribin);
>+ #endif
>+@@ -243,7 +243,7 @@
>+ 															rib_delete_buffer( YY_CURRENT_BUFFER );
>+ 															
>+ #ifdef HAVE_ZLIB
>+-															gzclose(ribin);
>++															gzclose((gzFile)ribin);
>+ #else
>+ 															fclose(ribin);
>+ #endif
>diff -urN /usr/ports/graphics/pixie/files/patch-src__ri__rib.y graphics/pixie/files/patch-src__ri__rib.y
>--- /usr/ports/graphics/pixie/files/patch-src__ri__rib.y	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/pixie/files/patch-src__ri__rib.y	2013-07-21 00:00:00.000000000 +0900
>@@ -0,0 +1,11 @@
>+--- src/ri/rib.y.orig
>++++ src/ri/rib.y
>+@@ -2940,7 +2940,7 @@
>+ 		
>+ 		if (ribin != NULL) {
>+ #ifdef HAVE_ZLIB
>+-			gzclose(ribin);
>++			gzclose((gzFile)ribin);
>+ #else
>+ 			fclose(ribin);
>+ #endif
>diff -urN /usr/ports/graphics/pixie/files/patch-src__ri__ribOut.cpp graphics/pixie/files/patch-src__ri__ribOut.cpp
>--- /usr/ports/graphics/pixie/files/patch-src__ri__ribOut.cpp	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/pixie/files/patch-src__ri__ribOut.cpp	2013-07-21 00:00:00.000000000 +0900
>@@ -0,0 +1,11 @@
>+--- src/ri/ribOut.cpp.orig
>++++ src/ri/ribOut.cpp
>+@@ -162,7 +162,7 @@
>+ 
>+ #ifdef HAVE_ZLIB
>+ 			if (outputCompressed) {
>+-				gzclose(outFile);
>++				gzclose((gzFile)outFile);
>+ 			} else {
>+ 				fclose(outFile);
>+ 			}
>diff -urN /usr/ports/graphics/pixie/files/patch-src__ri__ribOut.h graphics/pixie/files/patch-src__ri__ribOut.h
>--- /usr/ports/graphics/pixie/files/patch-src__ri__ribOut.h	1970-01-01 09:00:00.000000000 +0900
>+++ graphics/pixie/files/patch-src__ri__ribOut.h	2013-07-21 00:00:00.000000000 +0900
>@@ -0,0 +1,20 @@
>+--- src/ri/ribOut.h.orig
>++++ src/ri/ribOut.h
>+@@ -237,7 +237,7 @@
>+ 												const int	l	=	vsprintf(scratch,mes,args);
>+ 
>+ 												#ifdef HAVE_ZLIB
>+-													if (outputCompressed)	gzwrite(outFile,scratch,l);
>++													if (outputCompressed)	gzwrite((gzFile)outFile,scratch,l);
>+ 													else					fwrite(scratch,1,l,outFile);
>+ 												#else
>+ 													fwrite(scratch,1,l,outFile);
>+@@ -258,7 +258,7 @@
>+ 												const int l	=	vsprintf(scratch,mes,args);
>+ 
>+ 												#ifdef HAVE_ZLIB
>+-													if (outputCompressed)	gzwrite(outFile,scratch,l);
>++													if (outputCompressed)	gzwrite((gzFile)outFile,scratch,l);
>+ 													else					fwrite(scratch,1,l,outFile);
>+ 												#else
>+ 													fwrite(scratch,1,l,outFile);

Actions: View | Diff

Attachments on bug 180688: 135717