Updated ploticus to 2.10.

Major changes since 2.04:

- New libploticus C API.
- Vector plots.
- Unicode/big5 support (via GD and freetype).
- Disk resource limits lifted.
- CGI-mode fixes.
- Script interpreter overflow fixes.
- Other misc changes and bug fixes.

4 files changed, 38 insertions, 45 deletions

diff --git a/graphics/ploticus/Makefile b/graphics/ploticus/Makefile
index 16e80d1beac..c58baae6897 100644
--- a/graphics/ploticus/Makefile
+++ b/graphics/ploticus/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2002/09/20 11:41:15 rh Exp $
+# $NetBSD: Makefile,v 1.14 2002/12/16 23:02:31 grant Exp $
 #
 
-DISTNAME=	plsrc204
-PKGNAME=	ploticus-2.04
+DISTNAME=	plsrc210
+PKGNAME=	ploticus-2.10
 CATEGORIES=	graphics
 MASTER_SITES=	http://ploticus.sourceforge.net/download/
 
@@ -38,17 +38,16 @@ do-install:
 	Versions Welcome
 	${INSTALL_DATA} ${MANSRC}/manpl/${file} ${DOCDST}/${file}
 .endfor
-.for file in Faq Problems annotate areadef attributetypes autorange	\
+.for file in Faq Problems annotate api areadef attributetypes autorange	\
 	axis bars breakaxis catslide cgi clickmap color commalist	\
 	condex config control controlling curvefit dataformat dates	\
-	defineunits drawcommands dynamic endproc fonts functions	\
-	getdata gifpatent import interactive legend legenddriven	\
-	legendentry limits line linedetails lineplot missingdata	\
-	originaldata page paper pie plshellsql posters prefabs prepress	\
-	print processdata rangebar rangesweep rect scaleunits		\
+	defineunits drawcommands dynamic fonts functions getdata	\
+	gifpatent import interactive legend legendentry limits line	\
+	linedetails lineplot page paper pie plshellsql posters prefabs	\
+	prepress print processdata rangebar rangesweep rect scaleunits	\
 	scatterplot scripts settings shell slides specialchars sql svg	\
-	symboldetails tabulate textdetails times trailer transform	\
-	variables web
+	symboldetails tabulate textdetails times trailer usedata	\
+	variables vector web
 	${NROFF} <${MANSRC}/manpl/${file} >${WRKDIR}/${file}
 	${INSTALL_DATA} ${WRKDIR}/${file} ${DOCDST}/${file}
 .endfor
diff --git a/graphics/ploticus/PLIST b/graphics/ploticus/PLIST
index 723aee2726a..54cfad81a13 100644
--- a/graphics/ploticus/PLIST
+++ b/graphics/ploticus/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/09/20 11:41:15 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/12/16 23:02:32 grant Exp $
 bin/pl
 man/man1/pl.1
 share/doc/ploticus/Changelog
@@ -12,6 +12,7 @@ share/doc/ploticus/Problems
 share/doc/ploticus/Versions
 share/doc/ploticus/Welcome
 share/doc/ploticus/annotate
+share/doc/ploticus/api
 share/doc/ploticus/areadef
 share/doc/ploticus/attributetypes
 share/doc/ploticus/autorange
@@ -33,7 +34,6 @@ share/doc/ploticus/dates
 share/doc/ploticus/defineunits
 share/doc/ploticus/drawcommands
 share/doc/ploticus/dynamic
-share/doc/ploticus/endproc
 share/doc/ploticus/fonts
 share/doc/ploticus/functions
 share/doc/ploticus/getdata
@@ -41,14 +41,11 @@ share/doc/ploticus/gifpatent
 share/doc/ploticus/import
 share/doc/ploticus/interactive
 share/doc/ploticus/legend
-share/doc/ploticus/legenddriven
 share/doc/ploticus/legendentry
 share/doc/ploticus/limits
 share/doc/ploticus/line
 share/doc/ploticus/linedetails
 share/doc/ploticus/lineplot
-share/doc/ploticus/missingdata
-share/doc/ploticus/originaldata
 share/doc/ploticus/page
 share/doc/ploticus/paper
 share/doc/ploticus/pie
@@ -75,8 +72,9 @@ share/doc/ploticus/tabulate
 share/doc/ploticus/textdetails
 share/doc/ploticus/times
 share/doc/ploticus/trailer
-share/doc/ploticus/transform
+share/doc/ploticus/usedata
 share/doc/ploticus/variables
+share/doc/ploticus/vector
 share/doc/ploticus/web
 share/ploticus/chron.pl
 share/ploticus/chunk_area
diff --git a/graphics/ploticus/distinfo b/graphics/ploticus/distinfo
index 6769f2d00da..cd36197442e 100644
--- a/graphics/ploticus/distinfo
+++ b/graphics/ploticus/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/09/20 11:41:16 rh Exp $
+$NetBSD: distinfo,v 1.5 2002/12/16 23:02:32 grant Exp $
 
-SHA1 (plsrc204.tar.gz) = b3fa59be04ffb91b23f01fc129bdb504843ed5f5
-Size (plsrc204.tar.gz) = 755995 bytes
-SHA1 (patch-aa) = 43ab10ab37ae8d77884e01973fd40f113f57cfb7
+SHA1 (plsrc210.tar.gz) = 9783528e23a365ea8e7ac86a3cda0e7034f39682
+Size (plsrc210.tar.gz) = 806288 bytes
+SHA1 (patch-aa) = 9f38da86b131566fdae8524c6bfc8861cf23d1cd
diff --git a/graphics/ploticus/patches/patch-aa b/graphics/ploticus/patches/patch-aa
index 29601e6f7be..e5c10e34b3d 100644
--- a/graphics/ploticus/patches/patch-aa
+++ b/graphics/ploticus/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2002/09/20 11:41:16 rh Exp $
+$NetBSD: patch-aa,v 1.5 2002/12/16 23:02:33 grant Exp $
 
