Changed 0.20.2:

Overall stability has improved.
User interface is more clear regarding colourmanaging.
Softproofing is introduced.
The gutenprint plug-in uses the proofing profile as default separation target.
OpenEXR <-> ICC colour space information conversation
The expose item is moved from <imagemenu>-->Color-->Expose Image
to <imagemenu>-->View-->Expose. It is now a per window setting and
only available for 32-bit floats.
Many bugs where fixed.

17 files changed, 541 insertions, 1860 deletions

diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile
index 9102768e65c..4750afc96fb 100644
--- a/graphics/cinepaint/Makefile
+++ b/graphics/cinepaint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2005/07/04 19:57:01 drochner Exp $
+# $NetBSD: Makefile,v 1.8 2006/01/31 21:06:56 adam Exp $
 
-DISTNAME=	cinepaint-0.19-1
-PKGNAME=	cinepaint-0.19.1
+DISTNAME=	cinepaint-0.20-2
+PKGNAME=	cinepaint-0.20.2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cinepaint/}
 
@@ -11,15 +11,17 @@ COMMENT=	Motion picture painting and image retouching program
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
+USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
+PKGCONFIG_OVERRIDE=	cinepaint-gtk.pc.in
+
 BUILDLINK_DEPENDS.lcms+=	lcms>=1.13 # needs _cmsLCMScolorSpace
 .include "../../graphics/lcms/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
-.include "../../x11/fltk/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/cinepaint/PLIST b/graphics/cinepaint/PLIST
index b132fa32f55..11c0eb5f48e 100644
--- a/graphics/cinepaint/PLIST
+++ b/graphics/cinepaint/PLIST
@@ -1,410 +1,539 @@
-@comment $NetBSD: PLIST,v 1.3 2005/07/04 19:57:01 drochner Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/01/31 21:06:56 adam Exp $
 bin/cinepaint
+bin/cinepaint-remote
 bin/cinepainttool
-lib/cinepaint/0.19-1/plug-ins/blur
-lib/cinepaint/0.19-1/plug-ins/bmp
-lib/cinepaint/0.19-1/plug-ins/cineon
-lib/cinepaint/0.19-1/plug-ins/compose
-lib/cinepaint/0.19-1/plug-ins/dbbrowser
-lib/cinepaint/0.19-1/plug-ins/decompose
-lib/cinepaint/0.19-1/plug-ins/dicom
-lib/cinepaint/0.19-1/plug-ins/edge
-lib/cinepaint/0.19-1/plug-ins/fits
-lib/cinepaint/0.19-1/plug-ins/gauss_rle
-lib/cinepaint/0.19-1/plug-ins/gbr
-lib/cinepaint/0.19-1/plug-ins/gifload
-lib/cinepaint/0.19-1/plug-ins/guash
-lib/cinepaint/0.19-1/plug-ins/hdr
-lib/cinepaint/0.19-1/plug-ins/iff
-lib/cinepaint/0.19-1/plug-ins/jpeg
-lib/cinepaint/0.19-1/plug-ins/mblur
-lib/cinepaint/0.19-1/plug-ins/noisify
-lib/cinepaint/0.19-1/plug-ins/openexr
-lib/cinepaint/0.19-1/plug-ins/pic
-lib/cinepaint/0.19-1/plug-ins/png
-lib/cinepaint/0.19-1/plug-ins/psd
-lib/cinepaint/0.19-1/plug-ins/psd_save
-lib/cinepaint/0.19-1/plug-ins/rawphoto
-lib/cinepaint/0.19-1/plug-ins/rotate
-lib/cinepaint/0.19-1/plug-ins/screenshot
-lib/cinepaint/0.19-1/plug-ins/sgi
-lib/cinepaint/0.19-1/plug-ins/sharpen
-lib/cinepaint/0.19-1/plug-ins/snoise
-lib/cinepaint/0.19-1/plug-ins/sobel
-lib/cinepaint/0.19-1/plug-ins/spread
-lib/cinepaint/0.19-1/plug-ins/tga
-lib/cinepaint/0.19-1/plug-ins/tiff
-lib/cinepaint/0.19-1/plug-ins/unsharp
-lib/cinepaint/0.19-1/plug-ins/xwd
+include/cinepaint/app/errors.h
+include/cinepaint/app/trace.h
+lib/cinepaint/0.20-2/plug-ins/blur
+lib/cinepaint/0.20-2/plug-ins/bmp
+lib/cinepaint/0.20-2/plug-ins/bracketing_to_hdr
+lib/cinepaint/0.20-2/plug-ins/cineon
+lib/cinepaint/0.20-2/plug-ins/collect
+lib/cinepaint/0.20-2/plug-ins/compose
+lib/cinepaint/0.20-2/plug-ins/dbbrowser
+lib/cinepaint/0.20-2/plug-ins/decompose
+lib/cinepaint/0.20-2/plug-ins/dicom
+lib/cinepaint/0.20-2/plug-ins/edge
+lib/cinepaint/0.20-2/plug-ins/fits
+lib/cinepaint/0.20-2/plug-ins/gauss_rle
+lib/cinepaint/0.20-2/plug-ins/gbr
+lib/cinepaint/0.20-2/plug-ins/gifload
+lib/cinepaint/0.20-2/plug-ins/guash
+lib/cinepaint/0.20-2/plug-ins/hdr
+lib/cinepaint/0.20-2/plug-ins/icc_examin
+lib/cinepaint/0.20-2/plug-ins/iff
+lib/cinepaint/0.20-2/plug-ins/jpeg
+lib/cinepaint/0.20-2/plug-ins/mblur
+lib/cinepaint/0.20-2/plug-ins/median
+lib/cinepaint/0.20-2/plug-ins/minimum
+lib/cinepaint/0.20-2/plug-ins/noisify
+lib/cinepaint/0.20-2/plug-ins/openexr
+lib/cinepaint/0.20-2/plug-ins/pic
+lib/cinepaint/0.20-2/plug-ins/png
+lib/cinepaint/0.20-2/plug-ins/pnm
+lib/cinepaint/0.20-2/plug-ins/psd
+lib/cinepaint/0.20-2/plug-ins/psd_save
+lib/cinepaint/0.20-2/plug-ins/rawphoto
+lib/cinepaint/0.20-2/plug-ins/rotate
+lib/cinepaint/0.20-2/plug-ins/screenshot
+lib/cinepaint/0.20-2/plug-ins/sgi
+lib/cinepaint/0.20-2/plug-ins/sharpen
+lib/cinepaint/0.20-2/plug-ins/snoise
+lib/cinepaint/0.20-2/plug-ins/sobel
+lib/cinepaint/0.20-2/plug-ins/spread
+lib/cinepaint/0.20-2/plug-ins/tga
+lib/cinepaint/0.20-2/plug-ins/tiff
+lib/cinepaint/0.20-2/plug-ins/unsharp
+lib/cinepaint/0.20-2/plug-ins/xwd
 lib/libcinepaint.la
+lib/pkgconfig/cinepaint-gtk.pc
 man/man1/cinepaint.1
 man/man1/cinepainttool.1
 share/aclocal/cinepaint.m4
