Update to 1.1.0

* Newer GCC requires swig2.

Changelog:
Version 1.1.0:
- geometry tools: sequence of lines, curved lines, ellipses
- new brush and layer blending modes; different layer merging
- new color dialog: palette and gamut mapping
- improved document frame, can be resized on canvas
- symmetric drawing mode
- old color changer ("washed") from 0.6 is available again
- toolbar improvements, e.g. move layer mode, pan/zoom
- revised cursor and on-canvas color picker
- better separation of mypaint's brush library; json brush file format
- translations, performance improvements, bugfixes, and more

7 files changed, 403 insertions, 114 deletions

diff --git a/graphics/mypaint/Makefile b/graphics/mypaint/Makefile
index 585858f6840..d4fa1f12ff5 100644
--- a/graphics/mypaint/Makefile
+++ b/graphics/mypaint/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2014/10/17 22:01:25 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2015/03/15 04:51:31 ryoon Exp $
 
-DISTNAME=	mypaint-1.0.0
-PKGREVISION=	6
+DISTNAME=	mypaint-1.1.0
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.gna.org/mypaint/
 EXTRACT_SUFX=	.tar.bz2
@@ -14,7 +13,7 @@ LICENSE=	gnu-gpl-v2
 BUILD_DEPENDS+=	scons-[0-9]*:../../devel/scons
 DEPENDS+=	${PYPKGPREFIX}-gtk2-[0-9]*:../../x11/py-gtk2
 
-USE_LANGUAGES=	c++
+USE_LANGUAGES=	c c++
 
 USE_TOOLS+=	bash:run msgfmt pkg-config
 
@@ -24,25 +23,21 @@ PYTHON_VERSIONS_INCOMPATIBLE=	33 34 # py-gtk2
 FIND_PREFIX:=	SCONSDIR=scons
 .include "../../mk/find-prefix.mk"
 
-SUBST_CLASSES+=			locale-dir
-SUBST_STAGE.locale-dir=		pre-configure
-SUBST_FILES.locale-dir=		SConstruct
-SUBST_SED.locale-dir=		-e 's,share/locale,${PKGLOCALEDIR}/locale,'
 USE_PKGLOCALEDIR=	yes
 
 SUBST_CLASSES+=			python
 SUBST_STAGE.python=		pre-configure
-SUBST_FILES.python=		brushlib/generate.py \
-				SConstruct
-SUBST_SED.python=		-e 's,/usr/bin/env python,${PYTHONBIN},'
-SUBST_SED.python+=		-e 's,%PYTHONBIN%,${PYTHONBIN},'
+SUBST_FILES.python=		SConscript
+SUBST_VARS.python=		PYTHONBIN
+
+LDFLAGS+=	-lintl
 
 REPLACE_BASH=			brushes/label-brush-mypaint.sh
 
 do-build:
 	cd ${WRKSRC} && cd ${BUILD_DIRS} && \
 		${SETENV} ${MAKE_ENV} \
-		${SCONSDIR}/bin/scons prefix=${PREFIX}
+		${SCONSDIR}/bin/scons prefix=${DESTDIR}${PREFIX}
 
 do-install:
 	cd ${WRKSRC} && cd ${INSTALL_DIRS} && \
@@ -51,10 +46,13 @@ do-install:
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/swig2/buildlink3.mk"
+.include "../../textproc/json-c/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../devel/py-gobject/buildlink3.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../lang/python/versioned_dependencies.mk"
 .include "../../lang/python/pyversion.mk"
-.include "../../devel/swig/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/mypaint/PLIST b/graphics/mypaint/PLIST
index 8b666a34ce2..7ae68ac85ed 100644
--- a/graphics/mypaint/PLIST
+++ b/graphics/mypaint/PLIST
@@ -1,107 +1,304 @@
-@comment $NetBSD: PLIST,v 1.2 2011/11/23 11:00:55 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/03/15 04:51:31 ryoon Exp $
 bin/mypaint
+include/libmypaint/glib/mypaint-brush.h
+include/libmypaint/mypaint-brush-settings-gen.h
+include/libmypaint/mypaint-brush-settings.h
+include/libmypaint/mypaint-brush.h
+include/libmypaint/mypaint-config.h
+include/libmypaint/mypaint-fixed-tiled-surface.h
+include/libmypaint/mypaint-glib-compat.h
+include/libmypaint/mypaint-surface.h
+include/libmypaint/mypaint-tiled-surface.h
+lib/libmypaint.a
 lib/mypaint/_mypaintlib.so
+lib/pkgconfig/libmypaint.pc
 share/applications/mypaint.desktop
 share/icons/hicolor/16x16/actions/brush-blend-mode-eraser.png
 share/icons/hicolor/16x16/actions/brush-blend-mode-normal.png
 share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-colorize.png
 share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-eraser.png
 share/icons/hicolor/16x16/actions/mypaint-brush-blend-mode-normal.png
 share/icons/hicolor/16x16/actions/mypaint-brush-blend-modes.png
 share/icons/hicolor/16x16/actions/mypaint-brush-mods-active.png
 share/icons/hicolor/16x16/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/16x16/actions/mypaint-frame.png
+share/icons/hicolor/16x16/actions/mypaint-layer-duplicate.png
+share/icons/hicolor/16x16/actions/mypaint-line-mode-ellipse.png
+share/icons/hicolor/16x16/actions/mypaint-line-mode-freehand.png
+share/icons/hicolor/16x16/actions/mypaint-line-mode-sequence.png
+share/icons/hicolor/16x16/actions/mypaint-line-mode-straight.png
+share/icons/hicolor/16x16/actions/mypaint-line-mode.png
+share/icons/hicolor/16x16/actions/mypaint-move.png
+share/icons/hicolor/16x16/actions/mypaint-symmetry.png
 share/icons/hicolor/16x16/actions/mypaint-tool-brush.png
+share/icons/hicolor/16x16/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/16x16/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/16x16/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/16x16/actions/mypaint-tool-hcywheel.png
+share/icons/hicolor/16x16/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/16x16/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/16x16/actions/mypaint-tool-hue-wheel.png
 share/icons/hicolor/16x16/actions/mypaint-tool-layers.png
