* Ensure NETCDF is defined properly during the build. As part of this

  change, remove some unnecessary changes to the configure script and
  makefiles that caused @NETCDF@ to be substituted since the existing
  mechanism (simply set NETCDFHOME in the environment) is more than
  sufficient.

* Remove some unnecessary changes to the configure script and makefiles
  to cause @LIBTOOL@ to be substituted.  We can simply pass in the
  right value via MAKE_ENV instead of hardcoding the value.

* Fix a place where we weren't calling the compiler correctly, which
  broke the build of certain programs that should be installed and
  which were already listed in the PLIST.

* Add --mode=MODE tags in the appropriate places to suppress the
  warnings from libtool that were cluttering the build log.

Commit approved during the deep freeze by <agc>.

16 files changed, 92 insertions, 121 deletions

diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile
index 7fb404eacc1..9aa26e5359b 100644
--- a/graphics/GMT/Makefile
+++ b/graphics/GMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/05 10:17:47 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/06/22 08:34:54 jlam Exp $
 
 DISTNAME=	GMT3.4
 PKGNAME=	GMT-3.4
@@ -25,14 +25,13 @@ WRKSRC=		${WRKDIR}/${DISTNAME}
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 
-NETCDF_DEFAULT=	${LOCALBASE}
-EVAL_PREFIX+=	NETCDF=netcdf
-
 CONFIGURE_ARGS+=--includedir=${PREFIX}/include/gmt
 CONFIGURE_ARGS+=--datadir=${PREFIX}/share/gmt
 CONFIGURE_ARGS+=--enable-eps
 CONFIGURE_ARGS+=--enable-www=${PREFIX}/share/doc/html
 CONFIGURE_ARGS+=--enable-mansect=1
+MAKE_ENV+=	NETCDFHOME=${BUILDLINK_PREFIX.netcdf:Q}
+MAKE_ENV+=	LIBTOOL=${LIBTOOL:Q}
 
 BUILD_TARGET=	all suppl
 INSTALL_TARGET= install-all
diff --git a/graphics/GMT/distinfo b/graphics/GMT/distinfo
index 9ad44d6cccb..a968412bbd5 100644
--- a/graphics/GMT/distinfo
+++ b/graphics/GMT/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2005/02/24 08:45:01 agc Exp $
+$NetBSD: distinfo,v 1.11 2005/06/22 08:34:54 jlam Exp $
 
 SHA1 (GMT3.4/GMT3.4_progs.tar.bz2) = b9fa8f60fe20ff9509ef3ebdf15fcc74e01d3f95
 RMD160 (GMT3.4/GMT3.4_progs.tar.bz2) = efa76d4066070af694ec106c3d85d374af085e78
@@ -24,9 +24,9 @@ Size (GMT3.4/GMT3.4_scripts.tar.bz2) = 3050798 bytes
 SHA1 (GMT3.4/GMT3.4_web.tar.bz2) = efbde777b67d45cf706b680f23c0171bc983c4e3
 RMD160 (GMT3.4/GMT3.4_web.tar.bz2) = a428c198fcc7de3a6f380717634b14c1952d4218
 Size (GMT3.4/GMT3.4_web.tar.bz2) = 1644571 bytes
-SHA1 (patch-aa) = b36fa4900d8f27b1c9663172ccf95b8810f0afcc
-SHA1 (patch-ab) = 51e6616f5c08c7e1f0ae414f310b01e42c90e91f
-SHA1 (patch-ac) = d4ae35538313806567af7f077ad3d5b73ceea3dc
+SHA1 (patch-aa) = dadac1e16003da4902147dceacb8370d9861a03e
+SHA1 (patch-ab) = d53e80a2bdf4386f24f78c9509ab2df9de9a37b6
+SHA1 (patch-ac) = 1ea2263200b94baace742a97ab331ad471e1be81
 SHA1 (patch-ad) = e59e871e51e9a46909de5ec389cad5744de62016
 SHA1 (patch-ae) = e543e7593b949e1476d9f8b8f85b65a892967fb1
 SHA1 (patch-af) = eac4b86614b6ffe88a3790b37b3f0b17f999947d
@@ -34,17 +34,17 @@ SHA1 (patch-ag) = d78cf5b95dd18e4aa5aca68fd62a5793ec7d966f
 SHA1 (patch-ah) = 80fe4869af2c3c2eacf4f24dd9e6585153479f41
 SHA1 (patch-ai) = e95feed7fde9fb7a5a98cd3c73d0d9d7c057af43
 SHA1 (patch-aj) = 1b4994e217756f1a6978e6b4bbc3e7e7b2a26351
