Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv11851
Modified Files:
gildas.info gildas.patch
Log Message:
Moved from unstable
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gildas.patch 30 Nov 2009 10:58:24 -0000 1.5
+++ gildas.patch 22 Feb 2010 12:40:37 -0000 1.6
@@ -1,6 +1,6 @@
-diff -ruN --exclude='*~' gildas-src-nov09b/admin/Makefile
gildas-src-nov09b.patched/admin/Makefile
---- gildas-src-nov09b/admin/Makefile 2007-12-12 11:23:47.000000000 +0100
-+++ gildas-src-nov09b.patched/admin/Makefile 2009-11-04 12:02:33.000000000
+0100
+diff --exclude='*~' -ruN gildas-src-feb10a/admin/Makefile
gildas-src-feb10a.patched/admin/Makefile
+--- gildas-src-feb10a/admin/Makefile 2007-12-12 11:23:47.000000000 +0100
++++ gildas-src-feb10a.patched/admin/Makefile 2010-02-15 16:04:39.000000000
+0100
@@ -33,31 +33,31 @@
integ: integ-message
@@ -55,10 +55,10 @@
+# @(echo)
###########################################################################
-diff -ruN --exclude='*~' gildas-src-nov09b/admin/Makefile.build
gildas-src-nov09b.patched/admin/Makefile.build
---- gildas-src-nov09b/admin/Makefile.build 2009-03-12 19:28:41.000000000
+0100
-+++ gildas-src-nov09b.patched/admin/Makefile.build 2009-11-04
12:02:33.000000000 +0100
-@@ -306,6 +306,10 @@
+diff --exclude='*~' -ruN gildas-src-feb10a/admin/Makefile.build
gildas-src-feb10a.patched/admin/Makefile.build
+--- gildas-src-feb10a/admin/Makefile.build 2009-11-27 10:05:06.000000000
+0100
++++ gildas-src-feb10a.patched/admin/Makefile.build 2010-02-15
16:04:39.000000000 +0100
+@@ -313,6 +313,10 @@
-lm:
@@ -69,22 +69,10 @@
# Required by ASDM libs:
-lstdc++:
-diff -ruN --exclude='*~' gildas-src-nov09b/admin/Makefile.def
gildas-src-nov09b.patched/admin/Makefile.def
---- gildas-src-nov09b/admin/Makefile.def 2009-10-07 14:25:23.000000000
+0200
-+++ gildas-src-nov09b.patched/admin/Makefile.def 2009-11-06
17:56:42.000000000 +0100
-@@ -450,8 +450,9 @@
- # Assume that integers without specification (i.e. at declaration
- # time) are kind=4 (32 bits)?
- ifeq ($(GAG_USE_32BITS),yes)
-- GLOBAL_FFLAGS += -m32
-- GLOBAL_FLDFLAGS += -Wl,-m,elf_i386
-+ # This is not supported yet! Have to find the correct options...
-+ GLOBAL_FFLAGS +=
-+ GLOBAL_FLDFLAGS +=
- endif
- endif
- ifeq ($(GAG_OS_KIND),cygwin)
-@@ -552,7 +553,7 @@
+diff --exclude='*~' -ruN gildas-src-feb10a/admin/Makefile.def
gildas-src-feb10a.patched/admin/Makefile.def
+--- gildas-src-feb10a/admin/Makefile.def 2009-11-06 16:03:38.000000000
+0100
++++ gildas-src-feb10a.patched/admin/Makefile.def 2010-02-15
16:04:39.000000000 +0100
+@@ -553,7 +553,7 @@
###########################################################################
# Kernel libraries
@@ -93,31 +81,29 @@
GAG_LIBS = -lggui -lgcore -lgwcs -lgio -lgsys -lginc
ifeq ($(GAG_USE_XML),yes)
-diff -ruN --exclude='*~' gildas-src-nov09b/admin/define-system.sh
gildas-src-nov09b.patched/admin/define-system.sh
---- gildas-src-nov09b/admin/define-system.sh 2008-11-25 16:50:43.000000000
+0100
-+++ gildas-src-nov09b.patched/admin/define-system.sh 2009-11-30
11:32:25.000000000 +0100
-@@ -216,12 +216,12 @@
+diff --exclude='*~' -ruN gildas-src-feb10a/admin/define-system.sh
gildas-src-feb10a.patched/admin/define-system.sh
+--- gildas-src-feb10a/admin/define-system.sh 2009-12-07 14:34:49.000000000
+0100
++++ gildas-src-feb10a.patched/admin/define-system.sh 2010-02-15
16:07:51.000000000 +0100
+@@ -208,11 +208,11 @@
else
GAG_MACHINE=pc
fi
- if which ifort > /dev/null 2>&1; then
- DEFAULT_COMPILER=ifort
-- else
+- elif which g95 > /dev/null 2>&1; then
- DEFAULT_COMPILER=g95
-- GAG_MACHINE=pc # g95 for Darwin produces 32 bits
executables
- fi
+ #if which ifort > /dev/null 2>&1; then
+ # DEFAULT_COMPILER=ifort
-+ #else
++ #elif which g95 > /dev/null 2>&1; then
+ # DEFAULT_COMPILER=g95
-+ # GAG_MACHINE=pc # g95 for Darwin produces 32 bits
executables
+ #fi
fi ;;
CYGWIN*)
GAG_MACHINE=pc
-diff -ruN --exclude='*~' gildas-src-nov09b/admin/gildas-env.sh
gildas-src-nov09b.patched/admin/gildas-env.sh
---- gildas-src-nov09b/admin/gildas-env.sh 2009-10-07 17:45:32.000000000
+0200
-+++ gildas-src-nov09b.patched/admin/gildas-env.sh 2009-11-04
12:02:33.000000000 +0100
+diff --exclude='*~' -ruN gildas-src-feb10a/admin/gildas-env.sh
gildas-src-feb10a.patched/admin/gildas-env.sh
+--- gildas-src-feb10a/admin/gildas-env.sh 2009-11-20 15:55:11.000000000
+0100
++++ gildas-src-feb10a.patched/admin/gildas-env.sh 2010-02-15
16:04:39.000000000 +0100
@@ -524,11 +524,11 @@
NEWATM_PRESENT=yes
NEWATM_LIB_DIR=$DIR
@@ -133,9 +119,9 @@
BLAS_PRESENT=yes
BLAS_LIB_DIR=$DIR
fi
-diff -ruN --exclude='*~' gildas-src-nov09b/packages/clic/lib/Makefile
gildas-src-nov09b.patched/packages/clic/lib/Makefile
---- gildas-src-nov09b/packages/clic/lib/Makefile 2008-11-14
10:52:59.000000000 +0100
-+++ gildas-src-nov09b.patched/packages/clic/lib/Makefile 2009-11-04
12:02:33.000000000 +0100
+diff --exclude='*~' -ruN gildas-src-feb10a/packages/clic/lib/Makefile
gildas-src-feb10a.patched/packages/clic/lib/Makefile
+--- gildas-src-feb10a/packages/clic/lib/Makefile 2008-11-14
10:52:59.000000000 +0100
++++ gildas-src-feb10a.patched/packages/clic/lib/Makefile 2010-02-15
16:04:39.000000000 +0100
@@ -55,7 +55,7 @@
# Mathematical library dependency
ifeq ($(LINEAR),lapack)
@@ -145,9 +131,9 @@
else
ifeq ($(LINEAR),nag)
LINEAR_LIB_OBJECTS = mth_nag.o
-diff -ruN --exclude='*~' gildas-src-nov09b/packages/clic07/lib/Makefile
gildas-src-nov09b.patched/packages/clic07/lib/Makefile
---- gildas-src-nov09b/packages/clic07/lib/Makefile 2009-07-10
12:17:56.000000000 +0200
-+++ gildas-src-nov09b.patched/packages/clic07/lib/Makefile 2009-11-04
12:02:33.000000000 +0100
+diff --exclude='*~' -ruN gildas-src-feb10a/packages/clic07/lib/Makefile
gildas-src-feb10a.patched/packages/clic07/lib/Makefile
+--- gildas-src-feb10a/packages/clic07/lib/Makefile 2009-07-10
12:17:56.000000000 +0200
++++ gildas-src-feb10a.patched/packages/clic07/lib/Makefile 2010-02-15
16:04:39.000000000 +0100
@@ -49,7 +49,7 @@
# Mathematical library dependency
ifeq ($(LINEAR),lapack)
Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gildas.info 30 Nov 2009 10:58:24 -0000 1.13
+++ gildas.info 22 Feb 2010 12:40:37 -0000 1.14
@@ -1,12 +1,12 @@
Package: gildas
-Version: 200911
-Revision: 3
+Version: 201002
+Revision: 2
Architecture: powerpc, i386, x86_64
Description: Radioastronomy data analysis software
License: OSI-Approved
Maintainer: Sebastien Maret <bma...@users.sourceforge.net>
-Source: http://www.iram.fr/~gildas/dist/gildas-src-nov09b.tar.gz
-Source-MD5: 472308c118e361794af39bbe010788d2
+Source: http://www.iram.fr/~gildas/dist/gildas-src-feb10a.tar.gz
+Source-MD5: 02198fcbbadf849187489ceedc86704e
Depends: <<
fftw3-shlibs, gcc44-shlibs, libpng3-shlibs, lesstif-shlibs, x11
<<
@@ -14,7 +14,7 @@
cfitsio, fink (>= 0.29.5-1), fftw3, gcc44, libpng3, lesstif, sed, slatec,
x11-dev
<<
PatchFile: gildas.patch
-PatchFile-MD5: a240e4e591a917408de3412c9a28d4f7
+PatchFile-MD5: 43b290df556db323d0c888799d21c24f
CompileScript: <<
true
<<
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
