Fix build with XFree86.

3 files changed, 39 insertions, 2 deletions

diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index a7599ebf04d..35080dfa0b2 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2008/12/02 10:34:46 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2008/12/24 03:05:16 jmcneill Exp $
 #
 
 DISTNAME=		bug-buddy-2.24.2
@@ -16,12 +16,16 @@ GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt pkg-config
+USE_TOOLS+=		autoconf
 USE_LIBTOOL=		YES
 USE_LANGUAGES=		c c++
 CPPFLAGS+=	-I${LOCALBASE}/include/libelf
 
 GCONF_SCHEMAS=		bug-buddy.schemas
 
+pre-configure:
+	cd ${WRKSRC} && autoconf -f
+
 .include "options.mk"
 
 .include "../../mk/omf-scrollkeeper.mk"
diff --git a/net/bug-buddy/distinfo b/net/bug-buddy/distinfo
index d9c25cf6cca..8bfe5ecdf85 100644
--- a/net/bug-buddy/distinfo
+++ b/net/bug-buddy/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.18 2008/12/02 10:34:46 wiz Exp $
+$NetBSD: distinfo,v 1.19 2008/12/24 03:05:16 jmcneill Exp $
 
 SHA1 (bug-buddy-2.24.2.tar.bz2) = 00eb4f47af4e56d94ef8862acf782e572fdec7d2
 RMD160 (bug-buddy-2.24.2.tar.bz2) = fb443a39f1a6cff96c909e483aaec370a87b38ad
 Size (bug-buddy-2.24.2.tar.bz2) = 1109562 bytes
+SHA1 (patch-aa) = 400815a60eb40f8f59a60efe521438e8e9deac16
diff --git a/net/bug-buddy/patches/patch-aa b/net/bug-buddy/patches/patch-aa
new file mode 100644
index 00000000000..ccd56534083
--- /dev/null
+++ b/net/bug-buddy/patches/patch-aa
@@ -0,0 +1,32 @@
+$NetBSD: patch-aa,v 1.5 2008/12/24 03:05:16 jmcneill Exp $
+
+--- configure.in.orig	2008-12-23 21:57:53.000000000 -0500
++++ configure.in	2008-12-23 22:00:01.000000000 -0500
+@@ -123,7 +123,7 @@
+ AM_CONDITIONAL(BREAKPAD_SOLARIS, test x$solaris = xyes)
+ AM_CONDITIONAL(BREAKPAD_LINUX, test x$linux = xyes)
+ 
+-GDK_REQUIRED="x11 gdk-x11-2.0 >= 2.9"
++GDK_REQUIRED="gdk-x11-2.0 >= 2.9"
+ PKG_CHECK_MODULES(GNOME_BREAKPAD,
+ [
+ 	$GDK_REQUIRED
+@@ -131,6 +131,18 @@
+ AC_SUBST(GNOME_BREAKPAD_CFLAGS)
+ AC_SUBST(GNOME_BREAKPAD_LIBS)
+ 
++PKG_CHECK_MODULES(X11, x11 >= $X11_REQUIRED_VERSION, [HAVE_X11=yes], [HAVE_X11=no])
++if test x$HAVE_X11 = xno; then
++  AC_PATH_XTRA
++  if test "x$no_x" = xyes; then
++    AC_MSG_ERROR(X11 and Xrandr development libraries not found);
++  else
++    XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
++    XLIB_CFLAGS=$X_CFLAGS
++  fi
++fi
++GNOME_BREAKPAD_CFLAGS="$GNOME_BREAKPAD_CFLAGS $X11_CFLAGS $XLIB_CFLAGS"
++GNOME_BREAKPAD_LIBS="$GNOME_BREAKPAD_LIBS $X11_LIBS $XLIB_LIBS"
+ 
+ PKG_CHECK_MODULES(GNOME_CRASH, $LIBGNOMEUI_REQUIRED)
+ AC_SUBST(GNOME_CRASH_CFLAGS)