>Number:         20538
>Category:       pkg
>Synopsis:       www/htmllint update and fix htmllint command not run.
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Mar 01 10:38:00 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     ISIHARA Takanori
>Release:        NetBSD/i386 1.6.1_RC2
>Organization:
Nagoya *BSD Users' Group :-)
>Environment:
NetBSD ishitPc3.home 1.6.1_RC2 NetBSD 1.6.1_RC2 (ISHITPC3) #0: Fri Feb 21 15:35:57 JST 2003     root@ishitPc3.home:/usr/src/sys/arch/i386/compile/ISHITPC3 i386

>Description:
www/htmllint pkg update and fix @PREFIX@/bin/htmllint not run.

>How-To-Repeat:
cd /usr/pkgsrc/www/htmllint
sudo make NO_CHECKSUM=yes
sudo make install
rehash
% htmllint index.html
Can't locate htmllint.pm in @INC (@INC contains: /usr/pkg/lib/perl5/site_perl/5.6.1/i386-netbsd /usr/pkg/lib/perl5/site_perl/5.6.1 /usr/pkg/lib/perl5/site_perl /usr/pkg/lib/perl5/5.6.1/i386-netbsd /usr/pkg/lib/perl5/5.6.1 . /usr/pkg/bin/) at /usr/pkg/bin/htmllint line 15.

>Fix:

diff -uNr htmllint/Makefile htmllint.new/Makefile
--- htmllint/Makefile	Tue Feb  4 01:00:02 2003
+++ htmllint.new/Makefile	Sun Mar  2 03:09:53 2003
@@ -2,7 +2,7 @@
 #
 
 DISTNAME=	htmllint
-PKGNAME=	htmllint-20030203
+PKGNAME=	htmllint-20030225
 CATEGORIES=	www japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/k16/htmllint/archives/
 EXTRACT_SUFX=	.zip
@@ -25,7 +25,7 @@
 IMGDIR=		${HTMLDIR}/images
 
 post-patch:
-.for f in faq.html htmllintenv
+.for f in faq.html htmllintenv htmllint
 	@${MV} ${WRKSRC}/${f} ${WRKSRC}/${f}.orig; 			\
 	${SED} -e 's!@PREFIX@!${PREFIX}!g' < ${WRKSRC}/${f}.orig 	\
 		> ${WRKSRC}/${f}
diff -uNr htmllint/PLIST htmllint.new/PLIST
--- htmllint/PLIST	Sat Nov 23 01:10:10 2002
+++ htmllint.new/PLIST	Sun Mar  2 02:45:24 2003
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/11/22 16:10:10 jschauma Exp $
+@comment $NetBSD$
 bin/htmllint
 libexec/cgi-bin/htmllint.cgi
 libexec/cgi-bin/htmllint.env
@@ -76,6 +76,8 @@
 share/httpd/htdocs/htmllint/images/open.gif
 share/httpd/htdocs/htmllint/images/top.gif
 share/httpd/htdocs/htmllint/images/verygood.gif
+share/httpd/htdocs/htmllint/imode-xhtml.dtd
+share/httpd/htdocs/htmllint/imode-xhtml.rul
 share/httpd/htdocs/htmllint/imode.dtd
 share/httpd/htdocs/htmllint/imode.rul
 share/httpd/htdocs/htmllint/imode20.dtd
diff -uNr htmllint/distinfo htmllint.new/distinfo
--- htmllint/distinfo	Tue Feb  4 01:00:02 2003
+++ htmllint.new/distinfo	Sun Mar  2 03:12:20 2003
@@ -1,10 +1,11 @@
 $NetBSD: distinfo,v 1.5 2003/02/03 16:00:02 jschauma Exp $
 
-SHA1 (htmllint-20030203/htmllint.zip) = 0a72295e4ed49160bd4a575af6d9a6ae1ef4a648
-Size (htmllint-20030203/htmllint.zip) = 668912 bytes
+SHA1 (htmllint-20030225/htmllint.zip) = cdd5f35b0cf31e758e92ebe88c0ed50a1fa02414
+Size (htmllint-20030225/htmllint.zip) = 677549 bytes
 SHA1 (patch-aa) = bdaeb7be2fbf2a1295f4840d52a2e0f5f1cc31bc
 SHA1 (patch-ad) = 3759e9a01e8697e4db4012c91acb6429b8ef0e1e
 SHA1 (patch-ag) = 2feed2790b4c501c2df6f96efdb84ca39faf0fb7
 SHA1 (patch-ah) = 26ba26f155a05d8bd0e7bfa1d494a246e1bf2ab8
 SHA1 (patch-ai) = 27068dafb150f20e30898ec546d07af54e487fce
 SHA1 (patch-aj) = cb95bd5bbce00979ea29574f55e001c8df32436f
+SHA1 (patch-ak) = af542b90c1992e9fbf57d1b09a0fc1c0fafbcc25
diff -uNr htmllint/patches/patch-ak htmllint.new/patches/patch-ak
--- htmllint/patches/patch-ak	Thu Jan  1 09:00:00 1970
+++ htmllint.new/patches/patch-ak	Sun Mar  2 03:12:01 2003
@@ -0,0 +1,16 @@
+$NetBSD$
+
+--- htmllint.orig	Sun Mar  2 02:51:02 2003
++++ htmllint
+@@ -2,8 +2,9 @@
+ 
+ # Another HTML-lint ###########################################
+ 
+-use File::Basename;
+-push @INC => [&fileparse($0)]->[1];
++#use File::Basename;
++#push @INC => [&fileparse($0)]->[1];
++use lib ('@PREFIX@/share/httpd/htdocs/htmllint');
+ 
+ my $add_options; # = '-noscore -pedantic etc...';
+ 

>Release-Note:
>Audit-Trail:
>Unformatted: