Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv3492

Modified Files:
        gmt.info gmt.patch 
Log Message:
Newer version moved from unstable.


Index: gmt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gmt.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gmt.info    22 Nov 2006 16:44:44 -0000      1.3
+++ gmt.info    30 Nov 2006 22:11:44 -0000      1.4
@@ -1,23 +1,28 @@
 Package: gmt
-Version: 3.4.5
-Revision: 1002
-Source: ftp://gmt.soest.hawaii.edu/pub/gmt/3/GMT%v_progs.tar.gz
-Source2: ftp://gmt.soest.hawaii.edu/pub/gmt/3/GMT%v_man.tar.gz
-Source3: ftp://gmt.soest.hawaii.edu/pub/gmt/3/GMT_share.tar.gz
-Source4: ftp://gmt.soest.hawaii.edu/pub/gmt/3/GMT%v_suppl.tar.gz
-Source-MD5:  2cf24ad041179e9555dfb62696e726ad
-Source2-MD5: 5532ce175c3b727d00bd91c4ee36f2ea
-Source3-MD5: 07995a0218b5f145cc2c11c3735e358a
-Source4-MD5: 7f1e1c983652fcfb6c5d091a9c05675c
-Source3Rename: GMT%v_share.tar.gz
+Version: 4.1.1
+Revision: 1001
+Source: ftp://ftp.soest.hawaii.edu/gmt/4/GMT%v_progs.tar.bz2
+Source2: ftp://ftp.soest.hawaii.edu/gmt/4/GMT%v_man.tar.bz2
+Source3: ftp://ftp.soest.hawaii.edu/gmt/4/GMT4_share.tar.bz2
+Source4: ftp://ftp.soest.hawaii.edu/gmt/4/GMT%v_suppl.tar.bz2
+Source-MD5:  d8e189e9388cf415e0aceea3cb8e0348
+Source2-MD5: 2b2e42972f4addd5386e2b8fc116cd59
+Source3-MD5: d3aa6559eca5045e3255b476c1914f02
+Source4-MD5: 191fe95ea7211d2910363b93d95a301e
+#Source3Rename: GMT_share.tar.bz2
 SourceDirectory: GMT%v
 Source3ExtractDir: GMT%v
 BuildDepends: netcdf (>= 3.6.0-1002)
 Depends: netcdf-shlibs (>= 3.6.0-1002)
-Patch: %n.patch
 NoSetCPPFLAGS: true
-SetCFLAGS: -O2 -ansi -pedantic -no-cpp-precomp
-ConfigureParams: --mandir='${prefix}/share/man' --disable-shared 
--datadir='${prefix}/share/%n' 
+# -no-cpp-precomp
+SetCFLAGS: -O2 -ansi -pedantic -funroll-loops -fexpensive-optimizations
+# -I%p/include 
+# -L/sw/lib
+SetLDFLAGS: -L%p/lib 
+# for gmt >4.1.1, should be able to --disable-mex
+ConfigureParams: --mandir='${prefix}/share/man' --disable-shared 
--datadir='${prefix}/share/%n' --enable-netcdf=%p
+Patch: %n.patch
 CompileScript: <<
  #!/bin/sh -ev
  export NETCDFHOME=%p
@@ -36,8 +41,12 @@
  /bin/rm -f %i/bin/GMT.orig
  ranlib %i/lib/libgmt.a
  ranlib %i/lib/libgmt_mgg.a
+ ranlib %i/lib/libgmtps.a
+ ranlib %i/lib/libmgd77.a
  ranlib %i/lib/libpsl.a
  ranlib %i/lib/libx2sys.a
+ echo
+ echo NOTE: make sure NOT to set the GMTHOME variable
 <<
 Description: Tools to plot data sets
 DescDetail: <<
@@ -51,11 +60,18 @@
  log, and power scaling, and comes with support data such as
  coastlines, rivers, and political boundaries.
 
- Includes experimental wind barb patch
- (http://radar.sci.hokudai.ac.jp/~kato/work/GMT).
+ When using the fink install of GMT, make sure not to have GMTHOME set.
 <<
 DescPort: <<
  Remove xgrid suppl package so x11 not required.
+
+ Tweaks by Kurt Schwehr to jump from 4.0 to 4.1.1.  Trying to not use
+ the patch from before.  Also trying to optimize gmt so that things run
+ much faster.
+
+ Is no-cpp-precomp still needed?  Maybe just 10.3
+
+ Would probably better to just ranlib *.a
 <<
 License: GPL
 SplitOff: <<

Index: gmt.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/sci/gmt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gmt.patch   20 Jan 2006 20:12:58 -0000      1.1
+++ gmt.patch   30 Nov 2006 22:11:44 -0000      1.2
@@ -1,1062 +1,229 @@
-diff -uNr GMT3.4.2.orig/man/manl/grdbarb.l GMT3.4.2/man/manl/grdbarb.l
---- GMT3.4.2.orig/man/manl/grdbarb.l   Thu Jan  1 09:00:00 1970
-+++ GMT3.4.2/man/manl/grdbarb.l        Thu Feb 13 18:00:03 2003
-@@ -0,0 +1,185 @@
-+.TH GRDVECTOR l "1 Mar 2002"
-+.SH NAME
-+grdbarb \- Plot wind barb fields from grdfiles
-+.SH SYNOPSIS
-+\fBgrdbarb\fP \fIcompx.grd\fP \fIcompy.grd\fP \fB\-J\fP\fIparameters\fP [ 
\fB\-A\fP ]
-+[ \fB\-B\fP\fItickinfo\fP ] [ \fB\-E\fP ]
-+[ \fB\-I\fP\fIx_inc\fP[\fBm|c\fP][/\fIy_inc\fP[\fBm|c\fP]] ] [ \fB\-K\fP ] [ 
\fB\-N\fP ] [ \fB\-O\fP ] [ \fB\-P\fP ]
[...1205 lines suppressed...]
+@@ -4212,7 +4212,7 @@
+ 
+       /* First the standard 35 PostScript fonts from Adobe */
+ 
+-      sprintf (fullname, "%s%cshare%cpslib%cPS_font_info.d", PSHOME, 
DIR_DELIM, DIR_DELIM, DIR_DELIM);
++      sprintf (fullname, "%s%cshare%cgmt%cpslib%cPS_font_info.d", PSHOME, 
DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM);
+ 
+       if ((in = fopen (fullname, "r")) == NULL)
+       {
+@@ -4242,7 +4242,7 @@
+ 
+       /* Then any custom fonts */
+ 
+-      sprintf (fullname, "%s%cshare%cpslib%cCUSTOM_font_info.d", PSHOME, 
DIR_DELIM, DIR_DELIM, DIR_DELIM);
++      sprintf (fullname, "%s%cshare%cgmt%cpslib%cCUSTOM_font_info.d", PSHOME, 
DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM);
+ 
+       if (!access (fullname, R_OK)) { /* Decode Custom font file */
  
-               if ((fp = fopen (line, "r")) == NULL) {
-                       fprintf (stderr, "pslib: ERROR: Cannot open file %s\n", 
line);


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits

Reply via email to