* updated htmllint package to 2.36. Problem was noticed by David Brownlee

  <abs@netbsd.org> in private message.  Some bugs found in previous package
  was fixed also.

Change list is available on its home page (in Japanese).

htmllint.pm

2.36 2001/03/14 Supported iMode 3.0.
2.35 2001/03/05 Warn about non-blank text following <FIELDSET>.
2.34 2001/02/24 Support various ristrictions noted in comment of DTD by
                ISO/IEC 15545.  As this, several warning are added.
                Character entity references are now considered when
                counting length for title, etc.
2.33 2001/02/13 Under some circumstances, <NOFRAMES> outside of <FRAMESET>
                warns inconsitently.

htmllint.cgi

1.01 2001/03/08 Couldn't get resource properly when ommitting trailing '/'
                such as http://host
1.00 2001/02/01 Couldn't get resource properly when the URL contains
                authenticate information.

As you already know, '2.36' is a version of htmllint.pm.

7 files changed, 43 insertions, 37 deletions

diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile
index d2173b28561..4e803998ec5 100644
--- a/www/htmllint/Makefile
+++ b/www/htmllint/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/14 05:13:04 kei Exp $
+# $NetBSD: Makefile,v 1.2 2001/03/18 14:05:11 kei Exp $
 #
 
 DISTNAME=	htmllint
-PKGNAME=	htmllint-2.32
+PKGNAME=	htmllint-2.36
 CATEGORIES=	www japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/k16/htmllint/archives/
 EXTRACT_SUFX=	.zip
@@ -18,27 +18,29 @@ NO_WRKSUBDIR=	# defined
 NO_CONFIGURE=	# defined
 NO_BUILD=	# defined
 
