From fed22a3f0cb0c06ca0ebf07740508da6646d6350 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 20 Mar 2006 07:14:36 +0000
Subject: Do not build perl plugin: it is broken on 3.0, and makes the
 compilation fail on -current, because the name of the dynamic library is
 transformed by bl3 and then the transformed name is handed off to ar(1),
 which then doesn't find it.

Bump PKGREVISION.
---
 math/gnumeric/Makefile | 10 +++++++---
 math/gnumeric/PLIST    | 14 +++++++-------
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'math/gnumeric')

diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index ec0d19b850d..1f18ee73b53 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.106 2006/03/06 00:18:19 wiz Exp $
+# $NetBSD: Makefile,v 1.107 2006/03/20 07:14:36 wiz Exp $
 #
 
 DISTNAME=		gnumeric-1.6.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.6/}
 EXTRACT_SUFX=		.tar.bz2
@@ -24,6 +24,11 @@ PYTHON_VERSIONS_ACCEPTED=	24 23
 GCONF2_SCHEMAS=		gnumeric-dialogs.schemas gnumeric-general.schemas \
 			gnumeric-plugins.schemas
 
+# XXX: link test against libDynaLoader_pic.a fails; bug
+# in buildlink
+PLIST_SUBST+=	PERL="@comment "
+#.include "../../lang/perl5/buildlink3.mk"
+
 .include "../../databases/libgda/buildlink3.mk"
 .include "../../databases/libgnomedb/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
@@ -40,7 +45,6 @@ GCONF2_SCHEMAS=		gnumeric-dialogs.schemas gnumeric-general.schemas \
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 # guile is currently not supported in gnumeric
 #.include "../../lang/guile/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../misc/goffice/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
diff --git a/math/gnumeric/PLIST b/math/gnumeric/PLIST
index b7f45bf58c9..c77fecf91b2 100644
--- a/math/gnumeric/PLIST
+++ b/math/gnumeric/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2006/02/04 17:03:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.28 2006/03/20 07:14:36 wiz Exp $
 bin/gnumeric
 bin/${PKGNAME}
 bin/ssconvert
@@ -58,10 +58,10 @@ lib/gnumeric/${PKGVERSION}/plugins/oleo/oleo.la
 lib/gnumeric/${PKGVERSION}/plugins/oleo/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/openoffice/openoffice.la
 lib/gnumeric/${PKGVERSION}/plugins/openoffice/plugin.xml
-lib/gnumeric/${PKGVERSION}/plugins/perl-func/perl_func.pl
-lib/gnumeric/${PKGVERSION}/plugins/perl-func/plugin.xml
-lib/gnumeric/${PKGVERSION}/plugins/perl-loader/perl_loader.la
-lib/gnumeric/${PKGVERSION}/plugins/perl-loader/plugin.xml
+${PERL}lib/gnumeric/${PKGVERSION}/plugins/perl-func/perl_func.pl
+${PERL}lib/gnumeric/${PKGVERSION}/plugins/perl-func/plugin.xml
+${PERL}lib/gnumeric/${PKGVERSION}/plugins/perl-loader/perl_loader.la
+${PERL}lib/gnumeric/${PKGVERSION}/plugins/perl-loader/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/plan_perfect/plan_perfect.la
 lib/gnumeric/${PKGVERSION}/plugins/plan_perfect/plugin.xml
 lib/gnumeric/${PKGVERSION}/plugins/qpro/plugin.xml
@@ -734,8 +734,8 @@ share/pixmaps/win32-gnumeric.ico
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/sample_datasource
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/qpro
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/plan_perfect
-@dirrm lib/gnumeric/${PKGVERSION}/plugins/perl-loader
-@dirrm lib/gnumeric/${PKGVERSION}/plugins/perl-func
+${PERL}@dirrm lib/gnumeric/${PKGVERSION}/plugins/perl-loader
+${PERL}@dirrm lib/gnumeric/${PKGVERSION}/plugins/perl-func
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/openoffice
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/oleo
 @dirrm lib/gnumeric/${PKGVERSION}/plugins/numtheory
-- 
cgit v1.2.3