Update to 1.21. Convert to distutils.mk and add egg.

Fix pkglint warnings.

Changes in 1.21:
 * Add HDF5 saved document format
 * Add filled curve error bar style
 * Add fill left/right options for point plotter
 * Add filetype filters to import dialog file browser dialog
 * In file completer in import dialog, use selected tab as filter
 * Move code to use PyQt new style signals
 * Add a master color setting for xy point and nonorthpoint plot
 * Line labelling algorithm much improved in contour plots, which
   rotates text to match line angle and avoids label overlaps
 * More accurate axis tick label bounding boxes, allowing rotated
   labels to be placed close together
 * Add reflection and rotation options to vector field widget
 * Switch to scientific notation earlier when showing float settings

Bug fixes:
 * Direction combo did not work in import dialog
 * Saving text datasets did not work in Python3
 * Fix partial dataset evaluation issue when loading documents
 * 2D non-regular pixel spaced images give error if clipped in y
 * Handle Unicode quoted characters in simple text data files
 * xcent/ycent in Dataset2D import plugins were ignored
 * promote_tab broken for import plugins
 * Full screen view when all pages are deleted
 * Crash with empty dataset and boxplot widget
 * Fix copy and paste of datasets
 * Python 3 resizing axis bug
 * Crash if picking/zooming on document with no pages
 * Crash if reediting histogram dataset with blank output entry
 * Use end of text formatting string beyond format specifier
 * When writing SVG text as text, use xml:space="preserve" to
   avoid missing whitespace
 * Embedding socket issue on Python 3.4+

3 files changed, 30 insertions, 20 deletions

diff --git a/graphics/veusz/Makefile b/graphics/veusz/Makefile
index 3feb52c9f2a..1640f7b6fcc 100644
--- a/graphics/veusz/Makefile
+++ b/graphics/veusz/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2014/05/17 16:10:45 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.51 2014/08/21 20:38:47 wiz Exp $
 
-DISTNAME=		veusz-1.20.1
-PKGREVISION=		1
+DISTNAME=		veusz-1.21
 CATEGORIES=		graphics
 MASTER_SITES=		http://download.gna.org/veusz/
 
@@ -11,32 +9,38 @@ HOMEPAGE=		http://home.gna.org/veusz/
 COMMENT=		Scientific plotting package
 LICENSE=		gnu-gpl-v2
 
-PYDISTUTILSPKG=		yes
 USE_LANGUAGES=		c c++
 
-REPLACE_PYTHON=		examples/embedexample.py
+REPLACE_PYTHON+=	examples/embedexample.py
+REPLACE_PYTHON+=	veusz/veusz_listen.py
+REPLACE_PYTHON+=	veusz/veusz_main.py
+
+INSTALLATION_DIRS+=	share/applications
+INSTALLATION_DIRS+=	share/icons/hicolor/128x128/apps
+INSTALLATION_DIRS+=	share/icons/hicolor/16x16/apps
+INSTALLATION_DIRS+=	share/icons/hicolor/32x32/apps
+INSTALLATION_DIRS+=	share/icons/hicolor/48x48/apps
+INSTALLATION_DIRS+=	share/icons/hicolor/64x64/apps
+INSTALLATION_DIRS+=	share/icons/hicolor/scalable/apps
+INSTALLATION_DIRS+=	share/mime/packages
 
 post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/mime/packages
