Update to 4.4: Add docbook-4.3 and docbook-4.4 files.

5 files changed, 126 insertions, 9 deletions

diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index 111772cd164..59cdae29263 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.30 2004/06/05 00:01:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.31 2005/02/18 16:09:15 wiz Exp $
 # FreeBSD Id: Makefile,v 1.4 1998/06/27 05:19:35 asami Exp
 #
 
-DISTNAME=	docbook-4.2
-PKGREVISION=	4
+DISTNAME=	docbook-4.4
 CATEGORIES=	textproc
-MASTER_SITES=		http://www.oasis-open.org/docbook/sgml/4.2/
+MASTER_SITES=		http://www.oasis-open.org/docbook/sgml/4.4/
+SITES_docbook-4.3.zip=	http://www.oasis-open.org/docbook/sgml/4.3/
+SITES_docbook-4.2.zip=	http://www.oasis-open.org/docbook/sgml/4.2/
 SITES_docbk41.zip=	http://www.oasis-open.org/docbook/sgml/4.1/
 SITES_docbk40.zip=	http://www.oasis-open.org/docbook/sgml/4.0/
 SITES_docbk31.zip=	http://www.oasis-open.org/docbook/sgml/3.1/
 SITES_docbk30.zip=	http://www.oasis-open.org/docbook/sgml/3.0/
 SITES_docbk241.zip=	http://www.oasis-open.org/docbook/sgml/2.4.1/
 DISTFILES=	docbk241.zip docbk30.zip docbk31.zip docbk40.zip docbk41.zip \
-		docbook-4.2.zip
+		docbook-4.2.zip docbook-4.3.zip docbook-4.4.zip
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
@@ -33,13 +34,13 @@ 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
+.for ver in 2.4.1 3.0 3.1 4.0 4.1 4.2 4.3 4.4
 SGML_CATALOGS+=	${INSTDIR}/${ver}/catalog
 .endfor
 .undef ver
 
 do-build:
-.for ver in 241 30 31 40 41 42
+.for ver in 241 30 31 40 41 42 43 44
 	${CP} ${FILESDIR}/catalog${ver} ${WRKDIR}
 	${ECHO} "CATALOG \"${ISOCAT}\"" >> ${WRKDIR}/catalog${ver}
 .endfor
@@ -51,6 +52,8 @@ pre-install:
 	@[ -d ${INSTDIR}/4.0 ] || ${INSTALL_DATA_DIR} ${INSTDIR}/4.0
 	@[ -d ${INSTDIR}/4.1 ] || ${INSTALL_DATA_DIR} ${INSTDIR}/4.1
 	@[ -d ${INSTDIR}/4.2 ] || ${INSTALL_DATA_DIR} ${INSTDIR}/4.2
+	@[ -d ${INSTDIR}/4.3 ] || ${INSTALL_DATA_DIR} ${INSTDIR}/4.3
+	@[ -d ${INSTDIR}/4.4 ] || ${INSTALL_DATA_DIR} ${INSTDIR}/4.4
 
 do-install:
 	#
