Update to 0.9.21:

Tux Paint 0.9.21 features nearly two dozen new Magic tools, as well
as updates to old favorites. Many of these were developed by six
students from around the globe during Google's 2008 Summer of Code
program, under the mentorship of Tux Paint developers.

Exciting new Magic tools include intelligent train tracks that
automatically connect when their paths cross, a realistic rainbow
tool, a fisheye lens effect, edge and silhouette tracing tools,
various string art effects, and a tool to fold the edges of your
drawing up from the corners. There is also a brush that paints with
'toothpaste', and others that paint with confetti, rain, snowballs,
and snowflakes! Additionally, many classic Magic tools (like Blur
and Tint) can now affect the entire drawing, instead of just a
selected area.

Coloring-book style Starter Images are now easier to make. Images
with transparency (alpha channel) are still supported, but
additionally, if no transparent layer is found, Tux Paint will
assume that white is the background color. This means you can now
draw or scan any simple black-and-white image and use it as a Tux
Paint Starter Image!

New in Tux Paint 0.9.21, the Text tool now supports bidirectional
languages like Hebrew and Arabic, thanks to the FriBidi library.
Tux Paint has also been translated to two new languages, Shuswap
and Songhay, and many other translations have been updated.

On Linux, environment variables (like "$HOME") may now be used when
setting directories for saving images or finding data files.

And of course, Tux Paint 0.9.21 incorporates a number of minor
improvements and bug fixes requested by the Tux Paint community.
For example, Tux Paint no longer drops out of fullscreen mode in
Windows if the [Windows] key is pressed (XP, 2000 and Vista only),
and it brings up an error window if it fails to print.

6 files changed, 411 insertions, 161 deletions

diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 3f44b74629b..d171ab2cbdc 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.78 2014/05/05 00:48:00 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.79 2014/08/17 09:42:27 wiz Exp $
 
-DISTNAME=	tuxpaint-0.9.17
-PKGREVISION=	29
+DISTNAME=	tuxpaint-0.9.21
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.tuxpaint.org/
 COMMENT=	Drawing program for small children
+# program itself is gnu-gpl-v2, other licenses are packaged fonts
+LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2.1 AND public-domain AND modified-bsd
 
 USE_TOOLS+=		gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES
@@ -23,25 +23,39 @@ CONFLICTS+=		tuxpaint-stamps<2003.12.23
 BROKEN_GETTEXT_DETECTION=	yes
 
 PKG_SYSCONFSUBDIR=	tuxpaint
