Update to 0.9.22:

2014.August.5 (0.9.22)

  * New Tools:
    ----------
    * Label - A tool to add text to a drawing, which can be modified or
      moved later.
      By Arunodai Reddy Vudem (GSOC 2008)
      With modifications and integration by
      Pere Pujal i Carabantes <pere@fornol.no-ip.org>

  * New Magic Tools:
    ----------------
    * Blinds - Close window blinds over your picture.
      Pattern - Draws a tiled pattern around the picture.
      Perspective - Change the image's perspective.
      Mosaic Hexagon, Mosaic irregular, Mosaic square - Glass mosaic effects.
      Tiles - Draws a symettric pattern around the picture.
      Zoom - Zoom the image in or out.
      By Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    * Puzzle - Slide parts of your picture around like a sliding puzzle.
      By Adam 'foo-script' Rakowski <foo-script@o2.pl>
      with modifications by Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    * ROYGBIV Rainbow - Draw a rainbow arc using solid colors of
      Red, Orange, Yellow, Green, Blue, Indigo and Violet.

    * Symmetry Left/Right, Symmetry Up/Down - Paint with relfective symmetry
      across the horizontal or vertical center of the image.
      (Like Kaleidoscope, but only one mirrored brush, either left/right
      or up/down.)

    * Wet Paint - Draws a light coat of paint, and smudges at the same time.
      (Based on Smudge tool.  Requested by gallery artist Angela.)

    * Xor Colors - Colors based on the position drawn on the picture.
      Lukasz Dmitrowski <lukasz.dmitrowski@gmail.com>

  * Build System Improvements:
    --------------------------
    * Variety of tweaks to help Tux Paint cross-compile for Windows under Linux
      Volker Grabsch <vog@notjusthosting.com>

    * Added support for building under Haiku OS
      Scott McCreary <scottmc@users.sourceforge.net>

    * Integrated OpenCandy-powered recommendation service
      into Windows installation scripts (InnoSetup), as an option.
      <http://www.opencandy.com/>

      Note: "tuxpaint.iss" still builds standard, OpenCandy-less
      Tux Paint installer; "tuxpaint-opencandy.iss", along with a file
      with secret key info (not included in CVS, of course!), build
      an OpenCandy-enabled version.  The OC account is currently
      maintained by Bill Kendrick <nbs@sonic.net>, lead developer.

      For more info, see http://www.tuxpaint.org/docs/opencandy/

    * Using $LDFLAGS when linking Magic tool plugins and Tux Paint binary.
      Volkov Peter <volkov_peter@users.sourceforge.net> (SF.Net Bug #3389067)

  * Collection of Mac OS X Updates:
    -------------------------------
    Produced by Eric Poncet <http://www.linguasoft.com/>
    Commissioned by Harvey Ginter <harveyginter@gmail.com>

    * Fix OS X 10.9 issue of current directory set by Finder
      to something else than folder where app bundle resides.

    * Customization support for Mac OS X (automatic, under XCode)
      and Windows (manual).

    * Some Mac OS X build / project changes & updates.

    * Adjustments to Mac OS X fontconfig config file, to avoid warnings
      and make things more robust.

    * Updates to some #include's to catch up with newer library revisions.

    * Tweaks to pixel read/write on Apple.

    * Introduction of 'intprt_t' casting to avoid warnings on x64.

    * Some additional debugging output.

    * Logging stderr & stdout to /tmp/tuxpaint.log

  * Accessibility Improvements:
    ---------------------------
    * Added a mouse accessibility mode to avoid the need to drag the mouse.
      ("--mouse-accessibility")
      by Ankit Choudary <ankit.goaldecided@gmail.com> (GSOC 2010)
      with integration and fixes by
      Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    * Added an option to display an on-screen keyboard when using the
      'Text' and 'Label' tools.  ("--onscreen-keyboard") [Experimental!]
      by Ankit Choudary <ankit.goaldecided@gmail.com> (GSOC 2010) with
      integration and fixes by Pere Pujal i Carabantes <perepujal@gmail.com>
      and some code borrowed from xorg (keysymdef.h and en_US.UTF-8_COMPOSE
      Authors?)
      and xterm file keysym2ucs.c (function keysym2unicode
      Markus G. Kuhn <mkuhn@acm.org>, University of Cambridge, April 2001
      Special thanks to Richard Verhoeven <river@win.tue.nl>
      Public domain.

    * Keyboard can be used to move and click mouse ("--keyboard" option).
      [Experimental!]
      by Ankit Choudary <ankit.goaldecided@gmail.com> (GSOC 2010)
      * See documentation in OPTIONS for how to use it.

    * Joystick can be used to drive Tux Paint
      by Ankit Choudary <ankit.goaldecided@gmail.com> (GSOC 2010)
      with integration and fixes by Pere Pujal i Carabantes

      * Use --joystick-dev to choose joystick (otherwise
        uses the first joystick found on the system).
        * Use '--joystick-dev list' to list available joysticks.
      * Uses any of the buttons found in the joystick, no need for
        configuration.  (--joystick-buttons-ignore can be used to
        ignore buttons.)
      * The hat of the joystick moves one pixel at a time, useful to
        carefully place the pointer.
      * The ball of the joystick should also trigger pointer
        motion.
      * The responsivity of the joystick can be configured via command
        line or config files:
	* --joystick-slownes sets a delay at each axis motion event.
	    Allowed values from 0 to 500, defaults to 15.
	* --joystick-threshold sets the minimum value of axis motion to
	  begin move the pointer.
	    Allowed values from 0 to 32766, defaults to 3200.
	* --joystick_maxsteps sets the maximum number of pixels that
	  the pointer will move at a time.
	    Allowed values from 1 to 7, defaults to 7.
      * Joystick buttons can be assigned used to activate certain commands
        in Tux Paint (--joystick-btn-COMMAND options)

  * Magic Tool Improvememnts:
    -------------------------
    * Magic tools can register themselves as paint with one click
      (versus click/drag/release): MODE_ONECLICK.  (e.g., "Ripples")
      Utilized by mouse-accessibility feature.

    * Magic tools can register themsevles as paint-with-a-preview:
      MODE_PAINT_WITH_PREVIEW.  (e.g., "Flower")
      Utilized by mouse-accessibility feature.

  * Other Improvements:
    -------------------
    * Random brushes avoid repeating the same frame twice.

    * Showing a warning when using save-related options when "nosave" is set.
      (SourceForge Bug #3327493)

    * Quicker prompt window pop-up animation.

    * Left/Right Stamp navigation buttons are purple, like the other (up/down)
      scroll buttons found in Tux Paint.
      (SourceForge Bug #2918289)

    * Slightly improved mouse motion handling when Tux Paint is very busy
      drawing or previewing.  (e.g., when drawing a circle, you could often
      end up with a "D" shape... now, you get more of a regular polygon shape
      if Tux Paint is taking too long to draw.  It skips some motion events,
      rather than ignoring all motion events after the first 1/4th second.)

    * Deleting files from Tux Paint's 'Open' dialog now moves them to
      the user's Trash folder.
      FIXME: Only on freedesktop.org systems (e.g., Linux)
      (SourceForge.net Feature #3101084)

    * Tux Paint (in windowed mode) now only centers itself if
      no specific positioning has been provided via
      the SDL_VIDEO_WINDOW_POS environment variable.
      (SourceForge Bug #3138446)

    * Creating thumbnails for the starters we provide.
      (Speeds up 'New' dialog appearance.)
      (SourceForge Bug #1417849)
      Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    * On systems where Pango is used for UI text rendering, Tux Paint now
      spawns a temporary thread during start-up (at the splash screen) to
      allow "fontconfig" to generate its font cache in the background,
      while showing the "please wait" animation, and responding to the US.
      (Fontconfig takes a long time to generate its cache the first time
      you run a Pango- and hence fontconfig-enabled application
      (Tux Paint, Gimp, Inkscape, etc.), or after adding lots of new fonts
      to your system).
      SF.net Bug #2944951

    * Thumbnailing (of UI elements, stamps, saved images, etc.) is now
      gamma-corrected. See:
      http://www.4p8.com/eric.brasseur/gamma.html

    * Template images are now supported.  Similar to Starters, they are
      pre-drawn pictures to begin a new drawing with, accessed via the
      "New" dialog.  The "Eraser" tool will erase back to the original
      picture (rather than a solid color).

      Unlike Starters, they do not involve an immutable "layer" above the
      drawing.  They may be drawn over in their entirety.

    * After switching into, or out of, a magic tool, the canvas is updated.

    * Starter images can be in SVG (Scalable Vector Graphics) format.
      (Avoids loading PNG if SVG with the same name exists.)

    * Removed white artifacts from some Starters, and reduced file size
      of some Starters.

    * When scaling/smearing a picture or Starter, to fit the current canvas
      size, it was not drawing on the far right or bottom edges, causing
      Fill tool to 'spill'.  (Example: fill one of the puzzle pieces on the
      right or bottom of the 5x5 jigsaw Starter, and all pieces on the right
      and bottom would get filled, too.)

    * Starter images can be in KPX (Kid Pix Template) format.
      (These appear to simply be JPEG with 60 byte's worth of Mac OS
      resource fork header at the beginning.)
      (Thanks to Sarah Curry for sharing some example templates to test.)

    * When a default size was not specified, SVG-based Stamps would default
      to the largest, which was canvas-sized.  Now defaulting to a more
      reasonable size.  (And users can click the maximum size choice to get
      the largest, canvas-sized rendition.)
      (SF.net bug #2836471)

    * Widened dialog windows, to help avoid word-wrap and overlap problems
      with some prompts, in some locales.
      (SF.net bug #2834461)

    * Shape Tool now locks rotation into 15 or 5 degree steps, when the
      radius of the shape is very small or small, respectively.
      (SF.net bug #2837177)

    * Shape Tool tries to avoid glitches where lines connect, when shape is
      rotated.  (Rotation of fixed-aspect shapes like Square and Octagon
      stays within the angle of the corners. i.e., rotating a square 140 deg.
      actually only rotates it 30 deg., since it looks identical,
      sans glitches.)
      (SF.net bug #2837177)

    * Created a BASH tab-completion file for Tux Paint, so that
      command-line options are easier to discover (without necessarily
      needing to consult the man page, 'Options' documentation, or --usage
      output).

    * Text (and Label) tool doesn't flicker when typing or erasing text.

    * Creation of thumbnails for personal starters and templates.

    * Major rewrite of configuration and locale-setting code.
      Albert Cahalan <albert@users.sourceforge.net>,
      Bill Kendrick <bill@newbreedsoftware.com>

    * Packaging all the metadata in the PNG file. Before a draw based
      on a starter would have need 3 files: the draw, the starter and the
      .dat file, whith the addition of the Labels tool this increased to
      5 files. Now all this stuff is packed in customs chunks inside the
      PNG file.
      Pere Pujal i Carabantes <pere@fornol.no-ip.org>

    * No longer directly accessing PNG structure members directly, now using
      png_set_IHDR().
      Thomas Klausner, SF.net Bug #3386433

    * Adapted the interface to play nice too on touchscreen devices.

    * Optimised PNG files using TruePNG and PNGZopfli, for smaller file sizes.

 * New Starters:
   -------------
    * Elephant
    * Hat
    * Old Soviet Car
    * Skull
    * Bald Eagle
    * Car 2
    * Desert Tortoise
    * Gecko
    * Manatee
    * Pansy
    * Stained Glass
    * Woodpecker
    * Frame - Filmstrip
    * Frame - Flowers
    * Frame - Picture
    * Frame - Screen
    * Frame - Television
    * Frame - Gold
    * Frame - heart
    * Frame - hearts
    * Fish Icon
    * Mosaic
      From Open Clip Art, curated by
      Caroline Ford <caroline.ford.work@googlemail.com>

    * Frame - neon
      Made in inkscape and the gimp by Caroline Ford.

  * New Templates
    -------------
    * Burnt bark
    * Cliff
    * Corn maze
    * Jellyfish
    * Lighthouse
    * Mossy bark
    * Mossy log
    * Mudstone
    * Ocean splash
    * Ocean waves
    * Redwoods above
    * Rocks
    * Sheep
    * Spider's web
    * Sun behind clouds
    * Sun behind leaves
    * Trees above
    * Trees at dusk
    * Wool mill machine
      Photographed by Bill Kendrick <bill@newbreedsoftware.com>

  * New Brushes
    ---------
    * Another flower brush
      Made out of some open clipart by C Ford.

    * Inksplat
      Based on 'Splatter Brushes' for GIMP
      By 'Flyhorn' at deviantART
      http://browse.deviantart.com/art/Splatter-brushes-340519966

  * New Locales:
    ------------
    * Acholi translation
      Achuma George Patrick <chanchumgpa@gmail.com>
      Opio June Bryan
      Ogwal Kenneth Awio

    * Akan translation
      Derrick Frimpong <flexyflame2006@yahoo.com>

    * Amharic translation
      Solomon Gizaw <solohavi@yahoo.com>
      http://pootle.locamotion.org/am/tuxpaint/

    * Aragones translation
      Juan Pablo Martinez Cortes <jpmart@unizar.es>

    * Armenian translation
      Anush MKRTCHYAN
      Jasmine Udea

    * Assamese translation
      Anand Kulkarni <kulkarni1016@yahoo.co.in>

    * Bambara translation
      Fasokan <konate20032001@yahoo.fr>

    * Bosnian translation
      Samir Ribić

    * Kiga translation
      Florence Tushabe <tushabe@cit.mak.ac.ug>

    * Fula translation
      Ibraahiima SAAR <ibrahima.sarr@pulaagu.com>,
      Fula Localization Project, http://www.pulaar-fulfulde.org/

    * Inuktitut
      Harvey Ginter <harveyginter@gmail.com>

    * Kannada translation
      Savitha <savithasprasad@yahoo.com>
      Provided by Vrundesh Waghmare <vrundesh.waghmare@gmail.com>

    * Konkani (Devaganari and Roman)
      Rahul Borade <rahulborade01@gmail.com>

    * Luganda translation
      James Olweny <sjolweny85@yahoo.co.uk>

    * Luxembourgish translation
      Ren� Brandenburger <rene@brandenburger.lu>

    * Maithili
      U.Sudhakar <sudhakaru@cdac.in>
      sk <sk>
      Provided by Praveen Dewangan <pdvg.cdac@gmail.com>

    * Malayalam translation
      Students of Vocational Higher Secondary School Irimpanam
      http://vhssirimpanam.org
      - rimal <rimalmathew@gmail.com>
      - Abhijith P.K
      - Appu Ajith
      - Vishnu Ajith
      - Harish Vijay
      - Mathew K.Vaidyan
      - Manu C.Kauma
      - Sreejith P.M
      - Nithin M
      - Sidharth K.Bhattathiri
      - Thomas Peter
      - Dona C.D
      - Anjitha venugopal
      - Athira Venugopal
      - Shelmi P.R
      - Revathi Sukumaran
      - Salu P.SAmitha Appukuttan
      - Geegu Varghese
      - Ashna Manoharan
      - sreelakshmi
      - jithu
      - Abhinav Thomas
      - Abhitha Thomas
      - Sajith P.V
      - Vishnu Vinod
      - Senthis
      - Vimal <vimaljoseph@gmail.com>
      - Sameer <sameer.thahir@gmail.com>
      - Sanal <sanalmadatheth@gmail.com>
      - Sooraj <soorajkenoth@gmail.com>
      - V Sasi Kumar <sasi.fsf@gmail.com>
      Updated by Sonith Kumar <sonith.kumar153@gmail.com>
      Reviewed by Haris Ibrahim K. V. <blucalvin@gmail.com>

    * Manipuri (Bengali and Metei Mayek)
      Hidam Dolen <dolenhi@gmail.com>
      Provided by rahul dabre <rahulvdabre@yahoo.com>

    * Marathi translation
      Santosh Jankiram Kshetre <quicklearning@rediffmail.com>

    * Nepali translation
      Khagen Sharma <khagen.sharma@gmail.com>
      Provided by Neha Aphale <aphaleneha@gmail.com>

    * Northern Sotho translation
      Pheledi Mathibela <pheledi@mosekolatranslation.co.za>

    * Odia translation
      Kaniska Padhi <kaniska2008@gmail.com>

    * Punjabi translation
      Arshpreet Singh <arsh840@gmail.com>

    * Persian translation
      Farinaz Hedayat <farinaz.hedayat@gmail.com>

    * Sanskrit translation
      Babita Shinde <babitagaikwad@gmail.com>

    * Santali translation (Devaganari)
      Chandrakant Dhutadmal <cpdhutadmal@yahoo.com>
      Ganesh Murmu <g_murmu_in@yahoo.com>

    * Santali translation (Ol-Chiki)
      Chandrakant Dhutadmal <cpdhutadmal@yahoo.com>
      Ganesh Murmu <g_murmu_in@yahoo.com>

    * Serbian translation (latin)
      Ivana Rakic <reci.ne.silvesteru@gmail.com>

    * Sinhala
      Menik Prasantha <manikprasantha@gmail.com>

    * Sundanese
      kumincir <ia.adnan@gmail.com>

    * Valencian
      Pilar Embid Giner <embid_mar@gva.es>

    * Venetian language
      Fabio Lazarin, El Galep�n <mistro@elgalepin.com>

    * Zulu
      sipho <sipho@translate.org.za>

  * Localization Updates:
    ---------------------
    * Albanian translation.
      Canonical Ubuntu Launchpad contributors

    * Basque translation
      Ander Elortondo <ander.elor@gmail.com>

    * Belarusian translation
      Alexander Geroimenko <a.geroimenko@gmail.com>

    * Brazilian Portuguese translation
      Frederico Goncalves Guimaraes <frederico@teia.bio.br>

    * British English
      Robert Readman <robert_readman@hotmail.com>

    * Bulgarian
      Stefani Stoyanova

    * Chinese (Traditional) translation
      Song Huang <songhuang@users.sourceforge.net>

    * Czech translation
      Zdeněk Chalupský <chalzd@gmail.com>

    * Danish translation
      Joe Dalton <joedalton2@yahoo.dk>

    * Dutch translation
      Freek de Kruijf <f.de.kruijf@hetnet.nl>

    * Finnish translation
      Olli <ollinpostit@gmail.com>
      Tarmo Toikkanen <tarmo.toikkanen@iki.fi>

    * German translation
      Stephanie Schilling <stephanieschilling@online.de>

    * Greek translation
      Kiriaki SERAFEIM <pse04178@rhodes.aegean.gr>

    * Gujarati translation
      Kartik Mistry <kartik.mistry@gmail.com>

    * Hindi translation
      aki <akash.nawani@gmail.com>
      Ashish Arora <ashish.arora13@gmail.com>

    * Hungarian translation
      Nagy Akos <nagy.akos@codespring.ro>

    * Italian translation
      Flavio "Iron Bishop" Pastore <ironbishop@fsfe.org>

    * Latvian
      Raivis Strogonovs <raivucis@gmail.com>

    * Malay translation
      Muhammad Najmi Ahmad Zabidi <najmi.zabidi@gmail.com>

    * Norwegian Bokmål translation
      Karl Ove Hufthammer <karl@huftis.org>

    * Norwegian Nynorsk translation
      Karl Ove Hufthammer <karl@huftis.org>

    * Romanian translation
      Hodorog Andrei <tocitox@gmail.com>

    * Russian translation
      Nikolay Parukhin <parukhin@gmail.com>
      Sergei Popov <skein@rambler.ru>

    * Polish translation
      Piotr Kwiliński <euvcp@hotmail.com>

    * Portuguese now using plain "pt" locale (vs. always specifying "_PT")

    * Portuguese translation
      Sergio Marques <smarquespt@gmail.com>

    * Scottish Gaelic translation
      Michael Bauer <fios@akerbeltz.org>

    * Scottish Gaelic translation for Inno Setup
      Foram na Gaidhlig <fios@foramnagaidhlig.net>

    * Serbian translations (cyrillic)
      Ivana Rakic <reci.ne.silvesteru@gmail.com>

    * Slovak translation
      Jaroslav Rynik <jrynik@yahoo.co.uk>

    * Songhay translation
      Abdoul Cisse <abdoulseydou@hotmail.com>
      Mohomodou Houssouba  <mh@bollag-areal.ch>

    * Spanish (Spain) translation
      Teresa Orive <teresa.g.orive@gmail.com>

    * Swedish translation
      Henrik Holst <henrik.holst@millistream.com>

    * Swahili translation
      Emanuel Feruzi <emanuel.feruzi@trilabs.co.tz>

    * Telugu tranlation
      saikumar <ramukiashc@gmail.com> as a task in GCI

    * Turkish
      Enes Burhan KURAN <asd@gmail.com>

    * Vietnamese translation
      Clytie Siddall <clytie@riverland.net.au>

    * Zapoteco
      Rodrigo Perez Ramirez and Indigenas Sin Fronteras <isf_mx@yahoo.com>

  * Bug Fixes
    ---------
    * Starter and template filenames with non-lowercase extensions (e.g. .JPG)
      would fail to load.
      SF.net Bug #191

    * If a non-SVG starter or template with the same name as an SVG one
      existed, it would be loaded instead of the SVG (despite a thumbnail
      of the SVG appearing in the file selector).
      SF.net Bug #191

    * Image on right of dialogs would get scaled/cut-off even if there was
      room for them.

    * When using 'print delay' option, it would not allow printing the
      first time until the delay had passed.

    * Fixed error reporting when make_directory() fails.
      (Fixes spurious
      SF.net Bug #2765872)
      John Popplewell <john@johnnypops.demon.co.uk>

    * Buffersize for holding Starter and image filenames was way too low.
      (Could crash with Starter images with very long filenames.)

    * Shape tool would only resize a shape if you dragged down or right,
      not up or left.
      (SF.net Bug #2834320)

    * tuxpaint-import tool uses BASHisms, so changed shebang to #!/bin/bash
      (instead of #!/bin/sh).

    * Added some missing examples to the default tuxpaint.conf file.
      (Thanks to Aapo Rantalainen <aapo.rantalainen@gmail.com>)

    * Default stamp size, in some situations, was very large
      (due to some rules that allowed stamps to be, at maximum,
      up to 2x width of the canvas, OR 2x height of the canvas, as long
      as it wasn't larger than the canvas in the other dimension).
      The stamp sizing buttons were unable to re-select that size.
      The sizing button bug has been fixed, the rule has been adjusted to
      allow a maximum overscan of 1.5x width-or-height, and if the maximum
      size causes overscan, then a smaller size is used for the default
      when the stamp is first used.
      (SF.net Bug #1668235)

    * Shapes tool now draws at mouse release to help painting with
      touchscreen devices.
      (SF.net Feature request #3008811)

    * Shapes tool would left their preview on the canvas if you leave it
      or change the shape before finishing to draw it.
      (SF.net Bug #1057311)

    * Example for 'savedir' in tuxpaint.conf suggested you needed /saved
      at the end, which is not true.  Added note explaining that actual
      image files go under 'saved' subdirectory.
      (Thanks to Marco Menardi)

    * Saved images woose path contains non-ascii chars can now be opened on Windows.
      Fixes http://sourceforge.net/p/tuxpaint/bugs/188/

    * Ignoring ".pfb" (PostScript 'Printer Font Binary') fonts, to
      avoid crashes.

5 files changed, 181 insertions, 111 deletions

diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index d171ab2cbdc..fa7e6300593 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.79 2014/08/17 09:42:27 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2014/08/23 21:12:02 wiz Exp $
 
-DISTNAME=	tuxpaint-0.9.21
+DISTNAME=	tuxpaint-0.9.22
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tuxpaint/}
 
@@ -10,17 +10,16 @@ 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
+BUILD_DEPENDS+=	gperf-[0-9]*:../../devel/gperf
+
+USE_TOOLS+=		bash:run gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=	YES
 MANCOMPRESSED=		YES
 
-BUILDLINK_API_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.6
-BUILDLINK_API_DEPENDS.SDL_ttf+=	SDL_ttf>=2.0.7
-BUILDLINK_API_DEPENDS.SDL_image+=	SDL_image>=1.2.4
-
 CONFLICTS+=		tuxpaint-stamps<2003.12.23
 
 BROKEN_GETTEXT_DETECTION=	yes
+REPLACE_BASH=		src/tuxpaint-import.sh
 
 PKG_SYSCONFSUBDIR=	tuxpaint
 MAKE_FLAGS+=		CONFDIR=${PKG_SYSCONFDIR:Q}
@@ -31,10 +30,12 @@ MAKE_FLAGS+=		LDFLAGS=${LDFLAGS:Q}
 MAKE_FLAGS+=		CHMOD=${CHMOD:Q}
 MAKE_FLAGS+=		PREFIX=${PREFIX}
 MAKE_FLAGS+=		MAN_PREFIX=$(DESTDIR)$(PREFIX)/${PKGMANDIR}/
+MAKE_FLAGS+=		GPERF=${PREFIX}/bin/gperf
 EGDIR=			${PREFIX}/share/examples/tuxpaint
 CONF_FILES=		${EGDIR}/tuxpaint.conf ${PKG_SYSCONFDIR}/tuxpaint.conf
 
 INSTALL_MAKE_FLAGS+=	PKG_ROOT=${DESTDIR}
+INSTALL_MAKE_FLAGS+=	CONFDIR=${DESTDIR}${PREFIX}/share/examples/tuxpaint
 
 .include "../../mk/bsd.fast.prefs.mk"
 
@@ -53,12 +54,16 @@ post-install:
 	${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
 
+BUILDLINK_API_DEPENDS.SDL_mixer+=	SDL_mixer>=1.2.6
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
+.include "../../devel/SDL_Pango/buildlink3.mk"
+BUILDLINK_API_DEPENDS.SDL_ttf+=	SDL_ttf>=2.0.7
 .include "../../devel/SDL_ttf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.SDL_image+=	SDL_image>=1.2.4
 .include "../../graphics/SDL_image/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
diff --git a/graphics/tuxpaint/PLIST b/graphics/tuxpaint/PLIST
index 3fd742af508..66d2cfc32e6 100644
--- a/graphics/tuxpaint/PLIST
+++ b/graphics/tuxpaint/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.14 2014/08/17 09:42:27 wiz Exp $
+@comment $NetBSD: PLIST,v 1.15 2014/08/23 21:12:02 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/blind.so
 lib/tuxpaint/plugins/blocks_chalk_drip.so
 lib/tuxpaint/plugins/blur.so
 lib/tuxpaint/plugins/bricks.so
@@ -19,15 +20,19 @@ lib/tuxpaint/plugins/fisheye.so
 lib/tuxpaint/plugins/flower.so
 lib/tuxpaint/plugins/foam.so
 lib/tuxpaint/plugins/fold.so
+lib/tuxpaint/plugins/fretwork.so
 lib/tuxpaint/plugins/glasstile.so
 lib/tuxpaint/plugins/grass.so
+lib/tuxpaint/plugins/halftone.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/mosaic_shaped.so
 lib/tuxpaint/plugins/negative.so
 lib/tuxpaint/plugins/noise.so
+lib/tuxpaint/plugins/perspective.so
 lib/tuxpaint/plugins/puzzle.so
 lib/tuxpaint/plugins/rails.so
 lib/tuxpaint/plugins/rain.so
@@ -45,6 +50,7 @@ lib/tuxpaint/plugins/toothpaste.so
 lib/tuxpaint/plugins/tornado.so
 lib/tuxpaint/plugins/tv.so
 lib/tuxpaint/plugins/waves.so
+lib/tuxpaint/plugins/xor.so
 man/man1/tp-magic-config.1
 man/man1/tuxpaint-import.1
 man/man1/tuxpaint.1
@@ -56,6 +62,7 @@ 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
+share/doc/tuxpaint/COPYING-OC.txt
 share/doc/tuxpaint/COPYING.txt
 share/doc/tuxpaint/EXTENDING.txt
 share/doc/tuxpaint/FAQ.txt
@@ -328,6 +335,7 @@ share/doc/tuxpaint/ja/INSTALL.txt
 share/doc/tuxpaint/ja/OPTIONS.txt
 share/doc/tuxpaint/ja/PNG.txt
 share/doc/tuxpaint/ja/README.txt
+share/doc/tuxpaint/ja/html/README.html
 share/doc/tuxpaint/ko/AUTHORS.txt
 share/doc/tuxpaint/ko/COPYING.html
 share/doc/tuxpaint/ko/FAQ.txt
@@ -344,6 +352,7 @@ 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/blinds.txt
 share/doc/tuxpaint/magic-docs/blocks.txt
 share/doc/tuxpaint/magic-docs/blur.txt
 share/doc/tuxpaint/magic-docs/bricks.txt
@@ -366,6 +375,8 @@ 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/hexagonmosaic.txt
+share/doc/tuxpaint/magic-docs/html/blinds.html
 share/doc/tuxpaint/magic-docs/html/blocks.html
 share/doc/tuxpaint/magic-docs/html/blur.html
 share/doc/tuxpaint/magic-docs/html/bricks.html
@@ -388,14 +399,20 @@ 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/hexagonmosaic.html
 share/doc/tuxpaint/magic-docs/html/index.html
+share/doc/tuxpaint/magic-docs/html/irregularmosaic.html
+share/doc/tuxpaint/magic-docs/html/kal_pattern.html
+share/doc/tuxpaint/magic-docs/html/kal_tiles.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/mosaic.html
 share/doc/tuxpaint/magic-docs/html/negative.html
 share/doc/tuxpaint/magic-docs/html/noise.html
+share/doc/tuxpaint/magic-docs/html/perspective.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
@@ -403,12 +420,14 @@ 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/roygbivrainbow.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/squaremosaic.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
@@ -417,14 +436,21 @@ 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/html/wetpaint.html
+share/doc/tuxpaint/magic-docs/html/zoom.html
 share/doc/tuxpaint/magic-docs/index.txt
+share/doc/tuxpaint/magic-docs/irregularmosaic.txt
+share/doc/tuxpaint/magic-docs/kal_pattern.txt
+share/doc/tuxpaint/magic-docs/kal_tiles.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/mosaic.txt
 share/doc/tuxpaint/magic-docs/negative.txt
 share/doc/tuxpaint/magic-docs/noise.txt
+share/doc/tuxpaint/magic-docs/perspective.txt
 share/doc/tuxpaint/magic-docs/picasso.txt
 share/doc/tuxpaint/magic-docs/rails.txt
 share/doc/tuxpaint/magic-docs/rain.txt
@@ -432,12 +458,14 @@ 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/roygbivrainbow.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/squaremosaic.txt
 share/doc/tuxpaint/magic-docs/src/Makefile
 share/doc/tuxpaint/magic-docs/src/magic-docs.php
 share/doc/tuxpaint/magic-docs/stringcorner.txt
@@ -448,6 +476,8 @@ 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/magic-docs/wetpaint.txt
+share/doc/tuxpaint/magic-docs/zoom.txt
 share/doc/tuxpaint/ms/COPYING.txt
 share/doc/tuxpaint/nb/AUTHORS.txt
 share/doc/tuxpaint/nb/COPYING.txt
@@ -554,15 +584,24 @@ 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/ach/LC_MESSAGES/tuxpaint.mo
 share/locale/af/LC_MESSAGES/tuxpaint.mo
+share/locale/ak/LC_MESSAGES/tuxpaint.mo
+share/locale/am/LC_MESSAGES/tuxpaint.mo
+share/locale/an/LC_MESSAGES/tuxpaint.mo
 share/locale/ar/LC_MESSAGES/tuxpaint.mo
+share/locale/as/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/bm/LC_MESSAGES/tuxpaint.mo
 share/locale/bo/LC_MESSAGES/tuxpaint.mo
 share/locale/br/LC_MESSAGES/tuxpaint.mo
+share/locale/bs/LC_MESSAGES/tuxpaint.mo
 share/locale/ca/LC_MESSAGES/tuxpaint.mo
+share/locale/ca@valencia/LC_MESSAGES/tuxpaint.mo
+share/locale/cgg/LC_MESSAGES/tuxpaint.mo
 share/locale/cs/LC_MESSAGES/tuxpaint.mo
 share/locale/cy/LC_MESSAGES/tuxpaint.mo
 share/locale/da/LC_MESSAGES/tuxpaint.mo
@@ -577,6 +616,8 @@ share/locale/es/LC_MESSAGES/tuxpaint.mo
 share/locale/es_MX/LC_MESSAGES/tuxpaint.mo
 share/locale/et/LC_MESSAGES/tuxpaint.mo
 share/locale/eu/LC_MESSAGES/tuxpaint.mo
+share/locale/fa/LC_MESSAGES/tuxpaint.mo
+share/locale/ff/LC_MESSAGES/tuxpaint.mo
 share/locale/fi/LC_MESSAGES/tuxpaint.mo
 share/locale/fo/LC_MESSAGES/tuxpaint.mo
 share/locale/fr/LC_MESSAGES/tuxpaint.mo
@@ -589,36 +630,59 @@ share/locale/he/LC_MESSAGES/tuxpaint.mo
 share/locale/hi/LC_MESSAGES/tuxpaint.mo
 share/locale/hr/LC_MESSAGES/tuxpaint.mo
 share/locale/hu/LC_MESSAGES/tuxpaint.mo
+share/locale/hy/LC_MESSAGES/tuxpaint.mo
 share/locale/id/LC_MESSAGES/tuxpaint.mo
 share/locale/is/LC_MESSAGES/tuxpaint.mo
 share/locale/it/LC_MESSAGES/tuxpaint.mo
+share/locale/iu/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/kn/LC_MESSAGES/tuxpaint.mo
 share/locale/ko/LC_MESSAGES/tuxpaint.mo
+share/locale/kok/LC_MESSAGES/tuxpaint.mo
+share/locale/kok@roman/LC_MESSAGES/tuxpaint.mo
 share/locale/ku/LC_MESSAGES/tuxpaint.mo
+share/locale/lb/LC_MESSAGES/tuxpaint.mo
+share/locale/lg/LC_MESSAGES/tuxpaint.mo
 share/locale/lt/LC_MESSAGES/tuxpaint.mo
 share/locale/lv/LC_MESSAGES/tuxpaint.mo
+share/locale/mai/LC_MESSAGES/tuxpaint.mo
 share/locale/mk/LC_MESSAGES/tuxpaint.mo
+share/locale/ml/LC_MESSAGES/tuxpaint.mo
+share/locale/mn/LC_MESSAGES/tuxpaint.mo
+share/locale/mni/LC_MESSAGES/tuxpaint.mo
+share/locale/mni@meiteimayek/LC_MESSAGES/tuxpaint.mo
+share/locale/mr/LC_MESSAGES/tuxpaint.mo
 share/locale/ms/LC_MESSAGES/tuxpaint.mo
 share/locale/nb/LC_MESSAGES/tuxpaint.mo
+share/locale/ne/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/nso/LC_MESSAGES/tuxpaint.mo
 share/locale/oc/LC_MESSAGES/tuxpaint.mo
 share/locale/oj/LC_MESSAGES/tuxpaint.mo
+share/locale/or/LC_MESSAGES/tuxpaint.mo
+share/locale/pa/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/ro/LC_MESSAGES/tuxpaint.mo
 share/locale/ru/LC_MESSAGES/tuxpaint.mo
 share/locale/rw/LC_MESSAGES/tuxpaint.mo
+share/locale/sa/LC_MESSAGES/tuxpaint.mo
+share/locale/sat/LC_MESSAGES/tuxpaint.mo
+share/locale/sat@olchiki/LC_MESSAGES/tuxpaint.mo
 share/locale/shs/LC_MESSAGES/tuxpaint.mo
+share/locale/si/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/sr@latin/LC_MESSAGES/tuxpaint.mo
+share/locale/su/LC_MESSAGES/tuxpaint.mo
 share/locale/sv/LC_MESSAGES/tuxpaint.mo
 share/locale/sw/LC_MESSAGES/tuxpaint.mo
 share/locale/ta/LC_MESSAGES/tuxpaint.mo
@@ -627,9 +691,10 @@ share/locale/th/LC_MESSAGES/tuxpaint.mo
 share/locale/tl/LC_MESSAGES/tuxpaint.mo
 share/locale/tlh/LC_MESSAGES/tuxpaint.mo
 share/locale/tr/LC_MESSAGES/tuxpaint.mo
-share/locale/twi/LC_MESSAGES/tuxpaint.mo
+share/locale/tw/LC_MESSAGES/tuxpaint.mo
 share/locale/uk/LC_MESSAGES/tuxpaint.mo
 share/locale/ve/LC_MESSAGES/tuxpaint.mo
+share/locale/vec/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
@@ -637,6 +702,7 @@ 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/locale/zu/LC_MESSAGES/tuxpaint.mo
 share/pixmaps/tuxpaint.png
 share/tuxpaint/brushes/aa_round_03.png
 share/tuxpaint/brushes/aa_round_06.png
@@ -660,8 +726,11 @@ share/tuxpaint/brushes/flower_5.png
 share/tuxpaint/brushes/flower_5_small.png
 share/tuxpaint/brushes/flower_6.png
 share/tuxpaint/brushes/flower_6_small.png
+share/tuxpaint/brushes/flower_7.png
 share/tuxpaint/brushes/heart.png
 share/tuxpaint/brushes/hexagon.png
+share/tuxpaint/brushes/inksplat.dat
+share/tuxpaint/brushes/inksplat.png
 share/tuxpaint/brushes/kuroneko.dat
 share/tuxpaint/brushes/kuroneko.png
 share/tuxpaint/brushes/lines-angled.dat
@@ -768,6 +837,7 @@ 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/blind.png
 share/tuxpaint/images/magic/blocks.png
 share/tuxpaint/images/magic/blur.png
 share/tuxpaint/images/magic/calligraphy.png
@@ -792,17 +862,32 @@ 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/fretwork.png
+share/tuxpaint/images/magic/fretwork_corner.png
+share/tuxpaint/images/magic/fretwork_four.png
+share/tuxpaint/images/magic/fretwork_one.png
+share/tuxpaint/images/magic/fretwork_three.png
 share/tuxpaint/images/magic/glasstile.png
 share/tuxpaint/images/magic/grass.png
 share/tuxpaint/images/magic/grass_data.png
+share/tuxpaint/images/magic/halftone.png
+share/tuxpaint/images/magic/kal_pattern.png
+share/tuxpaint/images/magic/kal_tiles.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/mosaic_shaped_hex.png
+share/tuxpaint/images/magic/mosaic_shaped_hex_pattern.png
+share/tuxpaint/images/magic/mosaic_shaped_irregular.png
+share/tuxpaint/images/magic/mosaic_shaped_irregular_pattern.png
+share/tuxpaint/images/magic/mosaic_shaped_square.png
+share/tuxpaint/images/magic/mosaic_shaped_square_pattern.png
 share/tuxpaint/images/magic/negative.png
 share/tuxpaint/images/magic/noise.png
+share/tuxpaint/images/magic/perspective.png
 share/tuxpaint/images/magic/picasso.png
 share/tuxpaint/images/magic/puzzle.png
 share/tuxpaint/images/magic/rails.png
@@ -813,6 +898,8 @@ 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-roygbiv-colors.png
+share/tuxpaint/images/magic/realrainbow-roygbiv.png
 share/tuxpaint/images/magic/realrainbow.png
 share/tuxpaint/images/magic/ripples.png
 share/tuxpaint/images/magic/rosette.png
@@ -826,6 +913,8 @@ 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/symmetric_leftright.png
+share/tuxpaint/images/magic/symmetric_updown.png
 share/tuxpaint/images/magic/thick.png
 share/tuxpaint/images/magic/thin.png
 share/tuxpaint/images/magic/tint.png
@@ -836,6 +925,9 @@ 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/magic/wetpaint.png
+share/tuxpaint/images/magic/xor.png
+share/tuxpaint/images/magic/zoom.png
 share/tuxpaint/images/shapes/circle.png
 share/tuxpaint/images/shapes/circle_f.png
 share/tuxpaint/images/shapes/diamond.png
@@ -859,6 +951,8 @@ share/tuxpaint/images/title-tuxpaint.svg
 share/tuxpaint/images/title.png
 share/tuxpaint/images/tools/brush.png
 share/tuxpaint/images/tools/eraser.png
+share/tuxpaint/images/tools/label.png
+share/tuxpaint/images/tools/label_select.png
 share/tuxpaint/images/tools/lines.png
 share/tuxpaint/images/tools/magic.png
 share/tuxpaint/images/tools/new.png
@@ -887,8 +981,12 @@ share/tuxpaint/images/tuxpaint-installer.ico
 share/tuxpaint/images/ui/back.png
 share/tuxpaint/images/ui/bold.png
 share/tuxpaint/images/ui/btn_down.png
+share/tuxpaint/images/ui/btn_nav.png
 share/tuxpaint/images/ui/btn_off.png
 share/tuxpaint/images/ui/btn_up.png
+share/tuxpaint/images/ui/btnsm_down.png
+share/tuxpaint/images/ui/btnsm_hold.png
+share/tuxpaint/images/ui/btnsm_nav.png
 share/tuxpaint/images/ui/btnsm_off.png
 share/tuxpaint/images/ui/btnsm_up.png
 share/tuxpaint/images/ui/color_btn_down.png
@@ -915,6 +1013,11 @@ share/tuxpaint/images/ui/no.png
 share/tuxpaint/images/ui/no_title.png
 share/tuxpaint/images/ui/no_title_large.png
 share/tuxpaint/images/ui/open.png
+share/tuxpaint/images/ui/osk_capslock.png
+share/tuxpaint/images/ui/osk_delete.png
+share/tuxpaint/images/ui/osk_enter.png
+share/tuxpaint/images/ui/osk_shift.png
+share/tuxpaint/images/ui/osk_tab.png
 share/tuxpaint/images/ui/paintcan.png
 share/tuxpaint/images/ui/paintwell.png
 share/tuxpaint/images/ui/play.png
@@ -936,6 +1039,13 @@ 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/osk/abc.h_layout
+share/tuxpaint/osk/default.layout
+share/tuxpaint/osk/en_US.UTF-8_Compose
+share/tuxpaint/osk/keysymdef.h
+share/tuxpaint/osk/qwerty.h_layout
+share/tuxpaint/osk/qwerty.layout
+share/tuxpaint/osk/us-intl-altgr-dead-keys.keymap
 share/tuxpaint/sounds/areyousure.wav
 share/tuxpaint/sounds/bleep.wav
 share/tuxpaint/sounds/bubble.wav
@@ -952,6 +1062,7 @@ 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/blind.ogg
 share/tuxpaint/sounds/magic/blocks.wav
 share/tuxpaint/sounds/magic/blur.wav
 share/tuxpaint/sounds/magic/brick.wav
@@ -973,6 +1084,7 @@ 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/fretwork.ogg
 share/tuxpaint/sounds/magic/glasstile.ogg
 share/tuxpaint/sounds/magic/grass.wav
 share/tuxpaint/sounds/magic/kaleidoscope.ogg
@@ -981,8 +1093,12 @@ 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/mosaic_shaped_hex.ogg
+share/tuxpaint/sounds/magic/mosaic_shaped_irregular.ogg
+share/tuxpaint/sounds/magic/mosaic_shaped_square.ogg
 share/tuxpaint/sounds/magic/negative.wav
 share/tuxpaint/sounds/magic/noise.ogg
+share/tuxpaint/sounds/magic/perspective.ogg
 share/tuxpaint/sounds/magic/picasso.ogg
 share/tuxpaint/sounds/magic/rails.wav
 share/tuxpaint/sounds/magic/rain.ogg
@@ -1006,6 +1122,9 @@ 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/magic/xor.ogg
+share/tuxpaint/sounds/magic/zoom_down.ogg
+share/tuxpaint/sounds/magic/zoom_up.ogg
 share/tuxpaint/sounds/mirror.wav
 share/tuxpaint/sounds/paint1.wav
 share/tuxpaint/sounds/paint2.wav
@@ -1036,30 +1155,53 @@ 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/bald_eagle.svg
+share/tuxpaint/starters/car2.svg
 share/tuxpaint/starters/carcassone.png
 share/tuxpaint/starters/chessboard-back.png
 share/tuxpaint/starters/chessboard.png
 share/tuxpaint/starters/chicken.png
+share/tuxpaint/starters/desert_tortoise.svg
+share/tuxpaint/starters/elephant.svg
+share/tuxpaint/starters/fish_icon.svg
+share/tuxpaint/starters/frame_filmstrip.png
+share/tuxpaint/starters/frame_flowers.png
+share/tuxpaint/starters/frame_gold.png
+share/tuxpaint/starters/frame_heart.png
+share/tuxpaint/starters/frame_hearts.svg
+share/tuxpaint/starters/frame_neon.png
+share/tuxpaint/starters/frame_picture.png
+share/tuxpaint/starters/frame_screen.png
+share/tuxpaint/starters/frame_silver.png
+share/tuxpaint/starters/frame_television.png
+share/tuxpaint/starters/gecko.svg
 share/tuxpaint/starters/grid_10x10.png
 share/tuxpaint/starters/grid_20x20.png
+share/tuxpaint/starters/hat.png
+share/tuxpaint/starters/hat.svg
 share/tuxpaint/starters/jetplane.png
 share/tuxpaint/starters/jigsaw.png
 share/tuxpaint/starters/jigsaw.svg
+share/tuxpaint/starters/manatee.svg
+share/tuxpaint/starters/mosaic.svg
 share/tuxpaint/starters/nagasaki.png
 share/tuxpaint/starters/nagasaki.svg
+share/tuxpaint/starters/old_soviet_car.svg
+share/tuxpaint/starters/pansy.png
 share/tuxpaint/starters/reef-back.png
 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/skull.svg
 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/stained_glass.svg
 share/tuxpaint/starters/street.png
 share/tuxpaint/starters/tux_farmer.png
+share/tuxpaint/starters/woodpecker.svg
 share/tuxpaint/starters/worldmap.png
 share/tuxpaint/starters/worldmap_africa.png
 share/tuxpaint/starters/worldmap_america_north.png
@@ -1072,3 +1214,22 @@ share/tuxpaint/starters/worldmap_australasia.png
 share/tuxpaint/starters/worldmap_canada.png
 share/tuxpaint/starters/worldmap_europe.png
 share/tuxpaint/starters/worldmap_japan.png
+share/tuxpaint/templates/burnt_bark.jpg
+share/tuxpaint/templates/cliff.jpg
+share/tuxpaint/templates/corn_maze.jpg
+share/tuxpaint/templates/jellyfish.jpg
+share/tuxpaint/templates/lighthouse.jpg
+share/tuxpaint/templates/mossy_bark.jpg
+share/tuxpaint/templates/mossy_log.jpg
+share/tuxpaint/templates/mudstone.jpg
+share/tuxpaint/templates/ocean_splash.jpg
+share/tuxpaint/templates/ocean_waves.jpg
+share/tuxpaint/templates/redwoods_above.jpg
+share/tuxpaint/templates/rocks.jpg
+share/tuxpaint/templates/sheep.jpg
+share/tuxpaint/templates/spiders_web.jpg
+share/tuxpaint/templates/sun_behind_clouds.jpg
+share/tuxpaint/templates/sun_behind_leaves.jpg
+share/tuxpaint/templates/trees_above.jpg
+share/tuxpaint/templates/trees_at_dusk.jpg
+share/tuxpaint/templates/wool_mill_machine.jpg
diff --git a/graphics/tuxpaint/distinfo b/graphics/tuxpaint/distinfo
index cbd57c38845..241e2322f2f 100644
--- a/graphics/tuxpaint/distinfo
+++ b/graphics/tuxpaint/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.23 2014/08/17 09:42:27 wiz Exp $
+$NetBSD: distinfo,v 1.24 2014/08/23 21:12:02 wiz Exp $
 
-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
+SHA1 (tuxpaint-0.9.22.tar.gz) = 62ab3069f5a8e81edb83912fe3d9906c1e9b138f
+RMD160 (tuxpaint-0.9.22.tar.gz) = 4a122b87f01babb988c250f51d006a5dd59bf1de
+Size (tuxpaint-0.9.22.tar.gz) = 13301628 bytes
diff --git a/graphics/tuxpaint/patches/patch-aa b/graphics/tuxpaint/patches/patch-aa
deleted file mode 100644
index ed0070ec4d0..00000000000
--- a/graphics/tuxpaint/patches/patch-aa
+++ /dev/null
@@ -1,74 +0,0 @@
-$NetBSD: patch-aa,v 1.14 2014/08/17 09:42:27 wiz Exp $
-
---- Makefile.orig	2009-04-29 05:18:57.000000000 +0000
-+++ Makefile
-@@ -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
- 
- 
-@@ -556,9 +563,8 @@ uninstall:	uninstall-i18n
- install-default-config:
- 	@echo
- 	@echo "...Installing default config file..."
--	@install -d $(CONFDIR)
--	@cp src/tuxpaint.conf $(CONFDIR)
--	@chmod 644 $(CONFDIR)/tuxpaint.conf
-+	@$(BSD_INSTALL_DATA_DIR) ${DESTDIR}$(PREFIX)/share/examples/tuxpaint
-+	@$(BSD_INSTALL_DATA) src/tuxpaint.conf ${DESTDIR}$(PREFIX)/share/examples/tuxpaint
- 
- 
- # Install example stamps
-@@ -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) $(FRIBIDI_CFLAGS) $(DEFS) \
-+	$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(LDFLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \
- 		-o tuxpaint $^ \
- 		$(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS)
- 	@$(RSRC_CMD)
diff --git a/graphics/tuxpaint/patches/patch-ab b/graphics/tuxpaint/patches/patch-ab
deleted file mode 100644
index c9166c34a32..00000000000
--- a/graphics/tuxpaint/patches/patch-ab
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2014/08/17 09:42:27 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/tuxpaint.c.orig	2009-06-18 20:51:58.000000000 +0000
-+++ src/tuxpaint.c
-@@ -12898,12 +12898,7 @@ static int do_png_save(FILE * fi, const 
-       {
- 	png_init_io(png_ptr, fi);
- 
--	info_ptr->width = surf->w;
--	info_ptr->height = surf->h;
--	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 */
-+	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,
- 				   PNG_sRGB_INTENT_PERCEPTUAL);