+share/icons/hicolor/16x16/actions/mypaint-tool-move-layer.png
+share/icons/hicolor/16x16/actions/mypaint-tool-paint-color.png
 share/icons/hicolor/16x16/actions/mypaint-tool-scratchpad.png
+share/icons/hicolor/16x16/actions/mypaint-view-100.png
+share/icons/hicolor/16x16/actions/mypaint-view-fit.png
+share/icons/hicolor/16x16/actions/mypaint-view-mirror-horizontal.png
+share/icons/hicolor/16x16/actions/mypaint-view-mirror-vertical.png
+share/icons/hicolor/16x16/actions/mypaint-view-pan.png
+share/icons/hicolor/16x16/actions/mypaint-view-rotate-anticlockwise.png
+share/icons/hicolor/16x16/actions/mypaint-view-rotate-clockwise.png
+share/icons/hicolor/16x16/actions/mypaint-view-rotate.png
+share/icons/hicolor/16x16/actions/mypaint-view-zoom-less.png
+share/icons/hicolor/16x16/actions/mypaint-view-zoom-more.png
+share/icons/hicolor/16x16/actions/mypaint-view-zoom.png
 share/icons/hicolor/16x16/apps/mypaint.png
 share/icons/hicolor/22x22/actions/brush-blend-mode-eraser.png
 share/icons/hicolor/22x22/actions/brush-blend-mode-normal.png
 share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-colorize.png
 share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-eraser.png
 share/icons/hicolor/22x22/actions/mypaint-brush-blend-mode-normal.png
 share/icons/hicolor/22x22/actions/mypaint-brush-blend-modes.png
 share/icons/hicolor/22x22/actions/mypaint-brush-mods-active.png
 share/icons/hicolor/22x22/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/22x22/actions/mypaint-frame.png
+share/icons/hicolor/22x22/actions/mypaint-line-mode-ellipse.png
+share/icons/hicolor/22x22/actions/mypaint-line-mode-freehand.png
+share/icons/hicolor/22x22/actions/mypaint-line-mode-sequence.png
+share/icons/hicolor/22x22/actions/mypaint-line-mode-straight.png
+share/icons/hicolor/22x22/actions/mypaint-line-mode.png
+share/icons/hicolor/22x22/actions/mypaint-move.png
+share/icons/hicolor/22x22/actions/mypaint-symmetry.png
 share/icons/hicolor/22x22/actions/mypaint-tool-brush.png
+share/icons/hicolor/22x22/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/22x22/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/22x22/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/22x22/actions/mypaint-tool-hcywheel.png
+share/icons/hicolor/22x22/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/22x22/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/22x22/actions/mypaint-tool-hue-wheel.png
 share/icons/hicolor/22x22/actions/mypaint-tool-layers.png
+share/icons/hicolor/22x22/actions/mypaint-tool-move-layer.png
+share/icons/hicolor/22x22/actions/mypaint-tool-paint-color.png
 share/icons/hicolor/22x22/actions/mypaint-tool-scratchpad.png
+share/icons/hicolor/22x22/actions/mypaint-view-100.png
+share/icons/hicolor/22x22/actions/mypaint-view-fit.png
+share/icons/hicolor/22x22/actions/mypaint-view-mirror-horizontal.png
+share/icons/hicolor/22x22/actions/mypaint-view-mirror-vertical.png
+share/icons/hicolor/22x22/actions/mypaint-view-pan.png
+share/icons/hicolor/22x22/actions/mypaint-view-rotate-anticlockwise.png
+share/icons/hicolor/22x22/actions/mypaint-view-rotate-clockwise.png
+share/icons/hicolor/22x22/actions/mypaint-view-rotate.png
+share/icons/hicolor/22x22/actions/mypaint-view-zoom-less.png
+share/icons/hicolor/22x22/actions/mypaint-view-zoom-more.png
+share/icons/hicolor/22x22/actions/mypaint-view-zoom.png
 share/icons/hicolor/22x22/apps/mypaint.png
 share/icons/hicolor/24x24/actions/brush-blend-mode-eraser.png
 share/icons/hicolor/24x24/actions/brush-blend-mode-normal.png
 share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-colorize.png
 share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-eraser.png
 share/icons/hicolor/24x24/actions/mypaint-brush-blend-mode-normal.png
 share/icons/hicolor/24x24/actions/mypaint-brush-blend-modes.png
 share/icons/hicolor/24x24/actions/mypaint-brush-mods-active.png
 share/icons/hicolor/24x24/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/24x24/actions/mypaint-frame.png
+share/icons/hicolor/24x24/actions/mypaint-line-mode-ellipse.png
+share/icons/hicolor/24x24/actions/mypaint-line-mode-freehand.png
+share/icons/hicolor/24x24/actions/mypaint-line-mode-sequence.png
+share/icons/hicolor/24x24/actions/mypaint-line-mode-straight.png
+share/icons/hicolor/24x24/actions/mypaint-line-mode.png
+share/icons/hicolor/24x24/actions/mypaint-move.png
+share/icons/hicolor/24x24/actions/mypaint-symmetry.png
 share/icons/hicolor/24x24/actions/mypaint-tool-brush.png
+share/icons/hicolor/24x24/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/24x24/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/24x24/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/24x24/actions/mypaint-tool-hcywheel.png
+share/icons/hicolor/24x24/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/24x24/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/24x24/actions/mypaint-tool-hue-wheel.png
 share/icons/hicolor/24x24/actions/mypaint-tool-layers.png
+share/icons/hicolor/24x24/actions/mypaint-tool-move-layer.png
+share/icons/hicolor/24x24/actions/mypaint-tool-paint-color.png
 share/icons/hicolor/24x24/actions/mypaint-tool-scratchpad.png
