Presenting GNOME 2.18 for FreeBSD. GNOME 2.18 is a departure from recent GNOME

releases in that it focuses more on stability and functionality than on
new features.  Not that it doesn't have its share of new and exciting
items.  See http://www.gnome.org/start/2.18/ for all the goodies in
this release.

GNOME 2.18 for FreeBSD would not have been possible without the hard work
of the FreeBSD GNOME Team and our intrepid band of testers including
J. W. Ballantine, Pawel Worach, Yasuda Keisuke, Pascal Hofstee, miwi,
Yoshihiro Ota, Vladimir Grebenschikov, Jukka A. Ukkonen,
Phillip Neumann, Franz Klammer, and Neal Delmonico.

11 files changed, 91 insertions, 111 deletions

diff --git a/textproc/docbook-sk/Makefile b/textproc/docbook-sk/Makefile
index bc01cdf4c0aa..490a5f66a5ed 100644
--- a/textproc/docbook-sk/Makefile
+++ b/textproc/docbook-sk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	docbook-sk
 PORTVERSION=	4.1.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/xml/${PORTVERSION}/
 DISTNAME=	docbkx${PORTVERSION:S/.//g}
@@ -40,7 +40,6 @@ do-install:
 	done
 
 post-install:
-	@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${DOCBOOKDIR}/docbook.cat
 	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" file://${DOCBOOKDIR}/dbpoolx.mod
 	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//DTD DocBook XML V4.1.2//EN" file://${DOCBOOKDIR}/docbookx.dtd
 	@${XMLCATMGR} -c ${CATALOG_PORTS_XML} add public "-//OASIS//ENTITIES DocBook XML Character Entities V4.1.2//EN" file://${DOCBOOKDIR}/dbcentx.mod
diff --git a/textproc/docbook-sk/pkg-plist b/textproc/docbook-sk/pkg-plist
index f56fe56d897e..1706ca35e044 100644
--- a/textproc/docbook-sk/pkg-plist
+++ b/textproc/docbook-sk/pkg-plist
@@ -7,9 +7,7 @@ share/xml/docbook/%%DTD_VERSION%%/dbgenent.mod
 share/xml/docbook/%%DTD_VERSION%%/dbhierx.mod
 share/xml/docbook/%%DTD_VERSION%%/dbnotnx.mod
 share/xml/docbook/%%DTD_VERSION%%/dbpoolx.mod
-@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG %%DOCBOOKDIR%%/docbook.cat
 share/xml/docbook/%%DTD_VERSION%%/docbook.cat
-@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DOCBOOKDIR%%/docbook.cat
 share/xml/docbook/%%DTD_VERSION%%/docbookx.dtd
 @exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" file://%%DOCBOOKDIR%%/dbpoolx.mod
 @exec %%XMLCATMGR%% -c %%CATALOG_PORTS_XML%% add public "-//OASIS//DTD DocBook XML V4.1.2//EN" file://%%DOCBOOKDIR%%/docbookx.dtd
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index ec389ff83990..79d224523ef8 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -3,20 +3,21 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.44 2007/03/13 00:37:32 mezz Exp $
 #
 
 PORTNAME=	gnome-doc-utils
-PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTVERSION=	0.10.1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-doc-utils/0.7
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DISTNAME=	gnome-doc-utils-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME doc utils
 
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
+    		gawk:${PORTSDIR}/lang/gawk
 RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
 		${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
 		${LOCALBASE}/share/xml/docbook/4.3/catalog.xml:${PORTSDIR}/textproc/docbook-xml-430 \
diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo
index c6b6c87e5783..202ff4a6607f 100644
--- a/textproc/gnome-doc-utils/distinfo
+++ b/textproc/gnome-doc-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-doc-utils-0.7.2.tar.bz2) = 3f3903e5a3e3b05261498d907f2471a9
-SHA256 (gnome-doc-utils-0.7.2.tar.bz2) = aa2f8fed9aa95aff9c2a7d627a85cc428cef3dfa0cccd538dcfc41446bde8b8d
-SIZE (gnome-doc-utils-0.7.2.tar.bz2) = 405767
+MD5 (gnome-doc-utils-0.10.1.tar.bz2) = 208775a4b6c6d9ea0478a84afb36701f
+SHA256 (gnome-doc-utils-0.10.1.tar.bz2) = 7cd6c5bc72cb4f9ff4f173c957dcea1b71bbea3191bb337772eca57614f6b643
+SIZE (gnome-doc-utils-0.10.1.tar.bz2) = 427716
diff --git a/textproc/gnome-doc-utils/files/patch-xml2po__xml2po.py b/textproc/gnome-doc-utils/files/patch-xml2po__xml2po.py
deleted file mode 100644
index e0620056fab5..000000000000
--- a/textproc/gnome-doc-utils/files/patch-xml2po__xml2po.py
+++ /dev/null
@@ -1,41 +0,0 @@
---- xml2po/xml2po.py.orig	Sun Apr  2 03:47:17 2006
-+++ xml2po/xml2po.py	Fri Oct 20 00:57:46 2006
-@@ -242,14 +242,10 @@
-     text = normalizeString(text, not spacepreserve)
-     if (text.strip() == ''):
-         return text
--    file = open(mofile, "rb")
--    if file:
--        myfallback = NoneTranslations()
--        gt = gettext.GNUTranslations(file)
--        gt.add_fallback(myfallback)
--        if gt:
--            res = gt.ugettext(text.decode('utf-8'))
--            return res
-+    global gt
-+    if gt:
-+        res = gt.ugettext(text.decode('utf-8'))
-+        return res
- 
-     return text
- 
-@@ -648,6 +644,7 @@
- filename = ''
- origxml = ''
- mofile = ''
-+gt = None
- ultimate = [ ]
- ignored = [ ]
- filenames = [ ]
-@@ -763,6 +760,11 @@
- if mode=='merge' and mofile=='':
-     print >> sys.stderr, "Error: You must specify MO file when merging translations."
-     sys.exit(3)
-+
-+file = open(mofile, "rb")
-+if file:
-+    gt = gettext.GNUTranslations(file)
-+    gt.add_fallback(NoneTranslations())
- 
- ultimate_tags = read_finaltags(ultimate)
- ignored_tags = read_ignoredtags(ignored)
diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist
index 054f92b11100..7ed23ca2d134 100644
--- a/textproc/gnome-doc-utils/pkg-plist
+++ b/textproc/gnome-doc-utils/pkg-plist
@@ -1,4 +1,5 @@
 bin/gnome-doc-prepare
+bin/gnome-doc-tool
 bin/xml2po
 libdata/pkgconfig/gnome-doc-utils.pc
 libdata/pkgconfig/xml2po.pc
@@ -34,7 +35,6 @@ share/gnome/help/gnome-doc-xslt/C/db2html-list.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-media.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-qanda.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-refentry.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-suppressed.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-table.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-title.xml
 share/gnome/help/gnome-doc-xslt/C/db2html-xref.xml
@@ -45,7 +45,6 @@ share/gnome/help/gnome-doc-xslt/C/gnome-doc-xslt.xml
 share/gnome/help/gnome-doc-xslt/C/l10n-numbers.xml
 share/gnome/help/gnome-doc-xslt/C/legal.xml
 share/gnome/help/gnome-doc-xslt/C/translating.xml
-share/gnome/help/gnome-doc-xslt/C/xsldoc.xml
 share/gnome/omf/gnome-doc-make/gnome-doc-make-C.omf
 share/gnome/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf
 share/locale/ar/LC_MESSAGES/gnome-doc-utils.mo
@@ -63,6 +62,7 @@ share/locale/en_CA/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/en_GB/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/es/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/et/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/eu/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/fi/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/fr/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/gl/LC_MESSAGES/gnome-doc-utils.mo
@@ -77,22 +77,29 @@ share/locale/ka/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/ko/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/lt/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/lv/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/mg/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/mk/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/ml/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/mn/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/mr/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/nb/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/ne/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/nl/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/or/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/pa/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/pl/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/pt/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/ro/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/ru/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/rw/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/sk/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/sl/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/sq/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/sr/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/sv/LC_MESSAGES/gnome-doc-utils.mo
+share/locale/ta/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/th/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/tr/LC_MESSAGES/gnome-doc-utils.mo
 share/locale/ug/LC_MESSAGES/gnome-doc-utils.mo
@@ -134,11 +141,11 @@ share/xml/gnome/xslt/docbook/html/db2html.xsl
 share/xml/gnome/xslt/docbook/omf/db2omf.xsl
 share/xml/gnome/xslt/docbook/utils/chunks.xsl
 share/xml/gnome/xslt/docbook/utils/credits.xsl
+share/xml/gnome/xslt/docbook/utils/figures.xsl
 share/xml/gnome/xslt/docbook/utils/ids.xsl
 share/xml/gnome/xslt/gettext/gettext.xsl
 share/xml/gnome/xslt/gettext/l10n-numbers.xsl
 share/xml/gnome/xslt/gettext/l10n.xml
-share/xml/gnome/xslt/xsldoc/xsldoc.xsl
 share/xml2po/docbook.py
 share/xml2po/docbook.pyc
 share/xml2po/empty.py
@@ -147,8 +154,9 @@ share/xml2po/gs.py
 share/xml2po/gs.pyc
 share/xml2po/ubuntu.py
 share/xml2po/ubuntu.pyc
+share/xml2po/xhtml.py
+share/xml2po/xhtml.pyc
 @dirrm share/xml2po
-@dirrm share/xml/gnome/xslt/xsldoc
 @dirrm share/xml/gnome/xslt/gettext
 @dirrm share/xml/gnome/xslt/docbook/utils
 @dirrm share/xml/gnome/xslt/docbook/omf
@@ -177,6 +185,8 @@ share/xml2po/ubuntu.pyc
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/sr/LC_MESSAGES
 @dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
 @dirrmtry share/locale/sk/LC_MESSAGES
 @dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
@@ -185,8 +195,14 @@ share/xml2po/ubuntu.pyc
 @dirrmtry share/locale/ro
 @dirrmtry share/locale/pt/LC_MESSAGES
 @dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
 @dirrmtry share/locale/ne/LC_MESSAGES
 @dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
 @dirrmtry share/locale/ko/LC_MESSAGES
 @dirrmtry share/locale/ko
 @dirrmtry share/locale/gl/LC_MESSAGES
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 45740cbee099..4fd76a6ce72b 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -4,11 +4,11 @@
 # Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/textproc/libxml++26/Makefile,v 1.13 2006/04/13 07:52:38 bland Exp $
+#   $MCom: ports/textproc/libxml++26/Makefile,v 1.18 2007/03/07 19:06:06 marcus Exp $
 #
 
 PORTNAME=	libxml++
-PORTVERSION=	2.14.0
+PORTVERSION=	2.18.0
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -34,6 +34,10 @@ post-patch:
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e '/^gentoo_ltmain_version=/s/`.*`/$$gentoo_lt_version/' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/^library_configdir =/s/libdir/includedir/' \
+	    	${WRKSRC}/libxml++/Makefile.in
+	@${REINPLACE_CMD} -e '/^Cflags:/s/libdir/includedir/' \
+	    	${WRKSRC}/libxml++-2.6.pc.in
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -E '/^SUBDIRS = /s/(docs|examples)//g' ${WRKSRC}/Makefile.in
 .endif
diff --git a/textproc/libxml++26/distinfo b/textproc/libxml++26/distinfo
index 0dbea2ede9a1..9a2cf8468c6c 100644
--- a/textproc/libxml++26/distinfo
+++ b/textproc/libxml++26/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxml++-2.14.0.tar.gz) = 92ccfe24e23d6942441c6a1c78509dbf
-SHA256 (libxml++-2.14.0.tar.gz) = 9a3434e3f9193e4b577a4122e649ddb96bfb61d50899369e89fc64218efabf8c
-SIZE (libxml++-2.14.0.tar.gz) = 935513
+MD5 (libxml++-2.18.0.tar.gz) = 63b31bd9751cf99aaafccf6dfa4f88cd
+SHA256 (libxml++-2.18.0.tar.gz) = 0733c759c818d5aff07692b11c1bd1df736e4b479fb79cc50c3ab8b948d26b7e
+SIZE (libxml++-2.18.0.tar.gz) = 2020427
diff --git a/textproc/libxml++26/pkg-plist b/textproc/libxml++26/pkg-plist
index 1529065174f1..afb1d2e4f4a2 100644
--- a/textproc/libxml++26/pkg-plist
+++ b/textproc/libxml++26/pkg-plist
@@ -1,3 +1,4 @@
+include/libxml++-%%API_VERSION%%/include/libxml++config.h
 include/libxml++-%%API_VERSION%%/libxml++/attribute.h
 include/libxml++-%%API_VERSION%%/libxml++/document.h
 include/libxml++-%%API_VERSION%%/libxml++/dtd.h