-share/cinepaint/0.19-1/brushes/10x10square.gbr
-share/cinepaint/0.19-1/brushes/10x10square16.gbr
-share/cinepaint/0.19-1/brushes/10x10squareBlur.gbr
-share/cinepaint/0.19-1/brushes/10x10squareBlur16.gbr
-share/cinepaint/0.19-1/brushes/10x10squareBlurf16.gbr
-share/cinepaint/0.19-1/brushes/10x10squaref16.gbr
-share/cinepaint/0.19-1/brushes/11circle.gbr
-share/cinepaint/0.19-1/brushes/11circle16.gbr
-share/cinepaint/0.19-1/brushes/11circlef16.gbr
-share/cinepaint/0.19-1/brushes/11fcircle.gbr
-share/cinepaint/0.19-1/brushes/11fcirclef16.gbr
-share/cinepaint/0.19-1/brushes/13circle.gbr
-share/cinepaint/0.19-1/brushes/13circle16.gbr
-share/cinepaint/0.19-1/brushes/13circlef16.gbr
-share/cinepaint/0.19-1/brushes/13fcircle.gbr
-share/cinepaint/0.19-1/brushes/13fcirclef16.gbr
-share/cinepaint/0.19-1/brushes/15circle.gbr
-share/cinepaint/0.19-1/brushes/15circle16.gbr
-share/cinepaint/0.19-1/brushes/15circlef16.gbr
-share/cinepaint/0.19-1/brushes/15fcircle.gbr
-share/cinepaint/0.19-1/brushes/15fcirclef16.gbr
-share/cinepaint/0.19-1/brushes/17circle.gbr
-share/cinepaint/0.19-1/brushes/17circle16.gbr
-share/cinepaint/0.19-1/brushes/17circlef16.gbr
-share/cinepaint/0.19-1/brushes/17fcircle.gbr
-share/cinepaint/0.19-1/brushes/17fcirclef16.gbr
-share/cinepaint/0.19-1/brushes/19circle.gbr
-share/cinepaint/0.19-1/brushes/19circle16.gbr
-share/cinepaint/0.19-1/brushes/19circlef16.gbr
-share/cinepaint/0.19-1/brushes/19fcircle.gbr
-share/cinepaint/0.19-1/brushes/19fcirclef16.gbr
-share/cinepaint/0.19-1/brushes/1circle.gbr
-share/cinepaint/0.19-1/brushes/1circlef16.gbr
-share/cinepaint/0.19-1/brushes/20x20square.gbr
-share/cinepaint/0.19-1/brushes/20x20square16.gbr
-share/cinepaint/0.19-1/brushes/20x20squareBlur.gbr
-share/cinepaint/0.19-1/brushes/20x20squareBlur16.gbr
-share/cinepaint/0.19-1/brushes/20x20squareBlurf16.gbr
-share/cinepaint/0.19-1/brushes/20x20squaref16.gbr
-share/cinepaint/0.19-1/brushes/3circle.gbr
-share/cinepaint/0.19-1/brushes/3circle16.gbr
-share/cinepaint/0.19-1/brushes/3circlef16.gbr
-share/cinepaint/0.19-1/brushes/3fcircle.gbr
-share/cinepaint/0.19-1/brushes/3fcirclef16.gbr
-share/cinepaint/0.19-1/brushes/5circle.gbr
-share/cinepaint/0.19-1/brushes/5circle16.gbr
-share/cinepaint/0.19-1/brushes/5circlef16.gbr
-share/cinepaint/0.19-1/brushes/5fcircle.gbr
-share/cinepaint/0.19-1/brushes/5fcirclef16.gbr
-share/cinepaint/0.19-1/brushes/5x5square.gbr
-share/cinepaint/0.19-1/brushes/5x5square16.gbr
-share/cinepaint/0.19-1/brushes/5x5squareBlur.gbr
-share/cinepaint/0.19-1/brushes/5x5squareBlur16.gbr
-share/cinepaint/0.19-1/brushes/5x5squareBlurf16.gbr
-share/cinepaint/0.19-1/brushes/5x5squaref16.gbr
-share/cinepaint/0.19-1/brushes/7circle.gbr
-share/cinepaint/0.19-1/brushes/7circle16.gbr
-share/cinepaint/0.19-1/brushes/7circlef16.gbr
-share/cinepaint/0.19-1/brushes/7fcircle.gbr
-share/cinepaint/0.19-1/brushes/7fcirclef16.gbr
-share/cinepaint/0.19-1/brushes/9circle.gbr
-share/cinepaint/0.19-1/brushes/9circle16.gbr
-share/cinepaint/0.19-1/brushes/9circlef16.gbr
-share/cinepaint/0.19-1/brushes/9fcircle.gbr
-share/cinepaint/0.19-1/brushes/9fcirclef16.gbr
-share/cinepaint/0.19-1/brushes/DStar11.gbr
-share/cinepaint/0.19-1/brushes/DStar17.gbr
-share/cinepaint/0.19-1/brushes/DStar25.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal01.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal02.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal03.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal04.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal05.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal06.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal07.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal08.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal09.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal10.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal11.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal12.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal13.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal14.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal15.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal16.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal17.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal18.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal19.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal20.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal21.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal22.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal23.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal24.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal25.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal26.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal27.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal28.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal29.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal30.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal31.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal32.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal33.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal34.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal35.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal36.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal37.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal38.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal39.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal40.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal41.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal42.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal43.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal44.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal45.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal46.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal47.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal48.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal49.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal50.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal51.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal52.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal53.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal54.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal55.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal56.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal57.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal58.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal59.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal60.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal61.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal62.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal63.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal64.gbr
-share/cinepaint/0.19-1/brushes/NS1-Charcoal65.gbr
-share/cinepaint/0.19-1/brushes/SketchBrush-16.gih
-share/cinepaint/0.19-1/brushes/SketchBrush-32.gih
-share/cinepaint/0.19-1/brushes/SketchBrush-64.gih
-share/cinepaint/0.19-1/brushes/callig1.gbr
-share/cinepaint/0.19-1/brushes/callig116.gbr
-share/cinepaint/0.19-1/brushes/callig1f16.gbr
-share/cinepaint/0.19-1/brushes/callig2.gbr
-share/cinepaint/0.19-1/brushes/callig216.gbr
-share/cinepaint/0.19-1/brushes/callig2f16.gbr
-share/cinepaint/0.19-1/brushes/callig3.gbr
-share/cinepaint/0.19-1/brushes/callig316.gbr
-share/cinepaint/0.19-1/brushes/callig3f16.gbr
-share/cinepaint/0.19-1/brushes/callig4.gbr
-share/cinepaint/0.19-1/brushes/callig416.gbr
-share/cinepaint/0.19-1/brushes/callig4f16.gbr
-share/cinepaint/0.19-1/brushes/confetti.gbr
-share/cinepaint/0.19-1/brushes/confetti.gih
-share/cinepaint/0.19-1/brushes/confetti16.gbr
-share/cinepaint/0.19-1/brushes/confettif16.gbr
-share/cinepaint/0.19-1/brushes/dunes.gbr
-share/cinepaint/0.19-1/brushes/dunes16.gbr
-share/cinepaint/0.19-1/brushes/dunesf16.gbr
-share/cinepaint/0.19-1/brushes/feltpen.gih
-share/cinepaint/0.19-1/brushes/galaxy.gbr
-share/cinepaint/0.19-1/brushes/galaxy16.gbr
-share/cinepaint/0.19-1/brushes/galaxy_big.gbr
-share/cinepaint/0.19-1/brushes/galaxy_big16.gbr
-share/cinepaint/0.19-1/brushes/galaxy_bigf16.gbr
-share/cinepaint/0.19-1/brushes/galaxy_small.gbr
-share/cinepaint/0.19-1/brushes/galaxy_small16.gbr
-share/cinepaint/0.19-1/brushes/galaxy_smallf16.gbr
-share/cinepaint/0.19-1/brushes/galaxyf16.gbr
-share/cinepaint/0.19-1/brushes/hsparks.gih
-share/cinepaint/0.19-1/brushes/pepper.gbr
-share/cinepaint/0.19-1/brushes/pixel.gbr
-share/cinepaint/0.19-1/brushes/pixel16.gbr
-share/cinepaint/0.19-1/brushes/pixelf16.gbr
-share/cinepaint/0.19-1/brushes/thegimp.gbr
-share/cinepaint/0.19-1/brushes/thegimp16.gbr
-share/cinepaint/0.19-1/brushes/thegimpf16.gbr
-share/cinepaint/0.19-1/brushes/vine.gih
-share/cinepaint/0.19-1/brushes/xcf.gbr
-share/cinepaint/0.19-1/brushes/xcf16.gbr
-share/cinepaint/0.19-1/brushes/xcff16.gbr
-share/cinepaint/0.19-1/gimprc
-share/cinepaint/0.19-1/gimprc_user
-share/cinepaint/0.19-1/gradients/Abstract_1
-share/cinepaint/0.19-1/gradients/Abstract_2
-share/cinepaint/0.19-1/gradients/Abstract_3
-share/cinepaint/0.19-1/gradients/Aneurism
-share/cinepaint/0.19-1/gradients/Blinds
-share/cinepaint/0.19-1/gradients/Blue_Green
-share/cinepaint/0.19-1/gradients/Browns
-share/cinepaint/0.19-1/gradients/Brushed_Aluminium
-share/cinepaint/0.19-1/gradients/Burning_Paper
-share/cinepaint/0.19-1/gradients/Burning_Transparency
-share/cinepaint/0.19-1/gradients/CD
-share/cinepaint/0.19-1/gradients/CD_Half
-share/cinepaint/0.19-1/gradients/Caribbean_Blues
-share/cinepaint/0.19-1/gradients/Coffee
-share/cinepaint/0.19-1/gradients/Cold_Steel
-share/cinepaint/0.19-1/gradients/Cold_Steel_2
-share/cinepaint/0.19-1/gradients/Crown_molding
-share/cinepaint/0.19-1/gradients/Danish_flag
-share/cinepaint/0.19-1/gradients/Dark_1
-share/cinepaint/0.19-1/gradients/Deep_Sea
-share/cinepaint/0.19-1/gradients/Default
-share/cinepaint/0.19-1/gradients/Flare_Glow_Angular_1
-share/cinepaint/0.19-1/gradients/Flare_Glow_Radial_1
-share/cinepaint/0.19-1/gradients/Flare_Glow_Radial_2
-share/cinepaint/0.19-1/gradients/Flare_Glow_Radial_3
-share/cinepaint/0.19-1/gradients/Flare_Glow_Radial_4
-share/cinepaint/0.19-1/gradients/Flare_Radial_101
-share/cinepaint/0.19-1/gradients/Flare_Radial_102
-share/cinepaint/0.19-1/gradients/Flare_Radial_103
-share/cinepaint/0.19-1/gradients/Flare_Rays_Radial_1
-share/cinepaint/0.19-1/gradients/Flare_Rays_Radial_2
-share/cinepaint/0.19-1/gradients/Flare_Rays_Size_1
-share/cinepaint/0.19-1/gradients/Flare_Sizefac_101
-share/cinepaint/0.19-1/gradients/Four_bars
-share/cinepaint/0.19-1/gradients/French_flag
-share/cinepaint/0.19-1/gradients/French_flag_smooth
-share/cinepaint/0.19-1/gradients/Full_saturation_spectrum_CCW
-share/cinepaint/0.19-1/gradients/Full_saturation_spectrum_CW
-share/cinepaint/0.19-1/gradients/German_flag
-share/cinepaint/0.19-1/gradients/German_flag_smooth
-share/cinepaint/0.19-1/gradients/Golden
-share/cinepaint/0.19-1/gradients/Greens
-share/cinepaint/0.19-1/gradients/Horizon_1
-share/cinepaint/0.19-1/gradients/Horizon_2
-share/cinepaint/0.19-1/gradients/Incandescent
-share/cinepaint/0.19-1/gradients/Land_1
-share/cinepaint/0.19-1/gradients/Land_and_Sea
-share/cinepaint/0.19-1/gradients/Metallic_Something
-share/cinepaint/0.19-1/gradients/Mexican_flag
-share/cinepaint/0.19-1/gradients/Mexican_flag_smooth
-share/cinepaint/0.19-1/gradients/Nauseating_Headache
-share/cinepaint/0.19-1/gradients/Neon_Cyan
-share/cinepaint/0.19-1/gradients/Neon_Green
-share/cinepaint/0.19-1/gradients/Neon_Yellow
-share/cinepaint/0.19-1/gradients/Pastel_Rainbow
-share/cinepaint/0.19-1/gradients/Pastels
-share/cinepaint/0.19-1/gradients/Purples
-share/cinepaint/0.19-1/gradients/Radial_Eyeball_Blue
-share/cinepaint/0.19-1/gradients/Radial_Eyeball_Brown
-share/cinepaint/0.19-1/gradients/Radial_Eyeball_Green
-share/cinepaint/0.19-1/gradients/Radial_Glow_1
-share/cinepaint/0.19-1/gradients/Radial_Rainbow_Hoop
-share/cinepaint/0.19-1/gradients/Romanian_flag
-share/cinepaint/0.19-1/gradients/Romanian_flag_smooth
-share/cinepaint/0.19-1/gradients/Rounded_edge
-share/cinepaint/0.19-1/gradients/Shadows_1
-share/cinepaint/0.19-1/gradients/Shadows_2
-share/cinepaint/0.19-1/gradients/Shadows_3
-share/cinepaint/0.19-1/gradients/Skyline
-share/cinepaint/0.19-1/gradients/Skyline_polluted
-share/cinepaint/0.19-1/gradients/Square_Wood_Frame
-share/cinepaint/0.19-1/gradients/Sunrise
-share/cinepaint/0.19-1/gradients/Three_bars_sin
-share/cinepaint/0.19-1/gradients/Tropical_Colors
-share/cinepaint/0.19-1/gradients/Tube_Red
-share/cinepaint/0.19-1/gradients/Wood_1
-share/cinepaint/0.19-1/gradients/Wood_2
-share/cinepaint/0.19-1/gradients/Yellow_Contrast
-share/cinepaint/0.19-1/gradients/Yellow_Orange
-share/cinepaint/0.19-1/gtkrc
-share/cinepaint/0.19-1/gtkrc.forest2
-share/cinepaint/0.19-1/palettes/Bears
-share/cinepaint/0.19-1/palettes/Bgold
-share/cinepaint/0.19-1/palettes/Blues
-share/cinepaint/0.19-1/palettes/Borders
-share/cinepaint/0.19-1/palettes/Browns_And_Yellows
-share/cinepaint/0.19-1/palettes/Caramel
-share/cinepaint/0.19-1/palettes/Cascade
-share/cinepaint/0.19-1/palettes/China
-share/cinepaint/0.19-1/palettes/Coldfire
-share/cinepaint/0.19-1/palettes/Cool_Colors
-share/cinepaint/0.19-1/palettes/Cranes
-share/cinepaint/0.19-1/palettes/Dark_pastels
-share/cinepaint/0.19-1/palettes/Default
-share/cinepaint/0.19-1/palettes/Ega
-share/cinepaint/0.19-1/palettes/Firecode
-share/cinepaint/0.19-1/palettes/Gold
-share/cinepaint/0.19-1/palettes/GrayViolet
-share/cinepaint/0.19-1/palettes/Grayblue
-share/cinepaint/0.19-1/palettes/Grays
-share/cinepaint/0.19-1/palettes/Greens
-share/cinepaint/0.19-1/palettes/Hilite
-share/cinepaint/0.19-1/palettes/Kahki
-share/cinepaint/0.19-1/palettes/Lights
-share/cinepaint/0.19-1/palettes/Muted
-share/cinepaint/0.19-1/palettes/Named_Colors
-share/cinepaint/0.19-1/palettes/News3
-share/cinepaint/0.19-1/palettes/Op2
-share/cinepaint/0.19-1/palettes/Paintjet
-share/cinepaint/0.19-1/palettes/Pastels
-share/cinepaint/0.19-1/palettes/Plasma
-share/cinepaint/0.19-1/palettes/Reds
-share/cinepaint/0.19-1/palettes/Reds_And_Purples
-share/cinepaint/0.19-1/palettes/Royal
-share/cinepaint/0.19-1/palettes/Topographic
-share/cinepaint/0.19-1/palettes/Visibone
-share/cinepaint/0.19-1/palettes/Visibone2
-share/cinepaint/0.19-1/palettes/Volcano
-share/cinepaint/0.19-1/palettes/Warm_Colors
-share/cinepaint/0.19-1/palettes/Web
-share/cinepaint/0.19-1/patterns/3dgreen.pat
-share/cinepaint/0.19-1/patterns/Craters.pat
-share/cinepaint/0.19-1/patterns/Moonfoot.pat
-share/cinepaint/0.19-1/patterns/amethyst.pat
-share/cinepaint/0.19-1/patterns/bark.pat
-share/cinepaint/0.19-1/patterns/blue.pat
-share/cinepaint/0.19-1/patterns/bluegrid.pat
-share/cinepaint/0.19-1/patterns/bluesquares.pat
-share/cinepaint/0.19-1/patterns/blueweb.pat
-share/cinepaint/0.19-1/patterns/brick.pat
-share/cinepaint/0.19-1/patterns/burlap.pat
-share/cinepaint/0.19-1/patterns/burlwood.pat
-share/cinepaint/0.19-1/patterns/choc_swirl.pat
-share/cinepaint/0.19-1/patterns/corkboard.pat
-share/cinepaint/0.19-1/patterns/cracked.pat
-share/cinepaint/0.19-1/patterns/crinklepaper.pat
-share/cinepaint/0.19-1/patterns/electric.pat
-share/cinepaint/0.19-1/patterns/fibers.pat
-share/cinepaint/0.19-1/patterns/granite1.pat
-share/cinepaint/0.19-1/patterns/ground1.pat
-share/cinepaint/0.19-1/patterns/ice.pat
-share/cinepaint/0.19-1/patterns/java.pat
-share/cinepaint/0.19-1/patterns/leather.pat
-share/cinepaint/0.19-1/patterns/leaves.pat
-share/cinepaint/0.19-1/patterns/leopard.pat
-share/cinepaint/0.19-1/patterns/lightning.pat
-share/cinepaint/0.19-1/patterns/marble1.pat
-share/cinepaint/0.19-1/patterns/marble2.pat
-share/cinepaint/0.19-1/patterns/marble3.pat
-share/cinepaint/0.19-1/patterns/nops.pat
-share/cinepaint/0.19-1/patterns/paper.pat
-share/cinepaint/0.19-1/patterns/parque1.pat
-share/cinepaint/0.19-1/patterns/parque2.pat
-share/cinepaint/0.19-1/patterns/parque3.pat
-share/cinepaint/0.19-1/patterns/pastel.pat
-share/cinepaint/0.19-1/patterns/pine.pat
-share/cinepaint/0.19-1/patterns/pink_marble.pat
-share/cinepaint/0.19-1/patterns/pool.pat
-share/cinepaint/0.19-1/patterns/qube1.pat
-share/cinepaint/0.19-1/patterns/rain.pat
-share/cinepaint/0.19-1/patterns/recessed.pat
-share/cinepaint/0.19-1/patterns/redcube.pat
-share/cinepaint/0.19-1/patterns/rock.pat
-share/cinepaint/0.19-1/patterns/sky.pat
-share/cinepaint/0.19-1/patterns/slate.pat
-share/cinepaint/0.19-1/patterns/sm_squares.pat
-share/cinepaint/0.19-1/patterns/starfield.pat
-share/cinepaint/0.19-1/patterns/stone33.pat
-share/cinepaint/0.19-1/patterns/terra.pat
-share/cinepaint/0.19-1/patterns/walnut.pat
-share/cinepaint/0.19-1/patterns/warning.pat
-share/cinepaint/0.19-1/patterns/wood1.pat
-share/cinepaint/0.19-1/patterns/wood2.pat
-share/cinepaint/0.19-1/patterns/wood3.pat
-share/cinepaint/0.19-1/patterns/wood4.pat
-share/cinepaint/0.19-1/patterns/wood5.pat
-share/cinepaint/0.19-1/ps-menurc
-share/cinepaint/0.19-1/spot.splash.ppm
-share/cinepaint/0.19-1/tips.txt
-share/cinepaint/0.19-1/user_install
-@dirrm share/cinepaint/0.19-1/patterns
-@dirrm share/cinepaint/0.19-1/palettes
-@dirrm share/cinepaint/0.19-1/gradients
-@dirrm share/cinepaint/0.19-1/brushes
-@dirrm share/cinepaint/0.19-1
+share/cinepaint/0.20-2/brushes/10x10square.gbr
+share/cinepaint/0.20-2/brushes/10x10square16.gbr
+share/cinepaint/0.20-2/brushes/10x10squareBlur.gbr
+share/cinepaint/0.20-2/brushes/10x10squareBlur16.gbr
+share/cinepaint/0.20-2/brushes/10x10squareBlurf16.gbr
+share/cinepaint/0.20-2/brushes/10x10squaref16.gbr
+share/cinepaint/0.20-2/brushes/11circle.gbr
+share/cinepaint/0.20-2/brushes/11circle16.gbr
+share/cinepaint/0.20-2/brushes/11circlef16.gbr
+share/cinepaint/0.20-2/brushes/11fcircle.gbr
+share/cinepaint/0.20-2/brushes/11fcirclef16.gbr
+share/cinepaint/0.20-2/brushes/13circle.gbr
+share/cinepaint/0.20-2/brushes/13circle16.gbr
+share/cinepaint/0.20-2/brushes/13circlef16.gbr
+share/cinepaint/0.20-2/brushes/13fcircle.gbr
+share/cinepaint/0.20-2/brushes/13fcirclef16.gbr
+share/cinepaint/0.20-2/brushes/15circle.gbr
+share/cinepaint/0.20-2/brushes/15circle16.gbr
+share/cinepaint/0.20-2/brushes/15circlef16.gbr
+share/cinepaint/0.20-2/brushes/15fcircle.gbr
+share/cinepaint/0.20-2/brushes/15fcirclef16.gbr
+share/cinepaint/0.20-2/brushes/17circle.gbr
+share/cinepaint/0.20-2/brushes/17circle16.gbr
+share/cinepaint/0.20-2/brushes/17circlef16.gbr
+share/cinepaint/0.20-2/brushes/17fcircle.gbr
+share/cinepaint/0.20-2/brushes/17fcirclef16.gbr
+share/cinepaint/0.20-2/brushes/19circle.gbr
+share/cinepaint/0.20-2/brushes/19circle16.gbr
+share/cinepaint/0.20-2/brushes/19circlef16.gbr
+share/cinepaint/0.20-2/brushes/19fcircle.gbr
+share/cinepaint/0.20-2/brushes/19fcirclef16.gbr
+share/cinepaint/0.20-2/brushes/1circle.gbr
+share/cinepaint/0.20-2/brushes/1circlef16.gbr
+share/cinepaint/0.20-2/brushes/20x20square.gbr
+share/cinepaint/0.20-2/brushes/20x20square16.gbr
+share/cinepaint/0.20-2/brushes/20x20squareBlur.gbr
+share/cinepaint/0.20-2/brushes/20x20squareBlur16.gbr
+share/cinepaint/0.20-2/brushes/20x20squareBlurf16.gbr
+share/cinepaint/0.20-2/brushes/20x20squaref16.gbr
+share/cinepaint/0.20-2/brushes/3circle.gbr
+share/cinepaint/0.20-2/brushes/3circle16.gbr
+share/cinepaint/0.20-2/brushes/3circlef16.gbr
+share/cinepaint/0.20-2/brushes/3fcircle.gbr
+share/cinepaint/0.20-2/brushes/3fcirclef16.gbr
+share/cinepaint/0.20-2/brushes/5circle.gbr
+share/cinepaint/0.20-2/brushes/5circle16.gbr
+share/cinepaint/0.20-2/brushes/5circlef16.gbr
+share/cinepaint/0.20-2/brushes/5fcircle.gbr
+share/cinepaint/0.20-2/brushes/5fcirclef16.gbr
+share/cinepaint/0.20-2/brushes/5x5square.gbr
+share/cinepaint/0.20-2/brushes/5x5square16.gbr
+share/cinepaint/0.20-2/brushes/5x5squareBlur.gbr
+share/cinepaint/0.20-2/brushes/5x5squareBlur16.gbr
+share/cinepaint/0.20-2/brushes/5x5squareBlurf16.gbr
+share/cinepaint/0.20-2/brushes/5x5squaref16.gbr
+share/cinepaint/0.20-2/brushes/7circle.gbr
+share/cinepaint/0.20-2/brushes/7circle16.gbr
+share/cinepaint/0.20-2/brushes/7circlef16.gbr
+share/cinepaint/0.20-2/brushes/7fcircle.gbr
+share/cinepaint/0.20-2/brushes/7fcirclef16.gbr
+share/cinepaint/0.20-2/brushes/9circle.gbr
+share/cinepaint/0.20-2/brushes/9circle16.gbr
+share/cinepaint/0.20-2/brushes/9circlef16.gbr
+share/cinepaint/0.20-2/brushes/9fcircle.gbr
+share/cinepaint/0.20-2/brushes/9fcirclef16.gbr
+share/cinepaint/0.20-2/brushes/DStar11.gbr
+share/cinepaint/0.20-2/brushes/DStar17.gbr
+share/cinepaint/0.20-2/brushes/DStar25.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal01.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal02.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal03.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal04.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal05.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal06.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal07.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal08.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal09.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal10.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal11.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal12.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal13.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal14.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal15.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal16.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal17.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal18.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal19.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal20.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal21.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal22.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal23.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal24.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal25.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal26.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal27.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal28.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal29.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal30.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal31.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal32.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal33.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal34.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal35.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal36.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal37.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal38.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal39.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal40.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal41.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal42.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal43.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal44.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal45.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal46.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal47.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal48.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal49.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal50.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal51.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal52.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal53.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal54.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal55.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal56.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal57.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal58.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal59.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal60.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal61.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal62.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal63.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal64.gbr
+share/cinepaint/0.20-2/brushes/NS1-Charcoal65.gbr
+share/cinepaint/0.20-2/brushes/SketchBrush-16.gih
+share/cinepaint/0.20-2/brushes/SketchBrush-32.gih
+share/cinepaint/0.20-2/brushes/SketchBrush-64.gih
+share/cinepaint/0.20-2/brushes/callig1.gbr
+share/cinepaint/0.20-2/brushes/callig116.gbr
+share/cinepaint/0.20-2/brushes/callig1f16.gbr
+share/cinepaint/0.20-2/brushes/callig2.gbr
+share/cinepaint/0.20-2/brushes/callig216.gbr
+share/cinepaint/0.20-2/brushes/callig2f16.gbr
+share/cinepaint/0.20-2/brushes/callig3.gbr
+share/cinepaint/0.20-2/brushes/callig316.gbr
+share/cinepaint/0.20-2/brushes/callig3f16.gbr
+share/cinepaint/0.20-2/brushes/callig4.gbr
+share/cinepaint/0.20-2/brushes/callig416.gbr
+share/cinepaint/0.20-2/brushes/callig4f16.gbr
+share/cinepaint/0.20-2/brushes/confetti.gbr
+share/cinepaint/0.20-2/brushes/confetti.gih
+share/cinepaint/0.20-2/brushes/confetti16.gbr
+share/cinepaint/0.20-2/brushes/confettif16.gbr
+share/cinepaint/0.20-2/brushes/dunes.gbr
+share/cinepaint/0.20-2/brushes/dunes16.gbr
+share/cinepaint/0.20-2/brushes/dunesf16.gbr
+share/cinepaint/0.20-2/brushes/feltpen.gih
+share/cinepaint/0.20-2/brushes/galaxy.gbr
+share/cinepaint/0.20-2/brushes/galaxy16.gbr
+share/cinepaint/0.20-2/brushes/galaxy_big.gbr
+share/cinepaint/0.20-2/brushes/galaxy_big16.gbr
+share/cinepaint/0.20-2/brushes/galaxy_bigf16.gbr
+share/cinepaint/0.20-2/brushes/galaxy_small.gbr
+share/cinepaint/0.20-2/brushes/galaxy_small16.gbr
+share/cinepaint/0.20-2/brushes/galaxy_smallf16.gbr
+share/cinepaint/0.20-2/brushes/galaxyf16.gbr
+share/cinepaint/0.20-2/brushes/hsparks.gih
+share/cinepaint/0.20-2/brushes/pepper.gbr
+share/cinepaint/0.20-2/brushes/pixel.gbr
+share/cinepaint/0.20-2/brushes/pixel16.gbr
+share/cinepaint/0.20-2/brushes/pixelf16.gbr
+share/cinepaint/0.20-2/brushes/thegimp.gbr
+share/cinepaint/0.20-2/brushes/thegimp16.gbr
+share/cinepaint/0.20-2/brushes/thegimpf16.gbr
+share/cinepaint/0.20-2/brushes/vine.gih
+share/cinepaint/0.20-2/brushes/xcf.gbr
+share/cinepaint/0.20-2/brushes/xcf16.gbr
+share/cinepaint/0.20-2/brushes/xcff16.gbr
+share/cinepaint/0.20-2/curves/D100ev0
+share/cinepaint/0.20-2/curves/DavidFmidtoneBoostA
+share/cinepaint/0.20-2/curves/EV3-4.0
+share/cinepaint/0.20-2/curves/FG_baseline_conservative_v3
+share/cinepaint/0.20-2/curves/FG_baseline_v3
+share/cinepaint/0.20-2/curves/FG_ev3_v2
+share/cinepaint/0.20-2/curves/FG_ev3_v3
+share/cinepaint/0.20-2/curves/FG_ev3_v34
+share/cinepaint/0.20-2/curves/FG_ev5_v2
+share/cinepaint/0.20-2/curves/FG_ev5_v3
+share/cinepaint/0.20-2/curves/FG_point_and_shoot
+share/cinepaint/0.20-2/curves/FG_point_and_shoot_conservative_v31
+share/cinepaint/0.20-2/curves/FG_point_and_shoot_conservative_v32
+share/cinepaint/0.20-2/curves/FG_point_and_shoot_v31
+share/cinepaint/0.20-2/curves/FG_point_and_shoot_v32
+share/cinepaint/0.20-2/curves/FG_provia_v3
+share/cinepaint/0.20-2/curves/FG_provia_v31
+share/cinepaint/0.20-2/curves/FG_provia_v32
+share/cinepaint/0.20-2/curves/FG_provia_v33
+share/cinepaint/0.20-2/curves/FG_provia_v34
+share/cinepaint/0.20-2/curves/FG_provia_v40
+share/cinepaint/0.20-2/curves/FG_white_wedding_v3
+share/cinepaint/0.20-2/curves/FG_white_wedding_v31
+share/cinepaint/0.20-2/curves/FG_white_wedding_v32
+share/cinepaint/0.20-2/curves/FG_white_wedding_v33
+share/cinepaint/0.20-2/curves/FG_white_wedding_v34
+share/cinepaint/0.20-2/curves/FG_white_wedding_v35
+share/cinepaint/0.20-2/curves/FGs_Provia_v34
+share/cinepaint/0.20-2/curves/FGs_White_Wedding_v35
+share/cinepaint/0.20-2/curves/Fotogenic_Provia_v3.3
+share/cinepaint/0.20-2/curves/Fuji_Astia
+share/cinepaint/0.20-2/curves/Fuji_Superia_Reala
+share/cinepaint/0.20-2/curves/JTs_All_In_One
+share/cinepaint/0.20-2/curves/KGM_Agfa_Optima
+share/cinepaint/0.20-2/curves/KGM_fotogenetic_ev3_v34_5
+share/cinepaint/0.20-2/curves/KGM_fotogenetic_ev3_v34_6
+share/cinepaint/0.20-2/curves/KGM_fotogenetic_ev3_v43
+share/cinepaint/0.20-2/curves/KGM_oldskools_mtb_v1_3
+share/cinepaint/0.20-2/curves/Klaus_1
+share/cinepaint/0.20-2/curves/Klaus_2
+share/cinepaint/0.20-2/curves/Klaus_3
+share/cinepaint/0.20-2/curves/OldSkoOLs_Midtone_Enhance_v3h
+share/cinepaint/0.20-2/curves/OldSkoOLs_Normal_v2
+share/cinepaint/0.20-2/curves/OldSkoOLs_dlt
+share/cinepaint/0.20-2/curves/OldSkoOLs_mte_v3.1
+share/cinepaint/0.20-2/curves/Oldskools_mte_v2.14d
+share/cinepaint/0.20-2/curves/Oldskools_mte_v2.14h
+share/cinepaint/0.20-2/curves/Oldskools_mte_v3
+share/cinepaint/0.20-2/curves/Oldskools_mte_v3h
+share/cinepaint/0.20-2/curves/Optima2
+share/cinepaint/0.20-2/curves/Optimav1
+share/cinepaint/0.20-2/curves/P+S-4.0
+share/cinepaint/0.20-2/curves/Provia-4.0
+share/cinepaint/0.20-2/curves/README.curves
+share/cinepaint/0.20-2/curves/Velvia
+share/cinepaint/0.20-2/curves/astiav1
+share/cinepaint/0.20-2/curves/basic-curve_141
+share/cinepaint/0.20-2/curves/basic-curve_152
+share/cinepaint/0.20-2/curves/basic-curve_159
+share/cinepaint/0.20-2/curves/bh_filmcurve1
+share/cinepaint/0.20-2/curves/bh_filmcurve2
+share/cinepaint/0.20-2/curves/bright_2
+share/cinepaint/0.20-2/curves/bright_3
+share/cinepaint/0.20-2/curves/bright_4
+share/cinepaint/0.20-2/curves/courbeA
+share/cinepaint/0.20-2/curves/courbeB
+share/cinepaint/0.20-2/curves/curve039
+share/cinepaint/0.20-2/curves/curve114d
+share/cinepaint/0.20-2/curves/custom_jt
+share/cinepaint/0.20-2/curves/custom_jt1
+share/cinepaint/0.20-2/curves/custom_jt3
+share/cinepaint/0.20-2/curves/ev_0_custom
+share/cinepaint/0.20-2/curves/ev_3_custom_normal
+share/cinepaint/0.20-2/curves/ev_5_custom_normal
+share/cinepaint/0.20-2/curves/ev_7_custom_contrast
+share/cinepaint/0.20-2/curves/ev_7_custom_less
+share/cinepaint/0.20-2/curves/ev_7_custom_normal
+share/cinepaint/0.20-2/curves/henk1-03
+share/cinepaint/0.20-2/curves/jt_all-in-1Curve
+share/cinepaint/0.20-2/curves/jt_all_around1-1-03
+share/cinepaint/0.20-2/curves/jt_auto
+share/cinepaint/0.20-2/curves/jt_custom_color12-31-02
+share/cinepaint/0.20-2/curves/oldskools_mtb_v1
+share/cinepaint/0.20-2/curves/oldskools_mtc_v1
+share/cinepaint/0.20-2/curves/provia_d70
+share/cinepaint/0.20-2/curves/sReala
+share/cinepaint/0.20-2/curves/sReala2
+share/cinepaint/0.20-2/curves/sReala_12
+share/cinepaint/0.20-2/curves/sReala_2alpha
+share/cinepaint/0.20-2/curves/sReala_v2a_120505
+share/cinepaint/0.20-2/curves/sReala_version2
+share/cinepaint/0.20-2/curves/sRealav1
+share/cinepaint/0.20-2/curves/s_bright_1
+share/cinepaint/0.20-2/curves/s_bright_2
+share/cinepaint/0.20-2/curves/s_bright_3
+share/cinepaint/0.20-2/curves/s_bright_4
+share/cinepaint/0.20-2/curves/s_dark_1
+share/cinepaint/0.20-2/curves/s_dark_2
+share/cinepaint/0.20-2/curves/s_dark_3
+share/cinepaint/0.20-2/curves/s_dark_4
+share/cinepaint/0.20-2/curves/s_high
+share/cinepaint/0.20-2/curves/s_low
+share/cinepaint/0.20-2/curves/s_low_bright_3
+share/cinepaint/0.20-2/curves/s_low_bright_4
+share/cinepaint/0.20-2/curves/s_low_dark_3
+share/cinepaint/0.20-2/curves/s_low_dark_4
+share/cinepaint/0.20-2/curves/s_med
+share/cinepaint/0.20-2/curves/v2
+share/cinepaint/0.20-2/curves/v2h
+share/cinepaint/0.20-2/curves/v3
+share/cinepaint/0.20-2/curves/v3h
+share/cinepaint/0.20-2/curves/v3hb
+share/cinepaint/0.20-2/gimprc
+share/cinepaint/0.20-2/gimprc_user
+share/cinepaint/0.20-2/gradients/Abstract_1
+share/cinepaint/0.20-2/gradients/Abstract_2
+share/cinepaint/0.20-2/gradients/Abstract_3
+share/cinepaint/0.20-2/gradients/Aneurism
+share/cinepaint/0.20-2/gradients/Blinds
+share/cinepaint/0.20-2/gradients/Blue_Green
+share/cinepaint/0.20-2/gradients/Browns
+share/cinepaint/0.20-2/gradients/Brushed_Aluminium
+share/cinepaint/0.20-2/gradients/Burning_Paper
+share/cinepaint/0.20-2/gradients/Burning_Transparency
+share/cinepaint/0.20-2/gradients/CD
+share/cinepaint/0.20-2/gradients/CD_Half
+share/cinepaint/0.20-2/gradients/Caribbean_Blues
+share/cinepaint/0.20-2/gradients/Coffee
+share/cinepaint/0.20-2/gradients/Cold_Steel
+share/cinepaint/0.20-2/gradients/Cold_Steel_2
+share/cinepaint/0.20-2/gradients/Crown_molding
+share/cinepaint/0.20-2/gradients/Danish_flag
+share/cinepaint/0.20-2/gradients/Dark_1
+share/cinepaint/0.20-2/gradients/Deep_Sea
+share/cinepaint/0.20-2/gradients/Default
+share/cinepaint/0.20-2/gradients/Flare_Glow_Angular_1
+share/cinepaint/0.20-2/gradients/Flare_Glow_Radial_1
+share/cinepaint/0.20-2/gradients/Flare_Glow_Radial_2
+share/cinepaint/0.20-2/gradients/Flare_Glow_Radial_3
+share/cinepaint/0.20-2/gradients/Flare_Glow_Radial_4
+share/cinepaint/0.20-2/gradients/Flare_Radial_101
+share/cinepaint/0.20-2/gradients/Flare_Radial_102
+share/cinepaint/0.20-2/gradients/Flare_Radial_103
+share/cinepaint/0.20-2/gradients/Flare_Rays_Radial_1
+share/cinepaint/0.20-2/gradients/Flare_Rays_Radial_2
+share/cinepaint/0.20-2/gradients/Flare_Rays_Size_1
+share/cinepaint/0.20-2/gradients/Flare_Sizefac_101
+share/cinepaint/0.20-2/gradients/Four_bars
+share/cinepaint/0.20-2/gradients/French_flag
+share/cinepaint/0.20-2/gradients/French_flag_smooth
+share/cinepaint/0.20-2/gradients/Full_saturation_spectrum_CCW
+share/cinepaint/0.20-2/gradients/Full_saturation_spectrum_CW
+share/cinepaint/0.20-2/gradients/German_flag
+share/cinepaint/0.20-2/gradients/German_flag_smooth
+share/cinepaint/0.20-2/gradients/Golden
+share/cinepaint/0.20-2/gradients/Greens
+share/cinepaint/0.20-2/gradients/Horizon_1
+share/cinepaint/0.20-2/gradients/Horizon_2
+share/cinepaint/0.20-2/gradients/Incandescent
+share/cinepaint/0.20-2/gradients/Land_1
+share/cinepaint/0.20-2/gradients/Land_and_Sea
+share/cinepaint/0.20-2/gradients/Metallic_Something
+share/cinepaint/0.20-2/gradients/Mexican_flag
+share/cinepaint/0.20-2/gradients/Mexican_flag_smooth
+share/cinepaint/0.20-2/gradients/Nauseating_Headache
+share/cinepaint/0.20-2/gradients/Neon_Cyan
+share/cinepaint/0.20-2/gradients/Neon_Green
+share/cinepaint/0.20-2/gradients/Neon_Yellow
+share/cinepaint/0.20-2/gradients/Pastel_Rainbow
+share/cinepaint/0.20-2/gradients/Pastels
+share/cinepaint/0.20-2/gradients/Purples
+share/cinepaint/0.20-2/gradients/Radial_Eyeball_Blue
+share/cinepaint/0.20-2/gradients/Radial_Eyeball_Brown
+share/cinepaint/0.20-2/gradients/Radial_Eyeball_Green
+share/cinepaint/0.20-2/gradients/Radial_Glow_1
+share/cinepaint/0.20-2/gradients/Radial_Rainbow_Hoop
+share/cinepaint/0.20-2/gradients/Romanian_flag
+share/cinepaint/0.20-2/gradients/Romanian_flag_smooth
+share/cinepaint/0.20-2/gradients/Rounded_edge
+share/cinepaint/0.20-2/gradients/Shadows_1
+share/cinepaint/0.20-2/gradients/Shadows_2
+share/cinepaint/0.20-2/gradients/Shadows_3
+share/cinepaint/0.20-2/gradients/Skyline
+share/cinepaint/0.20-2/gradients/Skyline_polluted
+share/cinepaint/0.20-2/gradients/Square_Wood_Frame
+share/cinepaint/0.20-2/gradients/Sunrise
+share/cinepaint/0.20-2/gradients/Three_bars_sin
+share/cinepaint/0.20-2/gradients/Tropical_Colors
+share/cinepaint/0.20-2/gradients/Tube_Red
+share/cinepaint/0.20-2/gradients/Wood_1
+share/cinepaint/0.20-2/gradients/Wood_2
+share/cinepaint/0.20-2/gradients/Yellow_Contrast
+share/cinepaint/0.20-2/gradients/Yellow_Orange
+share/cinepaint/0.20-2/gtkrc
+share/cinepaint/0.20-2/gtkrc.forest2
+share/cinepaint/0.20-2/palettes/Bears
+share/cinepaint/0.20-2/palettes/Bgold
+share/cinepaint/0.20-2/palettes/Blues
+share/cinepaint/0.20-2/palettes/Borders
+share/cinepaint/0.20-2/palettes/Browns_And_Yellows
+share/cinepaint/0.20-2/palettes/Caramel
+share/cinepaint/0.20-2/palettes/Cascade
+share/cinepaint/0.20-2/palettes/China
+share/cinepaint/0.20-2/palettes/Coldfire
+share/cinepaint/0.20-2/palettes/Cool_Colors
+share/cinepaint/0.20-2/palettes/Cranes
+share/cinepaint/0.20-2/palettes/Dark_pastels
+share/cinepaint/0.20-2/palettes/Default
+share/cinepaint/0.20-2/palettes/Ega
+share/cinepaint/0.20-2/palettes/Firecode
+share/cinepaint/0.20-2/palettes/Gold
+share/cinepaint/0.20-2/palettes/GrayViolet
+share/cinepaint/0.20-2/palettes/Grayblue
+share/cinepaint/0.20-2/palettes/Grays
+share/cinepaint/0.20-2/palettes/Greens
+share/cinepaint/0.20-2/palettes/Hilite
+share/cinepaint/0.20-2/palettes/Kahki
+share/cinepaint/0.20-2/palettes/Lights
+share/cinepaint/0.20-2/palettes/Muted
+share/cinepaint/0.20-2/palettes/Named_Colors
+share/cinepaint/0.20-2/palettes/News3
+share/cinepaint/0.20-2/palettes/Op2
+share/cinepaint/0.20-2/palettes/Paintjet
+share/cinepaint/0.20-2/palettes/Pastels
+share/cinepaint/0.20-2/palettes/Plasma
+share/cinepaint/0.20-2/palettes/Reds
+share/cinepaint/0.20-2/palettes/Reds_And_Purples
+share/cinepaint/0.20-2/palettes/Royal
+share/cinepaint/0.20-2/palettes/Topographic
+share/cinepaint/0.20-2/palettes/Visibone
+share/cinepaint/0.20-2/palettes/Visibone2
+share/cinepaint/0.20-2/palettes/Volcano
+share/cinepaint/0.20-2/palettes/Warm_Colors
+share/cinepaint/0.20-2/palettes/Web
+share/cinepaint/0.20-2/patterns/3dgreen.pat
+share/cinepaint/0.20-2/patterns/Craters.pat
+share/cinepaint/0.20-2/patterns/Moonfoot.pat
+share/cinepaint/0.20-2/patterns/amethyst.pat
+share/cinepaint/0.20-2/patterns/bark.pat
+share/cinepaint/0.20-2/patterns/blue.pat
+share/cinepaint/0.20-2/patterns/bluegrid.pat
+share/cinepaint/0.20-2/patterns/bluesquares.pat
+share/cinepaint/0.20-2/patterns/blueweb.pat
+share/cinepaint/0.20-2/patterns/brick.pat
+share/cinepaint/0.20-2/patterns/burlap.pat
+share/cinepaint/0.20-2/patterns/burlwood.pat
+share/cinepaint/0.20-2/patterns/choc_swirl.pat
+share/cinepaint/0.20-2/patterns/corkboard.pat
+share/cinepaint/0.20-2/patterns/cracked.pat
+share/cinepaint/0.20-2/patterns/crinklepaper.pat
+share/cinepaint/0.20-2/patterns/electric.pat
+share/cinepaint/0.20-2/patterns/fibers.pat
+share/cinepaint/0.20-2/patterns/granite1.pat
+share/cinepaint/0.20-2/patterns/ground1.pat
+share/cinepaint/0.20-2/patterns/ice.pat
+share/cinepaint/0.20-2/patterns/java.pat
+share/cinepaint/0.20-2/patterns/leather.pat
+share/cinepaint/0.20-2/patterns/leaves.pat
+share/cinepaint/0.20-2/patterns/leopard.pat
+share/cinepaint/0.20-2/patterns/lightning.pat
+share/cinepaint/0.20-2/patterns/marble1.pat
+share/cinepaint/0.20-2/patterns/marble2.pat
+share/cinepaint/0.20-2/patterns/marble3.pat
+share/cinepaint/0.20-2/patterns/nops.pat
+share/cinepaint/0.20-2/patterns/paper.pat
+share/cinepaint/0.20-2/patterns/parque1.pat
+share/cinepaint/0.20-2/patterns/parque2.pat
+share/cinepaint/0.20-2/patterns/parque3.pat
+share/cinepaint/0.20-2/patterns/pastel.pat
+share/cinepaint/0.20-2/patterns/pine.pat
+share/cinepaint/0.20-2/patterns/pink_marble.pat
+share/cinepaint/0.20-2/patterns/pool.pat
+share/cinepaint/0.20-2/patterns/qube1.pat
+share/cinepaint/0.20-2/patterns/rain.pat
+share/cinepaint/0.20-2/patterns/recessed.pat
+share/cinepaint/0.20-2/patterns/redcube.pat
+share/cinepaint/0.20-2/patterns/rock.pat
+share/cinepaint/0.20-2/patterns/sky.pat
+share/cinepaint/0.20-2/patterns/slate.pat
+share/cinepaint/0.20-2/patterns/sm_squares.pat
+share/cinepaint/0.20-2/patterns/starfield.pat
+share/cinepaint/0.20-2/patterns/stone33.pat
+share/cinepaint/0.20-2/patterns/terra.pat
+share/cinepaint/0.20-2/patterns/walnut.pat
+share/cinepaint/0.20-2/patterns/warning.pat
+share/cinepaint/0.20-2/patterns/wood1.pat
+share/cinepaint/0.20-2/patterns/wood2.pat
+share/cinepaint/0.20-2/patterns/wood3.pat
+share/cinepaint/0.20-2/patterns/wood4.pat
+share/cinepaint/0.20-2/patterns/wood5.pat
+share/cinepaint/0.20-2/ps-menurc
+share/cinepaint/0.20-2/spot.splash.ppm
+share/cinepaint/0.20-2/tips.txt
+share/cinepaint/0.20-2/user_install
+@dirrm share/cinepaint/0.20-2/patterns
+@dirrm share/cinepaint/0.20-2/palettes
+@dirrm share/cinepaint/0.20-2/gradients
+@dirrm share/cinepaint/0.20-2/curves
+@dirrm share/cinepaint/0.20-2/brushes
+@dirrm share/cinepaint/0.20-2
 @dirrm share/cinepaint
