Import of pkgsrc-2013Q2

This commit is contained in:
2013-09-26 17:14:40 +02:00
commit 785076ae39
74991 changed files with 4380255 additions and 0 deletions

3
graphics/rayshade/DESCR Normal file
View File

@@ -0,0 +1,3 @@
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.

View File

@@ -0,0 +1,36 @@
# $NetBSD: Makefile,v 1.34 2013/02/16 11:22:26 wiz Exp $
DISTNAME= rayshade.4.0.6
PKGNAME= rayshade-4.0.6
#KGREVISION= 8
PKGREVISION= 3
CATEGORIES= graphics
MASTER_SITES= ftp://graphics.stanford.edu/pub/rayshade/
EXTRACT_SUFX= .tar.Z
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Extensible system for creating ray-traced images
NOT_FOR_BULK_PLATFORM= HPUX-*-*
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./Configure
BUILD_TARGET=
INSTALLATION_DIRS= bin lib share/doc/rayshade share/examples/rayshade
WRKSRC= ${WRKDIR}/rayshade.4.0
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/rayshade/rayshade ${DESTDIR}${PREFIX}/bin
${INSTALL_DATA} ${WRKSRC}/libray/libray.a ${DESTDIR}${PREFIX}/lib
${RANLIB} ${DESTDIR}${PREFIX}/lib/libray.a
${INSTALL_DATA} ${WRKSRC}/libshade/libshade.a ${DESTDIR}${PREFIX}/lib
${RANLIB} ${DESTDIR}${PREFIX}/lib/libshade.a
${INSTALL_DATA} ${WRKSRC}/Doc/Guide/* \
${DESTDIR}${PREFIX}/share/doc/rayshade
${INSTALL_DATA} ${WRKSRC}/Doc/quickref.txt \
${DESTDIR}${PREFIX}/share/doc/rayshade
${INSTALL_DATA} ${WRKSRC}/Examples/* \
${DESTDIR}${PREFIX}/share/examples/rayshade
.include "../../graphics/urt/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

34
graphics/rayshade/PLIST Normal file
View File

@@ -0,0 +1,34 @@
@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:59:27 joerg Exp $
bin/rayshade
lib/libray.a
lib/libshade.a
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

View File

@@ -0,0 +1,25 @@
$NetBSD: distinfo,v 1.8 2012/12/25 21:08:40 joerg Exp $
SHA1 (rayshade.4.0.6.tar.Z) = 5fd1ce05e7ba3bc8e8b337c212eccb6b53b5b4ca
RMD160 (rayshade.4.0.6.tar.Z) = a19bf35aa3f66de9ce406a1a98cf7edbde60f356
Size (rayshade.4.0.6.tar.Z) = 369527 bytes
SHA1 (patch-aa) = b510e1b3a98ef25ffe0d23f9b499fb5c16c333f4
SHA1 (patch-ab) = 8a5fb56e6e12440550469a4a7635921fa76ec615
SHA1 (patch-ac) = 496d4d89edaa7a8786cbd22c2fc31679fda96df5
SHA1 (patch-ad) = 8e599cc859406341ec39c52b7711e7b64f015b57
SHA1 (patch-ae) = 3663df57825be54a989dcfd2365662c524f8150f
SHA1 (patch-af) = 84663fa3abc0922e9a56b672127634b515b351b4
SHA1 (patch-ag) = db5628955bf9629e27d2d40c48ff87d418792f1d
SHA1 (patch-ah) = 9fb1fdbe73d2422d433777610fb8abf0a5a9b5f5
SHA1 (patch-ai) = 67086eacd9cac8acc7729129017279c0f3db0bf6
SHA1 (patch-aj) = c19ca9c4dfe789d9d48605f3ae08fa654a82db08
SHA1 (patch-ak) = b9237a9dcf2d4f8aacef5c50d83ac41ca3876d77
SHA1 (patch-al) = bd5931faab8c2544323d89d6102f0d04baaee2e6
SHA1 (patch-am) = 02102a8f4909db017c008e6998177b51f5bcf684
SHA1 (patch-an) = 0f1fc819052fc05097d278108934582f8e35a236
SHA1 (patch-ao) = a4357564a150836dc9080519f36c81ccc049d981
SHA1 (patch-ap) = 28ab76ad7b65d53bf190a944969b95f0915f6098
SHA1 (patch-ba) = d36261ceede5f89645ff23f5a108b231fd5ea18d
SHA1 (patch-libray_libtext_mapping.h) = e28ff185a6fefaad2fb975aafd04f7246ed83e55
SHA1 (patch-libray_libtext_texture.c) = 17635e4a7b286db4c86d7e0071852f688b3989d8
SHA1 (patch-libshade_lex.l) = e06825ca0fe17674c854aa04bf303a3ee0e0b768

View File

@@ -0,0 +1,189 @@
/* config.h
* This file was produced by running the config.h.SH script, which
* gets its values from config.sh, which is generally produced by
* running Configure.
*
* Feel free to modify any of this as the need arises. Note, however,
* that running config.h.SH again will wipe out any changes you've made.
* For a more permanent change edit config.sh and rerun config.h.SH.
*/
/* EUNICE:
* This symbol, if defined, indicates that the program is being compiled
* under the EUNICE package under VMS. The program will need to handle
* things like files that don't go away the first time you unlink them,
* due to version numbering. It will also need to compensate for lack
* of a respectable link() command.
*/
/* VMS:
* This symbol, if defined, indicates that the program is running under
* VMS. It is currently only set in conjunction with the EUNICE symbol.
*/
/* XENIX:
* This symbol, if defined, indicates thet the program is running under
* Xenix (at least 3.0 ?).
*/
/* BSD:
* This symbol, if defined, indicates that the program is running under
* a BSD system.
*/
/*#undef EUNICE /**/
/*#undef VMS /**/
/*#undef XENIX /**/
#define BSD /**/
/* CPPSTDIN:
* This symbol contains the first part of the string which will invoke
* the C preprocessor on the standard input and produce to standard
* output. Typical value of "cc -E" or "/lib/cpp".
*/
/* CPPMINUS:
* This symbol contains the second part of the string which will invoke
* the C preprocessor on the standard input and produce to standard
* output. This symbol will have the value "-" if CPPSTDIN needs a minus
* to specify standard input, otherwise the value is "".
*/
#define CPPSTDIN "/usr/bin/cpp"
#define CPPMINUS ""
/* bzero:
* This symbol is maped to memset if the bzero() routine is not
* available to set memory to 0.
*/
/*#undef bzero(s,l) memset((s),0,(l)) ; /* mapped to memset */
/* CBRT:
* This symbol, if defined, indicates that the cbrt() (cube root)
* function is available.
*/
#define CBRT /**/
/* index:
* This preprocessor symbol is defined, along with rindex, if the system
* uses the strchr and strrchr routines instead.
*/
/* rindex:
* This preprocessor symbol is defined, along with index, if the system
* uses the strchr and strrchr routines instead.
*/
#define index strchr /* cultural */
#define rindex strrchr /* differences? */
/* MEMSET:
* This symbol, if defined, indicates that the memset routine is available
* to set blocks of memory. You should always use bzero() instead of
* memset() because bzero is remaped to memset if necessary. This means
* that a memset() routine must be provided in case MEMSET is not defined
* and no bzero() is found.
*/
#define MEMSET /**/
/* POPEN:
* This symbol, if defined, indicates that the popen routine is
* available to open a pipe from a process.
*/
#define POPEN /**/
/* RUSAGE:
* This symbol, if defined, indicates that the getrusage() routine exists.
* Inclusion of <sys/resource.h> and <sys/time.h> may be necessary.
*/
#define RUSAGE /**/
/* TIMES:
* This symbol, if defined, indicates that the times() routine exists.
* Note that this became obsolete on some systems (SUNOS), which now
* use getrusage().
*/
/* CLOCKTYPE:
* This symbol holds the type returned by times(). It can be long,
* or clock_t on BSD sites (in which case <sys/types.h> should be
* included). Moreover, the Clock_t symbol is defined in common.h
* and should be used for easy clean reference.
*/
#define TIMES /**/
#define CLOCKTYPE clock_t /**/
/* I_STRING:
* This symbol, if defined, indicates to the C program that it should
* include <string.h> (USG systems) instead of <strings.h> (BSD systems).
*/
#define I_STRING /**/
/* I_SYSRESOURCE:
* This symbol, if defined, indicates to the C program that it should
* include <sys/resource.h>.
*/
#define I_SYSRESOURCE /**/
/* I_SYSTYPES:
* This symbol, if defined, indicates to the C program that it should
* include <sys/types.h>.
*/
#define I_SYSTYPES /**/
/* I_TIME:
* This symbol, if defined, indicates to the C program that it should
* include <time.h>.
*/
/* I_SYSTIME:
* This symbol, if defined, indicates to the C program that it should
* include <sys/time.h>.
*/
/* I_SYSTIMEKERNEL:
* This symbol, if defined, indicates to the C program that it should
* include <sys/time.h> with KERNEL defined.
*/
/*#undef I_TIME /**/
#define I_SYSTIME /**/
/*#undef I_SYSTIMEKERNEL /**/
/* nrand:
* This macro is to be used to generate uniformly distributed
* random numbers over the range [0., 1.].
*/
/* seednrand:
* This symbol defines the macro to be used in seeding the
* random number generator (see nrand).
*/
#define nrand() drand48() /**/
#define seednrand(x) srand48(x) /**/
/* VOIDFLAGS:
* This symbol indicates how much support of the void type is given by this
* compiler. What various bits mean:
*
* 1 = supports declaration of void
* 2 = supports arrays of pointers to functions returning void
* 4 = supports comparisons between pointers to void functions and
* addresses of void functions
* 8 = suports declaration of generic void pointers
*
* The package designer should define VOIDUSED to indicate the requirements
* of the package. This can be done either by #defining VOIDUSED before
* including config.h, or by defining defvoidused in Myinit.U. If the
* latter approach is taken, only those flags will be tested. If the
* level of void support necessary is not present, defines void to int.
*/
#ifndef VOIDUSED
#define VOIDUSED 11
#endif
#define VOIDFLAGS 11
#if (VOIDFLAGS & VOIDUSED) != VOIDUSED
#define void int /* is void to be avoided? */
#define M_VOID /* Xenix strikes again */
#endif
/* URT:
* This symbol, if defined, indicates that the Utah Raster
* Toolkit is being used.
*/
#define URT /**/
/* I_VARARGS:
* This symbol, if defined, indicates to the C program that it should
* include <stdlib.h>.
*/
#define I_STDLIB /**/

