security/vuxml: re-organize port

- move vuln-YYYY.xml files into vuln/ as just YYYY.xml
- this prevents problems with the new check_files hook when 2023 arrives.

23 files changed, 44 insertions, 44 deletions

diff --git a/security/vuxml/Makefile b/security/vuxml/Makefile
index 1b75dcb8748a..11132d8c65d5 100644
--- a/security/vuxml/Makefile
+++ b/security/vuxml/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	vuxml
 PORTVERSION=	1.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security textproc
 MASTER_SITES=	http://www.vuxml.org/dtd/vuxml-1/
 DISTFILES=	vuxml-10.dtd  vuxml-model-10.mod \
@@ -32,7 +32,7 @@ dir_DTD=	share/xml/dtd/vuxml
 VUXML_FILE?=	${PKGDIR}/vuln.xml
 VUXML_FLAT_FILE?=	${PKGDIR}/vuln-flat.xml
 _YEAR!=	date +%Y
-VUXML_CURRENT_FILE?=	${PKGDIR}/vuln-${_YEAR}.xml
+VUXML_CURRENT_FILE?=	${PKGDIR}/vuln/${_YEAR}.xml
 
 post-clean:
 	@${RM} "${VUXML_FILE}.tidy"
@@ -53,10 +53,10 @@ do-install:
 
 do-test:
 	@${MKDIR} ${WRKDIR}/test
-	@${CP} ${.CURDIR}/vuln*.xml ${WRKDIR}/test
+	@${CP} -R ${.CURDIR}/vuln.xml ${.CURDIR}/vuln ${WRKDIR}/test
 	@cd ${.CURDIR} && make validate PKGDIR=${WRKDIR}/test
 
