Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8200
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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gildas.patch 16 Jul 2008 03:01:48 -0000 1.1
+++ gildas.patch 29 Sep 2009 16:03:32 -0000 1.2
@@ -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-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
@@ -33,31 +33,31 @@
integ: integ-message
@@ -55,21 +55,35 @@
+# @(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
-@@ -542,7 +542,7 @@
+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
+@@ -306,6 +306,10 @@
+
+ -lm:
+
++-lLAPACK:
++
++-lBLAS:
++
+ # 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 @@
###########################################################################
# 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 -lBLAS
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
+ 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
@@ -211,11 +211,11 @@
DEFAULT_COMPILER=g95
fi
@@ -86,30 +100,11 @@
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 @@
- INC_PATH=`echo $LIB_PATH | sed -e "s&lib&include&g"`
+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
@@ -122,29 +117,45 @@
+# 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
#
- OLDIFS=$IFS
- IFS=:
-@@ -494,14 +494,14 @@
+@@ -515,11 +515,11 @@
NEWATM_PRESENT=yes
NEWATM_LIB_DIR=$DIR
fi
- if file_present "liblapack." "${DIR}"; then
- LAPACK_PRESENT=yes
-- LAPACK_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 "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 "libBLAS." "${DIR}"; then
+ 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
+@@ -55,7 +55,7 @@
+ # Mathematical library dependency
+ ifeq ($(LINEAR),lapack)
+ LINEAR_LIB_OBJECTS = singular.o mth_lapack.o
+- LINEAR_LIB_DEPENDS = -llapack -lblas
++ LINEAR_LIB_DEPENDS = -lLAPACK -lBLAS
+ 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
+@@ -49,7 +49,7 @@
+ # Mathematical library dependency
+ ifeq ($(LINEAR),lapack)
+ LINEAR_LIB_OBJECTS = singular.o mth_lapack.o
+- LINEAR_LIB_DEPENDS = -llapack -lblas
++ LINEAR_LIB_DEPENDS = -lLAPACK -lBLAS
+ else
+ ifeq ($(LINEAR),nag)
+ LINEAR_LIB_OBJECTS = mth_nag.o
Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gildas.info 26 Aug 2009 04:27:09 -0000 1.8
+++ gildas.info 29 Sep 2009 16:03:31 -0000 1.9
@@ -1,28 +1,26 @@
Package: gildas
-Version: 200808
-Revision: 2
-Architecture: i386, powerpc
-Distribution: 10.4, 10.5
+Version: 200908
+Revision: 3
+Architecture: powerpc, i386
Description: Radioastronomy data analysis software
License: OSI-Approved
Maintainer: Sebastien Maret <bma...@users.sourceforge.net>
-Source: http://www.iram.fr/~gildas/dist/gildas-src-aug08a.tar.gz
-Source-MD5: 10f04d85b913e6eb75fe4c2e0ee059c7
+Source: http://www.iram.fr/~gildas/dist/gildas-src-aug09c.tar.gz
+Source-MD5: d2cc049506ff47d0884294630a9f84f2
Depends: <<
- fftw3-shlibs, gcc43-shlibs, libpng3-shlibs, openmotif3-shlibs, x11
+ fftw3-shlibs, gcc44-shlibs, libpng3-shlibs, lesstif-shlibs, x11
<<
BuildDepends: <<
- cfitsio, fink (>= 0.24.12-1), fftw3, gcc43, libpng3, openmotif3, sed, x11-dev
+ cfitsio, fink (>= 0.24.12-1), fftw3, gcc44, libpng3, lesstif, sed, slatec,
x11-dev
<<
PatchFile: gildas.patch
-PatchFile-MD5: 5dae5cb4c406f8333972ef986b12381f
+PatchFile-MD5: c20ad801831474bb46e4ee6f66395ca1
CompileScript: <<
true
<<
InstallScript: <<
- #!/bin/bash -ev
- sed -i.bak -e "s|=\~ \"^no_\"|= \"^no_\"|" admin/gildas-env.sh
- source admin/gildas-env.sh -s %p/lib:%p/include -c gfortran -n python
+ #!/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
export gagexedir=%i/lib/gildas
install -d %i/bin %i/lib
make install
@@ -54,9 +52,4 @@
data acquired with the IRAM 30m telescope and Plateau de Bure
Interferometer (PdBI).
<<
-DescPort: <<
-Link against internal LAPACK and BLAS libraries, instead of the
-Accelerate framework or ATLAS. Python support is disabled for now
-because it does not work.
-<<
Homepage: http://www.iram.fr/IRAMFR/GILDAS/gildas.html
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