+share/icons/hicolor/24x24/actions/mypaint-view-100.png
+share/icons/hicolor/24x24/actions/mypaint-view-fit.png
+share/icons/hicolor/24x24/actions/mypaint-view-mirror-horizontal.png
+share/icons/hicolor/24x24/actions/mypaint-view-mirror-vertical.png
+share/icons/hicolor/24x24/actions/mypaint-view-pan.png
+share/icons/hicolor/24x24/actions/mypaint-view-rotate-anticlockwise.png
+share/icons/hicolor/24x24/actions/mypaint-view-rotate-clockwise.png
+share/icons/hicolor/24x24/actions/mypaint-view-rotate.png
+share/icons/hicolor/24x24/actions/mypaint-view-zoom-less.png
+share/icons/hicolor/24x24/actions/mypaint-view-zoom-more.png
+share/icons/hicolor/24x24/actions/mypaint-view-zoom.png
 share/icons/hicolor/24x24/apps/mypaint.png
 share/icons/hicolor/32x32/actions/brush-blend-mode-eraser.png
 share/icons/hicolor/32x32/actions/brush-blend-mode-normal.png
 share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-colorize.png
 share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-eraser.png
 share/icons/hicolor/32x32/actions/mypaint-brush-blend-mode-normal.png
 share/icons/hicolor/32x32/actions/mypaint-brush-blend-modes.png
 share/icons/hicolor/32x32/actions/mypaint-brush-mods-active.png
 share/icons/hicolor/32x32/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/32x32/actions/mypaint-frame.png
+share/icons/hicolor/32x32/actions/mypaint-line-mode-ellipse.png
+share/icons/hicolor/32x32/actions/mypaint-line-mode-freehand.png
+share/icons/hicolor/32x32/actions/mypaint-line-mode-sequence.png
+share/icons/hicolor/32x32/actions/mypaint-line-mode-straight.png
+share/icons/hicolor/32x32/actions/mypaint-line-mode.png
+share/icons/hicolor/32x32/actions/mypaint-move.png
+share/icons/hicolor/32x32/actions/mypaint-symmetry.png
 share/icons/hicolor/32x32/actions/mypaint-tool-brush.png
+share/icons/hicolor/32x32/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/32x32/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/32x32/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/32x32/actions/mypaint-tool-hcywheel.png
+share/icons/hicolor/32x32/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/32x32/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/32x32/actions/mypaint-tool-hue-wheel.png
 share/icons/hicolor/32x32/actions/mypaint-tool-layers.png
+share/icons/hicolor/32x32/actions/mypaint-tool-move-layer.png
+share/icons/hicolor/32x32/actions/mypaint-tool-paint-color.png
 share/icons/hicolor/32x32/actions/mypaint-tool-scratchpad.png
+share/icons/hicolor/32x32/actions/mypaint-view-100.png
+share/icons/hicolor/32x32/actions/mypaint-view-fit.png
+share/icons/hicolor/32x32/actions/mypaint-view-mirror-horizontal.png
+share/icons/hicolor/32x32/actions/mypaint-view-mirror-vertical.png
+share/icons/hicolor/32x32/actions/mypaint-view-pan.png
+share/icons/hicolor/32x32/actions/mypaint-view-rotate-anticlockwise.png
+share/icons/hicolor/32x32/actions/mypaint-view-rotate-clockwise.png
+share/icons/hicolor/32x32/actions/mypaint-view-rotate.png
+share/icons/hicolor/32x32/actions/mypaint-view-zoom-less.png
+share/icons/hicolor/32x32/actions/mypaint-view-zoom-more.png
+share/icons/hicolor/32x32/actions/mypaint-view-zoom.png
 share/icons/hicolor/32x32/apps/mypaint.png
 share/icons/hicolor/48x48/actions/brush-blend-mode-normal.png
 share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-alpha-lock.png
+share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-colorize.png
 share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-eraser.png
 share/icons/hicolor/48x48/actions/mypaint-brush-blend-mode-normal.png
 share/icons/hicolor/48x48/actions/mypaint-brush-blend-modes.png
 share/icons/hicolor/48x48/actions/mypaint-brush-mods-active.png
 share/icons/hicolor/48x48/actions/mypaint-brush-mods-inactive.png
+share/icons/hicolor/48x48/actions/mypaint-frame.png
+share/icons/hicolor/48x48/actions/mypaint-line-mode-ellipse.png
+share/icons/hicolor/48x48/actions/mypaint-line-mode-freehand.png
+share/icons/hicolor/48x48/actions/mypaint-line-mode-sequence.png
+share/icons/hicolor/48x48/actions/mypaint-line-mode-straight.png
+share/icons/hicolor/48x48/actions/mypaint-line-mode.png
+share/icons/hicolor/48x48/actions/mypaint-move.png
+share/icons/hicolor/48x48/actions/mypaint-symmetry.png
 share/icons/hicolor/48x48/actions/mypaint-tool-brush.png
+share/icons/hicolor/48x48/actions/mypaint-tool-color-rgb.png
 share/icons/hicolor/48x48/actions/mypaint-tool-color-triangle.png
+share/icons/hicolor/48x48/actions/mypaint-tool-component-sliders.png
+share/icons/hicolor/48x48/actions/mypaint-tool-hcywheel.png
+share/icons/hicolor/48x48/actions/mypaint-tool-hsvcube.png
+share/icons/hicolor/48x48/actions/mypaint-tool-hsvwheel.png
 share/icons/hicolor/48x48/actions/mypaint-tool-hue-wheel.png
 share/icons/hicolor/48x48/actions/mypaint-tool-layers.png
+share/icons/hicolor/48x48/actions/mypaint-tool-move-layer.png
+share/icons/hicolor/48x48/actions/mypaint-tool-paint-color.png
 share/icons/hicolor/48x48/actions/mypaint-tool-scratchpad.png
+share/icons/hicolor/48x48/actions/mypaint-view-100.png
+share/icons/hicolor/48x48/actions/mypaint-view-fit.png
+share/icons/hicolor/48x48/actions/mypaint-view-mirror-horizontal.png
+share/icons/hicolor/48x48/actions/mypaint-view-mirror-vertical.png
+share/icons/hicolor/48x48/actions/mypaint-view-pan.png
+share/icons/hicolor/48x48/actions/mypaint-view-rotate-anticlockwise.png
+share/icons/hicolor/48x48/actions/mypaint-view-rotate-clockwise.png
+share/icons/hicolor/48x48/actions/mypaint-view-rotate.png
+share/icons/hicolor/48x48/actions/mypaint-view-zoom-less.png
+share/icons/hicolor/48x48/actions/mypaint-view-zoom-more.png
+share/icons/hicolor/48x48/actions/mypaint-view-zoom.png
 share/icons/hicolor/48x48/apps/mypaint.png
 share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-alpha-lock.svg
