Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 1 Jul 2003 23:28:32 +0200 (CEST)
From:      "=?iso-8859-1?q?Pedro=20F.=20Giffuni?=" <giffunip@yahoo.com>
To:        FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/52821: Rayshade homesite and postscript documentation
Message-ID:  <20030701212832.56951.qmail@web13402.mail.yahoo.com>
In-Reply-To: <200305311750.h4VHoBWD015079@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
--0-954698741-1057094912=:56861
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
Content-Id: 
Content-Disposition: inline

The attached cleanup patch solved the building problems for me.
Since I don't have current I cannot be sure it will work
everywhere, but at least this cleans the port enough to find out
what is happening.

enjoy


______________________________________________________________________
Yahoo! Mail: 6MB di spazio gratuito, 30MB per i tuoi allegati, l'antivirus, il filtro Anti-spam
http://it.yahoo.com/mail_it/foot/?http://it.mail.yahoo.com/
--0-954698741-1057094912=:56861
Content-Type: text/plain; name=patch-rayshade
Content-Description: patch-rayshade
Content-Disposition: inline; filename=patch-rayshade

diff -ruN rayshade.orig/Makefile rayshade/Makefile
--- rayshade.orig/Makefile	Wed May 28 23:41:57 2003
+++ rayshade/Makefile	Tue Jul  1 16:12:10 2003
@@ -12,36 +12,38 @@
 		ftp://ftp.princeton.edu/pub/Graphics/rayshade.4.0/
 DISTNAME=	${PORTNAME}.${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
+.ifndef NOPORTDOCS
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} guide.ps.Z
+.endif
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extensible system for creating ray-traced images
 
 BUILD_DEPENDS=	$(LOCALBASE)/lib/librle.a:${PORTSDIR}/graphics/urt
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile"
-.endif
+DIST_SUBDIR=	rayshade
 
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	Configure
-CONFIGURE_ARGS+=	< ${WRKDIR}/config.ans
 ALL_TARGET=
 
+.if defined (BATCH) || defined(PACKAGE_BUILDING)
+USE_REINPLACE=	yes
+CONFIGURE_ARGS=	< ${WRKDIR}/config.ans
+
 pre-configure:
-	$(SED) -e "s,@CFLAGS@,${CFLAGS}," < ${FILESDIR}/config.ans > \
-		${WRKDIR}/config.ans
+	${CP} ${FILESDIR}/config.ans ${WRKDIR}/config.ans
+	${REINPLACE_CMD} -e "s,@CFLAGS@,${CFLAGS}," ${WRKDIR}/config.ans
+.endif
 
 do-install:
 	$(INSTALL_PROGRAM) $(WRKSRC)/rayshade/rayshade $(PREFIX)/bin
