summaryrefslogtreecommitdiff
path: root/textproc/docbook
diff options
context:
space:
mode:
authorjmmv <jmmv>2003-01-29 21:15:07 +0000
committerjmmv <jmmv>2003-01-29 21:15:07 +0000
commit4ab2b03d21fb8e228101889e5867536450eedf53 (patch)
treea2cb2772e43f582767b127b14878bbd452298465 /textproc/docbook
parentbb924fd623e88fdced52e4df07510e7546fc296d (diff)
downloadpkgsrc-4ab2b03d21fb8e228101889e5867536450eedf53.tar.gz
Use textproc/xmlcatmgr/catalogs.mk to register the installed catalog files,
through the SGML_CATALOGS variable. Bump PKGREVISION.
Diffstat (limited to 'textproc/docbook')
-rw-r--r--textproc/docbook/Makefile20
-rw-r--r--textproc/docbook/PLIST14
2 files changed, 11 insertions, 23 deletions
diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index a328bdc60c9..4926883a1c6 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.18 2003/01/11 22:11:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2003/01/29 21:15:08 jmmv Exp $
# FreeBSD Id: Makefile,v 1.4 1998/06/27 05:19:35 asami Exp
#
DISTNAME= docbook-4.2
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= textproc
MASTER_SITES= \
http://www.oasis-open.org/docbook/sgml/4.2/ \
@@ -27,10 +27,17 @@ USE_BUILDLINK2= yes
EXTRACT_ONLY= # empty
NO_BUILD= yes
WRKSRC= ${WRKDIR}
+USE_BUILDLINK2= yes
INSTDIR= ${PREFIX}/share/sgml/docbook
ISOCAT= ${PREFIX}/share/sgml/iso8879/catalog
+SGML_CATALOGS=
+.for ver in 2.4.1 3.0 3.1 4.0 4.1 4.2
+SGML_CATALOGS+= ${INSTDIR}/${ver}/catalog
+.endfor
+.undef ver
+
pre-install:
${INSTALL_DATA_DIR} ${INSTDIR}/2.4.1
@[ -d ${INSTDIR}/3.0 ] || ${INSTALL_DATA_DIR} ${INSTDIR}/3.0
@@ -87,13 +94,6 @@ do-install:
# General cleanup
#
@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
- #
- # Register SGML catalogs
- #
-.for ver in 2.4.1 3.0 3.1 4.0 4.1 4.2
- ${PREFIX}/bin/xmlcatmgr -c ${PREFIX}/share/sgml/catalog add \
- CATALOG ${INSTDIR}/${ver}/catalog
-.endfor
-.include "../../textproc/xmlcatmgr/buildlink2.mk"
+.include "../../textproc/xmlcatmgr/catalogs.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook/PLIST b/textproc/docbook/PLIST
index f468f62a83e..cebd1afece4 100644
--- a/textproc/docbook/PLIST
+++ b/textproc/docbook/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/01/11 22:11:50 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/01/29 21:15:08 jmmv Exp $
share/sgml/docbook/2.4.1/241chg.txt
share/sgml/docbook/2.4.1/announce.txt
share/sgml/docbook/2.4.1/calstbl.mod
@@ -78,18 +78,6 @@ share/sgml/docbook/4.2/docbook.dcl
share/sgml/docbook/4.2/docbook.dtd
share/sgml/docbook/4.2/docbookx.dtd
share/sgml/docbook/4.2/soextblx.dtd
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/docbook/2.4.1/catalog
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/docbook/3.0/catalog
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/docbook/3.1/catalog
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/docbook/4.0/catalog
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/docbook/4.1/catalog
-@exec %D/bin/xmlcatmgr -c %D/share/sgml/catalog add CATALOG %D/share/sgml/docbook/4.2/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/docbook/4.2/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/docbook/4.1/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/docbook/4.0/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/docbook/3.1/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/docbook/3.0/catalog
-@unexec %D/bin/xmlcatmgr -c %D/share/sgml/catalog remove %D/share/sgml/docbook/2.4.1/catalog
@dirrm share/sgml/docbook/4.2
@dirrm share/sgml/docbook/4.1
@dirrm share/sgml/docbook/4.0