-SHA1 (patch-ak) = 78a08380047c154cf11ad41d94619e05375b7a6d
-SHA1 (patch-al) = 21b50de82954941058ca8fc81337b013f67f878c
-SHA1 (patch-am) = cbff4b734cabea337a504779d92a17584064a9f0
-SHA1 (patch-an) = c043f414d4bf96a788637663f81eb3eb46f65995
-SHA1 (patch-ao) = 671e4bfb66628e231e193c807aca8866cc09cc52
-SHA1 (patch-ap) = 3475a19a50375dd50aba4ac0dda0d55acc085635
-SHA1 (patch-aq) = f131f99906396c617a7c6d9af9e0de54545f3cf6
-SHA1 (patch-ar) = f5628cff11b6330207c3c87217c8c00eb2f596e5
-SHA1 (patch-as) = 42da16147de379bc55a0f6e0f4e7aeb62cfc9843
-SHA1 (patch-at) = 32a3c3527ab9cae4f23163e4d49596aea8f32a76
-SHA1 (patch-au) = d4ac8225cdd83f81b71af7ca26d79a45bb76e283
+SHA1 (patch-ak) = 124368204367c86ae6272e20bbe7930267e764ad
+SHA1 (patch-al) = 429325839b9872858ce549b4a126fdc7b27ae0aa
+SHA1 (patch-am) = 994c931fe2af0af2d2cc2431ff5a10ce4f116c76
+SHA1 (patch-an) = c9762b3bd06a7af30b6661e1074cee50a68e6ce6
+SHA1 (patch-ao) = 2abd32103f35e3f945eb6cc92b33ac0f471be59b
+SHA1 (patch-ap) = c6a58f60f9cad393d092ab77086c150fe9f66de5
+SHA1 (patch-aq) = 5113f8020440c3506ac7162ffb9dfb32ed67e67a
+SHA1 (patch-ar) = 4117f47e6b710d161a1162541c9a103673be1e74
+SHA1 (patch-as) = 7c33dad7423ff19876e71061b41ce62b8cbf6517
+SHA1 (patch-at) = 9994714addb475dfcfba8314113bbb18c909f33f
+SHA1 (patch-au) = 3fc505b42192c9046293b83947bda59a2e233118
 SHA1 (patch-av) = fcc8aafb4a8163c0eb38744b9c7a05162d57db08
 SHA1 (patch-aw) = c9f81b674e8f0428d0bba521e3e58a6baf925ec8
 SHA1 (patch-ax) = 2475174e67f445a0f025cf409832676dfda96db9
diff --git a/graphics/GMT/patches/patch-aa b/graphics/GMT/patches/patch-aa
index 2deb46b7f08..7cbbd52da4f 100644
--- a/graphics/GMT/patches/patch-aa
+++ b/graphics/GMT/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2001/04/19 20:51:31 jtb Exp $
+$NetBSD: patch-aa,v 1.7 2005/06/22 08:34:54 jlam Exp $
 
 --- src/Makefile.orig	Fri Mar  9 19:20:44 2001
 +++ src/Makefile
@@ -51,8 +51,8 @@ $NetBSD: patch-aa,v 1.6 2001/04/19 20:51:31 jtb Exp $
 -				$(INSTALL) -m 444 libpsl.$(SL) $(libdir); \
 -				$(INSTALL) -m 444 libgmt.$(SL) $(libdir); \
 -			fi; \
-+			$(LIBTOOL) $(INSTALL_DATA) libpsl.la $(libdir); \
-+			$(LIBTOOL) $(INSTALL_DATA) libgmt.la $(libdir); \
++			$(LIBTOOL) --mode=install $(INSTALL_DATA) libpsl.la $(libdir); \
++			$(LIBTOOL) --mode=install $(INSTALL_DATA) libgmt.la $(libdir); \
  		fi
  		if [ ! -d $(includedir) ]; then \
  			mkdir -p $(includedir); \
@@ -67,7 +67,7 @@ $NetBSD: patch-aa,v 1.6 2001/04/19 20:51:31 jtb Exp $
 +			mkdir -p $(bindir); \
 +		fi
 +		for i in $(PROGS); do \
