Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv30351
Modified Files:
gildas.info gildas.patch
Log Message:
New upstream version. Also add missing dependency and fix a bug in the
profile.d scripts.
Index: gildas.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.patch,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- gildas.patch 29 Jun 2011 09:38:15 -0000 1.24
+++ gildas.patch 8 Jul 2011 10:46:46 -0000 1.25
@@ -1,6 +1,6 @@
-diff -ruN --exclude='*~' gildas-src-apr11d/admin/Makefile
gildas-src-apr11d.patched/admin/Makefile
---- gildas-src-apr11d/admin/Makefile 2007-12-12 11:23:47.000000000 +0100
-+++ gildas-src-apr11d.patched/admin/Makefile 2011-05-20 09:06:09.000000000
+0200
+diff -ruN --exclude='*~' 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-06-29 16:39:04.000000000
+0200
@@ -33,31 +33,31 @@
integ: integ-message
@@ -55,9 +55,9 @@
+# @(echo)
###########################################################################
-diff -ruN --exclude='*~' gildas-src-apr11d/admin/Makefile.build
gildas-src-apr11d.patched/admin/Makefile.build
---- gildas-src-apr11d/admin/Makefile.build 2011-02-07 11:16:34.000000000
+0100
-+++ gildas-src-apr11d.patched/admin/Makefile.build 2011-05-20
09:06:09.000000000 +0200
+diff -ruN --exclude='*~' 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-06-29
16:39:04.000000000 +0200
@@ -313,6 +313,10 @@
-lm:
@@ -69,9 +69,9 @@
# Required by ASDM libs:
-lstdc++:
-diff -ruN --exclude='*~' gildas-src-apr11d/admin/Makefile.def
gildas-src-apr11d.patched/admin/Makefile.def
---- gildas-src-apr11d/admin/Makefile.def 2011-03-09 17:06:56.000000000
+0100
-+++ gildas-src-apr11d.patched/admin/Makefile.def 2011-06-29
10:41:29.000000000 +0200
+diff -ruN --exclude='*~' 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-06-29
16:41:09.000000000 +0200
@@ -318,8 +318,8 @@
# C compilation
@@ -98,8 +98,8 @@
-ifeq ($(GAG_OS_KIND),darwin)
- ifeq ($(GAG_USE_32BITS),yes)
-- GLOBAL_CFLAGS += -arch i386
-- GLOBAL_CLDFLAGS += -arch i386
+- GLOBAL_CFLAGS += -m32
+- GLOBAL_CLDFLAGS += -m32
- endif
-endif
-
@@ -121,9 +121,9 @@
_GAG_LIBS = -lggui -lgcore -lgio -lgwcs -lgmath -lgsys -lginc
ifndef GAG_WIN32
GAG_LIBS = $(_GAG_LIBS)
-diff -ruN --exclude='*~' gildas-src-apr11d/admin/Makefile.python
gildas-src-apr11d.patched/admin/Makefile.python
---- gildas-src-apr11d/admin/Makefile.python 2011-02-08 15:40:52.000000000
+0100
-+++ gildas-src-apr11d.patched/admin/Makefile.python 2011-05-20
09:06:09.000000000 +0200
+diff -ruN --exclude='*~' 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-06-29
16:39:04.000000000 +0200
@@ -41,7 +41,7 @@
ifneq ($(MOD_IDENTITY),)
@@ -133,9 +133,9 @@
$(MV) $(builddir)/*.$(SO_EXT) $(pythondir)
$(builddir)/setup.py: setup.py.src Makefile
-diff -ruN --exclude='*~' gildas-src-apr11d/admin/gildas-env.sh
gildas-src-apr11d.patched/admin/gildas-env.sh
---- gildas-src-apr11d/admin/gildas-env.sh 2011-03-17 10:07:13.000000000
+0100
-+++ gildas-src-apr11d.patched/admin/gildas-env.sh 2011-05-25
09:26:31.000000000 +0200
+diff -ruN --exclude='*~' 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-06-29
16:39:04.000000000 +0200
@@ -438,7 +438,7 @@
if [ "$GAG_OS_KIND" = "cygwin" ]; then
gagenv_message "ATM 2009 is not supported under cygwin"
@@ -192,9 +192,9 @@
BLAS_PRESENT=yes
BLAS_LIB_DIR=$DIR
fi
-diff -ruN --exclude='*~' gildas-src-apr11d/packages/clic/lib/Makefile
gildas-src-apr11d.patched/packages/clic/lib/Makefile
---- gildas-src-apr11d/packages/clic/lib/Makefile 2011-02-02
16:58:56.000000000 +0100
-+++ gildas-src-apr11d.patched/packages/clic/lib/Makefile 2011-05-20
09:06:09.000000000 +0200
+diff -ruN --exclude='*~' 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-06-29
16:39:04.000000000 +0200
@@ -57,7 +57,7 @@
# Mathematical library dependency
ifeq ($(LINEAR),lapack)
@@ -204,9 +204,9 @@
else
ifeq ($(LINEAR),nag)
LINEAR_LIB_OBJECTS = mth_nag.o
-diff -ruN --exclude='*~' gildas-src-apr11d/packages/clic07/lib/Makefile
gildas-src-apr11d.patched/packages/clic07/lib/Makefile
---- gildas-src-apr11d/packages/clic07/lib/Makefile 2011-02-01
17:14:17.000000000 +0100
-+++ gildas-src-apr11d.patched/packages/clic07/lib/Makefile 2011-05-20
09:06:09.000000000 +0200
+diff -ruN --exclude='*~' 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-06-29
16:39:04.000000000 +0200
@@ -52,7 +52,7 @@
# Mathematical library dependency
ifeq ($(LINEAR),lapack)
Index: gildas.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gildas.info,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- gildas.info 29 Jun 2011 09:38:15 -0000 1.54
+++ gildas.info 8 Jul 2011 10:46:46 -0000 1.55
@@ -1,23 +1,25 @@
Package: gildas
-Version: 201104d
-Revision: 4
+Version: 201104f
+Revision: 1
Architecture: powerpc, i386, x86_64
Description: Radioastronomy data analysis software
License: OSI-Approved
Maintainer: Sebastien Maret <bma...@users.sourceforge.net>
-Source: http://www.iram.fr/~gildas/dist/gildas-src-apr11d.tar.gz
-Source-MD5: f52f7575c506dc22b4ee890749108f2d
-SourceDirectory: gildas-src-apr11d
+Source: http://www.iram.fr/~gildas/dist/gildas-src-apr11f.tar.gz
+Source-MD5: 72afa513d48d4fbc994fe5ecd748581e
+SourceDirectory: gildas-src-apr11f
Depends: <<
fftw3-shlibs, gcc45-shlibs (>= 4.5.2-1000), libpng3-shlibs,
gtk+2-shlibs, python26, numpy-py26
<<
BuildDepends: <<
- cfitsio, fink (>= 0.29.5-1), fftw3, gcc45 (>= 4.5.2-1000), libpng3,
- gtk+2-dev, python26-shlibs, sed, slatec
+ 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
<<
PatchFile: gildas.patch
-PatchFile-MD5: 076fa3be58eee97a812037118d4fb4e1
+PatchFile-MD5: 9ce5da59fb5fbd46784f62bc4f41a715
CompileScript: <<
true
<<
@@ -53,13 +55,21 @@
setenv GAG_PATH '%p/lib/gildas/etc'
setenv GAG_ROOT_DIR '%p/lib/gildas'
setenv GAG_EXEC_SYSTEM 'darwin-gfortran'
-prepend_path PYTHONPATH '%p/lib/gildas/darwin-gfortran/python'
+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'
-prepend_path PYTHONPATH '%p/lib/gildas/darwin-gfortran/python'
+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.*
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
