From owner-svn-ports-all@FreeBSD.ORG  Wed Jun 19 21:20:51 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 07DD4811;
 Wed, 19 Jun 2013 21:20:51 +0000 (UTC)
 (envelope-from eadler@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id EDFD81FD1;
 Wed, 19 Jun 2013 21:20:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5JLKofI072292;
 Wed, 19 Jun 2013 21:20:50 GMT (envelope-from eadler@svn.freebsd.org)
Received: (from eadler@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5JLKoDF072290;
 Wed, 19 Jun 2013 21:20:50 GMT (envelope-from eadler@svn.freebsd.org)
Message-Id: <201306192120.r5JLKoDF072290@svn.freebsd.org>
From: Eitan Adler <eadler@FreeBSD.org>
Date: Wed, 19 Jun 2013 21:20:50 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r321330 - in head/security/vuxml: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 19 Jun 2013 21:20:51 -0000

Author: eadler
Date: Wed Jun 19 21:20:50 2013
New Revision: 321330
URL: http://svnweb.freebsd.org/changeset/ports/321330

Log:
  Add extra-validation to the validation target.
  
  While here, test with python2 and permit the script to run with either 2 or 3.
  
  Requested by:	delphij
  With Hat:	ports-secteam

Modified:
  head/security/vuxml/Makefile
  head/security/vuxml/files/extra-validation.py

Modified: head/security/vuxml/Makefile
==============================================================================
--- head/security/vuxml/Makefile	Wed Jun 19 21:14:50 2013	(r321329)
+++ head/security/vuxml/Makefile	Wed Jun 19 21:20:50 2013	(r321330)
@@ -18,6 +18,8 @@ RUN_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/te
 		${LOCALBASE}/share/xml/dtd/xhtml-modularization/VERSION:${PORTSDIR}/textproc/xhtml-modularization \
 		${LOCALBASE}/share/xml/dtd/xhtml-basic/xhtml-basic10.dtd:${PORTSDIR}/textproc/xhtml-basic
 
+USE_PYTHON_RUN=	yes
+
 NO_MTREE=	YES
 NO_BUILD=	YES
 WRKSRC=		${WRKDIR}
@@ -91,6 +93,7 @@ validate: tidy
 		${ECHO_CMD} Consider using ${VUXML_FILE}.unexpanded for final commit; \
 		return 1; \
 	fi
+	${PYTHON_CMD} files/extra-validation.py
 
 tidy: vuln.xml
 	@if [ ! -e ${LOCALBASE}/share/xml/dtd/vuxml/catalog.xml ]; \

Modified: head/security/vuxml/files/extra-validation.py
==============================================================================
--- head/security/vuxml/files/extra-validation.py	Wed Jun 19 21:14:50 2013	(r321329)
+++ head/security/vuxml/files/extra-validation.py	Wed Jun 19 21:20:50 2013	(r321330)
@@ -1,11 +1,11 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 # $FreeBSD$
 
 import datetime
 import xml.etree.ElementTree as ET
 import sys
 
-tree = ET.parse('../vuln.xml')
+tree = ET.parse('vuln.xml')
 root = tree.getroot()
 
 namespace = "{http://www.vuxml.org/apps/vuxml-1}"