-+			$(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
++			$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
 +		done
 +		$(INSTALL) GMT $(bindir)
  
@@ -97,7 +97,7 @@ $NetBSD: patch-aa,v 1.6 2001/04/19 20:51:31 jtb Exp $
 -		$(AR) cvur libpsl.a $?
 -		$(RANLIB) libpsl.a
 +libpsl.la:	pslib.o
-+		@$(LIBTOOL) $(CC) -o $@ pslib.lo $(LDFLAGS) -lm --version-info 0:0 -rpath $(libdir)
++		@$(LIBTOOL) --mode=link $(CC) -o $@ pslib.lo $(LDFLAGS) -lm --version-info 0:0 -rpath $(libdir)
  
  pslib.o:	pslib.c $(PS_H)
 -		$(CC) $(CFLAGS) -c pslib.c
@@ -108,12 +108,12 @@ $NetBSD: patch-aa,v 1.6 2001/04/19 20:51:31 jtb Exp $
 -
 -libpsl.$(SL):	pslib.o
 -		$(LD) $(LD_OPT) $? -o $@
-+		@$(LIBTOOL) $(CC) $(CPPFLAGS) $(CFLAGS) -c pslib.c
++		@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -c pslib.c
  
 -libgmt.$(SL):	$(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O)
 -		$(LD) $(LD_OPT) $(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O) -o $@
 +libgmt.la:	$(LIB_O) $(TRIANGLE_O) $(ALPHA_SINCOS_O)
-+		@$(LIBTOOL) $(CC) -o $@ $(LIB_O:.o=.lo) $(TRIANGLE_O:.o=.lo) \
++		@$(LIBTOOL) --mode=link $(CC) -o $@ $(LIB_O:.o=.lo) $(TRIANGLE_O:.o=.lo) \
 +		$(ALPHA_SINCOS_O:.o=.lo) $(LDFLAGS) $(CDF) $(LIBS) 	\
 +		--version-info 0:0 -rpath $(libdir)
  
@@ -123,9 +123,9 @@ $NetBSD: patch-aa,v 1.6 2001/04/19 20:51:31 jtb Exp $
  
  $(PROGS):	$(GMTLIB) $(PROGS_O)
 -		$(CC) $(CFLAGS) $@.o -L. -lgmt -lpsl $(CDF) $(LIBS) $(LDFLAGS) -o $@
-+		@$(LIBTOOL) $(CC) $(CPPFLAGS) $(CFLAGS) $@.o libgmt.la \
++		@$(LIBTOOL) --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $@.o libgmt.la \
 +		libpsl.la $(CDF) $(LIBS) $(LDFLAGS) -o $@
  		$(COMPRESS) $@$(EXE)
  .c.o:
 -		$(CC) -c $(CFLAGS) $<
-+		@$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++		@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-ab b/graphics/GMT/patches/patch-ab
index f27777beb18..dc43ee1354f 100644
--- a/graphics/GMT/patches/patch-ab
+++ b/graphics/GMT/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2001/04/19 20:51:31 jtb Exp $
+$NetBSD: patch-ab,v 1.5 2005/06/22 08:34:54 jlam Exp $
 
---- src/makegmt.macros.in.orig	Fri Mar  2 05:40:57 2001
+--- src/makegmt.macros.in.orig	2001-03-02 00:40:57.000000000 -0500
 +++ src/makegmt.macros.in
-@@ -48,12 +48,16 @@
+@@ -48,6 +48,9 @@ LIBS	= @LIBS@
  # Misc. Standard Utilities:
  #---------------------------------------------------------------
  INSTALL		= @INSTALL@
@@ -12,23 +12,7 @@ $NetBSD: patch-ab,v 1.4 2001/04/19 20:51:31 jtb Exp $
  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
-@@ -73,7 +77,7 @@
- #	Required path to netcdf (with lib & include)
- #---------------------------------------------------------------
- #
--NETCDF		 = $(NETCDFHOME)
-+NETCDF		 = @NETCDF@
- #---------------------------------------------------------------
- #	Required path to GMT home (used as $GMTHOME by users)
- #---------------------------------------------------------------
-@@ -139,4 +143,4 @@
+@@ -139,4 +142,4 @@ ALPHA_SINCOS_O	= @ALPHA_SINCOS_O@
  #	Select STATIC (Default) or SHARED libraries
  #-------------------------------------------------------------------------------
  #
diff --git a/graphics/GMT/patches/patch-ac b/graphics/GMT/patches/patch-ac
index ffba57aa934..38e33bb4b5a 100644
--- a/graphics/GMT/patches/patch-ac
+++ b/graphics/GMT/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.3 2001/04/19 20:51:31 jtb Exp $
+$NetBSD: patch-ac,v 1.4 2005/06/22 08:34:54 jlam Exp $
 
---- configure.orig	Wed Apr 18 09:28:26 2001
+--- configure.orig	2001-04-18 05:28:26.000000000 -0400
 +++ configure
-@@ -2904,9 +2904,7 @@
+@@ -2904,9 +2904,7 @@ EOF
  
  fi
  
@@ -13,19 +13,7 @@ $NetBSD: patch-ac,v 1.3 2001/04/19 20:51:31 jtb Exp $
  
  trap '' 1 2 15
  cat > confcache <<\EOF
-@@ -3074,9 +3072,11 @@
- s%@wrapbindir@%$wrapbindir%g
- s%@wrapmandir@%$wrapmandir%g
- s%@mansection@%$mansection%g
-+s%@NETCDF@%$NETCDF%g
- s%@AR@%$AR%g
- s%@CSH@%$CSH%g
- s%@LD@%$LD%g
-+s%@LIBTOOL@%$LIBTOOL%g
- s%@AS@%$AS%g
- s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-@@ -3328,7 +3328,7 @@
+@@ -3328,7 +3326,7 @@ if test "$no_recursion" != yes; then
      esac
    done
  
diff --git a/graphics/GMT/patches/patch-ak b/graphics/GMT/patches/patch-ak
index 4fa3d1d0775..5471137d98c 100644
--- a/graphics/GMT/patches/patch-ak
+++ b/graphics/GMT/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 2001/04/19 20:51:32 jtb Exp $
+$NetBSD: patch-ak,v 1.3 2005/06/22 08:34:54 jlam Exp $
 
 --- ./src/dbase/makefile.orig	Wed Apr 11 19:58:09 2001
 +++ ./src/dbase/makefile
@@ -7,14 +7,14 @@ $NetBSD: patch-ak,v 1.2 2001/04/19 20:51:32 jtb Exp $
  
  install:	all
 -		$(INSTALL) grdraster$(EXE) $(bindir)
-+		@$(LIBTOOL) $(INSTALL_PROGRAM) 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.. -L$(libdir) -lgmt -lpsl $(CDF) $(LIBS) -o grdraster
-+		@$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) grdraster.lo -L$(libdir) ../libgmt.la ../libpsl.la $(CDF) $(LIBS) -o grdraster
++		@$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) grdraster.lo -L$(libdir) ../libgmt.la ../libpsl.la $(CDF) $(LIBS) -o grdraster
  
  spotless:	clean
  
