]> git.ipfire.org Git - people/arne_f/ipfire-3.x.git/commitdiff
docbook-dtds: Convert package to new layout.
authorStefan Schantl <stefan.schantl@ipfire.org>
Fri, 7 Oct 2011 16:09:00 +0000 (18:09 +0200)
committerStefan Schantl <stefan.schantl@ipfire.org>
Fri, 7 Oct 2011 16:09:48 +0000 (18:09 +0200)
pkgs/core/docbook-dtds/docbook-dtds.nm [deleted file]
pkgs/core/docbook-dtds/patches/docbook-4.2-euro.patch [deleted file]
pkgs/core/docbook-dtds/patches/docbook-dtd30-sgml-1.0.catalog.patch [deleted file]
pkgs/core/docbook-dtds/patches/docbook-dtd31-sgml-1.0.catalog.patch [deleted file]
pkgs/core/docbook-dtds/patches/docbook-dtd40-sgml-1.0.catalog.patch [deleted file]
pkgs/core/docbook-dtds/patches/docbook-dtd41-sgml-1.0.catalog.patch [deleted file]
pkgs/core/docbook-dtds/patches/docbook-dtd412-entities.patch [deleted file]
pkgs/core/docbook-dtds/patches/docbook-dtd42-sgml-1.0.catalog.patch [deleted file]
pkgs/core/docbook-dtds/patches/docbook-dtds-ents.patch [deleted file]
pkgs/core/docbook-dtds/patches/docbook-sgml-systemrewrite.patch [deleted file]
unzip/unzip.nm

