Update to version 2003-02-03; (aka make this find the distfile again; fix

bulk-build problem)
Changes: unknown, no information was available in any language or characterset
that I can understand.

Use REPLACE_PERL to obsolete a few patches.

6 files changed, 18 insertions, 68 deletions

diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile
index a8ca7c2a836..cbd4c3b3a18 100644
--- a/www/htmllint/Makefile
+++ b/www/htmllint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/01/29 02:05:19 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.8 2003/02/03 16:00:02 jschauma Exp $
 #
 
 DISTNAME=	htmllint
-PKGNAME=	htmllint-20021103
+PKGNAME=	htmllint-20030203
 CATEGORIES=	www japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/k16/htmllint/archives/
 EXTRACT_SUFX=	.zip
@@ -15,9 +15,9 @@ DEPENDS+=	p5-Jcode>=0.68:../../converters/p5-Jcode
 
 DIST_SUBDIR=	${PKGNAME}
 
+REPLACE_PERL=	htmllint.cgi htmllint parsedtd.pl tagslist.cgi
 USE_PERL5=	# defined
 WRKSRC=		${WRKDIR}
-NO_CONFIGURE=	# defined
 NO_BUILD=	# defined
 
 CGIDIR=		${LOCALBASE}/libexec/cgi-bin
@@ -25,25 +25,25 @@ HTMLDIR=	${LOCALBASE}/share/httpd/htdocs/htmllint
 IMGDIR=		${HTMLDIR}/images
 
 post-patch:
