svn commit: r345097 - in head: . databases/postgresql91-docs devel/eggdbus devel/git devel/libxs editors/scribes graphics/colord graphics/giflib graphics/liblqr-1 graphics/passepartout mail/dbmail ...

Mathieu Arnold mat at FreeBSD.org
Wed Feb 19 14:45:26 UTC 2014 

Author: mat
Date: Wed Feb 19 14:45:19 2014
New Revision: 345097
URL: http://svnweb.freebsd.org/changeset/ports/345097
QAT: https://qat.redports.org/buildarchive/r345097/

Log:
  Consolidate the docbook ports into -sgml and -xml variants.
  
  Submitted by:	hrs (based on)
  Sponsored by:	Absolight

Added:
  head/textproc/docbook-sgml/
  head/textproc/docbook-sgml/Makefile   (contents, props changed)
  head/textproc/docbook-sgml/distinfo   (contents, props changed)
  head/textproc/docbook-sgml/pkg-descr   (contents, props changed)
  head/textproc/docbook-sgml/pkg-plist   (contents, props changed)
  head/textproc/docbook-xml/files/
  head/textproc/docbook-xml/files/catalog412.xml   (contents, props changed)
Deleted:
  head/textproc/docbook-241/
  head/textproc/docbook-300/
  head/textproc/docbook-310/
  head/textproc/docbook-400/
  head/textproc/docbook-410/
  head/textproc/docbook-420/
  head/textproc/docbook-430/
  head/textproc/docbook-440/
  head/textproc/docbook-450/
  head/textproc/docbook-500/
  head/textproc/docbook-sk/
  head/textproc/docbook-xml-430/
  head/textproc/docbook-xml-440/
  head/textproc/docbook-xml-450/
Modified:
  head/MOVED
  head/UPDATING
  head/databases/postgresql91-docs/Makefile
  head/devel/eggdbus/Makefile
  head/devel/git/Makefile
  head/devel/libxs/Makefile
  head/editors/scribes/Makefile
  head/graphics/colord/Makefile
  head/graphics/giflib/Makefile
  head/graphics/liblqr-1/Makefile
  head/graphics/passepartout/Makefile
  head/mail/dbmail/Makefile
  head/multimedia/dvdstyler/Makefile
  head/ports-mgmt/packagekit/Makefile
  head/print/system-config-printer/Makefile
  head/science/g3data/Makefile
  head/sysutils/gnome-power-manager/Makefile
  head/sysutils/policykit/Makefile
  head/sysutils/polkit/Makefile
  head/sysutils/upower/Makefile
  head/textproc/Makefile
  head/textproc/docbook-utils/Makefile
  head/textproc/docbook-xml/Makefile
  head/textproc/docbook-xml/distinfo
  head/textproc/docbook-xml/pkg-descr
  head/textproc/docbook-xml/pkg-plist
  head/textproc/docbook/Makefile
  head/textproc/docproj/Makefile
  head/textproc/gnome-doc-utils/Makefile
  head/textproc/gtk-doc/Makefile
  head/textproc/mate-doc-utils/Makefile
  head/textproc/publican/Makefile
  head/textproc/rarian/Makefile
  head/textproc/scrollkeeper/Makefile
  head/textproc/sgmlformat/Makefile
  head/textproc/slides/Makefile
  head/x11-wm/awesome/Makefile
  head/x11-wm/compton/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/MOVED	Wed Feb 19 14:45:19 2014	(r345097)
@@ -5457,3 +5457,17 @@ deskutils/kdepim44||2014-02-18|Removed: 
 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

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/UPDATING	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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 at 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 at FreeBSD.org

Modified: head/databases/postgresql91-docs/Makefile
==============================================================================
--- head/databases/postgresql91-docs/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/databases/postgresql91-docs/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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}/text
 		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:

Modified: head/devel/eggdbus/Makefile
==============================================================================
--- head/devel/eggdbus/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/devel/eggdbus/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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
 

Modified: head/devel/git/Makefile
==============================================================================
--- head/devel/git/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/devel/git/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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 PE
 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 "

Modified: head/devel/libxs/Makefile
==============================================================================
--- head/devel/libxs/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/devel/libxs/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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 \

Modified: head/editors/scribes/Makefile
==============================================================================
--- head/editors/scribes/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/editors/scribes/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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

Modified: head/graphics/colord/Makefile
==============================================================================
--- head/graphics/colord/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/graphics/colord/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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
 

Modified: head/graphics/giflib/Makefile
==============================================================================
--- head/graphics/giflib/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/graphics/giflib/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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
 
 .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 '

Modified: head/graphics/liblqr-1/Makefile
==============================================================================
--- head/graphics/liblqr-1/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/graphics/liblqr-1/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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 "

Modified: head/graphics/passepartout/Makefile
==============================================================================
--- head/graphics/passepartout/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/graphics/passepartout/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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

Modified: head/mail/dbmail/Makefile
==============================================================================
--- head/mail/dbmail/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/mail/dbmail/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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}
 
 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]*
 

