Updated plplot to 5.0.2. No log of recent changes.

8 files changed, 44 insertions, 34 deletions

diff --git a/graphics/plplot/Makefile b/graphics/plplot/Makefile
index bb5b52096cf..3e369686759 100644
--- a/graphics/plplot/Makefile
+++ b/graphics/plplot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2001/02/05 09:00:59 tron Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/14 11:19:16 jtb Exp $
 
-DISTNAME=	plplot-5.0.1
+DISTNAME=	plplot-5.0.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=plplot/}
 
@@ -21,15 +21,16 @@ USE_X11=	YES
 EVAL_PREFIX+=	TK_PREFIX=tk TCL_PREFIX=tcl
 
 CONFIGURE_ENV+=	"BIN_DIR=${PREFIX}/bin"
-CONFIGURE_ENV+=	"LIB_DIR=${PREFIX}/lib/plplot"
+CONFIGURE_ENV+=	"LIB_DIR=${PREFIX}/lib"
 CONFIGURE_ENV+=	"INCLUDE_DIR=${PREFIX}/include/plplot"
+CONFIGURE_ENV+=	"DATA_DIR=${PREFIX}/libdata/plplot"
 CONFIGURE_ENV+=	"DOC_DIR=${PREFIX}/share/doc/plplot"
 CONFIGURE_ENV+=	"DEMOS_DIR=${PREFIX}/share/examples/plplot"
+CONFIGURE_ENV+=	"TCL_DIR=${PREFIX}/lib/tcl/plplot"
 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}"
@@ -53,6 +54,6 @@ post-patch:
 
 pre-configure:
 	(cd ${WRKSRC}/cf && ${LOCALBASE}/bin/autoconf)
-	${MV} ${WRKSRC}/cf/configure ${WRKSRC}/configure
+	${CP} ${WRKSRC}/cf/configure ${WRKSRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/plplot/files/md5 b/graphics/plplot/files/md5
index 02a6ade1d1b..94a427421a5 100644
--- a/graphics/plplot/files/md5
+++ b/graphics/plplot/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 2001/01/29 01:15:35 jtb Exp $
+$NetBSD: md5,v 1.4 2001/02/14 11:19:16 jtb Exp $
 
-MD5 (plplot-5.0.1.tar.gz) = 33942ab215cdad070a0390ac9ae6b764
+MD5 (plplot-5.0.2.tar.gz) = f1e518100dccc74094d7fab2a5b50136
diff --git a/graphics/plplot/files/patch-sum b/graphics/plplot/files/patch-sum
index 1ea89526dcb..aab6d760320 100644
--- a/graphics/plplot/files/patch-sum
+++ b/graphics/plplot/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.5 2001/01/29 01:15:35 jtb Exp $
+$NetBSD: patch-sum,v 1.6 2001/02/14 11:19:16 jtb Exp $
 
 MD5 (patch-aa) = 29ba62b72e8b544c673778522c9dde02
 MD5 (patch-ab) = 4e19a8510c846a9c778c29abb42a8032
@@ -8,7 +8,7 @@ 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-ai) = 875cd4de4f7be2cd8c0fb40ab1dccaad
+MD5 (patch-aj) = b5aeafacfe7a5d9ab26fe12fc0bc70d3
 MD5 (patch-ak) = 15623f3878315c08525157da85d294ca
-MD5 (patch-al) = 8343b4233e7c9883bb54a4a6faf2a6cd
+MD5 (patch-al) = 0421edcfc2b3e3317f4fa0487675fb28
diff --git a/graphics/plplot/patches/patch-ai b/graphics/plplot/patches/patch-ai
index 1f62f3d171a..916e2c5ed4e 100644
--- a/graphics/plplot/patches/patch-ai
+++ b/graphics/plplot/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.1 2001/01/29 01:15:35 jtb Exp $
+$NetBSD: patch-ai,v 1.2 2001/02/14 11:19:17 jtb Exp $
 
---- cf/pkg_cxx.in.orig	Mon Jan 29 00:15:42 2001
+--- cf/pkg_cxx.in.orig	Wed Feb 14 07:45:57 2001
 +++ cf/pkg_cxx.in
 @@ -32,17 +32,17 @@
  # Targets
@@ -12,7 +12,7 @@ $NetBSD: patch-ai,v 1.1 2001/01/29 01:15:35 jtb Exp $
  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++; \
+ 	  $(LN) ../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++
  
diff --git a/graphics/plplot/patches/patch-aj b/graphics/plplot/patches/patch-aj
index 2109bce01e7..b47b3c853b2 100644
--- a/graphics/plplot/patches/patch-aj
+++ b/graphics/plplot/patches/patch-aj
@@ -1,14 +1,23 @@
-$NetBSD: patch-aj,v 1.1 2001/01/29 01:15:35 jtb Exp $
+$NetBSD: patch-aj,v 1.2 2001/02/14 11:19:17 jtb Exp $
 
