Date: Thu, 26 Dec 2013 13:16:15 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337503 - in branches/2014Q1/graphics/rayshade: . files Message-ID: <201312261316.rBQDGFsO090881@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312261316.rBQDGFsO090881>