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

Modified Files:
        raster3d.info raster3d.patch 
Log Message:
raster3d fixed for gfortran gcc42 package

Index: raster3d.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/raster3d.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- raster3d.patch      26 Jun 2006 23:34:38 -0000      1.2
+++ raster3d.patch      25 Feb 2007 23:23:33 -0000      1.3
@@ -1,15 +1,14 @@
-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 @@
+--- Raster3D_2.7d.orig/Makefile        2007-02-25 12:03:31.000000000 -0500
++++ Raster3D_2.7d/Makefile     2007-02-25 12:04:12.000000000 -0500
+@@ -61,9 +61,9 @@
        @cp Makefile.template Makefile.incl
        @echo OS = linux                      >> Makefile.incl
        @echo CC = gcc                        >> 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
-+      @echo FFLAGS = -g -O -w               >> Makefile.incl
+-      @echo CFLAGS = -g -w -Dgfortran       >> Makefile.incl
++      @echo CFLAGS = -g -O3 -w -Dgfortran       >> Makefile.incl
+       @echo FC = gfortran                   >> Makefile.incl
+-      @echo FFLAGS = -g -w -O -ffixed-line-length-132 >> Makefile.incl
++      @echo FFLAGS = -g -w -O3 -ffixed-line-length-132 >> Makefile.incl
        @echo RM = /bin/rm -f                 >> Makefile.incl
        @echo OSDEFS =  -DLINUX -DNETWORKBYTEORDER       >> Makefile.incl
        @echo include Makefile.package        >> Makefile.incl
@@ -32,3 +31,39 @@
  
  #
  # TIFF support (enabled by default)
+--- Raster3D_2.7d.orig/parse.f 2007-02-25 12:43:04.000000000 -0500
++++ Raster3D_2.7d/parse.f      2007-02-25 12:43:36.000000000 -0500
+@@ -4,7 +4,8 @@
+       COMMON /OPTIONS/ FONTSCALE, GAMMA, ZOOM, NSCHEME, SHADOWFLAG, XBG, 
+      &                 NAX, NAY, OTMODE, QUALITY, INVERT, LFLAG
+       REAL             FONTSCALE, GAMMA, ZOOM
+-      INTEGER          NSCHEME, SHADOWFLAG, XBG
++      INTEGER          NSCHEME, SHADOWFLAG
++      INTEGER*8        XBG
+       INTEGER*2        NAX, NAY, OTMODE, QUALITY
+       LOGICAL*2        INVERT, LFLAG
+ c
+--- Raster3D_2.7d.orig/r3dtops.f       2007-02-25 12:43:45.000000000 -0500
++++ Raster3D_2.7d/r3dtops.f    2007-02-25 12:44:23.000000000 -0500
+@@ -68,7 +68,8 @@
+       COMMON /OPTIONS/ FONTSCALE, GAMMA, ZOOM, NSCHEME, SHADOWFLAG, XBG,
+      &                 NAX, NAY, OTMODE, QUALITY, INVERT, LFLAG
+       REAL             FONTSCALE, GAMMA, ZOOM
+-      INTEGER          NSCHEME, SHADOWFLAG, XBG
++      INTEGER          NSCHEME, SHADOWFLAG
++      INTEGER*8        XBG
+       INTEGER*2        NAX, NAY, OTMODE, QUALITY
+       LOGICAL*2        INVERT, LFLAG
+ *
+--- Raster3D_2.7d.orig/render.f        2007-02-25 12:44:33.000000000 -0500
++++ Raster3D_2.7d/render.f     2007-02-25 12:44:58.000000000 -0500
+@@ -372,7 +372,8 @@
+       COMMON /OPTIONS/ FONTSCALE, GAMMA, ZOOM, NSCHEME, SHADOWFLAG, XBG,
+      &                 NAX, NAY, OTMODE, QUALITY, INVERT, LFLAG
+       REAL             FONTSCALE, GAMMA, ZOOM
+-      INTEGER          NSCHEME, SHADOWFLAG, XBG
++      INTEGER          NSCHEME, SHADOWFLAG
++      INTEGER*8        XBG
+       INTEGER*2        NAX, NAY, OTMODE, QUALITY
+       LOGICAL*2        INVERT, LFLAG
+ *

Index: raster3d.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/raster3d.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- raster3d.info       22 Jul 2006 22:41:49 -0000      1.3
+++ raster3d.info       25 Feb 2007 23:23:33 -0000      1.4
@@ -1,15 +1,15 @@
 Package: raster3d
 Version: 2.7d
-Revision: 1102
-Maintainer: None <fink-devel@lists.sourceforge.net>
+Revision: 1103
+Maintainer: Jack Howarth <[EMAIL PROTECTED]>
 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
+Depends: imagemagick (>= 6.1.8-1002), libjpeg-shlibs, libpng3-shlibs, 
libtiff-shlibs, x11, gcc42-shlibs
+BuildDepends: gcc42, 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-gfortran prefix=%p; make all prefix=%p


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to