update to hp2xx-3.4.4

There have been many many bug fixes and improvements since the last
packaged release.  SVG, PDF, and DXF output is available now.  The complete
list (>200 lines) is in the CHANGES file in the distribution.

7 files changed, 65 insertions, 65 deletions

diff --git a/graphics/hp2xx/Makefile b/graphics/hp2xx/Makefile
index 1d6b17cef1e..ec3566848d2 100644
--- a/graphics/hp2xx/Makefile
+++ b/graphics/hp2xx/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2004/10/03 00:14:53 tv Exp $
+# $NetBSD: Makefile,v 1.26 2004/11/28 15:12:11 dmcmahill Exp $
 #
 
-DISTNAME=	hp2xx-3.4.0
+DISTNAME=	hp2xx-3.4.4
 PKGREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNU:=hp2xx/}
@@ -21,4 +21,5 @@ post-extract:
 
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../print/pdflib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/hp2xx/distinfo b/graphics/hp2xx/distinfo
index f16c4f7c6c0..a7109077050 100644
--- a/graphics/hp2xx/distinfo
+++ b/graphics/hp2xx/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.4 2002/02/18 15:14:20 seb Exp $
+$NetBSD: distinfo,v 1.5 2004/11/28 15:12:11 dmcmahill Exp $
 
-SHA1 (hp2xx-3.4.0.tar.gz) = b8b80ae2f558017046d1b0f43e3c4d7de565065c
-Size (hp2xx-3.4.0.tar.gz) = 301139 bytes
-SHA1 (patch-aa) = 80c8e2505556d493ffc6a741ac13bfd0abfe165b
-SHA1 (patch-ab) = 6bf8fa3b72cf24803060dabb41e26b103a62545a
-SHA1 (patch-ac) = 41901116cab61281160e892edb998d73fb2c9bcc
-SHA1 (patch-ad) = 2ef9c938ef802f139998cafd9cfa4d9f3be29c8d
-SHA1 (patch-ae) = ae68f08e8ad907f043a344f3172ba4f104223f6d
+SHA1 (hp2xx-3.4.4.tar.gz) = a168cbce5e0cea3859b404b9cbad372bd246af91
+Size (hp2xx-3.4.4.tar.gz) = 610330 bytes
+SHA1 (patch-ab) = a878f1fcdce47ef06a66fa9287245c5eab84c978
+SHA1 (patch-ad) = 25f67fbec1fbc6a0e5989564f352033469342224
+SHA1 (patch-ae) = a89f476bd97d954de4bf33c6167704753f58a8f6
diff --git a/graphics/hp2xx/patches/patch-aa b/graphics/hp2xx/patches/patch-aa
deleted file mode 100644
index 085062bbc30..00000000000
--- a/graphics/hp2xx/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2001/04/23 19:25:47 dmcmahill Exp $
-
---- 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;
- 
--  t = time((long *) 0);
-+  t = time(NULL);
-   p = ctime(&t);
-   len = strlen(p);
diff --git a/graphics/hp2xx/patches/patch-ab b/graphics/hp2xx/patches/patch-ab
index 4db7686c0cb..404fb064f30 100644
--- a/graphics/hp2xx/patches/patch-ab
+++ b/graphics/hp2xx/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2002/02/18 15:14:21 seb Exp $
+$NetBSD: patch-ab,v 1.7 2004/11/28 15:12:11 dmcmahill Exp $
 
---- Makefile.orig	Fri Feb 15 14:23:08 2002
+--- Makefile.orig	Sat Nov 27 23:52:19 2004
 +++ Makefile
-@@ -28,13 +28,13 @@
+@@ -28,13 +28,13 @@ SHELL    = /bin/sh
  
  CHMOD    = chmod
  CP       = cp
@@ -18,55 +18,79 @@ $NetBSD: patch-ab,v 1.6 2002/02/18 15:14:21 seb Exp $
  bindir   = $(prefix)/bin
  includedir = $(prefix)/include
  mandir   = $(prefix)/man
-@@ -44,12 +44,12 @@
+@@ -44,12 +44,12 @@ infodir  = $(prefix)/info
  # CC and CFLAGS set for gcc, but any ANSI-C compiler should work.
  # For non-gcc compilers, simply set CFLAGS = -O (to start with)
  #
 -CC       = gcc
--CFLAGS   = -O2 -Wall -ansi -fstrength-reduce -finline-functions
+-CFLAGS   = -O2 -Wall -finline-functions
 +#CC       = gcc
-+CFLAGS+=  -Wall -ansi -fstrength-reduce -finline-functions
++#CFLAGS   = -O2 -Wall -finline-functions
  
 -LFLAGS   =                # only sometimes needed; see below for examples
 -CPPFLAGS = -I.            # only sometimes needed; see below for examples
 -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
