Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv10987
Modified Files: gmt.info gmt.patch Log Message: New upstream version. Index: gmt.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gmt.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- gmt.info 22 May 2006 15:12:02 -0000 1.5 +++ gmt.info 18 Dec 2006 13:00:13 -0000 1.6 @@ -1,35 +1,32 @@ Package: gmt -Version: 4.1.1 -Revision: 1001 -Source: ftp://ftp.soest.hawaii.edu/gmt/4/GMT%v_progs.tar.bz2 +Version: 4.1.4 +Revision: 1 +Source: ftp://ftp.soest.hawaii.edu/gmt/4/GMT%v_src.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 +Source3: ftp://ftp.soest.hawaii.edu/gmt/4/GMT%v_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 +Source5: ftp://ftp.soest.hawaii.edu/gmt/4/GMT4.1_coast.tar.bz2 +Source-MD5: 679bfb7b73a70fa4e77731afc75352b1 +Source2-MD5: 4931a770b95f2f096e689f8e4d0203ab +Source3-MD5: 27960716546b8d5454a2bf605290f6ec +Source4-MD5: 9ee5e07db137b2aa99ad29e5fb33fa52 +Source5-MD5: 2ab56bb6dd2baf7299143a6cb46fbea4 SourceDirectory: GMT%v -Source3ExtractDir: GMT%v +Source5ExtractDir: GMT%v BuildDepends: netcdf (>= 3.6.0-1002) Depends: netcdf-shlibs (>= 3.6.0-1002) NoSetCPPFLAGS: true -# -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 + +# don't build xgrid to avoid x11 dependency. +# don't build mex (won't work unless matlab installed). +ConfigureParams: --mandir='${prefix}/share/man' --disable-shared --datadir='${prefix}/share/%n' --enable-netcdf=%p --disable-xgrid + Patch: %n.patch CompileScript: << #!/bin/sh -ev export NETCDFHOME=%p - # don't build xgrid to avoid x11 dependency. - /bin/rm -rf src/xgrid - # don't build mex (won't work unless matlab installed). - /bin/rm -rf src/mex ./configure %c make gmt suppl << Index: gmt.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/gmt.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gmt.patch 22 Mar 2006 22:10:22 -0000 1.2 +++ gmt.patch 18 Dec 2006 13:00:14 -0000 1.3 @@ -1,229 +1,208 @@ -diff -r -u GMT4.1.1.old/Makefile GMT4.1.1/Makefile ---- GMT4.1.1.old/Makefile 2006-02-27 19:25:01.000000000 -0500 -+++ GMT4.1.1/Makefile 2006-03-03 16:55:56.000000000 -0500 -@@ -109,19 +109,21 @@ - done - - mex_config: -+ if [ -d src/mex ]; then \ - if [ ! -f src/mex/makefile ]; then \ - cd src/mex; \ - \rm -f config.{cache,log,status}; \ - ./configure; \ -+ fi \ - fi -- - xgrid_config: -+ if [ -d src/xgrid ]; then \ - if [ ! -f src/xgrid/makefile ]; then \ - cd src/xgrid; \ - \rm -f config.{cache,log,status}; \ - ./configure; \ -+ fi \ - fi -- - gmtmacros: - if [ ! -s src/makegmt.macros ]; then \ - echo "src/makegmt.macros is empty - you must rerun configure in the main GMT directory"; \ -diff -r -u GMT4.1.1.old/src/gmt_init.c GMT4.1.1/src/gmt_init.c ---- GMT4.1.1.old/src/gmt_init.c 2006-02-22 17:52:55.000000000 -0500 -+++ GMT4.1.1/src/gmt_init.c 2006-03-03 15:23:01.000000000 -0500 -@@ -2351,7 +2351,7 @@ - - if (get == 0) { /* Must use GMT system defaults via gmt.conf */ - -- sprintf (line, "%s%cshare%cgmt.conf", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (line, "%s%cshare%cgmt%cgmt.conf", GMTHOME, DIR_DELIM, DIR_DELIM,DIR_DELIM); - if ((fp = fopen (line, "r")) == NULL) { - fprintf (stderr, "GMT Fatal Error: Cannot open/find GMT configuration file %s\n", line); - exit (EXIT_FAILURE); -@@ -2372,7 +2372,7 @@ - id = get; - - id--; /* Get 0 or 1 */ -- sprintf (line, "%s%cshare%c.gmtdefaults_%s", GMTHOME, DIR_DELIM, DIR_DELIM, suffix[id]); -+ sprintf (line, "%s%cshare%cgmt%c.gmtdefaults_%s", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, suffix[id]); - - path = (char *) GMT_memory (VNULL, (size_t)(strlen (line) + 1), (size_t)1, GMT_program); - -@@ -2481,7 +2481,7 @@ - FILE *fp; - char line[BUFSIZ], path[BUFSIZ]; - -- sprintf (path, "%s%cshare%c%s", GMTHOME, DIR_DELIM, DIR_DELIM, name); -+ sprintf (path, "%s%cshare%cgmt%c%s", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, name); - - if (!strcmp ("Sphere", name)) { - /* Special case where previous setting in .gmtdefaults4 is a custom ellipse which -@@ -2560,7 +2560,7 @@ - - GMT_set_home (); - -- sprintf (line, "%s%cshare%cgmtmedia.d", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (line, "%s%cshare%cgmt%gmtmedia.d", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); - if ((fp = fopen (line, "r")) == NULL) return (0); - - n_alloc = GMT_TINY_CHUNK; -@@ -2618,10 +2618,10 @@ - char file[BUFSIZ], line[BUFSIZ], full[16], abbrev[16], c[16], dwu; - int i, nm = 0, nw = 0, nu = 0; - -- sprintf (file, "%s%cshare%ctime%c%s.d", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, name); -+ sprintf (file, "%s%cshare%cgmt%ctime%c%s.d", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM, name); - if ((fp = fopen (file, "r")) == NULL) { - fprintf (stderr, "GMT Warning: Could not load %s - revert to us (English)!\n", name); -- sprintf (file, "%s%cshare%ctime%cus.d", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); -+ sprintf (file, "%s%cshare%cgmt%ctime%cus.d", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); - if ((fp = fopen (file, "r")) == NULL) { - fprintf (stderr, "GMT Error: Could not find %s!\n", file); - exit (EXIT_FAILURE); -@@ -4809,7 +4809,7 @@ - int code = 0, pos; - FILE *in; - -- sprintf (line, "%s%cshare%cpslib%c%s.ps", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, enc->name); -+ sprintf (line, "%s%cshare%cgmt%cpslib%c%s.ps", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM, enc->name); - in = GMT_fopen (line, "r"); - - if (!in) -@@ -4886,7 +4886,7 @@ - - /* First the standard 35 PostScript fonts from Adobe */ - -- sprintf (fullname, "%s%cshare%cpslib%cPS_font_info.d", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); -+ sprintf (fullname, "%s%cshare%cgmt%cpslib%cPS_font_info.d", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); - - if ((in = fopen (fullname, "r")) == NULL) - { -@@ -4916,7 +4916,7 @@ - - /* Then any custom fonts */ +diff -u -r GMT4.1.4-orig/src/gmt_io.c GMT4.1.4/src/gmt_io.c +--- GMT4.1.4-orig/src/gmt_io.c 2006-10-30 11:17:36.000000000 -0500 ++++ GMT4.1.4/src/gmt_io.c 2006-12-04 17:07:58.000000000 -0500 +@@ -224,14 +224,23 @@ + /* Finally try to get file from $GMTHOME/share[/subdirname] */ -- sprintf (fullname, "%s%cshare%cpslib%cCUSTOM_font_info.d", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); -+ sprintf (fullname, "%s%cshare%cgmt%cpslib%cCUSTOM_font_info.d", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); + if (subdir) { +- sprintf (path, "%s%cshare%c%s%c%s%s", GMTHOME, DIR_DELIM, DIR_DELIM, subdir, DIR_DELIM, stem, suffix); ++ sprintf (path, "%s%cshare%cgmt%c%s%c%s%s", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, subdir, DIR_DELIM, stem, suffix); ++ } ++ else { ++ sprintf (path, "%s%cshare%cgmt%c%s%s", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, stem, suffix); ++ } ++ if (!access (path, R_OK)) return (TRUE); /* Yes, use the file in $GMTHOME/share/subdir */ - if (!access (fullname, R_OK)) { /* Decode Custom font file */ ++ /* For debian systems (e.g. fink) these may hide in a gmt subdir under share */ ++ if (subdir) { ++ sprintf (path, "%s%cshare%cgmt%c%s%c%s%s", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, subdir, DIR_DELIM, stem, suffix); + } + else { +- sprintf (path, "%s%cshare%c%s%s", GMTHOME, DIR_DELIM, DIR_DELIM, stem, suffix); ++ sprintf (path, "%s%cshare%cgmt%c%s%s", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, stem, suffix); + } + if (!access (path, R_OK)) return (TRUE); /* Yes, use the file in $GMTHOME/share/subdir */ -diff -r -u GMT4.1.1.old/src/gmt_support.c GMT4.1.1/src/gmt_support.c ---- GMT4.1.1.old/src/gmt_support.c 2006-02-20 20:51:21.000000000 -0500 -+++ GMT4.1.1/src/gmt_support.c 2006-03-03 15:28:29.000000000 -0500 -@@ -1009,9 +1009,9 @@ ++ + return (FALSE); /* No file found, give up */ + } - if (!ok) { /* No table in current dir, try /share */ - if (table) -- sprintf (CPT_file, "%s%cshare%ccpt%cGMT_%s.cpt", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, table); -+ sprintf (CPT_file, "%s%cshare%cgmt%ccpt%cGMT_%s.cpt", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM, table); - else /* Default to rainbow colors */ -- sprintf (CPT_file, "%s%cshare%ccpt%cGMT_rainbow.cpt", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); -+ sprintf (CPT_file, "%s%cshare%cgmt%ccpt%cGMT_rainbow.cpt", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); +diff -u -r GMT4.1.4-orig/src/gmt_shore.c GMT4.1.4/src/gmt_shore.c +--- GMT4.1.4-orig/src/gmt_shore.c 2006-10-30 11:17:37.000000000 -0500 ++++ GMT4.1.4/src/gmt_shore.c 2006-12-04 17:09:50.000000000 -0500 +@@ -973,7 +973,7 @@ + + /* 2. Then check the $GMTHOME/share/coast directory */ - ok = !access (CPT_file, R_OK); - if (!ok) -@@ -5457,7 +5457,7 @@ +- sprintf (path, "%s%cshare%ccoast%c%s", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, name); ++ sprintf (path, "%s%cshare%cgmt%ccoast%c%s", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM, name); + if (!access (path, R_OK)) return (TRUE); /* File exists and is readable, return with name */ - /* First check the $GMTHOME/share directory */ + /* File was not readable. Now check if it exists */ +@@ -985,7 +985,7 @@ + + /* 3. Nothing in share/coast; do a backwards-compatible check in the $GMTHOME/share directory */ - sprintf (path, "%s%cshare%c%s", GMTHOME, DIR_DELIM, DIR_DELIM, name); + sprintf (path, "%s%cshare%cgmt%c%s", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, name); if (!access (path, R_OK)) return (TRUE); /* File exists and is readable, return with name */ /* File was not readable. Now check if it exists */ -@@ -5471,7 +5471,7 @@ +@@ -999,7 +999,7 @@ * It is not an error if we cannot find the named file, only if it is found * but cannot be read due to permission problems */ - sprintf (dir, "%s%cshare%ccoastline.conf", GMTHOME, DIR_DELIM, DIR_DELIM); + sprintf (dir, "%s%cshare%cgmt%ccoastline.conf", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); - if (!access (dir, F_OK)) { /* File exists... */ - if (access (dir, R_OK)) { /* ...but cannot be read */ - fprintf (stderr, "%s: Error: GMT does not have permission to open %s!\n", GMT_program, dir); -@@ -6100,7 +6100,7 @@ - - /* Open the list in $GMTHOME/share */ - -- sprintf (list, "%s%cshare%cGMT_CustomSymbols.lis", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (list, "%s%cshare%cgmt%cGMT_CustomSymbols.lis", GMTHOME, DIR_DELIM, DIR_DELIM); - - if ((fp = fopen (list, "r")) == NULL) { - fprintf (stderr, "%s: ERROR: Cannot open file %s\n", GMT_program, list); -@@ -7876,7 +7876,7 @@ - sprintf (file, "%s.def", name); - - if (access (file, R_OK)) { /* Not in current dir, try GMTHOME */ -- sprintf (file, "%s%cshare%ccustom%c%s.def", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, name); -+ sprintf (file, "%s%cshare%cgmt%ccustom%c%s.def", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM, name); - if (access (file, R_OK)) { /* Not there either - give up */ - fprintf (stderr, "GMT ERROR: %s : Could not find custom symbol %s\n", GMT_program, name); - exit (EXIT_FAILURE); -diff -r -u GMT4.1.1.old/src/grd2cpt.c GMT4.1.1/src/grd2cpt.c ---- GMT4.1.1.old/src/grd2cpt.c 2005-12-17 00:59:22.000000000 -0500 -+++ GMT4.1.1/src/grd2cpt.c 2006-03-03 15:29:44.000000000 -0500 -@@ -70,7 +70,7 @@ - - /* Get list of available color tables in $GMTHOME/share/cpt */ - -- sprintf (CPT_lis, "%s%cshare%cGMT_CPT.lis", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (CPT_lis, "%s%cshare%cgmt%cGMT_CPT.lis", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); - - if ((fpc = fopen (CPT_lis, "r")) == NULL) { - fprintf (stderr, "%s: ERROR: Cannot open file %s\n", GMT_program, CPT_lis); -diff -r -u GMT4.1.1.old/src/makecpt.c GMT4.1.1/src/makecpt.c ---- GMT4.1.1.old/src/makecpt.c 2005-12-17 00:59:22.000000000 -0500 -+++ GMT4.1.1/src/makecpt.c 2006-03-03 15:30:22.000000000 -0500 -@@ -48,7 +48,7 @@ - - /* Get list of available color tables in $GMTHOME/share/cpt */ - -- sprintf (CPT_lis, "%s%cshare%cGMT_CPT.lis", GMTHOME, DIR_DELIM, DIR_DELIM); -+ sprintf (CPT_lis, "%s%cshare%cgmt%cGMT_CPT.lis", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); - - if ((fpc = fopen (CPT_lis, "r")) == NULL) { - fprintf (stderr, "%s: ERROR: Cannot open file %s\n", GMT_program, CPT_lis); -diff -r -u GMT4.1.1.old/src/pslib.c GMT4.1.1/src/pslib.c ---- GMT4.1.1.old/src/pslib.c 2006-01-22 23:41:58.000000000 -0500 -+++ GMT4.1.1/src/pslib.c 2006-03-03 15:32:34.000000000 -0500 -@@ -889,7 +889,7 @@ - if ((image_no >= 0 && image_no < N_PATTERNS) && ps_pattern[image_no].status) return (image_no); /* Already done this */ + found = shore_conffile (name, dir, path); + + return (found); +diff -u -r GMT4.1.4-orig/src/gmt_support.c GMT4.1.4/src/gmt_support.c +--- GMT4.1.4-orig/src/gmt_support.c 2006-10-30 13:09:29.000000000 -0500 ++++ GMT4.1.4/src/gmt_support.c 2006-12-04 15:35:05.000000000 -0500 +@@ -1105,9 +1105,9 @@ - if ((image_no >= 0 && image_no < N_PATTERNS)) /* Premade pattern yet not used */ -- sprintf (file, "%s%cshare%cpattern%cps_pattern_%2.2d.ras", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, image_no); -+ sprintf (file, "%s%cshare%cgmt%cpattern%cps_pattern_%2.2d.ras", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM, image_no); - else { /* User image, check to see if already used */ + if (!ok) { /* Finally try $GMTHOME/share/cpt */ + if (table) +- sprintf (CPT_file, "%s%cshare%ccpt%cGMT_%s.cpt", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, table); ++ sprintf (CPT_file, "%s%cshare%cgmt%ccpt%cGMT_%s.cpt", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM, table); + else /* Default to rainbow colors */ +- sprintf (CPT_file, "%s%cshare%ccpt%cGMT_rainbow.cpt", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM); ++ sprintf (CPT_file, "%s%cshare%cgmt%ccpt%cGMT_rainbow.cpt", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); - for (i = 0, found = FALSE; !found && i < ps_n_userimages; i++) found = !strcmp (ps_user_image[i], imagefile); -@@ -905,7 +905,7 @@ - if (!access (imagefile, R_OK)) - strcpy (file, imagefile); - else -- sprintf (file, "%s%cshare%c%s", PSHOME, DIR_DELIM, DIR_DELIM, imagefile); -+ sprintf (file, "%s%cshare%cgmt%c%s", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, imagefile); + ok = !access (CPT_file, R_OK); + if (!ok) +diff -u -r GMT4.1.4-orig/src/mgd77/mgd77.c GMT4.1.4/src/mgd77/mgd77.c +--- GMT4.1.4-orig/src/mgd77/mgd77.c 2006-10-06 20:22:07.000000000 -0400 ++++ GMT4.1.4/src/mgd77/mgd77.c 2006-12-04 15:35:35.000000000 -0500 +@@ -2383,7 +2383,7 @@ + if ((this = getenv ("GMTHOME")) != CNULL) { + fprintf (stderr, "mgd77: Warning: MGD77_HOME not defined, set to $GMTHOME/share/mgd77\n"); + F->MGD77_HOME = (char *) GMT_memory (VNULL, (size_t)(strlen (this) + 13), 1, "MGD77_Set_Home"); +- sprintf (F->MGD77_HOME, "%s/share/mgd77", this); ++ sprintf (F->MGD77_HOME, "%s/share/gmt/mgd77", this); } - ps_user_image[ps_n_userimages] = (char *) ps_memory (VNULL, (size_t)(strlen (imagefile)+1), sizeof (char)); - strcpy (ps_user_image[ps_n_userimages], imagefile); -@@ -4187,7 +4187,7 @@ - char buf[80]; - char fullname[BUFSIZ]; - -- sprintf (fullname, "%s%cshare%cpslib%c%s.ps", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, fname); -+ sprintf (fullname, "%s%cshare%cgmt%cpslib%c%s.ps", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM, fname); + else { + fprintf (stderr, "mgd77: ERROR: Neither MGD77_HOME or GMTHOME defined - give up\n"); +@@ -3494,7 +3494,7 @@ + return (-1); + } - in = fopen (fullname, "r"); - if (in == NULL) -@@ -4212,7 +4212,7 @@ +- sprintf (buffer, "%s%cshare%cmgg%ccarter.d", SHAREDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM); ++ sprintf (buffer, "%s%cshare%cgmt%cmgg%ccarter.d", SHAREDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); + if ( (fp = fopen (buffer, "r")) == NULL) { + fprintf (stderr,"MGD77_carter_init: Cannot open r %s\n", buffer); + return (-1); +diff -u -r GMT4.1.4-orig/src/mgg/binlegs.c GMT4.1.4/src/mgg/binlegs.c +--- GMT4.1.4-orig/src/mgg/binlegs.c 2006-03-26 16:43:05.000000000 -0500 ++++ GMT4.1.4/src/mgg/binlegs.c 2006-12-04 15:35:57.000000000 -0500 +@@ -124,8 +124,8 @@ + sprintf (index_file, "%s%cgmt_index.b", path, DIR_DELIM); + } + else { +- sprintf (leg_file, "%s%cshare%cmgg%cgmt_legs.d", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM); +- sprintf (index_file, "%s%cshare%cmgg%cgmt_index.b", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM); ++ sprintf (leg_file, "%s%cshare%cgmt%cmgg%cgmt_legs.d", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); ++ sprintf (index_file, "%s%cshare%cgmt%cmgg%cgmt_index.b", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); + } + + +diff -u -r GMT4.1.4-orig/src/mgg/gmt_mgg.c GMT4.1.4/src/mgg/gmt_mgg.c +--- GMT4.1.4-orig/src/mgg/gmt_mgg.c 2005-12-26 23:28:12.000000000 -0500 ++++ GMT4.1.4/src/mgg/gmt_mgg.c 2006-12-04 15:36:18.000000000 -0500 +@@ -172,7 +172,7 @@ + exit (EXIT_FAILURE); + } - /* First the standard 35 PostScript fonts from Adobe */ +- sprintf (file, "%s%cshare%cmgg%cgmtfile_paths", SHAREDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM); ++ sprintf (file, "%s%cshare%cgmt%cmgg%cgmtfile_paths", SHAREDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); + + n_gmtmgg_paths = 0; -- 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); +@@ -385,7 +385,7 @@ + return (-1); + } - if ((in = fopen (fullname, "r")) == NULL) - { -@@ -4242,7 +4242,7 @@ +- sprintf (buffer, "%s%cshare%cmgg%ccarter.d", SHAREDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM); ++ sprintf (buffer, "%s%cshare%cgmt%cmgg%ccarter.d", SHAREDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); + if ( (fp = fopen (buffer, "r")) == NULL) { + fprintf (stderr,"carter_setup: Cannot open r %s\n", buffer); + return (-1); +diff -u -r GMT4.1.4-orig/src/mgg/gmtlegs.c GMT4.1.4/src/mgg/gmtlegs.c +--- GMT4.1.4-orig/src/mgg/gmtlegs.c 2006-03-26 16:43:05.000000000 -0500 ++++ GMT4.1.4/src/mgg/gmtlegs.c 2006-12-04 15:36:39.000000000 -0500 +@@ -90,12 +90,12 @@ + exit (EXIT_FAILURE); + } + +- sprintf (file, "%s%cshare%cmgg%cgmt_legs.d", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM); ++ sprintf (file, "%s%cshare%cgmt%cmgg%cgmt_legs.d", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); + if ((fleg = fopen (file, "r")) == NULL) { + fprintf (stderr,"gmtlegs: Could not open %s\n", file); + exit (EXIT_FAILURE); + } +- sprintf (file, "%s%cshare%cmgg%cgmt_index.b", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM); ++ sprintf (file, "%s%cshare%cgmt%cmgg%cgmt_index.b", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); + if ((fbin = fopen (file, "rb")) == NULL) { + fprintf(stderr,"gmtlegs: Could not open %s\n", file); + exit (EXIT_FAILURE); +diff -u -r GMT4.1.4-orig/src/mgg/gmtlist.c GMT4.1.4/src/mgg/gmtlist.c +--- GMT4.1.4-orig/src/mgg/gmtlist.c 2006-04-10 01:47:30.000000000 -0400 ++++ GMT4.1.4/src/mgg/gmtlist.c 2006-12-04 15:36:51.000000000 -0500 +@@ -100,7 +100,7 @@ + + case 'C': + if (argv[i][2] == 0) /* Use default corrfile */ +- sprintf (corrfile, "%s%cshare%cmgg%cxx_corrections.b", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM); ++ sprintf (corrfile, "%s%cshare%cgmt%cmgg%cxx_corrections.b", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); + else + strcpy (corrfile, &argv[i][2]); + correct = TRUE; +diff -u -r GMT4.1.4-orig/src/pslib.c GMT4.1.4/src/pslib.c +--- GMT4.1.4-orig/src/pslib.c 2006-10-30 11:17:38.000000000 -0500 ++++ GMT4.1.4/src/pslib.c 2006-12-04 15:37:26.000000000 -0500 +@@ -4580,11 +4580,11 @@ + /* Finally try to get file from $GMTHOME/share[/subdirname] */ - /* Then any custom fonts */ + if (subdir) { +- sprintf (path, "%s%cshare%c%s%c%s%s", PSL_HOME, DIR_DELIM, DIR_DELIM, subdir, DIR_DELIM, stem, suffix); ++ sprintf (path, "%s%cshare%cgmt%c%s%c%s%s", PSL_HOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, subdir, DIR_DELIM, stem, suffix); -- 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); + } + else { +- sprintf (path, "%s%cshare%c%s%s", PSL_HOME, DIR_DELIM, DIR_DELIM, stem, suffix); ++ sprintf (path, "%s%cshare%cgmt%c%s%s", PSL_HOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, stem, suffix); + } + if (!access (path, R_OK)) return (TRUE); /* Yes, use the file in $GMTHOME/share/subdir */ - if (!access (fullname, R_OK)) { /* Decode Custom font file */ +diff -u -r GMT4.1.4-orig/src/x2sys/x2sys.c GMT4.1.4/src/x2sys/x2sys.c +--- GMT4.1.4-orig/src/x2sys/x2sys.c 2006-10-18 15:00:08.000000000 -0400 ++++ GMT4.1.4/src/x2sys/x2sys.c 2006-12-04 15:37:38.000000000 -0500 +@@ -495,7 +495,7 @@ + } + else if ((this = getenv ("GMTHOME")) != CNULL) { /* Assume GMT path */ +- X2SYS_HOME = (char *) GMT_memory (VNULL, (size_t)(strlen (this) + 13), 1, "x2sys_set_home"); ++ X2SYS_HOME = (char *) GMT_memory (VNULL, (size_t)(strlen (this) + 17), 1, "x2sys_set_home"); +- sprintf (X2SYS_HOME, "%s%cshare%cx2sys", this, DIR_DELIM, DIR_DELIM); ++ sprintf (X2SYS_HOME, "%s%cshare%cgmt%cx2sys", this, DIR_DELIM, DIR_DELIM, DIR_DELIM); + } + else { /* Set default path */ + #ifdef _WIN32 +diff -u -r GMT4.1.4-orig/src/x_system/x_setup.c GMT4.1.4/src/x_system/x_setup.c +--- GMT4.1.4-orig/src/x_system/x_setup.c 2005-03-10 14:02:25.000000000 -0500 ++++ GMT4.1.4/src/x_system/x_setup.c 2006-12-04 15:39:27.000000000 -0500 +@@ -95,12 +95,12 @@ + exit (EXIT_FAILURE); + } +- sprintf (line, "%s%cshare%cmgg%cgmt_legs.d", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM); ++ sprintf (line, "%s%cshare%cgmt%cmgg%cgmt_legs.d", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); + if ((fleg = fopen (line, "r")) == NULL) { + fprintf(stderr,"Could not open %s\n", line); + exit (EXIT_FAILURE); + } +- sprintf (line, "%s%cshare%cmgg%cgmt_index.b", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM); ++ sprintf (line, "%s%cshare%cgmt%cmgg%cgmt_index.b", LIBDIR, DIR_DELIM, DIR_DELIM, DIR_DELIM, DIR_DELIM); + if ((fbin = fopen (line, "rb")) == NULL) { + fprintf(stderr,"Could not open %sb\n", line); + exit (EXIT_FAILURE); ------------------------------------------------------------------------- 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