From owner-svn-ports-all@FreeBSD.ORG Mon Feb 17 17:49:53 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D34463C7; Mon, 17 Feb 2014 17:49:53 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B448C1C59; Mon, 17 Feb 2014 17:49:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1HHnrkB069701; Mon, 17 Feb 2014 17:49:53 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1HHnreF069699; Mon, 17 Feb 2014 17:49:53 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402171749.s1HHnreF069699@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 17 Feb 2014 17:49:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r344802 - head/textproc/docbook-500 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.17 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: Mon, 17 Feb 2014 17:49:53 -0000 Author: mat Date: Mon Feb 17 17:49:53 2014 New Revision: 344802 URL: http://svnweb.freebsd.org/changeset/ports/344802 QAT: https://qat.redports.org/buildarchive/r344802/ Log: Support staging. Sponsored by: Absolight Modified: head/textproc/docbook-500/Makefile head/textproc/docbook-500/pkg-plist Modified: head/textproc/docbook-500/Makefile ============================================================================== --- head/textproc/docbook-500/Makefile Mon Feb 17 17:43:43 2014 (r344801) +++ head/textproc/docbook-500/Makefile Mon Feb 17 17:49:53 2014 (r344802) @@ -3,33 +3,28 @@ PORTNAME= docbook PORTVERSION= 5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= http://www.docbook.org/xml/5.0/ +PKGNAMESUFFIX= 500 +EXTRACT_SUFX= .zip MAINTAINER= gabor@FreeBSD.org COMMENT= DocBook 5.0, designed for technical documentation RUN_DEPENDS= ${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr -USE_ZIP= yes NO_BUILD= yes -PKGNAMESUFFIX= ${PKGORIGIN:T:S/docbook-//} -DOCBOOKDIR= share/xml/${PORTNAME}/${PORTVERSION} -DOCSDIR= ${PREFIX}/${DOCBOOKDIR}/docs +DTDDIR= share/xml/${PORTNAME}/${PORTVERSION} +DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}/${PORTVERSION} -PLIST_SUB+= XMLCAT_ADD="${XMLCAT_ADD}" \ - XMLCAT_RM="${XMLCAT_RM}" +PLIST_SUB+= XMLCATMGR=${XMLCATMGR} XMLCAT=${XMLCAT} \ + DTDDIR=${DTDDIR} XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr XMLCAT= ${PREFIX}/share/xml/catalog.ports -XMLCAT_ADD= ${XMLCATMGR} -c ${XMLCAT} add nextCatalog \ - ${PREFIX}/${DOCBOOKDIR}/catalog.xml -XMLCAT_RM= ${XMLCATMGR} -c ${XMLCAT} remove \ - ${PREFIX}/${DOCBOOKDIR}/catalog.xml - OPTIONS_DEFINE= DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS XMLCHARENT DOCS OPTIONS_DEFAULT= DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS XMLCHARENT DTD_DESC= XML DTD @@ -39,72 +34,22 @@ SCHEMATRON_DESC= Schematron constraints NVDL_DESC= NVDL description TOOLS_DESC= Tools for working with DocBook XMLCHARENT_DESC= Install ISO 8879 XML entites +OPTIONS_SUB= yes -.include +XMLCHARENT_RUN_DEPENDS+= ${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent -.if ${PORT_OPTIONS:MDTD} -PLIST_SUB+= DTD="" -MODULES+= dtd -.else -PLIST_SUB+= DTD="@comment " -.endif -.if ${PORT_OPTIONS:MSCHEMA} -PLIST_SUB+= SCHEMA="" -MODULES+= xsd -.else -PLIST_SUB+= SCHEMA="@comment " -.endif -.if ${PORT_OPTIONS:MRELAX_NG} -PLIST_SUB+= RELAXNG="" -MODULES+= rng -.else -PLIST_SUB+= RELAXNG="@comment " -.endif -.if ${PORT_OPTIONS:MSCHEMATRON} -PLIST_SUB+= SCHEMATRON="" -MODULES+= sch -.else -PLIST_SUB+= SCHEMATRON="@comment " -.endif -.if ${PORT_OPTIONS:MNVDL} -PLIST_SUB+= NVDL="" -.else -PLIST_SUB+= NVDL="@comment " -.endif -.if ${PORT_OPTIONS:MTOOLS} -PLIST_SUB+= TOOLS="" -MODULES+= tools -.else -PLIST_SUB+= TOOLS="@comment " -.endif -.if ${PORT_OPTIONS:MXMLCHARENT} -RUN_DEPENDS+= ${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent -.endif +PORTDOCS= * do-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/${DOCBOOKDIR} - ${INSTALL_DATA} ${WRKSRC}/catalog.xml ${STAGEDIR}${PREFIX}/${DOCBOOKDIR} -.for m in ${MODULES} - ${MKDIR} ${STAGEDIR}${PREFIX}/${DOCBOOKDIR}/${m} - files=$$(${FIND} ${WRKSRC}/${m} -type f); \ - for i in $${files}; do \ - ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/${DOCBOOKDIR}/${m}; \ - done + @${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR} + ${INSTALL_DATA} ${WRKSRC}/catalog.xml ${STAGEDIR}${PREFIX}/${DTDDIR} +.for m in dtd xsd rng sch tools + cd ${WRKSRC} && ${COPYTREE_SHARE} ${m} ${STAGEDIR}${PREFIX}/${DTDDIR} .endfor -.if ${PORT_OPTIONS:MNVDL} - ${MKDIR} ${STAGEDIR}${PREFIX}/${DOCBOOKDIR}/nvdl - ${INSTALL_DATA} ${WRKSRC}/docbook.nvdl ${STAGEDIR}${PREFIX}/${DOCBOOKDIR}/nvdl -.endif - ${MKDIR} ${STAGEDIR}${DOCSDIR} - files1=$$(${FIND} ${WRKSRC} -type f -depth 1| ${GREP} -v -e '.xml$$' -e '.nvdl$$'); \ - files2=$$(${FIND} ${WRKSRC}/docs -type f -depth 1); \ - for i in $${files1} $${files2}; do \ - ${INSTALL_DATA} $${i} ${STAGEDIR}${DOCSDIR}; \ - done - ${MKDIR} ${STAGEDIR}${DOCSDIR}/images - files=$$(${FIND} ${WRKSRC}/docs/images -type f); \ - for i in $${files}; do \ - ${INSTALL_DATA} $${i} ${STAGEDIR}${DOCSDIR}/images; \ - done + @${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}/nvdl + ${INSTALL_DATA} ${WRKSRC}/docbook.nvdl ${STAGEDIR}${PREFIX}/${DTDDIR}/nvdl + @${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ChangeLog README VERSION ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} .include Modified: head/textproc/docbook-500/pkg-plist ============================================================================== --- head/textproc/docbook-500/pkg-plist Mon Feb 17 17:43:43 2014 (r344801) +++ head/textproc/docbook-500/pkg-plist Mon Feb 17 17:49:53 2014 (r344802) @@ -1,40 +1,24 @@ -@unexec %%XMLCAT_RM%% -share/xml/docbook/5.0/catalog.xml -%%PORTDOCS%%share/xml/docbook/5.0/docs/ChangeLog -%%PORTDOCS%%share/xml/docbook/5.0/docs/README -%%PORTDOCS%%share/xml/docbook/5.0/docs/VERSION -%%PORTDOCS%%share/xml/docbook/5.0/docs/docbook-5.0-spec-cd-01.html -%%PORTDOCS%%share/xml/docbook/5.0/docs/docbook-5.0-spec-cd-01.pdf -%%PORTDOCS%%share/xml/docbook/5.0/docs/docbook-5.0-spec-cd-01.xml -%%PORTDOCS%%share/xml/docbook/5.0/docs/howto.html -%%PORTDOCS%%share/xml/docbook/5.0/docs/howto.pdf -%%PORTDOCS%%share/xml/docbook/5.0/docs/howto.xml -%%PORTDOCS%%share/xml/docbook/5.0/docs/images/emacs.png -%%PORTDOCS%%share/xml/docbook/5.0/docs/images/oxygen1.png -%%PORTDOCS%%share/xml/docbook/5.0/docs/images/oxygen2.png -%%PORTDOCS%%share/xml/docbook/5.0/docs/images/oxygen3.png -%%PORTDOCS%%share/xml/docbook/5.0/docs/images/xxe.png -%%PORTDOCS%%@dirrm share/xml/docbook/5.0/docs/images -%%PORTDOCS%%@dirrm share/xml/docbook/5.0/docs -%%DTD%%share/xml/docbook/5.0/dtd/docbook.dtd -%%DTD%%@dirrm share/xml/docbook/5.0/dtd -%%NVDL%%share/xml/docbook/5.0/nvdl/docbook.nvdl -%%NVDL%%@dirrm share/xml/docbook/5.0/nvdl -%%RELAXNG%%share/xml/docbook/5.0/rng/docbook.rnc -%%RELAXNG%%share/xml/docbook/5.0/rng/docbook.rng -%%RELAXNG%%share/xml/docbook/5.0/rng/docbookxi.rnc -%%RELAXNG%%share/xml/docbook/5.0/rng/docbookxi.rng -%%RELAXNG%%@dirrm share/xml/docbook/5.0/rng -%%SCHEMATRON%%share/xml/docbook/5.0/sch/docbook.sch -%%SCHEMATRON%%@dirrm share/xml/docbook/5.0/sch -%%TOOLS%%share/xml/docbook/5.0/tools/db4-entities.pl -%%TOOLS%%share/xml/docbook/5.0/tools/db4-upgrade.xsl -%%TOOLS%%@dirrm share/xml/docbook/5.0/tools -%%SCHEMA%%share/xml/docbook/5.0/xsd/docbook.xsd -%%SCHEMA%%share/xml/docbook/5.0/xsd/xlink.xsd -%%SCHEMA%%share/xml/docbook/5.0/xsd/xml.xsd -%%SCHEMA%%@dirrm share/xml/docbook/5.0/xsd -@dirrm share/xml/docbook/5.0 +@unexec %%XMLCATMGR%% -c %%XMLCAT%% remove %D/%%DTDDIR%%/catalog.xml +%%DTDDIR%%/catalog.xml +%%DTD%%%%DTDDIR%%/dtd/docbook.dtd +%%DTD%%@dirrm %%DTDDIR%%/dtd +%%NVDL%%%%DTDDIR%%/nvdl/docbook.nvdl +%%NVDL%%@dirrm %%DTDDIR%%/nvdl +%%RELAX_NG%%%%DTDDIR%%/rng/docbook.rnc +%%RELAX_NG%%%%DTDDIR%%/rng/docbook.rng +%%RELAX_NG%%%%DTDDIR%%/rng/docbookxi.rnc +%%RELAX_NG%%%%DTDDIR%%/rng/docbookxi.rng +%%RELAX_NG%%@dirrm %%DTDDIR%%/rng +%%SCHEMATRON%%%%DTDDIR%%/sch/docbook.sch +%%SCHEMATRON%%@dirrm %%DTDDIR%%/sch +%%TOOLS%%%%DTDDIR%%/tools/db4-entities.pl +%%TOOLS%%%%DTDDIR%%/tools/db4-upgrade.xsl +%%TOOLS%%@dirrm %%DTDDIR%%/tools +%%SCHEMA%%%%DTDDIR%%/xsd/docbook.xsd +%%SCHEMA%%%%DTDDIR%%/xsd/xlink.xsd +%%SCHEMA%%%%DTDDIR%%/xsd/xml.xsd +%%SCHEMA%%@dirrm %%DTDDIR%%/xsd +@dirrm %%DTDDIR%% @dirrmtry share/xml/docbook @dirrmtry share/xml -@exec %%XMLCAT_ADD%% +@exec %%XMLCATMGR%% -c %%XMLCAT%% add nextCatalog %D/%%DTDDIR%%/catalog.xml