Respect CFLAGS and CC.

Approved by:	maintainer

1 files changed, 46 insertions, 60 deletions

diff --git a/graphics/povray31/files/patch-ab b/graphics/povray31/files/patch-ab
index c073e7ebca96..d2c766c96143 100644
--- a/graphics/povray31/files/patch-ab
+++ b/graphics/povray31/files/patch-ab
@@ -1,60 +1,46 @@
-*** source/unix/makefile.orig	Fri Jun 18 22:52:24 1999
---- source/unix/makefile	Sat Jun 19 20:24:47 1999
-***************
-*** 51,57 ****
---- 51,61 ----
-  #CFLAGS      = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=586 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
-  
-  # Linux compiler flags, Pentium II optimized
-+ .if ${MACHINE_ARCH} == "i386"
-  CFLAGS      = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=686 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
-+ .else
-+ CFLAGS      = -O6 -finline-functions -ffast-math -c -ansi -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
-+ .endif
-  
-  # HPUX compiler flags
-  #CFLAGS      = +O2 -finline-functions -c -Aa -D_HPUX_SOURCE -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
-***************
-*** 88,97 ****
-  # 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
-  
-  # The following options are added at the suggestion of Axel Hecht
---- 92,101 ----
-  # 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 = $(PREFIX)/include
-  LIBPNGINC = -I$(PNGDIR)
-  #LIBPNGLIB = $(PNGDIR)/libpng.a
-! LIBPNGLIB = -L$(PREFIX)/lib -lpng
-  #LIBPNGLIB = -L/usr/local/lib -lpng
-  
-  # The following options are added at the suggestion of Axel Hecht
-***************
-*** 102,110 ****
-  # LIBPNGLIB = -L$(PREFIX)/lib -lpng
-  
-  ZLIBDIR = $(SRCDIR)/zlib
-! ZLIBINC = -I$(ZLIBDIR)
-  #ZLIBLIB = $(ZLIBDIR)/libz.a
-! ZLIBLIB = -L$(ZLIBDIR) -lz
-  #ZLIBLIB = -L/usr/local/lib -lz
-  
-  # The following options are added at the suggestion of Axel Hecht
---- 106,114 ----
-  # LIBPNGLIB = -L$(PREFIX)/lib -lpng
-  
-  ZLIBDIR = $(SRCDIR)/zlib
-! ZLIBINC = #-I$(ZLIBDIR)
-  #ZLIBLIB = $(ZLIBDIR)/libz.a
-! ZLIBLIB = -lz
-  #ZLIBLIB = -L/usr/local/lib -lz
-  
-  # The following options are added at the suggestion of Axel Hecht
+--- source/unix/makefile.orig	Mon Nov 22 02:12:37 1999
++++ source/unix/makefile	Wed Sep  1 12:40:10 2004
+@@ -53,7 +53,7 @@
+ #CFLAGS      = -O6 -finline-functions -ffast-math -c -ansi -m386 -DCPU=586 -DCOMPILER_VER=\".`uname`.$(CC)\" -DPOV_LIB_DIR=\"$(POVLIBDIR)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC)
+ 
+ # 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+= -c -ansi -DCPU=686 -DCOMPILER_VER=\".`uname`.$(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)
+@@ -61,9 +61,6 @@
+ # IRIX 6.5 compiler flags, courtesy Johan Eriksson
+ #CFLAGS	     = -O2 -n32 -mips4 -r10000 -ansi -c -DCOMPILER_VER=\".`uname`.$(CC)\" $(SRCINC) $(LIBPNGINC) $(ZLIBINC) $(XLIBINC)	
+ 
+-# Your compiler
+-CC          = gcc
+-
+ # The X11 variable should point to the top-level directory where the X11
+ #   libraries and include files are located.  It should really be set in
+ #   your system startup script (ie .cshrc or .profile) so that it can be
+@@ -90,10 +87,10 @@
+ # 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
++PNGDIR = $(PREFIX)/include
+ LIBPNGINC = -I$(PNGDIR)
+ #LIBPNGLIB = $(PNGDIR)/libpng.a
+-LIBPNGLIB = -L$(PNGDIR) -lpng
++LIBPNGLIB = -L$(PREFIX)/lib -lpng
+ #LIBPNGLIB = -L/usr/local/lib -lpng
+ 
+ # The following options are added at the suggestion of Axel Hecht
+@@ -104,9 +101,9 @@
+ # LIBPNGLIB = -L$(PREFIX)/lib -lpng
+ 
+ ZLIBDIR = $(SRCDIR)/zlib
+-ZLIBINC = -I$(ZLIBDIR)
++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