Move this port's distfiles into its own subdirectory to avoid conflicts

with the povray port.  Also fix build/install for the Alpha.

4 files changed, 25 insertions, 11 deletions

diff --git a/graphics/povray31/Makefile b/graphics/povray31/Makefile
index 6616ad6af3d1..ab9f6ef51763 100644
--- a/graphics/povray31/Makefile
+++ b/graphics/povray31/Makefile
@@ -3,7 +3,7 @@
 # Date created:         3 Dec 1996
 # Whom:                 paulo@isr.uc.pt
 #
-# $Id: Makefile,v 1.2 1999/05/09 17:47:51 flathill Exp $
+# $Id: Makefile,v 1.3 1999/05/11 02:05:36 flathill Exp $
 #
 
 DISTNAME=	povray31
@@ -19,6 +19,8 @@ MAINTAINER=	olli@fromme.com
 #BUILD_DEPENDS=  unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png
 
+DIST_SUBDIR=	povray31
+
 #
 #   I think all of this needs some explanation.
 #   The port downloads the MS-DOS source files of POV-Ray 3.1d
diff --git a/graphics/povray31/distinfo b/graphics/povray31/distinfo
index 28b70230288f..8b68352c4486 100644
--- a/graphics/povray31/distinfo
+++ b/graphics/povray31/distinfo
@@ -1,2 +1,2 @@
-MD5 (povuni_s.tgz) = c46218799503b887ad7e529a881f8769
-MD5 (povuni_d.tgz) = bf41d8269e2c9e6060b4ce1eb2612390
+MD5 (povray31/povuni_s.tgz) = e3c9427cc7959396265478103e1d72f9
+MD5 (povray31/povuni_d.tgz) = 87180c234fbd36c182d416e434b77562
diff --git a/graphics/povray31/files/patch-ab b/graphics/povray31/files/patch-ab
index 3a924df8a9fc..c073e7ebca96 100644
--- a/graphics/povray31/files/patch-ab
+++ b/graphics/povray31/files/patch-ab
@@ -1,7 +1,21 @@
-*** source/unix/makefile.orig	Tue Mar  9 12:03:02 1999
---- source/unix/makefile	Tue May 11 03:42:15 1999
+*** source/unix/makefile.orig	Fri Jun 18 22:52:24 1999
+--- source/unix/makefile	Sat Jun 19 20:24:47 1999
 ***************
-*** 34,43 ****
+*** 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.
@@ -12,7 +26,7 @@
   #LIBPNGLIB = -L/usr/local/lib -lpng
   
   # The following options are added at the suggestion of Axel Hecht
---- 34,43 ----
+--- 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.
@@ -24,7 +38,7 @@
   
   # The following options are added at the suggestion of Axel Hecht
 ***************
-*** 48,56 ****
+*** 102,110 ****
   # LIBPNGLIB = -L$(PREFIX)/lib -lpng
   
   ZLIBDIR = $(SRCDIR)/zlib
@@ -34,7 +48,7 @@
   #ZLIBLIB = -L/usr/local/lib -lz
   
   # The following options are added at the suggestion of Axel Hecht
---- 48,56 ----
+--- 106,114 ----
   # LIBPNGLIB = -L$(PREFIX)/lib -lpng
   
   ZLIBDIR = $(SRCDIR)/zlib
diff --git a/graphics/povray31/pkg-plist b/graphics/povray31/pkg-plist
index d5dd70bcb263..bc2914e2d78d 100644
--- a/graphics/povray31/pkg-plist
+++ b/graphics/povray31/pkg-plist
@@ -1,10 +1,8 @@
 bin/povray
 lib/povray31/CMPL_Unix.doc
-lib/povray31/allanim.ini
 lib/povray31/allscene.ini
 lib/povray31/allscene.sh
 lib/povray31/allscene/.bla
-lib/povray31/allstill.ini
 lib/povray31/compile.doc
 lib/povray31/gamma.gif
 lib/povray31/include/ash.map