+share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-colorize.svg
 share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-eraser.svg
 share/icons/hicolor/scalable/actions/mypaint-brush-blend-mode-normal.svg
 share/icons/hicolor/scalable/actions/mypaint-brush-blend-modes.svg
 share/icons/hicolor/scalable/actions/mypaint-brush-mods-active.svg
 share/icons/hicolor/scalable/actions/mypaint-brush-mods-inactive.svg
+share/icons/hicolor/scalable/actions/mypaint-frame.svg
+share/icons/hicolor/scalable/actions/mypaint-line-mode-ellipse.svg
+share/icons/hicolor/scalable/actions/mypaint-line-mode-freehand.svg
+share/icons/hicolor/scalable/actions/mypaint-line-mode-sequence.svg
+share/icons/hicolor/scalable/actions/mypaint-line-mode-straight.svg
+share/icons/hicolor/scalable/actions/mypaint-line-mode.svg
+share/icons/hicolor/scalable/actions/mypaint-move.svg
+share/icons/hicolor/scalable/actions/mypaint-symmetry.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-brush.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-color-rgb.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-color-triangle.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-component-sliders.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-hcywheel.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-hsvcube.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-hsvwheel.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-hue-wheel.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-layers.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-move-layer.svg
+share/icons/hicolor/scalable/actions/mypaint-tool-paint-color.svg
 share/icons/hicolor/scalable/actions/mypaint-tool-scratchpad.svg
+share/icons/hicolor/scalable/actions/mypaint-view-100.svg
+share/icons/hicolor/scalable/actions/mypaint-view-fit.svg
+share/icons/hicolor/scalable/actions/mypaint-view-mirror-horizontal.svg
+share/icons/hicolor/scalable/actions/mypaint-view-mirror-vertical.svg
+share/icons/hicolor/scalable/actions/mypaint-view-pan.svg
+share/icons/hicolor/scalable/actions/mypaint-view-rotate-anticlockwise.svg
+share/icons/hicolor/scalable/actions/mypaint-view-rotate-clockwise.svg
+share/icons/hicolor/scalable/actions/mypaint-view-rotate.svg
+share/icons/hicolor/scalable/actions/mypaint-view-zoom-less.svg
+share/icons/hicolor/scalable/actions/mypaint-view-zoom-more.svg
+share/icons/hicolor/scalable/actions/mypaint-view-zoom.svg
 share/icons/hicolor/scalable/apps/mypaint.svg
+share/locale/cs/LC_MESSAGES/libmypaint.mo
 share/locale/cs/LC_MESSAGES/mypaint.mo
+share/locale/de/LC_MESSAGES/libmypaint.mo
 share/locale/de/LC_MESSAGES/mypaint.mo
+share/locale/en_CA/LC_MESSAGES/libmypaint.mo
 share/locale/en_CA/LC_MESSAGES/mypaint.mo
+share/locale/en_GB/LC_MESSAGES/mypaint.mo
+share/locale/es/LC_MESSAGES/libmypaint.mo
 share/locale/es/LC_MESSAGES/mypaint.mo
+share/locale/fr/LC_MESSAGES/libmypaint.mo
 share/locale/fr/LC_MESSAGES/mypaint.mo
+share/locale/hu/LC_MESSAGES/libmypaint.mo
 share/locale/hu/LC_MESSAGES/mypaint.mo
+share/locale/id/LC_MESSAGES/libmypaint.mo
 share/locale/id/LC_MESSAGES/mypaint.mo
+share/locale/it/LC_MESSAGES/libmypaint.mo
 share/locale/it/LC_MESSAGES/mypaint.mo
+share/locale/ja/LC_MESSAGES/libmypaint.mo
 share/locale/ja/LC_MESSAGES/mypaint.mo
+share/locale/ko/LC_MESSAGES/libmypaint.mo
 share/locale/ko/LC_MESSAGES/mypaint.mo
+share/locale/nb/LC_MESSAGES/libmypaint.mo
 share/locale/nb/LC_MESSAGES/mypaint.mo
+share/locale/nn_NO/LC_MESSAGES/libmypaint.mo
 share/locale/nn_NO/LC_MESSAGES/mypaint.mo
+share/locale/pl/LC_MESSAGES/libmypaint.mo
 share/locale/pl/LC_MESSAGES/mypaint.mo
+share/locale/pt_BR/LC_MESSAGES/libmypaint.mo
 share/locale/pt_BR/LC_MESSAGES/mypaint.mo
+share/locale/ro/LC_MESSAGES/libmypaint.mo
+share/locale/ro/LC_MESSAGES/mypaint.mo
+share/locale/ru/LC_MESSAGES/libmypaint.mo
 share/locale/ru/LC_MESSAGES/mypaint.mo
+share/locale/sl/LC_MESSAGES/libmypaint.mo
 share/locale/sl/LC_MESSAGES/mypaint.mo
+share/locale/sv/LC_MESSAGES/libmypaint.mo
 share/locale/sv/LC_MESSAGES/mypaint.mo
+share/locale/uk/LC_MESSAGES/libmypaint.mo
 share/locale/uk/LC_MESSAGES/mypaint.mo
+share/locale/zh_CN/LC_MESSAGES/libmypaint.mo
 share/locale/zh_CN/LC_MESSAGES/mypaint.mo
+share/locale/zh_TW/LC_MESSAGES/libmypaint.mo
 share/locale/zh_TW/LC_MESSAGES/mypaint.mo
 share/mypaint/backgrounds/01_white.png
 share/mypaint/backgrounds/02_black.png
@@ -210,7 +407,7 @@ share/mypaint/backgrounds/ramon/HR_WaterColor.png
 share/mypaint/backgrounds/ramon/readme_papers.txt
 share/mypaint/backgrounds/squares2.png
 share/mypaint/backgrounds/squares2_blue.png
-share/mypaint/brushes/FX_blender_prev
+share/mypaint/brushes/FX_blender_prev.png
 share/mypaint/brushes/classic/blend+paint.myb
 share/mypaint/brushes/classic/blend+paint_prev.png
 share/mypaint/brushes/classic/blending_knife.myb
@@ -281,79 +478,79 @@ share/mypaint/brushes/classic/textured_ink.myb
 share/mypaint/brushes/classic/textured_ink_prev.png
 share/mypaint/brushes/classic/wet_knife.myb
 share/mypaint/brushes/classic/wet_knife_prev.png
