1 files changed, 176 insertions, 145 deletions

diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 08b5950c0020..0a61cda1ecbb 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -6,30 +6,21 @@
 #
 
 PORTNAME=	ghostscript
-PORTVERSION=	6.50
-PORTREVISION=	6
+PORTVERSION=	7.00
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Postscript/Ghostscript/aladdin/gs650/ \
-	ftp://ftp.fh-koblenz.de/pub/Postscript/Ghostscript/aladdin/fonts/ \
-	http://www.gelhaus.net/hp880c/1.4beta/ \
-	http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
-	http://www.harsch.net/Download/ \
-	http://members.ozemail.com.au/~geoffk/pdfencrypt/ \
-	ftp://download.sourceforge.net/pub/sourceforge/gimp-print/ \
-	http://download.sourceforge.net/ghostscript/ \
-	ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
-	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/gs650/ \
-	ftp://ftp.mirror.ac.uk/sites/ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
-	ftp://ftp.medasys-digital-systems.fr/pub/unix/ghostscript/aladdin/gs650/ \
-	ftp://ftp.medasys-digital-systems.fr/pub/unix/ghostscript/aladdin/fonts/ \
-	ftp://munnari.oz.au/ghost/aladdin/gs650/ \
-	ftp://munnari.oz.au/ghost/aladdin/fonts/ \
-	ftp://sunsite.cnlab-switch.ch/mirror/ghost/aladdin/gs650/ \
-	ftp://sunsite.cnlab-switch.ch/mirror/ghost/aladdin/fonts/
-# note: russian mirror isn't up to date
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://members.ozemail.com.au/~geoffk/pdfencrypt/ \
+		http://www.gelhaus.net/hp880c/1.4beta/ \
+		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/ \
+		http://www.harsch.net/Download/ \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs700/ \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/fonts/
+MASTER_SITE_SUBDIR=	${PORTNAME} gimp-print hpinkjet
+PKGNAMESUFFIX=	-afpl
+
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${DECRYPT_PDF} ${HP8XX_DRV} ${HPDJ_SRC} ${PCL3_SRC} \
-		${HP970_DRV} ${GPRINT_SRC}
+		${HP970_DRV} ${GPRINT_SRC} ${HPIJS_SRC}
 EXTRACT_ONLY=	${GS_SOURCES}
 
 MAINTAINER=	ports@FreeBSD.org
@@ -37,30 +28,41 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
+NO_CDROM=	"Can only be distributed for free"
+
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
+
+USE_GMAKE=	yes
+CFLAGS+=	-DUPD_SIGNAL=0
+MAKEFILE=	src/unix-gcc.mak
 ALL_TARGET=	all pcl3opts escputil
+PLIST_SUB=	GS_VERSION=${PORTVERSION}
+
+MAN1=		ansi2knr.1 dvipdf.1 escputil.1 font2c.1 gs-hpdj.1 gs-pcl3.1 \
+		gs.1 gslp.1 gsnd.1 pcl3opts.1 pdf2dsc.1 pdf2ps.1 pdfopt.1 \
+		pf2afm.1 pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 \
+		ps2pdfwr.1 ps2ps.1 wftopfa.1
+MLINKS=		gslp.1 gsbj.1 \
+		gslp.1 gsdj.1 \
+		gslp.1 gsdj500.1 \
+		gslp.1 gslj.1 \
+		ps2pdf.1 ps2pdf12.1 \
+		ps2pdf.1 ps2pdf13.1 \
+		ps2ps.1 eps2eps.1
+
+.if defined(A4)
+CFLAGS+=	-DA4
+.endif
 
 .if !defined(WITHOUT_X11)
+PKGNAMESUFFIX=	-afpl
 USE_XLIB=	yes
 .else
-# XXX Hack.  If you've done something like "-DWITHOUT_X11" on the command line
-# (instead of WITHOUT_X11=true, or similar) gmake won't pick it up.  So make
-# sure that NO_X is defined *and* has a value.
-MAKE_ENV+=	NO_X=true
+PKGNAMESUFFIX=	-afpl-nox11
+MAKE_ENV+=	WITHOUT_X11=${WITHOUT_X11}
 .endif
 