-	${INSTALL_DATA} ${WRKSRC}/support/veusz.xml \
-		${DESTDIR}${PREFIX}/share/mime/packages
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/support/veusz.desktop \
 		${DESTDIR}${PREFIX}/share/applications
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps
-	${INSTALL_DATA} ${WRKSRC}/icons/veusz.svg \
-		${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	for s in 16 32 48 64 128;do \
-		${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/icons/hicolor/$${s}x$${s}/apps; \
 		${INSTALL_DATA} ${WRKSRC}/icons/veusz_$${s}.png \
 			${DESTDIR}${PREFIX}/share/icons/hicolor/$${s}x$${s}/apps/veusz.png; \
 	done
+	${INSTALL_DATA} ${WRKSRC}/icons/veusz.svg \
+		${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps
+	${INSTALL_DATA} ${WRKSRC}/support/veusz.xml \
+		${DESTDIR}${PREFIX}/share/mime/packages
 
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/distutils.mk"
 .include "../../x11/qt4-libs/buildlink3.mk"
 .include "../../x11/py-qt4/buildlink3.mk"
 .include "../../x11/py-sip/buildlink3.mk"
diff --git a/graphics/veusz/PLIST b/graphics/veusz/PLIST
index 6851fef6a41..2415a7281c1 100644
--- a/graphics/veusz/PLIST
+++ b/graphics/veusz/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.17 2014/02/14 17:26:15 drochner Exp $
+@comment $NetBSD: PLIST,v 1.18 2014/08/21 20:38:47 wiz Exp $
 bin/veusz
 bin/veusz_listen
+${PYSITELIB}/${EGG_FILE}
 ${PYSITELIB}/veusz/VERSION
 ${PYSITELIB}/veusz/__init__.py
 ${PYSITELIB}/veusz/__init__.pyc
@@ -137,6 +138,9 @@ ${PYSITELIB}/veusz/document/emf_export.pyo
 ${PYSITELIB}/veusz/document/export.py
 ${PYSITELIB}/veusz/document/export.pyc
 ${PYSITELIB}/veusz/document/export.pyo
+${PYSITELIB}/veusz/document/loader.py
+${PYSITELIB}/veusz/document/loader.pyc
+${PYSITELIB}/veusz/document/loader.pyo
 ${PYSITELIB}/veusz/document/mime.py
 ${PYSITELIB}/veusz/document/mime.pyc
 ${PYSITELIB}/veusz/document/mime.pyo
@@ -174,6 +178,7 @@ ${PYSITELIB}/veusz/examples/boxplot.vsz
 ${PYSITELIB}/veusz/examples/broken_axis.vsz
 ${PYSITELIB}/veusz/examples/coloredpoints.vsz
 ${PYSITELIB}/veusz/examples/contour.vsz
+${PYSITELIB}/veusz/examples/contour_labels.vsz
 ${PYSITELIB}/veusz/examples/dataset_operations.vsz
 ${PYSITELIB}/veusz/examples/datebar.dat
 ${PYSITELIB}/veusz/examples/datebar.vsz
@@ -255,6 +260,7 @@ ${PYSITELIB}/veusz/icons/error_barends.svg
 ${PYSITELIB}/veusz/icons/error_box.svg
 ${PYSITELIB}/veusz/icons/error_boxfill.svg
 ${PYSITELIB}/veusz/icons/error_curve.svg
+${PYSITELIB}/veusz/icons/error_curvefill.svg
 ${PYSITELIB}/veusz/icons/error_diamond.svg
 ${PYSITELIB}/veusz/icons/error_diamondfill.svg
 ${PYSITELIB}/veusz/icons/error_fillhorz.svg
diff --git a/graphics/veusz/distinfo b/graphics/veusz/distinfo
index 2a7ed90efe9..7cb5aae088f 100644
--- a/graphics/veusz/distinfo
+++ b/graphics/veusz/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.17 2014/02/14 17:26:15 drochner Exp $
+$NetBSD: distinfo,v 1.18 2014/08/21 20:38:47 wiz Exp $
 
-SHA1 (veusz-1.20.1.tar.gz) = 8e42eb1f1d28119de881530fe602cfff1b16158b
-RMD160 (veusz-1.20.1.tar.gz) = dd3058ef57c6ad08a06ffa533aa2159a3ac80527
-Size (veusz-1.20.1.tar.gz) = 1778707 bytes
+SHA1 (veusz-1.21.tar.gz) = 6c970b4ca1f13d4cd0c5ce80e7249077d7092ec0
+RMD160 (veusz-1.21.tar.gz) = 3143c9dbcdd82b07398b4e4b7697c3d8ee65c034
+Size (veusz-1.21.tar.gz) = 1803048 bytes