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

3 files changed, 21 insertions, 33 deletions

diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index d33274ad7f9b..1d96d30c33aa 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/audio/gnome-audio/Makefile,v 1.3 2006/07/22 19:49:20 mezz Exp $
+#   $MCom: ports/audio/gnome-audio/Makefile,v 1.6 2007/06/29 22:55:02 mezz Exp $
 #
 
 PORTNAME=	gnome-audio
 PORTVERSION=	2.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-audio/2.0
@@ -21,5 +21,6 @@ USE_XLIB=	yes
 NO_BUILD=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier
 WRKSRC=		${WRKDIR}/${DISTNAME}/sounds
+MAKE_ENV=	prefix=${PREFIX}
 
 .include <bsd.port.mk>
diff --git a/audio/gnome-audio/files/patch-Makefile b/audio/gnome-audio/files/patch-Makefile
index f5556e24f16d..962c506807b6 100644
--- a/audio/gnome-audio/files/patch-Makefile
+++ b/audio/gnome-audio/files/patch-Makefile
@@ -4,16 +4,3 @@
 -prefix=$(shell gnome-config --prefix)
 -
  LN_S=ln -sf
-@@ -14,4 +12,4 @@
- 	for I in *.wav */*.wav ; do \
--		$(MKINSTALLDIRS) $(prefix)/share/sounds/`dirname $$I`; \
--		$(INSTALL_DATA) $$I $(prefix)/share/sounds/$$I; \
-+		$(MKINSTALLDIRS) $(PREFIX)/share/gnome/sounds/`dirname $$I`; \
-+		$(INSTALL_DATA) $$I $(PREFIX)/share/gnome/sounds/$$I; \
- 	done
-@@ -19,3 +17,3 @@
- install-default-links:
--	$(LN_S) startup3.wav $(prefix)/share/sounds/login.wav
--	$(LN_S) shutdown1.wav $(prefix)/share/sounds/logout.wav
-+	$(LN_S) startup3.wav $(PREFIX)/share/gnome/sounds/login.wav
-+	$(LN_S) shutdown1.wav $(PREFIX)/share/gnome/sounds/logout.wav
diff --git a/audio/gnome-audio/pkg-plist b/audio/gnome-audio/pkg-plist
index 93609a8dc24a..4dd0d274bf9c 100644
--- a/audio/gnome-audio/pkg-plist
+++ b/audio/gnome-audio/pkg-plist
@@ -1,18 +1,18 @@
-share/gnome/sounds/card_shuffle.wav
-share/gnome/sounds/email.wav
-share/gnome/sounds/error.wav
-share/gnome/sounds/generic.wav
-share/gnome/sounds/gtk-events/activate.wav
-share/gnome/sounds/gtk-events/clicked.wav
-share/gnome/sounds/gtk-events/toggled.wav
-share/gnome/sounds/info.wav
-share/gnome/sounds/login.wav
-share/gnome/sounds/logout.wav
-share/gnome/sounds/panel/slide.wav
-share/gnome/sounds/phone.wav
-share/gnome/sounds/question.wav
-share/gnome/sounds/shutdown1.wav
-share/gnome/sounds/startup3.wav
-share/gnome/sounds/warning.wav
-@dirrm share/gnome/sounds/gtk-events
-@dirrm share/gnome/sounds/panel
+share/sounds/card_shuffle.wav
+share/sounds/email.wav
+share/sounds/error.wav
+share/sounds/generic.wav
+share/sounds/gtk-events/activate.wav
+share/sounds/gtk-events/clicked.wav
+share/sounds/gtk-events/toggled.wav
+share/sounds/info.wav
+share/sounds/login.wav
+share/sounds/logout.wav
+share/sounds/panel/slide.wav
+share/sounds/phone.wav
+share/sounds/question.wav
+share/sounds/shutdown1.wav
+share/sounds/startup3.wav
+share/sounds/warning.wav
+@dirrm share/sounds/gtk-events
+@dirrm share/sounds/panel