- Update to version 2.20

PR:		60071
Submitted by:	Ports Fury

4 files changed, 137 insertions, 139 deletions

diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile
index 5373994aee55..c3ae0429d61a 100644
--- a/math/ploticus/Makefile
+++ b/math/ploticus/Makefile
@@ -7,11 +7,10 @@
 #
 
 PORTNAME=	ploticus
-PORTVERSION=	2.11
-PORTREVISION=	2
+PORTVERSION=	2.20
 CATEGORIES=	math
 MASTER_SITES=	http://ploticus.sourceforge.net/download/
-DISTNAME=	plsrc${PORTVERSION:S/.//}
+DISTNAME=	pl${PORTVERSION:S/.//}src
 
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	Generates plots and graphs from data
@@ -45,16 +44,15 @@ PKGNAMESUFFIX=	-nox11
 USE_XPM=	yes
 .endif
 
-MAN1=	pl.1
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pl ${PREFIX}/bin
 	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/../prefabs/* ${DATADIR}
-	${INSTALL_MAN} ${WRKSRC}/../man/man1/${MAN1} ${MANPREFIX}/man/man1
+	cd ${WRKSRC}/../prefabs && ${FIND} . | \
+		cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/* ${DOCSDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/../pltestsuite && ${FIND} . | \
+		cpio -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/math/ploticus/distinfo b/math/ploticus/distinfo
index 9ab142abfaed..68a8e1c5f111 100644
--- a/math/ploticus/distinfo
+++ b/math/ploticus/distinfo
@@ -1 +1 @@
-MD5 (plsrc211.tar.gz) = c62dce203d8aeecb589c10ee9e585594
+MD5 (pl220src.tar.gz) = a609e1e2328b9bf00966506d1038597f
diff --git a/math/ploticus/files/patch-src::swf.c b/math/ploticus/files/patch-src::swf.c
index 63e500760310..d1dcc2813514 100644
--- a/math/ploticus/files/patch-src::swf.c
+++ b/math/ploticus/files/patch-src::swf.c
@@ -1,11 +1,11 @@
---- swf.c.orig	Tue May 20 02:55:58 2003
-+++ swf.c	Wed Jun  4 09:41:53 2003
-@@ -80,7 +80,7 @@
- static void swf_TX(char *s);
- static void swf_LS(char *s);
- static void swf_PO(char *s);
--static void swf_FT(char *s);
-+/* static void swf_FT(char *s); */
- static void swf_TR(char *s);
+--- swf.c.orig	Tue Oct 28 04:45:58 2003
++++ swf.c	Mon Dec  8 00:27:51 2003
+@@ -15,7 +15,7 @@
+ */
+ #ifndef NOSWF
  
- /* ============================= */
+-#include MAX_D_ROWS 1000
++#define MAX_D_ROWS 1000
+ 
+ #include <stdio.h>
+ #include <math.h>
diff --git a/math/ploticus/pkg-plist b/math/ploticus/pkg-plist
index 285e4910913d..216ceddaa4f6 100644
--- a/math/ploticus/pkg-plist
+++ b/math/ploticus/pkg-plist
@@ -1,121 +1,121 @@
 @comment $FreeBSD$
 bin/pl
-%%PORTDOCS%%%%DOCSDIR%%/Changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/Contents.html
-%%PORTDOCS%%%%DOCSDIR%%/Copyright.html
-%%PORTDOCS%%%%DOCSDIR%%/Download.html
-%%PORTDOCS%%%%DOCSDIR%%/Faq.html
-%%PORTDOCS%%%%DOCSDIR%%/Faq.other.html
-%%PORTDOCS%%%%DOCSDIR%%/Feedback.html
-%%PORTDOCS%%%%DOCSDIR%%/Feedback00.html
-%%PORTDOCS%%%%DOCSDIR%%/Problems.html
-%%PORTDOCS%%%%DOCSDIR%%/Versions.html
-%%PORTDOCS%%%%DOCSDIR%%/Welcome.html
-%%PORTDOCS%%%%DOCSDIR%%/annotate.html
-%%PORTDOCS%%%%DOCSDIR%%/api.html
-%%PORTDOCS%%%%DOCSDIR%%/areadef.html
-%%PORTDOCS%%%%DOCSDIR%%/attributetypes.html
-%%PORTDOCS%%%%DOCSDIR%%/autorange.html
-%%PORTDOCS%%%%DOCSDIR%%/axis.html
-%%PORTDOCS%%%%DOCSDIR%%/bars.html
-%%PORTDOCS%%%%DOCSDIR%%/breakaxis.html
-%%PORTDOCS%%%%DOCSDIR%%/categories.html
-%%PORTDOCS%%%%DOCSDIR%%/catslide.html
-%%PORTDOCS%%%%DOCSDIR%%/cgi.html
-%%PORTDOCS%%%%DOCSDIR%%/changes20.html
-%%PORTDOCS%%%%DOCSDIR%%/clickmap.html
-%%PORTDOCS%%%%DOCSDIR%%/color.html
-%%PORTDOCS%%%%DOCSDIR%%/commalist.html
-%%PORTDOCS%%%%DOCSDIR%%/condex.html
-%%PORTDOCS%%%%DOCSDIR%%/config.html
-%%PORTDOCS%%%%DOCSDIR%%/control.html
-%%PORTDOCS%%%%DOCSDIR%%/controlling.html
-%%PORTDOCS%%%%DOCSDIR%%/curvefit.html
-%%PORTDOCS%%%%DOCSDIR%%/dataformat.html
-%%PORTDOCS%%%%DOCSDIR%%/dates.html
-%%PORTDOCS%%%%DOCSDIR%%/defineunits.html
-%%PORTDOCS%%%%DOCSDIR%%/drawcommands.html
-%%PORTDOCS%%%%DOCSDIR%%/dynamic.html
-%%PORTDOCS%%%%DOCSDIR%%/fonts.html
-%%PORTDOCS%%%%DOCSDIR%%/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/getdata.html
-%%PORTDOCS%%%%DOCSDIR%%/gifpatent.html
-%%PORTDOCS%%%%DOCSDIR%%/gpl.gif
-%%PORTDOCS%%%%DOCSDIR%%/import.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/interactive.html
-%%PORTDOCS%%%%DOCSDIR%%/legend.html
-%%PORTDOCS%%%%DOCSDIR%%/legendentry.html
-%%PORTDOCS%%%%DOCSDIR%%/license.jpg
-%%PORTDOCS%%%%DOCSDIR%%/limits.html
-%%PORTDOCS%%%%DOCSDIR%%/line.html
-%%PORTDOCS%%%%DOCSDIR%%/linedetails.html
-%%PORTDOCS%%%%DOCSDIR%%/lineplot.html
-%%PORTDOCS%%%%DOCSDIR%%/new.gif
-%%PORTDOCS%%%%DOCSDIR%%/nonunix.html
-%%PORTDOCS%%%%DOCSDIR%%/page.html
-%%PORTDOCS%%%%DOCSDIR%%/paper.html
-%%PORTDOCS%%%%DOCSDIR%%/pie.html
-%%PORTDOCS%%%%DOCSDIR%%/pl.1.html
-%%PORTDOCS%%%%DOCSDIR%%/ploticus.1.html
-%%PORTDOCS%%%%DOCSDIR%%/ploticus.gif
-%%PORTDOCS%%%%DOCSDIR%%/plshellsql.html
-%%PORTDOCS%%%%DOCSDIR%%/pltab.1.html
-%%PORTDOCS%%%%DOCSDIR%%/posters.html
-%%PORTDOCS%%%%DOCSDIR%%/prefab_chron.html
-%%PORTDOCS%%%%DOCSDIR%%/prefab_dist.html
-%%PORTDOCS%%%%DOCSDIR%%/prefab_draw.html
-%%PORTDOCS%%%%DOCSDIR%%/prefab_lines.html
-%%PORTDOCS%%%%DOCSDIR%%/prefab_multidist.html
-%%PORTDOCS%%%%DOCSDIR%%/prefab_pie.html
-%%PORTDOCS%%%%DOCSDIR%%/prefab_scat.html
-%%PORTDOCS%%%%DOCSDIR%%/prefab_stack.html
-%%PORTDOCS%%%%DOCSDIR%%/prefab_stdparms.html
-%%PORTDOCS%%%%DOCSDIR%%/prefab_vbars.html
-%%PORTDOCS%%%%DOCSDIR%%/prefabs.html
-%%PORTDOCS%%%%DOCSDIR%%/prepress.html
-%%PORTDOCS%%%%DOCSDIR%%/print.html
-%%PORTDOCS%%%%DOCSDIR%%/processdata.html
-%%PORTDOCS%%%%DOCSDIR%%/rangebar.html
-%%PORTDOCS%%%%DOCSDIR%%/rangesweep.html
-%%PORTDOCS%%%%DOCSDIR%%/rect.html
-%%PORTDOCS%%%%DOCSDIR%%/scaleunits.html
-%%PORTDOCS%%%%DOCSDIR%%/scatterplot.html
-%%PORTDOCS%%%%DOCSDIR%%/scripts.html
-%%PORTDOCS%%%%DOCSDIR%%/settings.html
-%%PORTDOCS%%%%DOCSDIR%%/settings.inc.html
-%%PORTDOCS%%%%DOCSDIR%%/shell.html
-%%PORTDOCS%%%%DOCSDIR%%/slides.html
-%%PORTDOCS%%%%DOCSDIR%%/specialchars.html
-%%PORTDOCS%%%%DOCSDIR%%/sql.html
-%%PORTDOCS%%%%DOCSDIR%%/svg.html
-%%PORTDOCS%%%%DOCSDIR%%/swf.html
-%%PORTDOCS%%%%DOCSDIR%%/symboldetails.html
-%%PORTDOCS%%%%DOCSDIR%%/tabulate.html
-%%PORTDOCS%%%%DOCSDIR%%/textdetails.html
-%%PORTDOCS%%%%DOCSDIR%%/times.html
-%%PORTDOCS%%%%DOCSDIR%%/trailer.html
-%%PORTDOCS%%%%DOCSDIR%%/usedata.html
-%%PORTDOCS%%%%DOCSDIR%%/variables.html
-%%PORTDOCS%%%%DOCSDIR%%/vector.html
-%%PORTDOCS%%%%DOCSDIR%%/web.html
-share/ploticus/README
-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
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/Diag.out
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/annot
+%%PORTDOCS%%%%EXAMPLESDIR%%/annot2.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/api_examp.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/bars3.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/clickmap_mouse.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/colorgrid.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/cumufrac.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/curve1.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/data1
+%%PORTDOCS%%%%EXAMPLESDIR%%/data10
+%%PORTDOCS%%%%EXAMPLESDIR%%/data10h
+%%PORTDOCS%%%%EXAMPLESDIR%%/data11
+%%PORTDOCS%%%%EXAMPLESDIR%%/data12
+%%PORTDOCS%%%%EXAMPLESDIR%%/data13
+%%PORTDOCS%%%%EXAMPLESDIR%%/data14
+%%PORTDOCS%%%%EXAMPLESDIR%%/data15
+%%PORTDOCS%%%%EXAMPLESDIR%%/data16
+%%PORTDOCS%%%%EXAMPLESDIR%%/data17
+%%PORTDOCS%%%%EXAMPLESDIR%%/data18
+%%PORTDOCS%%%%EXAMPLESDIR%%/data19
+%%PORTDOCS%%%%EXAMPLESDIR%%/data2
+%%PORTDOCS%%%%EXAMPLESDIR%%/data20
+%%PORTDOCS%%%%EXAMPLESDIR%%/data21
+%%PORTDOCS%%%%EXAMPLESDIR%%/data22
+%%PORTDOCS%%%%EXAMPLESDIR%%/data23
+%%PORTDOCS%%%%EXAMPLESDIR%%/data24
+%%PORTDOCS%%%%EXAMPLESDIR%%/data25
+%%PORTDOCS%%%%EXAMPLESDIR%%/data26
+%%PORTDOCS%%%%EXAMPLESDIR%%/data3
+%%PORTDOCS%%%%EXAMPLESDIR%%/data4
+%%PORTDOCS%%%%EXAMPLESDIR%%/data5
+%%PORTDOCS%%%%EXAMPLESDIR%%/data6
+%%PORTDOCS%%%%EXAMPLESDIR%%/data6b
+%%PORTDOCS%%%%EXAMPLESDIR%%/data7
+%%PORTDOCS%%%%EXAMPLESDIR%%/data8
+%%PORTDOCS%%%%EXAMPLESDIR%%/data9
+%%PORTDOCS%%%%EXAMPLESDIR%%/devol.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/devol.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/distrib.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/drawcom.dcm
+%%PORTDOCS%%%%EXAMPLESDIR%%/drawcom.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/errbar1.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/errbar5.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/heatmap3.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/hitcount.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/hitcount3.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/kmslide.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/lineplot20.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/lineplot4.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/lineplot5.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/mouse.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/pie1.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/plconfig.spanish
+%%PORTDOCS%%%%EXAMPLESDIR%%/propbars1.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/quarters.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/run_prefabs_test
+%%PORTDOCS%%%%EXAMPLESDIR%%/run_prefabs_test.bat
+%%PORTDOCS%%%%EXAMPLESDIR%%/run_script_test
+%%PORTDOCS%%%%EXAMPLESDIR%%/run_script_test.bat
+%%PORTDOCS%%%%EXAMPLESDIR%%/scatterplot10.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/scatterplot10.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/scatterplot4.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/snpmap.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/stock.csv
+%%PORTDOCS%%%%EXAMPLESDIR%%/stock2.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/strainz.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/td.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpf_chron
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpf_cumufrac
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpf_dist
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpf_draw
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpf_heatmap
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpf_lines
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpf_multidist
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpf_pie
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpf_scat
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpf_stack
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpf_vbars
+%%PORTDOCS%%%%EXAMPLESDIR%%/testpf_vdist
+%%PORTDOCS%%%%EXAMPLESDIR%%/timeline2.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/timely.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/timely.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/vector1.htm
+%%PORTDOCS%%%%EXAMPLESDIR%%/vermonth.tab
+%%PORTDOCS%%%%EXAMPLESDIR%%/vf.dat
+%%PORTDOCS%%%%EXAMPLESDIR%%/wind.csv
+%%PORTDOCS%%%%EXAMPLESDIR%%/windbarbs.htm
+%%DATADIR%%/README
+%%DATADIR%%/chron.pl
+%%DATADIR%%/chunk_area
+%%DATADIR%%/chunk_chronfilter
+%%DATADIR%%/chunk_doheatmap
+%%DATADIR%%/chunk_heatmapfilter
+%%DATADIR%%/chunk_logstubs
+%%DATADIR%%/chunk_logtics
+%%DATADIR%%/chunk_read
+%%DATADIR%%/chunk_setstd
+%%DATADIR%%/chunk_stackareafilter
+%%DATADIR%%/chunk_title
+%%DATADIR%%/chunk_vdistfilter
+%%DATADIR%%/chunk_xaxis
+%%DATADIR%%/chunk_yaxis
+%%DATADIR%%/cumufrac.pl
+%%DATADIR%%/dist.pl
+%%DATADIR%%/draw.pl
+%%DATADIR%%/heatmap.pl
+%%DATADIR%%/lines.pl
+%%DATADIR%%/multidist.pl
+%%DATADIR%%/pie.pl
+%%DATADIR%%/processdata.pl
+%%DATADIR%%/scat.pl
+%%DATADIR%%/stack.pl
+%%DATADIR%%/vbars.pl
+%%DATADIR%%/vdist.pl
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%