Changes 2.8.0:

Core:
- Add our own GimpOperationBrightnessContrast because GEGL one is different
Plug-ins:
- Fix some GFig rendering issues
Source and build system:
- Depend on Babl 0.1.10, GEGL 0.2.0 and some other new library versions
General:
- Bug fixes
- Translation updates

12 files changed, 357 insertions, 168 deletions

diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 4d6d0bb54bc..51159a9c974 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.211 2012/03/03 00:12:14 wiz Exp $
+# $NetBSD: Makefile,v 1.212 2012/05/07 08:40:07 adam Exp $
 
-DISTNAME=	gimp-2.6.12
-PKGREVISION=	2
+DISTNAME=	gimp-2.8.0
 CATEGORIES=	graphics
-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/
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v${PKGVERSION_NOREV:R}/ \
+		${MASTER_SITE_GNU:=gimp/v${PKGVERSION_NOREV:R}/} \
+		ftp://ftp.gwdg.de/pub/misc/grafik/gimp/gimp/v${PKGVERSION_NOREV:R}/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	adam@NetBSD.org
@@ -43,7 +42,7 @@ CONFIGURE_ARGS+=	--without-linux-input
 UNLIMIT_RESOURCES+=	datasize
 
 EGDIR=			${PREFIX}/share/examples/gimp-2.0
-.for f in controllerrc gimprc gtkrc menurc ps-menurc sessionrc templaterc unitrc
+.for f in controllerrc gimprc gtkrc menurc sessionrc templaterc unitrc
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 
diff --git a/graphics/gimp/PLIST b/graphics/gimp/PLIST
index a56e0644180..53a8ff9c330 100644
--- a/graphics/gimp/PLIST
+++ b/graphics/gimp/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.48 2012/02/04 21:10:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.49 2012/05/07 08:40:08 adam Exp $
 bin/gimp
-bin/gimp-2.6
+bin/gimp-2.8
 bin/gimp-console
-bin/gimp-console-2.6
+bin/gimp-console-2.8
 bin/gimptool-2.0
 include/gimp-2.0/libgimp/gimp.h
 include/gimp-2.0/libgimp/gimp_pdb.h
+include/gimp-2.0/libgimp/gimp_pdb_headers.h
 include/gimp-2.0/libgimp/gimpaspectpreview.h
 include/gimp-2.0/libgimp/gimpbrush_pdb.h
 include/gimp-2.0/libgimp/gimpbrushes.h
@@ -26,6 +27,7 @@ include/gimp-2.0/libgimp/gimpdrawable.h
 include/gimp-2.0/libgimp/gimpdrawable_pdb.h
 include/gimp-2.0/libgimp/gimpdrawablepreview.h
 include/gimp-2.0/libgimp/gimpdrawabletransform_pdb.h
+include/gimp-2.0/libgimp/gimpdynamics_pdb.h
 include/gimp-2.0/libgimp/gimpedit_pdb.h
 include/gimp-2.0/libgimp/gimpenums.h
 include/gimp-2.0/libgimp/gimpexport.h
@@ -51,12 +53,14 @@ 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/gimpimageselect_pdb.h
+include/gimp-2.0/libgimp/gimpitem_pdb.h
 include/gimp-2.0/libgimp/gimpitemcombobox.h
+include/gimp-2.0/libgimp/gimpitemtransform_pdb.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
@@ -66,7 +70,6 @@ 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/gimppaletteselectbutton.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
@@ -101,6 +104,7 @@ include/gimp-2.0/libgimp/gimpui.h
 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/libgimp/gimpvectors.h
 include/gimp-2.0/libgimp/gimpvectors_pdb.h
 include/gimp-2.0/libgimp/gimpzoompreview.h
 include/gimp-2.0/libgimpbase/gimpbase.h
@@ -122,6 +126,7 @@ include/gimp-2.0/libgimpbase/gimputils.h
 include/gimp-2.0/libgimpbase/gimpversion.h
 include/gimp-2.0/libgimpcolor/gimpadaptivesupersample.h
 include/gimp-2.0/libgimpcolor/gimpbilinear.h
+include/gimp-2.0/libgimpcolor/gimpcairocolor.h
 include/gimp-2.0/libgimpcolor/gimpcmyk.h
 include/gimp-2.0/libgimpcolor/gimpcolor.h
 include/gimp-2.0/libgimpcolor/gimpcolormanaged.h
@@ -157,6 +162,7 @@ include/gimp-2.0/libgimpthumb/gimpthumb-types.h
 include/gimp-2.0/libgimpthumb/gimpthumb-utils.h
 include/gimp-2.0/libgimpthumb/gimpthumb.h
 include/gimp-2.0/libgimpthumb/gimpthumbnail.h
+include/gimp-2.0/libgimpwidgets/gimp3migration.h
 include/gimp-2.0/libgimpwidgets/gimpbrowser.h
 include/gimp-2.0/libgimpwidgets/gimpbutton.h
 include/gimp-2.0/libgimpwidgets/gimpcairo-utils.h
@@ -206,7 +212,10 @@ 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/gimpstringcombobox.h
+include/gimp-2.0/libgimpwidgets/gimpunitcombobox.h
 include/gimp-2.0/libgimpwidgets/gimpunitmenu.h
+include/gimp-2.0/libgimpwidgets/gimpunitstore.h
+include/gimp-2.0/libgimpwidgets/gimpwidgets-error.h
 include/gimp-2.0/libgimpwidgets/gimpwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetsenums.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
@@ -292,10 +301,10 @@ lib/gimp/2.0/plug-ins/file-jpeg
 ${PLIST.mng}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-pdf-save
 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
@@ -310,6 +319,7 @@ 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
+${PLIST.remote}lib/gimp/2.0/plug-ins/file-xmc
 ${PLIST.remote}lib/gimp/2.0/plug-ins/file-xpm
 lib/gimp/2.0/plug-ins/file-xwd
 lib/gimp/2.0/plug-ins/film
@@ -317,8 +327,6 @@ lib/gimp/2.0/plug-ins/filter-pack
 lib/gimp/2.0/plug-ins/flame
 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/gfig
 lib/gimp/2.0/plug-ins/gimpressionist
 lib/gimp/2.0/plug-ins/gradient-flare
@@ -382,7 +390,6 @@ 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
-${PLIST.twain}lib/gimp/2.0/plug-ins/twain
 lib/gimp/2.0/plug-ins/unit-editor
 lib/gimp/2.0/plug-ins/unsharp-mask
 lib/gimp/2.0/plug-ins/value-invert
@@ -406,12 +413,12 @@ 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.6.1
-man/man1/gimp-console-2.6.1
+man/man1/gimp-2.8.1
+man/man1/gimp-console-2.8.1
 man/man1/gimp-console.1
 man/man1/gimp.1
 man/man1/gimptool-2.0.1
-man/man5/gimprc-2.6.5
+man/man5/gimprc-2.8.5
 man/man5/gimprc.5
 share/aclocal/gimp-2.0.m4
 share/applications/gimp.desktop
@@ -419,56 +426,119 @@ share/examples/gimp-2.0/controllerrc
 share/examples/gimp-2.0/gimprc
 share/examples/gimp-2.0/gtkrc
 share/examples/gimp-2.0/menurc
-share/examples/gimp-2.0/ps-menurc
 share/examples/gimp-2.0/sessionrc
 share/examples/gimp-2.0/templaterc
 share/examples/gimp-2.0/unitrc
