From tkato432@yahoo.com  Sun Nov 24 18:02:20 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id EE55C2D1
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 24 Nov 2013 18:02:03 +0000 (UTC)
Received: from omta02.auone-net.jp (mail-or2-f145.auone-net.jp [111.87.219.145])
	by mx1.freebsd.org (Postfix) with ESMTP id AD21B2C83
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 24 Nov 2013 18:02:03 +0000 (UTC)
Received: from coppermine.my.domain (ZT030024.ppp.dion.ne.jp [59.128.30.24])
	by omta02.auone-net.jp (au one net mail) with ESMTP id 3CBCD1560045
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 25 Nov 2013 03:02:00 +0900 (JST)
Message-Id: <20131125025212.92f71887eaa6be184872ce7d@yahoo.com>
Date: Mon, 25 Nov 2013 02:52:12 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: graphics/rayshade: Fix build on -current

>Number:         184236
>Category:       ports
>Synopsis:       graphics/rayshade: Fix build on -current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 24 18:10:05 UTC 2013
>Closed-Date:    Wed Dec 25 18:15:54 UTC 2013
>Last-Modified:  Thu Dec 26 13:20:10 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build on -current

New file:
files/patch-etc__rsconvert__lex.l
files/patch-etc__rsconvert__yacc.y
files/patch-libray__libtext__texture.c
files/patch-libshade__lex.l
files/patch-libshade__yacc.y

Remove file:
files/patch-ab

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/rayshade/Makefile graphics/rayshade/Makefile
--- /usr/ports/graphics/rayshade/Makefile	2013-11-06 22:02:26.000000000 +0900
+++ graphics/rayshade/Makefile	2013-11-25 00:00:00.000000000 +0900
@@ -8,20 +8,18 @@
 MASTER_SITES=	http://ccl.net/cca/software/SOURCES/C/rayshade/ \
 		http://www.mirrorservice.org/sites/graphics.stanford.edu/pub/rayshade/ \
 		ftp://graphics.stanford.edu/pub/rayshade/
-DISTNAME=	${PORTNAME}.${PORTVERSION}
-EXTRACT_SUFX=	.tar.Z
-.if !defined(NOPORTDOCS)
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} guide.ps.Z
-.endif
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${PORTNAME}.${PORTVERSION}.tar.Z ${GUIDE_PS_Z}
+EXTRACT_ONLY=	${PORTNAME}.${PORTVERSION}.tar.Z
 DIST_SUBDIR=	rayshade
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An extensible system for creating ray-traced images
+COMMENT=	Extensible system for creating ray-traced images
 
 BUILD_DEPENDS=	$(LOCALBASE)/lib/librle.a:${PORTSDIR}/graphics/urt
 
-WRKSRC=		${WRKDIR}/${PORTNAME}.4.0
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION:R}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
@@ -31,11 +29,16 @@
 PORTEXAMPLES=	*
 PLIST_FILES=	bin/rayshade
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+GUIDE_PS_Z=	guide.ps.Z
+.endif
+
 .if defined(BATCH) || defined(PACKAGE_BUILDING)
 CONFIGURE_ARGS=	< ${WRKDIR}/config.ans
 .endif
 
