Add a new keywork xmlcatmgr

It simplifies the handling of the XML and SMGL catalog
It brings a big of consistency by always specifying the catalog path absolute
instead of mixing absolute and relative path.
The keyword is also written a PKG_ROOTDIR friendly to simplify cross installing

Reviewed by:	hrs
Differential Revision:	https://reviews.freebsd.org/D6539

4 files changed, 4 insertions, 52 deletions

diff --git a/textproc/slides/Makefile b/textproc/slides/Makefile
index 9b30cb7805a8..25b04bfc5919 100644
--- a/textproc/slides/Makefile
+++ b/textproc/slides/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	slides
 PORTVERSION=	3.4.0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	SF/docbook/${PORTNAME}/${PORTVERSION}
 DISTNAME=	docbook-${PORTNAME}-${PORTVERSION}
@@ -14,26 +15,20 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	docbook-xml>0:textproc/docbook-xml \
-		docbook-xsl>0:textproc/docbook-xsl
+		docbook-xsl>0:textproc/docbook-xsl \
+		xmlcatmgr:textproc/xmlcatmgr
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USES=		tar:bzip2
 
-SUB_FILES=	pkg-deinstall pkg-install
-SUB_LIST=	XMLCATMGR="${XMLCATMGR}" CATALOG_PORTS_XML="${CATALOG_PORTS}" \
-		INSTDIR="${INSTDIR}"
-
 OPTIONS_DEFINE=	DOCS
 
-XMLDIR=		${LOCALBASE}/share/xml
 INSTDIR=	share/xsl/${PORTNAME}
 PINSTDIR=	${PREFIX}/${INSTDIR}
 COPYDIRS=	browser graphics schema xsl
 
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_PORTS=	${XMLDIR}/catalog.ports
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${PINSTDIR}
diff --git a/textproc/slides/files/pkg-deinstall.in b/textproc/slides/files/pkg-deinstall.in
deleted file mode 100644
index e9e55b8d901f..000000000000
--- a/textproc/slides/files/pkg-deinstall.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-# This script will remove the slides entries added to xml catalog.
-# -- Rui Lopes <rui@ruilopes.com>
-
-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/slides/
diff --git a/textproc/slides/files/pkg-install.in b/textproc/slides/files/pkg-install.in
deleted file mode 100644
index e7b498323082..000000000000
--- a/textproc/slides/files/pkg-install.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# This script will create the slides catalog and will add entries to xml catalog.
-# WARNING: If you change this script, be sure to check pkg-deinstall.in!
-#
-# Based on http://xmlsoft.org/buildDocBookCatalog file.
-#
-# in vi/vim grab VERSIONS string with command:
-# :r!echo -n "VERSIONS='current ";fetch -qo - http://cvs.sf.net/cgi-bin/viewcvs.cgi/docbook/${PORTNAME}/VERSION|sed -nE 's/.*Version (.*) released./\1/gp'|sort|sed -e '1,3d'|paste -sd ' ' -|tr \\n \'
-#
-# -- Rui Lopes <rui@ruilopes.com>
-
-XMLCATMGR=%%XMLCATMGR%%
-CATALOG_PORTS_XML=%%CATALOG_PORTS_XML%%
-XSL_DIR=${PKG_PREFIX}/%%INSTDIR%%
-CATALOG_XSL=${XSL_DIR}/catalog
-
-if [ "$2" != "POST-INSTALL" ]; then
-    exit 0
-fi
-
-${XMLCATMGR} -c "${CATALOG_PORTS_XML}" add delegateSystem \
-    http://docbook.sourceforge.net/release/slides/ \
-    "file://${CATALOG_XSL}"
-${XMLCATMGR} -c "${CATALOG_PORTS_XML}" add delegateURI \
-    http://docbook.sourceforge.net/release/slides/ \
-    "file://${CATALOG_XSL}"
-
-# echo $(w3m -dump http://cvs.sf.net/cgi-bin/viewcvs.cgi/docbook/slides/VERSION
-# | grep released | cut -d' ' -f2)
diff --git a/textproc/slides/pkg-plist b/textproc/slides/pkg-plist
index 783252cca86b..d1c996b3454f 100644
--- a/textproc/slides/pkg-plist
+++ b/textproc/slides/pkg-plist
@@ -22,7 +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
+@xmlcatmgr share/xsl/slides/catalog
 share/xsl/slides/graphics/ChangeLog
 share/xsl/slides/graphics/active/ChangeLog
 share/xsl/slides/graphics/active/arr-next.png