From a8aeab8b92287bcb16efa9c2921ef1b9ca606b9d Mon Sep 17 00:00:00 2001
From: Maxim Sobolev <sobomax@FreeBSD.org>
Date: Mon, 16 Sep 2002 13:25:34 +0000
Subject: [PATCH] Prevent breakage when both gal1 and gal2 are installed.

---
 math/gnumeric2/Makefile              | 3 ++-
 math/gnumeric2/files/patch-configure | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index ce88bb454317..ba7dc54ad265 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -30,7 +30,8 @@ USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--without-guile --with-bonobo
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}"
+		LIBS="-L${LOCALBASE}/lib -liconv ${PTHREAD_LIBS}" \
+		DEFS="-I${X11BASE}/include/gal-2-0"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
 PLIST_SUB=	VERSION=${PORTVERSION}-bonobo
diff --git a/math/gnumeric2/files/patch-configure b/math/gnumeric2/files/patch-configure
index 86dca3320983..0556ddc28540 100644
--- a/math/gnumeric2/files/patch-configure
+++ b/math/gnumeric2/files/patch-configure
@@ -8,3 +8,12 @@
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+@@ -13797,7 +13798,7 @@
+ }'
+ fi
+ 
+-DEFS=-DHAVE_CONFIG_H
++DEFS="$DEFS -DHAVE_CONFIG_H"
+ 
+ 
+