---- Makefile.orig	Fri Jun 14 23:58:53 2002
+--- Makefile.orig	Thu Dec 12 00:24:51 2002
 +++ Makefile
-@@ -10,7 +10,7 @@
+@@ -12,7 +12,7 @@
  ######## Covered by GPL; see the file ./Copyright for details. 
  
  # defaults..
@@ -10,9 +10,9 @@ $NetBSD: patch-aa,v 1.4 2002/09/20 11:41:16 rh Exp $
 +#CC = gcc
  PLATFORM = UNIX
  RMCOM = rm -f
- XOBJ = x11.o sleep.o interact.o
-@@ -23,15 +23,16 @@ PLPNG = plpng 
- ######## Choose one of the following.   All others should be commented out.
+ XOBJ = x11.o interact.o
+@@ -25,12 +25,12 @@ PLPNG = plpng 
+ ########         Choose one of the following.   All others should be commented out.
  
  #### For Solaris 2.x uncomment the following..
 -XLIBS = -L/usr/openwin/lib -lX11
@@ -23,28 +23,24 @@ $NetBSD: patch-aa,v 1.4 2002/09/20 11:41:16 rh Exp $
  #### For Linux and FreeBSD uncomment the following..
 -# XLIBS = -L/usr/X11R6/lib -lX11
 -# XINCLUDEDIR = -I/usr/X11R6/include
-+XLIBS = -L${X11BASE} -lX11
++XLIBS = -L${X11BASE}/lib -lX11
 +XINCLUDEDIR = -I${X11BASE}/include
  #### For FreeBSD uncomment the following and find GD16H or GD18H below and set to -I/usr/local/include
  # ADDLIBS = -L/usr/local/lib
  
-+
- #### For Cygwin uncomment the following..
- # PLATFORM = WIN32
- # XLIBS = -L/usr/X11R6/lib -lX11
-@@ -78,7 +79,7 @@ XINCLUDEDIR = -I/usr/openwin/include
- ######## Choose ONE of the following.  All others should be commented out.
+@@ -79,7 +79,7 @@ XINCLUDEDIR = -I/usr/openwin/include
+ ########         Choose ONE of the following.  All others should be commented out.
  
- #### For pseudo-GIF uncomment the following..  (no libs required)
+ #### For pseudo-GIF (only) uncomment the following..  (no libs required)
 -ploticus: pl 
-+# ploticus: pl 
++#ploticus: pl 
  
- #### For PNG uncomment the following.. (you must have libpng and zlib)
+ #### For PNG (only) uncomment the following.. (you must have libpng and zlib)
  # ploticus: plpng 
-@@ -103,11 +104,11 @@ ploticus: pl 
- #### For JPEG, WBMP, and PNG & FreeType2 using your copy of GD 1.84+ uncomment the following..
- #### (you must have gd 1.84+, libpng, zlib, libjpeg, libfreetype)
- #### Before using set environment var GDFONTPATH to directory containing .ttf files
+@@ -104,11 +104,11 @@ ploticus: pl 
+ #### For JPEG, WBMP, PNG, with FreeType2, using your copy of GD 1.84 or higher,
+ ####  uncomment the following..   (you must have gd 1.84+, libpng, zlib, libjpeg, libfreetype)
+ ####  (set environment var GDFONTPATH to directory containing .ttf files)
 -# ploticus: plgd18 
 -# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
 -# GD18H = 
@@ -56,9 +52,9 @@ $NetBSD: patch-aa,v 1.4 2002/09/20 11:41:16 rh Exp $
 +GDFREETYPE = -DGDFREETYPE
 +ZFLAG = -DWZ
  
- #### To disable GD image support (no GIF, PNG, JPEG, etc) uncomment the following..
+ #### To disable all GD image support (no GIF, PNG, JPEG, etc) uncomment the following..
  # ploticus: plnogd 
-@@ -125,7 +126,7 @@ ploticus: pl 
+@@ -126,7 +126,7 @@ ploticus: pl 
  #### To set a hard-coded directory for prefabs files, uncomment & edit the following.. 
  #### If done, users won't be required to have PLOTICUS_PREFABS environment variable defined.
  #### This option not available for win32
@@ -67,7 +63,7 @@ $NetBSD: patch-aa,v 1.4 2002/09/20 11:41:16 rh Exp $
  
  #### For LOCALE support (non-roman alphabets & collation), uncomment the following..
  # LOCALEOBJ = localef.o
-@@ -156,9 +157,9 @@ GD16 = grgd16.o devstuff16.o gd16.o gd_i
+@@ -163,9 +163,9 @@ GD16 = grgd16.o devstuff16.o gd16.o gd_i
  GD = gdfontg.o gdfontl.o gdfontmb.o gdfonts.o gdfontt.o
  
  
@@ -78,4 +74,4 @@ $NetBSD: patch-aa,v 1.4 2002/09/20 11:41:16 rh Exp $
 +CFLAGS+= -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
    $(NOGDFLAG) $(NOXFLAG) $(XINCLUDEDIR) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\"
  
- OBJ = 	proc_annotate.o proc_areadef.o proc_axis.o proc_bars.o proc_rect.o proc_breakaxis.o \
+ OBJ = proc_annotate.o proc_areadef.o proc_axis.o proc_bars.o proc_rect.o proc_breakaxis.o \