On 10/30/17 14:12, Brian Callahan wrote:
Hi ports --
Attached is an update to math/veusz.
Notably, it's Qt5 now. And one of the patches goes away. Otherwise,
it's a fairly simple update.
All tests pass on amd64.
And re-take MAINTAINER.
OK?
~Brian
Now to 2.1.1
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/math/veusz/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile 26 Jul 2017 22:45:26 -0000 1.15
+++ Makefile 12 Nov 2017 19:00:29 -0000
@@ -1,28 +1,33 @@
# $OpenBSD: Makefile,v 1.15 2017/07/26 22:45:26 sthen Exp $
COMMENT = scientific plotting and graphing package
-MODPY_EGG_VERSION = 1.23.1
+MODPY_EGG_VERSION = 2.1.1
DISTNAME = veusz-${MODPY_EGG_VERSION}
CATEGORIES = math graphics
-REVISION = 1
-HOMEPAGE = http://home.gna.org/veusz/
+HOMEPAGE = https://veusz.github.io/
+MAINTAINER = Brian Callahan <bcal...@openbsd.org>
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += lib/qt4/QtGui lib/qt4/QtXml m pthread ${COMPILER_LIBCXX} ${MODPY_WANTLIB}
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Widgets Qt5Xml
+WANTLIB += m ${MODPY_WANTLIB}
-MASTER_SITES = http://download.gna.org/veusz/
+MASTER_SITES = https://github.com/veusz/veusz/releases/download/${DISTNAME}/
+
+# C++11
+COMPILER = base-clang ports-clang ports-gcc
MODULES = lang/python \
- x11/qt4
+ x11/qt5
BUILD_DEPENDS = math/py-numpy \
- x11/py-qt4
+ x11/py-qt5
RUN_DEPENDS = math/py-numpy \
- x11/py-qt4
+ x11/py-qt5
+
TEST_DEPENDS = ${BASE_PKGPATH}
do-test:
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/veusz/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo 19 Jun 2015 22:02:01 -0000 1.10
+++ distinfo 12 Nov 2017 19:00:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (veusz-1.23.1.tar.gz) = wHC9GTzx7UGMX9DCn4vTh/9Ybp63udU9CK60ce1BrN4=
-SIZE (veusz-1.23.1.tar.gz) = 1843923
+SHA256 (veusz-2.1.1.tar.gz) = Y6kGMH76F7wu6VqAVaX8X7zewmK2+IdZIkgtWMFw/Xc=
+SIZE (veusz-2.1.1.tar.gz) = 2440253
Index: patches/patch-pyqtdistutils_py
===================================================================
RCS file: patches/patch-pyqtdistutils_py
diff -N patches/patch-pyqtdistutils_py
--- patches/patch-pyqtdistutils_py 19 Sep 2014 23:12:19 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-pyqtdistutils_py,v 1.1 2014/09/19 23:12:19 bcallah Exp $
---- pyqtdistutils.py.orig Fri Sep 19 19:03:46 2014
-+++ pyqtdistutils.py Fri Sep 19 19:04:25 2014
-@@ -34,8 +34,7 @@ except:
- import PyQt4.pyqtconfig
- SIP_FLAGS = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags
-
--PYQT_SIP_DIR = os.path.join(
-- sipconfig.Configuration().default_sip_dir, 'PyQt4')
-+PYQT_SIP_DIR = sipconfig.Configuration().default_sip_dir
-
- SIP_BIN = sipconfig.Configuration().sip_bin
- SIP_INC_DIR = sipconfig.Configuration().sip_inc_dir
Index: patches/patch-veusz_helpers_src_qtloops_isnan_h
===================================================================
RCS file: /cvs/ports/math/veusz/patches/patch-veusz_helpers_src_qtloops_isnan_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-veusz_helpers_src_qtloops_isnan_h
--- patches/patch-veusz_helpers_src_qtloops_isnan_h 13 May 2017 18:45:38 -0000 1.1
+++ patches/patch-veusz_helpers_src_qtloops_isnan_h 12 Nov 2017 19:00:29 -0000
@@ -11,7 +11,7 @@ Index: veusz/helpers/src/qtloops/isnan.h
#elif defined(WIN32) || defined(_isnan) || defined(_MSC_VER)
# define isNaN(_a) (_isnan(_a)) /* Win32 definition */
-#elif defined(isnan) || defined(__FreeBSD__) || defined(__osf__)
-+#elif defined(isnan) || defined(__FreeBSD__) ||defined(__OpenBSD__) || defined(__osf__)
++#elif defined(isnan) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__osf__)
# define isNaN(_a) (isnan(_a)) /* GNU definition */
#else
# define isNaN(_a) (std::isnan(_a))
@@ -19,8 +19,8 @@ Index: veusz/helpers/src/qtloops/isnan.h
# define isFinite(_a) (_finite(_a)) /* Win32 definition */
#elif defined(__sgi)
# define isFinite(_a) (_isfinite(_a))
--#elif defined(isfinite)
-+#elif defined(isfinite) || defined(__OpenBSD__)
+-#elif defined(isfinite) || defined(__FreeBSD__)
++#elif defined(isfinite) || defined(__FreeBSD__) || defined(__OpenBSD__)
# define isFinite(_a) (isfinite(_a))
#elif defined(__osf__)
# define isFinite(_a) (finite(_a) && !isNaN(_a))
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/veusz/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST 19 Apr 2015 17:01:40 -0000 1.6
+++ pkg/PLIST 12 Nov 2017 19:00:29 -0000
@@ -1,6 +1,5 @@
@comment $OpenBSD: PLIST,v 1.6 2015/04/19 17:01:40 bcallah Exp $
bin/veusz
-bin/veusz_listen
lib/python${MODPY_VERSION}/site-packages/veusz/
lib/python${MODPY_VERSION}/site-packages/veusz-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
lib/python${MODPY_VERSION}/site-packages/veusz/AUTHORS
@@ -24,6 +23,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/defn_fits.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/defn_hdf5.py
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/defn_hdf5.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/defn_nd.py
+lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/defn_nd.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/defn_plugin.py
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/defn_plugin.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/defn_standard.py
@@ -36,16 +37,49 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/dialog_fits.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/dialog_hdf5.py
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/dialog_hdf5.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/dialog_nd.py
+lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/dialog_nd.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/dialog_plugin.py
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/dialog_plugin.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/dialog_standard.py
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/dialog_standard.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/dialog_twod.py
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/dialog_twod.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/fits_hdf5_helpers.py
+lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/fits_hdf5_helpers.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/fits_hdf5_tree.py
+lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/fits_hdf5_tree.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/readcsv.py
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/readcsv.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/simpleread.py
lib/python${MODPY_VERSION}/site-packages/veusz/dataimport/simpleread.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/__init__.py
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/base.py
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/base.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/commonfn.py
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/commonfn.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/date.py
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/date.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/expression.py
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/expression.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/filtered.py
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/filtered.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/helpers.py
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/helpers.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/histo.py
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/histo.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/nd.py
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/nd.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/oned.py
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/oned.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/plugin.py
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/plugin.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/text.py
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/text.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/twod.py
+lib/python${MODPY_VERSION}/site-packages/veusz/datasets/twod.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/dialogs/
lib/python${MODPY_VERSION}/site-packages/veusz/dialogs/__init__.py
lib/python${MODPY_VERSION}/site-packages/veusz/dialogs/__init__.pyc
@@ -88,22 +122,20 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/veusz/document/
lib/python${MODPY_VERSION}/site-packages/veusz/document/__init__.py
lib/python${MODPY_VERSION}/site-packages/veusz/document/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/document/colors.py
+lib/python${MODPY_VERSION}/site-packages/veusz/document/colors.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/document/commandinterface.py
lib/python${MODPY_VERSION}/site-packages/veusz/document/commandinterface.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/document/commandinterpreter.py
lib/python${MODPY_VERSION}/site-packages/veusz/document/commandinterpreter.pyc
-lib/python${MODPY_VERSION}/site-packages/veusz/document/dataset_filtered.py
-lib/python${MODPY_VERSION}/site-packages/veusz/document/dataset_filtered.pyc
-lib/python${MODPY_VERSION}/site-packages/veusz/document/dataset_histo.py
-lib/python${MODPY_VERSION}/site-packages/veusz/document/dataset_histo.pyc
-lib/python${MODPY_VERSION}/site-packages/veusz/document/datasets.py
-lib/python${MODPY_VERSION}/site-packages/veusz/document/datasets.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/document/dbusinterface.py
lib/python${MODPY_VERSION}/site-packages/veusz/document/dbusinterface.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/document/doc.py
lib/python${MODPY_VERSION}/site-packages/veusz/document/doc.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/document/emf_export.py
lib/python${MODPY_VERSION}/site-packages/veusz/document/emf_export.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/document/evaluate.py
+lib/python${MODPY_VERSION}/site-packages/veusz/document/evaluate.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/document/export.py
lib/python${MODPY_VERSION}/site-packages/veusz/document/export.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/document/loader.py
@@ -139,6 +171,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/veusz/examples/coloredpoints.vsz
lib/python${MODPY_VERSION}/site-packages/veusz/examples/contour.vsz
lib/python${MODPY_VERSION}/site-packages/veusz/examples/contour_labels.vsz
+lib/python${MODPY_VERSION}/site-packages/veusz/examples/custom_definitions.vsz
lib/python${MODPY_VERSION}/site-packages/veusz/examples/dataset_operations.vsz
lib/python${MODPY_VERSION}/site-packages/veusz/examples/datebar.dat
lib/python${MODPY_VERSION}/site-packages/veusz/examples/datebar.vsz
@@ -166,6 +199,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/veusz/examples/mathml.vsz
lib/python${MODPY_VERSION}/site-packages/veusz/examples/multiaxes.vsz
lib/python${MODPY_VERSION}/site-packages/veusz/examples/multixy.vsz
+lib/python${MODPY_VERSION}/site-packages/veusz/examples/nd-1.csv
+lib/python${MODPY_VERSION}/site-packages/veusz/examples/nd.vsz
lib/python${MODPY_VERSION}/site-packages/veusz/examples/polar.vsz
lib/python${MODPY_VERSION}/site-packages/veusz/examples/profile.vsz
lib/python${MODPY_VERSION}/site-packages/veusz/examples/shapes.vsz
@@ -192,6 +227,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_boxplot.svg
lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_colorbar.svg
lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_contour.svg
+lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_covariance.svg
lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_document.svg
lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_ellipse.svg
lib/python${MODPY_VERSION}/site-packages/veusz/icons/button_fit.svg
@@ -378,6 +414,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/veusz/ui/import_csv.ui
lib/python${MODPY_VERSION}/site-packages/veusz/ui/import_fits.ui
lib/python${MODPY_VERSION}/site-packages/veusz/ui/import_hdf5.ui
+lib/python${MODPY_VERSION}/site-packages/veusz/ui/import_nd.ui
lib/python${MODPY_VERSION}/site-packages/veusz/ui/import_plugins.ui
lib/python${MODPY_VERSION}/site-packages/veusz/ui/import_standard.ui
lib/python${MODPY_VERSION}/site-packages/veusz/ui/importhelp.ui
@@ -445,6 +482,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/veusz/widgets/contour.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/widgets/controlgraph.py
lib/python${MODPY_VERSION}/site-packages/veusz/widgets/controlgraph.pyc
+lib/python${MODPY_VERSION}/site-packages/veusz/widgets/covariance.py
+lib/python${MODPY_VERSION}/site-packages/veusz/widgets/covariance.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/widgets/fit.py
lib/python${MODPY_VERSION}/site-packages/veusz/widgets/fit.pyc
lib/python${MODPY_VERSION}/site-packages/veusz/widgets/function.py