-share/gimp/2.0/brushes/10x10square.gbr
-share/gimp/2.0/brushes/10x10squareBlur.gbr
-share/gimp/2.0/brushes/20x20square.gbr
-share/gimp/2.0/brushes/20x20squareBlur.gbr
-share/gimp/2.0/brushes/5x5square.gbr
-share/gimp/2.0/brushes/5x5squareBlur.gbr
-share/gimp/2.0/brushes/Calligraphic-Brush-0.vbr
-share/gimp/2.0/brushes/Calligraphic-Brush-1.vbr
-share/gimp/2.0/brushes/Calligraphic-Brush-2.vbr
-share/gimp/2.0/brushes/Calligraphic-Brush-3.vbr
-share/gimp/2.0/brushes/Circle-1.vbr
-share/gimp/2.0/brushes/Circle-11.vbr
-share/gimp/2.0/brushes/Circle-13.vbr
-share/gimp/2.0/brushes/Circle-15.vbr
-share/gimp/2.0/brushes/Circle-17.vbr
-share/gimp/2.0/brushes/Circle-19.vbr
-share/gimp/2.0/brushes/Circle-3.vbr
-share/gimp/2.0/brushes/Circle-5.vbr
-share/gimp/2.0/brushes/Circle-7.vbr
-share/gimp/2.0/brushes/Circle-9.vbr
-share/gimp/2.0/brushes/Circle-Fuzzy-11.vbr
-share/gimp/2.0/brushes/Circle-Fuzzy-13.vbr
-share/gimp/2.0/brushes/Circle-Fuzzy-15.vbr
-share/gimp/2.0/brushes/Circle-Fuzzy-17.vbr
-share/gimp/2.0/brushes/Circle-Fuzzy-19.vbr
-share/gimp/2.0/brushes/Circle-Fuzzy-3.vbr
-share/gimp/2.0/brushes/Circle-Fuzzy-5.vbr
-share/gimp/2.0/brushes/Circle-Fuzzy-7.vbr
-share/gimp/2.0/brushes/Circle-Fuzzy-9.vbr
-share/gimp/2.0/brushes/Diagonal-Star-11.vbr
-share/gimp/2.0/brushes/Diagonal-Star-17.vbr
-share/gimp/2.0/brushes/Diagonal-Star-25.vbr
-share/gimp/2.0/brushes/SketchBrush-16.gih
-share/gimp/2.0/brushes/SketchBrush-32.gih
-share/gimp/2.0/brushes/SketchBrush-64.gih
-share/gimp/2.0/brushes/confetti.gbr
-share/gimp/2.0/brushes/confetti.gih
-share/gimp/2.0/brushes/dunes.gbr
-share/gimp/2.0/brushes/feltpen.gih
-share/gimp/2.0/brushes/galaxy.gbr
-share/gimp/2.0/brushes/galaxy_big.gbr
-share/gimp/2.0/brushes/galaxy_small.gbr
-share/gimp/2.0/brushes/hsparks.gih
-share/gimp/2.0/brushes/pepper.gbr
-share/gimp/2.0/brushes/pixel.gbr
-share/gimp/2.0/brushes/vine.gih
+share/gimp/2.0/brushes/Basic/1-pixel.vbr
+share/gimp/2.0/brushes/Basic/Block-01.vbr
+share/gimp/2.0/brushes/Basic/Block-02.vbr
+share/gimp/2.0/brushes/Basic/Block-03.vbr
+share/gimp/2.0/brushes/Basic/Hardness-025.vbr
+share/gimp/2.0/brushes/Basic/Hardness-050.vbr
+share/gimp/2.0/brushes/Basic/Hardness-075.vbr
+share/gimp/2.0/brushes/Basic/Hardness-100.vbr
+share/gimp/2.0/brushes/Basic/Star.vbr
+share/gimp/2.0/brushes/Basic/pixel.gbr
+share/gimp/2.0/brushes/Legacy/confetti.gbr
+share/gimp/2.0/brushes/Legacy/confetti.gih
+share/gimp/2.0/brushes/Legacy/dunes.gbr
+share/gimp/2.0/brushes/Legacy/galaxy-big.gbr
+share/gimp/2.0/brushes/Legacy/galaxy.gbr
+share/gimp/2.0/brushes/Legacy/pepper.gbr
+share/gimp/2.0/brushes/Legacy/vine.gih
+share/gimp/2.0/brushes/Media/Acrylic-01.gih
+share/gimp/2.0/brushes/Media/Acrylic-02.gih
+share/gimp/2.0/brushes/Media/Acrylic-03.gih
+share/gimp/2.0/brushes/Media/Acrylic-04.gih
+share/gimp/2.0/brushes/Media/Acrylic-05.gih
+share/gimp/2.0/brushes/Media/Bristles-01.gbr
+share/gimp/2.0/brushes/Media/Bristles-02.gbr
+share/gimp/2.0/brushes/Media/Bristles-03.gbr
+share/gimp/2.0/brushes/Media/Oils-01.gbr
+share/gimp/2.0/brushes/Media/Oils-02.gbr
+share/gimp/2.0/brushes/Media/Oils-03.gbr
+share/gimp/2.0/brushes/Sketch/Chalk-01.gih
+share/gimp/2.0/brushes/Sketch/Chalk-02.gih
+share/gimp/2.0/brushes/Sketch/Chalk-03.gih
+share/gimp/2.0/brushes/Sketch/Charcoal-01.gbr
+share/gimp/2.0/brushes/Sketch/Charcoal-02.gbr
+share/gimp/2.0/brushes/Sketch/Pencil-01.gih
+share/gimp/2.0/brushes/Sketch/Pencil-02.gih
+share/gimp/2.0/brushes/Sketch/Pencil-Scratch.gbr
+share/gimp/2.0/brushes/Splatters/Sparks-Hose.gih
+share/gimp/2.0/brushes/Splatters/Splats-01.gih
+share/gimp/2.0/brushes/Splatters/Splats-02.gih
+share/gimp/2.0/brushes/Splatters/Sponge-01.gbr
+share/gimp/2.0/brushes/Splatters/Sponge-02.gbr
+share/gimp/2.0/brushes/Texture/Cell-01.gbr
+share/gimp/2.0/brushes/Texture/Cell-02.gbr
+share/gimp/2.0/brushes/Texture/Grass.gih
+share/gimp/2.0/brushes/Texture/Smoke.gbr
+share/gimp/2.0/brushes/Texture/Structure.gbr
+share/gimp/2.0/brushes/Texture/Texture-01.gbr
+share/gimp/2.0/brushes/Texture/Texture-02.gbr
+share/gimp/2.0/brushes/Texture/Texture-Hose-01.gih
+share/gimp/2.0/brushes/Texture/Texture-Hose-02.gih
+share/gimp/2.0/brushes/Texture/Texture-Hose-03.gih
+share/gimp/2.0/brushes/Texture/Vegetation-01.gbr
+share/gimp/2.0/brushes/Texture/Vegetation-02.gih
+share/gimp/2.0/brushes/gimp-obsolete-files/10x10square.gbr
+share/gimp/2.0/brushes/gimp-obsolete-files/10x10squareBlur.gbr
+share/gimp/2.0/brushes/gimp-obsolete-files/20x20square.gbr
+share/gimp/2.0/brushes/gimp-obsolete-files/20x20squareBlur.gbr
+share/gimp/2.0/brushes/gimp-obsolete-files/5x5square.gbr
+share/gimp/2.0/brushes/gimp-obsolete-files/5x5squareBlur.gbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Calligraphic-Brush-0.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Calligraphic-Brush-1.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Calligraphic-Brush-2.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Calligraphic-Brush-3.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-1.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-11.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-13.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-15.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-17.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-19.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-3.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-5.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-7.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-9.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-Fuzzy-11.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-Fuzzy-13.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-Fuzzy-15.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-Fuzzy-17.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-Fuzzy-19.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-Fuzzy-3.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-Fuzzy-5.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-Fuzzy-7.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Circle-Fuzzy-9.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Diagonal-Star-11.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Diagonal-Star-17.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Diagonal-Star-25.vbr
+share/gimp/2.0/brushes/gimp-obsolete-files/Grass1.gih
+share/gimp/2.0/brushes/gimp-obsolete-files/SketchBrush-16.gih
+share/gimp/2.0/brushes/gimp-obsolete-files/SketchBrush-32.gih
+share/gimp/2.0/brushes/gimp-obsolete-files/SketchBrush-64.gih
+share/gimp/2.0/brushes/gimp-obsolete-files/feltpen.gih
+share/gimp/2.0/brushes/gimp-obsolete-files/galaxy_small.gbr
+share/gimp/2.0/brushes/gimp-obsolete-files/pepper.gbr
+share/gimp/2.0/brushes/gimp-obsolete-files/pixel.gbr
+share/gimp/2.0/dynamics/Basic-Dynamics.gdyn
+share/gimp/2.0/dynamics/Basic/Basic-Simple.gdyn
+share/gimp/2.0/dynamics/Basic/Dynamics-Random.gdyn
+share/gimp/2.0/dynamics/Basic/Negative-Size-Pressure.gdyn
+share/gimp/2.0/dynamics/Basic/Pen-Generic.gdyn
+share/gimp/2.0/dynamics/Basic/Pencil-Generic.gdyn
+share/gimp/2.0/dynamics/Basic/Pencil-Shader.gdyn
+share/gimp/2.0/dynamics/Basic/Pressure-Opacity.gdyn
+share/gimp/2.0/dynamics/Dynamics-Off.gdyn
+share/gimp/2.0/dynamics/FX/Confetti.gdyn
+share/gimp/2.0/dynamics/FX/Perspective.gdyn
+share/gimp/2.0/dynamics/FX/Speed_Size_Opacity.gdyn
+share/gimp/2.0/dynamics/Fade-Tapering.gdyn
+share/gimp/2.0/dynamics/Random-Color.gdyn
+share/gimp/2.0/dynamics/Tilt-Angle.gdyn
+share/gimp/2.0/dynamics/Track-Direction.gdyn
+share/gimp/2.0/dynamics/Velocity-Tapering.gdyn
 share/gimp/2.0/fractalexplorer/Asteroid_Field
 share/gimp/2.0/fractalexplorer/Bar_Code_Label
 share/gimp/2.0/fractalexplorer/Beauty_of_Nature
