Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7826
Modified Files:
gildas.info gildas.patch
Log Message:
New version. Also fixes a build error with XCode 5. See:
http://sourceforge.net/mailarchive/message.php?msg_id=31483834
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gildas.patch 10 Jun 2013 09:46:28 -0000 1.17
+++ gildas.patch 4 Oct 2013 15:01:46 -0000 1.18
@@ -1,6 +1,6 @@
-diff -ruN gildas-src-jun13a/admin/Makefile
gildas-src-jun13a.patched/admin/Makefile
---- gildas-src-jun13a/admin/Makefile 2012-06-27 15:22:50.000000000 +0200
-+++ gildas-src-jun13a.patched/admin/Makefile 2013-06-10 10:34:30.000000000
+0200
+diff -ruN --exclude='*~' --exclude='*.orig' gildas-src-oct13c/admin/Makefile
gildas-src-oct13c.patched/admin/Makefile
+--- gildas-src-oct13c/admin/Makefile 2012-06-27 15:22:50.000000000 +0200
++++ gildas-src-oct13c.patched/admin/Makefile 2013-10-04 11:12:27.000000000
+0200
@@ -27,31 +27,31 @@
integ: integ-message
@@ -55,9 +55,9 @@
+# @(echo)
###########################################################################
-diff -ruN gildas-src-jun13a/admin/Makefile.build
gildas-src-jun13a.patched/admin/Makefile.build
---- gildas-src-jun13a/admin/Makefile.build 2013-05-16 17:10:54.000000000
+0200
-+++ gildas-src-jun13a.patched/admin/Makefile.build 2013-06-10
10:34:30.000000000 +0200
+diff -ruN --exclude='*~' --exclude='*.orig'
gildas-src-oct13c/admin/Makefile.build
gildas-src-oct13c.patched/admin/Makefile.build
+--- gildas-src-oct13c/admin/Makefile.build 2013-05-16 17:10:54.000000000
+0200
++++ gildas-src-oct13c.patched/admin/Makefile.build 2013-10-04
11:12:27.000000000 +0200
@@ -368,6 +368,10 @@
-lm:
@@ -69,9 +69,18 @@
# Required by ASDM libs:
-lstdc++:
-diff -ruN gildas-src-jun13a/admin/Makefile.def
gildas-src-jun13a.patched/admin/Makefile.def
---- gildas-src-jun13a/admin/Makefile.def 2013-05-28 17:26:05.000000000
+0200
-+++ gildas-src-jun13a.patched/admin/Makefile.def 2013-06-10
10:34:30.000000000 +0200
+diff -ruN --exclude='*~' --exclude='*.orig'
gildas-src-oct13c/admin/Makefile.def
gildas-src-oct13c.patched/admin/Makefile.def
+--- gildas-src-oct13c/admin/Makefile.def 2013-05-28 17:26:05.000000000
+0200
++++ gildas-src-oct13c.patched/admin/Makefile.def 2013-10-04
11:14:58.000000000 +0200
+@@ -234,7 +234,7 @@
+ # Fortran preprocessing
+
+ # Preprocessor command
+-CPP = cpp
++CPP = cpp-4
+ ifeq ($(GAG_OS_KIND),solaris)
+ CPP = /usr/ccs/lib/cpp
+ endif
@@ -312,8 +312,8 @@
# C compilation
@@ -107,9 +116,9 @@
_GAG_LIBS = -lggui -lgcore -lgio -lgwcs -lgmath -lgsys -lginc
ifndef GAG_WIN32
GAG_LIBS = $(_GAG_LIBS)
-diff -ruN gildas-src-jun13a/admin/Makefile.python
gildas-src-jun13a.patched/admin/Makefile.python
---- gildas-src-jun13a/admin/Makefile.python 2011-02-08 15:40:52.000000000
+0100
-+++ gildas-src-jun13a.patched/admin/Makefile.python 2013-06-10
10:34:30.000000000 +0200
+diff -ruN --exclude='*~' --exclude='*.orig'
gildas-src-oct13c/admin/Makefile.python
gildas-src-oct13c.patched/admin/Makefile.python
+--- gildas-src-oct13c/admin/Makefile.python 2011-02-08 15:40:52.000000000
+0100
++++ gildas-src-oct13c.patched/admin/Makefile.python 2013-10-04
11:12:27.000000000 +0200
@@ -41,7 +41,7 @@
ifneq ($(MOD_IDENTITY),)
@@ -119,9 +128,9 @@
$(MV) $(builddir)/*.$(SO_EXT) $(pythondir)
$(builddir)/setup.py: setup.py.src Makefile
-diff -ruN gildas-src-jun13a/admin/gildas-env.sh
gildas-src-jun13a.patched/admin/gildas-env.sh
---- gildas-src-jun13a/admin/gildas-env.sh 2013-05-30 15:17:40.000000000
+0200
-+++ gildas-src-jun13a.patched/admin/gildas-env.sh 2013-06-10
10:37:52.000000000 +0200
+diff -ruN --exclude='*~' --exclude='*.orig'
gildas-src-oct13c/admin/gildas-env.sh
gildas-src-oct13c.patched/admin/gildas-env.sh
+--- gildas-src-oct13c/admin/gildas-env.sh 2013-05-30 15:17:40.000000000
+0200
++++ gildas-src-oct13c.patched/admin/gildas-env.sh 2013-10-04
11:12:27.000000000 +0200
@@ -422,7 +422,7 @@
if [ "$GAG_OS_KIND" = "cygwin" ]; then
gagenv_message "ATM 2009 is not supported under cygwin"
@@ -210,10 +219,10 @@
#
if [ "$X11_INC" = "yes" ]; then
gagenv_message "Found X11 header in $X11_INC_DIR"
-diff -ruN gildas-src-jun13a/packages/clic/lib/Makefile
gildas-src-jun13a.patched/packages/clic/lib/Makefile
---- gildas-src-jun13a/packages/clic/lib/Makefile 2012-10-18
11:16:23.000000000 +0200
-+++ gildas-src-jun13a.patched/packages/clic/lib/Makefile 2013-06-10
10:34:30.000000000 +0200
-@@ -61,7 +61,7 @@
+diff -ruN --exclude='*~' --exclude='*.orig'
gildas-src-oct13c/packages/clic/lib/Makefile
gildas-src-oct13c.patched/packages/clic/lib/Makefile
+--- gildas-src-oct13c/packages/clic/lib/Makefile 2013-09-13
13:43:04.000000000 +0200
++++ gildas-src-oct13c.patched/packages/clic/lib/Makefile 2013-10-04
11:12:27.000000000 +0200
+@@ -64,7 +64,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.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- gildas.info 2 Sep 2013 13:49:56 -0000 1.42
+++ gildas.info 4 Oct 2013 15:01:46 -0000 1.43
@@ -1,13 +1,13 @@
Package: gildas
-Version: 201309a
+Version: 201310c
Revision: 1
Epoch: 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-sep13a.tar.gz
-Source-MD5: c2e3c38f5c44c3abc21612532ad6172b
-SourceDirectory: gildas-src-sep13a
+Source: http://www.iram.fr/~gildas/dist/gildas-src-oct13c.tar.gz
+Source-MD5: 15e06d5496a59af55be70e73086bef03
+SourceDirectory: gildas-src-oct13c
Depends: <<
atk1-shlibs, cairo-shlibs, fftw3-shlibs, fontconfig2-shlibs,
freetype219-shlibs, gcc48-shlibs, glib2-shlibs, gtk+2-shlibs,
@@ -21,7 +21,7 @@
<<
BuildConflicts: atlas
PatchFile: gildas.patch
-PatchFile-MD5: 5a60ec305ba576b275ce99be02c0eaa6
+PatchFile-MD5: 78c0ed606d74eba5dfa54ff2cc7889cf
PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
CompileScript: <<
true
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60134791&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
