Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28785
Modified Files:
gildas.patch gildas.info
Log Message:
New version.
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gildas.patch 11 Jul 2008 08:09:09 -0000 1.6
+++ gildas.patch 25 Dec 2008 18:06:36 -0000 1.7
@@ -1,6 +1,6 @@
-diff -ruN --exclude='*~' gildas-src-jul08a/admin/Makefile
gildas-src-jul08a.patched/admin/Makefile
---- gildas-src-jul08a/admin/Makefile 2007-12-12 11:23:47.000000000 +0100
-+++ gildas-src-jul08a.patched/admin/Makefile 2008-07-09 16:41:41.000000000
+0200
+diff -ruN --exclude='*~' gildas-src-dec08b/admin/Makefile
gildas-src-dec08b.patched/admin/Makefile
+--- gildas-src-dec08b/admin/Makefile 2007-12-12 11:23:47.000000000 +0100
++++ gildas-src-dec08b.patched/admin/Makefile 2008-12-06 00:17:24.000000000
+0100
@@ -33,31 +33,31 @@
integ: integ-message
@@ -55,21 +55,21 @@
+# @(echo)
###########################################################################
-diff -ruN --exclude='*~' gildas-src-jul08a/admin/Makefile.def
gildas-src-jul08a.patched/admin/Makefile.def
---- gildas-src-jul08a/admin/Makefile.def 2008-06-25 16:40:19.000000000
+0200
-+++ gildas-src-jul08a.patched/admin/Makefile.def 2008-07-09
16:41:41.000000000 +0200
+diff -ruN --exclude='*~' gildas-src-dec08b/admin/Makefile.def
gildas-src-dec08b.patched/admin/Makefile.def
+--- gildas-src-dec08b/admin/Makefile.def 2008-11-26 16:38:00.000000000
+0100
++++ gildas-src-dec08b.patched/admin/Makefile.def 2008-12-06
14:22:47.000000000 +0100
@@ -542,7 +542,7 @@
###########################################################################
# Kernel libraries
-LEGACY_LIBS = -lslatec -llapack -lblas
-+LEGACY_LIBS = $(prefix)/$(GAG_EXEC_SYSTEM)/lib/libslatec.a
$(prefix)/$(GAG_EXEC_SYSTEM)/lib/liblapack.a
$(prefix)/$(GAG_EXEC_SYSTEM)/lib/libblas.a
++LEGACY_LIBS = -lslatec -llapack -lf77blas
GAG_LIBS = -lggui -lgcore -lgwcs -lgio -lgsys -lginc
GUI_LIBS =
-diff -ruN --exclude='*~' gildas-src-jul08a/admin/define-system.sh
gildas-src-jul08a.patched/admin/define-system.sh
---- gildas-src-jul08a/admin/define-system.sh 2008-06-17 16:28:12.000000000
+0200
-+++ gildas-src-jul08a.patched/admin/define-system.sh 2008-07-09
16:54:07.000000000 +0200
+diff -ruN --exclude='*~' gildas-src-dec08b/admin/define-system.sh
gildas-src-dec08b.patched/admin/define-system.sh
+--- gildas-src-dec08b/admin/define-system.sh 2008-11-25 16:50:43.000000000
+0100
++++ gildas-src-dec08b.patched/admin/define-system.sh 2008-12-06
00:17:24.000000000 +0100
@@ -211,11 +211,11 @@
DEFAULT_COMPILER=g95
fi
@@ -86,29 +86,10 @@
if which ifort > /dev/null 2>&1; then
DEFAULT_COMPILER=ifort
else
-@@ -264,14 +264,14 @@
- defsys_message "gfortran version $GFORTRAN_VERSION is experimental."
- defsys_message "Gildas may or may not compile, depending on the
release date of your gfortran"
- defsys_message "Use at your own risk. We advise you to use g95
instead."
-- defsys_message "Type <RETURN> to continue, <CTRL-C> to abort."
-- read
-+ #defsys_message "Type <RETURN> to continue, <CTRL-C> to abort."
-+ #read
- else
- defsys_message "We do not have (yet) validated gfortran version
$GFORTRAN_VERSION"
- defsys_message "You may encounter explicit or even silent
(undetectable) errors."
- defsys_message "Use at your own risk. We advise you to use g95
instead."
-- defsys_message "Type <RETURN> to continue, <CTRL-C> to abort."
-- read
-+ #defsys_message "Type <RETURN> to continue, <CTRL-C> to abort."
-+ #read
- fi
- fi
- #
-diff -ruN --exclude='*~' gildas-src-jul08a/admin/gildas-env.sh
gildas-src-jul08a.patched/admin/gildas-env.sh
---- gildas-src-jul08a/admin/gildas-env.sh 2008-06-16 15:13:18.000000000
+0200
-+++ gildas-src-jul08a.patched/admin/gildas-env.sh 2008-07-09
16:41:41.000000000 +0200
-@@ -442,11 +442,11 @@
+diff -ruN --exclude='*~' gildas-src-dec08b/admin/gildas-env.sh
gildas-src-dec08b.patched/admin/gildas-env.sh
+--- gildas-src-dec08b/admin/gildas-env.sh 2008-11-06 14:21:29.000000000
+0100
++++ gildas-src-dec08b.patched/admin/gildas-env.sh 2008-12-06
14:17:20.000000000 +0100
+@@ -462,11 +462,11 @@
INC_PATH=`echo $LIB_PATH | sed -e "s&lib&include&g"`
#
# Library locations under 64 bits linux
@@ -125,26 +106,16 @@
#
OLDIFS=$IFS
IFS=:
-@@ -494,14 +494,14 @@
- NEWATM_PRESENT=yes
+@@ -515,10 +515,10 @@
NEWATM_LIB_DIR=$DIR
fi
-- if file_present "liblapack." "${DIR}"; then
+ if file_present "liblapack." "${DIR}"; then
- LAPACK_PRESENT=yes
-- LAPACK_LIB_DIR=$DIR
-- fi
++ LAPACK_PRESENT=yes
+ LAPACK_LIB_DIR=$DIR
+ fi
- if file_present "libblas." "${DIR}"; then
-- BLAS_PRESENT=yes
-- BLAS_LIB_DIR=$DIR
-- fi
-+ #if file_present "liblapack." "${DIR}"; then
-+ # LAPACK_PRESENT=yes
-+ # LAPACK_LIB_DIR=$DIR
-+ #fi
-+ #if file_present "libblas." "${DIR}"; then
-+ # BLAS_PRESENT=yes
-+ # BLAS_LIB_DIR=$DIR
-+ #fi
- if file_present "libslatec." "${DIR}"; then
- SLATEC_PRESENT=yes
- SLATEC_LIB_DIR=$DIR
++ if file_present "libf77blas." "${DIR}"; then
+ BLAS_PRESENT=yes
+ BLAS_LIB_DIR=$DIR
+ fi
Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gildas.info 3 Dec 2008 20:17:01 -0000 1.20
+++ gildas.info 25 Dec 2008 18:06:36 -0000 1.21
@@ -1,16 +1,16 @@
Package: gildas
-Version: 200811
-Revision: 1
+Version: 200812
+Revision: 2
Description: Radioastronomy data analysis software
License: OSI-Approved
Maintainer: Sebastien Maret <[email protected]>
-Source: http://www.iram.fr/~gildas/dist/gildas-src-nov08b.tar.gz
-Source-MD5: 7544edfa63050a7556b07ed134b83a26
+Source: http://www.iram.fr/~gildas/dist/gildas-src-dec08b.tar.gz
+Source-MD5: 1add83cfdb129347adf878c04b54fdba
Depends: <<
- fftw3-shlibs, gcc43-shlibs, libpng3-shlibs, lesstif-shlibs, x11
+ atlas-shlibs, fftw3-shlibs, gcc43-shlibs, libpng3-shlibs, lesstif-shlibs, x11
<<
BuildDepends: <<
- cfitsio, fftw3, gcc43, libpng3, lesstif, sed, x11-dev
+ atlas, cfitsio, fftw3, gcc43, libpng3, lesstif, sed, slatec, x11-dev
<<
Patch: gildas.patch
CompileScript: <<
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs