Update to 1.1.2.

Changes:
Fixed a bug that caused the wrong character encoding to be used
when checking multiple documents with different character encodings
Added support for proxies when validating remote documents
Added support for validation of URIs.  Thanks to Ville Skyttä for
the patch.
Updated DTDs XHTML 1.0 Second Edition and added support for XHTML
1.1, MathML2 2.0, WML 1.3, 1.2, 1.1, and 1.0.

4 files changed, 132 insertions, 95 deletions

diff --git a/www/wdg-validate/Makefile b/www/wdg-validate/Makefile
index 5486438db26..db770c62d39 100644
--- a/www/wdg-validate/Makefile
+++ b/www/wdg-validate/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2002/08/25 21:52:24 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/01/19 00:41:07 wiz Exp $
 #
 
 DISTNAME=	validate
-PKGNAME=	wdg-validate-1.0.4
+PKGNAME=	wdg-validate-1.1.2
+WRKSRC=		${WRKDIR}
 CATEGORIES=	www
 MASTER_SITES=	http://www.htmlhelp.com/tools/validator/offline/
-DISTFILES=	validate sgml-lib-1.0.tar.gz README
+DISTFILES=	validate wdg-sgml-lib-1.1.1.tar.gz README
 
 MAINTAINER=	norm@sandbox.org.uk
 HOMEPAGE=	http://www.htmlhelp.com/tools/validator/offline/
@@ -13,26 +14,26 @@ COMMENT=	HTML validator from the Web Design Group
 
 DEPENDS+=	lq-sp>=1.3.4.5:../../textproc/lq-sp
 
-DIST_SUBDIR=	${PKGNAME}
-EXTRACT_ONLY=	sgml-lib-1.0.tar.gz
+DIST_SUBDIR=	${PKGNAME_NOREV}
+EXTRACT_ONLY=	wdg-sgml-lib-1.1.1.tar.gz
+SITES_wdg-sgml-lib-1.1.1.tar.gz=	http://www.htmlhelp.com/tools/validator/src/
 
 USE_BUILDLINK2=	YES
 REPLACE_PERL=	validate.netbsd
-NO_BUILD=	YES
 
 post-extract:
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/validate ${WRKSRC}/validate.netbsd
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/README ${WRKSRC}/README
 
-do-configure:
+do-build:
 	${SED}	-e "s|@PREFIX@|${PREFIX}|g" \
 		${WRKSRC}/validate.netbsd > ${WRKSRC}/validate
 
 do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/lib/validate
+	${INSTALL_DATA_DIR} ${PREFIX}/share/wdg/sgml-lib
 	${INSTALL_SCRIPT} ${WRKSRC}/validate ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/validate.README
