Update to 4.4, provided by Jeroen Ruigrok van der Werven in PR

31219.  Corrected the DESCR while here.

4.4:
The Version 4.4 release is a maintainance release. It introduces
no backwards-incompatible changes. All valid DocBook 4.3 documents
are also valid DocBook 4.4 documents.

The genesis of this release is a bug in the catalog files for
DocBook V4.3. The Committee decided to produce a 4.4 release,
incorporating a few recent backwards-compatible changes, rather
than simply produce a 4.3.1 release to fix the bugs.

4.3:
The Version 4.3 release is a maintainance release. It introduces
no backwards-incompatible changes. All valid DocBook 4.2 documents
are also valid DocBook 4.3 documents.

5 files changed, 143 insertions, 76 deletions

diff --git a/textproc/docbook-xml/DESCR b/textproc/docbook-xml/DESCR
index 44f02f3c1be..a030a44f923 100644
--- a/textproc/docbook-xml/DESCR
+++ b/textproc/docbook-xml/DESCR
@@ -1,13 +1,8 @@
-  The DocBook DTD defines structural and content-based SGML markup
-for computer documentation, with a primary emphasis on software
-documentation and related classes of technical documents. Its
-main high-level hierarchical structures are for books, reference
-entries (for example, ``man pages''), and articles. It is
-maintained by the Davenport Group (about which see the Davenport
-archive at http://www.ora.com/davenport/ or
-ftp://ftp.ora.com/pub/davenport/).
+DocBook provides a system for writing structured documents using
+SGML or XML. It is particularly well-suited to books and papers
+about computer hardware and software, though it is by no means
+limited to them.
 
-  This package contains DocBook XML V4.1.2, released 27 Aug 2000.
-
-  Some documentation for DocBook is available in ASCII and PDF
-at http://www.freebsd.org/~wosch/docbook/
+In short, DocBook is an easy-to-understand and widely used DTD.
+Dozens of organizations use DocBook for millions of pages of
+documentation, in various print and online formats, worldwide.
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index 80f14faee97..9c4114f1890 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -1,38 +1,46 @@
-# $NetBSD: Makefile,v 1.18 2005/06/06 03:34:08 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2005/09/30 15:24:20 wiz Exp $
 #
 
-DISTNAME=	docbook-xml-4.2
-PKGREVISION=	9
+DISTNAME=	docbook-xml-4.4
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.oasis-open.org/docbook/xml/4.2/
-EXTRACT_SUFX=	.zip
+MASTER_SITES=	http://www.oasis-open.org/docbook/xml/4.4/
+SITES_docbook-xml-4.3.zip=	http://www.oasis-open.org/docbook/xml/4.3/
+SITES_docbook-xml-4.2.zip=	http://www.oasis-open.org/docbook/xml/4.2/
+DISTFILES=	docbook-xml-4.2.zip docbook-xml-4.3.zip docbook-xml-4.4.zip
 
 MAINTAINER=	seb@NetBSD.org
-HOMEPAGE=	http://www.oasis-open.org/docbook
+HOMEPAGE=	http://www.oasis-open.org/docbook/
 COMMENT=	XML DTD designed for computer documentation
 
+BUILD_DEPENDS=	unzip-[0-9]*:../../archivers/unzip
+
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 
 WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# empty
 NO_BUILD=	YES
+EXTRACT_ONLY=	# empty
 
 INSTDIR=	${DESTDIR}${PREFIX}/share/xml
 DTDDIR=		${INSTDIR}/docbook
-ENTDIR=		${INSTDIR}/docbook/ent
-DTDFILES=	calstblx.dtd dbcentx.mod dbgenent.mod dbhierx.mod \
-		dbnotnx.mod dbpoolx.mod docbookx.dtd soextblx.dtd
-MISCFILES=	README
 
-XML_CATALOGS=	${DTDDIR}/catalog
+VER=		4.2 4.3 4.4
+
+XML_CATALOGS=
+.for ver in ${VER}
+XML_CATALOGS+= ${DTDDIR}/${ver}/catalog
+.endfor
+
+pre-install:
+.for ver in ${VER}
+	@[ -d ${DTDDIR}/${ver} ] || ${INSTALL_DATA_DIR} ${DTDDIR}/${ver}
+.endfor
 
 do-install:
-	${INSTALL_DATA_DIR} ${DTDDIR}
-	${INSTALL_DATA_DIR} ${ENTDIR}
-	(cd ${WRKSRC}; ${INSTALL_DATA} ${DTDFILES} ${DTDDIR})
-	(cd ${WRKSRC}/ent; ${INSTALL_DATA} *.ent ${ENTDIR})
-	(cd ${WRKSRC};     ${INSTALL_DATA} ${MISCFILES} ${DTDDIR})
-	${INSTALL_DATA} ${WRKSRC}/catalog.xml ${DTDDIR}/catalog
+.for ver in ${VER}
+	@(cd ${DTDDIR}/${ver}; unzip ${DISTDIR}/docbook-xml-${ver}.zip)
+	@(cd ${DTDDIR}/${ver}; ${MV} catalog.xml catalog)
+.endfor
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook-xml/PLIST b/textproc/docbook-xml/PLIST
index 2d1604f3abf..2da7bc2c067 100644
--- a/textproc/docbook-xml/PLIST
+++ b/textproc/docbook-xml/PLIST
@@ -1,32 +1,105 @@
-@comment $NetBSD: PLIST,v 1.7 2003/01/29 21:17:26 jmmv Exp $
-share/xml/docbook/README
-share/xml/docbook/calstblx.dtd
-share/xml/docbook/catalog
-share/xml/docbook/dbcentx.mod
-share/xml/docbook/dbgenent.mod
-share/xml/docbook/dbhierx.mod
-share/xml/docbook/dbnotnx.mod
-share/xml/docbook/dbpoolx.mod
-share/xml/docbook/docbookx.dtd
-share/xml/docbook/ent/iso-amsa.ent
-share/xml/docbook/ent/iso-amsb.ent
-share/xml/docbook/ent/iso-amsc.ent
-share/xml/docbook/ent/iso-amsn.ent
-share/xml/docbook/ent/iso-amso.ent
-share/xml/docbook/ent/iso-amsr.ent
-share/xml/docbook/ent/iso-box.ent
-share/xml/docbook/ent/iso-cyr1.ent
-share/xml/docbook/ent/iso-cyr2.ent
-share/xml/docbook/ent/iso-dia.ent
-share/xml/docbook/ent/iso-grk1.ent
-share/xml/docbook/ent/iso-grk2.ent
-share/xml/docbook/ent/iso-grk3.ent
-share/xml/docbook/ent/iso-grk4.ent
-share/xml/docbook/ent/iso-lat1.ent
-share/xml/docbook/ent/iso-lat2.ent
-share/xml/docbook/ent/iso-num.ent
-share/xml/docbook/ent/iso-pub.ent
-share/xml/docbook/ent/iso-tech.ent
-share/xml/docbook/soextblx.dtd
-@dirrm share/xml/docbook/ent
+@comment $NetBSD: PLIST,v 1.8 2005/09/30 15:24:20 wiz Exp $
+share/xml/docbook/4.4/ChangeLog
+share/xml/docbook/4.4/README
+share/xml/docbook/4.4/calstblx.dtd
+share/xml/docbook/4.4/catalog
+share/xml/docbook/4.4/dbcentx.mod
+share/xml/docbook/4.4/dbgenent.mod
+share/xml/docbook/4.4/dbhierx.mod
+share/xml/docbook/4.4/dbnotnx.mod
+share/xml/docbook/4.4/dbpoolx.mod
+share/xml/docbook/4.4/docbook.cat
+share/xml/docbook/4.4/docbookx.dtd
+share/xml/docbook/4.4/ent/README
+share/xml/docbook/4.4/ent/isoamsa.ent
+share/xml/docbook/4.4/ent/isoamsb.ent
+share/xml/docbook/4.4/ent/isoamsc.ent
+share/xml/docbook/4.4/ent/isoamsn.ent
+share/xml/docbook/4.4/ent/isoamso.ent
+share/xml/docbook/4.4/ent/isoamsr.ent
+share/xml/docbook/4.4/ent/isobox.ent
+share/xml/docbook/4.4/ent/isocyr1.ent
+share/xml/docbook/4.4/ent/isocyr2.ent
+share/xml/docbook/4.4/ent/isodia.ent
+share/xml/docbook/4.4/ent/isogrk1.ent
+share/xml/docbook/4.4/ent/isogrk2.ent
+share/xml/docbook/4.4/ent/isogrk3.ent
+share/xml/docbook/4.4/ent/isogrk4.ent
+share/xml/docbook/4.4/ent/isolat1.ent
+share/xml/docbook/4.4/ent/isolat2.ent
+share/xml/docbook/4.4/ent/isonum.ent
+share/xml/docbook/4.4/ent/isopub.ent
+share/xml/docbook/4.4/ent/isotech.ent
+share/xml/docbook/4.4/htmltblx.mod
+share/xml/docbook/4.4/soextblx.dtd
+share/xml/docbook/4.3/ChangeLog
+share/xml/docbook/4.3/README
+share/xml/docbook/4.3/calstblx.dtd
+share/xml/docbook/4.3/catalog
+share/xml/docbook/4.3/dbcentx.mod
+share/xml/docbook/4.3/dbgenent.mod
+share/xml/docbook/4.3/dbhierx.mod
+share/xml/docbook/4.3/dbnotnx.mod
+share/xml/docbook/4.3/dbpoolx.mod
+share/xml/docbook/4.3/docbook.cat
+share/xml/docbook/4.3/docbookx.dtd
+share/xml/docbook/4.3/ent/iso-amsa.ent
+share/xml/docbook/4.3/ent/iso-amsb.ent
+share/xml/docbook/4.3/ent/iso-amsc.ent
+share/xml/docbook/4.3/ent/iso-amsn.ent
+share/xml/docbook/4.3/ent/iso-amso.ent
+share/xml/docbook/4.3/ent/iso-amsr.ent
+share/xml/docbook/4.3/ent/iso-box.ent
+share/xml/docbook/4.3/ent/iso-cyr1.ent
+share/xml/docbook/4.3/ent/iso-cyr2.ent
+share/xml/docbook/4.3/ent/iso-dia.ent
+share/xml/docbook/4.3/ent/iso-grk1.ent
+share/xml/docbook/4.3/ent/iso-grk2.ent
+share/xml/docbook/4.3/ent/iso-grk3.ent
+share/xml/docbook/4.3/ent/iso-grk4.ent
+share/xml/docbook/4.3/ent/iso-lat1.ent
+share/xml/docbook/4.3/ent/iso-lat2.ent
+share/xml/docbook/4.3/ent/iso-num.ent
+share/xml/docbook/4.3/ent/iso-pub.ent
+share/xml/docbook/4.3/ent/iso-tech.ent
+share/xml/docbook/4.3/htmltblx.mod
+share/xml/docbook/4.3/soextblx.dtd
+share/xml/docbook/4.2/ChangeLog
+share/xml/docbook/4.2/README
+share/xml/docbook/4.2/calstblx.dtd
+share/xml/docbook/4.2/catalog
+share/xml/docbook/4.2/dbcentx.mod
+share/xml/docbook/4.2/dbgenent.mod
+share/xml/docbook/4.2/dbhierx.mod
+share/xml/docbook/4.2/dbnotnx.mod
+share/xml/docbook/4.2/dbpoolx.mod
+share/xml/docbook/4.2/docbook.cat
+share/xml/docbook/4.2/docbookx.dtd
+share/xml/docbook/4.2/ent/iso-amsa.ent
+share/xml/docbook/4.2/ent/iso-amsb.ent
+share/xml/docbook/4.2/ent/iso-amsc.ent
+share/xml/docbook/4.2/ent/iso-amsn.ent
+share/xml/docbook/4.2/ent/iso-amso.ent
+share/xml/docbook/4.2/ent/iso-amsr.ent
+share/xml/docbook/4.2/ent/iso-box.ent
+share/xml/docbook/4.2/ent/iso-cyr1.ent
+share/xml/docbook/4.2/ent/iso-cyr2.ent
+share/xml/docbook/4.2/ent/iso-dia.ent
+share/xml/docbook/4.2/ent/iso-grk1.ent
+share/xml/docbook/4.2/ent/iso-grk2.ent
+share/xml/docbook/4.2/ent/iso-grk3.ent
+share/xml/docbook/4.2/ent/iso-grk4.ent
+share/xml/docbook/4.2/ent/iso-lat1.ent
+share/xml/docbook/4.2/ent/iso-lat2.ent
+share/xml/docbook/4.2/ent/iso-num.ent
+share/xml/docbook/4.2/ent/iso-pub.ent
+share/xml/docbook/4.2/ent/iso-tech.ent
+share/xml/docbook/4.2/soextblx.dtd
+@dirrm share/xml/docbook/4.4/ent
+@dirrm share/xml/docbook/4.4
+@dirrm share/xml/docbook/4.3/ent
+@dirrm share/xml/docbook/4.3
+@dirrm share/xml/docbook/4.2/ent
+@dirrm share/xml/docbook/4.2
 @dirrm share/xml/docbook
+@comment in xmlcatmgr: @dirrm share/xml
diff --git a/textproc/docbook-xml/distinfo b/textproc/docbook-xml/distinfo
index 86bb86174c4..8da95047af2 100644
--- a/textproc/docbook-xml/distinfo
+++ b/textproc/docbook-xml/distinfo
@@ -1,6 +1,11 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 14:48:41 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/09/30 15:24:20 wiz Exp $
 
 SHA1 (docbook-xml-4.2.zip) = 5e3a35663cd028c5c5fbb959c3858fec2d7f8b9e
 RMD160 (docbook-xml-4.2.zip) = 3ba17bf96ab2ab8fe6dc9ff82da8e22aaf9ce5e0
 Size (docbook-xml-4.2.zip) = 78428 bytes
-SHA1 (patch-aa) = 8f542a900baa9f14204af0c2b5d20adf2c29bb20
+SHA1 (docbook-xml-4.3.zip) = e79a59e9164c1013b8cc9f64f96f909a184ca016
+RMD160 (docbook-xml-4.3.zip) = deeb29ed336bcce6ed199c516f01bb1542ea16ee
+Size (docbook-xml-4.3.zip) = 83865 bytes
+SHA1 (docbook-xml-4.4.zip) = 7c4d91c82ad3747e1b5600c91782758e5d91c22b
+RMD160 (docbook-xml-4.4.zip) = 691a9230442be14d019af9d07e94f269824d85cc
+Size (docbook-xml-4.4.zip) = 96107 bytes
diff --git a/textproc/docbook-xml/patches/patch-aa b/textproc/docbook-xml/patches/patch-aa
deleted file mode 100644
index 2372829a4b2..00000000000
--- a/textproc/docbook-xml/patches/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/02/09 12:23:40 jmmv Exp $
-
---- catalog.xml.orig	2002-07-17 18:14:41.000000000 +0200
-+++ catalog.xml
-@@ -25,6 +25,9 @@
- <public publicId="-//OASIS//DTD DocBook XML V4.2//EN"
-         uri="docbookx.dtd"/>
- 
-+<public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
-+        uri="docbookx.dtd"/>
-+
- <!-- ...................................................................... -->
- <!-- DocBook modules ...................................................... -->
-