@@ -23,4 +23,4 @@ $NetBSD: patch-ak,v 1.2 2001/04/19 20:51:32 jtb Exp $
  
  .c.o:
 -		$(CC) -c $(CFLAGS) $<
-+		@$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++		@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-al b/graphics/GMT/patches/patch-al
index 39c516598bf..927b349680b 100644
--- a/graphics/GMT/patches/patch-al
+++ b/graphics/GMT/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.3 2001/04/20 17:16:19 jtb Exp $
+$NetBSD: patch-al,v 1.4 2005/06/22 08:34:54 jlam Exp $
 
 --- src/mgg/makefile.orig	Wed Apr 11 19:58:09 2001
 +++ src/mgg/makefile
@@ -26,10 +26,10 @@ $NetBSD: patch-al,v 1.3 2001/04/20 17:16:19 jtb Exp $
 -			if [ -f libgmt_mgg.$(SL) ]; then \
 -				$(INSTALL) -m 444 libgmt_mgg.$(SL) $(libdir); \
 -			fi; \
-+			$(LIBTOOL) $(INSTALL_DATA) libgmt_mgg.la $(libdir); \
++			$(LIBTOOL) --mode=install $(INSTALL_DATA) libgmt_mgg.la $(libdir); \
  		fi
 +		for i in $(MGG); do \
