Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv7730
Modified Files:
gildas.info gildas.patch
Log Message:
New version
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- gildas.patch 30 Jul 2011 14:01:41 -0000 1.26
+++ gildas.patch 9 Sep 2011 07:27:31 -0000 1.27
@@ -72,16 +72,6 @@
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
-@@ -259,6 +259,9 @@
- GLOBAL_CPPFLAGS += -DBITS64="bits64"
- endif
- endif
-+ifeq ($(GAG_MACHINE),powerpc)
-+ GLOBAL_CPPFLAGS += -DEEEI="eeei"
-+endif
- ifeq ($(GAG_MACHINE),alpha)
- GLOBAL_CPPFLAGS += -DIEEE="ieee" -DBITS64="bits64"
- endif
@@ -318,8 +321,8 @@
# C compilation
@@ -139,7 +129,7 @@
$(MOD_NAME): $(MOD_SOURCES) $(MOD_INCLUDES) $(MOD_EXTRAS) $(builddir)/setup.py
- python $(builddir)/setup.py build --build-base $(builddir) --build-lib
$(builddir)
-+ python2.6 $(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
@@ -160,31 +150,31 @@
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
Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- gildas.info 9 Aug 2011 13:06:21 -0000 1.58
+++ gildas.info 9 Sep 2011 07:27:31 -0000 1.59
@@ -1,26 +1,25 @@
Package: gildas
-Version: 201104g
+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-apr11g.tar.gz
-Source-MD5: e67541c2a6b3e3be9b10b9fc377fb809
-SourceDirectory: gildas-src-apr11g
+Source: http://www.iram.fr/~gildas/dist/gildas-src-apr11h.tar.gz
+Source-MD5: be470f853ac0a72963b66996c3403088
+SourceDirectory: gildas-src-apr11h
Depends: <<
- fftw3-shlibs, gcc45-shlibs (>= 4.5.2-1000), libpng3-shlibs,
- gtk+2-shlibs, python26, numpy-py26
+ fftw3-shlibs, gcc46-shlibs, libpng3-shlibs, gtk+2-shlibs,
+ python27, numpy-py27
<<
BuildDepends: <<
atk1, cfitsio, fink (>= 0.29.5-1), fftw3, fontconfig2-dev,
- gcc45 (>= 4.5.2-1000), glib2-dev, gtk+2-dev, libpng3,
- libgettext8-dev, pango1-xft2-ft219-dev, python26-shlibs,
- sed, slatec
+ gcc46, glib2-dev, gtk+2-dev, libpng3, libgettext8-dev,
+ pango1-xft2-ft219-dev, python27-shlibs, sed, slatec
<<
PatchFile: gildas.patch
-PatchFile-MD5: 7576c499f1fa5b1520d886bc68c1f1ac
+PatchFile-MD5: 3d4d36127639703838937cf105bb9f89
CompileScript: <<
true
<<
@@ -40,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
------------------------------------------------------------------------------
Why Cloud-Based Security and Archiving Make Sense
Osterman Research conducted this study that outlines how and why cloud
computing security and archiving is rapidly being adopted across the IT
space for its ease of implementation, lower cost, and increased
reliability. Learn more. http://www.accelacomm.com/jaw/sfnl/114/51425301/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