@@ -124,9 +125,6 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1Parser__inherit__graph.md5
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ProcessingInstructionNode-members.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ProcessingInstructionNode.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1ProcessingInstructionNode__inherit__graph.md5
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1SaxParser-members.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1SaxParser.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1SaxParser__inherit__graph.jpg
@@ -169,25 +167,25 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/classxmlpp_1_1validity__error__inherit__graph.md5
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/commentnode_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/contentnode_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000000.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000000_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000000_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000001.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000001_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000001_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000002.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000002_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000002_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000003.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000003_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000003_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000004.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000004_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000004_dep.map
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000005.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000005_dep.jpg
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_000005_dep.map
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dirs.html
+%%PORTDOCS%%share/doc/libxml++-2.6/docs/reference/%%DOC_VERSION%%/html/dir_060042f61ad41255a77b5a60dc66afb4.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_060042f61ad41255a77b5a60dc66afb4_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_060042f61ad41255a77b5a60dc66afb4_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_98cc7bcadc131313690a7320eb0caa09.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_98cc7bcadc131313690a7320eb0caa09_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_98cc7bcadc131313690a7320eb0caa09_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_9cc7404ab660b5374779d403c202c70c.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_9cc7404ab660b5374779d403c202c70c_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_9cc7404ab660b5374779d403c202c70c_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_c513157412c8384caf468454c2c3cfa9.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_c513157412c8384caf468454c2c3cfa9_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_c513157412c8384caf468454c2c3cfa9_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_cf5c1e9933cb056be190fe9c88b8f1f0.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_cf5c1e9933cb056be190fe9c88b8f1f0_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_cf5c1e9933cb056be190fe9c88b8f1f0_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d49b71a5503b600be72da967490472e5.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d49b71a5503b600be72da967490472e5_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d49b71a5503b600be72da967490472e5_dep.map
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/document_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/domparser_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/doxygen.css
@@ -219,6 +217,25 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x77.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x78.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_0x7e.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x63.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x64.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x65.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x66.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x67.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x68.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x69.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6b.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6c.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6d.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6e.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x6f.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x70.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x72.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x73.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x74.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x76.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x77.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func_0x7e.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_enum.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_eval.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_func.html
@@ -226,6 +243,7 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_type.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_vars.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals_defs.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals_enum.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals_eval.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/globals_type.html
@@ -259,13 +277,14 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/internal__error_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/istreamparserinputbuffer_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/keepblanks_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/libxml++config_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/libxml++_8h.html
-%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespaceSigC.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers_enum.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers_eval.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacemembers_type.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespaces.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacesigc.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/namespacexmlpp.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/node_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/noncopyable_8h.html
@@ -280,6 +299,7 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/structxmlpp_1_1SaxParser_1_1Attribute.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/structxmlpp_1_1SaxParser_1_1AttributeHasName-members.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/structxmlpp_1_1SaxParser_1_1AttributeHasName.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/tabs.css
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/textnode_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/textreader_8h.html
 %%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/validator_8h.html
