update to hp2xx-3.3.2. While here do some cleanup of the package.

From the CHANGES file:
----------------------
Changes from 3.3.1 to 3.3.2

New features:

- Added TIFF output mode (provided by M.Liberi) based on libtiff. Uses ZIP
  deflate compression to avoid LZW patent issues at the risk of reduced
  portability.
- DV command (vertical text)

Bug fixes:

- Command line options for pen color and pen width take precedence over PC
  or PW statements in the HPGL file now. This allows creation of PBM bitmaps
  instead of PPM pixmaps from color plots again (by setting all pens to
  black, -c11111111), and should also help for programs that use several pens
  at constant widths, but emit global PW commands with every SP statement.
  A true fix for the latter case would require keeping track of the current
  pen settings for every line in the internal metaformat (maybe in 3.4)

- Removed the A4 size limitation for Encapsulated PostScript output

- Default 20x20 plot size calculation was broken for Landscape format

- Black pen was displayed as light gray in X11 preview, now uses a very dark
  gray (gray10)

- pen color was not decoded correctly in PE pencolor statements

- output file was closed twice in to_eps.c, which could cause a segmentation
  fault inside (g)libc if hp2xx was used in batch mode

Changes from 3.3.0 to 3.3.1

New features:
- PE with fractional coordinates (completes PE support)
- unlimited label lengths through dynamic reallocation of LB memory

Bug fixes:
- PS/RO handling was still broken, should be fixed now
- xfig file headers had erroneously claimed 3.2 compliance, but the files
  still had 3.1 format
- Makefiles in ~/makes updated
- DR and DI did not initialize character properties when called without
  parameters
- Current address of Michael Schmitz added to documentation
- removed leftover PCL file acad.pcl from hp-tests

Changes from 3.3.ALPHA2 to 3.3.0

New features:
(none)

Bug fixes:

- Combinations of PS, RO and the -r command line switch could lead to
  wrong scaling
- the position of a clipping box was miscalculated for labels

Changes from 3.3.ALPHA to 3.3.ALPHA2:

New features:

- the PS (plot size) command is now supported, allowing 'white space'
  around plots
- support for the EW (edge wedge) command

Bug fixes:

- PC support in 3.3.ALPHA was still limited to 8 colors
- PW had the parameters backwards and no provision for the
  'set them all to this value' variant
- tick marks were scaled incorrectly (long-standing bug)
- EA advanced pen position (long-standing bug)

Changes from 3.2.0 to 3.3.ALPHA:

New features:

- Character set support for fonts 1-7, and the 'upper half' of font 0.
- Support for most character-related commands (CA,CS,SA,SS)
- Support for the IW (input window, i.e. clipping) command
- Partial support for the PE (polyline encoded) command (integer coords only)
- Output generation for Brian Smith's XFig
- Output generation for Gnuplot
- Output generation in PNG format
- Automatic medium size selection code in the PCL initialization sequence
- Centering (-C) now supported even in true-size (-t) mode
- HPGL/2 Pen Color and Pen Width support for up to 256 virtual pens

9 files changed, 78 insertions, 92 deletions

diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile
index f9fd3e971b5..82613c8e119 100644
--- a/graphics/hp2xx/Makefile
+++ b/graphics/hp2xx/Makefile
@@ -1,14 +1,22 @@
-# $NetBSD: Makefile,v 1.7 2000/05/12 16:07:35 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.8 2000/08/31 12:37:01 dmcmahill Exp $
 #
 
-DISTNAME=	hp2xx-3.1.4
+DISTNAME=	hp2xx-3.3.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNU:=hp2xx/}
 
 MAINTAINER=	dmcmahill@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/hp2xx/hp2xx.html
 
-USE_X11BASE=	yes
+DEPENDS+=	png>=1.0.6:../../graphics/png
+DEPENDS+=	tiff-*:../../graphics/tiff
+
+USE_X11=	yes
 INFO_FILES=	hp2xx.info
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/sources
+
+post-extract:
+	${CP} ${WRKSRC}/../makes/generic.mak ${WRKSRC}/Makefile
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/hp2xx/files/md5 b/graphics/hp2xx/files/md5
index cba9fd221c2..881fabe5250 100644
--- a/graphics/hp2xx/files/md5
+++ b/graphics/hp2xx/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:21:36 agc Exp $
+$NetBSD: md5,v 1.3 2000/08/31 12:37:01 dmcmahill Exp $
 
-MD5 (hp2xx-3.1.4.tar.gz) = 89778dfd60c4e07cae0cdb99519a909a
+MD5 (hp2xx-3.3.2.tar.gz) = 24ac90814cca453fb84ff45de40b8f76
diff --git a/graphics/hp2xx/files/patch-sum b/graphics/hp2xx/files/patch-sum
index e44ae50d163..5e36b499c16 100644
--- a/graphics/hp2xx/files/patch-sum
+++ b/graphics/hp2xx/files/patch-sum
@@ -1,7 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 13:51:08 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/08/31 12:37:01 dmcmahill Exp $
 
