6 files changed, 95 insertions, 86 deletions

diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile
index c33574a11907..2aeec9f314bb 100644
--- a/math/ploticus/Makefile
+++ b/math/ploticus/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ploticus
-PORTVERSION=	2.10
+PORTVERSION=	2.11
 CATEGORIES=	math
 MASTER_SITES=	http://ploticus.sourceforge.net/download/
 DISTNAME=	plsrc${PORTVERSION:S/.//}
diff --git a/math/ploticus/distinfo b/math/ploticus/distinfo
index ca553aa308ec..9ab142abfaed 100644
--- a/math/ploticus/distinfo
+++ b/math/ploticus/distinfo
@@ -1 +1 @@
-MD5 (plsrc210.tar.gz) = 2f37a537f998e8894399871ebffb7711
+MD5 (plsrc211.tar.gz) = c62dce203d8aeecb589c10ee9e585594
diff --git a/math/ploticus/files/patch-Makefile b/math/ploticus/files/patch-Makefile
deleted file mode 100644
index 6a51610e9335..000000000000
--- a/math/ploticus/files/patch-Makefile
+++ /dev/null
@@ -1,82 +0,0 @@
---- Makefile.orig	Wed Dec 11 22:24:51 2002
-+++ Makefile	Sat Dec 14 01:30:46 2002
-@@ -12,7 +12,7 @@
- ######## Covered by GPL; see the file ./Copyright for details. 
- 
- # defaults..
--CC = gcc
-+CC ?= gcc
- PLATFORM = UNIX
- RMCOM = rm -f
- XOBJ = x11.o interact.o
-@@ -25,14 +25,15 @@
- ########         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
-+FLAGS = -I${LOCALBASE}/include
-+ADDLIBS = -L${LOCALBASE}/lib
- 
- #### For Cygwin uncomment the following..
- # PLATFORM = WIN32
-@@ -79,7 +80,7 @@
- ########         Choose ONE of the following.  All others should be commented out.
- 
- #### 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 +105,11 @@
- #### 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 = 
--# GDFREETYPE = -DGDFREETYPE
--# ZFLAG = -DWZ
-+ploticus: plgd18 
-+GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
-+GD18H = -I${LOCALBASE}/include/gd
-+GDFREETYPE = -DGDFREETYPE
-+ZFLAG = -DWZ
- 
- #### To disable all GD image support (no GIF, PNG, JPEG, etc) uncomment the following..
- # ploticus: plnogd 
-@@ -126,11 +127,11 @@
- #### 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
--# LOCALE_FLAG = -DLOCALE
-+LOCALEOBJ = localef.o
-+LOCALE_FLAG = -DLOCALE
- 
- #### If you want compressed svg (.svgz), and you selected "GIF only", "GIF & PNG", or "disable GD" above, 
- #### uncomment the following.  You need to have zlib.  If necessary change -lz to location of zlib.
-@@ -165,7 +166,7 @@
- 
- LIBS = $(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/math/ploticus/files/patch-src::Makefile b/math/ploticus/files/patch-src::Makefile
new file mode 100644
index 000000000000..47715281a655
--- /dev/null
+++ b/math/ploticus/files/patch-src::Makefile
@@ -0,0 +1,88 @@
+--- Makefile.orig	Sat May 24 15:00:02 2003
++++ Makefile		Sat May 24 15:06:19 2003
+@@ -23,7 +23,7 @@
+ ######## Covered by GPL; see the file ./Copyright for details. 
+ 
+ # defaults..
+-CC = gcc
++CC ?= gcc
+ PLATFORM = UNIX
+ RMCOM = rm -f
+ XOBJ = x11.o interact.o
+@@ -41,7 +41,8 @@
+ XLIBS = -L/usr/X11R6/lib -lX11
+ XINCLUDEDIR = -I/usr/X11R6/include
+ #### For FreeBSD uncomment the following and find GD16H or GD18H below and set to -I/usr/local/include
+-# ADDLIBS = -L/usr/local/lib
++ADDLIBS = -L${LOCALBASE}/lib
++FLAGS = -I${LOCALBASE}/include
+ 
+ #### For Solaris 2.x uncomment the following..
+ # XLIBS = -L/usr/openwin/lib -lX11
+@@ -105,11 +106,11 @@
+ # ploticus: pl 
+ 
+ #### For PNG (only) uncomment the following.. (you must have libpng and zlib)
+-ploticus: plpng 
+-PLPNG = pl 
+-GD16LIBS = -lpng -lz
+-GD16H = 
+-ZFLAG = -DWZ
++#ploticus: plpng 
++#PLPNG = pl 
++#GD16LIBS = -lpng -lz
++#GD16H = 
++#ZFLAG = -DWZ
+ 
+ #### For both pseudo-GIF & PNG uncomment the following..  (you must have libpng and zlib)
+ # ploticus: pl plpng 
+@@ -121,18 +122,18 @@
+ #### (you must have gd 1.84+, libpng, zlib, libjpeg)
+ # ploticus: plgd18 
+ # GD18LIBS = -lgd -lpng -lz -ljpeg 
+-# GD18H = 
+-# GDFREETYPE = 
++# GD18H = -I${LOCALBASE}/include/gd
++# GDFREETYPE = -DGDFREETYPE
+ # ZFLAG = -DWZ
+ 
+ #### For JPEG, WBMP, PNG, and 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 = -I${LOCALBASE}/include/gd 
++GDFREETYPE = -DGDFREETYPE
++ZFLAG = -DWZ
+ 
+ #### To disable all GD image support (no PNG, JPEG, GIF, etc) uncomment the following..
+ # ploticus: plnogd 
+@@ -149,11 +150,11 @@
+ #### 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
+-# LOCALE_FLAG = -DLOCALE
++LOCALEOBJ = localef.o
++LOCALE_FLAG = -DLOCALE
+ 
+ #### SVG output is always available by default.
+ #### If you want compressed SVG (.svgz), and you selected "GIF only", "GIF & PNG", or "disable GD" above, 
+@@ -197,7 +198,7 @@
+ 
+ LIBS = $(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) $(NOPSFLAG) $(NOSVGFLAG) $(NOSWFFLAG) $(XINCLUDEDIR) \
+   $(MINGH) $(NORLIMFLAG) -DPREFABS_DIR=\"$(PREFABS_DIR)\"
+ 
diff --git a/math/ploticus/files/patch-reslimits.c b/math/ploticus/files/patch-src::reslimits.c
index 4c7166e36726..c6794165ca8c 100644
--- a/math/ploticus/files/patch-reslimits.c
+++ b/math/ploticus/files/patch-src::reslimits.c
@@ -1,5 +1,5 @@
---- reslimits.c.orig	Thu Mar  7 16:11:25 2002
-+++ reslimits.c	Thu Mar  7 16:11:48 2002
+--- reslimits.c.orig	Sat May 24 15:07:41 2003
++++ reslimits.c		Sat May 24 15:08:01 2003
 @@ -9,6 +9,7 @@
  #ifndef NORLIMIT
  
diff --git a/math/ploticus/pkg-plist b/math/ploticus/pkg-plist
index b7d1e6f62827..14fe49afa96d 100644
--- a/math/ploticus/pkg-plist
+++ b/math/ploticus/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/pl
 %%PORTDOCS%%share/doc/ploticus/Changelog.html
 %%PORTDOCS%%share/doc/ploticus/Contents.html
@@ -18,6 +19,7 @@ bin/pl
 %%PORTDOCS%%share/doc/ploticus/axis.html
 %%PORTDOCS%%share/doc/ploticus/bars.html
 %%PORTDOCS%%share/doc/ploticus/breakaxis.html
+%%PORTDOCS%%share/doc/ploticus/categories.html
 %%PORTDOCS%%share/doc/ploticus/catslide.html
 %%PORTDOCS%%share/doc/ploticus/cgi.html
 %%PORTDOCS%%share/doc/ploticus/changes20.html
@@ -87,6 +89,7 @@ bin/pl
 %%PORTDOCS%%share/doc/ploticus/specialchars.html
 %%PORTDOCS%%share/doc/ploticus/sql.html
 %%PORTDOCS%%share/doc/ploticus/svg.html
+%%PORTDOCS%%share/doc/ploticus/swf.html
 %%PORTDOCS%%share/doc/ploticus/symboldetails.html
 %%PORTDOCS%%share/doc/ploticus/tabulate.html
 %%PORTDOCS%%share/doc/ploticus/textdetails.html