Update to version 1.1.2.

This version is based on PLplot-5.2.1, which is a large step forward
compared to PLplot-5.0.4 that yPlot was based on before.  For example,
the egregious rendering bugs in example 8 (doc/x08.i) are now long
gone, and the revised doc/x08.i and doc/x11.i show off some new
contouring functionality that is now available with PLplot 3D
plotting. The doc/x??.i examples from yPlot produce identical results
to the corresponding C examples from PLplot which is an excellent test
of the yPlot interface to PLplot. Note the yPlot API changes and
additions in the CHANGES file.

5 files changed, 99 insertions, 89 deletions

diff --git a/graphics/yplot/Makefile b/graphics/yplot/Makefile
index f4c265cc041..e0e11a75b77 100644
--- a/graphics/yplot/Makefile
+++ b/graphics/yplot/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2003/06/02 01:19:09 jschauma Exp $
+# $NetBSD: Makefile,v 1.16 2003/07/10 09:06:47 jtb Exp $
 
-DISTNAME=		yplot-1.1.0
-PKGREVISION=		2
+DISTNAME=		yplot-1.1.2
 CATEGORIES=		graphics math
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=yplot/}
 
@@ -17,10 +16,10 @@ BUILD_DEPENDS+=		teTeX>=1.0:../../print/teTeX
 BROKEN=			Compiling hangs, needs attention.
 .endif
 
-EVAL_PREFIX+=		PLPLOT_PREFIX=plplot
-CONFIGURE_ENV+=		PLPLOT_PREFIX=${PLPLOT_PREFIX}
+CONFIGURE_ENV+=		PLPLOT_PREFIX=${BUILDLINK_PREFIX.plplot}
 EVAL_PREFIX+=		YORICK_PREFIX=yorick
-CONFIGURE_ENV+=		YORICK_CONTRIB_PREFIX=${YORICK_PREFIX}/lib/yorick/1.5
+CONFIGURE_ENV+=		YORICK_HOME=${YORICK_PREFIX}
+CONFIGURE_ENV+=		YORICK_SITE=${YORICK_PREFIX}/share/yorick
 
 GNU_CONFIGURE=		yes
 MAKEFILE=		Makefile.build
@@ -28,5 +27,6 @@ MAKEFILE=		Makefile.build
 PYTHON_FOR_BUILD_ONLY=	yes
 PYTHON_PATCH_SCRIPTS=	parse_documentation.py
 
+.include "../../graphics/plplot/buildlink2.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/yplot/PLIST b/graphics/yplot/PLIST
index 3b7093b3484..8e617eac887 100644
--- a/graphics/yplot/PLIST
+++ b/graphics/yplot/PLIST
@@ -1,8 +1,53 @@
-@comment $NetBSD: PLIST,v 1.4 2003/04/29 22:55:34 jtb Exp $
+@comment $NetBSD: PLIST,v 1.5 2003/07/10 09:06:48 jtb Exp $
 bin/yplot
 bin/yplotl
