Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv29409/10.7/main/finkinfo/sci
Modified Files: gildas.info gildas.patch Log Message: build-fixes with maintainer's consent: link fails if fink's atlas lib is installed; make sure fink's -I/-L come before X11's; avoid upstream hardcoded /sw as fink prefix; gnome dep cleanups Index: gildas.patch =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gildas.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gildas.patch 6 Aug 2012 13:10:09 -0000 1.2 +++ gildas.patch 3 Apr 2013 14:49:46 -0000 1.3 @@ -1,6 +1,6 @@ -diff -ruN --exclude='*~' gildas-src-aug12b/admin/Makefile gildas-src-aug12b.patched/admin/Makefile ---- gildas-src-aug12b/admin/Makefile 2012-06-27 15:22:50.000000000 +0200 -+++ gildas-src-aug12b.patched/admin/Makefile 2012-08-06 12:18:27.000000000 +0200 +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 @@ -27,31 +27,31 @@ integ: integ-message @@ -55,10 +55,10 @@ +# @(echo) ########################################################################### -diff -ruN --exclude='*~' gildas-src-aug12b/admin/Makefile.build gildas-src-aug12b.patched/admin/Makefile.build ---- gildas-src-aug12b/admin/Makefile.build 2012-06-27 15:22:50.000000000 +0200 -+++ gildas-src-aug12b.patched/admin/Makefile.build 2012-08-06 12:18:27.000000000 +0200 -@@ -339,6 +339,10 @@ +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 +@@ -360,6 +360,10 @@ -lm: @@ -69,9 +69,9 @@ # Required by ASDM libs: -lstdc++: -diff -ruN --exclude='*~' gildas-src-aug12b/admin/Makefile.def gildas-src-aug12b.patched/admin/Makefile.def ---- gildas-src-aug12b/admin/Makefile.def 2012-06-27 15:22:50.000000000 +0200 -+++ gildas-src-aug12b.patched/admin/Makefile.def 2012-08-06 12:22:31.000000000 +0200 +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 @@ -312,8 +312,8 @@ # C compilation @@ -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-aug12b/admin/Makefile.python gildas-src-aug12b.patched/admin/Makefile.python ---- gildas-src-aug12b/admin/Makefile.python 2011-02-08 15:40:52.000000000 +0100 -+++ gildas-src-aug12b.patched/admin/Makefile.python 2012-08-06 12:18:27.000000000 +0200 +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 @@ -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-aug12b/admin/gildas-env.sh gildas-src-aug12b.patched/admin/gildas-env.sh ---- gildas-src-aug12b/admin/gildas-env.sh 2012-07-18 10:54:54.000000000 +0200 -+++ gildas-src-aug12b.patched/admin/gildas-env.sh 2012-08-06 13:56:02.000000000 +0200 +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 @@ -422,7 +422,7 @@ if [ "$GAG_OS_KIND" = "cygwin" ]; then gagenv_message "ATM 2009 is not supported under cygwin" @@ -174,7 +174,19 @@ SQLITE3_PRESENT=yes fi fi -@@ -535,11 +536,11 @@ +@@ -474,9 +475,9 @@ + fi + # + # Default library locations linux (32 or 64 bits: no general rule) +- LIB_PATH=/usr/lib:/usr/local/lib:/usr/X11R6/lib:/usr/X11/lib ++ LIB_PATH=/usr/lib:/usr/X11R6/lib:/usr/X11/lib + if [ "$GAG_OS_KIND" = "darwin" ]; then +- LIB_PATH=/sw/lib:$LIB_PATH ++ LIB_PATH=@PREFIX@/lib:$LIB_PATH + fi + # + # Header locations under 32/64 bits linux. Add user's $GAG_SEARCH_PATH. +@@ -542,11 +543,11 @@ ATM2003_PRESENT=yes ATM2003_LIB_DIR=$DIR fi @@ -188,10 +200,19 @@ BLAS_PRESENT=yes BLAS_LIB_DIR=$DIR fi -diff -ruN --exclude='*~' gildas-src-aug12b/packages/clic/lib/Makefile gildas-src-aug12b.patched/packages/clic/lib/Makefile ---- gildas-src-aug12b/packages/clic/lib/Makefile 2012-07-19 13:46:44.000000000 +0200 -+++ gildas-src-aug12b.patched/packages/clic/lib/Makefile 2012-08-06 12:18:27.000000000 +0200 -@@ -60,7 +60,7 @@ +@@ -604,6 +605,8 @@ + XML_PRESENT="yes" + # + unset GAG_LIB_DEP_PATH GAG_INC_DEP_PATH ++ GAG_INC_DEP_PATH=$GAG_INC_DEP_PATH:@PREFIX@/include ++ GAG_LIB_DEP_PATH=$GAG_INC_DEP_PATH:@PREFIX@/lib + # + 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 +@@ -61,7 +61,7 @@ # Mathematical library dependency ifeq ($(LINEAR),lapack) LINEAR_LIB_OBJECTS = singular.o mth_lapack.o @@ -200,9 +221,9 @@ else ifeq ($(LINEAR),nag) LINEAR_LIB_OBJECTS = mth_nag.o -diff -ruN --exclude='*~' gildas-src-aug12b/packages/clic07/lib/Makefile gildas-src-aug12b.patched/packages/clic07/lib/Makefile ---- gildas-src-aug12b/packages/clic07/lib/Makefile 2012-06-27 15:23:02.000000000 +0200 -+++ gildas-src-aug12b.patched/packages/clic07/lib/Makefile 2012-08-06 12:18:27.000000000 +0200 +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) Index: gildas.info =================================================================== RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/sci/gildas.info,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- gildas.info 8 Feb 2013 12:07:10 -0000 1.12 +++ gildas.info 3 Apr 2013 14:49:46 -0000 1.13 @@ -1,6 +1,6 @@ Package: gildas Version: 201302b -Revision: 1 +Revision: 2 Description: Radioastronomy data analysis software License: OSI-Approved Maintainer: Sebastien Maret <bma...@users.sourceforge.net> @@ -8,16 +8,19 @@ Source-MD5: 8b3037ca37788bfbc9d0e48ecf53a465 SourceDirectory: gildas-src-feb13b Depends: << - fftw3-shlibs, gcc47-shlibs, libpng3-shlibs, gtk+2-shlibs, - python27, numpy-py27 + atk1-shlibs, cairo-shlibs, fftw3-shlibs, fontconfig2-shlibs, + freetype219-shlibs, gcc47-shlibs, glib2-shlibs, gtk+2-shlibs, + libpng15-shlibs, pango1-xft2-ft219-shlibs, python27, numpy-py27 << BuildDepends: << - atk1, cfitsio, fink (>= 0.29.5-1), fftw3, fontconfig2-dev, - gcc47, glib2-dev, gtk+2-dev, libpng3, libgettext8-dev, - pango1-xft2-ft219-dev, python27-shlibs, sed, slatec + atk1, cairo (>= 1.12.8-1), cfitsio, fink (>= 0.29.5-1), fftw3, + fontconfig2-dev, freetype219, gcc47, glib2-dev, gtk+2-dev, + libgettext8-dev, libpng15, pango1-xft2-ft219-dev, pkgconfig, + python27-shlibs, sed, slatec, x11-dev << +BuildConflicts: atlas PatchFile: gildas.patch -PatchFile-MD5: 29ae12b53f294ea9c64f8c8a385b9977 +PatchFile-MD5: 7245b82c0a77a1328bdbd8f53287d076 PatchScript: sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1 CompileScript: << true @@ -54,6 +57,37 @@ EOF chmod 755 %i/etc/profile.d/gildas.* << +Shlibs: << + !%p/lib/gildas/darwin-gfortran/lib/libastro.so + !%p/lib/gildas/darwin-gfortran/lib/libatm.so + !%p/lib/gildas/darwin-gfortran/lib/libatm2009.so + !%p/lib/gildas/darwin-gfortran/lib/libclass.so + !%p/lib/gildas/darwin-gfortran/lib/libclassic.so + !%p/lib/gildas/darwin-gfortran/lib/libclic.so + !%p/lib/gildas/darwin-gfortran/lib/libclic07.so + !%p/lib/gildas/darwin-gfortran/lib/libflux.so + !%p/lib/gildas/darwin-gfortran/lib/libgaussclumps.so + !%p/lib/gildas/darwin-gfortran/lib/libgchar.so + !%p/lib/gildas/darwin-gfortran/lib/libgcont.so + !%p/lib/gildas/darwin-gfortran/lib/libgcore.so + !%p/lib/gildas/darwin-gfortran/lib/libggtk.so + !%p/lib/gildas/darwin-gfortran/lib/libggui.so + !%p/lib/gildas/darwin-gfortran/lib/libginc.so + !%p/lib/gildas/darwin-gfortran/lib/libgio.so + !%p/lib/gildas/darwin-gfortran/lib/libgkernel.so + !%p/lib/gildas/darwin-gfortran/lib/libgmath.so + !%p/lib/gildas/darwin-gfortran/lib/libgreg.so + !%p/lib/gildas/darwin-gfortran/lib/libgsys.so + !%p/lib/gildas/darwin-gfortran/lib/libgtv.so + !%p/lib/gildas/darwin-gfortran/lib/libgwcs.so + !%p/lib/gildas/darwin-gfortran/lib/libmapping.so + !%p/lib/gildas/darwin-gfortran/lib/libmaptasks.so + !%p/lib/gildas/darwin-gfortran/lib/libmira.so + !%p/lib/gildas/darwin-gfortran/lib/liborbit.so + !%p/lib/gildas/darwin-gfortran/lib/libpoint.so + !%p/lib/gildas/darwin-gfortran/lib/libsic.so + !%p/lib/gildas/darwin-gfortran/lib/libtelcal.so +<< PostInstScript: echo "\n*** Installation completed. Please open a new term to use gildas ***" DescDetail: << Gildas, the "Grenoble Image and Line Data Analysis Software", is a ------------------------------------------------------------------------------ Minimize network downtime and maximize team effectiveness. Reduce network management and security costs.Learn how to hire the most talented Cisco Certified professionals. Visit the Employer Resources Portal http://www.cisco.com/web/learning/employer_resources/index.html _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs