Update to 1.39, to work around changed distfiles with same name.

Fixes PR 11168 by Alaric Snell <alaric@alaric-snell.com>

Changes:

Version 1.39: Sept 29 '00
*Changed - proc transform renamed as proc processdata ('transform' still
 works)
*Changed - script syntax - references to undeclared @variables are now left
 alone. Formerly they had resulted in syntax errors.
*Added - proc areadef - autorange - if nearest= is omitted a reasonable
 default will be used for numeric data. Formerly it defaulted to exact min
 and max, which was usually not desirable. It is now possible to say
 nearest=exact to get exact min and max, should that be wanted.
*Added - proc areadef - categories - a new attribute called
 'catcompmethod', to control the details of how category comparisons are
 done.
*Added - proc areadef - now sets variables XMIN, XMAX, YMIN, and YMAX
*Fixed bug - proc areadef - autorange - problems with negative numbers;
*Added - proc axis - 'stubs increment' with no following value gives a
 reasonable default increment. So does 'stubs inc 0'.
*Added - proc bars - barwidthfield and bwfscale for data-driven bar widths
*Added - proc datesettings - several new options for omitting weekends
*Fixed bug - proc getdata - choking on long path names. Increased sizes of
 many buffers throughout.
*Fixed bug - proc getdata field names - a name beginning with a number such
 as 16kHz was being interpreted as an integer field number.
*Added - proc processdata - new actions 'breaks' to do break processing on
 data sets, and related action 'breakreset'.
*Added - proc rangebar - when using meanmode, plotfields may now be used
 for getting a mean, standard deviation, and optionally an N value.
*Changed - proc rangebar - variable NVALUES is now always set, even if
 nothing was plotted (it will be zero in this case).
*Added - proc rangebar - new attributes showbriefstats, showstatsfile,
 briefstatstag to make a file holding computed statistical info that can be
 used by other programs
*Added - proc rangebar - allow 'none' for outliernearsym and outlierfarsym,
 for when displaying outliers using only labels or line segments.
*Added - proc rangebar - a new attribute called 'skipmed', to omit median
 and percentiles calculation when only means and standard deviations are
 needed (a performance consideration).
*Fixed bug - proc rangesweep - bug involving the use of 'select'
*Added - new function - $dataitem(), to access a single data item from the
 current data set by row and field position.
*Added - command line / proc page - the options -croprel and -crop
*Changed - ploticus temp file naming now uses shorter names
*Added - user-contributed RPM spec file. See the Download page under
 Accessories.
*Changed - makefile & build - copied gd_io.h to the gd16 subdirectory for
 successful solaris 'make' build
*Added - MP/ix added to Makefile
*Changed - gallery example EPS or Postscript files will no longer be stored
 on the web site, except for the pltab examples.
*Changed - ploticus manual in postscript form will no longer be maintained
 or distributed.

Version 1.38: Jun 9 '00
*It is now possible to set the directory used for temp files, using a new
 config attribute tmpdir.
*under cygwin, problems have been reported with pltab writing postscript to
 standard output. Workaround is to use pltab -o

5 files changed, 26 insertions, 31 deletions

diff --git a/graphics/ploticus/Makefile b/graphics/ploticus/Makefile
index ae5694dfd77..959ea9d9eb2 100644
--- a/graphics/ploticus/Makefile
+++ b/graphics/ploticus/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2000/05/26 05:55:11 rh Exp $
+# $NetBSD: Makefile,v 1.6 2000/10/08 18:27:09 hubertf Exp $
 #
 
 DISTNAME=	plsrc13
-PKGNAME=	ploticus-1.37
+PKGNAME=	ploticus-1.39
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.sgpr.net/download/ \
 		http://gd.tuwien.ac.at/visual/ploticus/download/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MANDIST}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME:C/src/man/}${EXTRACT_SUFX}
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.sgpr.net/
@@ -15,9 +15,10 @@ DEPENDS+=	png>=1.0.6:../../graphics/png
 
 NO_CONFIGURE=	YES
 USE_X11=	YES
+DIST_SUBDIR=	ploticus-1.39
 
-MANDIST=	plman13
-MANSRC=		${WRKDIR}/${MANDIST}
+WRKSRC=		${WRKDIR}/ploticus/src
+MANSRC=		${WRKDIR}/ploticus/man
 DOCDST=		${PREFIX}/share/doc/ploticus
 NROFF?=		nroff -mandoc
 
@@ -26,19 +27,12 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin/${file}
 .endfor
 .for file in pl ploticus plpng pltab
-	${INSTALL_MAN} ${MANSRC}/man1/${file}.1 ${PREFIX}/man/man1/${file}.1
+	${INSTALL_MAN} ${MANSRC}/../man/man1/${file}.1 \
+		${PREFIX}/man/man1/${file}.1
 .endfor
 	${INSTALL_DATA_DIR} ${DOCDST}
