From tkato432@yahoo.com  Sat Jul 20 18:02:51 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id DE38BA83
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat, 20 Jul 2013 18:02:31 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from omta01.auone-net.jp (mail-or2-f145.auone-net.jp [111.87.219.145])
	by mx1.freebsd.org (Postfix) with ESMTP id 9FA07D77
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat, 20 Jul 2013 18:02:31 +0000 (UTC)
Received: from localhost.localdomain (ZT034196.ppp.dion.ne.jp [59.128.34.196])
	by omta01.auone-net.jp (au one net mail) with ESMTP id 8074D98000A
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 21 Jul 2013 03:02:28 +0900 (JST)
Message-Id: <20130721025129.273ce0c5bf032d3c3fba205a@yahoo.com>
Date: Sun, 21 Jul 2013 02:51:29 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: graphics/pixie: Fix build with 9-stable

>Number:         180688
>Category:       ports
>Synopsis:       graphics/pixie: Fix build with 9-stable
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jul 20 18:10:02 UTC 2013
>Closed-Date:    Sat Jul 20 21:34:50 UTC 2013
>Last-Modified:  Sat Jul 20 21:40:00 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p1 i386
>Organization:
>Environment:
>Description:
- Fix build with 9-stable
- Support OPTIONS_DEFINE
- Add LICENSE

New file:
files/patch-src__ri__rib.l
files/patch-src__ri__rib.y
files/patch-src__ri__ribOut.cpp
files/patch-src__ri__ribOut.h

>How-To-Repeat:
>Fix:

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);
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Jul 20 18:10:36 UTC 2013 
Responsible-Changed-Why:  
miwi@ wants this submitter's PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180688 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Jul 20 21:34:50 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180688 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180688: commit references a PR
Date: Sat, 20 Jul 2013 21:34:23 +0000 (UTC)

 Author: miwi
 Date: Sat Jul 20 21:34:14 2013
 New Revision: 323361
 URL: http://svnweb.freebsd.org/changeset/ports/323361
 
 Log:
   - Unbreak build
   - Support OPTIONS_DEFINE
   - Add LICENSE
   
   PR:		180688
   Submitted by:	ports fury
 
 Added:
   head/graphics/pixie/files/
   head/graphics/pixie/files/patch-src__ri__rib.l   (contents, props changed)
   head/graphics/pixie/files/patch-src__ri__rib.y   (contents, props changed)
   head/graphics/pixie/files/patch-src__ri__ribOut.cpp   (contents, props changed)
   head/graphics/pixie/files/patch-src__ri__ribOut.h   (contents, props changed)
 Modified:
   head/graphics/pixie/Makefile
 
 Modified: head/graphics/pixie/Makefile
 ==============================================================================
 --- head/graphics/pixie/Makefile	Sat Jul 20 20:38:41 2013	(r323360)
 +++ head/graphics/pixie/Makefile	Sat Jul 20 21:34:14 2013	(r323361)
 @@ -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 @@ MAN1=		rndr.1 sdrc.1 sdrinfo.1 texmake.1
  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 @@ LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_L
  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 @@ post-patch:
  .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*" | \
 
 Added: head/graphics/pixie/files/patch-src__ri__rib.l
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/pixie/files/patch-src__ri__rib.l	Sat Jul 20 21:34:14 2013	(r323361)
 @@ -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
 
 Added: head/graphics/pixie/files/patch-src__ri__rib.y
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/pixie/files/patch-src__ri__rib.y	Sat Jul 20 21:34:14 2013	(r323361)
 @@ -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
 
 Added: head/graphics/pixie/files/patch-src__ri__ribOut.cpp
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/pixie/files/patch-src__ri__ribOut.cpp	Sat Jul 20 21:34:14 2013	(r323361)
 @@ -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);
 + 			}
 
 Added: head/graphics/pixie/files/patch-src__ri__ribOut.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/pixie/files/patch-src__ri__ribOut.h	Sat Jul 20 21:34:14 2013	(r323361)
 @@ -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);
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