View File

@@ -0,0 +1,270 @@
$NetBSD: patch-aa,v 1.3 2006/06/20 22:50:13 joerg Exp $
--- Configure.orig 1992-02-10 03:04:23.000000000 +0000
+++ Configure
@@ -28,10 +28,10 @@ PATH=$PATH:'/sys5.3/bin:/sys5.3/usr/bin
PATH=$PATH:'/bsd4.3/usr/bin:/usr/bsd'
export PATH || (echo "OOPS, this isn't sh. Desperation time. I will feed myself to sh."; sh $0; kill $$)
-if test ! -t 0; then
- echo "Say 'sh Configure', not 'sh <Configure'"
- exit 1
-fi
+#if test ! -t 0; then
+# echo "Say 'sh Configure', not 'sh <Configure'"
+# exit 1
+#fi
(alias) >/dev/null 2>&1 && \
echo "(I see you are using the Korn shell. Some ksh's blow up on Configure," && \
@@ -364,7 +364,7 @@ where this is allowed will be marked "(~
EOH
rp="[Type carriage return to continue]"
echo $n "$rp $c"
-. myread
+#. myread
cat <<EOH
Much effort has been expended to ensure that this shell script will run on
@@ -386,7 +386,7 @@ SH files. Configure will offer to let y
EOH
rp="[Type carriage return to continue]"
echo $n "$rp $c"
-. myread
+#. myread
: get old answers, if there is a config file out there
if test -f ../config.sh; then
@@ -616,7 +616,8 @@ EOM
echo " "
rp="Any additional libraries? [$dflt]"
$echo $n "$rp $c"
-. myread
+#. myread
+ans="-lm"
case "$ans" in
none) ans='';
esac
@@ -720,7 +721,14 @@ fi
echo " "
set `echo $libc $libnames | tr ' ' '\012' | sort | uniq`
$echo $n "Extracting names from $* for later perusal...$c"
-nm $* 2>/dev/null >libc.tmp
+case "${OPSYS}" in
+DragonFly)
+ nm -D $* 2>/dev/null >libc.tmp
+ ;;
+*)
+ nm $* 2>/dev/null >libc.tmp
+ ;;
+esac
$grep printf libc.tmp > libc.ptf
com="$sed -n -e 's/^.* [ADTS] *_[_.]*//p' -e 's/^.* [ADTS] //p'"
eval "$com <libc.ptf >libc.list"
@@ -823,7 +831,8 @@ if $contains '^times$' libc.list >/dev/n
echo " "
rp="What type is returned by times() on this sytem? [$dflt]"
$echo $n "$rp $c"
- . myread
+ #. myread
+ ans="clock_t"
clocktype="$ans"
else
echo 'times() not found, hope that will do.'
@@ -872,7 +881,7 @@ $eunicefix filexp
: determine where manual pages are on this system
echo " "
case "$sysman" in
- '') sysman=`loc . /usr/man/man1 /usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1 /usr/man/u_man/man1 /usr/share/man/man1 /usr/catman/u_man/man1 /usr/man/l_man/man1 /usr/local/man/u_man/man1 /usr/local/man/l_man/man1 /usr/man/man.L`
+ '') sysman=`loc . /usr/local/man/man1 /usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1 /usr/man/u_man/man1 /usr/share/man/man1 /usr/catman/u_man/man1 /usr/man/l_man/man1 /usr/local/man/u_man/man1 /usr/local/man/l_man/man1 /usr/man/man.L`
;;
esac
if test -d "$sysman"; then
@@ -1007,7 +1016,8 @@ Venix systems may wish to put "none" and
EOM
rp="Which models are supported? [$dflt]"
$echo $n "$rp $c"
-. myread
+#. myread
+ans=""
models="$ans"
case "$models" in
@@ -1147,7 +1157,8 @@ else
esac
rp="Use which C compiler? [$dflt]"
$echo $n "$rp $c"
- . myread
+ #. myread
+ ans="cc"
cc="$ans"
fi
case "$cc" in
@@ -1171,7 +1182,8 @@ specify the word "none".
EOH
rp="What optimizer/debugger flag should be used? [$dflt]"
$echo $n "$rp $c"
-. myread
+#. myread
+ans="$CFLAGS"
optimize="$ans"
case "$optimize" in
'none') optimize=" ";;
@@ -1220,7 +1232,8 @@ the C compiler, but you should NOT inclu
EOH
rp="Any additional cc flags? [$dflt]"
$echo $n "$rp $c"
-. myread
+#. myread
+ans="-I${PREFIX}/include"
case "$ans" in
none) ans='';
esac
@@ -1258,7 +1271,8 @@ esac
echo " "
rp="Any additional ld flags (NOT including libraries)? [$dflt]"
$echo $n "$rp $c"
-. myread
+#. myread
+ans="$LDFLAGS"
case "$ans" in
none) ans='';
esac
@@ -1421,7 +1435,8 @@ if $contains '^index$' libc.list >/dev/n
echo "Your system has both index() and strchr(). Shall I use"
rp="index() rather than strchr()? [$dflt]"
$echo $n "$rp $c"
- . myread
+ #. myread
+ ans=y
case "$ans" in
n*) d_index="$define" ;;
*) d_index="$undef" ;;
@@ -1567,7 +1582,8 @@ EOT
rp="What directory holds the Utah Raster Toolkit include files? [$dflt]"
$echo $n "$rp $c"
-. myread
+#. myread
+ans="${PREFIX}/include"
case "$ans" in
'none')
urtinc=''
@@ -1591,7 +1607,8 @@ case "$ans" in
echo " "
rp="Where is the Utah Raster Toolkit library? [$dflt]"
$echo $n "$rp $c"
- . myread
+ #. myread
+ ans="${PREFIX}/lib/librle.a"
urtlib="$ans"
urtinc="-I$urtinc"
;;
@@ -1629,7 +1646,8 @@ cont=true
while $test "$cont"; do
rp="Use which function to generate random numbers? [$dflt]"
$echo $n "$rp $c"
- . myread
+ #. myread
+ ans="drand48"
if $test "$ans" = "$dflt"; then
: null
else
@@ -1802,7 +1820,8 @@ esac
dflt="$voidflags";
rp="Your void support flags add up to what? [$dflt]"
$echo $n "$rp $c"
-. myread
+#. myread
+ans=11
voidflags="$ans"
$rm -f try.* .out
@@ -1824,7 +1843,8 @@ while $test "$cont" ; do
echo " "
rp="Where do you want to put the public executables? (~name ok) [$dflt]"
$echo $n "$rp $c"
- . myread
+ #. myread
+ ans=${PREFIX}/bin
bin="$ans"
bin=`filexp $bin`
if test -d $bin; then
@@ -1833,7 +1853,8 @@ while $test "$cont" ; do
dflt=n
rp="Directory $bin doesn't exist. Use that name anyway? [$dflt]"
$echo $n "$rp $c"
- . myread
+ #. myread
+ ans=y
dflt=''
case "$ans" in
y*) cont='';;
@@ -1968,7 +1989,8 @@ while $test "$cont" ; do
echo " "
rp="Name of program to make makefile dependencies? [$dflt]"
$echo $n "$rp $c"
-. myread
+#. myread
+ans=/usr/bin/mkdep
mkdep="$ans"
mkdep=`filexp $mkdep`
if test -f "$mkdep"; then
@@ -1988,12 +2010,12 @@ $rm -f dep.c dep.h dep.o dep.out
: see if ar generates random libraries by itself
echo " "
echo "Checking how to generate random libraries on your machine..."
-ar rc ran.a /dev/null
-if ar ts ran.a >/dev/null 2>&1; then
- echo "ar appears to generate random libraries itself."
- orderlib=false
- ranlib=":"
-else
+#ar rc ran.a /dev/null
+#if ar ts ran.a >/dev/null 2>&1; then
+# echo "ar appears to generate random libraries itself."
+# orderlib=false
+# ranlib=":"
+#else
if test -f /usr/bin/ranlib; then
ranlib=/usr/bin/ranlib
elif test -f /bin/ranlib; then
@@ -2009,7 +2031,7 @@ else
orderlib=true
ranlib=":"
fi
-fi
+#fi
: determine compiler compiler
case "$bison" in
@@ -2024,7 +2046,8 @@ cont=true
echo " "
rp="Which compiler compiler (yacc or bison -y) will you use? [$dflt]"
$echo $n "$rp $c"
-. myread
+#. myread
+ans=yacc
case "$ans" in
'') ans="$dflt";;
*bis*) ans="bison -y";;
@@ -2153,7 +2176,8 @@ fastread=''
echo "If you didn't make any mistakes, then just type a carriage return here."
rp="If you need to edit config.sh, do it as a shell escape here:"
$echo $n "$rp $c"
-. UU/myread
+#. UU/myread
+ans=""
case "$ans" in
'') ;;
*) : in case they cannot read
@@ -2205,7 +2229,8 @@ It can take a while, so you might not wa
EOM
rp="Run make depend now? [$dflt]"
$echo $n "$rp $c"
- . UU/myread
+ #. UU/myread
+ ans=y
case "$ans" in
y*) make depend
echo "Now you must run a make."