-NO_STAGE=	yes
 pre-configure:
 	@${SED} -e \
 		"s,@CFLAGS@,${CFLAGS},g ; \
@@ -45,14 +48,15 @@
 		< ${FILESDIR}/config.ans > ${WRKDIR}/config.ans
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rayshade/rayshade ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/guide.ps.Z ${DOCSDIR}
-.endif
-.if !defined(NOPORTEXAMPLES)
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/Examples/* ${EXAMPLESDIR}
+	(cd ${WRKSRC}/rayshade && ${INSTALL_PROGRAM} rayshade \
+		${STAGEDIR}${PREFIX}/bin)
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${GUIDE_PS_Z} \
+		${STAGEDIR}${DOCSDIR})
 .endif
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/Examples && ${INSTALL_DATA} * \
+		${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/rayshade/files/patch-ab graphics/rayshade/files/patch-ab
--- /usr/ports/graphics/rayshade/files/patch-ab	2013-11-06 22:02:26.000000000 +0900
+++ graphics/rayshade/files/patch-ab	1970-01-01 09:00:00.000000000 +0900
@@ -1,24 +0,0 @@
-*** etc/rsconvert/lex.l.orig	Sun Mar  8 18:55:39 1998
---- etc/rsconvert/lex.l	Sun Mar  8 18:56:05 1998
-***************
-*** 22,27 ****
---- 22,28 ----
-  #include "libcommon/common.h"
-  #include "y.tab.h"
-  %}
-+ %option yylineno
-  alpha	[a-zA-Z]
-  special	[\.\_-]
-  digit	[0-9]
-*** libshade/lex.l.orig	Sun Mar  8 18:52:11 1998
---- libshade/lex.l	Sun Mar  8 18:53:18 1998
-***************
-*** 29,34 ****
---- 29,35 ----
-  #include "y.tab.h"
-  extern char *strsave();
-  %}
-+ %option yylineno
-  alpha	[a-zA-Z]
-  special	[\.\_-]
-  digit	[0-9]
diff -urN /usr/ports/graphics/rayshade/files/patch-etc__rsconvert__lex.l graphics/rayshade/files/patch-etc__rsconvert__lex.l
--- /usr/ports/graphics/rayshade/files/patch-etc__rsconvert__lex.l	1970-01-01 09:00:00.000000000 +0900
+++ graphics/rayshade/files/patch-etc__rsconvert__lex.l	2013-11-25 00:00:00.000000000 +0900
@@ -0,0 +1,19 @@
+--- etc/rsconvert/lex.l.orig	1992-02-10 12:03:54.000000000 +0900
++++ etc/rsconvert/lex.l	2013-05-28 22:55:24.000000000 +0900
+@@ -22,6 +22,7 @@
+ #include "libcommon/common.h"
+ #include "y.tab.h"
+ %}
++%option yylineno
+ alpha	[a-zA-Z]
+ special	[\.\_-]
+ digit	[0-9]
+@@ -113,7 +114,7 @@
+ 		if ((c = input()) == '/') {
+ 			WriteChar(c);
+ 			WriteNewline();
+-			return;
++			return FALSE;
+ 		}
+ 		unput(c);
+ 	}
diff -urN /usr/ports/graphics/rayshade/files/patch-etc__rsconvert__yacc.y graphics/rayshade/files/patch-etc__rsconvert__yacc.y
--- /usr/ports/graphics/rayshade/files/patch-etc__rsconvert__yacc.y	1970-01-01 09:00:00.000000000 +0900
+++ graphics/rayshade/files/patch-etc__rsconvert__yacc.y	2013-11-25 00:00:00.000000000 +0900
@@ -0,0 +1,10 @@
+--- etc/rsconvert/yacc.y.orig
++++ etc/rsconvert/yacc.y
+@@ -14,6 +14,7 @@
+ /* $Id: yacc.y,v 4.0.1.3 92/02/07 11:05:21 cek Exp Locker: cek $ */
+ %{
+ #include <stdio.h>
++#include <stdlib.h>
+ #include "libcommon/common.h"
+ 
+ #define NEWLINE()	WriteNewline()
diff -urN /usr/ports/graphics/rayshade/files/patch-libray__libtext__texture.c graphics/rayshade/files/patch-libray__libtext__texture.c
--- /usr/ports/graphics/rayshade/files/patch-libray__libtext__texture.c	1970-01-01 09:00:00.000000000 +0900
+++ graphics/rayshade/files/patch-libray__libtext__texture.c	2013-11-25 00:00:00.000000000 +0900
@@ -0,0 +1,11 @@
+--- libray/libtext/texture.c.orig	1992-02-10 12:04:02.000000000 +0900
++++ libray/libtext/texture.c	2013-05-28 22:41:59.000000000 +0900
+@@ -162,7 +162,7 @@
+ 	*u = ptmp.x;
+ 	*v = ptmp.y;
+ 	if (dpdu == (Vector *)NULL || dpdv == (Vector *)NULL)
+-		return;
++		return FALSE;
+ 	/*
+ 	 * Here's the ugly part.
+ 	 * Build initial UVN-->XYZ matrix...
diff -urN /usr/ports/graphics/rayshade/files/patch-libshade__lex.l graphics/rayshade/files/patch-libshade__lex.l
--- /usr/ports/graphics/rayshade/files/patch-libshade__lex.l	1970-01-01 09:00:00.000000000 +0900
+++ graphics/rayshade/files/patch-libshade__lex.l	2013-11-25 00:00:00.000000000 +0900
@@ -0,0 +1,19 @@
+--- libshade/lex.l.orig	1992-02-10 12:04:02.000000000 +0900
++++ libshade/lex.l	2013-05-28 22:45:54.000000000 +0900
+@@ -29,6 +29,7 @@
+ #include "y.tab.h"
+ extern char *strsave();
+ %}
++%option yylineno
+ alpha	[a-zA-Z]
+ special	[\.\_-]
+ digit	[0-9]
+@@ -171,7 +172,7 @@
+ 		while (input() != '*')
+ 			;
+ 		if ((c = input()) == '/')
+-			return;
++			return FALSE;
+ 		unput(c);
+ 	}
+ }
diff -urN /usr/ports/graphics/rayshade/files/patch-libshade__yacc.y graphics/rayshade/files/patch-libshade__yacc.y
--- /usr/ports/graphics/rayshade/files/patch-libshade__yacc.y	1970-01-01 09:00:00.000000000 +0900
+++ graphics/rayshade/files/patch-libshade__yacc.y	2013-11-25 00:00:00.000000000 +0900
@@ -0,0 +1,11 @@
+--- libshade/yacc.y.orig
++++ libshade/yacc.y
+@@ -13,6 +13,8 @@
+ /* for any purpose.  It is provided solely "as is".			   */
+ /* $Id: yacc.y,v 4.0.1.4 92/01/10 16:29:55 cek Exp Locker: cek $ */
+ %{
++#include <stdlib.h>
++#include <string.h>
+ #include "rayshade.h"
+ 
+ #include "symtab.h"
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Wed Dec 25 17:49:43 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184236 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Wed Dec 25 18:15:53 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184236: commit references a PR
Date: Wed, 25 Dec 2013 18:15:50 +0000 (UTC)

 Author: pawel
 Date: Wed Dec 25 18:15:41 2013
 New Revision: 337436
 URL: http://svnweb.freebsd.org/changeset/ports/337436
 
 Log:
   - Fix build on -current
   - Remove leading article from COMMENT
   - Support staging
   
   PR:		ports/184236
   Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
 
 Added:
   head/graphics/rayshade/files/patch-etc__rsconvert__lex.l   (contents, props changed)
   head/graphics/rayshade/files/patch-etc__rsconvert__yacc.y   (contents, props changed)
   head/graphics/rayshade/files/patch-libray__libtext__texture.c   (contents, props changed)
   head/graphics/rayshade/files/patch-libshade__lex.l   (contents, props changed)
   head/graphics/rayshade/files/patch-libshade__yacc.y   (contents, props changed)
 Deleted:
   head/graphics/rayshade/files/patch-ab
 Modified:
   head/graphics/rayshade/Makefile   (contents, props changed)
 
 Modified: head/graphics/rayshade/Makefile
 ==============================================================================
 --- head/graphics/rayshade/Makefile	Wed Dec 25 18:05:51 2013	(r337435)
 +++ head/graphics/rayshade/Makefile	Wed Dec 25 18:15:41 2013	(r337436)
 @@ -8,20 +8,18 @@ CATEGORIES=	graphics
  MASTER_SITES=	http://ccl.net/cca/software/SOURCES/C/rayshade/ \
  		http://www.mirrorservice.org/sites/graphics.stanford.edu/pub/rayshade/ \
  		ftp://graphics.stanford.edu/pub/rayshade/
 -DISTNAME=	${PORTNAME}.${PORTVERSION}
 -EXTRACT_SUFX=	.tar.Z
 -.if !defined(NOPORTDOCS)
 -DISTFILES=	${DISTNAME}${EXTRACT_SUFX} guide.ps.Z
 -.endif
 -EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 +DISTFILES=	${PORTNAME}.${PORTVERSION}.tar.Z ${GUIDE_PS_Z}
  DIST_SUBDIR=	rayshade
 +EXTRACT_ONLY=	${PORTNAME}.${PORTVERSION}.tar.Z
  
  MAINTAINER=	ports@FreeBSD.org
 -COMMENT=	An extensible system for creating ray-traced images
 +COMMENT=	Extensible system for creating ray-traced images
  
  BUILD_DEPENDS=	$(LOCALBASE)/lib/librle.a:${PORTSDIR}/graphics/urt
  
 -WRKSRC=		${WRKDIR}/${PORTNAME}.4.0
 +OPTIONS_DEFINE=	DOCS EXAMPLES
 +
 +WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION:R}
  
  HAS_CONFIGURE=	yes
  CONFIGURE_SCRIPT=	Configure
 @@ -31,11 +29,16 @@ PORTDOCS=	*
  PORTEXAMPLES=	*
  PLIST_FILES=	bin/rayshade
  
 +.include <bsd.port.options.mk>
 +
 +.if ${PORT_OPTIONS:MDOCS}
 +GUIDE_PS_Z=	guide.ps.Z
 +.endif
 +
  .if defined(BATCH) || defined(PACKAGE_BUILDING)
  CONFIGURE_ARGS=	< ${WRKDIR}/config.ans
  .endif
  
 -NO_STAGE=	yes
  pre-configure:
  	@${SED} -e \
  		"s,@CFLAGS@,${CFLAGS},g ; \
 @@ -45,14 +48,15 @@ pre-configure:
  		< ${FILESDIR}/config.ans > ${WRKDIR}/config.ans
  
  do-install:
 -	${INSTALL_PROGRAM} ${WRKSRC}/rayshade/rayshade ${PREFIX}/bin
 -.if !defined(NOPORTDOCS)
 -	@${MKDIR} ${DOCSDIR}
 -	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/guide.ps.Z ${DOCSDIR}
 -.endif
 -.if !defined(NOPORTEXAMPLES)
 -	@${MKDIR} ${EXAMPLESDIR}
 -	${INSTALL_DATA} ${WRKSRC}/Examples/* ${EXAMPLESDIR}
 +	(cd ${WRKSRC}/rayshade && ${INSTALL_PROGRAM} rayshade \
 +		${STAGEDIR}${PREFIX}/bin)
 +.if ${PORT_OPTIONS:MDOCS}
 +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${GUIDE_PS_Z} \
 +		${STAGEDIR}${DOCSDIR})
  .endif
 +	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 +	(cd ${WRKSRC}/Examples && ${INSTALL_DATA} * \
 +		${STAGEDIR}${EXAMPLESDIR})
  
  .include <bsd.port.mk>
 
 Added: head/graphics/rayshade/files/patch-etc__rsconvert__lex.l
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/rayshade/files/patch-etc__rsconvert__lex.l	Wed Dec 25 18:15:41 2013	(r337436)
 @@ -0,0 +1,19 @@
 +--- etc/rsconvert/lex.l.orig	1992-02-10 12:03:54.000000000 +0900
 ++++ etc/rsconvert/lex.l	2013-05-28 22:55:24.000000000 +0900
 +@@ -22,6 +22,7 @@
 + #include "libcommon/common.h"
 + #include "y.tab.h"
 + %}
 ++%option yylineno
 + alpha	[a-zA-Z]
 + special	[\.\_-]
 + digit	[0-9]
 +@@ -113,7 +114,7 @@
 + 		if ((c = input()) == '/') {
 + 			WriteChar(c);
 + 			WriteNewline();
 +-			return;
 ++			return FALSE;
 + 		}
 + 		unput(c);
 + 	}
 
 Added: head/graphics/rayshade/files/patch-etc__rsconvert__yacc.y
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/rayshade/files/patch-etc__rsconvert__yacc.y	Wed Dec 25 18:15:41 2013	(r337436)
 @@ -0,0 +1,10 @@
 +--- etc/rsconvert/yacc.y.orig
 ++++ etc/rsconvert/yacc.y
 +@@ -14,6 +14,7 @@
 + /* $Id: yacc.y,v 4.0.1.3 92/02/07 11:05:21 cek Exp Locker: cek $ */
 + %{
 + #include <stdio.h>
 ++#include <stdlib.h>
 + #include "libcommon/common.h"
 + 
 + #define NEWLINE()	WriteNewline()
 
 Added: head/graphics/rayshade/files/patch-libray__libtext__texture.c
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/rayshade/files/patch-libray__libtext__texture.c	Wed Dec 25 18:15:41 2013	(r337436)
 @@ -0,0 +1,11 @@
 +--- libray/libtext/texture.c.orig	1992-02-10 12:04:02.000000000 +0900
 ++++ libray/libtext/texture.c	2013-05-28 22:41:59.000000000 +0900
 +@@ -162,7 +162,7 @@
 + 	*u = ptmp.x;
 + 	*v = ptmp.y;
 + 	if (dpdu == (Vector *)NULL || dpdv == (Vector *)NULL)
 +-		return;
 ++		return FALSE;
 + 	/*
 + 	 * Here's the ugly part.
 + 	 * Build initial UVN-->XYZ matrix...
 
 Added: head/graphics/rayshade/files/patch-libshade__lex.l
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/rayshade/files/patch-libshade__lex.l	Wed Dec 25 18:15:41 2013	(r337436)
 @@ -0,0 +1,19 @@
 +--- libshade/lex.l.orig	1992-02-10 12:04:02.000000000 +0900
 ++++ libshade/lex.l	2013-05-28 22:45:54.000000000 +0900
 +@@ -29,6 +29,7 @@
 + #include "y.tab.h"
 + extern char *strsave();
 + %}
 ++%option yylineno
 + alpha	[a-zA-Z]
 + special	[\.\_-]
 + digit	[0-9]
 +@@ -171,7 +172,7 @@
 + 		while (input() != '*')
 + 			;
 + 		if ((c = input()) == '/')
 +-			return;
 ++			return FALSE;
 + 		unput(c);
 + 	}
 + }
 
 Added: head/graphics/rayshade/files/patch-libshade__yacc.y
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/graphics/rayshade/files/patch-libshade__yacc.y	Wed Dec 25 18:15:41 2013	(r337436)
 @@ -0,0 +1,11 @@
 +--- libshade/yacc.y.orig
 ++++ libshade/yacc.y
 +@@ -13,6 +13,8 @@
 + /* for any purpose.  It is provided solely "as is".			   */
 + /* $Id: yacc.y,v 4.0.1.4 92/01/10 16:29:55 cek Exp Locker: cek $ */
 + %{
 ++#include <stdlib.h>
 ++#include <string.h>
 + #include "rayshade.h"
 + 
 + #include "symtab.h"
 _______________________________________________
 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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184236: commit references a PR
Date: Thu, 26 Dec 2013 13:16:32 +0000 (UTC)

 Author: mat
 Date: Thu Dec 26 13:16:15 2013
 New Revision: 337503
 URL: http://svnweb.freebsd.org/changeset/ports/337503
 
 Log:
   MFH: r337436
   
   - Fix build on -current
   - Remove leading article from COMMENT
   - Support staging
   
   PR:		ports/184236
   Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
   Approved by:	portmgr (implicit)
 
 Added:
   branches/2014Q1/graphics/rayshade/files/patch-etc__rsconvert__lex.l
      - copied unchanged from r337436, head/graphics/rayshade/files/patch-etc__rsconvert__lex.l
   branches/2014Q1/graphics/rayshade/files/patch-etc__rsconvert__yacc.y
      - copied unchanged from r337436, head/graphics/rayshade/files/patch-etc__rsconvert__yacc.y
   branches/2014Q1/graphics/rayshade/files/patch-libray__libtext__texture.c
      - copied unchanged from r337436, head/graphics/rayshade/files/patch-libray__libtext__texture.c
   branches/2014Q1/graphics/rayshade/files/patch-libshade__lex.l
      - copied unchanged from r337436, head/graphics/rayshade/files/patch-libshade__lex.l
   branches/2014Q1/graphics/rayshade/files/patch-libshade__yacc.y
      - copied unchanged from r337436, head/graphics/rayshade/files/patch-libshade__yacc.y
 Deleted:
   branches/2014Q1/graphics/rayshade/files/patch-ab
 Modified:
   branches/2014Q1/graphics/rayshade/Makefile   (contents, props changed)
 Directory Properties:
   branches/2014Q1/   (props changed)
 
 Modified: branches/2014Q1/graphics/rayshade/Makefile
 ==============================================================================
 --- branches/2014Q1/graphics/rayshade/Makefile	Thu Dec 26 13:16:06 2013	(r337502)
 +++ branches/2014Q1/graphics/rayshade/Makefile	Thu Dec 26 13:16:15 2013	(r337503)
 @@ -8,20 +8,18 @@ CATEGORIES=	graphics
  MASTER_SITES=	http://ccl.net/cca/software/SOURCES/C/rayshade/ \
  		http://www.mirrorservice.org/sites/graphics.stanford.edu/pub/rayshade/ \
  		ftp://graphics.stanford.edu/pub/rayshade/
 -DISTNAME=	${PORTNAME}.${PORTVERSION}
 -EXTRACT_SUFX=	.tar.Z
 -.if !defined(NOPORTDOCS)
 -DISTFILES=	${DISTNAME}${EXTRACT_SUFX} guide.ps.Z
 -.endif
 -EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 +DISTFILES=	${PORTNAME}.${PORTVERSION}.tar.Z ${GUIDE_PS_Z}
  DIST_SUBDIR=	rayshade
 +EXTRACT_ONLY=	${PORTNAME}.${PORTVERSION}.tar.Z
  
  MAINTAINER=	ports@FreeBSD.org
 -COMMENT=	An extensible system for creating ray-traced images
 +COMMENT=	Extensible system for creating ray-traced images
  
  BUILD_DEPENDS=	$(LOCALBASE)/lib/librle.a:${PORTSDIR}/graphics/urt
  
 -WRKSRC=		${WRKDIR}/${PORTNAME}.4.0
 +OPTIONS_DEFINE=	DOCS EXAMPLES
 +
 +WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION:R}
  
  HAS_CONFIGURE=	yes
  CONFIGURE_SCRIPT=	Configure
 @@ -31,11 +29,16 @@ PORTDOCS=	*
  PORTEXAMPLES=	*
  PLIST_FILES=	bin/rayshade
  
 +.include <bsd.port.options.mk>
 +
 +.if ${PORT_OPTIONS:MDOCS}
 +GUIDE_PS_Z=	guide.ps.Z
 +.endif
 +
  .if defined(BATCH) || defined(PACKAGE_BUILDING)
  CONFIGURE_ARGS=	< ${WRKDIR}/config.ans
  .endif
  
 -NO_STAGE=	yes
  pre-configure:
  	@${SED} -e \
  		"s,@CFLAGS@,${CFLAGS},g ; \
 @@ -45,14 +48,15 @@ pre-configure:
  		< ${FILESDIR}/config.ans > ${WRKDIR}/config.ans
  
  do-install:
 -	${INSTALL_PROGRAM} ${WRKSRC}/rayshade/rayshade ${PREFIX}/bin
 -.if !defined(NOPORTDOCS)
 -	@${MKDIR} ${DOCSDIR}
 -	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/guide.ps.Z ${DOCSDIR}
 -.endif
 -.if !defined(NOPORTEXAMPLES)
 -	@${MKDIR} ${EXAMPLESDIR}
 -	${INSTALL_DATA} ${WRKSRC}/Examples/* ${EXAMPLESDIR}
 +	(cd ${WRKSRC}/rayshade && ${INSTALL_PROGRAM} rayshade \
 +		${STAGEDIR}${PREFIX}/bin)
 +.if ${PORT_OPTIONS:MDOCS}
 +	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 +	(cd ${DISTDIR}/${DIST_SUBDIR} && ${INSTALL_DATA} ${GUIDE_PS_Z} \
 +		${STAGEDIR}${DOCSDIR})
  .endif
 +	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 +	(cd ${WRKSRC}/Examples && ${INSTALL_DATA} * \
 +		${STAGEDIR}${EXAMPLESDIR})
  
  .include <bsd.port.mk>
 
 Copied: branches/2014Q1/graphics/rayshade/files/patch-etc__rsconvert__lex.l (from r337436, head/graphics/rayshade/files/patch-etc__rsconvert__lex.l)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ branches/2014Q1/graphics/rayshade/files/patch-etc__rsconvert__lex.l	Thu Dec 26 13:16:15 2013	(r337503, copy of r337436, head/graphics/rayshade/files/patch-etc__rsconvert__lex.l)
 @@ -0,0 +1,19 @@
 +--- etc/rsconvert/lex.l.orig	1992-02-10 12:03:54.000000000 +0900
 ++++ etc/rsconvert/lex.l	2013-05-28 22:55:24.000000000 +0900
 +@@ -22,6 +22,7 @@
 + #include "libcommon/common.h"
 + #include "y.tab.h"
 + %}
 ++%option yylineno
 + alpha	[a-zA-Z]
 + special	[\.\_-]
 + digit	[0-9]
 +@@ -113,7 +114,7 @@
 + 		if ((c = input()) == '/') {
 + 			WriteChar(c);
 + 			WriteNewline();
 +-			return;
 ++			return FALSE;
 + 		}
 + 		unput(c);
 + 	}
 
 Copied: branches/2014Q1/graphics/rayshade/files/patch-etc__rsconvert__yacc.y (from r337436, head/graphics/rayshade/files/patch-etc__rsconvert__yacc.y)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ branches/2014Q1/graphics/rayshade/files/patch-etc__rsconvert__yacc.y	Thu Dec 26 13:16:15 2013	(r337503, copy of r337436, head/graphics/rayshade/files/patch-etc__rsconvert__yacc.y)
 @@ -0,0 +1,10 @@
 +--- etc/rsconvert/yacc.y.orig
 ++++ etc/rsconvert/yacc.y
 +@@ -14,6 +14,7 @@
 + /* $Id: yacc.y,v 4.0.1.3 92/02/07 11:05:21 cek Exp Locker: cek $ */
 + %{
 + #include <stdio.h>
 ++#include <stdlib.h>
 + #include "libcommon/common.h"
 + 
 + #define NEWLINE()	WriteNewline()
 
 Copied: branches/2014Q1/graphics/rayshade/files/patch-libray__libtext__texture.c (from r337436, head/graphics/rayshade/files/patch-libray__libtext__texture.c)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ branches/2014Q1/graphics/rayshade/files/patch-libray__libtext__texture.c	Thu Dec 26 13:16:15 2013	(r337503, copy of r337436, head/graphics/rayshade/files/patch-libray__libtext__texture.c)
 @@ -0,0 +1,11 @@
 +--- libray/libtext/texture.c.orig	1992-02-10 12:04:02.000000000 +0900
 ++++ libray/libtext/texture.c	2013-05-28 22:41:59.000000000 +0900
 +@@ -162,7 +162,7 @@
 + 	*u = ptmp.x;
 + 	*v = ptmp.y;
 + 	if (dpdu == (Vector *)NULL || dpdv == (Vector *)NULL)
 +-		return;
 ++		return FALSE;
 + 	/*
 + 	 * Here's the ugly part.
 + 	 * Build initial UVN-->XYZ matrix...
 
 Copied: branches/2014Q1/graphics/rayshade/files/patch-libshade__lex.l (from r337436, head/graphics/rayshade/files/patch-libshade__lex.l)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ branches/2014Q1/graphics/rayshade/files/patch-libshade__lex.l	Thu Dec 26 13:16:15 2013	(r337503, copy of r337436, head/graphics/rayshade/files/patch-libshade__lex.l)
 @@ -0,0 +1,19 @@
 +--- libshade/lex.l.orig	1992-02-10 12:04:02.000000000 +0900
 ++++ libshade/lex.l	2013-05-28 22:45:54.000000000 +0900
 +@@ -29,6 +29,7 @@
 + #include "y.tab.h"
 + extern char *strsave();
 + %}
 ++%option yylineno
 + alpha	[a-zA-Z]
 + special	[\.\_-]
 + digit	[0-9]
 +@@ -171,7 +172,7 @@
 + 		while (input() != '*')
 + 			;
 + 		if ((c = input()) == '/')
 +-			return;
 ++			return FALSE;
 + 		unput(c);
 + 	}
 + }
 
 Copied: branches/2014Q1/graphics/rayshade/files/patch-libshade__yacc.y (from r337436, head/graphics/rayshade/files/patch-libshade__yacc.y)
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ branches/2014Q1/graphics/rayshade/files/patch-libshade__yacc.y	Thu Dec 26 13:16:15 2013	(r337503, copy of r337436, head/graphics/rayshade/files/patch-libshade__yacc.y)
 @@ -0,0 +1,11 @@
 +--- libshade/yacc.y.orig
 ++++ libshade/yacc.y
 +@@ -13,6 +13,8 @@
 + /* for any purpose.  It is provided solely "as is".			   */
 + /* $Id: yacc.y,v 4.0.1.4 92/01/10 16:29:55 cek Exp Locker: cek $ */
 + %{
 ++#include <stdlib.h>
 ++#include <string.h>
 + #include "rayshade.h"
 + 
 + #include "symtab.h"
 _______________________________________________
 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:
