Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv22659
Modified Files:
gildas.patch gildas.info
Log Message:
Use gfortran instead of g95. Thanks to Jack Howarth for the update
(tracker item #1834200).
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gildas.patch 31 Jul 2007 21:15:49 -0000 1.1
+++ gildas.patch 19 Nov 2007 00:46:35 -0000 1.2
@@ -1,6 +1,6 @@
-diff -ruN -x '*~' gildas-src-08apr07/admin/Makefile
gildas-src-08apr07.patched/admin/Makefile
---- gildas-src-08apr07/admin/Makefile 2004-10-19 10:04:03.000000000 -0400
-+++ gildas-src-08apr07.patched/admin/Makefile 2007-04-10 11:45:25.000000000
-0400
+diff -ruN gildas-src-oct07a/admin/Makefile
gildas-src-oct07a.patched/admin/Makefile
+--- gildas-src-oct07a/admin/Makefile 2007-07-26 11:46:43.000000000 -0400
++++ gildas-src-oct07a.patched/admin/Makefile 2007-11-18 17:42:22.000000000
-0500
@@ -42,6 +42,5 @@
@(echo "Bye." >> final-message.txt)
@(echo
"***************************************************************************"
>> final-message.txt)
@@ -8,10 +8,28 @@
- -(cat final-message.txt)
###########################################################################
-diff -ruN -x '*~' gildas-src-08apr07/admin/Makefile.def
gildas-src-08apr07.patched/admin/Makefile.def
---- gildas-src-08apr07/admin/Makefile.def 2007-03-30 10:30:37.000000000
-0400
-+++ gildas-src-08apr07.patched/admin/Makefile.def 2007-04-10
12:08:50.000000000 -0400
-@@ -436,7 +436,7 @@
+diff -ruN gildas-src-oct07a/admin/Makefile.def
gildas-src-oct07a.patched/admin/Makefile.def
+--- gildas-src-oct07a/admin/Makefile.def 2007-07-26 11:46:43.000000000
-0400
++++ gildas-src-oct07a.patched/admin/Makefile.def 2007-11-18
17:42:22.000000000 -0500
+@@ -256,7 +256,7 @@
+
+ # Generic flags
+ GLOBAL_CFLAGS = $(GAG_INC_FLAGS) -c
+-OPTION_CFLAGS = -O
++OPTION_CFLAGS = -O3
+
+ # GCC flags
+ ifeq ($(CC),gcc)
+@@ -328,7 +328,7 @@
+
+ # Generic flags
+ GLOBAL_FFLAGS = -I$(incdir)
+-OPTION_FFLAGS = -O
++OPTION_FFLAGS = -O3 -fno-range-check
+
+ # G95 flags
+ ifeq ($(FC),g95)
+@@ -442,7 +442,7 @@
GAG_LIBS = -lgio -lgsys
@@ -20,7 +38,7 @@
GREG_LIBS = -lgreg -lgtv -lgcont -lgchar -lX11
-@@ -467,7 +467,7 @@
+@@ -473,7 +473,7 @@
ADD_LIBS += -lpng -lz
endif
ifeq ($(FFTW3_PRESENT),yes)
@@ -29,10 +47,10 @@
endif
# Mandatory system libraries
-diff -ruN -x '*~' gildas-src-08apr07/admin/gildas-env.sh
gildas-src-08apr07.patched/admin/gildas-env.sh
---- gildas-src-08apr07/admin/gildas-env.sh 2007-04-02 05:20:48.000000000
-0400
-+++ gildas-src-08apr07.patched/admin/gildas-env.sh 2007-04-10
11:45:25.000000000 -0400
-@@ -357,14 +357,14 @@
+diff -ruN gildas-src-oct07a/admin/gildas-env.sh
gildas-src-oct07a.patched/admin/gildas-env.sh
+--- gildas-src-oct07a/admin/gildas-env.sh 2007-07-20 11:51:33.000000000
-0400
++++ gildas-src-oct07a.patched/admin/gildas-env.sh 2007-11-18
17:42:22.000000000 -0500
+@@ -361,14 +361,14 @@
NEWATM_PRESENT=yes
NEWATM_LIB_DIR=$DIR
fi
@@ -55,7 +73,7 @@
if file_present "libslatec." "${DIR}"; then
SLATEC_PRESENT=yes
SLATEC_LIB_DIR=$DIR
-@@ -420,10 +420,10 @@
+@@ -424,10 +424,10 @@
PNG_INC=yes
PNG_INC_DIR=$DIR
fi
@@ -70,7 +88,7 @@
done
for DIR in $LIB_PATH; do
if file_present "libX11." "${DIR}"; then
-@@ -442,10 +442,10 @@
+@@ -446,10 +446,10 @@
PNG_LIB=yes
PNG_LIB_DIR=$DIR
fi
Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- gildas.info 29 Oct 2007 19:27:58 -0000 1.4
+++ gildas.info 19 Nov 2007 00:46:35 -0000 1.5
@@ -1,17 +1,17 @@
Package: gildas
Version: 200710
-Revision: 1
-Distribution: 10.4
+Revision: 2
+Distribution: 10.4, 10.5
Description: Radioastronomy data analysis software
License: OSI-Approved
Maintainer: Sebastien Maret <[EMAIL PROTECTED]>
Source: http://www.iram.fr/~gildas/dist/gildas-src-oct07a.tar.gz
Source-MD5: 9355297d5492f3cf30a289ee2100fd14
Depends: <<
- fftw3-shlibs, libpng3-shlibs, openmotif3-shlibs, x11
+ fftw3-shlibs, libpng3-shlibs, openmotif3-shlibs, x11, gcc42-shlibs
<<
BuildDepends: <<
- cfitsio, fftw3, g95, libpng3, openmotif3, x11-dev
+ cfitsio, fftw3, gcc42, libpng3, openmotif3, x11-dev
<<
Patch: gildas.patch
CompileScript: <<
@@ -20,7 +20,7 @@
InstallScript: <<
#!/bin/bash -e
export gagsrcdir=%b
- source admin/gildas-env.sh -s %p/lib:%p/include -c g95
+ source admin/gildas-env.sh -s %p/lib:%p/include -c gfortran
export gagexedir=%i/lib/gildas
install -d %i/bin %i/lib
make install
@@ -29,20 +29,20 @@
else
export arch='pc'
fi
- cd %i/lib/gildas/${arch}-darwin-g95/bin/
+ cd %i/lib/gildas/${arch}-darwin-gfortran/bin/
for file in * ; do
- ln -s %p/lib/gildas/${arch}-darwin-g95/bin/${file} %i/bin/${file}
+ ln -s %p/lib/gildas/${arch}-darwin-gfortran/bin/${file} %i/bin/${file}
done
- cd %i/lib/gildas/${arch}-darwin-g95/libexec/
+ cd %i/lib/gildas/${arch}-darwin-gfortran/libexec/
for file in * ; do
- ln -s %p/lib/gildas/${arch}-darwin-g95/libexec/${file} %i/bin/${file}
+ ln -s %p/lib/gildas/${arch}-darwin-gfortran/libexec/${file} %i/bin/${file}
done
- /usr/bin/sed -e "s|%i|%p|g" -i ""
%i/lib/gildas/${arch}-darwin-g95/etc/gag.dico.gbl
+ /usr/bin/sed -e "s|%i|%p|g" -i ""
%i/lib/gildas/${arch}-darwin-gfortran/etc/gag.dico.gbl
<<
PostInstScript: echo -e "\n*** Installation completed. Please open a new term
to use gildas ***"
RuntimeVars: <<
G95_ENDIAN: NATIVE
- GAG_PATH:
%p/lib/gildas/pc-darwin-g95/etc:%p/lib/gildas/powerpc-darwin-g95/etc
+ GAG_PATH:
%p/lib/gildas/pc-darwin-gfortran/etc:%p/lib/gildas/powerpc-darwin-gfortran/etc
<<
DescDetail: <<
Gildas, the "Grenoble Image and Line Data Analysis Software", is a
@@ -56,4 +56,4 @@
Accelerate framework or ATLAS. Python support is disabled for now
because it does not work.
<<
-Homepage: http://www.iram.fr/IRAMFR/GILDAS/gildas.html
\ No newline at end of file
+Homepage: http://www.iram.fr/IRAMFR/GILDAS/gildas.html
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
