3 files changed, 42 insertions, 24 deletions

diff --git a/www/validator/Makefile b/www/validator/Makefile
index cb862fe6c766..7993a03b47fe 100644
--- a/www/validator/Makefile
+++ b/www/validator/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	validator
 PORTVERSION=	0.8.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://validator.w3.org/dist/ \
 		http://www.cyberbotx.com/w3c-validator/
@@ -64,27 +65,29 @@ do-install:
 	${MKDIR} ${PREFIX}/www/validator/htdocs/misc
 	${MKDIR} ${PREFIX}/www/validator/htdocs/scripts
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib
+	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/CR-xhtml-basic-20070713
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/IETF
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/ISO-HTML
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html32-19970114
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html40-19980424
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html401-19991224
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-MathML2-20031021
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-MathML2-20031021/html
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-MathML2-20031021/iso8879
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-MathML2-20031021/iso9573-13
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-MathML2-20031021/mathml
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-smil-19980615
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SMIL2-20051213
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-smil20-20050107
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SVG-20010904
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SVG11-20030114
+	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html32-19970114
+	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html40-19980424
+	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html401-19991224
+	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-smil-19980615
+	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-smil20-20050107
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-basic-20001219
+	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-basic-20080729
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-print-20060920
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml1-20020801
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml11-20010531
-	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/WD-xhtml-basic-20060705
 	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/WD-XHTMLplusMathMLplusSVG-20020809
+	${MKDIR} ${PREFIX}/www/validator/htdocs/sgml-lib/WD-xhtml-basic-20060705
 	${MKDIR} ${PREFIX}/www/validator/htdocs/source
 	${MKDIR} ${PREFIX}/www/validator/htdocs/style
 	${MKDIR} ${PREFIX}/www/validator/httpd
@@ -92,38 +95,40 @@ do-install:
 	${MKDIR} ${PREFIX}/www/validator/share
 	${MKDIR} ${PREFIX}/www/validator/share/templates
 	${MKDIR} ${PREFIX}/www/validator/share/templates/en_US
