10 files changed, 311 insertions, 515 deletions

diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index 6ee2c8ff444e..a79064a25e6e 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	plplot
-PORTVERSION=	5.1.0
+PORTVERSION=	5.2.1
 CATEGORIES=	math
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,49 +14,62 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A scientific plotting package
 
-LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
-BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
+BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
+		pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd2
+RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
+USE_GNOME=	gnomehack
 USE_REINPLACE=	yes
-USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	F77="${FC}" FFLAGS="${FFLAGS}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
-		GDINCDIR="${LOCALBASE}/include/gd" \
+		GDINCDIR="${LOCALBASE}/include" \
 		GDLIBDIR="${LOCALBASE}/lib" \
-		XINCDIR="${X11BASE}/include" \
-		XLIBDIR="${X11BASE}/lib" \
-		PLPLOT_PREFIX="${DATADIR}" \
-		DEMOS_DIR="${EXAMPLESDIR}" \
-		INFO_DIR="${PREFIX}/info" \
 		M4="${LOCALBASE}/bin/gm4"
-CONFIGURE_ARGS=	--disable-python --disable-octave --with-double
+CONFIGURE_ARGS=	--disable-python --disable-octave --without-qhull
 INSTALLS_SHLIB=	yes
+PLIST_SUB=	VERSION="${PORTVERSION}"
+
+MAN1=		plm2gif.1 plplot_libtool.1 plpr.1 pltek.1 pstex2eps.1
+
+.if defined(WITHOUT_X11)
+PKGNAMESUFFIX=	-nox11
+CONFIGURE_ARGS+=	--without-x
+PLIST_SUB+=	X11="@comment "
+.else
+USE_XLIB=	yes
+PLIST_SUB+=	X11=""
+.endif
 
 .if defined(WITH_TCLTK)
+.undef WITHOUT_X11
+PKGNAMESUFFIX=	-tcltk
 LIB_DEPENDS+=	itk32.1:${PORTSDIR}/x11-toolkits/itk
-CONFIGURE_ENV+=	ITCLINCDIR="${LOCALBASE}/include/itcl3.2" \
-		ITCLLIBDIR="${LOCALBASE}/lib" \
-		ITCLLIBSTR="-litcl32" \
-		ITKINCDIR="${LOCALBASE}/include/itk3.2" \
+CONFIGURE_ENV+=	ITKINCDIR="${LOCALBASE}/include/itk3.2" \
 		ITKLIBDIR="${LOCALBASE}/lib" \
-		ITKLIBSTR="-litk32" \
-		TCLINCDIR="${LOCALBASE}/include/tcl8.3" \
-		TCLLIBDIR="${LOCALBASE}/lib" \
-		TCLLIBSTR="-ltcl83" \
 		TKINCDIR="${LOCALBASE}/include/tk8.3" \
+		TKPRIVATEINCDIR="${LOCALBASE}/include/tk8.3/generic" \
 		TKLIBDIR="${LOCALBASE}/lib" \
-		TKLIBSTR="-ltk83"
+		ITCLINCDIR="${LOCALBASE}/include/itcl3.2" \
+		ITCLLIBDIR="${LOCALBASE}/lib" \
+		TCLINCDIR="${LOCALBASE}/include/tcl8.3" \
+		TCLPRIVATEINCDIR="${LOCALBASE}/include/tcl8.3/generic" \
+		TCLLIBDIR="${LOCALBASE}/lib"
 PLIST_SUB+=	TCLTK=""
 .else
 CONFIGURE_ARGS+=	--disable-itcl --disable-tcl --disable-tk
 PLIST_SUB+=	TCLTK="@comment "
+MAN1+=	plrender.1 plserver.1 pltcl.1
 .endif
 
 post-patch:
-.for file in scripts/mktclIndex
-	@${REINPLACE_CMD} -e 's|tclsh|${LOCALBASE}/bin/tclsh8.3|g' ${WRKSRC}/${file}
-.endfor
+	@${REINPLACE_CMD} -e 's|-litk$$|-litk32|g ; \
+		 s|-ltk$$|-ltk83|g ; \
+		 s|-litcl$$|-litcl32|g ; \
+		 s|-ltcl$$|-ltcl83|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|tclsh|${LOCALBASE}/bin/tclsh8.3|g' \
+		${WRKSRC}/scripts/mktclIndex
 
 .include <bsd.port.mk>
