o Update to version 3.4.2

4 files changed, 11 insertions, 41 deletions

diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index d24b68c..c0a35cb 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	hp2xx
-PORTVERSION=	3.4.1
-PORTEPOCH=	1
+PORTVERSION=	3.4.2
 CATEGORIES=	print x11
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/print/hp2xx/distinfo b/print/hp2xx/distinfo
index 90f33ee..3e0bc5a 100644
--- a/print/hp2xx/distinfo
+++ b/print/hp2xx/distinfo
@@ -1 +1 @@
-MD5 (hp2xx-3.4.1.tar.gz) = f5a991b57a2a26935f85eb348cd3967a
+MD5 (hp2xx-3.4.2.tar.gz) = 73f69b385341556396f39b18c334cdd4
diff --git a/print/hp2xx/files/patch-aa b/print/hp2xx/files/patch-aa
index 0948ece..1a71859 100644
--- a/print/hp2xx/files/patch-aa
+++ b/print/hp2xx/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Dec 30 20:17:58 2001
-+++ Makefile	Wed Jan 30 20:59:01 2002
+--- Makefile.orig	Mon Apr  8 00:45:53 2002
++++ Makefile	Sat Apr 27 03:25:35 2002
 @@ -35,7 +35,7 @@
  
  # Installation sites (GNU conventions):
@@ -14,9 +14,9 @@
  # For non-gcc compilers, simply set CFLAGS = -O (to start with)
  #
 -CC       = gcc
--CFLAGS	= -O2 -g -I/usr/X11R6/include $(DEFINES) $(EX_DEFS) -Wall -pedantic -Wuninitialized -Wunused -Wreturn-type -Wmissing-prototypes -Wstrict-prototypes  
+-CFLAGS	= -O2 -m486 -I/usr/X11R6/include $(DEFINES) $(EX_DEFS) -Wall -pedantic -Wuninitialized -Wunused -Wreturn-type -Wmissing-prototypes -Wstrict-prototypes  
 +#CC       = gcc
-+#CFLAGS	= -O2 -g -I/usr/X11R6/include $(DEFINES) $(EX_DEFS) -Wall -pedantic -Wuninitialized -Wunused -Wreturn-type -Wmissing-prototypes -Wstrict-prototypes  
++#CFLAGS	= -O2 -I/usr/X11R6/include $(DEFINES) $(EX_DEFS) -Wall -pedantic -Wuninitialized -Wunused -Wreturn-type -Wmissing-prototypes -Wstrict-prototypes  
  
  #CFLAGS   = +O1 -Aa -D_HPUX_SOURCE -DSYSV -I/usr/include/X11R5 -I/usr/include/X11R4 $(DEFINES)
  
@@ -32,41 +32,12 @@
 -DEFINES   = -DUNIX -DHAS_UNIX_X11 
 +DEFINES   = -DUNIX -DHAS_UNIX_X11 -I${X11BASE}/include -I${LOCALBASE}/include
  PREVIEWER = to_x11
--ALL_LIBS  = -L/usr/lib/X11R6 -lX11 -lm     
+-ALL_LIBS  = -L/usr/lib/X11R6 -lpng -ltiff -ljpeg -lz -lX11 -lm     
 +ALL_LIBS  = -L${X11BASE}/lib -lX11 -lm -L${LOCALBASE}/lib -ltiff -lpng -lz
  #
  # Generic UNIX, no previewer
  #
-@@ -179,19 +179,19 @@
- #
- # Epson Esc/P2 support 
- #
--#EX_SRC	 += to_escp2.c
--#EX_OBJ	 += to_escp2.o
--#EX_DEFS += -DEPSON
-+EX_SRC	 += to_escp2.c
-+EX_OBJ	 += to_escp2.o
-+EX_DEFS += -DEPSON
- #
- # Include PNG support:
--#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
- #
- # Include TIFF support:
--#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 ATARI extras:
- # EX_SRC	+= to_pic.c to_pac.c
-@@ -224,7 +224,8 @@
+@@ -228,7 +228,8 @@
  
  $(PROGRAM): $(OBJS)
  	$(CC) $(LFLAGS) $(OBJS) $(ALL_LIBS) -o $(PROGRAM)
@@ -76,7 +47,7 @@
  
  default:
  	@echo "This makefile needs manual configuration! Edit it now!
-@@ -248,9 +249,9 @@
+@@ -252,9 +253,9 @@
  #									#
  #########################################################################
  
@@ -89,7 +60,7 @@
  
  
  #########################################################################
-@@ -307,15 +308,11 @@
+@@ -311,15 +312,11 @@
  install:	install-bin install-info install-man
  
  install-bin:	$(PROGRAM)
diff --git a/print/hp2xx/pkg-comment b/print/hp2xx/pkg-comment
index 1df4321..d589ce3 100644
--- a/print/hp2xx/pkg-comment
+++ b/print/hp2xx/pkg-comment
@@ -1 +1 @@
-A HPGL converter into some vector- and raster formats, previewer for X11
+A HPGL to vector- and raster formats converter and previewer for X11