-share/yorick/1.5/contrib/yplot.i
-share/yorick/1.5/contrib/yplotl.i
+share/doc/yplot/ANNOUNCE
+share/doc/yplot/CHANGES
+share/doc/yplot/COPYING
+share/doc/yplot/DEVICES
+share/doc/yplot/GOALS
+share/doc/yplot/INSTALL
+share/doc/yplot/README
+share/doc/yplot/begin_verbatim.tex
+share/doc/yplot/demo1.ps
+share/doc/yplot/demo2.ps
+share/doc/yplot/demo3.ps
+share/doc/yplot/demo4.ps
+share/doc/yplot/demo5.ps
+share/doc/yplot/demo6.ps
+share/doc/yplot/end_verbatim.tex
+share/doc/yplot/plpoin.ps
+share/doc/yplot/plsym.ps.01
+share/doc/yplot/plsym.ps.02
+share/doc/yplot/plsym.ps.03
+share/doc/yplot/plsym.ps.04
+share/doc/yplot/plsym.ps.05
+share/doc/yplot/plsym.ps.06
+share/doc/yplot/plsym.ps.07
+share/doc/yplot/plsym.ps.08
+share/doc/yplot/plsym.ps.09
+share/doc/yplot/plsym.ps.10
+share/doc/yplot/plsym.ps.11
+share/doc/yplot/plsym.ps.12
+share/doc/yplot/plsym.ps.13
+share/doc/yplot/plsym.ps.14
+share/doc/yplot/plsym.ps.15
+share/doc/yplot/plsym.ps.16
+share/doc/yplot/plsym.ps.17
+share/doc/yplot/reference.tex
+share/doc/yplot/wrapped_demo1.tex
+share/doc/yplot/wrapped_demo2.tex
+share/doc/yplot/wrapped_demo3.tex
+share/doc/yplot/wrapped_demo4.tex
+share/doc/yplot/wrapped_demo5.tex
+share/doc/yplot/wrapped_demo6.tex
+share/doc/yplot/wrapped_plpoin.tex
+share/doc/yplot/wrapped_plsym.tex
+share/doc/yplot/yplot.doc
+share/doc/yplot/yplot.lsm
+share/doc/yplot/ytut.dvi
+share/doc/yplot/ytut.ps.gz
+share/doc/yplot/ytut.tex
 share/examples/yplot/demo1.i
 share/examples/yplot/demo2.i
 share/examples/yplot/demo3.i
@@ -29,21 +74,8 @@ share/examples/yplot/x13.i
 share/examples/yplot/x15.i
 share/examples/yplot/x16.i
 share/examples/yplot/x18.i
-share/doc/yplot/ANNOUNCE
-share/doc/yplot/CHANGES
-share/doc/yplot/COPYING
-share/doc/yplot/DEVICES
-share/doc/yplot/GOALS
-share/doc/yplot/README
-share/doc/yplot/demo1.ps
-share/doc/yplot/demo2.ps
-share/doc/yplot/demo3.ps
-share/doc/yplot/demo4.ps
-share/doc/yplot/demo5.ps
-share/doc/yplot/demo6.ps
-share/doc/yplot/yplot.doc
-share/doc/yplot/ytut.dvi
-share/doc/yplot/ytut.ps.gz
-@dirrm share/doc/yplot
-@dirrm share/examples/yplot
+share/yorick/1.5/contrib/yplot.i
+share/yorick/1.5/contrib/yplotl.i
 @unexec ${RMDIR} %D/share/yorick/1.5/contrib 2>/dev/null || ${TRUE}
+@dirrm share/examples/yplot
+@dirrm share/doc/yplot
diff --git a/graphics/yplot/distinfo b/graphics/yplot/distinfo
index 517e9bef9d4..1af9d34caa2 100644
--- a/graphics/yplot/distinfo
+++ b/graphics/yplot/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2003/04/29 22:55:34 jtb Exp $
+$NetBSD: distinfo,v 1.7 2003/07/10 09:06:48 jtb Exp $
 
