4 files changed, 2 insertions, 51 deletions

diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index 65d87ee2b53a..85695af0400c 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	docbook-xsl
 PORTVERSION=	1.76.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	SF/docbook/${PORTNAME}/${PORTVERSION}:src \
 		SF/docbook/${PORTNAME}-doc/${PORTVERSION}:doc
@@ -22,14 +22,6 @@ INSTDIR=	share/xsl/docbook
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
-SUB_FILES=	pkg-install pkg-deinstall
-SUB_LIST+=	INSTDIR="${INSTDIR}" \
-		XMLCATMGR="${XMLCATMGR}" \
-		CATALOG_PORTS="${LOCALBASE}/share/xml/catalog.ports"
-
-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
-CATALOG_XSL=	${WRKSRC}/catalog
-
 MODULES=	common fo html images lib manpages params xhtml
 
 OPTIONS_DEFINE=	ECLIPSE EPUB EXTENSIONS HIGHLIGHTING HTMLHELP JAVAHELP \
diff --git a/textproc/docbook-xsl/files/pkg-deinstall.in b/textproc/docbook-xsl/files/pkg-deinstall.in
deleted file mode 100644
index e4c66930a4cb..000000000000
--- a/textproc/docbook-xsl/files/pkg-deinstall.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# This script will remove the docbook-xsl entries added to xml catalog.
-# -- Rui Lopes <rui@ruilopes.com>
-
-if [ "$2" != "DEINSTALL" ]; then
-	exit 0
-fi
-
-%%XMLCATMGR%% -c %%CATALOG_PORTS%% remove \
-	http://docbook.sourceforge.net/release/xsl/
-exit 0
diff --git a/textproc/docbook-xsl/files/pkg-install.in b/textproc/docbook-xsl/files/pkg-install.in
deleted file mode 100644
index 48ef165481d6..000000000000
--- a/textproc/docbook-xsl/files/pkg-install.in
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-# This script will create the docbook-xsl 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.
-#
-# Run the following command to generate a new VERSIONS string:
-# perl -n -e '/Version ([\d.]+) rel/ && print "$1\n"' work/*/ChangeLog |
-#     sort -n | tr '\n' ' '
-#
-# -- Rui Lopes <rui@ruilopes.com>
-
-XSL_DIR=${PKG_PREFIX}/%%INSTDIR%%
-CATALOG_XSL=${XSL_DIR}/catalog.xml
-
-if [ "$2" != "POST-INSTALL" ]; then
-	exit 0
-fi
-
-test -r "${CATALOG_XSL}" || {
-    echo >&2 "Cannot register non-existent catalog ${CATALOG_XSL}"
-    exit 1
-}
-%%XMLCATMGR%% -c %%CATALOG_PORTS%% add delegateSystem \
-	http://docbook.sourceforge.net/release/xsl/ \
-	"file://${CATALOG_XSL}"
-%%XMLCATMGR%% -c %%CATALOG_PORTS%% add delegateURI \
-	http://docbook.sourceforge.net/release/xsl/ \
-	"file://${CATALOG_XSL}"
-exit 0
diff --git a/textproc/docbook-xsl/pkg-plist b/textproc/docbook-xsl/pkg-plist
index 4110bcbecbfb..35217754223a 100644
--- a/textproc/docbook-xsl/pkg-plist
+++ b/textproc/docbook-xsl/pkg-plist
@@ -13,7 +13,7 @@ share/xsl/docbook/RELEASE-NOTES.txt
 share/xsl/docbook/RELEASE-NOTES.xml
 share/xsl/docbook/TODO
 share/xsl/docbook/VERSION
-share/xsl/docbook/catalog.xml
+@xmlcatmgr share/xsl/docbook/catalog.xml
 share/xsl/docbook/common/af.xml
 share/xsl/docbook/common/am.xml
 share/xsl/docbook/common/ar.xml