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

5 files changed, 91 insertions, 111 deletions

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