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, 98 insertions, 34 deletions

diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 68dc5552dea5..b65ae3b36103 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/bug-buddy/Makefile,v 1.44 2007/03/13 12:27:23 ahze Exp $
+#   $MCom: ports/devel/bug-buddy/Makefile,v 1.55 2007/10/06 22:03:31 mezz Exp $
 #
 
 PORTNAME=	bug-buddy
-PORTVERSION=	2.18.1
-PORTREVISION=	2
+PORTVERSION=	2.20.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -37,5 +36,8 @@ GCONF_SCHEMAS=	bug-buddy.schemas
 post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|' \
 		${WRKSRC}/src/bugzilla.c
+	@${REINPLACE_CMD} -e 's|libelf.h||g ; \
+	    	s|gelf.h||g' \
+	    	${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index fbfff725646f..b443c5b57814 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.18.1.tar.bz2) = ebeaeee4acc1432b59a4ef242abff620
-SHA256 (gnome2/bug-buddy-2.18.1.tar.bz2) = 99cbdbe16942291f6a02060bf7b0bb7e5a36096379a02e513ad669eec0fdd311
-SIZE (gnome2/bug-buddy-2.18.1.tar.bz2) = 553967
+MD5 (gnome2/bug-buddy-2.20.1.tar.bz2) = 6b9ea4c067674120bd93711b3b9a9e63
+SHA256 (gnome2/bug-buddy-2.20.1.tar.bz2) = cb0cb3f2400f201e2bf7afc6de81df6ab4b68c5a770ec0a132c300efe72d5f4e
+SIZE (gnome2/bug-buddy-2.20.1.tar.bz2) = 1070862
diff --git a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc
new file mode 100644
index 000000000000..801be10640bf
--- /dev/null
+++ b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc
@@ -0,0 +1,52 @@
+--- gnome-breakpad/gnome-breakpad.cc.orig	2007-08-16 13:55:38.000000000 -0400
++++ gnome-breakpad/gnome-breakpad.cc	2007-09-02 19:21:10.000000000 -0400
+@@ -6,8 +6,14 @@
+ #include <cassert>
+ #include <cstring>
+ 
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
++
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ #include <libelf.h>
+ #include <gelf.h>
++#endif
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -114,6 +120,7 @@ find_in_debug_path (const char *filename
+ }
+ 	
+ 
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ static gboolean
+ elf_has_debug_symbols (const char *filename)
+ {
+@@ -166,7 +173,7 @@ elf_has_debug_symbols (const char *filen
+        elf_end (elf);
+        return false;
+ }
+-
++#endif
+ 
+ 
+ 
+@@ -269,9 +276,17 @@ check_if_gdb (void *callback_context)
+ 		_exit(0);
+ 	}
+ 	
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ 	memset(mypath, 0, sizeof(mypath));
++#ifndef __FreeBSD__
+ 	readlink ("/proc/self/exe", mypath, sizeof(mypath));
++#else
++	readlink ("/proc/curproc/file", mypath, sizeof(mypath));
++#endif
+ 	has_debug_symbols = elf_has_debug_symbols (mypath);
++#else
++	has_debug_symbols = TRUE;
++#endif
+ 
+ 
+ 	if (bugbuddy && gdb && has_debug_symbols) {
diff --git a/devel/bug-buddy/files/patch-src_bug-buddy.menu.in b/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
deleted file mode 100644
index 0866ee39f8fc..000000000000
--- a/devel/bug-buddy/files/patch-src_bug-buddy.menu.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/bug-buddy.menu.in.orig	Tue Feb 27 13:46:40 2007
-+++ src/bug-buddy.menu.in	Tue Feb 27 13:46:54 2007
-@@ -6,7 +6,7 @@
-   <Name>Bug Buddy programs</Name>
- 
-   <!-- Read only files in default .desktop file location -->
--  <LegacyDir>@prefix@/@DATADIRNAME@/applications</LegacyDir>
-+  <LegacyDir>@prefix@/@DATADIRNAME@/gnome/applications</LegacyDir>
-   <LegacyDir>@prefix@/@DATADIRNAME@/gnome/autostart</LegacyDir>
- 
-   <!-- we want to process all desktop files; Unfortunately,
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 4ac6b5cd86c8..27f3b5fad558 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -1,22 +1,26 @@
 bin/bug-buddy
-share/gnome/applications/bug-buddy.desktop
-share/gnome/bug-buddy/bug-buddy.glade
-share/gnome/bug-buddy/bug-buddy.menu
-share/gnome/bug-buddy/bug-buddy.png
-share/gnome/bug-buddy/bugzilla/gnome.bugzilla
-share/gnome/bug-buddy/bugzilla/gnome/config
-share/gnome/bug-buddy/bugzilla/gnome/mostfreq
-share/gnome/bug-buddy/bugzilla/gnome/products
-share/gnome/bug-buddy/bugzilla/ximian.bugzilla
-share/gnome/bug-buddy/bugzilla/ximian/config
-share/gnome/bug-buddy/bugzilla/ximian/mostfreq
-share/gnome/bug-buddy/bugzilla/ximian/products
-share/gnome/bug-buddy/gdb-cmd
+lib/gtk-2.0/modules/libgnomebreakpad.la
+lib/gtk-2.0/modules/libgnomebreakpad.so
+share/applications/bug-buddy.desktop
+%%DATADIR%%/bug-buddy.gtkbuilder
+%%DATADIR%%/bug-buddy.menu
+%%DATADIR%%/bug-buddy.png
+%%DATADIR%%/bugzilla/gnome.bugzilla
+%%DATADIR%%/bugzilla/gnome/config
+%%DATADIR%%/bugzilla/gnome/mostfreq
+%%DATADIR%%/bugzilla/gnome/products
+%%DATADIR%%/bugzilla/ximian.bugzilla
+%%DATADIR%%/bugzilla/ximian/config
+%%DATADIR%%/bugzilla/ximian/mostfreq
+%%DATADIR%%/bugzilla/ximian/products
+%%DATADIR%%/gdb-cmd
 share/icons/hicolor/48x48/apps/bug-buddy.png
 share/locale/am/LC_MESSAGES/bug-buddy.mo
 share/locale/ar/LC_MESSAGES/bug-buddy.mo
+share/locale/as/LC_MESSAGES/bug-buddy.mo
 share/locale/az/LC_MESSAGES/bug-buddy.mo
 share/locale/be/LC_MESSAGES/bug-buddy.mo
+share/locale/be@latin/LC_MESSAGES/bug-buddy.mo
 share/locale/bg/LC_MESSAGES/bug-buddy.mo
 share/locale/bn/LC_MESSAGES/bug-buddy.mo
 share/locale/bn_IN/LC_MESSAGES/bug-buddy.mo
@@ -63,6 +67,7 @@ share/locale/nb/LC_MESSAGES/bug-buddy.mo
 share/locale/ne/LC_MESSAGES/bug-buddy.mo
 share/locale/nl/LC_MESSAGES/bug-buddy.mo
 share/locale/nn/LC_MESSAGES/bug-buddy.mo
+share/locale/oc/LC_MESSAGES/bug-buddy.mo
 share/locale/or/LC_MESSAGES/bug-buddy.mo
 share/locale/pa/LC_MESSAGES/bug-buddy.mo
 share/locale/pl/LC_MESSAGES/bug-buddy.mo
@@ -71,6 +76,7 @@ share/locale/pt_BR/LC_MESSAGES/bug-buddy.mo
 share/locale/ro/LC_MESSAGES/bug-buddy.mo
 share/locale/ru/LC_MESSAGES/bug-buddy.mo
 share/locale/rw/LC_MESSAGES/bug-buddy.mo
+share/locale/si/LC_MESSAGES/bug-buddy.mo
 share/locale/sk/LC_MESSAGES/bug-buddy.mo
 share/locale/sl/LC_MESSAGES/bug-buddy.mo
 share/locale/sq/LC_MESSAGES/bug-buddy.mo
@@ -78,28 +84,38 @@ share/locale/sr/LC_MESSAGES/bug-buddy.mo
 share/locale/sr@Latn/LC_MESSAGES/bug-buddy.mo
 share/locale/sv/LC_MESSAGES/bug-buddy.mo
 share/locale/ta/LC_MESSAGES/bug-buddy.mo
+share/locale/te/LC_MESSAGES/bug-buddy.mo
 share/locale/th/LC_MESSAGES/bug-buddy.mo
 share/locale/tr/LC_MESSAGES/bug-buddy.mo
 share/locale/ug/LC_MESSAGES/bug-buddy.mo
 share/locale/uk/LC_MESSAGES/bug-buddy.mo
+share/locale/uz@cyrillic/LC_MESSAGES/bug-buddy.mo
 share/locale/vi/LC_MESSAGES/bug-buddy.mo
 share/locale/wa/LC_MESSAGES/bug-buddy.mo
 share/locale/xh/LC_MESSAGES/bug-buddy.mo
 share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
 share/locale/zh_HK/LC_MESSAGES/bug-buddy.mo
 share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
-@dirrm share/gnome/bug-buddy/bugzilla/ximian
-@dirrm share/gnome/bug-buddy/bugzilla/gnome
-@dirrm share/gnome/bug-buddy/bugzilla
-@dirrm share/gnome/bug-buddy
+@dirrm %%DATADIR%%/bugzilla/ximian
+@dirrm %%DATADIR%%/bugzilla/gnome
+@dirrm %%DATADIR%%/bugzilla
+@dirrm %%DATADIR%%
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
+@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
+@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @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
@@ -112,3 +128,8 @@ share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/applications