Changes 2.6.4:

* Bugs fixed:
	Perspective transformation jagged edges / comb effect
	jpg save dialog: "cancel" is treated like "commit" for settings
	Using clone tool on a layer with a part out of canvas causes crashes
	crash when the drawable is changed while a color tool is active
	GIMP crashes on selecting Tools->GEGL operation
	python-fu-foggify does not check if image is in rgb mode
	Hue selection mode does not cross the 0-360 degrees line
	Scrollbars not resized when we extend the canvas size
	PF_PALETTE: 'TypeError' when used in a plugin that is registered in
		<Image>
	Compilation with --as-needed
	PF_SLIDER and PF_SPINNER 'Step' values do not change consistently...
	Default image dimensions are not correctly transferred in the file/new
		dialog box
	GIMP can't save to mounted filesystem if file exists
* Updated translations

8 files changed, 223 insertions, 209 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 949019e26bd..dfc09d0e010 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.176 2008/08/30 11:11:50 adam Exp $
+# $NetBSD: Makefile,v 1.177 2009/01/24 20:55:05 adam Exp $
 
-DISTNAME=	gimp-2.4.7
+DISTNAME=	gimp-2.6.4
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.4/ \
-		${MASTER_SITE_GNU:=gimp/v2.4/} \
-		ftp://ftp.gwdg.de/pub/misc/grafik/gimp/gimp/v2.4/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v2.6/ \
+		${MASTER_SITE_GNU:=gimp/v2.6/} \
+		ftp://ftp.gwdg.de/pub/misc/grafik/gimp/gimp/v2.6/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
@@ -55,10 +55,20 @@ PLIST.twain=		yes
 
 .include "options.mk"
 