-+			$(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
++			$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
 +		done
  
  uninstall:
@@ -40,7 +40,7 @@ $NetBSD: patch-al,v 1.3 2001/04/20 17:16:19 jtb Exp $
  libgmt_mgg.a:	gmt_mgg.o
 -		$(AR) cvr libgmt_mgg.a $?
 -		$(RANLIB) libgmt_mgg.a
-+		@$(LIBTOOL) $(CC) -o libgmt_mgg.la gmt_mgg.lo --version-info 0:0  -rpath $(libdir)
++		@$(LIBTOOL) --mode=link $(CC) -o libgmt_mgg.la gmt_mgg.lo --version-info 0:0  -rpath $(libdir)
  
  gmt_mgg.o:	$(MGG_H)
  
@@ -49,8 +49,8 @@ $NetBSD: patch-al,v 1.3 2001/04/20 17:16:19 jtb Exp $
  
  $(MGG):		libgmt_mgg.a $(MGG_O)
 -		$(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lgmt_mgg -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) -o $@
-+		@$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $@.o libgmt_mgg.la ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
++		@$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.o libgmt_mgg.la ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
  
  .c.o:
 -		$(CC) -c $(CFLAGS) $<
-+		@$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++		@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-am b/graphics/GMT/patches/patch-am
index d1f25b96923..bdc8889e3d9 100644
--- a/graphics/GMT/patches/patch-am
+++ b/graphics/GMT/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.2 2001/04/19 20:51:32 jtb Exp $
+$NetBSD: patch-am,v 1.3 2005/06/22 08:34:54 jlam Exp $
 
 --- src/cps/makefile.orig	Wed Oct 18 03:01:09 2000
 +++ src/cps/makefile
@@ -8,8 +8,8 @@ $NetBSD: patch-am,v 1.2 2001/04/19 20:51:32 jtb Exp $
  install:	all
 -		$(INSTALL) cpsencode$(EXE) $(bindir)
 -		$(INSTALL) cpsdecode$(EXE) $(bindir)
-+		@$(LIBTOOL) $(INSTALL_PROGRAM) cpsencode$(EXE) $(bindir)
-+		@$(LIBTOOL) $(INSTALL_PROGRAM) 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)
@@ -34,15 +34,15 @@ $NetBSD: patch-am,v 1.2 2001/04/19 20:51:32 jtb Exp $
  
  cpsencode:	cpsencode.o libuu.a
 -		$(CC) $(CFLAGS) $(LDFLAGS) cpsencode.o -L. -luu -o cpsencode
-+		@$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $? -o $@
++		@$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $? -o $@
  
  cpsdecode:	cpsdecode.o libuu.a
 -		$(CC) $(CFLAGS) $(LDFLAGS) cpsdecode.o -L. -luu -o cpsdecode
-+		@$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $? -o $@
++		@$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $? -o $@
  
  .c.o:
 -		$(CC) -c $(CFLAGS) $<
-+		@$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++		@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
  
  cpsencode.c:	cps.h uu.h
  
diff --git a/graphics/GMT/patches/patch-an b/graphics/GMT/patches/patch-an
index f78d3aeaf1d..0e4126cc6f3 100644
--- a/graphics/GMT/patches/patch-an
+++ b/graphics/GMT/patches/patch-an
@@ -1,4 +1,4 @@
-$NetBSD: patch-an,v 1.2 2001/04/19 20:51:32 jtb Exp $
+$NetBSD: patch-an,v 1.3 2005/06/22 08:34:54 jlam Exp $
 
 --- src/gshhs/makefile.orig	Sat Jan 27 03:10:36 2001
 +++ src/gshhs/makefile
@@ -8,8 +8,8 @@ $NetBSD: patch-an,v 1.2 2001/04/19 20:51:32 jtb Exp $
  install:	all
 -		$(INSTALL) gshhs$(EXE) $(bindir)
 -		$(INSTALL) gshhs_dp$(EXE) $(bindir)
-+		@$(LIBTOOL) $(INSTALL_PROGRAM) gshhs$(EXE) $(bindir)
-+		@$(LIBTOOL) $(INSTALL_PROGRAM) 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)
@@ -19,12 +19,12 @@ $NetBSD: patch-an,v 1.2 2001/04/19 20:51:32 jtb Exp $
  
  gshhs:		gshhs.o
 -		$(CC) $(CFLAGS) gshhs.o $(LIBS) $(LDFLAGS) -o gshhs
-+		@$(LIBTOOL) $(CC) $(CFLAGS) gshhs.lo $(LIBS) $(LDFLAGS) -o $@
++		@$(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) $(CC) $(CFLAGS) gshhs_dp.lo $(LIBS) $(LDFLAGS) -o $@
++		@$(LIBTOOL) --mode=link $(CC) $(CFLAGS) gshhs_dp.lo $(LIBS) $(LDFLAGS) -o $@
  
  .c.o:
 -		$(CC) -c $(CFLAGS) $<
