From c924394e7bf4e87ffb44d02054f7c0a9723dc9ab Mon Sep 17 00:00:00 2001
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Wed, 19 Feb 2014 14:45:19 +0000
Subject: Consolidate the docbook ports into -sgml and -xml variants.
Submitted by: hrs (based on)
Sponsored by: Absolight
---
MOVED | 14 ++
UPDATING | 18 +++
databases/postgresql91-docs/Makefile | 4 +-
devel/eggdbus/Makefile | 2 +-
devel/git/Makefile | 3 +-
devel/libxs/Makefile | 4 +-
editors/scribes/Makefile | 3 +-
graphics/colord/Makefile | 3 +-
graphics/giflib/Makefile | 3 +-
graphics/liblqr-1/Makefile | 4 +-
graphics/passepartout/Makefile | 4 +-
mail/dbmail/Makefile | 3 +-
multimedia/dvdstyler/Makefile | 3 +-
ports-mgmt/packagekit/Makefile | 4 +-
print/system-config-printer/Makefile | 3 +-
science/g3data/Makefile | 4 +-
sysutils/gnome-power-manager/Makefile | 4 +-
sysutils/policykit/Makefile | 4 +-
sysutils/polkit/Makefile | 4 +-
sysutils/upower/Makefile | 6 +-
textproc/Makefile | 15 +-
textproc/docbook-241/Makefile | 16 --
textproc/docbook-241/distinfo | 2 -
textproc/docbook-241/files/catalog.in | 9 --
textproc/docbook-241/pkg-descr | 15 --
textproc/docbook-241/pkg-plist | 30 ----
textproc/docbook-300/Makefile | 15 --
textproc/docbook-300/distinfo | 2 -
textproc/docbook-300/files/catalog.in | 9 --
textproc/docbook-300/pkg-descr | 15 --
textproc/docbook-300/pkg-plist | 11 --
textproc/docbook-310/Makefile | 16 --
textproc/docbook-310/distinfo | 2 -
textproc/docbook-310/files/catalog.in | 36 -----
textproc/docbook-310/pkg-descr | 12 --
textproc/docbook-310/pkg-plist | 13 --
textproc/docbook-400/Makefile | 15 --
textproc/docbook-400/distinfo | 2 -
textproc/docbook-400/files/catalog.in | 37 -----
textproc/docbook-400/pkg-descr | 10 --
textproc/docbook-400/pkg-plist | 13 --
textproc/docbook-410/Makefile | 15 --
textproc/docbook-410/distinfo | 2 -
textproc/docbook-410/files/catalog.in | 41 -----
textproc/docbook-410/pkg-descr | 10 --
textproc/docbook-410/pkg-plist | 13 --
textproc/docbook-420/Makefile | 14 --
textproc/docbook-420/distinfo | 2 -
textproc/docbook-420/files/catalog.in | 87 -----------
textproc/docbook-420/pkg-descr | 15 --
textproc/docbook-420/pkg-plist | 17 ---
textproc/docbook-430/Makefile | 17 ---
textproc/docbook-430/distinfo | 2 -
textproc/docbook-430/files/patch-catalog | 68 ---------
textproc/docbook-430/pkg-descr | 15 --
textproc/docbook-430/pkg-plist | 17 ---
textproc/docbook-440/Makefile | 17 ---
textproc/docbook-440/distinfo | 2 -
textproc/docbook-440/files/patch-catalog | 68 ---------
textproc/docbook-440/pkg-descr | 15 --
textproc/docbook-440/pkg-plist | 17 ---
textproc/docbook-450/Makefile | 17 ---
textproc/docbook-450/distinfo | 2 -
textproc/docbook-450/files/patch-catalog | 68 ---------
textproc/docbook-450/pkg-descr | 15 --
textproc/docbook-450/pkg-plist | 17 ---
textproc/docbook-500/Makefile | 41 -----
textproc/docbook-500/distinfo | 2 -
textproc/docbook-500/pkg-descr | 16 --
textproc/docbook-500/pkg-plist | 22 ---
textproc/docbook-sgml/Makefile | 53 +++++++
textproc/docbook-sgml/distinfo | 18 +++
textproc/docbook-sgml/pkg-descr | 3 +
textproc/docbook-sgml/pkg-plist | 149 ++++++++++++++++++
textproc/docbook-sk/Makefile | 21 ---
textproc/docbook-sk/distinfo | 2 -
textproc/docbook-sk/pkg-descr | 3 -
textproc/docbook-sk/pkg-plist | 50 ------
textproc/docbook-utils/Makefile | 4 +-
textproc/docbook-xml-430/Makefile | 21 ---
textproc/docbook-xml-430/distinfo | 2 -
textproc/docbook-xml-430/pkg-descr | 3 -
textproc/docbook-xml-430/pkg-plist | 34 -----
textproc/docbook-xml-440/Makefile | 30 ----
textproc/docbook-xml-440/distinfo | 2 -
textproc/docbook-xml-440/pkg-descr | 3 -
textproc/docbook-xml-440/pkg-plist | 34 -----
textproc/docbook-xml-450/Makefile | 30 ----
textproc/docbook-xml-450/distinfo | 2 -
textproc/docbook-xml-450/pkg-descr | 3 -
textproc/docbook-xml-450/pkg-plist | 34 -----
textproc/docbook-xml/Makefile | 74 +++++++--
textproc/docbook-xml/distinfo | 10 ++
textproc/docbook-xml/files/catalog412.xml | 115 ++++++++++++++
textproc/docbook-xml/pkg-descr | 2 +-
textproc/docbook-xml/pkg-plist | 245 ++++++++++++++++++++++++++----
textproc/docbook/Makefile | 52 +------
textproc/docproj/Makefile | 4 +-
textproc/gnome-doc-utils/Makefile | 4 +-
textproc/gtk-doc/Makefile | 5 +-
textproc/mate-doc-utils/Makefile | 4 +-
textproc/publican/Makefile | 6 +-
textproc/rarian/Makefile | 7 +-
textproc/scrollkeeper/Makefile | 8 +-
textproc/sgmlformat/Makefile | 4 +-
textproc/slides/Makefile | 4 +-
x11-wm/awesome/Makefile | 4 +-
x11-wm/compton/Makefile | 3 +-
108 files changed, 724 insertions(+), 1374 deletions(-)
delete mode 100644 textproc/docbook-241/Makefile
delete mode 100644 textproc/docbook-241/distinfo
delete mode 100644 textproc/docbook-241/files/catalog.in
delete mode 100644 textproc/docbook-241/pkg-descr
delete mode 100644 textproc/docbook-241/pkg-plist
delete mode 100644 textproc/docbook-300/Makefile
delete mode 100644 textproc/docbook-300/distinfo
delete mode 100644 textproc/docbook-300/files/catalog.in
delete mode 100644 textproc/docbook-300/pkg-descr
delete mode 100644 textproc/docbook-300/pkg-plist
delete mode 100644 textproc/docbook-310/Makefile
delete mode 100644 textproc/docbook-310/distinfo
delete mode 100644 textproc/docbook-310/files/catalog.in
delete mode 100644 textproc/docbook-310/pkg-descr
delete mode 100644 textproc/docbook-310/pkg-plist
delete mode 100644 textproc/docbook-400/Makefile
delete mode 100644 textproc/docbook-400/distinfo
delete mode 100644 textproc/docbook-400/files/catalog.in
delete mode 100644 textproc/docbook-400/pkg-descr
delete mode 100644 textproc/docbook-400/pkg-plist
delete mode 100644 textproc/docbook-410/Makefile
delete mode 100644 textproc/docbook-410/distinfo
delete mode 100644 textproc/docbook-410/files/catalog.in
delete mode 100644 textproc/docbook-410/pkg-descr
delete mode 100644 textproc/docbook-410/pkg-plist
delete mode 100644 textproc/docbook-420/Makefile
delete mode 100644 textproc/docbook-420/distinfo
delete mode 100644 textproc/docbook-420/files/catalog.in
delete mode 100644 textproc/docbook-420/pkg-descr
delete mode 100644 textproc/docbook-420/pkg-plist
delete mode 100644 textproc/docbook-430/Makefile
delete mode 100644 textproc/docbook-430/distinfo
delete mode 100644 textproc/docbook-430/files/patch-catalog
delete mode 100644 textproc/docbook-430/pkg-descr
delete mode 100644 textproc/docbook-430/pkg-plist
delete mode 100644 textproc/docbook-440/Makefile
delete mode 100644 textproc/docbook-440/distinfo
delete mode 100644 textproc/docbook-440/files/patch-catalog
delete mode 100644 textproc/docbook-440/pkg-descr
delete mode 100644 textproc/docbook-440/pkg-plist
delete mode 100644 textproc/docbook-450/Makefile
delete mode 100644 textproc/docbook-450/distinfo
delete mode 100644 textproc/docbook-450/files/patch-catalog
delete mode 100644 textproc/docbook-450/pkg-descr
delete mode 100644 textproc/docbook-450/pkg-plist
delete mode 100644 textproc/docbook-500/Makefile
delete mode 100644 textproc/docbook-500/distinfo
delete mode 100644 textproc/docbook-500/pkg-descr
delete mode 100644 textproc/docbook-500/pkg-plist
create mode 100644 textproc/docbook-sgml/Makefile
create mode 100644 textproc/docbook-sgml/distinfo
create mode 100644 textproc/docbook-sgml/pkg-descr
create mode 100644 textproc/docbook-sgml/pkg-plist
delete mode 100644 textproc/docbook-sk/Makefile
delete mode 100644 textproc/docbook-sk/distinfo
delete mode 100644 textproc/docbook-sk/pkg-descr
delete mode 100644 textproc/docbook-sk/pkg-plist
delete mode 100644 textproc/docbook-xml-430/Makefile
delete mode 100644 textproc/docbook-xml-430/distinfo
delete mode 100644 textproc/docbook-xml-430/pkg-descr
delete mode 100644 textproc/docbook-xml-430/pkg-plist
delete mode 100644 textproc/docbook-xml-440/Makefile
delete mode 100644 textproc/docbook-xml-440/distinfo
delete mode 100644 textproc/docbook-xml-440/pkg-descr
delete mode 100644 textproc/docbook-xml-440/pkg-plist
delete mode 100644 textproc/docbook-xml-450/Makefile
delete mode 100644 textproc/docbook-xml-450/distinfo
delete mode 100644 textproc/docbook-xml-450/pkg-descr
delete mode 100644 textproc/docbook-xml-450/pkg-plist
create mode 100644 textproc/docbook-xml/files/catalog412.xml
diff --git a/MOVED b/MOVED
index 9282e2ae8467..47cd3e96dfe4 100644
--- a/MOVED
+++ b/MOVED
@@ -5457,3 +5457,17 @@ deskutils/kdepim44||2014-02-18|Removed: depends on deskutils/kdepim44-runtime
misc/kde-xdg-env||2014-02-18|Removed, remnant of KDE 3
lang/g95||2014-02-18|Removed, uses an old version of GCC which can't be built anymore
games/py-ski|games/ski|2014-02-18|Rename to match upstream naming
+textproc/docbook-241|textproc/docbook-sgml|2014-02-19|Merged into textproc/docbook-sgml
+textproc/docbook-300|textproc/docbook-sgml|2014-02-19|Merged into textproc/docbook-sgml
+textproc/docbook-310|textproc/docbook-sgml|2014-02-19|Merged into textproc/docbook-sgml
+textproc/docbook-400|textproc/docbook-sgml|2014-02-19|Merged into textproc/docbook-sgml
+textproc/docbook-410|textproc/docbook-sgml|2014-02-19|Merged into textproc/docbook-sgml
+textproc/docbook-420|textproc/docbook-sgml|2014-02-19|Merged into textproc/docbook-sgml
+textproc/docbook-430|textproc/docbook-sgml|2014-02-19|Merged into textproc/docbook-sgml
+textproc/docbook-440|textproc/docbook-sgml|2014-02-19|Merged into textproc/docbook-sgml
+textproc/docbook-450|textproc/docbook-sgml|2014-02-19|Merged into textproc/docbook-sgml
+textproc/docbook-xml-430|textproc/docbook-xml|2014-02-19|Merged into textproc/docbook-xml
+textproc/docbook-xml-440|textproc/docbook-xml|2014-02-19|Merged into textproc/docbook-xml
+textproc/docbook-xml-450|textproc/docbook-xml|2014-02-19|Merged into textproc/docbook-xml
+textproc/docbook-500|textproc/docbook-xml|2014-02-19|Merged into textproc/docbook-xml
+textproc/docbook-sk|textproc/docbook-xml|2014-02-19|Merged into textproc/docbook-xml
diff --git a/UPDATING b/UPDATING
index 5d4469fce992..95c785e7ee64 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,24 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20140219:
+ AFFECTS: users of textproc/docbook*
+ AUTHOR: mat@FreeBSD.org
+
+ The textproc/docbook-* ports have been consolidated into two ports
+ textproc/docbook-sgml and textproc/docbook-xml.
+
+ Before upgrading you should force the removal of the existing ports, they
+ will conflict with the new ones.
+
+ pkg users can run:
+
+ pkg delete -f docbook-xml* docbook-sk* docbook[2345]??-* docbook-4*
+
+ the other users can run:
+
+ pkg_delete -f docbook-xml* docbook-sk* docbook[2345]??-* docbook-4*
+
20140218:
AFFECTS: users of KDE SC 4
AUTHOR: kde@FreeBSD.org
diff --git a/databases/postgresql91-docs/Makefile b/databases/postgresql91-docs/Makefile
index d13263835ee8..eb075b156ed1 100644
--- a/databases/postgresql91-docs/Makefile
+++ b/databases/postgresql91-docs/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= postgresql
-PORTREVISION= 0
+PORTREVISION= 1
PKGNAMESUFFIX?= ${DISTV:S/.//}-docs
DISTV= ${DISTVERSION:R}
@@ -27,7 +27,7 @@ BUILD_DEPENDS+= onsgmls:${PORTSDIR}/textproc/opensp \
openjade:${PORTSDIR}/textproc/openjade \
${sgmldir}/iso8879/catalog:${PORTSDIR}/textproc/iso8879 \
${dbdir}/dsssl/modular/catalog:${PORTSDIR}/textproc/dsssl-docbook-modular \
- ${dbdir}/4.2:${PORTSDIR}/textproc/docbook-420
+ ${dbdir}/4.2:${PORTSDIR}/textproc/docbook-sgml
NO_STAGE= yes
do-build:
diff --git a/devel/eggdbus/Makefile b/devel/eggdbus/Makefile
index d86b438dc52d..9be6876b5543 100644
--- a/devel/eggdbus/Makefile
+++ b/devel/eggdbus/Makefile
@@ -25,7 +25,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
.if defined(NO_INSTALL_MANPAGES)
CONFIGURE_ARGS+=--disable-man-pages
.else
-BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410 \
+BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
xsltproc:${PORTSDIR}/textproc/libxslt \
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
diff --git a/devel/git/Makefile b/devel/git/Makefile
index ed35a8847051..d7c1027c8318 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -3,6 +3,7 @@
PORTNAME= git
PORTVERSION= 1.8.5.4
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@@ -329,7 +330,7 @@ IGNORE= using GITWEB support requires PERL support
PLIST_SUB+= CONTRIB=""
BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto \
asciidoc:${PORTSDIR}/textproc/asciidoc \
- ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450
+ ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml
MAN1+= git-subtree.1
.else
PLIST_SUB+= CONTRIB="@comment "
diff --git a/devel/libxs/Makefile b/devel/libxs/Makefile
index ad8016d45ff7..18b58fe7e7a3 100644
--- a/devel/libxs/Makefile
+++ b/devel/libxs/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxs
PORTVERSION= 1.2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MASTER_SITES= http://download.crossroads.io/
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --enable-debug
.if ${PORT_OPTIONS:MDOCS}
BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \
xmlto:${PORTSDIR}/textproc/xmlto \
- ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450
+ ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml
MAN3= \
xs_bind.3 \
diff --git a/editors/scribes/Makefile b/editors/scribes/Makefile
index 3c7a65df1e33..36605bb20696 100644
--- a/editors/scribes/Makefile
+++ b/editors/scribes/Makefile
@@ -3,6 +3,7 @@
PORTNAME= scribes
PORTVERSION= 0.4.b954
+PORTREVISION= 1
CATEGORIES= editors
MASTER_SITES= https://launchpadlibrarian.net/66129407/
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-dev-${PORTVERSION:E:S/b/build/}
@@ -15,7 +16,7 @@ LICENSE= GPLv2
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
${PYTHON_PKGNAMEPREFIX}xdg>0:${PORTSDIR}/devel/py-xdg \
- ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450 \
+ ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml \
yelp:${PORTSDIR}/x11/yelp
USE_BZIP2= yes
diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile
index 268ee8e74d1a..d895b5b98fe1 100644
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@@ -4,6 +4,7 @@
PORTNAME= colord
PORTVERSION= 1.0.1
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= http://www.freedesktop.org/software/colord/releases/
@@ -47,7 +48,7 @@ NO_STAGE= yes
.if ${PORT_OPTIONS:MMANPAGES}
BUILD_DEPENDS+= docbook2html:${PORTSDIR}/textproc/docbook-utils \
- ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410
+ ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml
MAN1= cd-create-profile.1 cd-fix-profile.1 colormgr.1
.endif
diff --git a/graphics/giflib/Makefile b/graphics/giflib/Makefile
index 70abb2e43aea..4e762aca8a7b 100644
--- a/graphics/giflib/Makefile
+++ b/graphics/giflib/Makefile
@@ -3,6 +3,7 @@
PORTNAME= giflib
PORTVERSION= 4.2.3
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-4.x
PKGNAMESUFFIX= ${NOX11SUFFIX}${PKGNAMESUFFIX2}
@@ -25,7 +26,7 @@ DOCBOOK_DESC= Generate API documentation (requires DOCS)
.if ${PORT_OPTIONS:MDOCBOOK} && ${PORT_OPTIONS:MDOCS}
BUILD_DEPENDS+= xmlto:${PORTSDIR}/textproc/xmlto \
- ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk
+ ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml
PLIST_SUB+= WITH_DOCBOOK=''
.else
PLIST_SUB+= WITH_DOCBOOK='@comment '
diff --git a/graphics/liblqr-1/Makefile b/graphics/liblqr-1/Makefile
index 07f3f5ae5620..1d8d5f3f60e8 100644
--- a/graphics/liblqr-1/Makefile
+++ b/graphics/liblqr-1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= liblqr-1
DISTVERSION= 0.4.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics
MASTER_SITES= http://liblqr.wdfiles.com/local--files/en:download-page/ \
http://mirror.amdmi3.ru/distfiles/
@@ -35,7 +35,7 @@ SUB_LIST= PORTSDIR=${PORTSDIR}
.if ${PORT_OPTIONS:MHTMLDOCS}
BUILD_DEPENDS+= ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
- ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450
+ ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml
PLIST_SUB= HTMLDOCS=""
.else
PLIST_SUB= HTMLDOCS="@comment "
diff --git a/graphics/passepartout/Makefile b/graphics/passepartout/Makefile
index 4332e47a5a90..c8781b2e2097 100644
--- a/graphics/passepartout/Makefile
+++ b/graphics/passepartout/Makefile
@@ -4,7 +4,7 @@
PORTNAME= passepartout
PORTVERSION= 0.7.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -14,7 +14,7 @@ COMMENT= DTP application for X
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \
docbook2html:${PORTSDIR}/textproc/docbook-utils \
- ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410
+ ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml
LIB_DEPENDS= xml\\+\\+-2.6.2:${PORTSDIR}/textproc/libxml++26 \
gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26
RUN_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 811676d95bb2..b79df57688cd 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -3,6 +3,7 @@
PORTNAME= dbmail
PORTVERSION= 3.1.10
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.dbmail.org/download/3.1/ \
http://git.dbmail.eu/paul/dbmail/snapshot/
@@ -19,7 +20,7 @@ LIB_DEPENDS= libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \
xmlto:${PORTSDIR}/textproc/xmlto \
- ${LOCALBASE}/share/sgml/docbook/4.5:${PORTSDIR}/textproc/docbook-450
+ ${LOCALBASE}/share/sgml/docbook/4.5:${PORTSDIR}/textproc/docbook-sgml
CONFLICTS= dbmail-2.* dbmail22-[0-9]*
diff --git a/multimedia/dvdstyler/Makefile b/multimedia/dvdstyler/Makefile
index 5d15827cc494..0ce610b79cf7 100644
--- a/multimedia/dvdstyler/Makefile
+++ b/multimedia/dvdstyler/Makefile
@@ -3,6 +3,7 @@
PORTNAME= dvdstyler
PORTVERSION= 2.6.1
+PORTREVISION= 1
PORTEPOCH= 2
CATEGORIES= multimedia
MASTER_SITES= SF
@@ -18,7 +19,7 @@ BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
mplex:${PORTSDIR}/multimedia/mjpegtools \
growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
- docbook-sk>=4.1.2:${PORTSDIR}/textproc/docbook-sk \
+ docbook-xml>=4.1.2:${PORTSDIR}/textproc/docbook-xml \
xmlto:${PORTSDIR}/textproc/xmlto
LIB_DEPENDS= libexif.so:${PORTSDIR}/graphics/libexif \
libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
diff --git a/ports-mgmt/packagekit/Makefile b/ports-mgmt/packagekit/Makefile
index 0842f75fba78..2dcb97505623 100644
--- a/ports-mgmt/packagekit/Makefile
+++ b/ports-mgmt/packagekit/Makefile
@@ -4,7 +4,7 @@
PORTNAME= PackageKit
PORTVERSION= 0.6.11
-PORTREVISION?= 3
+PORTREVISION?= 4
CATEGORIES= ports-mgmt sysutils
MASTER_SITES= http://www.packagekit.org/releases/
@@ -51,7 +51,7 @@ NO_STAGE= yes
.include <bsd.port.options.mk>
. if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410 \
+BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
xsltproc:${PORTSDIR}/textproc/libxslt \
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
MAN1= pkcon.1 pkmon.1 pkgenpack.1 pk-debuginfo-install.1
diff --git a/print/system-config-printer/Makefile b/print/system-config-printer/Makefile
index ad4c8d91b032..b5d42719463e 100644
--- a/print/system-config-printer/Makefile
+++ b/print/system-config-printer/Makefile
@@ -4,6 +4,7 @@
PORTNAME= system-config-printer
PORTVERSION= 1.4.2
+PORTREVISION= 1
CATEGORIES= print gnome
MASTER_SITES= http://cyberelk.net/tim/data/${PORTNAME}/${PORTVERSION:R}/
@@ -11,7 +12,7 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= CUPS configuration Gtk+2.0 GUI
BUILD_DEPENDS= xmlto:${PORTSDIR}/textproc/xmlto \
- ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk
+ ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml
LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \
${PYTHON_SITELIBDIR}/pycurl.so:${PORTSDIR}/ftp/py-curl \
diff --git a/science/g3data/Makefile b/science/g3data/Makefile
index 8bed3858cb1b..43951412ccdc 100644
--- a/science/g3data/Makefile
+++ b/science/g3data/Makefile
@@ -3,7 +3,7 @@
PORTNAME= g3data
PORTVERSION= 1.5.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= science
MASTER_SITES= http://www.frantz.fi/software/
@@ -12,7 +12,7 @@ COMMENT= Utility for extracting data from graphs
BUILD_DEPENDS= nsgmls:${PORTSDIR}/textproc/jade \
${LOCALBASE}/share/sgml/docbook/utils-0.6.14/helpers/docbook2man-spec.pl:${PORTSDIR}/textproc/docbook-utils \
- ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410
+ ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml
USES= pkgconfig
USE_GNOME= gtk20
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index f03215af2e15..5c494a29ef75 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-power-manager
PORTVERSION= 2.32.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -38,7 +38,7 @@ GCONF_SCHEMAS= gnome-power-manager.schemas
.if !defined(NO_INSTALL_MANPAGES)
BUILD_DEPENDS+= docbook2html:${PORTSDIR}/textproc/docbook-utils \
- ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410
+ ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml
MAN1= gnome-power-manager.1 gnome-power-preferences.1 \
gnome-power-statistics.1
.endif
diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
index 46b35ee8c56a..ebe33c66427c 100644
--- a/sysutils/policykit/Makefile
+++ b/sysutils/policykit/Makefile
@@ -4,7 +4,7 @@
PORTNAME= policykit
PORTVERSION= 0.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= sysutils gnome
MASTER_SITES= http://hal.freedesktop.org/releases/
DISTNAME= PolicyKit-${PORTVERSION}
@@ -40,7 +40,7 @@ NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410 \
+BUILD_DEPENDS= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
USE_GNOME+= libxslt:build
diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile
index 26fb07e53f63..372eef6cea6e 100644
--- a/sysutils/polkit/Makefile
+++ b/sysutils/polkit/Makefile
@@ -4,7 +4,7 @@
PORTNAME= polkit
PORTVERSION= 0.105
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils gnome
MASTER_SITES= http://www.freedesktop.org/software/polkit/releases/ \
http://miwibox.org/distfiles/
@@ -40,7 +40,7 @@ NO_STAGE= yes
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MMANPAGES}
-BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410 \
+BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
xsltproc:${PORTSDIR}/textproc/libxslt \
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile
index 71aa1c0132fc..66f2d678b403 100644
--- a/sysutils/upower/Makefile
+++ b/sysutils/upower/Makefile
@@ -4,7 +4,7 @@
PORTNAME= upower
PORTVERSION= 0.9.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= sysutils
MASTER_SITES= http://upower.freedesktop.org/releases/
@@ -34,8 +34,8 @@ LDFLAGS+= -L${LOCALBASE}/lib
.if defined(NO_INSTALL_MANPAGES)
CONFIGURE_ARGS+=--disable-man-pages
.else
-BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410 \
- ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk \
+BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml \
+ ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-xml \
xsltproc:${PORTSDIR}/textproc/libxslt \
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
MAN1= upower.1
diff --git a/textproc/Makefile b/textproc/Makefile
index 33cef37749bf..7e2473c9a7cb 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -113,24 +113,11 @@
SUBDIR += dixit
SUBDIR += doc-mode.el
SUBDIR += docbook
- SUBDIR += docbook-241
- SUBDIR += docbook-300
- SUBDIR += docbook-310
- SUBDIR += docbook-400
- SUBDIR += docbook-410
- SUBDIR += docbook-420
- SUBDIR += docbook-430
- SUBDIR += docbook-440
- SUBDIR += docbook-450
- SUBDIR += docbook-500
- SUBDIR += docbook-sk
+ SUBDIR += docbook-sgml
SUBDIR += docbook-tdg
SUBDIR += docbook-to-man
SUBDIR += docbook-utils
SUBDIR += docbook-xml
- SUBDIR += docbook-xml-430
- SUBDIR += docbook-xml-440
- SUBDIR += docbook-xml-450
SUBDIR += docbook-xsd
SUBDIR += docbook-xsl
SUBDIR += docbook-xsl-ns
diff --git a/textproc/docbook-241/Makefile b/textproc/docbook-241/Makefile
deleted file mode 100644
index 6ba510ba0d43..000000000000
--- a/textproc/docbook-241/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Created by: nik
-# $FreeBSD$
-
-PORTVERSION= 2.4.1
-PORTREVISION= 2
-PORTEPOCH= 1
-PKGNAMESUFFIX= 241
-DISTNAME= docbk241
-
-MAINTAINER= gabor@FreeBSD.org
-COMMENT= V2.4.1 of the DocBook DTD, designed for technical documentation
-
-HAS_OASIS_MASTER_SITE= yes
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-241/distinfo b/textproc/docbook-241/distinfo
deleted file mode 100644
index a72c84e28790..000000000000
--- a/textproc/docbook-241/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbk241.zip) = dbac0694e9bcaec43cab80c755ffb02cf8f613bf785ff8506e5ed72efa76a272
-SIZE (docbk241.zip) = 55653
diff --git a/textproc/docbook-241/files/catalog.in b/textproc/docbook-241/files/catalog.in
deleted file mode 100644
index 845f56f63bf1..000000000000
--- a/textproc/docbook-241/files/catalog.in
+++ /dev/null
@@ -1,9 +0,0 @@
--- Catalog file for Docbook 2.4.1 --
-
--- DTDDECL "-//Davenport//DTD DocBook V2.4.1//EN" "docbook.dcl" --
-PUBLIC "-//Davenport//DTD DocBook V2.4.1//EN" "docbook.dtd"
-PUBLIC "-//Davenport//ELEMENTS CALS-Based DocBook Table Model V2.4.1//EN" "calstbl.mod"
-PUBLIC "-//Davenport//ELEMENTS DocBook Information Pool V2.4.1//EN" "dbpool.mod"
-PUBLIC "-//Davenport//ELEMENTS DocBook Document Hierarchy V2.4.1//EN" "dbhier.mod"
-PUBLIC "-//Davenport//ELEMENTS DocBook Additional General Entities//EN" "dbgenent.mod"
-CATALOG "%%PREFIX%%/share/sgml/iso8879/catalog"
diff --git a/textproc/docbook-241/pkg-descr b/textproc/docbook-241/pkg-descr
deleted file mode 100644
index 75ab2cfe0e17..000000000000
--- a/textproc/docbook-241/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-The DocBook DTD defines structural and content-based SGML markup
-for computer documentation, with a primary emphasis on software
-documentation and related classes of technical documents. Its
-main high-level hierarchical structures are for books, reference
-entries (for example, ``man pages''), and articles. It is
-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 port contains DocBook 2.4.1
-
-Nik Clayton
-nik@freebsd.org
-
-WWW: http://www.oasis-open.org/docbook/
diff --git a/textproc/docbook-241/pkg-plist b/textproc/docbook-241/pkg-plist
deleted file mode 100644
index 89f529bc7662..000000000000
--- a/textproc/docbook-241/pkg-plist
+++ /dev/null
@@ -1,30 +0,0 @@
-%%DTDDIR%%/calstbl.mod
-%%DTDDIR%%/catalog
-@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
-@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhier.mod
-%%DTDDIR%%/dbpool.mod
-%%DTDDIR%%/docbook.cat
-%%DTDDIR%%/docbook.dcl
-%%DTDDIR%%/docbook.dtd
-%%DTDDIR%%/iso-amsa.gml
-%%DTDDIR%%/iso-amsb.gml
-%%DTDDIR%%/iso-amsc.gml
-%%DTDDIR%%/iso-amsn.gml
-%%DTDDIR%%/iso-amso.gml
-%%DTDDIR%%/iso-amsr.gml
-%%DTDDIR%%/iso-box.gml
-%%DTDDIR%%/iso-cyr1.gml
-%%DTDDIR%%/iso-cyr2.gml
-%%DTDDIR%%/iso-dia.gml
-%%DTDDIR%%/iso-grk1.gml
-%%DTDDIR%%/iso-grk2.gml
-%%DTDDIR%%/iso-grk3.gml
-%%DTDDIR%%/iso-grk4.gml
-%%DTDDIR%%/iso-lat1.gml
-%%DTDDIR%%/iso-lat2.gml
-%%DTDDIR%%/iso-num.gml
-%%DTDDIR%%/iso-pub.gml
-%%DTDDIR%%/iso-tech.gml
-@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-300/Makefile b/textproc/docbook-300/Makefile
deleted file mode 100644
index 26d2d74df33b..000000000000
--- a/textproc/docbook-300/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Created by: nik
-# $FreeBSD$
-
-PORTVERSION= 3.0
-PORTREVISION= 5
-PKGNAMESUFFIX= 300
-DISTNAME= docbk30
-
-MAINTAINER= gabor@FreeBSD.org
-COMMENT= V3.0 of the DocBook DTD, designed for technical documentation
-
-HAS_OASIS_MASTER_SITE= yes
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-300/distinfo b/textproc/docbook-300/distinfo
deleted file mode 100644
index ac8a69c63b73..000000000000
--- a/textproc/docbook-300/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbk30.zip) = ecf71cbe8ddbad7494ff520d5b4edf73a428c0b159178cb0cb619cba685e61c6
-SIZE (docbk30.zip) = 43441
diff --git a/textproc/docbook-300/files/catalog.in b/textproc/docbook-300/files/catalog.in
deleted file mode 100644
index 578e284730e2..000000000000
--- a/textproc/docbook-300/files/catalog.in
+++ /dev/null
@@ -1,9 +0,0 @@
--- Catalog file for Docbook 3.0 --
-
--- DTDDECL "-//Davenport//DTD DocBook V3.0//EN" "docbook.dcl" --
-PUBLIC "-//Davenport//DTD DocBook V3.0//EN" "docbook.dtd"
-PUBLIC "-//USA-DOD//DTD Table Model 951010//EN" "cals-tbl.dtd"
-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"
-CATALOG "%%PREFIX%%/share/sgml/iso8879/catalog"
diff --git a/textproc/docbook-300/pkg-descr b/textproc/docbook-300/pkg-descr
deleted file mode 100644
index 038671c95c09..000000000000
--- a/textproc/docbook-300/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-The DocBook DTD defines structural and content-based SGML markup
-for computer documentation, with a primary emphasis on software
-documentation and related classes of technical documents. Its
-main high-level hierarchical structures are for books, reference
-entries (for example, ``man pages''), and articles. It is
-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 port contains DocBook 3.0
-
-Nik Clayton
-nik@freebsd.org
-
-WWW: http://www.oasis-open.org/docbook/
diff --git a/textproc/docbook-300/pkg-plist b/textproc/docbook-300/pkg-plist
deleted file mode 100644
index 1383c79ad61b..000000000000
--- a/textproc/docbook-300/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-%%DTDDIR%%/cals-tbl.dtd
-%%DTDDIR%%/catalog
-@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
-@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhier.mod
-%%DTDDIR%%/dbpool.mod
-%%DTDDIR%%/docbook.cat
-%%DTDDIR%%/docbook.dcl
-%%DTDDIR%%/docbook.dtd
-@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-310/Makefile b/textproc/docbook-310/Makefile
deleted file mode 100644
index c41905c88aba..000000000000
--- a/textproc/docbook-310/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Created by: nik
-# $FreeBSD$
-
-PORTVERSION= 3.1
-PORTREVISION= 5
-CATEGORIES= textproc
-PKGNAMESUFFIX= 310
-DISTNAME= docbk31
-
-MAINTAINER= gabor@FreeBSD.org
-COMMENT= V3.1 of the DocBook DTD, designed for technical documentation
-
-PORTDOCS= ChangeLog *.txt
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-310/distinfo b/textproc/docbook-310/distinfo
deleted file mode 100644
index 78792ffb1076..000000000000
--- a/textproc/docbook-310/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbk31.zip) = 20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538
-SIZE (docbk31.zip) = 55952
diff --git a/textproc/docbook-310/files/catalog.in b/textproc/docbook-310/files/catalog.in
deleted file mode 100644
index 73e73168a4d6..000000000000
--- a/textproc/docbook-310/files/catalog.in
+++ /dev/null
@@ -1,36 +0,0 @@
- -- ...................................................................... --
- -- Catalog data for DocBook V3.1 ........................................ --
- -- File docbook.cat ..................................................... --
-
- -- Please direct all questions, bug reports, or suggestions for
- changes to the davenport@berkshire.net mailing list. For more
- information, see http://www.oasis-open.org/.
- --
-
- -- This is the catalog data file for Version 3.1 of the DocBook DTD.
- It is provided as a convenience in building your own catalog files.
- You need not use the filenames listed here, and need not use the
- filename method of identifying storage objects at all. See the
- documentation for detailed information on the files associated with
- the DocBook DTD. See SGML Open Technical Resolution 9401 for
- detailed information on supplying and using catalog data.
- --
-
- -- ...................................................................... --
- -- DocBook driver file .................................................. --
-
-PUBLIC "-//OASIS//DTD DocBook V3.1//EN" "docbook.dtd"
-
- -- ...................................................................... --
- -- DocBook modules ...................................................... --
-
-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"
-
- -- End of catalog data for DocBook V3.1 ................................. --
- -- ...................................................................... --
-CATALOG "%%PREFIX%%/share/sgml/iso8879/catalog"
diff --git a/textproc/docbook-310/pkg-descr b/textproc/docbook-310/pkg-descr
deleted file mode 100644
index 32870fd4f0ed..000000000000
--- a/textproc/docbook-310/pkg-descr
+++ /dev/null
@@ -1,12 +0,0 @@
-The DocBook DTD defines structural and content-based SGML markup
-for computer documentation, with a primary emphasis on software
-documentation and related classes of technical documents. Its
-main high-level hierarchical structures are for books, reference
-entries (for example, ``man pages''), and articles.
-
-This port contains DocBook 3.1
-
-Nik Clayton
-nik@freebsd.org
-
-WWW: http://www.docbook.org/sgml/3.1/index.html
diff --git a/textproc/docbook-310/pkg-plist b/textproc/docbook-310/pkg-plist
deleted file mode 100644
index bdc1825c1b08..000000000000
--- a/textproc/docbook-310/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-%%DTDDIR%%/cals-tbl.dtd
-%%DTDDIR%%/catalog
-@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
-@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
-%%DTDDIR%%/dbcent.mod
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhier.mod
-%%DTDDIR%%/dbnotn.mod
-%%DTDDIR%%/dbpool.mod
-%%DTDDIR%%/docbook.cat
-%%DTDDIR%%/docbook.dcl
-%%DTDDIR%%/docbook.dtd
-@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-400/Makefile b/textproc/docbook-400/Makefile
deleted file mode 100644
index 45eff76fd84f..000000000000
--- a/textproc/docbook-400/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Created by: asmodai
-# $FreeBSD$
-
-PORTVERSION= 4.0
-PORTREVISION= 4
-PKGNAMESUFFIX= 400
-DISTNAME= docbk40
-
-MAINTAINER= gabor@FreeBSD.org
-COMMENT= V4.0 of the DocBook DTD, designed for technical documentation
-
-HAS_OASIS_MASTER_SITE= yes
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-400/distinfo b/textproc/docbook-400/distinfo
deleted file mode 100644
index c234c08cf3fa..000000000000
--- a/textproc/docbook-400/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbk40.zip) = dfef22f109779e4cfaafa27b6d381d975ac05eaafb5b3d4407d7043e310817bb
-SIZE (docbk40.zip) = 55742
diff --git a/textproc/docbook-400/files/catalog.in b/textproc/docbook-400/files/catalog.in
deleted file mode 100644
index 6b8ef517cc9c..000000000000
--- a/textproc/docbook-400/files/catalog.in
+++ /dev/null
@@ -1,37 +0,0 @@
- -- ...................................................................... --
- -- Catalog data for DocBook V4.0 ........................................ --
- -- File docbook.cat ..................................................... --
-
- -- Please direct all questions, bug reports, or suggestions for
- changes to the docbook@lists.oasis-open.org mailing list. For more
- information, see http://www.oasis-open.org/.
- --
-
- -- This is the catalog data file for Version 4.0 of the DocBook DTD.
- It is provided as a convenience in building your own catalog files.
- You need not use the filenames listed here, and need not use the
- filename method of identifying storage objects at all. See the
- documentation for detailed information on the files associated with
- the DocBook DTD. See SGML Open Technical Resolution 9401 for
- detailed information on supplying and using catalog data.
- --
-
- -- ...................................................................... --
- -- DocBook driver file .................................................. --
-
-PUBLIC "-//OASIS//DTD DocBook V4.0//EN" "docbook.dtd"
-
- -- ...................................................................... --
- -- DocBook modules ...................................................... --
-
-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"
-
-
- -- End of catalog data for DocBook V4.0 ................................. --
- -- ...................................................................... --
-CATALOG "%%PREFIX%%/share/sgml/iso8879/catalog"
diff --git a/textproc/docbook-400/pkg-descr b/textproc/docbook-400/pkg-descr
deleted file mode 100644
index e1a3e2cb5dc1..000000000000
--- a/textproc/docbook-400/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-The DocBook DTD defines structural and content-based SGML markup
-for computer documentation, with a primary emphasis on software
-documentation and related classes of technical documents. Its
-main high-level hierarchical structures are for books, reference
-entries (for example, ``man pages''), and articles. It is
-maintained by the DocBook Technical Committee of OASIS.
-
-This port contains DocBook 4.0 BETA 5.
-
-WWW: http://www.oasis-open.org/docbook/
diff --git a/textproc/docbook-400/pkg-plist b/textproc/docbook-400/pkg-plist
deleted file mode 100644
index bdc1825c1b08..000000000000
--- a/textproc/docbook-400/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-%%DTDDIR%%/cals-tbl.dtd
-%%DTDDIR%%/catalog
-@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
-@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
-%%DTDDIR%%/dbcent.mod
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhier.mod
-%%DTDDIR%%/dbnotn.mod
-%%DTDDIR%%/dbpool.mod
-%%DTDDIR%%/docbook.cat
-%%DTDDIR%%/docbook.dcl
-%%DTDDIR%%/docbook.dtd
-@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-410/Makefile b/textproc/docbook-410/Makefile
deleted file mode 100644
index a7520797080a..000000000000
--- a/textproc/docbook-410/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# Created by: murray
-# $FreeBSD$
-
-PORTVERSION= 4.1
-PORTREVISION= 5
-PKGNAMESUFFIX= 410
-DISTNAME= docbk41
-
-MAINTAINER= gabor@FreeBSD.org
-COMMENT= V4.1 of the DocBook DTD, designed for technical documentation
-
-PORTDOCS= ChangeLog *.txt
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-410/distinfo b/textproc/docbook-410/distinfo
deleted file mode 100644
index 6b6bf5b839f2..000000000000
--- a/textproc/docbook-410/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbk41.zip) = deaafcf0a3677692e7ad4412c0e41c1db3e9da6cdcdb3dd32b2cc1f9c97d6311
-SIZE (docbk41.zip) = 56654
diff --git a/textproc/docbook-410/files/catalog.in b/textproc/docbook-410/files/catalog.in
deleted file mode 100644
index 609d749dbec6..000000000000
--- a/textproc/docbook-410/files/catalog.in
+++ /dev/null
@@ -1,41 +0,0 @@
- -- ...................................................................... --
- -- Catalog data for DocBook V4.1 ........................................ --
- -- File docbook.cat ..................................................... --
-
- -- Please direct all questions, bug reports, or suggestions for
- changes to the docbook@lists.oasis-open.org mailing list. For more
- information, see http://www.oasis-open.org/.
- --
-
- -- This is the catalog data file for DocBook V4.1. It is provided as
- a convenience in building your own catalog files. You need not use
- the filenames listed here, and need not use the filename method of
- identifying storage objects at all. See the documentation for
- detailed information on the files associated with the DocBook DTD.
- See SGML Open Technical Resolution 9401 for detailed information
- on supplying and using catalog data.
- --
-
- -- ...................................................................... --
- -- SGML declaration associated with DocBook ............................. --
-
- -- DTDDECL "-//OASIS//DTD DocBook V4.1//EN" "docbook.dcl" --
-
- -- ...................................................................... --
- -- DocBook driver file .................................................. --
-
-PUBLIC "-//OASIS//DTD DocBook V4.1//EN" "docbook.dtd"
-
- -- ...................................................................... --
- -- DocBook modules ...................................................... --
-
-PUBLIC "-//USA-DOD//DTD Table Model 951010//EN" "cals-tbl.dtd"
-PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.1//EN" "dbpool.mod"
-PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1//EN" "dbhier.mod"
-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"
-
- -- End of catalog data for DocBook V4.1 ................................. --
- -- ...................................................................... --
-CATALOG "%%PREFIX%%/share/sgml/iso8879/catalog"
diff --git a/textproc/docbook-410/pkg-descr b/textproc/docbook-410/pkg-descr
deleted file mode 100644
index 3f3720b5bc65..000000000000
--- a/textproc/docbook-410/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-The DocBook DTD defines structural and content-based SGML markup
-for computer documentation, with a primary emphasis on software
-documentation and related classes of technical documents. Its
-main high-level hierarchical structures are for books, reference
-entries (for example, ``man pages''), and articles. It is
-maintained by the DocBook Technical Committee of OASIS.
-
-This port contains DocBook 4.1
-
-WWW: http://www.oasis-open.org/docbook/
diff --git a/textproc/docbook-410/pkg-plist b/textproc/docbook-410/pkg-plist
deleted file mode 100644
index bdc1825c1b08..000000000000
--- a/textproc/docbook-410/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-%%DTDDIR%%/cals-tbl.dtd
-%%DTDDIR%%/catalog
-@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
-@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
-%%DTDDIR%%/dbcent.mod
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhier.mod
-%%DTDDIR%%/dbnotn.mod
-%%DTDDIR%%/dbpool.mod
-%%DTDDIR%%/docbook.cat
-%%DTDDIR%%/docbook.dcl
-%%DTDDIR%%/docbook.dtd
-@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-420/Makefile b/textproc/docbook-420/Makefile
deleted file mode 100644
index d39d73a8957e..000000000000
--- a/textproc/docbook-420/Makefile
+++ /dev/null
@@ -1,14 +0,0 @@
-# Created by: kutulu
-# $FreeBSD$
-
-PORTVERSION= 4.2
-PORTREVISION= 1
-PKGNAMESUFFIX= 420
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= V4.2 of the DocBook DTD, designed for technical documentation
-
-PORTDOCS= ChangeLog
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-420/distinfo b/textproc/docbook-420/distinfo
deleted file mode 100644
index b8d32e74f3cd..000000000000
--- a/textproc/docbook-420/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbook-4.2.zip) = 67ebd2c94b342718c6865d2de60f5d4ff02d77a7e4b0d9e72a48c45f2b2635c3
-SIZE (docbook-4.2.zip) = 61830
diff --git a/textproc/docbook-420/files/catalog.in b/textproc/docbook-420/files/catalog.in
deleted file mode 100644
index 28da63f711bb..000000000000
--- a/textproc/docbook-420/files/catalog.in
+++ /dev/null
@@ -1,87 +0,0 @@
- -- ...................................................................... --
- -- Catalog data for DocBook V4.2 ........................................ --
- -- File docbook.cat ..................................................... --
-
- -- Please direct all questions, bug reports, or suggestions for
- changes to the docbook@lists.oasis-open.org mailing list. For more
- information, see http://www.oasis-open.org/.
- --
-
- -- This is the catalog data file for DocBook V4.2. It is provided as
- a convenience in building your own catalog files. You need not use
- the filenames listed here, and need not use the filename method of
- identifying storage objects at all. See the documentation for
- detailed information on the files associated with the DocBook DTD.
- See SGML Open Technical Resolution 9401 for detailed information
- on supplying and using catalog data.
- --
-
- -- ...................................................................... --
- -- DocBook driver file .................................................. --
-
-PUBLIC "-//OASIS//DTD DocBook V4.2//EN" "docbook.dtd"
-
-PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "docbookx.dtd"
-
- -- ...................................................................... --
- -- DocBook modules ...................................................... --
-
-PUBLIC "-//OASIS//DTD DocBook CALS Table Model V4.2//EN" "calstblx.dtd"
-
-PUBLIC "-//OASIS//DTD XML Exchange Table Model 19990315//EN" "soextblx.dtd"
-
-PUBLIC "-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" "dbpoolx.mod"
-
-PUBLIC "-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" "dbhierx.mod"
-
-PUBLIC "-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" "dbgenent.mod"
-
-PUBLIC "-//OASIS//ENTITIES DocBook Notations V4.2//EN" "dbnotnx.mod"
-
-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 ................................. --
- -- ...................................................................... --
-
-CATALOG "%%PREFIX%%/share/sgml/iso8879/catalog"
diff --git a/textproc/docbook-420/pkg-descr b/textproc/docbook-420/pkg-descr
deleted file mode 100644
index 509588730d20..000000000000
--- a/textproc/docbook-420/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-The DocBook DTD defines structural and content-based SGML markup
-for computer documentation, with a primary emphasis on software
-documentation and related classes of technical documents. Its
-main high-level hierarchical structures are for books, reference
-entries (for example, ``man pages''), and articles. It is
-maintained by the DocBook Technical Committee of OASIS.
-
-This port contains DocBook 4.2. Note that DocBook 4.2 includes
-the XML DocBook DTD as part of the SGML DTD distribution. If
-you do not need SGML DTD you should install:
- textproc/docbook-xml
-instead. There are no conflicts if both ports are installed
-but you will have duplicates of most of the files.
-
-WWW: http://www.oasis-open.org/docbook/
diff --git a/textproc/docbook-420/pkg-plist b/textproc/docbook-420/pkg-plist
deleted file mode 100644
index b1f4b0f038d0..000000000000
--- a/textproc/docbook-420/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-%%DTDDIR%%/calstblx.dtd
-%%DTDDIR%%/catalog
-@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
-@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
-%%DTDDIR%%/catalog.xml
-%%DTDDIR%%/dbcentx.mod
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhierx.mod
-%%DTDDIR%%/dbnotnx.mod
-%%DTDDIR%%/dbpoolx.mod
-%%DTDDIR%%/docbook.cat
-%%DTDDIR%%/docbook.dcl
-%%DTDDIR%%/docbook.dtd
-%%DTDDIR%%/docbookx.dtd
-%%DTDDIR%%/soextblx.dtd
-%%DTDDIR%%/README
-@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-430/Makefile b/textproc/docbook-430/Makefile
deleted file mode 100644
index f098fc2cf7cc..000000000000
--- a/textproc/docbook-430/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: hrs
-# $FreeBSD$
-
-PORTVERSION= 4.3
-PORTREVISION= 1
-PKGNAMESUFFIX= 430
-
-MAINTAINER= hrs@FreeBSD.org
-COMMENT= DocBook/SGML DTD V4.3, designed for technical documentation
-
-PORTDOCS= ChangeLog README
-
-HAS_CATALOG_FILE= yes
-HAS_OASIS_MASTER_SITE= yes
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-430/distinfo b/textproc/docbook-430/distinfo
deleted file mode 100644
index fe60da9d2c85..000000000000
--- a/textproc/docbook-430/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbook-4.3.zip) = 88f52fab7bd49b2e8f40c525014129c26a5a4b8bbd1494e00387556ec76f95ee
-SIZE (docbook-4.3.zip) = 66117
diff --git a/textproc/docbook-430/files/patch-catalog b/textproc/docbook-430/files/patch-catalog
deleted file mode 100644
index 65fff5bd2eb7..000000000000
--- a/textproc/docbook-430/files/patch-catalog
+++ /dev/null
@@ -1,68 +0,0 @@
---- catalog.orig Sat Apr 3 19:51:36 2004
-+++ catalog Sat Apr 3 19:52:15 2004
-@@ -49,65 +49,5 @@
- PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.3//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.3 ................................. --
- -- ...................................................................... --
diff --git a/textproc/docbook-430/pkg-descr b/textproc/docbook-430/pkg-descr
deleted file mode 100644
index a02fa1c9099a..000000000000
--- a/textproc/docbook-430/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-The DocBook DTD defines structural and content-based SGML markup
-for computer documentation, with a primary emphasis on software
-documentation and related classes of technical documents. Its
-main high-level hierarchical structures are for books, reference
-entries (for example, ``man pages''), and articles. It is
-maintained by the DocBook Technical Committee of OASIS.
-
-This port contains DocBook 4.3. Note that DocBook 4.3 includes
-the XML DocBook DTD as part of the SGML DTD distribution. If
-you do not need SGML DTD you should install:
- textproc/docbook-xml-430
-instead. There are no conflicts if both ports are installed
-but you will have duplicates of most of the files.
-
-WWW: http://www.docbook.org/sgml/4.3/index.html
diff --git a/textproc/docbook-430/pkg-plist b/textproc/docbook-430/pkg-plist
deleted file mode 100644
index 929851c32e7e..000000000000
--- a/textproc/docbook-430/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-%%DTDDIR%%/calstblx.dtd
-%%DTDDIR%%/catalog
-@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
-@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
-%%DTDDIR%%/catalog.xml
-%%DTDDIR%%/dbcentx.mod
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhierx.mod
-%%DTDDIR%%/dbnotnx.mod
-%%DTDDIR%%/dbpoolx.mod
-%%DTDDIR%%/docbook.cat
-%%DTDDIR%%/docbook.dcl
-%%DTDDIR%%/docbook.dtd
-%%DTDDIR%%/docbookx.dtd
-%%DTDDIR%%/htmltblx.mod
-%%DTDDIR%%/soextblx.dtd
-@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-440/Makefile b/textproc/docbook-440/Makefile
deleted file mode 100644
index 48bc6a6f09ca..000000000000
--- a/textproc/docbook-440/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: Gabor Kovesdan <gabor@kovesdan.org>
-# $FreeBSD$
-
-PORTVERSION= 4.4
-PORTREVISION= 3
-PKGNAMESUFFIX= 440
-
-MAINTAINER= gabor@FreeBSD.org
-COMMENT= DocBook/SGML DTD V4.4, designed for technical documentation
-
-HAS_OASIS_MASTER_SITE= yes
-HAS_CATALOG_FILE= yes
-
-PORTDOCS= ChangeLog README
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-440/distinfo b/textproc/docbook-440/distinfo
deleted file mode 100644
index 5a28d5fd70bd..000000000000
--- a/textproc/docbook-440/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbook-4.4.zip) = 0ac7960409b032c8e517483523ecb92af4e59196a33b3e2c5617daa22b7a8a6c
-SIZE (docbook-4.4.zip) = 66879
diff --git a/textproc/docbook-440/files/patch-catalog b/textproc/docbook-440/files/patch-catalog
deleted file mode 100644
index 65fff5bd2eb7..000000000000
--- a/textproc/docbook-440/files/patch-catalog
+++ /dev/null
@@ -1,68 +0,0 @@
---- catalog.orig Sat Apr 3 19:51:36 2004
-+++ catalog Sat Apr 3 19:52:15 2004
-@@ -49,65 +49,5 @@
- PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.3//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.3 ................................. --
- -- ...................................................................... --
diff --git a/textproc/docbook-440/pkg-descr b/textproc/docbook-440/pkg-descr
deleted file mode 100644
index 8cbcb6c3b43f..000000000000
--- a/textproc/docbook-440/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-The DocBook DTD defines structural and content-based SGML markup
-for computer documentation, with a primary emphasis on software
-documentation and related classes of technical documents. Its
-main high-level hierarchical structures are for books, reference
-entries (for example, ``man pages''), and articles. It is
-maintained by the DocBook Technical Committee of OASIS.
-
-This port contains DocBook 4.4. Note that DocBook 4.4 includes
-the XML DocBook DTD as part of the SGML DTD distribution. If
-you do not need SGML DTD you should install:
- textproc/docbook-xml-440
-instead. There are no conflicts if both ports are installed
-but you will have duplicates of most of the files.
-
-WWW: http://www.docbook.org/specs/cd-docbook-docbook-4.4.html
diff --git a/textproc/docbook-440/pkg-plist b/textproc/docbook-440/pkg-plist
deleted file mode 100644
index 929851c32e7e..000000000000
--- a/textproc/docbook-440/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-%%DTDDIR%%/calstblx.dtd
-%%DTDDIR%%/catalog
-@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
-@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
-%%DTDDIR%%/catalog.xml
-%%DTDDIR%%/dbcentx.mod
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhierx.mod
-%%DTDDIR%%/dbnotnx.mod
-%%DTDDIR%%/dbpoolx.mod
-%%DTDDIR%%/docbook.cat
-%%DTDDIR%%/docbook.dcl
-%%DTDDIR%%/docbook.dtd
-%%DTDDIR%%/docbookx.dtd
-%%DTDDIR%%/htmltblx.mod
-%%DTDDIR%%/soextblx.dtd
-@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-450/Makefile b/textproc/docbook-450/Makefile
deleted file mode 100644
index dd4928fc6b6e..000000000000
--- a/textproc/docbook-450/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: Gabor Kovesdan <gabor@kovesdan.org>
-# $FreeBSD$
-
-PORTVERSION= 4.5
-PORTREVISION= 3
-PKGNAMESUFFIX= 450
-
-MAINTAINER= gabor@FreeBSD.org
-COMMENT= DocBook/SGML DTD V4.5, designed for technical documentation
-
-HAS_OASIS_MASTER_SITE= yes
-HAS_CATALOG_FILE= yes
-
-PORTDOCS= README
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-450/distinfo b/textproc/docbook-450/distinfo
deleted file mode 100644
index bd90e1d33d15..000000000000
--- a/textproc/docbook-450/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbook-4.5.zip) = 8043e514e80c6c19cb146b5d37937d1305bf3abf9b0097c36df7f70f611cdf43
-SIZE (docbook-4.5.zip) = 71252
diff --git a/textproc/docbook-450/files/patch-catalog b/textproc/docbook-450/files/patch-catalog
deleted file mode 100644
index 65fff5bd2eb7..000000000000
--- a/textproc/docbook-450/files/patch-catalog
+++ /dev/null
@@ -1,68 +0,0 @@
---- catalog.orig Sat Apr 3 19:51:36 2004
-+++ catalog Sat Apr 3 19:52:15 2004
-@@ -49,65 +49,5 @@
- PUBLIC "-//OASIS//ENTITIES DocBook Character Entities V4.3//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.3 ................................. --
- -- ...................................................................... --
diff --git a/textproc/docbook-450/pkg-descr b/textproc/docbook-450/pkg-descr
deleted file mode 100644
index 9d763153ebbe..000000000000
--- a/textproc/docbook-450/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-The DocBook DTD defines structural and content-based SGML markup
-for computer documentation, with a primary emphasis on software
-documentation and related classes of technical documents. Its
-main high-level hierarchical structures are for books, reference
-entries (for example, ``man pages''), and articles. It is
-maintained by the DocBook Technical Committee of OASIS.
-
-This port contains DocBook 4.5. Note that DocBook 4.5 includes
-the XML DocBook DTD as part of the SGML DTD distribution. If
-you do not need SGML DTD you should install:
- textproc/docbook-xml-450
-instead. There are no conflicts if both ports are installed
-but you will have duplicates of most of the files.
-
-WWW: http://www.docbook.org/specs/docbook-4.5-spec-cs-01.html
diff --git a/textproc/docbook-450/pkg-plist b/textproc/docbook-450/pkg-plist
deleted file mode 100644
index 929851c32e7e..000000000000
--- a/textproc/docbook-450/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-%%DTDDIR%%/calstblx.dtd
-%%DTDDIR%%/catalog
-@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
-@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
-%%DTDDIR%%/catalog.xml
-%%DTDDIR%%/dbcentx.mod
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhierx.mod
-%%DTDDIR%%/dbnotnx.mod
-%%DTDDIR%%/dbpoolx.mod
-%%DTDDIR%%/docbook.cat
-%%DTDDIR%%/docbook.dcl
-%%DTDDIR%%/docbook.dtd
-%%DTDDIR%%/docbookx.dtd
-%%DTDDIR%%/htmltblx.mod
-%%DTDDIR%%/soextblx.dtd
-@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-500/Makefile b/textproc/docbook-500/Makefile
deleted file mode 100644
index ead9d79a8bc9..000000000000
--- a/textproc/docbook-500/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# Created by: Gabor Kovesdan <gabor@kovesdan.org>
-# $FreeBSD$
-
-PORTVERSION= 5.0
-PORTREVISION= 4
-PKGNAMESUFFIX= 500
-
-MAINTAINER= gabor@FreeBSD.org
-COMMENT= DocBook 5.0, designed for technical documentation
-
-NO_ISOCAT= yes
-HAS_MANUAL_CATALOG_FILE= yes
-NO_DISTNAME_FIX= yes
-XML_DTD= yes
-MANUAL_DOCS= yes
-NO_DTD_SUBDIR= yes
-
-OPTIONS_DEFINE= DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS XMLCHARENT DOCS
-OPTIONS_DEFAULT= DTD SCHEMA RELAX_NG SCHEMATRON NVDL TOOLS XMLCHARENT
-DTD_DESC= XML DTD
-SCHEMA_DESC= W3C XML Schema
-RELAX_NG_DESC= RELAX NG Schema
-SCHEMATRON_DESC= Schematron constraints
-NVDL_DESC= NVDL description
-TOOLS_DESC= Tools for working with DocBook
-XMLCHARENT_DESC= Install ISO 8879 XML entites
-OPTIONS_SUB= yes
-
-XMLCHARENT_RUN_DEPENDS= ${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent
-
-PORTDOCS= *
-
-post-install:
- @${MKDIR} ${STAGEDIR}${PREFIX}/${DTDDIR}/nvdl
- ${MV} ${STAGEDIR}${PREFIX}/${DTDDIR}/docbook.nvdl ${STAGEDIR}${PREFIX}/${DTDDIR}/nvdl
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- cd ${STAGEDIR}${PREFIX}/${DTDDIR} && ${MV} ChangeLog README VERSION ${STAGEDIR}${DOCSDIR}
- cd ${STAGEDIR}${PREFIX}/${DTDDIR} && ${MV} docs/* ${STAGEDIR}${DOCSDIR} && ${RMDIR} docs
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-500/distinfo b/textproc/docbook-500/distinfo
deleted file mode 100644
index 1d396586c6c9..000000000000
--- a/textproc/docbook-500/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbook-5.0.zip) = 3dcd65e1f5d9c0c891b3be204fa2bb418ce485d32310e1ca052e81d36623208e
-SIZE (docbook-5.0.zip) = 835797
diff --git a/textproc/docbook-500/pkg-descr b/textproc/docbook-500/pkg-descr
deleted file mode 100644
index f4aab1b81dd5..000000000000
--- a/textproc/docbook-500/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-DocBook is a general purpose XML schema particularly well suited to books and
-papers about computer hardware and software (though it is by no means limited
-to these applications).
-
-The Version 5.0 release is a complete rewrite of DocBook in RELAX NG.
-The intent of this rewrite is to produce a schema that is true to the spirit
-of DocBook while simultaneously removing inconsistencies that have arisen as
-a natural consequence of DocBook's long, slow evolution. The Technical
-Committee has taken this opportunity to simplify a number of content models
-and tighten constraints where RELAX NG makes that possible.
-
-The Technical Committee provides the DocBook 5.0 schema in other schema
-languages, including W3C XML Schema and an XML DTD, but the RELAX NG Schema
-is now the normative schema.
-
-WWW: http://www.docbook.org/specs/docbook-5.0-spec-cd-04.html
diff --git a/textproc/docbook-500/pkg-plist b/textproc/docbook-500/pkg-plist
deleted file mode 100644
index cbee3ea89ee3..000000000000
--- a/textproc/docbook-500/pkg-plist
+++ /dev/null
@@ -1,22 +0,0 @@
-%%DTDDIR%%/catalog.xml
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F
-%%DTD%%%%DTDDIR%%/dtd/docbook.dtd
-%%DTD%%@dirrm %%DTDDIR%%/dtd
-%%NVDL%%%%DTDDIR%%/nvdl/docbook.nvdl
-%%NVDL%%@dirrm %%DTDDIR%%/nvdl
-%%RELAX_NG%%%%DTDDIR%%/rng/docbook.rnc
-%%RELAX_NG%%%%DTDDIR%%/rng/docbook.rng
-%%RELAX_NG%%%%DTDDIR%%/rng/docbookxi.rnc
-%%RELAX_NG%%%%DTDDIR%%/rng/docbookxi.rng
-%%RELAX_NG%%@dirrm %%DTDDIR%%/rng
-%%SCHEMATRON%%%%DTDDIR%%/sch/docbook.sch
-%%SCHEMATRON%%@dirrm %%DTDDIR%%/sch
-%%TOOLS%%%%DTDDIR%%/tools/db4-entities.pl
-%%TOOLS%%%%DTDDIR%%/tools/db4-upgrade.xsl
-%%TOOLS%%@dirrm %%DTDDIR%%/tools
-%%SCHEMA%%%%DTDDIR%%/xsd/docbook.xsd
-%%SCHEMA%%%%DTDDIR%%/xsd/xlink.xsd
-%%SCHEMA%%%%DTDDIR%%/xsd/xml.xsd
-%%SCHEMA%%@dirrm %%DTDDIR%%/xsd
-@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-sgml/Makefile b/textproc/docbook-sgml/Makefile
new file mode 100644
index 000000000000..b72eb8cede58
--- /dev/null
+++ b/textproc/docbook-sgml/Makefile
@@ -0,0 +1,53 @@
+# $FreeBSD$
+
+PORTNAME= docbook
+PORTVERSION= 4.5
+CATEGORIES= textproc
+MASTER_SITES= ${DBFILES:C,(.*):(.*),http://www.oasis-open.org/docbook/sgml/\1/:\2,:C,:docbook-([0-9]+).([0-9]+),:db\1\2,}
+PKGNAMESUFFIX= -sgml
+DISTFILES= ${DBFILES:C,.*:(.*),\1.zip:\1,:C,:docbook-([0-9]+).([0-9]+),:db\1\2,}
+
+MAINTAINER= doceng@FreeBSD.org
+COMMENT= DocBook SGML DTD
+
+RUN_DEPENDS= ${LOCALBASE}/${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
+ ${LOCALBASE}/${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
+
+NO_BUILD= yes
+
+DBFILES=2.4.1:docbk241 3.0:docbk30 3.1:docbk31 \
+ 4.0:docbk40 4.1:docbk41 4.2:docbook-4.2 \
+ 4.3:docbook-4.3 4.4:docbook-4.4 4.5:docbook-4.5
+
+XMLCATMGR= bin/xmlcatmgr
+SGMLCAT= share/sgml/catalog.ports
+ISOCAT= share/sgml/iso8879/catalog
+DBKDIR= share/sgml/docbook
+DBCAT= ${PREFIX}/${DBKDIR}/catalog
+PLIST_SUB= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} DBKDIR=${DBKDIR}
+
+do-extract:
+ @${RM} -rf ${WRKDIR}
+ @${MKDIR} ${WRKDIR}
+.for df in ${DISTFILES:C,:.*,,}
+ @cd ${WRKDIR} && ${EXTRACT_CMD} \
+ ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${df} \
+ ${EXTRACT_AFTER_ARGS} -s ,^,${df:R}/,
+.endfor
+
+pre-install:
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${DBKDIR}
+ ${ECHO_CMD} "CATALOG \"${LOCALBASE}/${ISOCAT}\"" \
+ > ${STAGEDIR}${DBCAT}
+
+.for D in ${DBFILES:C,:.*,,}
+do-install-${D:S/./_/g}:
+ @${MKDIR} ${STAGEDIR}${PREFIX}/share/sgml/docbook/$D
+ cd ${WRKDIR}/${DBFILES:M${D}\:*:C,.*:,,} && \
+ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/sgml/docbook/$D
+ ${ECHO_CMD} "CATALOG \"${PREFIX}/share/sgml/docbook/$D/docbook.cat" \
+ >> ${STAGEDIR}${DBCAT}
+do-install: do-install-${D:S/./_/g}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/textproc/docbook-sgml/distinfo b/textproc/docbook-sgml/distinfo
new file mode 100644
index 000000000000..9d171c6d22de
--- /dev/null
+++ b/textproc/docbook-sgml/distinfo
@@ -0,0 +1,18 @@
+SHA256 (docbk241.zip) = dbac0694e9bcaec43cab80c755ffb02cf8f613bf785ff8506e5ed72efa76a272
+SIZE (docbk241.zip) = 55653
+SHA256 (docbk30.zip) = ecf71cbe8ddbad7494ff520d5b4edf73a428c0b159178cb0cb619cba685e61c6
+SIZE (docbk30.zip) = 43441
+SHA256 (docbk31.zip) = 20261d2771b9a052abfa3d8fab1aa62be05791a010281c566f9073bf0e644538
+SIZE (docbk31.zip) = 55952
+SHA256 (docbk40.zip) = dfef22f109779e4cfaafa27b6d381d975ac05eaafb5b3d4407d7043e310817bb
+SIZE (docbk40.zip) = 55742
+SHA256 (docbk41.zip) = deaafcf0a3677692e7ad4412c0e41c1db3e9da6cdcdb3dd32b2cc1f9c97d6311
+SIZE (docbk41.zip) = 56654
+SHA256 (docbook-4.2.zip) = 67ebd2c94b342718c6865d2de60f5d4ff02d77a7e4b0d9e72a48c45f2b2635c3
+SIZE (docbook-4.2.zip) = 61830
+SHA256 (docbook-4.3.zip) = 88f52fab7bd49b2e8f40c525014129c26a5a4b8bbd1494e00387556ec76f95ee
+SIZE (docbook-4.3.zip) = 66117
+SHA256 (docbook-4.4.zip) = 0ac7960409b032c8e517483523ecb92af4e59196a33b3e2c5617daa22b7a8a6c
+SIZE (docbook-4.4.zip) = 66879
+SHA256 (docbook-4.5.zip) = 8043e514e80c6c19cb146b5d37937d1305bf3abf9b0097c36df7f70f611cdf43
+SIZE (docbook-4.5.zip) = 71252
diff --git a/textproc/docbook-sgml/pkg-descr b/textproc/docbook-sgml/pkg-descr
new file mode 100644
index 000000000000..742ff63eea81
--- /dev/null
+++ b/textproc/docbook-sgml/pkg-descr
@@ -0,0 +1,3 @@
+DocBook SGML DTD.
+
+WWW: http://www.oasis-open.org/docbook/
diff --git a/textproc/docbook-sgml/pkg-plist b/textproc/docbook-sgml/pkg-plist
new file mode 100644
index 000000000000..4842d4304703
--- /dev/null
+++ b/textproc/docbook-sgml/pkg-plist
@@ -0,0 +1,149 @@
+%%DBKDIR%%/2.4.1/241chg.txt
+%%DBKDIR%%/2.4.1/announce.txt
+%%DBKDIR%%/2.4.1/calstbl.mod
+%%DBKDIR%%/2.4.1/dbgenent.mod
+%%DBKDIR%%/2.4.1/dbhier.mod
+%%DBKDIR%%/2.4.1/dbpool.mod
+%%DBKDIR%%/2.4.1/docbook.cat
+%%DBKDIR%%/2.4.1/docbook.dcl
+%%DBKDIR%%/2.4.1/docbook.dtd
+%%DBKDIR%%/2.4.1/iso-amsa.gml
+%%DBKDIR%%/2.4.1/iso-amsb.gml
+%%DBKDIR%%/2.4.1/iso-amsc.gml
+%%DBKDIR%%/2.4.1/iso-amsn.gml
+%%DBKDIR%%/2.4.1/iso-amso.gml
+%%DBKDIR%%/2.4.1/iso-amsr.gml
+%%DBKDIR%%/2.4.1/iso-box.gml
+%%DBKDIR%%/2.4.1/iso-cyr1.gml
+%%DBKDIR%%/2.4.1/iso-cyr2.gml
+%%DBKDIR%%/2.4.1/iso-dia.gml
+%%DBKDIR%%/2.4.1/iso-grk1.gml
+%%DBKDIR%%/2.4.1/iso-grk2.gml
+%%DBKDIR%%/2.4.1/iso-grk3.gml
+%%DBKDIR%%/2.4.1/iso-grk4.gml
+%%DBKDIR%%/2.4.1/iso-lat1.gml
+%%DBKDIR%%/2.4.1/iso-lat2.gml
+%%DBKDIR%%/2.4.1/iso-num.gml
+%%DBKDIR%%/2.4.1/iso-pub.gml
+%%DBKDIR%%/2.4.1/iso-tech.gml
+%%DBKDIR%%/3.0/30chg.txt
+%%DBKDIR%%/3.0/40issues.txt
+%%DBKDIR%%/3.0/announce.txt
+%%DBKDIR%%/3.0/cals-tbl.dtd
+%%DBKDIR%%/3.0/dbgenent.mod
+%%DBKDIR%%/3.0/dbhier.mod
+%%DBKDIR%%/3.0/dbpool.mod
+%%DBKDIR%%/3.0/docbook.cat
+%%DBKDIR%%/3.0/docbook.dcl
+%%DBKDIR%%/3.0/docbook.dtd
+%%DBKDIR%%/3.1/31chg.txt
+%%DBKDIR%%/3.1/40issues.txt
+%%DBKDIR%%/3.1/50issues.txt
+%%DBKDIR%%/3.1/ChangeLog
+%%DBKDIR%%/3.1/cals-tbl.dtd
+%%DBKDIR%%/3.1/dbcent.mod
+%%DBKDIR%%/3.1/dbgenent.mod
+%%DBKDIR%%/3.1/dbhier.mod
+%%DBKDIR%%/3.1/dbnotn.mod
+%%DBKDIR%%/3.1/dbpool.mod
+%%DBKDIR%%/3.1/docbook.cat
+%%DBKDIR%%/3.1/docbook.dcl
+%%DBKDIR%%/3.1/docbook.dtd
+%%DBKDIR%%/3.1/readme.txt
+%%DBKDIR%%/4.0/40chg.txt
+%%DBKDIR%%/4.0/50issues.txt
+%%DBKDIR%%/4.0/cals-tbl.dtd
+%%DBKDIR%%/4.0/dbcent.mod
+%%DBKDIR%%/4.0/dbgenent.mod
+%%DBKDIR%%/4.0/dbhier.mod
+%%DBKDIR%%/4.0/dbnotn.mod
+%%DBKDIR%%/4.0/dbpool.mod
+%%DBKDIR%%/4.0/docbook.cat
+%%DBKDIR%%/4.0/docbook.dcl
+%%DBKDIR%%/4.0/docbook.dtd
+%%DBKDIR%%/4.0/readme.txt
+%%DBKDIR%%/4.1/40chg.txt
+%%DBKDIR%%/4.1/41chg.txt
+%%DBKDIR%%/4.1/50issues.txt
+%%DBKDIR%%/4.1/ChangeLog
+%%DBKDIR%%/4.1/cals-tbl.dtd
+%%DBKDIR%%/4.1/dbcent.mod
+%%DBKDIR%%/4.1/dbgenent.mod
+%%DBKDIR%%/4.1/dbhier.mod
+%%DBKDIR%%/4.1/dbnotn.mod
+%%DBKDIR%%/4.1/dbpool.mod
+%%DBKDIR%%/4.1/docbook.cat
+%%DBKDIR%%/4.1/docbook.dcl
+%%DBKDIR%%/4.1/docbook.dtd
+%%DBKDIR%%/4.1/readme.txt
+%%DBKDIR%%/4.2/ChangeLog
+%%DBKDIR%%/4.2/README
+%%DBKDIR%%/4.2/calstblx.dtd
+%%DBKDIR%%/4.2/catalog.xml
+%%DBKDIR%%/4.2/dbcentx.mod
+%%DBKDIR%%/4.2/dbgenent.mod
+%%DBKDIR%%/4.2/dbhierx.mod
+%%DBKDIR%%/4.2/dbnotnx.mod
+%%DBKDIR%%/4.2/dbpoolx.mod
+%%DBKDIR%%/4.2/docbook.cat
+%%DBKDIR%%/4.2/docbook.dcl
+%%DBKDIR%%/4.2/docbook.dtd
+%%DBKDIR%%/4.2/docbookx.dtd
+%%DBKDIR%%/4.2/soextblx.dtd
+%%DBKDIR%%/4.3/ChangeLog
+%%DBKDIR%%/4.3/README
+%%DBKDIR%%/4.3/calstblx.dtd
+%%DBKDIR%%/4.3/catalog.xml
+%%DBKDIR%%/4.3/dbcentx.mod
+%%DBKDIR%%/4.3/dbgenent.mod
+%%DBKDIR%%/4.3/dbhierx.mod
+%%DBKDIR%%/4.3/dbnotnx.mod
+%%DBKDIR%%/4.3/dbpoolx.mod
+%%DBKDIR%%/4.3/docbook.cat
+%%DBKDIR%%/4.3/docbook.dcl
+%%DBKDIR%%/4.3/docbook.dtd
+%%DBKDIR%%/4.3/docbookx.dtd
+%%DBKDIR%%/4.3/htmltblx.mod
+%%DBKDIR%%/4.3/soextblx.dtd
+%%DBKDIR%%/4.4/ChangeLog
+%%DBKDIR%%/4.4/README
+%%DBKDIR%%/4.4/calstblx.dtd
+%%DBKDIR%%/4.4/catalog.xml
+%%DBKDIR%%/4.4/dbcentx.mod
+%%DBKDIR%%/4.4/dbgenent.mod
+%%DBKDIR%%/4.4/dbhierx.mod
+%%DBKDIR%%/4.4/dbnotnx.mod
+%%DBKDIR%%/4.4/dbpoolx.mod
+%%DBKDIR%%/4.4/docbook.cat
+%%DBKDIR%%/4.4/docbook.dcl
+%%DBKDIR%%/4.4/docbook.dtd
+%%DBKDIR%%/4.4/docbookx.dtd
+%%DBKDIR%%/4.4/htmltblx.mod
+%%DBKDIR%%/4.4/soextblx.dtd
+%%DBKDIR%%/4.5/README
+%%DBKDIR%%/4.5/calstblx.dtd
+%%DBKDIR%%/4.5/catalog.xml
+%%DBKDIR%%/4.5/dbcentx.mod
+%%DBKDIR%%/4.5/dbgenent.mod
+%%DBKDIR%%/4.5/dbhierx.mod
+%%DBKDIR%%/4.5/dbnotnx.mod
+%%DBKDIR%%/4.5/dbpoolx.mod
+%%DBKDIR%%/4.5/docbook.cat
+%%DBKDIR%%/4.5/docbook.dcl
+%%DBKDIR%%/4.5/docbook.dtd
+%%DBKDIR%%/4.5/docbookx.dtd
+%%DBKDIR%%/4.5/htmltblx.mod
+%%DBKDIR%%/4.5/soextblx.dtd
+%%DBKDIR%%/catalog
+@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove CATALOG %D/%F
+@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
+@dirrmtry %%DBKDIR%%/4.5
+@dirrmtry %%DBKDIR%%/4.4
+@dirrmtry %%DBKDIR%%/4.3
+@dirrmtry %%DBKDIR%%/4.2
+@dirrmtry %%DBKDIR%%/4.1
+@dirrmtry %%DBKDIR%%/4.0
+@dirrmtry %%DBKDIR%%/3.1
+@dirrmtry %%DBKDIR%%/3.0
+@dirrmtry %%DBKDIR%%/2.4.1
+@dirrmtry %%DBKDIR%%
diff --git a/textproc/docbook-sk/Makefile b/textproc/docbook-sk/Makefile
deleted file mode 100644
index 3992348ac3cc..000000000000
--- a/textproc/docbook-sk/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Created by: marcus@FreeBSD.org
-# $FreeBSD$
-
-PORTNAME= docbook-sk
-PORTVERSION= 4.1.2
-PORTREVISION= 5
-DISTNAME= docbkx${PORTVERSION:S/.//g}
-
-MAINTAINER= gnome@FreeBSD.org
-COMMENT= XML version of the DocBook DTD version controlled for ScrollKeeper
-
-NO_ISOCAT= yes
-XML_DTD= yes
-HAS_MANUAL_CATALOG_FILE= yes
-
-DTD_NAME?= ${PORTNAME:S/-sk//}
-
-PORTDOCS= ChangeLog *.txt
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-sk/distinfo b/textproc/docbook-sk/distinfo
deleted file mode 100644
index 1b213218d154..000000000000
--- a/textproc/docbook-sk/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbkx412.zip) = 30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772
-SIZE (docbkx412.zip) = 75683
diff --git a/textproc/docbook-sk/pkg-descr b/textproc/docbook-sk/pkg-descr
deleted file mode 100644
index 8a7805b29747..000000000000
--- a/textproc/docbook-sk/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-XML version of the DocBook DTD version controlled for use with ScrollKeeper.
-
-WWW: http://www.oasis-open.org/docbook/
diff --git a/textproc/docbook-sk/pkg-plist b/textproc/docbook-sk/pkg-plist
deleted file mode 100644
index 31045f8af879..000000000000
--- a/textproc/docbook-sk/pkg-plist
+++ /dev/null
@@ -1,50 +0,0 @@
-%%DTDDIR%%/calstblx.dtd
-%%DTDDIR%%/dbcentx.mod
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhierx.mod
-%%DTDDIR%%/dbnotnx.mod
-%%DTDDIR%%/dbpoolx.mod
-%%DTDDIR%%/docbook.cat
-%%DTDDIR%%/docbookx.dtd
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" file://%D/%%DTDDIR%%/dbpoolx.mod
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//DTD DocBook XML V4.1.2//EN" file://%D/%%DTDDIR%%/docbookx.dtd
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" file://%D/%%DTDDIR%%/dbcentx.mod
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN" file://%D/%%DTDDIR%%/dbnotnx.mod
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN" file://%D/%%DTDDIR%%/dbgenent.mod
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN" file://%D/%%DTDDIR%%/dbhierx.mod
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//DTD XML Exchange Table Model 19990315//EN" file://%D/%%DTDDIR%%/soextblx.dtd
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN" file://%D/%%DTDDIR%%/calstblx.dtd
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2" file://%D/%%DTDDIR%%
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2" file://%D/%%DTDDIR%%
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN"
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//DTD DocBook XML V4.1.2//EN"
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN"
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ENTITIES DocBook XML Notations V4.1.2//EN"
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.1.2//EN"
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.1.2//EN"
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//DTD XML Exchange Table Model 19990315//EN"
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove public "-//OASIS//DTD DocBook XML CALS Table Model V4.1.2//EN"
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove rewriteSystem "http://www.oasis-open.org/docbook/xml/4.1.2"
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove rewriteURI "http://www.oasis-open.org/docbook/xml/4.1.2"
-%%DTDDIR%%/ent/iso-amsa.ent
-%%DTDDIR%%/ent/iso-amsb.ent
-%%DTDDIR%%/ent/iso-amsc.ent
-%%DTDDIR%%/ent/iso-amsn.ent
-%%DTDDIR%%/ent/iso-amso.ent
-%%DTDDIR%%/ent/iso-amsr.ent
-%%DTDDIR%%/ent/iso-box.ent
-%%DTDDIR%%/ent/iso-cyr1.ent
-%%DTDDIR%%/ent/iso-cyr2.ent
-%%DTDDIR%%/ent/iso-dia.ent
-%%DTDDIR%%/ent/iso-grk1.ent
-%%DTDDIR%%/ent/iso-grk2.ent
-%%DTDDIR%%/ent/iso-grk3.ent
-%%DTDDIR%%/ent/iso-grk4.ent
-%%DTDDIR%%/ent/iso-lat1.ent
-%%DTDDIR%%/ent/iso-lat2.ent
-%%DTDDIR%%/ent/iso-num.ent
-%%DTDDIR%%/ent/iso-pub.ent
-%%DTDDIR%%/ent/iso-tech.ent
-%%DTDDIR%%/soextblx.dtd
-@dirrm %%DTDDIR%%/ent
-@dirrm %%DTDDIR%%
diff --git a/textproc/docbook-utils/Makefile b/textproc/docbook-utils/Makefile
index e2add97234dd..c4465c379caf 100644
--- a/textproc/docbook-utils/Makefile
+++ b/textproc/docbook-utils/Makefile
@@ -3,7 +3,7 @@
PORTNAME= docbook-utils
PORTVERSION= 0.6.14
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
MASTER_SITE_SUBDIR= docbook-tools/new-trials/SOURCES
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR= docbook-tools/new-trials/SOURCES
MAINTAINER= gabor@FreeBSD.org
COMMENT= Generates various output formats from DocBook SGML documents
-BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-310 \
+BUILD_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-sgml \
${LOCALBASE}/share/sgml/docbook/dsssl:${PORTSDIR}/textproc/dsssl-docbook-modular \
nsgmls:${PORTSDIR}/textproc/jade
RUN_DEPENDS+= ${LOCALBASE}/share/sgml/docbook/dsssl:${PORTSDIR}/textproc/dsssl-docbook-modular \
diff --git a/textproc/docbook-xml-430/Makefile b/textproc/docbook-xml-430/Makefile
deleted file mode 100644
index ed730ebcacaa..000000000000
--- a/textproc/docbook-xml-430/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Created by: hrs
-# $FreeBSD$
-
-PORTNAME= docbook-xml
-PORTVERSION= 4.3
-PORTREVISION= 2
-PKGNAMESUFFIX= 430
-
-MAINTAINER= hrs@FreeBSD.org
-COMMENT= DocBook/XML DTD V4.3, designed for technical documentation
-
-NO_ISOCAT= yes
-XML_DTD= yes
-HAS_MANUAL_CATALOG_FILE= yes
-
-DTD_NAME?= ${PORTNAME:S/-xml//}
-
-PORTDOCS= ChangeLog README
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-xml-430/distinfo b/textproc/docbook-xml-430/distinfo
deleted file mode 100644
index e8996e2ed41c..000000000000
--- a/textproc/docbook-xml-430/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbook-xml-4.3.zip) = 23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464
-SIZE (docbook-xml-4.3.zip) = 83865
diff --git a/textproc/docbook-xml-430/pkg-descr b/textproc/docbook-xml-430/pkg-descr
deleted file mode 100644
index ae23a10fa13f..000000000000
--- a/textproc/docbook-xml-430/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-XML version of the DocBook DTD V4.3.
-
-WWW: http://www.docbook.org/xml/4.3/index.html
diff --git a/textproc/docbook-xml-430/pkg-plist b/textproc/docbook-xml-430/pkg-plist
deleted file mode 100644
index 107bc4489eca..000000000000
--- a/textproc/docbook-xml-430/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-%%DTDDIR%%/calstblx.dtd
-%%DTDDIR%%/catalog.xml
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F
-%%DTDDIR%%/dbcentx.mod
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhierx.mod
-%%DTDDIR%%/dbnotnx.mod
-%%DTDDIR%%/dbpoolx.mod
-%%DTDDIR%%/docbook.cat
-%%DTDDIR%%/docbookx.dtd
-%%DTDDIR%%/ent/iso-amsa.ent
-%%DTDDIR%%/ent/iso-amsb.ent
-%%DTDDIR%%/ent/iso-amsc.ent
-%%DTDDIR%%/ent/iso-amsn.ent
-%%DTDDIR%%/ent/iso-amso.ent
-%%DTDDIR%%/ent/iso-amsr.ent
-%%DTDDIR%%/ent/iso-box.ent
-%%DTDDIR%%/ent/iso-cyr1.ent
-%%DTDDIR%%/ent/iso-cyr2.ent
-%%DTDDIR%%/ent/iso-dia.ent
-%%DTDDIR%%/ent/iso-grk1.ent
-%%DTDDIR%%/ent/iso-grk2.ent
-%%DTDDIR%%/ent/iso-grk3.ent
-%%DTDDIR%%/ent/iso-grk4.ent
-%%DTDDIR%%/ent/iso-lat1.ent
-%%DTDDIR%%/ent/iso-lat2.ent
-%%DTDDIR%%/ent/iso-num.ent
-%%DTDDIR%%/ent/iso-pub.ent
-%%DTDDIR%%/ent/iso-tech.ent
-%%DTDDIR%%/htmltblx.mod
-%%DTDDIR%%/soextblx.dtd
-@dirrmtry %%DTDDIR%%/ent
-@dirrmtry %%DTDDIR%%
diff --git a/textproc/docbook-xml-440/Makefile b/textproc/docbook-xml-440/Makefile
deleted file mode 100644
index cf34c646ca54..000000000000
--- a/textproc/docbook-xml-440/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Created by: Sergey Skvortsov <skv@protey.ru>
-# $FreeBSD$
-
-PORTNAME= docbook-xml
-PORTVERSION= 4.4
-PORTREVISION= 4
-PKGNAMESUFFIX= 440
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= DocBook/XML DTD V4.4, designed for technical documentation
-
-NO_ISOCAT= yes
-XML_DTD= yes
-HAS_MANUAL_CATALOG_FILE= yes
-MANUAL_DOCS= yes
-
-OPTIONS_DEFINE= DOCS
-
-DTD_NAME= ${PORTNAME:S/-xml//}
-
-PORTDOCS= *
-
-post-install:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}/ent
-.for f in ChangeLog README ent/README
- ${MV} ${STAGEDIR}${PREFIX}/${DTDDIR}/${f} ${STAGEDIR}${DOCSDIR}/${f}
-.endfor
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-xml-440/distinfo b/textproc/docbook-xml-440/distinfo
deleted file mode 100644
index 42754771ff09..000000000000
--- a/textproc/docbook-xml-440/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbook-xml-4.4.zip) = 02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090
-SIZE (docbook-xml-4.4.zip) = 96107
diff --git a/textproc/docbook-xml-440/pkg-descr b/textproc/docbook-xml-440/pkg-descr
deleted file mode 100644
index b916ecf3fad6..000000000000
--- a/textproc/docbook-xml-440/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-XML version of the DocBook DTD V4.4.
-
-WWW: http://www.docbook.org/xml/4.4/index.html
diff --git a/textproc/docbook-xml-440/pkg-plist b/textproc/docbook-xml-440/pkg-plist
deleted file mode 100644
index ffbeb8f805e3..000000000000
--- a/textproc/docbook-xml-440/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-%%DTDDIR%%/calstblx.dtd
-%%DTDDIR%%/catalog.xml
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F
-%%DTDDIR%%/dbcentx.mod
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhierx.mod
-%%DTDDIR%%/dbnotnx.mod
-%%DTDDIR%%/dbpoolx.mod
-%%DTDDIR%%/docbook.cat
-%%DTDDIR%%/docbookx.dtd
-%%DTDDIR%%/ent/isoamsa.ent
-%%DTDDIR%%/ent/isoamsb.ent
-%%DTDDIR%%/ent/isoamsc.ent
-%%DTDDIR%%/ent/isoamsn.ent
-%%DTDDIR%%/ent/isoamso.ent
-%%DTDDIR%%/ent/isoamsr.ent
-%%DTDDIR%%/ent/isobox.ent
-%%DTDDIR%%/ent/isocyr1.ent
-%%DTDDIR%%/ent/isocyr2.ent
-%%DTDDIR%%/ent/isodia.ent
-%%DTDDIR%%/ent/isogrk1.ent
-%%DTDDIR%%/ent/isogrk2.ent
-%%DTDDIR%%/ent/isogrk3.ent
-%%DTDDIR%%/ent/isogrk4.ent
-%%DTDDIR%%/ent/isolat1.ent
-%%DTDDIR%%/ent/isolat2.ent
-%%DTDDIR%%/ent/isonum.ent
-%%DTDDIR%%/ent/isopub.ent
-%%DTDDIR%%/ent/isotech.ent
-%%DTDDIR%%/htmltblx.mod
-%%DTDDIR%%/soextblx.dtd
-@dirrmtry %%DTDDIR%%/ent
-@dirrmtry %%DTDDIR%%
diff --git a/textproc/docbook-xml-450/Makefile b/textproc/docbook-xml-450/Makefile
deleted file mode 100644
index 2eb7695e3bd7..000000000000
--- a/textproc/docbook-xml-450/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Created by: alepulver
-# $FreeBSD$
-
-PORTNAME= docbook-xml
-PORTVERSION= 4.5
-PORTREVISION= 3
-PKGNAMESUFFIX= 450
-
-MAINTAINER= gabor@FreeBSD.org
-COMMENT= DocBook/XML DTD V4.5, designed for technical documentation
-
-NO_ISOCAT= yes
-XML_DTD= yes
-HAS_MANUAL_CATALOG_FILE= yes
-MANUAL_DOCS= yes
-
-OPTIONS_DEFINE= DOCS
-
-DTD_NAME= ${PORTNAME:S/-xml//}
-
-PORTDOCS= *
-
-post-install:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}/ent
-.for f in ChangeLog README ent/README
- ${MV} ${STAGEDIR}${PREFIX}/${DTDDIR}/${f} ${STAGEDIR}${DOCSDIR}/${f}
-.endfor
-
-.include "../../textproc/docbook/bsd.docbook.mk"
-.include <bsd.port.mk>
diff --git a/textproc/docbook-xml-450/distinfo b/textproc/docbook-xml-450/distinfo
deleted file mode 100644
index c68343dd3280..000000000000
--- a/textproc/docbook-xml-450/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (docbook-xml-4.5.zip) = 4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4
-SIZE (docbook-xml-4.5.zip) = 98497
diff --git a/textproc/docbook-xml-450/pkg-descr b/textproc/docbook-xml-450/pkg-descr
deleted file mode 100644
index ef2a41db48f1..000000000000
--- a/textproc/docbook-xml-450/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-XML version of the DocBook DTD V4.5.
-
-WWW: http://www.docbook.org/xml/4.5/index.html
diff --git a/textproc/docbook-xml-450/pkg-plist b/textproc/docbook-xml-450/pkg-plist
deleted file mode 100644
index ffbeb8f805e3..000000000000
--- a/textproc/docbook-xml-450/pkg-plist
+++ /dev/null
@@ -1,34 +0,0 @@
-%%DTDDIR%%/calstblx.dtd
-%%DTDDIR%%/catalog.xml
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F
-@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F
-%%DTDDIR%%/dbcentx.mod
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhierx.mod
-%%DTDDIR%%/dbnotnx.mod
-%%DTDDIR%%/dbpoolx.mod
-%%DTDDIR%%/docbook.cat
-%%DTDDIR%%/docbookx.dtd
-%%DTDDIR%%/ent/isoamsa.ent
-%%DTDDIR%%/ent/isoamsb.ent
-%%DTDDIR%%/ent/isoamsc.ent
-%%DTDDIR%%/ent/isoamsn.ent
-%%DTDDIR%%/ent/isoamso.ent
-%%DTDDIR%%/ent/isoamsr.ent
-%%DTDDIR%%/ent/isobox.ent
-%%DTDDIR%%/ent/isocyr1.ent
-%%DTDDIR%%/ent/isocyr2.ent
-%%DTDDIR%%/ent/isodia.ent
-%%DTDDIR%%/ent/isogrk1.ent
-%%DTDDIR%%/ent/isogrk2.ent
-%%DTDDIR%%/ent/isogrk3.ent
-%%DTDDIR%%/ent/isogrk4.ent
-%%DTDDIR%%/ent/isolat1.ent
-%%DTDDIR%%/ent/isolat2.ent
-%%DTDDIR%%/ent/isonum.ent
-%%DTDDIR%%/ent/isopub.ent
-%%DTDDIR%%/ent/isotech.ent
-%%DTDDIR%%/htmltblx.mod
-%%DTDDIR%%/soextblx.dtd
-@dirrmtry %%DTDDIR%%/ent
-@dirrmtry %%DTDDIR%%
diff --git a/textproc/docbook-xml/Makefile b/textproc/docbook-xml/Makefile
index d11321566678..d9792e5410ff 100644
--- a/textproc/docbook-xml/Makefile
+++ b/textproc/docbook-xml/Makefile
@@ -1,22 +1,68 @@
-# Created by: kuriyama
# $FreeBSD$
-PORTNAME= docbook-xml
-PORTVERSION= 4.2
-PORTREVISION= 3
-MASTER_SITES= http://www.docbook.org/xml/${PORTVERSION}/ \
- http://www.oasis-open.org/committees/docbook/xml/${PORTVERSION}/
+PORTNAME= docbook
+PORTVERSION= 5.0
+CATEGORIES= textproc
+MASTER_SITES= ${DBFILES:C,(.*):(.*),http://www.docbook.org/xml/\1/:\2,:C,:docbook-xml-([0-9]+).([0-9]+).?([0-9]*),:db\1\2\3,:C,:docbook-([0-9]+).([0-9]+).?([0-9]*),:db\1\2\3,}
+PKGNAMESUFFIX= -xml
+DISTFILES= ${DBFILES:C,.*:(.*),\1.zip:\1,:C,:docbook-xml-([0-9]+).([0-9]+).?([0-9]*),:db\1\2\3,:C,:docbook-([0-9]+).([0-9]+).?([0-9]*),:db\1\2\3,}
-MAINTAINER= kuriyama@FreeBSD.org
-COMMENT= XML version of the DocBook DTD
+MAINTAINER= doceng@FreeBSD.org
+COMMENT= DocBook XML DTD
-NO_ISOCAT= yes
-XML_DTD= yes
-HAS_MANUAL_CATALOG_FILE= yes
+RUN_DEPENDS= ${LOCALBASE}/share/xml/xmlcharent/catalog.xml:${PORTSDIR}/textproc/xmlcharent \
+ ${XMLCATMGR_CMD}:${PORTSDIR}/textproc/xmlcatmgr
-DTD_NAME?= ${PORTNAME:S/-xml//}
+NO_BUILD= yes
-PORTDOCS= README ChangeLog
+DBFILES=4.1.2:docbkx412 4.2:docbook-xml-4.2 4.3:docbook-xml-4.3 \
+ 4.4:docbook-xml-4.4 4.5:docbook-xml-4.5 5.0:docbook-5.0
+
+XMLCATMGR= bin/xmlcatmgr
+XMLCATMGR_CMD= ${LOCALBASE}/${XMLCATMGR}
+SGMLCAT= share/sgml/catalog.ports
+XMLCAT= share/xml/catalog.ports
+DBKDIR= share/xml/docbook
+DBCAT_XML= ${PREFIX}/${DBKDIR}/catalog.xml
+DBCAT_SGML= ${PREFIX}/${DBKDIR}/catalog
+PLIST_SUB= XMLCATMGR=${XMLCATMGR} SGMLCAT=${SGMLCAT} \
+ DBKDIR=${DBKDIR} XMLCAT=${XMLCAT}
+
+do-extract:
+ @${RM} -rf ${WRKDIR}
+ @${MKDIR} ${WRKDIR}
+.for df in ${DISTFILES:C,:.*,,}
+ @cd ${WRKDIR} && ${EXTRACT_CMD} \
+ ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${df} \
+ ${EXTRACT_AFTER_ARGS} -s ,^,${df:R}/,
+.endfor
+
+post-extract:
+ @${MV} ${WRKDIR}/docbook-5.0/docbook-5.0/* ${WRKDIR}/docbook-5.0
+ @${RMDIR} ${WRKDIR}/docbook-5.0/docbook-5.0
+
+pre-install:
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${DBKDIR}
+ ${ECHO_CMD} "CATALOG \"${LOCALBASE}/share/xml/xmlcharent/catalog\"" \
+ > ${STAGEDIR}${DBCAT_SGML}
+ ${XMLCATMGR_CMD} -c ${STAGEDIR}${DBCAT_XML} create
+ ${XMLCATMGR_CMD} -c ${STAGEDIR}${DBCAT_XML} \
+ add nextCatalog "${LOCALBASE}/share/xml/xmlcharent/catalog.xml"
+
+.for D in ${DBFILES:C,:.*,,}
+do-install-${D:S/./_/g}:
+ @${MKDIR} ${STAGEDIR}${PREFIX}/${DBKDIR}/$D
+ cd ${WRKDIR}/${DBFILES:M${D}\:*:C,.*:,,} && \
+ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${DBKDIR}/$D
+ ${XMLCATMGR_CMD} -c ${STAGEDIR}${DBCAT_XML} \
+ add nextCatalog "${PREFIX}/${DBKDIR}/$D/catalog.xml"
+ ${ECHO_CMD} "CATALOG \"${PREFIX}/${DBKDIR}/$D/docbook.cat" \
+ >> ${STAGEDIR}${DBCAT_SGML}
+do-install: do-install-${D:S/./_/g}
+.endfor
+
+post-install:
+ ${INSTALL_DATA} ${FILESDIR}/catalog412.xml \
+ ${STAGEDIR}${PREFIX}/${DBKDIR}/4.1.2/catalog.xml
-.include "../../textproc/docbook/bsd.docbook.mk"
.include <bsd.port.mk>
diff --git a/textproc/docbook-xml/distinfo b/textproc/docbook-xml/distinfo
index 73b05439a026..cc383c4810f3 100644
--- a/textproc/docbook-xml/distinfo
+++ b/textproc/docbook-xml/distinfo
@@ -1,2 +1,12 @@
+SHA256 (docbkx412.zip) = 30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772
+SIZE (docbkx412.zip) = 75683
SHA256 (docbook-xml-4.2.zip) = acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2
SIZE (docbook-xml-4.2.zip) = 78428
+SHA256 (docbook-xml-4.3.zip) = 23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464
+SIZE (docbook-xml-4.3.zip) = 83865
+SHA256 (docbook-xml-4.4.zip) = 02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090
+SIZE (docbook-xml-4.4.zip) = 96107
+SHA256 (docbook-xml-4.5.zip) = 4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4
+SIZE (docbook-xml-4.5.zip) = 98497
+SHA256 (docbook-5.0.zip) = 3dcd65e1f5d9c0c891b3be204fa2bb418ce485d32310e1ca052e81d36623208e
+SIZE (docbook-5.0.zip) = 835797
diff --git a/textproc/docbook-xml/files/catalog412.xml b/textproc/docbook-xml/files/catalog412.xml
new file mode 100644
index 000000000000..84099164503b
--- /dev/null
+++ b/textproc/docbook-xml/files/catalog412.xml
@@ -0,0 +1,115 @@
+<?xml version='1.0'?>
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+
+<!-- ...................................................................... -->
+<!-- XML Catalog data for DocBook XML V4.1.2 .............................. -->
+<!-- File catalog.xml ..................................................... -->
+
+<!-- Please direct all questions, bug reports, or suggestions for
+ changes to the docbook@lists.oasis-open.org mailing list. For more
+ information, see http://www.oasis-open.org/.
+ -->
+
+<!-- This is the catalog data file for DocBook V4.1.2. It is provided as
+ a convenience in building your own catalog files. You need not use
+ the filenames listed here, and need not use the filename method of
+ identifying storage objects at all. See the documentation for
+ detailed information on the files associated with the DocBook DTD.
+ See XML Catalogs at http://www.oasis-open.org/committees/entity/ for
+ detailed information on supplying and using catalog data.
+ -->
+
+<!-- ...................................................................... -->
+<!-- DocBook driver file .................................................. -->
+
+<public publicId="-//OASIS//DTD DocBook XML V4.1.2//EN"
+ uri="docbookx.dtd"/>
+
+<!-- ...................................................................... -->
+<!-- DocBook modules ...................................................... -->
+
+<public publicId="-//OASIS//DTD DocBook CALS Table Model V4.1.2//EN"
+ uri="calstblx.dtd"/>
+
+<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN"
+ uri="soextblx.dtd"/>
+
+<public publicId="-//OASIS//ELEMENTS DocBook Information Pool V4.1.2//EN"
+ uri="dbpoolx.mod"/>
+
+<public publicId="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1.2//EN"
+ uri="dbhierx.mod"/>
+
+<public publicId="-//OASIS//ENTITIES DocBook Additional General Entities V4.1.2//EN"
+ uri="dbgenent.mod"/>
+
+<public publicId="-//OASIS//ENTITIES DocBook Notations V4.1.2//EN"
+ uri="dbnotnx.mod"/>
+
+<public publicId="-//OASIS//ENTITIES DocBook Character Entities V4.1.2//EN"
+ uri="dbcentx.mod"/>
+
+<!-- ...................................................................... -->
+<!-- ISO entity sets ...................................................... -->
+
+<public publicId="ISO 8879:1986//ENTITIES Diacritical Marks//EN//XML"
+ uri="ent/iso-dia.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN//XML"
+ uri="ent/iso-num.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Publishing//EN//XML"
+ uri="ent/iso-pub.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES General Technical//EN//XML"
+ uri="ent/iso-tech.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Added Latin 1//EN//XML"
+ uri="ent/iso-lat1.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Added Latin 2//EN//XML"
+ uri="ent/iso-lat2.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Greek Letters//EN//XML"
+ uri="ent/iso-grk1.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Monotoniko Greek//EN//XML"
+ uri="ent/iso-grk2.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Greek Symbols//EN//XML"
+ uri="ent/iso-grk3.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Alternative Greek Symbols//EN//XML"
+ uri="ent/iso-grk4.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Arrow Relations//EN//XML"
+ uri="ent/iso-amsa.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Binary Operators//EN//XML"
+ uri="ent/iso-amsb.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Delimiters//EN//XML"
+ uri="ent/iso-amsc.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Negated Relations//EN//XML"
+ uri="ent/iso-amsn.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Ordinary//EN//XML"
+ uri="ent/iso-amso.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Added Math Symbols: Relations//EN//XML"
+ uri="ent/iso-amsr.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Box and Line Drawing//EN//XML"
+ uri="ent/iso-box.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Russian Cyrillic//EN//XML"
+ uri="ent/iso-cyr1.ent"/>
+
+<public publicId="ISO 8879:1986//ENTITIES Non-Russian Cyrillic//EN//XML"
+ uri="ent/iso-cyr2.ent"/>
+
+<!-- End of catalog data for DocBook XML V4.1.2 ........................... -->
+<!-- ...................................................................... -->
+
+</catalog>
diff --git a/textproc/docbook-xml/pkg-descr b/textproc/docbook-xml/pkg-descr
index 2d0fe5e05369..e716e54ca8f7 100644
--- a/textproc/docbook-xml/pkg-descr
+++ b/textproc/docbook-xml/pkg-descr
@@ -1,3 +1,3 @@
-XML version of the DocBook DTD.
+DocBook XML DTD.
WWW: http://www.oasis-open.org/docbook/
diff --git a/textproc/docbook-xml/pkg-plist b/textproc/docbook-xml/pkg-plist
index 82f24217c593..ae9c16abdf4d 100644
--- a/textproc/docbook-xml/pkg-plist
+++ b/textproc/docbook-xml/pkg-plist
@@ -1,35 +1,214 @@
-%%DTDDIR%%/calstblx.dtd
-%%DTDDIR%%/catalog.xml
-@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove %D/%F
+%%DBKDIR%%/4.1.2/40chg.txt
+%%DBKDIR%%/4.1.2/41chg.txt
+%%DBKDIR%%/4.1.2/ChangeLog
+%%DBKDIR%%/4.1.2/calstblx.dtd
+%%DBKDIR%%/4.1.2/catalog.xml
+%%DBKDIR%%/4.1.2/dbcentx.mod
+%%DBKDIR%%/4.1.2/dbgenent.mod
+%%DBKDIR%%/4.1.2/dbhierx.mod
+%%DBKDIR%%/4.1.2/dbnotnx.mod
+%%DBKDIR%%/4.1.2/dbpoolx.mod
+%%DBKDIR%%/4.1.2/docbook.cat
+%%DBKDIR%%/4.1.2/docbookx.dtd
+%%DBKDIR%%/4.1.2/ent/iso-amsa.ent
+%%DBKDIR%%/4.1.2/ent/iso-amsb.ent
+%%DBKDIR%%/4.1.2/ent/iso-amsc.ent
+%%DBKDIR%%/4.1.2/ent/iso-amsn.ent
+%%DBKDIR%%/4.1.2/ent/iso-amso.ent
+%%DBKDIR%%/4.1.2/ent/iso-amsr.ent
+%%DBKDIR%%/4.1.2/ent/iso-box.ent
+%%DBKDIR%%/4.1.2/ent/iso-cyr1.ent
+%%DBKDIR%%/4.1.2/ent/iso-cyr2.ent
+%%DBKDIR%%/4.1.2/ent/iso-dia.ent
+%%DBKDIR%%/4.1.2/ent/iso-grk1.ent
+%%DBKDIR%%/4.1.2/ent/iso-grk2.ent
+%%DBKDIR%%/4.1.2/ent/iso-grk3.ent
+%%DBKDIR%%/4.1.2/ent/iso-grk4.ent
+%%DBKDIR%%/4.1.2/ent/iso-lat1.ent
+%%DBKDIR%%/4.1.2/ent/iso-lat2.ent
+%%DBKDIR%%/4.1.2/ent/iso-num.ent
+%%DBKDIR%%/4.1.2/ent/iso-pub.ent
+%%DBKDIR%%/4.1.2/ent/iso-tech.ent
+%%DBKDIR%%/4.1.2/readme.txt
+%%DBKDIR%%/4.1.2/soextblx.dtd
+%%DBKDIR%%/4.2/ChangeLog
+%%DBKDIR%%/4.2/README
+%%DBKDIR%%/4.2/calstblx.dtd
+%%DBKDIR%%/4.2/catalog.xml
+%%DBKDIR%%/4.2/dbcentx.mod
+%%DBKDIR%%/4.2/dbgenent.mod
+%%DBKDIR%%/4.2/dbhierx.mod
+%%DBKDIR%%/4.2/dbnotnx.mod
+%%DBKDIR%%/4.2/dbpoolx.mod
+%%DBKDIR%%/4.2/docbook.cat
+%%DBKDIR%%/4.2/docbookx.dtd
+%%DBKDIR%%/4.2/ent/iso-amsa.ent
+%%DBKDIR%%/4.2/ent/iso-amsb.ent
+%%DBKDIR%%/4.2/ent/iso-amsc.ent
+%%DBKDIR%%/4.2/ent/iso-amsn.ent
+%%DBKDIR%%/4.2/ent/iso-amso.ent
+%%DBKDIR%%/4.2/ent/iso-amsr.ent
+%%DBKDIR%%/4.2/ent/iso-box.ent
+%%DBKDIR%%/4.2/ent/iso-cyr1.ent
+%%DBKDIR%%/4.2/ent/iso-cyr2.ent
+%%DBKDIR%%/4.2/ent/iso-dia.ent
+%%DBKDIR%%/4.2/ent/iso-grk1.ent
+%%DBKDIR%%/4.2/ent/iso-grk2.ent
+%%DBKDIR%%/4.2/ent/iso-grk3.ent
+%%DBKDIR%%/4.2/ent/iso-grk4.ent
+%%DBKDIR%%/4.2/ent/iso-lat1.ent
+%%DBKDIR%%/4.2/ent/iso-lat2.ent
+%%DBKDIR%%/4.2/ent/iso-num.ent
+%%DBKDIR%%/4.2/ent/iso-pub.ent
+%%DBKDIR%%/4.2/ent/iso-tech.ent
+%%DBKDIR%%/4.2/soextblx.dtd
+%%DBKDIR%%/4.3/ChangeLog
+%%DBKDIR%%/4.3/README
+%%DBKDIR%%/4.3/calstblx.dtd
+%%DBKDIR%%/4.3/catalog.xml
+%%DBKDIR%%/4.3/dbcentx.mod
+%%DBKDIR%%/4.3/dbgenent.mod
+%%DBKDIR%%/4.3/dbhierx.mod
+%%DBKDIR%%/4.3/dbnotnx.mod
+%%DBKDIR%%/4.3/dbpoolx.mod
+%%DBKDIR%%/4.3/docbook.cat
+%%DBKDIR%%/4.3/docbookx.dtd
+%%DBKDIR%%/4.3/ent/iso-amsa.ent
+%%DBKDIR%%/4.3/ent/iso-amsb.ent
+%%DBKDIR%%/4.3/ent/iso-amsc.ent
+%%DBKDIR%%/4.3/ent/iso-amsn.ent
+%%DBKDIR%%/4.3/ent/iso-amso.ent
+%%DBKDIR%%/4.3/ent/iso-amsr.ent
+%%DBKDIR%%/4.3/ent/iso-box.ent
+%%DBKDIR%%/4.3/ent/iso-cyr1.ent
+%%DBKDIR%%/4.3/ent/iso-cyr2.ent
+%%DBKDIR%%/4.3/ent/iso-dia.ent
+%%DBKDIR%%/4.3/ent/iso-grk1.ent
+%%DBKDIR%%/4.3/ent/iso-grk2.ent
+%%DBKDIR%%/4.3/ent/iso-grk3.ent
+%%DBKDIR%%/4.3/ent/iso-grk4.ent
+%%DBKDIR%%/4.3/ent/iso-lat1.ent
+%%DBKDIR%%/4.3/ent/iso-lat2.ent
+%%DBKDIR%%/4.3/ent/iso-num.ent
+%%DBKDIR%%/4.3/ent/iso-pub.ent
+%%DBKDIR%%/4.3/ent/iso-tech.ent
+%%DBKDIR%%/4.3/htmltblx.mod
+%%DBKDIR%%/4.3/soextblx.dtd
+%%DBKDIR%%/4.4/ChangeLog
+%%DBKDIR%%/4.4/README
+%%DBKDIR%%/4.4/calstblx.dtd
+%%DBKDIR%%/4.4/catalog.xml
+%%DBKDIR%%/4.4/dbcentx.mod
+%%DBKDIR%%/4.4/dbgenent.mod
+%%DBKDIR%%/4.4/dbhierx.mod
+%%DBKDIR%%/4.4/dbnotnx.mod
+%%DBKDIR%%/4.4/dbpoolx.mod
+%%DBKDIR%%/4.4/docbook.cat
+%%DBKDIR%%/4.4/docbookx.dtd
+%%DBKDIR%%/4.4/ent/README
+%%DBKDIR%%/4.4/ent/isoamsa.ent
+%%DBKDIR%%/4.4/ent/isoamsb.ent
+%%DBKDIR%%/4.4/ent/isoamsc.ent
+%%DBKDIR%%/4.4/ent/isoamsn.ent
+%%DBKDIR%%/4.4/ent/isoamso.ent
+%%DBKDIR%%/4.4/ent/isoamsr.ent
+%%DBKDIR%%/4.4/ent/isobox.ent
+%%DBKDIR%%/4.4/ent/isocyr1.ent
+%%DBKDIR%%/4.4/ent/isocyr2.ent
+%%DBKDIR%%/4.4/ent/isodia.ent
+%%DBKDIR%%/4.4/ent/isogrk1.ent
+%%DBKDIR%%/4.4/ent/isogrk2.ent
+%%DBKDIR%%/4.4/ent/isogrk3.ent
+%%DBKDIR%%/4.4/ent/isogrk4.ent
+%%DBKDIR%%/4.4/ent/isolat1.ent
+%%DBKDIR%%/4.4/ent/isolat2.ent
+%%DBKDIR%%/4.4/ent/isonum.ent
+%%DBKDIR%%/4.4/ent/isopub.ent
+%%DBKDIR%%/4.4/ent/isotech.ent
+%%DBKDIR%%/4.4/htmltblx.mod
+%%DBKDIR%%/4.4/soextblx.dtd
+%%DBKDIR%%/4.5/ChangeLog
+%%DBKDIR%%/4.5/README
+%%DBKDIR%%/4.5/calstblx.dtd
+%%DBKDIR%%/4.5/catalog.xml
+%%DBKDIR%%/4.5/dbcentx.mod
+%%DBKDIR%%/4.5/dbgenent.mod
+%%DBKDIR%%/4.5/dbhierx.mod
+%%DBKDIR%%/4.5/dbnotnx.mod
+%%DBKDIR%%/4.5/dbpoolx.mod
+%%DBKDIR%%/4.5/docbook.cat
+%%DBKDIR%%/4.5/docbookx.dtd
+%%DBKDIR%%/4.5/ent/README
+%%DBKDIR%%/4.5/ent/isoamsa.ent
+%%DBKDIR%%/4.5/ent/isoamsb.ent
+%%DBKDIR%%/4.5/ent/isoamsc.ent
+%%DBKDIR%%/4.5/ent/isoamsn.ent
+%%DBKDIR%%/4.5/ent/isoamso.ent
+%%DBKDIR%%/4.5/ent/isoamsr.ent
+%%DBKDIR%%/4.5/ent/isobox.ent
+%%DBKDIR%%/4.5/ent/isocyr1.ent
+%%DBKDIR%%/4.5/ent/isocyr2.ent
+%%DBKDIR%%/4.5/ent/isodia.ent
+%%DBKDIR%%/4.5/ent/isogrk1.ent
+%%DBKDIR%%/4.5/ent/isogrk2.ent
+%%DBKDIR%%/4.5/ent/isogrk3.ent
+%%DBKDIR%%/4.5/ent/isogrk4.ent
+%%DBKDIR%%/4.5/ent/isolat1.ent
+%%DBKDIR%%/4.5/ent/isolat2.ent
+%%DBKDIR%%/4.5/ent/isonum.ent
+%%DBKDIR%%/4.5/ent/isopub.ent
+%%DBKDIR%%/4.5/ent/isotech.ent
+%%DBKDIR%%/4.5/htmltblx.mod
+%%DBKDIR%%/4.5/soextblx.dtd
+%%DBKDIR%%/5.0/ChangeLog
+%%DBKDIR%%/5.0/README
+%%DBKDIR%%/5.0/VERSION
+%%DBKDIR%%/5.0/catalog.xml
+%%DBKDIR%%/5.0/docbook.nvdl
+%%DBKDIR%%/5.0/docs/docbook-5.0-spec-cd-01.html
+%%DBKDIR%%/5.0/docs/docbook-5.0-spec-cd-01.pdf
+%%DBKDIR%%/5.0/docs/docbook-5.0-spec-cd-01.xml
+%%DBKDIR%%/5.0/docs/howto.html
+%%DBKDIR%%/5.0/docs/howto.pdf
+%%DBKDIR%%/5.0/docs/howto.xml
+%%DBKDIR%%/5.0/docs/images/emacs.png
+%%DBKDIR%%/5.0/docs/images/oxygen1.png
+%%DBKDIR%%/5.0/docs/images/oxygen2.png
+%%DBKDIR%%/5.0/docs/images/oxygen3.png
+%%DBKDIR%%/5.0/docs/images/xxe.png
+%%DBKDIR%%/5.0/dtd/docbook.dtd
+%%DBKDIR%%/5.0/rng/docbook.rnc
+%%DBKDIR%%/5.0/rng/docbook.rng
+%%DBKDIR%%/5.0/rng/docbookxi.rnc
+%%DBKDIR%%/5.0/rng/docbookxi.rng
+%%DBKDIR%%/5.0/sch/docbook.sch
+%%DBKDIR%%/5.0/tools/db4-entities.pl
+%%DBKDIR%%/5.0/tools/db4-upgrade.xsl
+%%DBKDIR%%/5.0/xsd/docbook.xsd
+%%DBKDIR%%/5.0/xsd/xlink.xsd
+%%DBKDIR%%/5.0/xsd/xml.xsd
+%%DBKDIR%%/catalog.xml
+@unexec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% remove nextCatalog %D/%F
@exec %D/%%XMLCATMGR%% -c %D/%%XMLCAT%% add nextCatalog %D/%F
-%%DTDDIR%%/dbcentx.mod
-%%DTDDIR%%/dbgenent.mod
-%%DTDDIR%%/dbhierx.mod
-%%DTDDIR%%/dbnotnx.mod
-%%DTDDIR%%/dbpoolx.mod
-%%DTDDIR%%/docbook.cat
-@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove %D/%F
+%%DBKDIR%%/catalog
+@unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove CATALOG %D/%F
@exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
-%%DTDDIR%%/docbookx.dtd
-%%DTDDIR%%/ent/iso-amsa.ent
-%%DTDDIR%%/ent/iso-amsb.ent
-%%DTDDIR%%/ent/iso-amsc.ent
-%%DTDDIR%%/ent/iso-amsn.ent
-%%DTDDIR%%/ent/iso-amso.ent
-%%DTDDIR%%/ent/iso-amsr.ent
-%%DTDDIR%%/ent/iso-box.ent
-%%DTDDIR%%/ent/iso-cyr1.ent
-%%DTDDIR%%/ent/iso-cyr2.ent
-%%DTDDIR%%/ent/iso-dia.ent
-%%DTDDIR%%/ent/iso-grk1.ent
-%%DTDDIR%%/ent/iso-grk2.ent
-%%DTDDIR%%/ent/iso-grk3.ent
-%%DTDDIR%%/ent/iso-grk4.ent
-%%DTDDIR%%/ent/iso-lat1.ent
-%%DTDDIR%%/ent/iso-lat2.ent
-%%DTDDIR%%/ent/iso-num.ent
-%%DTDDIR%%/ent/iso-pub.ent
-%%DTDDIR%%/ent/iso-tech.ent
-%%DTDDIR%%/soextblx.dtd
-@dirrm %%DTDDIR%%/ent
-@dirrm %%DTDDIR%%
+@dirrmtry %%DBKDIR%%/5.0/xsd
+@dirrmtry %%DBKDIR%%/5.0/tools
+@dirrmtry %%DBKDIR%%/5.0/sch
+@dirrmtry %%DBKDIR%%/5.0/rng
+@dirrmtry %%DBKDIR%%/5.0/dtd
+@dirrmtry %%DBKDIR%%/5.0/docs/images
+@dirrmtry %%DBKDIR%%/5.0/docs
+@dirrmtry %%DBKDIR%%/5.0
+@dirrmtry %%DBKDIR%%/4.5/ent
+@dirrmtry %%DBKDIR%%/4.5
+@dirrmtry %%DBKDIR%%/4.4/ent
+@dirrmtry %%DBKDIR%%/4.4
+@dirrmtry %%DBKDIR%%/4.3/ent
+@dirrmtry %%DBKDIR%%/4.3
+@dirrmtry %%DBKDIR%%/4.2/ent
+@dirrmtry %%DBKDIR%%/4.2
+@dirrmtry %%DBKDIR%%/4.1.2/ent
+@dirrmtry %%DBKDIR%%/4.1.2
+@dirrmtry %%DBKDIR%%
diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index ce939b928f41..de2043a266a2 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -2,60 +2,20 @@
# $FreeBSD$
PORTNAME= docbook
-PORTVERSION= 1.4
-PORTREVISION= 2
+PORTVERSION= 1.5
CATEGORIES= textproc
MASTER_SITES= #
DISTFILES= #
-MAINTAINER= gabor@FreeBSD.org
+MAINTAINER= doceng@FreeBSD.org
COMMENT= Meta-port for the different versions of the DocBook DTD
+RUN_DEPENDS= ${LOCALBASE}/share/sgml/docbook/catalog:${PORTSDIR}/textproc/docbook-sgml \
+ ${LOCALBASE}/share/xml/docbook/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
+ ${LOCALBASE}/share/xml/sdocbook/1.1:${PORTSDIR}/textproc/sdocbook-xml
+
NO_BUILD= yes
NO_INSTALL= yes
NO_MTREE= yes
-OPTIONS_DEFINE= DB241 DB30 DB31 DB40 DB41 DB42 DB43 DB44 DB45 DB41_XML \
- DB42_XML DB43_XML DB44_XML DB45_XML DB50_XML SDB_XML \
- SGMLCHARENT XMLCHARENT
-OPTIONS_DEFAULT= DB41_XML DB42_XML DB43_XML DB44_XML DB45_XML DB50_XML \
- SGMLCHARENT XMLCHARENT DB41 DB42 DB43 DB44 DB45
-DB241_DESC= DocBook SGML DTD 2.4.1
-DB30_DESC= DocBook SGML DTD 3.0
-DB31_DESC= DocBook SGML DTD 3.1
-DB40_DESC= DocBook SGML DTD 4.0
-DB41_DESC= DocBook SGML DTD 4.1
-DB42_DESC= DocBook SGML DTD 4.2
-DB43_DESC= DocBook SGML DTD 4.3
-DB44_DESC= DocBook SGML DTD 4.4
-DB45_DESC= DocBook SGML DTD 4.5
-DB41_XML_DESC= DocBook XML DTD 4.1
-DB42_XML_DESC= DocBook XML DTD 4.2
-DB43_XML_DESC= DocBook XML DTD 4.3
-DB44_XML_DESC= DocBook XML DTD 4.4
-DB45_XML_DESC= DocBook XML DTD 4.5
-DB50_XML_DESC= DocBook XML 5.0 distribution
-SDB_XML_DESC= Simplified DocBook XML DTD
-SGMLCHARENT_DESC= ISO 8879:1986 character entity sets (SGML)
-XMLCHARENT_DESC= ISO 8879:1986 character entity sets (XML)
-
-DB241_RUN_DEPENDS= ${LOCALBASE}/share/sgml/docbook/2.4.1:${PORTSDIR}/textproc/docbook-241
-DB30_RUN_DEPENDS= ${LOCALBASE}/share/sgml/docbook/3.0:${PORTSDIR}/textproc/docbook-300
-DB31_RUN_DEPENDS= ${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-310
-DB40_RUN_DEPENDS= ${LOCALBASE}/share/sgml/docbook/4.0:${PORTSDIR}/textproc/docbook-400
-DB41_RUN_DEPENDS= ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410
-DB42_RUN_DEPENDS= ${LOCALBASE}/share/sgml/docbook/4.2:${PORTSDIR}/textproc/docbook-420
-DB43_RUN_DEPENDS= ${LOCALBASE}/share/sgml/docbook/4.3:${PORTSDIR}/textproc/docbook-430
-DB44_RUN_DEPENDS= ${LOCALBASE}/share/sgml/docbook/4.4:${PORTSDIR}/textproc/docbook-440
-DB45_RUN_DEPENDS= ${LOCALBASE}/share/sgml/docbook/4.5:${PORTSDIR}/textproc/docbook-450
-DB41_XML_RUN_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk
-DB42_XML_RUN_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml
-DB43_XML_RUN_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml-430
-DB44_XML_RUN_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.4:${PORTSDIR}/textproc/docbook-xml-440
-DB45_XML_RUN_DEPENDS= ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450
-DB50_XML_RUN_DEPENDS= ${LOCALBASE}/share/xml/docbook/5.0:${PORTSDIR}/textproc/docbook-500
-SDB_XML_RUN_DEPENDS= ${LOCALBASE}/share/xml/sdocbook/1.1:${PORTSDIR}/textproc/sdocbook-xml
-SGMLCHARENT_RUN_DEPENDS= ${LOCALBASE}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879
-XMLCHARENT_RUN_DEPENDS= ${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent
-
.include <bsd.port.mk>
diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile
index 28a967e562bf..d01f10a85608 100644
--- a/textproc/docproj/Makefile
+++ b/textproc/docproj/Makefile
@@ -3,7 +3,7 @@
PORTNAME= docproj
PORTVERSION= 2.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= # empty
DISTFILES= # empty
@@ -23,7 +23,7 @@ RUN_DEPENDS= links:${PORTSDIR}/www/links1 \
${LOCALBASE}/share/xml/dtd/xhtml/xhtml.soc:${PORTSDIR}/textproc/xhtml \
docbook-xsl-ns>=1.78.1_4:${PORTSDIR}/textproc/docbook-xsl-ns \
${LOCALBASE}/share/xsl/iso-schematron/xslt1/iso_schematron_skeleton_for_xslt1.xsl:${PORTSDIR}/textproc/iso-schematron-xslt \
- ${LOCALBASE}/share/xml/docbook/5.0:${PORTSDIR}/textproc/docbook-500 \
+ ${LOCALBASE}/share/xml/docbook/5.0:${PORTSDIR}/textproc/docbook-xml \
${LOCALBASE}/share/xml/xmlcharent/catalog:${PORTSDIR}/textproc/xmlcharent \
p5-XML-Parser>=2.41:${PORTSDIR}/textproc/p5-XML-Parser \
zip:${PORTSDIR}/archivers/zip
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index d0a04f28c1e4..84e5fd937eb1 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -4,6 +4,7 @@
PORTNAME= gnome-doc-utils
PORTVERSION= 0.20.10
+PORTREVISION= 1
CATEGORIES= textproc gnome
MASTER_SITES= GNOME
@@ -15,8 +16,7 @@ BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \
gawk:${PORTSDIR}/lang/gawk
RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \
${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
- ${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml-430 \
- ${LOCALBASE}/share/xml/docbook/4.4:${PORTSDIR}/textproc/docbook-xml-440
+ ${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml \
USE_XZ= yes
MAKE_JOBS_UNSAFE=yes
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 9f73df550943..b6d7bc1db689 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -4,6 +4,7 @@
PORTNAME= gtk-doc
PORTVERSION= 1.18
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= GNOME
@@ -11,11 +12,11 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= Code documentation system, originally for GTK+
BUILD_DEPENDS= jade:${PORTSDIR}/textproc/jade \
- ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-sk \
+ ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
rarian-sk-config:${PORTSDIR}/textproc/rarian
RUN_DEPENDS= jade:${PORTSDIR}/textproc/jade \
- ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-sk \
+ ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
rarian-sk-config:${PORTSDIR}/textproc/rarian
diff --git a/textproc/mate-doc-utils/Makefile b/textproc/mate-doc-utils/Makefile
index 477175d92b04..1e22d9d08893 100644
--- a/textproc/mate-doc-utils/Makefile
+++ b/textproc/mate-doc-utils/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mate-doc-utils
PORTVERSION= 1.6.2
+PORTREVISION= 1
CATEGORIES= textproc mate
MASTER_SITES= MATE
DIST_SUBDIR= mate
@@ -13,8 +14,7 @@ COMMENT= MATE doc utils
BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \
${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2
RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \
- ${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml-430 \
- ${LOCALBASE}/share/xml/docbook/4.4:${PORTSDIR}/textproc/docbook-xml-440 \
+ ${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml \
xml2po:${PORTSDIR}/textproc/gnome-doc-utils
PORTSCOUT= limitw:1,even
diff --git a/textproc/publican/Makefile b/textproc/publican/Makefile
index b1c9cbf32d89..831af22c3eaf 100644
--- a/textproc/publican/Makefile
+++ b/textproc/publican/Makefile
@@ -3,7 +3,7 @@
PORTNAME= publican
PORTVERSION= 2.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc perl5
MASTER_SITES= http://pkgs.fedoraproject.org/repo/pkgs/publican/Publican-${PORTVERSION}.tar.gz/1ddcf8e93e96d0e49868f21df41b53a4/
DISTNAME= Publican-${PORTVERSION}
@@ -53,8 +53,8 @@ BUILD_DEPENDS= \
p5-XML-LibXSLT>=1.67:${PORTSDIR}/textproc/p5-XML-LibXSLT \
p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
p5-XML-TreeBuilder>=4.0:${PORTSDIR}/textproc/p5-XML-TreeBuilder \
- ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450 \
- ${LOCALBASE}/share/sgml/docbook/4.2:${PORTSDIR}/textproc/docbook-420 \
+ ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml \
+ ${LOCALBASE}/share/sgml/docbook/4.2:${PORTSDIR}/textproc/docbook-sgml \
${LOCALBASE}/share/xsl/docbook/html/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
librsvg2>=2.0:${PORTSDIR}/graphics/librsvg2 \
fop:${PORTSDIR}/textproc/fop \
diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
index d803b9a12a1e..72eed687e907 100644
--- a/textproc/rarian/Makefile
+++ b/textproc/rarian/Makefile
@@ -4,6 +4,7 @@
PORTNAME= rarian
PORTVERSION= 0.8.1
+PORTREVISION= 1
CATEGORIES= textproc gnome
MASTER_SITES= GNOME
@@ -11,14 +12,12 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= An OMF help system based on the Freedesktop specification
BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
- ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml \
- ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk \
+ ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml
bash:${PORTSDIR}/shells/bash
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
${LOCALBASE}/bin/getopt:${PORTSDIR}/misc/getopt \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
- ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml \
- ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk
+ ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml
DOCBOOK_VERSION=4.2
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 6365e9b95037..7d65815e3d8f 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -4,7 +4,7 @@
PORTNAME= scrollkeeper
PORTVERSION= 0.3.14
-PORTREVISION= 12
+PORTREVISION= 13
PORTEPOCH= 1
CATEGORIES= textproc gnome
MASTER_SITES= GNOME
@@ -15,12 +15,10 @@ COMMENT= An Open Document Cataloging Project
BUILD_DEPENDS= intltool-extract:${PORTSDIR}/textproc/intltool \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
- ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml \
- ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk
+ ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml
RUN_DEPENDS= intltool-extract:${PORTSDIR}/textproc/intltool \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
- ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml \
- ${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk
+ ${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}:${PORTSDIR}/textproc/docbook-xml
DOCBOOK_VERSION=4.2
diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile
index c61a49e8bd41..c01dd6bd9cf1 100644
--- a/textproc/sgmlformat/Makefile
+++ b/textproc/sgmlformat/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sgmlformat
PORTVERSION= 1.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc print
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= kuriyama
@@ -34,7 +34,7 @@ RUN_DEPENDS= onsgmls:${PORTSDIR}/textproc/openjade
RUN_DEPENDS= nsgmls:${PORTSDIR}/textproc/jade
.endif
RUN_DEPENDS+= ${LOCALBASE}/share/sgml/linuxdoc:${PORTSDIR}/textproc/linuxdoc \
- ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410
+ ${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-sgml
# Above depending on docbook-4.1 file is just for workaround. We need
# some of docbook DTDs, but not all.
diff --git a/textproc/slides/Makefile b/textproc/slides/Makefile
index d6e1beed900c..7ba4f487ad83 100644
--- a/textproc/slides/Makefile
+++ b/textproc/slides/Makefile
@@ -3,7 +3,7 @@
PORTNAME= slides
PORTVERSION= 3.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= SF/docbook/OldFiles
@@ -12,7 +12,7 @@ COMMENT= Doctype and stylesheets for making slides
BUILD_DEPENDS= xmlcatmgr:${PORTSDIR}/textproc/xmlcatmgr
RUN_DEPENDS= ${LOCALBASE}/share/xsl/docbook/catalog:${PORTSDIR}/textproc/docbook-xsl
-RUN_DEPENDS+= ${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml-430
+RUN_DEPENDS+= ${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml
XMLDIR= ${LOCALBASE}/share/xml
INSTDIR= share/xsl/slides
diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index 1e947b21df28..b5885854b5b8 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -3,7 +3,7 @@
PORTNAME= awesome
PORTVERSION= 3.5.2
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= x11-wm
MASTER_SITES= http://awesome.naquadah.org/download/
@@ -20,7 +20,7 @@ BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \
xcb-util>=0.3.8:${PORTSDIR}/x11/xcb-util \
xproto>=7.0.11:${PORTSDIR}/x11/xproto \
${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:${PORTSDIR}/devel/lua-lgi \
- ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450
+ ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml
RUN_DEPENDS= ${LUA_MODLIBDIR}/lgi/corelgilua${LUA_VER_STR}.so:${PORTSDIR}/devel/lua-lgi
LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \
libev.so:${PORTSDIR}/devel/libev \
diff --git a/x11-wm/compton/Makefile b/x11-wm/compton/Makefile
index 63b02ec0a38b..1ad8adb70693 100644
--- a/x11-wm/compton/Makefile
+++ b/x11-wm/compton/Makefile
@@ -2,6 +2,7 @@
PORTNAME= compton
PORTVERSION= 20130625
+PORTREVISION= 1
CATEGORIES= x11-wm
MAINTAINER= femc7488@gmail.com
@@ -61,7 +62,7 @@ MAKE_ARGS+= NO_DBUS=yes
.if ${PORT_OPTIONS:MDOCS}
BUILD_DEPENDS= a2x:${PORTSDIR}/textproc/asciidoc \
xsltproc:${PORTSDIR}/textproc/libxslt \
- ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450 \
+ ${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml \
${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
MAKE_ARGS+= DOCDIR=${DOCSDIR} MANDIR=${MANPREFIX}/man/man1
ALL_TARGET+= docs
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0