Fixed some more problems. Apologies.

6 files changed, 54 insertions, 26 deletions

diff --git a/graphics/GMT/Makefile b/graphics/GMT/Makefile
index 4107718f766..70495bf0afd 100644
--- a/graphics/GMT/Makefile
+++ b/graphics/GMT/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/01/27 09:01:01 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/27 10:36:53 jtb Exp $
 
 DISTNAME=	GMT3.3.6
 PKGNAME=	GMT-3.3.6
@@ -32,6 +32,8 @@ 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"
+
 ALL_TARGET=	all suppl
 INSTALL_TARGET= install-all
 
@@ -40,13 +42,14 @@ post-extract:
 
 pre-configure:
 	(cd ${WRKSRC} && autoreconf)
-	for e in ${WRKSRC}/examples/*.bat ${WRKSRC}/examples/*/*.bat; do\
-	${RM} -f $$e;							\
+	for e in ${WRKSRC}/examples/*.bat			\
+	${WRKSRC}/examples/*/*.bat; do				\
+	${RM} -f $$e;						\
 	done
-	for h in ${WRKSRC}/examples/do_view.bash	\
-	${WRKSRC}/examples/do_view.csh ; do		\
-	${SED} -e 's:ghostview:gv:g' < $$h > $$h.tmp &&	\
-	${MV} -f $$h.tmp $$h;				\
+	for h in ${WRKSRC}/examples/do_view.bash		\
+	${WRKSRC}/examples/do_view.csh ; do			\
+	${SED} -e 's:ghostview:gv:g' < $$h > $$h.tmp &&		\
+	${MV} -f $$h.tmp $$h;					\
 	done
 
 post-install:
