Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22663
Modified Files:
mbsystem.info mbsystem.patch
Log Message:
upgraded to mbsystem 5.0.6 (skipped 5.0.5). Now depends on GMT >= 4.0.
5.0.5 was unable to build against gmt 4.0 without ugly patches
The upstream package now has an explicit build option for fink.
Cleaned up the info file to not use a custom mirror.
Index: mbsystem.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/mbsystem.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mbsystem.info 23 Nov 2004 15:20:29 -0000 1.4
+++ mbsystem.info 21 Feb 2005 16:32:51 -0000 1.5
@@ -1,29 +1,23 @@
Package: mbsystem
-Version: 5.0.4
+Version: 5.0.6
Revision: 1
-Source: mirror:custom:MB-System.%v.tar.gz
-Source2: mirror:custom:annual.gz
+Source: ftp://ftp.ldeo.columbia.edu/pub/MB-System/MB-System.%v.tar.gz
+Source2: ftp://ftp.ldeo.columbia.edu/pub/MB-System/annual.gz
SourceRename: %n-%v.tar.gz
-CustomMirror: <<
- Primary: ftp://ftp.ldeo.columbia.edu/pub/MB-System
-<<
-Source-MD5: c092a6862dbb09e6cc26d23e9f4d771d
+Source-MD5: 0f87db651fe96ce1c9ec10cb8351af9e
Source2-MD5: d7b2f67c411c80b9e0018cfa149a64ef
-BuildDepends: gmt, lesstif, netcdf, x11-dev
-Depends: gmt, lesstif-shlibs, netcdf-shlibs, x11
+BuildDepends: gmt-dev (>=4.0), lesstif, netcdf, x11-dev
+Depends: gmt (>=4.0) , lesstif-shlibs, netcdf-shlibs, x11
PatchScript: sed 's|@FINKPREFIX@|%p|g' <%a/%n.patch | sed
's|@LIBDIR@|%b/lib|g' | patch -p1
CompileScript: <<
chmod +x install_makefiles
- ./install_makefiles
+ ./install_makefiles -P macosxfink
pwd
- echo "Remove this when GMT ranlibs its libs"
- cp %p/lib/lib{psl,gmt}.a %b/lib
- ranlib %b/lib/*.a
make all
<<
InstallScript: <<
gunzip ../annual.gz
- mkdir -p %i/share/mbsystem && mv ../annual %i/share/mbsystem
+ mkdir -p %i/share/mbsystem && mv ../annual
%i/share/mbsystem/LevitusAnnual82.dat
strip bin/*
mkdir -p %i/bin && mv bin/* %i/bin
mkdir -p %i/share && mv man %i/share
Index: mbsystem.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/mbsystem.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mbsystem.patch 21 Jun 2004 02:53:20 -0000 1.1
+++ mbsystem.patch 21 Feb 2005 16:32:54 -0000 1.2
@@ -1,44 +1,13 @@
---- mbsystem-5.0.4/install_makefiles.orig Thu Jun 10 12:05:27 2004
-+++ mbsystem-5.0.4/install_makefiles Thu Jun 10 12:12:48 2004
-@@ -367,21 +367,22 @@
- #
- # **** EDIT THE PARAMETERS HERE ****
- # Set the environment parameters:
--$MBSYSTEM_HOME = "/Users/caress/sandbox/mbsystem";
-+$MBSYSTEM_HOME = "@FINKPREFIX@";
- $OS = "DARWIN";
- $CC = "cc";
- $BYTESWAPPED = "NO";
- $GRAPHICAL = "YES";
--$MOTIFINCDIR = "/sw/include";
--$MOTIFLIBS = "-L/sw/lib -L/usr/X11R6/lib -lXm -lXt -lX11";
-+$MOTIFINCDIR = "@FINKPREFIX@/include";
-+$MOTIFLIBS = "[EMAIL PROTECTED]@/lib -L/usr/X11R6/lib -lXm -lXt -lX11";
- $OPENGLLIBS = "-lGLw -lGLU -lGL";
--$GMTVERSION = "4.0";
-+$GMTVERSION = "3.4";
--$GMTLIBDIR = "/usr/local/gmt4/lib";
--$GMTINCDIR = "/usr/local/gmt4/include";
--$NETCDFLIBDIR = "/sw/lib";
--$NETCDFINCDIR = "/sw/include";
--$LEVITUS = "$MBSYSTEM_HOME/share/LevitusAnnual82.dat";
--$PROJECTIONS = "$MBSYSTEM_HOME/share/Projections.dat";
-+# Get GMT libs from LIBDIR - FIX: remove this when fink gmt ranlibs its libs
-+$GMTLIBDIR = "@LIBDIR@";
-+$GMTINCDIR = "@FINKPREFIX@/include";
-+$NETCDFLIBDIR = "@FINKPREFIX@/lib";
-+$NETCDFINCDIR = "@FINKPREFIX@/include";
-+$LEVITUS = "$MBSYSTEM_HOME/share/mbsystem/annual";
-+$PROJECTIONS = "$MBSYSTEM_HOME/share/mbsystem/Projections.dat";
--$CFLAGS = "-g -I/usr/X11R6/include";
-+$CFLAGS = "-g -O2 -I/usr/X11R6/include";
- $LFLAGS = "-Wl -lm -bind_at_load";
- #
-@@ -657,5 +659,5 @@
- }
-
-
--die "\nAll done!\n";
--
-+#die "\nAll done!\n";
-+print "\nAll done!\n";
+--- mbsystem-5.0.6/install_makefiles.orig 2005-02-21 07:55:15.000000000
-0800
++++ mbsystem-5.0.6/install_makefiles 2005-02-21 07:39:12.000000000 -0800
+@@ -405,8 +405,8 @@
+ if ($preset eq "macosxfink")
+ {
+ print "\nUsing preset configuration for MacOs X by fink in /sw...\n";
+- $FINKPREFIX = "/sw";
+- $GMTVERSION = "3.4";
++ $FINKPREFIX = "@FINKPREFIX@";
++ $GMTVERSION = "4.0";
+ $MBSYSTEM_HOME = "$FINKPREFIX";
+ $OS = "DARWIN";
+ $CC = "cc";
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