-share/mypaint/brushes/deevad/2B.myb
-share/mypaint/brushes/deevad/2B_prev.png
-share/mypaint/brushes/deevad/4H.myb
-share/mypaint/brushes/deevad/4H_prev.png
+share/mypaint/brushes/deevad/2B_pencil.myb
+share/mypaint/brushes/deevad/2B_pencil_prev.png
+share/mypaint/brushes/deevad/4H_pencil.myb
+share/mypaint/brushes/deevad/4H_pencil_prev.png
 share/mypaint/brushes/deevad/airbrush.myb
 share/mypaint/brushes/deevad/airbrush_prev.png
-share/mypaint/brushes/deevad/artpen.myb
-share/mypaint/brushes/deevad/artpen_prev.png
 share/mypaint/brushes/deevad/ballpen.myb
 share/mypaint/brushes/deevad/ballpen_prev.png
+share/mypaint/brushes/deevad/basic_digital_brush.myb
+share/mypaint/brushes/deevad/basic_digital_brush_prev.png
+share/mypaint/brushes/deevad/basic_digital_brush_smudging.myb
+share/mypaint/brushes/deevad/basic_digital_brush_smudging_prev.png
+share/mypaint/brushes/deevad/basic_digital_knife.myb
+share/mypaint/brushes/deevad/basic_digital_knife_prev.png
+share/mypaint/brushes/deevad/basic_digital_knife_smudging.myb
+share/mypaint/brushes/deevad/basic_digital_knife_smudging_prev.png
 share/mypaint/brushes/deevad/blending.myb
-share/mypaint/brushes/deevad/blending2.myb
-share/mypaint/brushes/deevad/blending2_prev.png
 share/mypaint/brushes/deevad/blending_prev.png
 share/mypaint/brushes/deevad/brush.myb
 share/mypaint/brushes/deevad/brush_prev.png
 share/mypaint/brushes/deevad/chalk.myb
 share/mypaint/brushes/deevad/chalk_prev.png
-share/mypaint/brushes/deevad/charcoal.myb
-share/mypaint/brushes/deevad/charcoal_prev.png
-share/mypaint/brushes/deevad/detail1.myb
-share/mypaint/brushes/deevad/detail1_prev.png
-share/mypaint/brushes/deevad/detail2.myb
-share/mypaint/brushes/deevad/detail2_prev.png
-share/mypaint/brushes/deevad/detail3.myb
-share/mypaint/brushes/deevad/detail3_prev.png
-share/mypaint/brushes/deevad/detail4.myb
-share/mypaint/brushes/deevad/detail4_prev.png
-share/mypaint/brushes/deevad/digital.myb
-share/mypaint/brushes/deevad/digital_prev.png
+share/mypaint/brushes/deevad/detail_brush_large.myb
+share/mypaint/brushes/deevad/detail_brush_large_glazing.myb
+share/mypaint/brushes/deevad/detail_brush_large_glazing_prev.png
+share/mypaint/brushes/deevad/detail_brush_large_prev.png
+share/mypaint/brushes/deevad/detail_brush_thin.myb
+share/mypaint/brushes/deevad/detail_brush_thin_glazing.myb
+share/mypaint/brushes/deevad/detail_brush_thin_glazing_prev.png
+share/mypaint/brushes/deevad/detail_brush_thin_prev.png
 share/mypaint/brushes/deevad/fill.myb
 share/mypaint/brushes/deevad/fill_prev.png
-share/mypaint/brushes/deevad/gpen.myb
-share/mypaint/brushes/deevad/gpen_prev.png
-share/mypaint/brushes/deevad/hard.myb
-share/mypaint/brushes/deevad/hard_prev.png
-share/mypaint/brushes/deevad/kneaded.myb
-share/mypaint/brushes/deevad/kneaded2.myb
-share/mypaint/brushes/deevad/kneaded2_prev.png
-share/mypaint/brushes/deevad/kneaded_prev.png
-share/mypaint/brushes/deevad/knife.myb
-share/mypaint/brushes/deevad/knife_prev.png
-share/mypaint/brushes/deevad/marker.myb
-share/mypaint/brushes/deevad/marker_prev.png
-share/mypaint/brushes/deevad/mixbrush.myb
-share/mypaint/brushes/deevad/mixbrush_prev.png
-share/mypaint/brushes/deevad/mixknife.myb
-share/mypaint/brushes/deevad/mixknife_prev.png
-share/mypaint/brushes/deevad/mop.myb
-share/mypaint/brushes/deevad/mop_prev.png
+share/mypaint/brushes/deevad/grainy_blending.myb
+share/mypaint/brushes/deevad/grainy_blending_prev.png
+share/mypaint/brushes/deevad/kneaded_eraser.myb
+share/mypaint/brushes/deevad/kneaded_eraser_large.myb
+share/mypaint/brushes/deevad/kneaded_eraser_large_prev.png
+share/mypaint/brushes/deevad/kneaded_eraser_prev.png
+share/mypaint/brushes/deevad/large_hard_eraser.myb
+share/mypaint/brushes/deevad/large_hard_eraser_prev.png
+share/mypaint/brushes/deevad/large_watercolor_fringe.myb
+share/mypaint/brushes/deevad/large_watercolor_fringe_prev.png
+share/mypaint/brushes/deevad/liner.myb
+share/mypaint/brushes/deevad/liner_prev.png
+share/mypaint/brushes/deevad/only_water_fringe.myb
+share/mypaint/brushes/deevad/only_water_fringe_prev.png
+share/mypaint/brushes/deevad/pen-note.myb
+share/mypaint/brushes/deevad/pen-note_prev.png
 share/mypaint/brushes/deevad/pen.myb
 share/mypaint/brushes/deevad/pen_prev.png
 share/mypaint/brushes/deevad/readme.txt
