Prevent breakage when both gal1 and gal2 are installed.

svn path=/head/; revision=66444
2002-09-16 13:25:34 +00:00 · 2002-09-16 13:25:34 +00:00 · a8aeab8b92 · 2021-03-31 03:12:20 +00:00
commit a8aeab8b92
parent 6d612b4a81
2 changed files with 11 additions and 1 deletions
--- 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
--- 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"
+ 
+ 
+