unbreak povray port.

Many requests: thanks.

3 files changed, 8 insertions, 12 deletions

diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 5bb0aa71e568..b8a625cf1455 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	povray
 PORTVERSION=	3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \
 		ftp://ftp.gigabell.net/pub/unix/apps/graphics/povray/%SUBDIR%/ \
diff --git a/graphics/povray/distinfo b/graphics/povray/distinfo
index d5f4e39e58f0..9399a41c2e3d 100644
--- a/graphics/povray/distinfo
+++ b/graphics/povray/distinfo
@@ -1 +1 @@
-MD5 (povray35/povuni_s.tgz) = 2a7e44295f046157a948bbecbf1aa942
+MD5 (povray35/povuni_s.tgz) = bac59e7a86172a5bd0c63af2516e7045
diff --git a/graphics/povray/files/patch-src::Makefile.in b/graphics/povray/files/patch-src::Makefile.in
index 08883ad54cf3..f063d7529c8d 100644
--- a/graphics/povray/files/patch-src::Makefile.in
+++ b/graphics/povray/files/patch-src::Makefile.in
@@ -1,17 +1,13 @@
---- src/Makefile.in.orig	Tue Oct 22 09:54:20 2002
-+++ src/Makefile.in	Sun Dec  1 22:52:03 2002
-@@ -89,11 +89,13 @@
- 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)\"
+--- src/Makefile.in.orig	Tue Jan  7 10:23:23 2003
++++ src/Makefile.in	Sat Apr 12 08:56:01 2003
+@@ -92,8 +92,10 @@
+ DEFS = -DPREFIX=\"$(prefix)\" -DPOV_LIB_DIR=\"@datadir@/povray-3.5\" -DCOMPILER_VER=\".Linux.$(CC)\" -DSYSCONFDIR=\"$(sysconfdir)\" -DUSE_IO_RESTRICTIONS=\"$(ac_use_io_restrictions)\"
  NOMULTICHAR = `if [ "X$(CC)" = "Xgcc" ]; then echo "-Wno-multichar"; fi `
  LDADD = @X_LIBS@
 -CFLAGS = -O3 -mcpu=i586 -march=i586 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
--CXXFLAGS = $(NOMULTICHAR) -O3 -mcpu=i586 -march=i586 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
+-CXXFLAGS = $(NOMULTICHAR) -O3 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
 +#CFLAGS = -O3 -mcpu=i586 -march=i586 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
-+#CXXFLAGS = $(NOMULTICHAR) -O3 -mcpu=i586 -march=i586 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
++#CXXFLAGS = $(NOMULTICHAR) -O3 -finline-functions -ffast-math -fomit-frame-pointer -funroll-loops -fexpensive-optimizations -malign-double -foptimize-sibling-calls -minline-all-stringops -Wno-multichar
 +CFLAGS = @CFLAGS@
 +CXXFLAGS = @CXXFLAGS@
  LDFLAGS = @X_CFLAGS@