install version 3.1 too

fetch files from new master site www.oasis-open.org (sadly, .zip only)

5 files changed, 48 insertions, 12 deletions

diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index 0f250e27337..3187c7fd513 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.3 1999/04/23 12:33:19 kleink Exp $
+# $NetBSD: Makefile,v 1.4 1999/06/27 14:17:59 drochner Exp $
 # FreeBSD Id: Makefile,v 1.4 1998/06/27 05:19:35 asami Exp
 #
 
-DISTNAME=	docbook-3.0
+DISTNAME=	docbook-3.1
 CATEGORIES=	textproc
-MASTER_SITES=	ftp://ftp.ora.com/pub/davenport/ \
-		ftp://ftp.wu-wien.ac.at/pub/sgml/davenport/
-DISTFILES=	docbk241.tar.Z docbk30.tar.Z
+MASTER_SITES=	http://www.oasis-open.org/docbook/docbook/3.1/ \
+		http://www.oasis-open.org/docbook/docbook/3.0/ \
+		http://www.oasis-open.org/docbook/docbook/2.4.1/
+DISTFILES=	docbk241.zip docbk30.zip docbk31.zip
 
 MAINTAINER=	rh@NetBSD.ORG
 HOMEPAGE=	http://www.ora.com/davenport/
 
+BUILD_DEPENDS=	unzip:../../archivers/unzip
 DEPENDS+=	iso8879-1986:../../textproc/iso8879
 
 NO_MTREE=       yes
@@ -24,16 +26,22 @@ ISOCAT=		${PREFIX}/share/sgml/iso8879/catalog
 pre-install:
 	@[ -d ${INSTDIR}/2.4.1 ] || ${MKDIR} ${INSTDIR}/2.4.1
 	@[ -d ${INSTDIR}/3.0 ] || ${MKDIR} ${INSTDIR}/3.0
+	@[ -d ${INSTDIR}/3.1 ] || ${MKDIR} ${INSTDIR}/3.1
 
 do-install:
-	@zcat ${DISTDIR}/docbk241.tar.Z |(cd ${INSTDIR}/2.4.1; pax -r)
+	@(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
-	@zcat ${DISTDIR}/docbk30.tar.Z |(cd ${INSTDIR}/3.0; pax -r)
+	@(cd ${INSTDIR}/3.0; unzip ${DISTDIR}/docbk30.zip)
 	@${INSTALL_DATA} ${FILESDIR}/catalog30 ${INSTDIR}/3.0/catalog
 	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.0/catalog
+	@(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}/2.4.1/*
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/3.0/*
+	@${CHMOD} ${SHAREMODE} ${INSTDIR}/3.1/*
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/docbook/files/catalog31 b/textproc/docbook/files/catalog31
new file mode 100644
index 00000000000..26b165d82b0
--- /dev/null
+++ b/textproc/docbook/files/catalog31
@@ -0,0 +1,10 @@
+-- Catalog file for Docbook 3.1 --
+
+-- DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl" --
+PUBLIC "-//OASIS//DTD DocBook V3.1//EN" "docbook.dtd"
+PUBLIC "-//USA-DOD//DTD Table Model 951010//EN" "cals-tbl.dtd"
+PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V3.1//EN" "dbpool.mod"
+PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V3.1//EN" "dbhier.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V3.1//EN" "dbgenent.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook Notations V3.1//EN" "dbnotn.mod"
+PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V3.1//EN" "dbcent.mod"
diff --git a/textproc/docbook/files/md5 b/textproc/docbook/files/md5
index d4424652c92..1583c478e39 100644
--- a/textproc/docbook/files/md5
+++ b/textproc/docbook/files/md5
@@ -1,4 +1,5 @@
-$NetBSD: md5,v 1.2 1999/03/14 15:44:55 rh Exp $
+$NetBSD: md5,v 1.3 1999/06/27 14:17:59 drochner Exp $
 
-MD5 (docbk241.tar.Z) = 3991798ddca05a72fbe7c8dfb10c50c1
-MD5 (docbk30.tar.Z) = 09bb7511c5f58ead035a4747400ac93d
+MD5 (docbk241.zip) = 1c2ad8f5ad5e2e06ba8840263901330d
+MD5 (docbk30.zip) = 9a7f5b1b7dd52d0ca4fb080619f0459c
+MD5 (docbk31.zip) = 432749c0c806dbae81c8bcb70da3b5d3
diff --git a/textproc/docbook/pkg/DESCR b/textproc/docbook/pkg/DESCR
index 0d6219c48dc..1dbf0cdc09c 100644
--- a/textproc/docbook/pkg/DESCR
+++ b/textproc/docbook/pkg/DESCR
@@ -7,7 +7,7 @@ maintained by the Davenport Group (about which see the Davenport
 archive at http://www.ora.com/davenport/ or
 ftp://ftp.ora.com/pub/davenport/).
 
-  This package contains DocBook versions 2.4.1 and 3.0.
+  This package contains DocBook versions 2.4.1, 3.0 and 3.1.
 
   Some documentation for DocBook is available in ASCII and PDF
 at http://www.freebsd.org/~wosch/docbook/
diff --git a/textproc/docbook/pkg/PLIST b/textproc/docbook/pkg/PLIST
index 1ecd7ea0021..a741cfdf77d 100644
--- a/textproc/docbook/pkg/PLIST
+++ b/textproc/docbook/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 1999/03/14 15:44:56 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 1999/06/27 14:17:59 drochner 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
 share/sgml/docbook/2.4.1/dbgenent.mod
 share/sgml/docbook/2.4.1/dbhier.mod
@@ -19,7 +20,23 @@ share/sgml/docbook/3.0/docbook.cat
 share/sgml/docbook/3.0/docbook.dcl
 share/sgml/docbook/3.0/docbook.dtd
 share/sgml/docbook/3.0/catalog
+share/sgml/docbook/3.1/31chg.txt
+share/sgml/docbook/3.1/40issues.txt
+share/sgml/docbook/3.1/50issues.txt
+share/sgml/docbook/3.1/cals-tbl.dtd
+share/sgml/docbook/3.1/ChangeLog
+share/sgml/docbook/3.1/dbcent.mod
+share/sgml/docbook/3.1/dbgenent.mod
+share/sgml/docbook/3.1/dbhier.mod
+share/sgml/docbook/3.1/dbnotn.mod
+share/sgml/docbook/3.1/dbpool.mod
+share/sgml/docbook/3.1/docbook.cat
+share/sgml/docbook/3.1/docbook.dcl
+share/sgml/docbook/3.1/docbook.dtd
+share/sgml/docbook/3.1/readme.txt
+share/sgml/docbook/3.1/catalog
 @dirrm share/sgml/docbook/2.4.1
 @dirrm share/sgml/docbook/3.0
+@dirrm share/sgml/docbook/3.1
 @dirrm share/sgml/docbook
 @unexec rmdir %D/share/sgml 2>/dev/null || true