diff options
author | agc <agc> | 2000-01-04 15:34:52 +0000 |
---|---|---|
committer | agc <agc> | 2000-01-04 15:34:52 +0000 |
commit | e6a0786cf9245510f8c6d5d66a538d567ac6daa4 (patch) | |
tree | 17d5504df5c834a60a969ba22ac182f0c31eea52 /graphics/povray/patches | |
parent | d18a6945da766df12d26c57e3bfdddc32b6e4aeb (diff) | |
download | pkgsrc-e6a0786cf9245510f8c6d5d66a538d567ac6daa4.tar.gz |
Update pivray (persistence of vision ray tracing utility) to version 3.1g.
Changes in version 3.1:
The scene description language in POV-Ray 3.1 is not entirely
backwards-compatible with earlier versions of the POV-Ray scene
description language. The 'halo' feature in earlier versions
is obsolete and has been entirely replaced with a 'media' feature
which works better. Because older files making use of 'halo'
will not render in POV-Ray 3.1 without substantial modification,
you may wish to rename executables for pre-3.1 versions of POV-Ray
if you would like to be able to render such older files. It should
be noted that .povrayrc as described below can only refer to one
version.
Diffstat (limited to 'graphics/povray/patches')
-rw-r--r-- | graphics/povray/patches/patch-aa | 36 | ||||
-rw-r--r-- | graphics/povray/patches/patch-ab | 168 |
2 files changed, 105 insertions, 99 deletions
diff --git a/graphics/povray/patches/patch-aa b/graphics/povray/patches/patch-aa index 0646db04b2b..05f7bd0063b 100644 --- a/graphics/povray/patches/patch-aa +++ b/graphics/povray/patches/patch-aa @@ -1,23 +1,15 @@ -$NetBSD: patch-aa,v 1.1.1.1 1998/08/24 12:33:38 agc Exp $ +$NetBSD: patch-aa,v 1.2 2000/01/04 15:34:53 agc Exp $ -*** sourceold/optout.h Tue Sep 3 08:55:55 1996 ---- source/optout.h Tue Dec 3 22:51:16 1996 -*************** -*** 37,44 **** - - /* This message is for the personal distribution release. */ - -! #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:" -! #define DISTRIBUTION_MESSAGE_2 "FILL IN NAME HERE........................." - #define DISTRIBUTION_MESSAGE_3 "The POV-Ray Team(tm) is not responsible for supporting this version." - - /* Number of help pages (numbered 0 to MAX_HELP_PAGE). */ ---- 37,44 ---- - - /* This message is for the personal distribution release. */ - -! #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled for" -! #define DISTRIBUTION_MESSAGE_2 "The NetBSD Packages collection (http://www.netbsd.org/)" - #define DISTRIBUTION_MESSAGE_3 "The POV-Ray Team(tm) is not responsible for supporting this version." - - /* Number of help pages (numbered 0 to MAX_HELP_PAGE). */ +--- source/optout.h.orig Mon Nov 22 15:38:26 1999 ++++ source/optout.h Mon Nov 22 15:38:27 1999 +@@ -35,8 +35,8 @@ + + #define POV_RAY_VERSION "3.1g" + +-#define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:" +-#define DISTRIBUTION_MESSAGE_2 "FILL IN NAME HERE........................." ++#define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled for" ++#define DISTRIBUTION_MESSAGE_2 "The NetBSD Packages collection (http://www.netbsd.org/)" + #define DISTRIBUTION_MESSAGE_3 "The POV-Ray Team(tm) is not responsible for supporting this version." + + /* Number of help pages (numbered 0 to MAX_HELP_PAGE). */ diff --git a/graphics/povray/patches/patch-ab b/graphics/povray/patches/patch-ab index 1a0a02d07e3..e396a077925 100644 --- a/graphics/povray/patches/patch-ab +++ b/graphics/povray/patches/patch-ab @@ -1,78 +1,92 @@ -$NetBSD: patch-ab,v 1.2 1999/08/24 12:13:00 sakamoto Exp $ +$NetBSD: patch-ab,v 1.3 2000/01/04 15:34:54 agc Exp $ -*** source/unix/makefile.orig Sun Feb 2 21:16:04 1997 ---- source/unix/makefile Tue Aug 24 20:30:57 1999 -*************** -*** 28,44 **** - # Use libXXX.a if you want to force static linking of the libraries. - # Use -Llibdir -lXXX if you want to use shared libraries (if they are - # available). It doesn't matter if you only have libXXX.a libraries. -! PNGDIR = $(SRCDIR)/libpng -! LIBPNGINC = -I$(PNGDIR) - #LIBPNGLIB = $(PNGDIR)/libpng.a -! LIBPNGLIB = -L$(PNGDIR) -lpng -! #LIBPNGLIB = -L/usr/local/lib -lpng - -! ZLIBDIR = $(SRCDIR)/zlib -! ZLIBINC = -I$(ZLIBDIR) - #ZLIBLIB = $(ZLIBDIR)/libz.a -! ZLIBLIB = -L$(ZLIBDIR) -lz -! #ZLIBLIB = -L/usr/local/lib -lz - - # This is the suffix for object files. - OBJ = .o ---- 28,44 ---- - # Use libXXX.a if you want to force static linking of the libraries. - # Use -Llibdir -lXXX if you want to use shared libraries (if they are - # available). It doesn't matter if you only have libXXX.a libraries. -! PNGDIR = #$(SRCDIR)/libpng -! LIBPNGINC = -I${PREFIX}/include - #LIBPNGLIB = $(PNGDIR)/libpng.a -! #LIBPNGLIB = -L$(PNGDIR) -lpng -! LIBPNGLIB = -L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib -lpng - -! #ZLIBDIR = $(SRCDIR)/zlib -! #ZLIBINC = -I$(ZLIBDIR) - #ZLIBLIB = $(ZLIBDIR)/libz.a -! #ZLIBLIB = -L$(ZLIBDIR) -lz -! ZLIBLIB = -lz - - # This is the suffix for object files. - OBJ = .o -*************** -*** 55,66 **** - #X11 = /usr/local/X11R6 - #X11 = /usr/openwin # for some SunOS systems - #X11 = /usr/lpp/X11 # for some AIX systems -! X11 = /usr/X11 - - # You probably won't need to change these if you have the X11 variable - # above set properly... - XLIBINC = -I$(X11)/include -! XLIBLIB = -L$(X11)/lib -lX11 - - # Libraries for the SVGA Linux version - SLIBLIB = -lvga -lvgagl ---- 55,66 ---- - #X11 = /usr/local/X11R6 - #X11 = /usr/openwin # for some SunOS systems - #X11 = /usr/lpp/X11 # for some AIX systems -! X11 = ${X11BASE} - - # You probably won't need to change these if you have the X11 variable - # above set properly... - XLIBINC = -I$(X11)/include -! XLIBLIB = -Wl,-rpath,$(X11)/lib -L$(X11)/lib -lX11 - - # Libraries for the SVGA Linux version - SLIBLIB = -lvga -lvgagl -*************** -*** 910,916 **** - config.h \ - $(SRCDIR)/frame.h \ - $(SRCDIR)/optout.h \ -- $(PNGDIR)/png.h \ - $(SRCDIR)/png_pov.h \ - $(SRCDIR)/point.h \ - $(SRCDIR)/povproto.h \ ---- 910,915 ---- +--- source/unix/makefile 1999/11/22 15:47:05 1.1 ++++ source/unix/makefile 1999/11/22 15:59:05 +@@ -50,8 +50,10 @@ + # Linux compiler flags, Pentium optimized + #CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=586 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) + ++OPSYS!= uname -s ++ + # Linux compiler flags, Pentium II optimized +-CFLAGS = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=686 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) ++CFLAGS = -O2 -c -ansi -DCOMPILER_VER=\".${OPSYS}.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) + + # HPUX compiler flags + #CFLAGS = +O2 -finline-functions -c -Aa -D_HPUX_SOURCE -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) +@@ -68,7 +70,7 @@ + # different for each platform without having to change the makefile. + # If you already have it set, comment all of these lines out. Otherwise, + # uncomment one of the following lines, or edit one to suit your system. +-#X11 = /usr/local/X11R6 ++X11 = ${X11BASE} + + # for some SunOS systems: + #X11 = /usr/openwin +@@ -76,23 +78,23 @@ + # for some AIX systems: + #X11 = /usr/lpp/X11 + +-X11 = /usr/X11R6 ++#X11 = /usr/X11R6 + + # You probably won't need to change these if you have the X11 variable + # above set properly... + XLIBINC = -I$(X11)/include +-XLIBLIB = -L$(X11)/lib -lX11 ++XLIBLIB = -L$(X11)/lib -Wl,-R${X11}/lib -lX11 + + # libpng and zlib include and library directories. + # + # Use libXXX.a if you want to force static linking of the libraries. + # Use -Llibdir -lXXX if you want to use shared libraries (if they are + # available). It doesn't matter if you only have libXXX.a libraries. +-PNGDIR = $(SRCDIR)/libpng +-LIBPNGINC = -I$(PNGDIR) ++PNGDIR = ++LIBPNGINC = -I${PREFIX}/include + #LIBPNGLIB = $(PNGDIR)/libpng.a +-LIBPNGLIB = -L$(PNGDIR) -lpng +-#LIBPNGLIB = -L/usr/local/lib -lpng ++#LIBPNGLIB = -L$(PNGDIR) -lpng ++LIBPNGLIB = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lpng + + # The following options are added at the suggestion of Axel Hecht + # Modify png_povDEP accordingly if you use this option +@@ -101,10 +103,10 @@ + # LIBPNGINC = -I$(LIBPNGINCDIR) + # LIBPNGLIB = -L$(PREFIX)/lib -lpng + +-ZLIBDIR = $(SRCDIR)/zlib +-ZLIBINC = -I$(ZLIBDIR) ++#ZLIBDIR = $(SRCDIR)/zlib ++#ZLIBINC = -I$(ZLIBDIR) + #ZLIBLIB = $(ZLIBDIR)/libz.a +-ZLIBLIB = -L$(ZLIBDIR) -lz ++ZLIBLIB = -lz + #ZLIBLIB = -L/usr/local/lib -lz + + # The following options are added at the suggestion of Axel Hecht +@@ -127,12 +129,12 @@ + #default: svga + + # Define the default POV-Ray library location +-POVLIBDIR = /usr/local/lib/povray31 ++POVLIBDIR = ${LOCALBASE}/lib/povray31 + + # Define the path under which you want POV-Ray files to be installed, + # typically /usr/local/bin, though Linux distributions may wish to + # alter this to /usr/bin +-POVPATH = /usr/local ++POVPATH = ${LOCALBASE}/bin + + #---------------------------------------------------------------------- + # There should be no compelling reason to customize the makefile beyond +@@ -1021,7 +1023,6 @@ + config.h \ + $(SRCDIR)/frame.h \ + $(SRCDIR)/optout.h \ +- $(PNGDIR)/png.h \ + $(SRCDIR)/png_pov.h \ + $(SRCDIR)/point.h \ + $(SRCDIR)/povproto.h \ |