From owner-svn-ports-head@FreeBSD.ORG Sat Aug 23 16:22:52 2014 Return-Path: Delivered-To: svn-ports-head@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 5422DC8A; Sat, 23 Aug 2014 16:22:52 +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 352AE336B; Sat, 23 Aug 2014 16:22:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7NGMqwq003041; Sat, 23 Aug 2014 16:22:52 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7NGMph9003036; Sat, 23 Aug 2014 16:22:51 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201408231622.s7NGMph9003036@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Sat, 23 Aug 2014 16:22:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r365752 - in head/textproc/slides: . 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-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 23 Aug 2014 16:22:52 -0000 Author: adamw Date: Sat Aug 23 16:22:50 2014 New Revision: 365752 URL: http://svnweb.freebsd.org/changeset/ports/365752 QAT: https://qat.redports.org/buildarchive/r365752/ Log: Stage. PR: 192809 Submitted by: Ports Fury Deleted: head/textproc/slides/files/patch-schema__dtd__slides-full.dtd Modified: head/textproc/slides/Makefile head/textproc/slides/distinfo head/textproc/slides/files/pkg-deinstall.in head/textproc/slides/files/pkg-install.in head/textproc/slides/pkg-plist Modified: head/textproc/slides/Makefile ============================================================================== --- head/textproc/slides/Makefile Sat Aug 23 16:21:59 2014 (r365751) +++ head/textproc/slides/Makefile Sat Aug 23 16:22:50 2014 (r365752) @@ -2,88 +2,48 @@ # $FreeBSD$ PORTNAME= slides -PORTVERSION= 3.3.1 -PORTREVISION= 2 +PORTVERSION= 3.4.0 CATEGORIES= textproc -MASTER_SITES= SF/docbook/OldFiles +MASTER_SITES= SF/docbook/${PORTNAME}/${PORTVERSION} +DISTNAME= docbook-${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Doctype and stylesheets for making slides -BUILD_DEPENDS= xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr -RUN_DEPENDS= ${LOCALBASE}/share/xsl/docbook/catalog:${PORTSDIR}/textproc/docbook-xsl -RUN_DEPENDS+= ${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING -XMLDIR= ${LOCALBASE}/share/xml -INSTDIR= share/xsl/slides -PINSTDIR= ${PREFIX}/${INSTDIR} -COPYDIRS= browser graphics schema xsl - -PKGINSTALL= ${WRKSRC}/pkg-install -PKGDEINSTALL= ${WRKSRC}/pkg-deinstall +RUN_DEPENDS= docbook-xml>0:${PORTSDIR}/textproc/docbook-xml \ + docbook-xsl>0:${PORTSDIR}/textproc/docbook-xsl +NO_ARCH= yes NO_BUILD= yes -XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr -CATALOG_PORTS= ${XMLDIR}/catalog.ports -CATALOG_XSL= ${WRKSRC}/catalog -MYEXAMPLESDIR= tests -MYDOCSDIR= doc - -DXVERSIONS= 3.3.1 3.2.0 3.1.0 3.0.0 3.0b2 3.0b1 2.1b2 2.1b1 2.0a2 2.0a1 \ - current - -REPLACE_EXPR= -e 's,@INSTDIR@,${INSTDIR},g ; \ - s,@XMLCATMGR@,${XMLCATMGR},g ; \ - s,@CATALOG_PORTS_XML@,${CATALOG_PORTS},g ; \ - s,@PORTNAME@,slides,g' -NO_STAGE= yes +USES= tar:bzip2 + +SUB_FILES= pkg-deinstall pkg-install +SUB_LIST= XMLCATMGR="${XMLCATMGR}" CATALOG_PORTS_XML="${CATALOG_PORTS}" \ + INSTDIR="${INSTDIR}" OPTIONS_DEFINE= DOCS -.include +XMLDIR= ${LOCALBASE}/share/xml +INSTDIR= share/xsl/${PORTNAME} +PINSTDIR= ${PREFIX}/${INSTDIR} +COPYDIRS= browser graphics schema xsl -post-patch: - ${FIND} ${WRKSRC} -name '*.orig' -delete +XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr +CATALOG_PORTS= ${XMLDIR}/catalog.ports do-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${EXAMPLESDIR} - (cd ${WRKSRC}/${MYEXAMPLESDIR} && ${TAR} -cf - . |\ - ${TAR} -xf - -C${EXAMPLESDIR}) - ${MKDIR} ${DOCSDIR} - (cd ${WRKSRC}/${MYDOCSDIR} && ${TAR} -cf - . |\ - ${TAR} -xf - -C${DOCSDIR}) -.endif - ${XMLCATMGR} -c "${CATALOG_XSL}" create -.for dxversion in ${DXVERSIONS} - ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteSystem \ - http://docbook.sourceforge.net/release/slides/${dxversion}/xsl \ - "file://${PINSTDIR}/xsl" - ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteURI \ - http://docbook.sourceforge.net/release/slides/${dxversion}/xsl \ - "file://${PINSTDIR}/xsl" - ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteSystem \ - http://docbook.sourceforge.net/release/slides/${dxversion}/schema/dtd \ - "file://${PINSTDIR}/schema/dtd" - ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteURI \ - http://docbook.sourceforge.net/release/slides/${dxversion}/schema/dtd \ - "file://${PINSTDIR}/schema/dtd" - ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteSystem \ - http://docbook.sourceforge.net/release/slides/${dxversion} \ - "file://${PINSTDIR}/schema/dtd" - ${XMLCATMGR} -c "${CATALOG_XSL}" add rewriteURI \ - http://docbook.sourceforge.net/release/slides/${dxversion} \ - "file://${PINSTDIR}/schema/dtd" + @${MKDIR} ${STAGEDIR}${PINSTDIR} +.for i in VERSION catalog + (cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${PINSTDIR}) +.endfor +.for i in ${COPYDIRS} + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${PINSTDIR}) .endfor - ${MKDIR} ${PINSTDIR} - (cd ${WRKSRC} && ${TAR} -cf - VERSION catalog ${COPYDIRS} |\ - ${TAR} -xf - -C${PINSTDIR}) - -post-install: - @${SED} ${REPLACE_EXPR} < ${FILESDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} ${REPLACE_EXPR} < ${FILESDIR}/pkg-deinstall.in > ${PKGDEINSTALL} - @${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include Modified: head/textproc/slides/distinfo ============================================================================== --- head/textproc/slides/distinfo Sat Aug 23 16:21:59 2014 (r365751) +++ head/textproc/slides/distinfo Sat Aug 23 16:22:50 2014 (r365752) @@ -1,2 +1,2 @@ -SHA256 (slides-3.3.1.tar.gz) = c3d07676ae5a74e258de0eda029bb9cfe0cc4845f952a11125c8421bae79cf67 -SIZE (slides-3.3.1.tar.gz) = 260281 +SHA256 (docbook-slides-3.4.0.tar.bz2) = 0aee34fe68ba9b45e8a70ef43ff2b85878cd8f374c646fe8d8bcd4ad0db3400e +SIZE (docbook-slides-3.4.0.tar.bz2) = 201347 Modified: head/textproc/slides/files/pkg-deinstall.in ============================================================================== --- head/textproc/slides/files/pkg-deinstall.in Sat Aug 23 16:21:59 2014 (r365751) +++ head/textproc/slides/files/pkg-deinstall.in Sat Aug 23 16:22:50 2014 (r365752) @@ -3,12 +3,11 @@ # This script will remove the slides entries added to xml catalog. # -- Rui Lopes -XMLCATMGR=@XMLCATMGR@ -CATALOG_PORTS_XML=@CATALOG_PORTS_XML@ -PORTNAME=@PORTNAME@ +XMLCATMGR=%%XMLCATMGR%% +CATALOG_PORTS_XML=%%CATALOG_PORTS_XML%% if [ "$2" != "POST-DEINSTALL" ]; then exit 0 fi -${XMLCATMGR} -c "${CATALOG_PORTS_XML}" remove http://docbook.sourceforge.net/release/${PORTNAME}/ +${XMLCATMGR} -c "${CATALOG_PORTS_XML}" remove http://docbook.sourceforge.net/release/slides/ Modified: head/textproc/slides/files/pkg-install.in ============================================================================== --- head/textproc/slides/files/pkg-install.in Sat Aug 23 16:21:59 2014 (r365751) +++ head/textproc/slides/files/pkg-install.in Sat Aug 23 16:22:50 2014 (r365752) @@ -10,10 +10,9 @@ # # -- Rui Lopes -XMLCATMGR=@XMLCATMGR@ -CATALOG_PORTS_XML=@CATALOG_PORTS_XML@ -PORTNAME=@PORTNAME@ -XSL_DIR=${PKG_PREFIX}/@INSTDIR@ +XMLCATMGR=%%XMLCATMGR%% +CATALOG_PORTS_XML=%%CATALOG_PORTS_XML%% +XSL_DIR=${PKG_PREFIX}/%%INSTDIR%% CATALOG_XSL=${XSL_DIR}/catalog if [ "$2" != "POST-INSTALL" ]; then @@ -21,10 +20,10 @@ if [ "$2" != "POST-INSTALL" ]; then fi ${XMLCATMGR} -c "${CATALOG_PORTS_XML}" add delegateSystem \ - http://docbook.sourceforge.net/release/${PORTNAME}/ \ + http://docbook.sourceforge.net/release/slides/ \ "file://${CATALOG_XSL}" ${XMLCATMGR} -c "${CATALOG_PORTS_XML}" add delegateURI \ - http://docbook.sourceforge.net/release/${PORTNAME}/ \ + http://docbook.sourceforge.net/release/slides/ \ "file://${CATALOG_XSL}" # echo $(w3m -dump http://cvs.sf.net/cgi-bin/viewcvs.cgi/docbook/slides/VERSION Modified: head/textproc/slides/pkg-plist ============================================================================== --- head/textproc/slides/pkg-plist Sat Aug 23 16:21:59 2014 (r365751) +++ head/textproc/slides/pkg-plist Sat Aug 23 16:22:50 2014 (r365752) @@ -1,17 +1,8 @@ -%%PORTDOCS%%%%EXAMPLESDIR%%/ChangeLog -%%PORTDOCS%%%%EXAMPLESDIR%%/catalog.xml -%%PORTDOCS%%%%EXAMPLESDIR%%/dbgentext.xml -%%PORTDOCS%%%%EXAMPLESDIR%%/minimal.xml -%%PORTDOCS%%%%EXAMPLESDIR%%/test-full.xml -%%PORTDOCS%%%%EXAMPLESDIR%%/test.xml -%%PORTDOCS%%%%EXAMPLESDIR%%/testcust.xml -%%PORTDOCS%%%%EXAMPLESDIR%%/testfull.xml -%%PORTDOCS%%%%EXAMPLESDIR%%/testhtml.xml -%%PORTDOCS%%%%EXAMPLESDIR%%/tr-862918.xml %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/param.html %%PORTDOCS%%%%DOCSDIR%%/slides.xml +share/xsl/slides/VERSION share/xsl/slides/browser/CTOCWidget.js share/xsl/slides/browser/ChangeLog share/xsl/slides/browser/overlay.js @@ -31,6 +22,7 @@ share/xsl/slides/browser/xbStyle-css.js share/xsl/slides/browser/xbStyle-nn4.js share/xsl/slides/browser/xbStyle-not-supported.js share/xsl/slides/browser/xbStyle.js +share/xsl/slides/catalog share/xsl/slides/graphics/ChangeLog share/xsl/slides/graphics/active/ChangeLog share/xsl/slides/graphics/active/arr-next.png @@ -79,35 +71,25 @@ share/xsl/slides/schema/dtd/slides-custo share/xsl/slides/schema/dtd/slides-full.dtd share/xsl/slides/schema/dtd/slides.dtd share/xsl/slides/schema/dtd/slides.mod -share/xsl/slides/schema/rng/full/calstblx.rnc -share/xsl/slides/schema/rng/full/calstblx.rng -share/xsl/slides/schema/rng/full/dbhierx.rnc -share/xsl/slides/schema/rng/full/dbhierx.rng -share/xsl/slides/schema/rng/full/dbnotnx.rnc -share/xsl/slides/schema/rng/full/dbnotnx.rng -share/xsl/slides/schema/rng/full/dbpoolx.rnc -share/xsl/slides/schema/rng/full/dbpoolx.rng -share/xsl/slides/schema/rng/full/docbookx.rnc -share/xsl/slides/schema/rng/full/docbookx.rng -share/xsl/slides/schema/rng/full/htmltblx.rnc -share/xsl/slides/schema/rng/full/htmltblx.rng -share/xsl/slides/schema/rng/full/slides-full.rnc -share/xsl/slides/schema/rng/full/slides-full.rng -share/xsl/slides/schema/rng/full/slides.rnc -share/xsl/slides/schema/rng/full/slides.rng -share/xsl/slides/schema/rng/slides.rnc -share/xsl/slides/schema/rng/slides.rng -share/xsl/slides/schema/xsd/full/calstblx.xsd -share/xsl/slides/schema/xsd/full/dbhierx.xsd -share/xsl/slides/schema/xsd/full/dbnotnx.xsd -share/xsl/slides/schema/xsd/full/dbpoolx.xsd -share/xsl/slides/schema/xsd/full/docbookx.xsd -share/xsl/slides/schema/xsd/full/htmltblx.xsd -share/xsl/slides/schema/xsd/full/slides-full.xsd -share/xsl/slides/schema/xsd/full/slides.xsd -share/xsl/slides/schema/xsd/full/xml.xsd -share/xsl/slides/schema/xsd/slides.xsd -share/xsl/slides/schema/xsd/xml.xsd +share/xsl/slides/schema/relaxng/ChangeLog +share/xsl/slides/schema/relaxng/calstblx.rnc +share/xsl/slides/schema/relaxng/calstblx.rng +share/xsl/slides/schema/relaxng/dbhierx.mod.rnc +share/xsl/slides/schema/relaxng/dbhierx.mod.rng +share/xsl/slides/schema/relaxng/dbnotnx.mod.rnc +share/xsl/slides/schema/relaxng/dbnotnx.mod.rng +share/xsl/slides/schema/relaxng/dbpoolx.mod.rnc +share/xsl/slides/schema/relaxng/dbpoolx.mod.rng +share/xsl/slides/schema/relaxng/docbookx.rnc +share/xsl/slides/schema/relaxng/docbookx.rng +share/xsl/slides/schema/relaxng/htmltblx.mod.rnc +share/xsl/slides/schema/relaxng/htmltblx.mod.rng +share/xsl/slides/schema/relaxng/slides-full.rnc +share/xsl/slides/schema/relaxng/slides-full.rng +share/xsl/slides/schema/relaxng/slides.mod.rnc +share/xsl/slides/schema/relaxng/slides.mod.rng +share/xsl/slides/schema/relaxng/slides.rnc +share/xsl/slides/schema/relaxng/slides.rng share/xsl/slides/xsl/ChangeLog share/xsl/slides/xsl/fo/ChangeLog share/xsl/slides/xsl/fo/plain-titlepage.xml @@ -120,6 +102,7 @@ share/xsl/slides/xsl/html/flat.xsl share/xsl/slides/xsl/html/frames.xsl share/xsl/slides/xsl/html/graphics.xsl share/xsl/slides/xsl/html/jscript.xsl +share/xsl/slides/xsl/html/param.html share/xsl/slides/xsl/html/param.xml share/xsl/slides/xsl/html/param.xsl share/xsl/slides/xsl/html/param.xweb @@ -128,6 +111,23 @@ share/xsl/slides/xsl/html/slides-common. share/xsl/slides/xsl/html/tables.xsl share/xsl/slides/xsl/html/vslides.xsl share/xsl/slides/xsl/html/w3c.xsl +share/xsl/slides/xsl/htmlhelp/ChangeLog +share/xsl/slides/xsl/htmlhelp/htmlhelp.xsl +share/xsl/slides/xsl/keynote/ChangeLog +share/xsl/slides/xsl/keynote/default.xsl +share/xsl/slides/xsl/keynote/xsltsl/ChangeLog +share/xsl/slides/xsl/keynote/xsltsl/cmp.xsl +share/xsl/slides/xsl/keynote/xsltsl/date-time.xsl +share/xsl/slides/xsl/keynote/xsltsl/example.xsl +share/xsl/slides/xsl/keynote/xsltsl/markup.xsl +share/xsl/slides/xsl/keynote/xsltsl/math.xsl +share/xsl/slides/xsl/keynote/xsltsl/node.xsl +share/xsl/slides/xsl/keynote/xsltsl/stdlib.xsl +share/xsl/slides/xsl/keynote/xsltsl/string.xsl +share/xsl/slides/xsl/keynote/xsltsl/svg.xsl +share/xsl/slides/xsl/keynote/xsltsl/uri.xsl +share/xsl/slides/xsl/svg/ChangeLog +share/xsl/slides/xsl/svg/default.xsl share/xsl/slides/xsl/xhtml/ChangeLog share/xsl/slides/xsl/xhtml/css.xsl share/xsl/slides/xsl/xhtml/default.xsl @@ -142,24 +142,21 @@ share/xsl/slides/xsl/xhtml/slides-common share/xsl/slides/xsl/xhtml/tables.xsl share/xsl/slides/xsl/xhtml/vslides.xsl share/xsl/slides/xsl/xhtml/w3c.xsl -share/xsl/slides/VERSION -share/xsl/slides/catalog -@dirrm share/xsl/slides/browser -@dirrm share/xsl/slides/graphics/active -@dirrm share/xsl/slides/graphics/inactive -@dirrm share/xsl/slides/graphics/toc -@dirrm share/xsl/slides/graphics -@dirrm share/xsl/slides/schema/dtd -@dirrm share/xsl/slides/schema/rng/full -@dirrm share/xsl/slides/schema/rng -@dirrm share/xsl/slides/schema/xsd/full -@dirrm share/xsl/slides/schema/xsd -@dirrm share/xsl/slides/schema -@dirrm share/xsl/slides/xsl/fo -@dirrm share/xsl/slides/xsl/html @dirrm share/xsl/slides/xsl/xhtml +@dirrm share/xsl/slides/xsl/svg +@dirrm share/xsl/slides/xsl/keynote/xsltsl +@dirrm share/xsl/slides/xsl/keynote +@dirrm share/xsl/slides/xsl/htmlhelp +@dirrm share/xsl/slides/xsl/html +@dirrm share/xsl/slides/xsl/fo @dirrm share/xsl/slides/xsl +@dirrm share/xsl/slides/schema/relaxng +@dirrm share/xsl/slides/schema/dtd +@dirrm share/xsl/slides/schema +@dirrm share/xsl/slides/graphics/toc +@dirrm share/xsl/slides/graphics/inactive +@dirrm share/xsl/slides/graphics/active +@dirrm share/xsl/slides/graphics +@dirrm share/xsl/slides/browser @dirrm share/xsl/slides -@dirrmtry share/xsl -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%