CVS commit: pkgsrc/math/gnumeric112

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed May 20 16:48:41 UTC 2020

Modified Files:
        pkgsrc/math/gnumeric112: Makefile PLIST options.mk
Added Files:
        pkgsrc/math/gnumeric112: PLIST.python

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/math/gnumeric112/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/math/gnumeric112/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/math/gnumeric112/PLIST.python
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/gnumeric112/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/gnumeric112/Makefile
diff -u pkgsrc/math/gnumeric112/Makefile:1.66 pkgsrc/math/gnumeric112/Makefile:1.67
--- pkgsrc/math/gnumeric112/Makefile:1.66       Sun May 17 23:47:45 2020
+++ pkgsrc/math/gnumeric112/Makefile    Wed May 20 16:48:41 2020
@@ -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
 .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"

Index: pkgsrc/math/gnumeric112/PLIST
diff -u pkgsrc/math/gnumeric112/PLIST:1.15 pkgsrc/math/gnumeric112/PLIST:1.16
--- pkgsrc/math/gnumeric112/PLIST:1.15  Tue Jul 30 14:22:10 2019
+++ pkgsrc/math/gnumeric112/PLIST       Wed May 20 16:48:41 2020
@@ -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-ts
 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-
 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

Index: pkgsrc/math/gnumeric112/options.mk
diff -u pkgsrc/math/gnumeric112/options.mk:1.1 pkgsrc/math/gnumeric112/options.mk:1.2
--- pkgsrc/math/gnumeric112/options.mk:1.1      Thu Mar 14 19:00:45 2013
+++ pkgsrc/math/gnumeric112/options.mk  Wed May 20 16:48:41 2020
@@ -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

Added files:

Index: pkgsrc/math/gnumeric112/PLIST.python
diff -u /dev/null pkgsrc/math/gnumeric112/PLIST.python:1.1
--- /dev/null   Wed May 20 16:48:41 2020
+++ pkgsrc/math/gnumeric112/PLIST.python        Wed May 20 16:48:41 2020
@@ -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