summaryrefslogtreecommitdiff
path: root/graphics/GMT
diff options
context:
space:
mode:
authorjtb <jtb@pkgsrc.org>2000-11-26 22:48:12 +0000
committerjtb <jtb@pkgsrc.org>2000-11-26 22:48:12 +0000
commitea9102d97f9e93deca94a2cb998a4dfdcf83f3ee (patch)
tree25f00b80d0b1a2f6bd9e81e20fb13cc13ca2d209 /graphics/GMT
parent82a120c7dbc3485dcfcedabedcdf41bfee0d42ac (diff)
downloadpkgsrc-ea9102d97f9e93deca94a2cb998a4dfdcf83f3ee.tar.gz
Initial import of new "GMT" package:
Generic Mapping Tools
Diffstat (limited to 'graphics/GMT')
-rw-r--r--graphics/GMT/Makefile51
-rw-r--r--graphics/GMT/files/md54
-rw-r--r--graphics/GMT/files/patch-sum12
-rw-r--r--graphics/GMT/patches/patch-aa121
-rw-r--r--graphics/GMT/patches/patch-ab57
-rw-r--r--graphics/GMT/patches/patch-ac24
-rw-r--r--graphics/GMT/patches/patch-ad40
-rw-r--r--graphics/GMT/patches/patch-ae22
-rw-r--r--graphics/GMT/patches/patch-af25
-rw-r--r--graphics/GMT/patches/patch-ag25
-rw-r--r--graphics/GMT/patches/patch-ah13
-rw-r--r--graphics/GMT/patches/patch-ai31
-rw-r--r--graphics/GMT/patches/patch-aj12
-rw-r--r--graphics/GMT/pkg/COMMENT1
-rw-r--r--graphics/GMT/pkg/DESCR9
-rw-r--r--graphics/GMT/pkg/PLIST290
16 files changed, 737 insertions, 0 deletions
diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile
new file mode 100644
index 00000000000..0e62ddfaa3c
--- /dev/null
+++ b/graphics/GMT/Makefile
@@ -0,0 +1,51 @@
+# $NetBSD: Makefile,v 1.1.1.1 2000/11/26 22:48:12 jtb Exp $
+
+DISTNAME= GMT3.3.6
+PKGNAME= GMT-3.3.6
+CATEGORIES= graphics
+MASTER_SITES= ftp://gmt.soest.hawaii.edu/pub/gmt/ \
+ ftp://falcon.grdl.noaa.gov/pub/gmt/ \
+ ftp://ftp.iag.usp.br/pub/gmt/ \
+ ftp://ftp.geologi.uio.no/pub/gmt/ \
+ ftp://life.csu.edu.au/pub/gmt/ \
+ ftp://ftp.eos.hokudai.ac.jp/pub/gmt/
+DISTFILES= GMT3.3.6_progs.tar.bz2 GMT3.3.6_doc.tar.bz2 GMT_share.tar.bz2
+
+MAINTAINER= jtb@netbsd.org
+HOMEPAGE= http://imina.soest.hawaii.edu/gmt/
+
+DEPENDS+= netcdf>=3.0:../../devel/netcdf
+BUILD_DEPENDS+= ${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+
+EXTRACT_SUFFIX= .tar.bz2
+WRKSRC= ${WRKDIR}/${DISTNAME}
+
+DIST_SUBDIR= GMT
+GNU_CONFIGURE= YES
+USE_LIBTOOL= YES
+EVAL_PREFIX+= NETCDF=netcdf
+
+CONFIGURE_ARGS+="--includedir=${PREFIX}/include/gmt"
+CONFIGURE_ARGS+="--datadir=${PREFIX}/share/gmt"
+CONFIGURE_ARGS+="--enable-eps"
+INSTALL_TARGET= install install-man install-data
+
+pre-configure:
+ @(cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf 2>/dev/null)
+
+do-build:
+ @(cd ${WRKSRC}/src && ${MAKE})
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gmt
+ @for f in GMT_Docs.ps GMT_Tutorial.ps ; do \
+ ${INSTALL_DATA} ${WRKSRC}/www/gmt/doc/ps/$$f ${PREFIX}/share/doc/gmt; \
+ done
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gmt/tutorial
+ @for f in bermuda.grd quakes.cpt ship.xyz us.grd data quakes.ngdc \
+ topo.cpt ; do \
+ ${INSTALL_DATA} ${WRKSRC}/tutorial/$$f ${PREFIX}/share/examples/gmt; \
+ done;
+ ${INSTALL_DATA} ${WRKSRC}/../share/* ${PREFIX}/share/gmt
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/GMT/files/md5 b/graphics/GMT/files/md5
new file mode 100644
index 00000000000..be76cd186be
--- /dev/null
+++ b/graphics/GMT/files/md5
@@ -0,0 +1,4 @@
+$NetBSD: md5,v 1.1.1.1 2000/11/26 22:48:12 jtb Exp $
+MD5 (GMT/GMT3.3.6_progs.tar.bz2) = f727d799357583a2b901d832d37d561d
+MD5 (GMT/GMT3.3.6_doc.tar.bz2) = 2c025e7fcd997a58bafbebba1138cd9e
+MD5 (GMT/GMT_share.tar.bz2) = 35a67867ecbb8461690109beb663f317
diff --git a/graphics/GMT/files/patch-sum b/graphics/GMT/files/patch-sum
new file mode 100644
index 00000000000..5ca5c5b74c6
--- /dev/null
+++ b/graphics/GMT/files/patch-sum
@@ -0,0 +1,12 @@
+$NetBSD: patch-sum,v 1.1.1.1 2000/11/26 22:48:12 jtb Exp $
+
+MD5 (patch-aa) = 3e56f3e40ff0abf1fa442da354ffc06d
+MD5 (patch-ab) = 3865f3b4d98b55a65fa308ad27f2d6e3
+MD5 (patch-ac) = 17b5bee492e241ac0511bfb5d5167a73
+MD5 (patch-ad) = dab1556098f72997ff9195b2a75b8090
+MD5 (patch-ae) = 1ad779053784a61501b672a0f95cab24
+MD5 (patch-af) = 9bc80d1f1f305fe60a5c24e90fdd329f
+MD5 (patch-ag) = 5fd9f8963a7fbba82ddb8526eda22801
+MD5 (patch-ah) = 81938a902823d3657c19bd8612a6455b
+MD5 (patch-ai) = af0285b9046f0d660a5d0319d91c62ba
+MD5 (patch-aj) = 4271ee26423bd841c4412b041f3f8da9
diff --git a/graphics/GMT/patches/patch-aa b/graphics/GMT/patches/patch-aa
new file mode 100644
index 00000000000..34e1855ca4f
--- /dev/null
+++ b/graphics/GMT/patches/patch-aa
@@ -0,0 +1,121 @@
+$NetBSD: patch-aa,v 1.1.1.1 2000/11/26 22:48:15 jtb Exp $
+
+--- src/Makefile.orig Wed Oct 18 03:30:08 2000
++++ src/Makefile
+@@ -136,15 +136,15 @@
+
+ #-------------------------------------------------------------------------------
+
+-SHARED_LIB = libpsl.a libgmt.a libpsl.$(SL) libgmt.$(SL)
+-STATIC_LIB = libpsl.a libgmt.a
++SHARED_LIB = libpsl libgmt
++STATIC_LIB =
+
+ #-------------------------------------------------------------------------------
+
+ all: init libs $(PROGS)
+
+ init: gmt_notposix.h gmt_nan.h
+-
++
+ gmt_nan.h:
+ $(CC) $(CFLAGS) gmt_nan_init.c $(CDF) $(LIBS) -o gmt_nan_init
+ $(COMPRESS) gmt_nan_init$(EXE)
+@@ -156,23 +156,19 @@
+ ./configure
+
+ install: all
+- if [ ! -d $(bindir) ]; then \
+- mkdir -p $(bindir); \
+- fi
+- for i in $(PROGS); do \
+- $(INSTALL) $$i$(EXE) $(bindir); \
+- done
+ if [ ! -d $(libdir) ]; then \
+ mkdir -p $(libdir); \
+ fi
+ if [ ! $(libdir) = $(srcdir) ]; then \
+- $(INSTALL) -m 444 libpsl.a $(libdir); \
+- $(INSTALL) -m 444 libgmt.a $(libdir); \
+- if [ -f libpsl.$(SL) ]; then \
+- $(INSTALL) -m 444 libpsl.$(SL) $(libdir); \
+- $(INSTALL) -m 444 libgmt.$(SL) $(libdir); \
+- fi; \
++ $(LIBTOOL) --mode=install $(INSTALL) libpsl.la $(libdir);\
++ $(LIBTOOL) --mode=install $(INSTALL) libgmt.la $(libdir);\
++ fi
++ if [ ! -d $(bindir) ]; then \
++ mkdir -p $(bindir); \
+ fi
++ for i in $(PROGS); do \
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
++ done
+ if [ ! -d $(includedir) ]; then \
+ mkdir -p $(includedir); \
+ fi
+@@ -187,11 +183,7 @@
+ \rm -f $(bindir)/$$i$(EXE); \
+ done
+ if [ ! $(libdir) = $(srcdir) ]; then \
+- \rm -f $(libdir)/libgmt.a $(libdir)/libpsl.a; \
+- if [ -f libpsl.$(SL) ]; then \
+- \rm -f $(libdir)/libpsl.$(SL); \
+- \rm -f $(libdir)/libgmt.$(SL); \
+- fi; \
++ \rm -f $(libdir)/libgmt.* $(libdir)/libpsl.*; \
+ fi
+ if [ ! $(includedir) = $(srcdir) ]; then \
+ for i in $(GMT_H); do \
+@@ -200,7 +192,7 @@
+ fi
+
+ clean:
+- rm -f *.o gmt_nan_init$(EXE)
++ rm -rf *.o *.lo .libs libgmt.la libpsl.la gmt_nan_init$(EXE)
+ for i in $(PROGS); do \
+ rm -f $$i$(EXE); \
+ done
+@@ -214,31 +206,27 @@
+ # libraries
+ #-------------------------------------------------------------------------------
+
+-libs: $(GMTLIB)
++libs: libpsl libgmt
+
+-libpsl.a: pslib.o
+- $(AR) cvur libpsl.a $?
+- $(RANLIB) libpsl.a
++libpsl: pslib.o
++ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -O -o libpsl.la \
++ pslib.lo -rpath $(libdir)
+
+ pslib.o: pslib.c $(PS_H)
+- $(CC) $(CFLAGS) -c pslib.c
++ @$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c pslib.c
+
+-libgmt.a: $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O)
+- $(AR) cvur $@ $?
+- $(RANLIB) $@
+-
+-libpsl.$(SL): pslib.o
+- $(LD) $(LD_OPT) $? -o $@
+-
+-libgmt.$(SL): $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O)
+- $(LD) $(LD_OPT) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) -o $@
++libgmt: $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O)
++ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -O -o libgmt.la \
++ $(LIB_O:.o=.lo) $(TRIANGLE_O:.o=.lo) $(ALPHA_SINCOS_O.o=.lo) \
++ -rpath $(libdir)
+
+ #-------------------------------------------------------------------------------
+ # program dependencies
+ #-------------------------------------------------------------------------------
+
+ $(PROGS): $(GMTLIB) $(PROGS_O)
+- $(CC) $(CFLAGS) $@.o -L. -lgmt -lpsl $(CDF) $(LIBS) $(LDFLAGS) -o $@
++ @$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $@.o libgmt.la libpsl.la $(CDF) $(LIBS) $(LDFLAGS) -o $@
+ $(COMPRESS) $@$(EXE)
++
+ .c.o:
+- $(CC) -c $(CFLAGS) $<
++ @$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-ab b/graphics/GMT/patches/patch-ab
new file mode 100644
index 00000000000..e61fe964c71
--- /dev/null
+++ b/graphics/GMT/patches/patch-ab
@@ -0,0 +1,57 @@
+$NetBSD: patch-ab,v 1.1.1.1 2000/11/26 22:48:15 jtb Exp $
+
+--- src/makegmt.macros.in.orig Fri Jul 14 02:10:54 2000
++++ src/makegmt.macros.in
+@@ -26,7 +26,7 @@
+ mansection = @mansection@
+
+ # Compiler, if $CC not set in environment
+-CC = @CC@
++#CC = @CC@
+
+ # Link flags if $LDFLAGS is not set in environment
+ LDFLAGS = @LDFLAGS@
+@@ -46,12 +46,14 @@
+ # Misc. Standard Utilities:
+ #---------------------------------------------------------------
+ INSTALL = @INSTALL@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_DATA = @INSTALL_DATA@
+ AWK = @AWK@
+ AS = @AS@
+ AR = @AR@
+-RANLIB = @RANLIB@
+ CSH = @CSH@
+-LD = @LD@
++LIBTOOL = @LIBTOOL@
+ #---------------------------------------------------------------
+ # Misc. macros for Cygwin
+ # Normally empty, EXE=.exe and WIN32=_WIN32 under Cygwin
+@@ -71,7 +73,7 @@
+ # Required path to netcdf (with lib & include)
+ #---------------------------------------------------------------
+ #
+-NETCDF = $(NETCDFHOME)
++NETCDF = @NETCDF@
+ #---------------------------------------------------------------
+ # Required path to GMT home (used as $GMTHOME by users)
+ #---------------------------------------------------------------
+@@ -82,7 +84,7 @@
+ # Compiler switches (set a total of one only)
+ #-------------------------------------------------------------------------------
+ #
+-CC_OPT = @CC_OPT@
++#CC_OPT = @CC_OPT@
+ #
+ #-------------------------------------------------------------------------------
+ # For your information, here are some CC_OPT options known to work on other systems:
+@@ -92,7 +94,7 @@
+ #CC_OPT = -mieee -O2 # Dec Alpha/Alpha PC Linux
+ #CC_OPT = -Aa +Ofltacc +O1 +Olibcalls # HPUX
+ #CC_OPT = -Daux -O # A/UX
+-#CC_OPT = -O -ansi -pedantic # Gnu gcc compiler
++CC_OPT = -O2 -ansi -pedantic # Gnu gcc compiler
+ #CC_OPT = -O -Xc # Sun Solaris
+ #CC_OPT = -O -w # SGI IRIX
+ #CC_OPT = -O2 # IBM AIX
diff --git a/graphics/GMT/patches/patch-ac b/graphics/GMT/patches/patch-ac
new file mode 100644
index 00000000000..49e63b1109b
--- /dev/null
+++ b/graphics/GMT/patches/patch-ac
@@ -0,0 +1,24 @@
+$NetBSD: patch-ac,v 1.1.1.1 2000/11/26 22:48:16 jtb Exp $
+
+--- configure.in.orig Wed Oct 18 02:59:42 2000
++++ configure.in
+@@ -29,6 +29,7 @@
+ AC_SUBST(TRIANGLE_O)
+ AC_SUBST(ALPHA_SINCOS_O)
+ AC_SUBST(GMTLIB)
++AC_SUBST(NETCDF)
+ AC_SUBST(CC_OPT)
+ AC_SUBST(LD_OPT)
+ AC_SUBST(LDFLAGS)
+@@ -58,7 +59,11 @@
+ AC_CHECK_PROG(CSH, csh, csh, bash, )
+ AC_CHECK_PROG(LD, ld, ld, :)
+ AC_CHECK_PROG(AS, as, as, :)
++AC_CHECK_PROG(LIBTOOL, libtool, libtool, :)
+ AC_PROG_INSTALL
++AC_SUBST(INSTALL_PROGRAM)
++AC_SUBST(INSTALL_SCRIPT)
++AC_SUBST(INSTALL_DATA)
+ AC_PROG_AWK
+ AC_PROG_RANLIB
+ dnl
diff --git a/graphics/GMT/patches/patch-ad b/graphics/GMT/patches/patch-ad
new file mode 100644
index 00000000000..9b1289f0ad1
--- /dev/null
+++ b/graphics/GMT/patches/patch-ad
@@ -0,0 +1,40 @@
+$NetBSD: patch-ad,v 1.1.1.1 2000/11/26 22:48:16 jtb Exp $
+
+--- src/gmt_init.c.orig Tue Oct 24 17:24:38 2000
++++ src/gmt_init.c
+@@ -1488,7 +1488,7 @@
+
+ if (get == 0) { /* Must use GMT system defaults via gmt.conf */
+
+- sprintf (line, "%s%cshare%cgmt.conf\0", GMTHOME, DIR_DELIM, DIR_DELIM);
++ sprintf (line, "%s%cshare%cgmt%cgmt.conf\0", 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);
+@@ -1501,7 +1501,7 @@
+ else if (!strncmp (line, "SI", 2))
+ id = 1;
+ else {
+- fprintf (stderr, "GMT Fatal Error: No SI/US keyword in GMT configuration file ($GMTHOME/share/gmt.conf)\n");
++ fprintf (stderr, "GMT Fatal Error: No SI/US keyword in GMT configuration file ($GMTHOME/share/gmt/gmt.conf)\n");
+ exit (EXIT_FAILURE);
+ }
+ }
+@@ -1509,7 +1509,7 @@
+ id = get;
+
+ id--; /* Get 0 or 1 */
+- sprintf (line, "%s%cshare%c.gmtdefaults_%s\0", GMTHOME, DIR_DELIM, DIR_DELIM, suffix[id]);
++ sprintf (line, "%s%cshare%cgmt%c.gmtdefaults_%s\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, suffix[id]);
+
+ path = (char *) GMT_memory (VNULL, (size_t)(strlen (line) + 1), (size_t)1, GMT_program);
+
+@@ -1643,7 +1643,7 @@
+
+ GMT_set_home ();
+
+- sprintf (line, "%s%cshare%cgmtmedia.d\0", GMTHOME, DIR_DELIM, DIR_DELIM);
++ sprintf (line, "%s%cshare%cgmt%cgmtmedia.d\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM);
+ if ((fp = fopen (line, "r")) == NULL) return (0);
+
+ n_alloc = GMT_TINY_CHUNK;
diff --git a/graphics/GMT/patches/patch-ae b/graphics/GMT/patches/patch-ae
new file mode 100644
index 00000000000..0ff0e6e937a
--- /dev/null
+++ b/graphics/GMT/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.1.1.1 2000/11/26 22:48:16 jtb Exp $
+
+--- src/gmt_support.c.orig Tue Oct 24 17:24:38 2000
++++ src/gmt_support.c
+@@ -3456,7 +3456,7 @@
+
+ /* First check the $GMTHOME/share directory */
+
+- sprintf (path, "%s%cshare%c%s\0", GMTHOME, DIR_DELIM, DIR_DELIM, name);
++ sprintf (path, "%s%cshare%cgmt%c%s\0", 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 */
+@@ -3470,7 +3470,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\0", GMTHOME, DIR_DELIM, DIR_DELIM);
++ sprintf (dir, "%s%cshare%cgmt%ccoastline.conf\0", 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);
diff --git a/graphics/GMT/patches/patch-af b/graphics/GMT/patches/patch-af
new file mode 100644
index 00000000000..0d970ac6dea
--- /dev/null
+++ b/graphics/GMT/patches/patch-af
@@ -0,0 +1,25 @@
+$NetBSD: patch-af,v 1.1.1.1 2000/11/26 22:48:17 jtb Exp $
+
+--- src/grd2cpt.c.orig Tue Oct 24 17:24:38 2000
++++ src/grd2cpt.c
+@@ -64,7 +64,7 @@
+
+ /* Get list of available color tables in GMT /share */
+
+- sprintf (CPT_lis, "%s%cshare%cGMT_CPT.lis\0", GMTHOME, DIR_DELIM, DIR_DELIM);
++ sprintf (CPT_lis, "%s%cshare%cgmt%cGMT_CPT.lis\0", 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);
+@@ -180,9 +180,9 @@
+
+ if (!ok) { /* No table in current dir, try /share */
+ if (table)
+- sprintf (CPT_file, "%s%cshare%cGMT_%s.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM, table);
++ sprintf (CPT_file, "%s%cshare%cgmt%cGMT_%s.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, table);
+ else /* Default to rainbow colors */
+- sprintf (CPT_file, "%s%cshare%cGMT_rainbow.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM);
++ sprintf (CPT_file, "%s%cshare%cgmt%cGMT_rainbow.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM);
+
+ if (access (CPT_file, R_OK)) {
+ fprintf (stderr, "%s: ERROR: Cannot find colortable %s\n", GMT_program, CPT_file);
diff --git a/graphics/GMT/patches/patch-ag b/graphics/GMT/patches/patch-ag
new file mode 100644
index 00000000000..2917cf7532f
--- /dev/null
+++ b/graphics/GMT/patches/patch-ag
@@ -0,0 +1,25 @@
+$NetBSD: patch-ag,v 1.1.1.1 2000/11/26 22:48:17 jtb Exp $
+
+--- src/makecpt.c.orig Tue Oct 24 17:24:39 2000
++++ src/makecpt.c
+@@ -48,7 +48,7 @@
+
+ /* Get list of available color tables in GMT /share */
+
+- sprintf (CPT_lis, "%s%cshare%cGMT_CPT.lis\0", GMTHOME, DIR_DELIM, DIR_DELIM);
++ sprintf (CPT_lis, "%s%cshare%cgmt%cGMT_CPT.lis\0", 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);
+@@ -132,9 +132,9 @@
+
+ if (!ok) { /* No table in current dir, try /share */
+ if (table)
+- sprintf (CPT_file, "%s%cshare%cGMT_%s.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM, table);
++ sprintf (CPT_file, "%s%cshare%cgmt%cGMT_%s.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, table);
+ else /* Default to rainbow colors */
+- sprintf (CPT_file, "%s%cshare%cGMT_rainbow.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM);
++ sprintf (CPT_file, "%s%cshare%cgmt%cGMT_rainbow.cpt\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM);
+
+ ok = !access (CPT_file, R_OK);
+ if (!ok) {
diff --git a/graphics/GMT/patches/patch-ah b/graphics/GMT/patches/patch-ah
new file mode 100644
index 00000000000..702b4f96621
--- /dev/null
+++ b/graphics/GMT/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1.1.1 2000/11/26 22:48:17 jtb Exp $
+
+--- src/grdreformat.c.orig Tue Oct 24 17:24:39 2000
++++ src/grdreformat.c
+@@ -86,7 +86,7 @@
+ GMT_explain_option ('V');
+
+ fprintf (stderr, " The following formats are supported\n\n");
+- sprintf (line, "%s%cshare%cgmtformats.d\0", GMTHOME, DIR_DELIM, DIR_DELIM);
++ sprintf (line, "%s%cshare%cgmt%cgmtformats.d\0", GMTHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM);
+ if ((fp = fopen (line, "r")) == NULL) {
+ fprintf (stderr, "%s: GMT ERROR: Cannot read file %s\n", GMT_program, line);
+ exit (EXIT_FAILURE);
diff --git a/graphics/GMT/patches/patch-ai b/graphics/GMT/patches/patch-ai
new file mode 100644
index 00000000000..f432415a804
--- /dev/null
+++ b/graphics/GMT/patches/patch-ai
@@ -0,0 +1,31 @@
+$NetBSD: patch-ai,v 1.1.1.1 2000/11/26 22:48:17 jtb Exp $
+
+--- src/pslib.c.orig Tue Oct 24 17:24:39 2000
++++ src/pslib.c
+@@ -786,7 +786,7 @@
+ if ((image_no >= 0 && image_no < N_PATTERNS) && ps_pattern_status[image_no][invert]) return (image_no); /* Already done this */
+
+ if ((image_no >= 0 && image_no < N_PATTERNS)) { /* Premade pattern yet not used */
+- sprintf (file, "%s%cshare%cps_pattern_%2.2d.ras\0", PSHOME, DIR_DELIM, DIR_DELIM, image_no);
++ sprintf (file, "%s%cshare%cgmt%cps_pattern_%2.2d.ras\0", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, image_no);
+ ps_pattern_status[image_no][invert] = 1;
+ }
+ else { /* User image, check to see if already used */
+@@ -804,7 +804,7 @@
+ if (!access (imagefile, R_OK))
+ strcpy (file, imagefile);
+ else
+- sprintf (file, "%s%cshare%c%s\0", PSHOME, DIR_DELIM, DIR_DELIM, imagefile);
++ sprintf (file, "%s%cshare%cgmt%c%s\0", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM, imagefile);
+ }
+ ps_user_image[ps_n_userimages].name = (char *) ps_memory (VNULL, (size_t)(strlen (imagefile)+1), sizeof (char));
+ strcpy (ps_user_image[ps_n_userimages].name, imagefile);
+@@ -3190,7 +3190,7 @@
+ /* Load PSL_text procedures from file for now */
+
+ if (PSL_first) {
+- sprintf (line, "%s%cshare%cPSL_text.ps\0", PSHOME, DIR_DELIM, DIR_DELIM);
++ sprintf (line, "%s%cshare%cgmt%cPSL_text.ps\0", PSHOME, DIR_DELIM, DIR_DELIM, DIR_DELIM);
+
+ if ((fp = fopen (line, "r")) == NULL) {
+ fprintf (stderr, "pslib: ERROR: Cannot open file %s\n", line);
diff --git a/graphics/GMT/patches/patch-aj b/graphics/GMT/patches/patch-aj
new file mode 100644
index 00000000000..86ff176c86f
--- /dev/null
+++ b/graphics/GMT/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1.1.1 2000/11/26 22:48:17 jtb Exp $
+
+--- src/gmt.h.orig Tue Nov 14 02:03:49 2000
++++ src/gmt.h
+@@ -53,6 +53,7 @@
+ * SYSTEM HEADER FILES
+ *--------------------------------------------------------------------*/
+
++#include <sys/types.h>
+ #include <ctype.h>
+ #include <float.h>
+ #include <math.h>
diff --git a/graphics/GMT/pkg/COMMENT b/graphics/GMT/pkg/COMMENT
new file mode 100644
index 00000000000..7c55d7c98fe
--- /dev/null
+++ b/graphics/GMT/pkg/COMMENT
@@ -0,0 +1 @@
+Generic Mapping Tools
diff --git a/graphics/GMT/pkg/DESCR b/graphics/GMT/pkg/DESCR
new file mode 100644
index 00000000000..897ae454837
--- /dev/null
+++ b/graphics/GMT/pkg/DESCR
@@ -0,0 +1,9 @@
+GMT is a free collection of ~60 UNIX tools that allow users to
+manipulate (x,y) and (x,y,z) data sets (including filtering, trend
+fitting, gridding, projecting, etc.) and produce Encapsulated
+PostScript File (EPS) illustrations ranging from simple x-y plots
+through contour maps to artificially illuminated surfaces and 3-D
+perspective views in black and white, gray tone, hachure patterns, and
+24-bit color. GMT supports 25 common map projections plus linear, log,
+and power scaling, and comes with support data such as coastlines,
+rivers, and political boundaries.
diff --git a/graphics/GMT/pkg/PLIST b/graphics/GMT/pkg/PLIST
new file mode 100644
index 00000000000..73086043ca6
--- /dev/null
+++ b/graphics/GMT/pkg/PLIST
@@ -0,0 +1,290 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/26 22:48:19 jtb Exp $
+bin/blockmean
+bin/blockmedian
+bin/blockmode
+bin/filter1d
+bin/fitcircle
+bin/gmtconvert
+bin/gmtdefaults
+bin/gmtmath
+bin/gmtselect
+bin/gmtset
+bin/grd2cpt
+bin/grd2xyz
+bin/grdclip
+bin/grdcontour
+bin/grdcut
+bin/grdedit
+bin/grdfft
+bin/grdfilter
+bin/grdgradient
+bin/grdhisteq
+bin/grdimage
+bin/grdinfo
+bin/grdlandmask
+bin/grdmask
+bin/grdmath
+bin/grdpaste
+bin/grdproject
+bin/grdreformat
+bin/grdsample
+bin/grdtrack
+bin/grdtrend
+bin/grdvector
+bin/grdview
+bin/grdvolume
+bin/makecpt
+bin/mapproject
+bin/minmax
+bin/nearneighbor
+bin/project
+bin/psbasemap
+bin/psclip
+bin/pscoast
+bin/pscontour
+bin/pshistogram
+bin/psimage
+bin/psmask
+bin/psrose
+bin/psscale
+bin/pstext
+bin/pswiggle
+bin/psxy
+bin/psxyz
+bin/sample1d
+bin/spectrum1d
+bin/splitxyz
+bin/surface
+bin/trend1d
+bin/trend2d
+bin/triangulate
+bin/xyz2grd
+include/gmt/gmt.h
+include/gmt/gmt_bcr.h
+include/gmt/gmt_boundcond.h
+include/gmt/gmt_colors.h
+include/gmt/gmt_customio.h
+include/gmt/gmt_funcnames.h
+include/gmt/gmt_grd.h
+include/gmt/gmt_grdio.h
+include/gmt/gmt_io.h
+include/gmt/gmt_keywords.h
+include/gmt/gmt_map.h
+include/gmt/gmt_math.h
+include/gmt/gmt_nan.h
+include/gmt/gmt_notposix.h
+include/gmt/gmt_notunix.h
+include/gmt/gmt_project.h
+include/gmt/gmt_shore.h
+include/gmt/gmt_unique.h
+include/gmt/pslib.h
+lib/libgmt.a
+lib/libgmt.la
+lib/libgmt.so.0.0
+lib/libpsl.a
+lib/libpsl.la
+lib/libpsl.so.0.0
+share/gmt/.gmtdefaults_SI
+share/gmt/.gmtdefaults_SI.orig
+share/gmt/.gmtdefaults_US
+share/gmt/.gmtdefaults_US.orig
+share/gmt/GMT_CPT.lis
+share/gmt/GMT_cool.cpt
+share/gmt/GMT_copper.cpt
+share/gmt/GMT_gebco.cpt
+share/gmt/GMT_globe.cpt
+share/gmt/GMT_gray.cpt
+share/gmt/GMT_haxby.cpt
+share/gmt/GMT_hot.cpt
+share/gmt/GMT_jet.cpt
+share/gmt/GMT_no_green.cpt
+share/gmt/GMT_ocean.cpt
+share/gmt/GMT_polar.cpt
+share/gmt/GMT_rainbow.cpt
+share/gmt/GMT_red2green.cpt
+share/gmt/GMT_relief.cpt
+share/gmt/GMT_sealand.cpt
+share/gmt/GMT_seis.cpt
+share/gmt/GMT_split.cpt
+share/gmt/GMT_topo.cpt
+share/gmt/GMT_wysiwyg.cpt
+share/gmt/PSL_text.ps
+share/gmt/binned_GSHHS_c.cdf
+share/gmt/binned_GSHHS_i.cdf
+share/gmt/binned_GSHHS_l.cdf
+share/gmt/binned_border_c.cdf
+share/gmt/binned_border_i.cdf
+share/gmt/binned_border_l.cdf
+share/gmt/binned_river_c.cdf
+share/gmt/binned_river_i.cdf
+share/gmt/binned_river_l.cdf
+share/gmt/gmt.conf
+share/gmt/gmt.conf.orig
+share/gmt/gmtformats.d
+share/gmt/gmtmedia.d
+share/gmt/ps_pattern_01.ras
+share/gmt/ps_pattern_02.ras
+share/gmt/ps_pattern_03.ras
+share/gmt/ps_pattern_04.ras
+share/gmt/ps_pattern_05.ras
+share/gmt/ps_pattern_06.ras
+share/gmt/ps_pattern_07.ras
+share/gmt/ps_pattern_08.ras
+share/gmt/ps_pattern_09.ras
+share/gmt/ps_pattern_10.ras
+share/gmt/ps_pattern_11.ras
+share/gmt/ps_pattern_12.ras
+share/gmt/ps_pattern_13.ras
+share/gmt/ps_pattern_14.ras
+share/gmt/ps_pattern_15.ras
+share/gmt/ps_pattern_16.ras
+share/gmt/ps_pattern_17.ras
+share/gmt/ps_pattern_18.ras
+share/gmt/ps_pattern_19.ras
+share/gmt/ps_pattern_20.ras
+share/gmt/ps_pattern_21.ras
+share/gmt/ps_pattern_22.ras
+share/gmt/ps_pattern_23.ras
+share/gmt/ps_pattern_24.ras
+share/gmt/ps_pattern_25.ras
+share/gmt/ps_pattern_26.ras
+share/gmt/ps_pattern_27.ras
+share/gmt/ps_pattern_28.ras
+share/gmt/ps_pattern_29.ras
+share/gmt/ps_pattern_30.ras
+share/gmt/ps_pattern_31.ras
+share/gmt/ps_pattern_32.ras
+share/gmt/ps_pattern_33.ras
+share/gmt/ps_pattern_34.ras
+share/gmt/ps_pattern_35.ras
+share/gmt/ps_pattern_36.ras
+share/gmt/ps_pattern_37.ras
+share/gmt/ps_pattern_38.ras
+share/gmt/ps_pattern_39.ras
+share/gmt/ps_pattern_40.ras
+share/gmt/ps_pattern_41.ras
+share/gmt/ps_pattern_42.ras
+share/gmt/ps_pattern_43.ras
+share/gmt/ps_pattern_44.ras
+share/gmt/ps_pattern_45.ras
+share/gmt/ps_pattern_46.ras
+share/gmt/ps_pattern_47.ras
+share/gmt/ps_pattern_48.ras
+share/gmt/ps_pattern_49.ras
+share/gmt/ps_pattern_50.ras
+share/gmt/ps_pattern_51.ras
+share/gmt/ps_pattern_52.ras
+share/gmt/ps_pattern_53.ras
+share/gmt/ps_pattern_54.ras
+share/gmt/ps_pattern_55.ras
+share/gmt/ps_pattern_56.ras
+share/gmt/ps_pattern_57.ras
+share/gmt/ps_pattern_58.ras
+share/gmt/ps_pattern_59.ras
+share/gmt/ps_pattern_60.ras
+share/gmt/ps_pattern_61.ras
+share/gmt/ps_pattern_62.ras
+share/gmt/ps_pattern_63.ras
+share/gmt/ps_pattern_64.ras
+share/gmt/ps_pattern_65.ras
+share/gmt/ps_pattern_66.ras
+share/gmt/ps_pattern_67.ras
+share/gmt/ps_pattern_68.ras
+share/gmt/ps_pattern_69.ras
+share/gmt/ps_pattern_70.ras
+share/gmt/ps_pattern_71.ras
+share/gmt/ps_pattern_72.ras
+share/gmt/ps_pattern_73.ras
+share/gmt/ps_pattern_74.ras
+share/gmt/ps_pattern_75.ras
+share/gmt/ps_pattern_76.ras
+share/gmt/ps_pattern_77.ras
+share/gmt/ps_pattern_78.ras
+share/gmt/ps_pattern_79.ras
+share/gmt/ps_pattern_80.ras
+share/gmt/ps_pattern_81.ras
+share/gmt/ps_pattern_82.ras
+share/gmt/ps_pattern_83.ras
+share/gmt/ps_pattern_84.ras
+share/gmt/ps_pattern_85.ras
+share/gmt/ps_pattern_86.ras
+share/gmt/ps_pattern_87.ras
+share/gmt/ps_pattern_88.ras
+share/gmt/ps_pattern_89.ras
+share/gmt/ps_pattern_90.ras
+man/manl/blockmean.l
+man/manl/blockmedian.l
+man/manl/blockmode.l
+man/manl/filter1d.l
+man/manl/fitcircle.l
+man/manl/gmt.l
+man/manl/gmtconvert.l
+man/manl/gmtdefaults.l
+man/manl/gmtmath.l
+man/manl/gmtselect.l
+man/manl/gmtset.l
+man/manl/grd2cpt.l
+man/manl/grd2xyz.l
+man/manl/grdclip.l
+man/manl/grdcontour.l
+man/manl/grdcut.l
+man/manl/grdedit.l
+man/manl/grdfft.l
+man/manl/grdfilter.l
+man/manl/grdgradient.l
+man/manl/grdhisteq.l
+man/manl/grdimage.l
+man/manl/grdinfo.l
+man/manl/grdlandmask.l
+man/manl/grdmask.l
+man/manl/grdmath.l
+man/manl/grdpaste.l
+man/manl/grdproject.l
+man/manl/grdreformat.l
+man/manl/grdsample.l
+man/manl/grdtrack.l
+man/manl/grdtrend.l
+man/manl/grdvector.l
+man/manl/grdview.l
+man/manl/grdvolume.l
+man/manl/makecpt.l
+man/manl/mapproject.l
+man/manl/minmax.l
+man/manl/nearneighbor.l
+man/manl/project.l
+man/manl/psbasemap.l
+man/manl/psclip.l
+man/manl/pscoast.l
+man/manl/pscontour.l
+man/manl/pshistogram.l
+man/manl/psimage.l
+man/manl/pslib.l
+man/manl/psmask.l
+man/manl/psrose.l
+man/manl/psscale.l
+man/manl/pstext.l
+man/manl/pswiggle.l
+man/manl/psxy.l
+man/manl/psxyz.l
+man/manl/sample1d.l
+man/manl/spectrum1d.l
+man/manl/splitxyz.l
+man/manl/surface.l
+man/manl/trend1d.l
+man/manl/trend2d.l
+man/manl/triangulate.l
+man/manl/xyz2grd.l
+share/doc/gmt/GMT_Docs.ps
+share/doc/gmt/GMT_Tutorial.ps
+share/examples/gmt/bermuda.grd
+share/examples/gmt/data
+share/examples/gmt/quakes.cpt
+share/examples/gmt/quakes.ngdc
+share/examples/gmt/ship.xyz
+share/examples/gmt/topo.cpt
+share/examples/gmt/us.grd
+@dirrm share/examples/gmt/tutorial
+@dirrm share/examples/gmt
+@unexec rmdir %D/include/gmt 2>/dev/null || true
+@unexec rmdir %D/share/doc/gmt 2>/dev/null || true
+@unexec rmdir %D/share/gmt 2>/dev/null || true