-MAKE_ENV+=		CONFDIR=${PKG_SYSCONFDIR:Q} CP=${CP:Q} CHMOD=${CHMOD:Q}
+MAKE_FLAGS+=		CONFDIR=${PKG_SYSCONFDIR:Q}
+MAKE_FLAGS+=		CP=${CP:Q}
+MAKE_FLAGS+=		CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=		CPPFLAGS=${CPPFLAGS:Q}
+MAKE_FLAGS+=		LDFLAGS=${LDFLAGS:Q}
+MAKE_FLAGS+=		CHMOD=${CHMOD:Q}
+MAKE_FLAGS+=		PREFIX=${PREFIX}
+MAKE_FLAGS+=		MAN_PREFIX=$(DESTDIR)$(PREFIX)/${PKGMANDIR}/
 EGDIR=			${PREFIX}/share/examples/tuxpaint
 CONF_FILES=		${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf
 
 INSTALL_MAKE_FLAGS+=	PKG_ROOT=${DESTDIR}
 
+.include "../../mk/bsd.fast.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+CPPFLAGS+=		-DHAVE_STRCASESTR
+.endif
+
 # this uses iconv and png functions directly, so link against them
 # explicitly.
-MAKE_ENV+=		LIBS=${LIBS:M*:Q}
+MAKE_FLAGS+=		LIBS=${LIBS:M*:Q}
 LIBS+=			-liconv
 LIBS+=			-lpng
 LIBS.SunOS+=		-lsocket -lnsl
 
 post-install:
-	-${FIND} ${DESTDIR}${PREFIX}/share/doc/tuxpaint -name CVS -exec ${RM} -r {} \; 2>/dev/null
-	-${FIND} ${DESTDIR}${PREFIX}/share/tuxpaint -name CVS -exec ${RM} -r {} \; 2>/dev/null
+	${RM} -f ${DESTDIR}${PREFIX}/share/tuxpaint/fonts/locale/zh_tw_docs/maketuxfont.py
+	${RM} -f ${DESTDIR}${PREFIX}/share/tuxpaint/fonts/locale/zh_tw_docs/tuxpaintsubset.pe
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../devel/SDL_ttf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/graphics/tuxpaint/PLIST b/graphics/tuxpaint/PLIST
index a0077c0df55..3fd742af508 100644
--- a/graphics/tuxpaint/PLIST
+++ b/graphics/tuxpaint/PLIST
@@ -1,9 +1,58 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 17:59:29 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14 2014/08/17 09:42:27 wiz Exp $
+X11R6/include/X11/pixmaps/tuxpaint.xpm
+bin/tp-magic-config
 bin/tuxpaint
 bin/tuxpaint-import
+include/tuxpaint/tp_magic_api.h
+lib/tuxpaint/plugins/alien.so
+lib/tuxpaint/plugins/blocks_chalk_drip.so
+lib/tuxpaint/plugins/blur.so
+lib/tuxpaint/plugins/bricks.so
+lib/tuxpaint/plugins/calligraphy.so
+lib/tuxpaint/plugins/cartoon.so
+lib/tuxpaint/plugins/confetti.so
+lib/tuxpaint/plugins/distortion.so
+lib/tuxpaint/plugins/emboss.so
+lib/tuxpaint/plugins/fade_darken.so
+lib/tuxpaint/plugins/fill.so
+lib/tuxpaint/plugins/fisheye.so
+lib/tuxpaint/plugins/flower.so
+lib/tuxpaint/plugins/foam.so
+lib/tuxpaint/plugins/fold.so
+lib/tuxpaint/plugins/glasstile.so
+lib/tuxpaint/plugins/grass.so
+lib/tuxpaint/plugins/kalidescope.so
+lib/tuxpaint/plugins/light.so
+lib/tuxpaint/plugins/metalpaint.so
+lib/tuxpaint/plugins/mirror_flip.so
+lib/tuxpaint/plugins/mosaic.so
+lib/tuxpaint/plugins/negative.so
+lib/tuxpaint/plugins/noise.so
+lib/tuxpaint/plugins/puzzle.so
+lib/tuxpaint/plugins/rails.so
+lib/tuxpaint/plugins/rain.so
+lib/tuxpaint/plugins/rainbow.so
+lib/tuxpaint/plugins/realrainbow.so
+lib/tuxpaint/plugins/ripples.so
+lib/tuxpaint/plugins/rosette.so
+lib/tuxpaint/plugins/sharpen.so
+lib/tuxpaint/plugins/shift.so
+lib/tuxpaint/plugins/smudge.so
+lib/tuxpaint/plugins/snow.so
+lib/tuxpaint/plugins/string.so
+lib/tuxpaint/plugins/tint.so
+lib/tuxpaint/plugins/toothpaste.so
+lib/tuxpaint/plugins/tornado.so
+lib/tuxpaint/plugins/tv.so
+lib/tuxpaint/plugins/waves.so
+man/man1/tp-magic-config.1
 man/man1/tuxpaint-import.1
 man/man1/tuxpaint.1
 man/pl/man1/tuxpaint.1
+share/doc/tuxpaint-dev/Makefile
+share/doc/tuxpaint-dev/README.txt
+share/doc/tuxpaint-dev/html/README.html
+share/doc/tuxpaint-dev/tp_magic_example.c
 share/doc/tuxpaint/ADVANCED-STAMPS-HOWTO.txt
 share/doc/tuxpaint/AUTHORS.txt
 share/doc/tuxpaint/CHANGES.txt
@@ -90,13 +139,11 @@ share/doc/tuxpaint/el/OPTIONS.txt
 share/doc/tuxpaint/el/PNG.txt
 share/doc/tuxpaint/el/README.txt
 share/doc/tuxpaint/es/AUTORES.txt
-share/doc/tuxpaint/es/CONTRIBUYENTES.txt
 share/doc/tuxpaint/es/COPIADO.txt
 share/doc/tuxpaint/es/FAQ.txt
 share/doc/tuxpaint/es/INSTALACION.txt
 share/doc/tuxpaint/es/LEEME.txt
 share/doc/tuxpaint/es/OPCIONES.txt
-share/doc/tuxpaint/es/OPTIONS.txt
 share/doc/tuxpaint/es/PNG.txt
 share/doc/tuxpaint/es/html/LEEME.html
 share/doc/tuxpaint/es/html/OPCIONES.html
@@ -296,6 +343,111 @@ share/doc/tuxpaint/lt/INSTALL.txt
 share/doc/tuxpaint/lt/OPTIONS.txt
 share/doc/tuxpaint/lt/PNG.txt
 share/doc/tuxpaint/lt/README.txt
+share/doc/tuxpaint/magic-docs/Makefile
+share/doc/tuxpaint/magic-docs/blocks.txt
+share/doc/tuxpaint/magic-docs/blur.txt
+share/doc/tuxpaint/magic-docs/bricks.txt
+share/doc/tuxpaint/magic-docs/calligraphy.txt
+share/doc/tuxpaint/magic-docs/cartoon.txt
+share/doc/tuxpaint/magic-docs/chalk.txt
+share/doc/tuxpaint/magic-docs/colorandwhite.txt
+share/doc/tuxpaint/magic-docs/colorshift.txt
+share/doc/tuxpaint/magic-docs/confetti.txt
+share/doc/tuxpaint/magic-docs/darken.txt
+share/doc/tuxpaint/magic-docs/distortion.txt
+share/doc/tuxpaint/magic-docs/drip.txt
+share/doc/tuxpaint/magic-docs/edges.txt
+share/doc/tuxpaint/magic-docs/emboss.txt
+share/doc/tuxpaint/magic-docs/fill.txt
+share/doc/tuxpaint/magic-docs/fisheye.txt
+share/doc/tuxpaint/magic-docs/flip.txt
+share/doc/tuxpaint/magic-docs/flower.txt
+share/doc/tuxpaint/magic-docs/foam.txt
+share/doc/tuxpaint/magic-docs/fold.txt
+share/doc/tuxpaint/magic-docs/glasstile.txt
+share/doc/tuxpaint/magic-docs/grass.txt
+share/doc/tuxpaint/magic-docs/html/blocks.html
+share/doc/tuxpaint/magic-docs/html/blur.html
+share/doc/tuxpaint/magic-docs/html/bricks.html
+share/doc/tuxpaint/magic-docs/html/calligraphy.html
+share/doc/tuxpaint/magic-docs/html/cartoon.html
+share/doc/tuxpaint/magic-docs/html/chalk.html
+share/doc/tuxpaint/magic-docs/html/colorandwhite.html
+share/doc/tuxpaint/magic-docs/html/colorshift.html
+share/doc/tuxpaint/magic-docs/html/confetti.html
+share/doc/tuxpaint/magic-docs/html/darken.html
+share/doc/tuxpaint/magic-docs/html/distortion.html
+share/doc/tuxpaint/magic-docs/html/drip.html
+share/doc/tuxpaint/magic-docs/html/edges.html
+share/doc/tuxpaint/magic-docs/html/emboss.html
+share/doc/tuxpaint/magic-docs/html/fill.html
+share/doc/tuxpaint/magic-docs/html/fisheye.html
+share/doc/tuxpaint/magic-docs/html/flip.html
+share/doc/tuxpaint/magic-docs/html/flower.html
+share/doc/tuxpaint/magic-docs/html/foam.html
+share/doc/tuxpaint/magic-docs/html/fold.html
+share/doc/tuxpaint/magic-docs/html/glasstile.html
+share/doc/tuxpaint/magic-docs/html/grass.html
+share/doc/tuxpaint/magic-docs/html/index.html
+share/doc/tuxpaint/magic-docs/html/kaleidoscope.html
+share/doc/tuxpaint/magic-docs/html/light.html
+share/doc/tuxpaint/magic-docs/html/lighten.html
+share/doc/tuxpaint/magic-docs/html/metalpaint.html
+share/doc/tuxpaint/magic-docs/html/mirror.html
+share/doc/tuxpaint/magic-docs/html/negative.html
+share/doc/tuxpaint/magic-docs/html/noise.html
+share/doc/tuxpaint/magic-docs/html/picasso.html
+share/doc/tuxpaint/magic-docs/html/rails.html
+share/doc/tuxpaint/magic-docs/html/rain.html
+share/doc/tuxpaint/magic-docs/html/rainbow.html
+share/doc/tuxpaint/magic-docs/html/realrainbow.html
+share/doc/tuxpaint/magic-docs/html/ripples.html
+share/doc/tuxpaint/magic-docs/html/rosette.html
+share/doc/tuxpaint/magic-docs/html/sharpen.html
+share/doc/tuxpaint/magic-docs/html/shift.html
+share/doc/tuxpaint/magic-docs/html/silhouette.html
+share/doc/tuxpaint/magic-docs/html/smudge.html
+share/doc/tuxpaint/magic-docs/html/snowball.html
+share/doc/tuxpaint/magic-docs/html/snowflake.html
+share/doc/tuxpaint/magic-docs/html/stringcorner.html
+share/doc/tuxpaint/magic-docs/html/stringedges.html
+share/doc/tuxpaint/magic-docs/html/stringv.html
+share/doc/tuxpaint/magic-docs/html/tint.html
+share/doc/tuxpaint/magic-docs/html/toothpaste.html
+share/doc/tuxpaint/magic-docs/html/tv.html
+share/doc/tuxpaint/magic-docs/html/wavelets.html
+share/doc/tuxpaint/magic-docs/html/waves.html
+share/doc/tuxpaint/magic-docs/index.txt
+share/doc/tuxpaint/magic-docs/kaleidoscope.txt
+share/doc/tuxpaint/magic-docs/light.txt
+share/doc/tuxpaint/magic-docs/lighten.txt
+share/doc/tuxpaint/magic-docs/metalpaint.txt
+share/doc/tuxpaint/magic-docs/mirror.txt
+share/doc/tuxpaint/magic-docs/negative.txt
+share/doc/tuxpaint/magic-docs/noise.txt
+share/doc/tuxpaint/magic-docs/picasso.txt
+share/doc/tuxpaint/magic-docs/rails.txt
+share/doc/tuxpaint/magic-docs/rain.txt
+share/doc/tuxpaint/magic-docs/rainbow.txt
+share/doc/tuxpaint/magic-docs/realrainbow.txt
+share/doc/tuxpaint/magic-docs/ripples.txt
+share/doc/tuxpaint/magic-docs/rosette.txt
+share/doc/tuxpaint/magic-docs/sharpen.txt
+share/doc/tuxpaint/magic-docs/shift.txt
+share/doc/tuxpaint/magic-docs/silhouette.txt
+share/doc/tuxpaint/magic-docs/smudge.txt
+share/doc/tuxpaint/magic-docs/snowball.txt
+share/doc/tuxpaint/magic-docs/snowflake.txt
+share/doc/tuxpaint/magic-docs/src/Makefile
+share/doc/tuxpaint/magic-docs/src/magic-docs.php
+share/doc/tuxpaint/magic-docs/stringcorner.txt
+share/doc/tuxpaint/magic-docs/stringedges.txt
+share/doc/tuxpaint/magic-docs/stringv.txt
+share/doc/tuxpaint/magic-docs/tint.txt
+share/doc/tuxpaint/magic-docs/toothpaste.txt
+share/doc/tuxpaint/magic-docs/tv.txt
+share/doc/tuxpaint/magic-docs/wavelets.txt
+share/doc/tuxpaint/magic-docs/waves.txt
 share/doc/tuxpaint/ms/COPYING.txt
 share/doc/tuxpaint/nb/AUTHORS.txt
 share/doc/tuxpaint/nb/COPYING.txt
@@ -340,9 +492,15 @@ share/doc/tuxpaint/ro/OPTIONS.txt
 share/doc/tuxpaint/ro/PNG.txt
 share/doc/tuxpaint/ro/README.txt
 share/doc/tuxpaint/ru/COPYING.txt
+share/doc/tuxpaint/ru/EXTENDING.txt
+share/doc/tuxpaint/ru/FAQ.txt
+share/doc/tuxpaint/ru/INSTALL.txt
 share/doc/tuxpaint/ru/Makefile
 share/doc/tuxpaint/ru/OPTIONS.txt
+share/doc/tuxpaint/ru/PNG.txt
 share/doc/tuxpaint/ru/README.txt
+share/doc/tuxpaint/ru/html/EXTENDING.html
+share/doc/tuxpaint/ru/html/FAQ.html
 share/doc/tuxpaint/ru/html/OPTIONS.html
 share/doc/tuxpaint/ru/html/README.html
 share/doc/tuxpaint/sk/COPYING.txt
@@ -368,21 +526,38 @@ share/doc/tuxpaint/tr/INSTALL.txt
 share/doc/tuxpaint/tr/OPTIONS.txt
 share/doc/tuxpaint/tr/PNG.txt
 share/doc/tuxpaint/tr/README.txt
+share/doc/tuxpaint/uk/COPYING.txt
+share/doc/tuxpaint/uk/EXTENDING.txt
+share/doc/tuxpaint/uk/FAQ.txt
+share/doc/tuxpaint/uk/INSTALL.txt
+share/doc/tuxpaint/uk/OPTIONS.txt
+share/doc/tuxpaint/uk/PNG.txt
+share/doc/tuxpaint/uk/README.txt
 share/doc/tuxpaint/wa/COPYING.txt
 share/doc/tuxpaint/zh_cn/COPYING.html
+share/doc/tuxpaint/zh_cn/FAQ.txt
+share/doc/tuxpaint/zh_cn/Makefile
+share/doc/tuxpaint/zh_cn/README.txt
+share/doc/tuxpaint/zh_cn/html/FAQ.html
+share/doc/tuxpaint/zh_cn/html/README.html
 share/doc/tuxpaint/zh_tw/AUTHORS.txt
 share/doc/tuxpaint/zh_tw/COPYING.txt
 share/doc/tuxpaint/zh_tw/FAQ.txt
 share/doc/tuxpaint/zh_tw/GNU_GPL_Chinese.html
 share/doc/tuxpaint/zh_tw/INSTALL.txt
+share/doc/tuxpaint/zh_tw/Makefile
 share/doc/tuxpaint/zh_tw/OPTIONS.txt
 share/doc/tuxpaint/zh_tw/PNG.txt
 share/doc/tuxpaint/zh_tw/README.txt
 share/doc/tuxpaint/zh_tw/html/OPTIONS.html
 share/doc/tuxpaint/zh_tw/html/README.html
+share/doc/tuxpaint/zh_tw/mkTuxpaintIM.py
+share/doc/tuxpaint/zh_tw/phone.cin
 share/examples/tuxpaint/tuxpaint.conf
 share/locale/af/LC_MESSAGES/tuxpaint.mo
 share/locale/ar/LC_MESSAGES/tuxpaint.mo
+share/locale/ast/LC_MESSAGES/tuxpaint.mo
+share/locale/az/LC_MESSAGES/tuxpaint.mo
 share/locale/be/LC_MESSAGES/tuxpaint.mo
 share/locale/bg/LC_MESSAGES/tuxpaint.mo
 share/locale/bo/LC_MESSAGES/tuxpaint.mo
@@ -393,8 +568,11 @@ share/locale/cy/LC_MESSAGES/tuxpaint.mo
 share/locale/da/LC_MESSAGES/tuxpaint.mo
 share/locale/de/LC_MESSAGES/tuxpaint.mo
 share/locale/el/LC_MESSAGES/tuxpaint.mo
+share/locale/en_AU/LC_MESSAGES/tuxpaint.mo
+share/locale/en_CA/LC_MESSAGES/tuxpaint.mo
 share/locale/en_GB/LC_MESSAGES/tuxpaint.mo
 share/locale/en_ZA/LC_MESSAGES/tuxpaint.mo
+share/locale/eo/LC_MESSAGES/tuxpaint.mo
 share/locale/es/LC_MESSAGES/tuxpaint.mo
 share/locale/es_MX/LC_MESSAGES/tuxpaint.mo
 share/locale/et/LC_MESSAGES/tuxpaint.mo
@@ -416,23 +594,29 @@ share/locale/is/LC_MESSAGES/tuxpaint.mo
 share/locale/it/LC_MESSAGES/tuxpaint.mo
 share/locale/ja/LC_MESSAGES/tuxpaint.mo
 share/locale/ka/LC_MESSAGES/tuxpaint.mo
+share/locale/km/LC_MESSAGES/tuxpaint.mo
 share/locale/ko/LC_MESSAGES/tuxpaint.mo
 share/locale/ku/LC_MESSAGES/tuxpaint.mo
 share/locale/lt/LC_MESSAGES/tuxpaint.mo
 share/locale/lv/LC_MESSAGES/tuxpaint.mo
+share/locale/mk/LC_MESSAGES/tuxpaint.mo
 share/locale/ms/LC_MESSAGES/tuxpaint.mo
 share/locale/nb/LC_MESSAGES/tuxpaint.mo
 share/locale/nl/LC_MESSAGES/tuxpaint.mo
 share/locale/nn/LC_MESSAGES/tuxpaint.mo
 share/locale/nr/LC_MESSAGES/tuxpaint.mo
+share/locale/oc/LC_MESSAGES/tuxpaint.mo
+share/locale/oj/LC_MESSAGES/tuxpaint.mo
 share/locale/pl/LC_MESSAGES/tuxpaint.mo
+share/locale/pt/LC_MESSAGES/tuxpaint.mo
 share/locale/pt_BR/LC_MESSAGES/tuxpaint.mo
-share/locale/pt_PT/LC_MESSAGES/tuxpaint.mo
 share/locale/ro/LC_MESSAGES/tuxpaint.mo
 share/locale/ru/LC_MESSAGES/tuxpaint.mo
 share/locale/rw/LC_MESSAGES/tuxpaint.mo
+share/locale/shs/LC_MESSAGES/tuxpaint.mo
 share/locale/sk/LC_MESSAGES/tuxpaint.mo
 share/locale/sl/LC_MESSAGES/tuxpaint.mo
+share/locale/son/LC_MESSAGES/tuxpaint.mo
 share/locale/sq/LC_MESSAGES/tuxpaint.mo
 share/locale/sr/LC_MESSAGES/tuxpaint.mo
 share/locale/sv/LC_MESSAGES/tuxpaint.mo
@@ -448,9 +632,12 @@ share/locale/uk/LC_MESSAGES/tuxpaint.mo
 share/locale/ve/LC_MESSAGES/tuxpaint.mo
 share/locale/vi/LC_MESSAGES/tuxpaint.mo
 share/locale/wa/LC_MESSAGES/tuxpaint.mo
+share/locale/wo/LC_MESSAGES/tuxpaint.mo
 share/locale/xh/LC_MESSAGES/tuxpaint.mo
+share/locale/zam/LC_MESSAGES/tuxpaint.mo
 share/locale/zh_CN/LC_MESSAGES/tuxpaint.mo
 share/locale/zh_TW/LC_MESSAGES/tuxpaint.mo
+share/pixmaps/tuxpaint.png
 share/tuxpaint/brushes/aa_round_03.png
 share/tuxpaint/brushes/aa_round_06.png
 share/tuxpaint/brushes/aa_round_12.png
@@ -488,6 +675,8 @@ share/tuxpaint/brushes/slash_16_lt.png
 share/tuxpaint/brushes/slash_16_rt.png
 share/tuxpaint/brushes/slash_20_lt.png
 share/tuxpaint/brushes/slash_20_rt.png
+share/tuxpaint/brushes/sparkles.dat
+share/tuxpaint/brushes/sparkles.png
 share/tuxpaint/brushes/sphere.png
 share/tuxpaint/brushes/spiral.dat
 share/tuxpaint/brushes/spiral.png
@@ -555,16 +744,16 @@ share/tuxpaint/fonts/locale/te_docs/README.txt
 share/tuxpaint/fonts/locale/th.ttf
 share/tuxpaint/fonts/locale/th_docs/COPYING.txt
 share/tuxpaint/fonts/locale/th_docs/README.txt
-share/tuxpaint/fonts/locale/vi.ttf
 share/tuxpaint/fonts/locale/vi_docs/COPYING.txt
 share/tuxpaint/fonts/locale/vi_docs/README.txt
-share/tuxpaint/fonts/locale/zh_tw.ttf
+share/tuxpaint/fonts/locale/zh_TW.ttf
 share/tuxpaint/fonts/locale/zh_tw_docs/COPYING.txt
 share/tuxpaint/fonts/locale/zh_tw_docs/README.txt
-share/tuxpaint/fonts/locale/zh_tw_docs/maketuxfont.py
-share/tuxpaint/fonts/locale/zh_tw_docs/tuxpaintsubset.pe
+share/tuxpaint/fonts/locale/zh_tw_docs/do_it.sh
 share/tuxpaint/im/ja.im
 share/tuxpaint/im/ko.im
+share/tuxpaint/im/th.im
+share/tuxpaint/im/zh_tw.im
 share/tuxpaint/images/icon-win32.ico
 share/tuxpaint/images/icon.png
 share/tuxpaint/images/icon128x128.png
@@ -576,30 +765,83 @@ share/tuxpaint/images/icon32x32.xpm
 share/tuxpaint/images/icon48x48.png
 share/tuxpaint/images/icon64x64.png
 share/tuxpaint/images/icon96x96.png
+share/tuxpaint/images/magic/Snow_flake4.png
+share/tuxpaint/images/magic/Snow_flake5.png
+share/tuxpaint/images/magic/alien.png
 share/tuxpaint/images/magic/blocks.png
 share/tuxpaint/images/magic/blur.png
+share/tuxpaint/images/magic/calligraphy.png
+share/tuxpaint/images/magic/calligraphy_brush.png
 share/tuxpaint/images/magic/cartoon.png
 share/tuxpaint/images/magic/chalk.png
+share/tuxpaint/images/magic/colornwhite.png
+share/tuxpaint/images/magic/confetti.png
 share/tuxpaint/images/magic/darken.png
+share/tuxpaint/images/magic/distortion.png
 share/tuxpaint/images/magic/drip.png
+share/tuxpaint/images/magic/edges.png
+share/tuxpaint/images/magic/emboss.png
 share/tuxpaint/images/magic/fade.png
 share/tuxpaint/images/magic/fill.png
+share/tuxpaint/images/magic/fisheye.png
 share/tuxpaint/images/magic/flip.png
+share/tuxpaint/images/magic/flower.png
+share/tuxpaint/images/magic/flower_base.png
+share/tuxpaint/images/magic/flower_leaf.png
+share/tuxpaint/images/magic/flower_petals.png
+share/tuxpaint/images/magic/foam.png
+share/tuxpaint/images/magic/foam_data.png
+share/tuxpaint/images/magic/fold.png
+share/tuxpaint/images/magic/glasstile.png
 share/tuxpaint/images/magic/grass.png
+share/tuxpaint/images/magic/grass_data.png
+share/tuxpaint/images/magic/kalidescope.png
 share/tuxpaint/images/magic/largebrick.png
+share/tuxpaint/images/magic/light.png
+share/tuxpaint/images/magic/metalpaint.png
 share/tuxpaint/images/magic/mirror.png
+share/tuxpaint/images/magic/mosaic.png
 share/tuxpaint/images/magic/negative.png
+share/tuxpaint/images/magic/noise.png
+share/tuxpaint/images/magic/picasso.png
+share/tuxpaint/images/magic/puzzle.png
+share/tuxpaint/images/magic/rails.png
+share/tuxpaint/images/magic/rails_corner.png
+share/tuxpaint/images/magic/rails_four.png
+share/tuxpaint/images/magic/rails_one.png
+share/tuxpaint/images/magic/rails_three.png
+share/tuxpaint/images/magic/rain.png
 share/tuxpaint/images/magic/rainbow.png
+share/tuxpaint/images/magic/realrainbow-colors.png
+share/tuxpaint/images/magic/realrainbow.png
+share/tuxpaint/images/magic/ripples.png
+share/tuxpaint/images/magic/rosette.png
+share/tuxpaint/images/magic/sharpen.png
+share/tuxpaint/images/magic/shift.png
+share/tuxpaint/images/magic/silhouette.png
 share/tuxpaint/images/magic/smallbrick.png
 share/tuxpaint/images/magic/smudge.png
-share/tuxpaint/images/magic/sparkles.png
+share/tuxpaint/images/magic/snowball.png
+share/tuxpaint/images/magic/snowflake.png
+share/tuxpaint/images/magic/string_art_angles.png
+share/tuxpaint/images/magic/string_art_full_by_offset.png
+share/tuxpaint/images/magic/string_art_triangles.png
 share/tuxpaint/images/magic/thick.png
 share/tuxpaint/images/magic/thin.png
 share/tuxpaint/images/magic/tint.png
+share/tuxpaint/images/magic/toothpaste.png
+share/tuxpaint/images/magic/tornado.png
+share/tuxpaint/images/magic/tornado_base.png
+share/tuxpaint/images/magic/tornado_cloud.png
+share/tuxpaint/images/magic/tv.png
+share/tuxpaint/images/magic/wavelet.png
+share/tuxpaint/images/magic/waves.png
 share/tuxpaint/images/shapes/circle.png
 share/tuxpaint/images/shapes/circle_f.png
 share/tuxpaint/images/shapes/diamond.png
 share/tuxpaint/images/shapes/diamond_f.png
+share/tuxpaint/images/shapes/octagon.png
+share/tuxpaint/images/shapes/octagon_f.png
 share/tuxpaint/images/shapes/oval.png
 share/tuxpaint/images/shapes/oval_f.png
 share/tuxpaint/images/shapes/pentagon.png
@@ -611,7 +853,9 @@ share/tuxpaint/images/shapes/square_f.png
 share/tuxpaint/images/shapes/triangle.png
 share/tuxpaint/images/shapes/triangle_f.png
 share/tuxpaint/images/title-credits.png
+share/tuxpaint/images/title-tuxpaint-2x.png
 share/tuxpaint/images/title-tuxpaint.png
+share/tuxpaint/images/title-tuxpaint.svg
 share/tuxpaint/images/title.png
 share/tuxpaint/images/tools/brush.png
 share/tuxpaint/images/tools/eraser.png
@@ -649,6 +893,7 @@ share/tuxpaint/images/ui/btnsm_off.png
 share/tuxpaint/images/ui/btnsm_up.png
 share/tuxpaint/images/ui/color_btn_down.png
 share/tuxpaint/images/ui/color_btn_up.png
+share/tuxpaint/images/ui/color_picker.png
 share/tuxpaint/images/ui/cursor_down.png
 share/tuxpaint/images/ui/cursor_down_large.png
 share/tuxpaint/images/ui/cursor_starter_down.png
@@ -657,9 +902,12 @@ share/tuxpaint/images/ui/cursor_up.png
 share/tuxpaint/images/ui/cursor_up_large.png
 share/tuxpaint/images/ui/dead40x40.png
 share/tuxpaint/images/ui/erase.png
-share/tuxpaint/images/ui/grass.png
+share/tuxpaint/images/ui/flip.png
 share/tuxpaint/images/ui/grow.png
 share/tuxpaint/images/ui/italic.png
+share/tuxpaint/images/ui/magic_fullscreen.png
+share/tuxpaint/images/ui/magic_paint.png
+share/tuxpaint/images/ui/mirror.png
 share/tuxpaint/images/ui/mouse.png
 share/tuxpaint/images/ui/mouse_click.png
 share/tuxpaint/images/ui/next.png
@@ -684,28 +932,18 @@ share/tuxpaint/images/ui/select_digits.png
 share/tuxpaint/images/ui/shrink.png
 share/tuxpaint/images/ui/slideshow.png
 share/tuxpaint/images/ui/sparkles-old.png
-share/tuxpaint/images/ui/sparkles.png
 share/tuxpaint/images/ui/title.png
 share/tuxpaint/images/ui/title_large.png
 share/tuxpaint/images/ui/trash.png
 share/tuxpaint/images/ui/yes.png
 share/tuxpaint/sounds/areyousure.wav
 share/tuxpaint/sounds/bleep.wav
-share/tuxpaint/sounds/blocks.wav
-share/tuxpaint/sounds/blur.wav
-share/tuxpaint/sounds/brick.wav
 share/tuxpaint/sounds/bubble.wav
-share/tuxpaint/sounds/cartoon.wav
-share/tuxpaint/sounds/chalk.wav
 share/tuxpaint/sounds/click.wav
-share/tuxpaint/sounds/darken.wav
-share/tuxpaint/sounds/drip.wav
 share/tuxpaint/sounds/eraser1.wav
 share/tuxpaint/sounds/eraser2.wav
-share/tuxpaint/sounds/fade.wav
 share/tuxpaint/sounds/flip.wav
 share/tuxpaint/sounds/giggle.wav
-share/tuxpaint/sounds/grass.wav
 share/tuxpaint/sounds/grow.wav
 share/tuxpaint/sounds/harp.wav
 share/tuxpaint/sounds/italic_off.wav
@@ -713,25 +951,74 @@ share/tuxpaint/sounds/italic_on.wav
 share/tuxpaint/sounds/keyclick.wav
 share/tuxpaint/sounds/line_end.wav
 share/tuxpaint/sounds/line_start.wav
+share/tuxpaint/sounds/magic/alien.ogg
+share/tuxpaint/sounds/magic/blocks.wav
+share/tuxpaint/sounds/magic/blur.wav
+share/tuxpaint/sounds/magic/brick.wav
+share/tuxpaint/sounds/magic/calligraphy.ogg
+share/tuxpaint/sounds/magic/cartoon.wav
+share/tuxpaint/sounds/magic/chalk.wav
+share/tuxpaint/sounds/magic/confetti.ogg
+share/tuxpaint/sounds/magic/darken.wav
+share/tuxpaint/sounds/magic/distortion.ogg
+share/tuxpaint/sounds/magic/drip.wav
+share/tuxpaint/sounds/magic/edges.ogg
+share/tuxpaint/sounds/magic/emboss.ogg
+share/tuxpaint/sounds/magic/fade.wav
+share/tuxpaint/sounds/magic/fill.wav
+share/tuxpaint/sounds/magic/fisheye.ogg
+share/tuxpaint/sounds/magic/flip.wav
+share/tuxpaint/sounds/magic/flower_click.ogg
+share/tuxpaint/sounds/magic/flower_release.ogg
+share/tuxpaint/sounds/magic/foam.ogg
+share/tuxpaint/sounds/magic/fold.ogg
+share/tuxpaint/sounds/magic/fold.wav
+share/tuxpaint/sounds/magic/glasstile.ogg
+share/tuxpaint/sounds/magic/grass.wav
+share/tuxpaint/sounds/magic/kaleidoscope.ogg
+share/tuxpaint/sounds/magic/light1.ogg
+share/tuxpaint/sounds/magic/light2.ogg
+share/tuxpaint/sounds/magic/metalpaint.wav
+share/tuxpaint/sounds/magic/mirror.wav
+share/tuxpaint/sounds/magic/mosaic.ogg
+share/tuxpaint/sounds/magic/negative.wav
+share/tuxpaint/sounds/magic/noise.ogg
+share/tuxpaint/sounds/magic/picasso.ogg
+share/tuxpaint/sounds/magic/rails.wav
+share/tuxpaint/sounds/magic/rain.ogg
+share/tuxpaint/sounds/magic/rainbow.wav
+share/tuxpaint/sounds/magic/realrainbow.ogg
+share/tuxpaint/sounds/magic/ripples.ogg
+share/tuxpaint/sounds/magic/sharpen.ogg
+share/tuxpaint/sounds/magic/shift.ogg
+share/tuxpaint/sounds/magic/silhouette.ogg
+share/tuxpaint/sounds/magic/smudge.wav
+share/tuxpaint/sounds/magic/snowball.ogg
+share/tuxpaint/sounds/magic/snowflake.ogg
+share/tuxpaint/sounds/magic/string.ogg
+share/tuxpaint/sounds/magic/string2.ogg
+share/tuxpaint/sounds/magic/string3.ogg
+share/tuxpaint/sounds/magic/thick.wav
+share/tuxpaint/sounds/magic/thin.wav
+share/tuxpaint/sounds/magic/tint.wav
+share/tuxpaint/sounds/magic/toothpaste.ogg
+share/tuxpaint/sounds/magic/tornado_release.ogg
+share/tuxpaint/sounds/magic/tv.ogg
+share/tuxpaint/sounds/magic/wavelet.ogg
+share/tuxpaint/sounds/magic/waves.ogg
 share/tuxpaint/sounds/mirror.wav
-share/tuxpaint/sounds/negative.wav
 share/tuxpaint/sounds/paint1.wav
 share/tuxpaint/sounds/paint2.wav
 share/tuxpaint/sounds/paint3.wav
 share/tuxpaint/sounds/paint4.wav
 share/tuxpaint/sounds/prompt.wav
-share/tuxpaint/sounds/rainbow.wav
 share/tuxpaint/sounds/return.wav
 share/tuxpaint/sounds/save.wav
 share/tuxpaint/sounds/scroll.wav
 share/tuxpaint/sounds/shrink.wav
-share/tuxpaint/sounds/smudge.wav
-share/tuxpaint/sounds/sparkles1.wav
-share/tuxpaint/sounds/sparkles2.wav
 share/tuxpaint/sounds/stamp.wav
 share/tuxpaint/sounds/thick.wav
 share/tuxpaint/sounds/thin.wav
-share/tuxpaint/sounds/tint.wav
 share/tuxpaint/sounds/tuxok.wav
 share/tuxpaint/sounds/typewriterbell.wav
 share/tuxpaint/sounds/youcannot.wav
@@ -747,6 +1034,8 @@ share/tuxpaint/stamps/cartoon/tux/tux-yes1.dat
 share/tuxpaint/stamps/cartoon/tux/tux-yes1.png
 share/tuxpaint/stamps/cartoon/tux/tux-yes2.dat
 share/tuxpaint/stamps/cartoon/tux/tux-yes2.png
+share/tuxpaint/starters/Jigsaw_3x3.png
+share/tuxpaint/starters/Jigsaw_5x5.png
 share/tuxpaint/starters/carcassone.png
 share/tuxpaint/starters/chessboard-back.png
 share/tuxpaint/starters/chessboard.png
@@ -754,6 +1043,8 @@ share/tuxpaint/starters/chicken.png
 share/tuxpaint/starters/grid_10x10.png
 share/tuxpaint/starters/grid_20x20.png
 share/tuxpaint/starters/jetplane.png
+share/tuxpaint/starters/jigsaw.png
+share/tuxpaint/starters/jigsaw.svg
 share/tuxpaint/starters/nagasaki.png
 share/tuxpaint/starters/nagasaki.svg
 share/tuxpaint/starters/reef-back.png
@@ -761,9 +1052,12 @@ share/tuxpaint/starters/reef.png
 share/tuxpaint/starters/reef.txt
 share/tuxpaint/starters/rocket.png
 share/tuxpaint/starters/shipwreck.png
+share/tuxpaint/starters/silver_frame.png
 share/tuxpaint/starters/skyline-sf-dusk-back.jpeg
 share/tuxpaint/starters/skyline-sf-dusk.png
 share/tuxpaint/starters/skyline-sf-dusk.txt
+share/tuxpaint/starters/spirograph.png
+share/tuxpaint/starters/spirograph.svg
 share/tuxpaint/starters/street.png
 share/tuxpaint/starters/tux_farmer.png
 share/tuxpaint/starters/worldmap.png
@@ -775,4 +1069,6 @@ share/tuxpaint/starters/worldmap_america_south.png
 share/tuxpaint/starters/worldmap_asia_north.png
 share/tuxpaint/starters/worldmap_asia_south.png
 share/tuxpaint/starters/worldmap_australasia.png
+share/tuxpaint/starters/worldmap_canada.png
 share/tuxpaint/starters/worldmap_europe.png
+share/tuxpaint/starters/worldmap_japan.png
diff --git a/graphics/tuxpaint/distinfo b/graphics/tuxpaint/distinfo
index fbda57ac09e..cbd57c38845 100644
--- a/graphics/tuxpaint/distinfo
+++ b/graphics/tuxpaint/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.22 2011/08/05 00:34:41 wiz Exp $
+$NetBSD: distinfo,v 1.23 2014/08/17 09:42:27 wiz Exp $
 
-SHA1 (tuxpaint-0.9.17.tar.gz) = 88e42d19339bb1faa03bce45a28d3fe11fbe05b4
-RMD160 (tuxpaint-0.9.17.tar.gz) = c7cf3636875cad87646cda4df978f9adbbf18630
-Size (tuxpaint-0.9.17.tar.gz) = 7570223 bytes
-SHA1 (patch-aa) = 85365ebbe02084a3f11dcd365e5e5ecdee8c86c9
-SHA1 (patch-ab) = 9fdbaabd6da8b6e16de92a7506a3f732772ca671
-SHA1 (patch-ad) = ac33e71f3cd7e581d67206a86875492af2836f47
+SHA1 (tuxpaint-0.9.21.tar.gz) = 082a179a3cb44ee17af47421bc92125a890846e4
+RMD160 (tuxpaint-0.9.21.tar.gz) = 0c6892341c2e6c3abad7cf28caefdb2f8dc6d74d
+Size (tuxpaint-0.9.21.tar.gz) = 9543034 bytes
+SHA1 (patch-aa) = 004a8d7d89895da31cb7df6efd03eecaf9414f6f
+SHA1 (patch-ab) = 508052e3b1fdbc3b4d46a4f0d0eb3057bbe2dc0b
diff --git a/graphics/tuxpaint/patches/patch-aa b/graphics/tuxpaint/patches/patch-aa
index 81f176f2ec3..ed0070ec4d0 100644
--- a/graphics/tuxpaint/patches/patch-aa
+++ b/graphics/tuxpaint/patches/patch-aa
@@ -1,74 +1,41 @@
-$NetBSD: patch-aa,v 1.13 2010/02/03 22:13:09 joerg Exp $
+$NetBSD: patch-aa,v 1.14 2014/08/17 09:42:27 wiz Exp $
 
---- Makefile.orig	2007-07-01 17:05:57.000000000 +0200
+--- Makefile.orig	2009-04-29 05:18:57.000000000 +0000
 +++ Makefile
-@@ -18,7 +18,7 @@ VER_DATE=`date +"%Y-%m-%d"`
- 
- # Where to install things:
- 
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- 
- 
- # Root directory to place files when creating packages.
-@@ -40,16 +40,9 @@ DATA_PREFIX=$(PKG_ROOT)$(PREFIX)/share/t
- # Docs and man page:
- 
- DOC_PREFIX=$(PKG_ROOT)$(PREFIX)/share/doc/tuxpaint
--MAN_PREFIX=$(PKG_ROOT)$(PREFIX)/share/man
-+MAN_PREFIX=$(PKG_ROOT)$(PREFIX)/$(PKGMANDIR)
- 
- 
--# 'System-wide' Config file:
--
--ifeq ($(PREFIX),/usr)
--  CONFDIR=$(PKG_ROOT)/etc/tuxpaint
--else
--  CONFDIR=$(PKG_ROOT)$(PREFIX)/etc/tuxpaint
--endif
- 
- 
- # Commands useful to other arch's (e.g., BeOS)
-@@ -103,12 +96,8 @@ SDL_MIXER_LIB=-lSDL_mixer
- SDL_CFLAGS=$(shell sdl-config --cflags) $(SVG_CFLAGS)
- 
- 
--SVG_LIB=-lrsvg-2 -lcairo
--SVG_CFLAGS=-I/usr/include/librsvg-2/librsvg \
--	-I/usr/include/gtk-2.0 \
--	-I/usr/include/glib-2.0 \
--	-I/usr/lib/glib-2.0/include \
--	-I/usr/include/cairo
-+SVG_LIB=$(shell pkg-config --libs librsvg-2.0) $(shell pkg-config --libs cairo)
-+SVG_CFLAGS=$(shell pkg-config --cflags librsvg-2.0) $(shell pkg-config --cflags cairo)
- 
- PAPER_LIB=-lpaper
- 
-@@ -116,8 +105,8 @@ PAPER_LIB=-lpaper
- # The entire set of CFLAGS:
+@@ -81,7 +84,7 @@ windows_ARCH_LINKS:=-lintl $(PNG) -lwins
+ osx_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
+ beos_ARCH_LINKS:="-lintl $(PNG) -lz -lbe -liconv $(FRIBIDI_LIB)"
+ linux_ARCH_LINKS:=$(PAPER_LIB) $(FRIBIDI_LIB)
+-ARCH_LINKS:=$($(OS)_ARCH_LINKS)
++ARCH_LINKS:=$($(OS)_ARCH_LINKS) $(LIBS)
+ 
+ windows_ARCH_HEADERS:=src/win32_print.h
+ osx_ARCH_HEADERS:=
+@@ -301,9 +304,12 @@ nokia770:
+ POFILES:=$(wildcard src/po/*.po)
+ MOFILES:=$(patsubst src/po/%.po,trans/%.mo,$(POFILES))
+ INSTALLED_MOFILES:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint.mo,$(MOFILES))
++INSTALLED_MODIRS:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES,$(MOFILES))
+ 
++$(INSTALLED_MODIRS): $(LOCALE_PREFIX)/%/LC_MESSAGES: trans/%.mo
++	install -d -m 755 $@
+ $(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint.mo: trans/%.mo
+-	install -D -m 644 $< $@
++	install -m 644 $< $@
+ 
+ .PHONY: uninstall-i18n
+ uninstall-i18n:
+@@ -331,7 +337,8 @@ install-gettext:
+ 	@echo "You will not be able to run Tux Paint in non-U.S. English modes."
+ 	@echo "--------------------------------------------------------------"
+ else
+-install-gettext: $(INSTALLED_MOFILES)
++install-gettextdirs: $(INSTALLED_MODIRS)
++install-gettext: install-gettextdirs $(INSTALLED_MOFILES)
+ endif
  
- #-ffast-math
--OPTFLAGS=-O2
--CFLAGS=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \
-+#OPTFLAGS=-O2
-+CFLAGS+=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \
- 	-Wcast-align -Wredundant-decls \
- 	-Wbad-function-cast -Wwrite-strings \
- 	-Waggregate-return \
-@@ -284,10 +273,9 @@ include Makefile-i18n
- # to do this as superuser ("root"))
  
- install:	install-bin install-data install-man install-doc \
--		install-icon install-gettext install-im install-importscript \
-+		install-gettext install-im install-importscript \
- 		install-default-config install-example-stamps \
--		install-example-starters \
--		install-gnome install-kde install-kde-icons
-+		install-example-starters
- 	@echo
- 	@echo "--------------------------------------------------------------"
- 	@echo
-@@ -478,9 +466,8 @@ uninstall:	uninstall-i18n
+@@ -556,9 +563,8 @@ uninstall:	uninstall-i18n
  install-default-config:
  	@echo
  	@echo "...Installing default config file..."
@@ -80,21 +47,28 @@ $NetBSD: patch-aa,v 1.13 2010/02/03 22:13:09 joerg Exp $
  
  
  # Install example stamps
-@@ -715,7 +703,7 @@ tuxpaint:	obj/tuxpaint.o obj/i18n.o obj/
- 		$(HQXX_O) $(ARCH_LIBS)
+@@ -575,11 +581,13 @@ STARTERS:=$(wildcard starters/*.*)
+ INSTALLED_STARTERS:=$(patsubst %,$(DATA_PREFIX)/%,$(STARTERS))
+ 
+ $(INSTALLED_STARTERS): $(DATA_PREFIX)/%: %
+-	install -D -m 644 $< $@
++	install -m 644 $< $@
+ 
+ # Install example starters
+ .PHONY: install-example-starters
+-install-example-starters: $(INSTALLED_STARTERS)
++install-example-starters-dirs:
++	install -d -m 755 $(DATA_PREFIX)/starters
++install-example-starters: install-example-starters-dirs $(INSTALLED_STARTERS)
+ 
+ 
+ # Install a launcher icon in the Gnome menu
+@@ -832,7 +840,7 @@ tuxpaint:	obj/tuxpaint.o obj/i18n.o obj/
+ 		$(ARCH_LIBS)
  	@echo
  	@echo "...Linking Tux Paint..."
--	@$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(PAPER_CFLAGS) \
-+	@$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(LDFLAGS) $(SDL_CFLAGS) $(PAPER_CFLAGS) \
- 		$(DEFS) \
- 		-o tuxpaint \
- 		$^ \
-@@ -723,7 +711,7 @@ tuxpaint:	obj/tuxpaint.o obj/i18n.o obj/
- 		$(SDL_LIBS) \
- 		$(SVG_LIB) \
- 		$(PAPER_LIB) \
--		-lm $(ARCH_LINKS)
-+		-lm $(ARCH_LINKS) $(LIBS)
+-	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
++	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(LDFLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
+ 		-o tuxpaint $^ \
+ 		$(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS)
  	@$(RSRC_CMD)
- 	@$(MIMESET_CMD)
- 
diff --git a/graphics/tuxpaint/patches/patch-ab b/graphics/tuxpaint/patches/patch-ab
index 2a91bdf92a9..c9166c34a32 100644
--- a/graphics/tuxpaint/patches/patch-ab
+++ b/graphics/tuxpaint/patches/patch-ab
@@ -1,31 +1,10 @@
-$NetBSD: patch-ab,v 1.6 2011/08/05 00:34:41 wiz Exp $
+$NetBSD: patch-ab,v 1.7 2014/08/17 09:42:27 wiz Exp $
 
-Third chunk: fix build with png-1.5.
-https://sourceforge.net/tracker/?func=detail&aid=3386433&group_id=66938&atid=516295
+Fix build with png-1.5.
 
---- src/tuxpaint.c.orig	2007-07-01 01:38:03.000000000 +0000
+--- src/tuxpaint.c.orig	2009-06-18 20:51:58.000000000 +0000
 +++ src/tuxpaint.c
-@@ -170,7 +170,7 @@ static scaleparams scaletable[] = {
-    likely available; if not using GNU, you can set HAVE_STRCASESTR to
-    avoid trying to redefine it -bjk 2006.06.02 */
- 
--#if !defined(__USE_GNU) && !defined(HAVE_STRCASESTR)
-+#if !defined(__USE_GNU) && !defined(HAVE_STRCASESTR) && !defined(__NetBSD__)
- #warning "Attempting to define strcasestr(); if errors, build with -DHAVE_STRCASESTR"
- 
- char *strcasestr(const char *haystack, const char *needle)
-@@ -363,8 +363,8 @@ extern WrapperData macosx;
- 
- #else
- 
--#include "rsvg.h"
--#include "rsvg-cairo.h"
-+#include <librsvg/rsvg.h>
-+#include <librsvg/rsvg-cairo.h>
- #if !defined(RSVG_H) || !defined(RSVG_CAIRO_H)
- #error "---------------------------------------------------"
- #error "If you installed libRSVG from packages, be sure"
-@@ -12528,12 +12528,7 @@ static int do_png_save(FILE * fi, const 
+@@ -12898,12 +12898,7 @@ static int do_png_save(FILE * fi, const 
        {
  	png_init_io(png_ptr, fi);
  
@@ -34,7 +13,7 @@ https://sourceforge.net/tracker/?func=detail&aid=3386433&group_id=66938&atid=516
 -	info_ptr->bit_depth = 8;
 -	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
 -	info_ptr->interlace_type = 1;
--	info_ptr->valid = 0;	// will be updated by various png_set_FOO() functions
+-	info_ptr->valid = 0;	/* will be updated by various png_set_FOO() functions */
 +	png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
  
  	png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
diff --git a/graphics/tuxpaint/patches/patch-ad b/graphics/tuxpaint/patches/patch-ad
deleted file mode 100644
index 585a9787533..00000000000
--- a/graphics/tuxpaint/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/09/04 21:11:58 drochner Exp $
-
---- src/i18n.c.orig	2007-09-04 19:24:41.000000000 +0200
-+++ src/i18n.c
-@@ -32,6 +32,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <libintl.h>
-+#include <locale.h>
- #include "i18n.h"
- #include "debug.h"
-