-SHA1 (yplot-1.1.0.tar.gz) = f1b6d91c6ee1939144ba61eaa74a5a951f724372
-Size (yplot-1.1.0.tar.gz) = 71736 bytes
-SHA1 (patch-aa) = f9c538f5e262ac10b00a6669162f3336f4285f7a
-SHA1 (patch-ab) = 520dfe7b9382b03a9d1db03efe53799d2fbb1f4d
+SHA1 (yplot-1.1.2.tar.gz) = 21c3a3f9b9fc4f9ba9e25a6e58c2a5ac5812024e
+Size (yplot-1.1.2.tar.gz) = 141005 bytes
+SHA1 (patch-ab) = fcdde8d7ca95fcf2a201051812a0d6eafafcc7c0
diff --git a/graphics/yplot/patches/patch-aa b/graphics/yplot/patches/patch-aa
deleted file mode 100644
index a6136663d31..00000000000
--- a/graphics/yplot/patches/patch-aa
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2001/06/20 12:58:56 jtb Exp $
-
---- configure.orig	Wed Jun 20 04:20:56 2001
-+++ configure
-@@ -528,15 +528,6 @@
- # install with prefix=/usr/local/plplot or prefix=/usr and also installation
- # of plplot with debs or rpm's (where plplot is installed with prefix=/usr).
- 
--incdirs="\
--  /usr \
--  /usr/local/plplot"
--for dir in $incdirs; do
--  if test -r "$dir/bin/plplot-config"; then
--    PLPLOT_PREFIX="$dir"
--    break
--  fi
--done
- if test -z "$PLPLOT_PREFIX"; then
-   echo "$ac_t""ERROR: configuration cannot continue because plplot" 1>&6
-   echo "$ac_t""is not installed in one of the standard places." 1>&6
-@@ -548,17 +539,6 @@
- # This list of directories should cover the common cases of yorick
- # rpm package or Debian package install.
- 
--incdirs="\
--  /usr/lib/yorick/1.4 \
--  /usr/lib/yorick/1.4/i486-debian-linux/"
--for dir in $incdirs; do
--# lib seems to be a common sub-directory for these directories on either
--# rpm or debian systems.
--  if test -r "$dir/lib"; then
--    YORICK_CONTRIB_PREFIX="$dir"
--    break
--  fi
--done
- if test -z "$YORICK_CONTRIB_PREFIX"; then
-   echo "$ac_t""ERROR: configuration cannot continue because yorick" 1>&6
-   echo "$ac_t""is not installed in one of the standard places." 1>&6
diff --git a/graphics/yplot/patches/patch-ab b/graphics/yplot/patches/patch-ab
index bb52f5f7f17..9516770e37e 100644
--- a/graphics/yplot/patches/patch-ab
+++ b/graphics/yplot/patches/patch-ab
@@ -1,17 +1,35 @@
-$NetBSD: patch-ab,v 1.4 2003/04/29 22:55:34 jtb Exp $
+$NetBSD: patch-ab,v 1.5 2003/07/10 09:06:49 jtb Exp $
 
 --- Makefile.build.in.orig
 +++ Makefile.build.in
-@@ -27,7 +27,7 @@
- # so don't use -O option.
+@@ -47,7 +47,7 @@
+ # using include, the h directory should eventually be dropped.
  CFLAGS = -DSTDC_HEADERS=1 -DPAD_ARRAY=1 \
- 	`$(PLPLOT_PREFIX)/bin/plplot-config --cflags` \
--	-I$(YORICK_CONTRIB_PREFIX)/h \
-+	-I$(YORICK_CONTRIB_PREFIX)/include \
+ 	-I$(PLPLOT_PREFIX)/include \
+-	-I$(YORICK_HOME)/include \
++	-I$(YORICK_HOME)/lib/yorick/1.5/include \
+ 	-I$(YORICK_HOME)/h \
  	-DDOUBLE
  
+@@ -73,7 +73,7 @@
+ 	"Nameclash! must get rid of Makefile so this can work"; false ; fi
+ 	yorick -batch make.i yplotl yplotl.i
+ 	$(RM) -f Makefile_yplotl
+-	$(SED) "s?PKG_LIBS =?PKG_LIBS = -L$(PLPLOT_PREFIX)/lib -lplplotd -Wl,--rpath -Wl,$(PLPLOT_PREFIX)/lib?" <Makefile > Makefile_yplotl
++	$(SED) "s?PKG_LIBS =?PKG_LIBS = -L$(PLPLOT_PREFIX)/lib -lplplotd -Wl,--rpath -Wl,$(PLPLOT_PREFIX)/lib -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib?" <Makefile > Makefile_yplotl
+ 	$(RM) -f Makefile
+ 	$(MAKE) -f Makefile_yplotl
  ##############################################
