Updated ploticus to 2.21.

Version 2.21 - Released 12 May '04

A new option for producing dynamic web-based graphs - QUISP (quick
server pages). One nice thing you can do with this is create a CGI
form along with the graph, so users can control various graph
parameters... here's a live demo example of this.

Major changes since 2.20 are lengthy and can be found at:

http://ploticus.sourceforge.net/doc/news_old.html

4 files changed, 37 insertions, 146 deletions

diff --git a/graphics/ploticus/Makefile b/graphics/ploticus/Makefile
index 3a41c66171b..fff85ec5185 100644
--- a/graphics/ploticus/Makefile
+++ b/graphics/ploticus/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2004/04/10 23:49:20 snj Exp $
+# $NetBSD: Makefile,v 1.21 2004/05/15 11:16:45 grant Exp $
 #
 
-DISTNAME=	plsrc210
-PKGNAME=	ploticus-2.10
-PKGREVISION=	2
+DISTNAME=	pl221src
+PKGNAME=	ploticus-2.21
 CATEGORIES=	graphics
 MASTER_SITES=	http://ploticus.sourceforge.net/download/
 
@@ -24,9 +23,11 @@ DOCDST=		${PREFIX}/share/doc/ploticus
 PREFABDST=	${PREFIX}/share/ploticus
 NROFF?=		nroff -mandoc
 
+MAKE_ENV+=	XLIBS="-L${X11BASE}/lib -lX11"
+MAKE_ENV+=	XINCLUDEDIR="-I${X11BASE}/include"
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pl ${PREFIX}/bin/pl
-	${INSTALL_MAN} ${MANSRC}/man1/pl.1 ${PREFIX}/man/man1/pl.1
 	${INSTALL_DATA_DIR} ${PREFABDST}
 .for file in chunk_logtics chunk_xaxis lines.pl stack.pl chron.pl	\
 	chunk_read chunk_yaxis multidist.pl vbars.pl chunk_area		\
@@ -34,24 +35,6 @@ do-install:
 	scat.pl
 	${INSTALL_DATA} ${PREFABSRC}/${file} ${PREFABDST}/${file}
 .endfor
-	${INSTALL_DATA_DIR} ${DOCDST}
-.for file in Changelog Contents Copyright Download Feedback Feedback00	\
-	Versions Welcome
-	${INSTALL_DATA} ${MANSRC}/manpl/${file} ${DOCDST}/${file}
-.endfor
-.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 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 usedata	\
-	variables vector web
-	${NROFF} <${MANSRC}/manpl/${file} >${WRKDIR}/${file}
-	${INSTALL_DATA} ${WRKDIR}/${file} ${DOCDST}/${file}
-.endfor
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/gd/buildlink3.mk"
diff --git a/graphics/ploticus/PLIST b/graphics/ploticus/PLIST
index 54cfad81a13..1eb6a0112a1 100644
--- a/graphics/ploticus/PLIST
+++ b/graphics/ploticus/PLIST
@@ -1,81 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2002/12/16 23:02:32 grant Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/05/15 11:16:45 grant Exp $
 bin/pl
