[pkgsrc/trunk]: pkgsrc/chat/empathy Fix build with XFree86.

[jmcneill <jmcneill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cec6f0d890f4
branches:  trunk
changeset: 552048:cec6f0d890f4
user:      jmcneill <jmcneill%pkgsrc.org@localhost>
date:      Wed Dec 24 12:39:59 2008 +0000

description:
Fix build with XFree86.

diffstat:

 chat/empathy/Makefile         |   6 +++++-
 chat/empathy/distinfo         |   3 ++-
 chat/empathy/patches/patch-aa |  29 +++++++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 2 deletions(-)

diffs (71 lines):

diff -r ccc21d35adcf -r cec6f0d890f4 chat/empathy/Makefile
--- a/chat/empathy/Makefile     Wed Dec 24 12:19:46 2008 +0000
+++ b/chat/empathy/Makefile     Wed Dec 24 12:39:59 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/11/16 11:59:04 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2008/12/24 12:39:59 jmcneill Exp $
 
 DISTNAME=      empathy-2.24.1
 PKGREVISION=   1
@@ -16,6 +16,7 @@
 GNU_CONFIGURE=         yes
 USE_DIRS+=             gnome2-1.5
 USE_TOOLS+=            gawk gmake intltool msgfmt pkg-config
+USE_TOOLS+=            autoconf
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 
@@ -30,6 +31,9 @@
            ${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
        done
 
+pre-configure:
+       cd ${WRKSRC} && autoconf -f
+
 .include "../../chat/telepathy-mission-control/buildlink3.mk"
 .include "../../chat/telepathy-glib/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
diff -r ccc21d35adcf -r cec6f0d890f4 chat/empathy/distinfo
--- a/chat/empathy/distinfo     Wed Dec 24 12:19:46 2008 +0000
+++ b/chat/empathy/distinfo     Wed Dec 24 12:39:59 2008 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/14 23:01:45 wiz Exp $
+$NetBSD: distinfo,v 1.2 2008/12/24 12:39:59 jmcneill Exp $
 
 SHA1 (empathy-2.24.1.tar.gz) = c2962c01b12e946bca4f2ee4585e8a98a29689e4
 RMD160 (empathy-2.24.1.tar.gz) = 20e16355c7e9df02f7692d3ae7511d91f9f0c5e7
 Size (empathy-2.24.1.tar.gz) = 2475921 bytes
+SHA1 (patch-aa) = 764e4d75441e75de4053dcdf3e18628feebe05ac
diff -r ccc21d35adcf -r cec6f0d890f4 chat/empathy/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/chat/empathy/patches/patch-aa     Wed Dec 24 12:39:59 2008 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-aa,v 1.1 2008/12/24 12:39:59 jmcneill Exp $
+
+--- configure.ac.orig  2008-12-24 07:18:01.000000000 -0500
++++ configure.ac       2008-12-24 07:19:12.000000000 -0500
+@@ -95,11 +95,23 @@
+    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
+    libmissioncontrol >= $MISSION_CONTROL_REQUIRED
+    gtk+-2.0 >= $GTK_REQUIRED
+-   x11
+    libglade-2.0 >= $LIBGLADE_REQUIRED
+    libebook-1.2
+ ])
+ 
++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 development libraries not found);
++  else
++    XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
++    XLIB_CFLAGS=$X_CFLAGS
++  fi
++fi
++EMPATHY_CFLAGS="$EMPATHY_CFLAGS $X11_CFLAGS $XLIB_CFLAGS"
++EMPATHY_LIBS="$EMPATHY_LIBS $X11_LIBS $XLIB_LIBS"
++
+ # -----------------------------------------------------------
+ # Enable debug
+ # -----------------------------------------------------------