diff --git a/math/plplot/distinfo b/math/plplot/distinfo
index 559cba73d61e..44878395e9de 100644
--- a/math/plplot/distinfo
+++ b/math/plplot/distinfo
@@ -1 +1 @@
-MD5 (plplot-5.1.0.tar.gz) = e0b6608db15102b0fd57670923adfe0a
+MD5 (plplot-5.2.1.tar.gz) = 23c7260470acff2cb40c1e4b19054550
diff --git a/math/plplot/files/patch-aa b/math/plplot/files/patch-aa
deleted file mode 100644
index b0600fe398f2..000000000000
--- a/math/plplot/files/patch-aa
+++ /dev/null
@@ -1,226 +0,0 @@
---- configure.orig	Thu Jan 31 07:23:55 2002
-+++ configure	Thu Feb 28 04:05:01 2002
-@@ -1435,7 +1435,9 @@
- 
- # Defaults
- 
--M4=m4
-+if test -z "$M4"; then
-+    M4=m4
-+fi
- 
- # Double precision
- # Note that because there is no standard way to invoke double
-@@ -1667,9 +1669,9 @@
- # Optimization
- 
- if test "$with_opt" = "yes"; then
--    OPT_FLAG_C=-O
--    OPT_FLAG_CXX=-O
--    OPT_FLAG_F=-O
-+    OPT_FLAG_C="$CFLAGS"
-+    OPT_FLAG_CXX="$CXXFLAGS"
-+    OPT_FLAG_F="$FFLAGS"
- fi
- 
- # ----------------------------------------------------------------------------
-@@ -2143,16 +2145,36 @@
- # Default linker library commands.  These may need version numbers
- # appended to them though.
- 
--ITKLIBSTR=-litk
--TKLIBSTR=-ltk
--ITCLLIBSTR=-litcl
--TCLLIBSTR=-ltcl
--XLIBSTR=-lX11
--GDLIBSTR=-lgd
--CDLIBSTR=-lcd
--PNGLIBSTR=-lpng
--JPEGLIBSTR=-ljpeg
--ZLIBLIBSTR=-lz
-+if test -z "$ITKLIBSTR"; then
-+    ITKLIBSTR=-litk
-+fi
-+if test -z "$TKLIBSTR"; then
-+    TKLIBSTR=-ltk
-+fi
-+if test -z "$ITCLLIBSTR"; then
-+    ITCLLIBSTR=-litcl
-+fi
-+if test -z "$TCLLIBSTR"; then
-+    TCLLIBSTR=-ltcl
-+fi
-+if test -z "$XLIBSTR"; then
-+    XLIBSTR=-lX11
-+fi
-+if test -z "$GDLIBSTR"; then
-+    GDLIBSTR=-lgd
-+fi
-+if test -z "$CDLIBSTR"; then
-+    CDLIBSTR=-lcd
-+fi
-+if test -z "$PNGLIBSTR"; then
-+    PNGLIBSTR=-lpng
-+fi
-+if test -z "$JPEGLIBSTR"; then
-+    JPEGLIBSTR=-ljpeg
-+fi
-+if test -z "$ZLIBSTR"; then
-+    ZLIBLIBSTR=-lz
-+fi
- 
- # Add the current directory to the include path.  This must occur
- # first in the list, before we add the directories for any auxilliary
-@@ -2646,8 +2668,7 @@
-   rm -rf conftest*
-   
- 	incdirs="\
--	/usr/include \
--	/usr/local/include"
-+	/usr/include"
- 
-         for dir in $incdirs; do
- 	    if test -r "$dir/gd.h"; then
-@@ -2705,8 +2726,7 @@
-   echo "$ac_t""no" 1>&6
- 
- 	libdirs="\
--	/usr/lib \
--	/usr/local/lib"
-+	/usr/lib"
- 
-         for dir in $libdirs; do
- 	    if test -r "$dir/libgd.so" -o -r "$dir/libgd.a"; then
-@@ -2767,8 +2787,7 @@
-   echo "$ac_t""no" 1>&6
- 
- 	libdirs="\
--	/usr/lib \
--	/usr/local/lib"
-+	/usr/lib"
- 
-         for dir in $libdirs; do
- 	    if test -r "$dir/libpng.so" -o -r "$dir/libpng.a"; then
-@@ -2829,8 +2848,7 @@
-   echo "$ac_t""no" 1>&6
- 
- 	libdirs="\
--	/usr/lib \
--	/usr/local/lib"
-+	/usr/lib"
- 
-         for dir in $libdirs; do
- 	    if test -r "$dir/libjpeg.so" -o -r "$dir/libjpeg.a"; then
-@@ -2891,8 +2909,7 @@
-   echo "$ac_t""no" 1>&6
- 
- 	libdirs="\
--	/usr/lib \
--	/usr/local/lib"
-+	/usr/lib"
- 
-         for dir in $libdirs; do
- 	    if test -r "$dir/libz.so" -o -r "$dir/libz.a"; then
-@@ -2915,6 +2932,7 @@
-     fi
- fi
- 
-+if /usr/bin/false ; then
- GDLIBS=""
- GDINCS=""
- if test "$enable_png" = "yes" -o "$enable_jpeg" = "yes"; then
-@@ -3037,6 +3055,7 @@
- 
-     fi
- fi
-+fi
- 
- #next test requires C language
- 
-@@ -3161,8 +3180,7 @@
-   rm -rf conftest*
-   
- 	incdirs="\
--	/usr/include \
--	/usr/local/include"
-+	/usr/include"
- 
-         for dir in $incdirs; do
- 	    if test -r "$dir/cd.h"; then
-@@ -3219,8 +3237,7 @@
-   echo "$ac_t""no" 1>&6
- 
- 	libdirs="\
--	/usr/lib \
--	/usr/local/lib"
-+	/usr/lib"
- 
-         for dir in $libdirs; do
- 	    if test -r "$dir/libcd.so" -o -r "$dir/libcd.a"; then
-@@ -3322,7 +3339,6 @@
- $prefix/include \
- $HOME/local/include \
- $HOME/include \
--/usr/local/include \
- /usr/include/tcl \
- /usr/include"
- 
-@@ -3333,7 +3349,6 @@
- $prefix/lib \
- $HOME/local/lib \
- $HOME/lib \
--/usr/local/lib \
- /usr/lib"
- 
- incdirs=$incdirs_default
-@@ -5072,7 +5087,6 @@
- 	$HOME/local/lib \
- 	$HOME/dbmalloc/lib \
- 	$HOME/lib \
--	/usr/local/lib \
- 	/usr/local/dbmalloc/lib \
- 	/usr/lib"
- 
-@@ -5512,6 +5526,13 @@
- 		EXTRA_LIBS="-ldl -lm"
- 	    fi
- 	;;
-+	FreeBSD* )
-+	    if test "$enable_f77" = "yes"; then
-+		EXTRA_LIBS="$EXTRA_LIBS -lm -lg2c"
-+	    else
-+		EXTRA_LIBS="$EXTRA_LIBS -lm"
-+	    fi
-+	;;
- 	* ) 	
- 	    echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
- echo "configure:5518: checking for main in -lXbsd" >&5
-@@ -5793,6 +5814,20 @@
-             # for Linux.)
- 	    SHLIB_F77FLAGS=-fPIC
- 	;;
-+	FreeBSD* )
-+	    SHLIB_CCFLAGS="-fpic -DPIC"
-+	    SHLIB_CXXFLAGS="-fpic -DPIC"
-+	    echo "$ac_t""okay" 1>&6
-+	    if [ "${PORTOBJFORMAT}" = "elf" ]; then
-+		SO='.so.$(MAJOR_VERSION)'
-+		SHLIB_BUILD="$CC -shared -Wl,-soname -Wl,\$@ -o"
-+		SOVERSION='$(MAJOR_VERSION)'
-+	    else
-+		SO='.so.$(MAJOR_VERSION).$(MINOR_VERSION)'
-+		SHLIB_BUILD="ld -Bshareable -o"
-+		SOVERSION='$(MAJOR_VERSION).$(MINOR_VERSION)'
-+	    fi
-+	;;
- 	HP-UX-* )
- 	    SO=".sl"
- 	    SHLIB_F77FLAGS="+z"
-@@ -9672,6 +9707,7 @@
- s%@LDCXX_FLAGS@%$LDCXX_FLAGS%g
- s%@F77_FLAGS@%$F77_FLAGS%g
- s%@LDF_FLAGS@%$LDF_FLAGS%g
-+s%@M4@%$M4%g
- s%@M4_FLAGS@%$M4_FLAGS%g
- s%@CPP@%$CPP%g
- s%@GTK_CONFIG@%$GTK_CONFIG%g
diff --git a/math/plplot/files/patch-ab b/math/plplot/files/patch-ab
deleted file mode 100644
index 7c3fbc245887..000000000000
--- a/math/plplot/files/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
---- cf/install.in.orig	Tue Mar 27 10:01:46 2001
-+++ cf/install.in	Sat Apr 28 07:55:00 2001
-@@ -32,28 +32,26 @@
- install_demos:
- 	@-if test ! -d $(DEMOS_DIR); then mkdir -p $(DEMOS_DIR); fi; \
- 	  if test ! -d $(DEMOS_DIR)/c; then mkdir -p $(DEMOS_DIR)/c; fi; \
--	  $(CP) Makedemo $(DEMOS_DIR)/Makefile; \
--	  $(CP) ../test/test_*.sh plplot-test.sh $(DEMOS_DIR); \
-+	  ${BSD_INSTALL_DATA} Makedemo $(DEMOS_DIR)/Makefile; \
-+	  ${BSD_INSTALL_DATA} ../test/test_*.sh plplot-test.sh $(DEMOS_DIR); \
- 	  chmod a+x $(DEMOS_DIR)/plplot-test.sh; \
- 	  $(LN) ../Makefile $(DEMOS_DIR)/c; \
- 	  cd $(top_srcdir)/examples/c; \
--	  $(CP) *.c $(DEMOS_DIR)/c; \
--	  $(CP) *.h $(INCLUDE_DIR)
-+	  ${BSD_INSTALL_DATA} *.c $(DEMOS_DIR)/c; \
-+	  ${BSD_INSTALL_DATA} *.h $(INCLUDE_DIR)
- 
- install_plrender:
- 	@-if test $(SHARED) = 1; then \
- 	  $(LDC) $(LDC_FLAGS) plrender$O $(LIB_INSTALL) \
- 		-o plrender$E $(LDC_LIBS) $(INSTALL_RPATH); \
- 	  fi; \
--	  strip plrender$E; \
--	  $(CP) plrender$E $(BIN_DIR)
-+	  ${BSD_INSTALL_PROGRAM} plrender$E $(BIN_DIR)
- 
- install_pltek:
--	@-strip pltek$E; $(CP) pltek$E $(BIN_DIR)
-+	@${BSD_INSTALL_PROGRAM} pltek$E $(BIN_DIR)
- 
- install_plplot_config:
--	 @$(CP) plplot-config $(BIN_DIR); \
--	 chmod a+x $(BIN_DIR)/plplot-config
-+	 @${BSD_INSTALL_SCRIPT} plplot-config $(BIN_DIR)
- 
- install_utils: install_plrender install_pltek install_plplot_config
- 
diff --git a/math/plplot/files/patch-ad b/math/plplot/files/patch-ad
deleted file mode 100644
index dceffcd32498..000000000000
--- a/math/plplot/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- cf/init.in.orig	Mon Mar 26 17:10:40 2001
-+++ cf/init.in	Sat Apr 28 01:19:12 2001
-@@ -21,7 +21,7 @@
- OCC		= @OCC@
- F77		= @F77@
- LDF		= @LDF@
--M4		= m4
-+M4		= @M4@
- 
- # Force everything.  If unsure, test for existence first.
- # Redefine these as needed in system-specific setup.
diff --git a/math/plplot/files/patch-ag b/math/plplot/files/patch-ag
deleted file mode 100644
index a70fccb154f0..000000000000
--- a/math/plplot/files/patch-ag
+++ /dev/null
@@ -1,43 +0,0 @@
---- cf/inst_lib.in.orig	Thu Aug 23 08:03:43 2001
-+++ cf/inst_lib.in	Tue Feb 26 04:13:31 2002
-@@ -16,30 +16,33 @@
- 	  if test ! -d $(INFO_DIR); then mkdir -p $(INFO_DIR); fi
- 
- install_fonts:
--	@-cd $(top_srcdir)/lib; $(CP) *.fnt *.map $(DATA_DIR)
-+	@-cd $(top_srcdir)/lib; ${BSD_INSTALL_DATA} *.fnt *.map $(DATA_DIR)
- 
- install_libbase:
- 	@-( cd $(LIB_DIR); $(RM) $(PLLINKS) ) ; \
--	  $(CP) $(PLLIB_BASE)* $(LIB_DIR); \
-+	  ${BSD_INSTALL_DATA} $(PLLIB_BASE)* $(LIB_DIR); \
- 	  if test -r $(PLLIB_BASE)$(LIB_TAG)$A; then \
- 	     $(RANLIB) $(LIB_DIR)/$(PLLIB_BASE)$(LIB_TAG)$A; \
-+	  fi; \
-+	  if test -f $(LIB_DIR)/$(PLLIB_SO); then \
-+	     $(LN) $(PLLIB_SO) $(LIB_DIR)/$(PLLIB_BASE)$(LIB_TAG).so ; \
- 	  fi
- 
- install_textfiles:
- 	@-cd $(top_srcdir); \
--	  $(CP) README NEWS CHANGES Copyright COPYING.LIB FAQ ToDo mklinks \
-+	  ${BSD_INSTALL_DATA} README NEWS CHANGES Copyright COPYING.LIB FAQ ToDo mklinks \
- 		$(DOC_DIR); \
- 	  if test ! -f $(DOC_DIR)/README.local; then \
--	      $(CP) $(top_srcdir)/doc/README.local $(DOC_DIR); \
-+	      ${BSD_INSTALL_DATA} $(top_srcdir)/doc/README.local $(DOC_DIR); \
- 	  fi
- 
- install_scriptfiles:
--	@-cd $(top_srcdir)/scripts; $(CP) pl* pstex2eps $(BIN_DIR)
-+	@-cd $(top_srcdir)/scripts; ${BSD_INSTALL_SCRIPT} pl* pstex2eps $(BIN_DIR)
- 
- install_includes:
--	@-$(CP) plConfig.h plDevs.h $(INCLUDE_DIR); \
-+	@-${BSD_INSTALL_DATA} plConfig.h plDevs.h $(INCLUDE_DIR); \
- 	  cd $(top_srcdir)/include; \
--	  $(CP) plplotP.h plplot.h plxwd.h plevent.h plstrm.h pdf.h \
-+	  ${BSD_INSTALL_DATA} plplotP.h plplot.h plxwd.h plevent.h plstrm.h pdf.h \
- 	     pldebug.h drivers.h disptab.h $(INCLUDE_DIR)
- 
- install_lib: install_dirs install_fonts install_libbase \
diff --git a/math/plplot/files/patch-ah b/math/plplot/files/patch-ah
deleted file mode 100644
index e04d6d400a85..000000000000
--- a/math/plplot/files/patch-ah
+++ /dev/null
@@ -1,23 +0,0 @@
---- cf/pkg_cxx.in.orig	Sat Feb  3 09:36:16 2001
-+++ cf/pkg_cxx.in	Sat Apr 28 07:11:10 2001
-@@ -32,17 +32,17 @@
- # Targets
- 
- install_cxx_includes:
--	@-cd $(top_srcdir)/bindings/c++; $(CP) plstream.h $(INCLUDE_DIR)
-+	@-cd $(top_srcdir)/bindings/c++; ${BSD_INSTALL_DATA} plstream.h $(INCLUDE_DIR)
- 
- install_cxx_demos:
- 	@-if test ! -d $(DEMOS_DIR)/c++; then mkdir -p $(DEMOS_DIR)/c++; fi; \
- 	  $(LN) ../Makefile $(DEMOS_DIR)/c++; \
--	  cd $(top_srcdir)/examples/c++; $(CP) *.cc $(DEMOS_DIR)/c++
-+	  cd $(top_srcdir)/examples/c++; ${BSD_INSTALL_DATA} *.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/math/plplot/files/patch-bindings::tcl::Makefile.in b/math/plplot/files/patch-bindings::tcl::Makefile.in
new file mode 100644
index 000000000000..ae326bf8045f
--- /dev/null
+++ b/math/plplot/files/patch-bindings::tcl::Makefile.in
@@ -0,0 +1,11 @@
+--- bindings/tcl/Makefile.in.orig	Mon Apr 21 21:36:35 2003
++++ bindings/tcl/Makefile.in	Wed Apr 23 18:39:49 2003
+@@ -341,7 +341,7 @@
+ with_rpath_FALSE = @with_rpath_FALSE@
+ with_rpath_TRUE = @with_rpath_TRUE@
+ 
+-tcldir = ${prefix}/$(DATA_DIR)/../tcl
++@enable_tcl_TRUE@tcldir = ${prefix}/$(DATA_DIR)/../tcl
+ 
+ libplplot = ../../src/libplplot$(LIB_TAG).la
+ libmatrix = libtclmatrix$(LIB_TAG).la
diff --git a/math/plplot/files/patch-bindings::tk::Makefile.in b/math/plplot/files/patch-bindings::tk::Makefile.in
new file mode 100644
index 000000000000..abfbf353ba17
--- /dev/null
+++ b/math/plplot/files/patch-bindings::tk::Makefile.in
@@ -0,0 +1,11 @@
+--- bindings/tk/Makefile.in.orig	Mon Apr 21 21:36:35 2003
++++ bindings/tk/Makefile.in	Wed Apr 23 18:28:32 2003
+@@ -341,7 +341,7 @@
+ with_rpath_FALSE = @with_rpath_FALSE@
+ with_rpath_TRUE = @with_rpath_TRUE@
+ 
+-tcldir = ${prefix}/$(DATA_DIR)/../tcl
++@enable_tk_TRUE@tcldir = ${prefix}/$(DATA_DIR)/../tcl
+ 
+ libplplottcltk = ../tcl/libplplottcltk$(LIB_TAG).la
+ 
diff --git a/math/plplot/pkg-plist b/math/plplot/pkg-plist
index f55cb947e63d..c1d4a8f01aa0 100644
--- a/math/plplot/pkg-plist
+++ b/math/plplot/pkg-plist
@@ -1,5 +1,5 @@
 bin/plm2gif
