Changes 4.5:

Not known.

4 files changed, 75 insertions, 67 deletions

diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index 99890ad9af4..753e42034bc 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.42 2011/04/06 18:39:59 gdt Exp $
+# $NetBSD: Makefile,v 1.43 2011/04/14 10:33:41 adam Exp $
 
-DISTNAME=	docbook-4.4
-PKGREVISION=	3
+DISTNAME=	docbook-4.5
 CATEGORIES=	textproc
-MASTER_SITES=		http://www.oasis-open.org/docbook/sgml/4.4/
+MASTER_SITES=		http://www.oasis-open.org/docbook/sgml/4.5/
+SITES.docbook-4.4.zip=	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/
@@ -12,7 +12,7 @@ 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.3.zip docbook-4.4.zip
+		docbook-4.2.zip docbook-4.3.zip docbook-4.4.zip docbook-4.5.zip
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -21,24 +21,23 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.oasis-open.org/docbook/
 COMMENT=	SGML DTD designed for computer documentation
 
-BUILD_DEPENDS+=	unzip-[0-9]*:../../archivers/unzip
 DEPENDS+=	iso8879>=1986:../../textproc/iso8879
 
-WRKSRC=		${WRKDIR}
-USE_LANGUAGES=	# none
-USE_TOOLS+=	unzip
-EXTRACT_ONLY=	# nothing
+WRKSRC=			${WRKDIR}
+USE_LANGUAGES=		# none
+USE_TOOLS+=		unzip
+EXTRACT_ONLY=		# nothing
 
