Index: head/www/htmlpp/Makefile
===================================================================
--- head/www/htmlpp/Makefile	(revision 419735)
+++ head/www/htmlpp/Makefile	(revision 419736)
@@ -1,34 +1,38 @@
 # Created by: Donald Burr <dburr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	htmlpp
 PORTVERSION=	4.2a
 PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://legacy.imatix.com/pub/tools/
 DISTNAME=	htmlp42a
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl script to allow easy creation of HTML from template files
 
 LICENSE=	GPLv2+
 
 USES=		perl5 shebangfix tar:tgz
 SHEBANG_FILES=	htmlpp
-
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 NO_ARCH=	yes
 
+PORTDOCS=	*
+
+OPTIONS_DEFINE=	DOCS
+
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
-	${INSTALL_SCRIPT} ${WRKSRC}/htmlpp ${STAGEDIR}${PREFIX}/bin/htmlpp
-	${INSTALL_DATA} ${WRKSRC}/htmlpp.d ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/htmlpp.d
-	(cd ${WRKSRC}; for FILE in *.pl; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/$${FILE}; done)
-	(cd ${WRKSRC}; for FILE in *.def; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${PREFIX}/bin/$${FILE}; done)
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}
+	${INSTALL_SCRIPT} ${WRKSRC}/htmlpp ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/*.def ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_DATA} ${WRKSRC}/*.pl ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/
+	${INSTALL_DATA} ${WRKSRC}/htmlpp.d ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/
 	${INSTALL_DATA} ${WRKSRC}/guru_opt.fmt ${STAGEDIR}${PREFIX}/bin/guru.fmt
-	(cd ${WRKSRC}; ${MKDIR} ${STAGEDIR}${DOCSDIR}; for FILE in *.htm; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${DOCSDIR}/$${FILE}; done)
-	(cd ${WRKSRC}; for FILE in *.gif; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${DOCSDIR}/$${FILE}; done)
-	(cd ${WRKSRC}; for FILE in *.txt; do ${INSTALL_DATA} $${FILE} ${STAGEDIR}${DOCSDIR}/$${FILE}; done)
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} *.htm *.gif *.txt ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/www/htmlpp/pkg-plist
===================================================================
--- head/www/htmlpp/pkg-plist	(revision 419735)
+++ head/www/htmlpp/pkg-plist	(revision 419736)
@@ -1,24 +1,13 @@
 bin/htmlpp
 bin/contents.def
 bin/filetype.def
 bin/guru.def
 bin/macros.def
 bin/prelude.def
 bin/guru.fmt
 %%SITE_PERL%%/htmlpp.d
 %%SITE_PERL%%/findfile.pl
 %%SITE_PERL%%/sflcvdp.pl
 %%SITE_PERL%%/sfldate.pl
 %%SITE_PERL%%/shellwd.pl
 %%SITE_PERL%%/textdb.pl
-share/doc/htmlpp/index.htm
-share/doc/htmlpp/index1.htm
-share/doc/htmlpp/index2.htm
-share/doc/htmlpp/index3.htm
-share/doc/htmlpp/index4.htm
-share/doc/htmlpp/index5.htm
-share/doc/htmlpp/htmlpp1.gif
-share/doc/htmlpp/im0096c.gif
-share/doc/htmlpp/newstone.gif
-share/doc/htmlpp/gurutst.txt
-share/doc/htmlpp/htmlpp.txt