-.for file in Faq Problems Util Welcome annotate areadef attributetypes \
-	     axis bars bevelrect breakaxis catslide color condex config \
-	     controlling curvefit dataformat dates defineunits \
-	     drawcommands endproc functions getdata gifpatent import \
-	     interactive legend legendentry limits line linedetails \
-	     lineplot missingdata originaldata page paper pie posters \
-	     print rangebar rangesweep scaleunits scatterplot scripts \
-	     slides specialchars symboldetails tabulate textdetails times \
-	     trailer transform variables web
-	${NROFF} <${MANSRC}/manpl/${file} >${WRKDIR}/${file}
+.for file in Faq Problems Util annotate areadef attributetypes axis bars bevelrect breakaxis catslide color condex config controlling curvefit dataformat dates datesettings defineunits drawcommands endproc functions getdata gifpatent import interactive legend legendentry limits line linedetails lineplot missingdata originaldata page paper pie posters print processdata rangebar rangesweep scaleunits scatterplot scripts slides specialchars symboldetails tabulate textdetails times trailer transform variables web
+	${NROFF} <${MANSRC}/../man/manpl/${file} >${WRKDIR}/${file}
 	${INSTALL_DATA} ${WRKDIR}/${file} ${DOCDST}/${file}
 .endfor
 
diff --git a/graphics/ploticus/files/md5 b/graphics/ploticus/files/md5
index c43b3393ef4..d1fe08f2e7a 100644
--- a/graphics/ploticus/files/md5
+++ b/graphics/ploticus/files/md5
@@ -1,4 +1,4 @@
-$NetBSD: md5,v 1.4 2000/05/26 05:55:12 rh Exp $
+$NetBSD: md5,v 1.5 2000/10/08 18:27:09 hubertf Exp $
 
-MD5 (plsrc13.tar.gz) = 4486b05a6cb17d66bf1043ade7ec9f49
-MD5 (plman13.tar.gz) = 617661b30e22f58b3d7f758d67af31e0
+MD5 (ploticus-1.39/plsrc13.tar.gz) = fccae99644eb6771dd778ae1776236b0
+MD5 (ploticus-1.39/plman13.tar.gz) = 92597a1bbaa1e468c9805c5997217076
diff --git a/graphics/ploticus/files/patch-sum b/graphics/ploticus/files/patch-sum
index 78eaaab9c50..57dc96130c0 100644
--- a/graphics/ploticus/files/patch-sum
+++ b/graphics/ploticus/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.2 2000/04/12 06:38:25 rh Exp $
+$NetBSD: patch-sum,v 1.3 2000/10/08 18:27:10 hubertf Exp $
 
-MD5 (patch-aa) = 1f2f3bf1ecf639d590c7034259f4760a
+MD5 (patch-aa) = 6b490422628da893de7cc042605af489
diff --git a/graphics/ploticus/patches/patch-aa b/graphics/ploticus/patches/patch-aa
index 24a896ccecb..bab550d07ed 100644
--- a/graphics/ploticus/patches/patch-aa
+++ b/graphics/ploticus/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2000/04/12 06:38:25 rh Exp $
+$NetBSD: patch-aa,v 1.3 2000/10/08 18:27:10 hubertf Exp $
 
---- Makefile.orig	Wed Mar 15 22:21:08 2000
-+++ Makefile	Wed Apr 12 08:30:56 2000
-@@ -28,7 +28,7 @@
+--- Makefile.orig	Thu Sep 28 16:46:34 2000
++++ Makefile
+@@ -24,7 +24,7 @@
  ## and porting.
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2000/04/12 06:38:25 rh Exp $
  ADDLIBS =
  SLEEPLIB =
  
-@@ -36,15 +36,15 @@
+@@ -32,15 +32,15 @@
  ######## and comment out the others:
  
  ## For Solaris 2.x
@@ -34,7 +34,7 @@ $NetBSD: patch-aa,v 1.2 2000/04/12 06:38:25 rh Exp $
  
  ## For AIX 3.2.5, HP-UX 10.20
  # (note for HP-UX it was necessary to do: ln gd_io.h gd16
-@@ -120,9 +120,9 @@
+@@ -126,9 +126,9 @@
  
  
  
@@ -46,9 +46,9 @@ $NetBSD: patch-aa,v 1.2 2000/04/12 06:38:25 rh Exp $
  
  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 \
-@@ -163,7 +163,7 @@
+@@ -168,7 +168,7 @@
  gd16files: 
- 	$(CC) -c grgd.c -DGDPNG -I./gd16 -I./ -o grgd16.o
+ 	$(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
diff --git a/graphics/ploticus/pkg/PLIST b/graphics/ploticus/pkg/PLIST
index efb62b60e9d..62697cd36a0 100644
--- a/graphics/ploticus/pkg/PLIST
+++ b/graphics/ploticus/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/11/24 20:29:10 rh Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/10/08 18:27:10 hubertf Exp $
 bin/pl
 bin/plpng
 bin/pltab
@@ -10,7 +10,6 @@ man/man1/pltab.1
 share/doc/ploticus/Faq
 share/doc/ploticus/Problems
 share/doc/ploticus/Util
-share/doc/ploticus/Welcome
 share/doc/ploticus/annotate
 share/doc/ploticus/areadef
 share/doc/ploticus/attributetypes
@@ -26,6 +25,7 @@ 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/endproc
@@ -47,6 +47,7 @@ share/doc/ploticus/paper
 share/doc/ploticus/pie
 share/doc/ploticus/posters
 share/doc/ploticus/print
+share/doc/ploticus/processdata
 share/doc/ploticus/rangebar
 share/doc/ploticus/rangesweep
 share/doc/ploticus/scaleunits