@@ -646,12 +716,8 @@ share/gimp/2.0/gradients/Flare_Rays_Radial_2.ggr
 share/gimp/2.0/gradients/Flare_Rays_Size_1.ggr
 share/gimp/2.0/gradients/Flare_Sizefac_101.ggr
 share/gimp/2.0/gradients/Four_bars.ggr
-share/gimp/2.0/gradients/French_flag.ggr
-share/gimp/2.0/gradients/French_flag_smooth.ggr
 share/gimp/2.0/gradients/Full_saturation_spectrum_CCW.ggr
 share/gimp/2.0/gradients/Full_saturation_spectrum_CW.ggr
-share/gimp/2.0/gradients/German_flag.ggr
-share/gimp/2.0/gradients/German_flag_smooth.ggr
 share/gimp/2.0/gradients/Golden.ggr
 share/gimp/2.0/gradients/Greens.ggr
 share/gimp/2.0/gradients/Horizon_1.ggr
@@ -660,8 +726,6 @@ share/gimp/2.0/gradients/Incandescent.ggr
 share/gimp/2.0/gradients/Land_1.ggr
 share/gimp/2.0/gradients/Land_and_Sea.ggr
 share/gimp/2.0/gradients/Metallic_Something.ggr
-share/gimp/2.0/gradients/Mexican_flag.ggr
-share/gimp/2.0/gradients/Mexican_flag_smooth.ggr
 share/gimp/2.0/gradients/Nauseating_Headache.ggr
 share/gimp/2.0/gradients/Neon_Cyan.ggr
 share/gimp/2.0/gradients/Neon_Green.ggr
@@ -674,8 +738,6 @@ share/gimp/2.0/gradients/Radial_Eyeball_Brown.ggr
 share/gimp/2.0/gradients/Radial_Eyeball_Green.ggr
 share/gimp/2.0/gradients/Radial_Glow_1.ggr
 share/gimp/2.0/gradients/Radial_Rainbow_Hoop.ggr
-share/gimp/2.0/gradients/Romanian_flag.ggr
-share/gimp/2.0/gradients/Romanian_flag_smooth.ggr
 share/gimp/2.0/gradients/Rounded_edge.ggr
 share/gimp/2.0/gradients/Shadows_1.ggr
 share/gimp/2.0/gradients/Shadows_2.ggr
@@ -691,6 +753,14 @@ 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/gradients/gimp-obsolete-files/French_flag.ggr
+share/gimp/2.0/gradients/gimp-obsolete-files/French_flag_smooth.ggr
+share/gimp/2.0/gradients/gimp-obsolete-files/German_flag.ggr
+share/gimp/2.0/gradients/gimp-obsolete-files/German_flag_smooth.ggr
+share/gimp/2.0/gradients/gimp-obsolete-files/Mexican_flag.ggr
+share/gimp/2.0/gradients/gimp-obsolete-files/Mexican_flag_smooth.ggr
+share/gimp/2.0/gradients/gimp-obsolete-files/Romanian_flag.ggr
+share/gimp/2.0/gradients/gimp-obsolete-files/Romanian_flag_smooth.ggr
 share/gimp/2.0/images/gimp-logo.png
 share/gimp/2.0/images/gimp-splash.png
 share/gimp/2.0/images/wilber.png
@@ -702,6 +772,8 @@ share/gimp/2.0/menus/colormap-menu.xml
 share/gimp/2.0/menus/cursor-info-menu.xml
 share/gimp/2.0/menus/dockable-menu.xml
 share/gimp/2.0/menus/documents-menu.xml
+share/gimp/2.0/menus/dynamics-editor-menu.xml
+share/gimp/2.0/menus/dynamics-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
@@ -717,8 +789,10 @@ share/gimp/2.0/menus/sample-points-menu.xml
 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/text-tool-menu.xml
 share/gimp/2.0/menus/tool-options-menu.xml
-share/gimp/2.0/menus/tools-menu.xml
+share/gimp/2.0/menus/tool-preset-editor-menu.xml
+share/gimp/2.0/menus/tool-presets-menu.xml
 share/gimp/2.0/menus/undo-menu.xml
 share/gimp/2.0/menus/vectors-menu.xml
 share/gimp/2.0/palettes/Bears.gpl