-	${CP} -R ${WRKSRC}/lib/* ${PREFIX}/lib/validate
+	cd ${WRKSRC}/wdg/sgml-lib && ${PAX} -rw * ${PREFIX}/share/wdg/sgml-lib/
 
 .include "../../lang/perl5/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/wdg-validate/PLIST b/www/wdg-validate/PLIST
index 43048124e2f..687fea3172d 100644
--- a/www/wdg-validate/PLIST
+++ b/www/wdg-validate/PLIST
@@ -1,74 +1,110 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:19:03 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/19 00:41:08 wiz Exp $
 bin/validate
-lib/validate/15445.dcl
-lib/validate/15445.dtd
-lib/validate/HTML3-icons.ent
-lib/validate/HTML3-math.ent
-lib/validate/HTML3.dcl
-lib/validate/HTML3.dtd
-lib/validate/HTML32.dcl
-lib/validate/HTML32.dtd
-lib/validate/HTML4-frameset.dtd
-lib/validate/HTML4-loose.dtd
-lib/validate/HTML4-strict.dtd
-lib/validate/HTML4.dcl
-lib/validate/HTML401-frameset.dtd
-lib/validate/HTML401-loose.dtd
-lib/validate/HTML401-strict.dtd
-lib/validate/HTMLlat1.ent
-lib/validate/HTMLspecial.ent
-lib/validate/HTMLsymbol.ent
-lib/validate/ISOlat1.ent
-lib/validate/catalog
-lib/validate/custom.dcl
-lib/validate/html-1.dtd
-lib/validate/html-1s.dtd
-lib/validate/html-970421.decl
-lib/validate/html-970421.dtd
-lib/validate/html-s.dtd
-lib/validate/html.dcl
-lib/validate/html.dtd
-lib/validate/i18n.dcl
-lib/validate/i18n.dtd
-lib/validate/xhtml-basic10/xhtml-arch-1.mod
-lib/validate/xhtml-basic10/xhtml-attribs-1.mod
-lib/validate/xhtml-basic10/xhtml-base-1.mod
-lib/validate/xhtml-basic10/xhtml-basic-form-1.mod
-lib/validate/xhtml-basic10/xhtml-basic-table-1.mod
-lib/validate/xhtml-basic10/xhtml-basic10-f.dtd
-lib/validate/xhtml-basic10/xhtml-basic10-model-1.mod
-lib/validate/xhtml-basic10/xhtml-basic10.dtd
-lib/validate/xhtml-basic10/xhtml-blkphras-1.mod
-lib/validate/xhtml-basic10/xhtml-blkstruct-1.mod
-lib/validate/xhtml-basic10/xhtml-charent-1.mod
-lib/validate/xhtml-basic10/xhtml-datatypes-1.mod
-lib/validate/xhtml-basic10/xhtml-framework-1.mod
-lib/validate/xhtml-basic10/xhtml-hypertext-1.mod
-lib/validate/xhtml-basic10/xhtml-image-1.mod
-lib/validate/xhtml-basic10/xhtml-inlphras-1.mod
-lib/validate/xhtml-basic10/xhtml-inlstruct-1.mod
-lib/validate/xhtml-basic10/xhtml-lat1.ent
-lib/validate/xhtml-basic10/xhtml-link-1.mod
-lib/validate/xhtml-basic10/xhtml-list-1.mod
-lib/validate/xhtml-basic10/xhtml-meta-1.mod
-lib/validate/xhtml-basic10/xhtml-notations-1.mod
-lib/validate/xhtml-basic10/xhtml-object-1.mod
-lib/validate/xhtml-basic10/xhtml-param-1.mod
-lib/validate/xhtml-basic10/xhtml-qname-1.mod
-lib/validate/xhtml-basic10/xhtml-special.ent
-lib/validate/xhtml-basic10/xhtml-struct-1.mod
-lib/validate/xhtml-basic10/xhtml-symbol.ent
-lib/validate/xhtml-basic10/xhtml-text-1.mod
-lib/validate/xhtml-basic10/xml1.dcl
-lib/validate/xhtml.soc
-lib/validate/xhtml1/xhtml-lat1.ent
-lib/validate/xhtml1/xhtml-special.ent
-lib/validate/xhtml1/xhtml-symbol.ent
-lib/validate/xhtml1/xhtml1-frameset.dtd
-lib/validate/xhtml1/xhtml1-strict.dtd
-lib/validate/xhtml1/xhtml1-transitional.dtd
-lib/validate/xhtml1/xhtml1.dcl
 share/doc/validate.README
-@dirrm lib/validate/xhtml1
-@dirrm lib/validate/xhtml-basic10
-@dirrm lib/validate
+share/wdg/sgml-lib/15445.dcl
+share/wdg/sgml-lib/15445.dtd
+share/wdg/sgml-lib/HTML3-icons.ent
+share/wdg/sgml-lib/HTML3-math.ent
+share/wdg/sgml-lib/HTML3.dcl
+share/wdg/sgml-lib/HTML3.dtd
+share/wdg/sgml-lib/HTML32.dcl
+share/wdg/sgml-lib/HTML32.dtd
+share/wdg/sgml-lib/HTML4-frameset.dtd
+share/wdg/sgml-lib/HTML4-loose.dtd
+share/wdg/sgml-lib/HTML4-strict.dtd
+share/wdg/sgml-lib/HTML4.dcl
+share/wdg/sgml-lib/HTML401-frameset.dtd
+share/wdg/sgml-lib/HTML401-loose.dtd
+share/wdg/sgml-lib/HTML401-strict.dtd
+share/wdg/sgml-lib/HTMLlat1.ent
+share/wdg/sgml-lib/HTMLspecial.ent
+share/wdg/sgml-lib/HTMLsymbol.ent
+share/wdg/sgml-lib/ISOlat1.ent
+share/wdg/sgml-lib/catalog
+share/wdg/sgml-lib/custom.dcl
+share/wdg/sgml-lib/html-1.dtd
+share/wdg/sgml-lib/html-1s.dtd
+share/wdg/sgml-lib/html-970421.decl
+share/wdg/sgml-lib/html-970421.dtd
+share/wdg/sgml-lib/html-s.dtd
+share/wdg/sgml-lib/html.dcl
+share/wdg/sgml-lib/html.dtd
+share/wdg/sgml-lib/i18n.dcl
+share/wdg/sgml-lib/i18n.dtd
+share/wdg/sgml-lib/mathml2/isoamsa.ent
+share/wdg/sgml-lib/mathml2/isoamsb.ent
+share/wdg/sgml-lib/mathml2/isoamsc.ent
+share/wdg/sgml-lib/mathml2/isoamsn.ent
+share/wdg/sgml-lib/mathml2/isoamso.ent
+share/wdg/sgml-lib/mathml2/isoamsr.ent
+share/wdg/sgml-lib/mathml2/isobox.ent
+share/wdg/sgml-lib/mathml2/isocyr1.ent
+share/wdg/sgml-lib/mathml2/isocyr2.ent
+share/wdg/sgml-lib/mathml2/isodia.ent
+share/wdg/sgml-lib/mathml2/isogrk3.ent
+share/wdg/sgml-lib/mathml2/isolat1.ent
+share/wdg/sgml-lib/mathml2/isolat2.ent
+share/wdg/sgml-lib/mathml2/isomfrk.ent
+share/wdg/sgml-lib/mathml2/isomopf.ent
+share/wdg/sgml-lib/mathml2/isomscr.ent
+share/wdg/sgml-lib/mathml2/isonum.ent
+share/wdg/sgml-lib/mathml2/isopub.ent
+share/wdg/sgml-lib/mathml2/isotech.ent
+share/wdg/sgml-lib/mathml2/mathml2-qname-1.mod
+share/wdg/sgml-lib/mathml2/mathml2.dtd
+share/wdg/sgml-lib/mathml2/mmlalias.ent
+share/wdg/sgml-lib/mathml2/mmlextra.ent
+share/wdg/sgml-lib/mathml2/xhtml-math11-f.dtd
+share/wdg/sgml-lib/wml.xml
+share/wdg/sgml-lib/wml12.dtd
+share/wdg/sgml-lib/wml13.dtd
+share/wdg/sgml-lib/wml_1.1.xml
+share/wdg/sgml-lib/xhtml-basic10/xhtml-arch-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-attribs-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-base-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-basic-form-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-basic-table-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-basic10-f.dtd
+share/wdg/sgml-lib/xhtml-basic10/xhtml-basic10-model-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-basic10.dtd
+share/wdg/sgml-lib/xhtml-basic10/xhtml-blkphras-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-blkstruct-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-charent-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-datatypes-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-framework-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-hypertext-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-image-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-inlphras-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-inlstruct-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-lat1.ent
+share/wdg/sgml-lib/xhtml-basic10/xhtml-link-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-list-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-meta-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-notations-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-object-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-param-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-qname-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-special.ent
+share/wdg/sgml-lib/xhtml-basic10/xhtml-struct-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xhtml-symbol.ent
+share/wdg/sgml-lib/xhtml-basic10/xhtml-text-1.mod
+share/wdg/sgml-lib/xhtml-basic10/xml1.dcl
+share/wdg/sgml-lib/xhtml.soc
+share/wdg/sgml-lib/xhtml1/xhtml-lat1.ent
+share/wdg/sgml-lib/xhtml1/xhtml-special.ent
+share/wdg/sgml-lib/xhtml1/xhtml-symbol.ent
+share/wdg/sgml-lib/xhtml1/xhtml1-frameset.dtd
+share/wdg/sgml-lib/xhtml1/xhtml1-strict.dtd
+share/wdg/sgml-lib/xhtml1/xhtml1-transitional.dtd
+share/wdg/sgml-lib/xhtml1/xhtml1.dcl
+share/wdg/sgml-lib/xhtml11/xhtml11-flat.dtd
+share/wdg/sgml-lib/xhtml11/xhtml11-model-1.mod
+share/wdg/sgml-lib/xhtml11/xhtml11.dtd
+share/wdg/sgml-lib/xhtml11/xml1.dcl
+share/wdg/sgml-lib/xhtml11/xml1n.dcl
+@dirrm share/wdg/sgml-lib/xhtml11
+@dirrm share/wdg/sgml-lib/xhtml1
+@dirrm share/wdg/sgml-lib/xhtml-basic10
+@dirrm share/wdg/sgml-lib/mathml2
+@dirrm share/wdg/sgml-lib
+@dirrm share/wdg
diff --git a/www/wdg-validate/distinfo b/www/wdg-validate/distinfo
index b3441276d5a..735615b9051 100644
--- a/www/wdg-validate/distinfo
+++ b/www/wdg-validate/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2002/08/25 21:52:25 jlam Exp $
+$NetBSD: distinfo,v 1.7 2003/01/19 00:41:08 wiz Exp $
 
-SHA1 (wdg-validate-1.0.4/validate) = eb9ea352528fa5db2cbedc5ad4dbe59aa91d5e58
-Size (wdg-validate-1.0.4/validate) = 15210 bytes
-SHA1 (wdg-validate-1.0.4/sgml-lib-1.0.tar.gz) = 57bc51940b873b66af5c585e1c5d314512bd55eb
-Size (wdg-validate-1.0.4/sgml-lib-1.0.tar.gz) = 159465 bytes
-SHA1 (wdg-validate-1.0.4/README) = 0d287e7b41d4c5cb26d22fc22300b229c28ae66a
-Size (wdg-validate-1.0.4/README) = 2418 bytes
-SHA1 (patch-aa) = e9759bb7d3b949573a87687cc89ecdc3a8aabf61
+SHA1 (wdg-validate-1.1.2/validate) = bc22171066e3bc9528d060b962cde62f1bc58868
+Size (wdg-validate-1.1.2/validate) = 19231 bytes
+SHA1 (wdg-validate-1.1.2/wdg-sgml-lib-1.1.1.tar.gz) = 3a015ec34fae81d35c29b85f06e925dec14203c1
+Size (wdg-validate-1.1.2/wdg-sgml-lib-1.1.1.tar.gz) = 302636 bytes
+SHA1 (wdg-validate-1.1.2/README) = 433bc1e5311fb4972a97f0c46de7b910a1e96526
+Size (wdg-validate-1.1.2/README) = 2424 bytes
+SHA1 (patch-aa) = 8faf0396b73b782c0e33ef1aea940d4e40dc0be5
diff --git a/www/wdg-validate/patches/patch-aa b/www/wdg-validate/patches/patch-aa
index f3611674353..9bafdc1065a 100644
--- a/www/wdg-validate/patches/patch-aa
+++ b/www/wdg-validate/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.2 2001/11/28 23:59:29 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2003/01/19 00:41:10 wiz Exp $
 
---- validate.netbsd.orig        Wed May 30 00:53:44 2001
-+++ validate.netbsd     Wed May 30 00:56:20 2001
-@@ -39,10 +39,10 @@
+--- validate.netbsd.orig	Sat Jan 18 17:19:30 2003
++++ validate.netbsd
+@@ -43,10 +43,10 @@ my $usage = "Usage: validate [OPTION] [F
  my $tryHelp = qq{Try "validate --help" for more information.};
  
  # SGML directory (catalog, DTDs, SGML declarations)
--my $sgmlDir = '/usr/local/validate/lib';
-+my $sgmlDir = '@PREFIX@/lib/validate';
+-my $sgmlDir = '/usr/local/share/wdg/sgml-lib';
++my $sgmlDir = '@PREFIX@/share/wdg/sgml-lib';
  
  # Location of lq-nsgmls executable
 -my $nsgmlsLocation = '/usr/local/bin/lq-nsgmls';