-MD5 (patch-aa) = d44fc29b37427486044ece03b5f34386
-MD5 (patch-ab) = 1c9c9cfe444a2186681e323249054108
-MD5 (patch-ac) = 285217616ef8e3f2378f85fbc8756cf8
-MD5 (patch-ad) = d01f437c6be9d2e4612584fbb8aa6c30
-MD5 (patch-ae) = d6d745c28b6db98dc60589eb9cb33a0b
+MD5 (patch-aa) = dde4a51695bf07e015bf1e3da83df67f
+MD5 (patch-ab) = bacf38928f225701f121249f5828142d
+MD5 (patch-ad) = 25d811ef093fa780cf256e7d8534ac7d
+MD5 (patch-ae) = a2b5144f128752579c82d0bc6f89a060
diff --git a/graphics/hp2xx/patches/patch-aa b/graphics/hp2xx/patches/patch-aa
index e1cb707ff03..7407c16d446 100644
--- a/graphics/hp2xx/patches/patch-aa
+++ b/graphics/hp2xx/patches/patch-aa
@@ -1,33 +1,10 @@
-$NetBSD: patch-aa,v 1.2 1998/08/07 10:40:47 agc Exp $
+$NetBSD: patch-aa,v 1.3 2000/08/31 12:37:02 dmcmahill Exp $
 
---- Makefile.orig	Thu Jul  9 10:33:50 1998
-+++ Makefile	Thu Jul  9 10:44:38 1998
-@@ -0,0 +1,28 @@
-+all:
-+	cd sources; make all
-+
-+check:
-+	cd sources; make check
-+
-+clean:
-+	cd sources; make clean
-+
-+install:
-+	cd sources; make install
-+
-+install-bin:
-+	cd sources; make install-bin
-+
-+install-man:
-+	cd sources; make install-man
-+
-+install-info:
-+	cd sources; make install-info
-+
-+mostlyclean:
-+	cd sources; make mostlyclean
-+
-+realclean:
-+	cd sources; make realclean
-+
-+
+--- 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>
+ 
+ #define PDNCOL 8 
diff --git a/graphics/hp2xx/patches/patch-ab b/graphics/hp2xx/patches/patch-ab
index 1465162348a..93d065e2bbf 100644
--- a/graphics/hp2xx/patches/patch-ab
+++ b/graphics/hp2xx/patches/patch-ab
@@ -1,29 +1,57 @@
-$NetBSD: patch-ab,v 1.4 1998/08/23 06:55:03 garbled Exp $
+$NetBSD: patch-ab,v 1.5 2000/08/31 12:37:02 dmcmahill Exp $
 
---- sources/Makefile.orig	Mon Nov 15 22:47:49 1993
-+++ sources/Makefile	Tue Jul 28 11:39:53 1998
-@@ -34,7 +34,7 @@
- 
+--- Makefile.orig	Thu Aug 31 08:09:46 2000
++++ Makefile	Thu Aug 31 08:10:24 2000
+@@ -35,5 +35,5 @@
  # Installation sites (GNU conventions):
  #
 -prefix   = /usr/local
 +prefix   = ${PREFIX}
  bindir   = $(prefix)/bin
  includedir = $(prefix)/include
- mandir   = $(prefix)/man
-@@ -47,8 +47,8 @@
- CC       = gcc
- CFLAGS   = -O2 -Wall -ansi -fstrength-reduce -finline-functions
+@@ -45,10 +45,10 @@
+ # For non-gcc compilers, simply set CFLAGS = -O (to start with)
+ #
+-CC       = gcc
+-CFLAGS   = -O2 -Wall -ansi -fstrength-reduce -finline-functions
++#CC       = gcc
++CFLAGS+=  -Wall -ansi -fstrength-reduce -finline-functions
  
 -LFLAGS   =                # only sometimes needed; see below for examples
 -CPPFLAGS = -I.            # only sometimes needed; see below for examples
