Update to 20040716 (changes unknown); also try to address PR 25089

by Kazu Yamamoto.

4 files changed, 20 insertions, 9 deletions

diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile
index eaa6fae2ca3..953c35c161f 100644
--- a/www/htmllint/Makefile
+++ b/www/htmllint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2004/04/07 12:01:18 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2004/07/19 13:18:31 wiz Exp $
 #
 
 DISTNAME=	htmllint
-PKGNAME=	htmllint-20040406
+PKGNAME=	htmllint-20040719
 CATEGORIES=	www japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/k16/htmllint/archives/
 EXTRACT_SUFX=	.zip
@@ -14,7 +14,7 @@ COMMENT=	Another HTML-Lint program
 DEPENDS+=	p5-Jcode>=0.68:../../converters/p5-Jcode
 
 WRKSRC=		${WRKDIR}
-DIST_SUBDIR=	${PKGNAME}
+DIST_SUBDIR=	${PKGNAME_NOREV}
 
 REPLACE_PERL=	htmllint.cgi htmllint parsedtd.pl tagslist.cgi
 USE_PERL5=	# defined
@@ -25,14 +25,14 @@ HTMLDIR=	${LOCALBASE}/share/httpd/htdocs/htmllint
 IMGDIR=		${HTMLDIR}/images
 
 post-patch:
-.for f in faq.html htmllintenv htmllint
+.for f in faq.html htmllintenv htmllint htmllint.caller
 	@${MV} ${WRKSRC}/${f} ${WRKSRC}/${f}.orig; 			\
 	${SED} -e 's!@PREFIX@!${PREFIX}!g' < ${WRKSRC}/${f}.orig 	\
 		> ${WRKSRC}/${f}
 .endfor
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/htmllint ${PREFIX}/bin; 		\
+	@${INSTALL_SCRIPT} ${WRKSRC}/htmllint.caller ${PREFIX}/bin/htmllint; 	\
 	${INSTALL_SCRIPT_DIR} ${CGIDIR}; 				\
 	${INSTALL_SCRIPT} ${WRKSRC}/*.cgi ${CGIDIR}; 			\
 	${INSTALL_DATA} ${WRKSRC}/htmllintrc ${CGIDIR}; 		\
@@ -40,6 +40,7 @@ do-install:
 	${TEST} -f ${CGIDIR}/htmllint.env || 				\
 	    ${CP} ${CGIDIR}/htmllint.env.default  ${CGIDIR}/htmllint.env; \
 	${INSTALL_SCRIPT_DIR} ${HTMLDIR}; 				\
+	${INSTALL_SCRIPT} ${WRKSRC}/htmllint ${HTMLDIR}; 		\
 	${INSTALL_SCRIPT} ${WRKSRC}/*.pl ${WRKSRC}/*.pm ${HTMLDIR}; 	\
 	${INSTALL_DATA} ${WRKSRC}/*.css ${WRKSRC}/*.dtd ${WRKSRC}/*.ent \
 	    ${WRKSRC}/*.html ${WRKSRC}/*.rul ${WRKSRC}/*.txt ${HTMLDIR}; \
diff --git a/www/htmllint/PLIST b/www/htmllint/PLIST
index 2572052f025..9998c22e384 100644
--- a/www/htmllint/PLIST
+++ b/www/htmllint/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2004/04/07 12:01:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2004/07/19 13:18:31 wiz Exp $
 bin/htmllint
 libexec/cgi-bin/htmllint.cgi
 libexec/cgi-bin/htmllint.env
@@ -49,6 +49,7 @@ share/httpd/htdocs/htmllint/html401-loose.dtd
 share/httpd/htdocs/htmllint/html401-strict.dtd
 share/httpd/htdocs/htmllint/html401-strict.rul
 share/httpd/htdocs/htmllint/html401-transitional.rul
+share/httpd/htdocs/htmllint/htmllint
 share/httpd/htdocs/htmllint/htmllint.css
 share/httpd/htdocs/htmllint/htmllint.history.txt
 share/httpd/htdocs/htmllint/htmllint.html
diff --git a/www/htmllint/distinfo b/www/htmllint/distinfo
index cb56f738dd9..536fa0d1396 100644
--- a/www/htmllint/distinfo
+++ b/www/htmllint/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2004/04/07 12:01:18 wiz Exp $
+$NetBSD: distinfo,v 1.9 2004/07/19 13:18:31 wiz Exp $
 
-SHA1 (htmllint-20040406/htmllint.zip) = c8c186743035511ef70b6fdad0dba9ee20f73e23
-Size (htmllint-20040406/htmllint.zip) = 690157 bytes
+SHA1 (htmllint-20040719/htmllint.zip) = 1d17872eaccd23c104797ca6287f4a2fbe1303c2
+Size (htmllint-20040719/htmllint.zip) = 690457 bytes
 SHA1 (patch-aa) = bdaeb7be2fbf2a1295f4840d52a2e0f5f1cc31bc
+SHA1 (patch-ab) = ed444b7472e4d9d3205fe258d479495411467687
 SHA1 (patch-ad) = 3759e9a01e8697e4db4012c91acb6429b8ef0e1e
 SHA1 (patch-ag) = 2feed2790b4c501c2df6f96efdb84ca39faf0fb7
 SHA1 (patch-ah) = 26ba26f155a05d8bd0e7bfa1d494a246e1bf2ab8
diff --git a/www/htmllint/patches/patch-ab b/www/htmllint/patches/patch-ab
new file mode 100644
index 00000000000..c0194456dd1
--- /dev/null
+++ b/www/htmllint/patches/patch-ab
@@ -0,0 +1,8 @@
+$NetBSD: patch-ab,v 1.4 2004/07/19 13:18:31 wiz Exp $
+
+--- htmllint.caller.orig	2004-07-19 15:07:03.000000000 +0200
++++ htmllint.caller
+@@ -0,0 +1,3 @@
++#!/bin/sh
++
++@PREFIX@/share/httpd/htdocs/htmllint/htmllint $*