-share/mypaint/brushes/deevad/rigger.myb
-share/mypaint/brushes/deevad/rigger2.myb
-share/mypaint/brushes/deevad/rigger2_prev.png
-share/mypaint/brushes/deevad/rigger_prev.png
-share/mypaint/brushes/deevad/sketch.myb
-share/mypaint/brushes/deevad/sketch_prev.png
-share/mypaint/brushes/deevad/sponge.myb
-share/mypaint/brushes/deevad/sponge_prev.png
+share/mypaint/brushes/deevad/rigger_brush.myb
+share/mypaint/brushes/deevad/rigger_brush_prev.png
+share/mypaint/brushes/deevad/rigger_brush_thin.myb
+share/mypaint/brushes/deevad/rigger_brush_thin_prev.png
+share/mypaint/brushes/deevad/rough.myb
+share/mypaint/brushes/deevad/rough_prev.png
+share/mypaint/brushes/deevad/soft-dip-pen.myb
+share/mypaint/brushes/deevad/soft-dip-pen_prev.png
+share/mypaint/brushes/deevad/sponge_smudging.myb
+share/mypaint/brushes/deevad/sponge_smudging_prev.png
 share/mypaint/brushes/deevad/spray.myb
 share/mypaint/brushes/deevad/spray2.myb
 share/mypaint/brushes/deevad/spray2_prev.png
 share/mypaint/brushes/deevad/spray_prev.png
-share/mypaint/brushes/deevad/stick.myb
-share/mypaint/brushes/deevad/stick_prev.png
-share/mypaint/brushes/deevad/water1.myb
-share/mypaint/brushes/deevad/water1_prev.png
-share/mypaint/brushes/deevad/water2.myb
-share/mypaint/brushes/deevad/water2_prev.png
-share/mypaint/brushes/deevad/water3.myb
-share/mypaint/brushes/deevad/water3_prev.png
+share/mypaint/brushes/deevad/thin_hard_eraser.myb
+share/mypaint/brushes/deevad/thin_hard_eraser_prev.png
+share/mypaint/brushes/deevad/thin_watercolor.myb
+share/mypaint/brushes/deevad/thin_watercolor_prev.png
+share/mypaint/brushes/deevad/watercolor_expressive.myb
+share/mypaint/brushes/deevad/watercolor_expressive_prev.png
+share/mypaint/brushes/deevad/watercolor_glazing.myb
+share/mypaint/brushes/deevad/watercolor_glazing_prev.png
 share/mypaint/brushes/experimental/1pixel.myb
 share/mypaint/brushes/experimental/1pixel_prev.png
 share/mypaint/brushes/experimental/DNA_brush.myb
@@ -530,6 +727,7 @@ share/mypaint/brushes/tanda/watercolor-02-paint_prev.png
 share/mypaint/brushes/tanda/watercolor-02-water.myb
 share/mypaint/brushes/tanda/watercolor-02-water_prev.png
 share/mypaint/brushlib/__init__.py
+share/mypaint/brushlib/brushsettings.json
 share/mypaint/brushlib/brushsettings.py
 share/mypaint/brushlib/generate.py
 share/mypaint/gui/__init__.py
@@ -540,10 +738,27 @@ share/mypaint/gui/brushmanager.py
 share/mypaint/gui/brushmodifier.py
 share/mypaint/gui/brushselectionwindow.py
 share/mypaint/gui/brushsettingswindow.py
-share/mypaint/gui/colorhistory.py
+share/mypaint/gui/buttonmap.py
+share/mypaint/gui/canvasevent.py
 share/mypaint/gui/colorpicker.py
-share/mypaint/gui/colorsamplerwindow.py
+share/mypaint/gui/colors/__init__.py
+share/mypaint/gui/colors/adjbases.py
+share/mypaint/gui/colors/bases.py
+share/mypaint/gui/colors/combined.py
+share/mypaint/gui/colors/geom.py
+share/mypaint/gui/colors/hcywheel.py
+share/mypaint/gui/colors/hsvcube.py
+share/mypaint/gui/colors/hsvtriangle.py
+share/mypaint/gui/colors/hsvwheel.py
+share/mypaint/gui/colors/palette.py
+share/mypaint/gui/colors/paletteview.py
+share/mypaint/gui/colors/picker.py
+share/mypaint/gui/colors/sliders.py
+share/mypaint/gui/colors/uicolor.py
+share/mypaint/gui/colors/uimisc.py
+share/mypaint/gui/colors/util.py
 share/mypaint/gui/colorselectionwindow.py
+share/mypaint/gui/colorwindow.py
 share/mypaint/gui/cursor.py
 share/mypaint/gui/curve.py
 share/mypaint/gui/dialogs.py
@@ -556,26 +771,32 @@ share/mypaint/gui/framewindow.py
 share/mypaint/gui/functionwindow.py
 share/mypaint/gui/gtkexcepthook.py
 share/mypaint/gui/historypopup.py
-share/mypaint/gui/hsvcompat.py
 share/mypaint/gui/inputtestwindow.py
 share/mypaint/gui/keyboard.py
 share/mypaint/gui/layerswindow.py
 share/mypaint/gui/layout.py
+share/mypaint/gui/linemode.py
 share/mypaint/gui/main.py
 share/mypaint/gui/menu.xml
+share/mypaint/gui/mypaint.xml
+share/mypaint/gui/overlays.py
 share/mypaint/gui/pixbuflist.py
 share/mypaint/gui/preferenceswindow.py
+share/mypaint/gui/pygtkcompat.py
 share/mypaint/gui/scratchwindow.py
 share/mypaint/gui/spinbox.py
 share/mypaint/gui/stategroup.py
-share/mypaint/gui/stock.py
+share/mypaint/gui/symmetry.py
 share/mypaint/gui/tileddrawwidget.py
 share/mypaint/gui/toolbar-blendmodes.xml
 share/mypaint/gui/toolbar-edit.xml
 share/mypaint/gui/toolbar-file.xml
+share/mypaint/gui/toolbar-linemodes.xml
 share/mypaint/gui/toolbar-scrap.xml
 share/mypaint/gui/toolbar-subwindows.xml
-share/mypaint/gui/toolbar-view.xml
+share/mypaint/gui/toolbar-view-manips.xml
+share/mypaint/gui/toolbar-view-modes.xml
+share/mypaint/gui/toolbar-view-resets.xml
 share/mypaint/gui/toolbar.py
 share/mypaint/gui/toolbar.xml
 share/mypaint/gui/widgets.py
@@ -583,6 +804,7 @@ share/mypaint/gui/windowing.py
 share/mypaint/lib/__init__.py
 share/mypaint/lib/backgroundsurface.py
 share/mypaint/lib/brush.py
+share/mypaint/lib/brushes_migrate_json.py
 share/mypaint/lib/command.py
 share/mypaint/lib/document.py
 share/mypaint/lib/helpers.py