@@ -863,8 +937,7 @@ share/gimp/2.0/scripts/flatland.scm
 share/gimp/2.0/scripts/font-map.scm
 share/gimp/2.0/scripts/frosty-logo.scm
 share/gimp/2.0/scripts/fuzzyborder.scm
-share/gimp/2.0/scripts/gimp-headers.scm
-share/gimp/2.0/scripts/gimp-labels.scm
+share/gimp/2.0/scripts/gimp-online.scm
 share/gimp/2.0/scripts/glossy.scm
 share/gimp/2.0/scripts/glowing-logo.scm
 share/gimp/2.0/scripts/gradient-bevel-logo.scm
@@ -887,6 +960,7 @@ share/gimp/2.0/scripts/mkbrush.scm
 share/gimp/2.0/scripts/neon-logo.scm
 share/gimp/2.0/scripts/news-text.scm
 share/gimp/2.0/scripts/old-photo.scm
+share/gimp/2.0/scripts/palette-export.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
@@ -922,8 +996,8 @@ share/gimp/2.0/scripts/truchet.scm
 share/gimp/2.0/scripts/unsharp-mask.scm
 share/gimp/2.0/scripts/waves-anim.scm
 share/gimp/2.0/scripts/weave.scm
-share/gimp/2.0/scripts/web-browser.scm
 share/gimp/2.0/scripts/xach-effect.scm
+share/gimp/2.0/tags/gimp-tags-default.xml
 share/gimp/2.0/themes/Default/gtkrc
 share/gimp/2.0/themes/Default/images/preferences/color-management-22.png
 share/gimp/2.0/themes/Default/images/preferences/color-management.png
@@ -939,6 +1013,8 @@ share/gimp/2.0/themes/Default/images/preferences/environment.png
 share/gimp/2.0/themes/Default/images/preferences/folders-22.png
 share/gimp/2.0/themes/Default/images/preferences/folders-brushes-22.png
 share/gimp/2.0/themes/Default/images/preferences/folders-brushes.png
+share/gimp/2.0/themes/Default/images/preferences/folders-dynamics-22.png
+share/gimp/2.0/themes/Default/images/preferences/folders-dynamics.png
 share/gimp/2.0/themes/Default/images/preferences/folders-environ-22.png
 share/gimp/2.0/themes/Default/images/preferences/folders-environ.png
 share/gimp/2.0/themes/Default/images/preferences/folders-fonts-22.png
@@ -961,6 +1037,8 @@ share/gimp/2.0/themes/Default/images/preferences/folders-themes-22.png
 share/gimp/2.0/themes/Default/images/preferences/folders-themes.png
 share/gimp/2.0/themes/Default/images/preferences/folders-tool-plug-ins-22.png
 share/gimp/2.0/themes/Default/images/preferences/folders-tool-plug-ins.png
+share/gimp/2.0/themes/Default/images/preferences/folders-tool-presets-22.png
+share/gimp/2.0/themes/Default/images/preferences/folders-tool-presets.png
 share/gimp/2.0/themes/Default/images/preferences/folders-tools-22.png
 share/gimp/2.0/themes/Default/images/preferences/folders.png
 share/gimp/2.0/themes/Default/images/preferences/help-system-22.png
@@ -991,7 +1069,37 @@ 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/gimp/2.0/tool-presets/FX/Crop-16-9.gtp
+share/gimp/2.0/tool-presets/FX/Crop-Composition.gtp
+share/gimp/2.0/tool-presets/FX/FX-Confetti.gtp
+share/gimp/2.0/tool-presets/FX/FX-Radial-Softlight.gtp
+share/gimp/2.0/tool-presets/FX/Fill-Paper.gtp
+share/gimp/2.0/tool-presets/FX/Glow-Lights.gtp
+share/gimp/2.0/tool-presets/FX/Smooth-Clone.gtp
+share/gimp/2.0/tool-presets/FX/Vignette.gtp
+share/gimp/2.0/tool-presets/Paint/Airbrush.gtp
+share/gimp/2.0/tool-presets/Paint/Basic-Knife.gtp
+share/gimp/2.0/tool-presets/Paint/Basic-Round-Detail.gtp
+share/gimp/2.0/tool-presets/Paint/Basic-Round.gtp
+share/gimp/2.0/tool-presets/Paint/Bristles.gtp
+share/gimp/2.0/tool-presets/Paint/Eraser-Hard.gtp
+share/gimp/2.0/tool-presets/Paint/Noise.gtp
+share/gimp/2.0/tool-presets/Paint/Smudge-Rough.gtp
+share/gimp/2.0/tool-presets/Paint/Smudge-Soft.gtp
+share/gimp/2.0/tool-presets/Paint/Soft-Oil.gtp
+share/gimp/2.0/tool-presets/Paint/Splatters.gtp
+share/gimp/2.0/tool-presets/Paint/Structure.gtp
+share/gimp/2.0/tool-presets/Paint/Vegetal.gtp
+share/gimp/2.0/tool-presets/Selection/Circle-200px.gtp
+share/gimp/2.0/tool-presets/Selection/Feathered-Selection.gtp
+share/gimp/2.0/tool-presets/Sketch/Blue-Pen.gtp
+share/gimp/2.0/tool-presets/Sketch/Eraser-Soft.gtp
+share/gimp/2.0/tool-presets/Sketch/Ink-Smooth.gtp
+share/gimp/2.0/tool-presets/Sketch/Ink-Thin.gtp
+share/gimp/2.0/tool-presets/Sketch/Pencil-Soft.gtp
+share/gimp/2.0/tool-presets/Sketch/Pencil.gtp
+share/gimp/2.0/ui/plug-ins/plug-in-file-gif.ui
+share/gimp/2.0/ui/plug-ins/plug-in-file-png.ui
 share/gtk-doc/html/libgimp/GimpAspectPreview.html
 share/gtk-doc/html/libgimp/GimpBrushSelectButton.html
 share/gtk-doc/html/libgimp/GimpDrawablePreview.html
@@ -1008,10 +1116,11 @@ share/gtk-doc/html/libgimp/home.png
 share/gtk-doc/html/libgimp/index.html
 share/gtk-doc/html/libgimp/index.sgml
 share/gtk-doc/html/libgimp/left.png
+share/gtk-doc/html/libgimp/libgimp-Gimp.html
 share/gtk-doc/html/libgimp/libgimp-GimpItemComboBox.html
+share/gtk-doc/html/libgimp/libgimp-GimpProcView.html
 share/gtk-doc/html/libgimp/libgimp-data.html
 share/gtk-doc/html/libgimp/libgimp-general.html
-share/gtk-doc/html/libgimp/libgimp-gimp.html
 share/gtk-doc/html/libgimp/libgimp-gimpbrush.html
 share/gtk-doc/html/libgimp/libgimp-gimpbrushes.html
 share/gtk-doc/html/libgimp/libgimp-gimpbrushmenu.html
@@ -1024,6 +1133,7 @@ share/gtk-doc/html/libgimp/libgimp-gimpconvert.html
 share/gtk-doc/html/libgimp/libgimp-gimpdisplay.html
 share/gtk-doc/html/libgimp/libgimp-gimpdrawable.html
 share/gtk-doc/html/libgimp/libgimp-gimpdrawabletransform.html
+share/gtk-doc/html/libgimp/libgimp-gimpdynamics.html
 share/gtk-doc/html/libgimp/libgimp-gimpedit.html
 share/gtk-doc/html/libgimp/libgimp-gimpenums.html
 share/gtk-doc/html/libgimp/libgimp-gimpexport.html
