summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrh <rh>2001-10-04 19:28:42 +0000
committerrh <rh>2001-10-04 19:28:42 +0000
commit041a8d0c3a0b44b9b1583708584d251761fb9c11 (patch)
tree24342acf244a159e2669e9dbe83e4cead3e96bf9
parent7e4b287c5084864641792b87052a0f7c88c9bfb3 (diff)
downloadpkgsrc-041a8d0c3a0b44b9b1583708584d251761fb9c11.tar.gz
Make this compile with bonobo-1.0.9 and libglade-0.17 and while at it,
buildlinkify. Explicitly disable Guile support as this was broken anyway, because gnumeric needs at least Guile-1.5, which is a development version that is only available through CVS.
-rw-r--r--math/gnumeric/Makefile25
-rw-r--r--math/gnumeric/distinfo4
2 files changed, 20 insertions, 9 deletions
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 3a515af3d29..3c17cbd19eb 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2001/08/23 22:40:40 mjl Exp $
+# $NetBSD: Makefile,v 1.36 2001/10/04 19:28:42 rh Exp $
#
DISTNAME= gnumeric-0.70
@@ -10,15 +10,8 @@ HOMEPAGE= http://www.gnome.org/gnumeric/
COMMENT= Powerful and easy to use spreadsheet program from the GNOME project
BUILD_DEPENDS+= python>=2.0:../../lang/python
-DEPENDS+= libglade>=0.16:../../devel/libglade
-DEPENDS+= gal>=0.10:../../devel/gal
-DEPENDS+= gb>=0.0.20:../../lang/gb
-DEPENDS+= libole2>=0.2.3:../../devel/libole2
-DEPENDS+= oaf>=0.6.5:../../devel/oaf
-DEPENDS+= libxml>=1.8.14:../../textproc/libxml
GNU_CONFIGURE= YES
-USE_LIBINTL= YES
USE_LIBTOOL= YES
USE_X11BASE= YES
USE_GMAKE= YES
@@ -27,6 +20,22 @@ LDFLAGS+= -L${LOCALBASE}/lib
LDFLAGS+= -Wl,-R${LOCALBASE}/lib
LDFLAGS+= -lunicode
CPPFLAGS+= -I${LOCALBASE}/include
+CONFIGURE_ARGS+= --without-guile # needs CVS-only guile-1.5
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
+pre-configure:
+ for i in ${WRKSRC}/plugins/*/Makefile.in ; do \
+ ${SED} <$$i >$$i.fixed \
+ -e 's/^\(COMPILE.*\)$$/\1 $${EXTRA_GNOME_CFLAGS}/' && \
+ ${MV} $$i.fixed $$i ; \
+ done
+
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../textproc/libxml/buildlink.mk"
+.include "../../devel/libglade/buildlink.mk"
+.include "../../devel/libole2/buildlink.mk"
+.include "../../devel/oaf/buildlink.mk"
+.include "../../devel/gal/buildlink.mk"
+.include "../../lang/gb/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index c67eae077c4..723c56dde1b 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.4 2001/08/23 22:40:40 mjl Exp $
+$NetBSD: distinfo,v 1.5 2001/10/04 19:28:43 rh Exp $
SHA1 (gnumeric-0.70.tar.gz) = f9cac79f4ad04263efe4317894164fd60d49fd3a
Size (gnumeric-0.70.tar.gz) = 8111712 bytes
+SHA1 (patch-aa) = de5888c8163b64478563db0c6d10347e2686a57e
+SHA1 (patch-ab) = 6ea390b8d8eaa0efa4461252e5e39187fff051d3