-	${INSTALL_DATA} `find ${WRKSRC}/htdocs -type f -depth 1` ${PREFIX}/www/validator/htdocs
+	${INSTALL_DATA} `${FIND} ${WRKSRC}/htdocs -type f -depth 1` ${PREFIX}/www/validator/htdocs
 	${INSTALL_DATA} ${WRKSRC}/htdocs/config/* ${PREFIX}/www/validator/htdocs/config
 	${INSTALL_DATA} ${WRKSRC}/htdocs/dev/autotest/* ${PREFIX}/www/validator/htdocs/dev/autotest
 	${INSTALL_DATA} ${WRKSRC}/htdocs/dev/tests/* ${PREFIX}/www/validator/htdocs/dev/tests
 	${INSTALL_DATA} ${WRKSRC}/htdocs/docs/* ${PREFIX}/www/validator/htdocs/docs
-	${INSTALL_DATA} `find ${WRKSRC}/htdocs/images -type f -depth 1` ${PREFIX}/www/validator/htdocs/images
+	${INSTALL_DATA} `${FIND} ${WRKSRC}/htdocs/images -type f -depth 1` ${PREFIX}/www/validator/htdocs/images
 	${INSTALL_DATA} ${WRKSRC}/htdocs/images/info_icons/* ${PREFIX}/www/validator/htdocs/images/info_icons
 	${INSTALL_DATA} ${WRKSRC}/htdocs/images/valid_icons/* ${PREFIX}/www/validator/htdocs/images/valid_icons
 	${INSTALL_DATA} ${WRKSRC}/htdocs/misc/* ${PREFIX}/www/validator/htdocs/misc
-	${INSTALL_DATA} `find ${WRKSRC}/htdocs/scripts -type f -depth 1` ${PREFIX}/www/validator/htdocs/scripts
-	${INSTALL_DATA} `find ${WRKSRC}/htdocs/sgml-lib -type f -depth 1` ${PREFIX}/www/validator/htdocs/sgml-lib
+	${INSTALL_DATA} `${FIND} ${WRKSRC}/htdocs/scripts -type f -depth 1` ${PREFIX}/www/validator/htdocs/scripts
+	${INSTALL_DATA} `${FIND} ${WRKSRC}/htdocs/sgml-lib -type f -depth 1` ${PREFIX}/www/validator/htdocs/sgml-lib
+	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/CR-xhtml-basic-20070713/* ${PREFIX}/www/validator/htdocs/sgml-lib/CR-xhtml-basic-20070713
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/IETF/* ${PREFIX}/www/validator/htdocs/sgml-lib/IETF
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/ISO-HTML/* ${PREFIX}/www/validator/htdocs/sgml-lib/ISO-HTML
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-html32-19970114/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html32-19970114
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-html40-19980424/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html40-19980424
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-html401-19991224/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html401-19991224
-	${INSTALL_DATA} `find ${WRKSRC}/htdocs/sgml-lib/REC-MathML2-20031021 -type f -depth 1` ${PREFIX}/www/validator/htdocs/sgml-lib/REC-MathML2-20031021
+	${INSTALL_DATA} `${FIND} ${WRKSRC}/htdocs/sgml-lib/REC-MathML2-20031021 -type f -depth 1` ${PREFIX}/www/validator/htdocs/sgml-lib/REC-MathML2-20031021
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-MathML2-20031021/html/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-MathML2-20031021/html
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-MathML2-20031021/iso8879/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-MathML2-20031021/iso8879
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-MathML2-20031021/iso9573-13/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-MathML2-20031021/iso9573-13
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-MathML2-20031021/mathml/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-MathML2-20031021/mathml
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-smil-19980615/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-smil-19980615
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-SMIL2-20051213/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SMIL2-20051213
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-smil20-20050107/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-smil20-20050107
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-SVG-20010904/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SVG-20010904
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-SVG11-20030114/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-SVG11-20030114
+	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-html32-19970114/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html32-19970114
+	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-html40-19980424/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html40-19980424
+	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-html401-19991224/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-html401-19991224
+	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-smil-19980615/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-smil-19980615
+	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-smil20-20050107/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-smil20-20050107
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-xhtml-basic-20001219/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-basic-20001219
+	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-xhtml-basic-20080729/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-basic-20080729
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-xhtml-print-20060920/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml-print-20060920
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-xhtml1-20020801/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml1-20020801
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/REC-xhtml11-20010531/* ${PREFIX}/www/validator/htdocs/sgml-lib/REC-xhtml11-20010531
-	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/WD-xhtml-basic-20060705/* ${PREFIX}/www/validator/htdocs/sgml-lib/WD-xhtml-basic-20060705
 	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/WD-XHTMLplusMathMLplusSVG-20020809/* ${PREFIX}/www/validator/htdocs/sgml-lib/WD-XHTMLplusMathMLplusSVG-20020809
+	${INSTALL_DATA} ${WRKSRC}/htdocs/sgml-lib/WD-xhtml-basic-20060705/* ${PREFIX}/www/validator/htdocs/sgml-lib/WD-xhtml-basic-20060705
 	${INSTALL_DATA} ${WRKSRC}/htdocs/source/* ${PREFIX}/www/validator/htdocs/source
 	${INSTALL_DATA} ${WRKSRC}/htdocs/style/* ${PREFIX}/www/validator/htdocs/style
 	${INSTALL_SCRIPT} ${WRKSRC}/httpd/cgi-bin/* ${PREFIX}/www/validator/httpd/cgi-bin
diff --git a/www/validator/distinfo b/www/validator/distinfo
index c8ccf7c2e3ee..cb58be57297f 100644
--- a/www/validator/distinfo
+++ b/www/validator/distinfo
@@ -1,6 +1,6 @@
-MD5 (validator-0_8_3.tar.gz) = 91bb8878764689b1bcc4c2555242a2e2
-SHA256 (validator-0_8_3.tar.gz) = b989db5e126130d3958b5d067b14cd52662055819ffcff4292f28078d1f1608d
-SIZE (validator-0_8_3.tar.gz) = 682557
-MD5 (sgml-lib-0_8_3.tar.gz) = c41aff21db08c7b0258ed9d512f98ff3
-SHA256 (sgml-lib-0_8_3.tar.gz) = 7ab1aefae2de59c8229ea148b8ebe341028daa872ddb66e122a7a72468ee2db8
-SIZE (sgml-lib-0_8_3.tar.gz) = 625153
+MD5 (validator-0_8_3.tar.gz) = f0597c09ecff7e3b5caff727538e5b8d
+SHA256 (validator-0_8_3.tar.gz) = 91e40d24c696cba7fcee03c541266d01e6e83bee2998f58061f57b988e14ec14
+SIZE (validator-0_8_3.tar.gz) = 682559
+MD5 (sgml-lib-0_8_3.tar.gz) = a3877dd86783318475cc2d94e1fc818b
+SHA256 (sgml-lib-0_8_3.tar.gz) = 8f68123ab17924ff9f087e49e9705b4f1a4287174c78124f6bf2fbe6b81df936
+SIZE (sgml-lib-0_8_3.tar.gz) = 625129
diff --git a/www/validator/pkg-plist b/www/validator/pkg-plist
index b00d53e8226a..1d8a7935e329 100644
--- a/www/validator/pkg-plist
+++ b/www/validator/pkg-plist
@@ -53,9 +53,9 @@ www/validator/htdocs/dev/tests/bogus-fpi4.html
 www/validator/htdocs/dev/tests/bogus-fpi5.xhtml
 www/validator/htdocs/dev/tests/bogus-xmlpi.html
 www/validator/htdocs/dev/tests/bogus-xmlpi.xhtml
+www/validator/htdocs/dev/tests/charset-xmldecl.xhtml
 www/validator/htdocs/dev/tests/charset_mismatch-http_meta.html.utf8
 www/validator/htdocs/dev/tests/charset_mismatch-http_xmldec.xhtml.utf8
-www/validator/htdocs/dev/tests/charset-xmldecl.xhtml
 www/validator/htdocs/dev/tests/colons.html
 www/validator/htdocs/dev/tests/error_pls_warning.html
 www/validator/htdocs/dev/tests/errors_sorting.smi
@@ -335,6 +335,9 @@ www/validator/htdocs/results.css
 www/validator/htdocs/robots.txt
 www/validator/htdocs/scripts/mootools.js
 www/validator/htdocs/scripts/w3c-validator.js
+www/validator/htdocs/sgml-lib/CR-xhtml-basic-20070713/xhtml-basic11.dtd
+www/validator/htdocs/sgml-lib/CR-xhtml-basic-20070713/xhtml11-model-1.mod
+www/validator/htdocs/sgml-lib/CR-xhtml-basic-20070713/xhtml11.dtd
 www/validator/htdocs/sgml-lib/IETF/HTML-2_0-Level_1.dtd
 www/validator/htdocs/sgml-lib/IETF/HTML-2_0-Strict-Level_1.dtd
 www/validator/htdocs/sgml-lib/IETF/HTML-2_0-Strict.dtd
@@ -521,6 +524,14 @@ www/validator/htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-special.ent
 www/validator/htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-struct-1.mod
 www/validator/htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-symbol.ent
 www/validator/htdocs/sgml-lib/REC-xhtml-basic-20001219/xhtml-text-1.mod
+www/validator/htdocs/sgml-lib/REC-xhtml-basic-20080729/xhtml-basic10-f.dtd
+www/validator/htdocs/sgml-lib/REC-xhtml-basic-20080729/xhtml-basic10-model-1.mod
+www/validator/htdocs/sgml-lib/REC-xhtml-basic-20080729/xhtml-basic10.cat
+www/validator/htdocs/sgml-lib/REC-xhtml-basic-20080729/xhtml-basic10.dtd
+www/validator/htdocs/sgml-lib/REC-xhtml-basic-20080729/xhtml-basic11-model-1.mod
+www/validator/htdocs/sgml-lib/REC-xhtml-basic-20080729/xhtml-basic11.cat
+www/validator/htdocs/sgml-lib/REC-xhtml-basic-20080729/xhtml-basic11.dtd
+www/validator/htdocs/sgml-lib/REC-xhtml-basic-20080729/xhtml-inputmode-1.mod
 www/validator/htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-blkpres-1.mod
 www/validator/htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-inlpres-1.mod
 www/validator/htdocs/sgml-lib/REC-xhtml-print-20060920/xhtml-inlstyle-1.mod
@@ -619,6 +630,7 @@ www/validator/share/templates/en_US/xml_output.tmpl
 @dirrm www/validator/htdocs/sgml-lib/REC-xhtml11-20010531
 @dirrm www/validator/htdocs/sgml-lib/REC-xhtml1-20020801
 @dirrm www/validator/htdocs/sgml-lib/REC-xhtml-print-20060920
+@dirrm www/validator/htdocs/sgml-lib/REC-xhtml-basic-20080729
 @dirrm www/validator/htdocs/sgml-lib/REC-xhtml-basic-20001219
 @dirrm www/validator/htdocs/sgml-lib/REC-smil20-20050107
 @dirrm www/validator/htdocs/sgml-lib/REC-smil-19980615
@@ -635,6 +647,7 @@ www/validator/share/templates/en_US/xml_output.tmpl
 @dirrm www/validator/htdocs/sgml-lib/REC-MathML2-20031021
 @dirrm www/validator/htdocs/sgml-lib/ISO-HTML
 @dirrm www/validator/htdocs/sgml-lib/IETF
+@dirrm www/validator/htdocs/sgml-lib/CR-xhtml-basic-20070713
 @dirrm www/validator/htdocs/sgml-lib
 @dirrm www/validator/htdocs/scripts
 @dirrm www/validator/htdocs/misc