-bin/plplot-config
+bin/plplot_libtool
 bin/plpr
 bin/plrender
 %%TCLTK%%bin/plserver
@@ -11,168 +11,270 @@ include/plplot/drivers.h
 include/plplot/pdf.h
 include/plplot/plConfig.h
 include/plplot/plDevs.h
-include/plplot/plcdemos.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
-%%TCLTK%%include/plplot/pltcl.h
+include/plplot/pltcl.h
 %%TCLTK%%include/plplot/pltk.h
 include/plplot/plxwd.h
-%%TCLTK%%include/plplot/tclMatrix.h
-lib/libplcxxd.a
+include/plplot/tclMatrix.h
+lib/libcsa.a
+lib/libcsa.la
+lib/libcsa.so
+lib/libcsa.so.0
+lib/libplplotcxxd.a
+lib/libplplotcxxd.la
+lib/libplplotcxxd.so
+lib/libplplotcxxd.so.8
 lib/libplplotd.a
+lib/libplplotd.la
 lib/libplplotd.so
-lib/libplplotd.so.5
+lib/libplplotd.so.8
+lib/libplplotf77d.a
+lib/libplplotf77d.la
+lib/libplplotf77d.so
+lib/libplplotf77d.so.8
+%%TCLTK%%lib/libplplottcltkd.a
+%%TCLTK%%lib/libplplottcltkd.la
+%%TCLTK%%lib/libplplottcltkd.so
+%%TCLTK%%lib/libplplottcltkd.so.8
 %%TCLTK%%lib/libtclmatrixd.a