@@ -1041,9 +1151,13 @@ share/gtk-doc/html/libgimp/libgimp-gimpgrid.html
 share/gtk-doc/html/libgimp/libgimp-gimpguides.html
 share/gtk-doc/html/libgimp/libgimp-gimphelp.html
 share/gtk-doc/html/libgimp/libgimp-gimpimage.html
+share/gtk-doc/html/libgimp/libgimp-gimpimageselect.html
+share/gtk-doc/html/libgimp/libgimp-gimpitem.html
+share/gtk-doc/html/libgimp/libgimp-gimpitemtransform.html
 share/gtk-doc/html/libgimp/libgimp-gimplayer.html
 share/gtk-doc/html/libgimp/libgimp-gimpmenu.html
 share/gtk-doc/html/libgimp/libgimp-gimpmessage.html
+share/gtk-doc/html/libgimp/libgimp-gimppainttools.html
 share/gtk-doc/html/libgimp/libgimp-gimppalette.html
 share/gtk-doc/html/libgimp/libgimp-gimppalettemenu.html
 share/gtk-doc/html/libgimp/libgimp-gimppalettes.html
@@ -1058,14 +1172,14 @@ share/gtk-doc/html/libgimp/libgimp-gimppixelfetcher.html
 share/gtk-doc/html/libgimp/libgimp-gimppixelrgn.html
 share/gtk-doc/html/libgimp/libgimp-gimpplugin.html
 share/gtk-doc/html/libgimp/libgimp-gimpproceduraldb.html
-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-gimpselectiontools.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
+share/gtk-doc/html/libgimp/libgimp-gimptransformtools.html
 share/gtk-doc/html/libgimp/libgimp-gimpui.html
 share/gtk-doc/html/libgimp/libgimp-gimpundo.html
 share/gtk-doc/html/libgimp/libgimp-gimpvectors.html
@@ -1074,6 +1188,7 @@ 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-new-in-2-8.html
 share/gtk-doc/html/libgimp/libgimp-index.html
 share/gtk-doc/html/libgimp/libgimp-selectors.html
 share/gtk-doc/html/libgimp/libgimp.devhelp2
@@ -1107,6 +1222,7 @@ 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-new-in-2-8.html
 share/gtk-doc/html/libgimpbase/libgimpbase-index.html
 share/gtk-doc/html/libgimpbase/libgimpbase.devhelp2
 share/gtk-doc/html/libgimpbase/libgimpbase.html
@@ -1120,6 +1236,7 @@ share/gtk-doc/html/libgimpcolor/left.png
 share/gtk-doc/html/libgimpcolor/libgimpcolor-GimpAdaptiveSupersample.html
 share/gtk-doc/html/libgimpcolor/libgimpcolor-GimpBilinear.html
 share/gtk-doc/html/libgimpcolor/libgimpcolor-GimpCMYK.html
+share/gtk-doc/html/libgimpcolor/libgimpcolor-GimpCairoColor.html
 share/gtk-doc/html/libgimpcolor/libgimpcolor-GimpColorManaged.html
 share/gtk-doc/html/libgimpcolor/libgimpcolor-GimpColorSpace.html
 share/gtk-doc/html/libgimpcolor/libgimpcolor-GimpHSV.html
@@ -1128,6 +1245,7 @@ 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-new-in-2-8.html
 share/gtk-doc/html/libgimpcolor/libgimpcolor-index.html
 share/gtk-doc/html/libgimpcolor/libgimpcolor.devhelp2
 share/gtk-doc/html/libgimpcolor/libgimpcolor.html
@@ -1139,19 +1257,20 @@ share/gtk-doc/html/libgimpconfig/home.png
 share/gtk-doc/html/libgimpconfig/index.html
 share/gtk-doc/html/libgimpconfig/index.sgml
 share/gtk-doc/html/libgimpconfig/left.png
+share/gtk-doc/html/libgimpconfig/libgimpconfig-GimpConfig-deserialize.html
+share/gtk-doc/html/libgimpconfig/libgimpconfig-GimpConfig-params.html
+share/gtk-doc/html/libgimpconfig/libgimpconfig-GimpConfig-path.html
+share/gtk-doc/html/libgimpconfig/libgimpconfig-GimpConfig-serialize.html
+share/gtk-doc/html/libgimpconfig/libgimpconfig-GimpConfig-utils.html
 share/gtk-doc/html/libgimpconfig/libgimpconfig-GimpConfig.html
 share/gtk-doc/html/libgimpconfig/libgimpconfig-GimpConfigError.html
 share/gtk-doc/html/libgimpconfig/libgimpconfig-GimpConfigWriter.html
 share/gtk-doc/html/libgimpconfig/libgimpconfig-GimpScanner.html
-share/gtk-doc/html/libgimpconfig/libgimpconfig-gimpconfig-deserialize.html
-share/gtk-doc/html/libgimpconfig/libgimpconfig-gimpconfig-params.html
-share/gtk-doc/html/libgimpconfig/libgimpconfig-gimpconfig-path.html
-share/gtk-doc/html/libgimpconfig/libgimpconfig-gimpconfig-serialize.html
-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-new-in-2-8.html
 share/gtk-doc/html/libgimpconfig/libgimpconfig-index.html
 share/gtk-doc/html/libgimpconfig/libgimpconfig.devhelp2
 share/gtk-doc/html/libgimpconfig/libgimpconfig.html
@@ -1176,16 +1295,17 @@ share/gtk-doc/html/libgimpmath/libgimpmath.html
 share/gtk-doc/html/libgimpmath/right.png
 share/gtk-doc/html/libgimpmath/style.css
 share/gtk-doc/html/libgimpmath/up.png
+share/gtk-doc/html/libgimpmodule/GimpModule.html
+share/gtk-doc/html/libgimpmodule/GimpModuleDB.html
 share/gtk-doc/html/libgimpmodule/home.png
 share/gtk-doc/html/libgimpmodule/index.html
 share/gtk-doc/html/libgimpmodule/index.sgml
 share/gtk-doc/html/libgimpmodule/left.png
-share/gtk-doc/html/libgimpmodule/libgimpmodule-gimpmodule.html
-share/gtk-doc/html/libgimpmodule/libgimpmodule-gimpmoduledb.html
 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-new-in-2-8.html
 share/gtk-doc/html/libgimpmodule/libgimpmodule-index.html
 share/gtk-doc/html/libgimpmodule/libgimpmodule.devhelp2
 share/gtk-doc/html/libgimpmodule/libgimpmodule.html
@@ -1197,9 +1317,9 @@ share/gtk-doc/html/libgimpthumb/home.png
 share/gtk-doc/html/libgimpthumb/index.html
 share/gtk-doc/html/libgimpthumb/index.sgml
 share/gtk-doc/html/libgimpthumb/left.png
-share/gtk-doc/html/libgimpthumb/libgimpthumb-gimpthumb-enums.html
-share/gtk-doc/html/libgimpthumb/libgimpthumb-gimpthumb-error.html
-share/gtk-doc/html/libgimpthumb/libgimpthumb-gimpthumb-utils.html
+share/gtk-doc/html/libgimpthumb/libgimpthumb-GimpThumb-enums.html
+share/gtk-doc/html/libgimpthumb/libgimpthumb-GimpThumb-error.html
+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
@@ -1250,7 +1370,9 @@ 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
+share/gtk-doc/html/libgimpwidgets/GimpUnitComboBox.html
 share/gtk-doc/html/libgimpwidgets/GimpUnitMenu.html
