Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv21490
Modified Files:
gildas.info gildas.patch
Log Message:
New version
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gildas.patch 3 Apr 2013 14:49:46 -0000 1.14
+++ gildas.patch 25 Apr 2013 14:48:08 -0000 1.15
@@ -1,6 +1,6 @@
-diff -ruN --exclude='*~' gildas-src-feb13b/admin/Makefile
gildas-src-feb13b.patched/admin/Makefile
---- gildas-src-feb13b/admin/Makefile 2012-06-27 09:22:50.000000000 -0400
-+++ gildas-src-feb13b.patched/admin/Makefile 2013-04-03 06:11:47.000000000
-0400
+diff -ruN --exclude='*~' gildas-src-apr13a/admin/Makefile
gildas-src-apr13a.patched/admin/Makefile
+--- gildas-src-apr13a/admin/Makefile 2012-06-27 15:22:50.000000000 +0200
++++ gildas-src-apr13a.patched/admin/Makefile 2013-04-25 15:46:10.000000000
+0200
@@ -27,31 +27,31 @@
integ: integ-message
@@ -55,9 +55,9 @@
+# @(echo)
###########################################################################
-diff -ruN --exclude='*~' gildas-src-feb13b/admin/Makefile.build
gildas-src-feb13b.patched/admin/Makefile.build
---- gildas-src-feb13b/admin/Makefile.build 2013-01-25 09:20:29.000000000
-0500
-+++ gildas-src-feb13b.patched/admin/Makefile.build 2013-04-03
06:11:47.000000000 -0400
+diff -ruN --exclude='*~' gildas-src-apr13a/admin/Makefile.build
gildas-src-apr13a.patched/admin/Makefile.build
+--- gildas-src-apr13a/admin/Makefile.build 2013-01-25 15:20:29.000000000
+0100
++++ gildas-src-apr13a.patched/admin/Makefile.build 2013-04-25
15:46:10.000000000 +0200
@@ -360,6 +360,10 @@
-lm:
@@ -69,9 +69,9 @@
# Required by ASDM libs:
-lstdc++:
-diff -ruN --exclude='*~' gildas-src-feb13b/admin/Makefile.def
gildas-src-feb13b.patched/admin/Makefile.def
---- gildas-src-feb13b/admin/Makefile.def 2013-01-07 05:13:25.000000000
-0500
-+++ gildas-src-feb13b.patched/admin/Makefile.def 2013-04-03
06:11:47.000000000 -0400
+diff -ruN --exclude='*~' gildas-src-apr13a/admin/Makefile.def
gildas-src-apr13a.patched/admin/Makefile.def
+--- gildas-src-apr13a/admin/Makefile.def 2013-03-06 11:12:23.000000000
+0100
++++ gildas-src-apr13a.patched/admin/Makefile.def 2013-04-25
15:46:10.000000000 +0200
@@ -312,8 +312,8 @@
# C compilation
@@ -92,7 +92,7 @@
# Generic to GCC
GLOBAL_CFLAGS += -pipe -fPIC
OPTION_CFLAGS += -Wall
-@@ -500,12 +500,12 @@
+@@ -505,12 +505,12 @@
# Compilation in 32 bits mode
GAG_32BITS_SWITCH = "-m32"
endif
@@ -107,9 +107,9 @@
_GAG_LIBS = -lggui -lgcore -lgio -lgwcs -lgmath -lgsys -lginc
ifndef GAG_WIN32
GAG_LIBS = $(_GAG_LIBS)
-diff -ruN --exclude='*~' gildas-src-feb13b/admin/Makefile.python
gildas-src-feb13b.patched/admin/Makefile.python
---- gildas-src-feb13b/admin/Makefile.python 2011-02-08 09:40:52.000000000
-0500
-+++ gildas-src-feb13b.patched/admin/Makefile.python 2013-04-03
06:11:47.000000000 -0400
+diff -ruN --exclude='*~' gildas-src-apr13a/admin/Makefile.python
gildas-src-apr13a.patched/admin/Makefile.python
+--- gildas-src-apr13a/admin/Makefile.python 2011-02-08 15:40:52.000000000
+0100
++++ gildas-src-apr13a.patched/admin/Makefile.python 2013-04-25
15:46:10.000000000 +0200
@@ -41,7 +41,7 @@
ifneq ($(MOD_IDENTITY),)
@@ -119,9 +119,9 @@
$(MV) $(builddir)/*.$(SO_EXT) $(pythondir)
$(builddir)/setup.py: setup.py.src Makefile
-diff -ruN --exclude='*~' gildas-src-feb13b/admin/gildas-env.sh
gildas-src-feb13b.patched/admin/gildas-env.sh
---- gildas-src-feb13b/admin/gildas-env.sh 2013-04-03 06:23:27.000000000
-0400
-+++ gildas-src-feb13b.patched/admin/gildas-env.sh 2013-04-03
06:23:19.000000000 -0400
+diff -ruN --exclude='*~' gildas-src-apr13a/admin/gildas-env.sh
gildas-src-apr13a.patched/admin/gildas-env.sh
+--- gildas-src-apr13a/admin/gildas-env.sh 2013-03-06 11:17:37.000000000
+0100
++++ gildas-src-apr13a.patched/admin/gildas-env.sh 2013-04-25
15:46:10.000000000 +0200
@@ -422,7 +422,7 @@
if [ "$GAG_OS_KIND" = "cygwin" ]; then
gagenv_message "ATM 2009 is not supported under cygwin"
@@ -131,7 +131,7 @@
ATM2009_PRESENT=yes
else
gagenv_message "g++ not found in your \$PATH"
-@@ -439,32 +439,33 @@
+@@ -439,34 +439,34 @@
NUMPY_PRESENT=no
NUMERIC_PRESENT=no
SQLITE3_PRESENT=no
@@ -147,11 +147,12 @@
# does exactly the same, so this should be consistent
- PYTHON_INC_DIR=`python -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('INCLUDEPY')"`
+ PYTHON_INC_DIR=`python2.7 -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('INCLUDEPY')"`
- PYTHON_INC=yes
+ if [ -e "$PYTHON_INC_DIR/Python.h" ]; then PYTHON_INC=yes; else
PYTHON_INC=no; fi
- PYTHON_LIB_DIR=`python -c "import distutils.sysconfig; print
distutils.sysconfig.get_config_var('LIBDIR')"`
-+ #PYTHON_LIB_DIR=`python2.7 -c "import distutils.sysconfig;
print distutils.sysconfig.get_config_var('LIBDIR')"`
-+ PYTHON_LIB_DIR=@PREFIX@/lib/python2.7/config/
- PYTHON_LIB=yes
++ PYTHON_LIB_DIR=@PREFIX@/lib/python2.7/config/
+ PYTHON_LIB=yes # libpython name on the various supported
systems is just
+ # unpredictible. Can not check in advance if
the linker will
+ # find it or not.
#
# Now search for Numpy or Numeric
- if python -c "import numpy" > /dev/null 2>&1; then
@@ -174,7 +175,7 @@
SQLITE3_PRESENT=yes
fi
fi
-@@ -474,9 +475,9 @@
+@@ -476,9 +476,9 @@
fi
#
# Default library locations linux (32 or 64 bits: no general rule)
@@ -186,7 +187,7 @@
fi
#
# Header locations under 32/64 bits linux. Add user's $GAG_SEARCH_PATH.
-@@ -542,11 +543,11 @@
+@@ -544,11 +544,11 @@
ATM2003_PRESENT=yes
ATM2003_LIB_DIR=$DIR
fi
@@ -200,7 +201,7 @@
BLAS_PRESENT=yes
BLAS_LIB_DIR=$DIR
fi
-@@ -604,6 +605,8 @@
+@@ -606,6 +606,8 @@
XML_PRESENT="yes"
#
unset GAG_LIB_DEP_PATH GAG_INC_DEP_PATH
@@ -209,9 +210,21 @@
#
if [ "$X11_INC" = "yes" ]; then
gagenv_message "Found X11 header in $X11_INC_DIR"
-diff -ruN --exclude='*~' gildas-src-feb13b/packages/clic/lib/Makefile
gildas-src-feb13b.patched/packages/clic/lib/Makefile
---- gildas-src-feb13b/packages/clic/lib/Makefile 2012-10-18
05:16:23.000000000 -0400
-+++ gildas-src-feb13b.patched/packages/clic/lib/Makefile 2013-04-03
06:11:47.000000000 -0400
+diff -ruN --exclude='*~'
gildas-src-apr13a/packages/class/filler/python/Makefile
gildas-src-apr13a.patched/packages/class/filler/python/Makefile
+--- gildas-src-apr13a/packages/class/filler/python/Makefile 2013-02-26
10:34:10.000000000 +0100
++++ gildas-src-apr13a.patched/packages/class/filler/python/Makefile
2013-04-25 15:46:59.000000000 +0200
+@@ -17,7 +17,7 @@
+
+ MOD_SOURCES = file.c module.c observation-c.c setter-c.c
+
+-MOD_DEPENDS = -lclassfiller
++MOD_DEPENDS = -lclassfiller -lclass
+
+ MOD_LIB_DIRS = $(PYTHON_LIB_DEP_PATH)
+
+diff -ruN --exclude='*~' gildas-src-apr13a/packages/clic/lib/Makefile
gildas-src-apr13a.patched/packages/clic/lib/Makefile
+--- gildas-src-apr13a/packages/clic/lib/Makefile 2012-10-18
11:16:23.000000000 +0200
++++ gildas-src-apr13a.patched/packages/clic/lib/Makefile 2013-04-25
15:46:10.000000000 +0200
@@ -61,7 +61,7 @@
# Mathematical library dependency
ifeq ($(LINEAR),lapack)
@@ -221,15 +234,3 @@
else
ifeq ($(LINEAR),nag)
LINEAR_LIB_OBJECTS = mth_nag.o
-diff -ruN --exclude='*~' gildas-src-feb13b/packages/clic07/lib/Makefile
gildas-src-feb13b.patched/packages/clic07/lib/Makefile
---- gildas-src-feb13b/packages/clic07/lib/Makefile 2012-06-27
09:23:02.000000000 -0400
-+++ gildas-src-feb13b.patched/packages/clic07/lib/Makefile 2013-04-03
06:11:47.000000000 -0400
-@@ -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
Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- gildas.info 10 Apr 2013 11:59:10 -0000 1.36
+++ gildas.info 25 Apr 2013 14:48:08 -0000 1.37
@@ -1,12 +1,12 @@
Package: gildas
-Version: 201302b
-Revision: 3
+Version: 201304a
+Revision: 1
Description: Radioastronomy data analysis software
License: OSI-Approved
Maintainer: Sebastien Maret <bma...@users.sourceforge.net>
-Source: http://www.iram.fr/~gildas/dist/gildas-src-feb13b.tar.gz
-Source-MD5: 8b3037ca37788bfbc9d0e48ecf53a465
-SourceDirectory: gildas-src-feb13b
+Source: http://www.iram.fr/~gildas/dist/gildas-src-apr13a.tar.gz
+Source-MD5: a175af3e6feb645ee8bbc1bbbb37e288
+SourceDirectory: gildas-src-apr13a
Depends: <<
atk1-shlibs, cairo-shlibs, fftw3-shlibs, fontconfig2-shlibs,
freetype219-shlibs, gcc48-shlibs, glib2-shlibs, gtk+2-shlibs,
@@ -20,7 +20,7 @@
<<
BuildConflicts: atlas
PatchFile: gildas.patch
-PatchFile-MD5: 7245b82c0a77a1328bdbd8f53287d076
+PatchFile-MD5: 0a932517a39e7d146820d932a000e893
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
CompileScript: <<
true
------------------------------------------------------------------------------
Try New Relic Now & We'll Send You this Cool Shirt
New Relic is the only SaaS-based application performance monitoring service
that delivers powerful full stack analytics. Optimize and monitor your
browser, app, & servers with just a few lines of code. Try New Relic
and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_apr
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
