diff options
author | rh <rh> | 2002-09-20 11:41:15 +0000 |
---|---|---|
committer | rh <rh> | 2002-09-20 11:41:15 +0000 |
commit | 52ba988a2f8fed7d2c0500bfd1a6d25393cfcb7a (patch) | |
tree | 0d1402fe6fc0807217de1e03f80f5ad243e2be7a /graphics/ploticus | |
parent | 7cc849a838ea415e951d8dfbe30a3bed07f7610c (diff) | |
download | pkgsrc-52ba988a2f8fed7d2c0500bfd1a6d25393cfcb7a.tar.gz |
Update ploticus to 2.04. Changes include tons of bufixes and improvements.
Provided by Grant Beattie <grant@netbsd.org> in private mail.
New features include:
* client-side imagemaps
* Changed: #proc endproc may now be written #endproc. The old syntax
will also continue to work.
* New feature - proc areadef categories - new modifier selectrows
which allows categories to be taken from data field based on a
conditional expression.
* New attribute - proc processdata - outfile allows result to be
written to a file. This came up because a user wanted to perform
arithmetic (a la getdata filter) to processdata result, and there
was no way to do it.
* New feature - proc annotate can now do drop shadows, beveling, and
colored backing box with or without outline.
* New attribute - proc getdata - pf_fieldnames for defining
post-filter fieldnames.
* New attribute - config and proc settings - numberspacerthreshold
controls when thousands separator characters begin to appear.
* New system variable - CM_UNITS - indicates if working in -cm mode
or not.
* HTML server-side imagemap support has been added.
* The data parsing code has been rewritten, and now allows situations
that weren't allowed before.
* new attribute - proc getdata - nfields - Controls the expected
number of fields per record.
* new attribute - proc getdata - fieldnamerows - like fieldnames but
allows data field names to be given one per line.
* new attribute - proc lineplot - gapmissing - allows missing data
points to cause a gap in the curve. Similar parameter added to lines
and chron prefabs.
* new attribute - proc scatterplot - clustermethod - control how
duplicate points will be clustered.
* new attribute - proc scatterplot - symfield and symrangefield -
allows symbol shape, color, etc. to be controlled by a data field.
* new attribute - proc scatterplot - dupsleg allows symbol shape,
color, etc. to be controlled by degree of duplicity
* prefabs - added rectangle as a standard parameter. It controls
plotting area size (and location, if rendering in paginated
postscript).
* some new functions, including $numgroup() and $dategroup() which are
useful in grouping a set of numbers or dates into bins.
* SVG capabilities. The driver was written by Bill Traill.
* postscript - ISO Latin1 encoding added, so that European
characters may be produced in postscript exactly like they are in
the other environments (ascii 128-255).
* Created graphic files are automatically chmod'ed to mode 644.
* Prefabs
* CGI mode
* A new script interpreter. New flow of control operators including:
#elseif #else #for #while #setifnotgiven #call #write #shell, etc.
Also, increased capacities for data fields and variables (250
chars) and script input lines (3000). The new interpreter involves
some script syntax changes that may cause existing scripts to
break in some cases.
* #sql, a new directive for retrieving data directly from an SQL
database. This is currently under development, and
user-contributed client interfaces to DBMSs such as MySQL and
Oracle would be welcome (the code is in dbinterface.c)
* Added: proc areadef autorange - new subattributes selectrows (for
selecting rows to be considered when scanning for min and max) and
combomode (to allow correct finding of min and max for situations
like error bars and stacked bars).
* Added: proc areadef autorange - now sets variables DATAXMIN,
DATAXMAX, DATAYMIN, and DATAYMAX - the actual minima and maxima of
data field.
* Added: proc axis - stubevery attribute
* Added: proc getdata - pathname attribute, to specify data file
name directly without involving cat(1)
* Added: proc bars - colorfield attribute - set bar color based on a
data field
* Added: proc legendentry - tag attribute
* Added: various new functions
* Added: the temp file default path name and default slash character
can now be changed in pl.h or in a config file.
* Added: resource utilization (cpu time and size of created disk
files) now can be controlled. Default upper limits are 10 cpu
seconds and 5,000,000 bytes. Limits may be altered in pl.h or by
using a config file
* Added: various other config file settings
Diffstat (limited to 'graphics/ploticus')
-rw-r--r-- | graphics/ploticus/Makefile | 64 | ||||
-rw-r--r-- | graphics/ploticus/PLIST | 43 | ||||
-rw-r--r-- | graphics/ploticus/distinfo | 13 | ||||
-rw-r--r-- | graphics/ploticus/patches/patch-aa | 128 | ||||
-rw-r--r-- | graphics/ploticus/patches/patch-ab | 13 | ||||
-rw-r--r-- | graphics/ploticus/patches/patch-ac | 19 | ||||
-rw-r--r-- | graphics/ploticus/patches/patch-ad | 13 |
7 files changed, 151 insertions, 142 deletions
diff --git a/graphics/ploticus/Makefile b/graphics/ploticus/Makefile index 6bef6b86ee3..16e80d1beac 100644 --- a/graphics/ploticus/Makefile +++ b/graphics/ploticus/Makefile @@ -1,51 +1,63 @@ -# $NetBSD: Makefile,v 1.12 2002/03/17 16:23:34 fredb Exp $ +# $NetBSD: Makefile,v 1.13 2002/09/20 11:41:15 rh Exp $ # -DISTNAME= plsrc141 -PKGNAME= ploticus-1.41 -PKGREVISION= 1 +DISTNAME= plsrc204 +PKGNAME= ploticus-2.04 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_LOCAL:=${PKGNAME_NOREV}/} -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:C/src/man/}${EXTRACT_SUFX} +MASTER_SITES= http://ploticus.sourceforge.net/download/ MAINTAINER= rh@netbsd.org HOMEPAGE= http://ploticus.sourceforge.net/doc/Welcome.html COMMENT= Versatile data visualization engine -DEPENDS+= png>=1.2.1:../../graphics/png - NO_CONFIGURE= YES USE_X11= YES -DIST_SUBDIR= ${PKGNAME_NOREV} +USE_BUILDLINK2= YES + +ALL_TARGET= ploticus +WRKSRC= ${WRKDIR}/${DISTNAME}/src +MANSRC= ${WRKDIR}/${DISTNAME}/man +PREFABSRC= ${WRKDIR}/${DISTNAME}/prefabs -MANSRC= ${WRKSRC:C/plsrc/plman/} DOCDST= ${PREFIX}/share/doc/ploticus +PREFABDST= ${PREFIX}/share/ploticus NROFF?= nroff -mandoc do-install: -.for file in pl plpng pltab pltabpng - ${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin/${file} -.endfor -.for file in pl ploticus plpng pltab - ${INSTALL_MAN} ${MANSRC}/man/man1/${file}.1 \ - ${PREFIX}/man/man1/${file}.1 + ${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 \ + chunk_setstd dist.pl pie.pl chunk_logstubs chunk_title draw.pl \ + 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}/man/manpl/${file} ${DOCDST}/${file} + ${INSTALL_DATA} ${MANSRC}/manpl/${file} ${DOCDST}/${file} .endfor .for file in Faq Problems annotate areadef attributetypes autorange \ - axis bars bevelrect breakaxis catslide color condex config \ - controlling curvefit dataformat dates datesettings defineunits \ - drawcommands endproc foo functions getdata gifpatent import \ - interactive legend legendentry limits line linedetails lineplot \ - missingdata originaldata page paper pie posters prefabs print \ - processdata rangebar rangesweep scaleunits scatterplot scripts \ - slides specialchars symboldetails tabulate textdetails times \ - trailer transform variables web - ${NROFF} <${MANSRC}/man/manpl/${file} >${WRKDIR}/${file} + 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 \ + scatterplot scripts settings shell slides specialchars sql svg \ + symboldetails tabulate textdetails times trailer transform \ + variables web + ${NROFF} <${MANSRC}/manpl/${file} >${WRKDIR}/${file} ${INSTALL_DATA} ${WRKDIR}/${file} ${DOCDST}/${file} .endfor +.include "../../devel/zlib/buildlink2.mk" +.include "../../graphics/gd/buildlink2.mk" +.include "../../graphics/jpeg/buildlink2.mk" +.include "../../graphics/png/buildlink2.mk" +.include "../../graphics/freetype-lib/buildlink2.mk" +.include "../../graphics/freetype2/buildlink2.mk" + .include "../../mk/bsd.pkg.mk" diff --git a/graphics/ploticus/PLIST b/graphics/ploticus/PLIST index fee57d8d0a0..723aee2726a 100644 --- a/graphics/ploticus/PLIST +++ b/graphics/ploticus/PLIST @@ -1,12 +1,6 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:53:01 zuntum Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/09/20 11:41:15 rh Exp $ bin/pl -bin/plpng -bin/pltab -bin/pltabpng man/man1/pl.1 -man/man1/ploticus.1 -man/man1/plpng.1 -man/man1/pltab.1 share/doc/ploticus/Changelog share/doc/ploticus/Contents share/doc/ploticus/Copyright @@ -23,27 +17,31 @@ share/doc/ploticus/attributetypes share/doc/ploticus/autorange share/doc/ploticus/axis share/doc/ploticus/bars -share/doc/ploticus/bevelrect 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/datesettings share/doc/ploticus/defineunits share/doc/ploticus/drawcommands +share/doc/ploticus/dynamic share/doc/ploticus/endproc -share/doc/ploticus/foo +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/legenddriven share/doc/ploticus/legendentry share/doc/ploticus/limits share/doc/ploticus/line @@ -54,17 +52,24 @@ share/doc/ploticus/originaldata 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 @@ -73,4 +78,22 @@ share/doc/ploticus/trailer share/doc/ploticus/transform share/doc/ploticus/variables share/doc/ploticus/web +share/ploticus/chron.pl +share/ploticus/chunk_area +share/ploticus/chunk_logstubs +share/ploticus/chunk_logtics +share/ploticus/chunk_read +share/ploticus/chunk_setstd +share/ploticus/chunk_title +share/ploticus/chunk_xaxis +share/ploticus/chunk_yaxis +share/ploticus/dist.pl +share/ploticus/draw.pl +share/ploticus/lines.pl +share/ploticus/multidist.pl +share/ploticus/pie.pl +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 951f9d7c184..6769f2d00da 100644 --- a/graphics/ploticus/distinfo +++ b/graphics/ploticus/distinfo @@ -1,10 +1,5 @@ -$NetBSD: distinfo,v 1.3 2001/07/08 08:09:39 rh Exp $ +$NetBSD: distinfo,v 1.4 2002/09/20 11:41:16 rh Exp $ -SHA1 (ploticus-1.41/plsrc141.tar.gz) = 675ee667d4b0561abf9f271fdaf7a081db86b0c7 -Size (ploticus-1.41/plsrc141.tar.gz) = 257913 bytes -SHA1 (ploticus-1.41/plman141.tar.gz) = c353434240574e77d8098ac695b4969a750c53f1 -Size (ploticus-1.41/plman141.tar.gz) = 147028 bytes -SHA1 (patch-aa) = 4bb627cfedaf0d3692c9700533f7551ca0e133ea -SHA1 (patch-ab) = a1e7b090bf6f13c9f3659a81dcdf6a284b67a978 -SHA1 (patch-ac) = 0038991b57d5537a8c9af9a2b92e374ec50f6689 -SHA1 (patch-ad) = 49e77b3fc5794d3ec9005ac632bb5226dd748704 +SHA1 (plsrc204.tar.gz) = b3fa59be04ffb91b23f01fc129bdb504843ed5f5 +Size (plsrc204.tar.gz) = 755995 bytes +SHA1 (patch-aa) = 43ab10ab37ae8d77884e01973fd40f113f57cfb7 diff --git a/graphics/ploticus/patches/patch-aa b/graphics/ploticus/patches/patch-aa index bab550d07ed..29601e6f7be 100644 --- a/graphics/ploticus/patches/patch-aa +++ b/graphics/ploticus/patches/patch-aa @@ -1,57 +1,81 @@ -$NetBSD: patch-aa,v 1.3 2000/10/08 18:27:10 hubertf Exp $ +$NetBSD: patch-aa,v 1.4 2002/09/20 11:41:16 rh Exp $ ---- Makefile.orig Thu Sep 28 16:46:34 2000 +--- Makefile.orig Fri Jun 14 23:58:53 2002 +++ Makefile -@@ -24,7 +24,7 @@ - ## and porting. - +@@ -10,7 +10,7 @@ + ######## Covered by GPL; see the file ./Copyright for details. + # defaults.. -CC = gcc +#CC = gcc - ADDLIBS = - SLEEPLIB = - -@@ -32,15 +32,15 @@ - ######## and comment out the others: - - ## For Solaris 2.x --PLATFORM = SOLARIS2 --XLIBDIR = /usr/openwin/lib --XINCLUDEDIR = /usr/openwin/include --SLEEPLIB = -lposix4 # for nanosleep() only -+#PLATFORM = SOLARIS2 -+#XLIBDIR = /usr/openwin/lib -+#XINCLUDEDIR = /usr/openwin/include -+#SLEEPLIB = -lposix4 # for nanosleep() only - - ## For Linux, FreeBSD --# PLATFORM = BSD --# XLIBDIR = /usr/X11R6/lib --# XINCLUDEDIR = /usr/X11R6/include -+PLATFORM = BSD -+XLIBDIR = ${X11BASE}/lib -+XINCLUDEDIR = ${X11BASE}/include - - ## For AIX 3.2.5, HP-UX 10.20 - # (note for HP-UX it was necessary to do: ln gd_io.h gd16 -@@ -126,9 +126,9 @@ - - - --LIBS = $(XLIBS) -lm $(ADDLIBS) -+LIBS = ${LDFLAGS} ${XLIBS} -lm $(ADDLIBS) - --CFLAGS = -D$(PLATFORM) -DPLOTICUS -DDIST $(XCFLAGS) $(FLAGS) $(LOCALE_FLAG) -+CFLAGS+= -D${PLATFORM} -DPLOTICUS -DDIST ${XCFLAGS} ${FLAGS} ${LOCALE_FLAG} - - OBJ = custom.o execplfile.o lib.o areadef.o page.o axis.o getdata.o parsedata.o \ - drawcommands.o annotate.o tabulate.o lineplot.o bars.o bevelrect.o units.o line.o \ -@@ -168,7 +168,7 @@ - gd16files: - $(CC) -c grgd.c -DGDPNG -I./ -I./gd16 -o grgd16.o - $(CC) -c devstuff.c -DGDPNG -o devstuff16.o -- $(CC) -c -I./gd16 -I./ $(GD16H) gd16.c gd_io.c gd_io_dp.c gd_io_file.c gd_png.c -+ $(CC) -c -I./gd16 -I./ -I${PREFIX}/include $(GD16H) gd16.c gd_io.c gd_io_dp.c gd_io_file.c gd_png.c - - install: - mv pl pltab plpng pltabpng ../bin + 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. + + #### 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} -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. + + #### For pseudo-GIF uncomment the following.. (no libs required) +-ploticus: pl ++# ploticus: pl + + #### For PNG 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 +-# ploticus: plgd18 +-# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype +-# GD18H = +-# GDFREETYPE = -DGDFREETYPE +-# ZFLAG = -DWZ ++ploticus: plgd18 ++GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype ++GD18H = ++GDFREETYPE = -DGDFREETYPE ++ZFLAG = -DWZ + + #### To disable GD image support (no GIF, PNG, JPEG, etc) uncomment the following.. + # ploticus: plnogd +@@ -125,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 +-# PREFABS_DIR = "/usr/lib/ploticus" ++PREFABS_DIR = "${PREFIX}/share/ploticus" + + #### 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 + GD = gdfontg.o gdfontl.o gdfontmb.o gdfonts.o gdfontt.o + + +-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)\" + + OBJ = proc_annotate.o proc_areadef.o proc_axis.o proc_bars.o proc_rect.o proc_breakaxis.o \ diff --git a/graphics/ploticus/patches/patch-ab b/graphics/ploticus/patches/patch-ab deleted file mode 100644 index 1e1f916d1a7..00000000000 --- a/graphics/ploticus/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2001/07/08 08:09:40 rh Exp $ - ---- preliminaries.c.orig Sun Jul 8 09:47:17 2001 -+++ preliminaries.c -@@ -18,7 +18,7 @@ - - /* set first part of name for for tmp files.. */ - make_unique_string( buf, 0 ); --sprintf( Tmpname, "/usr/tmp/plo%s", buf ); -+sprintf( Tmpname, "/tmp/plo%s", buf ); - - Errfp = stderr; /* portability? */ - Diagfp = stderr; /* portability? */ diff --git a/graphics/ploticus/patches/patch-ac b/graphics/ploticus/patches/patch-ac deleted file mode 100644 index 140352edc69..00000000000 --- a/graphics/ploticus/patches/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2001/07/08 08:09:40 rh Exp $ - ---- units.c.orig Sun Jul 8 09:52:03 2001 -+++ units.c -@@ -275,8 +275,14 @@ - else i = 1; - - if( unittyp[i] == LINEAR ) { -+ /* when generating incremental axes moving from negative to positive, for zero sprintf sometimes -+ gives -0.00 or very tiny values like -5.5579e-17. The following is a workaround.. scg 7/5/01 */ -+ if( f < 0.0000000000001 && f > -0.0000000000001 ) f = 0.0; -+ - if( strlen( format ) < 1 ) sprintf( result, "%g", f ); - else sprintf( result, format, f ); -+ -+ - if( Bignumspacer ) rewritenums( result ); /* rewrite w/various spacing, decimal pt options*/ - } - diff --git a/graphics/ploticus/patches/patch-ad b/graphics/ploticus/patches/patch-ad deleted file mode 100644 index a82df5e990b..00000000000 --- a/graphics/ploticus/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2001/07/08 08:09:40 rh Exp $ - ---- getdata.c.orig Sun Jul 8 09:53:12 2001 -+++ getdata.c -@@ -349,7 +349,7 @@ - char recordid[80]; - char data[MAXITEMS][DATAMAXLEN+1]; - char *df[MAXITEMS]; --char str[255], str2[255]; -+char str[MAXINBUF], str2[MAXINBUF]; /* size increased from 255 scg 6/27/01 */ - int nfields, nrecords, nd; - int i; - char commentchar[12]; |