@@ -91,6 +94,18 @@ do-install:
 	@${INSTALL_DATA} ${WRKDIR}/catalog42 ${INSTDIR}/4.2/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/4.2/*
 	#
+	# 4.3:
+	#
+	@(cd ${INSTDIR}/4.3; unzip ${DISTDIR}/docbook-4.3.zip)
+	@${INSTALL_DATA} ${WRKDIR}/catalog43 ${INSTDIR}/4.3/catalog
+	@${CHMOD} ${SHAREMODE} ${INSTDIR}/4.3/*
+	#
+	# 4.4:
+	#
+	@(cd ${INSTDIR}/4.4; unzip ${DISTDIR}/docbook-4.4.zip)
+	@${INSTALL_DATA} ${WRKDIR}/catalog44 ${INSTDIR}/4.4/catalog
+	@${CHMOD} ${SHAREMODE} ${INSTDIR}/4.4/*
+	#
 	# General cleanup
 	#
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
diff --git a/textproc/docbook/PLIST b/textproc/docbook/PLIST
index cebd1afece4..b9831b75b85 100644
--- a/textproc/docbook/PLIST
+++ b/textproc/docbook/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/01/29 21:15:08 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/02/18 16:09:15 wiz 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,6 +78,40 @@ 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
+share/sgml/docbook/4.3/ChangeLog
+share/sgml/docbook/4.3/README
+share/sgml/docbook/4.3/calstblx.dtd
+share/sgml/docbook/4.3/catalog
+share/sgml/docbook/4.3/catalog.xml
+share/sgml/docbook/4.3/dbcentx.mod
+share/sgml/docbook/4.3/dbgenent.mod
+share/sgml/docbook/4.3/dbhierx.mod
+share/sgml/docbook/4.3/dbnotnx.mod
+share/sgml/docbook/4.3/dbpoolx.mod
+share/sgml/docbook/4.3/docbook.cat
+share/sgml/docbook/4.3/docbook.dcl
+share/sgml/docbook/4.3/docbook.dtd
+share/sgml/docbook/4.3/docbookx.dtd
+share/sgml/docbook/4.3/htmltblx.mod
+share/sgml/docbook/4.3/soextblx.dtd
+share/sgml/docbook/4.4/ChangeLog
+share/sgml/docbook/4.4/README
+share/sgml/docbook/4.4/calstblx.dtd
+share/sgml/docbook/4.4/catalog
+share/sgml/docbook/4.4/catalog.xml
+share/sgml/docbook/4.4/dbcentx.mod
+share/sgml/docbook/4.4/dbgenent.mod
+share/sgml/docbook/4.4/dbhierx.mod
+share/sgml/docbook/4.4/dbnotnx.mod
+share/sgml/docbook/4.4/dbpoolx.mod
+share/sgml/docbook/4.4/docbook.cat
+share/sgml/docbook/4.4/docbook.dcl
+share/sgml/docbook/4.4/docbook.dtd
+share/sgml/docbook/4.4/docbookx.dtd
+share/sgml/docbook/4.4/htmltblx.mod
+share/sgml/docbook/4.4/soextblx.dtd
+@dirrm share/sgml/docbook/4.4
+@dirrm share/sgml/docbook/4.3
 @dirrm share/sgml/docbook/4.2
 @dirrm share/sgml/docbook/4.1
 @dirrm share/sgml/docbook/4.0
diff --git a/textproc/docbook/distinfo b/textproc/docbook/distinfo
index d82b49799b9..38e80fb3062 100644
--- a/textproc/docbook/distinfo
+++ b/textproc/docbook/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/08/22 11:20:26 martti Exp $
+$NetBSD: distinfo,v 1.4 2005/02/18 16:09:15 wiz Exp $
 
 SHA1 (docbk241.zip) = fb314ca2a1eddef2c1e2db3eb3ffd15feff2f865
 Size (docbk241.zip) = 55653 bytes
@@ -12,3 +12,7 @@ SHA1 (docbk41.zip) = 3009fcc364511d186da40e828bf0d5d1556c020e
 Size (docbk41.zip) = 56654 bytes
 SHA1 (docbook-4.2.zip) = 98afcae616ed24edb30e40baa4ddd8cd8731f2c7
 Size (docbook-4.2.zip) = 61830 bytes
+SHA1 (docbook-4.3.zip) = c64759d07514a7ab4347b1fc03457664cdf98b3f
+Size (docbook-4.3.zip) = 66117 bytes
+SHA1 (docbook-4.4.zip) = 9a7343709c1f5093f93b234d04f3d7f440a84dd0
+Size (docbook-4.4.zip) = 66879 bytes
diff --git a/textproc/docbook/files/catalog43 b/textproc/docbook/files/catalog43
new file mode 100644
index 00000000000..c145c5166ba
--- /dev/null
+++ b/textproc/docbook/files/catalog43
@@ -0,0 +1,32 @@
+-- Catalog file for DocBook V4.3 --
+
+PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
+       "docbook.dtd"
+
+PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
+       "docbookx.dtd"
+
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.3//EN"
+       "calstblx.dtd"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.3//EN"
+        "htmltblx.mod"
+
+PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+       "soextblx.dtd"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN"
+       "dbpoolx.mod"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN"
+       "dbhierx.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN"
+       "dbgenent.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.3//EN"
+       "dbnotnx.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.3//EN"
+       "dbcentx.mod"
+
diff --git a/textproc/docbook/files/catalog44 b/textproc/docbook/files/catalog44
new file mode 100644
index 00000000000..dcea50e9543
--- /dev/null
+++ b/textproc/docbook/files/catalog44
@@ -0,0 +1,32 @@
+-- Catalog file for DocBook V4.4 --
+
+PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
+       "docbook.dtd"
+
+PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+       "docbookx.dtd"
+
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.4//EN"
+       "calstblx.dtd"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN"
+        "htmltblx.mod"
+
+PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+       "soextblx.dtd"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN"
+       "dbpoolx.mod"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN"
+       "dbhierx.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN"
+       "dbgenent.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.4//EN"
+       "dbnotnx.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.4//EN"
+       "dbcentx.mod"
+