++LFLAGS   =  -Wl,-R${X11BASE}/lib -L${X11BASE}/lib  -Wl,-R${LOCALBASE}/lib -L${LOCALBASE}/lib
++CPPFLAGS = -I. -I${X11BASE}/include  -I${LOCALBASE}/include
++BINDCMD  = echo
  
  
  
-@@ -62,7 +62,7 @@
+@@ -62,7 +62,7 @@ BINDCMD  =                # only needed 
  #
  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
++ALL_LIBS  = -lX11 -lm -lz -lpng -lpdf -ltiff -ljpeg
  #
  # Generic UNIX, no previewer
  #
-@@ -182,14 +182,14 @@
+@@ -197,29 +197,29 @@ EX_OBJ	=
  EX_DEFS	=
  #
  # 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
++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
++EX_SRC	= to_tif.c
++EX_OBJ	= to_tif.o
++EX_DEFS	= -DTIF
+ #
+ # JPEG support (requires -ljpeg)
+-#EX_SRC = to_jpg.c
+-#EX_OBJ = to_jpg.o
+-#EX_DEFS = -DJPG
++EX_SRC = to_jpg.c
++EX_OBJ = to_jpg.o
++EX_DEFS = -DJPG
+ #
+ # PDF support (requires -lpdf)
+-#EX_SRC = to_pdf.c
+-#EX_OBJ = to_pdf.o
+-#EX_DEFS = -DUSEPDF
++EX_SRC = to_pdf.c
++EX_OBJ = to_pdf.o
++EX_DEFS = -DUSEPDF
  #
  # Include extras:
- # EX_SRC	= to_pic.c to_pac.c
-@@ -305,15 +305,11 @@
+-# EX_SRC	= to_pic.c to_pac.c
+-# EX_OBJ	= to_pic.o to_pac.o
+-# EX_DEFS	= -DPIC_PAC
++EX_SRC	= to_pic.c to_pac.c
++EX_OBJ	= to_pic.o to_pac.o
++EX_DEFS	= -DPIC_PAC
+ #
+ #############################################################################
+ # No user-serviceable parts below!
+@@ -332,15 +332,11 @@ TAGS:
  install:	install-bin install-info install-man
  
  install-bin:	$(PROGRAM)
diff --git a/graphics/hp2xx/patches/patch-ac b/graphics/hp2xx/patches/patch-ac
deleted file mode 100644
index 6747f7025fa..00000000000
--- a/graphics/hp2xx/patches/patch-ac
+++ /dev/null
@@ -1,10 +0,0 @@
-$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-ad b/graphics/hp2xx/patches/patch-ad
index ec2fa6c86b7..e78cfc9f479 100644
--- a/graphics/hp2xx/patches/patch-ad
+++ b/graphics/hp2xx/patches/patch-ad
@@ -1,11 +1,13 @@
-$NetBSD: patch-ad,v 1.3 2000/08/31 12:37:02 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.4 2004/11/28 15:12:11 dmcmahill Exp $
 
---- getopt.c.orig	Wed Jan 26 08:03:28 2000
-+++ getopt.c	Thu Aug 31 07:52:58 2000
-@@ -57,4 +57,6 @@
+--- getopt.c.orig	Sat Jun 21 15:31:51 2003
++++ getopt.c
+@@ -56,6 +56,8 @@ void Eprintf(const char *, ...);
+ #endif
  
  #include <stdio.h>
 +#include <stdlib.h>
 +#include <string.h>
  
  /* Comment out all this code if we are using the GNU C Library, and are not
+    actually compiling the library itself.  This code is part of the GNU C
diff --git a/graphics/hp2xx/patches/patch-ae b/graphics/hp2xx/patches/patch-ae
index 2bcd734e1b2..1752329d72c 100644
--- a/graphics/hp2xx/patches/patch-ae
+++ b/graphics/hp2xx/patches/patch-ae
@@ -1,10 +1,9 @@
-$NetBSD: patch-ae,v 1.4 2001/04/23 19:25:47 dmcmahill Exp $
+$NetBSD: patch-ae,v 1.5 2004/11/28 15:12:11 dmcmahill Exp $
 
-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 @@
+--- ../doc/hp2xxinf.tex.orig	Sat Jun 21 15:41:16 2003
++++ ../doc/hp2xxinf.tex
+@@ -39,8 +39,7 @@
+ @ifinfo
  @format
  START-INFO-DIR-ENTRY
 -* HP2XX:(hp2xx).  Conversion of HP-GL graphics into raster and
@@ -12,3 +11,4 @@ to make it correctly deinstall...
 +* HP2XX:(hp2xx).  HPGL Converter and Previewer
  END-INFO-DIR-ENTRY
  @end format
+ @end ifinfo