Update from hp2xx-3.3.2nb2 to 3.4.0.

Changes are:

Bug fixes:

- Added polygon mode support for CI
- Label characters from unsupported fonts are now replaced by their
  charset 0 equivalents instead of being replaced by blanks.
- Text was sometimes incorrectly clipped when IW was set
- Fixed a typo (missing parenthesis) in the Sun5 part of generic.mak
- Polygon fills were (again) miscalculated in some cases
- The 'pen dot' feature was unnecessarily adding dots for the segments of
  polylines as well
- PS command with height only and PS with width>height were not treated
  correctly, rotation and scaling were applied twice due to code duplication
- small (cosmetic) corrections to the new linetype code (A. Bird)
- lines drawn in IW mode had extraneous pen-up moves added, which confused
  the line pattern generator.
- clipping (IW) was seriously broken by cleanup and prototyping efforts in
  ALPHA2/3. Thanks to Andrew Bird for finding and fixing this.
  Auto-generation of output filenames sometimes failed (side effect of
  the less restrictive naming rules introduced in ALPHA2)
- removed extraneous asterisk in the INFO-DIR-ENTRY section of the
  texinfo doc file (Reinhard Kotucha)
- IW without parameters was assigned wrong values in some cases (bug
  introduced in ALPHA2)
- IW could clip lines just inside the limits due to rounding errors on
  some platforms
- chanell makefiles to include fillpoly.(c,o)
- Line pattern length was too long for LT-2
- SC scale factors were not applied to XT/YT tick marks, resulting in
  distorted plots
- Added a #define to support compiling on WinNT (mentioned, but not
  actually included in ALPHA2)
- deactivated the excessive debug output in the fill code (which could lead
  to huge temporary files)
- made the simple scanline algorithm a bit more robust (but it still gets out
  of step in a few pathological cases - which means that filled and unfilled
  sections will be reversed for the remainder of that line)
- enclosed all references to the unfinished Epson driver in #ifdefs, so that
  it is not built by default. (also fixed a few glaring bugs in the esc/p2 file
  header code, but the driver still does not work _at_all_)
- absolute PW pen widths between 0 and .1 were accidentally rounded to zero
  (invisible lines)
- the picture border was too wide in some cases (Gerhard Buergmann)
- IW limits were interpreted as plotter units even if scaling (SC) was set.
- PCX output sometimes had dark red background in b/w mode and wrong colors
  in colormap mode (rewrote to_pcx.c for PCX5, see above).


New Features:

- Support for HPGL/2 commands related to polygons and area fills :
  EP, ER, FP, FT, PM, PT, RA, RR, WG (no user-defined fill types yet)
- WU command support, PW fixed accordingly.
- AT,RT command support (arc through three points)
- Initial (non-functional) version of an Epson Esc/P2 driver based on
  to_pcl.
- Parser improved to be more robust (especially with PE commands),
  cliping (IW) support for PE lines, PJL and RTL control sequence handler,
  type 1 and 2 (anisotropic) scaling support added to SC (Eugene Doudine).
- Modified to_pcx to produce PCX mode 5 (truecolor) files in color mode,
  PCX2 in monochrome. (The old PCX2 module is in the 'old' directory, in
  case this proves to be worse - i have changed a few of the palette
  definitions to get correct b/w output and primary colors even with this
  version).
- New linetype handling including support for line types 7,8,-7,-8 and
  user-defined linetype (UL) (written by Andrew Bird)
- Support for the COmment keyword added (Andrew Bird)
- PD;PU-sequences without pen movement create a small dot now to mimick the
  behaviour of a real pen plotter.
- Added -S option for selection of TIFF compression mode (Andrew Bird)
- Rewrote pen property handling - a pen can now change width during a
  plot (Andrew Bird). Similarly added pencolor changing support (though for
  the postscript driver only - all other modes require a rewrite of the
  intermediate raster 'picbuf' code).
- Output mode 'esc2' for the Epson Stylus series of printers at 720dpi.
  (limited to A4 size for now, and in 'microweave' mode, i.e. using only
  one row of nozzles, which results in exact but very slow printing)
