upgrade to 2.03

5 files changed, 39 insertions, 46 deletions

diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile
index e26f7fa77d1b..729c8929c979 100644
--- a/math/ploticus/Makefile
+++ b/math/ploticus/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ploticus
-PORTVERSION=	2.02
+PORTVERSION=	2.03
 CATEGORIES=	math
 MASTER_SITES=	http://ploticus.sourceforge.net/download/
 DISTNAME=	plsrc${PORTVERSION:S/.//}
@@ -24,21 +24,18 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 ALL_TARGET=	# empty
 MAKE_ENV=	LIBS="-L${LOCALBASE}/lib"
 
-MAN1=	pl.1 ploticus.1 plpng.1 pltab.1
+MAN1=	pl.1
 
 post-patch:
 	@${PERL} -pi -e "s,%%X11BASE%%,${X11BASE},g ; \
-		s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
+		s,%%LOCALBASE%%,${LOCALBASE},g ; \
+		s,^CC,#CC,g" ${WRKSRC}/Makefile
 
 do-install:
-.for file in pl pltab
-	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
-.endfor
+	${INSTALL_PROGRAM} ${WRKSRC}/pl ${PREFIX}/bin
 	@${MKDIR} ${DATADIR}
 	${CP} ${WRKSRC}/../prefabs/* ${DATADIR}
-.for file in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/../man/man1/${file} ${MAN1PREFIX}/man/man1
-.endfor
+	${INSTALL_MAN} ${WRKSRC}/../man/man1/${MAN1} ${MAN1PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${CP} -R ${WRKSRC}/../doc/* ${DOCSDIR}
diff --git a/math/ploticus/distinfo b/math/ploticus/distinfo
index 32b73770a560..48b84d97fff0 100644
--- a/math/ploticus/distinfo
+++ b/math/ploticus/distinfo
@@ -1 +1 @@
-MD5 (plsrc202.tar.gz) = bb77876000f4ce4ca2e6892620b7f777
+MD5 (plsrc203.tar.gz) = 807fa4ab2cefc6a1a54fd1c4cac67fc0
diff --git a/math/ploticus/files/patch-Makefile b/math/ploticus/files/patch-Makefile
index 8ee40905fe00..4224b257f34e 100644
--- a/math/ploticus/files/patch-Makefile
+++ b/math/ploticus/files/patch-Makefile
@@ -1,15 +1,6 @@
---- Makefile.orig	Wed Jan 23 22:23:20 2002
-+++ Makefile	Wed Jan 23 22:36:17 2002
-@@ -13,7 +13,7 @@
- ######## Covered by GPL; see the file ./Copyright for details. 
- 
- # defaults..
--CC = gcc
-+#CC = gcc
- PLATFORM = UNIX
- RMCOM = rm -f
- XOBJ = x11.o sleep.o interact.o
-@@ -26,12 +26,12 @@
+--- Makefile.orig	Thu Mar  7 16:10:46 2002
++++ Makefile	Thu Mar  7 16:10:50 2002
+@@ -22,14 +22,14 @@
  ######## Choose one of the following.   All others should be commented out.
  
  #### For Solaris 2.x uncomment the following..
@@ -22,37 +13,46 @@
 -# XLIBS = -L/usr/X11R6/lib -lX11
 -# XINCLUDEDIR = -I/usr/X11R6/include
 +XLIBS = -L%%X11BASE%%/lib -lX11
-+XINCLUDEDIR = -I/usr/X11R6/include
++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
++ADDLIBS = -L%%LOCALBASE%%/lib
  
  #### For Cygwin uncomment the following..
  # PLATFORM = WIN32
-@@ -79,7 +79,7 @@
- ######## Choose ONE of the following.  All others should be commented out.
+@@ -87,11 +87,11 @@
+ # ZFLAG = -DWZ
  
- #### For pseudo-GIF uncomment the following..  (no libs required)
--ploticus: pl pltab
-+#ploticus: pl pltab
+ #### For both pseudo-GIF & PNG uncomment the following..  (you must have libpng and zlib)
+-ploticus: pl plpng 
++#ploticus: pl plpng 
+ # GD16LIBS = -lpng -lz
+ # GD16H = 
+-GD16LIBS = /home/scg/lib/libpng.a /home/scg/lib/libz.a
+-GD16H = -I/home/scg/lib
++#GD16LIBS = /home/scg/lib/libpng.a /home/scg/lib/libz.a
++#GD16H = -I/home/scg/lib
  
- #### For PNG uncomment the following.. (you must have libpng and zlib)
- # ploticus: plpng pltabpng
-@@ -105,11 +105,11 @@
+ #### For JPEG, WBMP, and PNG using your copy of GD 1.84+ uncomment the following.. 
+ #### (you must have gd 1.84+, libpng, zlib, libjpeg)
+@@ -104,11 +104,11 @@
  #### 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 pltabgd18
+-# ploticus: plgd18 
 -# GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
 -# GD18H = 
 -# GDFREETYPE = -DGDFREETYPE
 -# ZFLAG = -DWZ
-+ploticus: plgd18 pltabgd18
++ploticus: plgd18 
 +GD18LIBS = -lgd -lpng -lz -ljpeg -lfreetype
 +GD18H = -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/gd -I%%LOCALBASE%%/include/freetype2
 +GDFREETYPE = -DGDFREETYPE
 +ZFLAG = -DWZ
  
  #### To disable GD image support (no GIF, PNG, JPEG, etc) uncomment the following..
- # ploticus: plnogd pltabnogd
-@@ -123,11 +123,11 @@
+ # ploticus: plnogd 
+@@ -122,11 +122,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
@@ -78,4 +78,4 @@
 +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_bevelrect.o proc_breakaxis.o \
+ 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-reslimits.c b/math/ploticus/files/patch-reslimits.c
index 3623e527397c..4c7166e36726 100644
--- a/math/ploticus/files/patch-reslimits.c
+++ b/math/ploticus/files/patch-reslimits.c
@@ -1,13 +1,10 @@
---- reslimits.c.orig	Wed Jan 23 22:39:27 2002
-+++ reslimits.c	Wed Jan 23 22:41:29 2002
-@@ -9,8 +9,9 @@
+--- reslimits.c.orig	Thu Mar  7 16:11:25 2002
++++ reslimits.c	Thu Mar  7 16:11:48 2002
+@@ -9,6 +9,7 @@
  #ifndef NORLIMIT
  
  #include <stdio.h>
--#include <sys/resource.h>
 +#include <sys/types.h>
  #include <sys/time.h>
-+#include <sys/resource.h>
+ #include <sys/resource.h>
  
- reslimits( type, value )
- char *type;
diff --git a/math/ploticus/pkg-plist b/math/ploticus/pkg-plist
index 22121f2a6132..9a55aaddb4ec 100644
--- a/math/ploticus/pkg-plist
+++ b/math/ploticus/pkg-plist
@@ -1,5 +1,4 @@
 bin/pl
-bin/pltab
 share/ploticus/README
 share/ploticus/chron.pl
 share/ploticus/chunk_area
@@ -33,7 +32,6 @@ share/ploticus/vbars.pl
 %%PORTDOCS%%share/doc/ploticus/autorange.html
 %%PORTDOCS%%share/doc/ploticus/axis.html
 %%PORTDOCS%%share/doc/ploticus/bars.html
-%%PORTDOCS%%share/doc/ploticus/bevelrect.html
 %%PORTDOCS%%share/doc/ploticus/breakaxis.html
 %%PORTDOCS%%share/doc/ploticus/catslide.html
 %%PORTDOCS%%share/doc/ploticus/cgi.html
@@ -48,7 +46,6 @@ share/ploticus/vbars.pl
 %%PORTDOCS%%share/doc/ploticus/curvefit.html
 %%PORTDOCS%%share/doc/ploticus/dataformat.html
 %%PORTDOCS%%share/doc/ploticus/dates.html
-%%PORTDOCS%%share/doc/ploticus/datesettings.html
 %%PORTDOCS%%share/doc/ploticus/defineunits.html
 %%PORTDOCS%%share/doc/ploticus/drawcommands.html
 %%PORTDOCS%%share/doc/ploticus/endproc.html
@@ -98,9 +95,11 @@ share/ploticus/vbars.pl
 %%PORTDOCS%%share/doc/ploticus/processdata.html
 %%PORTDOCS%%share/doc/ploticus/rangebar.html
 %%PORTDOCS%%share/doc/ploticus/rangesweep.html
+%%PORTDOCS%%share/doc/ploticus/rect.html
 %%PORTDOCS%%share/doc/ploticus/scaleunits.html
 %%PORTDOCS%%share/doc/ploticus/scatterplot.html
 %%PORTDOCS%%share/doc/ploticus/scripts.html
+%%PORTDOCS%%share/doc/ploticus/settings.html
 %%PORTDOCS%%share/doc/ploticus/shell.html
 %%PORTDOCS%%share/doc/ploticus/slides.html
 %%PORTDOCS%%share/doc/ploticus/specialchars.html