summaryrefslogtreecommitdiff
path: root/graphics/GMT/patches
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/GMT/patches')
-rw-r--r--graphics/GMT/patches/patch-aa30
-rw-r--r--graphics/GMT/patches/patch-ac4
-rw-r--r--graphics/GMT/patches/patch-aj18
-rw-r--r--graphics/GMT/patches/patch-ak27
-rw-r--r--graphics/GMT/patches/patch-al48
-rw-r--r--graphics/GMT/patches/patch-am48
-rw-r--r--graphics/GMT/patches/patch-an30
-rw-r--r--graphics/GMT/patches/patch-ao35
-rw-r--r--graphics/GMT/patches/patch-ap51
-rw-r--r--graphics/GMT/patches/patch-aq32
-rw-r--r--graphics/GMT/patches/patch-ar43
-rw-r--r--graphics/GMT/patches/patch-as48
-rw-r--r--graphics/GMT/patches/patch-at51
-rw-r--r--graphics/GMT/patches/patch-au43
-rw-r--r--graphics/GMT/patches/patch-av13
-rw-r--r--graphics/GMT/patches/patch-aw11
-rw-r--r--graphics/GMT/patches/patch-ax22
-rw-r--r--graphics/GMT/patches/patch-ay34
18 files changed, 562 insertions, 26 deletions
diff --git a/graphics/GMT/patches/patch-aa b/graphics/GMT/patches/patch-aa
index 0ba14c72a06..60e737730d0 100644
--- a/graphics/GMT/patches/patch-aa
+++ b/graphics/GMT/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2000/12/14 00:44:08 jtb Exp $
+$NetBSD: patch-aa,v 1.4 2001/01/27 08:16:01 jtb Exp $
--- src/Makefile.orig Wed Oct 18 03:30:08 2000
+++ src/Makefile
@@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 2000/12/14 00:44:08 jtb Exp $
NETCDFINC = $(NETCDF)/include
CFLAGS = -I$(NETCDFINC) $(WIN32) $(CC_OPT) -DGMT_DEFAULT_PATH=\"$(GMT_DEFAULT_PATH)\" $(TRIANGLE_D)
-CDF = -L$(NETCDFLIB) -lnetcdf
-+CDF = -L$(NETCDFLIB) -Wl,-R$(NETCDFLIB) -lnetcdf
++CDF = -Wl,-R$(NETCDFLIB) -L$(NETCDFLIB) -lnetcdf
PS = -lpsl
GMT = -lgmt
@@ -17,7 +17,7 @@ $NetBSD: patch-aa,v 1.3 2000/12/14 00:44:08 jtb Exp $
-SHARED_LIB = libpsl.a libgmt.a libpsl.$(SL) libgmt.$(SL)
-STATIC_LIB = libpsl.a libgmt.a
-+SHARED_LIB = libpsl libgmt
++SHARED_LIB = libpsl.la libgmt.la
+STATIC_LIB =
#-------------------------------------------------------------------------------
@@ -50,8 +50,8 @@ $NetBSD: patch-aa,v 1.3 2000/12/14 00:44:08 jtb Exp $
- $(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);\
++ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) libpsl.la $(libdir);\
++ $(LIBTOOL) --mode=install $(BSD_INSTALL_DATA) libgmt.la $(libdir);\
+ fi
+ if [ ! -d $(bindir) ]; then \
+ mkdir -p $(bindir); \
@@ -89,18 +89,18 @@ $NetBSD: patch-aa,v 1.3 2000/12/14 00:44:08 jtb Exp $
#-------------------------------------------------------------------------------
-libs: $(GMTLIB)
-+libs: libpsl libgmt
++libs: libpsl.la libgmt.la
-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) --version-info 0:0
++libpsl.la: pslib.o
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ \
++ pslib.lo -lm -rpath $(libdir) --version-info 0:0
pslib.o: pslib.c $(PS_H)
- $(CC) $(CFLAGS) -c pslib.c
-+ @$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c pslib.c
++ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c pslib.c
-libgmt.a: $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O)
- $(AR) cvur $@ $?
@@ -111,10 +111,10 @@ $NetBSD: patch-aa,v 1.3 2000/12/14 00:44:08 jtb Exp $
-
-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 \
++libgmt.la: $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ \
+ $(LIB_O:.o=.lo) $(TRIANGLE_O:.o=.lo) $(ALPHA_SINCOS_O.o=.lo) \
-+ -rpath $(libdir) --version-info 0:0
++ $(LDFLAGS) $(CDF) $(LIB) -rpath $(libdir) --version-info 0:0
#-------------------------------------------------------------------------------
# program dependencies
@@ -122,9 +122,9 @@ $NetBSD: patch-aa,v 1.3 2000/12/14 00:44:08 jtb Exp $
$(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 $@
++ $(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) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-ac b/graphics/GMT/patches/patch-ac
index 49e63b1109b..8f157756bef 100644
--- a/graphics/GMT/patches/patch-ac
+++ b/graphics/GMT/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/11/26 22:48:16 jtb Exp $
+$NetBSD: patch-ac,v 1.2 2001/01/27 08:16:01 jtb Exp $
--- configure.in.orig Wed Oct 18 02:59:42 2000
+++ configure.in
@@ -14,7 +14,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2000/11/26 22:48:16 jtb Exp $
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_SUBST(LIBTOOL)
AC_PROG_INSTALL
+AC_SUBST(INSTALL_PROGRAM)
+AC_SUBST(INSTALL_SCRIPT)
diff --git a/graphics/GMT/patches/patch-aj b/graphics/GMT/patches/patch-aj
index 86ff176c86f..258667751c5 100644
--- a/graphics/GMT/patches/patch-aj
+++ b/graphics/GMT/patches/patch-aj
@@ -1,12 +1,12 @@
-$NetBSD: patch-aj,v 1.1.1.1 2000/11/26 22:48:17 jtb Exp $
+$NetBSD: patch-aj,v 1.2 2001/01/27 08:16:01 jtb Exp $
---- src/gmt.h.orig Tue Nov 14 02:03:49 2000
-+++ src/gmt.h
-@@ -53,6 +53,7 @@
- * SYSTEM HEADER FILES
- *--------------------------------------------------------------------*/
+--- src/meca/pspolar.c.orig Sat Jan 27 04:08:41 2001
++++ src/meca/pspolar.c
+@@ -19,6 +19,7 @@
+ *
+ */
+#include <sys/types.h>
- #include <ctype.h>
- #include <float.h>
- #include <math.h>
+ #include <string.h>
+ #include "gmt.h" /* to have gmt environment */
+
diff --git a/graphics/GMT/patches/patch-ak b/graphics/GMT/patches/patch-ak
new file mode 100644
index 00000000000..14aaab8be6c
--- /dev/null
+++ b/graphics/GMT/patches/patch-ak
@@ -0,0 +1,27 @@
+$NetBSD: patch-ak,v 1.1 2001/01/27 08:16:01 jtb Exp $
+
+--- src/dbase/makefile.orig Wed Oct 18 03:01:08 2000
++++ src/dbase/makefile
+@@ -14,18 +14,18 @@
+ all: grdraster
+
+ install: all
+- $(INSTALL) grdraster$(EXE) $(bindir)
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) grdraster$(EXE) $(bindir)
+
+ uninstall:
+ \rm -f $(bindir)/grdraster$(EXE)
+
+ grdraster: grdraster.o
+- $(CC) $(CFLAGS) $(LDFLAGS) grdraster.o -L.. -lgmt -lpsl $(CDF) $(LIBS) -o grdraster
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) grdraster.o ../libgmt.la ../libpsl.la $(CDF) $(LIBS) -o grdraster
+
+ spotless: clean
+
+ clean:
+- rm -f *.o grdraster$(EXE)
++ rm -f *.o *.lo .libs grdraster$(EXE)
+
+ .c.o:
+- $(CC) -c $(CFLAGS) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-al b/graphics/GMT/patches/patch-al
new file mode 100644
index 00000000000..e458d8fd532
--- /dev/null
+++ b/graphics/GMT/patches/patch-al
@@ -0,0 +1,48 @@
+$NetBSD: patch-al,v 1.1 2001/01/27 08:16:01 jtb Exp $
+
+--- src/mgg/makefile.orig Wed Oct 18 03:01:19 2000
++++ src/mgg/makefile
+@@ -45,7 +45,7 @@
+
+ install: all
+ for i in $(MGG); do \
+- $(INSTALL) $$i$(EXE) $(bindir); \
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
+ done
+
+ uninstall:
+@@ -54,21 +54,20 @@
+ done
+
+ clean:
+- rm -f *.o
++ rm -f *.o *.lo
+ for i in $(MGG); do \
+ rm -f $$i$(EXE); \
+ done
+
+ spotless: clean
+- rm -f *.a
++ rm -fr .libs *.la
+
+ #-------------------------------------------------------------------------------
+ # library
+ #-------------------------------------------------------------------------------
+
+ libgmt_mgg.a: gmt_mgg.o
+- $(AR) cvr libgmt_mgg.a $?
+- $(RANLIB) libgmt_mgg.a
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ gmt_mgg.lo
+
+ gmt_mgg.o: $(MGG_H)
+
+@@ -77,7 +76,7 @@
+ #-------------------------------------------------------------------------------
+
+ $(MGG): libgmt_mgg.a $(MGG_O)
+- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lgmt_mgg -L.. -lpsl -lgmt $(CDF) $(LIBS) -o $@
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lgmt_mgg ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
+
+ .c.o:
+- $(CC) -c $(CFLAGS) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-am b/graphics/GMT/patches/patch-am
new file mode 100644
index 00000000000..f2c6c82b544
--- /dev/null
+++ b/graphics/GMT/patches/patch-am
@@ -0,0 +1,48 @@
+$NetBSD: patch-am,v 1.1 2001/01/27 08:16:01 jtb Exp $
+
+--- src/cps/makefile.orig Wed Oct 18 03:01:09 2000
++++ src/cps/makefile
+@@ -12,35 +12,34 @@
+ all: cpsencode cpsdecode
+
+ install: all
+- $(INSTALL) cpsencode$(EXE) $(bindir)
+- $(INSTALL) cpsdecode$(EXE) $(bindir)
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cpsencode$(EXE) $(bindir)
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) cpsdecode$(EXE) $(bindir)
+
+ uninstall:
+ \rm -f $(bindir)/cpsencode$(EXE)
+ \rm -f $(bindir)/cpsdecode$(EXE)
+
+ spotless: clean
+- \rm -f *.a
++ \rm -fr .libs *.la
+
+ clean:
+- rm -f *.o cpsencode$(EXE) cpsdecode$(EXE)
++ rm -f *.o *.lo cpsencode$(EXE) cpsdecode$(EXE)
+
+ #-------------------------------------------------------------------------------
+ # library
+ #-------------------------------------------------------------------------------
+
+ libuu.a: libuu.o
+- $(AR) cvr libuu.a $?
+- $(RANLIB) libuu.a
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ libuu.lo
+
+ cpsencode: cpsencode.o libuu.a
+- $(CC) $(CFLAGS) $(LDFLAGS) cpsencode.o -L. -luu -o cpsencode
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $? -o $@
+
+ cpsdecode: cpsdecode.o libuu.a
+- $(CC) $(CFLAGS) $(LDFLAGS) cpsdecode.o -L. -luu -o cpsdecode
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $? -o $@
+
+ .c.o:
+- $(CC) -c $(CFLAGS) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
+
+ cpsencode.c: cps.h uu.h
+
diff --git a/graphics/GMT/patches/patch-an b/graphics/GMT/patches/patch-an
new file mode 100644
index 00000000000..8d9c5f05172
--- /dev/null
+++ b/graphics/GMT/patches/patch-an
@@ -0,0 +1,30 @@
+$NetBSD: patch-an,v 1.1 2001/01/27 08:16:01 jtb Exp $
+
+--- src/gshhs/makefile.orig Sat Jan 27 03:10:36 2001
++++ src/gshhs/makefile
+@@ -12,19 +12,19 @@
+ all: gshhs gshhs_dp
+
+ install: all
+- $(INSTALL) gshhs$(EXE) $(bindir)
+- $(INSTALL) gshhs_dp$(EXE) $(bindir)
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) gshhs$(EXE) $(bindir)
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) gshhs_dp$(EXE) $(bindir)
+
+ clean:
+- \rm -f *.o *% gshhs$(EXE) gshhs_dp$(EXE)
++ \rm -f *.o *.lo .libs *% gshhs$(EXE) gshhs_dp$(EXE)
+
+ spotless: clean
+
+ gshhs: gshhs.o
+- $(CC) $(CFLAGS) gshhs.o $(LIBS) $(LDFLAGS) -o gshhs
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) gshhs.lo $(LIBS) $(LDFLAGS) -o $@
+
+ gshhs_dp: gshhs_dp.o
+- $(CC) $(CFLAGS) gshhs_dp.o $(LIBS) $(LDFLAGS) -o gshhs_dp
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) gshhs_dp.lo $(LIBS) $(LDFLAGS) -o $@
+
+ .c.o:
+- $(CC) -c $(CFLAGS) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-ao b/graphics/GMT/patches/patch-ao
new file mode 100644
index 00000000000..a1bb3a5fcc9
--- /dev/null
+++ b/graphics/GMT/patches/patch-ao
@@ -0,0 +1,35 @@
+$NetBSD: patch-ao,v 1.1 2001/01/27 08:16:01 jtb Exp $
+
+--- src/imgsrc/makefile.orig Sat Jan 27 03:13:35 2001
++++ src/imgsrc/makefile
+@@ -7,24 +7,24 @@
+ include ../makegmt.macros
+
+ CDF = -L$(NETCDF)/lib -lnetcdf
+-GMT = -L.. -lgmt -lpsl
++GMT = ../libgmt.la ../libpsl.la
+ CFLAGS = $(CC_OPT) $(WIN32) -I.. -I$(NETCDF)/include
+
+ all: img2mercgrd
+
+ install: all
+- $(INSTALL) img2mercgrd$(EXE) $(bindir)
+- $(INSTALL) img2grd $(bindir)
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) img2mercgrd$(EXE) $(bindir)
++ $(INSTALL_SCRIPT) img2grd $(bindir)
+
+ uninstall:
+ \rm -f $(bindir)/img2mercgrd$(EXE) $(bindir)/img2grd
+
+ img2mercgrd: img2mercgrd.o gmt_imgsubs.o
+- $(CC) $(CFLAGS) $(LDFLAGS) img2mercgrd.o gmt_imgsubs.o $(GMT) $(CDF) $(LIBS) -o img2mercgrd
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) img2mercgrd.lo gmt_imgsubs.lo $(GMT) $(CDF) $(LIBS) -o img2mercgrd
+
+ spotless: clean
+
+ clean:
+- rm -f *.o img2mercgrd$(EXE)
++ rm -fr *.o *.lo .libs img2mercgrd$(EXE)
+ .c.o:
+- $(CC) -c $(CFLAGS) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-ap b/graphics/GMT/patches/patch-ap
new file mode 100644
index 00000000000..34f6220052d
--- /dev/null
+++ b/graphics/GMT/patches/patch-ap
@@ -0,0 +1,51 @@
+$NetBSD: patch-ap,v 1.1 2001/01/27 08:16:02 jtb Exp $
+
+--- src/meca/makefile.orig Sat Jan 27 03:17:16 2001
++++ src/meca/makefile
+@@ -9,7 +9,7 @@
+ NETCDFINC = $(NETCDF)/include
+ CDF = -L$(NETCDFLIB) -lnetcdf
+ CFLAGS = $(CC_OPT) -I.. -I$(NETCDFINC)
+-ALLLIB = -L.. -lpsl -lgmt $(CDF) $(LIBS) $(LDFLAGS)
++ALLLIB = ../libpsl.la ../libgmt.la $(CDF) $(LIBS) $(LDFLAGS)
+ #
+ #
+
+@@ -21,7 +21,7 @@
+
+ install: all
+ for i in $(MECA); do \
+- $(INSTALL) $$i$(EXE) $(bindir); \
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
+ done
+
+ uninstall:
+@@ -32,22 +32,22 @@
+ spotless: clean
+
+ psmeca: psmeca.o utilmeca.o nrutil.o
+- $(CC) $(CFLAGS) psmeca.o utilmeca.o nrutil.o $(ALLLIB) -o ./$@
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) psmeca.lo utilmeca.lo nrutil.lo $(ALLLIB) -o ./$@
+
+ pscoupe: pscoupe.o utilmeca.o submeca.o distaz.o nrutil.o
+- $(CC) $(CFLAGS) pscoupe.o utilmeca.o submeca.o distaz.o nrutil.o $(ALLLIB) -o ./$@
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) pscoupe.lo utilmeca.lo submeca.lo distaz.lo nrutil.lo $(ALLLIB) -o ./$@
+
+ pspolar: pspolar.o
+- $(CC) $(CFLAGS) pspolar.o $(ALLLIB) -o ./$@
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) pspolar.lo $(ALLLIB) -o ./$@
+
+ psvelo: psvelo.o utilvelo.o utilstrain.o
+- $(CC) $(CFLAGS) psvelo.o utilvelo.o utilstrain.o $(ALLLIB) -o ./$@
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) psvelo.lo utilvelo.lo utilstrain.lo $(ALLLIB) -o ./$@
+
+ .c.o:
+- $(CC) -c $(CFLAGS) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
+
+ clean:
+- rm -f *.o
++ rm -fr *.o *.lo .libs
+ for i in $(MECA); do \
+ rm -f $$i$(EXE); \
+ done
diff --git a/graphics/GMT/patches/patch-aq b/graphics/GMT/patches/patch-aq
new file mode 100644
index 00000000000..27c6919f27b
--- /dev/null
+++ b/graphics/GMT/patches/patch-aq
@@ -0,0 +1,32 @@
+$NetBSD: patch-aq,v 1.1 2001/01/27 08:16:02 jtb Exp $
+
+--- src/misc/makefile.orig Sat Jan 27 03:22:03 2001
++++ src/misc/makefile
+@@ -30,7 +30,7 @@
+
+ install: all
+ for i in $(MISC); do \
+- $(INSTALL) $$i$(EXE) $(bindir); \
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
+ done
+
+ uninstall:
+@@ -41,7 +41,7 @@
+ spotless: clean
+
+ clean:
+- rm -f *.o
++ rm -fr *.o *.lo .libs
+ for i in $(MISC); do \
+ \rm -f $$i$(EXE); \
+ done
+@@ -51,7 +51,7 @@
+ #-------------------------------------------------------------------------------
+
+ $(MISC): $(MISC_O)
+- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L.. -lpsl -lgmt $(CDF) $(LIBS) -o $@
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
+
+ .c.o:
+- $(CC) -c $(CFLAGS) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-ar b/graphics/GMT/patches/patch-ar
new file mode 100644
index 00000000000..7e1b6a6654f
--- /dev/null
+++ b/graphics/GMT/patches/patch-ar
@@ -0,0 +1,43 @@
+$NetBSD: patch-ar,v 1.1 2001/01/27 08:16:02 jtb Exp $
+
+--- src/segyprogs/makefile.orig Sat Jan 27 03:25:15 2001
++++ src/segyprogs/makefile
+@@ -8,7 +8,7 @@
+ #------------------------- stop here --------------------------
+
+ CFLAGS = $(CC_OPT) $(WIN32) -I.. -I$(NETCDF)/include -I$(GMT_DEFAULT_PATH)/src
+-ALLLIB = -L.. -L$(GMT_DEFAULT_PATH)/bin -lgmt -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS)
++ALLLIB = ../libgmt.la ../libpsl.la -L$(NETCDF)/lib -lnetcdf $(LIBS)
+
+ SEGYPLOT_H = segy_io.h segy.h segyreel.h
+ SEGYPLOT_C = pssegyz.c pssegy.c
+@@ -23,7 +23,7 @@
+
+ install: all
+ for i in $(SEGYPLOT); do \
+- $(INSTALL) $$i$(EXE) $(bindir); \
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
+ done
+
+ uninstall:
+@@ -32,16 +32,16 @@
+ done
+
+ clean:
+- \rm -f *.o
++ \rm -f *.o *.lo
+ for i in $(SEGYPLOT); do \
+ \rm -f $$i$(EXE); \
+ done
+
+ spotless: clean
+- \rm -f *.a
++ \rm -fr .libs *.la
+
+ $(SEGYPLOT): $(SEGYPLOT_O) segy_io.o
+- $(CC) $(CFLAGS) segy_io.o $@.o -o $@ $(ALLLIB) $(LDFLAGS)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) segy_io.lo $@.lo -o $@ $(ALLLIB) $(LDFLAGS)
+
+ .c.o:
+- $(CC) -c $(CFLAGS) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-as b/graphics/GMT/patches/patch-as
new file mode 100644
index 00000000000..05ce332f062
--- /dev/null
+++ b/graphics/GMT/patches/patch-as
@@ -0,0 +1,48 @@
+$NetBSD: patch-as,v 1.1 2001/01/27 08:16:02 jtb Exp $
+
+--- src/spotter/makefile.orig Wed Oct 18 03:01:22 2000
++++ src/spotter/makefile
+@@ -41,7 +41,7 @@
+
+ install: all
+ for i in $(SPOT); do \
+- $(INSTALL) $$i$(EXE) $(bindir); \
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
+ done
+
+ uninstall:
+@@ -50,21 +50,20 @@
+ done
+
+ clean:
+- rm -f *.o
++ rm -f *.o *.la
+ for i in $(SPOT); do \
+ rm -f $$i$(EXE); \
+ done
+
+ spotless: clean
+- rm -f *.a
++ rm -fr .libs *.la
+
+ #-------------------------------------------------------------------------------
+ # library
+ #-------------------------------------------------------------------------------
+
+ libspotter.a: libspotter.o
+- $(AR) cvr libspotter.a $?
+- $(RANLIB) libspotter.a
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ libspotter.lo
+
+ libspotter.o: $(SPOT_H)
+
+@@ -73,7 +72,7 @@
+ #-------------------------------------------------------------------------------
+
+ $(SPOT): libspotter.a $(SPOT_O)
+- $(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lspotter -L.. -lpsl -lgmt $(CDF) $(LIBS) -o $@
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo -L. -lspotter ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
+
+ .c.o:
+- $(CC) -c $(CFLAGS) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-at b/graphics/GMT/patches/patch-at
new file mode 100644
index 00000000000..3d39c2889c1
--- /dev/null
+++ b/graphics/GMT/patches/patch-at
@@ -0,0 +1,51 @@
+$NetBSD: patch-at,v 1.1 2001/01/27 08:16:02 jtb Exp $
+
+--- src/x2sys/makefile.orig Wed Oct 18 03:01:23 2000
++++ src/x2sys/makefile
+@@ -7,7 +7,7 @@
+ #------------------------- stop here --------------------------
+
+ CFLAGS = $(CC_OPT) $(WIN32) -I.. -I../mgg -I$(NETCDF)/include
+-ALLLIB = -L.. -lgmt -L../mgg -lgmt_mgg -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS)
++ALLLIB = ../libgmt.la -L../mgg -lgmt_mgg ../libpsl.la -L$(NETCDF)/lib -lnetcdf $(LIBS)
+
+ XSYSTEM_H = x2sys.h
+ XSYSTEM_C = x2sys_datalist.c x2sys_cross.c
+@@ -19,14 +19,13 @@
+ #---------------------------------------------------------------
+
+ libx2sys.a: x2sys.o
+- $(AR) cvr libx2sys.a $?
+- $(RANLIB) libx2sys.a
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ x2sys.lo
+
+ all: $(XSYSTEM) libx2sys.a
+
+ install: all
+ for i in $(XSYSTEM); do \
+- $(INSTALL) $$i$(EXE) $(bindir); \
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
+ done
+
+ uninstall:
+@@ -35,16 +34,16 @@
+ done
+
+ clean:
+- \rm -f *.o
++ \rm -f *.o *.lo
+ for i in $(XSYSTEM); do \
+ \rm -f $$i$(EXE); \
+ done
+
+ spotless: clean
+- \rm -f *.a
++ \rm -fr .libs *.la
+
+ $(XSYSTEM): $(XSYSTEM_O) libx2sys.a
+- $(CC) $(CFLAGS) $@.o -o $@ -L. -lx2sys $(ALLLIB) $(LDFLAGS)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $@.lo -o $@ -L. -lx2sys $(ALLLIB) $(LDFLAGS)
+
+ .c.o:
+- $(CC) -c $(CFLAGS) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-au b/graphics/GMT/patches/patch-au
new file mode 100644
index 00000000000..538d0ddd828
--- /dev/null
+++ b/graphics/GMT/patches/patch-au
@@ -0,0 +1,43 @@
+$NetBSD: patch-au,v 1.1 2001/01/27 08:16:02 jtb Exp $
+
+--- src/x_system/makefile.orig Wed Oct 18 03:01:25 2000
++++ src/x_system/makefile
+@@ -21,7 +21,7 @@
+ #
+
+ CFLAGS = $(CC_OPT) $(WIN32) -I.. -I../mgg -I$(NETCDF)/include
+-ALLLIB = -L.. -lgmt -L../mgg -lgmt_mgg -lpsl -L$(NETCDF)/lib -lnetcdf $(LIBS)
++ALLLIB = ../libgmt.la -L../mgg -lgmt_mgg ../libpsl.la -L$(NETCDF)/lib -lnetcdf $(LIBS)
+
+ ALL_C = x_edit.c x_init.c x_list.c x_over.c x_report.c x_remove.c x_setup.c x_solve_dc_drift.c x_update.c
+
+@@ -35,7 +35,7 @@
+
+ install: all
+ for i in $(ALL); do \
+- $(INSTALL) $$i$(EXE) $(bindir); \
++ $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
+ done
+
+ uninstall:
+@@ -44,7 +44,7 @@
+ done
+
+ clean:
+- rm -f *.o
++ rm -fr *.o *.lo .libs
+ for i in $(ALL); do \
+ rm -f $$i$(EXE); \
+ done
+@@ -56,9 +56,9 @@
+ #-------------------------------------------------------------------------------
+
+ $(ALL): $(ALL_O)
+- $(CC) $(CFLAGS) $(LDFLAGS) $@.o $(ALLLIB) -o $@
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo $(ALLLIB) -o $@
+
+ .c.o:
+- $(CC) -c $(CFLAGS) $<
++ $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $<
+
+ $(ALL_O): x_system.h
diff --git a/graphics/GMT/patches/patch-av b/graphics/GMT/patches/patch-av
new file mode 100644
index 00000000000..bb09c47d280
--- /dev/null
+++ b/graphics/GMT/patches/patch-av
@@ -0,0 +1,13 @@
+$NetBSD: patch-av,v 1.1 2001/01/27 08:16:02 jtb Exp $
+
+--- src/x_system/x_solve_dc_drift.c.orig Sun Dec 10 14:02:39 2000
++++ src/x_system/x_solve_dc_drift.c
+@@ -354,7 +354,7 @@
+
+ if (n_iterations == 0) {
+ printf ("One more iteration?: ");
+- gets(string);
++ fgets(string, sizeof(string), stdin);
+ if (string[0] == 'N' || string[0] == 'n') ok = FALSE;
+ }
+ else if (iteration >= n_iterations)
diff --git a/graphics/GMT/patches/patch-aw b/graphics/GMT/patches/patch-aw
new file mode 100644
index 00000000000..2fd4d4aad6e
--- /dev/null
+++ b/graphics/GMT/patches/patch-aw
@@ -0,0 +1,11 @@
+$NetBSD: patch-aw,v 1.1 2001/01/27 08:16:02 jtb Exp $
+
+--- src/meca/meca.h.orig Sun Dec 10 14:43:19 2000
++++ src/meca/meca.h
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <math.h>
++#include <sys/types.h>
+
+ #define EPSIL 0.0001
+
diff --git a/graphics/GMT/patches/patch-ax b/graphics/GMT/patches/patch-ax
new file mode 100644
index 00000000000..2cf1aba6e9a
--- /dev/null
+++ b/graphics/GMT/patches/patch-ax
@@ -0,0 +1,22 @@
+$NetBSD: patch-ax,v 1.1 2001/01/27 08:16:02 jtb Exp $
+
+--- Makefile.orig Sat Jan 27 04:38:15 2001
++++ Makefile
+@@ -62,7 +62,7 @@
+ # !! STOP EDITING HERE, THE REST IS FIXED !!
+ #-------------------------------------------------------------------------------
+
+-SUPPL = cps dbase gshhs imgsrc meca mex mgg misc segyprogs spotter x2sys x_system xgrid
++SUPPL = cps dbase gshhs imgsrc meca mgg misc segyprogs spotter x2sys x_system xgrid
+ SUPPL_M = cps dbase imgsrc meca mgg misc segyprogs spotter x2sys x_system
+
+ all: gmt suppl
+@@ -85,7 +85,7 @@
+ $(MAKE) uninstall; \
+ cd ..
+
+-suppl: mex_config xgrid_config
++suppl: xgrid_config
+ for d in $(SUPPL); do \
+ if [ -d src/$$d ] ; then \
+ cd src/$$d; \
diff --git a/graphics/GMT/patches/patch-ay b/graphics/GMT/patches/patch-ay
new file mode 100644
index 00000000000..2aa1fdbdc43
--- /dev/null
+++ b/graphics/GMT/patches/patch-ay
@@ -0,0 +1,34 @@
+$NetBSD: patch-ay,v 1.1 2001/01/27 08:16:03 jtb Exp $
+
+--- src/xgrid/makefile.in.orig Sat Jan 27 04:55:11 2001
++++ src/xgrid/makefile.in
+@@ -19,7 +19,7 @@
+ # Location of GMT and CDF header files
+
+ CFLAGS= $(CC_OPT) $(WIN32) -I.. -I$(NETCDF)/include @X_CFLAGS@ @CFLAGS@
+-XLIBS=@X_PRE_LIBS@ @X_LIBS@ -lXt -lXaw -lXmu -lXext -lX11 @X_EXTRA_LIBS@ -L.. -lgmt -lpsl -lnetcdf
++XLIBS=@X_PRE_LIBS@ @X_LIBS@ -lXt -lXaw -lXmu -lXext -lX11 @X_EXTRA_LIBS@ ../libgmt.la ../libpsl.la -lnetcdf
+
+ all: @buildtarget@
+
+@@ -35,15 +35,16 @@
+ \rm -f makefile config.cache config.log config.status
+
+ clean:
+- rm -f *.o xgridedit$(EXE)
++ rm -f *.o *.lo .libs xgridedit$(EXE)
+
+ xgridedit: $(OBJS) $(EDITOBJS) xgridedit.o
+- $(CC) $(CFLAGS) xgridedit.o -o xgridedit $(OBJS) \
+- $(EDITOBJS) $(CDF) $(XLIBS) $(LIBS) $(LDFLAGS)
++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) xgridedit.lo -o \
++ xgridedit $(OBJS:.o=.lo) $(EDITOBJS:.o=.lo) $(CDF) $(XLIBS) \
++ $(LIBS) $(LDFLAGS)
+
+ xgridedit.o: xGridEdit.c xgrid_utility.h xgrid_controls.h \
+ xgrid_messages.h xgrid_view.h xgrid_textInput.h
+- $(CC) $(CFLAGS) -c xGridEdit.c -o xgridedit.o
++ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c xGridEdit.c -o xgridedit.lo
+
+ xgrid_utility.o: xgrid_utility.h
+
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-06 06:06:55 +0000