From owner-svn-ports-all@FreeBSD.ORG Sat May 17 17:58:39 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 786BEA25; Sat, 17 May 2014 17:58:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 65E062925; Sat, 17 May 2014 17:58:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HHwd00077420; Sat, 17 May 2014 17:58:39 GMT (envelope-from zi@svn.freebsd.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4HHwd7e077418; Sat, 17 May 2014 17:58:39 GMT (envelope-from zi@svn.freebsd.org) Message-Id: <201405171758.s4HHwd7e077418@svn.freebsd.org> From: Ryan Steinmetz Date: Sat, 17 May 2014 17:58:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354349 - head/security/vuxml 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.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 17:58:39 -0000 Author: zi Date: Sat May 17 17:58:38 2014 New Revision: 354349 URL: http://svnweb.freebsd.org/changeset/ports/354349 QAT: https://qat.redports.org/buildarchive/r354349/ Log: - Add STAGE support - Add LICENSE - Cleanup plist-related clever - Pacify portlint(1) - Bump PORTREVISION With hat: ports-secteam Modified: head/security/vuxml/Makefile head/security/vuxml/pkg-plist Modified: head/security/vuxml/Makefile ============================================================================== --- head/security/vuxml/Makefile Sat May 17 17:55:55 2014 (r354348) +++ head/security/vuxml/Makefile Sat May 17 17:58:38 2014 (r354349) @@ -3,7 +3,7 @@ PORTNAME= vuxml PORTVERSION= 1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security textproc MASTER_SITES= http://www.vuxml.org/dtd/vuxml-1/ DISTFILES= vuxml-10.dtd vuxml-model-10.mod \ @@ -14,6 +14,8 @@ DIST_SUBDIR= vuxml MAINTAINER= ports-secteam@FreeBSD.org COMMENT= Vulnerability and eXposure Markup Language DTD +LICENSE= BSD2CLAUSE + RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr \ ${LOCALBASE}/share/xml/dtd/xhtml-modularization/VERSION:${PORTSDIR}/textproc/xhtml-modularization \ ${LOCALBASE}/share/xml/dtd/xhtml-basic/xhtml-basic10.dtd:${PORTSDIR}/textproc/xhtml-basic @@ -23,6 +25,9 @@ USE_PYTHON_RUN= yes NO_MTREE= YES NO_BUILD= YES WRKSRC= ${WRKDIR} +PLIST_SUB= XMLCAT_RM="${XMLCAT_RM}" XMLCAT_ADD="${XMLCAT_ADD}" \ + SGMLCAT_RM="${SGMLCAT_RM}" SGMLCAT_ADD="${SGMLCAT_ADD}" \ + dir_DTD="${dir_DTD}" dir_DTD= share/xml/dtd/vuxml @@ -42,11 +47,8 @@ SGMLCAT_RM= ${XMLCATMGR} -sc ${SGMLCAT} CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports CATALOG_PORTS_XML= ${PREFIX}/share/xml/catalog.ports -PLIST= ${WRKDIR}/PLIST - VUXML_FILE?= ${PKGDIR}/vuln.xml -NO_STAGE= yes do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} @@ -54,24 +56,11 @@ do-extract: ${CP} ${_DISTDIR}/${f} ${WRKDIR}/${f} .endfor -pre-install: - ${CP} ${PKGDIR}/pkg-plist ${PLIST} - ${ECHO} "@unexec ${XMLCAT_RM}" >> ${PLIST} - ${ECHO} "@exec ${XMLCAT_ADD}" >> ${PLIST} - ${ECHO} "@unexec ${SGMLCAT_RM}" >> ${PLIST} - ${ECHO} "@exec ${SGMLCAT_ADD}" >> ${PLIST} - ${ECHO} "@dirrm ${dir_DTD}" >> ${PLIST} - ${ECHO} '@unexec rmdir %D share/xml/dtd 2>/dev/null || true' >> \ - ${PLIST} - do-install: - @[ -d ${PREFIX}/${dir_DTD} ] || \ - ${MKDIR} ${PREFIX}/${dir_DTD} + @${MKDIR} ${STAGEDIR}${PREFIX}/${dir_DTD} .for f in ${DISTFILES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${dir_DTD}/${f} + ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/${dir_DTD}/${f} .endfor - ${XMLCAT_ADD} - ${SGMLCAT_ADD} validate: tidy @${SH} ${FILESDIR}/validate.sh "${VUXML_FILE}" @@ -94,7 +83,7 @@ validate: tidy ${ECHO_CMD} Consider using ${VUXML_FILE}.unexpanded for final commit; \ return 1; \ fi - ${PYTHON_CMD} files/extra-validation.py + ${PYTHON_CMD} ${FILESDIR}/extra-validation.py tidy: vuln.xml @if [ ! -e ${LOCALBASE}/share/xml/dtd/vuxml/catalog.xml ]; \ Modified: head/security/vuxml/pkg-plist ============================================================================== --- head/security/vuxml/pkg-plist Sat May 17 17:55:55 2014 (r354348) +++ head/security/vuxml/pkg-plist Sat May 17 17:58:38 2014 (r354349) @@ -5,3 +5,8 @@ share/xml/dtd/vuxml/vuxml-11.dtd share/xml/dtd/vuxml/vuxml-model-10.mod share/xml/dtd/vuxml/vuxml-model-11.mod share/xml/dtd/vuxml/xml1.dcl +@unexec %%XMLCAT_RM%% +@exec %%XMLCAT_ADD%% +@unexec %%SGMLCAT_RM%% +@exec %%SGMLCAT_ADD%% +@dirrm %%dir_DTD%%