Changes 2.2.1:

- added python logo to EXTRA_DIST so it shows up in the tarball (bug #161716)
- fixed mempory corruption in FracalExplorer plug-in (bug #161729)
- fixed crash in gradient editor (bug #161411)
- fixed crash in unsharp mask plug-in preview code (bug #157910)
- fixed bug in unsharp mask plug-in that caused artefacts when a large blur
  radius was being used on a small drawable; minor optimizations
- removed broken asc2img Script-Fu
- fixed channel drag-n-drop (bug #161877)
- fixed misbehaviour of entries in Scale and Resize dialogs (bug #161756)
- speed up preview in several plug-ins
- fixed bug in Despeckle plug-in that caused it to run very slowly
  (bug #162129)
- fixed a crash in the error dialog (bug #162147)
- fixed parameter value range in Weave script (bug #162182)
- fixed crash in brush preview (bug #162232)
- minor improvements to the API docs

5 files changed, 175 insertions, 47 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 1b91da14699..4d8cbc5f362 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.109 2004/12/28 23:18:21 reed Exp $
+# $NetBSD: Makefile,v 1.110 2005/01/04 15:20:25 adam Exp $
 
-DISTNAME=	gimp-2.0.6
-PKGREVISION=	1
+DISTNAME=	gimp-2.2.1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.0/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/v2.0/ \
-		ftp://ftp.sunet.se/pub/gnu/gimp/v2.0/ \
-		ftp://ftp.gwdg.de/pub/misc/grafik/gimp/gimp/v2.0/ \
-		ftp://ftp.minet.net/pub/gimp/v2.0/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.2/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/v2.2/ \
+		ftp://ftp.sunet.se/pub/gnu/gimp/v2.2/ \
+		ftp://ftp.gwdg.de/pub/misc/grafik/gimp/gimp/v2.2/ \
+		ftp://ftp.minet.net/pub/gimp/v2.2/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
@@ -47,7 +46,7 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html/${PKGNAME_NOREV}
 CONFIGURE_ARGS+=	--with-gimpprint-prefix=${BUILDLINK_PREFIX.gimp-print-lib}
 
 EGDIR=			${PREFIX}/share/examples/gimp-2.0
-.for f in gimprc gtkrc ps-menurc sessionrc templaterc unionrc
+.for f in controllerrc gimprc gtkrc ps-menurc sessionrc templaterc unionrc
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index 8d719f2d3b4..a29bc9b9738 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,11 +1,14 @@
-@comment $NetBSD: PLIST,v 1.15 2004/09/27 11:19:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2005/01/04 15:20:25 adam Exp $
 bin/gimp
-bin/gimp-2.0
+bin/gimp-2.2
 bin/gimp-remote
-bin/gimp-remote-2.0
+bin/gimp-remote-2.2
 bin/gimptool-2.0
 include/gimp-2.0/libgimp/gimp.h
 include/gimp-2.0/libgimp/gimp_pdb.h
+include/gimp-2.0/libgimp/gimpaspectpreview.h
+include/gimp-2.0/libgimp/gimpbrush_pdb.h
+include/gimp-2.0/libgimp/gimpbrushes.h
 include/gimp-2.0/libgimp/gimpbrushes_pdb.h
 include/gimp-2.0/libgimp/gimpbrushmenu.h
 include/gimp-2.0/libgimp/gimpbrushselect.h
@@ -14,10 +17,14 @@ include/gimp-2.0/libgimp/gimpchannel.h
 include/gimp-2.0/libgimp/gimpchannel_pdb.h
 include/gimp-2.0/libgimp/gimpcolor_pdb.h
 include/gimp-2.0/libgimp/gimpcompat.h
+include/gimp-2.0/libgimp/gimpcontext_pdb.h
 include/gimp-2.0/libgimp/gimpconvert_pdb.h
 include/gimp-2.0/libgimp/gimpdisplay_pdb.h
 include/gimp-2.0/libgimp/gimpdrawable.h
 include/gimp-2.0/libgimp/gimpdrawable_pdb.h
+include/gimp-2.0/libgimp/gimpdrawablecombobox.h
+include/gimp-2.0/libgimp/gimpdrawablepreview.h
+include/gimp-2.0/libgimp/gimpdrawabletransform_pdb.h
 include/gimp-2.0/libgimp/gimpedit_pdb.h
 include/gimp-2.0/libgimp/gimpenums.h
 include/gimp-2.0/libgimp/gimpexport.h
@@ -28,7 +35,9 @@ include/gimp-2.0/libgimp/gimpfonts_pdb.h
 include/gimp-2.0/libgimp/gimpfontselect.h
 include/gimp-2.0/libgimp/gimpfontselect_pdb.h
 include/gimp-2.0/libgimp/gimpgimprc_pdb.h
+include/gimp-2.0/libgimp/gimpgradient_pdb.h
 include/gimp-2.0/libgimp/gimpgradientmenu.h
+include/gimp-2.0/libgimp/gimpgradients.h
 include/gimp-2.0/libgimp/gimpgradients_pdb.h
 include/gimp-2.0/libgimp/gimpgradientselect.h
 include/gimp-2.0/libgimp/gimpgradientselect_pdb.h
@@ -36,26 +45,38 @@ include/gimp-2.0/libgimp/gimpguides_pdb.h
 include/gimp-2.0/libgimp/gimphelp_pdb.h
 include/gimp-2.0/libgimp/gimpimage.h
 include/gimp-2.0/libgimp/gimpimage_pdb.h
+include/gimp-2.0/libgimp/gimpimagecombobox.h
 include/gimp-2.0/libgimp/gimplayer.h
 include/gimp-2.0/libgimp/gimplayer_pdb.h
 include/gimp-2.0/libgimp/gimpmenu.h
 include/gimp-2.0/libgimp/gimpmessage_pdb.h
 include/gimp-2.0/libgimp/gimpmisc_pdb.h
 include/gimp-2.0/libgimp/gimppainttools_pdb.h
+include/gimp-2.0/libgimp/gimppalette.h
 include/gimp-2.0/libgimp/gimppalette_pdb.h
+include/gimp-2.0/libgimp/gimppalettemenu.h
+include/gimp-2.0/libgimp/gimppalettes.h
 include/gimp-2.0/libgimp/gimppalettes_pdb.h
+include/gimp-2.0/libgimp/gimppaletteselect.h
 include/gimp-2.0/libgimp/gimppaletteselect_pdb.h
 include/gimp-2.0/libgimp/gimpparasite_pdb.h
 include/gimp-2.0/libgimp/gimppaths_pdb.h
+include/gimp-2.0/libgimp/gimppattern_pdb.h
 include/gimp-2.0/libgimp/gimppatternmenu.h
+include/gimp-2.0/libgimp/gimppatterns.h
 include/gimp-2.0/libgimp/gimppatterns_pdb.h
 include/gimp-2.0/libgimp/gimppatternselect.h
 include/gimp-2.0/libgimp/gimppatternselect_pdb.h
+include/gimp-2.0/libgimp/gimppixbuf.h
 include/gimp-2.0/libgimp/gimppixelfetcher.h
 include/gimp-2.0/libgimp/gimppixelrgn.h
+include/gimp-2.0/libgimp/gimpplugin.h
 include/gimp-2.0/libgimp/gimpplugin_pdb.h
 include/gimp-2.0/libgimp/gimpproceduraldb.h
 include/gimp-2.0/libgimp/gimpproceduraldb_pdb.h
+include/gimp-2.0/libgimp/gimpprogress.h
+include/gimp-2.0/libgimp/gimpprogress_pdb.h
+include/gimp-2.0/libgimp/gimpprogressbar.h
 include/gimp-2.0/libgimp/gimpregioniterator.h
 include/gimp-2.0/libgimp/gimpselection.h
 include/gimp-2.0/libgimp/gimpselection_pdb.h
@@ -69,10 +90,13 @@ include/gimp-2.0/libgimp/gimpuitypes.h
 include/gimp-2.0/libgimp/gimpundo_pdb.h
 include/gimp-2.0/libgimp/gimpunit_pdb.h
 include/gimp-2.0/libgimpbase/gimpbase.h
+include/gimp-2.0/libgimpbase/gimpbaseenums.h
 include/gimp-2.0/libgimpbase/gimpbasetypes.h
 include/gimp-2.0/libgimpbase/gimpdatafiles.h
+include/gimp-2.0/libgimpbase/gimpchecks.h
 include/gimp-2.0/libgimpbase/gimpenv.h
 include/gimp-2.0/libgimpbase/gimplimits.h
+include/gimp-2.0/libgimpbase/gimpmemsize.h
 include/gimp-2.0/libgimpbase/gimpparasite.h
 include/gimp-2.0/libgimpbase/gimpparasiteio.h
 include/gimp-2.0/libgimpbase/gimpsignal.h
@@ -103,25 +127,36 @@ include/gimp-2.0/libgimpthumb/gimpthumb.h
 include/gimp-2.0/libgimpthumb/gimpthumbnail.h
 include/gimp-2.0/libgimpwidgets/gimpbutton.h
 include/gimp-2.0/libgimpwidgets/gimpchainbutton.h
+include/gimp-2.0/libgimpwidgets/gimpcellrenderercolor.h
+include/gimp-2.0/libgimpwidgets/gimpcellrenderertoggle.h
 include/gimp-2.0/libgimpwidgets/gimpcolorarea.h
 include/gimp-2.0/libgimpwidgets/gimpcolorbutton.h
 include/gimp-2.0/libgimpwidgets/gimpcolordisplay.h
 include/gimp-2.0/libgimpwidgets/gimpcolordisplaystack.h
+include/gimp-2.0/libgimpwidgets/gimpcolorhexentry.h
 include/gimp-2.0/libgimpwidgets/gimpcolornotebook.h
 include/gimp-2.0/libgimpwidgets/gimpcolorscale.h
 include/gimp-2.0/libgimpwidgets/gimpcolorscales.h
 include/gimp-2.0/libgimpwidgets/gimpcolorselect.h
 include/gimp-2.0/libgimpwidgets/gimpcolorselection.h
 include/gimp-2.0/libgimpwidgets/gimpcolorselector.h
+include/gimp-2.0/libgimpwidgets/gimpcontroller.h
 include/gimp-2.0/libgimpwidgets/gimpdialog.h
 include/gimp-2.0/libgimpwidgets/gimpfileentry.h
+include/gimp-2.0/libgimpwidgets/gimpframe.h
 include/gimp-2.0/libgimpwidgets/gimphelpui.h
+include/gimp-2.0/libgimpwidgets/gimpintcombobox.h
+include/gimp-2.0/libgimpwidgets/gimpintstore.h
 include/gimp-2.0/libgimpwidgets/gimpmemsizeentry.h
 include/gimp-2.0/libgimpwidgets/gimpoffsetarea.h
+include/gimp-2.0/libgimpwidgets/gimpoldwidgets.h
 include/gimp-2.0/libgimpwidgets/gimppatheditor.h
+include/gimp-2.0/libgimpwidgets/gimppreview.h
+include/gimp-2.0/libgimpwidgets/gimppreviewarea.h
 include/gimp-2.0/libgimpwidgets/gimppickbutton.h
 include/gimp-2.0/libgimpwidgets/gimppixmap.h
 include/gimp-2.0/libgimpwidgets/gimpquerybox.h
+include/gimp-2.0/libgimpwidgets/gimpscrolledpreview.h
 include/gimp-2.0/libgimpwidgets/gimpsizeentry.h
 include/gimp-2.0/libgimpwidgets/gimpstock.h
 include/gimp-2.0/libgimpwidgets/gimpunitmenu.h
@@ -135,7 +170,7 @@ lib/gimp/2.0/modules/libcdisplay_proof.la
 lib/gimp/2.0/modules/libcolorsel_cmyk.la
 lib/gimp/2.0/modules/libcolorsel_triangle.la
 lib/gimp/2.0/modules/libcolorsel_water.la
-lib/gimp/2.0/plug-ins/AlienMap
+lib/gimp/2.0/modules/libcontroller_midi.la
 lib/gimp/2.0/plug-ins/AlienMap2
 lib/gimp/2.0/plug-ins/CEL
 lib/gimp/2.0/plug-ins/CML_explorer
@@ -154,7 +189,7 @@ lib/gimp/2.0/plug-ins/blur
 lib/gimp/2.0/plug-ins/bmp
 lib/gimp/2.0/plug-ins/borderaverage
 lib/gimp/2.0/plug-ins/bumpmap
-lib/gimp/2.0/plug-ins/bz2
+lib/gimp/2.0/plug-ins/cartoon
 lib/gimp/2.0/plug-ins/c_astretch
 lib/gimp/2.0/plug-ins/ccanalyze
 lib/gimp/2.0/plug-ins/channel_mixer
@@ -163,11 +198,11 @@ lib/gimp/2.0/plug-ins/color_enhance
 lib/gimp/2.0/plug-ins/colorify
 lib/gimp/2.0/plug-ins/colortoalpha
 lib/gimp/2.0/plug-ins/compose
+lib/gimp/2.0/plug-ins/compressor
 lib/gimp/2.0/plug-ins/convmatrix
 lib/gimp/2.0/plug-ins/csource
 lib/gimp/2.0/plug-ins/cubism
 lib/gimp/2.0/plug-ins/curve_bend
-lib/gimp/2.0/plug-ins/dbbrowser
 lib/gimp/2.0/plug-ins/decompose
 lib/gimp/2.0/plug-ins/deinterlace
 lib/gimp/2.0/plug-ins/depthmerge
@@ -176,6 +211,7 @@ lib/gimp/2.0/plug-ins/destripe
 lib/gimp/2.0/plug-ins/dicom
 lib/gimp/2.0/plug-ins/diffraction
 lib/gimp/2.0/plug-ins/displace
+lib/gimp/2.0/plug-ins/dog
 lib/gimp/2.0/plug-ins/edge
 lib/gimp/2.0/plug-ins/emboss
 lib/gimp/2.0/plug-ins/engrave
@@ -187,31 +223,28 @@ lib/gimp/2.0/plug-ins/flame
 lib/gimp/2.0/plug-ins/flarefx
 lib/gimp/2.0/plug-ins/fp
 lib/gimp/2.0/plug-ins/fractaltrace
-lib/gimp/2.0/plug-ins/gauss_iir
-lib/gimp/2.0/plug-ins/gauss_rle
+lib/gimp/2.0/plug-ins/gauss
 lib/gimp/2.0/plug-ins/gbr
 lib/gimp/2.0/plug-ins/gee
 lib/gimp/2.0/plug-ins/gee_zoom
 lib/gimp/2.0/plug-ins/gfig
 lib/gimp/2.0/plug-ins/gflare
 lib/gimp/2.0/plug-ins/gfli
-lib/gimp/2.0/plug-ins/gicon
 lib/gimp/2.0/plug-ins/gif
 lib/gimp/2.0/plug-ins/gifload
 lib/gimp/2.0/plug-ins/gih
 lib/gimp/2.0/plug-ins/gimpressionist
 lib/gimp/2.0/plug-ins/glasstile
+lib/gimp/2.0/plug-ins/glob
 lib/gimp/2.0/plug-ins/gqbist
 lib/gimp/2.0/plug-ins/gradmap
 lib/gimp/2.0/plug-ins/grid
 lib/gimp/2.0/plug-ins/gtm
 lib/gimp/2.0/plug-ins/guillotine
-lib/gimp/2.0/plug-ins/gz
 lib/gimp/2.0/plug-ins/header
 lib/gimp/2.0/plug-ins/help
 lib/gimp/2.0/plug-ins/helpbrowser
 lib/gimp/2.0/plug-ins/hot
-lib/gimp/2.0/plug-ins/hrz
 lib/gimp/2.0/plug-ins/ifscompose
 lib/gimp/2.0/plug-ins/illusion
 lib/gimp/2.0/plug-ins/imagemap
@@ -227,6 +260,7 @@ lib/gimp/2.0/plug-ins/maze
 lib/gimp/2.0/plug-ins/mblur
 lib/gimp/2.0/plug-ins/mng
 lib/gimp/2.0/plug-ins/mosaic
+lib/gimp/2.0/plug-ins/neon
 lib/gimp/2.0/plug-ins/newsprint
 lib/gimp/2.0/plug-ins/nlfilt
 lib/gimp/2.0/plug-ins/noisify
@@ -237,20 +271,24 @@ lib/gimp/2.0/plug-ins/pagecurl
 lib/gimp/2.0/plug-ins/papertile
 lib/gimp/2.0/plug-ins/pat
 lib/gimp/2.0/plug-ins/pcx
+lib/gimp/2.0/plug-ins/photocopy
 lib/gimp/2.0/plug-ins/pix
 lib/gimp/2.0/plug-ins/pixelize
 lib/gimp/2.0/plug-ins/plasma
-lib/gimp/2.0/plug-ins/plugindetails
+lib/gimp/2.0/plug-ins/plugin-browser
 lib/gimp/2.0/plug-ins/png
 lib/gimp/2.0/plug-ins/pnm
 lib/gimp/2.0/plug-ins/polar
 lib/gimp/2.0/plug-ins/postscript
 lib/gimp/2.0/plug-ins/print
+lib/gimp/2.0/plug-ins/procedure-browser
 lib/gimp/2.0/plug-ins/psd
 lib/gimp/2.0/plug-ins/psd_save
 lib/gimp/2.0/plug-ins/psp
 lib/gimp/2.0/plug-ins/randomize
+lib/gimp/2.0/plug-ins/raw
 lib/gimp/2.0/plug-ins/rcm
+lib/gimp/2.0/plug-ins/retinex
 lib/gimp/2.0/plug-ins/ripple
 lib/gimp/2.0/plug-ins/rotate
 lib/gimp/2.0/plug-ins/sample_colorize
@@ -267,6 +305,7 @@ lib/gimp/2.0/plug-ins/sinus
 lib/gimp/2.0/plug-ins/smooth_palette
 lib/gimp/2.0/plug-ins/snoise
 lib/gimp/2.0/plug-ins/sobel
+lib/gimp/2.0/plug-ins/softglow
 lib/gimp/2.0/plug-ins/sparkle
 lib/gimp/2.0/plug-ins/spheredesigner
 lib/gimp/2.0/plug-ins/spread
@@ -290,6 +329,7 @@ lib/gimp/2.0/plug-ins/waves
 lib/gimp/2.0/plug-ins/webbrowser
 lib/gimp/2.0/plug-ins/whirlpinch
 lib/gimp/2.0/plug-ins/wind
+lib/gimp/2.0/plug-ins/winicon
 lib/gimp/2.0/plug-ins/wmf
 lib/gimp/2.0/plug-ins/xbm
 lib/gimp/2.0/plug-ins/xjt
@@ -307,30 +347,39 @@ lib/libgimpwidgets-2.0.la
 lib/pkgconfig/gimp-2.0.pc
 lib/pkgconfig/gimpthumb-2.0.pc
 lib/pkgconfig/gimpui-2.0.pc
-man/man1/gimp-2.0.1
-man/man1/gimp-remote-2.0.1
+man/man1/${PKGNAME}
+man/man1/gimp-remote-2.2.1
 man/man1/gimp-remote.1
 man/man1/gimp.1
 man/man1/gimptool-2.0.1
-man/man5/gimprc-2.0.5
+man/man5/gimprc-2.2.5
 man/man5/gimprc.5
 share/aclocal/gimp-2.0.m4
-share/application-registry/gimp-2.0.applications
-share/applications/gimp-2.0.desktop
+share/application-registry/gimp-2.2.applications
+share/applications/gimp-2.2.desktop
+share/doc/html/${PKGNAME}/libgimp/GimpAspectPreview.html
+share/doc/html/${PKGNAME}/libgimp/GimpDrawablePreview.html
+share/doc/html/${PKGNAME}/libgimp/GimpProgressBar.html
 share/doc/html/${PKGNAME}/libgimp/gimpdefinitions.html
 share/doc/html/${PKGNAME}/libgimp/home.png
 share/doc/html/${PKGNAME}/libgimp/index.html
 share/doc/html/${PKGNAME}/libgimp/index.sgml
 share/doc/html/${PKGNAME}/libgimp/left.png
+share/doc/html/${PKGNAME}/libgimp/libgimp-data.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-general.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimp.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-gimpbrush.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpbrushes.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpbrushmenu.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpbrushselect.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpchannel.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpcolor.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-gimpcontext.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpconvert.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpdisplay.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpdrawable.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-gimpdrawablecombobox.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-gimpdrawabletransform.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpedit.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpenums.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpexport.html
@@ -340,25 +389,32 @@ share/doc/html/${PKGNAME}/libgimp/libgimp-gimpfontmenu.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpfonts.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpfontselect.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpgimprc.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-gimpgradient.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpgradientmenu.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpgradients.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpgradientselect.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpguides.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimphelp.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpimage.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-gimpimagecombobox.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimplayer.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpmenu.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpmessage.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimppalette.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-gimppalettemenu.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-gimppaletteselect.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimppalettes.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimppaths.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-gimppattern.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimppatternmenu.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimppatterns.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimppatternselect.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-gimppixbuf.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimppixelfetcher.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimppixelrgn.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpplugin.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpproceduraldb.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-gimpprogress.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpregioniterator.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpselection.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimptexttool.html
@@ -366,19 +422,25 @@ share/doc/html/${PKGNAME}/libgimp/libgimp-gimptile.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimptools.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpui.html
 share/doc/html/${PKGNAME}/libgimp/libgimp-gimpundo.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-image.html
+share/doc/html/${PKGNAME}/libgimp/libgimp-selectors.html
 share/doc/html/${PKGNAME}/libgimp/libgimp.devhelp
 share/doc/html/${PKGNAME}/libgimp/libgimp.html
 share/doc/html/${PKGNAME}/libgimp/libgimpui.html
+share/doc/html/${PKGNAME}/libgimp/libgimpui-hierarchy.html
 share/doc/html/${PKGNAME}/libgimp/right.png
 share/doc/html/${PKGNAME}/libgimp/up.png
 share/doc/html/${PKGNAME}/libgimpbase/home.png
 share/doc/html/${PKGNAME}/libgimpbase/index.html
 share/doc/html/${PKGNAME}/libgimpbase/index.sgml
 share/doc/html/${PKGNAME}/libgimpbase/left.png
+share/doc/html/${PKGNAME}/libgimpbase/libgimpbase-gimpbaseenums.html
 share/doc/html/${PKGNAME}/libgimpbase/libgimpbase-gimpbasetypes.html
+share/doc/html/${PKGNAME}/libgimpbase/libgimpbase-gimpchecks.html
 share/doc/html/${PKGNAME}/libgimpbase/libgimpbase-gimpdatafiles.html
 share/doc/html/${PKGNAME}/libgimpbase/libgimpbase-gimpenv.html
 share/doc/html/${PKGNAME}/libgimpbase/libgimpbase-gimplimits.html
+share/doc/html/${PKGNAME}/libgimpbase/libgimpbase-gimpmemsize.html
 share/doc/html/${PKGNAME}/libgimpbase/libgimpbase-gimpparasite.html
 share/doc/html/${PKGNAME}/libgimpbase/libgimpbase-gimpparasiteio.html
 share/doc/html/${PKGNAME}/libgimpbase/libgimpbase-gimpprotocol.html
@@ -440,24 +502,33 @@ share/doc/html/${PKGNAME}/libgimpthumb/libgimpthumb.html
 share/doc/html/${PKGNAME}/libgimpthumb/right.png
 share/doc/html/${PKGNAME}/libgimpthumb/up.png
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpButton.html
+share/doc/html/${PKGNAME}/libgimpwidgets/GimpCellRendererColor.html
+share/doc/html/${PKGNAME}/libgimpwidgets/GimpCellRendererToggle.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpChainButton.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpColorArea.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpColorButton.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpColorDisplay.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpColorDisplayStack.html
+share/doc/html/${PKGNAME}/libgimpwidgets/GimpColorHexEntry.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpColorNotebook.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpColorScale.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpColorScales.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpColorSelect.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpColorSelection.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpColorSelector.html
+share/doc/html/${PKGNAME}/libgimpwidgets/GimpController.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpDialog.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpFileEntry.html
+share/doc/html/${PKGNAME}/libgimpwidgets/GimpFrame.html
+share/doc/html/${PKGNAME}/libgimpwidgets/GimpIntComboBox.html
+share/doc/html/${PKGNAME}/libgimpwidgets/GimpIntStore.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpMemsizeEntry.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpOffsetArea.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpPathEditor.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpPickButton.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpPixmap.html
+share/doc/html/${PKGNAME}/libgimpwidgets/GimpPreview.html
+share/doc/html/${PKGNAME}/libgimpwidgets/GimpPreviewArea.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpSizeEntry.html
 share/doc/html/${PKGNAME}/libgimpwidgets/GimpUnitMenu.html
 share/doc/html/${PKGNAME}/libgimpwidgets/home.png
@@ -466,10 +537,15 @@ share/doc/html/${PKGNAME}/libgimpwidgets/index.sgml
 share/doc/html/${PKGNAME}/libgimpwidgets/left.png
 share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-GimpHelpUI.html
 share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-GimpQueryBox.html
+share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-GimpScrolledPreview.html
 share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-GimpStock.html
 share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-GimpWidgets.html
+share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-cell-renderers.html
 share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-colordisplay.html
 share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-colorselector.html
+share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-controller.html
+share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-deprecated.html
+share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-gimpoldwidgets.html
 share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-hierarchy.html
 share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-utils.html
 share/doc/html/${PKGNAME}/libgimpwidgets/libgimpwidgets-widgets.html
@@ -479,6 +555,8 @@ share/doc/html/${PKGNAME}/libgimpwidgets/stock-anchor-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-cap-butt-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-cap-round-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-cap-square-16.png
+share/doc/html/${PKGNAME}/libgimpwidgets/stock-center-16.png
+share/doc/html/${PKGNAME}/libgimpwidgets/stock-center-24.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-channel-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-channel-24.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-channel-32.png
@@ -511,6 +589,7 @@ share/doc/html/${PKGNAME}/libgimpwidgets/stock-channels-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-channels-24.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-char-picker-22.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-close-12.png
+share/doc/html/${PKGNAME}/libgimpwidgets/stock-color-pick-from-screen-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-color-picker-black-18.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-color-picker-gray-18.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-color-picker-white-18.png
@@ -536,6 +615,7 @@ share/doc/html/${PKGNAME}/libgimpwidgets/stock-floating-selection-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-floating-selection-24.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-floating-selection-32.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-floating-selection-48.png
+share/doc/html/${PKGNAME}/libgimpwidgets/stock-frame-64.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-gradient-bilinear-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-gradient-conical-asymmetric-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-gradient-conical-symmetric-16.png
@@ -609,6 +689,8 @@ share/doc/html/${PKGNAME}/libgimpwidgets/stock-paths-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-paths-22.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-plugin-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-portrait-16.png
+share/doc/html/${PKGNAME}/libgimpwidgets/stock-print-resolution-16.png
+share/doc/html/${PKGNAME}/libgimpwidgets/stock-print-resolution-24.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-qmask-off-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-qmask-on-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-question-64.png
@@ -632,6 +714,9 @@ share/doc/html/${PKGNAME}/libgimpwidgets/stock-selection-stroke-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-selection-subtract-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-selection-to-channel-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-selection-to-path-16.png
+share/doc/html/${PKGNAME}/libgimpwidgets/stock-shape-circle-16.png
+share/doc/html/${PKGNAME}/libgimpwidgets/stock-shape-diamond-16.png
+share/doc/html/${PKGNAME}/libgimpwidgets/stock-shape-square-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-swap-colors-12.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-template-16.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-template-24.png
@@ -740,7 +825,9 @@ share/doc/html/${PKGNAME}/libgimpwidgets/stock-wilber-32.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-wilber-48.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-wilber-64.png
 share/doc/html/${PKGNAME}/libgimpwidgets/stock-wilber-eek-64.png
+share/doc/html/${PKGNAME}/libgimpwidgets/stock-zoom-follow-window-12.png
 share/doc/html/${PKGNAME}/libgimpwidgets/up.png
+share/examples/gimp-2.0/controllerrc
 share/examples/gimp-2.0/gimprc
 share/examples/gimp-2.0/gtkrc
 share/examples/gimp-2.0/ps-menurc
@@ -1017,12 +1104,36 @@ share/gimp/2.0/gradients/Wood_1.ggr
 share/gimp/2.0/gradients/Wood_2.ggr
 share/gimp/2.0/gradients/Yellow_Contrast.ggr
 share/gimp/2.0/gradients/Yellow_Orange.ggr
-share/gimp/2.0/images/gimp_logo.png
-share/gimp/2.0/images/gimp_splash.png
+share/gimp/2.0/images/gimp-logo.png
+share/gimp/2.0/images/gimp-splash.png
 share/gimp/2.0/images/wilber-devel-icon.png
 share/gimp/2.0/images/wilber-icon.png
 share/gimp/2.0/images/wilber-tips.png
 share/gimp/2.0/images/wilber-wizard.png
+share/gimp/2.0/menus/brushes-menu.xml
+share/gimp/2.0/menus/buffers-menu.xml
+share/gimp/2.0/menus/channels-menu.xml
+share/gimp/2.0/menus/colormap-editor-menu.xml
+share/gimp/2.0/menus/dockable-menu.xml
+share/gimp/2.0/menus/documents-menu.xml
+share/gimp/2.0/menus/error-console-menu.xml
+share/gimp/2.0/menus/fonts-menu.xml
+share/gimp/2.0/menus/gradient-editor-menu.xml
+share/gimp/2.0/menus/gradients-menu.xml
+share/gimp/2.0/menus/image-menu.xml
+share/gimp/2.0/menus/images-menu.xml
+share/gimp/2.0/menus/layers-menu.xml
+share/gimp/2.0/menus/palette-editor-menu.xml
+share/gimp/2.0/menus/palettes-menu.xml
+share/gimp/2.0/menus/patterns-menu.xml
+share/gimp/2.0/menus/qmask-menu.xml
+share/gimp/2.0/menus/selection-editor-menu.xml
+share/gimp/2.0/menus/templates-menu.xml
+share/gimp/2.0/menus/text-editor-toolbar.xml
+share/gimp/2.0/menus/tool-options-menu.xml
+share/gimp/2.0/menus/toolbox-menu.xml
+share/gimp/2.0/menus/tools-menu.xml
+share/gimp/2.0/menus/vectors-menu.xml
 share/gimp/2.0/misc/gimp.applications
 share/gimp/2.0/misc/gimp.desktop
 share/gimp/2.0/misc/gimp.keys
@@ -1133,7 +1244,6 @@ share/gimp/2.0/scripts/alien-glow-bullet.scm
 share/gimp/2.0/scripts/alien-glow-button.scm
 share/gimp/2.0/scripts/alien-glow-logo.scm
 share/gimp/2.0/scripts/alien-neon-logo.scm
-share/gimp/2.0/scripts/asc2img.scm
 share/gimp/2.0/scripts/basic1-logo.scm
 share/gimp/2.0/scripts/basic2-logo.scm
 share/gimp/2.0/scripts/beveled-button.scm
@@ -1175,6 +1285,10 @@ share/gimp/2.0/scripts/glowing-logo.scm
 share/gimp/2.0/scripts/gradient-bevel-logo.scm
 share/gimp/2.0/scripts/gradient-example.scm
 share/gimp/2.0/scripts/grid-system.scm
+share/gimp/2.0/scripts/guides-from-selection.scm
+share/gimp/2.0/scripts/guides-new-percent.scm
+share/gimp/2.0/scripts/guides-new.scm
+share/gimp/2.0/scripts/guides-remove-all.scm
 share/gimp/2.0/scripts/hsv-graph.scm
 share/gimp/2.0/scripts/i26-gunya2.scm
 share/gimp/2.0/scripts/image-structure.scm
@@ -1212,6 +1326,7 @@ share/gimp/2.0/scripts/starscape-logo.scm
 share/gimp/2.0/scripts/swirltile.scm
 share/gimp/2.0/scripts/swirly-pattern.scm
 share/gimp/2.0/scripts/t-o-p-logo.scm
+share/gimp/2.0/scripts/test-sphere.scm
 share/gimp/2.0/scripts/text-circle.scm
 share/gimp/2.0/scripts/textured-logo.scm
 share/gimp/2.0/scripts/tileblur.scm
@@ -1224,6 +1339,7 @@ share/gimp/2.0/scripts/web-browser.scm
 share/gimp/2.0/scripts/xach-effect.scm
 share/gimp/2.0/themes/Default/gtkrc
 share/gimp/2.0/themes/Default/imagerc
+share/gimp/2.0/themes/Default/images/preferences/controllers.png
 share/gimp/2.0/themes/Default/images/preferences/default-comment.png
 share/gimp/2.0/themes/Default/images/preferences/default-grid.png
 share/gimp/2.0/themes/Default/images/preferences/display.png
@@ -1248,12 +1364,16 @@ share/gimp/2.0/themes/Default/images/preferences/interface.png
 share/gimp/2.0/themes/Default/images/preferences/monitor.png
 share/gimp/2.0/themes/Default/images/preferences/new-image.png
 share/gimp/2.0/themes/Default/images/preferences/session.png
+share/gimp/2.0/themes/Default/images/preferences/theme.png
 share/gimp/2.0/themes/Default/images/preferences/tool-options.png
+share/gimp/2.0/themes/Default/images/preferences/toolbox.png
 share/gimp/2.0/themes/Default/images/preferences/window-management.png
 share/gimp/2.0/themes/Default/images/stock-anchor-16.png
 share/gimp/2.0/themes/Default/images/stock-cap-butt-16.png
 share/gimp/2.0/themes/Default/images/stock-cap-round-16.png
 share/gimp/2.0/themes/Default/images/stock-cap-square-16.png
+share/gimp/2.0/themes/Default/images/stock-center-16.png
+share/gimp/2.0/themes/Default/images/stock-center-24.png
 share/gimp/2.0/themes/Default/images/stock-channel-16.png
 share/gimp/2.0/themes/Default/images/stock-channel-24.png
 share/gimp/2.0/themes/Default/images/stock-channel-32.png
@@ -1286,6 +1406,7 @@ share/gimp/2.0/themes/Default/images/stock-channels-16.png
 share/gimp/2.0/themes/Default/images/stock-channels-24.png
 share/gimp/2.0/themes/Default/images/stock-char-picker-22.png
 share/gimp/2.0/themes/Default/images/stock-close-12.png
+share/gimp/2.0/themes/Default/images/stock-color-pick-from-screen-16.png
 share/gimp/2.0/themes/Default/images/stock-color-picker-black-18.png
 share/gimp/2.0/themes/Default/images/stock-color-picker-gray-18.png
 share/gimp/2.0/themes/Default/images/stock-color-picker-white-18.png
@@ -1311,6 +1432,7 @@ share/gimp/2.0/themes/Default/images/stock-floating-selection-16.png
 share/gimp/2.0/themes/Default/images/stock-floating-selection-24.png
 share/gimp/2.0/themes/Default/images/stock-floating-selection-32.png
 share/gimp/2.0/themes/Default/images/stock-floating-selection-48.png
+share/gimp/2.0/themes/Default/images/stock-frame-64.png
 share/gimp/2.0/themes/Default/images/stock-gradient-bilinear-16.png
 share/gimp/2.0/themes/Default/images/stock-gradient-conical-asymmetric-16.png
 share/gimp/2.0/themes/Default/images/stock-gradient-conical-symmetric-16.png
@@ -1384,6 +1506,8 @@ share/gimp/2.0/themes/Default/images/stock-paths-16.png
 share/gimp/2.0/themes/Default/images/stock-paths-22.png
 share/gimp/2.0/themes/Default/images/stock-plugin-16.png
 share/gimp/2.0/themes/Default/images/stock-portrait-16.png
+share/gimp/2.0/themes/Default/images/stock-print-resolution-16.png
+share/gimp/2.0/themes/Default/images/stock-print-resolution-24.png
 share/gimp/2.0/themes/Default/images/stock-qmask-off-16.png
 share/gimp/2.0/themes/Default/images/stock-qmask-on-16.png
 share/gimp/2.0/themes/Default/images/stock-question-64.png
@@ -1407,6 +1531,9 @@ share/gimp/2.0/themes/Default/images/stock-selection-stroke-16.png
 share/gimp/2.0/themes/Default/images/stock-selection-subtract-16.png
 share/gimp/2.0/themes/Default/images/stock-selection-to-channel-16.png
 share/gimp/2.0/themes/Default/images/stock-selection-to-path-16.png
+share/gimp/2.0/themes/Default/images/stock-shape-circle-16.png
+share/gimp/2.0/themes/Default/images/stock-shape-diamond-16.png
+share/gimp/2.0/themes/Default/images/stock-shape-square-16.png
 share/gimp/2.0/themes/Default/images/stock-swap-colors-12.png
 share/gimp/2.0/themes/Default/images/stock-template-16.png
 share/gimp/2.0/themes/Default/images/stock-template-24.png
@@ -1513,6 +1640,7 @@ share/gimp/2.0/themes/Default/images/stock-web-24.png
 share/gimp/2.0/themes/Default/images/stock-wilber-16.png
 share/gimp/2.0/themes/Default/images/stock-wilber-64.png
 share/gimp/2.0/themes/Default/images/stock-wilber-eek-64.png
+share/gimp/2.0/themes/Default/images/stock-zoom-follow-window-12.png
 share/gimp/2.0/themes/Small/gtkrc
 share/gimp/2.0/tips/gimp-tips.xml
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gimp20-libgimp.mo
@@ -1615,6 +1743,10 @@ ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gimp20-libgimp.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gimp20-script-fu.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gimp20-std-plug-ins.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gimp20.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gimp20-libgimp.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gimp20-script-fu.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gimp20-std-plug-ins.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/gimp20.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gimp20-libgimp.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gimp20-script-fu.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gimp20-std-plug-ins.mo
@@ -1639,10 +1771,6 @@ ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gimp20-libgimp.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gimp20-script-fu.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gimp20-std-plug-ins.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gimp20.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gimp20-libgimp.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gimp20-script-fu.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gimp20-std-plug-ins.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/gimp20.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gimp20-libgimp.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gimp20-script-fu.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/gimp20-std-plug-ins.mo
@@ -1679,7 +1807,7 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gimp20-libgimp.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gimp20.mo
-share/mime-info/gimp-2.0.keys
+share/mime-info/gimp-2.2.keys
 @comment in xdg-dirs: @dirrm share/mime-info
 @dirrm share/gimp/2.0/tips
 @dirrm share/gimp/2.0/themes/Small
@@ -1692,6 +1820,7 @@ share/mime-info/gimp-2.0.keys
 @dirrm share/gimp/2.0/patterns
 @dirrm share/gimp/2.0/palettes
 @dirrm share/gimp/2.0/misc
+@dirrm share/gimp/2.0/menus
 @dirrm share/gimp/2.0/images
 @dirrm share/gimp/2.0/gradients
 @dirrm share/gimp/2.0/gimpressionist/Presets
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index ca491b36834..c1025a07c7f 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.17 2004/11/03 13:29:46 adam Exp $
+$NetBSD: distinfo,v 1.18 2005/01/04 15:20:25 adam Exp $
 
-SHA1 (gimp-2.0.6.tar.bz2) = 0cc4b5ccf277983c67eec5d41d1e2213e983a2f4
-Size (gimp-2.0.6.tar.bz2) = 14097124 bytes
-SHA1 (patch-aa) = 1deb4760ae6b430a8954ca8aacdac75dbf7090f6
-SHA1 (patch-ab) = 92c0bad9401638ceea5da479b023d16b2aed190f
+SHA1 (gimp-2.2.1.tar.bz2) = df0c0fe79aa365c10bee6d2b549c4ed7e1eb7c74
+Size (gimp-2.2.1.tar.bz2) = 13788305 bytes
+SHA1 (patch-aa) = 350170ee426cb1cb5636603845674cdae3d2f1b6
+SHA1 (patch-ab) = 5ed8add03f1c60efca1f285494f5d69e24faec09
 SHA1 (patch-ad) = 632c34e0fbeda69139b2b674d9c5ef80db40dcca
diff --git a/graphics/gimp/patches/patch-aa b/graphics/gimp/patches/patch-aa
index ada55da5aa4..0c6dc6eadd7 100644
--- a/graphics/gimp/patches/patch-aa
+++ b/graphics/gimp/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.11 2004/11/03 13:29:46 adam Exp $
+$NetBSD: patch-aa,v 1.12 2005/01/04 15:20:25 adam Exp $
 
---- etc/Makefile.in.orig	2004-11-02 19:04:35.000000000 +0000
+--- etc/Makefile.in.orig	2004-12-27 19:49:29.000000000 +0000
 +++ etc/Makefile.in
-@@ -326,7 +326,7 @@ exec_prefix = @exec_prefix@
+@@ -339,7 +339,7 @@ exec_prefix = @exec_prefix@
  gimpdatadir = @gimpdatadir@
  gimpdir = @gimpdir@
  gimpplugindir = @gimpplugindir@
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
index 5bd4050c99e..2d8314f270b 100644
--- a/graphics/gimp/patches/patch-ab
+++ b/graphics/gimp/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.11 2004/11/03 13:29:47 adam Exp $
+$NetBSD: patch-ab,v 1.12 2005/01/04 15:20:25 adam Exp $
 
---- configure.orig	2004-11-02 19:04:51.000000000 +0000
+--- configure.orig	2004-12-27 19:49:38.000000000 +0000
 +++ configure
-@@ -27530,8 +27530,16 @@ if test "x$enable_altivec" = xyes; then
+@@ -27662,8 +27662,16 @@ if test "x$enable_altivec" = xyes; then
    echo "$as_me:$LINENO: checking whether we can compile Altivec code" >&5
  echo $ECHO_N "checking whether we can compile Altivec code... $ECHO_C" >&6
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.11 2004/11/03 13:29:47 adam Exp $
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -27571,7 +27579,7 @@ enable_altivec=no
+@@ -27703,7 +27711,7 @@ enable_altivec=no
  echo "${ECHO_T}no" >&6
      { echo "$as_me:$LINENO: WARNING: The assembler does not support the Altivec command set." >&5
  echo "$as_me: WARNING: The assembler does not support the Altivec command set." >&2;}
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.11 2004/11/03 13:29:47 adam Exp $
  fi
  rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  
-@@ -32894,7 +32902,7 @@ fi;
+@@ -33686,7 +33694,7 @@ fi;
  
  gimpdatadir="$datadir/$PACKAGE/2.0"
  gimpplugindir="$libdir/$PACKAGE/2.0"