Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv18218
Modified Files:
gildas.info gildas.patch
Log Message:
Move to stable
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gildas.patch 17 Sep 2010 10:30:04 -0000 1.9
+++ gildas.patch 9 Dec 2010 16:09:16 -0000 1.10
@@ -1,6 +1,6 @@
-diff -ruN --exclude='*~' gildas-src-aug10a/admin/Makefile
gildas-src-aug10a.patched/admin/Makefile
---- gildas-src-aug10a/admin/Makefile 2007-12-12 11:23:47.000000000 +0100
-+++ gildas-src-aug10a.patched/admin/Makefile 2010-08-25 17:12:33.000000000
+0200
+diff -ruN --exclude='*~' gildas-src-dec10a/admin/Makefile
gildas-src-dec10a.patched/admin/Makefile
+--- gildas-src-dec10a/admin/Makefile 2007-12-12 11:23:47.000000000 +0100
++++ gildas-src-dec10a.patched/admin/Makefile 2010-12-01 11:59:00.000000000
+0100
@@ -33,31 +33,31 @@
integ: integ-message
@@ -55,9 +55,9 @@
+# @(echo)
###########################################################################
-diff -ruN --exclude='*~' gildas-src-aug10a/admin/Makefile.build
gildas-src-aug10a.patched/admin/Makefile.build
---- gildas-src-aug10a/admin/Makefile.build 2009-11-27 10:05:06.000000000
+0100
-+++ gildas-src-aug10a.patched/admin/Makefile.build 2010-08-25
17:12:33.000000000 +0200
+diff -ruN --exclude='*~' gildas-src-dec10a/admin/Makefile.build
gildas-src-dec10a.patched/admin/Makefile.build
+--- gildas-src-dec10a/admin/Makefile.build 2010-11-17 14:00:11.000000000
+0100
++++ gildas-src-dec10a.patched/admin/Makefile.build 2010-12-01
11:59:00.000000000 +0100
@@ -313,6 +313,10 @@
-lm:
@@ -69,10 +69,10 @@
# Required by ASDM libs:
-lstdc++:
-diff -ruN --exclude='*~' gildas-src-aug10a/admin/Makefile.def
gildas-src-aug10a.patched/admin/Makefile.def
---- gildas-src-aug10a/admin/Makefile.def 2010-07-13 09:46:23.000000000
+0200
-+++ gildas-src-aug10a.patched/admin/Makefile.def 2010-08-25
17:12:33.000000000 +0200
-@@ -567,7 +567,7 @@
+diff -ruN --exclude='*~' gildas-src-dec10a/admin/Makefile.def
gildas-src-dec10a.patched/admin/Makefile.def
+--- gildas-src-dec10a/admin/Makefile.def 2010-11-24 10:55:50.000000000
+0100
++++ gildas-src-dec10a.patched/admin/Makefile.def 2010-12-01
11:59:00.000000000 +0100
+@@ -606,7 +606,7 @@
###########################################################################
# Kernel libraries
@@ -81,78 +81,81 @@
GAG_LIBS = -lggui -lgcore -lgwcs -lgio -lgmath -lgsys -lginc
ifeq ($(GAG_USE_XML),yes)
-diff -ruN --exclude='*~' gildas-src-aug10a/admin/define-system.sh
gildas-src-aug10a.patched/admin/define-system.sh
---- gildas-src-aug10a/admin/define-system.sh 2010-07-12 17:00:21.000000000
+0200
-+++ gildas-src-aug10a.patched/admin/define-system.sh 2010-08-25
17:12:33.000000000 +0200
+diff -ruN --exclude='*~' gildas-src-dec10a/admin/define-system.sh
gildas-src-dec10a.patched/admin/define-system.sh
+--- gildas-src-dec10a/admin/define-system.sh 2010-11-18 09:22:18.000000000
+0100
++++ gildas-src-dec10a.patched/admin/define-system.sh 2010-12-01
12:15:03.000000000 +0100
@@ -209,12 +209,12 @@
- else
- GAG_MACHINE=pc
- fi
-- if which ifort > /dev/null 2>&1; then
-- DEFAULT_COMPILER=ifort
-- 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
-+# 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-aug10a/admin/gildas-env.sh
gildas-src-aug10a.patched/admin/gildas-env.sh
---- gildas-src-aug10a/admin/gildas-env.sh 2010-07-23 16:50:31.000000000
+0200
-+++ gildas-src-aug10a.patched/admin/gildas-env.sh 2010-08-25
17:14:27.000000000 +0200
-@@ -449,21 +449,21 @@
- NUMPY_PRESENT=no
- NUMERIC_PRESENT=no
- SQLITE3_PRESENT=no
-- if \which python > /dev/null 2>&1; then
-+ if \which python2.6 > /dev/null 2>&1; then
- # Check the version of python the user is currently using
- # (There may be a portability problem with the use of awk)
-- if python -V 2>&1 > /dev/null 2>&1; then
-- if python -V 2>&1 | awk '{printf "%.3s", $2}' > /dev/null 2>&1;
then
-- PY_VERS=`python -V 2>&1 | awk '{printf "%.3s", $2}'`
-+ if python2.6 -V 2>&1 > /dev/null 2>&1; then
-+ if python2.6 -V 2>&1 | awk '{printf "%.3s", $2}' > /dev/null
2>&1; then
-+ PY_VERS=`python2.6 -V 2>&1 | awk '{printf "%.3s", $2}'`
- #
- # Now search for Numpy or Numeric
-- if python -c "import numpy" > /dev/null 2>&1; then
-+ if python2.6 -c "import numpy" > /dev/null 2>&1; then
- NUMPY_PRESENT=yes
-- elif python -c "import Numeric"> /dev/null 2>&1; then
-+ elif python2.6 -c "import Numeric"> /dev/null 2>&1; then
- NUMERIC_PRESENT=yes
- fi
- # Search for sqlite3
-- if python -c "import sqlite3" > /dev/null 2>&1; then
-+ if python2.6 -c "import sqlite3" > /dev/null 2>&1; then
- SQLITE3_PRESENT=yes
- fi
- fi
-@@ -535,11 +535,11 @@
- NEWATM_PRESENT=yes
- NEWATM_LIB_DIR=$DIR
- fi
-- if file_present "liblapack." "${DIR}"; then
-- LAPACK_PRESENT=yes
-+ if file_present "libLAPACK." "${DIR}"; then
-+ LAPACK_PRESENT=yes
- LAPACK_LIB_DIR=$DIR
- fi
-- if file_present "libblas." "${DIR}"; then
-+ if file_present "libBLAS." "${DIR}"; then
- BLAS_PRESENT=yes
- BLAS_LIB_DIR=$DIR
- fi
-diff -ruN --exclude='*~' gildas-src-aug10a/packages/clic/lib/Makefile
gildas-src-aug10a.patched/packages/clic/lib/Makefile
---- gildas-src-aug10a/packages/clic/lib/Makefile 2010-05-25
06:26:45.000000000 +0200
-+++ gildas-src-aug10a.patched/packages/clic/lib/Makefile 2010-08-25
17:12:33.000000000 +0200
+ else
+ GAG_MACHINE=pc
+ fi
+- if which ifort > /dev/null 2>&1; then
+- DEFAULT_COMPILER=ifort
+- 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
++# 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-dec10a/admin/gildas-env.sh
gildas-src-dec10a.patched/admin/gildas-env.sh
+--- gildas-src-dec10a/admin/gildas-env.sh 2010-11-26 11:25:20.000000000
+0100
++++ gildas-src-dec10a.patched/admin/gildas-env.sh 2010-12-01
12:25:32.000000000 +0100
+@@ -462,25 +462,25 @@
+ NUMPY_PRESENT=no
+ NUMERIC_PRESENT=no
+ SQLITE3_PRESENT=no
+- if \which python > /dev/null 2>&1; then
++ if \which python2.6 > /dev/null 2>&1; then
+ # Check the version of python the user is currently using
+- if python -V 2>&1 > /dev/null 2>&1; then
+- PY_VERS=`python -V 2>&1 | cut -d' ' -f2 | sed
"s%\([0-9]\.[0-9][0-9]*\).*%\1%"`
++ if python2.6 -V 2>&1 > /dev/null 2>&1; then
++ PY_VERS=`python2.6 -V 2>&1 | cut -d' ' -f2 | sed
"s%\([0-9]\.[0-9][0-9]*\).*%\1%"`
+ #
+ # Now search for Numpy or Numeric
+- if python -c "import numpy" > /dev/null 2>&1; then
++ if python2.6 -c "import numpy" > /dev/null 2>&1; then
+ NUMPY_PRESENT=yes
+- NUMPY_INC_DIR=`python -c "import numpy; print
numpy.__path__[0] + '/core/include'"`
++ NUMPY_INC_DIR=`python2.6 -c "import numpy; print
numpy.__path__[0] + '/core/include'"`
+ if [ -e "$NUMPY_INC_DIR/numpy/arrayobject.h" ]; then
+ NUMPY_INC_PRESENT=yes
+ else
+ NUMPY_INC_PRESENT=no
+ fi
+- elif python -c "import Numeric"> /dev/null 2>&1; then
++ elif python2.6 -c "import Numeric"> /dev/null 2>&1; then
+ NUMERIC_PRESENT=yes
+ fi
+ # Search for sqlite3
+- if python -c "import sqlite3" > /dev/null 2>&1; then
++ if python2.6 -c "import sqlite3" > /dev/null 2>&1; then
+ SQLITE3_PRESENT=yes
+ fi
+ fi
+@@ -551,11 +551,11 @@
+ ATM2003_PRESENT=yes
+ ATM2003_LIB_DIR=$DIR
+ fi
+- if file_present "liblapack." "${DIR}"; then
++ if file_present "libLAPACK." "${DIR}"; then
+ LAPACK_PRESENT=yes
+ LAPACK_LIB_DIR=$DIR
+ fi
+- if file_present "libblas." "${DIR}"; then
++ if file_present "libBLAS." "${DIR}"; then
+ BLAS_PRESENT=yes
+ BLAS_LIB_DIR=$DIR
+ fi
+diff -ruN --exclude='*~' gildas-src-dec10a/packages/clic/lib/Makefile
gildas-src-dec10a.patched/packages/clic/lib/Makefile
+--- gildas-src-dec10a/packages/clic/lib/Makefile 2010-11-17
14:00:11.000000000 +0100
++++ gildas-src-dec10a.patched/packages/clic/lib/Makefile 2010-12-01
11:59:00.000000000 +0100
@@ -55,7 +55,7 @@
# Mathematical library dependency
ifeq ($(LINEAR),lapack)
@@ -162,9 +165,9 @@
else
ifeq ($(LINEAR),nag)
LINEAR_LIB_OBJECTS = mth_nag.o
-diff -ruN --exclude='*~' gildas-src-aug10a/packages/clic07/lib/Makefile
gildas-src-aug10a.patched/packages/clic07/lib/Makefile
---- gildas-src-aug10a/packages/clic07/lib/Makefile 2010-05-27
14:01:58.000000000 +0200
-+++ gildas-src-aug10a.patched/packages/clic07/lib/Makefile 2010-08-25
17:12:33.000000000 +0200
+diff -ruN --exclude='*~' gildas-src-dec10a/packages/clic07/lib/Makefile
gildas-src-dec10a.patched/packages/clic07/lib/Makefile
+--- gildas-src-dec10a/packages/clic07/lib/Makefile 2010-05-27
14:01:58.000000000 +0200
++++ gildas-src-dec10a.patched/packages/clic07/lib/Makefile 2010-12-01
11:59:00.000000000 +0100
@@ -50,7 +50,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.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gildas.info 27 Oct 2010 08:26:52 -0000 1.20
+++ gildas.info 9 Dec 2010 16:09:16 -0000 1.21
@@ -1,12 +1,12 @@
Package: gildas
-Version: 201010
+Version: 201012
Revision: 1
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-oct10a.tar.gz
-Source-MD5: 7d923a050de59a15b2c21979d902fea4
+Source: http://www.iram.fr/~gildas/dist/gildas-src-dec10a.tar.gz
+Source-MD5: 0b1020167ba232c11e835f8479f23dd6
Depends: <<
fftw3-shlibs, gcc44-shlibs | gcc45-shlibs, libpng3-shlibs,
lesstif-shlibs, python26, numpy-py26, x11
@@ -16,7 +16,7 @@
lesstif, python26-shlibs, sed, slatec, x11-dev
<<
PatchFile: gildas.patch
-PatchFile-MD5: 3e2c9ad4d2011ac43ff09ab8d0aaa06b
+PatchFile-MD5: 8d05164edbe5437b14381491d91c9fab
CompileScript: <<
true
<<
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
