4 files changed, 23 insertions, 28 deletions
diff --git a/www/htmlpp/Makefile b/www/htmlpp/Makefile
index 38521400c8c9..ec266fe1b0be 100644
--- a/www/htmlpp/Makefile
+++ b/www/htmlpp/Makefile
@@ -3,23 +3,17 @@
 # Date created:         9 Nov 1997
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.3 1998/11/29 08:20:30 asami Exp $
+# $Id: Makefile,v 1.4 1999/02/03 11:11:59 asami Exp $
 #
 
-DISTNAME=	htmlpp
-PKGNAME=	htmlpp-3.9d
+DISTNAME=	htmlp42a
+PKGNAME=	htmlpp-4.2a
 CATEGORIES=	www
 MASTER_SITES=	http://www.imatix.com/pub/tools/
-EXTRACT_SUFX=	.zip
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	dburr@FreeBSD.ORG
 
-BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
-
-EXTRACT_CMD=	unzip
-EXTRACT_BEFORE_ARGS=	-qa
-EXTRACT_AFTER_ARGS=	# empty
-
 USE_PERL5=	YES
 
 NO_WRKSUBDIR=	yes
@@ -31,14 +25,13 @@ do-build:
 	${MV} ${WRKDIR}/htmlpp.temp ${WRKDIR}/htmlpp
 
 do-install:
-	${MKDIR} ${PREFIX}/lib/perl5/site_perl
+	${MKDIR} ${PREFIX}/lib/perl5/site_perl/${PERL_VER}
 	${INSTALL_SCRIPT} ${WRKDIR}/htmlpp ${PREFIX}/bin/htmlpp
-	${INSTALL_DATA} ${WRKDIR}/htmlpp.d ${PREFIX}/lib/perl5/site_perl/htmlpp.d
-	(cd ${WRKDIR}; for FILE in *.pl; do ${INSTALL_DATA} $${FILE} ${PREFIX}/lib/perl5/site_perl/$${FILE}; done)
+	${INSTALL_DATA} ${WRKDIR}/htmlpp.d ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/htmlpp.d
+	(cd ${WRKDIR}; for FILE in *.pl; do ${INSTALL_DATA} $${FILE} ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/$${FILE}; done)
 	(cd ${WRKDIR}; for FILE in *.def; do ${INSTALL_DATA} $${FILE} ${PREFIX}/bin/$${FILE}; done)
 	${INSTALL_DATA} ${WRKDIR}/guru_opt.fmt ${PREFIX}/bin/guru.fmt
-	${INSTALL_DATA} ${WRKDIR}/htmlpp.l ${PREFIX}/bin/htmlpp.l
-	(cd ${WRKDIR}; ${MKDIR} ${PREFIX}/share/doc/htmlpp; for FILE in *.htm; do ${INSTALL_DATA} $${FILE} ${PREFIX}/share/doc/htmlpp/$${FILE}l; done)
+	(cd ${WRKDIR}; ${MKDIR} ${PREFIX}/share/doc/htmlpp; for FILE in *.htm; do ${INSTALL_DATA} $${FILE} ${PREFIX}/share/doc/htmlpp/$${FILE}; done)
 	(cd ${WRKDIR}; for FILE in *.gif; do ${INSTALL_DATA} $${FILE} ${PREFIX}/share/doc/htmlpp/$${FILE}; done)
 	(cd ${WRKDIR}; for FILE in *.txt; do ${INSTALL_DATA} $${FILE} ${PREFIX}/share/doc/htmlpp/$${FILE}; done)
 
diff --git a/www/htmlpp/distinfo b/www/htmlpp/distinfo
index 4ed021440f80..8b5bfa852cd6 100644
--- a/www/htmlpp/distinfo
+++ b/www/htmlpp/distinfo
@@ -1 +1 @@
-MD5 (htmlpp.zip) = 66451d3900084b2331823420506d71d9
+MD5 (htmlp42a.tgz) = 95fd34f0f94d4cb4dde418ed3bfdc056
diff --git a/www/htmlpp/pkg-descr b/www/htmlpp/pkg-descr
index d05098153925..7432bf24914b 100644
--- a/www/htmlpp/pkg-descr
+++ b/www/htmlpp/pkg-descr
@@ -7,4 +7,6 @@ Documentation is included in HTML format
 produced using htmlpp itself, you can take a look at the source file (also
 installed) to see an example of how to use htmlpp.
 
+WWW: http://www.imatix.com/html/htmlpp/index.htm
+
 [ This port is maintained by Donald Burr <dburr@FreeBSD.ORG>. ]
diff --git a/www/htmlpp/pkg-plist b/www/htmlpp/pkg-plist
index f3a31c4fb41b..d95544535a15 100644
--- a/www/htmlpp/pkg-plist
+++ b/www/htmlpp/pkg-plist
@@ -5,18 +5,18 @@ bin/guru.def
 bin/macros.def
 bin/prelude.def
 bin/guru.fmt
-bin/htmlpp.l
-lib/perl5/site_perl/htmlpp.d
-lib/perl5/site_perl/findfile.pl
-lib/perl5/site_perl/sflcvdp.pl
-lib/perl5/site_perl/sfldate.pl
-lib/perl5/site_perl/shellwd.pl
-share/doc/htmlpp/index.html
-share/doc/htmlpp/index1.html
-share/doc/htmlpp/index2.html
-share/doc/htmlpp/index3.html
-share/doc/htmlpp/index4.html
-share/doc/htmlpp/index5.html
+lib/perl5/site_perl/%%PERL_VER%%/htmlpp.d
+lib/perl5/site_perl/%%PERL_VER%%/findfile.pl
+lib/perl5/site_perl/%%PERL_VER%%/sflcvdp.pl
+lib/perl5/site_perl/%%PERL_VER%%/sfldate.pl
+lib/perl5/site_perl/%%PERL_VER%%/shellwd.pl
+lib/perl5/site_perl/%%PERL_VER%%/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