-USE_GMAKE=	yes
-MAKEFILE=	src/unix-gcc.mak
-PLIST_SUB=	GS_VERSION=${PORTVERSION}
-# Note: the order that the manpages are listed here matters because
-# some of them are symbolic links
-MAN1=		gs.1 dvipdf.1 font2c.1 eps2eps.1 gsbj.1 gsdj.1 gsdj500.1 \
-		gslj.1 gslp.1 gsnd.1 pdf2dsc.1 pdfopt.1 pdf2ps.1 pf2afm.1 \
-		pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf12.1 \
-		ps2pdf13.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1 \
-		gs-hpdj.1 gs-pcl3.1 pcl3opts.1 escputil.1
-
-GS_SOURCES=	ghostscript-${PORTVERSION}.tar.gz
+GS_SOURCES=	${DISTNAME}${EXTRACT_SUFX}
 #  Note: the following two are real files that have symlinks with
 #  later version numbers pointing to them.  To avoid unnecessarily
 #  downloading distfiles, do not change these when upgrading the port
@@ -72,13 +74,12 @@ GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 
 # Ghostscript Driver for HP DeskJet 812C/815C/832C/880C/882C/895C
 # http://www.gelhaus.net/hp880c/
-# driver names:	cdj880
-HP8XX=		cdj850
+HP8XX=		cdj880
 HP8XX_DRV=	gdevcd8.tar.gz
 
 # HPDJ, additional driver for HP PCL3 Printers, by Martin Lottermoser
-# ftp://ftp.sbs.de/pub/graphics/ghostscript/pcl3/pcl3.html
 # still present, just for the case pcl3 is missing some hpdj feature
+# http://home.t-online.de/home/Martin.Lottermoser/pcl3.html
 HPDJ=		hpdj
 HPDJ_VERS=	2.6
 HPDJ_NAME=	${HPDJ}-${HPDJ_VERS}
@@ -95,17 +96,25 @@ PCL3_SRC=	${PCL3_NAME}.tar.gz
 PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
 
 # additional driver for HP DeskJet 970, supports duplex printing
+# http://www.harsch.net/Ghostscript/ghostscript.html
 HP970_DRV=	gdevdj9.c.gz
 
 # gimp-print - very high quality driver for Epson, HPs,...
-# http://sourceforge.net/projects/gimp-print/
+# http://gimp-print.sourceforge.net/
 GPRINT=		print
 GPRINT_DESC=	gimp-${GPRINT}
-GPRINT_VERS=	4.0.4
+GPRINT_VERS=	4.0.5
 GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
 GPRINT_SRC=	${GPRINT_NAME}.tar.gz
 GPRINT_MAN1=	escputil.1
 
+# HPinkjet - HP developed printer driver for PhotoSmart/DeskJet series
+# http://hpinkjet.sourceforge.net/
+HPIJS=		hpijs
+HPIJS_VERS=	0.97
+HPIJS_NAME=	${HPIJS}${HPIJS_VERS}
+HPIJS_SRC=	${HPIJS_NAME}.tar.gz
+
 # contributed uniprint profiles
 CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 		stc740ih.upp stc740p.upp stc740pl.upp
@@ -113,200 +122,222 @@ CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
 # replacement for pdf_sec.ps, that allows you to read encrypted PDF files
 DECRYPT_PDF=	pdf_sec.ps
 
-.if defined(A4)
-CFLAGS+=	-DA4
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+CFLAGS+=	-D_LITTLE_ENDIAN
 .endif
 
-CFLAGS+=	-DUPD_SIGNAL=0
+.SILENT:
 
-pre-fetch:
+pre-everything:
 .if !defined(A4)