@@ -594,17 +816,44 @@ share/mypaint/lib/scratchpad_palette.py
 share/mypaint/lib/stroke.py
 share/mypaint/lib/strokemap.py
 share/mypaint/lib/tiledsurface.py
+share/mypaint/palettes/All_color_choice.gpl
+share/mypaint/palettes/Browns_And_Yellows.gpl
+share/mypaint/palettes/Classic_4.gpl
+share/mypaint/palettes/Cool_Colors.gpl
+share/mypaint/palettes/Creative_Commons.gpl
+share/mypaint/palettes/GIMP_Default.gpl
+share/mypaint/palettes/Gnome_Palette.gpl
+share/mypaint/palettes/Greys16.gpl
+share/mypaint/palettes/Muted.gpl
+share/mypaint/palettes/MyPaint_Default.gpl
+share/mypaint/palettes/Pastels.gpl
+share/mypaint/palettes/Reds_And_Purples.gpl
+share/mypaint/palettes/Tango_Palette.gpl
+share/mypaint/palettes/Ubuntu.gpl
+share/mypaint/palettes/Visibone.gpl
+share/mypaint/palettes/Visibone_2.gpl
+share/mypaint/palettes/Warm_Colors.gpl
+share/mypaint/palettes/Watercolor.gpl
+share/mypaint/palettes/Zenburn.gpl
+share/mypaint/pixmaps/crosshair_closed.png
+share/mypaint/pixmaps/cursor_arrow.png
+share/mypaint/pixmaps/cursor_arrow_forbidden.png
 share/mypaint/pixmaps/cursor_color_picker.png
+share/mypaint/pixmaps/cursor_crosshair_open.png
+share/mypaint/pixmaps/cursor_crosshair_precise_open.png
+share/mypaint/pixmaps/cursor_forbidden_everywhere.png
+share/mypaint/pixmaps/cursor_hand_closed.png
+share/mypaint/pixmaps/cursor_hand_open.png
+share/mypaint/pixmaps/cursor_move_n_s.png
+share/mypaint/pixmaps/cursor_move_ne_sw.png
+share/mypaint/pixmaps/cursor_move_nw_se.png
+share/mypaint/pixmaps/cursor_move_w_e.png
+share/mypaint/pixmaps/cursor_pencil.png
 share/mypaint/pixmaps/eye_closed.png
 share/mypaint/pixmaps/eye_open.png
 share/mypaint/pixmaps/layer_duplicate.png
+share/mypaint/pixmaps/layers.png
 share/mypaint/pixmaps/lock_closed.png
 share/mypaint/pixmaps/lock_open.png
 share/mypaint/pixmaps/mypaint_logo.png
 share/mypaint/pixmaps/plus.png
-share/mypaint/pixmaps/tool_brushSelectionWindow.png
-share/mypaint/pixmaps/tool_colorSamplerWindow.png
-share/mypaint/pixmaps/tool_colorSelectionWindow.png
-share/mypaint/pixmaps/tool_layersWindow.png
-share/mypaint/pixmaps/tool_scratchWindow.png
-share/mypaint/pixmaps/tool_scratchpadWindow.png
diff --git a/graphics/mypaint/distinfo b/graphics/mypaint/distinfo
index 56dfbdccc80..ee85bd780de 100644
--- a/graphics/mypaint/distinfo
+++ b/graphics/mypaint/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.6 2014/10/17 22:01:25 joerg Exp $
+$NetBSD: distinfo,v 1.7 2015/03/15 04:51:31 ryoon Exp $
 
-SHA1 (mypaint-1.0.0.tar.bz2) = 5f9221304bb8becd642b00d94af947edf1e18844
-RMD160 (mypaint-1.0.0.tar.bz2) = 6d3ff0f5c16e18b006f6449e9591067bd29ed3c5
-Size (mypaint-1.0.0.tar.bz2) = 36748957 bytes
-SHA1 (patch-SConstruct) = 374416991833fd3cb4f99f66cefee96e45e45161
-SHA1 (patch-lib_SConscript) = f075c48ffa1fcc7671f080f7125c186c9cc4392a
+SHA1 (mypaint-1.1.0.tar.bz2) = 9e4f0bc2cee6c369f1a40d7c24435b7c26cc3795
+RMD160 (mypaint-1.1.0.tar.bz2) = c34aaf96c66fd62117379b6f2553645c94501fae
+Size (mypaint-1.1.0.tar.bz2) = 37416388 bytes
+SHA1 (patch-SConscript) = a1027dc48d9ccde6e8c273e7b28611bc9338534c
+SHA1 (patch-SConstruct) = 11111493804031c54b62f36b7eb290fae49d3630
+SHA1 (patch-brushlib_SConscript) = afab91876d916f5497017b3a4280d9d26afd280b
+SHA1 (patch-lib_SConscript) = 4f476bb0daf8bbb21a6a11cf1acc662c023f4140
 SHA1 (patch-lib_colorchanger__crossed__bowl.hpp) = b64b8695fe8b787df94ddc588a714b991954084b
diff --git a/graphics/mypaint/patches/patch-SConscript b/graphics/mypaint/patches/patch-SConscript
new file mode 100644
index 00000000000..5efd09cd5b3
--- /dev/null
+++ b/graphics/mypaint/patches/patch-SConscript
@@ -0,0 +1,13 @@
+$NetBSD: patch-SConscript,v 1.1 2015/03/15 04:51:31 ryoon Exp $
+
+--- SConscript.orig	2012-12-31 17:03:38.000000000 +0000
++++ SConscript
+@@ -19,7 +19,7 @@ except OSError:
+ 
+ def burn_python_version(target, source, env):
+     # make sure we run the python version that we built the extension modules for
+-    s =  '#!/usr/bin/env ' + env['python_binary'] + '\n'
++    s =  '#! @PYTHONBIN@' + '\n'
+     s += 5*'#\n'
+     s += '# DO NOT EDIT - edit %s instead\n' % source[0]
+     s += 5*'#\n'
diff --git a/graphics/mypaint/patches/patch-SConstruct b/graphics/mypaint/patches/patch-SConstruct
index 07f667a8a71..f712afa4f87 100644
--- a/graphics/mypaint/patches/patch-SConstruct
+++ b/graphics/mypaint/patches/patch-SConstruct
@@ -1,9 +1,9 @@
-$NetBSD: patch-SConstruct,v 1.2 2012/12/19 11:25:31 ryoon Exp $
+$NetBSD: patch-SConstruct,v 1.3 2015/03/15 04:51:31 ryoon Exp $
 
 * Set python interpreter
 * From http://dev.gentoo.org/~vapier/scons-blows.txt, to respect LDFLAGS
 