---- cf/pkg_f77.in.orig	Mon Jan 29 00:15:31 2001
+--- cf/pkg_f77.in.orig	Wed Feb 14 07:51:15 2001
 +++ cf/pkg_f77.in
+@@ -15,7 +15,7 @@
+ 
+ FDEMOS_SOURCES = x01f.f x02f.f x03f.f x04f.f x05f.f x06f.f x07f.f \
+ 	x08f.f x09f.f x10f.f x11f.f x12f.f x13f.f x16f.f
+-	
++
+ x01f.f: x01f.fm4 fmacs.m4
+ 
+ x02f.f: x02f.fm4 fmacs.m4
 @@ -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; \
+ 	  $(LN) ../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-al b/graphics/plplot/patches/patch-al
index a42322c46fd..a7d0efc89df 100644
--- a/graphics/plplot/patches/patch-al
+++ b/graphics/plplot/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.1 2001/01/29 01:15:35 jtb Exp $
+$NetBSD: patch-al,v 1.2 2001/02/14 11:19:17 jtb Exp $
 
---- cf/pkg_tk.in.orig	Fri Jan 12 23:34:22 2001
+--- cf/pkg_tk.in.orig	Wed Feb 14 07:53:54 2001
 +++ cf/pkg_tk.in
 @@ -22,28 +22,27 @@
  # Targets
@@ -32,7 +32,7 @@ $NetBSD: patch-al,v 1.1 2001/01/29 01:15:35 jtb Exp $
  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; \
+ 	  $(LN) ../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 ; \
diff --git a/graphics/plplot/pkg/DESCR b/graphics/plplot/pkg/DESCR
index cf2f0ca6b86..f0f27473170 100644
--- a/graphics/plplot/pkg/DESCR
+++ b/graphics/plplot/pkg/DESCR
@@ -6,9 +6,9 @@ set.  The package is designed to make it easy to quickly get graphical
 output; only a handful of function calls is typically required.  For
 more advanced use, virtually all aspects of plotting are configurable.
 
-PLplot includes device drivers for postscript, xfig, HPGL, impress,
-native meta-file, X-Window, Xterm, Tcl/Tk, Tektronix terminals,
-vt100/tek and vt320/tek emulators, and others.
+PLplot includes drivers for postscript, xfig, HPGL, impress, native
+meta-file, X-Window, Xterm, Tcl/Tk, Tektronix terminals, vt100/tek and
+vt320/tek emulators, and others.
 
 The PLplot package includes interfaces for the Fortran, C, C++, and
 Tcl languages. There is also a Tcl based interpreter (pltcl), allowing
diff --git a/graphics/plplot/pkg/PLIST b/graphics/plplot/pkg/PLIST
index 48ff422330a..47309d2b2ec 100644
--- a/graphics/plplot/pkg/PLIST
+++ b/graphics/plplot/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/01/29 01:24:41 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/02/14 11:19:17 jtb Exp $
 bin/plplot_linkage
 bin/plrender
 bin/plserver
@@ -19,15 +19,9 @@ 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/libplcxxd.a
-lib/plplot/libplmatrix.a
-lib/plplot/libplplotd.a
-lib/plplot/plstnd5.fnt
-lib/plplot/plxtnd5.fnt
-lib/plplot/usa.map
-lib/plplot/usaglobe.map
+lib/libplcxxd.a
+lib/libplmatrix.a
+lib/libplplotd.a
 lib/tcl/plplot/FileSelector.tcl
 lib/tcl/plplot/PLWin.itk
 lib/tcl/plplot/PLXWin.itk
@@ -50,6 +44,12 @@ lib/tcl/plplot/plserver.tcl
 lib/tcl/plplot/pltools.tcl
 lib/tcl/plplot/plwidget.tcl
 lib/tcl/plplot/tclIndex
+libdata/plplot/cglobe.map
+libdata/plplot/globe.map
+libdata/plplot/plstnd5.fnt
+libdata/plplot/plxtnd5.fnt
+libdata/plplot/usa.map
+libdata/plplot/usaglobe.map
 share/doc/plplot/CHANGES
 share/doc/plplot/COPYING.LIB
 share/doc/plplot/Copyright
@@ -152,8 +152,8 @@ share/examples/plplot/tk/xtk01.c
 share/examples/plplot/tk/xtk02.c
 share/examples/plplot/tk/xtk04.c
 @dirrm include/plplot
-@dirrm lib/plplot
 @dirrm lib/tcl/plplot
+@dirrm libdata/plplot
 @dirrm share/doc/plplot
 @dirrm share/examples/plplot/c
 @dirrm share/examples/plplot/c++