Stage.

PR:		192809
Submitted by:	Ports Fury

6 files changed, 89 insertions, 147 deletions

diff --git a/textproc/slides/Makefile b/textproc/slides/Makefile
index 4e1c8eccb590..270c545bebcb 100644
--- a/textproc/slides/Makefile
+++ b/textproc/slides/Makefile
@@ -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'
+USES=		tar:bzip2
 
-NO_STAGE=	yes
+SUB_FILES=	pkg-deinstall pkg-install
+SUB_LIST=	XMLCATMGR="${XMLCATMGR}" CATALOG_PORTS_XML="${CATALOG_PORTS}" \
+		INSTDIR="${INSTDIR}"
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
+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
-	${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
+.for i in ${COPYDIRS}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${i} ${STAGEDIR}${PINSTDIR})
+.endfor
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/textproc/slides/distinfo b/textproc/slides/distinfo
index 4e9ce50eef55..dd6c307eb027 100644
--- a/textproc/slides/distinfo
+++ b/textproc/slides/distinfo
@@ -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
diff --git a/textproc/slides/files/patch-schema__dtd__slides-full.dtd b/textproc/slides/files/patch-schema__dtd__slides-full.dtd
deleted file mode 100644
index e49bdff98d26..000000000000
--- a/textproc/slides/files/patch-schema__dtd__slides-full.dtd
+++ /dev/null
@@ -1,13 +0,0 @@
---- schema/dtd/slides-full.dtd.orig	Thu Apr 29 19:36:50 2004
-+++ schema/dtd/slides-full.dtd	Thu Apr 29 19:37:22 2004
-@@ -24,8 +24,8 @@
- <!ENTITY % local.component.mix "|speakernotes">
- 
- <!-- In this version, we use full DocBook -->
--<!ENTITY % docbook.dtd PUBLIC "-//OASIS//DTD DocBook XML V4.3CR2//EN"
--  "http://docbook.org/xml/4.3CR2/docbookx.dtd">
-+<!ENTITY % docbook.dtd PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-+  "http://docbook.org/xml/4.3/docbookx.dtd">
- %docbook.dtd;
- 
- <!ENTITY % slides.mod SYSTEM "slides.mod">
diff --git a/textproc/slides/files/pkg-deinstall.in b/textproc/slides/files/pkg-deinstall.in
index 04034f4b5ee4..e9e55b8d901f 100644
--- a/textproc/slides/files/pkg-deinstall.in
+++ b/textproc/slides/files/pkg-deinstall.in
@@ -3,12 +3,11 @@
 # This script will remove the slides entries added to xml catalog.
 # -- Rui Lopes <rui@ruilopes.com>
 
-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/
diff --git a/textproc/slides/files/pkg-install.in b/textproc/slides/files/pkg-install.in
index fe6bfa40c3bb..e7b498323082 100644
--- a/textproc/slides/files/pkg-install.in
+++ b/textproc/slides/files/pkg-install.in
@@ -10,10 +10,9 @@
 #
 # -- Rui Lopes <rui@ruilopes.com>
 
-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
diff --git a/textproc/slides/pkg-plist b/textproc/slides/pkg-plist
index 68fe9bbf6b99..b5628086b138 100644
--- a/textproc/slides/pkg-plist
+++ b/textproc/slides/pkg-plist
@@ -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-custom.dtd
 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.xsl
 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.xsl
 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%%