diff --git a/print/hp2xx/Makefile b/print/hp2xx/Makefile
index 289a6628305b..fee0e58dd32b 100644
--- a/print/hp2xx/Makefile
+++ b/print/hp2xx/Makefile
@@ -1,38 +1,44 @@
 PORTNAME=	hp2xx
 PORTVERSION=	3.4.4
 PORTREVISION=	8
 CATEGORIES=	print x11
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HPGL to vector and raster formats converter and previewer for X11
 WWW=		https://www.gnu.org/software/hp2xx/
 
 LICENSE=	GPLv2+
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libtiff.so:graphics/tiff
 
-WRKSRC_SUBDIR=	sources
+USES=		jpeg localbase:ldflags
 
-USES=		makeinfo
-MAKE_ARGS=	infodir=${PREFIX}/${INFO_PATH}
 MAKE_ENV=	DEFINES="${CPPFLAGS}" ALL_LIBS="${LDFLAGS}"
 
-CPPFLAGS+=	-DUNIX -I${LOCALBASE}/include
-LDFLAGS+=	-lm -L${LOCALBASE}/lib -ltiff -lpng -lz
+CPPFLAGS+=	-DUNIX
+LDFLAGS+=	-lm -ltiff -lpng -lz
+
+WRKSRC_SUBDIR=	sources
 
-INFO=		hp2xx
 PLIST_FILES=	bin/hp2xx man/man1/hp2xx.1.gz
 
-OPTIONS_DEFINE=		X11
-OPTIONS_DEFAULT=	X11
+OPTIONS_DEFINE=		INFO X11
+OPTIONS_DEFAULT=	INFO X11
 
+INFO_USES=		makeinfo
+INFO_MAKE_ARGS=	infodir=${PREFIX}/${INFO_PATH}
+INFO_INFO=		hp2xx
 X11_USES=		xorg
 X11_USE=		XORG=x11
 X11_MAKE_ENV=		PREVIEWER=to_x11
 X11_MAKE_ENV_OFF=	PREVIEWER=no_prev
-X11_CPPFLAGS=		-DHAS_UNIX_X11 -I${LOCALBASE}/include
-X11_LDFLAGS=		-L${LOCALBASE}/lib -lX11
+X11_CPPFLAGS=		-DHAS_UNIX_X11
+X11_LDFLAGS=		-lX11
+
+post-patch-INFO-off:
+	@${REINPLACE_CMD} -e '/^all:/s|hp2xx.info||g; \
+		/^install:/s|install-info||g' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/print/hp2xx/files/patch-Makefile b/print/hp2xx/files/patch-Makefile
index 247d98273af5..4104a0d2f9f7 100644
--- a/print/hp2xx/files/patch-Makefile
+++ b/print/hp2xx/files/patch-Makefile
@@ -1,100 +1,105 @@
---- Makefile.orig	Sun Jun 22 00:16:34 2003
-+++ Makefile	Tue Jun 24 07:53:46 2003
-@@ -35,7 +35,7 @@
+--- Makefile.orig	2003-06-21 15:16:34 UTC
++++ Makefile
+@@ -35,7 +35,7 @@ STRIP    = strip
  
  # Installation sites (GNU conventions):
  #
 -prefix   = /usr/local
 +prefix   = ${PREFIX}
  bindir   = $(prefix)/bin
  includedir = $(prefix)/include
  mandir   = $(prefix)/man
-@@ -45,14 +45,14 @@
+@@ -45,14 +45,14 @@ 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 -g -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  
  LINT	= splint
  LINTFLAGS = -weak -initallelements +posixlib -I/usr/X11R6/include $(DEFINES) $(EX_DEFS)
  
  #CFLAGS   = +O1 -Aa -D_HPUX_SOURCE -DSYSV -I/usr/include/X11R5 -I/usr/include/X11R4 $(DEFINES) $(EX_DEFS)
  
 -LFLAGS   = -L/usr/X11R6/lib            # only sometimes needed; see below for examples
 +#LFLAGS   = -L/usr/X11R6/lib            # 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
  
-@@ -65,9 +65,9 @@
+@@ -65,9 +65,9 @@ BINDCMD  =                # only needed for EMX and DJ
  #
  # Generic UNIX + X11 previewer (default)
  #
 -DEFINES   = -DUNIX -DHAS_UNIX_X11 
 -PREVIEWER = to_x11
 -ALL_LIBS  =  -L/usr/lib/X11R6 -lX11 -lm     
 +#DEFINES   = -DUNIX -DHAS_UNIX_X11 
 +#PREVIEWER = to_x11
 +#ALL_LIBS  =  -L/usr/lib/X11R6 -lX11 -lm     
  #
  # for experimental truetype font support
  #