-${VUXML_FLAT_FILE}: ${VUXML_FILE} vuln-20??.xml
+${VUXML_FLAT_FILE}: ${VUXML_FILE} vuln/*.xml
 	xmllint -noent ${.ALLSRC:[1]} > ${.TARGET}
 
 validate: tidy
diff --git a/security/vuxml/files/tidy.xsl b/security/vuxml/files/tidy.xsl
index e48c36c691c2..c912c0b4f7a1 100644
--- a/security/vuxml/files/tidy.xsl
+++ b/security/vuxml/files/tidy.xsl
@@ -25,26 +25,26 @@ result in more namespace declarations than we wish.
 <xsl:template match="/">
 	<xsl:text disable-output-escaping="yes"><![CDATA[<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE vuxml PUBLIC "-//vuxml.org//DTD VuXML 1.1//EN" "http://www.vuxml.org/dtd/vuxml-1/vuxml-11.dtd" [
-<!ENTITY vuln-2003 SYSTEM "vuln-2003.xml">
-<!ENTITY vuln-2004 SYSTEM "vuln-2004.xml">
-<!ENTITY vuln-2005 SYSTEM "vuln-2005.xml">
-<!ENTITY vuln-2006 SYSTEM "vuln-2006.xml">
-<!ENTITY vuln-2007 SYSTEM "vuln-2007.xml">
-<!ENTITY vuln-2008 SYSTEM "vuln-2008.xml">
-<!ENTITY vuln-2009 SYSTEM "vuln-2009.xml">
-<!ENTITY vuln-2010 SYSTEM "vuln-2010.xml">
-<!ENTITY vuln-2011 SYSTEM "vuln-2011.xml">
-<!ENTITY vuln-2012 SYSTEM "vuln-2012.xml">
-<!ENTITY vuln-2013 SYSTEM "vuln-2013.xml">
-<!ENTITY vuln-2014 SYSTEM "vuln-2014.xml">
-<!ENTITY vuln-2015 SYSTEM "vuln-2015.xml">
-<!ENTITY vuln-2016 SYSTEM "vuln-2016.xml">
-<!ENTITY vuln-2017 SYSTEM "vuln-2017.xml">
-<!ENTITY vuln-2018 SYSTEM "vuln-2018.xml">
-<!ENTITY vuln-2019 SYSTEM "vuln-2019.xml">
-<!ENTITY vuln-2020 SYSTEM "vuln-2020.xml">
-<!ENTITY vuln-2021 SYSTEM "vuln-2021.xml">
-<!ENTITY vuln-2022 SYSTEM "vuln-2022.xml">
+<!ENTITY vuln-2003 SYSTEM "vuln/2003.xml">
+<!ENTITY vuln-2004 SYSTEM "vuln/2004.xml">
+<!ENTITY vuln-2005 SYSTEM "vuln/2005.xml">
+<!ENTITY vuln-2006 SYSTEM "vuln/2006.xml">
+<!ENTITY vuln-2007 SYSTEM "vuln/2007.xml">
+<!ENTITY vuln-2008 SYSTEM "vuln/2008.xml">
+<!ENTITY vuln-2009 SYSTEM "vuln/2009.xml">
+<!ENTITY vuln-2010 SYSTEM "vuln/2010.xml">
+<!ENTITY vuln-2011 SYSTEM "vuln/2011.xml">
+<!ENTITY vuln-2012 SYSTEM "vuln/2012.xml">
+<!ENTITY vuln-2013 SYSTEM "vuln/2013.xml">
+<!ENTITY vuln-2014 SYSTEM "vuln/2014.xml">
+<!ENTITY vuln-2015 SYSTEM "vuln/2015.xml">
+<!ENTITY vuln-2016 SYSTEM "vuln/2016.xml">
+<!ENTITY vuln-2017 SYSTEM "vuln/2017.xml">
+<!ENTITY vuln-2018 SYSTEM "vuln/2018.xml">
+<!ENTITY vuln-2019 SYSTEM "vuln/2019.xml">
+<!ENTITY vuln-2020 SYSTEM "vuln/2020.xml">
+<!ENTITY vuln-2021 SYSTEM "vuln/2021.xml">
+<!ENTITY vuln-2022 SYSTEM "vuln/2022.xml">
 ]>
 ]]></xsl:text>
   <xsl:apply-templates />
diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
index 845b3df9e509..d181901f3970 100644
--- a/security/vuxml/vuln.xml
+++ b/security/vuxml/vuln.xml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE vuxml PUBLIC "-//vuxml.org//DTD VuXML 1.1//EN" "http://www.vuxml.org/dtd/vuxml-1/vuxml-11.dtd" [
-<!ENTITY vuln-2003 SYSTEM "vuln-2003.xml">
-<!ENTITY vuln-2004 SYSTEM "vuln-2004.xml">
-<!ENTITY vuln-2005 SYSTEM "vuln-2005.xml">
-<!ENTITY vuln-2006 SYSTEM "vuln-2006.xml">
-<!ENTITY vuln-2007 SYSTEM "vuln-2007.xml">
-<!ENTITY vuln-2008 SYSTEM "vuln-2008.xml">
-<!ENTITY vuln-2009 SYSTEM "vuln-2009.xml">
-<!ENTITY vuln-2010 SYSTEM "vuln-2010.xml">
-<!ENTITY vuln-2011 SYSTEM "vuln-2011.xml">
-<!ENTITY vuln-2012 SYSTEM "vuln-2012.xml">
-<!ENTITY vuln-2013 SYSTEM "vuln-2013.xml">
-<!ENTITY vuln-2014 SYSTEM "vuln-2014.xml">
-<!ENTITY vuln-2015 SYSTEM "vuln-2015.xml">
-<!ENTITY vuln-2016 SYSTEM "vuln-2016.xml">
-<!ENTITY vuln-2017 SYSTEM "vuln-2017.xml">
-<!ENTITY vuln-2018 SYSTEM "vuln-2018.xml">
-<!ENTITY vuln-2019 SYSTEM "vuln-2019.xml">
-<!ENTITY vuln-2020 SYSTEM "vuln-2020.xml">
-<!ENTITY vuln-2021 SYSTEM "vuln-2021.xml">
-<!ENTITY vuln-2022 SYSTEM "vuln-2022.xml">
+<!ENTITY vuln-2003 SYSTEM "vuln/2003.xml">
+<!ENTITY vuln-2004 SYSTEM "vuln/2004.xml">
+<!ENTITY vuln-2005 SYSTEM "vuln/2005.xml">
+<!ENTITY vuln-2006 SYSTEM "vuln/2006.xml">
+<!ENTITY vuln-2007 SYSTEM "vuln/2007.xml">
+<!ENTITY vuln-2008 SYSTEM "vuln/2008.xml">
+<!ENTITY vuln-2009 SYSTEM "vuln/2009.xml">
+<!ENTITY vuln-2010 SYSTEM "vuln/2010.xml">
+<!ENTITY vuln-2011 SYSTEM "vuln/2011.xml">
+<!ENTITY vuln-2012 SYSTEM "vuln/2012.xml">
+<!ENTITY vuln-2013 SYSTEM "vuln/2013.xml">
+<!ENTITY vuln-2014 SYSTEM "vuln/2014.xml">
+<!ENTITY vuln-2015 SYSTEM "vuln/2015.xml">
+<!ENTITY vuln-2016 SYSTEM "vuln/2016.xml">
+<!ENTITY vuln-2017 SYSTEM "vuln/2017.xml">
+<!ENTITY vuln-2018 SYSTEM "vuln/2018.xml">
+<!ENTITY vuln-2019 SYSTEM "vuln/2019.xml">
+<!ENTITY vuln-2020 SYSTEM "vuln/2020.xml">
+<!ENTITY vuln-2021 SYSTEM "vuln/2021.xml">
+<!ENTITY vuln-2022 SYSTEM "vuln/2022.xml">
 ]>
 <!--
 Copyright 2003-2022 Jacques Vidrine and contributors
diff --git a/security/vuxml/vuln-2003.xml b/security/vuxml/vuln/2003.xml
index ab8cd2c33a84..ab8cd2c33a84 100644
--- a/security/vuxml/vuln-2003.xml
+++ b/security/vuxml/vuln/2003.xml
diff --git a/security/vuxml/vuln-2004.xml b/security/vuxml/vuln/2004.xml
index aa6e6b1adbe5..aa6e6b1adbe5 100644
--- a/security/vuxml/vuln-2004.xml
+++ b/security/vuxml/vuln/2004.xml
diff --git a/security/vuxml/vuln-2005.xml b/security/vuxml/vuln/2005.xml
index 7b03ffd4d899..7b03ffd4d899 100644
--- a/security/vuxml/vuln-2005.xml
+++ b/security/vuxml/vuln/2005.xml
diff --git a/security/vuxml/vuln-2006.xml b/security/vuxml/vuln/2006.xml
index d94b827cbd2b..d94b827cbd2b 100644
--- a/security/vuxml/vuln-2006.xml
+++ b/security/vuxml/vuln/2006.xml
diff --git a/security/vuxml/vuln-2007.xml b/security/vuxml/vuln/2007.xml
index cfac8ca9cf37..cfac8ca9cf37 100644
--- a/security/vuxml/vuln-2007.xml
+++ b/security/vuxml/vuln/2007.xml
diff --git a/security/vuxml/vuln-2008.xml b/security/vuxml/vuln/2008.xml
index f5f2ff988c59..f5f2ff988c59 100644
--- a/security/vuxml/vuln-2008.xml
+++ b/security/vuxml/vuln/2008.xml
diff --git a/security/vuxml/vuln-2009.xml b/security/vuxml/vuln/2009.xml
index 4ed63453900d..4ed63453900d 100644
--- a/security/vuxml/vuln-2009.xml
+++ b/security/vuxml/vuln/2009.xml
diff --git a/security/vuxml/vuln-2010.xml b/security/vuxml/vuln/2010.xml
index d3a8f569873e..d3a8f569873e 100644
--- a/security/vuxml/vuln-2010.xml
+++ b/security/vuxml/vuln/2010.xml
diff --git a/security/vuxml/vuln-2011.xml b/security/vuxml/vuln/2011.xml
index 6247a20e1ee6..6247a20e1ee6 100644
--- a/security/vuxml/vuln-2011.xml
+++ b/security/vuxml/vuln/2011.xml
diff --git a/security/vuxml/vuln-2012.xml b/security/vuxml/vuln/2012.xml
index 5de258b56e1c..5de258b56e1c 100644
--- a/security/vuxml/vuln-2012.xml
+++ b/security/vuxml/vuln/2012.xml
diff --git a/security/vuxml/vuln-2013.xml b/security/vuxml/vuln/2013.xml
index f46442c6e179..f46442c6e179 100644
--- a/security/vuxml/vuln-2013.xml
+++ b/security/vuxml/vuln/2013.xml
diff --git a/security/vuxml/vuln-2014.xml b/security/vuxml/vuln/2014.xml
index 6b1f1c8cce16..6b1f1c8cce16 100644
--- a/security/vuxml/vuln-2014.xml
+++ b/security/vuxml/vuln/2014.xml
diff --git a/security/vuxml/vuln-2015.xml b/security/vuxml/vuln/2015.xml
index 36997bebdfe4..36997bebdfe4 100644
--- a/security/vuxml/vuln-2015.xml
+++ b/security/vuxml/vuln/2015.xml
diff --git a/security/vuxml/vuln-2016.xml b/security/vuxml/vuln/2016.xml
index 5fe4fdc4bf1b..5fe4fdc4bf1b 100644
--- a/security/vuxml/vuln-2016.xml
+++ b/security/vuxml/vuln/2016.xml
diff --git a/security/vuxml/vuln-2017.xml b/security/vuxml/vuln/2017.xml
index 9e78bc4ba88c..9e78bc4ba88c 100644
--- a/security/vuxml/vuln-2017.xml
+++ b/security/vuxml/vuln/2017.xml
diff --git a/security/vuxml/vuln-2018.xml b/security/vuxml/vuln/2018.xml
index ccf9fab5631e..ccf9fab5631e 100644
--- a/security/vuxml/vuln-2018.xml
+++ b/security/vuxml/vuln/2018.xml
diff --git a/security/vuxml/vuln-2019.xml b/security/vuxml/vuln/2019.xml
index c506c424fb6b..c506c424fb6b 100644
--- a/security/vuxml/vuln-2019.xml
+++ b/security/vuxml/vuln/2019.xml
diff --git a/security/vuxml/vuln-2020.xml b/security/vuxml/vuln/2020.xml
index 928a3eaab63f..928a3eaab63f 100644
--- a/security/vuxml/vuln-2020.xml
+++ b/security/vuxml/vuln/2020.xml
diff --git a/security/vuxml/vuln-2021.xml b/security/vuxml/vuln/2021.xml
index 8f7ca411b5e5..8f7ca411b5e5 100644
--- a/security/vuxml/vuln-2021.xml
+++ b/security/vuxml/vuln/2021.xml
diff --git a/security/vuxml/vuln-2022.xml b/security/vuxml/vuln/2022.xml
index da329d617e6a..da329d617e6a 100644
--- a/security/vuxml/vuln-2022.xml
+++ b/security/vuxml/vuln/2022.xml