summaryrefslogtreecommitdiff
path: root/graphics/ploticus/patches/patch-aa
diff options
context:
space:
mode:
authorrh <rh>2002-09-20 11:41:15 +0000
committerrh <rh>2002-09-20 11:41:15 +0000
commit89a665bd7dbf71f41bb4fdf435c2abfc84f47821 (patch)
tree0d1402fe6fc0807217de1e03f80f5ad243e2be7a /graphics/ploticus/patches/patch-aa
parent2103b5994237c5b0d40a381bb8d70935d184f284 (diff)
downloadpkgsrc-89a665bd7dbf71f41bb4fdf435c2abfc84f47821.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/patches/patch-aa')
-rw-r--r--graphics/ploticus/patches/patch-aa128
1 files changed, 76 insertions, 52 deletions
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 \