-man/man1/pl.1
-share/doc/ploticus/Changelog
-share/doc/ploticus/Contents
-share/doc/ploticus/Copyright
-share/doc/ploticus/Download
-share/doc/ploticus/Faq
-share/doc/ploticus/Feedback
-share/doc/ploticus/Feedback00
-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
-share/doc/ploticus/axis
-share/doc/ploticus/bars
-share/doc/ploticus/breakaxis
-share/doc/ploticus/catslide
-share/doc/ploticus/cgi
-share/doc/ploticus/clickmap
-share/doc/ploticus/color
-share/doc/ploticus/commalist
-share/doc/ploticus/condex
-share/doc/ploticus/config
-share/doc/ploticus/control
-share/doc/ploticus/controlling
-share/doc/ploticus/curvefit
-share/doc/ploticus/dataformat
-share/doc/ploticus/dates
-share/doc/ploticus/defineunits
-share/doc/ploticus/drawcommands
-share/doc/ploticus/dynamic
-share/doc/ploticus/fonts
-share/doc/ploticus/functions
-share/doc/ploticus/getdata
-share/doc/ploticus/gifpatent
-share/doc/ploticus/import
-share/doc/ploticus/interactive
-share/doc/ploticus/legend
-share/doc/ploticus/legendentry
-share/doc/ploticus/limits
-share/doc/ploticus/line
-share/doc/ploticus/linedetails
-share/doc/ploticus/lineplot
-share/doc/ploticus/page
-share/doc/ploticus/paper
-share/doc/ploticus/pie
-share/doc/ploticus/plshellsql
-share/doc/ploticus/posters
-share/doc/ploticus/prefabs
-share/doc/ploticus/prepress
-share/doc/ploticus/print
-share/doc/ploticus/processdata
-share/doc/ploticus/rangebar
-share/doc/ploticus/rangesweep
-share/doc/ploticus/rect
-share/doc/ploticus/scaleunits
-share/doc/ploticus/scatterplot
-share/doc/ploticus/scripts
-share/doc/ploticus/settings
-share/doc/ploticus/shell
-share/doc/ploticus/slides
-share/doc/ploticus/specialchars
-share/doc/ploticus/sql
-share/doc/ploticus/svg
-share/doc/ploticus/symboldetails
-share/doc/ploticus/tabulate
-share/doc/ploticus/textdetails
-share/doc/ploticus/times
-share/doc/ploticus/trailer
-share/doc/ploticus/usedata
-share/doc/ploticus/variables
-share/doc/ploticus/vector
-share/doc/ploticus/web
 share/ploticus/chron.pl
 share/ploticus/chunk_area
 share/ploticus/chunk_logstubs
@@ -94,4 +18,3 @@ share/ploticus/scat.pl
 share/ploticus/stack.pl
 share/ploticus/vbars.pl
 @dirrm share/ploticus
-@dirrm share/doc/ploticus
diff --git a/graphics/ploticus/distinfo b/graphics/ploticus/distinfo
index cd36197442e..f7654095c3d 100644
--- a/graphics/ploticus/distinfo
+++ b/graphics/ploticus/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/12/16 23:02:32 grant Exp $
+$NetBSD: distinfo,v 1.6 2004/05/15 11:16:45 grant Exp $
 
-SHA1 (plsrc210.tar.gz) = 9783528e23a365ea8e7ac86a3cda0e7034f39682
-Size (plsrc210.tar.gz) = 806288 bytes
-SHA1 (patch-aa) = 9f38da86b131566fdae8524c6bfc8861cf23d1cd
+SHA1 (pl221src.tar.gz) = 01ff416db8a5c1995231ce237e923379cbe6b4dd
+Size (pl221src.tar.gz) = 404260 bytes
+SHA1 (patch-aa) = 87c2cc5fc1f4dc2d684c999ca3e1de9055dafcc3
diff --git a/graphics/ploticus/patches/patch-aa b/graphics/ploticus/patches/patch-aa
index e5c10e34b3d..f62774167d6 100644
--- a/graphics/ploticus/patches/patch-aa
+++ b/graphics/ploticus/patches/patch-aa
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.5 2002/12/16 23:02:33 grant Exp $
+$NetBSD: patch-aa,v 1.6 2004/05/15 11:16:45 grant Exp $
 
---- Makefile.orig	Thu Dec 12 00:24:51 2002
+--- Makefile.orig	2004-05-13 04:49:26.000000000 +1000
 +++ Makefile
-@@ -12,7 +12,7 @@
- ######## Covered by GPL; see the file ./Copyright for details. 
+@@ -26,7 +26,7 @@
+ 
  
  # defaults..
 -CC = gcc
@@ -11,36 +11,21 @@ $NetBSD: patch-aa,v 1.5 2002/12/16 23:02:33 grant Exp $
  PLATFORM = UNIX
  RMCOM = rm -f
  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
