4 files changed, 79 insertions, 55 deletions
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);
+