Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv22100
Added Files:
gildas.patch gildas.info
Log Message:
Move to stable
--- NEW FILE: gildas.patch ---
diff --exclude='*~' -ruN gildas-src-apr11f/admin/Makefile
gildas-src-apr11f.patched/admin/Makefile
--- gildas-src-apr11f/admin/Makefile 2007-12-12 11:23:47.000000000 +0100
+++ gildas-src-apr11f.patched/admin/Makefile 2011-07-29 22:39:38.000000000
+0200
@@ -33,31 +33,31 @@
integ: integ-message
integ-message:
- @(echo)
- @(echo "Compilation succeeded! Bye.")
- @(echo)
+# @(echo)
+# @(echo "Compilation succeeded! Bye.")
+# @(echo)
default-install: install-message
install-message:
- @(echo)
- @(echo
"***************************************************************************")
- @(echo "Installation succeeded!")
- @(echo)
- @(echo "bash users: You should add in your ~/.bash_profile the
following lines")
- @(echo " export GAG_ROOT_DIR=$(gagexedir)")
- @(echo " export GAG_EXEC_SYSTEM=$(GAG_EXEC_SYSTEM)")
- @(echo ' source $$GAG_ROOT_DIR/etc/bash_profile')
- @(echo)
- @(echo "csh users: You should add in your ~/.login the following
lines")
- @(echo " setenv GAG_ROOT_DIR $(gagexedir)")
- @(echo " setenv GAG_EXEC_SYSTEM $(GAG_EXEC_SYSTEM)")
- @(echo ' source $$GAG_ROOT_DIR/etc/login')
- @(echo)
- @(echo "You should then exit this xterm and open a new one to reset
your path.")
- @(echo "GILDAS should be ready for use (e.g. type greg @
gag_demo:demo).")
- @(echo "Bye.")
- @(echo
"***************************************************************************")
- @(echo)
+# @(echo)
+# @(echo
"***************************************************************************")
+# @(echo "Installation succeeded!")
+# @(echo)
+# @(echo "bash users: You should add in your ~/.bash_profile the
following lines")
+# @(echo " export GAG_ROOT_DIR=$(gagexedir)")
+# @(echo " export GAG_EXEC_SYSTEM=$(GAG_EXEC_SYSTEM)")
+# @(echo ' source $$GAG_ROOT_DIR/etc/bash_profile')
+# @(echo)
+# @(echo "csh users: You should add in your ~/.login the following
lines")
+# @(echo " setenv GAG_ROOT_DIR $(gagexedir)")
+# @(echo " setenv GAG_EXEC_SYSTEM $(GAG_EXEC_SYSTEM)")
+# @(echo ' source $$GAG_ROOT_DIR/etc/login')
+# @(echo)
+# @(echo "You should then exit this xterm and open a new one to reset
your path.")
+# @(echo "GILDAS should be ready for use (e.g. type greg @
gag_demo:demo).")
+# @(echo "Bye.")
+# @(echo
"***************************************************************************")
+# @(echo)
###########################################################################
diff --exclude='*~' -ruN gildas-src-apr11f/admin/Makefile.build
gildas-src-apr11f.patched/admin/Makefile.build
--- gildas-src-apr11f/admin/Makefile.build 2011-02-07 11:16:34.000000000
+0100
+++ gildas-src-apr11f.patched/admin/Makefile.build 2011-07-29
22:39:38.000000000 +0200
@@ -313,6 +313,10 @@
-lm:
+-lLAPACK:
+
+-lBLAS:
+
# Required by ASDM libs:
-lstdc++:
diff --exclude='*~' -ruN gildas-src-apr11f/admin/Makefile.def
gildas-src-apr11f.patched/admin/Makefile.def
--- gildas-src-apr11f/admin/Makefile.def 2011-06-29 13:30:14.000000000
+0200
+++ gildas-src-apr11f.patched/admin/Makefile.def 2011-07-29
22:40:53.000000000 +0200
@@ -318,8 +321,8 @@
# C compilation
# C compiler name
-CC = gcc
-CXX = g++
+CC = gcc-4
+CXX = g++-4
ifeq ($(GAG_OS_KIND),hpux)
CC = c89
endif
@@ -341,7 +344,7 @@
endif
# GCC flags
-ifeq ($(CC),gcc)
+ifeq ($(CC),gcc-4)
# Generic to GCC
GLOBAL_CFLAGS += -pipe -fPIC
OPTION_CFLAGS += -Wall
@@ -377,13 +380,6 @@
# OS dependent flags
GLOBAL_CFLAGS += -D$(GAG_OS_KIND) -D$(LOCAL_UPPER_OS_KIND)
-ifeq ($(GAG_OS_KIND),darwin)
- ifeq ($(GAG_USE_32BITS),yes)
- GLOBAL_CFLAGS += -m32
- GLOBAL_CLDFLAGS += -m32
- endif
-endif
-
# External library flags
ifeq ($(PNG_PRESENT),yes)
GLOBAL_CFLAGS += -DPNG
@@ -574,12 +570,12 @@
# Compilation in 32 bits mode
GAG_32BITS_SWITCH = "-m32"
endif
-STDCpp_LIB += $(shell g++ $(GAG_32BITS_SWITCH)
-print-file-name=libstdc++.$(LIB_CPP_EXT))
+STDCpp_LIB += $(shell g++-4 $(GAG_32BITS_SWITCH)
-print-file-name=libstdc++.$(LIB_CPP_EXT))
###########################################################################
# Kernel libraries
-LEGACY_LIBS = -lslatec -llapack -lblas
+LEGACY_LIBS = -lslatec -lLAPACK -lBLAS
_GAG_LIBS = -lggui -lgcore -lgio -lgwcs -lgmath -lgsys -lginc
ifndef GAG_WIN32
GAG_LIBS = $(_GAG_LIBS)
diff --exclude='*~' -ruN gildas-src-apr11f/admin/Makefile.python
gildas-src-apr11f.patched/admin/Makefile.python
--- gildas-src-apr11f/admin/Makefile.python 2011-02-08 15:40:52.000000000
+0100
+++ gildas-src-apr11f.patched/admin/Makefile.python 2011-07-29
22:39:38.000000000 +0200
@@ -41,7 +41,7 @@
ifneq ($(MOD_IDENTITY),)
$(MOD_NAME): $(MOD_SOURCES) $(MOD_INCLUDES) $(MOD_EXTRAS) $(builddir)/setup.py
- python $(builddir)/setup.py build --build-base $(builddir) --build-lib
$(builddir)
+ python2.7 $(builddir)/setup.py build --build-base $(builddir)
--build-lib $(builddir)
$(MV) $(builddir)/*.$(SO_EXT) $(pythondir)
$(builddir)/setup.py: setup.py.src Makefile
diff --exclude='*~' -ruN gildas-src-apr11f/admin/gildas-env.sh
gildas-src-apr11f.patched/admin/gildas-env.sh
--- gildas-src-apr11f/admin/gildas-env.sh 2011-06-20 11:44:09.000000000
+0200
+++ gildas-src-apr11f.patched/admin/gildas-env.sh 2011-07-29
22:39:38.000000000 +0200
@@ -438,7 +438,7 @@
if [ "$GAG_OS_KIND" = "cygwin" ]; then
gagenv_message "ATM 2009 is not supported under cygwin"
ATM2009_PRESENT=no
- elif \which g++ > /dev/null 2>&1; then
+ elif \which g++-4 > /dev/null 2>&1; then
ATM2009_PRESENT=yes
else
gagenv_message "g++ not found in your \$PATH"
@@ -452,25 +452,25 @@
NUMPY_PRESENT=no
NUMERIC_PRESENT=no
SQLITE3_PRESENT=no
- if \which python > /dev/null 2>&1; then
+ if \which python2.7 > /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.7 -V 2>&1 > /dev/null 2>&1; then
+ PY_VERS=`python2.7 -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.7 -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.7 -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.7 -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.7 -c "import sqlite3" > /dev/null 2>&1; then
SQLITE3_PRESENT=yes
fi
fi
@@ -541,11 +541,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 --exclude='*~' -ruN gildas-src-apr11f/packages/clic/lib/Makefile
gildas-src-apr11f.patched/packages/clic/lib/Makefile
--- gildas-src-apr11f/packages/clic/lib/Makefile 2011-02-02
16:58:56.000000000 +0100
+++ gildas-src-apr11f.patched/packages/clic/lib/Makefile 2011-07-29
22:39:38.000000000 +0200
@@ -57,7 +57,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 --exclude='*~' -ruN gildas-src-apr11f/packages/clic07/lib/Makefile
gildas-src-apr11f.patched/packages/clic07/lib/Makefile
--- gildas-src-apr11f/packages/clic07/lib/Makefile 2011-02-01
17:14:17.000000000 +0100
+++ gildas-src-apr11f.patched/packages/clic07/lib/Makefile 2011-07-29
22:39:38.000000000 +0200
@@ -52,7 +52,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
--- NEW FILE: gildas.info ---
Package: gildas
Version: 201104h
Revision: 1
Description: Radioastronomy data analysis software
License: OSI-Approved
Maintainer: Sebastien Maret <[email protected]>
Source: http://www.iram.fr/~gildas/dist/gildas-src-apr11h.tar.gz
Source-MD5: be470f853ac0a72963b66996c3403088
SourceDirectory: gildas-src-apr11h
Depends: <<
fftw3-shlibs, gcc46-shlibs, libpng3-shlibs, gtk+2-shlibs,
python27, numpy-py27
<<
BuildDepends: <<
atk1, cfitsio, fink (>= 0.29.5-1), fftw3, fontconfig2-dev,
gcc46, glib2-dev, gtk+2-dev, libpng3, libgettext8-dev,
pango1-xft2-ft219-dev, python27-shlibs, sed, slatec
<<
PatchFile: gildas.patch
PatchFile-MD5: 3d4d36127639703838937cf105bb9f89
CompileScript: <<
true
<<
InstallScript: <<
#!/bin/bash -ev
export arch="x86_64-darwin-gfortran" ;;
source admin/gildas-env.sh -s
/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/Current/:/usr/X11/lib:/usr/X11/include:%p/lib/python2.7/config:%p/lib:%p/include
-c gfortran
export GAG_SLDFLAGS='-install_name %p/lib/gildas/darwin-gfortran/lib/$(notdir
$@)'
export DYLD_LIBRARY_PATH=%b/integ/${arch}/lib
export gagexedir=%i/lib/gildas
install -d %i/bin %i/lib
make install
mv %i/lib/gildas/${arch} %i/lib/gildas/darwin-gfortran
cd %i/lib/gildas/darwin-gfortran/bin/
for file in * ; do
ln -s %p/lib/gildas/darwin-gfortran/bin/${file} %i/bin/${file}
done
/usr/bin/install -d %i/etc/profile.d
cat >%i/etc/profile.d/%n.csh <<EOF
setenv GAG_PATH '%p/lib/gildas/etc'
setenv GAG_ROOT_DIR '%p/lib/gildas'
setenv GAG_EXEC_SYSTEM 'darwin-gfortran'
if ( \$?PYTHONPATH ) then
prepend_path PYTHONPATH '%p/lib/gildas/darwin-gfortran/python'
else
setenv PYTHONPATH '%p/lib/gildas/darwin-gfortran/python'
endif
EOF
cat >%i/etc/profile.d/%n.sh <<EOF
export GAG_PATH='%p/lib/gildas/etc'
export GAG_ROOT_DIR='%p/lib/gildas'
export GAG_EXEC_SYSTEM='darwin-gfortran'
if [ -z "\$PYTHONPATH" ]; then
PYTHONPATH='%p/lib/gildas/darwin-gfortran/python'
else
prepend_path PYTHONPATH '%p/lib/gildas/darwin-gfortran/python'
fi
export PYTHONPATH
EOF
chmod 755 %i/etc/profile.d/gildas.*
<<
PostInstScript: echo "\n*** Installation completed. Please open a new term to
use gildas ***"
DescDetail: <<
Gildas, the "Grenoble Image and Line Data Analysis Software", is a
collection of software oriented towards radioastronomical applications
(either single-dish or interferometer). It is daily used to reduce all
data acquired with the IRAM 30m telescope and Plateau de Bure
Interferometer (PdBI).
<<
Homepage: http://www.iram.fr/IRAMFR/GILDAS/gildas.html
------------------------------------------------------------------------------
Doing More with Less: The Next Generation Virtual Desktop
What are the key obstacles that have prevented many mid-market businesses
from deploying virtual desktops? How do next-generation virtual desktops
provide companies an easier-to-deploy, easier-to-manage and more affordable
virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