-share/doc/plplot/CHANGES
+%%TCLTK%%lib/libtclmatrixd.la
+%%TCLTK%%lib/libtclmatrixd.so
+%%TCLTK%%lib/libtclmatrixd.so.8
+lib/plplot%%VERSION%%/data/cglobe.map
+lib/plplot%%VERSION%%/data/globe.map
+lib/plplot%%VERSION%%/data/plstnd5.fnt
+lib/plplot%%VERSION%%/data/plxtnd5.fnt
+lib/plplot%%VERSION%%/data/usa.map
+lib/plplot%%VERSION%%/data/usaglobe.map
+lib/plplot%%VERSION%%/driversd/dg300.la
+lib/plplot%%VERSION%%/driversd/dg300.rc
+lib/plplot%%VERSION%%/driversd/dg300.so
+lib/plplot%%VERSION%%/driversd/gd.la
+lib/plplot%%VERSION%%/driversd/gd.rc
+lib/plplot%%VERSION%%/driversd/gd.so
+lib/plplot%%VERSION%%/driversd/hpgl.la
+lib/plplot%%VERSION%%/driversd/hpgl.rc
+lib/plplot%%VERSION%%/driversd/hpgl.so
+lib/plplot%%VERSION%%/driversd/impress.la
+lib/plplot%%VERSION%%/driversd/impress.rc
+lib/plplot%%VERSION%%/driversd/impress.so
+lib/plplot%%VERSION%%/driversd/ljii.la
+lib/plplot%%VERSION%%/driversd/ljii.rc
+lib/plplot%%VERSION%%/driversd/ljii.so
+lib/plplot%%VERSION%%/driversd/ljiip.la
+lib/plplot%%VERSION%%/driversd/ljiip.rc
+lib/plplot%%VERSION%%/driversd/ljiip.so
+lib/plplot%%VERSION%%/driversd/mem.la
+lib/plplot%%VERSION%%/driversd/mem.rc
+lib/plplot%%VERSION%%/driversd/mem.so
+%%TCLTK%%lib/plplot%%VERSION%%/driversd/ntk.la
+%%TCLTK%%lib/plplot%%VERSION%%/driversd/ntk.rc
+%%TCLTK%%lib/plplot%%VERSION%%/driversd/ntk.so
+lib/plplot%%VERSION%%/driversd/null.la
+lib/plplot%%VERSION%%/driversd/null.rc
+lib/plplot%%VERSION%%/driversd/null.so
+lib/plplot%%VERSION%%/driversd/pbm.la
+lib/plplot%%VERSION%%/driversd/pbm.rc
+lib/plplot%%VERSION%%/driversd/pbm.so
+lib/plplot%%VERSION%%/driversd/plmeta.la
+lib/plplot%%VERSION%%/driversd/plmeta.rc
+lib/plplot%%VERSION%%/driversd/plmeta.so
+lib/plplot%%VERSION%%/driversd/ps.la
+lib/plplot%%VERSION%%/driversd/ps.rc
+lib/plplot%%VERSION%%/driversd/ps.so
+lib/plplot%%VERSION%%/driversd/pstex.la
+lib/plplot%%VERSION%%/driversd/pstex.rc
+lib/plplot%%VERSION%%/driversd/pstex.so
+lib/plplot%%VERSION%%/driversd/tek.la
+lib/plplot%%VERSION%%/driversd/tek.rc
+lib/plplot%%VERSION%%/driversd/tek.so
+%%TCLTK%%lib/plplot%%VERSION%%/driversd/tk.la
+%%TCLTK%%lib/plplot%%VERSION%%/driversd/tk.rc
+%%TCLTK%%lib/plplot%%VERSION%%/driversd/tk.so
+%%TCLTK%%lib/plplot%%VERSION%%/driversd/tkwin.la
+%%TCLTK%%lib/plplot%%VERSION%%/driversd/tkwin.rc
+%%TCLTK%%lib/plplot%%VERSION%%/driversd/tkwin.so
+lib/plplot%%VERSION%%/driversd/xfig.la
+lib/plplot%%VERSION%%/driversd/xfig.rc
+lib/plplot%%VERSION%%/driversd/xfig.so
+%%X11%%lib/plplot%%VERSION%%/driversd/xwin.la
+%%X11%%lib/plplot%%VERSION%%/driversd/xwin.rc
+%%X11%%lib/plplot%%VERSION%%/driversd/xwin.so
+lib/plplot%%VERSION%%/examples/c/Makefile
+lib/plplot%%VERSION%%/examples/c/lena.pgm
+lib/plplot%%VERSION%%/examples/c/plcdemos.h
+lib/plplot%%VERSION%%/examples/c/tutor.c
+lib/plplot%%VERSION%%/examples/c/x01c.c
+lib/plplot%%VERSION%%/examples/c/x02c.c
+lib/plplot%%VERSION%%/examples/c/x03c.c
+lib/plplot%%VERSION%%/examples/c/x04c.c
+lib/plplot%%VERSION%%/examples/c/x05c.c
+lib/plplot%%VERSION%%/examples/c/x06c.c
+lib/plplot%%VERSION%%/examples/c/x07c.c
+lib/plplot%%VERSION%%/examples/c/x08c.c
+lib/plplot%%VERSION%%/examples/c/x09c.c
+lib/plplot%%VERSION%%/examples/c/x10c.c
+lib/plplot%%VERSION%%/examples/c/x11c.c
+lib/plplot%%VERSION%%/examples/c/x12c.c
+lib/plplot%%VERSION%%/examples/c/x13c.c
+lib/plplot%%VERSION%%/examples/c/x14c.c
+lib/plplot%%VERSION%%/examples/c/x15c.c
+lib/plplot%%VERSION%%/examples/c/x16c.c
+lib/plplot%%VERSION%%/examples/c/x17c.c
+lib/plplot%%VERSION%%/examples/c/x18c.c
+lib/plplot%%VERSION%%/examples/c/x19c.c
+lib/plplot%%VERSION%%/examples/c/x20c.c
+lib/plplot%%VERSION%%/examples/c/x21c.c
+lib/plplot%%VERSION%%/examples/c++/Makefile
+lib/plplot%%VERSION%%/examples/c++/x01cc.cc
+lib/plplot%%VERSION%%/examples/f77/Makefile
+lib/plplot%%VERSION%%/examples/f77/x01f.f
+lib/plplot%%VERSION%%/examples/f77/x02f.f
+lib/plplot%%VERSION%%/examples/f77/x03f.f
+lib/plplot%%VERSION%%/examples/f77/x04f.f
+lib/plplot%%VERSION%%/examples/f77/x05f.f
+lib/plplot%%VERSION%%/examples/f77/x06f.f
+lib/plplot%%VERSION%%/examples/f77/x07f.f
+lib/plplot%%VERSION%%/examples/f77/x08f.f
+lib/plplot%%VERSION%%/examples/f77/x09f.f
+lib/plplot%%VERSION%%/examples/f77/x10f.f
+lib/plplot%%VERSION%%/examples/f77/x11f.f
+lib/plplot%%VERSION%%/examples/f77/x12f.f
+lib/plplot%%VERSION%%/examples/f77/x13f.f
+lib/plplot%%VERSION%%/examples/f77/x16f.f
+lib/plplot%%VERSION%%/examples/plplot-test.sh
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/README.tcldemos
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/plgrid.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/plot.dat
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/plot.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/r.dat
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/stats.log
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/tclIndex
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/tcldemos.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x01
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x01.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x02
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x02.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x03
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x03.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x04
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x04.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x05
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x05.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x06
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x06.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x07
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x07.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x08
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x08.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x09
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x09.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x10
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x10.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x11
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x11.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x12
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x12.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x13
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x13.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x14
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x14.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x15
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x15.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x16
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x16.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x17
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x17.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x18
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x18.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x19
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tcl/x19.tcl
+lib/plplot%%VERSION%%/examples/test_c.sh
+lib/plplot%%VERSION%%/examples/test_cxx.sh
+lib/plplot%%VERSION%%/examples/test_f77.sh
+%%TCLTK%%lib/plplot%%VERSION%%/examples/test_tcl.sh
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/Makefile
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/README.tkdemos
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/runAllDemos.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/runExtendedDemos.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/tclIndex
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/tk01
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/tk02
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/tk03
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/tk04
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/tkdemos.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x01.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x02.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x03.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x04.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x05.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x06.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x07.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x08.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x09.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x10.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x11.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x12.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x13.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x14.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x15.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x16.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x17.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x18.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/x19.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/xtk01.c
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/xtk02.c
+%%TCLTK%%lib/plplot%%VERSION%%/examples/tk/xtk04.c
+%%TCLTK%%lib/plplot%%VERSION%%/pkgIndex.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/FileSelector.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/PLWin.itk
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/PLXWin.itk
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/Pltkwin.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/about.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/cmap0a.pal
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/cmap1a.pal
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/cmap1a1.pal
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/cmap1b.pal
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/cmap1c.pal
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/cmap1d.pal
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/help_gui.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/help_keys.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/help_tcltk.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/plclient.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/plcolor.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/plconfig.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/pldefaults.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/plplot.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/plserver.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/pltools.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/plwidget.tcl
+%%TCLTK%%lib/plplot%%VERSION%%/tcl/tclIndex
+libdata/pkgconfig/plplot.pc
+share/doc/plplot/AUTHORS
 share/doc/plplot/COPYING.LIB