-+LFLAGS   = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib  # only sometimes needed; see below for examples
-+CPPFLAGS = -I. -I${X11BASE}/include  # only sometimes needed; see below for examples
- BINDCMD  =                # only needed for EMX and DJGPP DOS extenders
+-BINDCMD  =                # only needed for EMX and DJGPP DOS extenders
++LFLAGS   = -Wl,-R${X11BASE}/lib -L${X11BASE}/lib  -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib # only sometimes needed; see below for examples
++CPPFLAGS = -I. -I${X11BASE}/include  -I${LOCALBASE}/include # only sometimes needed; see below for examples
++BINDCMD  = echo               # only needed for EMX and DJGPP DOS extenders
  
  
-@@ -279,15 +279,11 @@
- install:	install-bin install-info install-man
+@@ -63,5 +63,5 @@
+ DEFINES   = -DUNIX -DHAS_UNIX_X11
+ PREVIEWER = to_x11
+-ALL_LIBS  = -lX11 -lm     #  Maybe -lX instead of -lX11 is needed?
++ALL_LIBS  = -lX11 -lm -lz -lpng -ltiff -ljpeg
+ #
+ # Generic UNIX, no previewer
+@@ -183,12 +183,12 @@
+ #
+ # PNG support (requires -lpng and -lz on the ALL_LIBS line)
+-#EX_SRC	= png.c to_png.c
+-#EX_OBJ	= png.o to_png.o 
+-#EX_DEFS= -DPNG
++EX_SRC+= png.c to_png.c
++EX_OBJ+= png.o to_png.o 
++EX_DEFS+= -DPNG
+ #
+ # TIFF support (requires -ltiff and possibly -lz on the ALL_LIBS line)
+-#EX_SRC	= to_tif.c
+-#EX_OBJ	= to_tif.o
+-#EX_DEFS	= -DTIF
++EX_SRC+= to_tif.c
++EX_OBJ+= to_tif.o
++EX_DEFS+= -DTIF
+ #
+ # Include extras:
+@@ -304,14 +304,10 @@
  
  install-bin:	$(PROGRAM)
 -		-$(STRIP) $(PROGRAM)
diff --git a/graphics/hp2xx/patches/patch-ac b/graphics/hp2xx/patches/patch-ac
deleted file mode 100644
index ae20575f051..00000000000
--- a/graphics/hp2xx/patches/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ac,v 1.2 1998/08/07 10:40:48 agc Exp $
-
---- sources/picbuf.c.orig	Thu Jul  9 11:36:03 1998
-+++ sources/picbuf.c	Thu Jul  9 11:36:56 1998
-@@ -44,4 +44,5 @@
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- #include <math.h>
- #include "bresnham.h"
diff --git a/graphics/hp2xx/patches/patch-ad b/graphics/hp2xx/patches/patch-ad
index 21ef8ac3b56..ec2fa6c86b7 100644
--- a/graphics/hp2xx/patches/patch-ad
+++ b/graphics/hp2xx/patches/patch-ad
@@ -1,11 +1,11 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 10:40:48 agc Exp $
+$NetBSD: patch-ad,v 1.3 2000/08/31 12:37:02 dmcmahill Exp $
 
---- sources/getopt.c.orig	Thu Jul  9 11:38:13 1998
-+++ sources/getopt.c	Thu Jul  9 11:39:08 1998
-@@ -41,4 +41,6 @@
+--- getopt.c.orig	Wed Jan 26 08:03:28 2000
++++ getopt.c	Thu Aug 31 07:52:58 2000
+@@ -57,4 +57,6 @@
  
  #include <stdio.h>
 +#include <stdlib.h>
 +#include <string.h>
  
- /* This needs to come after some library #include
+ /* Comment out all this code if we are using the GNU C Library, and are not
diff --git a/graphics/hp2xx/patches/patch-ae b/graphics/hp2xx/patches/patch-ae
index 0b6d4666a58..a15fb9753ff 100644
--- a/graphics/hp2xx/patches/patch-ae
+++ b/graphics/hp2xx/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 10:40:48 agc Exp $
+$NetBSD: patch-ae,v 1.3 2000/08/31 12:37:02 dmcmahill Exp $
 
---- doc/hp2xxinf.tex.orig	Thu Jul  9 17:30:12 1998
-+++ doc/hp2xxinf.tex	Fri Jul 10 11:04:20 1998
-@@ -33,6 +33,5 @@
+--- ../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 @@
  @format
  START-INFO-DIR-ENTRY
 -* HP2XX:(hp2xx).  Conversion of HP-GL graphics into raster and
@@ -10,10 +10,3 @@ $NetBSD: patch-ae,v 1.2 1998/08/07 10:40:48 agc Exp $
 +* HP2XX:(hp2xx).  HPGL converter and previewer
  END-INFO-DIR-ENTRY
  @end format
-@@ -887,5 +886,5 @@
- @menu
- * Installation of run-time versions::
--* Source-level installation::
-+* Source-level Installation::
- @end menu
- 
diff --git a/graphics/hp2xx/scripts/post-extract b/graphics/hp2xx/scripts/post-extract
deleted file mode 100644
index 80801dc7e65..00000000000
--- a/graphics/hp2xx/scripts/post-extract
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: post-extract,v 1.2 1998/08/07 10:40:48 agc Exp $
-#
- 
-echo "Running post-extract script"
-
-cd ${WRKSRC}
-cp -p makes/generic.mak sources/Makefile