Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv24110
Modified Files:
gildas.info gildas.patch
Log Message:
New versionSummary:
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gildas.patch 17 Mar 2011 09:23:58 -0000 1.11
+++ gildas.patch 15 Sep 2011 12:56:04 -0000 1.12
@@ -1,6 +1,6 @@
-diff -ruN --exclude='*~' gildas-src-dec10c/admin/Makefile
gildas-src-dec10c.patched/admin/Makefile
---- gildas-src-dec10c/admin/Makefile 2007-12-12 11:23:47.000000000 +0100
-+++ gildas-src-dec10c.patched/admin/Makefile 2011-03-16 16:16:18.000000000
+0100
+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
@@ -55,9 +55,9 @@
+# @(echo)
###########################################################################
-diff -ruN --exclude='*~' gildas-src-dec10c/admin/Makefile.build
gildas-src-dec10c.patched/admin/Makefile.build
---- gildas-src-dec10c/admin/Makefile.build 2010-11-17 14:00:11.000000000
+0100
-+++ gildas-src-dec10c.patched/admin/Makefile.build 2011-03-16
16:16:18.000000000 +0100
+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:
@@ -69,86 +69,116 @@
# Required by ASDM libs:
-lstdc++:
-diff -ruN --exclude='*~' gildas-src-dec10c/admin/Makefile.def
gildas-src-dec10c.patched/admin/Makefile.def
---- gildas-src-dec10c/admin/Makefile.def 2010-11-24 10:55:50.000000000
+0100
-+++ gildas-src-dec10c.patched/admin/Makefile.def 2011-03-16
16:17:28.000000000 +0100
-@@ -606,7 +606,7 @@
+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 -lgwcs -lgio -lgmath -lgsys -lginc
+ _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),)
- ifeq ($(GAG_USE_XML),yes)
-@@ -683,7 +683,7 @@
- # the following commented one.
- #MOTIF_LIBS = -lXm -lXt -lX11 -lXp -lXext -lSM -lICE
- MOTIF_LIBS = -lXm -lXt
--XFORMS_LIBS = -lforms -lXpm
-+XFORMS_LIBS =
+ $(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)
- XML_LIBS =
- ifeq ($(GAG_OS_KIND),solaris)
-diff -ruN --exclude='*~' gildas-src-dec10c/admin/define-system.sh
gildas-src-dec10c.patched/admin/define-system.sh
---- gildas-src-dec10c/admin/define-system.sh 2010-11-18 09:22:18.000000000
+0100
-+++ gildas-src-dec10c.patched/admin/define-system.sh 2011-03-16
16:16:18.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-dec10c/admin/gildas-env.sh
gildas-src-dec10c.patched/admin/gildas-env.sh
---- gildas-src-dec10c/admin/gildas-env.sh 2010-11-26 11:25:20.000000000
+0100
-+++ gildas-src-dec10c.patched/admin/gildas-env.sh 2011-03-16
16:16:18.000000000 +0100
-@@ -462,25 +462,25 @@
+ $(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.6 > /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.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%"`
++ 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.6 -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.6 -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.6 -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.6 -c "import sqlite3" > /dev/null 2>&1; then
++ if python2.7 -c "import sqlite3" > /dev/null 2>&1; then
SQLITE3_PRESENT=yes
fi
fi
-@@ -551,11 +551,11 @@
+@@ -541,11 +541,11 @@
ATM2003_PRESENT=yes
ATM2003_LIB_DIR=$DIR
fi
@@ -162,10 +192,10 @@
BLAS_PRESENT=yes
BLAS_LIB_DIR=$DIR
fi
-diff -ruN --exclude='*~' gildas-src-dec10c/packages/clic/lib/Makefile
gildas-src-dec10c.patched/packages/clic/lib/Makefile
---- gildas-src-dec10c/packages/clic/lib/Makefile 2010-11-17
14:00:11.000000000 +0100
-+++ gildas-src-dec10c.patched/packages/clic/lib/Makefile 2011-03-16
16:16:18.000000000 +0100
-@@ -55,7 +55,7 @@
+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
@@ -174,10 +204,10 @@
else
ifeq ($(LINEAR),nag)
LINEAR_LIB_OBJECTS = mth_nag.o
-diff -ruN --exclude='*~' gildas-src-dec10c/packages/clic07/lib/Makefile
gildas-src-dec10c.patched/packages/clic07/lib/Makefile
---- gildas-src-dec10c/packages/clic07/lib/Makefile 2010-05-27
14:01:58.000000000 +0200
-+++ gildas-src-dec10c.patched/packages/clic07/lib/Makefile 2011-03-16
16:16:18.000000000 +0100
-@@ -50,7 +50,7 @@
+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
Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gildas.info 2 Jun 2011 21:01:53 -0000 1.24
+++ gildas.info 15 Sep 2011 12:56:04 -0000 1.25
@@ -1,27 +1,30 @@
Package: gildas
-Version: 201012
-Revision: 3
+Version: 201104h
+Revision: 1
+Distribution: 10.5, 10.6
Architecture: powerpc, i386, x86_64
Description: Radioastronomy data analysis software
License: OSI-Approved
Maintainer: Sebastien Maret <[email protected]>
-Source: http://www.iram.fr/~gildas/dist/gildas-src-dec10c.tar.gz
-Source-MD5: c2585be517348af5645b979aaa82a7bc
+Source: http://www.iram.fr/~gildas/dist/gildas-src-apr11h.tar.gz
+Source-MD5: be470f853ac0a72963b66996c3403088
+SourceDirectory: gildas-src-apr11h
Depends: <<
- fftw3-shlibs, gcc44-shlibs | gcc45-shlibs, libpng3-shlibs,
- lesstif-shlibs, python26, numpy-py26, x11
+ fftw3-shlibs, gcc45-shlibs, libpng3-shlibs, gtk+2-shlibs,
+ python27, numpy-py27
<<
BuildDepends: <<
- cfitsio, fink (>= 0.29.5-1), fftw3, gcc44 | gcc45, libpng3,
- lesstif, python26-shlibs, sed, slatec, x11-dev
+ atk1, cfitsio, fink (>= 0.29.5-1), fftw3, fontconfig2-dev,
+ gcc45, glib2-dev, gtk+2-dev, libpng3, libgettext8-dev,
+ pango1-xft2-ft219-dev, python27-shlibs, sed, slatec
<<
PatchFile: gildas.patch
-PatchFile-MD5: a4f9ed79c72b9ca66271d0683d675bea
+PatchFile-MD5: 3d4d36127639703838937cf105bb9f89
CompileScript: <<
true
<<
InstallScript: <<
- #!/bin/bash -ev
+#!/bin/bash -ev
case %m in
"powerpc")
export arch="powerpc-darwin-gfortran" ;;
@@ -36,7 +39,7 @@
export bitflag=""
export arch="x86_64-darwin-gfortran" ;;
esac
- 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.6/config:%p/lib:%p/include
-c gfortran ${bitflag}
+ 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 ${bitflag}
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
@@ -47,18 +50,31 @@
for file in * ; do
ln -s %p/lib/gildas/darwin-gfortran/bin/${file} %i/bin/${file}
done
- cd %i/lib/gildas/darwin-gfortran/libexec/
- for file in * ; do
- ln -s %p/lib/gildas/darwin-gfortran/libexec/${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 ***"
-RuntimeVars: <<
- GAG_ROOT_DIR: %p/lib/gildas
- GAG_EXEC_SYSTEM: darwin-gfortran
- GAG_PATH: %p/lib/gildas/etc
- PYTHONPATH: %p/lib/gildas/darwin-gfortran/python
-<<
DescDetail: <<
Gildas, the "Grenoble Image and Line Data Analysis Software", is a
collection of software oriented towards radioastronomical applications
------------------------------------------------------------------------------
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