-@dirrm lib/cinepaint/0.19-1/plug-ins
-@dirrm lib/cinepaint/0.19-1
+@dirrm lib/cinepaint/0.20-2/plug-ins
+@dirrm lib/cinepaint/0.20-2
 @dirrm lib/cinepaint
+@exec ${MKDIR} %D/include/include/cinepaint/wire
+@dirrm include/cinepaint/wire
+@exec ${MKDIR} %D/include/include/cinepaint/libgimp
+@dirrm include/cinepaint/libgimp
+@dirrm include/cinepaint/app
+@dirrm include/cinepaint
diff --git a/graphics/cinepaint/distinfo b/graphics/cinepaint/distinfo
index e8c773b88dd..4fcf82ab344 100644
--- a/graphics/cinepaint/distinfo
+++ b/graphics/cinepaint/distinfo
@@ -1,21 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/07/04 19:57:01 drochner Exp $
+$NetBSD: distinfo,v 1.6 2006/01/31 21:06:56 adam Exp $
 
-SHA1 (cinepaint-0.19-1.tar.gz) = fb8a04d9a4dd0959a75a4b9c9a927e1ca2c0700f
-RMD160 (cinepaint-0.19-1.tar.gz) = 71337ea41ecec71fed8827c4aed0dcc3176910eb
-Size (cinepaint-0.19-1.tar.gz) = 7317730 bytes
+SHA1 (cinepaint-0.20-2.tar.gz) = 67ef64c1708553fc50f28c622d016e6388df079b
+RMD160 (cinepaint-0.20-2.tar.gz) = 637396d43db8e6bd00d6b28fc754315be8db2d9c
+Size (cinepaint-0.20-2.tar.gz) = 7550210 bytes
 SHA1 (patch-aa) = 2259896756f3371589b4a83655e4c118d0247302
 SHA1 (patch-ab) = 1e03ffb0deab12b229f2604083bd3515a80747ac