-CGIDIR=		${PREFIX}/libexec/cgi-bin
-HTMLDIR=	${PREFIX}/share/httpd/htdocs/htmllint
+CGIDIR=		${LOCALBASE}/libexec/cgi-bin
+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
+	@${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 ${WRKSRC}/htmllintrc ${CGIDIR}
-	${INSTALL_DATA} ${WRKSRC}/htmllintenv ${CGIDIR}/htmllint.env
-	${INSTALL_SCRIPT_DIR} ${HTMLDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/*.pl ${WRKSRC}/*.pm ${HTMLDIR}
+	@${INSTALL_SCRIPT} ${WRKSRC}/htmllint ${PREFIX}/bin; \
+	${INSTALL_SCRIPT_DIR} ${CGIDIR}; \
+	${INSTALL_SCRIPT} ${WRKSRC}/*.cgi ${WRKSRC}/htmllintrc ${CGIDIR}; \
+	${INSTALL_DATA} ${WRKSRC}/htmllintenv ${CGIDIR}/htmllint.env.default; \
+	${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_DATA} ${WRKSRC}/*.css ${WRKSRC}/*.dtd ${WRKSRC}/*.ent \
-	    ${WRKSRC}/*.html ${WRKSRC}/*.rul ${WRKSRC}/*.txt ${HTMLDIR}
-	${INSTALL_DATA_DIR} ${IMGDIR}
+	    ${WRKSRC}/*.html ${WRKSRC}/*.rul ${WRKSRC}/*.txt ${HTMLDIR}; \
+	${INSTALL_DATA_DIR} ${IMGDIR}; \
 	${INSTALL_DATA} ${WRKSRC}/*.gif ${IMGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/htmllint/files/md5 b/www/htmllint/files/md5
index e06796f342c..2ca64f24f02 100644
--- a/www/htmllint/files/md5
+++ b/www/htmllint/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2001/03/14 05:13:04 kei Exp $
+$NetBSD: md5,v 1.2 2001/03/18 14:05:12 kei Exp $
 
-SHA1 (htmllint.zip) = a51b9575be4f5c26fd27fc59366c8d0c368c0cea
+SHA1 (htmllint.zip) = cc9c3753f533e2ad8d2c49880c4a138cea9c7466
diff --git a/www/htmllint/files/patch-sum b/www/htmllint/files/patch-sum
index d1f0310a29c..9af0e327ae1 100644
--- a/www/htmllint/files/patch-sum
+++ b/www/htmllint/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.1.1.1 2001/03/14 05:13:04 kei Exp $
+$NetBSD: patch-sum,v 1.2 2001/03/18 14:05:12 kei Exp $
 
-SHA1 (patch-aa) = 2cd0a865cd2e31caf32516e6ec010de4a4fc0069
-SHA1 (patch-ab) = 8f2e40f76d3f74a1ef3a0465c43ff1f40359c25a
+SHA1 (patch-aa) = bdaeb7be2fbf2a1295f4840d52a2e0f5f1cc31bc
+SHA1 (patch-ab) = 5c471f6833812cb7473f763e2ce25c1c48436b0c
 SHA1 (patch-ac) = b68972da18b7c4d4720f365a51f1d70b8f9635ec
-SHA1 (patch-ad) = b9dff9aa7086224389d4fe4c0c1dd97c7ada4075
+SHA1 (patch-ad) = 3759e9a01e8697e4db4012c91acb6429b8ef0e1e
 SHA1 (patch-ae) = a90c30ef3890a2989ccf8ca6cd36ddb805da35eb
 SHA1 (patch-af) = 9133d16bff24a3837ecf21ddf28fa10025335a84
 SHA1 (patch-ag) = 2feed2790b4c501c2df6f96efdb84ca39faf0fb7
diff --git a/www/htmllint/patches/patch-aa b/www/htmllint/patches/patch-aa
index c8c3f560185..ba4aaf9c086 100644
--- a/www/htmllint/patches/patch-aa
+++ b/www/htmllint/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/14 05:13:04 kei Exp $
+$NetBSD: patch-aa,v 1.2 2001/03/18 14:05:12 kei Exp $
 
---- faq.html.orig	Wed Jan 24 10:05:06 2001
-+++ faq.html	Wed Jan 24 10:08:22 2001
-@@ -150,7 +150,7 @@
+--- faq.html.orig	Wed Mar 14 16:36:18 2001
++++ faq.html	Sun Mar 18 08:42:50 2001
+@@ -153,7 +153,7 @@
  <dl compact class="faq">
  <dt>Q<dd>$B%5!<%P$K(B <a href="http://ei5nazha.yz.yamagata-u.ac.jp/~aito/w3m/">w3m</a> $B$r%$%s%9%H!<%k$7$^$7$?$,(B Another HTML-lint $B$G7k2L$,I=<($5$l$^$;$s!#(B
  <dt>A<dd>$B%G%U%)%k%H$G!"(B-M$B%*%W%7%g%s$rIU$1$F(Bw3m$B$r8F$S=P$9$?$a!"%+%i!<5!G=$rL58z$K$7$F%3%s%Q%$%k$5$l$?(Bw3m$B$G$&$^$/F0:n$7$J$$$h$&$G$9!#%+%i!<5!G=$rM-8z$K$9$k$+!"(Bhtmllint.env $B$G(B
 -<pre class="pre-sample">    $W3M = '/usr/local/bin/w3m -dump -T text/html -e';</pre>
-+<pre class="pre-sample">    $W3M = '@PREFIX@/bin/w3m -dump -T text/html -e';</pre>
++<pre class="pre-sample">    $W3M = '@PREFIX@/bin/w3m -dump -T text/html -j';</pre>
  $B$J$I$H(B -M $B$N$J$$%*%W%7%g%s$r;XDj$7$F$/$@$5$$(B($B%*%W%7%g%s$N>\:Y$O(Bw3m$B$r;2>H$N$3$H(B)$B!#(B
  </dl>
  
diff --git a/www/htmllint/patches/patch-ab b/www/htmllint/patches/patch-ab
index f661e47c857..bedd1608328 100644
--- a/www/htmllint/patches/patch-ab
+++ b/www/htmllint/patches/patch-ab
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/14 05:13:04 kei Exp $
+$NetBSD: patch-ab,v 1.2 2001/03/18 14:05:12 kei Exp $
 
---- htmllint.cgi.orig	Wed Jan 24 10:05:18 2001
-+++ htmllint.cgi	Wed Jan 24 10:08:51 2001
+--- 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-ad b/www/htmllint/patches/patch-ad
index ceb40b47b11..921c30be580 100644
--- a/www/htmllint/patches/patch-ad
+++ b/www/htmllint/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/03/14 05:13:05 kei Exp $
+$NetBSD: patch-ad,v 1.2 2001/03/18 14:05:12 kei Exp $
 
---- htmllintenv.orig	Sat Jan 13 10:04:08 2001
-+++ htmllintenv	Wed Mar 14 13:03:36 2001
+--- htmllintenv.orig	Thu Feb  1 21:16:08 2001
++++ htmllintenv	Sun Mar 18 08:38:21 2001
 @@ -5,7 +5,7 @@
  #   アクセス権をうまく工夫して、他人から見えないようにしてください。
  
@@ -34,14 +34,15 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/03/14 05:13:05 kei Exp $
 +$KANJICODE = 'JIS';    # JIS/EUC/SJIS/UTF8 のいずれか
  
  # Lynx (不要あるいは未実装ならコメントアウト)
--#$LYNX = '/usr/local/bin/lynx -dump -nolist';
-+#$LYNX = '@PREFIX@/bin/lynx -dump -nolist';
+-#$LYNX = '/usr/local/bin/lynx -dump -nolist -force_html';
++#$LYNX = '@PREFIX@/lynx -dump -nolist -force_html';
  
  # w3m (不要あるいは未実装ならコメントアウト)
  #   カラー機能のない場合 -M の指定は不可
- #   -e は EUC、Shift JIS なら -s
+-#   -e は EUC、Shift JIS なら -s
 -#$W3M = '/usr/local/bin/w3m -dump -T text/html -M -e';
-+#$W3M = '@PREFIX@/bin/w3m -dump -T text/html -M -e';
++#   -j は JIS、-e は EUC、Shift JIS なら -s
++#$W3M = '@PREFIX@/w3m -dump -T text/html -M -j';
  
  # 得点記録用ログファイル (不要ならコメントアウト)
  #   # の部分は年月に置き換わります
diff --git a/www/htmllint/pkg/PLIST b/www/htmllint/pkg/PLIST
index 597ecdda9eb..a2cd631e227 100644
--- a/www/htmllint/pkg/PLIST
+++ b/www/htmllint/pkg/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/03/14 05:13:04 kei Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/03/18 14:05:12 kei Exp $
 bin/htmllint
 libexec/cgi-bin/htmllint.cgi
-libexec/cgi-bin/htmllint.env
+libexec/cgi-bin/htmllint.env.default
+@exec [ -f %D/htmllint.env ] || cp %D/htmllint.env.default %D/htmllint.env
 libexec/cgi-bin/htmllintrc
 libexec/cgi-bin/tagslist.cgi
 share/httpd/htdocs/htmllint/15445.dtd
@@ -77,6 +78,8 @@ share/httpd/htdocs/htmllint/imode.dtd
 share/httpd/htdocs/htmllint/imode.rul
 share/httpd/htdocs/htmllint/imode20.dtd
 share/httpd/htdocs/htmllint/imode20.rul
+share/httpd/htdocs/htmllint/imode30.dtd
+share/httpd/htdocs/htmllint/imode30.rul
 share/httpd/htdocs/htmllint/index.html
 share/httpd/htdocs/htmllint/introduction.html
 share/httpd/htdocs/htmllint/jpo.dtd