[pkgsrc/trunk]: pkgsrc/math/gnumeric112 gnumeric112: disable python function ...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7e1fba466452
branches:  trunk
changeset: 432284:7e1fba466452
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed May 20 16:48:41 2020 +0000

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

diffstat:

 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(-)

diffs (113 lines):

diff -r 487878ea0889 -r 7e1fba466452 math/gnumeric112/Makefile
--- a/math/gnumeric112/Makefile Wed May 20 16:37:29 2020 +0000
+++ b/math/gnumeric112/Makefile Wed May 20 16:48:41 2020 +0000
@@ -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 @@
 
 .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 @@
 .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 -r 487878ea0889 -r 7e1fba466452 math/gnumeric112/PLIST
--- a/math/gnumeric112/PLIST    Wed May 20 16:37:29 2020 +0000
+++ b/math/gnumeric112/PLIST    Wed May 20 16:48:41 2020 +0000
@@ -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.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/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 -r 487878ea0889 -r 7e1fba466452 math/gnumeric112/PLIST.python
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/math/gnumeric112/PLIST.python     Wed May 20 16:48:41 2020 +0000
@@ -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 -r 487878ea0889 -r 7e1fba466452 math/gnumeric112/options.mk
--- a/math/gnumeric112/options.mk       Wed May 20 16:37:29 2020 +0000
+++ b/math/gnumeric112/options.mk       Wed May 20 16:48:41 2020 +0000
@@ -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 @@
 .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