-# THIS ARE NOT USED BY ANY PORT
-#	$(INSTALL_DATA) $(WRKSRC)/libray/libray.a $(PREFIX)/lib
-#	$(INSTALL_DATA) $(WRKSRC)/libshade/libshade.a $(PREFIX)/lib
-	$(MKDIR) $(PREFIX)/share/doc/rayshade
-	$(INSTALL_DATA) $(WRKSRC)/Doc/Guide/* $(PREFIX)/share/doc/rayshade
-	$(INSTALL_DATA) $(WRKSRC)/Doc/quickref.txt $(PREFIX)/share/doc/rayshade
+.ifndef NOPORTDOCS
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/guide.ps.Z ${DOCSDIR}
 	$(MKDIR) $(PREFIX)/share/examples/rayshade
 	$(INSTALL_DATA) $(WRKSRC)/Examples/* $(PREFIX)/share/examples/rayshade
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -ruN rayshade.orig/distinfo rayshade/distinfo
--- rayshade.orig/distinfo	Wed May 28 23:41:57 2003
+++ rayshade/distinfo	Thu May 29 11:00:30 2003
@@ -1 +1,2 @@
-MD5 (rayshade.4.0.tar.Z) = c81f9507c20cd6060a8bdc611a6771ff
+MD5 (rayshade/rayshade.4.0.tar.Z) = c81f9507c20cd6060a8bdc611a6771ff
+MD5 (rayshade/guide.ps.Z) = 59429e2018ef21bb1e31ca8e0ae26c56
diff -ruN rayshade.orig/files/config.ans rayshade/files/config.ans
--- rayshade.orig/files/config.ans	Wed May 28 23:41:57 2003
+++ rayshade/files/config.ans	Tue Jul  1 15:54:38 2003
@@ -7,14 +7,13 @@
 
 @CFLAGS@
 
-n
+none
 /usr/local/include
 
 
 
 
-
+/usr/bin/mkdep
 yacc
-
 
 
diff -ruN rayshade.orig/pkg-descr rayshade/pkg-descr
--- rayshade.orig/pkg-descr	Wed May 28 23:41:57 2003
+++ rayshade/pkg-descr	Wed May 28 23:44:34 2003
@@ -1,3 +1,5 @@
 Rayshade is a system for generating ray-traced images. Rayshade's main
 function is to read a multi-line ASCII file describing a scene to be
 rendered and produce a file containing the ray traced image.
+
+WWW:	http://www-graphics.stanford.edu/~cek/rayshade/
diff -ruN rayshade.orig/pkg-plist rayshade/pkg-plist
--- rayshade.orig/pkg-plist	Wed May 28 23:41:57 2003
+++ rayshade/pkg-plist	Tue Jul  1 16:10:39 2003
@@ -1,33 +1,19 @@
 bin/rayshade
-share/doc/rayshade/README
-share/doc/rayshade/animate.tex
-share/doc/rayshade/camera.tex
-share/doc/rayshade/guide.tex
-share/doc/rayshade/height.tex
-share/doc/rayshade/intro.tex
-share/doc/rayshade/lights.tex
-share/doc/rayshade/objects.tex
-share/doc/rayshade/options.tex
-share/doc/rayshade/preface.tex
-share/doc/rayshade/running.tex
-share/doc/rayshade/surfaces.tex
-share/doc/rayshade/texture.tex
-share/doc/rayshade/transform.tex
-share/doc/rayshade/quickref.txt
-share/examples/rayshade/ashtray.def.ray
-share/examples/rayshade/ashtray.ray
-share/examples/rayshade/balls.ray
-share/examples/rayshade/blob.ray
-share/examples/rayshade/boxball.ray
-share/examples/rayshade/coin.ray
-share/examples/rayshade/csg.ray
-share/examples/rayshade/glass.def.ray
-share/examples/rayshade/glass.ray
-share/examples/rayshade/mtv.ray
-share/examples/rayshade/planet.map
-share/examples/rayshade/planet.ray
-share/examples/rayshade/pool.ray
-share/examples/rayshade/solids.ray
-share/examples/rayshade/stripe.ray
-@dirrm share/doc/rayshade
-@dirrm share/examples/rayshade
+%%PORTDOCS%%%%DOCSDIR%%/guide.ps.Z
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/ashtray.def.ray
+%%PORTDOCS%%%%EXAMPLESDIR%%/ashtray.ray
+%%PORTDOCS%%%%EXAMPLESDIR%%/balls.ray
+%%PORTDOCS%%%%EXAMPLESDIR%%/blob.ray
+%%PORTDOCS%%%%EXAMPLESDIR%%/boxball.ray
+%%PORTDOCS%%%%EXAMPLESDIR%%/coin.ray
+%%PORTDOCS%%%%EXAMPLESDIR%%/csg.ray
+%%PORTDOCS%%%%EXAMPLESDIR%%/glass.def.ray
+%%PORTDOCS%%%%EXAMPLESDIR%%/glass.ray
+%%PORTDOCS%%%%EXAMPLESDIR%%/mtv.ray
+%%PORTDOCS%%%%EXAMPLESDIR%%/planet.map
+%%PORTDOCS%%%%EXAMPLESDIR%%/planet.ray
+%%PORTDOCS%%%%EXAMPLESDIR%%/pool.ray
+%%PORTDOCS%%%%EXAMPLESDIR%%/solids.ray
+%%PORTDOCS%%%%EXAMPLESDIR%%/stripe.ray
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%

--0-954698741-1057094912=:56861--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030701212832.56951.qmail>