+share/gtk-doc/html/libgimpwidgets/GimpUnitStore.html
 share/gtk-doc/html/libgimpwidgets/GimpZoomModel.html
 share/gtk-doc/html/libgimpwidgets/gimp-browser.png
 share/gtk-doc/html/libgimpwidgets/gimp-button.png
@@ -1285,6 +1407,7 @@ 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
+share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpOldWidgets.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpPropWidgets.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpQueryBox.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-GimpStock.html
@@ -1295,12 +1418,12 @@ share/gtk-doc/html/libgimpwidgets/libgimpwidgets-colorselector.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-controller.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-deprecated.html
 share/gtk-doc/html/libgimpwidgets/libgimpwidgets-gallery.html
-share/gtk-doc/html/libgimpwidgets/libgimpwidgets-gimpoldwidgets.html
 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-new-in-2-8.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
@@ -1384,6 +1507,8 @@ share/gtk-doc/html/libgimpwidgets/stock-display-filter-lcms-24.png
 share/gtk-doc/html/libgimpwidgets/stock-display-filter-proof-16.png
 share/gtk-doc/html/libgimpwidgets/stock-display-filter-proof-24.png
 share/gtk-doc/html/libgimpwidgets/stock-duplicate-16.png
+share/gtk-doc/html/libgimpwidgets/stock-dynamics-16.png
+share/gtk-doc/html/libgimpwidgets/stock-dynamics-22.png
 share/gtk-doc/html/libgimpwidgets/stock-edit-16.png
 share/gtk-doc/html/libgimpwidgets/stock-error-64.png
 share/gtk-doc/html/libgimpwidgets/stock-eye-12.png
@@ -1433,6 +1558,8 @@ share/gtk-doc/html/libgimpwidgets/stock-images-24.png
 share/gtk-doc/html/libgimpwidgets/stock-info-16.png
 share/gtk-doc/html/libgimpwidgets/stock-info-24.png
 share/gtk-doc/html/libgimpwidgets/stock-info-64.png
+share/gtk-doc/html/libgimpwidgets/stock-input-device-16.png
+share/gtk-doc/html/libgimpwidgets/stock-input-device-22.png
 share/gtk-doc/html/libgimpwidgets/stock-invert-16.png
 share/gtk-doc/html/libgimpwidgets/stock-join-bevel-16.png
 share/gtk-doc/html/libgimpwidgets/stock-join-miter-16.png
@@ -1527,6 +1654,8 @@ share/gtk-doc/html/libgimpwidgets/stock-tool-bucket-fill-16.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-bucket-fill-22.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-by-color-select-16.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-by-color-select-22.png
+share/gtk-doc/html/libgimpwidgets/stock-tool-cage-16.png
+share/gtk-doc/html/libgimpwidgets/stock-tool-cage-22.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-clone-16.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-clone-22.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-color-balance-16.png
@@ -1539,6 +1668,8 @@ share/gtk-doc/html/libgimpwidgets/stock-tool-crop-16.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-crop-22.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-curves-16.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-curves-22.png
+share/gtk-doc/html/libgimpwidgets/stock-tool-desaturate-16.png
+share/gtk-doc/html/libgimpwidgets/stock-tool-desaturate-22.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-dodge-16.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-dodge-22.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-ellipse-select-16.png
@@ -1581,6 +1712,8 @@ share/gtk-doc/html/libgimpwidgets/stock-tool-perspective-clone-16.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-perspective-clone-22.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-posterize-16.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-posterize-22.png
+share/gtk-doc/html/libgimpwidgets/stock-tool-preset-16.png
+share/gtk-doc/html/libgimpwidgets/stock-tool-preset-22.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-rect-select-16.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-rect-select-22.png
 share/gtk-doc/html/libgimpwidgets/stock-tool-rotate-16.png
@@ -1627,10 +1760,9 @@ share/gtk-doc/html/libgimpwidgets/up.png
 share/icons/hicolor/16x16/apps/gimp.png
 share/icons/hicolor/22x22/apps/gimp.png
 share/icons/hicolor/24x24/apps/gimp.png
+share/icons/hicolor/256x256/apps/gimp.png
 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
@@ -1638,9 +1770,6 @@ 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/ast/LC_MESSAGES/gimp20-libgimp.mo
-share/locale/ast/LC_MESSAGES/gimp20-script-fu.mo
-share/locale/ast/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/ast/LC_MESSAGES/gimp20.mo
 share/locale/az/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/az/LC_MESSAGES/gimp20-python.mo
@@ -1658,6 +1787,12 @@ share/locale/bg/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/bg/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/bg/LC_MESSAGES/gimp20-tips.mo
 share/locale/bg/LC_MESSAGES/gimp20.mo
+share/locale/br/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/br/LC_MESSAGES/gimp20-python.mo
+share/locale/br/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/br/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/br/LC_MESSAGES/gimp20-tips.mo
+share/locale/br/LC_MESSAGES/gimp20.mo
 share/locale/ca/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ca/LC_MESSAGES/gimp20-python.mo
 share/locale/ca/LC_MESSAGES/gimp20-script-fu.mo
@@ -1676,6 +1811,7 @@ share/locale/cs/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/cs/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/cs/LC_MESSAGES/gimp20-tips.mo
 share/locale/cs/LC_MESSAGES/gimp20.mo
+share/locale/csb/LC_MESSAGES/gimp20.mo
 share/locale/da/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/da/LC_MESSAGES/gimp20-python.mo
 share/locale/da/LC_MESSAGES/gimp20-script-fu.mo
@@ -1790,8 +1926,10 @@ 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
@@ -1847,12 +1985,6 @@ 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/mr/LC_MESSAGES/gimp20-libgimp.mo
-share/locale/mr/LC_MESSAGES/gimp20-python.mo
-share/locale/mr/LC_MESSAGES/gimp20-script-fu.mo
-share/locale/mr/LC_MESSAGES/gimp20-std-plug-ins.mo
-share/locale/mr/LC_MESSAGES/gimp20-tips.mo
-share/locale/mr/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
@@ -1895,9 +2027,6 @@ 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.mo
-share/locale/or/LC_MESSAGES/gimp20-python.mo
-share/locale/or/LC_MESSAGES/gimp20-std-plug-ins.mo
-share/locale/or/LC_MESSAGES/gimp20.mo
 share/locale/pa/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/pa/LC_MESSAGES/gimp20-python.mo
 share/locale/pa/LC_MESSAGES/gimp20-script-fu.mo
@@ -1971,7 +2100,15 @@ 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-libgimp.mo
+share/locale/ta/LC_MESSAGES/gimp20-python.mo
+share/locale/ta/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/ta/LC_MESSAGES/gimp20-tips.mo
 share/locale/ta/LC_MESSAGES/gimp20.mo
+share/locale/te/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/te/LC_MESSAGES/gimp20-python.mo
+share/locale/te/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/te/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
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 07386a230f2..1b28d919fe8 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.66 2012/05/04 16:17:38 joerg Exp $
+$NetBSD: distinfo,v 1.67 2012/05/07 08:40:08 adam Exp $
 
