7 files changed, 91 insertions, 62 deletions
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 888c32e7fcf6..025744a6e06d 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/bug-buddy/Makefile,v 1.81 2010/03/30 07:21:31 avl Exp $
+#   $MCom: ports/devel/bug-buddy/Makefile,v 1.86 2010/11/16 18:17:55 kwm Exp $
 #
 
 PORTNAME=	bug-buddy
-PORTVERSION=	2.30.0
-PORTREVISION=	2
+PORTVERSION=	2.32.0
+PORTREVISION=	1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -41,4 +41,8 @@ post-patch:
 	    	s|gelf.h||g' \
 	    	${WRKSRC}/configure
 
+post-install:
+	@${LN} -fs ${PREFIX}/lib/gtk-2.0/modules/libgnomesegvhandler.so \
+		${PREFIX}/lib/gtk-2.0/modules/libgnomebreakpad.so
+
 .include <bsd.port.mk>
diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo
index 9f4e9f0e4a4b..84c72dfa0e7a 100644
--- a/devel/bug-buddy/distinfo
+++ b/devel/bug-buddy/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/bug-buddy-2.30.0.tar.bz2) = da34ace8a806cd1c901ae960184e2997
-SHA256 (gnome2/bug-buddy-2.30.0.tar.bz2) = 6e81a55bd252f552aa4aea180b8dbceb0898d2bf173e330c5c09f8fbdba66b05
-SIZE (gnome2/bug-buddy-2.30.0.tar.bz2) = 1192441
+MD5 (gnome2/bug-buddy-2.32.0.tar.bz2) = 86a84389c206396eba680e93288d04c8
+SHA256 (gnome2/bug-buddy-2.32.0.tar.bz2) = ffdc70fe4a59c0aef42b5b0b72b08f17db2b1d9f49ba2b68722334ddbee5e3ca
+SIZE (gnome2/bug-buddy-2.32.0.tar.bz2) = 701052
diff --git a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc b/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc
deleted file mode 100644
index 7007a9101cb3..000000000000
--- a/devel/bug-buddy/files/patch-gnome-breakpad_gnome-breakpad.cc
+++ /dev/null
@@ -1,55 +0,0 @@
---- gnome-breakpad/gnome-breakpad.cc.orig	2009-02-16 15:24:48.000000000 +0100
-+++ gnome-breakpad/gnome-breakpad.cc	2009-02-22 16:25:50.000000000 +0100
-@@ -25,8 +25,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>
-@@ -264,6 +270,7 @@ find_in_debug_path (const char *filename
- }
- 
- 
-+#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
- static gboolean
- elf_has_debug_symbols (const char *filename)
- {
-@@ -316,7 +323,7 @@ elf_has_debug_symbols (const char *filen
-        elf_end (elf);
-        return false;
- }
--
-+#endif
- 
- 
- 
-@@ -429,11 +436,18 @@ check_if_gdb ()
- 			_exit (1);
- 		_exit(0);
- 	}
--	
-+
-+#if !defined(__FreeBSD__)
- 	mypath = g_file_read_link ("/proc/self/exe", NULL);
-+#else
-+	mypath = g_file_read_link ("/proc/curproc/file", NULL);
-+#endif
- 	if (mypath)
-+#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
- 		has_debug_symbols = elf_has_debug_symbols (mypath);
--
-+#else	
-+		has_debug_symbols = TRUE;
-+#endif
- 	g_free (mypath);
- 
- 	if (bugbuddy && gdb && has_debug_symbols) {
diff --git a/devel/bug-buddy/files/patch-src_bug-buddy.c b/devel/bug-buddy/files/patch-src_bug-buddy.c
new file mode 100644
index 000000000000..25c5a0a3f425
--- /dev/null
+++ b/devel/bug-buddy/files/patch-src_bug-buddy.c
@@ -0,0 +1,26 @@
+--- src/bug-buddy.c.orig	2010-09-27 16:25:15.000000000 +0200
++++ src/bug-buddy.c	2010-11-16 19:16:24.000000000 +0100
+@@ -56,6 +56,10 @@
+ 
+ #include <libsoup/soup.h>
+ 
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
++
+ #define USE_PROXY_KEY 	"/system/http_proxy/use_http_proxy"
+ #define PROXY_HOST_KEY	"/system/http_proxy/host"
+ #define PROXY_PORT_KEY	"/system/http_proxy/port"
+@@ -1955,10 +1959,12 @@
+ 			_exit(0);
+ 		}
+ 		
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ 		if (!elf_has_debug_symbols (gopt_data.pid)) {
+ 			/* FIXME: Request PackageKit to install debug symbols packages */
+ 			_exit(0);
+ 		}
++#endif
+ 
+ 	}
+ 
diff --git a/devel/bug-buddy/files/patch-src_elf.c b/devel/bug-buddy/files/patch-src_elf.c
new file mode 100644
index 000000000000..659058fe963c
--- /dev/null
+++ b/devel/bug-buddy/files/patch-src_elf.c
@@ -0,0 +1,42 @@
+--- src/elf.c.orig	2010-11-16 18:43:40.000000000 +0100
++++ src/elf.c	2010-11-16 18:59:11.000000000 +0100
+@@ -16,8 +16,15 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
++
++#if !defined(__FreeBSD__) || __FreeBSD_version > 700024
+ #include <libelf.h>
+ #include <gelf.h>
++#endif
++
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <string.h>
+@@ -61,7 +68,9 @@
+ gboolean
+ elf_has_debug_symbols (gint pid)
+ {
++#if !defined(__FreeBSD__)
+ 	gchar *proc_path;
++#endif
+ 	gchar *filename;
+ 	int fd;
+ 	Elf *elf;
+@@ -76,9 +85,13 @@
+ 		return FALSE;
+ 	}
+ 
++#if defined(__FreeBSD__)
++	filename = g_file_read_link ("/proc/curproc/file", NULL);
++#else
+ 	proc_path = g_strdup_printf ("/proc/%d/exe", pid);
+ 	filename = g_file_read_link (proc_path, NULL);
+ 	g_free (proc_path);
++#endif
+ 	if (!filename)
+ 		return FALSE;
+ 
diff --git a/devel/bug-buddy/files/patch-src_gdb-buddy.c b/devel/bug-buddy/files/patch-src_gdb-buddy.c
new file mode 100644
index 000000000000..a15e1a2a0ddb
--- /dev/null
+++ b/devel/bug-buddy/files/patch-src_gdb-buddy.c
@@ -0,0 +1,11 @@
+--- src/gdb-buddy.c.orig	2010-11-16 18:43:48.000000000 +0100
++++ src/gdb-buddy.c	2010-11-16 18:54:28.000000000 +0100
+@@ -170,7 +170,7 @@
+ 	link = g_strdup_printf ("/proc/%d/path/a.out", pid);
+ #else
+ 	/* if someone knows how to do this on BSD, please send a patch */
+-	return NULL;
++	link = g_file_read_link ("/proc/curproc/file", NULL);
+ #endif
+ 	exe = g_file_read_link (link, &error);
+ 
diff --git a/devel/bug-buddy/pkg-plist b/devel/bug-buddy/pkg-plist
index 32c3dfcc8d0b..c8b6d1f69bfa 100644
--- a/devel/bug-buddy/pkg-plist
+++ b/devel/bug-buddy/pkg-plist
@@ -1,6 +1,7 @@
 bin/bug-buddy
-lib/gtk-2.0/modules/libgnomebreakpad.la
 lib/gtk-2.0/modules/libgnomebreakpad.so
+lib/gtk-2.0/modules/libgnomesegvhandler.la
+lib/gtk-2.0/modules/libgnomesegvhandler.so
 share/applications/bug-buddy.desktop
 %%DATADIR%%/bug-buddy.gtkbuilder
 %%DATADIR%%/gdb-cmd