-INSTDIR=	${DESTDIR}${PREFIX}/share/sgml/docbook
-ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
+INSTDIR=		${DESTDIR}${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 4.3 4.4
+.for ver in 2.4.1 3.0 3.1 4.0 4.1 4.2 4.3 4.4 4.5
 SGML_CATALOGS+=	${PREFIX}/share/sgml/docbook/${ver}/catalog
 .endfor
 
 do-build:
-.for ver in 241 30 31 40 41 42 43 44
+.for ver in 241 30 31 40 41 42 43 44 45
 	${CP} ${FILESDIR}/catalog${ver} ${WRKDIR}
 	${CHMOD} +w ${WRKDIR}/catalog${ver}
 	${ECHO} "CATALOG \"${ISOCAT}\"" >> ${WRKDIR}/catalog${ver}
@@ -53,60 +52,20 @@ pre-install:
 	[ -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
+	[ -d ${INSTDIR}/4.5 ] || ${INSTALL_DATA_DIR} ${INSTDIR}/4.5
 
 do-install:
-	#
-	# 2.4.1:
-	#
-	(cd ${INSTDIR}/2.4.1 && ${UNZIP_CMD} ${DISTDIR}/docbk241.zip)
+.for ver in 2.4.1 3.0 3.1 4.0 4.1
+	(cd ${INSTDIR}/${ver} && ${UNZIP_CMD} ${DISTDIR}/docbk${ver:S/.//g}.zip)
+	${INSTALL_DATA} ${WRKDIR}/catalog${ver:S/.//g} ${INSTDIR}/${ver}/catalog
+	${CHMOD} ${SHAREMODE} ${INSTDIR}/${ver}/*
+.endfor
+.for ver in 4.2 4.3 4.4 4.5
+	(cd ${INSTDIR}/${ver} && ${UNZIP_CMD} ${DISTDIR}/docbook-${ver}.zip)
+	${INSTALL_DATA} ${WRKDIR}/catalog${ver:S/.//g} ${INSTDIR}/${ver}/catalog
+	${CHMOD} ${SHAREMODE} ${INSTDIR}/${ver}/*
+.endfor
 	${RM} -r ${INSTDIR}/2.4.1/iso-*
-	${INSTALL_DATA} ${WRKDIR}/catalog241 ${INSTDIR}/2.4.1/catalog
-	${CHMOD} ${SHAREMODE} ${INSTDIR}/2.4.1/*
-	#
-	# 3.0:
-	#
-	(cd ${INSTDIR}/3.0 && ${UNZIP_CMD} ${DISTDIR}/docbk30.zip)
-	${INSTALL_DATA} ${WRKDIR}/catalog30 ${INSTDIR}/3.0/catalog
-	${CHMOD} ${SHAREMODE} ${INSTDIR}/3.0/*
-	#
-	# 3.1:
-	#
-	(cd ${INSTDIR}/3.1 && ${UNZIP_CMD} ${DISTDIR}/docbk31.zip)
-	${INSTALL_DATA} ${WRKDIR}/catalog31 ${INSTDIR}/3.1/catalog
-	${CHMOD} ${SHAREMODE} ${INSTDIR}/3.1/*
-	#
-	# 4.0:
-	#
-	(cd ${INSTDIR}/4.0 && ${UNZIP_CMD} ${DISTDIR}/docbk40.zip)
-	${INSTALL_DATA} ${WRKDIR}/catalog40 ${INSTDIR}/4.0/catalog
-	${CHMOD} ${SHAREMODE} ${INSTDIR}/4.0/*
-	#
-	# 4.1:
-	#
-	(cd ${INSTDIR}/4.1 && ${UNZIP_CMD} ${DISTDIR}/docbk41.zip)
-	${INSTALL_DATA} ${WRKDIR}/catalog41 ${INSTDIR}/4.1/catalog
-	${CHMOD} ${SHAREMODE} ${INSTDIR}/4.1/*
-	#
-	# 4.2:
-	#
-	(cd ${INSTDIR}/4.2 && ${UNZIP_CMD} ${DISTDIR}/docbook-4.2.zip)
-	${INSTALL_DATA} ${WRKDIR}/catalog42 ${INSTDIR}/4.2/catalog
-	${CHMOD} ${SHAREMODE} ${INSTDIR}/4.2/*
-	#
-	# 4.3:
-	#
-	(cd ${INSTDIR}/4.3 && ${UNZIP_CMD} ${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_CMD} ${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}
 
 .include "../../textproc/xmlcatmgr/catalogs.mk"
diff --git a/textproc/docbook/PLIST b/textproc/docbook/PLIST
index ebd5619ae26..e22c6764823 100644
--- a/textproc/docbook/PLIST
+++ b/textproc/docbook/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:17:14 joerg Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/04/14 10:33:41 adam 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
@@ -110,3 +110,18 @@ 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
+share/sgml/docbook/4.5/README
+share/sgml/docbook/4.5/calstblx.dtd
+share/sgml/docbook/4.5/catalog
+share/sgml/docbook/4.5/catalog.xml
+share/sgml/docbook/4.5/dbcentx.mod
+share/sgml/docbook/4.5/dbgenent.mod
+share/sgml/docbook/4.5/dbhierx.mod
+share/sgml/docbook/4.5/dbnotnx.mod
+share/sgml/docbook/4.5/dbpoolx.mod
+share/sgml/docbook/4.5/docbook.cat
+share/sgml/docbook/4.5/docbook.dcl
+share/sgml/docbook/4.5/docbook.dtd
+share/sgml/docbook/4.5/docbookx.dtd
+share/sgml/docbook/4.5/htmltblx.mod
+share/sgml/docbook/4.5/soextblx.dtd
diff --git a/textproc/docbook/distinfo b/textproc/docbook/distinfo
index ae1311b1e0c..fcd942df07e 100644
--- a/textproc/docbook/distinfo
+++ b/textproc/docbook/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 14:48:41 agc Exp $
+$NetBSD: distinfo,v 1.6 2011/04/14 10:33:41 adam Exp $
 
 SHA1 (docbk241.zip) = fb314ca2a1eddef2c1e2db3eb3ffd15feff2f865
 RMD160 (docbk241.zip) = 8a78758d40da64bb0cc010ac713634d071e90394
@@ -24,3 +24,6 @@ Size (docbook-4.3.zip) = 66117 bytes
 SHA1 (docbook-4.4.zip) = 9a7343709c1f5093f93b234d04f3d7f440a84dd0
 RMD160 (docbook-4.4.zip) = 65a451c2783ea86ea471c180209e70444d30a5ab
 Size (docbook-4.4.zip) = 66879 bytes
+SHA1 (docbook-4.5.zip) = 5efeb22936ea30cdaf88053337de7966dfda02bd
+RMD160 (docbook-4.5.zip) = 79c86bd52dbcb3ac5ebc965b5f7c12073fc1a87f
+Size (docbook-4.5.zip) = 71252 bytes
diff --git a/textproc/docbook/files/catalog45 b/textproc/docbook/files/catalog45
new file mode 100644
index 00000000000..b74f52c73a7
--- /dev/null
+++ b/textproc/docbook/files/catalog45
@@ -0,0 +1,31 @@
+-- Catalog file for DocBook V4.5 --
+
+PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
+       "docbook.dtd"
+
+PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+       "docbookx.dtd"
+
+PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.5//EN"
+       "calstblx.dtd"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN"
+        "htmltblx.mod"
+
+PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+       "soextblx.dtd"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN"
+       "dbpoolx.mod"
+
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN"
+       "dbhierx.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.5//EN"
+       "dbgenent.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.5//EN"
+       "dbnotnx.mod"
+
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.5//EN"
+       "dbcentx.mod"