Fixed problems encountered in recent pkgsrc/i386 build results, viz.

added -Wl,-R$(NETCDFLIB). Install the man pages in man1 instead of manl.

4 files changed, 83 insertions, 70 deletions

diff --git a/graphics/GMT/files/patch-sum b/graphics/GMT/files/patch-sum
index ec3cdc378fb..cc6cb1e79f3 100644
--- a/graphics/GMT/files/patch-sum
+++ b/graphics/GMT/files/patch-sum
@@ -1,7 +1,7 @@
-$NetBSD: patch-sum,v 1.2 2000/12/07 07:40:16 jtb Exp $
+$NetBSD: patch-sum,v 1.3 2000/12/14 00:44:08 jtb Exp $
 
-MD5 (patch-aa) = c1fbb19d007c9ad0813d531206c3a14c
-MD5 (patch-ab) = 3865f3b4d98b55a65fa308ad27f2d6e3
+MD5 (patch-aa) = 37585e253e4d9d5a25dfbf41637d0c58
+MD5 (patch-ab) = 53baf801019ac455b84c338406c136f6
 MD5 (patch-ac) = 17b5bee492e241ac0511bfb5d5167a73
 MD5 (patch-ad) = dab1556098f72997ff9195b2a75b8090
 MD5 (patch-ae) = 1ad779053784a61501b672a0f95cab24
diff --git a/graphics/GMT/patches/patch-aa b/graphics/GMT/patches/patch-aa
index 0a650d14921..0ba14c72a06 100644
--- a/graphics/GMT/patches/patch-aa
+++ b/graphics/GMT/patches/patch-aa
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.2 2000/12/07 07:40:17 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2000/12/14 00:44:08 jtb Exp $
 
 --- src/Makefile.orig	Wed Oct 18 03:30:08 2000
 +++ src/Makefile
+@@ -43,7 +43,7 @@
+ NETCDFLIB	= $(NETCDF)/lib
+ 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
+ 
+ PS	= -lpsl
+ GMT	= -lgmt
 @@ -136,15 +136,15 @@
  
  #-------------------------------------------------------------------------------
diff --git a/graphics/GMT/patches/patch-ab b/graphics/GMT/patches/patch-ab
index e61fe964c71..74dd463ae95 100644
--- a/graphics/GMT/patches/patch-ab
+++ b/graphics/GMT/patches/patch-ab
@@ -1,9 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/11/26 22:48:15 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2000/12/14 00:44:08 jtb Exp $
 
 --- src/makegmt.macros.in.orig	Fri Jul 14 02:10:54 2000
 +++ src/makegmt.macros.in
-@@ -26,7 +26,7 @@
- mansection	= @mansection@
+@@ -23,10 +23,10 @@
+ mandir		= @mandir@
+ datadir		= @datadir@
+ wwwdir		= @wwwdir@
+-mansection	= @mansection@
++mansection	= 1
  
  # Compiler, if $CC not set in environment
 -CC		= @CC@
diff --git a/graphics/GMT/pkg/PLIST b/graphics/GMT/pkg/PLIST
index 73086043ca6..26740231097 100644
--- a/graphics/GMT/pkg/PLIST
+++ b/graphics/GMT/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/26 22:48:19 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/12/14 00:44:08 jtb Exp $
 bin/blockmean
 bin/blockmedian
 bin/blockmode
@@ -212,68 +212,68 @@ 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
+man/man1/blockmean.1
+man/man1/blockmedian.1
+man/man1/blockmode.1
+man/man1/filter1d.1
+man/man1/fitcircle.1
+man/man1/gmt.1
+man/man1/gmtconvert.1
+man/man1/gmtdefaults.1
+man/man1/gmtmath.1
+man/man1/gmtselect.1
+man/man1/gmtset.1
+man/man1/grd2cpt.1
+man/man1/grd2xyz.1
+man/man1/grdclip.1
+man/man1/grdcontour.1
+man/man1/grdcut.1
+man/man1/grdedit.1
+man/man1/grdfft.1
+man/man1/grdfilter.1
+man/man1/grdgradient.1
+man/man1/grdhisteq.1
+man/man1/grdimage.1
+man/man1/grdinfo.1
+man/man1/grdlandmask.1
+man/man1/grdmask.1
+man/man1/grdmath.1
+man/man1/grdpaste.1
+man/man1/grdproject.1
+man/man1/grdreformat.1
+man/man1/grdsample.1
+man/man1/grdtrack.1
+man/man1/grdtrend.1
+man/man1/grdvector.1
+man/man1/grdview.1
+man/man1/grdvolume.1
+man/man1/makecpt.1
+man/man1/mapproject.1
+man/man1/minmax.1
+man/man1/nearneighbor.1
+man/man1/project.1
+man/man1/psbasemap.1
+man/man1/psclip.1
+man/man1/pscoast.1
+man/man1/pscontour.1
+man/man1/pshistogram.1
+man/man1/psimage.1
+man/man1/pslib.1
+man/man1/psmask.1
+man/man1/psrose.1
+man/man1/psscale.1
+man/man1/pstext.1
+man/man1/pswiggle.1
+man/man1/psxy.1
+man/man1/psxyz.1
+man/man1/sample1d.1
+man/man1/spectrum1d.1
+man/man1/splitxyz.1
+man/man1/surface.1
+man/man1/trend1d.1
+man/man1/trend2d.1
+man/man1/triangulate.1
+man/man1/xyz2grd.1
 share/doc/gmt/GMT_Docs.ps
 share/doc/gmt/GMT_Tutorial.ps
 share/examples/gmt/bermuda.grd