- Fix "make validate" problem when textproc/xhtml-basic is

installed by adding an SGML declaration and DTDDECL.
- Remove the --catalogs option for xmllint(1) in validate.sh.

Approved by:	nectar (maintainer)
PR:		ports/63035
This commit is contained in:
Hiroki Sato 2004-08-25 15:36:09 +00:00
parent a07c70ab36
commit c65c583e56
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=117260
4 changed files with 12 additions and 9 deletions

View file

@ -7,12 +7,12 @@
PORTNAME= vuxml PORTNAME= vuxml
PORTVERSION= 1.1 PORTVERSION= 1.1
PORTREVISION= 0 PORTREVISION= 1
CATEGORIES= security textproc CATEGORIES= security textproc
MASTER_SITES= http://www.vuxml.org/dtd/vuxml-1/ MASTER_SITES= http://www.vuxml.org/dtd/vuxml-1/
DISTFILES= vuxml-10.dtd vuxml-model-10.mod \ DISTFILES= vuxml-10.dtd vuxml-model-10.mod \
vuxml-11.dtd vuxml-model-11.mod \ vuxml-11.dtd vuxml-model-11.mod \
catalog catalog.xml xml1.dcl catalog catalog.xml
DIST_SUBDIR= vuxml DIST_SUBDIR= vuxml
MAINTAINER= nectar@FreeBSD.org MAINTAINER= nectar@FreeBSD.org

View file

@ -6,7 +6,9 @@ MD5 (vuxml/vuxml-11.dtd) = a208b5388095884a616d277890ae2fc9
SIZE (vuxml/vuxml-11.dtd) = 3063 SIZE (vuxml/vuxml-11.dtd) = 3063
MD5 (vuxml/vuxml-model-11.mod) = 180b4ae0788180ebe5b356e2da26c6dc MD5 (vuxml/vuxml-model-11.mod) = 180b4ae0788180ebe5b356e2da26c6dc
SIZE (vuxml/vuxml-model-11.mod) = 13282 SIZE (vuxml/vuxml-model-11.mod) = 13282
MD5 (vuxml/catalog) = 65ad3a182fe69f77b883e67cd28bf6a2 MD5 (vuxml/catalog) = d48e340eac85d6d6c2958b7d5779c2a0
SIZE (vuxml/catalog) = 290 SIZE (vuxml/catalog) = 549
MD5 (vuxml/catalog.xml) = 1e5293f2b01cf1ff169e37115e0ec16d MD5 (vuxml/catalog.xml) = 1e5293f2b01cf1ff169e37115e0ec16d
SIZE (vuxml/catalog.xml) = 813 SIZE (vuxml/catalog.xml) = 813
MD5 (vuxml/xml1.dcl) = 25b501e84af39d7aab067117d616636e
SIZE (vuxml/xml1.dcl) = 7372

View file

@ -15,12 +15,12 @@ SP_CHARSET_FIXED="YES"; export SP_CHARSET_FIXED
SP_ENCODING="XML"; export SP_ENCODING SP_ENCODING="XML"; export SP_ENCODING
X=`/usr/bin/which xmllint nsgmls` X=`/usr/bin/which xmllint onsgmls`
if [ -z "$X" ]; then if [ -z "$X" ]; then
exec >&2 exec >&2
echo "Could not find \`xmllint' nor \`nsgmls'." echo "Could not find \`xmllint' nor \`onsgmls'."
echo "Install ports/textproc/libxml2 for \`xmllint', or" echo "Install ports/textproc/libxml2 for \`xmllint', or"
echo "ports/textproc/jade for \`nsgmls'." echo "ports/textproc/opensp for \`onsgmls'."
exit 1 exit 1
fi fi
@ -39,10 +39,10 @@ validate() {
for x in ${X}; do for x in ${X}; do
case ${x} in case ${x} in
*xmllint) *xmllint)
validate ${x} --catalogs --valid --noout "${vuxml_file}" validate ${x} --valid --noout "${vuxml_file}"
exit $? exit $?
;; ;;
*nsgmls) *onsgmls)
validate ${x} -wxml -s "${vuxml_file}" validate ${x} -wxml -s "${vuxml_file}"
exit $? exit $?
;; ;;

View file

@ -4,3 +4,4 @@ share/xml/dtd/vuxml/vuxml-10.dtd
share/xml/dtd/vuxml/vuxml-11.dtd share/xml/dtd/vuxml/vuxml-11.dtd
share/xml/dtd/vuxml/vuxml-model-10.mod share/xml/dtd/vuxml/vuxml-model-10.mod
share/xml/dtd/vuxml/vuxml-model-11.mod share/xml/dtd/vuxml/vuxml-model-11.mod
share/xml/dtd/vuxml/xml1.dcl