-@@ -299,19 +299,16 @@
+@@ -94,7 +94,7 @@
+ 	"Nameclash! must get rid of Makefile so this can work"; false ; fi
+ 	yorick -batch make.i yplot yplot.i
+ 	$(RM) -f Makefile_yplot
+-	$(SED) "s?PKG_LIBS =?PKG_LIBS = -L$(PLPLOT_PREFIX)/lib -lplplotd -Wl,--rpath -Wl,$(PLPLOT_PREFIX)/lib?" <Makefile > Makefile_yplot
++	$(SED) "s?PKG_LIBS =?PKG_LIBS = -L$(PLPLOT_PREFIX)/lib -lplplotd -Wl,--rpath -Wl,$(PLPLOT_PREFIX)/lib -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib?" <Makefile > Makefile_yplot
+ 	$(RM) -f Makefile
+ 	$(MAKE) -f Makefile_yplot
+ 
+@@ -322,19 +322,18 @@
  ##############################################
  
  install: all yplot.i yplotl.i
@@ -19,24 +37,23 @@ $NetBSD: patch-ab,v 1.4 2003/04/29 22:55:34 jtb Exp $
 -	cp yplot yplotl $(ROOT)$(YPLOT_PREFIX)/bin
 -	mkdir -p $(ROOT)$(YPLOT_PREFIX)/share/doc/yplot/
 -	cp ANNOUNCE CHANGES COPYING DEVICES GOALS INSTALL README yplot.lsm\
--	doc/*.tex doc/*.dvi doc/ytut.ps.gz doc/yplot.doc \
--	doc/demo[1-6].ps \
--	doc/plpoin.ps doc/plsym.ps.??\
 +	$(BSD_INSTALL_PROGRAM) yplot yplotl $(ROOT)$(YPLOT_PREFIX)/bin
 +	$(BSD_INSTALL_DATA_DIR) $(ROOT)$(YPLOT_PREFIX)/share/doc/yplot/
-+	$(BSD_INSTALL_DATA) ANNOUNCE CHANGES COPYING DEVICES GOALS \
-+	README doc/*.dvi doc/ytut.ps.gz doc/yplot.doc doc/demo[1-6].ps \
++	$(BSD_INSTALL_DATA) ANNOUNCE CHANGES COPYING DEVICES GOALS INSTALL README yplot.lsm\
+ 	doc/*.tex doc/*.dvi doc/ytut.ps.gz doc/yplot.doc \
+ 	doc/demo[1-6].ps \
+ 	doc/plpoin.ps doc/plsym.ps.??\
  	$(ROOT)$(YPLOT_PREFIX)/share/doc/yplot/
--	mkdir -p $(ROOT)$(YPLOT_PREFIX)/lib/yplot1.1.0/examples
+-	mkdir -p $(ROOT)$(YPLOT_PREFIX)/lib/yplot1.1.1/examples
 -	cp doc/*.i doc/test.dat \
--	$(ROOT)$(YPLOT_PREFIX)/lib/yplot1.1.0/examples
--	mkdir -p $(ROOT)$(YORICK_CONTRIB_PREFIX)/contrib
--	cp yplot.i yplotl.i $(ROOT)$(YORICK_CONTRIB_PREFIX)/contrib
-+	$(BSD_INSTALL_DATA_DIR) $(ROOT)$(YPLOT_PREFIX)/share/examples/yplot
+-	$(ROOT)$(YPLOT_PREFIX)/lib/yplot1.1.1/examples
+-	mkdir -p $(ROOT)$(YORICK_SITE)/contrib
+-	cp yplot.i yplotl.i $(ROOT)$(YORICK_SITE)/contrib
++	$(BSD_INSTALL_DATA_DIR) $(ROOT)$(YPLOT_PREFIX)/share/examples/yplot/
 +	$(BSD_INSTALL_DATA) doc/*.i doc/test.dat \
-+	$(ROOT)$(YPLOT_PREFIX)/share/examples/yplot
-+	$(BSD_INSTALL_DATA_DIR) $(PREFIX)/share/yorick/1.5/contrib
-+	$(BSD_INSTALL_DATA) yplot.i yplotl.i $(PREFIX)/share/yorick/1.5/contrib
++	$(ROOT)$(YPLOT_PREFIX)/share/examples/yplot/
++	$(BSD_INSTALL_DATA_DIR) $(ROOT)$(YORICK_SITE)/1.5/contrib
++	$(BSD_INSTALL_DATA) yplot.i yplotl.i $(ROOT)$(YORICK_SITE)/1.5/contrib
  
  ##############################################