From 71507ae17406930f3b4958fc0206c153486f6254 Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill>
Date: Wed, 24 Dec 2008 17:56:11 +0000
Subject: Fix build with XFree86.

---
 editors/gedit/Makefile         |  6 +++++-
 editors/gedit/distinfo         |  3 ++-
 editors/gedit/patches/patch-ab | 31 +++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 editors/gedit/patches/patch-ab

diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index e19912ea961..cf77ef26d42 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2008/11/24 13:39:28 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2008/12/24 17:56:11 jmcneill Exp $
 #
 
 DISTNAME=		gedit-2.24.2
@@ -15,6 +15,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
+USE_TOOLS+=		autoconf
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
@@ -34,6 +35,9 @@ BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.6.0
 BUILDLINK_API_DEPENDS.libgnomeui+=	libgnomeui>=2.16.0
 BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.16.0
 
+pre-configure:
+	cd ${WRKSRC} && autoconf -f
+
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/editors/gedit/distinfo b/editors/gedit/distinfo
index 494712ef3d3..dc3ac0315ac 100644
--- a/editors/gedit/distinfo
+++ b/editors/gedit/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.38 2008/11/24 13:39:29 wiz Exp $
+$NetBSD: distinfo,v 1.39 2008/12/24 17:56:11 jmcneill Exp $
 
 SHA1 (gedit-2.24.2.tar.bz2) = dd47269990bcf0f1de11d3ab2cbc3e1d2b75f1d5
 RMD160 (gedit-2.24.2.tar.bz2) = 4e043a5b69c69d1edcdebc3648338d8bac4d615f
 Size (gedit-2.24.2.tar.bz2) = 4089534 bytes
 SHA1 (patch-aa) = 6589d3e14e3210478830f7715077f67cb3556d41
+SHA1 (patch-ab) = 51d328f4c84b9c8a4593891535fc3d67d060550f
diff --git a/editors/gedit/patches/patch-ab b/editors/gedit/patches/patch-ab
new file mode 100644
index 00000000000..0d42ca5963a
--- /dev/null
+++ b/editors/gedit/patches/patch-ab
@@ -0,0 +1,31 @@
+$NetBSD: patch-ab,v 1.5 2008/12/24 17:56:11 jmcneill Exp $
+
+--- configure.ac.orig	2008-11-23 12:16:28.000000000 -0500
++++ configure.ac	2008-12-24 12:48:29.000000000 -0500
+@@ -176,7 +176,6 @@
+ dnl ================================================================
+ 
+ PKG_CHECK_MODULES(GEDIT, [
+-	sm >= 1.0.0
+ 	libxml-2.0 >= 2.5.0
+ 	glib-2.0 >= 2.13.0
+ 	gthread-2.0 >= 2.13.0
+@@ -189,6 +188,18 @@
+ AC_SUBST(GEDIT_LIBS)
+ AC_SUBST(GEDIT_CFLAGS)
+ 
++PKG_CHECK_MODULES(SM, sm >= $1.0.0, [HAVE_SM=yes], [HAVE_SM=no])
++if test x$HAVE_SM = xno; then
++  AC_PATH_XTRA
++  if test "x$no_x" = xyes; then
++    AC_MSG_ERROR(X11 and sm development libraries not found);
++  else
++    XLIB_LIBS="$X_PRE_LIBS $X_LIBS -lSM -lICE $X_EXTRA_LIBS"
++    XLIB_CFLAGS=$X_CFLAGS
++  fi
++fi
++GEDIT_CFLAGS="$GEDIT_CFLAGS $SM_CFLAGS $XLIB_CFLAGS"
++GEDIT_LIBS="$GEDIT_LIBS $SM_LIBS $XLIB_LIBS"
+ 
+ dnl ================================================================
+ dnl GConf related settings
-- 
cgit v1.2.3