Index: head/print/hp2xx/Makefile
===================================================================
--- head/print/hp2xx/Makefile	(revision 372070)
+++ head/print/hp2xx/Makefile	(revision 372071)
@@ -1,41 +1,38 @@
 # Created by: Lars Koeller
 # $FreeBSD$
 
 PORTNAME=	hp2xx
 PORTVERSION=	3.4.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	print x11
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	GNU
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	HPGL to vector and raster formats converter and previewer for X11
 
+LICENSE=	GPLv2 # (or later)
+
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/sources
+WRKSRC_SUBDIR=	sources
 
 USES=		makeinfo
 MAKE_ENV=	DEFINES="${CPPFLAGS}" ALL_LIBS="${LDFLAGS}"
 
-PLIST_FILES=	bin/hp2xx man/man1/hp2xx.1.gz
-INFO=		hp2xx
-
 CPPFLAGS+=	-DUNIX -I${LOCALBASE}/include
 LDFLAGS+=	-lm -L${LOCALBASE}/lib -ltiff -lpng -lz
 
-OPTIONS_DEFINE=	X11
-OPTIONS_DEFAULT=X11
+INFO=		hp2xx
+PLIST_FILES=	bin/hp2xx man/man1/hp2xx.1.gz
 
-X11_USE=	XORG=x11
-X11_CPPFLAGS=	-DHAS_UNIX_X11 -I${LOCALBASE}/include
-X11_LDFLAGS=	-L${LOCALBASE}/lib -lX11
+OPTIONS_DEFINE=		X11
+OPTIONS_DEFAULT=	X11
+
+X11_USE=		XORG=x11
 X11_MAKE_ENV=		PREVIEWER=to_x11
 X11_MAKE_ENV_OFF=	PREVIEWER=no_prev
-
-post-patch:
-	@${REINPLACE_CMD} -E 's,(bin|info|man1)dir),DESTDIR)$$(&,' \
-		${WRKSRC}/Makefile
+X11_CPPFLAGS=		-DHAS_UNIX_X11 -I${LOCALBASE}/include
+X11_LDFLAGS=		-L${LOCALBASE}/lib -lX11
 
 .include <bsd.port.mk>
Index: head/print/hp2xx/files/patch-Makefile
===================================================================
--- head/print/hp2xx/files/patch-Makefile	(revision 372070)
+++ head/print/hp2xx/files/patch-Makefile	(revision 372071)
@@ -1,100 +1,100 @@
 --- Makefile.orig	Sun Jun 22 00:16:34 2003
 +++ Makefile	Tue Jun 24 07:53:46 2003
 @@ -35,7 +35,7 @@
  
  # Installation sites (GNU conventions):
  #
 -prefix   = /usr/local
 +prefix   = ${PREFIX}
  bindir   = $(prefix)/bin
  includedir = $(prefix)/include
  mandir   = $(prefix)/man
 @@ -45,14 +45,14 @@
  # 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 @@
  #
  # 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 @@
  
  # $(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 @@
  
  $(PROGRAM): $(OBJS)
  	$(CC) $(LFLAGS) $(OBJS) $(ALL_LIBS) $(EX_LIBS) -o $(PROGRAM)
 -	$(BINDCMD)
 +
 +all: $(PROGRAM) hp2xx.info
  
  default:
  	@echo "This makefile needs manual configuration! Edit it now!
 @@ -268,9 +269,9 @@
  #									#
  #########################################################################
  
 -# .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
  
  install-bin:	$(PROGRAM)
 -		-$(STRIP) $(PROGRAM)
 -		-$(CP) $(PROGRAM) $(bindir)
 -		-$(CHMOD) 755 $(bindir)/$(PROGRAM)
-+		${BSD_INSTALL_PROGRAM} $(PROGRAM) $(bindir)
++		${BSD_INSTALL_PROGRAM} $(PROGRAM) $(DESTDIR)$(bindir)
  
  install-info:	hp2xx.info
 -		-$(CP) hp2xx.info $(infodir)
 -		-$(CHMOD) 644 $(infodir)/hp2xx.info
-+		${BSD_INSTALL_DATA} hp2xx.info $(infodir)
++		${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 $(man1dir)
++		${BSD_INSTALL_MAN} ../doc/hp2xx.1 $(DESTDIR)$(man1dir)
  
Index: head/print/hp2xx/files/patch-doc_hp2xxinf.tex
===================================================================
--- head/print/hp2xx/files/patch-doc_hp2xxinf.tex	(revision 372070)
+++ head/print/hp2xx/files/patch-doc_hp2xxinf.tex	(revision 372071)
@@ -1,29 +1,38 @@
 --- ../doc/hp2xxinf.tex.orig	Sun Dec 30 20:18:00 2001
 +++ ../doc/hp2xxinf.tex	Wed Jan 30 20:01:28 2002
 @@ -5,6 +5,11 @@
  @setfilename hp2xx.info
  @settitle HP2XX, A HP-GL Converter
  @setchapternewpage odd
 +@dircategory Miscellaneous
 +@direntry
 +* HP2XX:(hp2xx).		Conversion of HP-GL graphics into raster and
 +				vector graphics formats
 +@end direntry
  @c @smallbook
  @c @cropmarks
  @c %**end of header
-@@ -35,14 +40,6 @@
- @c 00/09/20  V 1.2   MK   fixed INFO-DIR-ENTRY, updates for 3.4.0
+@@ -36,14 +41,6 @@
+ @c 03/06/21  V 1.4   MK   updates and fixes for 3.4.4
  @c THIS MANUAL REQUIRES TEXINFO-2 macros and info-makers to format properly.
  
 -@ifinfo
 -@format
 -START-INFO-DIR-ENTRY
 -* HP2XX:(hp2xx).  Conversion of HP-GL graphics into raster and
 -                  vector graphics formats
 -END-INFO-DIR-ENTRY
 -@end format
 -@end ifinfo
  @c
  @ifinfo
  This file documents the HP-GL converter HP2XX
+@@ -92,7 +89,7 @@
+ @page
+ @tex
+ {\parskip=0pt
+-\hfill mk\@daveg.com\par
++\hfill mk@@daveg.com\par
+ \hfill {\it Using HP2XX}, \manvers\par
+ \hfill \TeX{}info \texinfoversion\par
+ }