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

2 files changed, 14 insertions, 9 deletions

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 7d180a9fb107..8c84f2236cb6 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Koop Mast <einekoai@chello.nl>
 #
 # $FreeBSD$
-#   $MCom: ports/www/bluefish/Makefile,v 1.1 2006/09/30 03:21:27 ahze Exp $
+#   $MCom: ports/www/bluefish/Makefile,v 1.6 2007/10/11 03:20:30 mezz Exp $
 #
 
 PORTNAME=	bluefish
 PORTVERSION=	1.0.7
-PORTREVISION=	2
+PORTREVISION=	4
 CATEGORIES=	www editors
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -28,16 +28,16 @@ RUN_DEPENDS+=	tidy:${PORTSDIR}/www/tidy
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_GNOME=	gnomehier gtk20 gnomevfs2
+USE_GNOME=	gnomeprefix gtk20 gnomevfs2 gnomemimedata desktopfileutils
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-freedesktop_org-menu=${PREFIX}/share/gnome/applications \
+CONFIGURE_ARGS=	--with-freedesktop_org-menu=${PREFIX}/share/applications \
 		--with-freedesktop_org-mime=${PREFIX}/share/mime \
 		--without-gnome2_4-mime \
 		--without-gnome2_4-appreg \
-		--with-icon-path=${PREFIX}/share/gnome/pixmaps
+		--with-icon-path=${PREFIX}/share/pixmaps
 
 # Turns debugging output on
 .if defined(WITH_DEBUG)
@@ -62,6 +62,9 @@ pre-everything::
 	@${ECHO_MSG} "This will reduce the number of warning in the console when running bluefish."
 	@${ECHO_MSG} ""
 
+pre-install:
+	@${MKDIR} ${PREIX}/share/mime
+
 .include <bsd.port.pre.mk>
 
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
diff --git a/www/bluefish/pkg-plist b/www/bluefish/pkg-plist
index 8a7b525d9692..4817ee543072 100644
--- a/www/bluefish/pkg-plist
+++ b/www/bluefish/pkg-plist
@@ -22,10 +22,10 @@ bin/bluefish
 %%DATADIR%%/icon_r.png
 %%DATADIR%%/icon_unknown.png
 %%DATADIR%%/icon_xml.png
-share/gnome/applications/bluefish-project.desktop
-share/gnome/applications/bluefish.desktop
-share/gnome/pixmaps/bluefish-icon.png
-share/gnome/pixmaps/gnome-mime-application-bluefish-project.png
+share/applications/bluefish-project.desktop
+share/applications/bluefish.desktop
+share/pixmaps/bluefish-icon.png
+share/pixmaps/gnome-mime-application-bluefish-project.png
 share/locale/bg/LC_MESSAGES/bluefish.mo
 share/locale/cs/LC_MESSAGES/bluefish.mo
 share/locale/da/LC_MESSAGES/bluefish.mo
@@ -54,3 +54,5 @@ share/mime/packages/bluefish.xml
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@dirrmtry share/mime
+@dirrmtry share/applications