pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/math/gnumeric Do not build perl plugin:



details:   https://anonhg.NetBSD.org/pkgsrc/rev/04d946858b82
branches:  trunk
changeset: 509959:04d946858b82
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Mar 20 07:14:36 2006 +0000

description:
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.

diffstat:

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

diffs (69 lines):

diff -r 874de28a86df -r 04d946858b82 math/gnumeric/Makefile
--- a/math/gnumeric/Makefile    Mon Mar 20 06:29:30 2006 +0000
+++ b/math/gnumeric/Makefile    Mon Mar 20 07:14:36 2006 +0000
@@ -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 @@
 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 @@
 .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 -r 874de28a86df -r 04d946858b82 math/gnumeric/PLIST
--- a/math/gnumeric/PLIST       Mon Mar 20 06:29:30 2006 +0000
+++ b/math/gnumeric/PLIST       Mon Mar 20 07:14:36 2006 +0000
@@ -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/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 @@
 @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



Home | Main Index | Thread Index | Old Index