-SHA1 (gimp-2.6.12.tar.bz2) = 82964e3d4eb003239f3443a1bccac53f5d780e15
-RMD160 (gimp-2.6.12.tar.bz2) = 3c7ae863474dea670eaeb914e333ba6bf50c7fcc
-Size (gimp-2.6.12.tar.bz2) = 16745411 bytes
-SHA1 (patch-aa) = 91b8f1aa493ab9991ec619268143db748bb6bb9d
-SHA1 (patch-ab) = 99a09ad2b0513d28d321b6a698bba3dc6614f2bc
-SHA1 (patch-ac) = 42f44b45640bdde305c1e52b95ee633360ebccb8
-SHA1 (patch-ad) = 4e2ce2f7d8729fb760eac1bad89cfe09fef499b0
-SHA1 (patch-app_Makefile.in) = 356d97e414d1a8b6c0e23b03cc1338d4c0bae028
-SHA1 (patch-app_config_Makefile.in) = 5b7d56eb83aa0e88ccac712256028cd1b7f878e4
-SHA1 (patch-devel-docs_app_Makefile.in) = 931ccc245b7d70962d4fa43f30cbd5ddd8773d3b
-SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = 88c99c5dc97a8a5a8708eed8cbb1d4bb6be1abe0
+SHA1 (gimp-2.8.0.tar.bz2) = 3b20d3dd10d971acbbc9345eb5cb93378c398ebc
+RMD160 (gimp-2.8.0.tar.bz2) = aeff9275461d0171e22b2281aae28ca4fb4bc63f
+Size (gimp-2.8.0.tar.bz2) = 20142440 bytes
+SHA1 (patch-aa) = 8107200cc3007e6ae4b9064ee05e5c9a00cca2ef
+SHA1 (patch-ab) = 56affce3f484df5e57a646eb5c18d273d1298e7c
+SHA1 (patch-ad) = 7863678d59ccf54e2ce61a4ac4b883fb9eb5fb82
+SHA1 (patch-app_Makefile.in) = efbd9e592cdbc154e5a6402279c7d54f3946c65c
+SHA1 (patch-app_base_base-utils.c) = 18dfa09c1d63530ff79cd4c3515d9f1077182d64
+SHA1 (patch-app_config_Makefile.in) = a2fcebd994831fbe0f911efb84c1fecdf2e59198
+SHA1 (patch-devel-docs_app_Makefile.in) = 1eb97f779d5151b9e89b4ae47afb44d1bb3b6a48
+SHA1 (patch-plug-ins_script-fu_script-fu-server.c) = 4932d82711c8010cf7b1ff5bfb12031946273c2b
diff --git a/graphics/gimp/patches/patch-aa b/graphics/gimp/patches/patch-aa
index ebbc22091a9..2d700b91146 100644
--- a/graphics/gimp/patches/patch-aa
+++ b/graphics/gimp/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.27 2012/02/04 21:10:44 adam Exp $
+$NetBSD: patch-aa,v 1.28 2012/05/07 08:40:08 adam Exp $
 
 --- etc/Makefile.in.orig	2010-06-21 20:00:58.000000000 +0000
 +++ etc/Makefile.in
-@@ -344,7 +344,7 @@ gimpdatadir = @gimpdatadir@
+@@ -398,7 +398,7 @@ gimpdatadir = @gimpdatadir@
  gimpdir = @gimpdir@
  gimplocaledir = @gimplocaledir@
  gimpplugindir = @gimpplugindir@
diff --git a/graphics/gimp/patches/patch-ab b/graphics/gimp/patches/patch-ab
index eeca6fabebb..8506c9f6a93 100644
--- a/graphics/gimp/patches/patch-ab
+++ b/graphics/gimp/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.33 2012/02/04 21:10:44 adam Exp $
+$NetBSD: patch-ab,v 1.34 2012/05/07 08:40:08 adam Exp $
 
---- configure.orig	2012-01-31 14:25:33.000000000 +0000
+--- configure.orig	2012-05-02 08:56:45.000000000 +0000
 +++ configure
-@@ -18549,13 +18549,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
+@@ -19094,13 +19094,13 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&
    gimp_ok=yes
  fi
  rm -f conftest*
@@ -17,7 +17,16 @@ $NetBSD: patch-ab,v 1.33 2012/02/04 21:10:44 adam Exp $
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gimp_ok" >&5
  $as_echo "$gimp_ok" >&6; }
    if test "x$gimp_ok" = xno; then
