Add VuXML 1.1 DTD

Update document type declaration to VuXML 1.1

6 files changed, 23 insertions, 40 deletions

diff --git a/security/vuxml/Makefile b/security/vuxml/Makefile
index 56effd511a28..29105dbfbc5f 100644
--- a/security/vuxml/Makefile
+++ b/security/vuxml/Makefile
@@ -6,11 +6,14 @@
 #
 
 PORTNAME=	vuxml
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 PORTREVISION=	0
 CATEGORIES=	security textproc
 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 \
+		catalog catalog.xml
+DIST_SUBDIR=	vuxml
 
 MAINTAINER=	nectar@FreeBSD.org
 COMMENT=	Vulnerability and eXposure Markup Language DTD
@@ -34,9 +37,9 @@ XMLCAT_ADD=	${XMLCATMGR} -c ${XMLCAT} add nextCatalog \
 XMLCAT_RM=	${XMLCATMGR} -c ${XMLCAT} remove nextCatalog \
 		    ${PREFIX}/${dir_DTD}/catalog.xml
 SGMLCAT_ADD=	${XMLCATMGR} -sc ${SGMLCAT} add CATALOG \
-		    ${PREFIX}/${dir_DTD}/vuxml.cat
+		    ${PREFIX}/${dir_DTD}/catalog
 SGMLCAT_RM=	${XMLCATMGR} -sc ${SGMLCAT} remove CATALOG \
-		    ${PREFIX}/${dir_DTD}/vuxml.cat
+		    ${PREFIX}/${dir_DTD}/catalog
 
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 CATALOG_PORTS_XML=	${PREFIX}/share/xml/catalog.ports
@@ -68,10 +71,6 @@ do-install:
 .for f in ${DISTFILES}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${dir_DTD}/${f}
 .endfor
-	${SED} -e "s;@@PREFIX@@;${PREFIX};g" ${FILESDIR}/catalog.xml > \
-	    ${WRKDIR}/catalog.xml
-	${INSTALL_DATA} ${WRKDIR}/catalog.xml ${PREFIX}/${dir_DTD}/catalog.xml
-	${INSTALL_DATA} ${FILESDIR}/vuxml.cat ${PREFIX}/${dir_DTD}/vuxml.cat
 	${XMLCAT_ADD}
 	${SGMLCAT_ADD}
 
diff --git a/security/vuxml/distinfo b/security/vuxml/distinfo
index 06a74a9fb77d..2b702da350e7 100644
--- a/security/vuxml/distinfo
+++ b/security/vuxml/distinfo
@@ -1,4 +1,12 @@
-MD5 (vuxml-10.dtd) = a0fa5d5facdff104bbf25c7e55459fac
-SIZE (vuxml-10.dtd) = 2986
-MD5 (vuxml-model-10.mod) = bc4b64d08d60d2d4d0dc5b3f83f4fca0
-SIZE (vuxml-model-10.mod) = 10599
+MD5 (vuxml/vuxml-10.dtd) = a0fa5d5facdff104bbf25c7e55459fac
+SIZE (vuxml/vuxml-10.dtd) = 2986
+MD5 (vuxml/vuxml-model-10.mod) = bc4b64d08d60d2d4d0dc5b3f83f4fca0
+SIZE (vuxml/vuxml-model-10.mod) = 10599
+MD5 (vuxml/vuxml-11.dtd) = a208b5388095884a616d277890ae2fc9
+SIZE (vuxml/vuxml-11.dtd) = 3063
+MD5 (vuxml/vuxml-model-11.mod) = 180b4ae0788180ebe5b356e2da26c6dc
+SIZE (vuxml/vuxml-model-11.mod) = 13282
+MD5 (vuxml/catalog) = 65ad3a182fe69f77b883e67cd28bf6a2
+SIZE (vuxml/catalog) = 290
+MD5 (vuxml/catalog.xml) = 1e5293f2b01cf1ff169e37115e0ec16d
+SIZE (vuxml/catalog.xml) = 813
diff --git a/security/vuxml/files/catalog.xml b/security/vuxml/files/catalog.xml
deleted file mode 100644
index 2d187c0df09c..000000000000
--- a/security/vuxml/files/catalog.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN"
-  "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
-
-
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"
-  prefer="public"
-  xml:base="file://@@PREFIX@@/share/xml/dtd/vuxml/">
-
-  <rewriteSystem
-    systemIdStartString="http://www.vuxml.org/dtd/vuxml-1"
-    rewritePrefix="./" />
-
-  <public
-    publicId="-//vuxml.org/DTD VuXML 1.0//EN"
-    uri="vuxml-10.dtd" />
-
-  <public
-    publicId="-//vuxml.org//ELEMENTS VuXML 1.0 Document Model//EN"
-    uri="vuxml-model-10.mod" />
-
-</catalog>
diff --git a/security/vuxml/files/vuxml.cat b/security/vuxml/files/vuxml.cat
deleted file mode 100644
index e09ccff2cac7..000000000000
--- a/security/vuxml/files/vuxml.cat
+++ /dev/null
@@ -1,4 +0,0 @@
-OVERRIDE YES
-
-PUBLIC "-//vuxml.org//DTD VuXML 1.0//EN" "vuxml-10.dtd"
-PUBLIC "-//vuxml.org//ELEMENTS VuXML 1.0 Document Model//EN" "vuxml-model-10.mod"
diff --git a/security/vuxml/pkg-plist b/security/vuxml/pkg-plist
index c011ca18780c..956bf3de1f32 100644
--- a/security/vuxml/pkg-plist
+++ b/security/vuxml/pkg-plist
@@ -1,4 +1,6 @@
+share/xml/dtd/vuxml/catalog
 share/xml/dtd/vuxml/catalog.xml
 share/xml/dtd/vuxml/vuxml-10.dtd
+share/xml/dtd/vuxml/vuxml-11.dtd
 share/xml/dtd/vuxml/vuxml-model-10.mod
-share/xml/dtd/vuxml/vuxml.cat
+share/xml/dtd/vuxml/vuxml-model-11.mod
diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
index 5da0d0e28d64..e15eb8eca559 100644
--- a/security/vuxml/vuln.xml
+++ b/security/vuxml/vuln.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE vuxml PUBLIC "-//vuxml.org//DTD VuXML 1.0//EN" "http://www.vuxml.org/dtd/vuxml-1/vuxml-10.dtd">
+<!DOCTYPE vuxml PUBLIC "-//vuxml.org//DTD VuXML 1.1//EN" "http://www.vuxml.org/dtd/vuxml-1/vuxml-11.dtd">
 <!--
 Copyright 2003, 2004 Jacques Vidrine and contributors