-.for f in faq.html htmllint.cgi htmllint htmllintenv parsedtd.pl tagslist.cgi
-	@${MV} ${WRKSRC}/${f} ${WRKSRC}/${f}.orig; \
-	${SED} -e 's!@PREFIX@!${PREFIX}!g' < ${WRKSRC}/${f}.orig \
-	    > ${WRKSRC}/${f}
+.for f in faq.html htmllintenv
+	@${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_DIR} ${CGIDIR}; \
-	${INSTALL_SCRIPT} ${WRKSRC}/*.cgi ${CGIDIR}; \
-	${INSTALL_DATA} ${WRKSRC}/htmllintrc ${CGIDIR}; \
+	@${INSTALL_SCRIPT} ${WRKSRC}/htmllint ${PREFIX}/bin; 		\
+	${INSTALL_SCRIPT_DIR} ${CGIDIR}; 				\
+	${INSTALL_SCRIPT} ${WRKSRC}/*.cgi ${CGIDIR}; 			\
+	${INSTALL_DATA} ${WRKSRC}/htmllintrc ${CGIDIR}; 		\
 	${INSTALL_DATA} ${WRKSRC}/htmllintenv ${CGIDIR}/htmllint.env.default; \
-	${TEST} -f ${CGIDIR}/htmllint.env || \
+	${TEST} -f ${CGIDIR}/htmllint.env || 				\
 	    ${CP} ${CGIDIR}/htmllint.env.default  ${CGIDIR}/htmllint.env; \
-	${INSTALL_SCRIPT_DIR} ${HTMLDIR}; \
-	${INSTALL_SCRIPT} ${WRKSRC}/*.pl ${WRKSRC}/*.pm ${HTMLDIR}; \
+	${INSTALL_SCRIPT_DIR} ${HTMLDIR}; 				\
+	${INSTALL_SCRIPT} ${WRKSRC}/*.pl ${WRKSRC}/*.pm ${HTMLDIR}; 	\
 	${INSTALL_DATA} ${WRKSRC}/*.css ${WRKSRC}/*.dtd ${WRKSRC}/*.ent \
 	    ${WRKSRC}/*.html ${WRKSRC}/*.rul ${WRKSRC}/*.txt ${HTMLDIR}; \
-	${INSTALL_DATA_DIR} ${IMGDIR}; \
+	${INSTALL_DATA_DIR} ${IMGDIR}; 					\
 	${INSTALL_DATA} ${WRKSRC}/*.gif ${IMGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/htmllint/distinfo b/www/htmllint/distinfo
index 77b0b8687d0..674159418b4 100644
--- a/www/htmllint/distinfo
+++ b/www/htmllint/distinfo
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.4 2003/01/29 02:05:20 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2003/02/03 16:00:02 jschauma Exp $
 
-SHA1 (htmllint-20021103/htmllint.zip) = 07a3e71d4c1f2e46b26f4f39aea1d06d1f834cd4
-Size (htmllint-20021103/htmllint.zip) = 667900 bytes
+SHA1 (htmllint-20030203/htmllint.zip) = 0a72295e4ed49160bd4a575af6d9a6ae1ef4a648
+Size (htmllint-20030203/htmllint.zip) = 668912 bytes
 SHA1 (patch-aa) = bdaeb7be2fbf2a1295f4840d52a2e0f5f1cc31bc
-SHA1 (patch-ab) = 5c471f6833812cb7473f763e2ce25c1c48436b0c
-SHA1 (patch-ac) = e3ac802ed17d7939e47e6f074113ddad2eb93e68
 SHA1 (patch-ad) = 3759e9a01e8697e4db4012c91acb6429b8ef0e1e
-SHA1 (patch-ae) = a90c30ef3890a2989ccf8ca6cd36ddb805da35eb
-SHA1 (patch-af) = 9133d16bff24a3837ecf21ddf28fa10025335a84
 SHA1 (patch-ag) = 2feed2790b4c501c2df6f96efdb84ca39faf0fb7
 SHA1 (patch-ah) = 26ba26f155a05d8bd0e7bfa1d494a246e1bf2ab8
 SHA1 (patch-ai) = 27068dafb150f20e30898ec546d07af54e487fce
diff --git a/www/htmllint/patches/patch-ab b/www/htmllint/patches/patch-ab
deleted file mode 100644
index bedd1608328..00000000000
--- a/www/htmllint/patches/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/03/18 14:05:12 kei Exp $
-
---- htmllint.cgi.orig	Thu Mar  8 20:18:48 2001
-+++ htmllint.cgi	Thu Mar 15 10:13:17 2001
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!@PREFIX@/bin/perl
- # CGI script for Another HTML-lint gateway ###################
- require 5.004;
- 
diff --git a/www/htmllint/patches/patch-ac b/www/htmllint/patches/patch-ac
deleted file mode 100644
index b6cb47f7292..00000000000
--- a/www/htmllint/patches/patch-ac
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2002/11/22 16:10:11 jschauma Exp $
-
---- htmllint.orig	Fri Nov 22 10:33:45 2002
-+++ htmllint	Fri Nov 22 10:34:19 2002
-@@ -1,9 +1,9 @@
--#!/usr/local/bin/perl
-+#!@PREFIX@/bin/perl
- 
- # Another HTML-lint ###########################################
- 
- use File::Basename;
--push @INC => [&fileparse($0)]->[1];
-+push @INC => '@PREFIX@/share/httpd/htdocs/htmllint'; # XXX
- 
- my $add_options; # = '-noscore -pedantic etc...';
- 
diff --git a/www/htmllint/patches/patch-ae b/www/htmllint/patches/patch-ae
deleted file mode 100644
index 453053908b1..00000000000
--- a/www/htmllint/patches/patch-ae
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2001/03/14 05:13:05 kei Exp $
-
---- parsedtd.pl.orig	Wed Jan 24 10:05:31 2001
-+++ parsedtd.pl	Wed Jan 24 10:10:43 2001
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!@PREFIX@/bin/perl
- 
- # Simple DTD Parser for HTML ##########################
- 
diff --git a/www/htmllint/patches/patch-af b/www/htmllint/patches/patch-af
deleted file mode 100644
index 0c11d7962f9..00000000000
--- a/www/htmllint/patches/patch-af
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/03/14 05:13:05 kei Exp $
-
---- tagslist.cgi.orig	Wed Jan 24 10:05:39 2001
-+++ tagslist.cgi	Wed Jan 24 10:10:59 2001
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!@PREFIX@/bin/perl
- 
- # 規則ファイルから要素一覧HTMLを生成する
-