summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/GMT/Makefile6
-rw-r--r--graphics/GMT/distinfo13
-rw-r--r--graphics/GMT/patches/patch-aj13
-rw-r--r--graphics/GMT/patches/patch-al18
-rw-r--r--graphics/GMT/patches/patch-aq6
-rw-r--r--graphics/GMT/patches/patch-at13
-rw-r--r--graphics/GMT/patches/patch-aw7
-rw-r--r--graphics/GMT/patches/patch-ay13
8 files changed, 59 insertions, 30 deletions
diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile
index 871ef6242a8..c5af7cc67a3 100644
--- a/graphics/GMT/Makefile
+++ b/graphics/GMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/04/19 20:51:30 jtb Exp $
+# $NetBSD: Makefile,v 1.13 2001/04/20 17:16:19 jtb Exp $
DISTNAME= GMT3.4
PKGNAME= GMT-3.4
@@ -17,7 +17,7 @@ MAINTAINER= packages@netbsd.org
HOMEPAGE= http://imina.soest.hawaii.edu/gmt/
COMMENT= Generic Mapping Tools
-DEPENDS+= netcdf>=3.2:../../devel/netcdf
+DEPENDS+= netcdf>=3.4:../../devel/netcdf
EXTRACT_SUFFIX= .tar.bz2
DIST_SUBDIR= ${DISTNAME}
@@ -59,6 +59,6 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gmt
${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${WRKSRC}/examples/
(cd ${WRKSRC}/examples; ${GTAR} cf - . ) | \
- (cd ${PREFIX}/share/examples/gmt/; ${GTAR} xvf - )
+ (cd ${PREFIX}/share/examples/gmt/; ${GTAR} xf - )
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/GMT/distinfo b/graphics/GMT/distinfo
index bd787e486e5..1d17a0791b3 100644
--- a/graphics/GMT/distinfo
+++ b/graphics/GMT/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/04/19 21:36:30 jtb Exp $
+$NetBSD: distinfo,v 1.5 2001/04/20 17:16:19 jtb Exp $
SHA1 (GMT3.4/GMT3.4_progs.tar.bz2) = b9fa8f60fe20ff9509ef3ebdf15fcc74e01d3f95
Size (GMT3.4/GMT3.4_progs.tar.bz2) = 551406 bytes
@@ -25,19 +25,20 @@ SHA1 (patch-af) = eac4b86614b6ffe88a3790b37b3f0b17f999947d
SHA1 (patch-ag) = d78cf5b95dd18e4aa5aca68fd62a5793ec7d966f
SHA1 (patch-ah) = 80fe4869af2c3c2eacf4f24dd9e6585153479f41
SHA1 (patch-ai) = 039e4164425eed0a3ea03867cce3f55c0ee36d4a
+SHA1 (patch-aj) = 1b4994e217756f1a6978e6b4bbc3e7e7b2a26351
SHA1 (patch-ak) = 78a08380047c154cf11ad41d94619e05375b7a6d
-SHA1 (patch-al) = 56df465d532b01c8ea065717e6a66799cc1a8916
+SHA1 (patch-al) = 21b50de82954941058ca8fc81337b013f67f878c
SHA1 (patch-am) = cbff4b734cabea337a504779d92a17584064a9f0
SHA1 (patch-an) = c043f414d4bf96a788637663f81eb3eb46f65995
SHA1 (patch-ao) = 671e4bfb66628e231e193c807aca8866cc09cc52
SHA1 (patch-ap) = 3475a19a50375dd50aba4ac0dda0d55acc085635
-SHA1 (patch-aq) = cb36055875a8de6a7fa894b2b747dd148c7a132e
+SHA1 (patch-aq) = f131f99906396c617a7c6d9af9e0de54545f3cf6
SHA1 (patch-ar) = f5628cff11b6330207c3c87217c8c00eb2f596e5
SHA1 (patch-as) = 42da16147de379bc55a0f6e0f4e7aeb62cfc9843
-SHA1 (patch-at) = 4d85b3961c88c95652a58a76fa5eadf32399a01f
+SHA1 (patch-at) = 34f44f67ac054ab13c66300cac7a5d1e94a51a86
SHA1 (patch-au) = d4ac8225cdd83f81b71af7ca26d79a45bb76e283
SHA1 (patch-av) = fcc8aafb4a8163c0eb38744b9c7a05162d57db08
-SHA1 (patch-aw) = 52375a2781c5e8085d84dbee245b6bae2d6eb2cf
+SHA1 (patch-aw) = c9f81b674e8f0428d0bba521e3e58a6baf925ec8
SHA1 (patch-ax) = 2475174e67f445a0f025cf409832676dfda96db9
-SHA1 (patch-ay) = 7ed3c53a48d8387bb4fb2a0b51bddc07bafd08d7
+SHA1 (patch-ay) = b88f4585958d22aff356094dd9050fad06c67c5b
SHA1 (patch-az) = 4db3d50e182e2efb7d60ae7746c062dfffed5f2f
diff --git a/graphics/GMT/patches/patch-aj b/graphics/GMT/patches/patch-aj
new file mode 100644
index 00000000000..6b2d68e3c72
--- /dev/null
+++ b/graphics/GMT/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.4 2001/04/20 17:16:19 jtb Exp $
+
+--- src/GMT.in.orig
++++ src/GMT.in
+@@ -123,7 +123,7 @@
+ By default, those man pages are in @prefix@/man/man@mansection@.
+ Information is also available on the GMT World Wide Web home page
+ (http://gmt.soest.hawaii.edu) and, if installed, locally from
+-@prefix@/www/gmt/gmt_services.html.
++@prefix@/share/doc/html/gmt/gmt_services.html.
+ EOF
+ exit
+ fi
diff --git a/graphics/GMT/patches/patch-al b/graphics/GMT/patches/patch-al
index 4b4e017dbc2..39c516598bf 100644
--- a/graphics/GMT/patches/patch-al
+++ b/graphics/GMT/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.2 2001/04/19 20:51:32 jtb Exp $
+$NetBSD: patch-al,v 1.3 2001/04/20 17:16:19 jtb Exp $
---- ./src/mgg/makefile.orig Wed Apr 11 19:58:09 2001
-+++ ./src/mgg/makefile
+--- src/mgg/makefile.orig Wed Apr 11 19:58:09 2001
++++ src/mgg/makefile
@@ -22,7 +22,7 @@
include ../makegmt.macros
@@ -11,13 +11,13 @@ $NetBSD: patch-al,v 1.2 2001/04/19 20:51:32 jtb Exp $
MGG_H = gmt_mgg.h
-@@ -45,16 +45,13 @@
+@@ -44,18 +44,15 @@
+ #-------------------------------------------------------------------------------
install: all
- for i in $(MGG); do \
+- for i in $(MGG); do \
- $(INSTALL) $$i$(EXE) $(bindir); \
-+ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
- done
+- done
if [ ! -d $(libdir) ]; then \
mkdir -p $(libdir); \
fi
@@ -28,8 +28,12 @@ $NetBSD: patch-al,v 1.2 2001/04/19 20:51:32 jtb Exp $
- fi; \
+ $(LIBTOOL) $(INSTALL_DATA) libgmt_mgg.la $(libdir); \
fi
++ for i in $(MGG); do \
++ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
++ done
uninstall:
+ for i in $(MGG); do \
@@ -82,8 +79,7 @@
#-------------------------------------------------------------------------------
diff --git a/graphics/GMT/patches/patch-aq b/graphics/GMT/patches/patch-aq
index 524d33c1b39..8a13f650038 100644
--- a/graphics/GMT/patches/patch-aq
+++ b/graphics/GMT/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.2 2001/04/19 20:51:32 jtb Exp $
+$NetBSD: patch-aq,v 1.3 2001/04/20 17:16:19 jtb Exp $
--- src/misc/makefile.orig Wed Apr 11 19:58:09 2001
+++ src/misc/makefile
@@ -25,8 +25,8 @@ $NetBSD: patch-aq,v 1.2 2001/04/19 20:51:32 jtb Exp $
$(MISC): $(MISC_O)
- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) -o $@
-+ $(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $@.lo ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
++ @$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $@.lo ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
.c.o:
- $(CC) -c $(CFLAGS) $<
-+ $(LIBTOOL) $(CPPFLAGS) $(CC) -c $(CFLAGS) $<
++ @$(LIBTOOL) $(CPPFLAGS) $(CC) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-at b/graphics/GMT/patches/patch-at
index 33ebef41b8f..53f4364a0f3 100644
--- a/graphics/GMT/patches/patch-at
+++ b/graphics/GMT/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.3 2001/04/19 21:36:31 jtb Exp $
+$NetBSD: patch-at,v 1.4 2001/04/20 17:16:19 jtb Exp $
--- src/x2sys/makefile.orig Wed Apr 11 19:58:09 2001
+++ src/x2sys/makefile
@@ -11,7 +11,7 @@ $NetBSD: patch-at,v 1.3 2001/04/19 21:36:31 jtb Exp $
XSYSTEM_H = x2sys.h
XSYSTEM_C = x2sys_datalist.c x2sys_cross.c
-@@ -18,24 +18,20 @@
+@@ -18,25 +18,21 @@
#---------------------------------------------------------------
@@ -25,10 +25,9 @@ $NetBSD: patch-at,v 1.3 2001/04/19 21:36:31 jtb Exp $
+all: libx2sys.la $(XSYSTEM)
install: all
- for i in $(XSYSTEM); do \
+- for i in $(XSYSTEM); do \
- $(INSTALL) $$i$(EXE) $(bindir); \
-+ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
- done
+- done
if [ ! -d $(libdir) ]; then \
mkdir -p $(libdir); \
fi
@@ -39,8 +38,12 @@ $NetBSD: patch-at,v 1.3 2001/04/19 21:36:31 jtb Exp $
- fi; \
+ $(LIBTOOL) $(INSTALL_DATA) libx2sys.la $(libdir); \
fi
++ for i in $(XSYSTEM); do \
++ $(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
++ done
uninstall:
+ for i in $(XSYSTEM); do \
@@ -59,7 +55,7 @@
\rm -f *.a
diff --git a/graphics/GMT/patches/patch-aw b/graphics/GMT/patches/patch-aw
index 2fd4d4aad6e..3964228f735 100644
--- a/graphics/GMT/patches/patch-aw
+++ b/graphics/GMT/patches/patch-aw
@@ -1,11 +1,10 @@
-$NetBSD: patch-aw,v 1.1 2001/01/27 08:16:02 jtb Exp $
+$NetBSD: patch-aw,v 1.2 2001/04/20 17:16:19 jtb Exp $
---- src/meca/meca.h.orig Sun Dec 10 14:43:19 2000
+--- src/meca/meca.h.orig Fri Dec 29 22:10:37 2000
+++ src/meca/meca.h
-@@ -1,5 +1,6 @@
+@@ -2,4 +2,5 @@
#include <stdio.h>
#include <math.h>
+#include <sys/types.h>
#define EPSIL 0.0001
-
diff --git a/graphics/GMT/patches/patch-ay b/graphics/GMT/patches/patch-ay
index e0d726e839a..7425e241d08 100644
--- a/graphics/GMT/patches/patch-ay
+++ b/graphics/GMT/patches/patch-ay
@@ -1,7 +1,16 @@
-$NetBSD: patch-ay,v 1.4 2001/04/19 20:51:33 jtb Exp $
+$NetBSD: patch-ay,v 1.5 2001/04/20 17:16:19 jtb Exp $
---- src/dbase/grdraster.c.orig Thu Apr 19 18:16:18 2001
+--- src/dbase/grdraster.c.orig Wed Apr 11 23:07:29 2001
+++ src/dbase/grdraster.c
+@@ -41,7 +41,7 @@
+ BOOLEAN swap_me; /* TRUE if data set need to be swapped */
+ };
+
+-#if WORDS_BIGENDIAN == 0
++#if BYTE_ORDER == LITTLE_ENDIAN
+ char my_endian = 'L'; /* This machine is Little endian */
+ #else
+ char my_endian = 'B'; /* This machine is Big endian */
@@ -601,7 +601,7 @@
struct RASTER_INFO *rasinfo;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 09:15:00 +0000