diff options
| author | sobomax <sobomax@FreeBSD.org> | 2002-09-16 21:25:34 +0800 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2002-09-16 21:25:34 +0800 |
| commit | 90a833ea7a217c4be5e58a5745f98f349989d1cb (patch) | |
| tree | f03bffdcb7fe1234ab254b4ff19a619695f82d5d | |
| parent | 4eeea8544bbd0e0f1fb0befe2f12aab74dd0bff3 (diff) | |
| download | freebsd-ports-gnome-90a833ea7a217c4be5e58a5745f98f349989d1cb.tar.gz freebsd-ports-gnome-90a833ea7a217c4be5e58a5745f98f349989d1cb.tar.zst freebsd-ports-gnome-90a833ea7a217c4be5e58a5745f98f349989d1cb.zip | |
Prevent breakage when both gal1 and gal2 are installed.
| -rw-r--r-- | math/gnumeric2/Makefile | 3 | ||||
| -rw-r--r-- | math/gnumeric2/files/patch-configure | 9 |
2 files changed, 11 insertions, 1 deletions
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" + + + |