@@ -58,9 +61,9 @@ post-install:
 	../../../gmt ps)
 	${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/tutorial;				  \
+	topo.cpt ; do							 \
+	${INSTALL_DATA} ${WRKSRC}/tutorial/$$f				 \
+	${PREFIX}/share/examples/gmt/tutorial;				 \
 	done;
 	${INSTALL_DATA} ${WRKSRC}/../share/* ${PREFIX}/share/gmt
 	for i in ${WRKSRC}/examples/*.bash ${WRKSRC}/examples/*.csh	\
diff --git a/graphics/GMT/files/patch-sum b/graphics/GMT/files/patch-sum
index 01c231d1016..8c6d0040447 100644
--- a/graphics/GMT/files/patch-sum
+++ b/graphics/GMT/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.4 2001/01/27 08:16:01 jtb Exp $
+$NetBSD: patch-sum,v 1.5 2001/01/27 10:36:54 jtb Exp $
 
 MD5 (patch-aa) = f6bd2a5d0af7804458282b876a2bd245
-MD5 (patch-ab) = 53baf801019ac455b84c338406c136f6
+MD5 (patch-ab) = 3865f3b4d98b55a65fa308ad27f2d6e3
 MD5 (patch-ac) = 34dd3c33717877f70efeb143d57de09b
 MD5 (patch-ad) = dab1556098f72997ff9195b2a75b8090
 MD5 (patch-ae) = 1ad779053784a61501b672a0f95cab24
@@ -24,4 +24,5 @@ MD5 (patch-au) = d1997868dcd205b3d1cf694189b81bd0
 MD5 (patch-av) = 07af60e17414034ca9b53e69e9274735
 MD5 (patch-aw) = 872028c7c698b10eb2985340d01f3f8b
 MD5 (patch-ax) = 100fd6d5d6a549dc87daee208f77dd47
-MD5 (patch-ay) = f810f43b39137095ca20bd4771955744
+MD5 (patch-ay) = 94f7b630815f3293d2159d3fb912ea58
+MD5 (patch-az) = 2ee40b4c77e54aad87ba051f6e1b7d96
diff --git a/graphics/GMT/patches/patch-ab b/graphics/GMT/patches/patch-ab
index 74dd463ae95..26c6b9e2173 100644
--- a/graphics/GMT/patches/patch-ab
+++ b/graphics/GMT/patches/patch-ab
@@ -1,13 +1,9 @@
-$NetBSD: patch-ab,v 1.2 2000/12/14 00:44:08 jtb Exp $
+$NetBSD: patch-ab,v 1.3 2001/01/27 10:36:54 jtb Exp $
 
 --- src/makegmt.macros.in.orig	Fri Jul 14 02:10:54 2000
 +++ src/makegmt.macros.in
-@@ -23,10 +23,10 @@
- mandir		= @mandir@
- datadir		= @datadir@
- wwwdir		= @wwwdir@
--mansection	= @mansection@
-+mansection	= 1
+@@ -26,7 +26,7 @@
+ mansection	= @mansection@
  
  # Compiler, if $CC not set in environment
 -CC		= @CC@
diff --git a/graphics/GMT/patches/patch-ay b/graphics/GMT/patches/patch-ay
index 2aa1fdbdc43..a43f811b1f5 100644
--- a/graphics/GMT/patches/patch-ay
+++ b/graphics/GMT/patches/patch-ay
@@ -1,8 +1,8 @@
-$NetBSD: patch-ay,v 1.1 2001/01/27 08:16:03 jtb Exp $
+$NetBSD: patch-ay,v 1.2 2001/01/27 10:36:54 jtb Exp $
 
---- src/xgrid/makefile.in.orig	Sat Jan 27 04:55:11 2001
+--- src/xgrid/makefile.in.orig	Wed Oct 18 03:01:29 2000
 +++ src/xgrid/makefile.in
-@@ -19,7 +19,7 @@
+@@ -19,14 +19,14 @@
  #	Location of GMT and CDF header files
  
  CFLAGS=	$(CC_OPT) $(WIN32) -I.. -I$(NETCDF)/include @X_CFLAGS@ @CFLAGS@
@@ -11,6 +11,14 @@ $NetBSD: patch-ay,v 1.1 2001/01/27 08:16:03 jtb Exp $
  
  all:		@buildtarget@
  
+ install:	@installtarget@
+ 
+ xgridedit-install:
+-		$(INSTALL) xgridedit$(EXE) $(bindir)
++		$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) xgridedit$(EXE) $(bindir)
+ 
+ uninstall:
+ 		\rm -f $(bindir)/xgridedit$(EXE)
 @@ -35,15 +35,16 @@
  		\rm -f makefile config.cache config.log config.status
  
diff --git a/graphics/GMT/patches/patch-az b/graphics/GMT/patches/patch-az
new file mode 100644
index 00000000000..3ece5e9ec53
--- /dev/null
+++ b/graphics/GMT/patches/patch-az
@@ -0,0 +1,22 @@
+$NetBSD: patch-az,v 1.1 2001/01/27 10:36:54 jtb Exp $
+
+--- src/xgrid/configure.orig	Sat Jan 27 10:15:57 2001
++++ src/xgrid/configure
+@@ -1190,7 +1190,7 @@
+ 
+   # It would also be nice to do this for all -L options, not just this one.
+   if test -n "$x_libraries"; then
+-    X_LIBS="$X_LIBS -L$x_libraries"
++    X_LIBS="$X_LIBS -Wl,-R$x_libraries -L$x_libraries"
+     # For Solaris; some versions of Sun CC require a space after -R and
+     # others require no space.  Words are not sufficient . . . .
+     case "`(uname -sr) 2>/dev/null`" in
+@@ -1725,7 +1725,7 @@
+ 
+   # Check for libraries that X11R6 Xt/Xaw programs need.
+   ac_save_LDFLAGS="$LDFLAGS"
+-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
++  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,-R$x_libraries -L$x_libraries"
+   # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+   # check for ICE first), but we must link in the order -lSM -lICE or
+   # we get undefined symbols.  So assume we have SM if we have ICE.
diff --git a/graphics/GMT/pkg/PLIST b/graphics/GMT/pkg/PLIST
index 888b631f518..77aab234db9 100644
--- a/graphics/GMT/pkg/PLIST
+++ b/graphics/GMT/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/01/27 08:16:03 jtb Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/01/27 10:36:54 jtb Exp $
 bin/backtracker
 bin/binlegs
 bin/blockmean
@@ -942,9 +942,7 @@ share/gmt/binned_border_l.cdf
 share/gmt/binned_river_c.cdf
 share/gmt/binned_river_i.cdf
 share/gmt/binned_river_l.cdf
-@unexec install-info --delete --info-dir=%D/info %D/share/gmt/dbase/grdraster.info
 share/gmt/dbase/grdraster.info
-@exec install-info --info-dir=%D/info %D/share/gmt/dbase/grdraster.info
 share/gmt/gmt.conf
 share/gmt/gmt.conf.orig
 share/gmt/gmtformats.d