- added command line option '-n'/'--nofill' to suppress polygon filling
- OS/2 PM previewer now has stderr output redirection to a separate window
  (patch provided by Kazutaka Nishiyama)
- Added step-by-step instructions for compiling on Windows NT (provided by
  James D. Shaw)
- X11 preview generates a warning, but no longer aborts if the window is
  larger than the current screen size
- file names may start with non-alphabetic characters (e.g. numbers
  or unix-style path names) now (Michael Kennedy)

5 files changed, 39 insertions, 79 deletions

diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile
index 81ef2135f99..6364fb724d3 100644
--- a/graphics/hp2xx/Makefile
+++ b/graphics/hp2xx/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2001/03/04 09:06:12 tron Exp $
+# $NetBSD: Makefile,v 1.13 2001/04/23 19:25:46 dmcmahill Exp $
 #
 
-DISTNAME=	hp2xx-3.3.2
-PKGNAME=	hp2xx-3.3.2nb2
+DISTNAME=	hp2xx-3.4.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNU:=hp2xx/}
 
diff --git a/graphics/hp2xx/distinfo b/graphics/hp2xx/distinfo
index 3dc1fc6af79..6330c60f07d 100644
--- a/graphics/hp2xx/distinfo
+++ b/graphics/hp2xx/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:16 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/04/23 19:25:46 dmcmahill Exp $
 
-SHA1 (hp2xx-3.3.2.tar.gz) = 722edd179a7966efa73cc78b9c60507a6455252a
-Size (hp2xx-3.3.2.tar.gz) = 247487 bytes
-SHA1 (patch-aa) = ffabfa541a27b413c7f6331477f51542e304be80
+SHA1 (hp2xx-3.4.0.tar.gz) = b8b80ae2f558017046d1b0f43e3c4d7de565065c
+Size (hp2xx-3.4.0.tar.gz) = 301139 bytes
+SHA1 (patch-aa) = 80c8e2505556d493ffc6a741ac13bfd0abfe165b
 SHA1 (patch-ab) = 574ab1554935f51f2f9dd217552c65a523e76980
-SHA1 (patch-ac) = f4bc4d6cdc07ecf2fb5b4863b65db9d245e4d25c
+SHA1 (patch-ac) = 41901116cab61281160e892edb998d73fb2c9bcc
 SHA1 (patch-ad) = 2ef9c938ef802f139998cafd9cfa4d9f3be29c8d
-SHA1 (patch-ae) = 59e64a6da7a7409993bfaaccce5a657c61032c43
+SHA1 (patch-ae) = ae68f08e8ad907f043a344f3172ba4f104223f6d
diff --git a/graphics/hp2xx/patches/patch-aa b/graphics/hp2xx/patches/patch-aa
index 7407c16d446..085062bbc30 100644
--- a/graphics/hp2xx/patches/patch-aa
+++ b/graphics/hp2xx/patches/patch-aa
@@ -1,10 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2000/08/31 12:37:02 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.4 2001/04/23 19:25:47 dmcmahill Exp $
 