-+		@$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++		@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-ao b/graphics/GMT/patches/patch-ao
index 444b83d45f6..13d953aa4cf 100644
--- a/graphics/GMT/patches/patch-ao
+++ b/graphics/GMT/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.2 2001/04/19 20:51:32 jtb Exp $
+$NetBSD: patch-ao,v 1.3 2005/06/22 08:34:54 jlam Exp $
 
 --- ./src/imgsrc/makefile.orig	Wed Apr 11 19:58:09 2001
 +++ ./src/imgsrc/makefile
@@ -17,15 +17,15 @@ $NetBSD: patch-ao,v 1.2 2001/04/19 20:51:32 jtb Exp $
  install:	all
 -		$(INSTALL) img2mercgrd$(EXE) $(bindir)
 -		$(INSTALL) img2grd $(bindir)
-+		@$(LIBTOOL) $(INSTALL_PROGRAM) img2mercgrd$(EXE) $(bindir)
-+		@$(LIBTOOL) $(INSTALL_SCRIPT) img2grd $(bindir)
++		@$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) img2mercgrd$(EXE) $(bindir)
++		@$(LIBTOOL) --mode=install $(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) $(CC) $(CFLAGS) $(LDFLAGS) img2mercgrd.lo gmt_imgsubs.lo $(GMT) $(CDF) $(LIBS) -o img2mercgrd
++		@$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) img2mercgrd.lo gmt_imgsubs.lo $(GMT) $(CDF) $(LIBS) -o img2mercgrd
  
  spotless:	clean
  
@@ -33,4 +33,4 @@ $NetBSD: patch-ao,v 1.2 2001/04/19 20:51:32 jtb Exp $
  		rm -f *.o img2mercgrd$(EXE)
  .c.o:
 -		$(CC) -c $(CFLAGS) $<
-+		@$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++		@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-ap b/graphics/GMT/patches/patch-ap
index 6d19994403e..5e448ef71b6 100644
--- a/graphics/GMT/patches/patch-ap
+++ b/graphics/GMT/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.2 2001/04/19 20:51:32 jtb Exp $
+$NetBSD: patch-ap,v 1.3 2005/06/22 08:34:54 jlam Exp $
 
 --- ./src/meca/makefile.orig	Wed Apr 11 19:58:09 2001
 +++ ./src/meca/makefile
@@ -19,7 +19,7 @@ $NetBSD: patch-ap,v 1.2 2001/04/19 20:51:32 jtb Exp $
  install:	all
  		for i in $(MECA); do \
 -			$(INSTALL) $$i$(EXE) $(bindir); \
