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

4 files changed, 32 insertions, 43 deletions

diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index e9a9e0469f50..b063aa15609d 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -3,11 +3,12 @@
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/x11-wm/sawfish/Makefile,v 1.1 2006/07/18 17:01:14 ahze Exp $
+#   $MCom: ports/x11-wm/sawfish/Makefile,v 1.5 2007/10/10 22:57:29 mezz Exp $
+#
 
 PORTNAME=	sawfish
 PORTVERSION=	1.3
-PORTREVISION=	14
+PORTREVISION=	16
 PORTEPOCH=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -36,7 +37,7 @@ CONFIGURE_ARGS=	--with-readline \
 		--enable-capplet \
 		--disable-themer \
 		--with-esd
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	${ARCH}-pc-freebsd${OSREL:C/\..*//}
 
diff --git a/x11-wm/sawfish/files/patch-ae b/x11-wm/sawfish/files/patch-ae
index 9ad8909b2ac8..ccd0bc67f4b6 100644
--- a/x11-wm/sawfish/files/patch-ae
+++ b/x11-wm/sawfish/files/patch-ae
@@ -1,13 +1,11 @@
---- capplet/Makefile.in.orig	Sun Jan 12 21:30:41 2003
-+++ capplet/Makefile.in	Wed Feb  8 04:25:14 2006
-@@ -26,8 +26,8 @@
+--- capplet/Makefile.in.orig	2007-10-10 17:59:01.000000000 -0500
++++ capplet/Makefile.in	2007-10-10 17:59:24.000000000 -0500
+@@ -26,7 +26,7 @@
  srcdir=@srcdir@
  VPATH=@srcdir@:@top_srcdir@
  
 -G_CC_DIR = $(GNOMEDIR)/share/control-center-2.0/capplets
--G_PIXMAP_DIR = $(GNOMEDIR)/share/pixmaps
-+G_CC_DIR = $(GNOMEDIR)/share/gnome/applications
-+G_PIXMAP_DIR = $(GNOMEDIR)/share/gnome/pixmaps
++G_CC_DIR = $(GNOMEDIR)/share/applications
+ G_PIXMAP_DIR = $(GNOMEDIR)/share/pixmaps
  
  all :
- 
diff --git a/x11-wm/sawfish/files/patch-af b/x11-wm/sawfish/files/patch-af
deleted file mode 100644
index baaf30e26c3a..000000000000
--- a/x11-wm/sawfish/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/Makefile.in	2000/09/21 13:09:15	1.1
-+++ scripts/Makefile.in	2000/09/21 13:09:33
-@@ -34,7 +34,7 @@
- SUBSTS := -e "s|__lispdir__|$(lispdir)|" \
- 	  -e "s|__version__|$(version)|"
- 
--G_PIXMAP_DIR = $(GNOMEDIR)/share/pixmaps
-+G_PIXMAP_DIR = $(GNOMEDIR)/share/gnome/pixmaps
- 
- %.jlc : %.jl
- 	$(REP_ENVIRON) rep compiler -f compile-batch $<
diff --git a/x11-wm/sawfish/pkg-plist b/x11-wm/sawfish/pkg-plist
index 5dfcd8ffc5df..364b03deaea3 100644
--- a/x11-wm/sawfish/pkg-plist
+++ b/x11-wm/sawfish/pkg-plist
@@ -23,28 +23,28 @@ libexec/sawfish/%%VERSION%%/%%GNUHOST%%/selection.la
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/selection.so
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.la
 libexec/sawfish/%%VERSION%%/%%GNUHOST%%/x.so
-share/gnome/applications/appearance-properties.desktop
-share/gnome/applications/bindings-properties.desktop
-share/gnome/applications/focus-properties.desktop
-share/gnome/applications/match-properties.desktop
-share/gnome/applications/maximize-properties.desktop
-share/gnome/applications/misc-properties.desktop
-share/gnome/applications/move-properties.desktop
-share/gnome/applications/placement-properties.desktop
-share/gnome/applications/sound-properties.desktop
-share/gnome/applications/workspace-properties.desktop
-share/gnome/pixmaps/sawfish-appearance.png
-share/gnome/pixmaps/sawfish-edgeflip.png
-share/gnome/pixmaps/sawfish-focus.png
-share/gnome/pixmaps/sawfish-logo.png
-share/gnome/pixmaps/sawfish-matched.png
-share/gnome/pixmaps/sawfish-minmax.png
-share/gnome/pixmaps/sawfish-misc.png
-share/gnome/pixmaps/sawfish-moveresize.png
-share/gnome/pixmaps/sawfish-placement.png
-share/gnome/pixmaps/sawfish-shortcuts.png
-share/gnome/pixmaps/sawfish-tooltips.png
-share/gnome/pixmaps/sawfish-workspaces.png
+share/applications/appearance-properties.desktop
+share/applications/bindings-properties.desktop
+share/applications/focus-properties.desktop
+share/applications/match-properties.desktop
+share/applications/maximize-properties.desktop
+share/applications/misc-properties.desktop
+share/applications/move-properties.desktop
+share/applications/placement-properties.desktop
+share/applications/sound-properties.desktop
+share/applications/workspace-properties.desktop
+share/pixmaps/sawfish-appearance.png
+share/pixmaps/sawfish-edgeflip.png
+share/pixmaps/sawfish-focus.png
+share/pixmaps/sawfish-logo.png
+share/pixmaps/sawfish-matched.png
+share/pixmaps/sawfish-minmax.png
+share/pixmaps/sawfish-misc.png
+share/pixmaps/sawfish-moveresize.png
+share/pixmaps/sawfish-placement.png
+share/pixmaps/sawfish-shortcuts.png
+share/pixmaps/sawfish-tooltips.png
+share/pixmaps/sawfish-workspaces.png
 share/gnome/wm-properties/Sawfish.desktop
 share/locale/am/LC_MESSAGES/sawfish.mo
 share/locale/az/LC_MESSAGES/sawfish.mo
@@ -680,3 +680,4 @@ share/locale/zh_TW/LC_MESSAGES/sawfish.mo
 @dirrm libexec/sawfish/%%VERSION%%
 @dirrm libexec/sawfish
 @dirrm libexec/rep/%%GNUHOST%%/sawfish
+@dirrmtry share/applications