+# The gettext version in pkgsrc cannot handle the .po files, so
+# we strip out usage of the newer features (context and fuzzy matches)
+post-patch:
+	for f in ${WRKSRC}/po/*.po ${WRKSRC}/po-libgimp/*.po ${WRKSRC}/po-plug-ins/*.po; do \
+		mv $$f $$f.original ; \
+		${AWK} -f ${FILESDIR}/msgfmtstrip $$f.original > $$f ; \
+	done
+
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/babl/buildlink3.mk"
+.include "../../graphics/gegl/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index 0bc284b2cb9..859a6ff2bd3 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,10 +1,8 @@
-@comment $NetBSD: PLIST,v 1.35 2008/05/31 09:23:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.36 2009/01/24 20:55:05 adam Exp $
 bin/gimp
-bin/gimp-2.4
+bin/gimp-2.6
 bin/gimp-console
-bin/gimp-console-2.4
-${PLIST.remote}bin/gimp-remote
-${PLIST.remote}bin/gimp-remote-2.4
+bin/gimp-console-2.6
 bin/gimptool-2.0
 include/gimp-2.0/libgimp/gimp.h
 include/gimp-2.0/libgimp/gimp_pdb.h
@@ -94,6 +92,7 @@ include/gimp-2.0/libgimp/gimpselectbutton.h
 include/gimp-2.0/libgimp/gimpselection.h
 include/gimp-2.0/libgimp/gimpselection_pdb.h
 include/gimp-2.0/libgimp/gimpselectiontools_pdb.h
+include/gimp-2.0/libgimp/gimptextlayer_pdb.h
 include/gimp-2.0/libgimp/gimptexttool_pdb.h
 include/gimp-2.0/libgimp/gimptile.h
 include/gimp-2.0/libgimp/gimptransformtools_pdb.h
@@ -160,6 +159,7 @@ include/gimp-2.0/libgimpthumb/gimpthumb.h
 include/gimp-2.0/libgimpthumb/gimpthumbnail.h
 include/gimp-2.0/libgimpwidgets/gimpbrowser.h
 include/gimp-2.0/libgimpwidgets/gimpbutton.h
+include/gimp-2.0/libgimpwidgets/gimpcairo-utils.h
 include/gimp-2.0/libgimpwidgets/gimpcellrenderercolor.h
 include/gimp-2.0/libgimpwidgets/gimpcellrenderertoggle.h
 include/gimp-2.0/libgimpwidgets/gimpchainbutton.h
@@ -200,6 +200,8 @@ include/gimp-2.0/libgimpwidgets/gimppreview.h
 include/gimp-2.0/libgimpwidgets/gimppreviewarea.h
 include/gimp-2.0/libgimpwidgets/gimppropwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpquerybox.h
+include/gimp-2.0/libgimpwidgets/gimpruler.h
+include/gimp-2.0/libgimpwidgets/gimpscaleentry.h
 include/gimp-2.0/libgimpwidgets/gimpscrolledpreview.h
 include/gimp-2.0/libgimpwidgets/gimpsizeentry.h
 include/gimp-2.0/libgimpwidgets/gimpstock.h
@@ -211,189 +213,186 @@ include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
 include/gimp-2.0/libgimpwidgets/gimpzoommodel.h
 lib/gimp/2.0/environ/default.env
 lib/gimp/2.0/interpreters/default.interp
-lib/gimp/2.0/modules/libcdisplay_colorblind.la
-lib/gimp/2.0/modules/libcdisplay_gamma.la
-lib/gimp/2.0/modules/libcdisplay_highcontrast.la
-lib/gimp/2.0/modules/libcdisplay_lcms.la
-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/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
-lib/gimp/2.0/plug-ins/FractalExplorer
-lib/gimp/2.0/plug-ins/Lighting
-lib/gimp/2.0/plug-ins/MapObject
-${PLIST.aalib}lib/gimp/2.0/plug-ins/aa
-lib/gimp/2.0/plug-ins/align_layers
-lib/gimp/2.0/plug-ins/animationplay
-lib/gimp/2.0/plug-ins/animoptimize
+lib/gimp/2.0/modules/libcolor-selector-cmyk.la
+lib/gimp/2.0/modules/libcolor-selector-water.la
+lib/gimp/2.0/modules/libcolor-selector-wheel.la
+lib/gimp/2.0/modules/libcontroller-midi.la
+lib/gimp/2.0/modules/libdisplay-filter-color-blind.la
+lib/gimp/2.0/modules/libdisplay-filter-gamma.la
+lib/gimp/2.0/modules/libdisplay-filter-high-contrast.la
+lib/gimp/2.0/modules/libdisplay-filter-lcms.la
+lib/gimp/2.0/modules/libdisplay-filter-proof.la
+lib/gimp/2.0/plug-ins/alien-map
+lib/gimp/2.0/plug-ins/align-layers
+lib/gimp/2.0/plug-ins/animation-optimize
+lib/gimp/2.0/plug-ins/animation-play
 lib/gimp/2.0/plug-ins/antialias
-lib/gimp/2.0/plug-ins/apply_lens
-lib/gimp/2.0/plug-ins/autocrop
-lib/gimp/2.0/plug-ins/autostretch_hsv
+lib/gimp/2.0/plug-ins/apply-canvas
 lib/gimp/2.0/plug-ins/blinds
 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/c_astretch
+lib/gimp/2.0/plug-ins/blur-gauss
+lib/gimp/2.0/plug-ins/blur-gauss-selective
+lib/gimp/2.0/plug-ins/blur-motion
+lib/gimp/2.0/plug-ins/border-average
+lib/gimp/2.0/plug-ins/bump-map
 lib/gimp/2.0/plug-ins/cartoon
-lib/gimp/2.0/plug-ins/ccanalyze
-lib/gimp/2.0/plug-ins/channel_mixer
+lib/gimp/2.0/plug-ins/channel-mixer
 lib/gimp/2.0/plug-ins/checkerboard
-lib/gimp/2.0/plug-ins/color_enhance
+lib/gimp/2.0/plug-ins/cml-explorer
+lib/gimp/2.0/plug-ins/color-cube-analyze
+lib/gimp/2.0/plug-ins/color-enhance
+lib/gimp/2.0/plug-ins/color-exchange
+lib/gimp/2.0/plug-ins/color-rotate
+lib/gimp/2.0/plug-ins/color-to-alpha
 lib/gimp/2.0/plug-ins/colorify
 lib/gimp/2.0/plug-ins/colormap-remap
-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/contrast-normalize
+lib/gimp/2.0/plug-ins/contrast-retinex
+lib/gimp/2.0/plug-ins/contrast-stretch
+lib/gimp/2.0/plug-ins/contrast-stretch-hsv
+lib/gimp/2.0/plug-ins/convolution-matrix
+lib/gimp/2.0/plug-ins/crop-auto
+lib/gimp/2.0/plug-ins/crop-zealous
 lib/gimp/2.0/plug-ins/cubism
-lib/gimp/2.0/plug-ins/curve_bend
+lib/gimp/2.0/plug-ins/curve-bend
 lib/gimp/2.0/plug-ins/decompose
 lib/gimp/2.0/plug-ins/deinterlace
-lib/gimp/2.0/plug-ins/depthmerge
-lib/gimp/2.0/plug-ins/desktop-link
+lib/gimp/2.0/plug-ins/depth-merge
 lib/gimp/2.0/plug-ins/despeckle
 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/edge-dog
+lib/gimp/2.0/plug-ins/edge-laplace
+lib/gimp/2.0/plug-ins/edge-neon
+lib/gimp/2.0/plug-ins/edge-sobel
 lib/gimp/2.0/plug-ins/emboss
 lib/gimp/2.0/plug-ins/engrave
-lib/gimp/2.0/plug-ins/exchange
-lib/gimp/2.0/plug-ins/faxg3
+${PLIST.aalib}lib/gimp/2.0/plug-ins/file-aa
+lib/gimp/2.0/plug-ins/file-bmp
+lib/gimp/2.0/plug-ins/file-cel
+lib/gimp/2.0/plug-ins/file-compressor
+lib/gimp/2.0/plug-ins/file-csource
+lib/gimp/2.0/plug-ins/file-desktop-link
+lib/gimp/2.0/plug-ins/file-dicom
+lib/gimp/2.0/plug-ins/file-faxg3
+lib/gimp/2.0/plug-ins/file-fits
+lib/gimp/2.0/plug-ins/file-fli
+lib/gimp/2.0/plug-ins/file-gbr
+lib/gimp/2.0/plug-ins/file-gif-load
+lib/gimp/2.0/plug-ins/file-gif-save
+lib/gimp/2.0/plug-ins/file-gih
+lib/gimp/2.0/plug-ins/file-glob
+lib/gimp/2.0/plug-ins/file-header
+lib/gimp/2.0/plug-ins/file-html-table
+lib/gimp/2.0/plug-ins/file-ico
+lib/gimp/2.0/plug-ins/file-jpeg
+lib/gimp/2.0/plug-ins/file-mng
+lib/gimp/2.0/plug-ins/file-pat
+lib/gimp/2.0/plug-ins/file-pcx
+lib/gimp/2.0/plug-ins/file-pix
+lib/gimp/2.0/plug-ins/file-png
+lib/gimp/2.0/plug-ins/file-pnm
+lib/gimp/2.0/plug-ins/file-ps
+lib/gimp/2.0/plug-ins/file-psd-load
+lib/gimp/2.0/plug-ins/file-psd-save
+lib/gimp/2.0/plug-ins/file-psp
+lib/gimp/2.0/plug-ins/file-raw
+lib/gimp/2.0/plug-ins/file-sgi
+lib/gimp/2.0/plug-ins/file-sunras
+lib/gimp/2.0/plug-ins/file-svg
+lib/gimp/2.0/plug-ins/file-tga
+lib/gimp/2.0/plug-ins/file-tiff-load
+lib/gimp/2.0/plug-ins/file-tiff-save
+lib/gimp/2.0/plug-ins/file-uri
+lib/gimp/2.0/plug-ins/file-wmf
+lib/gimp/2.0/plug-ins/file-xbm
+lib/gimp/2.0/plug-ins/file-xjt
+lib/gimp/2.0/plug-ins/file-xpm
+lib/gimp/2.0/plug-ins/file-xwd
 lib/gimp/2.0/plug-ins/film
-lib/gimp/2.0/plug-ins/fits
+lib/gimp/2.0/plug-ins/filter-pack
 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
-lib/gimp/2.0/plug-ins/gbr
+lib/gimp/2.0/plug-ins/fractal-explorer
+lib/gimp/2.0/plug-ins/fractal-trace
 lib/gimp/2.0/plug-ins/gee
-lib/gimp/2.0/plug-ins/gee_zoom
+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/gif-load
-lib/gimp/2.0/plug-ins/gif-save
-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/gradient-flare
+lib/gimp/2.0/plug-ins/gradient-map
 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/header
 lib/gimp/2.0/plug-ins/help
-${PLIST.gnome}lib/gimp/2.0/plug-ins/helpbrowser
 lib/gimp/2.0/plug-ins/hot
-lib/gimp/2.0/plug-ins/ifscompose
+lib/gimp/2.0/plug-ins/ifs-compose
 lib/gimp/2.0/plug-ins/illusion
 lib/gimp/2.0/plug-ins/imagemap
 lib/gimp/2.0/plug-ins/iwarp
 lib/gimp/2.0/plug-ins/jigsaw
-lib/gimp/2.0/plug-ins/jpeg
-lib/gimp/2.0/plug-ins/laplace
 lib/gimp/2.0/plug-ins/lcms
-lib/gimp/2.0/plug-ins/lens
-lib/gimp/2.0/plug-ins/lic
+lib/gimp/2.0/plug-ins/lens-apply
+lib/gimp/2.0/plug-ins/lens-distortion
+lib/gimp/2.0/plug-ins/lens-flare
+lib/gimp/2.0/plug-ins/lighting
 lib/gimp/2.0/plug-ins/mail
-lib/gimp/2.0/plug-ins/mapcolor
-lib/gimp/2.0/plug-ins/max_rgb
+lib/gimp/2.0/plug-ins/map-object
+lib/gimp/2.0/plug-ins/max-rgb
 lib/gimp/2.0/plug-ins/maze
-lib/gimp/2.0/plug-ins/mblur
 lib/gimp/2.0/plug-ins/metadata
-${PLIST.mng}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
-lib/gimp/2.0/plug-ins/normalize
+lib/gimp/2.0/plug-ins/nl-filter
+lib/gimp/2.0/plug-ins/noise-hsv
+lib/gimp/2.0/plug-ins/noise-randomize
+lib/gimp/2.0/plug-ins/noise-rgb
+lib/gimp/2.0/plug-ins/noise-solid
+lib/gimp/2.0/plug-ins/noise-spread
 lib/gimp/2.0/plug-ins/nova
 lib/gimp/2.0/plug-ins/oilify
 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/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/polar-coords
 lib/gimp/2.0/plug-ins/print
 lib/gimp/2.0/plug-ins/procedure-browser
-lib/gimp/2.0/plug-ins/psd-load
-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/redeye
-lib/gimp/2.0/plug-ins/retinex
+lib/gimp/2.0/plug-ins/qbist
+lib/gimp/2.0/plug-ins/red-eye-removal
 lib/gimp/2.0/plug-ins/ripple
 lib/gimp/2.0/plug-ins/rotate
-lib/gimp/2.0/plug-ins/sample_colorize
-lib/gimp/2.0/plug-ins/scatter_hsv
+lib/gimp/2.0/plug-ins/sample-colorize
 lib/gimp/2.0/plug-ins/screenshot
 lib/gimp/2.0/plug-ins/script-fu
-lib/gimp/2.0/plug-ins/sel2path
-lib/gimp/2.0/plug-ins/sel_gauss
-lib/gimp/2.0/plug-ins/semiflatten
-lib/gimp/2.0/plug-ins/sgi
+lib/gimp/2.0/plug-ins/selection-to-path
+lib/gimp/2.0/plug-ins/semi-flatten
 lib/gimp/2.0/plug-ins/sharpen
 lib/gimp/2.0/plug-ins/shift
 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/smooth-palette
 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
-lib/gimp/2.0/plug-ins/struc
-lib/gimp/2.0/plug-ins/sunras
-${PLIST.svg}lib/gimp/2.0/plug-ins/svg
-lib/gimp/2.0/plug-ins/tga
-lib/gimp/2.0/plug-ins/threshold_alpha
-lib/gimp/2.0/plug-ins/tiff-load
-lib/gimp/2.0/plug-ins/tiff-save
+lib/gimp/2.0/plug-ins/sphere-designer
+lib/gimp/2.0/plug-ins/threshold-alpha
 lib/gimp/2.0/plug-ins/tile
-lib/gimp/2.0/plug-ins/tileit
-lib/gimp/2.0/plug-ins/tiler
-${PLIST.twain}lib/gimp/2.0/plug-ins/twain
-lib/gimp/2.0/plug-ins/uniteditor
-lib/gimp/2.0/plug-ins/unsharp
-lib/gimp/2.0/plug-ins/uri
+lib/gimp/2.0/plug-ins/tile-glass
+lib/gimp/2.0/plug-ins/tile-paper
+lib/gimp/2.0/plug-ins/tile-seamless
+lib/gimp/2.0/plug-ins/tile-small
+lib/gimp/2.0/plug-ins/unit-editor
+lib/gimp/2.0/plug-ins/unsharp-mask
+lib/gimp/2.0/plug-ins/value-invert
+lib/gimp/2.0/plug-ins/value-propagate
+lib/gimp/2.0/plug-ins/van-gogh-lic
 lib/gimp/2.0/plug-ins/video
-lib/gimp/2.0/plug-ins/vinvert
-lib/gimp/2.0/plug-ins/vpropagate
 lib/gimp/2.0/plug-ins/warp
 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/web-browser
+lib/gimp/2.0/plug-ins/whirl-pinch
 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
-lib/gimp/2.0/plug-ins/xpm
-lib/gimp/2.0/plug-ins/xwd
-lib/gimp/2.0/plug-ins/zealouscrop
 lib/libgimp-2.0.la
 lib/libgimpbase-2.0.la
 lib/libgimpcolor-2.0.la
@@ -406,17 +405,14 @@ 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.4.1
-man/man1/gimp-console-2.4.1
+man/man1/gimp-2.6.1
+man/man1/gimp-console-2.6.1
 man/man1/gimp-console.1
-man/man1/gimp-remote-2.4.1
-man/man1/gimp-remote.1
 man/man1/gimp.1
 man/man1/gimptool-2.0.1
-man/man5/gimprc-2.4.5
+man/man5/gimprc-2.6.5
 man/man5/gimprc.5
 share/aclocal/gimp-2.0.m4
-share/application-registry/gimp.applications
 share/applications/gimp.desktop
 share/examples/gimp-2.0/controllerrc
 share/examples/gimp-2.0/gimprc
@@ -696,6 +692,7 @@ 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/wilber.png
 share/gimp/2.0/menus/brush-editor-menu.xml
 share/gimp/2.0/menus/brushes-menu.xml
 share/gimp/2.0/menus/buffers-menu.xml
@@ -720,7 +717,6 @@ share/gimp/2.0/menus/selection-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/undo-menu.xml
 share/gimp/2.0/menus/vectors-menu.xml
@@ -893,6 +889,7 @@ share/gimp/2.0/scripts/old-photo.scm
 share/gimp/2.0/scripts/paste-as-brush.scm
 share/gimp/2.0/scripts/paste-as-pattern.scm
 share/gimp/2.0/scripts/perspective-shadow.scm
+share/gimp/2.0/scripts/plug-in-compat.init
 share/gimp/2.0/scripts/predator.scm
 share/gimp/2.0/scripts/pupi-button.scm
 share/gimp/2.0/scripts/rendermap.scm
@@ -910,10 +907,8 @@ share/gimp/2.0/scripts/selection-round.scm
 share/gimp/2.0/scripts/slide.scm
 share/gimp/2.0/scripts/sota-chrome-logo.scm
 share/gimp/2.0/scripts/speed-text.scm
-share/gimp/2.0/scripts/sphere.scm
 share/gimp/2.0/scripts/spinning-globe.scm
 share/gimp/2.0/scripts/spyrogimp.scm
-share/gimp/2.0/scripts/starburst-logo.scm
 share/gimp/2.0/scripts/starscape-logo.scm
 share/gimp/2.0/scripts/swirltile.scm
 share/gimp/2.0/scripts/swirly-pattern.scm
@@ -995,7 +990,6 @@ share/gimp/2.0/themes/Default/images/stock-question-64.png
 share/gimp/2.0/themes/Default/images/stock-warning-64.png
 share/gimp/2.0/themes/Small/gtkrc
 share/gimp/2.0/tips/gimp-tips.xml
-${PLIST.twain}share/gimp/2.0/twain/gimp-twain.png
 share/gtk-doc/html/libgimp/GimpAspectPreview.html
 share/gtk-doc/html/libgimp/GimpBrushSelectButton.html
 share/gtk-doc/html/libgimp/GimpDrawablePreview.html
@@ -1066,6 +1060,7 @@ share/gtk-doc/html/libgimp/libgimp-gimpprocview.html
 share/gtk-doc/html/libgimp/libgimp-gimpprogress.html
 share/gtk-doc/html/libgimp/libgimp-gimpregioniterator.html
 share/gtk-doc/html/libgimp/libgimp-gimpselection.html
+share/gtk-doc/html/libgimp/libgimp-gimptextlayer.html
 share/gtk-doc/html/libgimp/libgimp-gimptexttool.html
 share/gtk-doc/html/libgimp/libgimp-gimptile.html
 share/gtk-doc/html/libgimp/libgimp-gimptools.html
@@ -1076,6 +1071,7 @@ share/gtk-doc/html/libgimp/libgimp-image.html
 share/gtk-doc/html/libgimp/libgimp-index-deprecated.html
 share/gtk-doc/html/libgimp/libgimp-index-new-in-2-2.html
 share/gtk-doc/html/libgimp/libgimp-index-new-in-2-4.html
+share/gtk-doc/html/libgimp/libgimp-index-new-in-2-6.html
 share/gtk-doc/html/libgimp/libgimp-index.html
 share/gtk-doc/html/libgimp/libgimp-selectors.html
 share/gtk-doc/html/libgimp/libgimp.devhelp
@@ -1109,6 +1105,7 @@ share/gtk-doc/html/libgimpbase/libgimpbase-gimpversion.html
 share/gtk-doc/html/libgimpbase/libgimpbase-index-deprecated.html
 share/gtk-doc/html/libgimpbase/libgimpbase-index-new-in-2-2.html
 share/gtk-doc/html/libgimpbase/libgimpbase-index-new-in-2-4.html
+share/gtk-doc/html/libgimpbase/libgimpbase-index-new-in-2-6.html
 share/gtk-doc/html/libgimpbase/libgimpbase-index.html
 share/gtk-doc/html/libgimpbase/libgimpbase.devhelp
 share/gtk-doc/html/libgimpbase/libgimpbase.devhelp2
@@ -1130,6 +1127,7 @@ share/gtk-doc/html/libgimpcolor/libgimpcolor-GimpRGB.html
 share/gtk-doc/html/libgimpcolor/libgimpcolor-index-deprecated.html
 share/gtk-doc/html/libgimpcolor/libgimpcolor-index-new-in-2-2.html
 share/gtk-doc/html/libgimpcolor/libgimpcolor-index-new-in-2-4.html
+share/gtk-doc/html/libgimpcolor/libgimpcolor-index-new-in-2-6.html
 share/gtk-doc/html/libgimpcolor/libgimpcolor-index.html
 share/gtk-doc/html/libgimpcolor/libgimpcolor.devhelp
 share/gtk-doc/html/libgimpcolor/libgimpcolor.devhelp2
@@ -1154,6 +1152,7 @@ share/gtk-doc/html/libgimpconfig/libgimpconfig-gimpconfig-utils.html
 share/gtk-doc/html/libgimpconfig/libgimpconfig-hierarchy.html
 share/gtk-doc/html/libgimpconfig/libgimpconfig-index-deprecated.html
 share/gtk-doc/html/libgimpconfig/libgimpconfig-index-new-in-2-4.html
+share/gtk-doc/html/libgimpconfig/libgimpconfig-index-new-in-2-6.html
 share/gtk-doc/html/libgimpconfig/libgimpconfig-index.html
 share/gtk-doc/html/libgimpconfig/libgimpconfig.devhelp
 share/gtk-doc/html/libgimpconfig/libgimpconfig.devhelp2
@@ -1172,6 +1171,7 @@ share/gtk-doc/html/libgimpmath/libgimpmath-GimpVector.html
 share/gtk-doc/html/libgimpmath/libgimpmath-index-deprecated.html
 share/gtk-doc/html/libgimpmath/libgimpmath-index-new-in-2-2.html
 share/gtk-doc/html/libgimpmath/libgimpmath-index-new-in-2-4.html
+share/gtk-doc/html/libgimpmath/libgimpmath-index-new-in-2-6.html
 share/gtk-doc/html/libgimpmath/libgimpmath-index.html
 share/gtk-doc/html/libgimpmath/libgimpmath.devhelp
 share/gtk-doc/html/libgimpmath/libgimpmath.devhelp2
@@ -1188,6 +1188,7 @@ share/gtk-doc/html/libgimpmodule/left.png
 share/gtk-doc/html/libgimpmodule/libgimpmodule-index-deprecated.html
 share/gtk-doc/html/libgimpmodule/libgimpmodule-index-new-in-2-2.html
 share/gtk-doc/html/libgimpmodule/libgimpmodule-index-new-in-2-4.html
+share/gtk-doc/html/libgimpmodule/libgimpmodule-index-new-in-2-6.html
 share/gtk-doc/html/libgimpmodule/libgimpmodule-index.html
 share/gtk-doc/html/libgimpmodule/libgimpmodule.devhelp
 share/gtk-doc/html/libgimpmodule/libgimpmodule.devhelp2
@@ -1206,6 +1207,7 @@ share/gtk-doc/html/libgimpthumb/libgimpthumb-gimpthumb-utils.html
 share/gtk-doc/html/libgimpthumb/libgimpthumb-index-deprecated.html
 share/gtk-doc/html/libgimpthumb/libgimpthumb-index-new-in-2-2.html
 share/gtk-doc/html/libgimpthumb/libgimpthumb-index-new-in-2-4.html
+share/gtk-doc/html/libgimpthumb/libgimpthumb-index-new-in-2-6.html
 share/gtk-doc/html/libgimpthumb/libgimpthumb-index.html
 share/gtk-doc/html/libgimpthumb/libgimpthumb.devhelp
 share/gtk-doc/html/libgimpthumb/libgimpthumb.devhelp2
@@ -1249,6 +1251,7 @@ share/gtk-doc/html/libgimpwidgets/GimpPickButton.html
 share/gtk-doc/html/libgimpwidgets/GimpPixmap.html
 share/gtk-doc/html/libgimpwidgets/GimpPreview.html
 share/gtk-doc/html/libgimpwidgets/GimpPreviewArea.html
+share/gtk-doc/html/libgimpwidgets/GimpRuler.html
 share/gtk-doc/html/libgimpwidgets/GimpScrolledPreview.html
 share/gtk-doc/html/libgimpwidgets/GimpSizeEntry.html
 share/gtk-doc/html/libgimpwidgets/GimpStringComboBox.html
@@ -1283,6 +1286,7 @@ share/gtk-doc/html/libgimpwidgets/home.png
 share/gtk-doc/html/libgimpwidgets/index.html
 share/gtk-doc/html/libgimpwidgets/index.sgml
 share/gtk-doc/html/libgimpwidgets/left.png
+share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpCairoUtils.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpEnumWidgets.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpHelpUI.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpHintBox.html
@@ -1301,6 +1305,7 @@ share/gtk-doc/html/libgimpwidgets/libgimpwidgets-hierarchy.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-index-deprecated.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-index-new-in-2-2.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-index-new-in-2-4.html
+share/gtk-doc/html/libgimpwidgets/libgimpwidgets-index-new-in-2-6.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-index.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-utils.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-widgets.html
@@ -1396,6 +1401,8 @@ share/gtk-doc/html/libgimpwidgets/stock-floating-selection-24.png
 share/gtk-doc/html/libgimpwidgets/stock-floating-selection-32.png
 share/gtk-doc/html/libgimpwidgets/stock-floating-selection-48.png
 share/gtk-doc/html/libgimpwidgets/stock-frame-64.png
+share/gtk-doc/html/libgimpwidgets/stock-gegl-16.png
+share/gtk-doc/html/libgimpwidgets/stock-gegl-22.png
 share/gtk-doc/html/libgimpwidgets/stock-gradient-bilinear-16.png
 share/gtk-doc/html/libgimpwidgets/stock-gradient-conical-asymmetric-16.png
 share/gtk-doc/html/libgimpwidgets/stock-gradient-conical-symmetric-16.png
@@ -1602,6 +1609,10 @@ share/gtk-doc/html/libgimpwidgets/stock-transparency-16.png
 share/gtk-doc/html/libgimpwidgets/stock-transparency-24.png
 share/gtk-doc/html/libgimpwidgets/stock-undo-history-16.png
 share/gtk-doc/html/libgimpwidgets/stock-undo-history-24.png
+share/gtk-doc/html/libgimpwidgets/stock-user-manual-16.png
+share/gtk-doc/html/libgimpwidgets/stock-user-manual-24.png
+share/gtk-doc/html/libgimpwidgets/stock-user-manual-32.png
+share/gtk-doc/html/libgimpwidgets/stock-user-manual-64.png
 share/gtk-doc/html/libgimpwidgets/stock-vcenter-24.png
 share/gtk-doc/html/libgimpwidgets/stock-vchain-24.png
 share/gtk-doc/html/libgimpwidgets/stock-vchain-broken-24.png
@@ -1614,7 +1625,6 @@ share/gtk-doc/html/libgimpwidgets/stock-web-16.png
 share/gtk-doc/html/libgimpwidgets/stock-web-24.png
 share/gtk-doc/html/libgimpwidgets/stock-wilber-16.png
 share/gtk-doc/html/libgimpwidgets/stock-wilber-22.png
-share/gtk-doc/html/libgimpwidgets/stock-wilber-48.png
 share/gtk-doc/html/libgimpwidgets/stock-wilber-64.png
 share/gtk-doc/html/libgimpwidgets/stock-wilber-eek-64.png
 share/gtk-doc/html/libgimpwidgets/stock-zoom-follow-window-12.png
@@ -1627,12 +1637,17 @@ share/icons/hicolor/32x32/apps/gimp.png
 share/icons/hicolor/48x48/apps/gimp.png
 share/icons/hicolor/64x64/apps/gimp.png
 share/icons/hicolor/scalable/apps/gimp.svg
+share/locale/am/LC_MESSAGES/gimp20.mo
 share/locale/ar/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ar/LC_MESSAGES/gimp20-python.mo
 share/locale/ar/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ar/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/ar/LC_MESSAGES/gimp20-tips.mo
 share/locale/ar/LC_MESSAGES/gimp20.mo
+share/locale/az/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/az/LC_MESSAGES/gimp20-python.mo
+share/locale/az/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/az/LC_MESSAGES/gimp20.mo
 share/locale/be/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/be/LC_MESSAGES/gimp20-python.mo
 share/locale/be/LC_MESSAGES/gimp20-script-fu.mo
@@ -1685,7 +1700,6 @@ share/locale/el/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/el/LC_MESSAGES/gimp20-python.mo
 share/locale/el/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/el/LC_MESSAGES/gimp20-std-plug-ins.mo
-share/locale/el/LC_MESSAGES/gimp20-tips.mo
 share/locale/el/LC_MESSAGES/gimp20.mo
 share/locale/en_CA/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/en_CA/LC_MESSAGES/gimp20-python.mo
@@ -1702,7 +1716,6 @@ share/locale/en_GB/LC_MESSAGES/gimp20.mo
 share/locale/eo/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/eo/LC_MESSAGES/gimp20-python.mo
 share/locale/eo/LC_MESSAGES/gimp20-script-fu.mo
-share/locale/eo/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/eo/LC_MESSAGES/gimp20-tips.mo
 share/locale/eo/LC_MESSAGES/gimp20.mo
 share/locale/es/LC_MESSAGES/gimp20-libgimp.mo
@@ -1745,7 +1758,6 @@ share/locale/ga/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ga/LC_MESSAGES/gimp20-python.mo
 share/locale/ga/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ga/LC_MESSAGES/gimp20-std-plug-ins.mo
-share/locale/ga/LC_MESSAGES/gimp20-tips.mo
 share/locale/ga/LC_MESSAGES/gimp20.mo
 share/locale/gl/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/gl/LC_MESSAGES/gimp20-python.mo
@@ -1760,11 +1772,11 @@ share/locale/gu/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/gu/LC_MESSAGES/gimp20-tips.mo
 share/locale/gu/LC_MESSAGES/gimp20.mo
 share/locale/he/LC_MESSAGES/gimp20-libgimp.mo
-share/locale/he/LC_MESSAGES/gimp20-python.mo
 share/locale/he/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/he/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/he/LC_MESSAGES/gimp20-tips.mo
 share/locale/he/LC_MESSAGES/gimp20.mo
+share/locale/hi/LC_MESSAGES/gimp20.mo
 share/locale/hr/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/hr/LC_MESSAGES/gimp20-python.mo
 share/locale/hr/LC_MESSAGES/gimp20-script-fu.mo
@@ -1778,11 +1790,15 @@ share/locale/hu/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/hu/LC_MESSAGES/gimp20-tips.mo
 share/locale/hu/LC_MESSAGES/gimp20.mo
 share/locale/id/LC_MESSAGES/gimp20-libgimp.mo
-share/locale/id/LC_MESSAGES/gimp20-python.mo
 share/locale/id/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/id/LC_MESSAGES/gimp20-std-plug-ins.mo
-share/locale/id/LC_MESSAGES/gimp20-tips.mo
 share/locale/id/LC_MESSAGES/gimp20.mo
+share/locale/is/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/is/LC_MESSAGES/gimp20-python.mo
+share/locale/is/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/is/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/is/LC_MESSAGES/gimp20-tips.mo
+share/locale/is/LC_MESSAGES/gimp20.mo
 share/locale/it/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/it/LC_MESSAGES/gimp20-python.mo
 share/locale/it/LC_MESSAGES/gimp20-script-fu.mo
@@ -1795,6 +1811,7 @@ share/locale/ja/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ja/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/ja/LC_MESSAGES/gimp20-tips.mo
 share/locale/ja/LC_MESSAGES/gimp20.mo
+share/locale/ka/LC_MESSAGES/gimp20.mo
 share/locale/km/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/km/LC_MESSAGES/gimp20-python.mo
 share/locale/km/LC_MESSAGES/gimp20-script-fu.mo
@@ -1813,12 +1830,15 @@ share/locale/lt/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/lt/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/lt/LC_MESSAGES/gimp20-tips.mo
 share/locale/lt/LC_MESSAGES/gimp20.mo
+share/locale/lv/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/lv/LC_MESSAGES/gimp20.mo
 share/locale/mk/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/mk/LC_MESSAGES/gimp20-python.mo
 share/locale/mk/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/mk/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/mk/LC_MESSAGES/gimp20-tips.mo
 share/locale/mk/LC_MESSAGES/gimp20.mo
+share/locale/ml/LC_MESSAGES/gimp20.mo
 share/locale/ms/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ms/LC_MESSAGES/gimp20-python.mo
 share/locale/ms/LC_MESSAGES/gimp20-script-fu.mo
@@ -1853,7 +1873,6 @@ share/locale/oc/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/oc/LC_MESSAGES/gimp20-python.mo
 share/locale/oc/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/oc/LC_MESSAGES/gimp20-std-plug-ins.mo
-share/locale/oc/LC_MESSAGES/gimp20-tips.mo
 share/locale/oc/LC_MESSAGES/gimp20.mo
 share/locale/pa/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/pa/LC_MESSAGES/gimp20-python.mo
@@ -1915,29 +1934,25 @@ share/locale/sr/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/sr/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/sr/LC_MESSAGES/gimp20-tips.mo
 share/locale/sr/LC_MESSAGES/gimp20.mo
-share/locale/sr@Latn/LC_MESSAGES/gimp20-libgimp.mo
-share/locale/sr@Latn/LC_MESSAGES/gimp20-python.mo
-share/locale/sr@Latn/LC_MESSAGES/gimp20-script-fu.mo
-share/locale/sr@Latn/LC_MESSAGES/gimp20-std-plug-ins.mo
-share/locale/sr@Latn/LC_MESSAGES/gimp20-tips.mo
-share/locale/sr@Latn/LC_MESSAGES/gimp20.mo
+share/locale/sr@latin/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/sr@latin/LC_MESSAGES/gimp20-python.mo
+share/locale/sr@latin/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/sr@latin/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/sr@latin/LC_MESSAGES/gimp20-tips.mo
+share/locale/sr@latin/LC_MESSAGES/gimp20.mo
 share/locale/sv/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/sv/LC_MESSAGES/gimp20-python.mo
 share/locale/sv/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/sv/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/sv/LC_MESSAGES/gimp20-tips.mo
 share/locale/sv/LC_MESSAGES/gimp20.mo
+share/locale/ta/LC_MESSAGES/gimp20.mo
+share/locale/th/LC_MESSAGES/gimp20.mo
 share/locale/tr/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/tr/LC_MESSAGES/gimp20-python.mo
 share/locale/tr/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/tr/LC_MESSAGES/gimp20-std-plug-ins.mo
-share/locale/tr/LC_MESSAGES/gimp20-tips.mo
 share/locale/tr/LC_MESSAGES/gimp20.mo
-share/locale/tt/LC_MESSAGES/gimp20-libgimp.mo
-share/locale/tt/LC_MESSAGES/gimp20-python.mo
-share/locale/tt/LC_MESSAGES/gimp20-script-fu.mo
-share/locale/tt/LC_MESSAGES/gimp20-std-plug-ins.mo
-share/locale/tt/LC_MESSAGES/gimp20-tips.mo
 share/locale/tt/LC_MESSAGES/gimp20.mo
 share/locale/uk/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/uk/LC_MESSAGES/gimp20-python.mo
@@ -1955,13 +1970,10 @@ share/locale/xh/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/xh/LC_MESSAGES/gimp20-python.mo
 share/locale/xh/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/xh/LC_MESSAGES/gimp20-std-plug-ins.mo
-share/locale/xh/LC_MESSAGES/gimp20-tips.mo
 share/locale/xh/LC_MESSAGES/gimp20.mo
 share/locale/yi/LC_MESSAGES/gimp20-libgimp.mo
-share/locale/yi/LC_MESSAGES/gimp20-python.mo
 share/locale/yi/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/yi/LC_MESSAGES/gimp20-std-plug-ins.mo
-share/locale/yi/LC_MESSAGES/gimp20-tips.mo
 share/locale/yi/LC_MESSAGES/gimp20.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20-python.mo
@@ -1969,14 +1981,13 @@ share/locale/zh_CN/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20-tips.mo
 share/locale/zh_CN/LC_MESSAGES/gimp20.mo
+share/locale/zh_HK/LC_MESSAGES/gimp20.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-python.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-tips.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20.mo
-share/mime-info/gimp.keys
-@comment in xdg-dirs: @dirrm share/mime-info
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
@@ -1993,7 +2004,6 @@ share/mime-info/gimp.keys
 @dirrm share/gtk-doc/html/libgimpcolor
 @dirrm share/gtk-doc/html/libgimpbase
 @dirrm share/gtk-doc/html/libgimp
-${PLIST.twain}@dirrm share/gimp/2.0/twain
 @dirrm share/gimp/2.0/tips
 @dirrm share/gimp/2.0/themes/Small
 @dirrm share/gimp/2.0/themes/Default/images/preferences
@@ -2021,12 +2031,12 @@ ${PLIST.twain}@dirrm share/gimp/2.0/twain
 @dirrm share/gimp
 @dirrm share/examples/gimp-2.0
 @comment in xdg-dirs: @dirrm share/applications
-@comment in xdg-dirs: @dirrm share/application-registry
 @dirrm lib/gimp/2.0/plug-ins
 @dirrm lib/gimp/2.0/modules
 @dirrm lib/gimp/2.0/interpreters
 @dirrm lib/gimp/2.0/environ
 @dirrm lib/gimp/2.0
+@dirrm lib/gimp
 @dirrm include/gimp-2.0/libgimpwidgets
 @dirrm include/gimp-2.0/libgimpthumb
 @dirrm include/gimp-2.0/libgimpmodule
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index f4cbf3dc5dc..01f88b56d71 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.45 2008/08/30 20:22:25 tron Exp $
+$NetBSD: distinfo,v 1.46 2009/01/24 20:55:06 adam Exp $
 
-SHA1 (gimp-2.4.7.tar.bz2) = fd6dac4fd107f3b741168ffcaf4425a9dd179327
-RMD160 (gimp-2.4.7.tar.bz2) = 79062e60db1fe172e2a91ff0601462462d3a61cb
-Size (gimp-2.4.7.tar.bz2) = 18977384 bytes
+SHA1 (gimp-2.6.4.tar.bz2) = f68ca1e1dce7ef8c100ce74e0c1ee5c493a589a1
+RMD160 (gimp-2.6.4.tar.bz2) = 64aa55def0e97cfc85f27dc7461f18455619ed41
+Size (gimp-2.6.4.tar.bz2) = 16012685 bytes
 SHA1 (patch-aa) = 4881df151c386371a91e558b4b15611023fceca1
-SHA1 (patch-ab) = e37caaedd738476b901aca0635bdefe3fb9d266d
+SHA1 (patch-ab) = 636d2a78256c34fdb141f15c3520fdb0abe31069
 SHA1 (patch-ac) = b1f4b802eebbb2d2145e0e282e65d48a0409a6b8
-SHA1 (patch-ae) = 285b7d8f5d67660da62656cae45a97e5801920b2
diff --git a/graphics/gimp/files/msgfmtstrip b/graphics/gimp/files/msgfmtstrip
new file mode 100644
index 00000000000..807dab33485
--- /dev/null
+++ b/graphics/gimp/files/msgfmtstrip
@@ -0,0 +1,18 @@
+# $Id: msgfmtstrip,v 1.1 2009/01/24 20:55:06 adam Exp $
+# Simple awk script to strip out .po entries with "msgctxt" or "#~|", so the
+# resultant file can be handled by the msgfmt 0.14.4 in NetBSD 4.0
+{
+if (/^$/) { entry_end(); }
+else if ($1 == "msgctxt" || $2 == "msgctxt") { skip = 1; }
+else if ($1 == "#~|") { skip = 1; }
+else { entry = entry $0 "\n" }
+}
+
+END { entry_end(); }
+
+function entry_end() {
+    if (!skip)
+	print entry;
+    entry = "";
+    skip = 0;
+}
diff --git a/graphics/gimp/patches/patch-aa b/graphics/gimp/patches/patch-aa
index d82becb63db..825e6aa8dd3 100644
--- a/graphics/gimp/patches/patch-aa
+++ b/graphics/gimp/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.21 2008/08/30 11:11:50 adam Exp $
+$NetBSD: patch-aa,v 1.22 2009/01/24 20:55:06 adam Exp $
 
 --- etc/Makefile.in.orig	2008-08-21 11:36:45.000000000 +0200
 +++ etc/Makefile.in
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
index bfc9e11c6ac..b482751b4c4 100644
--- a/graphics/gimp/patches/patch-ab
+++ b/graphics/gimp/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.26 2008/08/30 11:11:50 adam Exp $
+$NetBSD: patch-ab,v 1.27 2009/01/24 20:55:06 adam Exp $
 
---- configure.orig	2008-08-21 11:36:52.000000000 +0200
+--- configure.orig	2008-11-20 23:48:56.000000000 +0100
 +++ configure
-@@ -31016,6 +31016,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -31444,6 +31444,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
    gimp_ok=yes
  fi
  rm -f conftest*
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.26 2008/08/30 11:11:50 adam Exp $
  
        if test "x$gimp_ok" = xyes; then
  
-@@ -31024,7 +31025,6 @@ cat >>confdefs.h <<\_ACEOF
+@@ -31452,7 +31453,6 @@ cat >>confdefs.h <<\_ACEOF
  _ACEOF
  
        fi
@@ -18,16 +18,16 @@ $NetBSD: patch-ab,v 1.26 2008/08/30 11:11:50 adam Exp $
    { echo "$as_me:$LINENO: result: $gimp_ok" >&5
  echo "${ECHO_T}$gimp_ok" >&6; }
    if test "x$gimp_ok" = xno; then
-@@ -33563,7 +33563,7 @@ fi
- if test "x$with_print" != xno; then
-     enable_print="yes"
+@@ -34171,7 +34171,7 @@ if test "x$with_print" != xno; then
+   enable_print="yes"
  fi
+ 
 - if test "x$enable_print" == xyes; then
 + if test "x$enable_print" = xyes; then
    BUILD_PRINT_TRUE=
    BUILD_PRINT_FALSE='#'
  else
-@@ -36523,7 +36523,7 @@ fi
+@@ -36840,7 +36840,7 @@ fi
  
  gimpdatadir="$datadir/$PACKAGE/2.0"
  gimpplugindir="$libdir/$PACKAGE/2.0"
diff --git a/graphics/gimp/patches/patch-ac b/graphics/gimp/patches/patch-ac
index b435e046fcd..de9265fc7b1 100644
--- a/graphics/gimp/patches/patch-ac
+++ b/graphics/gimp/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.16 2008/08/30 20:22:25 tron Exp $
+$NetBSD: patch-ac,v 1.17 2009/01/24 20:55:06 adam Exp $
 
 --- plug-ins/twain/Makefile.in.orig	2008-08-30 19:55:20.000000000 +0100
 +++ plug-ins/twain/Makefile.in	2008-08-30 20:02:01.000000000 +0100
diff --git a/graphics/gimp/patches/patch-ae b/graphics/gimp/patches/patch-ae
deleted file mode 100644
index f7e4a7a3f7c..00000000000
--- a/graphics/gimp/patches/patch-ae
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ae,v 1.9 2007/10/25 21:06:17 adam Exp $
-
---- plug-ins/common/png.c.orig	2007-08-15 23:57:03.000000000 +0200
-+++ plug-ins/common/png.c
-@@ -1095,8 +1095,6 @@ load_image (const gchar *filename,
- 
-   g_free (pixel);
-   g_free (pixels);
--  free (pp);
--  free (info);
- 
-   fclose (fp);
- 
-@@ -1558,9 +1556,6 @@ save_image (const gchar *filename,
-       g_free (text);
-     }
- 
--  free (pp);
--  free (info);
--
-   fclose (fp);
- 
-   return TRUE;