1. Merge patch-ah & patch-ai to one file.

2. Add two manpages (gimptool.1 & gpc.3)
3. Remove tiff34 configure patch.
4. Correct pkg/PLIST.
5. Remove LIB_DEPENDS on xdelta, because we can't compile it on current.

1 files changed, 130 insertions, 126 deletions

diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 5339ab517bc3..8dd716d230c0 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1,4 +1,6 @@
 bin/gimp
+bin/gimptool
+include/gpc.h
 include/megawidget.h
 include/gck/gck.h
 include/gck/gckcolor.h
@@ -25,133 +27,134 @@ lib/libgimpui.a
 lib/libgimpui.la
 lib/libgimpui.so
 lib/libgimpui.so.1.0
+lib/libgpc.a
 lib/libmegawidget.a
-libexec/gimp/plug-ins/AlienMap
-libexec/gimp/plug-ins/CEL
-libexec/gimp/plug-ins/CML_explorer
-libexec/gimp/plug-ins/MapObject
-libexec/gimp/plug-ins/aa
-libexec/gimp/plug-ins/align_layers
-libexec/gimp/plug-ins/animationplay
-libexec/gimp/plug-ins/animoptimize
-libexec/gimp/plug-ins/apply_lens
-libexec/gimp/plug-ins/autocrop
-libexec/gimp/plug-ins/autostretch_hsv
-libexec/gimp/plug-ins/blinds
-libexec/gimp/plug-ins/blur
-libexec/gimp/plug-ins/bmp
-libexec/gimp/plug-ins/bumpmap
-libexec/gimp/plug-ins/bz2
-libexec/gimp/plug-ins/c_astretch
-libexec/gimp/plug-ins/checkerboard
-libexec/gimp/plug-ins/colorify
-libexec/gimp/plug-ins/compose
-libexec/gimp/plug-ins/convmatrix
-libexec/gimp/plug-ins/cubism
-libexec/gimp/plug-ins/dbbrowser
-libexec/gimp/plug-ins/decompose
-libexec/gimp/plug-ins/deinterlace
-libexec/gimp/plug-ins/depthmerge
-libexec/gimp/plug-ins/despeckle
-libexec/gimp/plug-ins/destripe
-libexec/gimp/plug-ins/diffraction
-libexec/gimp/plug-ins/displace
-libexec/gimp/plug-ins/edge
-libexec/gimp/plug-ins/emboss
-libexec/gimp/plug-ins/engrave
-libexec/gimp/plug-ins/exchange
-libexec/gimp/plug-ins/faxg3
-libexec/gimp/plug-ins/film
-libexec/gimp/plug-ins/fits
-libexec/gimp/plug-ins/flame
-libexec/gimp/plug-ins/flarefx
-libexec/gimp/plug-ins/fractaltrace
-libexec/gimp/plug-ins/gauss_iir
-libexec/gimp/plug-ins/gauss_rle
-libexec/gimp/plug-ins/gbr
-libexec/gimp/plug-ins/gfig
-libexec/gimp/plug-ins/gfli
-libexec/gimp/plug-ins/gee
-libexec/gimp/plug-ins/gicon
-libexec/gimp/plug-ins/gif
-libexec/gimp/plug-ins/glasstile
-libexec/gimp/plug-ins/gqbist
-libexec/gimp/plug-ins/gradmap
-libexec/gimp/plug-ins/grid
-libexec/gimp/plug-ins/gtm
-libexec/gimp/plug-ins/gz
-libexec/gimp/plug-ins/header
-libexec/gimp/plug-ins/hot
-libexec/gimp/plug-ins/hrz
-libexec/gimp/plug-ins/ifscompose
-libexec/gimp/plug-ins/illusion
-libexec/gimp/plug-ins/iwarp
-libexec/gimp/plug-ins/jpeg
-libexec/gimp/plug-ins/laplace
-libexec/gimp/plug-ins/libgpc.a
-libexec/gimp/plug-ins/mail
-libexec/gimp/plug-ins/max_rgb
-libexec/gimp/plug-ins/maze
-libexec/gimp/plug-ins/mblur
-libexec/gimp/plug-ins/mosaic
-libexec/gimp/plug-ins/mpeg
-libexec/gimp/plug-ins/nlfilt
-libexec/gimp/plug-ins/noisify
-libexec/gimp/plug-ins/normalize
-libexec/gimp/plug-ins/nova
-libexec/gimp/plug-ins/oilify
-libexec/gimp/plug-ins/pagecurl
-libexec/gimp/plug-ins/palette
-libexec/gimp/plug-ins/papertile
-libexec/gimp/plug-ins/pat
-libexec/gimp/plug-ins/pcx
-libexec/gimp/plug-ins/pix
-libexec/gimp/plug-ins/pixelize
-libexec/gimp/plug-ins/plasma
-libexec/gimp/plug-ins/png
-libexec/gimp/plug-ins/pnm
-libexec/gimp/plug-ins/polar
-libexec/gimp/plug-ins/print
-libexec/gimp/plug-ins/ps
-libexec/gimp/plug-ins/psd
-libexec/gimp/plug-ins/randomize
-libexec/gimp/plug-ins/ripple
-libexec/gimp/plug-ins/rotate
-libexec/gimp/plug-ins/rotators
-libexec/gimp/plug-ins/scatter_hsv
-libexec/gimp/plug-ins/screenshot
-libexec/gimp/plug-ins/script-fu
-libexec/gimp/plug-ins/semiflatten
-libexec/gimp/plug-ins/sgi
-libexec/gimp/plug-ins/sharpen
-libexec/gimp/plug-ins/shift
-libexec/gimp/plug-ins/sinus
-libexec/gimp/plug-ins/smooth_palette
-libexec/gimp/plug-ins/snoise
-libexec/gimp/plug-ins/snp
-libexec/gimp/plug-ins/sobel
-libexec/gimp/plug-ins/sparkle
-libexec/gimp/plug-ins/spread
-libexec/gimp/plug-ins/struc
-libexec/gimp/plug-ins/sunras
-libexec/gimp/plug-ins/tga
-libexec/gimp/plug-ins/threshold_alpha
-libexec/gimp/plug-ins/tiff
-libexec/gimp/plug-ins/tile
-libexec/gimp/plug-ins/tileit
-libexec/gimp/plug-ins/tiler
-libexec/gimp/plug-ins/url
-libexec/gimp/plug-ins/video
-libexec/gimp/plug-ins/vinvert
-libexec/gimp/plug-ins/vpropagate
-libexec/gimp/plug-ins/waves
-libexec/gimp/plug-ins/webbrowser
-libexec/gimp/plug-ins/whirlpinch
-libexec/gimp/plug-ins/xd
-libexec/gimp/plug-ins/xpm
-libexec/gimp/plug-ins/xwd
-libexec/gimp/plug-ins/zealouscrop
+libexec/gimp/0.99/plug-ins/AlienMap
+libexec/gimp/0.99/plug-ins/CEL
+libexec/gimp/0.99/plug-ins/CML_explorer
+libexec/gimp/0.99/plug-ins/MapObject
+libexec/gimp/0.99/plug-ins/aa
+libexec/gimp/0.99/plug-ins/align_layers
+libexec/gimp/0.99/plug-ins/animationplay
+libexec/gimp/0.99/plug-ins/animoptimize
+libexec/gimp/0.99/plug-ins/apply_lens
+libexec/gimp/0.99/plug-ins/autocrop
+libexec/gimp/0.99/plug-ins/autostretch_hsv
+libexec/gimp/0.99/plug-ins/blinds
+libexec/gimp/0.99/plug-ins/blur
+libexec/gimp/0.99/plug-ins/bmp
+libexec/gimp/0.99/plug-ins/bumpmap
+libexec/gimp/0.99/plug-ins/bz2
+libexec/gimp/0.99/plug-ins/c_astretch
+libexec/gimp/0.99/plug-ins/checkerboard
+libexec/gimp/0.99/plug-ins/colorify
+libexec/gimp/0.99/plug-ins/compose
+libexec/gimp/0.99/plug-ins/convmatrix
+libexec/gimp/0.99/plug-ins/cubism
+libexec/gimp/0.99/plug-ins/dbbrowser
+libexec/gimp/0.99/plug-ins/decompose
+libexec/gimp/0.99/plug-ins/deinterlace
+libexec/gimp/0.99/plug-ins/depthmerge
+libexec/gimp/0.99/plug-ins/despeckle
+libexec/gimp/0.99/plug-ins/destripe
+libexec/gimp/0.99/plug-ins/diffraction
+libexec/gimp/0.99/plug-ins/displace
+libexec/gimp/0.99/plug-ins/edge
+libexec/gimp/0.99/plug-ins/emboss
+libexec/gimp/0.99/plug-ins/engrave
+libexec/gimp/0.99/plug-ins/exchange
+libexec/gimp/0.99/plug-ins/faxg3
+libexec/gimp/0.99/plug-ins/film
+libexec/gimp/0.99/plug-ins/fits
+libexec/gimp/0.99/plug-ins/flame
+libexec/gimp/0.99/plug-ins/flarefx
+libexec/gimp/0.99/plug-ins/fractaltrace
+libexec/gimp/0.99/plug-ins/gauss_iir
+libexec/gimp/0.99/plug-ins/gauss_rle
+libexec/gimp/0.99/plug-ins/gbr
+libexec/gimp/0.99/plug-ins/gfig
+libexec/gimp/0.99/plug-ins/gfli
+libexec/gimp/0.99/plug-ins/gee
+libexec/gimp/0.99/plug-ins/gicon
+libexec/gimp/0.99/plug-ins/gif
+libexec/gimp/0.99/plug-ins/glasstile
+libexec/gimp/0.99/plug-ins/gqbist
+libexec/gimp/0.99/plug-ins/gradmap
+libexec/gimp/0.99/plug-ins/grid
+libexec/gimp/0.99/plug-ins/gtm
+libexec/gimp/0.99/plug-ins/gz
+libexec/gimp/0.99/plug-ins/header
+libexec/gimp/0.99/plug-ins/hot
+libexec/gimp/0.99/plug-ins/hrz
+libexec/gimp/0.99/plug-ins/ifscompose
+libexec/gimp/0.99/plug-ins/illusion
+libexec/gimp/0.99/plug-ins/iwarp
+libexec/gimp/0.99/plug-ins/jpeg
+libexec/gimp/0.99/plug-ins/laplace
+libexec/gimp/0.99/plug-ins/mail
+libexec/gimp/0.99/plug-ins/max_rgb
+libexec/gimp/0.99/plug-ins/maze
+libexec/gimp/0.99/plug-ins/mblur
+libexec/gimp/0.99/plug-ins/mosaic
+libexec/gimp/0.99/plug-ins/mpeg
+libexec/gimp/0.99/plug-ins/nlfilt
+libexec/gimp/0.99/plug-ins/noisify
+libexec/gimp/0.99/plug-ins/normalize
+libexec/gimp/0.99/plug-ins/nova
+libexec/gimp/0.99/plug-ins/oilify
+libexec/gimp/0.99/plug-ins/pagecurl
+libexec/gimp/0.99/plug-ins/palette
+libexec/gimp/0.99/plug-ins/papertile
+libexec/gimp/0.99/plug-ins/pat
+libexec/gimp/0.99/plug-ins/pcx
+libexec/gimp/0.99/plug-ins/pix
+libexec/gimp/0.99/plug-ins/pixelize
+libexec/gimp/0.99/plug-ins/plasma
+libexec/gimp/0.99/plug-ins/png
+libexec/gimp/0.99/plug-ins/pnm
+libexec/gimp/0.99/plug-ins/polar
+libexec/gimp/0.99/plug-ins/print
+libexec/gimp/0.99/plug-ins/ps
+libexec/gimp/0.99/plug-ins/psd
+libexec/gimp/0.99/plug-ins/randomize
+libexec/gimp/0.99/plug-ins/ripple
+libexec/gimp/0.99/plug-ins/rotate
+libexec/gimp/0.99/plug-ins/rotators
+libexec/gimp/0.99/plug-ins/scatter_hsv
+libexec/gimp/0.99/plug-ins/screenshot
+libexec/gimp/0.99/plug-ins/script-fu
+libexec/gimp/0.99/plug-ins/semiflatten
+libexec/gimp/0.99/plug-ins/sgi
+libexec/gimp/0.99/plug-ins/sharpen
+libexec/gimp/0.99/plug-ins/shift
+libexec/gimp/0.99/plug-ins/sinus
+libexec/gimp/0.99/plug-ins/smooth_palette
+libexec/gimp/0.99/plug-ins/snoise
+libexec/gimp/0.99/plug-ins/snp
+libexec/gimp/0.99/plug-ins/sobel
+libexec/gimp/0.99/plug-ins/sparkle
+libexec/gimp/0.99/plug-ins/spread
+libexec/gimp/0.99/plug-ins/struc
+libexec/gimp/0.99/plug-ins/sunras
+libexec/gimp/0.99/plug-ins/tga
+libexec/gimp/0.99/plug-ins/threshold_alpha
+libexec/gimp/0.99/plug-ins/tiff
+libexec/gimp/0.99/plug-ins/tile
+libexec/gimp/0.99/plug-ins/tileit
+libexec/gimp/0.99/plug-ins/tiler
+libexec/gimp/0.99/plug-ins/url
+libexec/gimp/0.99/plug-ins/video
+libexec/gimp/0.99/plug-ins/vinvert
+libexec/gimp/0.99/plug-ins/vpropagate
+libexec/gimp/0.99/plug-ins/waves
+libexec/gimp/0.99/plug-ins/webbrowser
+libexec/gimp/0.99/plug-ins/whirlpinch
+libexec/gimp/0.99/plug-ins/xpm
+libexec/gimp/0.99/plug-ins/xwd
+libexec/gimp/0.99/plug-ins/zealouscrop
 man/man1/gimp.1.gz
+man/man1/gimptool.1.gz
+man/man3/gpc.3.gz
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -627,7 +630,8 @@ share/gimp/gimp_logo.ppm
 share/gimp/gimp_splash.ppm
 share/gimp/gimp_tips.txt
 share/gimp/ps-menurc
-@dirrm libexec/gimp/plug-ins
+@dirrm libexec/gimp/0.99/plug-ins
+@dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
 @dirrm include/libgimp
 @dirrm include/gck