-+			$(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
++			$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
  		done
  
  uninstall:
@@ -28,23 +28,23 @@ $NetBSD: patch-ap,v 1.2 2001/04/19 20:51:32 jtb Exp $
  
  psmeca: 	psmeca.o utilmeca.o nrutil.o
 -		$(CC) $(CFLAGS) psmeca.o utilmeca.o nrutil.o $(ALLLIB) -o ./$@
-+		@$(LIBTOOL) $(CC) $(CFLAGS) psmeca.lo utilmeca.lo nrutil.lo $(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) $(CC) $(CFLAGS) pscoupe.lo utilmeca.lo submeca.lo distaz.lo nrutil.lo $(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) $(CC) $(CFLAGS) pspolar.lo $(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) $(CC) $(CFLAGS) psvelo.lo utilvelo.lo utilstrain.lo $(ALLLIB) -o ./$@
++		@$(LIBTOOL) --mode=link $(CC) $(CFLAGS) psvelo.lo utilvelo.lo utilstrain.lo $(ALLLIB) -o ./$@
  
  .c.o:
 -		$(CC) -c $(CFLAGS) $<
-+		@$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++		@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
  
  clean:
  		rm -f *.o
diff --git a/graphics/GMT/patches/patch-aq b/graphics/GMT/patches/patch-aq
index 8a13f650038..4e1df83f05c 100644
--- a/graphics/GMT/patches/patch-aq
+++ b/graphics/GMT/patches/patch-aq
@@ -1,4 +1,4 @@
-$NetBSD: patch-aq,v 1.3 2001/04/20 17:16:19 jtb Exp $
+$NetBSD: patch-aq,v 1.4 2005/06/22 08:34:54 jlam Exp $
 
 --- src/misc/makefile.orig	Wed Apr 11 19:58:09 2001
 +++ src/misc/makefile
@@ -16,7 +16,7 @@ $NetBSD: patch-aq,v 1.3 2001/04/20 17:16:19 jtb Exp $
  install:	all
  		for i in $(MISC); do \
 -			$(INSTALL) $$i$(EXE) $(bindir); \
-+			$(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
++			$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
  		done
  
  uninstall:
@@ -25,8 +25,8 @@ $NetBSD: patch-aq,v 1.3 2001/04/20 17:16:19 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) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
  
  .c.o:
 -		$(CC) -c $(CFLAGS) $<
-+		@$(LIBTOOL) $(CPPFLAGS) $(CC) -c $(CFLAGS) $<
++		@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-ar b/graphics/GMT/patches/patch-ar
index 6a57b0d5b62..f03787db3ff 100644
--- a/graphics/GMT/patches/patch-ar
+++ b/graphics/GMT/patches/patch-ar
@@ -1,4 +1,4 @@
-$NetBSD: patch-ar,v 1.2 2001/04/19 20:51:32 jtb Exp $
+$NetBSD: patch-ar,v 1.3 2005/06/22 08:34:54 jlam Exp $
 
 --- ./src/segyprogs/makefile.orig	Wed Apr 11 19:58:09 2001
 +++ ./src/segyprogs/makefile
@@ -16,7 +16,7 @@ $NetBSD: patch-ar,v 1.2 2001/04/19 20:51:32 jtb Exp $
  install:		all
  			for i in $(SEGYPLOT); do \
 -				$(INSTALL) $$i$(EXE) $(bindir); \
-+				$(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
++				$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
  			done
  
  uninstall:	
@@ -25,12 +25,12 @@ $NetBSD: patch-ar,v 1.2 2001/04/19 20:51:32 jtb Exp $
  
  segy_io.o:		$(SEGYPLOT_H) segy_io.c
 -			$(CC) -c $(CFLAGS) segy_io.c
-+			@$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) segy_io.c
++			@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) segy_io.c
  
  $(SEGYPLOT):		$(SEGYPLOT_O) segy_io.o
 -			$(CC) $(CFLAGS) segy_io.o $@.o -o $@ $(ALLLIB) $(LDFLAGS)
-+			@$(LIBTOOL) $(CC) $(CFLAGS) segy_io.lo $@.lo -o $@ $(ALLLIB) $(LDFLAGS)
++			@$(LIBTOOL) --mode=link $(CC) $(CFLAGS) segy_io.lo $@.lo -o $@ $(ALLLIB) $(LDFLAGS)
  
  .c.o:
 -			$(CC) -c $(CFLAGS) $<
-+			@$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++			@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-as b/graphics/GMT/patches/patch-as
index 566bb925732..f746d915493 100644
--- a/graphics/GMT/patches/patch-as
+++ b/graphics/GMT/patches/patch-as
@@ -1,4 +1,4 @@
-$NetBSD: patch-as,v 1.2 2001/04/19 20:51:33 jtb Exp $
+$NetBSD: patch-as,v 1.3 2005/06/22 08:34:54 jlam Exp $
 
 --- ./src/spotter/makefile.orig	Wed Apr 11 19:58:09 2001
 +++ ./src/spotter/makefile
@@ -16,7 +16,7 @@ $NetBSD: patch-as,v 1.2 2001/04/19 20:51:33 jtb Exp $
  install:	all
  		for i in $(SPOT); do \
 -			$(INSTALL) $$i$(EXE) $(bindir); \
