From 51912b22e7ff8b6da05b65635067947146cf44fe Mon Sep 17 00:00:00 2001 From: hubertf Date: Wed, 7 Jun 2000 20:32:00 +0000 Subject: Update to DocBook V4.0. Changes from DocBook V3.1 to DocBook V4.0: Markup: - RFE 17: Added a common attribute 'Condition' for generic effectivity - RFE 38: The nav.class elements (ToC|LoT|Index|Glossary|Bibliography) are now allowed at the beginning and end of components and sections - RFE 58: The 'optmult' and 'reqmult' attribute values have been removed from Group - RFE 65: Added several class attribute values to Filename and SystemItem at the request of the Linux community - RFE 73: Removed BookBiblio and SeriesInfo - RFE 81: Added SidebarInfo to Sidebar - RFE 87: Added 'xmlpi' and 'emptytag' as class values of SGMLTag - RFE 92: Added 'CO' to Synopsis and LiteralLayout - RFE 99: Added SimpleMsgEntry as an alternative to MsgEntry in order to provide a simpler MsgSet construct - RFE 103: Added RevDescription as an alternative to RevRemark in RevHistory; this allows longer descriptive text in a revision - RFE 104: Added 'Specification' to the list of document classes on Article - RFE 108: Allow admonitions in Answers - RFE 110: Allow a RevHistory on QandAEntry - RFE 115: Allow optional Title on OrderedList and ItemizedList - RFE 116: Added LineNumbering attribute to linespecific environments for presentation of line numbers - Added a common attribute 'Security' for effectivity - Added synopsis markup for modern programming languages (e.g, object oriented languages like Java, C++, and IDL) - Renamed DocInfo to PrefaceInfo, ChapterInfo, AppendixInfo, etc. Other: - RFE 88: Added PEs to include/ignore dbnotn.mod and dbcent.mod - RFE 102: Fixed some outstanding namecase problems - RFE 105: Added PNG notation - RFE 106: Removed some odd *.content PEs that interfered with customization layers - RFE 109: Added FPI to content of dbgenent.mod (for consistency) - RFE 111: Added the Euro symbol - Fixed bug in cals-tbl.dtd; a model group was used for the element declaration, but the attlist declaration used "Table" literally. --- textproc/docbook/Makefile | 14 ++++++++++---- textproc/docbook/files/catalog40 | 8 ++++++++ textproc/docbook/files/md5 | 3 ++- textproc/docbook/pkg/DESCR | 2 +- textproc/docbook/pkg/PLIST | 28 +++++++++++++++++++++------- 5 files changed, 42 insertions(+), 13 deletions(-) create mode 100644 textproc/docbook/files/catalog40 (limited to 'textproc/docbook') diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile index 6116c958cea..d68c6dda0cf 100644 --- a/textproc/docbook/Makefile +++ b/textproc/docbook/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.6 2000/05/12 18:18:18 drochner Exp $ +# $NetBSD: Makefile,v 1.7 2000/06/07 20:32:00 hubertf Exp $ # FreeBSD Id: Makefile,v 1.4 1998/06/27 05:19:35 asami Exp # -DISTNAME= docbook-3.1 +DISTNAME= docbook-4.0 CATEGORIES= textproc -MASTER_SITES= http://www.oasis-open.org/docbook/sgml/3.1/ \ +MASTER_SITES= 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 +DISTFILES= docbk241.zip docbk30.zip docbk31.zip docbk40.zip MAINTAINER= rh@NetBSD.ORG HOMEPAGE= http://www.ora.com/davenport/ @@ -27,6 +28,7 @@ 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 + @[ -d ${INSTDIR}/4.0 ] || ${MKDIR} ${INSTDIR}/4.0 do-install: @(cd ${INSTDIR}/2.4.1; unzip ${DISTDIR}/docbk241.zip) @@ -39,9 +41,13 @@ do-install: @(cd ${INSTDIR}/3.1; unzip ${DISTDIR}/docbk31.zip) @${INSTALL_DATA} ${FILESDIR}/catalog31 ${INSTDIR}/3.1/catalog @${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.1/catalog + @(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/* @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR} .include "../../mk/bsd.pkg.mk" diff --git a/textproc/docbook/files/catalog40 b/textproc/docbook/files/catalog40 new file mode 100644 index 00000000000..43e1cc66cec --- /dev/null +++ b/textproc/docbook/files/catalog40 @@ -0,0 +1,8 @@ +-- Catalog file for Docbook 4.0 + +PUBLIC "-//USA-DOD//DTD Table Model 951010//EN" "cals-tbl.dtd" +PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.0//EN" "dbpool.mod" +PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.0//EN" "dbhier.mod" +PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.0//EN" "dbgenent.mod" +PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.0//EN" "dbnotn.mod" +PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.0//EN" "dbcent.mod" diff --git a/textproc/docbook/files/md5 b/textproc/docbook/files/md5 index 1583c478e39..4144a81150d 100644 --- a/textproc/docbook/files/md5 +++ b/textproc/docbook/files/md5 @@ -1,5 +1,6 @@ -$NetBSD: md5,v 1.3 1999/06/27 14:17:59 drochner Exp $ +$NetBSD: md5,v 1.4 2000/06/07 20:32:02 hubertf Exp $ MD5 (docbk241.zip) = 1c2ad8f5ad5e2e06ba8840263901330d MD5 (docbk30.zip) = 9a7f5b1b7dd52d0ca4fb080619f0459c MD5 (docbk31.zip) = 432749c0c806dbae81c8bcb70da3b5d3 +MD5 (docbk40.zip) = fabcf7dd1d88b94797b7e5344389eab9 diff --git a/textproc/docbook/pkg/DESCR b/textproc/docbook/pkg/DESCR index 1dbf0cdc09c..b52297b21ec 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, 3.0 and 3.1. + This package contains DocBook versions 2.4.1, 3.0, 3.1 and 4.0. 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 a741cfdf77d..e6d1230fdc1 100644 --- a/textproc/docbook/pkg/PLIST +++ b/textproc/docbook/pkg/PLIST @@ -1,30 +1,31 @@ -@comment $NetBSD: PLIST,v 1.3 1999/06/27 14:17:59 drochner Exp $ +@comment $NetBSD: PLIST,v 1.4 2000/06/07 20:32:02 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 +share/sgml/docbook/2.4.1/catalog share/sgml/docbook/2.4.1/dbgenent.mod share/sgml/docbook/2.4.1/dbhier.mod share/sgml/docbook/2.4.1/dbpool.mod share/sgml/docbook/2.4.1/docbook.cat share/sgml/docbook/2.4.1/docbook.dcl share/sgml/docbook/2.4.1/docbook.dtd -share/sgml/docbook/2.4.1/catalog share/sgml/docbook/3.0/30chg.txt share/sgml/docbook/3.0/40issues.txt share/sgml/docbook/3.0/announce.txt share/sgml/docbook/3.0/cals-tbl.dtd +share/sgml/docbook/3.0/catalog share/sgml/docbook/3.0/dbgenent.mod share/sgml/docbook/3.0/dbhier.mod share/sgml/docbook/3.0/dbpool.mod 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/cals-tbl.dtd +share/sgml/docbook/3.1/catalog share/sgml/docbook/3.1/dbcent.mod share/sgml/docbook/3.1/dbgenent.mod share/sgml/docbook/3.1/dbhier.mod @@ -34,9 +35,22 @@ 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 +share/sgml/docbook/4.0/40chg.txt +share/sgml/docbook/4.0/50issues.txt +share/sgml/docbook/4.0/cals-tbl.dtd +share/sgml/docbook/4.0/catalog +share/sgml/docbook/4.0/dbcent.mod +share/sgml/docbook/4.0/dbgenent.mod +share/sgml/docbook/4.0/dbhier.mod +share/sgml/docbook/4.0/dbnotn.mod +share/sgml/docbook/4.0/dbpool.mod +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 +@dirrm share/sgml/docbook/4.0 @dirrm share/sgml/docbook/3.1 +@dirrm share/sgml/docbook/3.0 +@dirrm share/sgml/docbook/2.4.1 @dirrm share/sgml/docbook @unexec rmdir %D/share/sgml 2>/dev/null || true -- cgit v1.2.3