diff --git a/pkgs/core/docbook-dtds/docbook-dtds.nm b/pkgs/core/docbook-dtds/docbook-dtds.nm
deleted file mode 100644 (file)
index 5c5cbf8..0000000
+++ /dev/null
@@ -1,133 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt                 #
-#                                                                             #
-# This program is free software: you can redistribute it and/or modify        #
-# it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation, either version 3 of the License, or           #
-# (at your option) any later version.                                         #
-#                                                                             #
-# This program is distributed in the hope that it will be useful,             #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
-# GNU General Public License for more details.                                #
-#                                                                             #
-# You should have received a copy of the GNU General Public License           #
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include $(PKGROOT)/Include
-
-PKG_NAME       = docbook-dtds
-PKG_VER        = 1.0
-PKG_REL        = 0
-
-PKG_MAINTAINER =
-PKG_GROUP      = Applications/Text
-PKG_URL        = http://www.oasis-open.org/docbook/
-PKG_LICENSE    = Copyright only
-PKG_SUMMARY    = SGML and XML document type definitions for DocBook.
-
-PKG_BUILD_DEPS+= dos2unix unzip
-
-define PKG_DESCRIPTION
-       The DocBook Document Type Definition (DTD) describes the syntax of \
-       technical documentation texts (articles, books and manual pages). \
-       This syntax is XML-compliant and is developed by the OASIS consortium. \
-       This package contains SGML and XML versions of the DocBook DTD.
-endef
-
-# TODO XXX post-installation stuff
-
-PKG_OBJECTS += \
-       docbk30.zip \
-       docbk31.zip \
-       docbk40.zip \
-       docbk41.zip \
-       docbkx412.zip \
-       docbook-4.2.zip \
-       docbook-xml-4.2.zip \
-       docbook-4.3.zip \
-       docbook-xml-4.3.zip \
-       docbook-4.4.zip \
-       docbook-xml-4.4.zip \
-       docbook-4.5.zip \
-       docbook-xml-4.5.zip
-
-DIRECTORIES = \
-       3.0-sgml \
-       3.1-sgml \
-       4.0-sgml \
-       4.1-sgml \
-       4.1.2-xml \
-       4.2-sgml \
-       4.2-xml \
-       4.3-sgml \
-       4.3-xml \
-       4.4-sgml \
-       4.4-xml \
-       4.5-sgml \
-       4.5-xml
-
-DIR_APP = $(DIR_SRC)/$(PKG_NAME)-$(PKG_VER)
-
-define MACRO_EXTRACT
-       mkdir -pv $(DIR_APP)/$(2)
-       cd $(DIR_APP)/$(2) && unzip $(DIR_DL)/$(1)
-
-endef
-
-define STAGE_PREPARE
-       $(call MACRO_EXTRACT,docbk30.zip,3.0-sgml)
-       $(call MACRO_EXTRACT,docbk31.zip,3.1-sgml)
-       $(call MACRO_EXTRACT,docbk40.zip,4.0-sgml)
-       $(call MACRO_EXTRACT,docbk41.zip,4.1-sgml)
-       $(call MACRO_EXTRACT,docbkx412.zip,4.1.2-xml)
-       $(call MACRO_EXTRACT,docbook-4.2.zip,4.2-sgml)
-       $(call MACRO_EXTRACT,docbook-xml-4.2.zip,4.2-xml)
-       $(call MACRO_EXTRACT,docbook-4.3.zip,4.3-sgml)
-       $(call MACRO_EXTRACT,docbook-xml-4.3.zip,4.3-xml)
-       $(call MACRO_EXTRACT,docbook-4.4.zip,4.4-sgml)
-       $(call MACRO_EXTRACT,docbook-xml-4.4.zip,4.4-xml)
-       $(call MACRO_EXTRACT,docbook-4.5.zip,4.5-sgml)
-       $(call MACRO_EXTRACT,docbook-xml-4.5.zip,4.5-xml)
-
-       # Convert all catalog files to unix format
-       cd $(DIR_APP) && dos2unix */docbook.cat
-
-       $(DO_PATCHES)
-
-       cd $(DIR_APP) && sed -e's,\(NAMELEN\s\+\)44\(\s\*\)\?,\1256,' -i.namelen */docbook.dcl
-       cd $(DIR_APP) && sed -i 's/\r//' */*.txt
-       cd $(DIR_APP) && chown -R root:root .
-       cd $(DIR_APP) && chmod -R a+rX,g-w,o-w .
-endef
-
-STAGE_BUILD = # Nothing to do
-
-define STAGE_INSTALL
-       -mkdir -pv $(BUILDROOT)/etc/sgml
-       for fmt in sgml xml; do \
-               ln -svf $${fmt}-docbook-4.5.cat $(BUILDROOT)/etc/sgml/$${fmt}-docbook.cat; \
-       done
-
-       for dir in $(DIRECTORIES); do \
-               fmt=$${dir#*-}; ver=$${dir%%-*}; \
-               cd $(DIR_APP)/$${dir}; \
-               DESTDIR=$(BUILDROOT)/usr/share/sgml/docbook/$${fmt}-dtd-$${ver}; \
-                       mkdir -pv $${DESTDIR}; \
-                       case $${fmt} in \
-                               sgml)   mkdir -pv $${DESTDIR}; install -v *.dcl $${DESTDIR} ;; \
-                               xml)    mkdir -pv $${DESTDIR}/ent; install -v ent/* $${DESTDIR}/ent ;; \
-                       esac; \
-               install -v *.dtd *.mod $${DESTDIR}; \
-               install -v docbook.cat $${DESTDIR}/catalog; \
-               touch $(BUILDROOT)/etc/sgml/$${dir#*-}-docbook-$${ver}.cat; \
-       done
-endef
diff --git a/pkgs/core/docbook-dtds/patches/docbook-4.2-euro.patch b/pkgs/core/docbook-dtds/patches/docbook-4.2-euro.patch
deleted file mode 100644 (file)
index bbace5d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
---- docbook-dtds-1.0/4.2-sgml/docbookx.dtd.euro        2003-07-15 09:07:58.000000000 +0100
-+++ docbook-dtds-1.0/4.2-sgml/docbookx.dtd     2003-07-15 09:08:12.000000000 +0100
-@@ -106,7 +106,7 @@
- <![%dbcent.module;[
- <![%sgml.features;[
--<!ENTITY euro "[euro  ]"><!-- euro sign, U+20AC NEW -->
-+<!ENTITY euro SDATA "[euro  ]"><!-- euro sign, U+20AC NEW -->
- ]]>
- <![%xml.features;[
- <!ENTITY euro "&#x20AC;"><!-- euro sign, U+20AC NEW -->
---- docbook-dtds-1.0/4.2-xml/docbookx.dtd.euro 2003-07-15 09:08:02.000000000 +0100
-+++ docbook-dtds-1.0/4.2-xml/docbookx.dtd      2003-07-15 09:08:21.000000000 +0100
-@@ -106,7 +106,7 @@
- <![%dbcent.module;[
- <![%sgml.features;[
--<!ENTITY euro "[euro  ]"><!-- euro sign, U+20AC NEW -->
-+<!ENTITY euro SDATA "[euro  ]"><!-- euro sign, U+20AC NEW -->
- ]]>
- <![%xml.features;[
- <!ENTITY euro "&#x20AC;"><!-- euro sign, U+20AC NEW -->
diff --git a/pkgs/core/docbook-dtds/patches/docbook-dtd30-sgml-1.0.catalog.patch b/pkgs/core/docbook-dtds/patches/docbook-dtd30-sgml-1.0.catalog.patch
deleted file mode 100644 (file)
index 81bff59..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/3.0-sgml/docbook.cat     Tue Dec 10 16:35:22 1996
-+++ b/3.0-sgml/catalog Mon Jun  5 11:08:34 2000
-@@ -27,7 +27,7 @@
-   -- ...................................................................... --
-   -- SGML declaration associated with DocBook ............................. --
--DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl"
-+SGMLDECL "docbook.dcl"
-   -- ...................................................................... --
-   -- DocBook driver file .................................................. --
-@@ -41,29 +41,6 @@
- PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V3.0//EN" "dbpool.mod"
- PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V3.0//EN" "dbhier.mod"
- PUBLIC "-//Davenport//ENTITIES DocBook Additional General Entities V3.0//EN" "dbgenent.mod"
--
--  -- ...................................................................... --
--  -- ISO entity sets ...................................................... --
--
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
-   -- End of catalog data for DocBook V3.0 ................................. --
-   -- ...................................................................... --
diff --git a/pkgs/core/docbook-dtds/patches/docbook-dtd31-sgml-1.0.catalog.patch b/pkgs/core/docbook-dtds/patches/docbook-dtd31-sgml-1.0.catalog.patch
deleted file mode 100644 (file)
index d4789b3..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/3.1-sgml/docbook.cat     Tue Feb  2 06:53:32 1999
-+++ b/3.1-sgml/catalog Thu May 25 11:45:01 2000
-@@ -19,7 +19,7 @@
-   -- ...................................................................... --
-   -- SGML declaration associated with DocBook ............................. --
--DTDDECL "-//OASIS//DTD DocBook V3.1//EN" "docbook.dcl"
-+SGMLDECL "docbook.dcl"
-   -- ...................................................................... --
-   -- DocBook driver file .................................................. --
-@@ -35,29 +35,6 @@
- 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"
--
--  -- ...................................................................... --
--  -- ISO entity sets ...................................................... --
--
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
-   -- End of catalog data for DocBook V3.1 ................................. --
-   -- ...................................................................... --
diff --git a/pkgs/core/docbook-dtds/patches/docbook-dtd40-sgml-1.0.catalog.patch b/pkgs/core/docbook-dtds/patches/docbook-dtd40-sgml-1.0.catalog.patch
deleted file mode 100644 (file)
index 367279f..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/4.0-sgml/docbook.cat     Mon May 22 22:38:05 2000
-+++ b/4.0-sgml/catalog Mon May 22 22:12:36 2000
-@@ -19,7 +19,7 @@
-   -- ...................................................................... --
-   -- SGML declaration associated with DocBook ............................. --
--DTDDECL "-//OASIS//DTD DocBook V4.0//EN" "docbook.dcl"
-+SGMLDECL "docbook.dcl"
-   -- ...................................................................... --
-   -- DocBook driver file .................................................. --
-@@ -35,29 +35,6 @@
- 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"
--
--  -- ...................................................................... --
--  -- ISO entity sets ...................................................... --
--
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
-   -- End of catalog data for DocBook V4.0 ................................. --
-   -- ...................................................................... --
diff --git a/pkgs/core/docbook-dtds/patches/docbook-dtd41-sgml-1.0.catalog.patch b/pkgs/core/docbook-dtds/patches/docbook-dtd41-sgml-1.0.catalog.patch
deleted file mode 100644 (file)
index 2a10e7d..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/4.1-sgml/docbook.cat     Mon May 22 22:38:05 2000
-+++ b/4.1-sgml/catalog Mon May 22 22:12:36 2000
-@@ -19,7 +19,7 @@
-   -- ...................................................................... --
-   -- SGML declaration associated with DocBook ............................. --
--DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl"
-+SGMLDECL "docbook.dcl"
-   -- ...................................................................... --
-   -- DocBook driver file .................................................. --
-@@ -35,29 +35,6 @@
- PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.1//EN" "dbgenent.mod"
- PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.1//EN" "dbnotn.mod"
- PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.1//EN" "dbcent.mod"
--
--  -- ...................................................................... --
--  -- ISO entity sets ...................................................... --
--
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "iso-pub.gml"
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "iso-tech.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "iso-lat1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "iso-lat2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "iso-grk1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "iso-grk2.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "iso-grk3.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "iso-grk4.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "iso-amsa.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "iso-amsb.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "iso-amsc.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "iso-amsn.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "iso-amso.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "iso-amsr.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "iso-box.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "iso-cyr1.gml"
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "iso-cyr2.gml"
-   -- End of catalog data for DocBook V4.1 ................................. --
-   -- ...................................................................... --
diff --git a/pkgs/core/docbook-dtds/patches/docbook-dtd412-entities.patch b/pkgs/core/docbook-dtds/patches/docbook-dtd412-entities.patch
deleted file mode 100644 (file)
index 39a7bb2..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat
---- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat        2009-02-19 13:49:08.000000000 +0100
-+++ docbook-dtds-1.0/4.1.2-xml/docbook.cat     2009-02-19 13:50:59.000000000 +0100
-@@ -41,25 +41,25 @@ PUBLIC "-//OASIS//ENTITIES DocBook XML C
-   -- ...................................................................... --
-   -- ISO entity sets ...................................................... --
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "ent/iso-dia.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "ent/iso-num.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN" "ent/iso-pub.ent"
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN" "ent/iso-tech.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN" "ent/iso-lat1.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN" "ent/iso-lat2.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN" "ent/iso-grk1.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN" "ent/iso-grk2.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN" "ent/iso-grk3.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN" "ent/iso-grk4.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN" "ent/iso-amsa.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN" "ent/iso-amsb.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN" "ent/iso-amsc.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN" "ent/iso-amsn.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN" "ent/iso-amso.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN" "ent/iso-amsr.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN" "ent/iso-box.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN" "ent/iso-cyr1.ent"
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN" "ent/iso-cyr2.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML" "ent/iso-dia.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML" "ent/iso-num.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN//XML" "ent/iso-pub.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN//XML" "ent/iso-tech.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN//XML" "ent/iso-lat1.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN//XML" "ent/iso-lat2.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN//XML" "ent/iso-grk1.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML" "ent/iso-grk2.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN//XML" "ent/iso-grk3.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML" "ent/iso-grk4.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML" "ent/iso-amsa.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML" "ent/iso-amsb.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML" "ent/iso-amsc.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML" "ent/iso-amsn.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML" "ent/iso-amso.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML" "ent/iso-amsr.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML" "ent/iso-box.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML" "ent/iso-cyr1.ent"
-+PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML" "ent/iso-cyr2.ent"
-   -- End of catalog data for DocBook XML V4.1.2 ............................. --
-   -- ...................................................................... --
diff --git a/pkgs/core/docbook-dtds/patches/docbook-dtd42-sgml-1.0.catalog.patch b/pkgs/core/docbook-dtds/patches/docbook-dtd42-sgml-1.0.catalog.patch
deleted file mode 100644 (file)
index d0b2cc3..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/4.2-sgml/docbook.cat.orig        2002-07-17 17:14:28.000000000 +0100
-+++ b/4.2-sgml/docbook.cat     2002-07-17 21:58:24.000000000 +0100
-@@ -49,65 +49,5 @@
- PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.2//EN"
-        "dbcentx.mod"
--  -- ...................................................................... --
--  -- ISO entity sets ...................................................... --
--
--PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
--       "iso-dia.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN"
--       "iso-num.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Publishing//EN"
--       "iso-pub.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES General Technical//EN"
--       "iso-tech.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 1//EN"
--       "iso-lat1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Latin 2//EN"
--       "iso-lat2.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Greek Letters//EN"
--       "iso-grk1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Monotoniko Greek//EN"
--       "iso-grk2.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Greek Symbols//EN"
--       "iso-grk3.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN"
--       "iso-grk4.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN"
--       "iso-amsa.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN"
--       "iso-amsb.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN"
--       "iso-amsc.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN"
--       "iso-amsn.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN"
--       "iso-amso.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN"
--       "iso-amsr.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Box and Line Drawing//EN"
--       "iso-box.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Russian Cyrillic//EN"
--       "iso-cyr1.gml"
--
--PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
--       "iso-cyr2.gml"
--
-   -- End of catalog data for DocBook V4.2 ................................. --
-   -- ...................................................................... --
diff --git a/pkgs/core/docbook-dtds/patches/docbook-dtds-ents.patch b/pkgs/core/docbook-dtds/patches/docbook-dtds-ents.patch
deleted file mode 100644 (file)
index bc45628..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
---- docbook-dtds-1.0/4.3-sgml/docbook.cat.ents 2005-12-13 13:14:24.000000000 +0000
-+++ docbook-dtds-1.0/4.3-sgml/docbook.cat      2005-12-13 13:14:38.000000000 +0000
-@@ -51,6 +51,7 @@
-   -- ...................................................................... --
-   -- ISO entity sets ...................................................... --
-+--
- PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
-        "iso-dia.gml"
-@@ -109,5 +110,6 @@
- PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
-        "iso-cyr2.gml"
-+--
-   -- End of catalog data for DocBook V4.3 ................................. --
-   -- ...................................................................... --
---- docbook-dtds-1.0/4.4-sgml/docbook.cat.ents 2005-12-13 13:14:51.000000000 +0000
-+++ docbook-dtds-1.0/4.4-sgml/docbook.cat      2005-12-13 13:14:59.000000000 +0000
-@@ -54,6 +54,7 @@
-   -- ...................................................................... --
-   -- ISO entity sets ...................................................... --
-+--
- PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
-        "iso-dia.gml"
-@@ -112,5 +113,6 @@
- PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
-        "iso-cyr2.gml"
-+--
-   -- End of catalog data for DocBook V4.4 ................................. --
-   -- ...................................................................... --
-diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2009-02-19 13:45:22.000000000 +0100
-+++ docbook-dtds-1.0/4.5-sgml/docbook.cat      2009-02-19 13:47:31.000000000 +0100
-@@ -60,6 +60,7 @@ PUBLIC "-//OASIS//ENTITIES DocBook Chara
-   -- ...................................................................... --
-   -- ISO entity sets ...................................................... --
-+--
- PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN"
-        "iso-dia.gml"
-@@ -118,5 +119,7 @@ PUBLIC "ISO 8879:1986//ENTITIES Russian 
- PUBLIC "ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN"
-        "iso-cyr2.gml"
-+--
-+
-   -- End of catalog data for DocBook V4.5 ................................. --
-   -- ...................................................................... --
diff --git a/pkgs/core/docbook-dtds/patches/docbook-sgml-systemrewrite.patch b/pkgs/core/docbook-dtds/patches/docbook-sgml-systemrewrite.patch
deleted file mode 100644 (file)
index 4adbc50..0000000
+++ /dev/null
@@ -1,210 +0,0 @@
-diff -urNp docbook-dtds-1.0-orig/3.0-sgml/docbook.cat docbook-dtds-1.0/3.0-sgml/docbook.cat
---- docbook-dtds-1.0-orig/3.0-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100
-+++ docbook-dtds-1.0/3.0-sgml/docbook.cat      2009-02-05 16:48:58.000000000 +0100
-@@ -30,6 +30,12 @@
- SGMLDECL "docbook.dcl"
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd"
-+       "docbook.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
-diff -urNp docbook-dtds-1.0-orig/3.1-sgml/docbook.cat docbook-dtds-1.0/3.1-sgml/docbook.cat
---- docbook-dtds-1.0-orig/3.1-sgml/docbook.cat 2009-02-05 16:44:15.000000000 +0100
-+++ docbook-dtds-1.0/3.1-sgml/docbook.cat      2009-02-05 16:56:51.000000000 +0100
-@@ -22,6 +22,12 @@
- SGMLDECL "docbook.dcl"
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/3.0/docbook.dtd"
-+       "docbook.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- PUBLIC "-//OASIS//DTD DocBook V3.1//EN" "docbook.dtd"
-diff -urNp docbook-dtds-1.0-orig/4.0-sgml/docbook.cat docbook-dtds-1.0/4.0-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.0-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100
-+++ docbook-dtds-1.0/4.0-sgml/docbook.cat      2009-02-05 16:49:06.000000000 +0100
-@@ -22,6 +22,12 @@
- SGMLDECL "docbook.dcl"
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.0/docbook.dtd"
-+       "docbook.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
-Binární soubory docbook-dtds-1.0-orig/4.0-sgml/.docbook.cat.swp a docbook-dtds-1.0/4.0-sgml/.docbook.cat.swp jsou různé
-diff -urNp docbook-dtds-1.0-orig/4.1-sgml/docbook.cat docbook-dtds-1.0/4.1-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.1-sgml/docbook.cat 2009-02-05 16:44:16.000000000 +0100
-+++ docbook-dtds-1.0/4.1-sgml/docbook.cat      2009-02-05 16:49:27.000000000 +0100
-@@ -22,6 +22,12 @@
- SGMLDECL "docbook.dcl"
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.1/docbook.dtd"
-+       "docbook.dtd"
-+
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
-diff -urNp docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat docbook-dtds-1.0/4.1.2-xml/docbook.cat
---- docbook-dtds-1.0-orig/4.1.2-xml/docbook.cat        2000-08-27 17:19:42.000000000 +0200
-+++ docbook-dtds-1.0/4.1.2-xml/docbook.cat     2009-02-05 16:52:16.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"
-+       "docbookx.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "docbookx.dtd"
-diff -urNp docbook-dtds-1.0-orig/4.2-sgml/docbook.cat docbook-dtds-1.0/4.2-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.2-sgml/docbook.cat 2009-02-05 16:44:17.000000000 +0100
-+++ docbook-dtds-1.0/4.2-sgml/docbook.cat      2009-02-05 16:50:10.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.2/docbook.dtd"
-+       "docbook.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- PUBLIC "-//OASIS//DTD DocBook V4.2//EN"
-diff -urNp docbook-dtds-1.0-orig/4.2-xml/docbook.cat docbook-dtds-1.0/4.2-xml/docbook.cat
---- docbook-dtds-1.0-orig/4.2-xml/docbook.cat  2002-07-17 18:14:41.000000000 +0200
-+++ docbook-dtds-1.0/4.2-xml/docbook.cat       2009-02-05 16:52:53.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
-+       "docbookx.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-diff -urNp docbook-dtds-1.0-orig/4.3-sgml/docbook.cat docbook-dtds-1.0/4.3-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.3-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100
-+++ docbook-dtds-1.0/4.3-sgml/docbook.cat      2009-02-05 16:50:37.000000000 +0100
-@@ -17,6 +17,13 @@
-   --
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.3/docbook.dtd"
-+       "docbook.dtd"
-+
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- PUBLIC "-//OASIS//DTD DocBook V4.3//EN"
-diff -urNp docbook-dtds-1.0-orig/4.3-xml/docbook.cat docbook-dtds-1.0/4.3-xml/docbook.cat
---- docbook-dtds-1.0-orig/4.3-xml/docbook.cat  2004-03-31 13:22:18.000000000 +0200
-+++ docbook-dtds-1.0/4.3-xml/docbook.cat       2009-02-05 16:53:12.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-+       "docbookx.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-diff -urNp docbook-dtds-1.0-orig/4.4-sgml/docbook.cat docbook-dtds-1.0/4.4-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.4-sgml/docbook.cat 2009-02-05 16:44:18.000000000 +0100
-+++ docbook-dtds-1.0/4.4-sgml/docbook.cat      2009-02-05 16:50:57.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.4/docbook.dtd"
-+       "docbook.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
-diff -urNp docbook-dtds-1.0-orig/4.4-xml/docbook.cat docbook-dtds-1.0/4.4-xml/docbook.cat
---- docbook-dtds-1.0-orig/4.4-xml/docbook.cat  2005-01-27 14:57:19.000000000 +0100
-+++ docbook-dtds-1.0/4.4-xml/docbook.cat       2009-02-05 16:53:30.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
-+       "docbookx.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
-diff -urNp docbook-dtds-1.0-orig/4.5-sgml/docbook.cat docbook-dtds-1.0/4.5-sgml/docbook.cat
---- docbook-dtds-1.0-orig/4.5-sgml/docbook.cat 2006-10-03 15:27:50.000000000 +0200
-+++ docbook-dtds-1.0/4.5-sgml/docbook.cat      2009-02-05 16:51:22.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/sgml/4.5/docbook.dtd"
-+       "docbook.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- PUBLIC "-//OASIS//DTD DocBook V4.5//EN"
-diff -urNp docbook-dtds-1.0-orig/4.5-xml/docbook.cat docbook-dtds-1.0/4.5-xml/docbook.cat
---- docbook-dtds-1.0-orig/4.5-xml/docbook.cat  2006-10-03 15:26:00.000000000 +0200
-+++ docbook-dtds-1.0/4.5-xml/docbook.cat       2009-02-05 16:55:45.000000000 +0100
-@@ -17,6 +17,12 @@
-   --
-   -- ...................................................................... --
-+  -- SYSTEM rewrite of web URL .............. ............................. --
-+
-+SYSTEM "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"
-+       "docbookx.dtd"
-+
-+  -- ...................................................................... --
-   -- DocBook driver file .................................................. --
- PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
index faf915d8a84ba6252bf55934e2e2aba9f5d4112e..9a4371756d9592cb07315a65d8754fbfe81445a9 100644 (file)
@@ -40,7 +40,7 @@ build
                CC="gcc %{CFLAGS}" \
                LD=gcc
 
-       make_install_targetsi += \
+       make_install_targets += \
                prefix=%{BUILDROOT}/usr \
                MANDIR=/usr/share/man/man1 \
                INSTALL="cp -p"