@@ -297,4 +317,5 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
 @dirrm include/libxml++-%%API_VERSION%%/libxml++/io
 @dirrm include/libxml++-%%API_VERSION%%/libxml++/exceptions
 @dirrm include/libxml++-%%API_VERSION%%/libxml++
+@dirrm include/libxml++-%%API_VERSION%%/include
 @dirrm include/libxml++-%%API_VERSION%%
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index bb5d39cb256c..73496808b538 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Rene Hexel <rh@netbsd.org>
 #
 # $FreeBSD$
-#    $MCom: ports/textproc/scrollkeeper/Makefile,v 1.2 2006/09/10 00:51:13 mezz Exp $
+#    $MCom: ports/textproc/scrollkeeper/Makefile,v 1.7 2007/02/20 20:26:47 marcus Exp $
 
 PORTNAME=	scrollkeeper
 PORTVERSION=	0.3.14
-PORTREVISION=	5
+PORTREVISION=	7
 PORTEPOCH=	1
 CATEGORIES=	textproc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
@@ -18,19 +18,20 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An Open Document Cataloging Project
 
 BUILD_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
-		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \
-		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
+		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
+		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
+    		${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk
 RUN_DEPENDS=	intltool-extract:${PORTSDIR}/textproc/intltool \
-		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \
-		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl
+		${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
+    		${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
+    		${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk
 
-DOCBOOK_VERSION=	4.1.2
+DOCBOOK_VERSION=4.2
 
-USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_BISON=	yes
 USE_GNOME=	gnomehack gnomehier gnometarget libxslt intlhack
 USE_LDCONFIG=	yes
diff --git a/textproc/scrollkeeper/files/patch-configure b/textproc/scrollkeeper/files/patch-configure
deleted file mode 100644
index 054d07f1fdf9..000000000000
--- a/textproc/scrollkeeper/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	Sat Dec  6 03:18:20 2003
-+++ configure	Sat Dec  6 17:46:38 2003
-@@ -7864,6 +7864,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8360,7 +8361,7 @@
- 	echo "$as_me:$LINENO: checking for DocBook XML DTD" >&5
- echo $ECHO_N "checking for DocBook XML DTD... $ECHO_C" >&6
- 	db_found=
--	for vers in 4.2 4.1.2; do
-+	for vers in 4.1.2 4.2; do
- 	   if xmlcatalog $XML_CATALOG "-//OASIS//DTD DocBook XML V$vers//EN" >/dev/null ; then
- 	      db_found=$vers
- 	      break