o Update to 3.5

o Assign maintainership to submitter

PR:		41709
Submitted by:	Nakata Maho <chat95@mbox.kyoto-inet.or.jp>
Approved by:	maintainer (previous one)

6 files changed, 122 insertions, 108 deletions

diff --git a/graphics/povray/files/patch-Makefile.in b/graphics/povray/files/patch-Makefile.in
new file mode 100644
index 0000000..13845f7
--- /dev/null
+++ b/graphics/povray/files/patch-Makefile.in
@@ -0,0 +1,56 @@
+--- Makefile.in.orig	Thu Aug  8 21:51:07 2002
++++ Makefile.in	Sat Aug 17 08:01:49 2002
+@@ -88,6 +88,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ SUBDIRS = doc include ini scenes scripts src tests
++SUBDIRS_DATA = include ini scenes scripts src tests
+ docdir = $(prefix)/share/doc/@PACKAGE@-@VERSION@
+ doc_DATA = povlegal.doc povwhere.txt gamma.gif gamma.gif.txt README README.unix 
+ povlibdir = @datadir@/povray-3.5
+@@ -99,7 +100,7 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ./src/conf.h
+ CONFIG_CLEAN_FILES = 
+-DATA =  $(doc_DATA) $(povlib_DATA)
++DATA =  $(povlib_DATA) #$(doc_DATA)
+ 
+ DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+ Makefile.in NEWS aclocal.m4 configure configure.in install-sh missing \
+@@ -202,7 +203,26 @@
+ 
+ @SET_MAKE@
+ 
+-all-recursive install-data-recursive install-exec-recursive \
++install-data-recursive:
++	@set fnord $(MAKEFLAGS); amf=$$2; \
++	dot_seen=no; \
++	target=`echo $@ | sed s/-recursive//`; \
++	list='$(SUBDIRS_DATA)'; for subdir in $$list; do \
++	  echo "Making $$target in $$subdir"; \
++	  if test "$$subdir" = "."; then \
++	    dot_seen=yes; \
++	    local_target="$$target-am"; \
++	  else \
++	    local_target="$$target"; \
++	  fi; \
++	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
++	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	done; \
++	if test "$$dot_seen" = "no"; then \
++	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
++	fi; test -z "$$fail"
++
++all-recursive install-exec-recursive \
+ installdirs-recursive install-recursive uninstall-recursive  \
+ check-recursive installcheck-recursive info-recursive dvi-recursive:
+ 	@set fnord $(MAKEFLAGS); amf=$$2; \
+@@ -351,7 +371,7 @@
+ install-exec-am:
+ install-exec: install-exec-recursive
+ 
+-install-data-am: install-docDATA install-povlibDATA
++install-data-am: install-povlibDATA
+ install-data: install-data-recursive
+ 
+ install-am: all-am
diff --git a/graphics/povray/files/patch-a b/graphics/povray/files/patch-a
deleted file mode 100644
index 45f1174..0000000
--- a/graphics/povray/files/patch-a
+++ /dev/null
@@ -1,21 +0,0 @@
-*** 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 "FreeBSD"
-  #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/files/patch-b b/graphics/povray/files/patch-b
deleted file mode 100644
index 2e9f944..0000000
--- a/graphics/povray/files/patch-b
+++ /dev/null
@@ -1,87 +0,0 @@
-*** sourceold/unix/makefile	Tue Sep  3 08:48:13 1996
---- source/unix/makefile	Tue Dec  3 22:49:24 1996
-***************
-*** 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/usr/local/include
-  #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 =  -lz
-  
-  # This is the suffix for object files.
-  OBJ     = .o
-***************
-*** 55,61 ****
-  #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...
---- 55,61 ----
-  #X11 = /usr/local/X11R6
-  #X11 = /usr/openwin        # for some SunOS systems
-  #X11 = /usr/lpp/X11        # for some AIX systems
-! X11 = /usr/X11R6
-  
-  # You probably won't need to change these if you have the X11 variable
-  #   above set properly...
-***************
-*** 901,907 ****
-                            config.h             \
-                            $(SRCDIR)/frame.h    \
-                            $(SRCDIR)/optout.h   \
--                           $(PNGDIR)/png.h      \
-                            $(SRCDIR)/png_pov.h  \
-                            $(SRCDIR)/point.h    \
-                            $(SRCDIR)/povproto.h \
---- 901,906 ----
-*** source/unix/makefile~	Wed Dec 30 16:07:40 1998
---- source/unix/makefile	Wed Dec 30 16:09:21 1998
-***************
-*** 79,85 ****
-  #   for compiles unless you are debugging new code, as it slows things down.
-  # The option -DPOV_COMMENTS enables informational comments in PNG and PPM
-  #   format output files (see png_pov.c and ppm.c for more info).
-! CFLAGS      = -O2 -ansi -c -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)
-  LFLAGS      = $(LIBPNGLIB) $(ZLIBLIB) -lm
-  
-  # Linux compiler flags
---- 79,87 ----
-  #   for compiles unless you are debugging new code, as it slows things down.
-  # The option -DPOV_COMMENTS enables informational comments in PNG and PPM
-  #   format output files (see png_pov.c and ppm.c for more info).
-! CFLAGS      ?= -O2
-! CFLAGS      += -ansi -c -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)
-! 
-  LFLAGS      = $(LIBPNGLIB) $(ZLIBLIB) -lm
-  
-  # Linux compiler flags
diff --git a/graphics/povray/files/patch-povray.ini b/graphics/povray/files/patch-povray.ini
new file mode 100644
index 0000000..26b60d5
--- /dev/null
+++ b/graphics/povray/files/patch-povray.ini
@@ -0,0 +1,13 @@
+--- povray.ini.orig	Fri Aug 16 22:04:30 2002
++++ povray.ini	Fri Aug 16 22:04:52 2002
+@@ -55,8 +55,8 @@
+ ;; found in the current directory.  New directories are added to the
+ ;; search path, up to a maximum of 25.
+ 
+-Library_Path=/usr/local/lib/povray-3.5
+-Library_Path=/usr/local/lib/povray-3.5/include
++Library_Path=@PREFIX@/share/povray-3.5
++Library_Path=@PREFIX@/share/povray-3.5/include
+ 
+ ;; File output type control.
+ ;;     T    Uncompressed Targa-24
diff --git a/graphics/povray/files/patch-src::Makefile.in b/graphics/povray/files/patch-src::Makefile.in
new file mode 100644
index 0000000..87cfbb9
--- /dev/null
+++ b/graphics/povray/files/patch-src::Makefile.in
@@ -0,0 +1,41 @@
+--- src/Makefile.in.orig	Thu Aug  8 09:51:00 2002
++++ src/Makefile.in	Wed Sep  4 14:03:58 2002
+@@ -89,10 +89,10 @@
+ VERSION = @VERSION@
+ bin_PROGRAMS = povray
+ povray_SOURCES = atmosph.cpp bbox.cpp bcyl.cpp benchmark.cpp bezier.cpp blob.cpp boxes.cpp bsphere.cpp camera.cpp chi2.cpp colour.cpp colutils.cpp cones.cpp csg.cpp discs.cpp express.cpp file_pov.cpp fncode.cpp fnintern.cpp fnpovfpu.cpp fnsyntax.cpp fpmetric.cpp fractal.cpp function.cpp gif.cpp gifdecod.cpp hcmplx.cpp hfield.cpp histogra.cpp iff.cpp image.cpp interior.cpp isosurf.cpp jpeg_pov.cpp lathe.cpp lbuffer.cpp lightgrp.cpp lighting.cpp matrices.cpp media.cpp mesh.cpp normal.cpp objects.cpp octree.cpp optin.cpp optout.cpp parse.cpp parsestr.cpp parstxtr.cpp pattern.cpp pgm.cpp photons.cpp pigment.cpp planes.cpp png_pov.cpp point.cpp poly.cpp polygon.cpp polysolv.cpp pov_mem.cpp povms.cpp povmscpp.cpp povmsend.cpp povmsrec.cpp povray.cpp pov_util.cpp ppm.cpp prism.cpp quadrics.cpp quatern.cpp rad_data.cpp radiosit.cpp ray.cpp render.cpp renderio.cpp sor.cpp spheres.cpp sphsweep.cpp splines.cpp statspov.cpp super.cpp targa.cpp texture.cpp tiff_pov.cpp tokenize.cpp torus.cpp triangle.cpp truetype.cpp txttest.cpp userdisp.cpp userio.cpp vbuffer.cpp vlbuffer.cpp warps.cpp unix.cpp povxlib.c config.h jversion.h optout.h povxlib.h atmosph.h bbox.h bcyl.h bezier.h blob.h boxes.h bsphere.h camera.h chi2.h colour.h colutils.h cones.h csg.h discs.h express.h file_pov.h fncode.h fnintern.h fnpovfpu.h fnsyntax.h fpmetric.h fractal.h frame.h function.h gifdecod.h gif.h hcmplx.h hfield.h histogra.h iff.h image.h interior.h isosurf.h jpeg_pov.h lathe.h lbuffer.h lightgrp.h lighting.h matrices.h media.h mesh.h normal.h objects.h octree.h optin.h parse.h parsestr.h parstxtr.h pattern.h pgm.h photons.h pigment.h planes.h png_pov.h point.h polygon.h poly.h polysolv.h pov_err.h pov_mem.h povmscpp.h povmsend.h povmsgid.h povms.h povmsrec.h povproto.h povray.h pov_util.h ppm.h prism.h quadrics.h quatern.h radiosit.h ray.h render.h renderio.h sor.h spheres.h sphsweep.h splines.h statspov.h super.h targa.h texture.h tiff_pov.h tokenize.h torus.h triangle.h truetype.h txttest.h userdisp.h userio.h vbuffer.h vector.h vlbuffer.h warps.h  conf.h
+-DEFS = -DPREFIX=\"$(prefix)\" -DPOV_LIB_DIR=\"@datadir@/povray-3.5\" -DCOMPILER_VER=\".Linux.$(CC)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DUSE_IO_RESTRICTIONS=\"$(ac_use_io_restrictions)\"
++DEFS = -DPREFIX=\"$(prefix)\" -DPOV_LIB_DIR=\"@datadir@/povray-3.5\" -DCOMPILER_VER=\".FreeBSD.$(CC)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DUSE_IO_RESTRICTIONS=\"$(ac_use_io_restrictions)\"
+ NOMULTICHAR = `if [ "X$(CC)" = "Xgcc" ]; then echo "-Wno-multichar"; fi `
+ LDADD = @X_LIBS@
+-CXXFLAGS = $(NOMULTICHAR) -O3
++CXXFLAGS = $(NOMULTICHAR)
+ LDFLAGS = @X_CFLAGS@
+ EXTRA_DIST = xpovicon.xbm xpovmask.xbm xpovicon.xpm 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -101,7 +101,7 @@
+ PROGRAMS =  $(bin_PROGRAMS)
+ 
+ CPPFLAGS = @CPPFLAGS@
+-LIBS = @LIBS@
++LIBS = -L${LOCALBASE}/lib @LIBS@
+ X_CFLAGS = @X_CFLAGS@
+ X_LIBS = @X_LIBS@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+@@ -122,12 +122,13 @@
+ vlbuffer.o warps.o unix.o povxlib.o
+ povray_LDADD = $(LDADD)
+ povray_DEPENDENCIES = 
+-povray_LDFLAGS = 
+-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++povray_LDFLAGS = -L$(libdir)
++INCLUDES = -I$(includedir)
++CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(X_CFLAGS)
+ CXXLD = $(CXX)
+ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+ CFLAGS = @CFLAGS@
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(X_CFLAGS)
+ CCLD = $(CC)
+ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+ DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in conf.h.in
diff --git a/graphics/povray/files/patch-src::optout.h b/graphics/povray/files/patch-src::optout.h
new file mode 100644
index 0000000..4ef0ede
--- /dev/null
+++ b/graphics/povray/files/patch-src::optout.h
@@ -0,0 +1,12 @@
+--- src/optout.h.orig	Thu Aug  8 22:00:48 2002
++++ src/optout.h	Wed Aug 14 12:14:50 2002
+@@ -46,8 +46,7 @@
+ #define OFFICIAL_VERSION_NUMBER 350
+ 
+ #define DISTRIBUTION_MESSAGE_1 "This is an unofficial version compiled by:"
+-#error You must complete the following DISTRIBUTION_MESSAGE macro
+-#define DISTRIBUTION_MESSAGE_2 " FILL IN NAME HERE........................."
++#define DISTRIBUTION_MESSAGE_2 "FreeBSD, http://www.freebsd.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). */