-SHA1 (patch-ac) = 106b4569e627692566abc1f2d2175df01ae76fea
-SHA1 (patch-ad) = 4d36cc56b32a04fdcc4428a778ff8d88435fea3a
-SHA1 (patch-ae) = 188e453a0a2b5fdf7ce3ec7db889d08071a57bd3
-SHA1 (patch-af) = 313f9fe908217de89ba9b02bd98cb28761d188ba
-SHA1 (patch-ag) = 25dff8ba05f414d4dde3356dfc71624f6fdb8a60
-SHA1 (patch-ah) = b2f750fa1adf9c09af13e8b0fa172be90e7802d4
-SHA1 (patch-ai) = e7979dec50e3402927a5442cb69e5771b03362db
-SHA1 (patch-aj) = 06ca475fdb0ea0e49e89c91cdb164d001a6a1937
-SHA1 (patch-ak) = e63c101cdc372ec8680ccf22bae99099fdb641af
-SHA1 (patch-al) = 2e456b752b363191c0f6ddcff9904b434ddf81ea
-SHA1 (patch-am) = 9bdb163ddc08bb526be842a3c3ef719426dc257f
-SHA1 (patch-an) = 8ef057f80c9586e26e66a28e8b402147e6d98faa
-SHA1 (patch-ao) = 564d69b66582f3db696063b64f329d78b4f4836f
-SHA1 (patch-ap) = 04dd321313b21acc76f84cc62cb6c6e28306f6f1
diff --git a/graphics/cinepaint/patches/patch-ac b/graphics/cinepaint/patches/patch-ac
deleted file mode 100644
index e58f4caa4d2..00000000000
--- a/graphics/cinepaint/patches/patch-ac
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/03/16 18:32:50 rillig Exp $
-
-Copy and paste bug.
-
---- app/store_frame_manager.c.orig	Tue Dec 28 17:22:02 2004
-+++ app/store_frame_manager.c	Sat Mar 12 14:36:11 2005
-@@ -2153,51 +2153,6 @@ sfm_store_change_frame_to (GDisplay* dis
-       disp->ID = disp->gimage->ID;
-       item->gimage = disp->gimage;
-       sfm_store_make_cur (disp, fm->fg);
--void 
--sfm_slide_show (GtkWidget *w, gpointer data)
--{
--  GDisplay *display=NULL;
--  GtkWidget *window;
--  static gint win_x, win_y, win_w, win_h, win_d;
--
--  display = gdisplay_active();
--  window = display->shell;
--
--  if(display)
--    {
--      display->slide_show = display->slide_show ? 0 : 1;
--      if(display->slide_show)
--	{ 
--	  gdk_window_get_geometry(window->window, &win_x, &win_y, &win_w, &win_h, &win_d);
--
--	  gtk_widget_hide(display->menubar);
--	  gtk_widget_hide(display->hsb);
--	  gtk_widget_hide(display->vsb);
--	  gtk_widget_hide(display->hrule);
--	  gtk_widget_hide(display->vrule);
--
--	  gdk_window_move_resize (window->window, -50, -75, gdk_screen_width()+92, 
--				  gdk_screen_height()+105);
--	  gtk_window_set_default_size (GTK_WINDOW (window), gdk_screen_width()+92,
--				       gdk_screen_height()+105);
--	  gtk_widget_set_usize (GTK_WIDGET(window), gdk_screen_width()+92, 
--				gdk_screen_height()+105);
--	}
--      else
--	{
--	  gdk_window_move_resize (window->window, win_x, win_y, win_w, win_h);
--	  gtk_window_set_default_size (GTK_WINDOW (window), win_w, win_h);
--	  gtk_widget_set_usize (GTK_WIDGET(window), win_w, win_h);
--
--	  gtk_widget_show(display->menubar);
--	  gtk_widget_show(display->hsb);
--	  gtk_widget_show(display->vsb);
--	  gtk_widget_show(display->hrule);
--	  gtk_widget_show(display->vrule);
--	}
--      gdisplays_flush();
--    }
--}
-       gtk_clist_set_text (GTK_CLIST (disp->bfm->sfm->store_list), disp->bfm->sfm->fg, 
- 	  5, temp_name);
- 
diff --git a/graphics/cinepaint/patches/patch-ad b/graphics/cinepaint/patches/patch-ad
deleted file mode 100644
index 178235042bb..00000000000
--- a/graphics/cinepaint/patches/patch-ad
+++ /dev/null
@@ -1,350 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/07/04 19:57:01 drochner Exp $
-
---- app/cms.c.orig	2005-05-24 20:51:25.000000000 +0200
-+++ app/cms.c
-@@ -208,7 +208,12 @@ erase_alpha_from_4th_color (CMSTransform
-  * called from app_procs.c:app_init()
-  */
- void cms_init()
--{   profile_cache = g_hash_table_new(g_str_hash, g_str_equal);
-+{
-+    GList *remove_settings = NULL;
-+    GList *update_settings = NULL;
-+    cmsHPROFILE test = NULL;
-+
-+    profile_cache = g_hash_table_new(g_str_hash, g_str_equal);
-     transform_cache = g_hash_table_new(g_str_hash, g_str_equal);         
-     profile_info_buffer = g_new(CMSProfileInfo, 1);
-     profile_info_buffer->manufacturer = NULL;
-@@ -222,9 +227,6 @@ void cms_init()
-     /* suppress lcms errors while checking */
-     cmsErrorAction(LCMS_ERROR_IGNORE);     
- 
--    GList *remove_settings = NULL;
--    GList *update_settings = NULL;
--    cmsHPROFILE test = NULL;
- 
-     /* 1. image profile */
-     if (cms_default_image_profile_name != NULL)
-@@ -525,11 +527,12 @@ cms_read_icc_profile_dir(gchar *path, ic
-     while ((entry = readdir (dir)))
-     {   char *file_name = entry->d_name;
-         cmsHPROFILE profile;
-+	GString *file_path;
- 	if ((strcmp (file_name, "..") == 0) || (strcmp (file_name, ".") == 0)) 
- 	{   continue;
- 	}
- 
--	GString *file_path = g_string_new(NULL);
-+	file_path = g_string_new(NULL);
- 	g_string_sprintf (file_path, "%s/%s", path, file_name);
- 
- 	/* Open the file and try to read it using the lcms library
-@@ -566,6 +569,7 @@ cms_read_standard_profile_dirs(icProfile
-     const char *home = GetDirHome();
-     char *directories = g_strdup(cms_profile_path);
-     GString *file_path = g_string_new(NULL);
-+    GSList *sub_list;
- 
-     /* process path by path, paths are separated by : */
-     char *remaining_directories = directories;    
-@@ -580,7 +584,7 @@ cms_read_standard_profile_dirs(icProfile
-         {   path = strdup(token);
- 	} 
- 
--	GSList *sub_list = cms_read_icc_profile_dir(path, class);
-+	sub_list = cms_read_icc_profile_dir(path, class);
- 	return_list = g_slist_concat(return_list, sub_list);
- 
- 	g_free(path);
-@@ -729,6 +733,7 @@ cms_load_profile_to_mem (char* filename,
- CMSProfile *
- cms_get_profile_from_file(char *file_name)
- {   CMSProfile *return_value;
-+    ProfileCacheEntry *cache_entry;
-     size_t size_order = 128;
-     char *mem = 0;
-     const char *keyname = 0; 
-@@ -743,7 +748,7 @@ cms_get_profile_from_file(char *file_nam
-     keyname = cms_get_profile_keyname (profile, mem);
-  
-     /* check hash table for profile */ 
--    ProfileCacheEntry *cache_entry = g_hash_table_lookup(profile_cache, 
-+    cache_entry = g_hash_table_lookup(profile_cache, 
- 							 (gpointer) cms_get_profile_keyname(profile,mem));
-     if (cache_entry != NULL) 
-     {   cache_entry->ref_count ++;
-@@ -783,7 +788,8 @@ cms_get_profile_from_file(char *file_nam
- CMSProfile *
- cms_get_profile_from_mem(void *mem_pointer, DWORD size)
- {   CMSProfile *return_value;
--    
-+    ProfileCacheEntry *cache_entry;
-+
-     /* get profile information */ 
-     cmsHPROFILE profile = cmsOpenProfileFromMem (mem_pointer, size);
-     if (profile == NULL)
-@@ -792,7 +798,7 @@ cms_get_profile_from_mem(void *mem_point
-     }   
- 
-     /* check hash table for profile */ 
--    ProfileCacheEntry *cache_entry = g_hash_table_lookup(profile_cache, 
-+    cache_entry = g_hash_table_lookup(profile_cache, 
- 							 (gpointer) cms_get_profile_keyname(profile,mem_pointer));
-     if (cache_entry != NULL) 
-     {   cache_entry->ref_count ++;
-@@ -852,6 +858,7 @@ cms_get_profile_data(CMSProfile *profile
- CMSProfile *
- cms_get_lab_profile(LPcmsCIExyY white_point) 
- {   CMSProfile *return_value;
-+    ProfileCacheEntry *cache_entry;
- 
-     GString *hash_key = g_string_new(NULL); 
-     if (white_point) 
-@@ -861,7 +868,7 @@ cms_get_lab_profile(LPcmsCIExyY white_po
-     {   g_string_sprintf(hash_key, "###LAB###");
-     }
- 
--    ProfileCacheEntry *cache_entry = g_hash_table_lookup(profile_cache, (gpointer) hash_key);
-+    cache_entry = g_hash_table_lookup(profile_cache, (gpointer) hash_key);
-     if (cache_entry != NULL) 
-     {   cache_entry->ref_count ++;
-         return_value = cache_entry->profile;
-@@ -1034,12 +1041,13 @@ cms_return_profile(CMSProfile *profile)
- {   /* search the cache for the profile 
-      * decreate ref_counter + possibly close profile 
-      */  
-+    ProfileCacheEntry *entry;
-     if (profile == NULL)
-     {   g_warning("cms_return_profile: profile is NULL");
-         return FALSE;
-     } 
- 
--    ProfileCacheEntry *entry = g_hash_table_lookup(profile_cache, (gpointer)profile->cache_key);
-+    entry = g_hash_table_lookup(profile_cache, (gpointer)profile->cache_key);
-     if (entry == NULL)
-     {   g_warning("cms_return_profile: profile not found in cache");
-         return FALSE;
-@@ -1072,7 +1080,18 @@ cms_get_transform(GSList *profiles,
- {   /* turn profiles into an array as needed by lcms + 
-        check all profiles are registered with the profile cache + 
-        create hash key to check transform cache */
-+
-+    int i;
-+    GString *hash_key;
-+    CMSProfile *current_profile;
-+    GSList *iterator;
-+    TransformCacheEntry *cache_entry;
-+    cmsHTRANSFORM transform;
-+    cmsHPROFILE devicelink;
-+    char *file_name;
-+
-     int num_profiles = g_slist_length(profiles);
-+    cmsHPROFILE profile_array[num_profiles];
-     if (num_profiles == 0)
-     {   g_warning("cms_get_transform: profile list is empty, cannot create transfrom");
-         return NULL;
-@@ -1092,12 +1111,9 @@ cms_get_transform(GSList *profiles,
-         return NULL;
-     }
- 
--    cmsHPROFILE profile_array[num_profiles];
--    GString *hash_key = g_string_new(NULL);
-+    hash_key = g_string_new(NULL);
- 
--    int i;
--    CMSProfile *current_profile;
--    GSList *iterator = profiles;
-+    iterator = profiles;
-     for (i=0; ((i<num_profiles) && (iterator !=NULL)); i++) 
-     {   current_profile = (CMSProfile *)iterator->data;
-         if (g_hash_table_lookup(profile_cache, (gpointer)current_profile->cache_key) == NULL) 
-@@ -1114,7 +1130,7 @@ cms_get_transform(GSList *profiles,
-                                            lcms_intent, lcms_flags);
- 
-     /* now check the cache */
--    TransformCacheEntry *cache_entry = g_hash_table_lookup(transform_cache, (gpointer) hash_key->str);
-+    cache_entry = g_hash_table_lookup(transform_cache, (gpointer) hash_key->str);
- 
-     /* if it was in the disc cache */
-     if (cache_entry != NULL) 
-@@ -1143,7 +1159,6 @@ cms_get_transform(GSList *profiles,
-     }
- 
-     /* if no cache hit, create transform */
--    cmsHTRANSFORM transform;
-         transform = cmsCreateMultiprofileTransform  (profile_array,
- 						     num_profiles,
- 						     lcms_input_format,
-@@ -1157,8 +1172,8 @@ cms_get_transform(GSList *profiles,
-     }							     
- 
-     /* save it to disk */
--    cmsHPROFILE devicelink = cmsTransform2DeviceLink(transform,0);
--    char *file_name = file_temp_name("icc");
-+    devicelink = cmsTransform2DeviceLink(transform,0);
-+    file_name = file_temp_name("icc");
-     _cmsSaveProfile(devicelink, file_name);
-     cmsCloseProfile(devicelink);
- 
-@@ -1282,6 +1297,12 @@ cms_set_display_profile(CMSProfile *prof
- void 
- cms_transform_area(CMSTransform *transform, PixelArea *src_area, PixelArea *dest_area) 
- {   TransformFunc transform_func;
-+    PixelRow src_row_buffer, dest_row_buffer;
-+    guint h;
-+    void *src_data, *dest_data;
-+    guint num_pixels;
-+    void *pag;
-+    
-     Tag src_tag = pixelarea_tag(src_area); 
-     Tag dest_tag = pixelarea_tag(dest_area); 
-     if (tag_precision(src_tag) != tag_precision(dest_tag)) 
-@@ -1309,12 +1330,6 @@ cms_transform_area(CMSTransform *transfo
-     }
- 
- 
--    PixelRow src_row_buffer, dest_row_buffer;
--    guint h;
--    void *src_data, *dest_data;
--    guint num_pixels;
--    void *pag;
--    
-     for (pag = pixelarea_register (1, src_area, dest_area);
- 	 pag != NULL;
- 	 pag = pixelarea_process (pag))
-@@ -1385,6 +1400,8 @@ void
- cms_transform_float(CMSTransform *transform, void *src_data, void *dest_data, int num_pixels) 
- {   /* need to convert data to double for lcms's convenience */
-     int i;
-+    float *src_fbuffer, *dest_fbuffer;
-+    double *dbuffer;
-     if (!transform || !transform->handle)
-         g_warning ("%s:%d %s() transform not allocated\n",
-                    __FILE__,__LINE__,__func__);
-@@ -1392,9 +1409,9 @@ cms_transform_float(CMSTransform *transf
-         g_warning ("%s:%d %s() array not allocated\n",
-                    __FILE__,__LINE__,__func__);
- 
--    float *src_fbuffer = (float *)src_data;
--    float *dest_fbuffer = (float *)dest_data;
--    double *dbuffer = malloc(sizeof(double) * num_pixels * 4); 
-+    src_fbuffer = (float *)src_data;
-+    dest_fbuffer = (float *)dest_data;
-+    dbuffer = malloc(sizeof(double) * num_pixels * 4); 
-     for (i=0; i < num_pixels * 4; i++) 
-     {   dbuffer[i]=(double)src_fbuffer[i];
-     }
-@@ -1463,10 +1480,14 @@ static GtkWidget *cms_profile_menu_new(G
- {   GtkWidget *menu;
-     GtkWidget *menuitem;
-     GtkWidget *optionmenu;
-+
-+    gchar *current_filename;
-+    CMSProfile *current_profile;
-+    CMSProfileInfo *current_profile_info;
-        
--    menu = gtk_menu_new (); 
-     GSList *profile_file_names = cms_read_standard_profile_dirs(CMS_ANY_PROFILECLASS);      
-     GSList *iterator = profile_file_names;
-+    menu = gtk_menu_new (); 
- 
-     if (can_select_none)
-     {   menuitem = gtk_menu_item_new_with_label("[none]");
-@@ -1474,9 +1495,6 @@ static GtkWidget *cms_profile_menu_new(G
- 	gtk_object_set_data(GTK_OBJECT(menuitem), "value", NULL);      
-     }
- 
--    gchar *current_filename;
--    CMSProfile *current_profile;
--    CMSProfileInfo *current_profile_info;      
-     while (iterator != NULL)
-     {   current_filename = iterator->data;
-         current_profile = cms_get_profile_from_file(current_filename);
-@@ -1506,8 +1524,8 @@ static GtkWidget *cms_intent_menu_new(Gt
-     GtkWidget *menuitem = NULL;
-     GtkWidget *optionmenu = NULL;
-       
--    menu = gtk_menu_new ();	 
-     guint8 *value = NULL;
-+    menu = gtk_menu_new ();	 
- 
-     menuitem = gtk_menu_item_new_with_label ("Perceptual");
-     gtk_menu_append (GTK_MENU (menu), menuitem);
-@@ -1685,6 +1703,8 @@ cms_assign_dialog(GImage *image)
-     GtkWidget *label = NULL; 
-     GtkWidget *vbox = NULL;
-     GtkWidget *alignment = NULL;
-+    CMSProfile *current_profile;
-+    GString *profile_string;
- 
-     CMSAssignDialogData *data=g_new(CMSAssignDialogData,1); 
-     data->image = image;
-@@ -1700,8 +1720,8 @@ cms_assign_dialog(GImage *image)
-     table = gtk_table_new(3, 1, FALSE);
-     gtk_box_pack_start (GTK_BOX (vbox), table, TRUE, TRUE, 0);
-     
--    CMSProfile *current_profile = gimage_get_cms_profile(image);
--    GString *profile_string = g_string_new(NULL);
-+    current_profile = gimage_get_cms_profile(image);
-+    profile_string = g_string_new(NULL);
-     
-     if (current_profile == NULL)
-     {   g_string_sprintf (profile_string, "[The currently assigned profile is: [none]]");
-@@ -1792,6 +1812,7 @@ cms_open_assign_dialog(GImage *image)
-     GSList *radiogroup = NULL;
-     GtkWidget *vbox = NULL;
-     GtkWidget *alignment = NULL;
-+    GString *profile_string;
- 
-     CMSOpenAssignDialogData *data=g_new(CMSOpenAssignDialogData,1); 
-     data->image = image;
-@@ -1821,7 +1842,7 @@ cms_open_assign_dialog(GImage *image)
- 						  
-     data->profile_menu = cms_profile_menu_new(GTK_TABLE(table), 1, 0, TRUE);
- 
--    GString *profile_string = g_string_new(NULL);    
-+    profile_string = g_string_new(NULL);    
-     if (cms_default_image_profile_name == NULL)
-     {   g_string_sprintf (profile_string, "The default image profile: [none]");
-     }
-@@ -1888,9 +1909,10 @@ cms_open_assign_dialog_ok_callback(GtkWi
-     
-     /* update cms_open_action (global preference variable) */
-     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->always_default_check)))
--    {   cms_open_action = CMS_ASSIGN_DEFAULT;
-+    {
-         GList *update_settings = NULL;
-         GList *remove_settings = NULL;
-+	cms_open_action = CMS_ASSIGN_DEFAULT;
- 	update_settings = g_list_append(update_settings, "cms-open-action");
- 	save_gimprc(&update_settings, &remove_settings); 
- 	g_list_free(update_settings);
-@@ -1939,6 +1961,7 @@ cms_convert_on_open_prompt(GImage *image
-     GtkWidget *table;
-     GtkWidget *vbox;
-     GtkWidget *alignment;
-+    gboolean return_value;
- 
-     CMSConvertOnOpenPromptData *data = g_new(CMSConvertOnOpenPromptData, 1);
- 
-@@ -2010,7 +2033,7 @@ cms_convert_on_open_prompt(GImage *image
-     data->event_loop = g_main_new(FALSE);    
-     g_main_run(data->event_loop);
- 
--    gboolean return_value = data->return_value;
-+    return_value = data->return_value;
-     g_main_destroy(data->event_loop);
-     g_free(data);
- 
-@@ -2023,9 +2046,9 @@ cms_convert_on_open_prompt_yes_callback 
- {   data->return_value = TRUE;  
-     if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(data->auto_convert_check)))
-     {   /* cms_auto_convert is global preference variable */
--        cms_mismatch_action = CMS_MISMATCH_AUTO_CONVERT;
-         GList *update_settings = NULL;
-         GList *remove_settings = NULL;
-+        cms_mismatch_action = CMS_MISMATCH_AUTO_CONVERT;
- 	update_settings = g_list_append(update_settings, "cms-mismatch-action");
- 	save_gimprc(&update_settings, &remove_settings); 
- 	g_list_free(update_settings);
diff --git a/graphics/cinepaint/patches/patch-ae b/graphics/cinepaint/patches/patch-ae
deleted file mode 100644
index 2d09dfd7e9c..00000000000
--- a/graphics/cinepaint/patches/patch-ae
+++ /dev/null
@@ -1,73 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/03/16 18:32:50 rillig Exp $
-
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- app/color_correction.c.orig	Tue Nov 23 12:58:15 2004
-+++ app/color_correction.c	Wed Mar 16 18:13:56 2005
-@@ -103,16 +103,19 @@ color_correction_free_transfer_LUTs (voi
- void 
- color_correction_init_lab_transforms (GImage *image)
- {   CMSProfile *image_profile = gimage_get_cms_profile(image);
-+    CMSProfile *lab_profile;
-+    GSList *profiles = NULL;
-+    Tag t;
-+    DWORD lcms_format;
-     if (!image_profile) 
-     {   image_profile = cms_get_srgb_profile();
-     }
- 
--    CMSProfile *lab_profile = cms_get_lab_profile(NULL);
--    GSList *profiles = NULL;
-+    lab_profile = cms_get_lab_profile(NULL);
-     profiles = g_slist_append(profiles, image_profile);
-     profiles = g_slist_append(profiles, lab_profile);
--    Tag t = canvas_tag(drawable_data(gimage_active_drawable(image)));
--    DWORD lcms_format = cms_get_lcms_format(t, image_profile);
-+    t = canvas_tag(drawable_data(gimage_active_drawable(image)));
-+    lcms_format = cms_get_lcms_format(t, image_profile);
-     color_correction_to_lab_transform = cms_get_transform(profiles, lcms_format, TYPE_Lab_16, INTENT_PERCEPTUAL, 0);
-     
-     profiles = g_slist_remove(profiles, image_profile);
-@@ -141,6 +144,13 @@ color_correction (PixelArea *src_area,
-     /* r,g,b values of the colour we are interpolating with, sat and lightness */
-     gfloat rgb[3][3];
-     int i=0;
-+    gint width, height, num_channels, row_overhead;
-+    gboolean has_alpha;
-+    guint16 Lab[3],new_Lab[3];
-+    gint16 new_col[3];
-+    /* buffers to hold a colour value in float, used with HLS */
-+    float fcol[3], fnew_col[3];
-+    guint8 *s, *d;
- 
-     /* get the fully saturated colour of given hue in rgb 
-        this is the colour we are moving towards/interpolating with */
-@@ -155,21 +165,17 @@ color_correction (PixelArea *src_area,
- 	i++;
-     }
- 
--    gint width = pixelarea_width(src_area);
--    gint height = pixelarea_height(src_area);
--    gint num_channels = tag_num_channels(pixelarea_tag(src_area));
-+    width = pixelarea_width(src_area);
-+    height = pixelarea_height(src_area);
-+    num_channels = tag_num_channels(pixelarea_tag(src_area));
-     /* overhead is in pixels */
--    gint row_overhead = pixelarea_rowstride(src_area)/pixelarea_bytes(src_area) - width;
--    gboolean has_alpha = tag_alpha(pixelarea_tag(src_area)) == ALPHA_YES ? TRUE : FALSE;
-+    row_overhead = pixelarea_rowstride(src_area)/pixelarea_bytes(src_area) - width;
-+    has_alpha = tag_alpha(pixelarea_tag(src_area)) == ALPHA_YES ? TRUE : FALSE;
-     
-     /* buffers to hold a Lab colour value, used with Lab */
--    guint16 Lab[3],new_Lab[3];
--    gint16 new_col[3];
--    /* buffers to hold a colour value in float, used with HLS */
--    float fcol[3], fnew_col[3];
- 
--    guint8 *s = (guint8 *)pixelarea_data(src_area);
--    guint8 *d = (guint8 *)pixelarea_data(dest_area);
-+    s = (guint8 *)pixelarea_data(src_area);
-+    d = (guint8 *)pixelarea_data(dest_area);
-     while (height--)
-     {   
-       while (width--) {
diff --git a/graphics/cinepaint/patches/patch-af b/graphics/cinepaint/patches/patch-af
deleted file mode 100644
index 56a3d0c7dbc..00000000000
--- a/graphics/cinepaint/patches/patch-af
+++ /dev/null
@@ -1,250 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/03/16 18:32:50 rillig Exp $
-
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- app/color_correction_gui.c.orig	Tue Nov 23 12:58:15 2004
-+++ app/color_correction_gui.c	Wed Mar 16 18:24:44 2005
-@@ -246,12 +246,14 @@ static void _color_correction_gui_save_p
- 
- void 
- color_correction_gui (GDisplay *display)
--{   if (! drawable_color (gimage_active_drawable (display->gimage)))
-+{
-+    _ColorCorrectionGui *data;
-+    if (! drawable_color (gimage_active_drawable (display->gimage)))
-     {   g_message ("Color correction operates only on RGB color drawables.");
-         return;
-     }
- 
--    _ColorCorrectionGui *data = g_new(_ColorCorrectionGui, 1);
-+    data = g_new(_ColorCorrectionGui, 1);
-     data->display = display;
-     data->active=TRUE;
-     data->image_map = image_map_create (data->display, 
-@@ -280,6 +282,7 @@ _color_correction_gui_create (_ColorCorr
-     GtkWidget *label =NULL;
-     GtkWidget *notebook = NULL;
-     GtkWidget *frame = NULL;
-+    int i;
-        
- 
-     /*** MAIN SHELL AND NOTEBOOK */
-@@ -308,9 +311,14 @@ _color_correction_gui_create (_ColorCorr
-     gtk_notebook_append_page(GTK_NOTEBOOK(notebook), hbox, button);
- 
-     /*** WHEELS + SLIDERS + INPUTS ***/
--    int i;
-     for (i=SHADOWS; i<=HIGHLIGHTS; i++)
--    {   data->settings->values[i][HUE]=0.0;      
-+    {
-+        _ColorCorrectionGuiWheel *wheel_data;
-+        _ColorCorrectionGuiLSlider *lslider_data;
-+        GtkObject *hue_adjustment, *saturation_adjustment, *lightness_adjustment;
-+        _ColorCorrectionGuiSpin *spin_data;
-+
-+        data->settings->values[i][HUE]=0.0;      
-         data->settings->values[i][SATURATION]=0.0;      
- 	data->settings->values[i][LIGHTNESS]=0.0;      
-       
-@@ -334,7 +342,7 @@ _color_correction_gui_create (_ColorCorr
- 	/* WHEEL */
- 	data->color_wheels[i] = gtk_drawing_area_new ();
- 	gtk_drawing_area_size(GTK_DRAWING_AREA(data->color_wheels[i]), WHEEL_RADIUS*2+2,WHEEL_RADIUS*2+2); 
--	_ColorCorrectionGuiWheel *wheel_data=g_new(_ColorCorrectionGuiWheel, 1);
-+	wheel_data=g_new(_ColorCorrectionGuiWheel, 1);
- 	wheel_data->range = i;
- 	wheel_data->pixmap = NULL;
- 	wheel_data->display_buffer = NULL;
-@@ -366,7 +374,7 @@ _color_correction_gui_create (_ColorCorr
- 	//	gtk_widget_set_style(frame, style);
- 
- 	data->lsliders[i] = gtk_drawing_area_new();    
--	_ColorCorrectionGuiLSlider *lslider_data = g_new(_ColorCorrectionGuiLSlider, 1);
-+	lslider_data = g_new(_ColorCorrectionGuiLSlider, 1);
- 	lslider_data->range= i;
- 	lslider_data->gc = NULL;
- 	lslider_data->pixmap = NULL;
-@@ -384,15 +392,15 @@ _color_correction_gui_create (_ColorCorr
- 
- 
- 	/* INNPUTS */
--	GtkObject *hue_adjustment = gtk_adjustment_new(0.0, 0.0, 360.0, 1.0, 0.0, 0.0);
--	GtkObject *saturation_adjustment = gtk_adjustment_new(0.0, 0.0, 100.0, 1.0, 0.0, 0.0);
--	GtkObject *lightness_adjustment = gtk_adjustment_new(0.0, 0.0, 100.0, 1.0, 0.0, 0.0);
-+	hue_adjustment = gtk_adjustment_new(0.0, 0.0, 360.0, 1.0, 0.0, 0.0);
-+	saturation_adjustment = gtk_adjustment_new(0.0, 0.0, 100.0, 1.0, 0.0, 0.0);
-+	lightness_adjustment = gtk_adjustment_new(0.0, 0.0, 100.0, 1.0, 0.0, 0.0);
- 
- 	hbox = gtk_hbox_new(FALSE, 0);
- 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3);    
- 
- 
--	_ColorCorrectionGuiSpin *spin_data = g_new(_ColorCorrectionGuiSpin, 1);
-+	spin_data = g_new(_ColorCorrectionGuiSpin, 1);
- 	spin_data->range = i;
- 	spin_data->attribute = HUE;
- 	label = gtk_label_new("H");
-@@ -501,10 +509,10 @@ static void
- _color_correction_gui_update_wheel_handle (_ColorCorrectionGui *dialog,
- 					   ColorCorrectionLightnessRange range)
- {   _ColorCorrectionGuiWheel *data;
-+     gint new_pos[2]; 
-      data = (_ColorCorrectionGuiWheel *)gtk_object_get_data(GTK_OBJECT(dialog->color_wheels[range]), 
- 								"data");
-      
--     gint new_pos[2]; 
-      _color_correction_gui_wheel_hs_to_pos(dialog->settings->values[range][HUE],
- 					   dialog->settings->values[range][SATURATION],
- 					   data->radius, data->radius,
-@@ -521,10 +529,11 @@ static void
- _color_correction_gui_update_lslider_handle (_ColorCorrectionGui *dialog,
- 					     ColorCorrectionLightnessRange range)
- {   _ColorCorrectionGuiLSlider *data;
-+    gint new_position;
-     data = (_ColorCorrectionGuiLSlider *)gtk_object_get_data(GTK_OBJECT(dialog->lsliders[range]), 
- 								  "data");
- 
--    gint new_position =  (0.5-dialog->settings->values[range][LIGHTNESS]) * data->height;
-+    new_position =  (0.5-dialog->settings->values[range][LIGHTNESS]) * data->height;
-     if (new_position != data->position)
-     {   _color_correction_gui_erase_lslider_handle(dialog->lsliders[range], data);
-         data->position = new_position;
-@@ -625,13 +634,13 @@ _color_correction_gui_wheel_events_cb (G
-       {   data->active = data->active ? FALSE : TRUE;
- 	  if (data->active) 
- 	  {
-+	     _ColorCorrectionGuiLSlider *slider_data;
-    	     /* reset values from positions */
-   	     _color_correction_gui_wheel_pos_to_hs(data->position[X]-data->x, 
- 					      data->position[Y]-data->y, 
- 					      data->radius, data->radius, 
- 					      &dialog->settings->values[data->range][HUE], 
- 					      &dialog->settings->values[data->range][SATURATION]); 
--	     _ColorCorrectionGuiLSlider *slider_data;
- 	     slider_data = (_ColorCorrectionGuiLSlider *)gtk_object_get_data(GTK_OBJECT(dialog->lsliders[data->range]), 
- 										 "data");
- 	     dialog->settings->values[data->range][LIGHTNESS] = (1-slider_data->position/(gfloat)slider_data->height) - 0.5;	     
-@@ -697,6 +706,7 @@ _color_correction_gui_lslider_events_cb 
- 				 GdkEvent  *event,
- 				 _ColorCorrectionGui *dialog)
- {   _ColorCorrectionGuiLSlider *data = (_ColorCorrectionGuiLSlider *)gtk_object_get_data(GTK_OBJECT(widget), "data");
-+    gfloat new_lightness;
- 
-     switch (event->type)
-     {
-@@ -716,7 +726,7 @@ _color_correction_gui_lslider_events_cb 
-       _color_correction_gui_erase_lslider_handle(widget, data);
- 
-       data->position=event->button.y;
--      gfloat new_lightness = (1-data->position/(gfloat)data->height) -0.5;
-+      new_lightness = (1-data->position/(gfloat)data->height) -0.5;
-       if (dialog->settings->values[data->range][LIGHTNESS] != new_lightness) 
-       {   if(dialog->settings->values[data->range][LIGHTNESS] == 0)
- 	  {   dialog->settings->lightness_modified ++;
-@@ -740,7 +750,7 @@ _color_correction_gui_lslider_events_cb 
-       if (data->dragging)
-       {   _color_correction_gui_erase_lslider_handle(widget, data);
-           data->position=event->button.y;
--	  gfloat new_lightness = (1-data->position/(gfloat)data->height) -0.5;
-+	  new_lightness = (1-data->position/(gfloat)data->height) -0.5;
- 	  if (dialog->settings->values[data->range][LIGHTNESS] != new_lightness) 
-           {   if(dialog->settings->values[data->range][LIGHTNESS] == 0)
- 	      {   dialog->settings->lightness_modified ++;
-@@ -843,6 +853,7 @@ _color_correction_gui_draw_wheel (GtkWid
-     gfloat h,s,l;
-     guchar color[3];
-     _ColorCorrectionGuiWheel *data = (_ColorCorrectionGuiWheel *)gtk_object_get_data(GTK_OBJECT(drawing_area), "data");
-+    int xmax, ymax;
-     
-     /* translate the marker to the new size */
-     gint new_width, new_height;
-@@ -875,7 +886,6 @@ _color_correction_gui_draw_wheel (GtkWid
- 		       TRUE, 0,0, data->width, data->height);
- 
-     /* iterate over wheel calculating hue and saturation */
--    int xmax, ymax;
-     data->x = data->width/2-data->radius;
-     data->y = data->height/2-data->radius;
-     xmax = data->x + 2 * data->radius;
-@@ -903,14 +913,20 @@ _color_correction_gui_draw_wheel (GtkWid
- 
- static void
- _color_correction_gui_draw_wheel_handle (GtkWidget *drawing_area, _ColorCorrectionGuiWheel *data)
--{   gdk_gc_set_foreground(data->gc, &GTK_WIDGET(drawing_area)->style->black);
-+{
-+    GdkRectangle update_area;
-+
-+    gdk_gc_set_foreground(data->gc, &GTK_WIDGET(drawing_area)->style->black);
-    
-     gdk_draw_arc(data->display_buffer, data->gc, FALSE, 
- 		 data->position[X]-5, data->position[Y]-5,
- 		 10,10,0,23040); /* last two params are angle in 1/64th of degree */
-     gdk_draw_point(data->display_buffer, data->gc, 
- 		   data->position[X], data->position[Y]);
--    GdkRectangle update_area = {data->position[X]-5, data->position[Y]-5, 11, 11};
-+    update_area.x = data->position[X]-5;
-+    update_area.y = data->position[Y]-5;
-+    update_area.width = 11;
-+    update_area.height = 11;
-     gtk_widget_draw(drawing_area, &update_area);
- }
- 
-@@ -931,6 +947,7 @@ _color_correction_gui_erase_wheel_handle
- static void
- _color_correction_gui_draw_wheel_toggle(GtkWidget *drawing_area)
- {   _ColorCorrectionGuiWheel *data = (_ColorCorrectionGuiWheel *)gtk_object_get_data(GTK_OBJECT(drawing_area), "data");
-+    GdkRectangle update_area = {3,3,27,19};    
-     if (data->active) 
-     {   gdk_rgb_gc_set_foreground(data->gc, 0x777777);
-         gdk_draw_rectangle(data->display_buffer, data->gc, TRUE, 3,3, 26, 19);
-@@ -966,7 +983,6 @@ _color_correction_gui_draw_wheel_toggle(
- 		      color_correction_wheel_labels[data->range], 3);
-     }
- 
--    GdkRectangle update_area = {3,3,27,19};    
-     gtk_widget_draw(drawing_area, &update_area);
- }
- 
-@@ -1063,7 +1079,8 @@ static void
- _color_correction_gui_draw_lslider (GtkWidget *drawing_area)
- {   _ColorCorrectionGuiLSlider *data = (_ColorCorrectionGuiLSlider *)gtk_object_get_data(GTK_OBJECT(drawing_area), "data");
-     gint y;
--    
-+    int step_size, gray;
-+
-     data->height = drawing_area->allocation.height;
- 
-     if (data->gc == NULL)
-@@ -1084,8 +1101,7 @@ _color_correction_gui_draw_lslider (GtkW
- 
-     /* draw the slider */
-     gdk_gc_set_function(data->gc, GDK_COPY);
--    int step_size = 255/data->height;
--    int gray;
-+    step_size = 255/data->height;
-     for (y = 0; y < data->height; y++)
-     {   gray=255-(y*step_size);
-         gdk_rgb_gc_set_foreground(data->gc, (gray<<16) | (gray<<8) | gray);
-@@ -1102,7 +1118,9 @@ _color_correction_gui_draw_lslider (GtkW
- 
- static void
- _color_correction_gui_draw_lslider_handle (GtkWidget *drawing_area, _ColorCorrectionGuiLSlider *data)
--{   gdk_gc_set_foreground(data->gc, &drawing_area->style->white);
-+{
-+    GdkRectangle update_area;
-+    gdk_gc_set_foreground(data->gc, &drawing_area->style->white);
-     gdk_draw_line(data->display_buffer, data->gc,
- 		  0, data->position-2, LSLIDER_WIDTH, data->position-2);
-     gdk_gc_set_foreground(data->gc, &drawing_area->style->mid[GTK_STATE_NORMAL]);
-@@ -1112,7 +1130,10 @@ _color_correction_gui_draw_lslider_handl
-     gdk_draw_line(data->display_buffer, data->gc,
- 		  0, data->position+2, LSLIDER_WIDTH, data->position+2);
- 
--    GdkRectangle update_area = {0, data->position-2, LSLIDER_WIDTH, 5};
-+    update_area.x = 0;
-+    update_area.y = data->position-2;
-+    update_area.width = LSLIDER_WIDTH;
-+    update_area.height = 5;
-     gtk_widget_draw(drawing_area, &update_area);		    
- }
- 
diff --git a/graphics/cinepaint/patches/patch-ag b/graphics/cinepaint/patches/patch-ag
deleted file mode 100644
index 0f2864a3348..00000000000
--- a/graphics/cinepaint/patches/patch-ag
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/03/16 18:32:50 rillig Exp $
-
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- app/convert.c.orig	Tue Nov 23 12:58:15 2004
-+++ app/convert.c	Wed Mar 16 18:25:45 2005
-@@ -310,6 +310,9 @@ convert_image_colorspace (void *gimage_p
-     /*  get the profiles */
-     GSList *profiles = NULL;
-     CMSProfile *image_profile = gimage_get_cms_profile(image);
-+    DWORD lcms_format_in, lcms_format_out;
-+    CMSTransform *transform;
-+
-     if (image_profile == NULL)
-     {   g_warning("convert_image_colourspace: No cms profile assigned to gimage. Cannot convert.");
-         return;
-@@ -318,10 +321,10 @@ convert_image_colorspace (void *gimage_p
-     profiles = g_slist_append(profiles, (gpointer)new_profile);
- 
-     /* assuming all layers have homogenous alpha */
--    DWORD lcms_format_in  = cms_get_lcms_format(
-+    lcms_format_in  = cms_get_lcms_format(
-                               drawable_tag(GIMP_DRAWABLE(image->active_layer)),
-                               gimage_get_cms_profile(image)  );
--    DWORD lcms_format_out = cms_get_lcms_format(
-+    lcms_format_out = cms_get_lcms_format(
-                               drawable_tag(GIMP_DRAWABLE(image->active_layer)),
-                               new_profile  );
-     if  (!(int)lcms_format_in || !(int)lcms_format_out)
-@@ -330,7 +333,7 @@ convert_image_colorspace (void *gimage_p
-         return;
-     } 
- 
--    CMSTransform *transform = cms_get_transform(profiles, lcms_format_in, lcms_format_out, lcms_intent, cms_default_flags);
-+    transform = cms_get_transform(profiles, lcms_format_in, lcms_format_out, lcms_intent, cms_default_flags);
-     g_slist_free(profiles);
-     gimage_transform_colors(image, transform, TRUE);
-     cms_return_transform(transform);    
diff --git a/graphics/cinepaint/patches/patch-ah b/graphics/cinepaint/patches/patch-ah
deleted file mode 100644
index 83b360e57fe..00000000000
--- a/graphics/cinepaint/patches/patch-ah
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2005/03/16 18:32:50 rillig Exp $
-
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- app/depth/commands.c.orig	Fri Dec  3 21:25:34 2004
-+++ app/depth/commands.c	Wed Mar 16 17:38:10 2005
-@@ -2136,7 +2136,7 @@ file_pref_cmd_callback (GtkWidget *widge
- 			 (gpointer)&cms_default_image_profile_name );
-       gtk_menu_set_active(GTK_MENU(menu), 0);
- 
--      GSList *profile_file_names = cms_read_standard_profile_dirs(CMS_ANY_PROFILECLASS);            
-+      {GSList *profile_file_names = cms_read_standard_profile_dirs(CMS_ANY_PROFILECLASS);            
-       GSList *iterator = profile_file_names;
-       gchar *current_filename;
-       CMSProfile *current_profile;
-@@ -2280,7 +2280,7 @@ file_pref_cmd_callback (GtkWidget *widge
-       gtk_widget_show(label);
-       
-       menu = gtk_menu_new (); 
--      guint8 *value;
-+      {guint8 *value;
-       menuitem = gtk_menu_item_new_with_label ("Perceptual");
-       gtk_menu_append (GTK_MENU (menu), menuitem);
-       value = g_new(guint8, 1);
-@@ -2347,7 +2347,7 @@ file_pref_cmd_callback (GtkWidget *widge
-       gtk_widget_show(label);
-       
-       menu = gtk_menu_new (); 
--      guint16 *value16;
-+      {guint16 *value16;
-       menuitem = gtk_menu_item_new_with_label ("CMM default");
-       gtk_menu_append (GTK_MENU (menu), menuitem);
-       value16 = g_new(guint16, 1);
-@@ -2558,7 +2558,7 @@ file_pref_cmd_callback (GtkWidget *widge
-       label = gtk_label_new ("Color Management");
-       gtk_notebook_append_page (GTK_NOTEBOOK(notebook), out_frame, label);
-       gtk_widget_show (notebook);	  
--    }
-+    }}}}
- 
-   gtk_widget_show (prefs_dlg);      
- }
diff --git a/graphics/cinepaint/patches/patch-ai b/graphics/cinepaint/patches/patch-ai
deleted file mode 100644
index 6d867979cf4..00000000000
--- a/graphics/cinepaint/patches/patch-ai
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2005/03/16 18:32:50 rillig Exp $
-
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- app/depth/layer.c.orig	Tue Dec 28 17:22:01 2004
-+++ app/depth/layer.c	Wed Mar 16 17:39:33 2005
-@@ -197,6 +197,7 @@ layer_new  (
-             )
- {
-   Layer * layer;
-+  SplineTool *st;
- 
-   if (width == 0 || height == 0) {
-     g_message ("Zero width or height layers not allowed.");
-@@ -233,7 +234,6 @@ layer_new  (
-   layer->fs.num_segs = 0;
- 
-   /* spline layer variables */
--  SplineTool *st;
-   layer->sl.splines=(DL_list*)malloc(sizeof(DL_list));
-   DL_init((DL_node*)layer->sl.splines);
-   st=(SplineTool*)malloc(sizeof(SplineTool));
diff --git a/graphics/cinepaint/patches/patch-aj b/graphics/cinepaint/patches/patch-aj
deleted file mode 100644
index 863b4987ad6..00000000000
--- a/graphics/cinepaint/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2005/03/16 18:32:50 rillig Exp $
-
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- app/depth/levels.c.orig	Tue Nov 23 13:01:51 2004
-+++ app/depth/levels.c	Wed Mar 16 17:47:55 2005
-@@ -4173,13 +4173,12 @@ levels_reset_callback       (GtkWidget *
- {
-   LevelsDialog *ld;
-   HistogramValues *values;
-+  int single, channel;
- 
-   ld = levels_dialog;
-   values = histogram_values (ld->histogram);
- 
--  int single = FALSE,
--      channel;
--
-+  single = FALSE;
-   channel = ld->channel;
- 
-   if (channel != HISTOGRAM_VALUE)
diff --git a/graphics/cinepaint/patches/patch-ak b/graphics/cinepaint/patches/patch-ak
deleted file mode 100644
index 3d5b8662370..00000000000
--- a/graphics/cinepaint/patches/patch-ak
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2005/03/16 18:32:50 rillig Exp $
-
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- app/fileops.c.orig	Tue Nov 23 12:58:14 2004
-+++ app/fileops.c	Wed Mar 16 18:29:30 2005
-@@ -2021,6 +2021,7 @@ file_temp_name(char *extension) 
-     static gint pid;
- 
-     GString *s = g_string_new (NULL);
-+    char *file_name;
- 
-     if (id == 0)
-     {   pid = getpid();
-@@ -2030,8 +2031,8 @@ file_temp_name(char *extension) 
- 		      id++, extension);
- 
- 
--    char *file_name = strdup(s->str);  
--    g_string_free (s, FALSE);
-+    file_name = strdup(s->str);   /* FIXME: possible null pointer access */
-+    g_string_free (s, FALSE); /* FIXME: memory leak */
-     return file_name;
- }
- 
diff --git a/graphics/cinepaint/patches/patch-al b/graphics/cinepaint/patches/patch-al
deleted file mode 100644
index 351d681f7c1..00000000000
--- a/graphics/cinepaint/patches/patch-al
+++ /dev/null
@@ -1,121 +0,0 @@
-$NetBSD: patch-al,v 1.1 2005/03/16 18:32:50 rillig Exp $
-
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- app/gdisplay.c.orig	Fri Dec  3 23:16:18 2004
-+++ app/gdisplay.c	Wed Mar 16 18:32:58 2005
-@@ -90,6 +90,7 @@ gdisplay_new (GImage       *gimage,
-   GSList *cur_wid_list;
-   char title [MAX_TITLE_BUF];
-   int instance;
-+  Tag t;
- 
-   /*  If there isn't an interface, never create a gdisplay  */
-   if (no_interface)
-@@ -181,7 +182,7 @@ gdisplay_new (GImage       *gimage,
-   gdisplays_update_title (gimage->ID); 
- 
-   /* initialize the projection */
--  Tag t = gimage_tag (gdisp->gimage);
-+  t = gimage_tag (gdisp->gimage);
-   t = tag_set_alpha (t, ALPHA_YES);
-   if (tag_format (t) == FORMAT_INDEXED)
-   {   t = tag_set_format (t, FORMAT_RGB);  
-@@ -225,11 +226,11 @@ gdisplay_format_title (GImage *gimage,
-   int empty = gimage_is_empty (gimage);
-   Tag t = gimage_tag (gimage);
-   char *alpha_msg = ""; /*"no alpha";*/
-+  const char *profile;
-   if (layer_has_alpha(gimage->active_layer)){
-     alpha_msg = "A"; /*"alpha";*/
-   }
- 
--  const char *profile;
-   if (gimage_get_cms_profile(gimage) != NULL)
-   {   profile = cms_get_profile_info(gimage_get_cms_profile(gimage))->description;
-   }
-@@ -373,6 +374,8 @@ gdisplay_process_area_list (GSList *list
- static void 
- gdisplay_project (GDisplay *display, int x, int y, int w, int h) 
- {   /* realloc projection if  necessary */ 
-+    PixelArea image_projection_area;
-+    PixelArea display_projection_area;
-     if((display->gimage->width != canvas_width(display->projection)) ||
- 	    (display->gimage->height != canvas_height(display->projection)) ||
-        (canvas_tag(display->projection) != canvas_tag(gimage_projection(display->gimage))))
-@@ -400,8 +403,6 @@ gdisplay_project (GDisplay *display, int
- 
- 
-     /* Stefan Klein: temporary solution, just copy projection calculated in gimage */
--    PixelArea image_projection_area;
--    PixelArea display_projection_area;
- 
-     gimage_construct(display->gimage, x,y,w,h);
-     pixelarea_init (&image_projection_area, gimage_projection(display->gimage), x,y,w,h, FALSE);
-@@ -1918,7 +1919,9 @@ gdisplay_set_cms_flags(GDisplay *display
- 
- gboolean       
- gdisplay_set_colormanaged(GDisplay *display, gboolean colormanaged)
--{   if (colormanaged != display->colormanaged)
-+{
-+    GString *buffer;
-+    if (colormanaged != display->colormanaged)
-     {   if ((colormanaged == TRUE) && (gimage_get_cms_profile(display->gimage) == NULL))
-         {   g_warning("gdisplay_set_colormanaged: cannot colormanage. no display profile defined");  
-    	    return FALSE;
-@@ -1930,7 +1933,7 @@ gdisplay_set_colormanaged(GDisplay *disp
- 
- 	display->colormanaged = colormanaged;
- 	/* set the toggle menu */
--	GString *buffer = g_string_new(NULL);
-+	buffer = g_string_new(NULL);
- 	g_string_sprintf(buffer, "<Image%d>/View/Colormanage Display", display->unique_id);
- 	menus_set_state (buffer->str, colormanaged);
- 	g_string_free(buffer, TRUE);
-@@ -1945,15 +1948,17 @@ gdisplay_set_colormanaged(GDisplay *disp
- 
- gboolean 
- gdisplay_all_set_colormanaged(gboolean colormanaged)
--{   if ((colormanaged == TRUE) && (cms_display_profile_name == NULL))
-+{
-+    gboolean some_without_profile = FALSE; 
-+    GSList *list = display_list;
-+    GDisplay *current_display;
-+    GString *buffer;
-+    if ((colormanaged == TRUE) && (cms_display_profile_name == NULL))
-     {   g_warning("gdisplay_all_set_colormanaged: cannot colormanage. no display profile defined");    
-         return FALSE;
-     }
-     
--    gboolean some_without_profile = FALSE; 
--    GSList *list = display_list;
--    GDisplay *current_display;
--    GString *buffer = g_string_new(NULL);
-+    buffer = g_string_new(NULL);
- 
-     /*  traverse the linked list of displays  */
-     while (list)
-@@ -1986,15 +1991,18 @@ gdisplay_all_set_colormanaged(gboolean c
- 
- gboolean
- gdisplay_image_set_colormanaged(int image_id, gboolean colormanaged)
--{   if ((colormanaged == TRUE) && (cms_display_profile_name == NULL))
-+{
-+    gboolean some_without_profile = FALSE; 
-+    GSList *list = display_list;
-+    GDisplay *current_display;
-+    GString *buffer;
-+
-+    if ((colormanaged == TRUE) && (cms_display_profile_name == NULL))
-     {   g_warning("gdisplay_image_set_colormanaged: cannot colormanage. no display profile defined");    
-         return FALSE;
-     }
-     
--    gboolean some_without_profile = FALSE; 
--    GSList *list = display_list;
--    GDisplay *current_display;
--    GString *buffer = g_string_new(NULL);
-+    buffer = g_string_new(NULL);
- 
-     /*  traverse the linked list of displays  */
-     while (list)
diff --git a/graphics/cinepaint/patches/patch-am b/graphics/cinepaint/patches/patch-am
deleted file mode 100644
index 3ed5b41ff43..00000000000
--- a/graphics/cinepaint/patches/patch-am
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-am,v 1.1 2005/03/16 18:32:50 rillig Exp $
-
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- app/gimage.c.orig	Tue Nov 23 12:58:14 2004
-+++ app/gimage.c	Wed Mar 16 18:34:14 2005
-@@ -3625,21 +3625,25 @@ gimage_set_cms_profile(GImage *image, CM
- }
- 
- void gimage_transform_colors(GImage *image, CMSTransform *transform, gboolean allow_undo)
--{   if (allow_undo)
-+{
-+    Layer *floating_layer;
-+    GSList *list = NULL;
-+
-+    if (allow_undo)
-     {   undo_push_group_start (image, GIMAGE_MOD_UNDO);
-     }
- 
-     /*  Relax the floating selection  */
--    Layer* floating_layer = gimage_floating_sel (image);
-+    floating_layer = gimage_floating_sel (image);
-     if (floating_layer)
-     {   floating_sel_relax (floating_layer, TRUE);
-     }
-   
--    GSList *list = NULL;
-     /*  Convert all layers  */
-     for (list = image->layers; list; list = g_slist_next (list))
-     {   /* get the original layer */
-         Layer * layer = (Layer *) list->data;
-+        PixelArea transform_area;        
- 
-         /* get the data */
-         Canvas *tiles = drawable_data (GIMP_DRAWABLE (layer));
-@@ -3653,7 +3657,6 @@ void gimage_transform_colors(GImage *ima
- 	}
- 
-         /* get the transform and convert */
--        PixelArea transform_area;        
-         pixelarea_init(&transform_area, tiles,0, 0, 
- 	               drawable_width(GIMP_DRAWABLE(layer)), 
-  	               drawable_height(GIMP_DRAWABLE(layer)), TRUE);
diff --git a/graphics/cinepaint/patches/patch-an b/graphics/cinepaint/patches/patch-an
deleted file mode 100644
index 7860b444d4d..00000000000
--- a/graphics/cinepaint/patches/patch-an
+++ /dev/null
@@ -1,337 +0,0 @@
-$NetBSD: patch-an,v 1.1 2005/03/16 18:32:50 rillig Exp $
-
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- app/look_profile.c.orig	Tue Nov 23 12:58:14 2004
-+++ app/look_profile.c	Wed Mar 16 18:45:54 2005
-@@ -90,9 +90,10 @@ look_profile_change_image_height(GImage 
-     list = gimage->channels;
-     list = g_slist_append(list, gimage->selection_mask);
-     while (list)
--    {   channel = (Channel *) list->data;
-+    {
-         PixelArea src_area, dest_area;
- 	Canvas *new_canvas;
-+        channel = (Channel *) list->data;
- 
- 	/*  Update the old channel position  */
- 	drawable_update (GIMP_DRAWABLE(channel),
-@@ -194,13 +195,16 @@ look_profile_change_layer_height(Layer *
-     
-       /*  If there is a layer mask, make sure it gets resized also  */
-       if (layer->mask) 
--      {   GIMP_DRAWABLE(layer->mask)->offset_x = GIMP_DRAWABLE(layer)->offset_x;
-+      {
-+          Channel *channel;
-+	  PixelArea src_area, dest_area;
-+	  Canvas *new_canvas;
-+	  
-+          GIMP_DRAWABLE(layer->mask)->offset_x = GIMP_DRAWABLE(layer)->offset_x;
-           GIMP_DRAWABLE(layer->mask)->offset_y = GIMP_DRAWABLE(layer)->offset_y;
- 
- 
--	  Channel* channel = GIMP_CHANNEL(layer->mask);
--	  PixelArea src_area, dest_area;
--	  Canvas *new_canvas;
-+	  channel = GIMP_CHANNEL(layer->mask);
- 
- 	  /*  Update the old channel position  */
- 	  drawable_update (GIMP_DRAWABLE(channel),
-@@ -253,6 +257,18 @@ look_profile_change_layer_height(Layer *
- LookProfile *
- look_profile_create(GImage *image, gint sample_depth)
- {   LookProfile *look_profile;
-+    PixelArea sample_area;
-+    CMSProfile *lab_profile, *input_profile;
-+    GSList *profiles = NULL;
-+    DWORD lcms_format_out;
-+    CMSTransform *transform;
-+    guint16 Lab[3];
-+    guint8 rgb[3];
-+    PixelRow row_buffer;
-+    void *pag;
-+    gint col_index;
-+    guint8 *row_data;
-+    gint sample_step;
-             
-     gint num_pix = pow(sample_depth, 3);
-        
-@@ -267,37 +283,32 @@ look_profile_create(GImage *image, gint 
- #endif
- 
-     
--    PixelArea sample_area;
-     pixelarea_init(&sample_area, look_profile->canvas, 
- 		   0, 0, canvas_width(look_profile->canvas), 1, TRUE);
-   
-     /* get a lab->rgb transform 
-        (the reference strip is calculated iterating over Lab, the image is rgb) */
--    CMSProfile *lab_profile = cms_get_lab_profile(NULL);
--    CMSProfile *input_profile = gimage_get_cms_profile(image);
-+    lab_profile = cms_get_lab_profile(NULL);
-+    input_profile = gimage_get_cms_profile(image);
-     if (!input_profile) 
-     {   input_profile = cms_get_srgb_profile();
-     }
- 
--    GSList *profiles = NULL;
-     profiles = g_slist_append(profiles, lab_profile);
-     profiles = g_slist_append(profiles, input_profile);
--    DWORD lcms_format_out= cms_get_lcms_format(gimage_tag(image),input_profile);
--    CMSTransform *transform = cms_get_transform(profiles, TYPE_Lab_16,
-+    lcms_format_out= cms_get_lcms_format(gimage_tag(image),input_profile);
-+    transform = cms_get_transform(profiles, TYPE_Lab_16,
- 						lcms_format_out,
- 						INTENT_PERCEPTUAL,
-                                                 cms_default_flags);
-     g_slist_free(profiles);
- 
-     /* iterate over Lab space, converting to rgb, filling into picture */
--    guint16 Lab[3];
--    guint8 rgb[3];
--    PixelRow row_buffer;
--    void *pag = pixelarea_register (1, &sample_area);
-+    pag = pixelarea_register (1, &sample_area);
-     pixelarea_getdata (&sample_area, &row_buffer, 0);
--    gint col_index = pixelrow_width(&row_buffer);
--    guint8 *row_data = pixelrow_data(&row_buffer);
--    gint sample_step = 65535/(sample_depth-1);
-+    col_index = pixelrow_width(&row_buffer);
-+    row_data = pixelrow_data(&row_buffer);
-+    sample_step = 65535/(sample_depth-1);
- 
-     Lab[0]=Lab[1]=Lab[2]=0;
-     while (TRUE)
-@@ -384,8 +395,10 @@ look_profile_new_dialog ()
- void 
- look_profile_include (LookProfile *profile, ImageMapApplyFunc func, void *data)
- {   PixelArea src_area, dest_area;
-+    Canvas *new_canvas;
-+    void *pag;
-     pixelarea_init(&src_area, profile->canvas, 0,0, canvas_width(profile->canvas), 1, FALSE);
--    Canvas *new_canvas= canvas_new (canvas_tag(profile->canvas), canvas_width(profile->canvas), 1,
-+    new_canvas= canvas_new (canvas_tag(profile->canvas), canvas_width(profile->canvas), 1,
- #ifdef NO_TILES						  
- 						  STORAGE_FLAT);
- #else
-@@ -393,7 +406,6 @@ look_profile_include (LookProfile *profi
- #endif
-     pixelarea_init(&dest_area, new_canvas, 0,0, canvas_width(profile->canvas), 1, TRUE);
- 
--    void *pag;
-     for (pag = pixelarea_register (2, &src_area, &dest_area);
- 	 pag != NULL;
- 	 pag = pixelarea_process (pag))
-@@ -431,6 +443,13 @@ void
- look_profile_save (LookProfile *profile,
- 		   gchar *file_name, int intent, DWORD flags)
- {   /* create a new profile, abstract, Lab */
-+    LPLUT AToB0;
-+    SampleInfo *sample_info;
-+    CMSProfile *input_profile, *lab_profile;
-+    Tag t;
-+    GSList *profiles = NULL;
-+    PixelRow row_buffer;
-+
-     cmsHPROFILE saved_profile = cmsOpenProfileFromFile(file_name, "w");
-     cmsSetColorSpace(saved_profile, icSigLabData);
-     cmsSetPCS(saved_profile, icSigLabData);
-@@ -438,22 +457,21 @@ look_profile_save (LookProfile *profile,
- 
-     cmsSetDeviceClass(saved_profile, icSigAbstractClass);
- 
--    LPLUT AToB0 = cmsAllocLUT();
-+    AToB0 = cmsAllocLUT();
-     cmsAlloc3DGrid(AToB0, profile->sample_depth, 3, 3);
-     
--    SampleInfo *sample_info = g_new(SampleInfo, 1);
-+    sample_info = g_new(SampleInfo, 1);
-     sample_info->profile = profile;
- 
-     /* create a transform from image space to lab (the space of the 
-        new abstract profile, just the other way from  before)*/
--    CMSProfile *input_profile = gimage_get_cms_profile(sample_info->profile->image);
-+    input_profile = gimage_get_cms_profile(sample_info->profile->image);
-     if (!input_profile) 
-     {   input_profile = cms_get_srgb_profile();
-     }
--    CMSProfile *lab_profile = cms_get_lab_profile(NULL);
-+    lab_profile = cms_get_lab_profile(NULL);
- 
--    Tag t = gimage_tag(sample_info->profile->image);
--    GSList *profiles = NULL;
-+    t = gimage_tag(sample_info->profile->image);
-     profiles = g_slist_append(profiles, input_profile);
-     profiles = g_slist_append(profiles, lab_profile);
-     sample_info->transform = cms_get_transform(profiles,
-@@ -466,7 +484,6 @@ look_profile_save (LookProfile *profile,
- 		   canvas_width(profile->canvas), 1,FALSE);
- 
-     sample_info->pag = pixelarea_register (1, &sample_info->sample_area);
--    PixelRow row_buffer;
-     pixelarea_getdata (&sample_info->sample_area, &row_buffer, 0);
-     sample_info->col_index = pixelrow_width (&row_buffer);
-     sample_info->current_pixel = pixelrow_data(&row_buffer);
-@@ -700,28 +717,33 @@ _look_profile_gui_free_row_data(gpointer
- 
- static void 
- _look_profile_gui_update_list(_LookProfileGui *data)
--{   data->row_count=0;    
-+{
-+    GSList *profile_file_names, *iterator;
-+    gint path_length;
-+    char *file_path;
-+    _LookProfileGuiRowData *row_data = NULL;
-+
-+    data->row_count=0;    
-     gtk_clist_clear(GTK_CLIST(data->profile_list));
- 
--    GSList *profile_file_names = cms_read_icc_profile_dir(look_profile_path, icSigAbstractClass);     
-+    profile_file_names = cms_read_icc_profile_dir(look_profile_path, icSigAbstractClass);     
-     if (!profile_file_names)
-     {   return;
-     }
- 
--    gint path_length = strlen(look_profile_path); 
--    gchar *file_path;
-+    path_length = strlen(look_profile_path); 
-     /* row_data[0] contains the path of the profile,
-        row_data[1] is NULL if off, profile handle if on */
--    _LookProfileGuiRowData *row_data = NULL;
- 
--    GSList *iterator = profile_file_names; 
-+    iterator = profile_file_names; 
-     while (iterator != NULL)      
--    {   file_path = (gchar *)iterator->data;
-+    {
-+	/* the text to display in the row, one element per column */
-+	gchar *row_text[2] = {NULL, NULL};
-+        file_path = (gchar *)iterator->data;
-         row_data = g_new(_LookProfileGuiRowData, 1);
-         row_data->file_name = file_path;
- 	row_data->handle = NULL;
--	/* the text to display in the row, one element per column */
--	gchar *row_text[2] = {NULL, NULL};
-         /* strdup(file_path + path_length + 1) extracts the filename from the path */
- 	row_text[1] = strdup(file_path + path_length + 1);
-         gtk_clist_insert(GTK_CLIST(data->profile_list), data->row_count, row_text);	    
-@@ -813,10 +835,10 @@ _look_profile_gui_open_cb (GtkWidget *wi
- 
- static void 
- _look_profile_gui_open_ok_cb(GtkWidget *widget, _LookProfileGui *data) 
--{   look_profile_path = strdup(gtk_file_selection_get_filename (GTK_FILE_SELECTION(data->file_selector)));
--
-+{
-     GList *update_settings = NULL;
-     GList *remove_settings = NULL;
-+    look_profile_path = strdup(gtk_file_selection_get_filename (GTK_FILE_SELECTION(data->file_selector)));
-     update_settings = g_list_append(update_settings, "look-profile-path");
-     save_gimprc(&update_settings, &remove_settings); 
-     g_list_free(update_settings);
-@@ -829,6 +851,10 @@ void 
- _look_profile_gui_apply(_LookProfileGui *data)
- {   GSList *profiles = NULL;
-     CMSProfile *image_profile = gimage_get_cms_profile(data->display->gimage);
-+    DWORD lcms_format;
-+    CMSTransform *transform;
-+    int i;
-+
-     if (image_profile == NULL)
-     {   image_profile = cms_get_srgb_profile();
-     }
-@@ -836,9 +862,9 @@ _look_profile_gui_apply(_LookProfileGui 
-     profiles = g_slist_append(profiles, (gpointer)image_profile);
-     profiles = g_slist_concat(profiles, g_slist_copy(gdisplay_get_look_profile_pipe(data->display)));
-     profiles = g_slist_append(profiles, (gpointer)image_profile);
--    DWORD lcms_format = cms_get_lcms_format(gimage_tag(data->display->gimage),
-+    lcms_format = cms_get_lcms_format(gimage_tag(data->display->gimage),
-                                             image_profile);
--    CMSTransform *transform = cms_get_transform(profiles,
-+    transform = cms_get_transform(profiles,
-                                         lcms_format, lcms_format,
-                                         gdisplay_get_cms_intent(data->display),
-                                         gdisplay_get_cms_flags(data->display));
-@@ -847,7 +873,6 @@ _look_profile_gui_apply(_LookProfileGui 
-     cms_return_transform(transform);
- 
-     /* resets all the selections */
--    int i;
-     for (i=0; i<data->row_count; i++)
-     {   _look_profile_gui_profile_set_active(data, i, FALSE);
-     }
-@@ -855,13 +880,22 @@ _look_profile_gui_apply(_LookProfileGui 
- 
- void 
- _look_profile_gui_apply_flipbook (_LookProfileGui *data)
--{   if (data->display->bfm == NULL)
-+{
-+    GSList *profiles = NULL;
-+    CMSProfile *image_profile;
-+    DWORD lcms_format;
-+    CMSTransform *transform;
-+    GtkWidget *progress_dialog, *vbox, *progress_bar;
-+    GSList *iterator;
-+    gint num_images, count;
-+    int i;
-+
-+    if (data->display->bfm == NULL)
-     {   g_message("This display has no flipbook. Application to flipbook stores not possible");
-         return;
-     }
- 
--    GSList *profiles = NULL;
--    CMSProfile *image_profile = gimage_get_cms_profile(data->display->gimage);
-+    image_profile = gimage_get_cms_profile(data->display->gimage);
-     if (image_profile == NULL)
-     {   image_profile = cms_get_srgb_profile();
-     }
-@@ -869,23 +903,23 @@ _look_profile_gui_apply_flipbook (_LookP
-     profiles = g_slist_append(profiles, (gpointer)image_profile);
-     profiles = g_slist_concat(profiles, g_slist_copy(gdisplay_get_look_profile_pipe(data->display)));
-     profiles = g_slist_append(profiles, (gpointer)image_profile);
--    DWORD lcms_format = cms_get_lcms_format(gimage_tag(data->display->gimage), image_profile);
--    CMSTransform *transform = cms_get_transform(profiles,
-+    lcms_format = cms_get_lcms_format(gimage_tag(data->display->gimage), image_profile);
-+    transform = cms_get_transform(profiles,
-                                         lcms_format, lcms_format,
-                                         gdisplay_get_cms_intent(data->display),
-                                         gdisplay_get_cms_flags(data->display));
-     g_slist_free(profiles);
- 
-     /* create progress dialog */
--    GtkWidget *progress_dialog = gtk_window_new(GTK_WINDOW_DIALOG);    
-+    progress_dialog = gtk_window_new(GTK_WINDOW_DIALOG);    
-     gtk_window_set_wmclass (GTK_WINDOW (progress_dialog), "progress", PROGRAM_NAME);
-     gtk_window_set_title (GTK_WINDOW (progress_dialog), "Applying look to flipbook stores...");
-     gtk_window_set_position(GTK_WINDOW(progress_dialog), GTK_WIN_POS_CENTER);
- 
--    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
-+    vbox = gtk_vbox_new(FALSE, 0);
-     gtk_container_add (GTK_CONTAINER (progress_dialog), vbox);
- 
--    GtkWidget *progress_bar = gtk_progress_bar_new();
-+    progress_bar = gtk_progress_bar_new();
-     gtk_box_pack_start (GTK_BOX(vbox), progress_bar, TRUE, TRUE, 0);
-     gtk_widget_set_usize(progress_bar, 250,-1);
-     gtk_widget_show_all(progress_dialog);
-@@ -894,9 +928,9 @@ _look_profile_gui_apply_flipbook (_LookP
-     gtk_widget_draw(progress_bar, NULL);
-     gdk_flush();
- 
--    GSList *iterator = data->display->bfm->sfm->stores;
--    gint num_images = g_slist_length(iterator);
--    gint count = 0;
-+    iterator = data->display->bfm->sfm->stores;
-+    num_images = g_slist_length(iterator);
-+    count = 0;
-     while (iterator != NULL)
-     {   store *store = iterator->data;
- 	gimage_transform_colors(store->gimage, transform, FALSE);
-@@ -914,7 +948,6 @@ _look_profile_gui_apply_flipbook (_LookP
-     cms_return_transform(transform);
- 
-     /* resets all the selections */
--    int i;
-     for (i=0; i<data->row_count; i++)
-     {   _look_profile_gui_profile_set_active(data, i, FALSE);
-     }
diff --git a/graphics/cinepaint/patches/patch-ao b/graphics/cinepaint/patches/patch-ao
deleted file mode 100644
index 52db8048c46..00000000000
--- a/graphics/cinepaint/patches/patch-ao
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ao,v 1.1 2005/03/16 18:32:50 rillig Exp $
-
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- app/spline.c.orig	Tue Dec 28 17:22:02 2004
-+++ app/spline.c	Wed Mar 16 18:47:21 2005
-@@ -1028,7 +1028,8 @@ spline_stroke_ellipse(Tool *tool)
-   if(a==0)
-     return;
-   b=abs(point1->y-point2->y);
--  int x[(int)a+1], y[(int)a+1];
-+  {int x[(int)a+1], y[(int)a+1];
-+  int spacing;
-   b2=b*b;
-   b2a2=b2/(a*a);
-   for(i=0; i<a; i++)
-@@ -1038,7 +1039,7 @@ spline_stroke_ellipse(Tool *tool)
-     }
- 
-   /* this is a temporary fix to force brush spacing to 1. */
--  int spacing=gimp_brush_get_spacing();
-+  spacing=gimp_brush_get_spacing();
-   gimp_brush_set_spacing(1);
- 
-   spline_control(tool, PAUSE, display);
-@@ -1156,7 +1157,7 @@ spline_stroke_ellipse(Tool *tool)
-   gdisplay_flush(display);
-   gimp_brush_set_spacing(spacing);
- 
--}
-+}}
- 
- void 
- spline_stroke_curve(Tool *tool)
diff --git a/graphics/cinepaint/patches/patch-ap b/graphics/cinepaint/patches/patch-ap
deleted file mode 100644
index ce0bb8d1121..00000000000
--- a/graphics/cinepaint/patches/patch-ap
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2005/03/16 18:32:50 rillig Exp $
-
-gcc-2.95.3 cannot handle declarations intermixed with code.
-
---- plug-ins/tiff/tiff.c.orig	Tue Nov 23 13:17:14 2004
-+++ plug-ins/tiff/tiff.c	Wed Mar 16 16:50:25 2005
-@@ -857,12 +857,13 @@ load_image ( gchar *filename)
-         /* TODO more specific GRAYSCALE handling */
-           { size_t size = 0;
-             char* buf;
-+	    cmsHPROFILE lp;
-             LPGAMMATABLE gamma = cmsBuildGamma(256, 1.0), g;
-             if (info->photomet == PHOTOMETRIC_MINISWHITE)
-               g = cmsReverseGamma(256, gamma);
-             else
-               g = gamma;
--            cmsHPROFILE lp = cmsCreateGrayProfile(cmsD50_xyY(), g);
-+            lp = cmsCreateGrayProfile(cmsD50_xyY(), g);
-             _cmsSaveProfileToMem (lp, NULL, &size);
-             buf = (char*) calloc (sizeof(char), size);
-             _cmsSaveProfileToMem (lp, buf, &size);