---- SConstruct.orig	2011-11-22 20:27:03.000000000 +0000
+--- SConstruct.orig	2012-12-31 17:03:38.000000000 +0000
 +++ SConstruct
 @@ -1,4 +1,5 @@
  import os, sys
@@ -11,22 +11,35 @@ $NetBSD: patch-SConstruct,v 1.2 2012/12/19 11:25:31 ryoon Exp $
  from os.path import join, basename
  from SCons.Script.SConscript import SConsEnvironment
  
-@@ -72,6 +73,9 @@ if env['debug']:
-     env.Append(CPPDEFINES='HEAVY_DEBUG')
-     env.Append(CCFLAGS='-O0', LINKFLAGS='-O0')
+@@ -39,7 +40,7 @@ opts.Add('python_config', 'python-config
+ 
+ tools = ['default', 'textfile']
+ 
+-env = Environment(ENV=os.environ, options=opts, tools=tools)
++env = Environment(ENV=os.environ, options=opts, tools=tools, **dict((k, v.split()) for k, v in ARGUMENTS.iteritems()))
+ print('building for %r (use scons python_binary=xxx to change)' % env['python_binary'])
+ print('using %r (use scons python_config=xxx to change)' % env['python_config'])
+ if sys.platform == "win32":
+@@ -47,9 +48,9 @@ if sys.platform == "win32":
+     env = Environment(tools=tools + ['mingw'], ENV=os.environ, options=opts)
+ opts.Update(env)
+ 
+-env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings')
+-env.Append(CCFLAGS='-Wall')
+-env.Append(CFLAGS='-std=c99')
++env.Append(CXXFLAGS=['-Wall', '-Wno-sign-compare', '-Wno-write-strings'])
++env.Append(CCFLAGS=['-Wall'])
++env.Append(CFLAGS=['-std=c99'])
+ 
+ # Define strdup() in string.h under glibc >= 2.10 (POSIX.1-2008)
+ env.Append(CFLAGS='-D_POSIX_C_SOURCE=200809L')
+@@ -67,6 +68,9 @@ else:
+ if env['enable_profiling'] or env['debug']:
+     env.Append(CCFLAGS='-g')
  
 +if os.environ.has_key('LDFLAGS'):
 +    env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
 +
  #env.Append(CCFLAGS='-fno-inline', LINKFLAGS='-fno-inline')
  
- Export('env', 'python')
-@@ -81,7 +85,7 @@ languages = SConscript('po/SConscript')
- 
- def burn_python_version(target, source, env):
-     # make sure we run the python version that we built the extension modules for
--    s =  '#!/usr/bin/env ' + python + '\n'
-+    s =  '#!%PYTHONBIN%\n'
-     s += 5*'#\n'
-     s += '# DO NOT EDIT - edit %s instead\n' % source[0]
-     s += 5*'#\n'
+ # Look up libraries dependencies relative to the library
diff --git a/graphics/mypaint/patches/patch-brushlib_SConscript b/graphics/mypaint/patches/patch-brushlib_SConscript
new file mode 100644
index 00000000000..4ddbd6403be
--- /dev/null
+++ b/graphics/mypaint/patches/patch-brushlib_SConscript
@@ -0,0 +1,13 @@
+$NetBSD: patch-brushlib_SConscript,v 1.1 2015/03/15 04:51:31 ryoon Exp $
+
+--- brushlib/SConscript.orig	2012-12-31 17:03:38.000000000 +0000
++++ brushlib/SConscript
+@@ -73,7 +73,7 @@ if env['enable_docs']:
+ 
+ env.Append(CPPPATH='./')
+ 
+-pkg_deps = ['json']
++pkg_deps = ['json-c']
+ libs = ['m']
+ linkflags = []
+ 
diff --git a/graphics/mypaint/patches/patch-lib_SConscript b/graphics/mypaint/patches/patch-lib_SConscript
index 27339e76adc..dc5f509d7d6 100644
--- a/graphics/mypaint/patches/patch-lib_SConscript
+++ b/graphics/mypaint/patches/patch-lib_SConscript
@@ -1,12 +1,13 @@
-$NetBSD: patch-lib_SConscript,v 1.1 2014/10/17 22:01:25 joerg Exp $
+$NetBSD: patch-lib_SConscript,v 1.2 2015/03/15 04:51:31 ryoon Exp $
 
---- lib/SConscript.orig	2014-10-17 20:31:31.000000000 +0000
+--- lib/SConscript.orig	2012-12-31 17:03:38.000000000 +0000
 +++ lib/SConscript
-@@ -17,6 +17,6 @@ if sys.platform == "win32": # there 's a
- elif sys.platform == "darwin":
-     module = env.SharedLibrary('_mypaintlib', Split(src), SHLIBPREFIX="", SHLIBSUFFIX=".so")
- else:
--    module = env.SharedLibrary('_mypaintlib', Split(src), SHLIBPREFIX="")
-+    module = env.SharedLibrary('_mypaintlib', Split(src), SHLIBPREFIX="", CCFLAGS = ['-O2', '-fPIC'])
- 
- Return('module')
+@@ -18,7 +18,7 @@ env = mypaintlib_env
+ # I have given up. Scons just can't get the dependencies right with those
+ # code generators. Let's give scons a "normal" c++ project to dependency-scan.
+ swig_opts = '-DHAVE_GEGL' if env['enable_gegl'] else ''
+-if env.Execute('swig -o mypaintlib_wrap.cpp -noproxydel -python -c++ %s mypaintlib.i' % swig_opts):
++if env.Execute('swig2.0 -o mypaintlib_wrap.cpp -noproxydel -python -c++ %s mypaintlib.i' % swig_opts):
+     Exit(1)
+ env.Clean('.', 'mypaintlib_wrap.cpp')
+ env.Clean('.', 'mypaintlib.py')