--XINCLUDEDIR = -I/usr/openwin/include
-+#XLIBS = -L/usr/openwin/lib -lX11
-+#XINCLUDEDIR = -I/usr/openwin/include
- 
- #### For Linux and FreeBSD uncomment the following..
--# XLIBS = -L/usr/X11R6/lib -lX11
--# XINCLUDEDIR = -I/usr/X11R6/include
-+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
+@@ -42,8 +42,8 @@ EXE = pl
+ #############################################################
  
-@@ -79,7 +79,7 @@ XINCLUDEDIR = -I/usr/openwin/include
- ########         Choose ONE of the following.  All others should be commented out.
+ #### For Linux uncomment the following.. #######################
+-XLIBS = -L/usr/X11R6/lib -lX11
+-INCLUDEDIRS = -I/usr/X11R6/include
++#XLIBS = -L/usr/X11R6/lib -lX11
++#INCLUDEDIRS = -I/usr/X11R6/include
  
- #### For pseudo-GIF (only) uncomment the following..  (no libs required)
--ploticus: pl 
-+#ploticus: pl 
  
- #### For PNG (only) uncomment the following.. (you must have libpng and zlib)
- # ploticus: plpng 
-@@ -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)
+ #### For Solaris 2.x uncomment the following.. #################
+@@ -157,11 +157,11 @@ ZFLAG = -DWZ
+ #### For JPEG, WBMP, PNG, and FreeType2, using your copy of GD 1.84+,          ######
+ #### uncomment the following..  (gd 1.84+, libpng, zlib, libjpeg, libfreetype  ######
+ #### are all required).  Set GDFONTPATH to directory containing .ttf files     ######
 -# ploticus: plgd18 
 -# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
 -# GD18H = 
@@ -52,26 +37,26 @@ $NetBSD: patch-aa,v 1.5 2002/12/16 23:02:33 grant Exp $
 +GDFREETYPE = -DGDFREETYPE
 +ZFLAG = -DWZ
  
- #### To disable all GD image support (no GIF, PNG, JPEG, etc) uncomment the following..
- # ploticus: plnogd 
-@@ -126,7 +126,7 @@ ploticus: pl 
- #### To set a hard-coded directory for prefabs files, uncomment & edit the following.. 
+ 
+ #### To disable all GD image support uncomment the following..  ######################
+@@ -183,6 +183,7 @@ BIN = /usr/local/bin
  #### If done, users won't be required to have PLOTICUS_PREFABS environment variable defined.
  #### This option not available for win32
--# PREFABS_DIR = "/usr/lib/ploticus"
+ # PREFABS_DIR = "/usr/lib/ploticus"
 +PREFABS_DIR = "${PREFIX}/share/ploticus"
  
+ 
  #### For LOCALE support (non-roman alphabets & collation), uncomment the following..
- # LOCALEOBJ = localef.o
-@@ -163,9 +163,9 @@ GD16 = grgd16.o devstuff16.o gd16.o gd_i
+@@ -249,9 +250,10 @@ GD16 = grgd16.o devstuff16.o gd16.o gd_i
  GD = gdfontg.o gdfontl.o gdfontmb.o gdfonts.o gdfontt.o
  
  
 -LIBS = $(XLIBS) -lm $(ADDLIBS) 
-+LIBS = ${LDFLAGS} $(XLIBS) -lm $(ADDLIBS) 
++# LIBS = $(XLIBS) -lm $(ADDLIBS) 
++LIBS = $(LDFLAGS) $(XLIBS) -lm $(ADDLIBS) 
  
 -CFLAGS = -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
 +CFLAGS+= -DPLOTICUS -D$(PLATFORM) -DTDH_NOREC $(ZFLAG) $(FLAGS) $(LOCALE_FLAG) \
-   $(NOGDFLAG) $(NOXFLAG) $(XINCLUDEDIR) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\"
+   $(NOGDFLAG) $(NOXFLAG) $(NOPSFLAG) $(NOSVGFLAG) $(NOSWFFLAG) $(INCLUDEDIRS) \
+   $(MINGH) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\"
  
- OBJ = proc_annotate.o proc_areadef.o proc_axis.o proc_bars.o proc_rect.o proc_breakaxis.o \