aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2007-10-25 07:37:25 +0800
committermarcus <marcus@FreeBSD.org>2007-10-25 07:37:25 +0800
commit43bd9f14d9ce11690e9538bf3b03d3462faa6dbe (patch)
treeda347910089a96d6d726b8bb080f62c773263828 /textproc
parent2e669ed08a56339ee1a8b2a0573a30147f95bd82 (diff)
downloadfreebsd-ports-gnome-43bd9f14d9ce11690e9538bf3b03d3462faa6dbe.tar.gz
freebsd-ports-gnome-43bd9f14d9ce11690e9538bf3b03d3462faa6dbe.tar.zst
freebsd-ports-gnome-43bd9f14d9ce11690e9538bf3b03d3462faa6dbe.zip
Presenting GNOME 2.20.1 and all related works for FreeBSD. The official
GNOME 2.20 release notes can be found at http://www.gnome.org/start/2.20/notes/en/ . Beyond that, this update includes the new GIMP 2.4 (courtesy of ahze). The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME hierarchy. We are now using the more standard DATADIR of ${PREFIX}/share rather than ${PREFIX}/share/gnome. The result is that fewer patches and hacks are needed to port GNOME components to FreeBSD. This will mean some user changes may be required, so be sure to read /usr/ports/UPDATING for more details. This release and the things we accomplished in it would not have been possible without mezz's crazy idea to collapse DATADIR, and his persistence to make it happen successfully. Ahze and pav also deserve thanks for their work on porting modules and testing the whole ball of wax on pointyhat (respectively). The FreeBSD GNOME team would also like to thank our various testers and contributors: Yasuda Keisuke Frank Jahnke Pawel Worach Brian Gruber Franz Klammer Yuri Pankov Nick Barkas Cristian KLEIN Tony Maher Scot Hetzel Martin Matuska (mm) Benoit Dejean Martin Wilke (miwi) (And anyone else I may have missed) PRs fixed in this release: 111272, 113470, 115995, 116338
Diffstat (limited to 'textproc')
-rw-r--r--textproc/Makefile1
-rw-r--r--textproc/gnome-doc-utils/Makefile13
-rw-r--r--textproc/gnome-doc-utils/distinfo6
-rw-r--r--textproc/gnome-doc-utils/pkg-plist50
-rw-r--r--textproc/gnome-spell/Makefile8
-rw-r--r--textproc/gnome-spell/distinfo6
-rw-r--r--textproc/gnome-spell/pkg-plist22
-rw-r--r--textproc/gnome-translate/Makefile2
-rw-r--r--textproc/gnome-translate/pkg-plist29
-rw-r--r--textproc/gtk-doc/Makefile13
-rw-r--r--textproc/gtk-doc/distinfo6
-rw-r--r--textproc/gtk-doc/files/patch-help_manual_C_Makefile.in10
-rw-r--r--textproc/gtk-doc/pkg-plist13
-rw-r--r--textproc/gtkdiff/Makefile2
-rw-r--r--textproc/gtkdiff/pkg-plist4
-rw-r--r--textproc/gxmlviewer/Makefile2
-rw-r--r--textproc/gxmlviewer/pkg-plist2
-rw-r--r--textproc/iiimf-gnome-im-switcher/Makefile12
-rw-r--r--textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make9
-rw-r--r--textproc/iiimf-gnome-im-switcher/pkg-plist26
-rw-r--r--textproc/libxml++26/Makefile4
-rw-r--r--textproc/libxml++26/distinfo6
-rw-r--r--textproc/libxml++26/pkg-plist47
-rw-r--r--textproc/meld/Makefile7
-rw-r--r--textproc/meld/pkg-plist13
-rw-r--r--textproc/rarian/Makefile59
-rw-r--r--textproc/rarian/distinfo3
-rw-r--r--textproc/rarian/files/patch-docs_Makefile.in11
-rw-r--r--textproc/rarian/files/patch-librarian_rarian-main.c11
-rw-r--r--textproc/rarian/files/patch-util_rarian-sk-config.in11
-rw-r--r--textproc/rarian/pkg-descr9
-rw-r--r--textproc/rarian/pkg-plist53
-rw-r--r--textproc/sagasu/Makefile3
-rw-r--r--textproc/sagasu/pkg-plist17
-rw-r--r--textproc/scim/Makefile7
-rw-r--r--textproc/scim/pkg-plist7
-rw-r--r--textproc/scrollkeeper/Makefile10
-rw-r--r--textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in11
-rw-r--r--textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in11
-rw-r--r--textproc/scrollkeeper/pkg-install4
-rw-r--r--textproc/scrollkeeper/pkg-plist166
-rw-r--r--textproc/stardict2-dictd_mova/Makefile5
-rw-r--r--textproc/stardict2-quick/Makefile5
-rw-r--r--textproc/stardict2/Makefile2
-rw-r--r--textproc/stardict2/pkg-plist47
-rw-r--r--textproc/stardict3/Makefile2
-rw-r--r--textproc/stardict3/pkg-plist47
47 files changed, 493 insertions, 321 deletions
diff --git a/textproc/Makefile b/textproc/Makefile
index bd76a509dc88..e36019e04a17 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -823,6 +823,7 @@
SUBDIR += queequeg
SUBDIR += rand
SUBDIR += raptor
+ SUBDIR += rarian
SUBDIR += rast
SUBDIR += re_graph
SUBDIR += redet
diff --git a/textproc/gnome-doc-utils/Makefile b/textproc/gnome-doc-utils/Makefile
index 76498989cf98..2fb44b7df9ba 100644
--- a/textproc/gnome-doc-utils/Makefile
+++ b/textproc/gnome-doc-utils/Makefile
@@ -3,12 +3,11 @@
# 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 $
+# $MCom: ports/textproc/gnome-doc-utils/Makefile,v 1.55 2007/09/18 16:49:47 mezz Exp $
#
PORTNAME= gnome-doc-utils
-PORTVERSION= 0.10.3
-PORTREVISION= 1
+PORTVERSION= 0.12.0
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -17,9 +16,9 @@ DISTNAME= gnome-doc-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
COMMENT= GNOME doc utils
-BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
+BUILD_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \
gawk:${PORTSDIR}/lang/gawk
-RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
+RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian \
${PYTHON_SITELIBDIR}/libxml2mod.so:${PORTSDIR}/textproc/py-libxml2 \
${LOCALBASE}/share/xml/docbook/4.3/catalog.xml:${PORTSDIR}/textproc/docbook-xml-430 \
${LOCALBASE}/share/xml/docbook/4.4/catalog.xml:${PORTSDIR}/textproc/docbook-xml-440
@@ -27,11 +26,11 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper \
USE_BZIP2= yes
USE_GMAKE= yes
USE_GETTEXT= yes
-USE_GNOME= gnomehier gnometarget gnomehack libxslt
+USE_GNOME= gnomehier gnometarget gnomehack libxslt intlhack
USE_PYTHON= yes
INSTALLS_OMF= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-omf-dir=${PREFIX}/share/gnome/omf
+CONFIGURE_ARGS= --with-omf-dir=${PREFIX}/share/omf
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/textproc/gnome-doc-utils/distinfo b/textproc/gnome-doc-utils/distinfo
index cfcc35c11337..481be468bd69 100644
--- a/textproc/gnome-doc-utils/distinfo
+++ b/textproc/gnome-doc-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-doc-utils-0.10.3.tar.bz2) = 43f3a4086ec1254cbe20b85948192d18
-SHA256 (gnome-doc-utils-0.10.3.tar.bz2) = 19b5b4425bc578af8a1c58b61f1b9a416743d0b1fae3356cd9a0071f1f66632c
-SIZE (gnome-doc-utils-0.10.3.tar.bz2) = 451981
+MD5 (gnome-doc-utils-0.12.0.tar.bz2) = 5934c08d12407d8233416343cd73df24
+SHA256 (gnome-doc-utils-0.12.0.tar.bz2) = 6bb8ec068558e380aff1e3f0aa130b52161ad68f8d495fce45c55783bbba9076
+SIZE (gnome-doc-utils-0.12.0.tar.bz2) = 592073
diff --git a/textproc/gnome-doc-utils/pkg-plist b/textproc/gnome-doc-utils/pkg-plist
index 86bb06a79f10..aa2dd49a3748 100644
--- a/textproc/gnome-doc-utils/pkg-plist
+++ b/textproc/gnome-doc-utils/pkg-plist
@@ -5,9 +5,31 @@ libdata/pkgconfig/gnome-doc-utils.pc
libdata/pkgconfig/xml2po.pc
share/aclocal/gnome-doc-utils.m4
%%DATADIR%%/gnome-doc-utils.make
+%%DATADIR%%/icons/hicolor/48x48/admon-bug.png
+%%DATADIR%%/icons/hicolor/48x48/admon-caution.png
+%%DATADIR%%/icons/hicolor/48x48/admon-important.png
+%%DATADIR%%/icons/hicolor/48x48/admon-note.png
+%%DATADIR%%/icons/hicolor/48x48/admon-tip.png
+%%DATADIR%%/icons/hicolor/48x48/admon-warning.png
+%%DATADIR%%/icons/hicolor/scalable/admon-bug.svg
+%%DATADIR%%/icons/hicolor/scalable/admon-caution.svg
+%%DATADIR%%/icons/hicolor/scalable/admon-important.svg
+%%DATADIR%%/icons/hicolor/scalable/admon-note.svg
+%%DATADIR%%/icons/hicolor/scalable/admon-tip.svg
+%%DATADIR%%/icons/hicolor/scalable/admon-warning.svg
%%DATADIR%%/template-document.xml
%%DATADIR%%/template.make
%%DATADIR%%/template.omf.in
+%%DATADIR%%/templates/gnome-app-template.xml
+%%DATADIR%%/templates/gnome-applet-template.xml
+%%DATADIR%%/templates/legal.xml
+%%DATADIR%%/watermarks/watermark-blockquote-00AB.png
+%%DATADIR%%/watermarks/watermark-blockquote-00BB.png
+%%DATADIR%%/watermarks/watermark-blockquote-201C.png
+%%DATADIR%%/watermarks/watermark-blockquote-201D.png
+%%DATADIR%%/watermarks/watermark-blockquote-201E.png
+%%DATADIR%%/watermarks/watermark-code-python.png
+%%DATADIR%%/watermarks/watermark-code.png
share/gnome/help/gnome-doc-make/C/gnome-doc-make.xml
share/gnome/help/gnome-doc-make/C/legal.xml
share/gnome/help/gnome-doc-make/C/make-ref.xml
@@ -16,7 +38,6 @@ share/gnome/help/gnome-doc-xslt/C/db-common.xml
share/gnome/help/gnome-doc-xslt/C/db-label.xml
share/gnome/help/gnome-doc-xslt/C/db-title.xml
share/gnome/help/gnome-doc-xslt/C/db-xref.xml
-share/gnome/help/gnome-doc-xslt/C/db2html-admon.xml
share/gnome/help/gnome-doc-xslt/C/db2html-autotoc.xml
share/gnome/help/gnome-doc-xslt/C/db2html-bibliography.xml
share/gnome/help/gnome-doc-xslt/C/db2html-block.xml
@@ -28,6 +49,7 @@ share/gnome/help/gnome-doc-xslt/C/db2html-division.xml
share/gnome/help/gnome-doc-xslt/C/db2html-ebnf.xml
share/gnome/help/gnome-doc-xslt/C/db2html-footnote.xml
share/gnome/help/gnome-doc-xslt/C/db2html-funcsynopsis.xml
+share/gnome/help/gnome-doc-xslt/C/db2html-index.xml
share/gnome/help/gnome-doc-xslt/C/db2html-info.xml
share/gnome/help/gnome-doc-xslt/C/db2html-inline.xml
share/gnome/help/gnome-doc-xslt/C/db2html-l10n.xml
@@ -40,13 +62,13 @@ share/gnome/help/gnome-doc-xslt/C/db2html-title.xml
share/gnome/help/gnome-doc-xslt/C/db2html-xref.xml
share/gnome/help/gnome-doc-xslt/C/db2html.xml
share/gnome/help/gnome-doc-xslt/C/db2omf.xml
+share/gnome/help/gnome-doc-xslt/C/db2xhtml.xml
share/gnome/help/gnome-doc-xslt/C/gettext.xml
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/theme.xml
share/gnome/help/gnome-doc-xslt/C/translating.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
share/locale/bg/LC_MESSAGES/gnome-doc-utils.mo
share/locale/bn/LC_MESSAGES/gnome-doc-utils.mo
@@ -85,6 +107,7 @@ 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/oc/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
@@ -109,12 +132,14 @@ share/locale/wa/LC_MESSAGES/gnome-doc-utils.mo
share/locale/zh_CN/LC_MESSAGES/gnome-doc-utils.mo
share/locale/zh_HK/LC_MESSAGES/gnome-doc-utils.mo
share/locale/zh_TW/LC_MESSAGES/gnome-doc-utils.mo
+share/omf/gnome-doc-make/gnome-doc-make-C.omf
+share/omf/gnome-doc-xslt/gnome-doc-xslt-C.omf
+share/xml/gnome/xslt/common/theme.xsl
share/xml/gnome/xslt/docbook/common/db-chunk.xsl
share/xml/gnome/xslt/docbook/common/db-common.xsl
share/xml/gnome/xslt/docbook/common/db-label.xsl
share/xml/gnome/xslt/docbook/common/db-title.xsl
share/xml/gnome/xslt/docbook/common/db-xref.xsl
-share/xml/gnome/xslt/docbook/html/db2html-admon.xsl
share/xml/gnome/xslt/docbook/html/db2html-autotoc.xsl
share/xml/gnome/xslt/docbook/html/db2html-bibliography.xsl
share/xml/gnome/xslt/docbook/html/db2html-block.xsl
@@ -126,6 +151,7 @@ share/xml/gnome/xslt/docbook/html/db2html-division.xsl
share/xml/gnome/xslt/docbook/html/db2html-ebnf.xsl
share/xml/gnome/xslt/docbook/html/db2html-footnote.xsl
share/xml/gnome/xslt/docbook/html/db2html-funcsynopsis.xsl
+share/xml/gnome/xslt/docbook/html/db2html-index.xsl
share/xml/gnome/xslt/docbook/html/db2html-info.xsl
share/xml/gnome/xslt/docbook/html/db2html-inline.xsl
share/xml/gnome/xslt/docbook/html/db2html-l10n.xsl
@@ -138,10 +164,12 @@ share/xml/gnome/xslt/docbook/html/db2html-table.xsl
share/xml/gnome/xslt/docbook/html/db2html-title.xsl
share/xml/gnome/xslt/docbook/html/db2html-xref.xsl
share/xml/gnome/xslt/docbook/html/db2html.xsl
+share/xml/gnome/xslt/docbook/html/db2xhtml.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/graphics.xsl
share/xml/gnome/xslt/docbook/utils/ids.xsl
share/xml/gnome/xslt/gettext/gettext.xsl
share/xml/gnome/xslt/gettext/l10n-numbers.xsl
@@ -163,15 +191,21 @@ share/xml2po/xhtml.pyc
@dirrm share/xml/gnome/xslt/docbook/html
@dirrm share/xml/gnome/xslt/docbook/common
@dirrm share/xml/gnome/xslt/docbook
+@dirrm share/xml/gnome/xslt/common
@dirrm share/xml/gnome/xslt
@dirrm share/xml/gnome
-@dirrm share/xml
-@dirrm share/gnome/omf/gnome-doc-xslt
-@dirrm share/gnome/omf/gnome-doc-make
+@dirrm share/omf/gnome-doc-xslt
+@dirrm share/omf/gnome-doc-make
@dirrm share/gnome/help/gnome-doc-xslt/C
@dirrm share/gnome/help/gnome-doc-xslt
@dirrm share/gnome/help/gnome-doc-make/C
@dirrm share/gnome/help/gnome-doc-make
+@dirrm %%DATADIR%%/watermarks
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/icons/hicolor/scalable
+@dirrm %%DATADIR%%/icons/hicolor/48x48
+@dirrm %%DATADIR%%/icons/hicolor
+@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
@@ -179,6 +213,8 @@ share/xml2po/xhtml.pyc
@dirrmtry share/locale/ug
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
@dirrmtry share/locale/mr/LC_MESSAGES
@dirrmtry share/locale/mr
@dirrmtry share/locale/mg/LC_MESSAGES
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 1ecf4b617681..aa0c66bf6b9e 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -3,16 +3,14 @@
# Whom: Maxim Sobolev <sobomax@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/textproc/gnome-spell/Makefile,v 1.9 2006/07/23 01:44:27 mezz Exp $
+# $MCom: ports/textproc/gnome-spell/Makefile,v 1.13 2007/10/15 17:17:18 mezz Exp $
#
PORTNAME= gnome-spell
-PORTVERSION= 1.0.7
-PORTREVISION= 3
+PORTVERSION= 1.0.8
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR= sources/gnome-spell/1.0
-DISTNAME= gnome-spell-${PORTVERSION}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
diff --git a/textproc/gnome-spell/distinfo b/textproc/gnome-spell/distinfo
index 47e05f752f02..090d35b3c71b 100644
--- a/textproc/gnome-spell/distinfo
+++ b/textproc/gnome-spell/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome/gnome-spell-1.0.7.tar.bz2) = da3ad2c664afd06a0c56c84d5055f8ad
-SHA256 (gnome/gnome-spell-1.0.7.tar.bz2) = 6f3117635267acd29bb934bd6e588c58a8f5643fcaf41310d6633c2d7909f5f6
-SIZE (gnome/gnome-spell-1.0.7.tar.bz2) = 331063
+MD5 (gnome/gnome-spell-1.0.8.tar.bz2) = 6ccc46b4e3dc7cb1c6d413358e35d445
+SHA256 (gnome/gnome-spell-1.0.8.tar.bz2) = 04393bef844a92a18c9e6a676355d89b21cdc1b3111a407299108507eb9763a2
+SIZE (gnome/gnome-spell-1.0.8.tar.bz2) = 417076
diff --git a/textproc/gnome-spell/pkg-plist b/textproc/gnome-spell/pkg-plist
index a078dddab685..b589c5283aa9 100644
--- a/textproc/gnome-spell/pkg-plist
+++ b/textproc/gnome-spell/pkg-plist
@@ -3,10 +3,11 @@ lib/gnome-spell/libgnome-spell-component.a
lib/gnome-spell/libgnome-spell-component.la
lib/gnome-spell/libgnome-spell-component.so
libdata/bonobo/servers/GNOME_Spell.server
-share/gnome/control-center-2.0/icons/spell-checker.png
-share/gnome/gnome-spell-%%VERSION%%/spell-checker.glade
-share/gnome/idl/Spell-%%VERSION%%.idl
+share/control-center-2.0/icons/spell-checker.png
+share/gnome-spell-%%VERSION%%/spell-checker.glade
+share/idl/Spell-%%VERSION%%.idl
share/locale/am/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/ar/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/be/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
@@ -14,10 +15,12 @@ share/locale/ca/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/cs/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/da/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/de/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/el/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/en_CA/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/en_GB/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/es/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/fi/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/fr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/ga/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
@@ -34,7 +37,7 @@ share/locale/lv/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/nb/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/ne/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/nl/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-share/locale/no/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/oc/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/pa/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/pl/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/pt/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
@@ -42,6 +45,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/ru/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/rw/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/sk/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
+share/locale/sl/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/sq/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/sr/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/sr@Latn/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
@@ -53,11 +57,15 @@ share/locale/vi/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/wa/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/xh/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gnome-spell-%%VERSION%%.mo
-@dirrmtry share/gnome/control-center-2.0/icons 2>/dev/null
-@dirrmtry share/gnome/control-center-2.0
-@dirrm share/gnome/gnome-spell-%%VERSION%%
+@dirrm share/gnome-spell-%%VERSION%%
+@dirrmtry share/control-center-2.0/icons
+@dirrmtry share/control-center-2.0
@dirrm lib/gnome-spell
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
diff --git a/textproc/gnome-translate/Makefile b/textproc/gnome-translate/Makefile
index a71f44072271..b70d4dff93ff 100644
--- a/textproc/gnome-translate/Makefile
+++ b/textproc/gnome-translate/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-translate
PORTVERSION= 0.99
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= libtranslate
diff --git a/textproc/gnome-translate/pkg-plist b/textproc/gnome-translate/pkg-plist
index 1c1ba0431126..bfcd65aa4676 100644
--- a/textproc/gnome-translate/pkg-plist
+++ b/textproc/gnome-translate/pkg-plist
@@ -1,19 +1,19 @@
bin/gnome-translate
-share/gnome/applications/gnome-translate.desktop
-share/gnome/gnome-translate/ui/app.glade
-share/gnome/gnome-translate/ui/edit-toolbars.glade
-share/gnome/gnome-translate/ui/hand-open.png
-share/gnome/gnome-translate/ui/logo.png
-share/gnome/gnome-translate/ui/menus.xml
-share/gnome/gnome-translate/ui/preferences.glade
-share/gnome/gnome-translate/ui/toolbars.xml
-share/gnome/gnome-translate/ui/translate-web-page.glade
+share/applications/gnome-translate.desktop
+share/gnome-translate/ui/app.glade
+share/gnome-translate/ui/edit-toolbars.glade
+share/gnome-translate/ui/hand-open.png
+share/gnome-translate/ui/logo.png
+share/gnome-translate/ui/menus.xml
+share/gnome-translate/ui/preferences.glade
+share/gnome-translate/ui/toolbars.xml
+share/gnome-translate/ui/translate-web-page.glade
share/gnome/help/gnome-translate/C/documentation-license.xml
share/gnome/help/gnome-translate/C/figures/main-window.png
share/gnome/help/gnome-translate/C/gnome-translate.xml
share/gnome/help/gnome-translate/C/software-license.xml
-share/gnome/omf/gnome-translate/gnome-translate-C.omf
-share/gnome/pixmaps/gnome-translate.png
+share/omf/gnome-translate/gnome-translate-C.omf
+share/pixmaps/gnome-translate.png
share/icons/hicolor/16x16/apps/gnome-translate-web-page.png
share/icons/hicolor/16x16/apps/gnome-translate.png
share/icons/hicolor/24x24/apps/gnome-translate-web-page.png
@@ -24,9 +24,10 @@ share/icons/hicolor/32x32/apps/gnome-translate.png
share/icons/hicolor/48x48/apps/gnome-translate-web-page.png
share/icons/hicolor/48x48/apps/gnome-translate.png
share/locale/fr/LC_MESSAGES/gnome-translate.mo
-@dirrm share/gnome/gnome-translate/ui
-@dirrm share/gnome/gnome-translate
+@dirrm share/gnome-translate/ui
+@dirrm share/gnome-translate
@dirrm share/gnome/help/gnome-translate/C/figures
@dirrm share/gnome/help/gnome-translate/C
@dirrm share/gnome/help/gnome-translate
-@dirrm share/gnome/omf/gnome-translate
+@dirrm share/omf/gnome-translate
+@dirrmtry share/applications
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 3ef4c63f520f..88a1e8fe3558 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= gtk-doc
-PORTVERSION= 1.8
-PORTREVISION= 1
+PORTVERSION= 1.9
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,11 +17,11 @@ COMMENT= Code documentation system, originally for GTK+
BUILD_DEPENDS= jade:${PORTSDIR}/textproc/jade \
${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
- scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+ rarian-sk-config:${PORTSDIR}/textproc/rarian
RUN_DEPENDS= jade:${PORTSDIR}/textproc/jade \
${LOCALBASE}/share/xml/docbook/${DOCBOOK_VERSION}/docbook.cat:${PORTSDIR}/textproc/docbook-sk \
${LOCALBASE}/share/xsl/docbook/xhtml/chunk.xsl:${PORTSDIR}/textproc/docbook-xsl \
- scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+ rarian-sk-config:${PORTSDIR}/textproc/rarian
DOCBOOK_VERSION= 4.1.2
@@ -33,7 +32,7 @@ CATALOG_PORTS_SGML= ${PREFIX}/share/sgml/catalog.ports
USE_BZIP2= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
-USE_GNOME= gnomehack gnometarget libxslt
+USE_GNOME= gnomehack gnometarget gnomeprefix libxslt
INSTALLS_OMF= yes
CONFIGURE_ARGS= --with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
@@ -41,10 +40,6 @@ PLIST_SUB= XMLCATMGR=${XMLCATMGR} \
CATALOG_PORTS_SGML=${CATALOG_PORTS_SGML} \
CATALOG_DIR=${CATALOG_DIR}
-post-patch:
- @${REINPLACE_CMD} -e 's|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|' \
- ${WRKSRC}/Makefile.in
-
post-install:
@${XMLCATMGR} -sc ${CATALOG_PORTS_SGML} add CATALOG ${CATALOG_DIR}/gtk-doc.cat
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
index 57dfde8e5ba1..9fc10e82f9d1 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (gtk-doc-1.8.tar.bz2) = e61595df21431db28c83fe4c7d4a4fa8
-SHA256 (gtk-doc-1.8.tar.bz2) = 7a21c6f094f39b73ab23653ec628dd78ded47412636c491b3513fa760a8a22d3
-SIZE (gtk-doc-1.8.tar.bz2) = 186203
+MD5 (gtk-doc-1.9.tar.bz2) = bcd002f381385812737a05538eb8b21e
+SHA256 (gtk-doc-1.9.tar.bz2) = d1be2fc7be880b912f871675baed4a9e28ee4c19eef7fd1299c9c5d11cc9a80d
+SIZE (gtk-doc-1.9.tar.bz2) = 391957
diff --git a/textproc/gtk-doc/files/patch-help_manual_C_Makefile.in b/textproc/gtk-doc/files/patch-help_manual_C_Makefile.in
new file mode 100644
index 000000000000..4c52d15064d9
--- /dev/null
+++ b/textproc/gtk-doc/files/patch-help_manual_C_Makefile.in
@@ -0,0 +1,10 @@
+--- help/manual/C/Makefile.in.orig 2007-10-02 12:53:30.000000000 -0500
++++ help/manual/C/Makefile.in 2007-10-02 12:53:52.000000000 -0500
+@@ -213,7 +213,6 @@
+ # This variable (docdir) specifies where the documents should be installed.
+ # This default value should work for most packages.
+ @ENABLE_SCROLLKEEPER_TRUE@docdir = $(datadir)/gnome/help/$(docname)/$(lang)
+-docdir = @docdir@
+ dvidir = @dvidir@
+ exec_prefix = @exec_prefix@
+ glib_prefix = @glib_prefix@
diff --git a/textproc/gtk-doc/pkg-plist b/textproc/gtk-doc/pkg-plist
index 29f1437d9c6f..52438fd79b66 100644
--- a/textproc/gtk-doc/pkg-plist
+++ b/textproc/gtk-doc/pkg-plist
@@ -1,19 +1,24 @@
+bin/gtkdoc-check
bin/gtkdoc-fixxref
bin/gtkdoc-mkdb
bin/gtkdoc-mkhtml
bin/gtkdoc-mkman
bin/gtkdoc-mktmpl
+bin/gtkdoc-rebase
bin/gtkdoc-scan
bin/gtkdoc-scangobj
bin/gtkdoc-scanobj
bin/gtkdocize
libdata/pkgconfig/gtk-doc.pc
share/aclocal/gtk-doc.m4
+share/gnome/help/gtk-doc-manual/C/fdl-appendix.xml
+share/gnome/help/gtk-doc-manual/C/gtk-doc-manual.xml
%%DATADIR%%/data/devhelp.xsl
%%DATADIR%%/data/devhelp2.xsl
%%DATADIR%%/data/gtk-doc.dcl
%%DATADIR%%/data/gtk-doc.dsl
%%DATADIR%%/data/gtk-doc.make
+%%DATADIR%%/data/gtk-doc.notmpl.make
%%DATADIR%%/data/gtk-doc.xsl
%%DATADIR%%/data/gtkdoc-common.pl
%%DATADIR%%/data/home.png
@@ -22,17 +27,13 @@ share/aclocal/gtk-doc.m4
%%DATADIR%%/data/style.css
%%DATADIR%%/data/up.png
%%DATADIR%%/data/version-greater-or-equal.xsl
-share/help/gtk-doc-manual/C/fdl-appendix.xml
-share/help/gtk-doc-manual/C/gtk-doc-manual.xml
share/omf/gtk-doc/gtk-doc-manual-C.omf
@unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove CATALOG %%CATALOG_DIR%%/gtk-doc.cat
share/sgml/gtk-doc/gtk-doc.cat
@exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%CATALOG_DIR%%/gtk-doc.cat
@dirrm share/sgml/gtk-doc
@dirrm share/omf/gtk-doc
-@dirrmtry share/omf
-@dirrm share/help/gtk-doc-manual/C
-@dirrm share/help/gtk-doc-manual
-@dirrmtry share/help
@dirrm %%DATADIR%%/data
@dirrm %%DATADIR%%
+@dirrm share/gnome/help/gtk-doc-manual/C
+@dirrm share/gnome/help/gtk-doc-manual
diff --git a/textproc/gtkdiff/Makefile b/textproc/gtkdiff/Makefile
index 391ab0f56698..22dc546f609f 100644
--- a/textproc/gtkdiff/Makefile
+++ b/textproc/gtkdiff/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gtkdiff
PORTVERSION= 1.8.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc gnome
MASTER_SITES= TUCOWS
diff --git a/textproc/gtkdiff/pkg-plist b/textproc/gtkdiff/pkg-plist
index 54f235cf9292..d751bf70594f 100644
--- a/textproc/gtkdiff/pkg-plist
+++ b/textproc/gtkdiff/pkg-plist
@@ -2,11 +2,11 @@ bin/gtkdiff
bin/gtkdiff-cvs
bin/gtkdiff-rcs
share/gnome/apps/Utilities/gtkdiff.desktop
-share/gnome/gtkdiff/gtkdiffrc
+%%DATADIR%%/gtkdiffrc
share/locale/da/LC_MESSAGES/gtkdiff.mo
share/locale/de/LC_MESSAGES/gtkdiff.mo
share/locale/es/LC_MESSAGES/gtkdiff.mo
share/locale/fr/LC_MESSAGES/gtkdiff.mo
share/locale/ja/LC_MESSAGES/gtkdiff.mo
share/locale/tr/LC_MESSAGES/gtkdiff.mo
-@dirrm share/gnome/gtkdiff
+@dirrm %%DATADIR%%
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index a64f2e730424..57e96af661f0 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gxmlviewer
PORTVERSION= 1.3.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/textproc/gxmlviewer/pkg-plist b/textproc/gxmlviewer/pkg-plist
index 88fc21b80912..24f5da4d4b4b 100644
--- a/textproc/gxmlviewer/pkg-plist
+++ b/textproc/gxmlviewer/pkg-plist
@@ -2,7 +2,7 @@ bin/gxmlviewer
bin/xmlview-control
bin/xmlformatter
lib/gxmlviewer/plugins/npgxmlviewer.so
-share/gnome/oaf/GNOME_XMLView.oaf
+share/oaf/GNOME_XMLView.oaf
@unexec rm -f %%LOCALBASE%%/lib/browser_plugins/npgxmlviewer.so
@unexec rmdir %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true
@exec mkdir -p %%LOCALBASE%%/lib/browser_plugins 2>/dev/null || true
diff --git a/textproc/iiimf-gnome-im-switcher/Makefile b/textproc/iiimf-gnome-im-switcher/Makefile
index cc5bdae0943b..0a84acf375ef 100644
--- a/textproc/iiimf-gnome-im-switcher/Makefile
+++ b/textproc/iiimf-gnome-im-switcher/Makefile
@@ -7,7 +7,7 @@
PORTNAME= gnome-im-switcher
PORTVERSION= 12.2
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= textproc
MASTER_SITES= http://www.openi18n.org/download/im-sdk/src/
PKGNAMEPREFIX= iiimf-
@@ -46,25 +46,15 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
post-patch:
${REINPLACE_CMD} \
-e '/^serverdir/s,$$[(]libdir[)],%%LOCALBASE%%/libdata,g' \
- -e '/^uidir/s,$$[(]datadir[)]/,&gnome/,g' \
${BUILDDIR}/src/Makefile.am
${REINPLACE_CMD} \
-e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-e "s,%%PREFIX%%,${PREFIX},g" \
${WRKSRC}/Makefile ${BUILDDIR}/Makefile.am \
${BUILDDIR}/src/Makefile.am
- ${REINPLACE_CMD} -e "/GNOMECC_DATA_DIR/s,/share/,&gnome/,g" \
- ${BUILDDIR}/configure.ac
- ${REINPLACE_CMD} -e "/^GNOMECC_.*_DIR=/s,[(]datadir[)]/,&gnome/,g" \
- ${BUILDDIR}/configure.ac
do-configure:
@cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${GMAKE} bootstrap
@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${GMAKE} config
-post-configure:
- ${REINPLACE_CMD} -e '/^pkgdatadir/s,[(]datadir[)]/,&gnome/,g' \
- -e '/^iconsdir/s,[(]datadir[)]/,&gnome/,g' \
- ${BUILDDIR}/src/Makefile
-
.include <bsd.port.post.mk>
diff --git a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make
index 20ba08efe479..78bf144ed989 100644
--- a/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make
+++ b/textproc/iiimf-gnome-im-switcher/files/patch-gnome_help_omf.make
@@ -1,14 +1,5 @@
--- gnome-im-switcher/help/omf.make.orig Thu Sep 23 06:31:15 2004
+++ gnome-im-switcher/help/omf.make Sun May 29 22:04:45 2005
-@@ -26,7 +26,7 @@
- # Version: 0.1.3 (last updated: March 20, 2002)
- #
-
--omf_dest_dir=$(datadir)/omf/@PACKAGE@
-+omf_dest_dir=$(datadir)/gnome/omf/@PACKAGE@
- scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-
- # At some point, it may be wise to change to something like this:
@@ -45,7 +45,9 @@
for file in $(omffile); do \
$(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
diff --git a/textproc/iiimf-gnome-im-switcher/pkg-plist b/textproc/iiimf-gnome-im-switcher/pkg-plist
index 65d33b87369a..677d42f07ff1 100644
--- a/textproc/iiimf-gnome-im-switcher/pkg-plist
+++ b/textproc/iiimf-gnome-im-switcher/pkg-plist
@@ -2,17 +2,17 @@ bin/gnome-im-properties
bin/gnome-im-settings-daemon
libdata/bonobo/servers/GNOME_IMSwitcherApplet.server
libexec/gnome-im-switcher-applet
-share/gnome/control-center-2.0/capplets/gnome-im-properties.desktop
-share/gnome/control-center-2.0/interfaces/gnome-im-properties.glade2
-share/gnome/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
+share/control-center-2.0/capplets/gnome-im-properties.desktop
+share/control-center-2.0/interfaces/gnome-im-properties.glade2
+share/gnome-2.0/ui/GNOME_InputMethodSwitcherApplet.xml
share/gnome/help/imswitcher/C/imswitcher.xml
share/gnome/help/imswitcher/C/legal.xml
-share/gnome/iiimf-im-switcher/glade/gnome-im-switcher.glade2
-share/gnome/omf/iiimf-im-switcher/imswitcher-C.omf
-share/gnome/pixmaps/gimlet-disable.png
-share/gnome/pixmaps/gimlet-off.png
-share/gnome/pixmaps/gimlet-on.png
-share/gnome/pixmaps/gnome-settings-im.png
+share/iiimf-im-switcher/glade/gnome-im-switcher.glade2
+share/omf/iiimf-im-switcher/imswitcher-C.omf
+share/pixmaps/gimlet-disable.png
+share/pixmaps/gimlet-off.png
+share/pixmaps/gimlet-on.png
+share/pixmaps/gnome-settings-im.png
share/icons/hicolor/48x48/apps/gnome-settings-im.png
share/locale/bn/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/cs/LC_MESSAGES/iiimf-im-switcher.mo
@@ -34,11 +34,11 @@ share/locale/ta/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/zh_CN/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/zh_HK/LC_MESSAGES/iiimf-im-switcher.mo
share/locale/zh_TW/LC_MESSAGES/iiimf-im-switcher.mo
-@dirrm share/gnome/omf/iiimf-im-switcher
-@dirrm share/gnome/iiimf-im-switcher/glade
-@dirrm share/gnome/iiimf-im-switcher
+@dirrm share/omf/iiimf-im-switcher
+@dirrm share/iiimf-im-switcher/glade
+@dirrm share/iiimf-im-switcher
@dirrm share/gnome/help/imswitcher/C
@dirrm share/gnome/help/imswitcher
-@dirrmtry share/gnome/control-center-2.0/interfaces
+@dirrmtry share/control-center-2.0/interfaces
@dirrmtry share/locale/zh_HK/LC_MESSAGES
@dirrmtry share/locale/zh_HK
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index 3b67edb5fa53..c2fe64402f72 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.18 2007/03/07 19:06:06 marcus Exp $
+# $MCom: ports/textproc/libxml++26/Makefile,v 1.22 2007/09/18 16:36:01 marcus Exp $
#
PORTNAME= libxml++
-PORTVERSION= 2.18.0
+PORTVERSION= 2.20.0
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/textproc/libxml++26/distinfo b/textproc/libxml++26/distinfo
index 9a2cf8468c6c..7ae26a4ff694 100644
--- a/textproc/libxml++26/distinfo
+++ b/textproc/libxml++26/distinfo
@@ -1,3 +1,3 @@
-MD5 (libxml++-2.18.0.tar.gz) = 63b31bd9751cf99aaafccf6dfa4f88cd
-SHA256 (libxml++-2.18.0.tar.gz) = 0733c759c818d5aff07692b11c1bd1df736e4b479fb79cc50c3ab8b948d26b7e
-SIZE (libxml++-2.18.0.tar.gz) = 2020427
+MD5 (libxml++-2.20.0.tar.gz) = 0f6a95220c7cd893e711f85ad4056a1c
+SHA256 (libxml++-2.20.0.tar.gz) = 4b77156f6590a294aea179f2c42c2ced6b97368552be1298ee1ed072ca2e130e
+SIZE (libxml++-2.20.0.tar.gz) = 2044144
diff --git a/textproc/libxml++26/pkg-plist b/textproc/libxml++26/pkg-plist
index afb1d2e4f4a2..2124a9f6e57e 100644
--- a/textproc/libxml++26/pkg-plist
+++ b/textproc/libxml++26/pkg-plist
@@ -167,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_32008f4d917c53e6cfd05a5ea51dedc7.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_32008f4d917c53e6cfd05a5ea51dedc7_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_32008f4d917c53e6cfd05a5ea51dedc7_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_65e551a142d652aded9ca2dceeff3a63.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_65e551a142d652aded9ca2dceeff3a63_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_65e551a142d652aded9ca2dceeff3a63_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_6838e863111a3eb2223eace1205f0754.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_6838e863111a3eb2223eace1205f0754_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_6838e863111a3eb2223eace1205f0754_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_7146fab70a01c720ccb41a8cc1039409.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_7146fab70a01c720ccb41a8cc1039409_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_7146fab70a01c720ccb41a8cc1039409_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_90b4fb38958b63647b10dd7f2c14b828.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_90b4fb38958b63647b10dd7f2c14b828_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_90b4fb38958b63647b10dd7f2c14b828_dep.map
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d3a0f78a890734e21280a988361c8980.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d3a0f78a890734e21280a988361c8980_dep.jpg
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/dir_d3a0f78a890734e21280a988361c8980_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
@@ -217,6 +217,9 @@ 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_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
%%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
@@ -236,9 +239,6 @@ libdata/pkgconfig/libxml++-%%API_VERSION%%.pc
%%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
%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/functions_rela.html
%%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
@@ -277,19 +277,22 @@ 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/libxml++config_8h.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/namespacestatic_01const_01std.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/newin2p20s.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
%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/ostreamoutputbuffer_8h.html
%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/outputbuffer_8h.html
+%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/pages.html
%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/parse__error_8h.html
%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/parser_8h.html
%%PORTDOCS%%share/doc/libxml++-%%API_VERSION%%/docs/reference/%%DOC_VERSION%%/html/parserinputbuffer_8h.html
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 96da82f7c764..021d7d465d01 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -7,6 +7,7 @@
PORTNAME= meld
PORTVERSION= 1.1.5.1
+PORTREVISION= 1
CATEGORIES= textproc devel python
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:R:R}
@@ -28,11 +29,7 @@ INSTALLS_OMF= yes
post-patch:
@${FIND} ${WRKSRC} -name "${MAKEFILE}" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|$$(sharedir)/applications|$$(sharedir)/gnome/applications|g ; \
- s|$$(sharedir)/application-registry|$$(sharedir)/gnome/application-registry|g ; \
- s|$$(sharedir)/pixmaps|$$(sharedir)/gnome/pixmaps|g ; \
- s|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g ; \
- s|$$(sharedir)/omf/meld|$$(sharedir)/gnome/omf/meld|g'
+ 's|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g'
.include <bsd.port.pre.mk>
diff --git a/textproc/meld/pkg-plist b/textproc/meld/pkg-plist
index b82347c538c1..e4ab87014be0 100644
--- a/textproc/meld/pkg-plist
+++ b/textproc/meld/pkg-plist
@@ -68,17 +68,17 @@ lib/meld/vc/tla.pyo
lib/meld/vcview.py
lib/meld/vcview.pyc
lib/meld/vcview.pyo
-share/gnome/application-registry/meld.applications
-share/gnome/applications/meld.desktop
+share/application-registry/meld.applications
+share/applications/meld.desktop
share/gnome/help/meld/C/figures/dirdiff.png
share/gnome/help/meld/C/figures/filediff.png
share/gnome/help/meld/C/meld.xml
share/gnome/help/meld/es/figures/dirdiff.png
share/gnome/help/meld/es/figures/filediff.png
share/gnome/help/meld/es/meld.xml
-share/gnome/omf/meld/meld-C.omf
-share/gnome/omf/meld/meld-es.omf
-share/gnome/pixmaps/meld.png
+share/omf/meld/meld-C.omf
+share/omf/meld/meld-es.omf
+share/pixmaps/meld.png
share/locale/ar/LC_MESSAGES/meld.mo
share/locale/bg/LC_MESSAGES/meld.mo
share/locale/ca/LC_MESSAGES/meld.mo
@@ -144,7 +144,7 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo
@dirrm %%DATADIR%%
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
-@dirrm share/gnome/omf/meld
+@dirrm share/omf/meld
@dirrm share/gnome/help/meld/es/figures
@dirrm share/gnome/help/meld/es
@dirrm share/gnome/help/meld/C/figures
@@ -154,3 +154,4 @@ share/locale/zh_TW/LC_MESSAGES/meld.mo
@dirrm %%DOCSDIR%%
@dirrm lib/meld/vc
@dirrm lib/meld
+@dirrmtry share/applications
diff --git a/textproc/rarian/Makefile b/textproc/rarian/Makefile
new file mode 100644
index 000000000000..f8d0260c8988
--- /dev/null
+++ b/textproc/rarian/Makefile
@@ -0,0 +1,59 @@
+# New ports collection makefile for: rarian
+# Date created: 02 August 2007
+# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+# $MCom: ports/textproc/rarian/Makefile,v 1.8 2007/10/11 04:04:18 mezz Exp $
+#
+
+PORTNAME= rarian
+PORTVERSION= 0.6.0
+PORTREVISION= 1
+CATEGORIES= textproc gnome
+MASTER_SITES= ${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+
+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}/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
+ ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk \
+ 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}/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
+ ${LOCALBASE}/share/xml/docbook/4.1.2/docbookx.dtd:${PORTSDIR}/textproc/docbook-sk
+
+DOCBOOK_VERSION=4.2
+
+CONFLICTS= scrollkeeper-[0-9]*
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GNOME= gnomehier gnometarget gnomehack libxslt
+USE_PYTHON= yes
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+CONFIGURE_ARGS= --with-convert-dir=${LOCALBASE}/share/omf \
+ --datadir=${PREFIX}/share \
+ --localstatedir=/var
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|/lib/rarian|/db/rarian|' \
+ ${WRKSRC}/util/Makefile.in
+ @${REINPLACE_CMD} -e 's|@localstatedir@/lib/rarian|@localstatedir@/db/rarian|g ; \
+ s|getopt|${LOCALBASE}/bin/getopt|' \
+ ${WRKSRC}/util/rarian-sk-config.in \
+ ${WRKSRC}/util/rarian-sk-extract.in \
+ ${WRKSRC}/util/rarian-sk-rebuild.in \
+ ${WRKSRC}/util/rarian-sk-update.in
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
+ ${WRKSRC}/librarian/rarian-main.c \
+ ${WRKSRC}/librarian/rarian-man.c \
+ ${WRKSRC}/librarian/rarian-info.c
+
+.include <bsd.port.mk>
diff --git a/textproc/rarian/distinfo b/textproc/rarian/distinfo
new file mode 100644
index 000000000000..c10840549f71
--- /dev/null
+++ b/textproc/rarian/distinfo
@@ -0,0 +1,3 @@
+MD5 (rarian-0.6.0.tar.bz2) = 23772a3b0f882d13c86dd9fa67bb21bf
+SHA256 (rarian-0.6.0.tar.bz2) = 2f169f3c794b2602d8590b1fd16c0aa5b7ca77e993f74b89c4f42db74c1d2029
+SIZE (rarian-0.6.0.tar.bz2) = 312258
diff --git a/textproc/rarian/files/patch-docs_Makefile.in b/textproc/rarian/files/patch-docs_Makefile.in
new file mode 100644
index 000000000000..10e4783a75b8
--- /dev/null
+++ b/textproc/rarian/files/patch-docs_Makefile.in
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig 2007-08-02 01:37:06.000000000 -0400
++++ docs/Makefile.in 2007-08-02 01:37:22.000000000 -0400
+@@ -183,7 +183,7 @@ target_alias = @target_alias@
+ EXTRA_DIST = help-spec-0.2.xml index.xhtml rar-mdf.xhtml rar-lib.xhtml rar-skcompat.xhtml rarian.document.in
+ manualdir = $(datadir)/librarian/manual
+ manual_DATA = help-spec-0.2.xml index.xhtml rar-mdf.xhtml rar-lib.xhtml rar-skcompat.xhtml
+-metadatadir = $(datadir)/help
++metadatadir = $(datadir)/doc/rarian
+ metadata_DATA = rarian.document
+ all: all-am
+
diff --git a/textproc/rarian/files/patch-librarian_rarian-main.c b/textproc/rarian/files/patch-librarian_rarian-main.c
new file mode 100644
index 000000000000..549390150c64
--- /dev/null
+++ b/textproc/rarian/files/patch-librarian_rarian-main.c
@@ -0,0 +1,11 @@
+--- librarian/rarian-main.c.orig 2007-08-02 16:04:45.000000000 -0400
++++ librarian/rarian-main.c 2007-08-02 16:12:58.000000000 -0400
+@@ -212,7 +212,7 @@ past:
+ path = getenv ("XDG_DATA_DIRS");
+
+ if (!path || !strcmp (path, "")) {
+- path = "/usr/local/share/:/usr/share/";
++ path = "/usr/local/share/";
+ }
+ cur_path = path;
+ do {
diff --git a/textproc/rarian/files/patch-util_rarian-sk-config.in b/textproc/rarian/files/patch-util_rarian-sk-config.in
new file mode 100644
index 000000000000..c97a07c77b6c
--- /dev/null
+++ b/textproc/rarian/files/patch-util_rarian-sk-config.in
@@ -0,0 +1,11 @@
+--- util/rarian-sk-config.in.orig 2007-10-10 23:00:03.000000000 -0500
++++ util/rarian-sk-config.in 2007-10-10 23:00:30.000000000 -0500
+@@ -47,7 +47,7 @@
+ print_help
+ ;;
+ --version )
+- echo $package_version \(Rarian replacement for scrollkeeper-config\)
++ echo $package_version
+ ;;
+ --prefix )
+ echo $prefix
diff --git a/textproc/rarian/pkg-descr b/textproc/rarian/pkg-descr
new file mode 100644
index 000000000000..e60b1e98e756
--- /dev/null
+++ b/textproc/rarian/pkg-descr
@@ -0,0 +1,9 @@
+Rarian is designed to be a replacement for scrollkeeper. It is
+currently undergoing heavy development. As of writing, rarian can be
+installed in place of scrollkeeper and everything will work okay.
+
+Rarian manages documentation metadata (as specified by the Open Source
+Metadata Framework (OMF) and provides a simple API to allow help browsers
+to find, sort, and search the document catalog. It will also be able to
+communicate with catalog servers on the Net to search for documents which
+are not on the local system.
diff --git a/textproc/rarian/pkg-plist b/textproc/rarian/pkg-plist
new file mode 100644
index 000000000000..1abb978331bc
--- /dev/null
+++ b/textproc/rarian/pkg-plist
@@ -0,0 +1,53 @@
+bin/rarian-example
+bin/rarian-sk-config
+bin/rarian-sk-extract
+bin/rarian-sk-gen-uuid
+bin/rarian-sk-get-cl
+bin/rarian-sk-get-content-list
+bin/rarian-sk-get-extended-content-list
+bin/rarian-sk-get-scripts
+bin/rarian-sk-install
+bin/rarian-sk-migrate
+bin/rarian-sk-preinstall
+bin/rarian-sk-rebuild
+bin/rarian-sk-update
+bin/scrollkeeper-config
+bin/scrollkeeper-extract
+bin/scrollkeeper-gen-seriesid
+bin/scrollkeeper-get-cl
+bin/scrollkeeper-get-content-list
+bin/scrollkeeper-get-extended-content-list
+bin/scrollkeeper-get-index-from-docpath
+bin/scrollkeeper-get-toc-from-docpath
+bin/scrollkeeper-get-toc-from-id
+bin/scrollkeeper-install
+bin/scrollkeeper-preinstall
+bin/scrollkeeper-rebuilddb
+bin/scrollkeeper-uninstall
+bin/scrollkeeper-update
+include/rarian/rarian-info.h
+include/rarian/rarian-man.h
+include/rarian/rarian-reg-utils.h
+include/rarian/rarian.h
+lib/librarian.a
+lib/librarian.la
+lib/librarian.so
+lib/librarian.so.0
+libdata/pkgconfig/rarian.pc
+share/doc/rarian/rarian.document
+share/librarian/Templates/C/scrollkeeper_cl.xml
+share/librarian/manual/help-spec-0.2.xml
+share/librarian/manual/index.xhtml
+share/librarian/manual/rar-lib.xhtml
+share/librarian/manual/rar-mdf.xhtml
+share/librarian/manual/rar-skcompat.xhtml
+share/librarian/rarian-sk-cl.xml
+@dirrm share/librarian/manual
+@dirrm share/librarian/Templates/C
+@dirrm share/librarian/Templates
+@dirrm share/librarian
+@dirrm share/doc/rarian
+@dirrm include/rarian
+@unexec rm -rf /var/db/scrollkeeper 2>/dev/null || true
+@exec mkdir -p /var/db/rarian
+@exec %%PREFIX%%/bin/rarian-sk-update || true
diff --git a/textproc/sagasu/Makefile b/textproc/sagasu/Makefile
index 60a2f774dba9..d453824e43ad 100644
--- a/textproc/sagasu/Makefile
+++ b/textproc/sagasu/Makefile
@@ -3,10 +3,11 @@
# Whom: Juan Salaverria <rael@vectorstar.net>
#
# $FreeBSD$
+#
PORTNAME= sagasu
PORTVERSION= 2.0.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc gnome
MASTER_SITES= http://www3.sympatico.ca/sarrazip/dev/
diff --git a/textproc/sagasu/pkg-plist b/textproc/sagasu/pkg-plist
index 152ce2bb4bb0..d504328416c4 100644
--- a/textproc/sagasu/pkg-plist
+++ b/textproc/sagasu/pkg-plist
@@ -5,22 +5,23 @@ bin/sagasu
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/THANKS
%%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/sagasu.desktop
+share/applications/sagasu.desktop
share/gnome/help/sagasu/C/sagasu.html
share/gnome/help/sagasu/fr/sagasu.html
-share/gnome/pixmaps/close.xpm
-share/gnome/pixmaps/sagasu.png
-share/gnome/sagasu/COPYING
-share/gnome/sagasu/sagasu-helper.pl
-share/gnome/sounds/sagasu/sagasu.wav
+share/pixmaps/close.xpm
+share/pixmaps/sagasu.png
+share/sagasu/COPYING
+share/sagasu/sagasu-helper.pl
+share/sounds/sagasu/sagasu.wav
share/locale/de/LC_MESSAGES/sagasu.mo
share/locale/fr/LC_MESSAGES/sagasu.mo
share/locale/ja/LC_MESSAGES/sagasu.mo
share/locale/ru/LC_MESSAGES/sagasu.mo
share/locale/sr/LC_MESSAGES/sagasu.mo
-@dirrm share/gnome/sounds/sagasu
-@dirrm share/gnome/sagasu
+@dirrm share/sounds/sagasu
+@dirrm share/sagasu
@dirrm share/gnome/help/sagasu/fr
@dirrm share/gnome/help/sagasu/C
@dirrm share/gnome/help/sagasu
%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 1f61cda5baf4..3b3b9d7ecb12 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -7,6 +7,7 @@
PORTNAME= scim
PORTVERSION= 1.4.7
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=scim
@@ -32,11 +33,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -D__STDC_ISO_10646__" \
LDFLAGS="-L${LOCALBASE}/lib -lintl"
post-patch:
- ${REINPLACE_CMD} 's|$$(datadir)/pixmaps|$$(prefix)/share/gnome/pixmaps|' \
- ${WRKSRC}/data/pixmaps/Makefile.in
- ${REINPLACE_CMD} -e 's|$$(datadir)/app|$$(prefix)/share/gnome/app| ; \
- s|$$(datadir)/control|$$(prefix)/share/gnome/control| ; \
- /^scim_setup_LDFLAGS/s|=|= ${PTHREAD_LIBS}|' \
+ ${REINPLACE_CMD} -e '/^scim_setup_LDFLAGS/s|=|= ${PTHREAD_LIBS}|' \
${WRKSRC}/extras/setup/Makefile.in
post-install:
diff --git a/textproc/scim/pkg-plist b/textproc/scim/pkg-plist
index 3da4b75ba7ca..c559f3221083 100644
--- a/textproc/scim/pkg-plist
+++ b/textproc/scim/pkg-plist
@@ -102,9 +102,9 @@ lib/scim-1.0/scim-panel-gtk
libdata/pkgconfig/scim-gtkutils.pc
libdata/pkgconfig/scim-x11utils.pc
libdata/pkgconfig/scim.pc
-share/gnome/applications/scim-setup.desktop
-share/gnome/control-center-2.0/capplets/scim-setup.desktop
-share/gnome/pixmaps/scim-setup.png
+share/applications/scim-setup.desktop
+share/control-center-2.0/capplets/scim-setup.desktop
+share/pixmaps/scim-setup.png
share/locale/cs/LC_MESSAGES/scim.mo
share/locale/de/LC_MESSAGES/scim.mo
share/locale/fi/LC_MESSAGES/scim.mo
@@ -153,3 +153,4 @@ share/locale/zh_TW/LC_MESSAGES/scim.mo
@dirrm %%DATADIR%%
@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules
+@dirrmtry share/applications
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 67e2f99dfee9..81eb73a554b1 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.7 2007/02/20 20:26:47 marcus Exp $
+# $MCom: ports/textproc/scrollkeeper/Makefile,v 1.12 2007/10/17 21:36:13 mezz Exp $
PORTNAME= scrollkeeper
PORTVERSION= 0.3.14
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 1
CATEGORIES= textproc gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -28,6 +28,8 @@ RUN_DEPENDS= intltool-extract:${PORTSDIR}/textproc/intltool \
DOCBOOK_VERSION=4.2
+CONFLICTS= rarian-[0-9]*
+
USE_BZIP2= yes
USE_GETTEXT= yes
USE_GMAKE= yes
@@ -35,8 +37,8 @@ USE_AUTOTOOLS= libtool:15
USE_BISON= build
USE_GNOME= gnomehack gnomehier gnometarget libxslt intlhack
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --localstatedir=/var --datadir=${PREFIX}/share/gnome \
- --with-omfdirs=${PREFIX}/share/gnome/omf \
+CONFIGURE_ARGS= --localstatedir=/var --datadir=${PREFIX}/share \
+ --with-omfdirs=${PREFIX}/share/omf \
--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib -lintl" \
diff --git a/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in b/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in
deleted file mode 100644
index c8a8d3400623..000000000000
--- a/textproc/scrollkeeper/files/patch-libs_scrollkeeper.h.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libs/scrollkeeper.h.in.orig Mon Jun 3 14:00:51 2002
-+++ libs/scrollkeeper.h.in Mon Jun 3 14:01:11 2002
-@@ -32,7 +32,7 @@
- #define SCROLLKEEPERLOCALEDIR "/usr/X11R6/share/locale"
- #define SCROLLKEEPERLOGFILE "@localstatedir@/log/scrollkeeper.log"
- #define SCROLLKEEPERLOGFILE_ROT "@localstatedir@/log/scrollkeeper.log.1"
--#define SCROLLKEEPER_OMF_DTD "@prefix@/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"
-+#define SCROLLKEEPER_OMF_DTD "@prefix@/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd"
- #define PATHLEN 256
-
- /*
diff --git a/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in b/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in
deleted file mode 100644
index 0185737cea7d..000000000000
--- a/textproc/scrollkeeper/files/patch-scripts_scrollkeeper-config.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/scrollkeeper-config.in.orig Thu Mar 21 00:08:51 2002
-+++ scripts/scrollkeeper-config.in Sat May 25 23:59:53 2002
-@@ -4,7 +4,7 @@
- localstatedir=@localstatedir@
- partial_db_dir=@SCROLLKEEPER_PARTIAL_DB_DIR@
- pkglocalstatedir=${localstatedir}/${partial_db_dir}
--pkgdatadir=${prefix}/share/scrollkeeper
-+pkgdatadir=${prefix}/share/gnome/scrollkeeper
- datadir=@datadir@
-
- usage()
diff --git a/textproc/scrollkeeper/pkg-install b/textproc/scrollkeeper/pkg-install
index a2a601b74d86..4af1430f1f2b 100644
--- a/textproc/scrollkeeper/pkg-install
+++ b/textproc/scrollkeeper/pkg-install
@@ -1,6 +1,6 @@
#!/bin/sh
-PATH=${PATH}:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+PATH=${PATH}:/bin:/usr/bin:/usr/local/bin
export PATH
PREFIX=`xml2-config --prefix`
@@ -12,7 +12,7 @@ if [ "$2" = "POST-INSTALL" ]; then
xmlcatalog --noout --add "public" \
"-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" \
- "${SKPREFIX}/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" \
+ "${SKPREFIX}/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" \
${ROOTCATALOG}
scrollkeeper-rebuilddb -q -p /var/db/scrollkeeper || /usr/bin/true
diff --git a/textproc/scrollkeeper/pkg-plist b/textproc/scrollkeeper/pkg-plist
index 49289b7ded61..27e2a47e1d55 100644
--- a/textproc/scrollkeeper/pkg-plist
+++ b/textproc/scrollkeeper/pkg-plist
@@ -17,46 +17,46 @@ lib/libscrollkeeper.a
lib/libscrollkeeper.la
lib/libscrollkeeper.so
lib/libscrollkeeper.so.0
-share/gnome/omf/scrollkeeper/writing_scrollkeeper_omf_files-C.omf
-share/gnome/scrollkeeper/Templates/C/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/am/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/az/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/be/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ca/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/cs/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/da/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/de/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/el/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/es/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/fr/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/hu/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/it/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ja/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/kn/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ko/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/nl/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/no/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/pl/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/pt_BR/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ro/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/ru/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sl/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sk/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sr/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sr@Latn/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/sv/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/tr/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/uk/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/vi/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/zh_CN/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/Templates/zh_TW/scrollkeeper_cl.xml
-share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/legal.xml
-share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml
-share/gnome/scrollkeeper/stylesheets/categories.xsl
-share/gnome/scrollkeeper/stylesheets/index.xsl
-share/gnome/scrollkeeper/stylesheets/toc.xsl
-share/gnome/xml/scrollkeeper/dtds/scrollkeeper-cl.dtd
-share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
+share/omf/scrollkeeper/writing_scrollkeeper_omf_files-C.omf
+share/scrollkeeper/Templates/C/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/am/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/az/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/be/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ca/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/cs/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/da/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/de/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/el/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/es/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/fr/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/hu/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/it/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ja/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/kn/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ko/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/nl/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/no/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/pl/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/pt_BR/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ro/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/ru/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sl/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sk/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sr/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sr@Latn/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/sv/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/tr/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/uk/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/vi/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/zh_CN/scrollkeeper_cl.xml
+share/scrollkeeper/Templates/zh_TW/scrollkeeper_cl.xml
+share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/legal.xml
+share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C/writing_scrollkeeper_omf_files.xml
+share/scrollkeeper/stylesheets/categories.xsl
+share/scrollkeeper/stylesheets/index.xsl
+share/scrollkeeper/stylesheets/toc.xsl
+share/xml/scrollkeeper/dtds/scrollkeeper-cl.dtd
+share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd
share/locale/am/LC_MESSAGES/scrollkeeper.mo
share/locale/az/LC_MESSAGES/scrollkeeper.mo
share/locale/be/LC_MESSAGES/scrollkeeper.mo
@@ -88,50 +88,50 @@ share/locale/uk/LC_MESSAGES/scrollkeeper.mo
share/locale/vi/LC_MESSAGES/scrollkeeper.mo
share/locale/zh_CN/LC_MESSAGES/scrollkeeper.mo
share/locale/zh_TW/LC_MESSAGES/scrollkeeper.mo
-@dirrm share/gnome/xml/scrollkeeper/dtds
-@dirrm share/gnome/xml/scrollkeeper
-@dirrm share/gnome/xml
-@dirrm share/gnome/scrollkeeper/stylesheets
-@dirrm share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files/C
-@dirrm share/gnome/scrollkeeper/doc/writing_scrollkeeper_omf_files
-@dirrm share/gnome/scrollkeeper/doc
-@dirrm share/gnome/scrollkeeper/Templates/zh_TW
-@dirrm share/gnome/scrollkeeper/Templates/zh_CN
-@dirrm share/gnome/scrollkeeper/Templates/vi
-@dirrm share/gnome/scrollkeeper/Templates/uk
-@dirrm share/gnome/scrollkeeper/Templates/tr
-@dirrm share/gnome/scrollkeeper/Templates/sv
-@dirrm share/gnome/scrollkeeper/Templates/sr@Latn
-@dirrm share/gnome/scrollkeeper/Templates/sr
-@dirrm share/gnome/scrollkeeper/Templates/sl
-@dirrm share/gnome/scrollkeeper/Templates/sk
-@dirrm share/gnome/scrollkeeper/Templates/ru
-@dirrm share/gnome/scrollkeeper/Templates/ro
-@dirrm share/gnome/scrollkeeper/Templates/pt_BR
-@dirrm share/gnome/scrollkeeper/Templates/pl
-@dirrm share/gnome/scrollkeeper/Templates/no
-@dirrm share/gnome/scrollkeeper/Templates/nl
-@dirrm share/gnome/scrollkeeper/Templates/ko
-@dirrm share/gnome/scrollkeeper/Templates/kn
-@dirrm share/gnome/scrollkeeper/Templates/ja
-@dirrm share/gnome/scrollkeeper/Templates/it
-@dirrm share/gnome/scrollkeeper/Templates/hu
-@dirrm share/gnome/scrollkeeper/Templates/fr
-@dirrm share/gnome/scrollkeeper/Templates/es
-@dirrm share/gnome/scrollkeeper/Templates/el
-@dirrm share/gnome/scrollkeeper/Templates/de
-@dirrm share/gnome/scrollkeeper/Templates/da
-@dirrm share/gnome/scrollkeeper/Templates/cs
-@dirrm share/gnome/scrollkeeper/Templates/ca
-@dirrm share/gnome/scrollkeeper/Templates/be
-@dirrm share/gnome/scrollkeeper/Templates/az
-@dirrm share/gnome/scrollkeeper/Templates/am
-@dirrm share/gnome/scrollkeeper/Templates/C
-@dirrm share/gnome/scrollkeeper/Templates
-@dirrm share/gnome/scrollkeeper
-@dirrm share/gnome/omf/scrollkeeper
+@dirrm share/xml/scrollkeeper/dtds
+@dirrm share/xml/scrollkeeper
+@dirrmtry share/xml
+@dirrm share/scrollkeeper/stylesheets
+@dirrm share/scrollkeeper/doc/writing_scrollkeeper_omf_files/C
+@dirrm share/scrollkeeper/doc/writing_scrollkeeper_omf_files
+@dirrm share/scrollkeeper/doc
+@dirrm share/scrollkeeper/Templates/zh_TW
+@dirrm share/scrollkeeper/Templates/zh_CN
+@dirrm share/scrollkeeper/Templates/vi
+@dirrm share/scrollkeeper/Templates/uk
+@dirrm share/scrollkeeper/Templates/tr
+@dirrm share/scrollkeeper/Templates/sv
+@dirrm share/scrollkeeper/Templates/sr@Latn
+@dirrm share/scrollkeeper/Templates/sr
+@dirrm share/scrollkeeper/Templates/sl
+@dirrm share/scrollkeeper/Templates/sk
+@dirrm share/scrollkeeper/Templates/ru
+@dirrm share/scrollkeeper/Templates/ro
+@dirrm share/scrollkeeper/Templates/pt_BR
+@dirrm share/scrollkeeper/Templates/pl
+@dirrm share/scrollkeeper/Templates/no
+@dirrm share/scrollkeeper/Templates/nl
+@dirrm share/scrollkeeper/Templates/ko
+@dirrm share/scrollkeeper/Templates/kn
+@dirrm share/scrollkeeper/Templates/ja
+@dirrm share/scrollkeeper/Templates/it
+@dirrm share/scrollkeeper/Templates/hu
+@dirrm share/scrollkeeper/Templates/fr
+@dirrm share/scrollkeeper/Templates/es
+@dirrm share/scrollkeeper/Templates/el
+@dirrm share/scrollkeeper/Templates/de
+@dirrm share/scrollkeeper/Templates/da
+@dirrm share/scrollkeeper/Templates/cs
+@dirrm share/scrollkeeper/Templates/ca
+@dirrm share/scrollkeeper/Templates/be
+@dirrm share/scrollkeeper/Templates/az
+@dirrm share/scrollkeeper/Templates/am
+@dirrm share/scrollkeeper/Templates/C
+@dirrm share/scrollkeeper/Templates
+@dirrm share/scrollkeeper
+@dirrm share/omf/scrollkeeper
@unexec rm -f /var/log/scrollkeeper.log 2>/dev/null || true
@unexec rm -rf /var/db/scrollkeeper 2>/dev/null || true
-@unexec %%LOCALBASE%%/bin/xmlcatalog --noout --del %D/share/gnome/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd %%LOCALBASE%%/share/xml/catalog.ports || true
+@unexec %%LOCALBASE%%/bin/xmlcatalog --noout --del %D/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd %%LOCALBASE%%/share/xml/catalog.ports || true
@exec touch -f /var/log/scrollkeeper.log
@exec mkdir -p /var/db/scrollkeeper
diff --git a/textproc/stardict2-dictd_mova/Makefile b/textproc/stardict2-dictd_mova/Makefile
index a8530bf46595..8d321c496612 100644
--- a/textproc/stardict2-dictd_mova/Makefile
+++ b/textproc/stardict2-dictd_mova/Makefile
@@ -1,12 +1,13 @@
# Ports collection makefile for: stardict-dictd_www.mova.org
# Date created: 16 Dec 2004
# Whom: Timur I. Bakeyev <timur@gnome.org>
+#
# $FreeBSD$
#
PORTNAME= stardict
PORTVERSION= 2.4.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= stardict
@@ -23,7 +24,7 @@ USE_BZIP2= yes
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-DICTDIR= share/gnome/stardict/dic
+DICTDIR= share/stardict/dic
DISTSUFFIX= -dictd_www.mova.org
diff --git a/textproc/stardict2-quick/Makefile b/textproc/stardict2-quick/Makefile
index 940ce21a571b..f7210ac25d9b 100644
--- a/textproc/stardict2-quick/Makefile
+++ b/textproc/stardict2-quick/Makefile
@@ -1,12 +1,13 @@
# Ports collection makefile for: stardict-quick
# Date created: 16 Dec 2004
# Whom: Timur I. Bakeyev <timur@gnome.org>
+#
# $FreeBSD$
#
PORTNAME= stardict
PORTVERSION= 2.4.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= stardict
@@ -23,7 +24,7 @@ USE_BZIP2= yes
LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
-DICTDIR= share/gnome/stardict/dic
+DICTDIR= share/stardict/dic
DICTIONARIES= afr-eng afr-swe bul-swe dan-deu dan-eng dan-fin dan-fra \
dan-hun dan-ind dan-ita dan-jpn dan-lat dan-nld dan-nor \
diff --git a/textproc/stardict2/Makefile b/textproc/stardict2/Makefile
index d91c60073f07..2d5f0174ce0a 100644
--- a/textproc/stardict2/Makefile
+++ b/textproc/stardict2/Makefile
@@ -7,7 +7,7 @@
PORTNAME= stardict
PORTVERSION= 2.4.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/textproc/stardict2/pkg-plist b/textproc/stardict2/pkg-plist
index 26dd31626e97..85342966e0fc 100644
--- a/textproc/stardict2/pkg-plist
+++ b/textproc/stardict2/pkg-plist
@@ -1,6 +1,6 @@
bin/stardict
%%GNOME%%libdata/bonobo/servers/GNOME_Stardict.server
-share/gnome/applications/stardict.desktop
+share/applications/stardict.desktop
%%GNOME%%share/gnome/help/stardict/C/figures/stardict_float_window.png
%%GNOME%%share/gnome/help/stardict/C/figures/stardict_main_window.png
%%GNOME%%share/gnome/help/stardict/C/figures/stardict_notification_area.png
@@ -36,24 +36,24 @@ share/gnome/applications/stardict.desktop
%%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_notification_area.png
%%GNOME%%share/gnome/help/stardict/zh_TW/legal.xml
%%GNOME%%share/gnome/help/stardict/zh_TW/stardict.xml
-%%GNOME%%share/gnome/idl/GNOME_Stardict.idl
-%%GNOME%%share/gnome/omf/stardict/stardict-C.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-mk.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-nl.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-ru.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-uk.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-zh_CN.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-zh_TW.omf
-share/gnome/pixmaps/stardict.png
-share/gnome/stardict/pixmaps/docklet_normal.png
-share/gnome/stardict/pixmaps/docklet_scan.png
-share/gnome/stardict/pixmaps/docklet_stop.png
-share/gnome/stardict/pixmaps/index_appendix.png
-share/gnome/stardict/pixmaps/index_dictlist.png
-share/gnome/stardict/pixmaps/index_wazard.png
-share/gnome/stardict/pixmaps/splash.png
-share/gnome/stardict/sounds/buttonactive.wav
-share/gnome/stardict/sounds/menushow.wav
+%%GNOME%%share/idl/GNOME_Stardict.idl
+%%GNOME%%share/omf/stardict/stardict-C.omf
+%%GNOME%%share/omf/stardict/stardict-mk.omf
+%%GNOME%%share/omf/stardict/stardict-nl.omf
+%%GNOME%%share/omf/stardict/stardict-ru.omf
+%%GNOME%%share/omf/stardict/stardict-uk.omf
+%%GNOME%%share/omf/stardict/stardict-zh_CN.omf
+%%GNOME%%share/omf/stardict/stardict-zh_TW.omf
+share/pixmaps/stardict.png
+share/stardict/pixmaps/docklet_normal.png
+share/stardict/pixmaps/docklet_scan.png
+share/stardict/pixmaps/docklet_stop.png
+share/stardict/pixmaps/index_appendix.png
+share/stardict/pixmaps/index_dictlist.png
+share/stardict/pixmaps/index_wazard.png
+share/stardict/pixmaps/splash.png
+share/stardict/sounds/buttonactive.wav
+share/stardict/sounds/menushow.wav
share/locale/cs/LC_MESSAGES/stardict.mo
share/locale/de/LC_MESSAGES/stardict.mo
share/locale/el/LC_MESSAGES/stardict.mo
@@ -73,10 +73,10 @@ share/locale/zh_CN/LC_MESSAGES/stardict.mo
share/locale/zh_TW/LC_MESSAGES/stardict.mo
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
-@dirrm share/gnome/stardict/sounds
-@dirrm share/gnome/stardict/pixmaps
-@dirrmtry share/gnome/stardict
-%%GNOME%%@dirrm share/gnome/omf/stardict
+@dirrm share/stardict/sounds
+@dirrm share/stardict/pixmaps
+@dirrmtry share/stardict
+%%GNOME%%@dirrm share/omf/stardict
%%GNOME%%@dirrm share/gnome/help/stardict/zh_TW/figures
%%GNOME%%@dirrm share/gnome/help/stardict/zh_TW
%%GNOME%%@dirrm share/gnome/help/stardict/zh_CN/figures
@@ -92,3 +92,4 @@ share/locale/zh_TW/LC_MESSAGES/stardict.mo
%%GNOME%%@dirrm share/gnome/help/stardict/C/figures
%%GNOME%%@dirrm share/gnome/help/stardict/C
%%GNOME%%@dirrm share/gnome/help/stardict
+@dirrmtry share/applications
diff --git a/textproc/stardict3/Makefile b/textproc/stardict3/Makefile
index d91c60073f07..2d5f0174ce0a 100644
--- a/textproc/stardict3/Makefile
+++ b/textproc/stardict3/Makefile
@@ -7,7 +7,7 @@
PORTNAME= stardict
PORTVERSION= 2.4.8
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/textproc/stardict3/pkg-plist b/textproc/stardict3/pkg-plist
index 26dd31626e97..85342966e0fc 100644
--- a/textproc/stardict3/pkg-plist
+++ b/textproc/stardict3/pkg-plist
@@ -1,6 +1,6 @@
bin/stardict
%%GNOME%%libdata/bonobo/servers/GNOME_Stardict.server
-share/gnome/applications/stardict.desktop
+share/applications/stardict.desktop
%%GNOME%%share/gnome/help/stardict/C/figures/stardict_float_window.png
%%GNOME%%share/gnome/help/stardict/C/figures/stardict_main_window.png
%%GNOME%%share/gnome/help/stardict/C/figures/stardict_notification_area.png
@@ -36,24 +36,24 @@ share/gnome/applications/stardict.desktop
%%GNOME%%share/gnome/help/stardict/zh_TW/figures/stardict_notification_area.png
%%GNOME%%share/gnome/help/stardict/zh_TW/legal.xml
%%GNOME%%share/gnome/help/stardict/zh_TW/stardict.xml
-%%GNOME%%share/gnome/idl/GNOME_Stardict.idl
-%%GNOME%%share/gnome/omf/stardict/stardict-C.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-mk.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-nl.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-ru.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-uk.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-zh_CN.omf
-%%GNOME%%share/gnome/omf/stardict/stardict-zh_TW.omf
-share/gnome/pixmaps/stardict.png
-share/gnome/stardict/pixmaps/docklet_normal.png
-share/gnome/stardict/pixmaps/docklet_scan.png
-share/gnome/stardict/pixmaps/docklet_stop.png
-share/gnome/stardict/pixmaps/index_appendix.png
-share/gnome/stardict/pixmaps/index_dictlist.png
-share/gnome/stardict/pixmaps/index_wazard.png
-share/gnome/stardict/pixmaps/splash.png
-share/gnome/stardict/sounds/buttonactive.wav
-share/gnome/stardict/sounds/menushow.wav
+%%GNOME%%share/idl/GNOME_Stardict.idl
+%%GNOME%%share/omf/stardict/stardict-C.omf
+%%GNOME%%share/omf/stardict/stardict-mk.omf
+%%GNOME%%share/omf/stardict/stardict-nl.omf
+%%GNOME%%share/omf/stardict/stardict-ru.omf
+%%GNOME%%share/omf/stardict/stardict-uk.omf
+%%GNOME%%share/omf/stardict/stardict-zh_CN.omf
+%%GNOME%%share/omf/stardict/stardict-zh_TW.omf
+share/pixmaps/stardict.png
+share/stardict/pixmaps/docklet_normal.png
+share/stardict/pixmaps/docklet_scan.png
+share/stardict/pixmaps/docklet_stop.png
+share/stardict/pixmaps/index_appendix.png
+share/stardict/pixmaps/index_dictlist.png
+share/stardict/pixmaps/index_wazard.png
+share/stardict/pixmaps/splash.png
+share/stardict/sounds/buttonactive.wav
+share/stardict/sounds/menushow.wav
share/locale/cs/LC_MESSAGES/stardict.mo
share/locale/de/LC_MESSAGES/stardict.mo
share/locale/el/LC_MESSAGES/stardict.mo
@@ -73,10 +73,10 @@ share/locale/zh_CN/LC_MESSAGES/stardict.mo
share/locale/zh_TW/LC_MESSAGES/stardict.mo
@dirrmtry share/locale/tt/LC_MESSAGES
@dirrmtry share/locale/tt
-@dirrm share/gnome/stardict/sounds
-@dirrm share/gnome/stardict/pixmaps
-@dirrmtry share/gnome/stardict
-%%GNOME%%@dirrm share/gnome/omf/stardict
+@dirrm share/stardict/sounds
+@dirrm share/stardict/pixmaps
+@dirrmtry share/stardict
+%%GNOME%%@dirrm share/omf/stardict
%%GNOME%%@dirrm share/gnome/help/stardict/zh_TW/figures
%%GNOME%%@dirrm share/gnome/help/stardict/zh_TW
%%GNOME%%@dirrm share/gnome/help/stardict/zh_CN/figures
@@ -92,3 +92,4 @@ share/locale/zh_TW/LC_MESSAGES/stardict.mo
%%GNOME%%@dirrm share/gnome/help/stardict/C/figures
%%GNOME%%@dirrm share/gnome/help/stardict/C
%%GNOME%%@dirrm share/gnome/help/stardict
+@dirrmtry share/applications