-@@ -22231,7 +22231,7 @@ fi
+@@ -22871,7 +22871,7 @@ fi
+     have_xvfb_run="no (not found)"
+   fi
+ fi
+- if test "x$have_xvfb_run" == "xyes"; then
++ if test "x$have_xvfb_run" = "xyes"; then
+   HAVE_XVFB_RUN_TRUE=
+   HAVE_XVFB_RUN_FALSE='#'
+ else
+@@ -23294,7 +23294,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
deleted file mode 100644
index f26f8de7b5e..00000000000
--- a/graphics/gimp/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.18 2010/07/04 05:36:49 adam Exp $
-
---- plug-ins/twain/Makefile.in.orig	2010-06-21 20:01:06.000000000 +0000
-+++ plug-ins/twain/Makefile.in
-@@ -69,7 +69,7 @@ twain_DEPENDENCIES = $(libgimp) $(libgim
- 	$(am__DEPENDENCIES_1)
- twain_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(twain_LDFLAGS) \
--	$(LDFLAGS) -o $@
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
diff --git a/graphics/gimp/patches/patch-ad b/graphics/gimp/patches/patch-ad
index 947016f0cf0..4abc7327990 100644
--- a/graphics/gimp/patches/patch-ad
+++ b/graphics/gimp/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.11 2010/10/25 19:06:11 adam Exp $
+$NetBSD: patch-ad,v 1.12 2012/05/07 08:40:08 adam Exp $
 
 Disable API deprecated in Mac OS X v10.5 or not available for 64-bit.
 
 --- plug-ins/twain/tw_mac.c.orig	2010-10-25 18:48:00.000000000 +0000
 +++ plug-ins/twain/tw_mac.c
-@@ -193,10 +193,12 @@ static void twainSetupMacUI()
+@@ -192,10 +192,12 @@ static void twainSetupMacUI()
  
    /* Voodoo magic fix inspired by java_swt launcher */
    /* Without this the icon setting doesn't work about half the time. */
diff --git a/graphics/gimp/patches/patch-app_Makefile.in b/graphics/gimp/patches/patch-app_Makefile.in
index 502c81b7b51..c35ae3ddc3b 100644
--- a/graphics/gimp/patches/patch-app_Makefile.in
+++ b/graphics/gimp/patches/patch-app_Makefile.in
@@ -1,23 +1,48 @@
-$NetBSD: patch-app_Makefile.in,v 1.1 2012/05/04 16:17:39 joerg Exp $
+$NetBSD: patch-app_Makefile.in,v 1.2 2012/05/07 08:40:08 adam Exp $
 
---- app/Makefile.in.orig	2012-04-27 17:59:44.000000000 +0000
+--- app/Makefile.in.orig	2012-05-02 08:56:34.000000000 +0000
 +++ app/Makefile.in
-@@ -556,12 +556,12 @@ INCLUDES = \
- AM_LDFLAGS = \
- 	$(munix)					\
- 	$(CARBON_LDFLAGS)				\
--	-u $(SYMPREFIX)xcf_init				\
+@@ -638,33 +638,33 @@ INCLUDES = \
+ 
+ # FIXME: core should not depend on xcf
+ workaround_that_core_depends_on_xcf = \
+-	-u $(SYMPREFIX)xcf_init
++	-Wl,-u,$(SYMPREFIX)xcf_init
+ 
+ 
+ # FIXME: core should not depend on pdb
+ workaround_that_core_depends_on_pdb = \
 -	-u $(SYMPREFIX)internal_procs_init		\
--	-u $(SYMPREFIX)gimp_coords_mix			\
--	-u $(SYMPREFIX)gimp_curve_map_pixels		\
--	-u $(SYMPREFIX)gimp_image_map_config_get_type	\
 -	-u $(SYMPREFIX)gimp_plug_in_manager_restore
-+	-Wl,-u,$(SYMPREFIX)xcf_init				\
 +	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
-+	-Wl,-u,$(SYMPREFIX)gimp_coords_mix			\
-+	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels		\
-+	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type	\
 +	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
  
- gimp_2_6_LDFLAGS = $(AM_LDFLAGS) $(win32_ldflags) 
- gimp_2_6_LDADD = \
+ 
+ # FIXME: plug-in should not depend on pdb
+ workaround_that_plug_in_depends_on_pdb = \
+-	-u $(SYMPREFIX)gimp_pdb_compat_param_spec
++	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec
+ 
+ 
+ # FIXME: file should not depend on plug-in
+ workaround_that_file_depends_on_plug_in = \
+-	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
+-	-u $(SYMPREFIX)gimp_image_map_config_get_type
++	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
++	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
+ 
+ 
+ # core, vectors and gegl are on the same architectural layer, prevent
+ # the linker from panicing
+ calm_down_linker = \
+-	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_curve_map_pixels
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
+ 
+ AM_LDFLAGS = \
+ 	$(munix)					\
diff --git a/graphics/gimp/patches/patch-app_base_base-utils.c b/graphics/gimp/patches/patch-app_base_base-utils.c
new file mode 100644
index 00000000000..da5aaf764a9
--- /dev/null
+++ b/graphics/gimp/patches/patch-app_base_base-utils.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-app_base_base-utils.c,v 1.1 2012/05/07 08:40:08 adam Exp $
+
+--- app/base/base-utils.c.orig	2012-05-07 07:50:39.000000000 +0000
++++ app/base/base-utils.c
+@@ -33,8 +33,10 @@
+ /* For get_backtrace() */
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef __linux__
+ #include <execinfo.h>
+ #endif
++#endif
+ 
+ #include "base-utils.h"
+ 
+@@ -112,7 +114,7 @@ get_physical_memory_size (void)
+ char *
+ get_backtrace (void)
+ {
+-#ifdef G_OS_UNIX
++#ifdef __linux__
+   void     *functions[MAX_FUNC];
+   char    **function_names;
+   int       n_functions;
diff --git a/graphics/gimp/patches/patch-app_config_Makefile.in b/graphics/gimp/patches/patch-app_config_Makefile.in
index eefc5e33d39..21a81d79b67 100644
--- a/graphics/gimp/patches/patch-app_config_Makefile.in
+++ b/graphics/gimp/patches/patch-app_config_Makefile.in
@@ -1,21 +1,29 @@
-$NetBSD: patch-app_config_Makefile.in,v 1.1 2012/05/04 16:17:39 joerg Exp $
+$NetBSD: patch-app_config_Makefile.in,v 1.2 2012/05/07 08:40:08 adam Exp $
 
---- app/config/Makefile.in.orig	2012-04-27 17:59:47.000000000 +0000
+--- app/config/Makefile.in.orig	2012-05-02 08:56:34.000000000 +0000
 +++ app/config/Makefile.in
-@@ -444,11 +444,11 @@ libappconfig_a_SOURCES = \
- EXTRA_DIST = makefile.msc
- test_config_DEPENDENCIES = $(gimpconfig_libs)
+@@ -522,15 +522,15 @@ test_config_DEPENDENCIES = $(gimpconfig_
+ # We need this due to circular dependencies, see more detailed
+ # comments about it in app/Makefile.am
  test_config_LDFLAGS = \
 -	-u $(SYMPREFIX)xcf_init				\
+-	-u $(SYMPREFIX)gimp_pdb_new			\
 -	-u $(SYMPREFIX)internal_procs_init		\
--	-u $(SYMPREFIX)gimp_coords_mix			\
 -	-u $(SYMPREFIX)gimp_plug_in_manager_restore	\
+-	-u $(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
+-	-u $(SYMPREFIX)gimp_vectors_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
+-	-u $(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
 -	-u $(SYMPREFIX)gimp_image_map_config_get_type
 +	-Wl,-u,$(SYMPREFIX)xcf_init				\
++	-Wl,-u,$(SYMPREFIX)gimp_pdb_new			\
 +	-Wl,-u,$(SYMPREFIX)internal_procs_init		\
-+	-Wl,-u,$(SYMPREFIX)gimp_coords_mix			\
 +	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore	\
++	-Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type	\
++	-Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type	\
 +	-Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
  
  test_config_LDADD = \
- 	../widgets/widgets-enums.o		\
+ 	../xcf/libappxcf.a			\
diff --git a/graphics/gimp/patches/patch-devel-docs_app_Makefile.in b/graphics/gimp/patches/patch-devel-docs_app_Makefile.in
index 855f9afe720..2d02d2bcd2b 100644
--- a/graphics/gimp/patches/patch-devel-docs_app_Makefile.in
+++ b/graphics/gimp/patches/patch-devel-docs_app_Makefile.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-devel-docs_app_Makefile.in,v 1.1 2012/05/04 16:17:39 joerg Exp $
+$NetBSD: patch-devel-docs_app_Makefile.in,v 1.2 2012/05/07 08:40:08 adam Exp $
 
 --- devel-docs/app/Makefile.in.orig	2012-04-27 17:59:56.000000000 +0000
 +++ devel-docs/app/Makefile.in
-@@ -423,10 +423,10 @@ GTKDOC_CFLAGS = \
+@@ -473,10 +473,10 @@ GTKDOC_CFLAGS = \
  	-UGTK_DISABLE_SINGLE_INCLUDES
  
  GTKDOC_LIBS = \
diff --git a/graphics/gimp/patches/patch-plug-ins_script-fu_script-fu-server.c b/graphics/gimp/patches/patch-plug-ins_script-fu_script-fu-server.c
index ff3ad1c8105..7750c483902 100644
--- a/graphics/gimp/patches/patch-plug-ins_script-fu_script-fu-server.c
+++ b/graphics/gimp/patches/patch-plug-ins_script-fu_script-fu-server.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-plug-ins_script-fu_script-fu-server.c,v 1.1 2012/02/04 21:10:45 adam Exp $
+$NetBSD: patch-plug-ins_script-fu_script-fu-server.c,v 1.2 2012/05/07 08:40:08 adam Exp $
 
 AI_ADDRCONFIG is not defined on some platforms.
 
 --- plug-ins/script-fu/script-fu-server.c.orig	2012-02-04 18:42:45.000000000 +0000
 +++ plug-ins/script-fu/script-fu-server.c
-@@ -446,7 +446,11 @@ server_start (gint         port,
+@@ -456,7 +456,11 @@ server_start (gint         port,
    const gchar     *progress;
  
    memset (&hints, 0, sizeof (hints));