Add bugbuddy, along with a patch to fix the build against the new gnome-menus

API. They really should release a new version soon.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4003 df743ca5-7f9a-e211-a948-0013205c9059

14 files changed, 690 insertions, 0 deletions

diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
new file mode 100644
index 000000000..4054a9732
--- /dev/null
+++ b/devel/bug-buddy/Makefile
@@ -0,0 +1,42 @@
+# New ports collection makefile for:	bugbuddy2
+# Date created:				14 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/devel/bugbuddy/Makefile,v 1.34 2005/03/16 21:47:45 mezz Exp $
+#
+
+PORTNAME=	bugbuddy
+PORTVERSION=	2.10.0
+PORTREVISION=	1
+CATEGORIES=	devel gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/bug-buddy/2.10
+DISTNAME=	bug-buddy-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A bug reporting tool for GNOME 2
+
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL_VER=15
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \
+		desktopfileutils
+GNOME_DESKTOP_VERSION=2
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help
+
+MAN1=		bug-buddy.1
+GCONF_SCHEMAS=	bug-buddy.schemas
+
+post-install:
+	@-update-desktop-database
+
+.include <bsd.port.mk>
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
new file mode 100644
index 000000000..d7003e3d3
--- /dev/null
+++ b/devel/bug-buddy/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/bug-buddy-2.10.0.tar.bz2) = c821a933f3d7be64071c7bfcb07ee1ac
+SIZE (gnome2/bug-buddy-2.10.0.tar.bz2) = 718182
diff --git a/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in b/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in
new file mode 100644
index 000000000..1074dd752
--- /dev/null
+++ b/devel/bug-buddy/files/patch-docs_bug-buddy.omf.in
@@ -0,0 +1,12 @@
+--- docs/bug-buddy.omf.in.orig	Fri Feb 11 14:23:02 2005
++++ docs/bug-buddy.omf.in	Fri Feb 11 14:22:48 2005
+@@ -0,0 +1,9 @@
++<?xml version="1.0" standalone="no"?>
++<omf>
++  <resource>
++    <subject category="GNOME|Development"/>
++    <type>user's guide</type>
++    <relation seriesid="69b6f5ee-6cc5-11d6-8051-fe97a46511fa"/>
++    <rights type="GNU FDL" license.version="1.1" holder="Eric Baudais"/>
++  </resource>
++</omf>
diff --git a/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c b/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c
new file mode 100644
index 000000000..bc0a6ba22
--- /dev/null
+++ b/devel/bug-buddy/files/patch-src::united-states-of-bug-buddy.c
@@ -0,0 +1,10 @@
+--- src/united-states-of-bug-buddy.c.orig	Tue Nov 30 18:21:10 2004
++++ src/united-states-of-bug-buddy.c	Tue Nov 30 18:21:15 2004
+@@ -36,6 +36,7 @@
+ #include <sys/types.h>
+ #include <sysexits.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ 
+ #if 0
+ static char *help_pages[] = {
diff --git a/devel/bug-buddy/files/patch-src_bugzilla.c b/devel/bug-buddy/files/patch-src_bugzilla.c
new file mode 100644
index 000000000..c5b3077c5
--- /dev/null
+++ b/devel/bug-buddy/files/patch-src_bugzilla.c
@@ -0,0 +1,176 @@
+--- src/bugzilla.c.orig	Thu Feb 10 06:01:10 2005
++++ src/bugzilla.c	Fri May 20 15:17:09 2005
+@@ -40,7 +40,8 @@
+ #include <libgnomevfs/gnome-vfs.h>
+ 
+ #include <libgnome/gnome-desktop-item.h>
+-#include <menu-tree.h>
++#define  GMENU_I_KNOW_THIS_IS_UNSTABLE
++#include <gmenu-tree.h>
+ 
+ #include <bonobo/bonobo-exception.h>
+ #include <bonobo-activation/bonobo-activation.h>
+@@ -1123,32 +1124,74 @@ NULL)) {
+ }
+ 
+ static int
+-compare_applications (MenuTreeEntry *a,
+-		      MenuTreeEntry *b)
++compare_applications (GMenuTreeEntry *a,
++		      GMenuTreeEntry *b)
+ {
+-	return g_utf8_collate (menu_tree_entry_get_name (a),
+-			       menu_tree_entry_get_name (b));
++	return g_utf8_collate (gmenu_tree_entry_get_name (a),
++			       gmenu_tree_entry_get_name (b));
+ }
+ 
++static GSList *get_all_applications_from_dir (GMenuTreeDirectory *directory,
++					      GSList             *list);
++
+ static GSList *
+-get_all_applications_from_dir (MenuTreeDirectory *directory,
+-			       GSList            *list)
++get_all_applications_from_alias (GMenuTreeAlias *alias,
++				 GSList         *list)
+ {
+-	GSList *subdirs;
++	GMenuTreeItem *aliased_item;
++
++	aliased_item = gmenu_tree_alias_get_item (alias);
++
++	switch (gmenu_tree_item_get_type (aliased_item)) {
++	case GMENU_TREE_ITEM_DIRECTORY:
++		list = get_all_applications_from_dir (GMENU_TREE_DIRECTORY (aliased_item), list);
++		break;
++
++	case GMENU_TREE_ITEM_ENTRY:
++		list = g_slist_append (list, gmenu_tree_item_ref (aliased_item));
++		break;
++
++	default:
++		break;
++	}
++
++	gmenu_tree_item_unref (aliased_item);
++
++	return list;
++}
++
++static GSList *
++get_all_applications_from_dir (GMenuTreeDirectory *directory,
++			       GSList             *list)
++{
++	GSList *items;
+ 	GSList *l;
+ 
+-	list = g_slist_concat (list,
+-			       menu_tree_directory_get_entries (directory));
++	items = gmenu_tree_directory_get_contents (directory);
++	for (l = items; l; l = l->next) {
++		GMenuTreeItem *item = l->data;
+ 
+-	subdirs = menu_tree_directory_get_subdirs (directory);
+-	for (l = subdirs; l; l = l->next) {
+-		MenuTreeDirectory *subdir = l->data;
++		switch (gmenu_tree_item_get_type (item)) {
++		case GMENU_TREE_ITEM_DIRECTORY:
++			list = get_all_applications_from_dir (GMENU_TREE_DIRECTORY (item), list);
++			break;
+ 
+-		list = get_all_applications_from_dir (subdir, list);
++		case GMENU_TREE_ITEM_ENTRY:
++			list = g_slist_append (list, gmenu_tree_item_ref (item));
++			break;
+ 
+-		menu_tree_directory_unref (subdir);
++		case GMENU_TREE_ITEM_ALIAS:
++			list = get_all_applications_from_alias (GMENU_TREE_ALIAS (item), list);
++			break;
++
++		default:
++			break;
++		}
++
++		gmenu_tree_item_unref (item);
+ 	}
+-	g_slist_free (subdirs);
++
++	g_slist_free (items);
+ 
+ 	return list;
+ }
+@@ -1156,18 +1199,18 @@ get_all_applications_from_dir (MenuTreeD
+ static GSList *
+ get_all_applications (void)
+ {
+-	MenuTree          *tree;
+-	MenuTreeDirectory *root;
+-	GSList            *retval;
++	GMenuTree          *tree;
++	GMenuTreeDirectory *root;
++	GSList             *retval;
+ 
+-	tree = menu_tree_lookup ("applications.menu");
++	tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_NONE);
+ 
+-	root = menu_tree_get_root_directory (tree);
++	root = gmenu_tree_get_root_directory (tree);
+ 
+ 	retval = get_all_applications_from_dir (root, NULL);
+ 
+-	menu_tree_directory_unref (root);
+-	menu_tree_unref (tree);
++	gmenu_tree_item_unref (root);
++	gmenu_tree_unref (tree);
+ 
+ 	retval = g_slist_sort (retval, (GCompareFunc) compare_applications);
+ 
+@@ -1193,28 +1236,28 @@ load_applications (void)
+ 	for (l = all_applications; l; l = l->next) {
+ 		GnomeDesktopItem *ditem;
+ 		char *icon;
+-		MenuTreeEntry *entry = l->data;
++		GMenuTreeEntry *entry = l->data;
+ 
+-		if (prev_name && strcmp (menu_tree_entry_get_name (entry), prev_name) == 0) {
+-			menu_tree_entry_unref (entry);
++		if (prev_name && strcmp (gmenu_tree_entry_get_name (entry), prev_name) == 0) {
++			gmenu_tree_item_unref (entry);
+ 			continue;
+ 		}
+-		ditem = gnome_desktop_item_new_from_uri (menu_tree_entry_get_desktop_file_path (entry), 
++		ditem = gnome_desktop_item_new_from_uri (gmenu_tree_entry_get_desktop_file_path (entry), 
+ 							 0, &error);
+ 		if (!ditem) {
+ 			if (error) {
+-				g_warning ("Couldn't load %s: %s", desktop_entry_get_path (entry),
++				g_warning ("Couldn't load %s: %s", gmenu_tree_entry_get_desktop_file_path (entry),
+ 					   error->message);
+ 				g_error_free (error);
+ 				error = NULL;
+ 			}
+-			menu_tree_entry_unref (entry);
++			gmenu_tree_item_unref (entry);
+ 			continue;
+ 		}
+     
+ 		if ((gnome_desktop_item_get_entry_type (ditem) != GNOME_DESKTOP_ITEM_TYPE_APPLICATION) || !gnome_desktop_item_get_string (ditem, BUGZILLA_BUGZILLA)) {
+ 			gnome_desktop_item_unref (ditem);	
+-			menu_tree_entry_unref (entry);
++			gmenu_tree_item_unref (entry);
+ 			continue;
+ 		}
+ 
+@@ -1231,9 +1274,9 @@ load_applications (void)
+ 			gnome_desktop_item_get_string (ditem, GNOME_DESKTOP_ITEM_EXEC),
+ 			gnome_desktop_item_get_string (ditem, BUGZILLA_OTHER_BINARIES));
+ 		g_free (icon);
+-		prev_name = menu_tree_entry_get_name (entry);
++		prev_name = gmenu_tree_entry_get_name (entry);
+ 		gnome_desktop_item_unref (ditem);	
+-		menu_tree_entry_unref (entry);
++		gmenu_tree_item_unref (entry);
+ 	}
+ 	g_slist_free (all_applications);
+ 
diff --git a/devel/bug-buddy/pkg-descr b/devel/bug-buddy/pkg-descr
new file mode 100644
index 000000000..7268130ab
--- /dev/null
+++ b/devel/bug-buddy/pkg-descr
@@ -0,0 +1,7 @@
+This is a bug reporting tool.  It pops up automatically when a GNOME
+app crashes under the GNOME desktop (via gnome_segv), and allows
+the crash information to be sent to the app's developers.
+
+Jacob Berkman  <jberkman@andrew.cmu.edu>
+
+WWW: http://www.gnome.org/
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
new file mode 100644
index 000000000..ec291fb0a
--- /dev/null
+++ b/devel/bug-buddy/pkg-plist
@@ -0,0 +1,96 @@
+bin/bug-buddy
+share/gnome/application-registry/bug-buddy.applications
+share/gnome/applications/bug-buddy-core.desktop
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+share/gnome/applications/bug-buddy.desktop
+share/gnome/bug-buddy/bug-buddy.glade
+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
+share/gnome/bug-buddy/gnome.png
+share/gnome/bug-buddy/ximian.png
+share/gnome/help/bug-buddy/C/bug-buddy.xml
+share/gnome/help/bug-buddy/C/legal.xml
+share/gnome/mime-info/bug-buddy.keys
+share/gnome/omf/bug-buddy/bug-buddy-C.omf
+share/gnome/pixmaps/bug-buddy.png
+share/locale/am/LC_MESSAGES/bug-buddy.mo
+share/locale/ar/LC_MESSAGES/bug-buddy.mo
+share/locale/az/LC_MESSAGES/bug-buddy.mo
+share/locale/be/LC_MESSAGES/bug-buddy.mo
+share/locale/bg/LC_MESSAGES/bug-buddy.mo
+share/locale/bn/LC_MESSAGES/bug-buddy.mo
+share/locale/bs/LC_MESSAGES/bug-buddy.mo
+share/locale/ca/LC_MESSAGES/bug-buddy.mo
+share/locale/cs/LC_MESSAGES/bug-buddy.mo
+share/locale/cy/LC_MESSAGES/bug-buddy.mo
+share/locale/da/LC_MESSAGES/bug-buddy.mo
+share/locale/de/LC_MESSAGES/bug-buddy.mo
+share/locale/el/LC_MESSAGES/bug-buddy.mo
+share/locale/en_CA/LC_MESSAGES/bug-buddy.mo
+share/locale/en_GB/LC_MESSAGES/bug-buddy.mo
+share/locale/es/LC_MESSAGES/bug-buddy.mo
+share/locale/et/LC_MESSAGES/bug-buddy.mo
+share/locale/eu/LC_MESSAGES/bug-buddy.mo
+share/locale/fa/LC_MESSAGES/bug-buddy.mo
+share/locale/fi/LC_MESSAGES/bug-buddy.mo
+share/locale/fr/LC_MESSAGES/bug-buddy.mo
+share/locale/ga/LC_MESSAGES/bug-buddy.mo
+share/locale/gl/LC_MESSAGES/bug-buddy.mo
+share/locale/gu/LC_MESSAGES/bug-buddy.mo
+share/locale/he/LC_MESSAGES/bug-buddy.mo
+share/locale/hi/LC_MESSAGES/bug-buddy.mo
+share/locale/hr/LC_MESSAGES/bug-buddy.mo
+share/locale/hu/LC_MESSAGES/bug-buddy.mo
+share/locale/id/LC_MESSAGES/bug-buddy.mo
+share/locale/is/LC_MESSAGES/bug-buddy.mo
+share/locale/it/LC_MESSAGES/bug-buddy.mo
+share/locale/ja/LC_MESSAGES/bug-buddy.mo
+share/locale/ko/LC_MESSAGES/bug-buddy.mo
+share/locale/lt/LC_MESSAGES/bug-buddy.mo
+share/locale/lv/LC_MESSAGES/bug-buddy.mo
+share/locale/mk/LC_MESSAGES/bug-buddy.mo
+share/locale/ml/LC_MESSAGES/bug-buddy.mo
+share/locale/mn/LC_MESSAGES/bug-buddy.mo
+share/locale/ms/LC_MESSAGES/bug-buddy.mo
+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/no/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
+share/locale/pt/LC_MESSAGES/bug-buddy.mo
+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/sk/LC_MESSAGES/bug-buddy.mo
+share/locale/sl/LC_MESSAGES/bug-buddy.mo
+share/locale/sq/LC_MESSAGES/bug-buddy.mo
+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/th/LC_MESSAGES/bug-buddy.mo
+share/locale/tr/LC_MESSAGES/bug-buddy.mo
+share/locale/uk/LC_MESSAGES/bug-buddy.mo
+share/locale/vi/LC_MESSAGES/bug-buddy.mo
+share/locale/wa/LC_MESSAGES/bug-buddy.mo
+share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
+share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
+@dirrm share/gnome/omf/bug-buddy
+@dirrm share/gnome/help/bug-buddy/C
+@dirrm share/gnome/help/bug-buddy
+@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
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
new file mode 100644
index 000000000..4054a9732
--- /dev/null
+++ b/devel/bugbuddy/Makefile
@@ -0,0 +1,42 @@
+# New ports collection makefile for:	bugbuddy2
+# Date created:				14 May 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD: ports/devel/bugbuddy/Makefile,v 1.34 2005/03/16 21:47:45 mezz Exp $
+#
+
+PORTNAME=	bugbuddy
+PORTVERSION=	2.10.0
+PORTREVISION=	1
+CATEGORIES=	devel gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/bug-buddy/2.10
+DISTNAME=	bug-buddy-${PORTVERSION}
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A bug reporting tool for GNOME 2
+
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+INSTALLS_OMF=	yes
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+USE_LIBTOOL_VER=15
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop gnomemenus \
+		desktopfileutils
+GNOME_DESKTOP_VERSION=2
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-help-dir=${PREFIX}/share/gnome/help
+
+MAN1=		bug-buddy.1
+GCONF_SCHEMAS=	bug-buddy.schemas
+
+post-install:
+	@-update-desktop-database
+
+.include <bsd.port.mk>
diff --git a/devel/bugbuddy/distinfo b/devel/bugbuddy/distinfo
new file mode 100644
index 000000000..d7003e3d3
--- /dev/null
+++ b/devel/bugbuddy/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/bug-buddy-2.10.0.tar.bz2) = c821a933f3d7be64071c7bfcb07ee1ac
+SIZE (gnome2/bug-buddy-2.10.0.tar.bz2) = 718182
diff --git a/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in b/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in
new file mode 100644
index 000000000..1074dd752
--- /dev/null
+++ b/devel/bugbuddy/files/patch-docs_bug-buddy.omf.in
@@ -0,0 +1,12 @@
+--- docs/bug-buddy.omf.in.orig	Fri Feb 11 14:23:02 2005
++++ docs/bug-buddy.omf.in	Fri Feb 11 14:22:48 2005
+@@ -0,0 +1,9 @@
++<?xml version="1.0" standalone="no"?>
++<omf>
++  <resource>
++    <subject category="GNOME|Development"/>
++    <type>user's guide</type>
++    <relation seriesid="69b6f5ee-6cc5-11d6-8051-fe97a46511fa"/>
++    <rights type="GNU FDL" license.version="1.1" holder="Eric Baudais"/>
++  </resource>
++</omf>
diff --git a/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c b/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c
new file mode 100644
index 000000000..bc0a6ba22
--- /dev/null
+++ b/devel/bugbuddy/files/patch-src::united-states-of-bug-buddy.c
@@ -0,0 +1,10 @@
+--- src/united-states-of-bug-buddy.c.orig	Tue Nov 30 18:21:10 2004
++++ src/united-states-of-bug-buddy.c	Tue Nov 30 18:21:15 2004
+@@ -36,6 +36,7 @@
+ #include <sys/types.h>
+ #include <sysexits.h>
+ #include <sys/wait.h>
++#include <signal.h>
+ 
+ #if 0
+ static char *help_pages[] = {
diff --git a/devel/bugbuddy/files/patch-src_bugzilla.c b/devel/bugbuddy/files/patch-src_bugzilla.c
new file mode 100644
index 000000000..c5b3077c5
--- /dev/null
+++ b/devel/bugbuddy/files/patch-src_bugzilla.c
@@ -0,0 +1,176 @@
+--- src/bugzilla.c.orig	Thu Feb 10 06:01:10 2005
++++ src/bugzilla.c	Fri May 20 15:17:09 2005
+@@ -40,7 +40,8 @@
+ #include <libgnomevfs/gnome-vfs.h>
+ 
+ #include <libgnome/gnome-desktop-item.h>
+-#include <menu-tree.h>
++#define  GMENU_I_KNOW_THIS_IS_UNSTABLE
++#include <gmenu-tree.h>
+ 
+ #include <bonobo/bonobo-exception.h>
+ #include <bonobo-activation/bonobo-activation.h>
+@@ -1123,32 +1124,74 @@ NULL)) {
+ }
+ 
+ static int
+-compare_applications (MenuTreeEntry *a,
+-		      MenuTreeEntry *b)
++compare_applications (GMenuTreeEntry *a,
++		      GMenuTreeEntry *b)
+ {
+-	return g_utf8_collate (menu_tree_entry_get_name (a),
+-			       menu_tree_entry_get_name (b));
++	return g_utf8_collate (gmenu_tree_entry_get_name (a),
++			       gmenu_tree_entry_get_name (b));
+ }
+ 
++static GSList *get_all_applications_from_dir (GMenuTreeDirectory *directory,
++					      GSList             *list);
++
+ static GSList *
+-get_all_applications_from_dir (MenuTreeDirectory *directory,
+-			       GSList            *list)
++get_all_applications_from_alias (GMenuTreeAlias *alias,
++				 GSList         *list)
+ {
+-	GSList *subdirs;
++	GMenuTreeItem *aliased_item;
++
++	aliased_item = gmenu_tree_alias_get_item (alias);
++
++	switch (gmenu_tree_item_get_type (aliased_item)) {
++	case GMENU_TREE_ITEM_DIRECTORY:
++		list = get_all_applications_from_dir (GMENU_TREE_DIRECTORY (aliased_item), list);
++		break;
++
++	case GMENU_TREE_ITEM_ENTRY:
++		list = g_slist_append (list, gmenu_tree_item_ref (aliased_item));
++		break;
++
++	default:
++		break;
++	}
++
++	gmenu_tree_item_unref (aliased_item);
++
++	return list;
++}
++
++static GSList *
++get_all_applications_from_dir (GMenuTreeDirectory *directory,
++			       GSList             *list)
++{
++	GSList *items;
+ 	GSList *l;
+ 
+-	list = g_slist_concat (list,
+-			       menu_tree_directory_get_entries (directory));
++	items = gmenu_tree_directory_get_contents (directory);
++	for (l = items; l; l = l->next) {
++		GMenuTreeItem *item = l->data;
+ 
+-	subdirs = menu_tree_directory_get_subdirs (directory);
+-	for (l = subdirs; l; l = l->next) {
+-		MenuTreeDirectory *subdir = l->data;
++		switch (gmenu_tree_item_get_type (item)) {
++		case GMENU_TREE_ITEM_DIRECTORY:
++			list = get_all_applications_from_dir (GMENU_TREE_DIRECTORY (item), list);
++			break;
+ 
+-		list = get_all_applications_from_dir (subdir, list);
++		case GMENU_TREE_ITEM_ENTRY:
++			list = g_slist_append (list, gmenu_tree_item_ref (item));
++			break;
+ 
+-		menu_tree_directory_unref (subdir);
++		case GMENU_TREE_ITEM_ALIAS:
++			list = get_all_applications_from_alias (GMENU_TREE_ALIAS (item), list);
++			break;
++
++		default:
++			break;
++		}
++
++		gmenu_tree_item_unref (item);
+ 	}
+-	g_slist_free (subdirs);
++
++	g_slist_free (items);
+ 
+ 	return list;
+ }
+@@ -1156,18 +1199,18 @@ get_all_applications_from_dir (MenuTreeD
+ static GSList *
+ get_all_applications (void)
+ {
+-	MenuTree          *tree;
+-	MenuTreeDirectory *root;
+-	GSList            *retval;
++	GMenuTree          *tree;
++	GMenuTreeDirectory *root;
++	GSList             *retval;
+ 
+-	tree = menu_tree_lookup ("applications.menu");
++	tree = gmenu_tree_lookup ("applications.menu", GMENU_TREE_FLAGS_NONE);
+ 
+-	root = menu_tree_get_root_directory (tree);
++	root = gmenu_tree_get_root_directory (tree);
+ 
+ 	retval = get_all_applications_from_dir (root, NULL);
+ 
+-	menu_tree_directory_unref (root);
+-	menu_tree_unref (tree);
++	gmenu_tree_item_unref (root);
++	gmenu_tree_unref (tree);
+ 
+ 	retval = g_slist_sort (retval, (GCompareFunc) compare_applications);
+ 
+@@ -1193,28 +1236,28 @@ load_applications (void)
+ 	for (l = all_applications; l; l = l->next) {
+ 		GnomeDesktopItem *ditem;
+ 		char *icon;
+-		MenuTreeEntry *entry = l->data;
++		GMenuTreeEntry *entry = l->data;
+ 
+-		if (prev_name && strcmp (menu_tree_entry_get_name (entry), prev_name) == 0) {
+-			menu_tree_entry_unref (entry);
++		if (prev_name && strcmp (gmenu_tree_entry_get_name (entry), prev_name) == 0) {
++			gmenu_tree_item_unref (entry);
+ 			continue;
+ 		}
+-		ditem = gnome_desktop_item_new_from_uri (menu_tree_entry_get_desktop_file_path (entry), 
++		ditem = gnome_desktop_item_new_from_uri (gmenu_tree_entry_get_desktop_file_path (entry), 
+ 							 0, &error);
+ 		if (!ditem) {
+ 			if (error) {
+-				g_warning ("Couldn't load %s: %s", desktop_entry_get_path (entry),
++				g_warning ("Couldn't load %s: %s", gmenu_tree_entry_get_desktop_file_path (entry),
+ 					   error->message);
+ 				g_error_free (error);
+ 				error = NULL;
+ 			}
+-			menu_tree_entry_unref (entry);
++			gmenu_tree_item_unref (entry);
+ 			continue;
+ 		}
+     
+ 		if ((gnome_desktop_item_get_entry_type (ditem) != GNOME_DESKTOP_ITEM_TYPE_APPLICATION) || !gnome_desktop_item_get_string (ditem, BUGZILLA_BUGZILLA)) {
+ 			gnome_desktop_item_unref (ditem);	
+-			menu_tree_entry_unref (entry);
++			gmenu_tree_item_unref (entry);
+ 			continue;
+ 		}
+ 
+@@ -1231,9 +1274,9 @@ load_applications (void)
+ 			gnome_desktop_item_get_string (ditem, GNOME_DESKTOP_ITEM_EXEC),
+ 			gnome_desktop_item_get_string (ditem, BUGZILLA_OTHER_BINARIES));
+ 		g_free (icon);
+-		prev_name = menu_tree_entry_get_name (entry);
++		prev_name = gmenu_tree_entry_get_name (entry);
+ 		gnome_desktop_item_unref (ditem);	
+-		menu_tree_entry_unref (entry);
++		gmenu_tree_item_unref (entry);
+ 	}
+ 	g_slist_free (all_applications);
+ 
diff --git a/devel/bugbuddy/pkg-descr b/devel/bugbuddy/pkg-descr
new file mode 100644
index 000000000..7268130ab
--- /dev/null
+++ b/devel/bugbuddy/pkg-descr
@@ -0,0 +1,7 @@
+This is a bug reporting tool.  It pops up automatically when a GNOME
+app crashes under the GNOME desktop (via gnome_segv), and allows
+the crash information to be sent to the app's developers.
+
+Jacob Berkman  <jberkman@andrew.cmu.edu>
+
+WWW: http://www.gnome.org/
diff --git a/devel/bugbuddy/pkg-plist b/devel/bugbuddy/pkg-plist
new file mode 100644
index 000000000..ec291fb0a
--- /dev/null
+++ b/devel/bugbuddy/pkg-plist
@@ -0,0 +1,96 @@
+bin/bug-buddy
+share/gnome/application-registry/bug-buddy.applications
+share/gnome/applications/bug-buddy-core.desktop
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+share/gnome/applications/bug-buddy.desktop
+share/gnome/bug-buddy/bug-buddy.glade
+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
+share/gnome/bug-buddy/gnome.png
+share/gnome/bug-buddy/ximian.png
+share/gnome/help/bug-buddy/C/bug-buddy.xml
+share/gnome/help/bug-buddy/C/legal.xml
+share/gnome/mime-info/bug-buddy.keys
+share/gnome/omf/bug-buddy/bug-buddy-C.omf
+share/gnome/pixmaps/bug-buddy.png
+share/locale/am/LC_MESSAGES/bug-buddy.mo
+share/locale/ar/LC_MESSAGES/bug-buddy.mo
+share/locale/az/LC_MESSAGES/bug-buddy.mo
+share/locale/be/LC_MESSAGES/bug-buddy.mo
+share/locale/bg/LC_MESSAGES/bug-buddy.mo
+share/locale/bn/LC_MESSAGES/bug-buddy.mo
+share/locale/bs/LC_MESSAGES/bug-buddy.mo
+share/locale/ca/LC_MESSAGES/bug-buddy.mo
+share/locale/cs/LC_MESSAGES/bug-buddy.mo
+share/locale/cy/LC_MESSAGES/bug-buddy.mo
+share/locale/da/LC_MESSAGES/bug-buddy.mo
+share/locale/de/LC_MESSAGES/bug-buddy.mo
+share/locale/el/LC_MESSAGES/bug-buddy.mo
+share/locale/en_CA/LC_MESSAGES/bug-buddy.mo
+share/locale/en_GB/LC_MESSAGES/bug-buddy.mo
+share/locale/es/LC_MESSAGES/bug-buddy.mo
+share/locale/et/LC_MESSAGES/bug-buddy.mo
+share/locale/eu/LC_MESSAGES/bug-buddy.mo
+share/locale/fa/LC_MESSAGES/bug-buddy.mo
+share/locale/fi/LC_MESSAGES/bug-buddy.mo
+share/locale/fr/LC_MESSAGES/bug-buddy.mo
+share/locale/ga/LC_MESSAGES/bug-buddy.mo
+share/locale/gl/LC_MESSAGES/bug-buddy.mo
+share/locale/gu/LC_MESSAGES/bug-buddy.mo
+share/locale/he/LC_MESSAGES/bug-buddy.mo
+share/locale/hi/LC_MESSAGES/bug-buddy.mo
+share/locale/hr/LC_MESSAGES/bug-buddy.mo
+share/locale/hu/LC_MESSAGES/bug-buddy.mo
+share/locale/id/LC_MESSAGES/bug-buddy.mo
+share/locale/is/LC_MESSAGES/bug-buddy.mo
+share/locale/it/LC_MESSAGES/bug-buddy.mo
+share/locale/ja/LC_MESSAGES/bug-buddy.mo
+share/locale/ko/LC_MESSAGES/bug-buddy.mo
+share/locale/lt/LC_MESSAGES/bug-buddy.mo
+share/locale/lv/LC_MESSAGES/bug-buddy.mo
+share/locale/mk/LC_MESSAGES/bug-buddy.mo
+share/locale/ml/LC_MESSAGES/bug-buddy.mo
+share/locale/mn/LC_MESSAGES/bug-buddy.mo
+share/locale/ms/LC_MESSAGES/bug-buddy.mo
+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/no/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
+share/locale/pt/LC_MESSAGES/bug-buddy.mo
+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/sk/LC_MESSAGES/bug-buddy.mo
+share/locale/sl/LC_MESSAGES/bug-buddy.mo
+share/locale/sq/LC_MESSAGES/bug-buddy.mo
+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/th/LC_MESSAGES/bug-buddy.mo
+share/locale/tr/LC_MESSAGES/bug-buddy.mo
+share/locale/uk/LC_MESSAGES/bug-buddy.mo
+share/locale/vi/LC_MESSAGES/bug-buddy.mo
+share/locale/wa/LC_MESSAGES/bug-buddy.mo
+share/locale/zh_CN/LC_MESSAGES/bug-buddy.mo
+share/locale/zh_TW/LC_MESSAGES/bug-buddy.mo
+@dirrm share/gnome/omf/bug-buddy
+@dirrm share/gnome/help/bug-buddy/C
+@dirrm share/gnome/help/bug-buddy
+@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
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true