+share/doc/plplot/ChangeLog
 share/doc/plplot/Copyright
 share/doc/plplot/FAQ
 share/doc/plplot/NEWS
+share/doc/plplot/PROBLEMS
 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/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/c/x20c.c
-share/examples/plplot/c++/Makefile
-share/examples/plplot/c++/x01cc.cc
-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/plplot-test.sh
-%%TCLTK%%share/examples/plplot/tcl/README.tcldemos
-%%TCLTK%%share/examples/plplot/tcl/plgrid.tcl
-%%TCLTK%%share/examples/plplot/tcl/plot.dat
-%%TCLTK%%share/examples/plplot/tcl/plot.tcl
-%%TCLTK%%share/examples/plplot/tcl/r.dat
-%%TCLTK%%share/examples/plplot/tcl/stats.log
-%%TCLTK%%share/examples/plplot/tcl/tcldemos.tcl
-%%TCLTK%%share/examples/plplot/tcl/x01.tcl
-%%TCLTK%%share/examples/plplot/tcl/x02.tcl
-%%TCLTK%%share/examples/plplot/tcl/x03.tcl
-%%TCLTK%%share/examples/plplot/tcl/x04.tcl
-%%TCLTK%%share/examples/plplot/tcl/x05.tcl
-%%TCLTK%%share/examples/plplot/tcl/x06.tcl
-%%TCLTK%%share/examples/plplot/tcl/x07.tcl
-%%TCLTK%%share/examples/plplot/tcl/x08.tcl
-%%TCLTK%%share/examples/plplot/tcl/x09.tcl
-%%TCLTK%%share/examples/plplot/tcl/x10.tcl
-%%TCLTK%%share/examples/plplot/tcl/x11.tcl
-%%TCLTK%%share/examples/plplot/tcl/x12.tcl
-%%TCLTK%%share/examples/plplot/tcl/x13.tcl
-%%TCLTK%%share/examples/plplot/tcl/x14.tcl
-%%TCLTK%%share/examples/plplot/tcl/x15.tcl
-%%TCLTK%%share/examples/plplot/tcl/x16.tcl
-%%TCLTK%%share/examples/plplot/tcl/x17.tcl
-%%TCLTK%%share/examples/plplot/tcl/x18.tcl
-share/examples/plplot/test_c.sh
-share/examples/plplot/test_cxx.sh
-share/examples/plplot/test_f77.sh
-share/examples/plplot/test_octave.sh
-share/examples/plplot/test_python.sh
-share/examples/plplot/test_tcl.sh
-%%TCLTK%%share/examples/plplot/tk/Makefile
-%%TCLTK%%share/examples/plplot/tk/README.tkdemos
-%%TCLTK%%share/examples/plplot/tk/tk01
-%%TCLTK%%share/examples/plplot/tk/tk02
-%%TCLTK%%share/examples/plplot/tk/tk03
-%%TCLTK%%share/examples/plplot/tk/tk04
-%%TCLTK%%share/examples/plplot/tk/tkdemos.tcl
-%%TCLTK%%share/examples/plplot/tk/x01.tcl
-%%TCLTK%%share/examples/plplot/tk/x02.tcl
-%%TCLTK%%share/examples/plplot/tk/x03.tcl
-%%TCLTK%%share/examples/plplot/tk/x04.tcl
-%%TCLTK%%share/examples/plplot/tk/x05.tcl
-%%TCLTK%%share/examples/plplot/tk/x06.tcl
-%%TCLTK%%share/examples/plplot/tk/x07.tcl
-%%TCLTK%%share/examples/plplot/tk/x08.tcl
-%%TCLTK%%share/examples/plplot/tk/x09.tcl
-%%TCLTK%%share/examples/plplot/tk/x10.tcl
-%%TCLTK%%share/examples/plplot/tk/x11.tcl
-%%TCLTK%%share/examples/plplot/tk/x12.tcl
-%%TCLTK%%share/examples/plplot/tk/x13.tcl
-%%TCLTK%%share/examples/plplot/tk/x14.tcl
-%%TCLTK%%share/examples/plplot/tk/x15.tcl
-%%TCLTK%%share/examples/plplot/tk/x16.tcl
-%%TCLTK%%share/examples/plplot/tk/x17.tcl
-%%TCLTK%%share/examples/plplot/tk/x18.tcl
-%%TCLTK%%share/examples/plplot/tk/xtk01.c
-%%TCLTK%%share/examples/plplot/tk/xtk02.c
-%%TCLTK%%share/examples/plplot/tk/xtk04.c
-share/plplot/data/cglobe.map
-share/plplot/data/globe.map
-share/plplot/data/plstnd5.fnt
-share/plplot/data/plxtnd5.fnt
-share/plplot/data/usa.map
-share/plplot/data/usaglobe.map
-%%TCLTK%%share/plplot/tcl/FileSelector.tcl
-%%TCLTK%%share/plplot/tcl/PLWin.itk
-%%TCLTK%%share/plplot/tcl/PLXWin.itk
-%%TCLTK%%share/plplot/tcl/Pltkwin.tcl
-%%TCLTK%%share/plplot/tcl/about.tcl
-%%TCLTK%%share/plplot/tcl/cmap0a.pal
-%%TCLTK%%share/plplot/tcl/cmap1a.pal
-%%TCLTK%%share/plplot/tcl/cmap1a1.pal
-%%TCLTK%%share/plplot/tcl/cmap1b.pal
-%%TCLTK%%share/plplot/tcl/cmap1c.pal
-%%TCLTK%%share/plplot/tcl/cmap1d.pal
-%%TCLTK%%share/plplot/tcl/help_gui.tcl
-%%TCLTK%%share/plplot/tcl/help_keys.tcl
-%%TCLTK%%share/plplot/tcl/help_tcltk.tcl
-%%TCLTK%%share/plplot/tcl/plclient.tcl
-%%TCLTK%%share/plplot/tcl/plcolor.tcl
-%%TCLTK%%share/plplot/tcl/plconfig.tcl
-%%TCLTK%%share/plplot/tcl/pldefaults.tcl
-%%TCLTK%%share/plplot/tcl/plplot.tcl
-%%TCLTK%%share/plplot/tcl/plserver.tcl
-%%TCLTK%%share/plplot/tcl/pltools.tcl
-%%TCLTK%%share/plplot/tcl/plwidget.tcl
-%%TCLTK%%share/plplot/tcl/tclIndex
-%%TCLTK%%@dirrm share/plplot/tcl
-@dirrm share/plplot/data
-@dirrm share/plplot
-%%TCLTK%%@dirrm share/examples/plplot/tk
-%%TCLTK%%@dirrm share/examples/plplot/tcl
-@dirrm share/examples/plplot/f77
-@dirrm share/examples/plplot/c++
-@dirrm share/examples/plplot/c
-@dirrm share/examples/plplot
+share/doc/plplot/README.1st.csa
+share/doc/plplot/README.csa
+share/doc/plplot/README.drivers
 @dirrm share/doc/plplot
+%%TCLTK%%@dirrm lib/plplot%%VERSION%%/tcl
+%%TCLTK%%@dirrm lib/plplot%%VERSION%%/examples/tk
+%%TCLTK%%@dirrm lib/plplot%%VERSION%%/examples/tcl
+@dirrm lib/plplot%%VERSION%%/examples/f77
+@dirrm lib/plplot%%VERSION%%/examples/c++
+@dirrm lib/plplot%%VERSION%%/examples/c
+@dirrm lib/plplot%%VERSION%%/examples
+@dirrm lib/plplot%%VERSION%%/driversd
+@dirrm lib/plplot%%VERSION%%/data
+@dirrm lib/plplot%%VERSION%%
 @dirrm include/plplot