Update to 4.1. Changes:

No user-visible changes; removed some 4.0 future use comments that had
accidentally been left in the DTD and fixed a couple of incorrect FPIs.
See 40chg.txt for a list of the significant changes.

3 files changed, 50 insertions, 8 deletions

diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index d68c6dda0cf..4c67fca24f3 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,14 +1,16 @@
-# $NetBSD: Makefile,v 1.7 2000/06/07 20:32:00 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2000/06/27 00:51:40 hubertf Exp $
 # FreeBSD Id: Makefile,v 1.4 1998/06/27 05:19:35 asami Exp
 #
 
 DISTNAME=	docbook-4.0
 CATEGORIES=	textproc
-MASTER_SITES=	http://www.oasis-open.org/docbook/sgml/4.0/ \
+MASTER_SITES=	\
+		http://www.oasis-open.org/docbook/sgml/4.1/ \
+		http://www.oasis-open.org/docbook/sgml/4.0/ \
 		http://www.oasis-open.org/docbook/sgml/3.1/ \
 		http://www.oasis-open.org/docbook/sgml/3.0/ \
 		http://www.oasis-open.org/docbook/sgml/2.4.1/
-DISTFILES=	docbk241.zip docbk30.zip docbk31.zip docbk40.zip
+DISTFILES=	docbk241.zip docbk30.zip docbk31.zip docbk40.zip docbk41.zip
 
 MAINTAINER=	rh@NetBSD.ORG
 HOMEPAGE=	http://www.ora.com/davenport/
@@ -29,25 +31,48 @@ pre-install:
 	@[ -d ${INSTDIR}/3.0 ] || ${MKDIR} ${INSTDIR}/3.0
 	@[ -d ${INSTDIR}/3.1 ] || ${MKDIR} ${INSTDIR}/3.1
 	@[ -d ${INSTDIR}/4.0 ] || ${MKDIR} ${INSTDIR}/4.0
+	@[ -d ${INSTDIR}/4.1 ] || ${MKDIR} ${INSTDIR}/4.1
 
 do-install:
+	#
+	# 2.4.1:
+	# 
 	@(cd ${INSTDIR}/2.4.1; unzip ${DISTDIR}/docbk241.zip)
 	@${RM} -r ${INSTDIR}/2.4.1/iso-*
 	@${INSTALL_DATA} ${FILESDIR}/catalog241 ${INSTDIR}/2.4.1/catalog
 	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/2.4.1/catalog
+	@${CHMOD} ${SHAREMODE} ${INSTDIR}/2.4.1/*
+	#
+	# 3.0:
+	# 
 	@(cd ${INSTDIR}/3.0; unzip ${DISTDIR}/docbk30.zip)
 	@${INSTALL_DATA} ${FILESDIR}/catalog30 ${INSTDIR}/3.0/catalog
 	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.0/catalog
+	@${CHMOD} ${SHAREMODE} ${INSTDIR}/3.0/*
+	#
+	# 3.1:
+	# 
 	@(cd ${INSTDIR}/3.1; unzip ${DISTDIR}/docbk31.zip)
 	@${INSTALL_DATA} ${FILESDIR}/catalog31 ${INSTDIR}/3.1/catalog
 	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.1/catalog
+	@${CHMOD} ${SHAREMODE} ${INSTDIR}/3.1/*
+	#
+	# 4.0:
+	# 
 	@(cd ${INSTDIR}/4.0; unzip ${DISTDIR}/docbk40.zip)
 	@${INSTALL_DATA} ${FILESDIR}/catalog40 ${INSTDIR}/4.0/catalog
 	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.0/catalog
-	@${CHMOD} ${SHAREMODE} ${INSTDIR}/2.4.1/*
-	@${CHMOD} ${SHAREMODE} ${INSTDIR}/3.0/*
-	@${CHMOD} ${SHAREMODE} ${INSTDIR}/3.1/*
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/4.0/*
+	#
+	# 4.1:
+	# 
+	@(cd ${INSTDIR}/4.1; unzip ${DISTDIR}/docbk41.zip)
+	@${EGREP} '^PUBLIC.*(DocBook|Table)' ${INSTDIR}/4.1/docbook.cat >${INSTDIR}/4.1/catalog
+	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/4.1/catalog
+	@${CHMOD} ${SHAREMODE} ${INSTDIR}/4.1/*
+	#
+	# General cleanup
+	#
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook/files/md5 b/textproc/docbook/files/md5
index 4144a81150d..deedc8be1e2 100644
--- a/textproc/docbook/files/md5
+++ b/textproc/docbook/files/md5
@@ -1,6 +1,7 @@
-$NetBSD: md5,v 1.4 2000/06/07 20:32:02 hubertf Exp $
+$NetBSD: md5,v 1.5 2000/06/27 00:51:41 hubertf Exp $
 
 MD5 (docbk241.zip) = 1c2ad8f5ad5e2e06ba8840263901330d
 MD5 (docbk30.zip) = 9a7f5b1b7dd52d0ca4fb080619f0459c
 MD5 (docbk31.zip) = 432749c0c806dbae81c8bcb70da3b5d3
 MD5 (docbk40.zip) = fabcf7dd1d88b94797b7e5344389eab9
+MD5 (docbk41.zip) = 489f6ff2a2173eb1e14216c10533ede2
diff --git a/textproc/docbook/pkg/PLIST b/textproc/docbook/pkg/PLIST
index e6d1230fdc1..6fd9893efa3 100644
--- a/textproc/docbook/pkg/PLIST
+++ b/textproc/docbook/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2000/06/07 20:32:02 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.5 2000/06/27 00:51:42 hubertf 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
@@ -48,6 +48,22 @@ share/sgml/docbook/4.0/docbook.cat
 share/sgml/docbook/4.0/docbook.dcl
 share/sgml/docbook/4.0/docbook.dtd
 share/sgml/docbook/4.0/readme.txt
+share/sgml/docbook/4.1/40chg.txt
+share/sgml/docbook/4.1/41chg.txt
+share/sgml/docbook/4.1/50issues.txt
+share/sgml/docbook/4.1/ChangeLog
+share/sgml/docbook/4.1/cals-tbl.dtd
+share/sgml/docbook/4.1/catalog
+share/sgml/docbook/4.1/dbcent.mod
+share/sgml/docbook/4.1/dbgenent.mod
+share/sgml/docbook/4.1/dbhier.mod
+share/sgml/docbook/4.1/dbnotn.mod
+share/sgml/docbook/4.1/dbpool.mod
+share/sgml/docbook/4.1/docbook.cat
+share/sgml/docbook/4.1/docbook.dcl
+share/sgml/docbook/4.1/docbook.dtd
+share/sgml/docbook/4.1/readme.txt
+@dirrm share/sgml/docbook/4.1
 @dirrm share/sgml/docbook/4.0
 @dirrm share/sgml/docbook/3.1
 @dirrm share/sgml/docbook/3.0