[cvs] dists/10.4/unstable/main/finkinfo/graphics raster3d.info, 1.1, 1.2 raster3d.patch, 1.1, 1.2

[Daniel M. <dm...@us...>]

Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv20962/10.4/unstable/main/finkinfo/graphics

Modified Files:
	raster3d.info raster3d.patch 
Log Message:
New version + build cleanup and dep fixes


Index: raster3d.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/raster3d.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- raster3d.patch	20 Jan 2006 20:26:46 -0000	1.1
+++ raster3d.patch	26 Jun 2006 23:34:38 -0000	1.2
@@ -1,22 +1,11 @@
---- Raster3D_2.7b/label3d	2003-06-20 07:52:12.000000000 +1000
-+++ Raster3D_2.7b-patched/label3d	2003-06-27 15:29:48.000000000 +1000
-@@ -39,7 +39,7 @@
- if [ "$TMPDIR" ]; then
-     tmp=$TMPDIR/$$
- else
--    tmp=/usr/tmp/$$
-+    tmp=/tmp/$$
- fi
- #echo "DEBUG scratch files to $tmp"  1>&2
- 
-
---- Raster3D_2.7b/Makefile	2003-06-20 07:52:12.000000000 +1000
-+++ Raster3D_2.7b-patched/Makefile	2003-06-27 15:31:42.000000000 +1000
+diff -Nurd -x'*~' Raster3D_2.7d.orig/Makefile Raster3D_2.7d/Makefile
+--- Raster3D_2.7d.orig/Makefile	2006-04-12 14:46:10.000000000 -0400
++++ Raster3D_2.7d/Makefile	2006-06-26 14:33:01.000000000 -0400
 @@ -50,9 +50,9 @@
  	@cp Makefile.template Makefile.incl
  	@echo OS = linux                      >> Makefile.incl
  	@echo CC = gcc                        >> Makefile.incl
--	@echo CFLAGS = -g -m486 -w            >> Makefile.incl
+-	@echo CFLAGS = -g -w                  >> Makefile.incl
 +	@echo CFLAGS = -g -dynamic            >> Makefile.incl
  	@echo FC = g77                        >> Makefile.incl
 -	@echo FFLAGS = -g -O -w -malign-double>> Makefile.incl
@@ -24,15 +13,11 @@
  	@echo RM = /bin/rm -f                 >> Makefile.incl
  	@echo OSDEFS =  -DLINUX -DNETWORKBYTEORDER       >> Makefile.incl
  	@echo include Makefile.package        >> Makefile.incl
-
---- Raster3D_2.7b/Makefile.template	2003-06-20 07:52:12.000000000 +1000
-+++ Raster3D_2.7b-patched/Makefile.template	2003-06-27 15:28:24.000000000 +1000
-@@ -8,15 +8,15 @@
- #
- # Where to install the program, data files, and manuals
- #
--prefix  = /usr/local
-+prefix  = $(prefix)
+diff -Nurd -x'*~' Raster3D_2.7d.orig/Makefile.template Raster3D_2.7d/Makefile.template
+--- Raster3D_2.7d.orig/Makefile.template	2003-10-20 18:50:11.000000000 -0400
++++ Raster3D_2.7d/Makefile.template	2006-06-26 14:39:18.000000000 -0400
+@@ -11,12 +11,12 @@
+ prefix  = /usr/local
  bindir  = $(prefix)/bin
  datadir = $(prefix)/share/Raster3D/materials
 -mandir  = $(prefix)/man/manl
@@ -42,20 +27,8 @@
  
 -INCDIRS  =	-I/usr/include -I/usr/local/include
 -LIBDIRS  =	-L/usr/local/lib
-+INCDIRS  =	-I/usr/include -I@FINKPREFIX@/include
-+LIBDIRS  =	-L@FINKPREFIX@/lib
++INCDIRS  =	-I$(prefix)/include
++LIBDIRS  =	-L$(prefix)/lib
  
  #
  # TIFF support (enabled by default)
-
---- Raster3D_2.7b/stereo3d	2003-06-20 07:52:13.000000000 +1000
-+++ Raster3D_2.7b-patched/stereo3d	2003-06-27 15:30:09.000000000 +1000
-@@ -42,7 +42,7 @@
- if [ "$TMPDIR" ]; then
-     tmp=$TMPDIR/$$
- else
--    tmp=/usr/tmp/$$
-+    tmp=/tmp/$$
- fi
- # echo "DEBUG scratch files to $tmp"  1>&2
- 

Index: raster3d.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/raster3d.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- raster3d.info	20 Jan 2006 20:26:46 -0000	1.1
+++ raster3d.info	26 Jun 2006 23:34:38 -0000	1.2
@@ -1,13 +1,20 @@
 Package: raster3d
-Version: 2.7b
-Revision: 22
+Version: 2.7d
+Revision: 1101
 Maintainer: None <fin...@li...>
-Source: http://www.bmsc.washington.edu/%n/Raster3D_%v.tar.gz
-Source-MD5: 7599cb74fc9a20b6b1cf04812fdc144f
-Depends: imagemagick (>= 5.5.1-2), x11
-BuildDepends: g77 (>= 3.1-20020420-2), libjpeg, libpng3, libtiff, x11-dev
-PatchScript: sed 's|@FINKPREFIX@|%p|g' <%a/%n.patch | patch -p1
-CompileScript: make linux; make all
+Source: mirror:custom:Raster3D_%v.tar.gz
+CustomMirror: <<
+  Primary: http://skuld.bmsc.washington.edu/raster3d
+  Seconary: http://skuld.bmsc.washington.edu/raster3d/old
+<<
+Source-MD5: 30b284037b0138d328ab1b43328549e6
+Depends: imagemagick (>= 6.1.8-1002), libjpeg-shlibs, libpng3-shlibs, libtiff-shlibs, x11
+BuildDepends: gcc4, libjpeg, libpng3, libtiff, x11-dev
+Patch: %n.patch
+PatchScript: perl -pi -e 's,/usr/tmp,/tmp,' *3d doc/*3d.l html/*3d.html
+CompileScript: make linux prefix=%p; make all prefix=%p
+# -lcc_dynamic for 10.3 only
+#SetLDFLAGS: -lcc_dynamic
 InstallScript: <<
  mkdir -p %i/bin
  make install prefix=%i
@@ -15,7 +22,7 @@
 DocFiles: BUGS CHANGELOG README
 Description: Tools for generating images of molecules
 DescDetail: <<
- Raster3D is a set of tools for generating high quality raster images of
+Raster3D is a set of tools for generating high quality raster images of
 proteins or other molecules. The core program renders spheres, triangles,
 cylinders, and quadric surfaces with specular highlighting, Phong shading,
 and shadowing. It uses an efficient software Z-buffer algorithm which is
@@ -25,7 +32,6 @@
 can also be used to render pictures composed in other programs such as
 Molscript in glorious 3D with highlights, shadowing, etc. Output is to
 pixel image files with 24 bits of color information per pixel. 
-
 <<
 DescPackaging: <<
  Originally packaged by Matt Stephenson.