Modified: head/multimedia/dvdstyler/Makefile
==============================================================================
--- head/multimedia/dvdstyler/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/multimedia/dvdstyler/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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
 		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

Modified: head/ports-mgmt/packagekit/Makefile
==============================================================================
--- head/ports-mgmt/packagekit/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/ports-mgmt/packagekit/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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

Modified: head/print/system-config-printer/Makefile
==============================================================================
--- head/print/system-config-printer/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/print/system-config-printer/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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 at 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 \

Modified: head/science/g3data/Makefile
==============================================================================
--- head/science/g3data/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/science/g3data/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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 fro
 
 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

Modified: head/sysutils/gnome-power-manager/Makefile
==============================================================================
--- head/sysutils/gnome-power-manager/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/sysutils/gnome-power-manager/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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.schem
 
 .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

Modified: head/sysutils/policykit/Makefile
==============================================================================
--- head/sysutils/policykit/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/sysutils/policykit/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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
 

Modified: head/sysutils/polkit/Makefile
==============================================================================
--- head/sysutils/polkit/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/sysutils/polkit/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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
 

Modified: head/sysutils/upower/Makefile
==============================================================================
--- head/sysutils/upower/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/sysutils/upower/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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

Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/textproc/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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

Added: head/textproc/docbook-sgml/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/docbook-sgml/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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 at 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>

Added: head/textproc/docbook-sgml/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/docbook-sgml/distinfo	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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

Added: head/textproc/docbook-sgml/pkg-descr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/docbook-sgml/pkg-descr	Wed Feb 19 14:45:19 2014	(r345097)
@@ -0,0 +1,3 @@
+DocBook SGML DTD.
+
+WWW: http://www.oasis-open.org/docbook/

Added: head/textproc/docbook-sgml/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/docbook-sgml/pkg-plist	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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
+ at unexec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% remove CATALOG %D/%F
+ at exec %D/%%XMLCATMGR%% -sc %D/%%SGMLCAT%% add CATALOG %D/%F
+ at dirrmtry %%DBKDIR%%/4.5
+ at dirrmtry %%DBKDIR%%/4.4
+ at dirrmtry %%DBKDIR%%/4.3
+ at dirrmtry %%DBKDIR%%/4.2
+ at dirrmtry %%DBKDIR%%/4.1
+ at dirrmtry %%DBKDIR%%/4.0
+ at dirrmtry %%DBKDIR%%/3.1
+ at dirrmtry %%DBKDIR%%/3.0
+ at dirrmtry %%DBKDIR%%/2.4.1
+ at dirrmtry %%DBKDIR%%

Modified: head/textproc/docbook-utils/Makefile
==============================================================================
--- head/textproc/docbook-utils/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/textproc/docbook-utils/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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-tr
 MAINTAINER=	gabor at 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 \

Modified: head/textproc/docbook-xml/Makefile
==============================================================================
--- head/textproc/docbook-xml/Makefile	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/textproc/docbook-xml/Makefile	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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=	doceng at FreeBSD.org
+COMMENT=	DocBook XML DTD
+
+RUN_DEPENDS=	${LOCALBASE}/share/xml/xmlcharent/catalog.xml:${PORTSDIR}/textproc/xmlcharent \
+		${XMLCATMGR_CMD}:${PORTSDIR}/textproc/xmlcatmgr
+
+NO_BUILD=	yes
+
+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
 
-MAINTAINER=	kuriyama at FreeBSD.org
-COMMENT=	XML version of the DocBook DTD
-
-NO_ISOCAT=	yes
-XML_DTD=	yes
-HAS_MANUAL_CATALOG_FILE=	yes
-
-DTD_NAME?=	${PORTNAME:S/-xml//}
-
-PORTDOCS=	README ChangeLog
-
-.include "../../textproc/docbook/bsd.docbook.mk"
 .include <bsd.port.mk>

Modified: head/textproc/docbook-xml/distinfo
==============================================================================
--- head/textproc/docbook-xml/distinfo	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/textproc/docbook-xml/distinfo	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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

Added: head/textproc/docbook-xml/files/catalog412.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/docbook-xml/files/catalog412.xml	Wed Feb 19 14:45:19 2014	(r345097)
@@ -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 at 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>

Modified: head/textproc/docbook-xml/pkg-descr
==============================================================================
--- head/textproc/docbook-xml/pkg-descr	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/textproc/docbook-xml/pkg-descr	Wed Feb 19 14:45:19 2014	(r345097)
@@ -1,3 +1,3 @@
-XML version of the DocBook DTD.
+DocBook XML DTD.
 
 WWW: http://www.oasis-open.org/docbook/

Modified: head/textproc/docbook-xml/pkg-plist
==============================================================================
--- head/textproc/docbook-xml/pkg-plist	Wed Feb 19 14:44:23 2014	(r345096)
+++ head/textproc/docbook-xml/pkg-plist	Wed Feb 19 14:45:19 2014	(r345097)
@@ -1,35 +1,214 @@
-%%DTDDIR%%/calstblx.dtd
-%%DTDDIR%%/catalog.xml
- at 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

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list