From e90e99804bc894b3d810b8d86cc060a7942ab5f9 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 20 May 2020 16:48:41 +0000 Subject: gnumeric112: disable python function plugin by default It uses python 2.x and gnumeric upstream has turned off the plugin by default as well. Add a "python" option for those who really need it. Update some outdated comments. Bump PKGREVISION. --- math/gnumeric112/Makefile | 15 +++++---------- math/gnumeric112/PLIST | 10 +--------- math/gnumeric112/PLIST.python | 9 +++++++++ math/gnumeric112/options.mk | 10 ++++++++-- 4 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 math/gnumeric112/PLIST.python diff --git a/math/gnumeric112/Makefile b/math/gnumeric112/Makefile index 1af68dbc411..19c2c67d458 100644 --- a/math/gnumeric112/Makefile +++ b/math/gnumeric112/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.66 2020/05/17 23:47:45 nia Exp $ +# $NetBSD: Makefile,v 1.67 2020/05/20 16:48:41 wiz Exp $ DISTNAME= gnumeric-1.12.47 +PKGREVISION= 1 CATEGORIES= math gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnumeric/1.12/} EXTRACT_SUFX= .tar.xz @@ -27,17 +28,12 @@ TEST_TARGET= check .include "options.mk" -CONFIGURE_ARGS+= --with-python CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} -PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.12.9 - -#CONFIGURE_ARGS+= --with-gnome .include "../../devel/glib2/schemas.mk" -# XXX: that version's not in pkgsrc yet -#BUILDLINK_API_DEPENDS.libgda+= libgda>=3.1.1 +# also needs libgda-ui, currently not in pkgsrc +#BUILDLINK_API_DEPENDS.libgda+= libgda>=5.0 #.include "../../databases/libgda/buildlink3.mk" -#.include "../../databases/libgnomedb/buildlink3.mk" BUILDLINK_API_DEPENDS.libgsf+= libgsf>=1.14.33 .include "../../devel/libgsf/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" @@ -45,12 +41,11 @@ BUILDLINK_API_DEPENDS.libgsf+= libgsf>=1.14.33 .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" -.include "../../lang/python/application.mk" BUILDLINK_API_DEPENDS.goffice0.10+= goffice0.10>=0.10.46 .include "../../misc/goffice0.10/buildlink3.mk" -BUILDLINK_API_DEPENDS.libxml2+= libxml2>=2.4.12 .include "../../textproc/libxml2/buildlink3.mk" BUILDLINK_API_DEPENDS.gtk3+= gtk3+>=3.8.7 .include "../../x11/gtk3/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../lang/python/pyversion.mk" .include "../../mk/bsd.pkg.mk" diff --git a/math/gnumeric112/PLIST b/math/gnumeric112/PLIST index 108e63fdad1..027541d9194 100644 --- a/math/gnumeric112/PLIST +++ b/math/gnumeric112/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2019/07/30 14:22:10 nia Exp $ +@comment $NetBSD: PLIST,v 1.16 2020/05/20 16:48:41 wiz Exp $ bin/gnumeric bin/${PKGNAME} bin/ssconvert @@ -233,9 +233,6 @@ lib/gnumeric/${PKGVERSION}/plugins/fn-tsa/plugin.la lib/gnumeric/${PKGVERSION}/plugins/fn-tsa/plugin.xml lib/gnumeric/${PKGVERSION}/plugins/glpk/glpk.la lib/gnumeric/${PKGVERSION}/plugins/glpk/plugin.xml -lib/gnumeric/${PKGVERSION}/plugins/gnome-glossary/glossary-po-header -lib/gnumeric/${PKGVERSION}/plugins/gnome-glossary/gnome_glossary.py -lib/gnumeric/${PKGVERSION}/plugins/gnome-glossary/plugin.xml lib/gnumeric/${PKGVERSION}/plugins/html/html.la lib/gnumeric/${PKGVERSION}/plugins/html/plugin.xml lib/gnumeric/${PKGVERSION}/plugins/lotus/lotus.la @@ -256,11 +253,6 @@ lib/gnumeric/${PKGVERSION}/plugins/perl-loader/perl_loader.la 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/py-func/plugin.xml -lib/gnumeric/${PKGVERSION}/plugins/py-func/py_func.py -lib/gnumeric/${PKGVERSION}/plugins/python-loader/plugin.xml -lib/gnumeric/${PKGVERSION}/plugins/python-loader/python_loader.la -lib/gnumeric/${PKGVERSION}/plugins/python-loader/ui-console-menu.xml lib/gnumeric/${PKGVERSION}/plugins/qpro/plugin.xml lib/gnumeric/${PKGVERSION}/plugins/qpro/qpro.la lib/gnumeric/${PKGVERSION}/plugins/sample_datasource/plugin.xml diff --git a/math/gnumeric112/PLIST.python b/math/gnumeric112/PLIST.python new file mode 100644 index 00000000000..05c3dd232e8 --- /dev/null +++ b/math/gnumeric112/PLIST.python @@ -0,0 +1,9 @@ +@comment $NetBSD: PLIST.python,v 1.1 2020/05/20 16:48:41 wiz Exp $ +lib/gnumeric/${PKGVERSION}/plugins/gnome-glossary/glossary-po-header +lib/gnumeric/${PKGVERSION}/plugins/gnome-glossary/gnome_glossary.py +lib/gnumeric/${PKGVERSION}/plugins/gnome-glossary/plugin.xml +lib/gnumeric/${PKGVERSION}/plugins/py-func/plugin.xml +lib/gnumeric/${PKGVERSION}/plugins/py-func/py_func.py +lib/gnumeric/${PKGVERSION}/plugins/python-loader/plugin.xml +lib/gnumeric/${PKGVERSION}/plugins/python-loader/python_loader.la +lib/gnumeric/${PKGVERSION}/plugins/python-loader/ui-console-menu.xml diff --git a/math/gnumeric112/options.mk b/math/gnumeric112/options.mk index 7935641e765..0298e15f0dc 100644 --- a/math/gnumeric112/options.mk +++ b/math/gnumeric112/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2013/03/14 19:00:45 drochner Exp $ +# $NetBSD: options.mk,v 1.2 2020/05/20 16:48:41 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gnumeric -PKG_SUPPORTED_OPTIONS= psiconv +PKG_SUPPORTED_OPTIONS= psiconv python .include "../../mk/bsd.options.mk" @@ -10,3 +10,9 @@ PKG_SUPPORTED_OPTIONS= psiconv .else CONFIGURE_ARGS+= --without-psiconv .endif + +.if !empty(PKG_OPTIONS:Mpython) +CONFIGURE_ARGS+= --with-python +PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 1.12.47 +PLIST_SRC+= PLIST PLIST.python +.endif -- cgit v1.2.3