Update to jing-20090818, 6 years of development.

3 files changed, 97 insertions, 61 deletions

diff --git a/textproc/jing/Makefile b/textproc/jing/Makefile
index 98b62e988cb..3e1a95a782b 100644
--- a/textproc/jing/Makefile
+++ b/textproc/jing/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2009/07/07 21:34:26 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2009/10/31 02:21:07 wiz Exp $
 #
 
-DISTNAME=		jing-20030619
+DISTNAME=		jing-20090818
 CATEGORIES=		textproc
-MASTER_SITES=		http://www.thaiopensource.com/download/
+MASTER_SITES=		http://jing-trang.googlecode.com/files/
 EXTRACT_SUFX=		.zip
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -21,12 +21,16 @@ do-build:
 	${ECHO} "#!/bin/sh" > ${WRKSRC}/jing
 	${ECHO} "${PKG_JAVA_HOME}/bin/java -jar ${PREFIX}/libexec/jing/jing.jar"' "$$@"' >> ${WRKSRC}/jing
 
-INSTALLATION_DIRS=	bin libexec/jing/lib share/doc/jing/doc
+INSTALLATION_DIRS=	bin libexec/jing/lib/xhtml/exclude \
+			libexec/jing/lib/xhtml/modules share/doc/jing/doc
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/jing ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/bin/* ${DESTDIR}${PREFIX}/libexec/jing
-	${INSTALL_DATA} ${WRKSRC}/lib/* ${DESTDIR}${PREFIX}/libexec/jing/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/*.* ${DESTDIR}${PREFIX}/libexec/jing/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/xhtml/*.* ${DESTDIR}${PREFIX}/libexec/jing/lib/xhtml
+	${INSTALL_DATA} ${WRKSRC}/lib/xhtml/exclude/*.* ${DESTDIR}${PREFIX}/libexec/jing/lib/xhtml/exclude
+	${INSTALL_DATA} ${WRKSRC}/lib/xhtml/modules/*.* ${DESTDIR}${PREFIX}/libexec/jing/lib/xhtml/modules
 	${INSTALL_DATA} ${WRKSRC}/readme.html ${DESTDIR}${PREFIX}/share/doc/jing
 	cd ${WRKSRC}/doc && pax -pp -rw * ${DESTDIR}${PREFIX}/share/doc/jing/doc
 
diff --git a/textproc/jing/PLIST b/textproc/jing/PLIST
index 601287e8e39..7ec42d7bca4 100644
--- a/textproc/jing/PLIST
+++ b/textproc/jing/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/09/26 22:44:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2009/10/31 02:21:07 wiz Exp $
 bin/jing
 libexec/jing/isorelax.jar
 libexec/jing/jing.jar
@@ -9,6 +9,45 @@ libexec/jing/lib/relaxCoreDatatypes.rng
 libexec/jing/lib/relaxng.rnc
 libexec/jing/lib/relaxng.rng
 libexec/jing/lib/schematron.rnc
+libexec/jing/lib/xhtml/exclude/basic-table.rng
+libexec/jing/lib/xhtml/exclude/basic.rng
+libexec/jing/lib/xhtml/exclude/form.rng
+libexec/jing/lib/xhtml/index.html
+libexec/jing/lib/xhtml/modules/applet.rng
+libexec/jing/lib/xhtml/modules/attribs.rng
+libexec/jing/lib/xhtml/modules/base.rng
+libexec/jing/lib/xhtml/modules/basic-form.rng
+libexec/jing/lib/xhtml/modules/basic-table.rng
+libexec/jing/lib/xhtml/modules/bdo.rng
+libexec/jing/lib/xhtml/modules/csismap.rng
+libexec/jing/lib/xhtml/modules/datatypes.rng
+libexec/jing/lib/xhtml/modules/edit.rng
+libexec/jing/lib/xhtml/modules/events.rng
+libexec/jing/lib/xhtml/modules/form.rng
+libexec/jing/lib/xhtml/modules/frames.rng
+libexec/jing/lib/xhtml/modules/hypertext.rng
+libexec/jing/lib/xhtml/modules/iframe.rng
+libexec/jing/lib/xhtml/modules/image.rng
+libexec/jing/lib/xhtml/modules/inlstyle.rng
+libexec/jing/lib/xhtml/modules/legacy.rng
+libexec/jing/lib/xhtml/modules/link.rng
+libexec/jing/lib/xhtml/modules/list.rng
+libexec/jing/lib/xhtml/modules/meta.rng
+libexec/jing/lib/xhtml/modules/nameident.rng
+libexec/jing/lib/xhtml/modules/object.rng
+libexec/jing/lib/xhtml/modules/param.rng
+libexec/jing/lib/xhtml/modules/pres.rng
+libexec/jing/lib/xhtml/modules/ruby.rng
+libexec/jing/lib/xhtml/modules/script.rng
+libexec/jing/lib/xhtml/modules/ssismap.rng
+libexec/jing/lib/xhtml/modules/struct.rng
+libexec/jing/lib/xhtml/modules/style.rng
+libexec/jing/lib/xhtml/modules/table.rng
+libexec/jing/lib/xhtml/modules/target.rng
+libexec/jing/lib/xhtml/modules/text.rng
+libexec/jing/lib/xhtml/xhtml-basic.rng
+libexec/jing/lib/xhtml/xhtml-strict.rng
+libexec/jing/lib/xhtml/xhtml.rng
 libexec/jing/lib/xslt.rng
 libexec/jing/saxon.jar
 libexec/jing/xercesImpl.jar
@@ -40,7 +79,7 @@ share/doc/jing/doc/api/datatype/overview-frame.html
 share/doc/jing/doc/api/datatype/overview-summary.html
 share/doc/jing/doc/api/datatype/overview-tree.html
 share/doc/jing/doc/api/datatype/package-list
-share/doc/jing/doc/api/datatype/packages.html
+share/doc/jing/doc/api/datatype/resources/inherit.gif
 share/doc/jing/doc/api/datatype/serialized-form.html
 share/doc/jing/doc/api/datatype/stylesheet.css
 share/doc/jing/doc/api/jing/allclasses-frame.html
@@ -53,16 +92,23 @@ share/doc/jing/doc/api/jing/com/thaiopensource/util/OptionParser.html
 share/doc/jing/doc/api/jing/com/thaiopensource/util/PropertyId.html
 share/doc/jing/doc/api/jing/com/thaiopensource/util/PropertyMap.html
 share/doc/jing/doc/api/jing/com/thaiopensource/util/PropertyMapBuilder.html
+share/doc/jing/doc/api/jing/com/thaiopensource/util/Ref.html
 share/doc/jing/doc/api/jing/com/thaiopensource/util/Service.html
 share/doc/jing/doc/api/jing/com/thaiopensource/util/SinglePropertyMap.html
 share/doc/jing/doc/api/jing/com/thaiopensource/util/Uri.html
+share/doc/jing/doc/api/jing/com/thaiopensource/util/UriEncoder.html
 share/doc/jing/doc/api/jing/com/thaiopensource/util/UriOrFile.html
 share/doc/jing/doc/api/jing/com/thaiopensource/util/Utf16.html
+share/doc/jing/doc/api/jing/com/thaiopensource/util/Utf8.html
 share/doc/jing/doc/api/jing/com/thaiopensource/util/Version.html
+share/doc/jing/doc/api/jing/com/thaiopensource/util/VoidValue.html
 share/doc/jing/doc/api/jing/com/thaiopensource/util/package-frame.html
 share/doc/jing/doc/api/jing/com/thaiopensource/util/package-summary.html
 share/doc/jing/doc/api/jing/com/thaiopensource/util/package-tree.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/AbstractSchema.html
+share/doc/jing/doc/api/jing/com/thaiopensource/validate/AbstractSchemaReader.html
+share/doc/jing/doc/api/jing/com/thaiopensource/validate/CombineSchema.html
+share/doc/jing/doc/api/jing/com/thaiopensource/validate/CombineValidator.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/Flag.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/FlagOption.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/FlagPropertyId.html
@@ -71,15 +117,13 @@ share/doc/jing/doc/api/jing/com/thaiopensource/validate/Option.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/OptionArgumentException.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/OptionArgumentFormatException.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/OptionArgumentPresenceException.html
+share/doc/jing/doc/api/jing/com/thaiopensource/validate/ResolverFactory.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/Schema.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/SchemaReader.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/SchemaReaderFactory.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/SchemaReaderLoader.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/StringOption.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/StringPropertyId.html
-share/doc/jing/doc/api/jing/com/thaiopensource/validate/ValidateProperty.EntityResolverPropertyId.html
-share/doc/jing/doc/api/jing/com/thaiopensource/validate/ValidateProperty.ErrorHandlerPropertyId.html
-share/doc/jing/doc/api/jing/com/thaiopensource/validate/ValidateProperty.XMLReaderCreatorPropertyId.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/ValidateProperty.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/ValidationDriver.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/Validator.html
@@ -88,18 +132,17 @@ share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/AutoSchemaReceiver.
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/ReparseException.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/Rewindable.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/RewindableInputStream.html
+share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/RewindableReader.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/SchemaFuture.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/SchemaReaderFactorySchemaReceiverFactory.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/SchemaReaderLoaderSchemaReceiverFactory.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/SchemaReaderSchemaReceiver.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/SchemaReceiver.html
-share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/SchemaReceiverFactory.SchemaReceiverFactoryPropertyId.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/SchemaReceiverFactory.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/SchemaReceiverLoader.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/package-frame.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/package-summary.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/auto/package-tree.html
-share/doc/jing/doc/api/jing/com/thaiopensource/validate/nrl/NrlProperty.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/nrl/NrlSchemaReceiverFactory.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/nrl/package-frame.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/nrl/package-summary.html
@@ -108,17 +151,15 @@ share/doc/jing/doc/api/jing/com/thaiopensource/validate/package-frame.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/package-summary.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/package-tree.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/rng/CompactSchemaReader.html
-share/doc/jing/doc/api/jing/com/thaiopensource/validate/rng/RngProperty.DatatypeLibraryFactoryPropertyId.html
-share/doc/jing/doc/api/jing/com/thaiopensource/validate/rng/RngProperty.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/rng/SAXSchemaReader.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/rng/SAXSchemaReceiverFactory.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/rng/package-frame.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/rng/package-summary.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/rng/package-tree.html
-share/doc/jing/doc/api/jing/com/thaiopensource/validate/schematron/SaxonSchemaReaderFactory.html
-share/doc/jing/doc/api/jing/com/thaiopensource/validate/schematron/SchematronProperty.PhaseOption.html
-share/doc/jing/doc/api/jing/com/thaiopensource/validate/schematron/SchematronProperty.html
+share/doc/jing/doc/api/jing/com/thaiopensource/validate/schematron/NewSaxonSchemaReaderFactory.html
+share/doc/jing/doc/api/jing/com/thaiopensource/validate/schematron/OldSaxonSchemaReaderFactory.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/schematron/SchematronSchemaReaderFactory.html
+share/doc/jing/doc/api/jing/com/thaiopensource/validate/schematron/TransformerFactoryInitializer.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/schematron/XalanSchemaReaderFactory.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/schematron/package-frame.html
 share/doc/jing/doc/api/jing/com/thaiopensource/validate/schematron/package-summary.html
@@ -150,10 +191,40 @@ share/doc/jing/doc/api/jing/overview-frame.html
 share/doc/jing/doc/api/jing/overview-summary.html
 share/doc/jing/doc/api/jing/overview-tree.html
 share/doc/jing/doc/api/jing/package-list
-share/doc/jing/doc/api/jing/packages.html
+share/doc/jing/doc/api/jing/resources/inherit.gif
 share/doc/jing/doc/api/jing/serialized-form.html
 share/doc/jing/doc/api/jing/stylesheet.css
+share/doc/jing/doc/api/regex/allclasses-frame.html
+share/doc/jing/doc/api/regex/allclasses-noframe.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/Regex.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/RegexEngine.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/RegexSyntaxException.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/java/RegexEngineImpl.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/java/Translator.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/java/package-frame.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/java/package-summary.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/java/package-tree.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/package-frame.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/package-summary.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/package-tree.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/xerces2/RegexEngineImpl.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/xerces2/package-frame.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/xerces2/package-summary.html
+share/doc/jing/doc/api/regex/com/thaiopensource/datatype/xsd/regex/xerces2/package-tree.html
+share/doc/jing/doc/api/regex/constant-values.html
+share/doc/jing/doc/api/regex/deprecated-list.html
+share/doc/jing/doc/api/regex/help-doc.html
+share/doc/jing/doc/api/regex/index-all.html
+share/doc/jing/doc/api/regex/index.html
+share/doc/jing/doc/api/regex/overview-frame.html
+share/doc/jing/doc/api/regex/overview-summary.html
+share/doc/jing/doc/api/regex/overview-tree.html
+share/doc/jing/doc/api/regex/package-list
+share/doc/jing/doc/api/regex/resources/inherit.gif
+share/doc/jing/doc/api/regex/serialized-form.html
+share/doc/jing/doc/api/regex/stylesheet.css
 share/doc/jing/doc/copying.html
+share/doc/jing/doc/isorelax.copying.txt
 share/doc/jing/doc/jing-ant.html
 share/doc/jing/doc/jing-datatypes.html
 share/doc/jing/doc/jing-other.html
@@ -161,43 +232,4 @@ share/doc/jing/doc/jing.html
 share/doc/jing/doc/nrl.html
 share/doc/jing/doc/pluggable-datatypes.html
 share/doc/jing/doc/xerces.copying.txt
-share/doc/jing/doc/xhtml/exclude/basic-table.rng
-share/doc/jing/doc/xhtml/exclude/basic.rng
-share/doc/jing/doc/xhtml/exclude/form.rng
-share/doc/jing/doc/xhtml/index.html
-share/doc/jing/doc/xhtml/modules/applet.rng
-share/doc/jing/doc/xhtml/modules/attribs.rng
-share/doc/jing/doc/xhtml/modules/base.rng
-share/doc/jing/doc/xhtml/modules/basic-form.rng
-share/doc/jing/doc/xhtml/modules/basic-table.rng
-share/doc/jing/doc/xhtml/modules/bdo.rng
-share/doc/jing/doc/xhtml/modules/csismap.rng
-share/doc/jing/doc/xhtml/modules/datatypes.rng
-share/doc/jing/doc/xhtml/modules/edit.rng
-share/doc/jing/doc/xhtml/modules/events.rng
-share/doc/jing/doc/xhtml/modules/form.rng
-share/doc/jing/doc/xhtml/modules/frames.rng
-share/doc/jing/doc/xhtml/modules/hypertext.rng
-share/doc/jing/doc/xhtml/modules/iframe.rng
-share/doc/jing/doc/xhtml/modules/image.rng
-share/doc/jing/doc/xhtml/modules/inlstyle.rng
-share/doc/jing/doc/xhtml/modules/legacy.rng
-share/doc/jing/doc/xhtml/modules/link.rng
-share/doc/jing/doc/xhtml/modules/list.rng
-share/doc/jing/doc/xhtml/modules/meta.rng
-share/doc/jing/doc/xhtml/modules/nameident.rng
-share/doc/jing/doc/xhtml/modules/object.rng
-share/doc/jing/doc/xhtml/modules/param.rng
-share/doc/jing/doc/xhtml/modules/pres.rng
-share/doc/jing/doc/xhtml/modules/ruby.rng
-share/doc/jing/doc/xhtml/modules/script.rng
-share/doc/jing/doc/xhtml/modules/ssismap.rng
-share/doc/jing/doc/xhtml/modules/struct.rng
-share/doc/jing/doc/xhtml/modules/style.rng
-share/doc/jing/doc/xhtml/modules/table.rng
-share/doc/jing/doc/xhtml/modules/target.rng
-share/doc/jing/doc/xhtml/modules/text.rng
-share/doc/jing/doc/xhtml/xhtml-basic.rng
-share/doc/jing/doc/xhtml/xhtml-strict.rng
-share/doc/jing/doc/xhtml/xhtml.rng
 share/doc/jing/readme.html
diff --git a/textproc/jing/distinfo b/textproc/jing/distinfo
index 393aa6f1421..2116a5ad711 100644
--- a/textproc/jing/distinfo
+++ b/textproc/jing/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/08/06 17:37:21 wiz Exp $
+$NetBSD: distinfo,v 1.2 2009/10/31 02:21:07 wiz Exp $
 
-SHA1 (jing-20030619.zip) = 10c2b8c651c639389642b712497597664d95f2cb
-RMD160 (jing-20030619.zip) = 53ae68b42bee829f3e6da910c5a96e9910cfa430
-Size (jing-20030619.zip) = 2523368 bytes
+SHA1 (jing-20090818.zip) = d887cf0e98c2015d25af1e69e8f34110f2985bc7
+RMD160 (jing-20090818.zip) = ebd2ba68edfacd127e7682287e2c5d3a100e36eb
+Size (jing-20090818.zip) = 3196580 bytes