-@@ -230,13 +230,13 @@
+@@ -230,13 +230,13 @@ ALL_CFLAGS	= -c $(CFLAGS)
  
  # $(SRCS) NOT USED YET:
  SRCS	= clip.c fillpoly.c\
 -	  hp2xx.c hpgl.c picbuf.c bresnham.c murphy.c chardraw.c getopt.c getopt1.c \
 +	  hp2xx.c hpgl.c picbuf.c bresnham.c murphy.c chardraw.c \
  	  $(ALL_INCS)\
  	  to_vec.c to_pcx.c to_pcl.c to_eps.c to_img.c to_pbm.c  \
  	  to_rgip.c to_fig.c std_main.c $(PREVIEWER).c pendef.c lindef.c $(EX_SRC)
  
  OBJS	= clip.o fillpoly.o\
 -	  hp2xx.o hpgl.o picbuf.o bresnham.o murphy.o chardraw.o getopt.o getopt1.o \
 +	  hp2xx.o hpgl.o picbuf.o bresnham.o murphy.o chardraw.o \
  	  to_vec.o to_pcx.o to_pcl.o  to_eps.o to_img.o to_pbm.o \
  	  to_rgip.o to_fig.o std_main.o $(PREVIEWER).o pendef.o lindef.o $(EX_OBJ)
  
-@@ -244,7 +244,8 @@
+@@ -244,8 +244,9 @@ PROGRAM	= hp2xx
  
  $(PROGRAM): $(OBJS)
  	$(CC) $(LFLAGS) $(OBJS) $(ALL_LIBS) $(EX_LIBS) -o $(PROGRAM)
 -	$(BINDCMD)
-+
-+all: $(PROGRAM) hp2xx.info
  
++all: $(PROGRAM) 
++
  default:
  	@echo "This makefile needs manual configuration! Edit it now!
-@@ -268,9 +269,9 @@
+ 	@echo "After configuration, you may use the following commands:
+@@ -268,9 +269,9 @@ default:
  #									#
  #########################################################################
  
 -# .c.o:	$< $(COMMON_INCS)
 -#	-$(RMCMD) $@
 -#	$(CC) $(DEFINES) $(EX_DEFS) $(ALL_CFLAGS) $(CPPFLAGS) $<
 +.c.o:	$< $(COMMON_INCS)
 +	-$(RMCMD) $@
 +	$(CC) $(DEFINES) $(EX_DEFS) $(ALL_CFLAGS) $(CPPFLAGS) $<
  
  
  #########################################################################
-@@ -330,15 +331,11 @@
- install:	install-bin install-info install-man
+@@ -327,18 +328,14 @@ realclean:
+ TAGS:
+ 	@echo make TAGS -- not supported nor needed.
+ 
+-install:	install-bin install-info install-man
++install:	install-bin  install-man
  
  install-bin:	$(PROGRAM)
 -		-$(STRIP) $(PROGRAM)
 -		-$(CP) $(PROGRAM) $(bindir)
 -		-$(CHMOD) 755 $(bindir)/$(PROGRAM)
 +		${BSD_INSTALL_PROGRAM} $(PROGRAM) $(DESTDIR)$(bindir)
  
  install-info:	hp2xx.info
 -		-$(CP) hp2xx.info $(infodir)
 -		-$(CHMOD) 644 $(infodir)/hp2xx.info
 +		${BSD_INSTALL_DATA} hp2xx.info $(DESTDIR)$(infodir)
  
  install-man:	../doc/hp2xx.1
 -		-$(CP) ../doc/hp2xx.1 $(man1dir)
 -		-$(CHMOD) 644 $(man1dir)/hp2xx.1
 +		${BSD_INSTALL_MAN} ../doc/hp2xx.1 $(DESTDIR)$(man1dir)
  
diff --git a/print/hp2xx/files/patch-png.c b/print/hp2xx/files/patch-png.c
index 48162b3d7dae..a3973fd0202a 100644
--- a/print/hp2xx/files/patch-png.c
+++ b/print/hp2xx/files/patch-png.c
@@ -1,19 +1,19 @@
---- png.c.orig	2003-06-21 17:31:51.000000000 +0200
-+++ png.c	2012-05-06 06:59:14.000000000 +0200
+--- png.c.orig	2003-06-21 15:31:51 UTC
++++ png.c
 @@ -6,6 +6,7 @@
  #include <stdlib.h>
  #include "to_png.h"
  #include <png.h>
 +#include <zlib.h>
  
  #define PDNCOL 256
  
-@@ -36,7 +37,7 @@
+@@ -36,7 +37,7 @@ FILE *fd;
  	}
  
  	/* set up error handlimg for libpng */
 -	if (setjmp(png_ptr->jmpbuf)) {
 +	if (setjmp(png_jmpbuf(png_ptr))) {
  		png_destroy_write_struct(&png_ptr, &info_ptr);
  		return;
  	}