Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv13642
Modified Files:
gildas.info gildas.patch
Log Message:
New upstream version.
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gildas.patch 28 Sep 2009 11:28:01 -0000 1.11
+++ gildas.patch 4 Nov 2009 14:20:05 -0000 1.12
@@ -1,6 +1,6 @@
-diff -ruN --exclude='*~' gildas-src-aug09c/admin/Makefile
gildas-src-aug09c.patched/admin/Makefile
---- gildas-src-aug09c/admin/Makefile 2007-12-12 11:23:47.000000000 +0100
-+++ gildas-src-aug09c.patched/admin/Makefile 2009-09-27 18:31:46.000000000
+0200
+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
@@ -33,31 +33,31 @@
integ: integ-message
@@ -55,9 +55,9 @@
+# @(echo)
###########################################################################
-diff -ruN --exclude='*~' gildas-src-aug09c/admin/Makefile.build
gildas-src-aug09c.patched/admin/Makefile.build
---- gildas-src-aug09c/admin/Makefile.build 2009-03-12 19:28:41.000000000
+0100
-+++ gildas-src-aug09c.patched/admin/Makefile.build 2009-09-28
13:09:45.000000000 +0200
+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 @@
-lm:
@@ -69,10 +69,10 @@
# Required by ASDM libs:
-lstdc++:
-diff -ruN --exclude='*~' gildas-src-aug09c/admin/Makefile.def
gildas-src-aug09c.patched/admin/Makefile.def
---- gildas-src-aug09c/admin/Makefile.def 2009-05-28 11:17:16.000000000
+0200
-+++ gildas-src-aug09c.patched/admin/Makefile.def 2009-09-28
13:00:24.000000000 +0200
-@@ -549,7 +549,7 @@
+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-04
12:02:33.000000000 +0100
+@@ -552,7 +552,7 @@
###########################################################################
# Kernel libraries
@@ -81,9 +81,9 @@
GAG_LIBS = -lggui -lgcore -lgwcs -lgio -lgsys -lginc
ifeq ($(GAG_USE_XML),yes)
-diff -ruN --exclude='*~' gildas-src-aug09c/admin/define-system.sh
gildas-src-aug09c.patched/admin/define-system.sh
---- gildas-src-aug09c/admin/define-system.sh 2008-11-25 16:50:43.000000000
+0100
-+++ gildas-src-aug09c.patched/admin/define-system.sh 2009-09-27
18:31:46.000000000 +0200
+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-04
12:02:33.000000000 +0100
@@ -211,11 +211,11 @@
DEFAULT_COMPILER=g95
fi
@@ -100,27 +100,10 @@
if which ifort > /dev/null 2>&1; then
DEFAULT_COMPILER=ifort
else
-diff -ruN --exclude='*~' gildas-src-aug09c/admin/gildas-env.sh
gildas-src-aug09c.patched/admin/gildas-env.sh
---- gildas-src-aug09c/admin/gildas-env.sh 2009-04-27 11:46:55.000000000
+0200
-+++ gildas-src-aug09c.patched/admin/gildas-env.sh 2009-09-28
12:56:43.000000000 +0200
-@@ -461,11 +461,11 @@
- INC_PATH=`echo $LIB_PATH:$GAGENV_SEARCH_PATH | sed -e "s&lib&include&g"`
- #
- # Library locations under 64 bits linux
-- if [ "$GAG_MACHINE" = "x86_64" ]; then
-- if [ "$GAG_COMPILER" != "ifort_32" ]; then
-- LIB_PATH=`echo $LIB_PATH | sed -e "s&lib&lib64&g"`
-- fi
-- fi
-+# if [ "$GAG_MACHINE" = "x86_64" ]; then
-+# if [ "$GAG_COMPILER" != "ifort_32" ]; then
-+# LIB_PATH=`echo $LIB_PATH | sed -e "s&lib&lib64&g"`
-+# fi
-+# fi
- # Add user's $GAG_SEARCH_PATH, but only after converting lib into lib64.
- LIB_PATH=$LIB_PATH:$GAGENV_SEARCH_PATH
- #
-@@ -515,11 +515,11 @@
+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
+@@ -524,11 +524,11 @@
NEWATM_PRESENT=yes
NEWATM_LIB_DIR=$DIR
fi
@@ -135,9 +118,9 @@
BLAS_PRESENT=yes
BLAS_LIB_DIR=$DIR
fi
-diff -ruN --exclude='*~' gildas-src-aug09c/packages/clic/lib/Makefile
gildas-src-aug09c.patched/packages/clic/lib/Makefile
---- gildas-src-aug09c/packages/clic/lib/Makefile 2008-11-14
10:52:59.000000000 +0100
-+++ gildas-src-aug09c.patched/packages/clic/lib/Makefile 2009-09-28
12:59:24.000000000 +0200
+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
@@ -55,7 +55,7 @@
# Mathematical library dependency
ifeq ($(LINEAR),lapack)
@@ -147,9 +130,9 @@
else
ifeq ($(LINEAR),nag)
LINEAR_LIB_OBJECTS = mth_nag.o
-diff -ruN --exclude='*~' gildas-src-aug09c/packages/clic07/lib/Makefile
gildas-src-aug09c.patched/packages/clic07/lib/Makefile
---- gildas-src-aug09c/packages/clic07/lib/Makefile 2009-07-10
12:17:56.000000000 +0200
-+++ gildas-src-aug09c.patched/packages/clic07/lib/Makefile 2009-09-28
12:59:49.000000000 +0200
+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
@@ -49,7 +49,7 @@
# Mathematical library dependency
ifeq ($(LINEAR),lapack)
Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- gildas.info 29 Oct 2009 16:53:00 -0000 1.30
+++ gildas.info 4 Nov 2009 14:20:05 -0000 1.31
@@ -1,12 +1,12 @@
Package: gildas
-Version: 200910
+Version: 200911
Revision: 1
Architecture: powerpc, i386
Description: Radioastronomy data analysis software
License: OSI-Approved
Maintainer: Sebastien Maret <[email protected]>
-Source: http://www.iram.fr/~gildas/dist/gildas-src-oct09a.tar.gz
-Source-MD5: 3053f277b24f0a855efea64c66b07f0b
+Source: http://www.iram.fr/~gildas/dist/gildas-src-nov09b.tar.gz
+Source-MD5: 472308c118e361794af39bbe010788d2
Depends: <<
fftw3-shlibs, gcc44-shlibs, libpng3-shlibs, lesstif-shlibs, x11
<<
@@ -14,13 +14,13 @@
cfitsio, fink (>= 0.24.12-1), fftw3, gcc44, libpng3, lesstif, sed, slatec,
x11-dev
<<
PatchFile: gildas.patch
-PatchFile-MD5: c20ad801831474bb46e4ee6f66395ca1
+PatchFile-MD5: 3f12ad46808f3ed7adafe3b112a9730b
CompileScript: <<
true
<<
InstallScript: <<
#!/bin/bash -e
- source admin/gildas-env.sh -s
/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/Current/:%p/lib:%p/include
-c gfortran -n python
+ source admin/gildas-env.sh -s
/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/Current/:%p/lib:%p/include
-c gfortran -n python -o 32bits
export gagexedir=%i/lib/gildas
install -d %i/bin %i/lib
make install
@@ -29,7 +29,7 @@
else
export arch='pc'
fi
- mv %i/lib/gildas/${arch}-darwin-gfortran-no_python
%i/lib/gildas/darwin-gfortran-no_python
+ mv %i/lib/gildas/${arch}-darwin-gfortran-32bits-no_python
%i/lib/gildas/darwin-gfortran-no_python
cd %i/lib/gildas/darwin-gfortran-no_python/bin/
for file in * ; do
ln -s %p/lib/gildas/darwin-gfortran-no_python/bin/${file} %i/bin/${file}
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