View File

@@ -0,0 +1,23 @@
$NetBSD: patch-ab,v 1.2 2012/12/25 21:08:40 joerg Exp $
--- etc/rsconvert/lex.l.orig 1992-02-10 03:03:54.000000000 +0000
+++ etc/rsconvert/lex.l
@@ -21,7 +21,9 @@
#endif
#include "libcommon/common.h"
#include "y.tab.h"
+static void skipcomments(void);
%}
+%option yylineno
alpha [a-zA-Z]
special [\.\_-]
digit [0-9]
@@ -101,7 +103,7 @@ yywrap() {return(1);}
/*
* Skip over comments.
*/
-skipcomments()
+static void skipcomments(void)
{
char c;

View File

@@ -0,0 +1,40 @@
$NetBSD: patch-ac,v 1.2 2008/09/01 06:57:58 dholland Exp $
This fixes an error that will only occur on machines fast enough to
compile through two directories in the "libray" directorie in 1
second: the upto-date check of libray.a will fail because it was already
touched in this very second. Slowing things down here will help.
(I seem to remember some hacking about this before, maybe in make(1),
but I don't remember, and I won't start hacking make(1) now ;-)
(Note from 2008: still pertinent, because the build misuses ar to add
objects into the same .a file repeatedly. I could hack it to not do
that, but for now I'm choosing not to. However, I am fixing the
makefile to stop on error.)
--- libray/Makefile.orig 1992-02-09 22:03:05.000000000 -0500
+++ libray/Makefile 2008-09-01 02:06:03.000000000 -0400
@@ -10,7 +10,7 @@ SHELL = /bin/sh
default:
for i in $(STUFF); do \
- (cd $$i && $(MAKE)); \
+ (echo $$i ; cd $$i && $(MAKE) && sleep 1) || exit 1; \
done
#
@@ -20,11 +20,11 @@ default:
depend:
for i in $(STUFF); do \
- (cd $$i && $(MAKE) depend); \
+ (cd $$i && $(MAKE) depend) || exit 1; \
done
clean:
for i in $(STUFF); do \
- (cd $$i && $(MAKE) clean); \
+ (cd $$i && $(MAKE) clean) || exit 1; \
done
rm -f libray.a

View File

@@ -0,0 +1,28 @@
$NetBSD: patch-ad,v 1.1 2008/09/01 06:57:58 dholland Exp $
--- Makefile~ 1992-02-09 22:03:04.000000000 -0500
+++ Makefile 2008-09-01 02:03:03.000000000 -0400
@@ -11,7 +11,7 @@ SHELL = /bin/sh
default:
for i in $(STUFF); do \
- (cd $$i && $(MAKE)); \
+ (cd $$i && $(MAKE)) || exit 1; \
done
#
@@ -21,12 +21,12 @@ default:
depend:
for i in $(STUFF); do \
- (cd $$i && $(MAKE) depend); \
+ (cd $$i && $(MAKE) depend) || exit 1; \
done
clean:
for i in $(STUFF); do \
- (cd $$i && $(MAKE) clean); \
+ (cd $$i && $(MAKE) clean) || exit 1; \
done
kit:

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ae,v 1.1 2008/09/01 06:57:58 dholland Exp $
--- libray/libcommon/memory.c~ 1992-02-09 22:03:29.000000000 -0500
+++ libray/libcommon/memory.c 2008-09-01 02:07:19.000000000 -0400
@@ -20,6 +20,8 @@
* Initial version.
*
*/
+#include <string.h>
+#include <stdlib.h>
#ifdef SYSV
#include <memory.h>
#endif

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-af,v 1.1 2008/09/01 06:57:58 dholland Exp $
--- libray/libobj/hf.c~ 1992-02-09 22:04:18.000000000 -0500
+++ libray/libobj/hf.c 2008-09-01 02:08:11.000000000 -0400
@@ -42,7 +42,7 @@ typedef struct {
Vector cp, pDX, pDY;
} Trav2D;
-hfTri *CreateHfTriangle(), *GetQueuedTri();
+static hfTri *CreateHfTriangle(), *GetQueuedTri();
unsigned long HFTests, HFHits;

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-ag,v 1.1 2008/09/01 06:57:58 dholland Exp $
--- libray/liblight/extended.h~ 1992-02-09 22:03:11.000000000 -0500
+++ libray/liblight/extended.h 2008-09-01 02:09:05.000000000 -0400
@@ -33,7 +33,7 @@ typedef struct {
extern Extended *ExtendedCreate();
extern LightMethods *ExtendedMethods();
-extern int ExtendedIntens();
+/*extern int ExtendedIntens();*/
extern void ExtendedDirection();
#endif /* EXTENDED_H */

View File

@@ -0,0 +1,12 @@
$NetBSD: patch-ah,v 1.1 2008/09/01 06:57:58 dholland Exp $
--- libray/libsurf/fog.c~ 1992-02-09 22:03:33.000000000 -0500
+++ libray/libsurf/fog.c 2008-09-01 02:09:44.000000000 -0400
@@ -28,7 +28,6 @@ FogCreate(color, trans)
Color *color, *trans;
{
Fog *fog;
- static void ComputeFog();
fog = (Fog *)Malloc(sizeof(Fog));

View File

@@ -0,0 +1,10 @@
$NetBSD: patch-ai,v 1.1 2008/09/01 06:57:58 dholland Exp $
--- libray/libtext/texture.h~ 1992-02-09 22:03:41.000000000 -0500
+++ libray/libtext/texture.h 2008-09-01 02:10:15.000000000 -0400
@@ -76,4 +76,4 @@ Color *ColormapRead();
extern Trans model2text, prim2text, world2text;
-#endif TEXTURE_H
+#endif /* TEXTURE_H */

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-aj,v 1.1 2008/09/01 06:57:58 dholland Exp $
--- libray/libtext/noise.c~ 1992-02-09 22:04:06.000000000 -0500
+++ libray/libtext/noise.c 2008-09-01 02:11:06.000000000 -0400
@@ -121,7 +121,7 @@ Vector *v;
v->y *= .12345;
v->z *= .12345;
- return Crc16(v, sizeof(Vector));
+ return Crc16((char *)v, sizeof(Vector));
}
/*

View File

@@ -0,0 +1,12 @@
$NetBSD: patch-ak,v 1.1 2008/09/01 06:57:58 dholland Exp $
--- libshade/misc.c~ 1992-02-09 22:03:59.000000000 -0500
+++ libshade/misc.c 2008-09-01 02:12:18.000000000 -0400
@@ -23,6 +23,7 @@
* Initial version.
*
*/
+#include <stdlib.h>
#include "rayshade.h"
#ifdef RUSAGE
#include <sys/time.h>

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-al,v 1.1 2008/09/01 06:57:58 dholland Exp $
--- etc/rsconvert/main.c~ 1992-02-09 22:03:28.000000000 -0500
+++ etc/rsconvert/main.c 2008-09-01 02:15:11.000000000 -0400
@@ -24,6 +24,8 @@
*
*/
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#ifdef SYSV
#include <memory.h>
#endif

View File

@@ -0,0 +1,11 @@
$NetBSD: patch-am,v 1.1 2008/09/01 06:57:58 dholland Exp $
--- etc/rsconvert/yacc.y~ 1992-02-09 22:04:17.000000000 -0500
+++ etc/rsconvert/yacc.y 2008-09-01 02:15:45.000000000 -0400
@@ -15,5 +15,6 @@
%{
#include <stdio.h>
+#include <string.h>
#include "libcommon/common.h"
#define NEWLINE() WriteNewline()

View File

@@ -0,0 +1,13 @@
$NetBSD: patch-an,v 1.1 2008/09/01 06:57:58 dholland Exp $
--- libray/liblight/extended.c~ 1992-02-09 22:03:43.000000000 -0500
+++ libray/liblight/extended.c 2008-09-01 02:17:28.000000000 -0400
@@ -24,6 +24,8 @@
#include "libcommon/sampling.h"
#include "extended.h"
+static int ExtendedIntens();
+
static LightMethods *iExtendedMethods = NULL;
Extended *

View File

@@ -0,0 +1,12 @@
$NetBSD: patch-ao,v 1.1 2008/09/01 06:57:58 dholland Exp $
--- libray/libsurf/fogdeck.c~ 1992-02-09 22:03:45.000000000 -0500
+++ libray/libsurf/fogdeck.c 2008-09-01 02:18:42.000000000 -0400
@@ -31,7 +31,6 @@ int octaves;
Color *color, *trans;
{
Fogdeck *fogdeck;
- static void ComputeFogdeck();
fogdeck = (Fogdeck *)Malloc(sizeof(Fogdeck));

View File

@@ -0,0 +1,12 @@
$NetBSD: patch-ap,v 1.1 2008/09/01 06:57:58 dholland Exp $
--- libshade/options.c~ 1992-02-09 22:04:09.000000000 -0500
+++ libshade/options.c 2008-09-01 02:28:43.000000000 -0400
@@ -30,6 +30,7 @@
* Initial version.
*
*/
+#include <stdlib.h>
#include "rayshade.h"
#include "options.h"
#include "stats.h"

View File

@@ -0,0 +1,29 @@
$NetBSD: patch-ba,v 1.1 1998/08/24 18:11:44 agc Exp $
*** raypaint/Makefile.SH.orig Sat Mar 28 20:31:28 1998
--- raypaint/Makefile.SH Sat Mar 28 20:31:55 1998
***************
*** 55,65 ****
#
# If using X11, use:
! #GRAPHICSLIB = -lX11
#
# If you are using GL, use:
! GRAPHICSLIB = -lgl_s
LIBRAY = $(LIBRAYDIR)/libray.a
LIBSHADE = $(LIBSHADEDIR)/libshade.a
--- 55,65 ----
#
# If using X11, use:
! GRAPHICSLIB = -lX11
#
# If you are using GL, use:
! #GRAPHICSLIB = -lgl_s
LIBRAY = $(LIBRAYDIR)/libray.a
LIBSHADE = $(LIBSHADEDIR)/libshade.a

View File

@@ -0,0 +1,11 @@
$NetBSD: patch-libray_libtext_mapping.h,v 1.1 2012/12/25 21:08:40 joerg Exp $
--- libray/libtext/mapping.h.orig 2012-12-25 18:59:13.000000000 +0000
+++ libray/libtext/mapping.h
@@ -36,5 +36,6 @@ typedef struct Mapping {
extern Mapping *UVMappingCreate(), *SphereMappingCreate(), *CylMappingCreate(),
*LinearMappingCreate();
+void TextToUV(Mapping *mapping, Geom *prim, Vector *pos, Vector *norm, Float *u, Float *v, Vector *dpdu, Vector *dpdv);
#endif /* MAPPING_H */

View File

@@ -0,0 +1,17 @@
$NetBSD: patch-libray_libtext_texture.c,v 1.1 2012/12/25 21:08:40 joerg Exp $
--- libray/libtext/texture.c.orig 2012-12-25 18:58:09.000000000 +0000
+++ libray/libtext/texture.c
@@ -121,11 +121,7 @@ Trans *p2model, *world2model;
/*
* Compute UV at 'pos' on given primitive.
*/
-TextToUV(mapping, prim, pos, norm, u, v, dpdu, dpdv)
-Mapping *mapping;
-Geom *prim;
-Vector *pos, *norm, *dpdu, *dpdv;
-Float *u, *v;
+void TextToUV(Mapping *mapping, Geom *prim, Vector *pos, Vector *norm, Float *u, Float *v, Vector *dpdu, Vector *dpdv)
{
Vec2d uv;
Vector ptmp;

View File

@@ -0,0 +1,24 @@
$NetBSD: patch-libshade_lex.l,v 1.1 2012/12/25 21:08:40 joerg Exp $
--- libshade/lex.l.orig 1992-02-10 03:04:02.000000000 +0000
+++ libshade/lex.l
@@ -28,7 +28,10 @@
#include "symtab.h"
#include "y.tab.h"
extern char *strsave();
+static void skipcomments(void);
+
%}
+%option yylineno
alpha [a-zA-Z]
special [\.\_-]
digit [0-9]
@@ -163,7 +166,7 @@ yywrap() {return 1;}
/*
* Skip over comments.
*/
-skipcomments()
+static void skipcomments(void)
{
char c;