-+			$(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
++			$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
  		done
  
  uninstall:
@@ -25,8 +25,8 @@ $NetBSD: patch-as,v 1.2 2001/04/19 20:51:33 jtb Exp $
  
  $(SPOT):	libspotter.a $(SPOT_O)
 -		$(CC) $(CFLAGS) $(LDFLAGS) $@.o -L. -lspotter -L.. -L$(libdir) -lpsl -lgmt $(CDF) $(LIBS) -o $@
-+		@$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $@.lo -L. -lspotter -L.. ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
++		@$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo -L. -lspotter -L.. ../libpsl.la ../libgmt.la $(CDF) $(LIBS) -o $@
  
  .c.o:
 -		$(CC) -c $(CFLAGS) $<
-+		@$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++		@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-at b/graphics/GMT/patches/patch-at
index edefc9aa942..771bdd15c2c 100644
--- a/graphics/GMT/patches/patch-at
+++ b/graphics/GMT/patches/patch-at
@@ -1,4 +1,4 @@
-$NetBSD: patch-at,v 1.5 2003/05/01 11:31:46 kivinen Exp $
+$NetBSD: patch-at,v 1.6 2005/06/22 08:34:54 jlam Exp $
 
 --- src/x2sys/makefile.orig	2003-05-01 14:08:38.000000000 +0300
 +++ src/x2sys/makefile	2003-05-01 14:09:44.000000000 +0300
@@ -19,7 +19,7 @@ $NetBSD: patch-at,v 1.5 2003/05/01 11:31:46 kivinen Exp $
 -			$(AR) cvr libx2sys.a $?
 -			$(RANLIB) libx2sys.a
 +libx2sys.la:		x2sys.o
-+			$(LIBTOOL) $(CC) -o libx2sys.la x2sys.lo --version-info 0:0 -rpath $(libdir)
++			$(LIBTOOL) --mode=link $(CC) -o libx2sys.la x2sys.lo --version-info 0:0 -rpath $(libdir)
  
 -all:			$(XSYSTEM) libx2sys.a
 +all:			libx2sys.la $(XSYSTEM)
@@ -36,10 +36,10 @@ $NetBSD: patch-at,v 1.5 2003/05/01 11:31:46 kivinen Exp $
 -				if [ -f libx2sys.$(SL) ]; then \
 -					$(INSTALL) -m 444 libx2sys.$(SL) $(libdir); \
 -				fi; \
-+				$(LIBTOOL) $(INSTALL_DATA) libx2sys.la $(libdir); \
++				$(LIBTOOL) --mode=install $(INSTALL_DATA) libx2sys.la $(libdir); \
  			fi
 +			for i in $(XSYSTEM); do \
-+				$(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
++				$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
 +			done
  
  uninstall:	
@@ -51,8 +51,8 @@ $NetBSD: patch-at,v 1.5 2003/05/01 11:31:46 kivinen Exp $
 -$(XSYSTEM):		$(XSYSTEM_O) libx2sys.a
 -			$(CC) $(CFLAGS) $@.o -o $@ -L. -lx2sys $(ALLLIB) $(LDFLAGS)
 +$(XSYSTEM):		$(XSYSTEM_O) libx2sys.la
-+			@$(LIBTOOL) $(CC) $(CFLAGS) $@.lo -o $@ libx2sys.la $(ALLLIB) $(LDFLAGS)
++			@$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $@.lo -o $@ libx2sys.la $(ALLLIB) $(LDFLAGS)
  
  .c.o:
 -			$(CC) -c $(CFLAGS) $<
-+			@$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++			@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
diff --git a/graphics/GMT/patches/patch-au b/graphics/GMT/patches/patch-au
index bc6bcd3f75d..3a6c7ce73a2 100644
--- a/graphics/GMT/patches/patch-au
+++ b/graphics/GMT/patches/patch-au
@@ -1,4 +1,4 @@
-$NetBSD: patch-au,v 1.2 2001/04/19 20:51:33 jtb Exp $
+$NetBSD: patch-au,v 1.3 2005/06/22 08:34:54 jlam Exp $
 
 --- src/x_system/makefile.orig	Wed Apr 11 19:58:09 2001
 +++ src/x_system/makefile
@@ -18,7 +18,7 @@ $NetBSD: patch-au,v 1.2 2001/04/19 20:51:33 jtb Exp $
  install:	all
  		for i in $(ALL); do \
 -			$(INSTALL) $$i$(EXE) $(bindir); \
-+			$(LIBTOOL) $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
++			$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$i$(EXE) $(bindir); \
  		done
  
  uninstall:
@@ -27,11 +27,11 @@ $NetBSD: patch-au,v 1.2 2001/04/19 20:51:33 jtb Exp $
  
  $(ALL):		$(ALL_O)
 -		$(CC) $(CFLAGS) $(LDFLAGS) $@.o $(ALLLIB) -o $@
-+		@$(LIBTOOL) $(CC) $(CFLAGS) $(LDFLAGS) $@.lo $(ALLLIB) -o $@
++		@$(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) $@.lo $(ALLLIB) -o $@
  
  .c.o:
 -		$(CC) -c $(CFLAGS) $<
-+		@$(LIBTOOL) $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
++		@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) -c $(CFLAGS) $<
  
  $(ALL_O):	x_system.h
 +