-	@${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
+	${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
 .else
-	@${ECHO_MSG} "Using -DA4 for compilation."
+	${ECHO_MSG} "Using -DA4 for compilation."
 .endif
 
 post-extract:
-	@${ECHO} ">>> in post-extract ..."
-	@${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \
+	${ECHO_MSG} ">>> in post-extract ..."
+	${LN} -sf ${WRKDIRPREFIX}${.CURDIR}/../../graphics/jpeg/work/jpeg-6b \
 		${WRKSRC}/jpeg
+	${RM} -f ${WRKSRC}/man/de/*.1
 # ** 3rd party driver **
 # Note: don't forget to add those devices in scripts/configure and
 # configure.batch, which update unix-gcc.mak to build gs with these
 # new devices !
 #
 # for HP8XX driver
-	@${ECHO} ">>>   extracting ${HP8XX_DRV} ..."
-	@${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${HP8XX_DRV}
+	${ECHO_MSG} ">>>   extracting ${HP8XX_DRV} ..."
+	${TAR} -C ${WRKSRC}/src -xzf ${_DISTDIR}/${HP8XX_DRV}
 # for HPDJ driver
-	@${ECHO} ">>>   extracting ${HPDJ_SRC} ..."
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${HPDJ_SRC}
-	@${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
+	${ECHO_MSG} ">>>   extracting ${HPDJ_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPDJ_SRC}
+	${TAR} -C ${WRKSRC}/src -xf ${WRKSRC}/${HPDJ_NAME}/${HPDJ}.tar
 # for PCL3 driver
-	@${ECHO} ">>>   extracting ${PCL3_SRC} ..."
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${PCL3_SRC}
-	@${LN} -s ${PCL3_NAME} ${WRKSRC}/pcl3
-	@${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
+	${ECHO_MSG} ">>>   extracting ${PCL3_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${PCL3_SRC}
+	${LN} -sf ${PCL3_NAME} ${WRKSRC}/pcl3
+	${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
 		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
 # for HP DeskJet 970 driver
-	@${ECHO} ">>>   extracting ${HP970_DRV} ..."
-	@${CP} ${DISTDIR}/${HP970_DRV} ${WRKSRC}/src
-	@${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
+	${ECHO_MSG} ">>>   extracting ${HP970_DRV} ..."
+	${CP} ${_DISTDIR}/${HP970_DRV} ${WRKSRC}/src
+	${GUNZIP_CMD} ${WRKSRC}/src/${HP970_DRV}
 # for gimp-print
-	@${ECHO} ">>>   extracting ${GPRINT_SRC} ..."
-	@${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${GPRINT_SRC}
+	${ECHO_MSG} ">>>   extracting ${GPRINT_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${GPRINT_SRC}
+# for HPinkjet driver
+	${ECHO_MSG} ">>>   extracting ${HPIJS_SRC} ..."
+	${TAR} -C ${WRKSRC} -xzf ${_DISTDIR}/${HPIJS_SRC}
+	${LN} -sf ${HPIJS_NAME} ${WRKSRC}/hpijs
 
-# here we apply unofficial patches from 3rd party drivers
 post-patch:
-# from PCL3 driver
-	@${ECHO} ">>> in post-patch ..."
-	@${ECHO} ">>>   applying patches from ${PCL3} ..."
-	@${PATCH} -d ${WRKSRC}/src --forward --quiet -E \
-		< ${WRKSRC}/${PCL3_NAME}/src/zmedia2.c-6.01.diff
+	${PERL} -pi -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
+		${WRKSRC}/src/unix-gcc.mak
+# for HPinkjet driver
+	find ${WRKSRC}/${HPIJS_NAME} -name '*.h' | xargs ${PERL} -pi -e \
+		's|#include <malloc.h>||g; \
+		 s|SRVPATH \"hpijs\"|SRVPATH \"${PREFIX}/libexec/hpijs\"|g'
 
 # here we apply the modifications necessary to build the 3rd party drivers
 # advantage: you see unmodified makefiles after a pure make extract
 pre-configure:
-	@${ECHO} ">>> in pre-configure ..."
+	${ECHO_MSG} ">>> in pre-configure ..."
 # for HP8XX driver
-	@${ECHO} ">>>   adding ${HP8XX} driver to contrib.mak ..."
-	@${CAT} ${FILESDIR}/cdj850.contrib.mak \
+	${ECHO_MSG} ">>>   adding ${HP8XX} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/cdj850.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for HPDJ driver
-	@${ECHO} ">>>   adding ${HPDJ} driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
+	${ECHO_MSG} ">>>   adding ${HPDJ} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/src/contrib.mak-5.94.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for PCL3 driver
-	@${ECHO} ">>>   adding ${PCL3} driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.01.add \
+	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.50.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for HP DeskJet 970 driver
-	@${ECHO} ">>>   adding DJ970 driver to contrib.mak ..."
-	@${CAT} ${FILESDIR}/dj970.contrib.mak \
+	${ECHO_MSG} ">>>   adding DJ970 driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/dj970.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 # for gimp-print
-	@${ECHO} ">>>   creating symlinks for ${GPRINT_DESC} ..."
-	@${LN} -s ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
+	${ECHO_MSG} ">>>   creating symlinks for ${GPRINT_DESC} ..."
+	${LN} -sf ${WRKSRC}/${GPRINT_NAME}/Ghost/*.[ch] \
 		${WRKSRC}/src
-	@${ECHO} ">>>   adding ${GPRINT_DESC} driver to contrib.mak ..."
-	@${CAT} ${WRKSRC}/${GPRINT_NAME}/Ghost/contrib.mak.addon \
+	${ECHO_MSG} ">>>   adding ${GPRINT_DESC} driver to contrib.mak ..."
+	${CAT} ${WRKSRC}/${GPRINT_NAME}/Ghost/contrib.mak.addon \
+		>> ${WRKSRC}/src/contrib.mak
+	${ECHO_MSG} ">>>   adding make rules for escputil to contrib.mak ..."
+	${CAT} ${FILESDIR}/escputil.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
-	@${ECHO} ">>>   adding make rules for escputil to contrib.mak ..."
-	@${CAT} ${FILESDIR}/escputil.contrib.mak \
+# for HPinkjet driver
+	${ECHO_MSG} ">>>   creating symlinks for ${HPIJS} ..."
+	${LN} -sf ${WRKSRC}/${HPIJS_NAME}/gdevhpij.[ch] \
+		${WRKSRC}/src
+	${ECHO_MSG} ">>>   adding ${HPIJS} driver to contrib.mak ..."
+	${CAT} ${FILESDIR}/hpijs.contrib.mak \
 		>> ${WRKSRC}/src/contrib.mak
 
 do-configure:
-	@${ECHO} ">>> in do-configure ..."
+	${ECHO_MSG} ">>> in do-configure ..."
 .if defined(BATCH)
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
 .else
-	# XXX diable dialog based configure, needs some rework later...
-	#@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.batch
+	${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
 .endif
 
 pre-build:
-	@${ECHO} ">>> in pre-build ..."
-	@${ECHO} ">>>   creating directories for compilation ..."
-	@${MKDIR} ${WRKSRC}/obj
-	@${MKDIR} ${WRKSRC}/bin
+	${ECHO_MSG} ">>> in pre-build ..."
+	${ECHO_MSG} ">>>   creating directories for compilation ..."
+	${MKDIR} ${WRKSRC}/obj
+	${MKDIR} ${WRKSRC}/bin
+
+post-build:
+# for HPinkjet driver
+	cd ${WRKSRC}/${HPIJS_NAME} ; \
+		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} makefile
 
 pre-install:
-	@${ECHO} ">>> in pre-install ..."
-	@${ECHO} ">>>   creating ghostscript destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript
-	@${ECHO} ">>>   extracting ghostscript fonts..."
-	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_STD}
-	@${TAR} -C ${PREFIX}/share/ghostscript -xzf ${DISTDIR}/${GS_FONTS_OTHER}
+	${ECHO_MSG} ">>> in pre-install ..."
+	${ECHO_MSG} ">>>   creating ghostscript destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript
+	${ECHO_MSG} ">>>   extracting ghostscript fonts..."
+	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${_DISTDIR}/${GS_FONTS_STD}
+	${TAR} -C ${PREFIX}/share/ghostscript -xzf ${_DISTDIR}/${GS_FONTS_OTHER}
 
 post-install:
-	@${ECHO} ">>> in post-install ..."
-	@${ECHO} ">>>   stripping gs ..."
-	@strip ${PREFIX}/bin/gs
-	@${ECHO} ">>>   installing additional scripts ..."
-	@${INSTALL_SCRIPT} ${WRKSRC}/lib/unix-lpr.sh ${PREFIX}/bin
-	@${INSTALL_SCRIPT} ${WRKSRC}/lib/lprsetup.sh ${PREFIX}/bin
+	${ECHO_MSG} ">>> in post-install ..."
+	${ECHO_MSG} ">>>   stripping gs ..."
+	strip ${PREFIX}/bin/gs
 # for HPDJ driver
-	@${ECHO} ">>>   installing ${HPDJ} manpages ..."
+	${ECHO_MSG} ">>>   installing ${HPDJ} manpages ..."
 .for i in ${HPDJ_MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/src/${i} ${PREFIX}/man/man1
 .endfor
-	@${ECHO} ">>>   creating ${HPDJ} destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in ${HPDJ} destdir ..."
+	${ECHO_MSG} ">>>   creating ${HPDJ} destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
+	${ECHO_MSG} ">>>   installing files in ${HPDJ} destdir ..."
 .for i in README.hpdj example.mdf margins-A4.ps margins-A4Rotated.ps \
 	margins-Letter.ps margins-LetterRotated.ps
-	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/hpdj
 .endfor
 # for PCL3 driver
-	@${ECHO} ">>> installing ${PCL3} manpages ..."
+	${ECHO_MSG} ">>> installing ${PCL3} manpages ..."
 .for i in ${PCL3_MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${PREFIX}/man/man1
 .endfor
 # other pcl3 stuff, which might be interesting for runtime
-	@${ECHO} ">>>   creating ${PCL3} destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in ${PCL3} destdir ..."
+	${ECHO_MSG} ">>>   creating ${PCL3} destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
+	${ECHO_MSG} ">>>   installing files in ${PCL3} destdir ..."
 .for i in NEWS BUGS README lib/example.mcf lib/if-pcl3 ps/calign.ps \
 	ps/dumppdd.ps ps/levels-test.ps ps/margins-A4.ps \
 	ps/margins-A4Rotated.ps ps/margins-Env10Rotated.ps \
 	ps/margins-EnvDLRotated.ps ps/margins-Letter.ps \
 	ps/margins-LetterRotated.ps
-	@${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
+	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/pcl3
 .endfor
 # for gimp-print driver
-	@${ECHO} ">>>   installing ${GPRINT_DESC} escputil in bindir ..."
-	@${INSTALL_PROGRAM} ${WRKSRC}/src/escputil ${PREFIX}/bin
-	@${ECHO} ">>>   stripping ${GPRINT_DESC} escputil ..."
-	@strip ${PREFIX}/bin/escputil
-	@${ECHO} ">>>   installing ${GPRINT_DESC} manpages ..."
+	${ECHO_MSG} ">>>   installing ${GPRINT_DESC} escputil in bindir ..."
+	${INSTALL_PROGRAM} ${WRKSRC}/src/escputil ${PREFIX}/bin
+	${ECHO_MSG} ">>>   installing ${GPRINT_DESC} manpages ..."
 .for i in ${GPRINT_MAN1}
-	@${INSTALL_MAN} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+	${INSTALL_MAN} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
 		${PREFIX}/man/man1
 .endfor
-	@${ECHO} ">>>   creating ${GPRINT_DESC} destdir ..."
-	@${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
-	@${ECHO} ">>>   installing files in gimp-print destdir ..."
+	${ECHO_MSG} ">>>   creating ${GPRINT_DESC} destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
+	${ECHO_MSG} ">>>   installing files in gimp-print destdir ..."
 .for i in README
-	@${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
+	${INSTALL_DATA} ${WRKSRC}/${GPRINT_NAME}/Ghost/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/gimp-print
 .endfor
+# for HPinkjet driver
+	${ECHO_MSG} ">>>   installing ${HPIJS} server in libexecdir ..."
+	${INSTALL_PROGRAM} ${WRKSRC}/${HPIJS_NAME}/hpijs ${PREFIX}/libexec
+	${ECHO_MSG} ">>>   creating ${HPIJS} destdir ..."
+	${MKDIR} ${PREFIX}/share/ghostscript/${PORTVERSION}/hpijs
+	${ECHO_MSG} ">>>   installing files in ${HPIJS} destdir ..."
+.for i in hpijs_readme.html
+	${INSTALL_DATA} ${WRKSRC}/${HPIJS}/${i} \
+		${PREFIX}/share/ghostscript/${PORTVERSION}/hpijs
+.endfor
 # contributed UPP driver
-	@${ECHO} ">>> installing contributed UPP profiles ..."
+	${ECHO_MSG} ">>> installing contributed UPP profiles ..."
 .for i in ${CONTRIB_UPP}
-	@${INSTALL_DATA} ${FILESDIR}/${i} \
+	${INSTALL_DATA} ${FILESDIR}/${i} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
 .endfor
 # for reading encrypted PDFs
-	@${ECHO} ">>> installing support for encrypted PDF files ..."
-	@${INSTALL_DATA} ${DISTDIR}/${DECRYPT_PDF} \
+	${ECHO_MSG} ">>> installing support for encrypted PDF files ..."
+	${INSTALL_DATA} ${DISTDIR}/${DECRYPT_PDF} \
 		${PREFIX}/share/ghostscript/${PORTVERSION}/lib
 #
 # now NOPORTDOCS dependend stuff
 #
 .if !defined(NOPORTDOCS)
-	@${ECHO} ">>> installing PORTDOC stuff ..."
+	${ECHO_MSG} ">>> installing PORTDOC stuff ..."
 # install hpdj docu, not necessary for runtime
 # note: old hpdj driver has its files in ${WRKSRC}/src
-	@${ECHO} ">>>   creating ${HPDJ} docu destdir ..."
-	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
-	@${ECHO} ">>>   installing files in ${HPDJ} docu destdir ..."
-.for i in LGPL.txt NEWS hpdj.html
-	@${INSTALL_DATA} ${WRKSRC}/src/${i} \
+	${ECHO_MSG} ">>>   creating ${HPDJ} docu destdir ..."
+	${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
+	${ECHO_MSG} ">>>   installing files in ${HPDJ} docu destdir ..."
+.for i in NEWS hpdj.html
+	${INSTALL_DATA} ${WRKSRC}/src/${i} \
 		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/hpdj
 .endfor
 # install pcl3 docu, not necessary for runtime
 # note: new pcl3 driver has a subdir of its own
-	@${ECHO} ">>>   creating ${PCL3} docu destdir ..."
-	@${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
-	@${ECHO} ">>>   installing files in ${PCL3} docu destdir ..."
-.for i in LGPL NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
-	@${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
+	${ECHO_MSG} ">>>   creating ${PCL3} docu destdir ..."
+	${MKDIR} ${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
+	${ECHO_MSG} ">>>   installing files in ${PCL3} docu destdir ..."
+.for i in NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
+	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
 		${PREFIX}/share/doc/ghostscript/${PORTVERSION}/pcl3
 .endfor
 .endif
-	@${ECHO} "> post-installation tasks completed."
+	${ECHO_MSG} "> post-installation tasks completed."
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>