---- png.c.orig	Wed Jan 26 08:03:29 2000
-+++ png.c	Thu Aug 31 08:08:48 2000
-@@ -5,4 +5,5 @@
- #include "to_png.h"
- #include <png.h>
-+#include <stdlib.h>
+--- to_eps.c.orig	Thu Feb  1 10:05:30 2001
++++ to_eps.c	Mon Apr 23 15:12:26 2001
+@@ -144,8 +144,8 @@
+ {
+ int len;
+-long t;
++time_t t;
+ char *p;
  
- #define PDNCOL 8 
+-  t = time((long *) 0);
++  t = time(NULL);
+   p = ctime(&t);
+   len = strlen(p);
diff --git a/graphics/hp2xx/patches/patch-ac b/graphics/hp2xx/patches/patch-ac
index 062df3dc464..6747f7025fa 100644
--- a/graphics/hp2xx/patches/patch-ac
+++ b/graphics/hp2xx/patches/patch-ac
@@ -1,56 +1,10 @@
-$NetBSD: patch-ac,v 1.5 2000/11/15 23:05:06 dmcmahill Exp $
-
--fix a problem scaling tick marks.
-
-- also fix a bug when plotting single points. (ie, 
-  commands like
-   ;PU;PA 50,200;PD;PU;
-  now actually put a single dot at 50,200
-
-both of these are fixed in the next
-(not yet released version 3.4) hp2xx.
-
---- hpgl.c.orig	Sun Feb 13 18:19:28 2000
-+++ hpgl.c	Wed Nov 15 14:10:36 2000
-@@ -1126,7 +1126,11 @@
-   for ( ; ; )
-   {
--	if (read_float (&p.x, hd))	/* No number found	*/
-+	if (read_float (&p.x, hd)){	/* No number found	*/
-+		if(pen_down){  /*simulate dot created by 'real' pen */
-+			Pen_action_to_tmpfile   (MOVE_TO, &p_last,scale_flag);
-+			Pen_action_to_tmpfile   (DRAW_TO, &p_last,scale_flag);
-+		}
- 		return ;
--
-+	}
- 	if (read_float (&p.y, hd))	/* x without y invalid! */
- 		par_err_exit (2,PA);
-@@ -1521,19 +1525,23 @@
-   if (mode == 0)	/* X tick	*/
-   {
--  	/* dividing by Q appears to be unnecessary - MK
-+	if(scale_flag){
- 	p1.y -= neg_ticklen * (P2.y - P1.y) / Q.y;
- 	p2.y += pos_ticklen * (P2.y - P1.y) / Q.y;
--	*/
-+ 	}
-+	else{	
- 	p1.y -= neg_ticklen * (P2.y - P1.y) ;
- 	p2.y += pos_ticklen * (P2.y - P1.y) ;
-+	}
-   }
-   else			/* Y tick	*/
-   {
--	/*
-+	if (scale_flag){
- 	p1.x -= neg_ticklen * (P2.x - P1.x) / Q.x;
- 	p2.x += pos_ticklen * (P2.x - P1.x) / Q.x;
--	*/
-+ 	}
-+	else{	
- 	p1.x -= neg_ticklen * (P2.x - P1.x);
- 	p2.x += pos_ticklen * (P2.x - P1.x);
-+	}
-   }
- 
+$NetBSD: patch-ac,v 1.6 2001/04/23 19:25:47 dmcmahill Exp $
+
+--- to_tif.c.orig	Thu Feb  1 10:05:30 2001
++++ to_tif.c	Mon Apr 23 15:13:45 2001
+@@ -2,4 +2,5 @@
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include "bresnham.h"
diff --git a/graphics/hp2xx/patches/patch-ae b/graphics/hp2xx/patches/patch-ae
index a15fb9753ff..2bcd734e1b2 100644
--- a/graphics/hp2xx/patches/patch-ae
+++ b/graphics/hp2xx/patches/patch-ae
@@ -1,12 +1,14 @@
-$NetBSD: patch-ae,v 1.3 2000/08/31 12:37:02 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.4 2001/04/23 19:25:47 dmcmahill Exp $
 
---- ../doc/hp2xxinf.tex.orig	Sun Feb 13 12:28:24 2000
-+++ ../doc/hp2xxinf.tex	Thu Aug 31 07:54:23 2000
-@@ -38,6 +38,5 @@
+to make it correctly deinstall...
+
+--- ../doc/hp2xxinf.tex.orig	Thu Feb  1 10:05:33 2001
++++ ../doc/hp2xxinf.tex	Mon Apr 23 11:33:03 2001
+@@ -39,6 +39,5 @@
  @format
  START-INFO-DIR-ENTRY
 -* HP2XX:(hp2xx).  Conversion of HP-GL graphics into raster and
--*                 vector graphics formats
-+* HP2XX:(hp2xx).  HPGL converter and previewer
+-                  vector graphics formats
++* HP2XX:(hp2xx).  HPGL Converter and Previewer
  END-INFO-DIR-ENTRY
  @end format