Updated plplot to version 5.0.1. The changes are too numerous to

list (especially as the Changelog doesn't mention any recent changes).
Things work much better than in the last version (especially on the
Tcl/Tk end).

19 files changed, 251 insertions, 565 deletions

diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile
index c4b9ea92396..9523a5f6572 100644
--- a/graphics/plplot/Makefile
+++ b/graphics/plplot/Makefile
@@ -1,89 +1,58 @@
-# $NetBSD: Makefile,v 1.4 2001/01/26 09:47:23 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/01/29 01:15:33 jtb Exp $
 
-DISTNAME=	plplot-5.0.0
+DISTNAME=	plplot-5.0.1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://plplot.sourceforge.net/pub/plplot/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=plplot/}
 
 MAINTAINER=	jtb@netbsd.org
 HOMEPAGE=	http://www.plplot.org/
 
-BUILD_DEPENDS+=	${LOCALBASE}/bin/autoreconf:../../devel/autoconf
+DEPENDS+=	tcl>=8.3.0:../../lang/tcl
+DEPENDS+= 	tk>=8.3.0:../../x11/tk
+DEPENDS+=	m4-[0-9]*:../../devel/m4
+BUILD_DEPENDS+=	autoconf:../../devel/autoconf
+BUILD_DEPENDS+=	perl:../../lang/perl5
 
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_FORTRAN=	YES
+USE_X11=	YES
 
-EVAL_PREFIX+=	TK_PREFIX=tk TCL_PREFIX=tcl PYTHON_PREFIX=python
-
-post-patch:
-	@for f in ${WRKSRC}/src/plctrl.c ; do  \
-	${SED} -e 's:%%PREFIX%%:'${PREFIX}':g' \
-	< $$f > $$f.tmp && ${MV} $$f.tmp $$f ; done
-
-pre-configure:
-	@(cd ${WRKSRC} && ${LOCALBASE}/bin/autoreconf)
-	@${MV} ${WRKSRC}/cf/configure ${WRKSRC}/configure
-
-PLPLOT_USE_X11= YES
-PLPLOT_USE_TCL= YES
-PLPLOT_USE_TK = YES
+EVAL_PREFIX+=	TK_PREFIX=tk TCL_PREFIX=tcl
 
-CONFIGURE_ENV+=	"LIB_DIR=${PREFIX}/lib/plplot"
 CONFIGURE_ENV+=	"BIN_DIR=${PREFIX}/bin"
-CONFIGURE_ENV+=	"DOC_DIR=${PREFIX}/share/doc/plplot"
+CONFIGURE_ENV+=	"LIB_DIR=${PREFIX}/lib/plplot"
 CONFIGURE_ENV+=	"INCLUDE_DIR=${PREFIX}/include/plplot"
+CONFIGURE_ENV+=	"DOC_DIR=${PREFIX}/share/doc/plplot"
 CONFIGURE_ENV+=	"DEMOS_DIR=${PREFIX}/share/examples/plplot"
-
-# Python support requires shared libraries. Disabled for now.
-#CONFIGURE_ENV+="PYTHONLIBDIR=${PYTHON_PREFIX}/lib/python1.5"
-#CONFIGURE_ENV+="PYTHON_INC_DIR=${PYTHON_PREFIX}/include/python1.5"
-#CONFIGURE_ENV+="PYTHON_MOD_DIR=${PYTHON_PREFIX}/lib/python1.5/site-packages"
-#CONFIGURE_ENV+="PYTHON_DIR=${PREFIX}/libdata/plplot/python"
+CONFIGURE_ENV+=	"TKINCDIR=${TK_PREFIX}/include"
+CONFIGURE_ENV+=	"TKLIBDIR=${TK_PREFIX}/lib"
+CONFIGURE_ENV+=	"TCLINCDIR=${TCL_PREFIX}/include"
+CONFIGURE_ENV+=	"TCLLIBDIR=${TCL_PREFIX}/lib"
+CONFIGURE_ENV+=	"TCL_DIR=${PREFIX}/lib/tcl/plplot"
+CONFIGURE_ENV+=	"USER_FLAGS_C=${CFLAGS}"
+CONFIGURE_ENV+=	"USER_FLAGS_LC=${LDFLAGS}"
+CONFIGURE_ENV+=	"USER_FLAGS_CXX=${CXXFLAGS}"
+CONFIGURE_ENV+=	"USER_FLAGS_LCXX=${LDFLAGS}"
+CONFIGURE_ENV+=	"USER_FLAGS_F=${FFLAGS}"
+CONFIGURE_ENV+=	"USER_FLAGS_LF=${LDLAGS}"
 
 CONFIGURE_ARGS+="--with-double"
+CONFIGURE_ARGS+="--enable-xwin"
+CONFIGURE_ARGS+="--enable-tcl"
+CONFIGURE_ARGS+="--enable-tk"
 CONFIGURE_ARGS+="--without-shlib"
 CONFIGURE_ARGS+="--disable-python"
 CONFIGURE_ARGS+="--disable-itcl"
 CONFIGURE_ARGS+="--disable-dp"
 
-.include "../../mk/bsd.prefs.mk"
-
-PLIST_SRC=	${PKGDIR}/PLIST.no-x11
-
-.if defined(PLPLOT_USE_TK) && ${PLPLOT_USE_TK} == "YES"
-DEPENDS+= 	tk-8.3.[0-9]:../../x11/tk
-USE_X11=	YES
-PLPLOT_USE_X11= YES
-PLPLOT_USE_TCL= YES
-PLIST_SRC=	${PKGDIR}/PLIST.xwin-tcl-tk
-CONFIGURE_ARGS+="--enable-tk"
-CONFIGURE_ENV+=	"TKINCDIR=${TK_PREFIX}/include"
-CONFIGURE_ENV+=	"TKLIBDIR=${TK_PREFIX}/lib"
-.else
-CONFIGURE_ARGS+="--disable-tk"
-.endif
-
-.if defined(PLPLOT_USE_X11) && ${PLPLOT_USE_X11} == "NO"
-CONFIGURE_ARGS+="--disable-xwin"
-.else
-USE_X11=	YES
-CONFIGURE_ARGS+="--enable-xwin"
-.if ${PLPLOT_USE_TK} == "NO" && ${PLPLOT_USE_TCL} == "NO"
-PLIST_SRC=	${PKGDIR}/PLIST.xwin
-.endif
-.endif
+post-patch:
+	for f in ${WRKSRC}/src/plctrl.c ; do		\
+	${SED} -e 's:@PREFIX@:'${PREFIX}':g'		\
+	< $$f > $$f.tmp && ${MV} $$f.tmp $$f ; done
 
-.if defined(PLPLOT_USE_TCL) && ${PLPLOT_USE_TCL} == "YES"
-DEPENDS+=	tcl>=8.3.2:../../lang/tcl
-.if ${PLPLOT_USE_X11} == "NO"
-PLIST_SRC=	${PKGDIR}/PLIST.tcl
-.endif
-CONFIGURE_ARGS+="--enable-tcl"
-CONFIGURE_ENV+=	"TCLINCDIR=${TCL_PREFIX}/include"
-CONFIGURE_ENV+=	"TCLLIBDIR=${TCL_PREFIX}/lib"
-CONFIGURE_ENV+=	"TCL_DIR=${PREFIX}/libdata/plplot/tcl"
-.else
-CONFIGURE_ARGS+="--disable-tcl"
-.endif
+pre-configure:
+	(cd ${WRKSRC}/cf && autoconf)
+	${MV} ${WRKSRC}/cf/configure ${WRKSRC}/configure
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plplot/files/md5 b/graphics/plplot/files/md5
index 60a437ae792..02a6ade1d1b 100644
--- a/graphics/plplot/files/md5
+++ b/graphics/plplot/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 2000/12/08 09:54:30 jtb Exp $
+$NetBSD: md5,v 1.3 2001/01/29 01:15:35 jtb Exp $
 
-MD5 (plplot-5.0.0.tar.gz) = c52ed7c80fa4d2155dbd35d130246790
+MD5 (plplot-5.0.1.tar.gz) = 33942ab215cdad070a0390ac9ae6b764
diff --git a/graphics/plplot/files/patch-sum b/graphics/plplot/files/patch-sum
index 8c6c1a24355..1ea89526dcb 100644
--- a/graphics/plplot/files/patch-sum
+++ b/graphics/plplot/files/patch-sum
@@ -1,8 +1,14 @@
-$NetBSD: patch-sum,v 1.4 2000/12/14 01:27:32 jtb Exp $
+$NetBSD: patch-sum,v 1.5 2001/01/29 01:15:35 jtb Exp $
 
-MD5 (patch-aa) = 76106f9a0dead8498291e686f8afbc32
+MD5 (patch-aa) = 29ba62b72e8b544c673778522c9dde02
 MD5 (patch-ab) = 4e19a8510c846a9c778c29abb42a8032
-MD5 (patch-ac) = 9646f9b082536e9f80c2c2b037332a25
-MD5 (patch-ad) = 986a238768477fca8fa1948358c7a4db
-MD5 (patch-ae) = 89dafc9b8758a5bdbb4df2a6fa52536b
-MD5 (patch-af) = 243bd46a6828971bfe4cee9e2492eb31
+MD5 (patch-ac) = ae72234724c290fd1a3600554b8f1630
+MD5 (patch-ad) = a0de2d4f3c7c649d6299aa03f71113cc
+MD5 (patch-ae) = 26912afb861085e6e249e63909b7e6d0
+MD5 (patch-af) = 829d46280be6a2d9c96d060e7ee90af5
+MD5 (patch-ag) = 2380998737829162671afa524728e776
+MD5 (patch-ah) = eff416ce0ccd876a621b3caef263017c
+MD5 (patch-ai) = 41cb73fbe761813e7ce0b7bb7e3804ff
+MD5 (patch-aj) = 237554828ff74daad8356690c3da88aa
+MD5 (patch-ak) = 15623f3878315c08525157da85d294ca
+MD5 (patch-al) = 8343b4233e7c9883bb54a4a6faf2a6cd
diff --git a/graphics/plplot/patches/patch-aa b/graphics/plplot/patches/patch-aa
index e64f81584f8..6fd088bd8e5 100644
--- a/graphics/plplot/patches/patch-aa
+++ b/graphics/plplot/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2000/12/08 09:54:30 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2001/01/29 01:15:35 jtb Exp $
 
---- configure.orig	Sun Dec  3 01:39:06 2000
+--- configure.orig	Sun Jan 28 21:48:55 2001
 +++ configure
-@@ -1917,9 +1917,9 @@
+@@ -1885,9 +1885,9 @@
+ # appended to them though.
  
- DPLIBSTR=-ldpnetwork
  ITKLIBSTR=-litk
 -TKLIBSTR=-ltk
 +TKLIBSTR=-ltk83
@@ -13,4 +13,4 @@ $NetBSD: patch-aa,v 1.2 2000/12/08 09:54:30 jtb Exp $
 +TCLLIBSTR=-ltcl83
  XLIBSTR=-lX11
  
- # ----------------------------------------------------------------------------
+ # Add the current directory to the include path.  This must occur
diff --git a/graphics/plplot/patches/patch-ac b/graphics/plplot/patches/patch-ac
index f41bb080845..25bb9fdddf9 100644
--- a/graphics/plplot/patches/patch-ac
+++ b/graphics/plplot/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.2 2000/12/08 09:54:30 jtb Exp $
+$NetBSD: patch-ac,v 1.3 2001/01/29 01:15:35 jtb Exp $
 
---- utils/pltek.c.orig
-+++ utils/pltek.c
-@@ -110,7 +110,7 @@
- 	oldpage = ipage;
- 	printf("Page %d/%d> ", ipage, npage);
+--- cf/init.in.orig	Wed Jan 10 06:31:08 2001
++++ cf/init.in
+@@ -21,7 +21,7 @@
+ OCC		= @OCC@
+ F77		= @F77@
+ LDF		= @LDF@
+-M4		= m4
++M4		= gm4
  
--	gets(ibuf);
-+	fgets(ibuf, sizeof(ibuf), stdin);
- 	c = ibuf[0];
- 
- /* User input a page number or a return */
+ # Force everything.  If unsure, test for existence first.
+ # Redefine these as needed in system-specific setup.
diff --git a/graphics/plplot/patches/patch-ad b/graphics/plplot/patches/patch-ad
index 203759dc5cd..badfe38faa0 100644
--- a/graphics/plplot/patches/patch-ad
+++ b/graphics/plplot/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2000/12/08 09:54:30 jtb Exp $
+$NetBSD: patch-ad,v 1.3 2001/01/29 01:15:35 jtb Exp $
 
 --- src/plctrl.c.orig
 +++ src/plctrl.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.2 2000/12/08 09:54:30 jtb Exp $
  
  #ifndef PLLIBDEV
 -#define PLLIBDEV "/usr/local/plplot/lib"
-+#define PLLIBDEV "%%PREFIX%%/lib/plplot"
++#define PLLIBDEV "@PREFIX@/lib/plplot"
  #endif
  
  #endif
diff --git a/graphics/plplot/patches/patch-ae b/graphics/plplot/patches/patch-ae
index 1bb6cade362..37202af11e0 100644
--- a/graphics/plplot/patches/patch-ae
+++ b/graphics/plplot/patches/patch-ae
@@ -1,15 +1,13 @@
-$NetBSD: patch-ae,v 1.3 2000/12/08 22:29:47 jtb Exp $
+$NetBSD: patch-ae,v 1.4 2001/01/29 01:15:35 jtb Exp $
 
---- cf/sysconf.in.orig	Fri Jun 25 04:27:20 1999
+--- cf/sysconf.in.orig	Sun Jan 28 21:59:55 2001
 +++ cf/sysconf.in
-@@ -293,6 +293,10 @@
-     fi
- fi
+@@ -78,7 +78,7 @@
  
-+if test "$F77" = "f2c-f77" ; then
-+    DBL_FLAG_F=""
-+fi
-+
- # ----------------------------------------------------------------------------
- # gcc
- # ----------------------------------------------------------------------------
+ # Defaults
+ 
+-M4=m4
++M4=gm4
+ 
+ # Double precision
+ # Note that because there is no standard way to invoke double
diff --git a/graphics/plplot/patches/patch-af b/graphics/plplot/patches/patch-af
index b19bb164a08..75d341eab33 100644
--- a/graphics/plplot/patches/patch-af
+++ b/graphics/plplot/patches/patch-af
@@ -1,39 +1,13 @@
-$NetBSD: patch-af,v 1.4 2000/12/14 01:27:33 jtb Exp $
+$NetBSD: patch-af,v 1.5 2001/01/29 01:15:35 jtb Exp $
 
---- cf/sysloc.in.orig	Wed May 10 20:47:53 2000
-+++ cf/sysloc.in
-@@ -20,9 +20,9 @@
- 
- DPLIBSTR=-ldpnetwork
- ITKLIBSTR=-litk
--TKLIBSTR=-ltk
-+TKLIBSTR=-ltk83
- ITCLLIBSTR=-litcl
--TCLLIBSTR=-ltcl
-+TCLLIBSTR=-ltcl83
- XLIBSTR=-lX11
- 
- # ----------------------------------------------------------------------------
-@@ -384,16 +384,19 @@
-     ADD_TO_LIBS($ITKLIBDIR, $ITKLIBSTR, LIBS, LIBPATH)
- fi
- if test "$enable_tk" = "yes"; then
--    ADD_TO_LIBS($TKLIBDIR, $TKLIBSTR, LIBS, LIBPATH)
-+    TKLIB="$TKLIBDIR -Wl,-R$TKLIBDIR"
-+    ADD_TO_LIBS($TKLIB, $TKLIBSTR, LIBS, LIBPATH)
- fi
- if test "$enable_itcl" = "yes"; then
-     ADD_TO_LIBS($ITCLLIBDIR, $ITCLLIBSTR, LIBS, LIBPATH)
- fi
- if test "$enable_tcl" = "yes"; then
--    ADD_TO_LIBS($TCLLIBDIR, $TCLLIBSTR, LIBS, LIBPATH)
-+    TCLLIB="$TCLLIBDIR -Wl,-R$TCLLIBDIR"
-+    ADD_TO_LIBS($TCLLIB, $TCLLIBSTR, LIBS, LIBPATH)
- fi
- if test "$enable_xwin" = "yes"; then
--    ADD_TO_LIBS($XLIBDIR, $XLIBSTR, LIBS, LIBPATH)
-+    XLIB="$XLIBDIR -Wl,-R$XLIBDIR"
-+    ADD_TO_LIBS($XLIB, $XLIBSTR, LIBS, LIBPATH)
- fi
- if test ! -z "$TCL_DL_LIBS"; then
-     ADD_TO_LIBS( default, $TCL_DL_LIBS, LIBS, LIBPATH)
+--- cf/aclocal.m4.orig	Thu Jan 11 07:20:36 2001
++++ cf/aclocal.m4
+@@ -447,7 +447,7 @@
+ define([ADD_TO_LIBS],[
+     LIBSW=""
+     if test "$1" != "default"; then
+-	LIBSW="-L$1"
++	LIBSW="-Wl,-R$1 -L$1"
+     fi
+     for dir in $$4; do
+ 	if test "$1" = "$dir"; then
diff --git a/graphics/plplot/patches/patch-ag b/graphics/plplot/patches/patch-ag
new file mode 100644
index 00000000000..70ccab1b555
--- /dev/null
+++ b/graphics/plplot/patches/patch-ag
@@ -0,0 +1,17 @@
+$NetBSD: patch-ag,v 1.3 2001/01/29 01:15:35 jtb Exp $
+
+--- cf/initlib.in.orig	Thu Jan  4 21:52:12 2001
++++ cf/initlib.in
+@@ -69,9 +69,9 @@
+ 
+ # These are what we link against.
+ 
+-PLLIB_LDC	= -L$(PLLIB_DIR) -l$(PLLIB_NAME)$(LIB_TAG) $(MAT_LINK)
+-PLLIB_LDCXX	= -L$(PLLIB_DIR) $(CXX_LINK) -l$(PLLIB_NAME)$(LIB_TAG) $(MAT_LINK)
+-PLLIB_LDF	= -L$(PLLIB_DIR) -l$(PLLIB_NAME)$(LIB_TAG) $(MAT_LINK)
++PLLIB_LDC	= -Wl,-R$(PLLIB_DIR) -L$(PLLIB_DIR) -l$(PLLIB_NAME)$(LIB_TAG) $(MAT_LINK)
++PLLIB_LDCXX	= -Wl,-R$(PLLIB_DIR) -L$(PLLIB_DIR) $(CXX_LINK) -l$(PLLIB_NAME)$(LIB_TAG) $(MAT_LINK)
++PLLIB_LDF	= -Wl,-R$(PLLIB_DIR) -L$(PLLIB_DIR) -l$(PLLIB_NAME)$(LIB_TAG) $(MAT_LINK)
+ 
+ # Header file dependencies for demos.
+ # Done this way to only pick up the dependency during development, and not
diff --git a/graphics/plplot/patches/patch-ah b/graphics/plplot/patches/patch-ah
new file mode 100644
index 00000000000..5fa8b12220b
--- /dev/null
+++ b/graphics/plplot/patches/patch-ah
@@ -0,0 +1,16 @@
+$NetBSD: patch-ah,v 1.1 2001/01/29 01:15:35 jtb Exp $
+
+--- cf/sysloc.in.orig	Fri Jan 12 07:54:57 2001
++++ cf/sysloc.in
+@@ -19,9 +19,9 @@
+ # appended to them though.
+ 
+ ITKLIBSTR=-litk
+-TKLIBSTR=-ltk
++TKLIBSTR=-ltk83
+ ITCLLIBSTR=-litcl
+-TCLLIBSTR=-ltcl
++TCLLIBSTR=-ltcl83
+ XLIBSTR=-lX11
+ 
+ # Add the current directory to the include path.  This must occur
diff --git a/graphics/plplot/patches/patch-ai b/graphics/plplot/patches/patch-ai
new file mode 100644
index 00000000000..1f62f3d171a
--- /dev/null
+++ b/graphics/plplot/patches/patch-ai
@@ -0,0 +1,26 @@
+$NetBSD: patch-ai,v 1.1 2001/01/29 01:15:35 jtb Exp $
+
+--- cf/pkg_cxx.in.orig	Mon Jan 29 00:15:42 2001
++++ cf/pkg_cxx.in
+@@ -32,17 +32,17 @@
+ # Targets
+ 
+ install_cxx_includes:
+-	@-cd $(top_srcdir)/bindings/c++; $(CP) plstream.h $(INCLUDE_DIR)
++	-$(BSD_INSTALL_DATA) $(top_srcdir)/bindings/c++/plstream.h $(INCLUDE_DIR)
+ 
+ install_cxx_demos:
+-	@-if test ! -d $(DEMOS_DIR)/c++; then mkdir -p $(DEMOS_DIR)/c++; fi; \
++	-$(BSD_INSTALL_DATA_DIR) $(DEMOS_DIR)/c++; \
+ 	  $(LN) $(DEMOS_DIR)/Makefile $(DEMOS_DIR)/c++; \
+-	  cd $(top_srcdir)/examples/c++; $(CP) *.cc $(DEMOS_DIR)/c++
++	  $(BSD_INSTALL_DATA) $(top_srcdir)/examples/c++/*.cc $(DEMOS_DIR)/c++
+ 
+ install_cxx: install_cxx_includes install_cxx_demos
+ 
+ install_cxxlib:
+-	@-$(CP) $(CXXLIB_BASE)* $(LIB_DIR); \
++	-$(BSD_INSTALL_DATA) $(CXXLIB_BASE)* $(LIB_DIR); \
+ 	  if test -r $(CXXLIB_BASE)$(LIB_TAG)$A; then \
+ 	      $(RANLIB) $(LIB_DIR)/$(CXXLIB_BASE)$(LIB_TAG)$A; \
+ 	  fi
diff --git a/graphics/plplot/patches/patch-aj b/graphics/plplot/patches/patch-aj
new file mode 100644
index 00000000000..2109bce01e7
--- /dev/null
+++ b/graphics/plplot/patches/patch-aj
@@ -0,0 +1,14 @@
+$NetBSD: patch-aj,v 1.1 2001/01/29 01:15:35 jtb Exp $
+
+--- cf/pkg_f77.in.orig	Mon Jan 29 00:15:31 2001
++++ cf/pkg_f77.in
+@@ -46,7 +46,7 @@
+ 
+ # Require dependency on FDEMOS_SOURCES because these are generated files
+ install_f77: $(FDEMOS_SOURCES)
+-	@-if test ! -d $(DEMOS_DIR)/f77; then mkdir -p $(DEMOS_DIR)/f77; fi; \
++	-$(BSD_INSTALL_DATA_DIR) $(DEMOS_DIR)/f77; \
+ 	  $(LN) $(DEMOS_DIR)/Makefile $(DEMOS_DIR)/f77; \
+-	  cd $(top_srcdir)/examples/f77; $(CP) *.f $(DEMOS_DIR)/f77
++	  $(BSD_INSTALL_DATA) $(top_srcdir)/examples/f77/*.f $(DEMOS_DIR)/f77
+ 
diff --git a/graphics/plplot/patches/patch-ak b/graphics/plplot/patches/patch-ak
new file mode 100644
index 00000000000..41ffe56bb8e
--- /dev/null
+++ b/graphics/plplot/patches/patch-ak
@@ -0,0 +1,50 @@
+$NetBSD: patch-ak,v 1.1 2001/01/29 01:15:35 jtb Exp $
+
+--- cf/pkg_tcl.in.orig	Fri Jan 12 04:00:01 2001
++++ cf/pkg_tcl.in
+@@ -53,35 +53,33 @@
+ 	perl pltclgen
+ 
+ tclIndex:
+-	@$(MAKEINDEX)
++	$(MAKEINDEX)
+ 
+ install_pltcl:
+-	@-if test $(SHARED) = 1; then \
++	-if test $(SHARED) = 1; then \
+ 	     $(LDC) $(LDC_FLAGS) pltcl$O $(LIB_INSTALL) \
+ 		-o pltcl$E $(LDC_LIBS) $(INSTALL_RPATH); \
+ 	  fi; \
+-	  strip pltcl$E; $(CP) pltcl$E $(BIN_DIR)
++	  $(BSD_INSTALL_PROGRAM) pltcl$E $(BIN_DIR)
+ 
+ install_tcl_index:
+-	@-if test ! -d $(TCL_DIR); then mkdir -p $(TCL_DIR); fi; \
+-	  $(CP) tclIndex $(TCL_DIR)
++	-$(BSD_INSTALL_DATA_DIR) $(TCL_DIR); \
++	  $(BSD_INSTALL_DATA) tclIndex $(TCL_DIR)
+ 
+ install_tcl_includes:
+-	@-cd $(top_srcdir)/bindings/tcl; \
+-	  $(CP) pltcl.h $(INCLUDE_DIR)
++	-$(BSD_INSTALL_DATA) $(top_srcdir)/bindings/tcl/pltcl.h $(INCLUDE_DIR)
+ 
+ install_tcl_demos:
+-	@-if test ! -d $(DEMOS_DIR)/tcl; then mkdir -p $(DEMOS_DIR)/tcl; fi; \
+-	  cd $(top_srcdir)/examples/tcl; $(CP) $(TCL_DEMOS) $(DEMOS_DIR)/tcl
++	-$(BSD_INSTALL_DATA_DIR) $(DEMOS_DIR)/tcl; \
++	  cd $(top_srcdir)/examples/tcl; $(BSD_INSTALL_DATA) $(TCL_DEMOS) $(DEMOS_DIR)/tcl
+ 
+ install_tcl: install_pltcl install_tcl_index install_tcl_includes install_tcl_demos
+ 
+ install_mat_includes:
+-	@-cd $(top_srcdir)/bindings/tcl; \
+-	  $(CP) tclMatrix.h $(INCLUDE_DIR)
++	-$(BSD_INSTALL_DATA) $(top_srcdir)/bindings/tcl/tclMatrix.h $(INCLUDE_DIR)
+ 
+ install_matlib:
+-	@-$(CP) $(MATLIB_BASE)* $(LIB_DIR); \
++	-$(BSD_INSTALL_DATA) $(MATLIB_BASE)* $(LIB_DIR); \
+ 	  if test -r $(MATLIB_BASE)$A; then \
+ 	      $(RANLIB) $(LIB_DIR)/$(MATLIB_BASE)$A; \
+ 	  fi
diff --git a/graphics/plplot/patches/patch-al b/graphics/plplot/patches/patch-al
new file mode 100644
index 00000000000..a42322c46fd
--- /dev/null
+++ b/graphics/plplot/patches/patch-al
@@ -0,0 +1,40 @@
+$NetBSD: patch-al,v 1.1 2001/01/29 01:15:35 jtb Exp $
+
+--- cf/pkg_tk.in.orig	Fri Jan 12 23:34:22 2001
++++ cf/pkg_tk.in
+@@ -22,28 +22,27 @@
+ # Targets
+ 
+ install_plserver:
+-	@-if test ! -d $(TCL_DIR); then mkdir -p $(TCL_DIR); fi; \
++	-$(BSD_INSTALL_DATA_DIR) $(TCL_DIR); \
+ 	  if test $(SHARED) = 1; then \
+ 	      $(LDC) $(LDC_FLAGS) plserver$O $(LIB_INSTALL) \
+ 		  -o plserver$E $(LDC_LIBS) $(INSTALL_RPATH); \
+ 	  fi; \
+-	  strip plserver$E; \
+-	  $(CP) plserver$E $(BIN_DIR)
++	  $(BSD_INSTALL_PROGRAM) plserver$E $(BIN_DIR)
+ 
+ 
+ install_tk_scripts:
+-	@-cd $(top_srcdir)/bindings/tk; \
+-	  $(CP) pltk.h $(INCLUDE_DIR); \
+-	  $(CP) *.itk *.tcl *.pal $(TCL_DIR)
++	-cd $(top_srcdir)/bindings/tk; \
++	  $(BSD_INSTALL_DATA) pltk.h $(INCLUDE_DIR); \
++	  $(BSD_INSTALL_DATA) *.itk *.tcl *.pal $(TCL_DIR)
+ 
+ # N.B. this target depends on install_tcl_demos to work properly because the
+ # symbolic links below are set up by real files in tcl/x??.tcl that must
+ # exist.  However, AWI hesitates to put in the dependence because it might
+ # just simply mean the rules for install_tcl_demos got executed twice.
+ install_tk_demos:
+-	@-if test ! -d $(DEMOS_DIR)/tk; then mkdir -p $(DEMOS_DIR)/tk; fi; \
++	-$(BSD_INSTALL_DATA_DIR) $(DEMOS_DIR)/tk; \
+ 	  $(LN) $(DEMOS_DIR)/Makefile $(DEMOS_DIR)/tk; \
+-	  cd $(top_srcdir)/examples/tk; $(CP) $(TK_DEMOS) $(DEMOS_DIR)/tk ; \
++	  cd $(top_srcdir)/examples/tk; $(BSD_INSTALL_DATA) $(TK_DEMOS) $(DEMOS_DIR)/tk ; \
+ 	  cd $(DEMOS_DIR)/tk ; \
+ 	  for filename in ../tcl/x??.tcl ; \
+ 	  do  \
diff --git a/graphics/plplot/pkg/COMMENT b/graphics/plplot/pkg/COMMENT
index fe74e1c9442..7be4a3bf64a 100644
--- a/graphics/plplot/pkg/COMMENT
+++ b/graphics/plplot/pkg/COMMENT
@@ -1 +1 @@
-Scientific plotting library
+Scientific plotting package
diff --git a/graphics/plplot/pkg/PLIST.no-x11 b/graphics/plplot/pkg/PLIST.no-x11
deleted file mode 100644
index 3454fbff81e..00000000000
--- a/graphics/plplot/pkg/PLIST.no-x11
+++ /dev/null
@@ -1,78 +0,0 @@
-@comment $NetBSD: PLIST.no-x11,v 1.2 2000/12/08 09:54:31 jtb Exp $
-bin/plm2gif
-bin/plpr
-bin/plrender
-bin/pltek
-include/plplot/pdf.h
-include/plplot/plConfig.h
-include/plplot/pldebug.h
-include/plplot/plevent.h
-include/plplot/plplot.h
-include/plplot/plplotP.h
-include/plplot/plstream.h
-include/plplot/plstrm.h
-include/plplot/plxwd.h
-lib/plplot/cglobe.map
-lib/plplot/globe.map
-lib/plplot/libPLcxx.a
-lib/plplot/libplplotdb.a
-lib/plplot/plstnd5.fnt
-lib/plplot/plxtnd5.fnt
-lib/plplot/usa.map
-lib/plplot/usaglobe.map
-share/doc/plplot/CHANGES
-share/doc/plplot/COPYING.LIB
-share/doc/plplot/Copyright
-share/doc/plplot/FAQ
-share/doc/plplot/NEWS
-share/doc/plplot/README
-share/doc/plplot/README.local
-share/doc/plplot/ToDo
-share/doc/plplot/mklinks
-share/examples/plplot/Makefile
-share/examples/plplot/c++/Makefile
-share/examples/plplot/c++/x01cc.cc
-share/examples/plplot/c/Makefile
-share/examples/plplot/c/plcdemos.h
-share/examples/plplot/c/tutor.c
-share/examples/plplot/c/x01c.c
-share/examples/plplot/c/x02c.c
-share/examples/plplot/c/x03c.c
-share/examples/plplot/c/x04c.c
-share/examples/plplot/c/x05c.c
-share/examples/plplot/c/x06c.c
-share/examples/plplot/c/x07c.c
-share/examples/plplot/c/x08c.c
-share/examples/plplot/c/x09c.c
-share/examples/plplot/c/x10c.c
-share/examples/plplot/c/x11c.c
-share/examples/plplot/c/x12c.c
-share/examples/plplot/c/x13c.c
-share/examples/plplot/c/x14c.c
-share/examples/plplot/c/x15c.c
-share/examples/plplot/c/x16c.c
-share/examples/plplot/c/x17c.c
-share/examples/plplot/c/x18c.c
-share/examples/plplot/c/x19c.c
-share/examples/plplot/f77/Makefile
-share/examples/plplot/f77/x01f.f
-share/examples/plplot/f77/x02f.f
-share/examples/plplot/f77/x03f.f
-share/examples/plplot/f77/x04f.f
-share/examples/plplot/f77/x05f.f
-share/examples/plplot/f77/x06f.f
-share/examples/plplot/f77/x07f.f
-share/examples/plplot/f77/x08f.f
-share/examples/plplot/f77/x09f.f
-share/examples/plplot/f77/x10f.f
-share/examples/plplot/f77/x11f.f
-share/examples/plplot/f77/x12f.f
-share/examples/plplot/f77/x13f.f
-share/examples/plplot/f77/x16f.f
-@dirrm share/examples/plplot/f77
-@dirrm share/examples/plplot/c++
-@dirrm share/examples/plplot/c
-@dirrm share/examples/plplot
-@dirrm share/doc/plplot
-@dirrm lib/plplot
-@dirrm include/plplot
diff --git a/graphics/plplot/pkg/PLIST.tcl b/graphics/plplot/pkg/PLIST.tcl
deleted file mode 100644
index 7fe7f8f6fb4..00000000000
--- a/graphics/plplot/pkg/PLIST.tcl
+++ /dev/null
@@ -1,108 +0,0 @@
-@comment $NetBSD: PLIST.tcl,v 1.2 2000/12/08 09:54:31 jtb Exp $
-bin/plm2gif
-bin/plpr
-bin/plrender
-bin/pltcl
-bin/pltek
-include/plplot/pdf.h
-include/plplot/plConfig.h
-include/plplot/pldebug.h
-include/plplot/plevent.h
-include/plplot/plplot.h
-include/plplot/plplotP.h
-include/plplot/plstream.h
-include/plplot/plstrm.h
-include/plplot/pltcl.h
-include/plplot/plxwd.h
-include/plplot/tclMatrix.h
-lib/plplot/cglobe.map
-lib/plplot/globe.map
-lib/plplot/libMatrix.a
-lib/plplot/libPLcxx.a
-lib/plplot/libplplotdb.a
-lib/plplot/plstnd5.fnt
-lib/plplot/plxtnd5.fnt
-lib/plplot/usa.map
-lib/plplot/usaglobe.map
-libdata/plplot/tcl/tclIndex
-share/doc/plplot/CHANGES
-share/doc/plplot/COPYING.LIB
-share/doc/plplot/Copyright
-share/doc/plplot/FAQ
-share/doc/plplot/NEWS
-share/doc/plplot/README
-share/doc/plplot/README.local
-share/doc/plplot/ToDo
-share/doc/plplot/mklinks
-share/examples/plplot/Makefile
-share/examples/plplot/c++/Makefile
-share/examples/plplot/c++/x01cc.cc
-share/examples/plplot/c/Makefile
-share/examples/plplot/c/plcdemos.h
-share/examples/plplot/c/tutor.c
-share/examples/plplot/c/x01c.c
-share/examples/plplot/c/x02c.c
-share/examples/plplot/c/x03c.c
-share/examples/plplot/c/x04c.c
-share/examples/plplot/c/x05c.c
-share/examples/plplot/c/x06c.c
-share/examples/plplot/c/x07c.c
-share/examples/plplot/c/x08c.c
-share/examples/plplot/c/x09c.c
-share/examples/plplot/c/x10c.c
-share/examples/plplot/c/x11c.c
-share/examples/plplot/c/x12c.c
-share/examples/plplot/c/x13c.c
-share/examples/plplot/c/x14c.c
-share/examples/plplot/c/x15c.c
-share/examples/plplot/c/x16c.c
-share/examples/plplot/c/x17c.c
-share/examples/plplot/c/x18c.c
-share/examples/plplot/c/x19c.c
-share/examples/plplot/f77/Makefile
-share/examples/plplot/f77/x01f.f
-share/examples/plplot/f77/x02f.f
-share/examples/plplot/f77/x03f.f
-share/examples/plplot/f77/x04f.f
-share/examples/plplot/f77/x05f.f
-share/examples/plplot/f77/x06f.f
-share/examples/plplot/f77/x07f.f
-share/examples/plplot/f77/x08f.f
-share/examples/plplot/f77/x09f.f
-share/examples/plplot/f77/x10f.f
-share/examples/plplot/f77/x11f.f
-share/examples/plplot/f77/x12f.f
-share/examples/plplot/f77/x13f.f
-share/examples/plplot/f77/x16f.f
-share/examples/plplot/tcl/plgrid.tcl
-share/examples/plplot/tcl/plot.dat
-share/examples/plplot/tcl/plot.tcl
-share/examples/plplot/tcl/r.dat
-share/examples/plplot/tcl/stats.log
-share/examples/plplot/tcl/tcldemos.tcl
-share/examples/plplot/tcl/x01.tcl
-share/examples/plplot/tcl/x02.tcl
-share/examples/plplot/tcl/x03.tcl
-share/examples/plplot/tcl/x04.tcl
-share/examples/plplot/tcl/x05.tcl
-share/examples/plplot/tcl/x06.tcl
-share/examples/plplot/tcl/x07.tcl
-share/examples/plplot/tcl/x08.tcl
-share/examples/plplot/tcl/x09.tcl
-share/examples/plplot/tcl/x10.tcl
-share/examples/plplot/tcl/x11.tcl
-share/examples/plplot/tcl/x12.tcl
-share/examples/plplot/tcl/x13.tcl
-share/examples/plplot/tcl/x14.tcl
-share/examples/plplot/tcl/x15.tcl
-share/examples/plplot/tcl/x16.tcl
-share/examples/plplot/tcl/x17.tcl
-share/examples/plplot/tcl/x18.tcl
-@dirrm share/examples/plplot/tcl
-@dirrm share/examples/plplot/f77
-@dirrm share/examples/plplot/c++
-@dirrm share/examples/plplot/c
-@dirrm share/examples/plplot
-@dirrm share/doc/plplot
-@dirrm lib/plplot
-@dirrm include/plplot
diff --git a/graphics/plplot/pkg/PLIST.xwin b/graphics/plplot/pkg/PLIST.xwin
deleted file mode 100644
index e515c69695c..00000000000
--- a/graphics/plplot/pkg/PLIST.xwin
+++ /dev/null
@@ -1,78 +0,0 @@
-@comment $NetBSD: PLIST.xwin,v 1.2 2000/12/08 09:54:31 jtb Exp $
-bin/plm2gif
-bin/plpr
-bin/plrender
-bin/pltek
-include/plplot/pdf.h
-include/plplot/plConfig.h
-include/plplot/pldebug.h
-include/plplot/plevent.h
-include/plplot/plplot.h
-include/plplot/plplotP.h
-include/plplot/plstream.h
-include/plplot/plstrm.h
-include/plplot/plxwd.h
-lib/plplot/cglobe.map
-lib/plplot/globe.map
-lib/plplot/libPLcxx.a
-lib/plplot/libplplotdX.a
-lib/plplot/plstnd5.fnt
-lib/plplot/plxtnd5.fnt
-lib/plplot/usa.map
-lib/plplot/usaglobe.map
-share/doc/plplot/CHANGES
-share/doc/plplot/COPYING.LIB
-share/doc/plplot/Copyright
-share/doc/plplot/FAQ
-share/doc/plplot/NEWS
-share/doc/plplot/README
-share/doc/plplot/README.local
-share/doc/plplot/ToDo
-share/doc/plplot/mklinks
-share/examples/plplot/Makefile
-share/examples/plplot/c++/Makefile
-share/examples/plplot/c++/x01cc.cc
-share/examples/plplot/c/Makefile
-share/examples/plplot/c/plcdemos.h
-share/examples/plplot/c/tutor.c
-share/examples/plplot/c/x01c.c
-share/examples/plplot/c/x02c.c
-share/examples/plplot/c/x03c.c
-share/examples/plplot/c/x04c.c
-share/examples/plplot/c/x05c.c
-share/examples/plplot/c/x06c.c
-share/examples/plplot/c/x07c.c
-share/examples/plplot/c/x08c.c
-share/examples/plplot/c/x09c.c
-share/examples/plplot/c/x10c.c
-share/examples/plplot/c/x11c.c
-share/examples/plplot/c/x12c.c
-share/examples/plplot/c/x13c.c
-share/examples/plplot/c/x14c.c
-share/examples/plplot/c/x15c.c
-share/examples/plplot/c/x16c.c
-share/examples/plplot/c/x17c.c
-share/examples/plplot/c/x18c.c
-share/examples/plplot/c/x19c.c
-share/examples/plplot/f77/Makefile
-share/examples/plplot/f77/x01f.f
-share/examples/plplot/f77/x02f.f
-share/examples/plplot/f77/x03f.f
-share/examples/plplot/f77/x04f.f
-share/examples/plplot/f77/x05f.f
-share/examples/plplot/f77/x06f.f
-share/examples/plplot/f77/x07f.f
-share/examples/plplot/f77/x08f.f
-share/examples/plplot/f77/x09f.f
-share/examples/plplot/f77/x10f.f
-share/examples/plplot/f77/x11f.f
-share/examples/plplot/f77/x12f.f
-share/examples/plplot/f77/x13f.f
-share/examples/plplot/f77/x16f.f
-@dirrm share/examples/plplot/f77
-@dirrm share/examples/plplot/c++
-@dirrm share/examples/plplot/c
-@dirrm share/examples/plplot
-@dirrm share/doc/plplot
-@dirrm lib/plplot
-@dirrm include/plplot
diff --git a/graphics/plplot/pkg/PLIST.xwin-tcl-tk b/graphics/plplot/pkg/PLIST.xwin-tcl-tk
deleted file mode 100644
index f4bc78eb496..00000000000
--- a/graphics/plplot/pkg/PLIST.xwin-tcl-tk
+++ /dev/null
@@ -1,160 +0,0 @@
-@comment $NetBSD: PLIST.xwin-tcl-tk,v 1.2 2000/12/08 09:54:31 jtb Exp $
-bin/plm2gif
-bin/plpr
-bin/plrender
-bin/plserver
-bin/pltcl
-bin/pltek
-include/plplot/pdf.h
-include/plplot/plConfig.h
-include/plplot/pldebug.h
-include/plplot/plevent.h
-include/plplot/plplot.h
-include/plplot/plplotP.h
-include/plplot/plstream.h
-include/plplot/plstrm.h
-include/plplot/pltcl.h
-include/plplot/pltk.h
-include/plplot/plxwd.h
-include/plplot/tclMatrix.h
-lib/plplot/cglobe.map
-lib/plplot/globe.map
-lib/plplot/libMatrix.a
-lib/plplot/libPLcxx.a
-lib/plplot/libplplotdtk.a
-lib/plplot/plstnd5.fnt
-lib/plplot/plxtnd5.fnt
-lib/plplot/usa.map
-lib/plplot/usaglobe.map
-libdata/plplot/tcl/FileSelector.tcl
-libdata/plplot/tcl/PLWin.itk
-libdata/plplot/tcl/PLXWin.itk
-libdata/plplot/tcl/Pltkwin.tcl
-libdata/plplot/tcl/about.tcl
-libdata/plplot/tcl/cmap0a.pal
-libdata/plplot/tcl/cmap1a.pal
-libdata/plplot/tcl/cmap1b.pal
-libdata/plplot/tcl/cmap1c.pal
-libdata/plplot/tcl/cmap1d.pal
-libdata/plplot/tcl/help_gui.tcl
-libdata/plplot/tcl/help_keys.tcl
-libdata/plplot/tcl/help_tcltk.tcl
-libdata/plplot/tcl/plclient.tcl
-libdata/plplot/tcl/plcolor.tcl
-libdata/plplot/tcl/plconfig.tcl
-libdata/plplot/tcl/pldefaults.tcl
-libdata/plplot/tcl/plplot.tcl
-libdata/plplot/tcl/plserver.tcl
-libdata/plplot/tcl/pltools.tcl
-libdata/plplot/tcl/plwidget.tcl
-libdata/plplot/tcl/tclIndex
-share/doc/plplot/CHANGES
-share/doc/plplot/COPYING.LIB
-share/doc/plplot/Copyright
-share/doc/plplot/FAQ
-share/doc/plplot/NEWS
-share/doc/plplot/README
-share/doc/plplot/README.local
-share/doc/plplot/ToDo
-share/doc/plplot/mklinks
-share/examples/plplot/Makefile
-share/examples/plplot/c++/Makefile
-share/examples/plplot/c++/x01cc.cc
-share/examples/plplot/c/Makefile
-share/examples/plplot/c/plcdemos.h
-share/examples/plplot/c/tutor.c
-share/examples/plplot/c/x01c.c
-share/examples/plplot/c/x02c.c
-share/examples/plplot/c/x03c.c
-share/examples/plplot/c/x04c.c
-share/examples/plplot/c/x05c.c
-share/examples/plplot/c/x06c.c
-share/examples/plplot/c/x07c.c
-share/examples/plplot/c/x08c.c
-share/examples/plplot/c/x09c.c
-share/examples/plplot/c/x10c.c
-share/examples/plplot/c/x11c.c
-share/examples/plplot/c/x12c.c
-share/examples/plplot/c/x13c.c
-share/examples/plplot/c/x14c.c
-share/examples/plplot/c/x15c.c
-share/examples/plplot/c/x16c.c
-share/examples/plplot/c/x17c.c
-share/examples/plplot/c/x18c.c
-share/examples/plplot/c/x19c.c
-share/examples/plplot/f77/Makefile
-share/examples/plplot/f77/x01f.f
-share/examples/plplot/f77/x02f.f
-share/examples/plplot/f77/x03f.f
-share/examples/plplot/f77/x04f.f
-share/examples/plplot/f77/x05f.f
-share/examples/plplot/f77/x06f.f
-share/examples/plplot/f77/x07f.f
-share/examples/plplot/f77/x08f.f
-share/examples/plplot/f77/x09f.f
-share/examples/plplot/f77/x10f.f
-share/examples/plplot/f77/x11f.f
-share/examples/plplot/f77/x12f.f
-share/examples/plplot/f77/x13f.f
-share/examples/plplot/f77/x16f.f
-share/examples/plplot/tcl/plgrid.tcl
-share/examples/plplot/tcl/plot.dat
-share/examples/plplot/tcl/plot.tcl
-share/examples/plplot/tcl/r.dat
-share/examples/plplot/tcl/stats.log
-share/examples/plplot/tcl/tcldemos.tcl
-share/examples/plplot/tcl/x01.tcl
-share/examples/plplot/tcl/x02.tcl
-share/examples/plplot/tcl/x03.tcl
-share/examples/plplot/tcl/x04.tcl
-share/examples/plplot/tcl/x05.tcl
-share/examples/plplot/tcl/x06.tcl
-share/examples/plplot/tcl/x07.tcl
-share/examples/plplot/tcl/x08.tcl
-share/examples/plplot/tcl/x09.tcl
-share/examples/plplot/tcl/x10.tcl
-share/examples/plplot/tcl/x11.tcl
-share/examples/plplot/tcl/x12.tcl
-share/examples/plplot/tcl/x13.tcl
-share/examples/plplot/tcl/x14.tcl
-share/examples/plplot/tcl/x15.tcl
-share/examples/plplot/tcl/x16.tcl
-share/examples/plplot/tcl/x17.tcl
-share/examples/plplot/tcl/x18.tcl
-share/examples/plplot/tk/Makefile
-share/examples/plplot/tk/tk01
-share/examples/plplot/tk/tk02
-share/examples/plplot/tk/tk03
-share/examples/plplot/tk/tk04
-share/examples/plplot/tk/tkdemos.tcl
-share/examples/plplot/tk/x01.tcl
-share/examples/plplot/tk/x02.tcl
-share/examples/plplot/tk/x03.tcl
-share/examples/plplot/tk/x04.tcl
-share/examples/plplot/tk/x05.tcl
-share/examples/plplot/tk/x06.tcl
-share/examples/plplot/tk/x07.tcl
-share/examples/plplot/tk/x08.tcl
-share/examples/plplot/tk/x09.tcl
-share/examples/plplot/tk/x10.tcl
-share/examples/plplot/tk/x11.tcl
-share/examples/plplot/tk/x12.tcl
-share/examples/plplot/tk/x13.tcl
-share/examples/plplot/tk/x14.tcl
-share/examples/plplot/tk/x15.tcl
-share/examples/plplot/tk/x16.tcl
-share/examples/plplot/tk/x17.tcl
-share/examples/plplot/tk/x18.tcl
-share/examples/plplot/tk/xtk01.c
-share/examples/plplot/tk/xtk02.c
-share/examples/plplot/tk/xtk04.c
-@dirrm share/examples/plplot/tk
-@dirrm share/examples/plplot/tcl
-@dirrm share/examples/plplot/f77
-@dirrm share/examples/plplot/c++
-@dirrm share/examples/plplot/c
-@dirrm share/examples/plplot
-@dirrm share/doc/plplot
-@dirrm libdata/plplot/tcl
-@dirrm lib/plplot
-@dirrm include/plplot