- Update to 2.2.p1

- Use libtool
- Use new DISTVERSION

Approved by:	pav (co mentor)

10 files changed, 532 insertions, 574 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 696e687d08e2..c51fe67048b6 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	2.2.p1
+DISTVERSION=	2.2-pre2
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -15,7 +15,6 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/testing
-DISTNAME=	${PORTNAME}-${PORTVERSION:S,.p1,-pre1,}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program
@@ -36,8 +35,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2 libgtkhtml
+USE_LIBTOOL_VER=15
+USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
@@ -51,10 +50,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 
 GIMP_DISTFILE=	${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
-MAN1=		gimp-2.2.1 gimptool-2.0.1 gimp-remote-2.2.1
-MAN5=		gimprc-2.2.5
-MLINKS=		gimp-2.2.1 gimp.1 gimp-remote-2.2.1 gimp-remote.1 \
-		gimprc-2.2.5 gimprc.5
+MAN1=	gimp.1 gimp-2.2.1 gimp-remote.1 gimp-remote-2.2.1 gimptool-2.0.1
+MAN5=	gimprc.5 gimprc-2.2.5
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 12645a304b4a..c2e9858f82c6 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-2.2-pre1.tar.bz2) = f88e30b6a11b2d3c81219bc10a6de19a
-SIZE (gimp-2.2-pre1.tar.bz2) = 14047553
+MD5 (gimp-2.2-pre2.tar.bz2) = ebf7e6ecfd8140933ba8def721df49cd
+SIZE (gimp-2.2-pre2.tar.bz2) = 14369555
diff --git a/graphics/gimp-app-devel/files/patch-configure b/graphics/gimp-app-devel/files/patch-configure
index 3d3ad15c49f5..6dab9ee3a629 100644
--- a/graphics/gimp-app-devel/files/patch-configure
+++ b/graphics/gimp-app-devel/files/patch-configure
@@ -1,13 +1,15 @@
---- configure.orig	Sun Nov  7 10:44:21 2004
-+++ configure	Sun Nov  7 10:45:48 2004
-@@ -33311,8 +33311,8 @@
+--- configure.orig	Sun Nov 21 08:44:04 2004
++++ configure	Sun Nov 21 08:46:24 2004
+@@ -33676,9 +33676,9 @@
  fi
  fi;
  
 -gimpdatadir="$datadir/$PACKAGE/2.0"
 -gimpplugindir="$libdir/$PACKAGE/2.0"
+-gimpsysconfdir="$sysconfdir/$PACKAGE/2.0"
 +gimpdatadir="$datadir/$PACKAGE"
-+gimpplugindir="$libexecdir/$PACKAGE/2.0"
- gimpsysconfdir="$sysconfdir/$PACKAGE/2.0"
++gimpplugindir="$libexecdir/$PACKAGE/2.2"
++gimpsysconfdir="$sysconfdir/$PACKAGE/2.2"
  
  localedir='${prefix}/${DATADIRNAME}/locale'
+ 
diff --git a/graphics/gimp-app-devel/files/patch-ltmain.sh b/graphics/gimp-app-devel/files/patch-ltmain.sh
deleted file mode 100644
index 14cb2f8c753b..000000000000
--- a/graphics/gimp-app-devel/files/patch-ltmain.sh
+++ /dev/null
@@ -1,41 +0,0 @@
---- ltmain.sh.orig	Sun Sep  7 16:23:57 2003
-+++ ltmain.sh	Sat Sep 13 01:29:14 2003
-@@ -1278,7 +1278,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1288,8 +1288,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -5457,10 +5465,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 3f1230b6483a..ea81518c0eb9 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -3,19 +3,19 @@ bin/gimp-2.2
 bin/gimp-remote
 bin/gimp-remote-2.2
 bin/gimptool-2.0
-etc/gimp/2.0/controllerrc
-etc/gimp/2.0/gimprc
-etc/gimp/2.0/gtkrc
-etc/gimp/2.0/ps-menurc
-etc/gimp/2.0/sessionrc
-etc/gimp/2.0/templaterc
-etc/gimp/2.0/unitrc
+etc/gimp/2.2/controllerrc
+etc/gimp/2.2/gimprc
+etc/gimp/2.2/gtkrc
+etc/gimp/2.2/ps-menurc
+etc/gimp/2.2/sessionrc
+etc/gimp/2.2/templaterc
+etc/gimp/2.2/unitrc
 include/gimp-2.0/libgimp/gimp.h
 include/gimp-2.0/libgimp/gimp_pdb.h
 include/gimp-2.0/libgimp/gimpaspectpreview.h
 include/gimp-2.0/libgimp/gimpbrush_pdb.h
-include/gimp-2.0/libgimp/gimpbrushes_pdb.h
 include/gimp-2.0/libgimp/gimpbrushes.h
+include/gimp-2.0/libgimp/gimpbrushes_pdb.h
 include/gimp-2.0/libgimp/gimpbrushmenu.h
 include/gimp-2.0/libgimp/gimpbrushselect.h
 include/gimp-2.0/libgimp/gimpbrushselect_pdb.h
@@ -41,8 +41,8 @@ include/gimp-2.0/libgimp/gimpfonts_pdb.h
 include/gimp-2.0/libgimp/gimpfontselect.h
 include/gimp-2.0/libgimp/gimpfontselect_pdb.h
 include/gimp-2.0/libgimp/gimpgimprc_pdb.h
-include/gimp-2.0/libgimp/gimpgradientmenu.h
 include/gimp-2.0/libgimp/gimpgradient_pdb.h
+include/gimp-2.0/libgimp/gimpgradientmenu.h
 include/gimp-2.0/libgimp/gimpgradients.h
 include/gimp-2.0/libgimp/gimpgradients_pdb.h
 include/gimp-2.0/libgimp/gimpgradientselect.h
@@ -168,6 +168,208 @@ include/gimp-2.0/libgimpwidgets/gimpstock.h
 include/gimp-2.0/libgimpwidgets/gimpunitmenu.h
 include/gimp-2.0/libgimpwidgets/gimpwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
+libexec/gimp/2.2/environ/default.env
+%%PYTHON:%%libexec/gimp/2.2/environ/pygimp.env
+libexec/gimp/2.2/modules/libcdisplay_colorblind.so
+libexec/gimp/2.2/modules/libcdisplay_gamma.so
+libexec/gimp/2.2/modules/libcdisplay_highcontrast.so
+libexec/gimp/2.2/modules/libcdisplay_proof.so
+libexec/gimp/2.2/modules/libcolorsel_cmyk.so
+libexec/gimp/2.2/modules/libcolorsel_triangle.so
+libexec/gimp/2.2/modules/libcolorsel_water.so
+libexec/gimp/2.2/modules/libcontroller_midi.so
+libexec/gimp/2.2/plug-ins/AlienMap2
+libexec/gimp/2.2/plug-ins/CEL
+libexec/gimp/2.2/plug-ins/CML_explorer
+libexec/gimp/2.2/plug-ins/FractalExplorer
+libexec/gimp/2.2/plug-ins/Lighting
+libexec/gimp/2.2/plug-ins/MapObject
+libexec/gimp/2.2/plug-ins/aa
+libexec/gimp/2.2/plug-ins/align_layers
+libexec/gimp/2.2/plug-ins/animationplay
+libexec/gimp/2.2/plug-ins/animoptimize
+libexec/gimp/2.2/plug-ins/apply_lens
+libexec/gimp/2.2/plug-ins/autocrop
+libexec/gimp/2.2/plug-ins/autostretch_hsv
+libexec/gimp/2.2/plug-ins/blinds
+libexec/gimp/2.2/plug-ins/blur
+libexec/gimp/2.2/plug-ins/bmp
+libexec/gimp/2.2/plug-ins/borderaverage
+libexec/gimp/2.2/plug-ins/bumpmap
+libexec/gimp/2.2/plug-ins/c_astretch
+libexec/gimp/2.2/plug-ins/cartoon
+libexec/gimp/2.2/plug-ins/ccanalyze
+libexec/gimp/2.2/plug-ins/channel_mixer
+libexec/gimp/2.2/plug-ins/checkerboard
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/clothify.py
+libexec/gimp/2.2/plug-ins/color_enhance
+libexec/gimp/2.2/plug-ins/colorify
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/colorhtml.py
+libexec/gimp/2.2/plug-ins/colortoalpha
+libexec/gimp/2.2/plug-ins/compose
+libexec/gimp/2.2/plug-ins/compressor
+libexec/gimp/2.2/plug-ins/convmatrix
+libexec/gimp/2.2/plug-ins/csource
+libexec/gimp/2.2/plug-ins/cubism
+libexec/gimp/2.2/plug-ins/curve_bend
+libexec/gimp/2.2/plug-ins/decompose
+libexec/gimp/2.2/plug-ins/deinterlace
+libexec/gimp/2.2/plug-ins/depthmerge
+libexec/gimp/2.2/plug-ins/despeckle
+libexec/gimp/2.2/plug-ins/destripe
+libexec/gimp/2.2/plug-ins/dicom
+libexec/gimp/2.2/plug-ins/diffraction
+libexec/gimp/2.2/plug-ins/displace
+libexec/gimp/2.2/plug-ins/dog
+libexec/gimp/2.2/plug-ins/edge
+libexec/gimp/2.2/plug-ins/emboss
+libexec/gimp/2.2/plug-ins/engrave
+libexec/gimp/2.2/plug-ins/exchange
+libexec/gimp/2.2/plug-ins/faxg3
+libexec/gimp/2.2/plug-ins/film
+libexec/gimp/2.2/plug-ins/fits
+libexec/gimp/2.2/plug-ins/flame
+libexec/gimp/2.2/plug-ins/flarefx
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/foggify.py
+libexec/gimp/2.2/plug-ins/fp
+libexec/gimp/2.2/plug-ins/fractaltrace
+libexec/gimp/2.2/plug-ins/gauss
+libexec/gimp/2.2/plug-ins/gbr
+libexec/gimp/2.2/plug-ins/gee
+libexec/gimp/2.2/plug-ins/gee_zoom
+libexec/gimp/2.2/plug-ins/gfig
+libexec/gimp/2.2/plug-ins/gflare
+libexec/gimp/2.2/plug-ins/gfli
+libexec/gimp/2.2/plug-ins/gif
+libexec/gimp/2.2/plug-ins/gifload
+libexec/gimp/2.2/plug-ins/gih
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/gimpcons.py
+libexec/gimp/2.2/plug-ins/gimpressionist
+libexec/gimp/2.2/plug-ins/glasstile
+libexec/gimp/2.2/plug-ins/glob
+libexec/gimp/2.2/plug-ins/gqbist
+libexec/gimp/2.2/plug-ins/gradmap
+libexec/gimp/2.2/plug-ins/grid
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/gtkcons.py
+libexec/gimp/2.2/plug-ins/gtm
+libexec/gimp/2.2/plug-ins/guillotine
+libexec/gimp/2.2/plug-ins/header
+libexec/gimp/2.2/plug-ins/help
+%%HELPBROWSER:%%libexec/gimp/2.2/plug-ins/helpbrowser
+libexec/gimp/2.2/plug-ins/hot
+libexec/gimp/2.2/plug-ins/ifscompose
+libexec/gimp/2.2/plug-ins/illusion
+libexec/gimp/2.2/plug-ins/imagemap
+libexec/gimp/2.2/plug-ins/iwarp
+libexec/gimp/2.2/plug-ins/jigsaw
+libexec/gimp/2.2/plug-ins/jpeg
+libexec/gimp/2.2/plug-ins/laplace
+libexec/gimp/2.2/plug-ins/lic
+libexec/gimp/2.2/plug-ins/mail
+libexec/gimp/2.2/plug-ins/mapcolor
+libexec/gimp/2.2/plug-ins/max_rgb
+libexec/gimp/2.2/plug-ins/maze
+libexec/gimp/2.2/plug-ins/mblur
+libexec/gimp/2.2/plug-ins/mng
+libexec/gimp/2.2/plug-ins/mosaic
+libexec/gimp/2.2/plug-ins/neon
+libexec/gimp/2.2/plug-ins/newsprint
+libexec/gimp/2.2/plug-ins/nlfilt
+libexec/gimp/2.2/plug-ins/noisify
+libexec/gimp/2.2/plug-ins/normalize
+libexec/gimp/2.2/plug-ins/nova
+libexec/gimp/2.2/plug-ins/oilify
+libexec/gimp/2.2/plug-ins/pagecurl
+libexec/gimp/2.2/plug-ins/papertile
+libexec/gimp/2.2/plug-ins/pat
+libexec/gimp/2.2/plug-ins/pcx
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/pdbbrowse.py
+libexec/gimp/2.2/plug-ins/photocopy
+libexec/gimp/2.2/plug-ins/pix
+libexec/gimp/2.2/plug-ins/pixelize
+libexec/gimp/2.2/plug-ins/plasma
+libexec/gimp/2.2/plug-ins/plugin-browser
+libexec/gimp/2.2/plug-ins/png
+libexec/gimp/2.2/plug-ins/pnm
+libexec/gimp/2.2/plug-ins/polar
+libexec/gimp/2.2/plug-ins/postscript
+%%PRINT%%libexec/gimp/2.2/plug-ins/print
+libexec/gimp/2.2/plug-ins/procedure-browser
+libexec/gimp/2.2/plug-ins/psd
+libexec/gimp/2.2/plug-ins/psd_save
+libexec/gimp/2.2/plug-ins/psp
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/py-slice.py
+libexec/gimp/2.2/plug-ins/randomize
+libexec/gimp/2.2/plug-ins/raw
+libexec/gimp/2.2/plug-ins/rcm
+libexec/gimp/2.2/plug-ins/retinex
+libexec/gimp/2.2/plug-ins/ripple
+libexec/gimp/2.2/plug-ins/rotate
+libexec/gimp/2.2/plug-ins/sample_colorize
+libexec/gimp/2.2/plug-ins/scatter_hsv
+libexec/gimp/2.2/plug-ins/screenshot
+libexec/gimp/2.2/plug-ins/script-fu
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/shadow_bevel.py
+libexec/gimp/2.2/plug-ins/sel2path
+libexec/gimp/2.2/plug-ins/sel_gauss
+libexec/gimp/2.2/plug-ins/semiflatten
+libexec/gimp/2.2/plug-ins/sgi
+libexec/gimp/2.2/plug-ins/sharpen
+libexec/gimp/2.2/plug-ins/shift
+libexec/gimp/2.2/plug-ins/sinus
+libexec/gimp/2.2/plug-ins/smooth_palette
+libexec/gimp/2.2/plug-ins/snoise
+libexec/gimp/2.2/plug-ins/sobel
+libexec/gimp/2.2/plug-ins/softglow
+libexec/gimp/2.2/plug-ins/sparkle
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/sphere.py
+libexec/gimp/2.2/plug-ins/spheredesigner
+libexec/gimp/2.2/plug-ins/spread
+libexec/gimp/2.2/plug-ins/struc
+libexec/gimp/2.2/plug-ins/sunras
+libexec/gimp/2.2/plug-ins/svg
+libexec/gimp/2.2/plug-ins/tga
+libexec/gimp/2.2/plug-ins/threshold_alpha
+libexec/gimp/2.2/plug-ins/tiff
+libexec/gimp/2.2/plug-ins/tile
+libexec/gimp/2.2/plug-ins/tileit
+libexec/gimp/2.2/plug-ins/tiler
+libexec/gimp/2.2/plug-ins/uniteditor
+libexec/gimp/2.2/plug-ins/unsharp
+libexec/gimp/2.2/plug-ins/url
+libexec/gimp/2.2/plug-ins/video
+libexec/gimp/2.2/plug-ins/vinvert
+libexec/gimp/2.2/plug-ins/vpropagate
+libexec/gimp/2.2/plug-ins/warp
+libexec/gimp/2.2/plug-ins/waves
+libexec/gimp/2.2/plug-ins/webbrowser
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/whirlpinch.py
+libexec/gimp/2.2/plug-ins/whirlpinch
+libexec/gimp/2.2/plug-ins/wind
+libexec/gimp/2.2/plug-ins/winicon
+libexec/gimp/2.2/plug-ins/wmf
+libexec/gimp/2.2/plug-ins/xbm
+libexec/gimp/2.2/plug-ins/xjt
+libexec/gimp/2.2/plug-ins/xpm
+libexec/gimp/2.2/plug-ins/xwd
+libexec/gimp/2.2/plug-ins/zealouscrop
+%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpmodule.so
+%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpprocbrowsermodule.so
+%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpui.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpui.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpui.pyo
 lib/libgimp-2.0.a
 lib/libgimp-2.0.so
 lib/libgimp-2.0.so.%%SHLIBVER%%
@@ -195,207 +397,6 @@ lib/libgimpwidgets-2.0.so.%%SHLIBVER%%
 libdata/pkgconfig/gimp-2.0.pc
 libdata/pkgconfig/gimpthumb-2.0.pc
 libdata/pkgconfig/gimpui-2.0.pc
-libexec/gimp/2.0/environ/default.env
-%%PYTHON:%%libexec/gimp/2.0/environ/pygimp.env
-libexec/gimp/2.0/modules/libcdisplay_colorblind.so
-libexec/gimp/2.0/modules/libcdisplay_gamma.so
-libexec/gimp/2.0/modules/libcdisplay_highcontrast.so
-libexec/gimp/2.0/modules/libcdisplay_proof.so
-libexec/gimp/2.0/modules/libcolorsel_cmyk.so
-libexec/gimp/2.0/modules/libcolorsel_triangle.so
-libexec/gimp/2.0/modules/libcolorsel_water.so
-libexec/gimp/2.0/modules/libcontroller_midi.so
-libexec/gimp/2.0/plug-ins/AlienMap2
-libexec/gimp/2.0/plug-ins/CEL
-libexec/gimp/2.0/plug-ins/CML_explorer
-libexec/gimp/2.0/plug-ins/FractalExplorer
-libexec/gimp/2.0/plug-ins/Lighting
-libexec/gimp/2.0/plug-ins/MapObject
-libexec/gimp/2.0/plug-ins/aa
-libexec/gimp/2.0/plug-ins/align_layers
-libexec/gimp/2.0/plug-ins/animationplay
-libexec/gimp/2.0/plug-ins/animoptimize
-libexec/gimp/2.0/plug-ins/apply_lens
-libexec/gimp/2.0/plug-ins/autocrop
-libexec/gimp/2.0/plug-ins/autostretch_hsv
-libexec/gimp/2.0/plug-ins/blinds
-libexec/gimp/2.0/plug-ins/blur
-libexec/gimp/2.0/plug-ins/bmp
-libexec/gimp/2.0/plug-ins/borderaverage
-libexec/gimp/2.0/plug-ins/bumpmap
-libexec/gimp/2.0/plug-ins/c_astretch
-libexec/gimp/2.0/plug-ins/cartoon
-libexec/gimp/2.0/plug-ins/ccanalyze
-libexec/gimp/2.0/plug-ins/channel_mixer
-libexec/gimp/2.0/plug-ins/checkerboard
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/clothify.py
-libexec/gimp/2.0/plug-ins/color_enhance
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/colorhtml.py
-libexec/gimp/2.0/plug-ins/colorify
-libexec/gimp/2.0/plug-ins/colortoalpha
-libexec/gimp/2.0/plug-ins/compose
-libexec/gimp/2.0/plug-ins/compressor
-libexec/gimp/2.0/plug-ins/convmatrix
-libexec/gimp/2.0/plug-ins/csource
-libexec/gimp/2.0/plug-ins/cubism
-libexec/gimp/2.0/plug-ins/curve_bend
-libexec/gimp/2.0/plug-ins/decompose
-libexec/gimp/2.0/plug-ins/deinterlace
-libexec/gimp/2.0/plug-ins/depthmerge
-libexec/gimp/2.0/plug-ins/despeckle
-libexec/gimp/2.0/plug-ins/destripe
-libexec/gimp/2.0/plug-ins/dicom
-libexec/gimp/2.0/plug-ins/diffraction
-libexec/gimp/2.0/plug-ins/displace
-libexec/gimp/2.0/plug-ins/dog
-libexec/gimp/2.0/plug-ins/edge
-libexec/gimp/2.0/plug-ins/emboss
-libexec/gimp/2.0/plug-ins/engrave
-libexec/gimp/2.0/plug-ins/exchange
-libexec/gimp/2.0/plug-ins/faxg3
-libexec/gimp/2.0/plug-ins/film
-libexec/gimp/2.0/plug-ins/fits
-libexec/gimp/2.0/plug-ins/flame
-libexec/gimp/2.0/plug-ins/flarefx
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/foggify.py
-libexec/gimp/2.0/plug-ins/fp
-libexec/gimp/2.0/plug-ins/fractaltrace
-libexec/gimp/2.0/plug-ins/gauss
-libexec/gimp/2.0/plug-ins/gbr
-libexec/gimp/2.0/plug-ins/gee
-libexec/gimp/2.0/plug-ins/gee_zoom
-libexec/gimp/2.0/plug-ins/gfig
-libexec/gimp/2.0/plug-ins/gflare
-libexec/gimp/2.0/plug-ins/gfli
-libexec/gimp/2.0/plug-ins/gif
-libexec/gimp/2.0/plug-ins/gifload
-libexec/gimp/2.0/plug-ins/gih
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/gimpcons.py
-libexec/gimp/2.0/plug-ins/gimpressionist
-libexec/gimp/2.0/plug-ins/glasstile
-libexec/gimp/2.0/plug-ins/glob
-libexec/gimp/2.0/plug-ins/gqbist
-libexec/gimp/2.0/plug-ins/gradmap
-libexec/gimp/2.0/plug-ins/grid
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/gtkcons.py
-libexec/gimp/2.0/plug-ins/gtm
-libexec/gimp/2.0/plug-ins/guillotine
-libexec/gimp/2.0/plug-ins/header
-libexec/gimp/2.0/plug-ins/help
-%%HELPBROWSER:%%libexec/gimp/2.0/plug-ins/helpbrowser
-libexec/gimp/2.0/plug-ins/hot
-libexec/gimp/2.0/plug-ins/ifscompose
-libexec/gimp/2.0/plug-ins/illusion
-libexec/gimp/2.0/plug-ins/imagemap
-libexec/gimp/2.0/plug-ins/iwarp
-libexec/gimp/2.0/plug-ins/jigsaw
-libexec/gimp/2.0/plug-ins/jpeg
-libexec/gimp/2.0/plug-ins/laplace
-libexec/gimp/2.0/plug-ins/lic
-libexec/gimp/2.0/plug-ins/mail
-libexec/gimp/2.0/plug-ins/mapcolor
-libexec/gimp/2.0/plug-ins/max_rgb
-libexec/gimp/2.0/plug-ins/maze
-libexec/gimp/2.0/plug-ins/mblur
-libexec/gimp/2.0/plug-ins/mng
-libexec/gimp/2.0/plug-ins/mosaic
-libexec/gimp/2.0/plug-ins/neon
-libexec/gimp/2.0/plug-ins/newsprint
-libexec/gimp/2.0/plug-ins/nlfilt
-libexec/gimp/2.0/plug-ins/noisify
-libexec/gimp/2.0/plug-ins/normalize
-libexec/gimp/2.0/plug-ins/nova
-libexec/gimp/2.0/plug-ins/oilify
-libexec/gimp/2.0/plug-ins/pagecurl
-libexec/gimp/2.0/plug-ins/papertile
-libexec/gimp/2.0/plug-ins/pat
-libexec/gimp/2.0/plug-ins/pcx
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/pdbbrowse.py
-libexec/gimp/2.0/plug-ins/photocopy
-libexec/gimp/2.0/plug-ins/pix
-libexec/gimp/2.0/plug-ins/pixelize
-libexec/gimp/2.0/plug-ins/plasma
-libexec/gimp/2.0/plug-ins/plugin-browser
-libexec/gimp/2.0/plug-ins/png
-libexec/gimp/2.0/plug-ins/pnm
-libexec/gimp/2.0/plug-ins/polar
-libexec/gimp/2.0/plug-ins/postscript
-%%PRINT%%libexec/gimp/2.0/plug-ins/print
-libexec/gimp/2.0/plug-ins/procedure-browser
-libexec/gimp/2.0/plug-ins/psd
-libexec/gimp/2.0/plug-ins/psd_save
-libexec/gimp/2.0/plug-ins/psp
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/py-slice.py
-libexec/gimp/2.0/plug-ins/randomize
-libexec/gimp/2.0/plug-ins/raw
-libexec/gimp/2.0/plug-ins/rcm
-libexec/gimp/2.0/plug-ins/retinex
-libexec/gimp/2.0/plug-ins/ripple
-libexec/gimp/2.0/plug-ins/rotate
-libexec/gimp/2.0/plug-ins/sample_colorize
-libexec/gimp/2.0/plug-ins/scatter_hsv
-libexec/gimp/2.0/plug-ins/screenshot
-libexec/gimp/2.0/plug-ins/script-fu
-libexec/gimp/2.0/plug-ins/sel2path
-libexec/gimp/2.0/plug-ins/sel_gauss
-libexec/gimp/2.0/plug-ins/semiflatten
-libexec/gimp/2.0/plug-ins/sgi
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/shadow_bevel.py
-libexec/gimp/2.0/plug-ins/sharpen
-libexec/gimp/2.0/plug-ins/shift
-libexec/gimp/2.0/plug-ins/sinus
-libexec/gimp/2.0/plug-ins/smooth_palette
-libexec/gimp/2.0/plug-ins/snoise
-libexec/gimp/2.0/plug-ins/sobel
-libexec/gimp/2.0/plug-ins/softglow
-libexec/gimp/2.0/plug-ins/sparkle
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/sphere.py
-libexec/gimp/2.0/plug-ins/spheredesigner
-libexec/gimp/2.0/plug-ins/spread
-libexec/gimp/2.0/plug-ins/struc
-libexec/gimp/2.0/plug-ins/sunras
-libexec/gimp/2.0/plug-ins/svg
-libexec/gimp/2.0/plug-ins/tga
-libexec/gimp/2.0/plug-ins/threshold_alpha
-libexec/gimp/2.0/plug-ins/tiff
-libexec/gimp/2.0/plug-ins/tile
-libexec/gimp/2.0/plug-ins/tileit
-libexec/gimp/2.0/plug-ins/tiler
-libexec/gimp/2.0/plug-ins/uniteditor
-libexec/gimp/2.0/plug-ins/unsharp
-libexec/gimp/2.0/plug-ins/url
-libexec/gimp/2.0/plug-ins/video
-libexec/gimp/2.0/plug-ins/vinvert
-libexec/gimp/2.0/plug-ins/vpropagate
-libexec/gimp/2.0/plug-ins/warp
-libexec/gimp/2.0/plug-ins/waves
-libexec/gimp/2.0/plug-ins/webbrowser
-libexec/gimp/2.0/plug-ins/whirlpinch
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/whirlpinch.py
-libexec/gimp/2.0/plug-ins/wind
-libexec/gimp/2.0/plug-ins/winicon
-libexec/gimp/2.0/plug-ins/wmf
-libexec/gimp/2.0/plug-ins/xbm
-libexec/gimp/2.0/plug-ins/xjt
-libexec/gimp/2.0/plug-ins/xpm
-libexec/gimp/2.0/plug-ins/xwd
-libexec/gimp/2.0/plug-ins/zealouscrop
-%%PYTHON:%%libexec/gimp/2.0/python/gimpenums.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpenums.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpenums.pyo
-%%PYTHON:%%libexec/gimp/2.0/python/gimpfu.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpfu.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpfu.pyo
-%%PYTHON:%%libexec/gimp/2.0/python/gimpmodule.so
-%%PYTHON:%%libexec/gimp/2.0/python/gimpplugin.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpplugin.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpplugin.pyo
-%%PYTHON:%%libexec/gimp/2.0/python/gimpshelf.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpshelf.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpshelf.pyo
-%%PYTHON:%%libexec/gimp/2.0/python/gimpui.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpui.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpui.pyo
 share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimp/GimpAspectPreview.html
 %%DOCSDIR%%/libgimp/GimpDrawablePreview.html
@@ -405,6 +406,8 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimp/index.html
 %%DOCSDIR%%/libgimp/index.sgml
 %%DOCSDIR%%/libgimp/left.png
+%%DOCSDIR%%/libgimp/libgimp-data.html
+%%DOCSDIR%%/libgimp/libgimp-general.html
 %%DOCSDIR%%/libgimp/libgimp-gimp.html
 %%DOCSDIR%%/libgimp/libgimp-gimpbrush.html
 %%DOCSDIR%%/libgimp/libgimp-gimpbrushes.html
@@ -460,6 +463,8 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimp/libgimp-gimptools.html
 %%DOCSDIR%%/libgimp/libgimp-gimpui.html
 %%DOCSDIR%%/libgimp/libgimp-gimpundo.html
+%%DOCSDIR%%/libgimp/libgimp-image.html
+%%DOCSDIR%%/libgimp/libgimp-selectors.html
 %%DOCSDIR%%/libgimp/libgimp.devhelp
 %%DOCSDIR%%/libgimp/libgimp.html
 %%DOCSDIR%%/libgimp/libgimpui-hierarchy.html
@@ -552,6 +557,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/GimpColorSelect.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorSelection.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorSelector.html
+%%DOCSDIR%%/libgimpwidgets/GimpController.html
 %%DOCSDIR%%/libgimpwidgets/GimpDialog.html
 %%DOCSDIR%%/libgimpwidgets/GimpFileEntry.html
 %%DOCSDIR%%/libgimpwidgets/GimpFrame.html
@@ -578,6 +584,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-cell-renderers.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-colordisplay.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-colorselector.html
+%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-controller.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-deprecated.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-gimpoldwidgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-hierarchy.html
@@ -589,6 +596,8 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-cap-butt-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-cap-round-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-cap-square-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-center-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-center-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-32.png
@@ -721,6 +730,8 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-paths-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-plugin-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-portrait-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-print-resolution-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-print-resolution-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-qmask-off-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-qmask-on-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-question-64.png
@@ -1127,8 +1138,8 @@ share/gimp/gradients/Wood_1.ggr
 share/gimp/gradients/Wood_2.ggr
 share/gimp/gradients/Yellow_Contrast.ggr
 share/gimp/gradients/Yellow_Orange.ggr
-share/gimp/images/gimp_logo.png
 share/gimp/images/gimp-splash.png
+share/gimp/images/gimp_logo.png
 share/gimp/images/wilber-devel-icon.png
 share/gimp/images/wilber-icon.png
 share/gimp/images/wilber-tips.png
@@ -1152,13 +1163,18 @@ share/gimp/menus/patterns-menu.xml
 share/gimp/menus/qmask-menu.xml
 share/gimp/menus/selection-editor-menu.xml
 share/gimp/menus/templates-menu.xml
+share/gimp/menus/text-editor-toolbar.xml
 share/gimp/menus/tool-options-menu.xml
 share/gimp/menus/toolbox-menu.xml
 share/gimp/menus/tools-menu.xml
 share/gimp/menus/vectors-menu.xml
-share/gimp/misc/gimp.applications
-share/gimp/misc/gimp.desktop
-share/gimp/misc/gimp.keys
+%%GNOMEPANEL:%%share/gimp/misc/gimp.applications
+%%GNOMEPANEL:%%share/gimp/misc/gimp.desktop
+%%GNOMEPANEL:%%share/gimp/misc/gimp.keys
+%%GNOMEPANEL:%%share/gnome/application-registry/gimp-2.2.applications
+%%GNOMEPANEL:%%share/gnome/applications/gimp-2.2.desktop
+%%GNOMEPANEL:%%share/gnome/mime-info/gimp-2.2.keys
+%%GNOMEPANEL:%%share/gnome/pixmaps/gnome-gimp.png
 share/gimp/palettes/Bears.gpl
 share/gimp/palettes/Bgold.gpl
 share/gimp/palettes/Blues.gpl
@@ -1395,6 +1411,8 @@ share/gimp/themes/Default/images/stock-anchor-16.png
 share/gimp/themes/Default/images/stock-cap-butt-16.png
 share/gimp/themes/Default/images/stock-cap-round-16.png
 share/gimp/themes/Default/images/stock-cap-square-16.png
+share/gimp/themes/Default/images/stock-center-16.png
+share/gimp/themes/Default/images/stock-center-24.png
 share/gimp/themes/Default/images/stock-channel-16.png
 share/gimp/themes/Default/images/stock-channel-24.png
 share/gimp/themes/Default/images/stock-channel-32.png
@@ -1527,6 +1545,8 @@ share/gimp/themes/Default/images/stock-paths-16.png
 share/gimp/themes/Default/images/stock-paths-22.png
 share/gimp/themes/Default/images/stock-plugin-16.png
 share/gimp/themes/Default/images/stock-portrait-16.png
+share/gimp/themes/Default/images/stock-print-resolution-16.png
+share/gimp/themes/Default/images/stock-print-resolution-24.png
 share/gimp/themes/Default/images/stock-qmask-off-16.png
 share/gimp/themes/Default/images/stock-qmask-on-16.png
 share/gimp/themes/Default/images/stock-question-64.png
@@ -1662,9 +1682,6 @@ share/gimp/themes/Default/images/stock-wilber-eek-64.png
 share/gimp/themes/Default/images/stock-zoom-follow-window-12.png
 share/gimp/themes/Small/gtkrc
 share/gimp/tips/gimp-tips.xml
-%%GNOMEPANEL:%%share/gnome/application-registry/gimp-2.2.applications
-%%GNOMEPANEL:%%share/gnome/applications/gimp-2.2.desktop
-%%GNOMEPANEL:%%share/gnome/mime-info/gimp-2.2.keys
 share/locale/ca/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ca/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ca/LC_MESSAGES/gimp20-std-plug-ins.mo
@@ -1753,6 +1770,10 @@ share/locale/ms/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ms/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ms/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/ms/LC_MESSAGES/gimp20.mo
+share/locale/nb/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/nb/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/nb/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/nb/LC_MESSAGES/gimp20.mo
 share/locale/nl/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/nl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/nl/LC_MESSAGES/gimp20-std-plug-ins.mo
@@ -1825,14 +1846,6 @@ share/locale/zh_TW/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20.mo
-@dirrm %%DOCSDIR%%/libgimpwidgets
-@dirrm %%DOCSDIR%%/libgimpthumb
-@dirrm %%DOCSDIR%%/libgimpmodule
-@dirrm %%DOCSDIR%%/libgimpmath
-@dirrm %%DOCSDIR%%/libgimpcolor
-@dirrm %%DOCSDIR%%/libgimpbase
-@dirrm %%DOCSDIR%%/libgimp
-@dirrm %%DOCSDIR%%
 @dirrm share/gimp/tips
 @dirrm share/gimp/themes/Small
 @dirrm share/gimp/themes/Default/images/preferences
@@ -1857,11 +1870,19 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm share/gimp/fonts
 @dirrm share/gimp/brushes
 @dirrm share/gimp
-%%PYTHON:%%@dirrm libexec/gimp/2.0/python
-@dirrm libexec/gimp/2.0/plug-ins
-@dirrm libexec/gimp/2.0/modules
-@dirrm libexec/gimp/2.0/environ
-@dirrm libexec/gimp/2.0
+@dirrm %%DOCSDIR%%/libgimpwidgets
+@dirrm %%DOCSDIR%%/libgimpthumb
+@dirrm %%DOCSDIR%%/libgimpmodule
+@dirrm %%DOCSDIR%%/libgimpmath
+@dirrm %%DOCSDIR%%/libgimpcolor
+@dirrm %%DOCSDIR%%/libgimpbase
+@dirrm %%DOCSDIR%%/libgimp
+@dirrm %%DOCSDIR%%
+@dirrm libexec/gimp/2.2/plug-ins
+%%PYTHON:%%@dirrm libexec/gimp/2.2/python
+@dirrm libexec/gimp/2.2/modules
+@dirrm libexec/gimp/2.2/environ
+@dirrm libexec/gimp/2.2
 @dirrm libexec/gimp
 @dirrm include/gimp-2.0/libgimpwidgets
 @dirrm include/gimp-2.0/libgimpthumb
@@ -1871,5 +1892,5 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm include/gimp-2.0/libgimpbase
 @dirrm include/gimp-2.0/libgimp
 @dirrm include/gimp-2.0
-@dirrm etc/gimp/2.0
+@dirrm etc/gimp/2.2
 @dirrm etc/gimp
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 696e687d08e2..c51fe67048b6 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gimp
-PORTVERSION=	2.2.p1
+DISTVERSION=	2.2-pre2
 PORTEPOCH=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -15,7 +15,6 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/%SUBDIR%,}
 MASTER_SITE_SUBDIR=	gimp/v${PORTVERSION:R}/testing
-DISTNAME=	${PORTNAME}-${PORTVERSION:S,.p1,-pre1,}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNU Image Manipulation Program
@@ -36,8 +35,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2 libgtkhtml
+USE_LIBTOOL_VER=15
+USE_GNOME=	gnomehack intltool intlhack gtk20 libartlgpl2 librsvg2
 WANT_GNOME=	yes
 INSTALLS_SHLIB=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
@@ -51,10 +50,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 
 GIMP_DISTFILE=	${DISTDIR}/${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
-MAN1=		gimp-2.2.1 gimptool-2.0.1 gimp-remote-2.2.1
-MAN5=		gimprc-2.2.5
-MLINKS=		gimp-2.2.1 gimp.1 gimp-remote-2.2.1 gimp-remote.1 \
-		gimprc-2.2.5 gimprc.5
+MAN1=	gimp.1 gimp-2.2.1 gimp-remote.1 gimp-remote-2.2.1 gimptool-2.0.1
+MAN5=	gimprc.5 gimprc-2.2.5
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index 12645a304b4a..c2e9858f82c6 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-2.2-pre1.tar.bz2) = f88e30b6a11b2d3c81219bc10a6de19a
-SIZE (gimp-2.2-pre1.tar.bz2) = 14047553
+MD5 (gimp-2.2-pre2.tar.bz2) = ebf7e6ecfd8140933ba8def721df49cd
+SIZE (gimp-2.2-pre2.tar.bz2) = 14369555
diff --git a/graphics/gimp-devel/files/patch-configure b/graphics/gimp-devel/files/patch-configure
index 3d3ad15c49f5..6dab9ee3a629 100644
--- a/graphics/gimp-devel/files/patch-configure
+++ b/graphics/gimp-devel/files/patch-configure
@@ -1,13 +1,15 @@
---- configure.orig	Sun Nov  7 10:44:21 2004
-+++ configure	Sun Nov  7 10:45:48 2004
-@@ -33311,8 +33311,8 @@
+--- configure.orig	Sun Nov 21 08:44:04 2004
++++ configure	Sun Nov 21 08:46:24 2004
+@@ -33676,9 +33676,9 @@
  fi
  fi;
  
 -gimpdatadir="$datadir/$PACKAGE/2.0"
 -gimpplugindir="$libdir/$PACKAGE/2.0"
+-gimpsysconfdir="$sysconfdir/$PACKAGE/2.0"
 +gimpdatadir="$datadir/$PACKAGE"
-+gimpplugindir="$libexecdir/$PACKAGE/2.0"
- gimpsysconfdir="$sysconfdir/$PACKAGE/2.0"
++gimpplugindir="$libexecdir/$PACKAGE/2.2"
++gimpsysconfdir="$sysconfdir/$PACKAGE/2.2"
  
  localedir='${prefix}/${DATADIRNAME}/locale'
+ 
diff --git a/graphics/gimp-devel/files/patch-ltmain.sh b/graphics/gimp-devel/files/patch-ltmain.sh
deleted file mode 100644
index 14cb2f8c753b..000000000000
--- a/graphics/gimp-devel/files/patch-ltmain.sh
+++ /dev/null
@@ -1,41 +0,0 @@
---- ltmain.sh.orig	Sun Sep  7 16:23:57 2003
-+++ ltmain.sh	Sat Sep 13 01:29:14 2003
-@@ -1278,7 +1278,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1288,8 +1288,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -5457,10 +5465,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index 3f1230b6483a..ea81518c0eb9 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -3,19 +3,19 @@ bin/gimp-2.2
 bin/gimp-remote
 bin/gimp-remote-2.2
 bin/gimptool-2.0
-etc/gimp/2.0/controllerrc
-etc/gimp/2.0/gimprc
-etc/gimp/2.0/gtkrc
-etc/gimp/2.0/ps-menurc
-etc/gimp/2.0/sessionrc
-etc/gimp/2.0/templaterc
-etc/gimp/2.0/unitrc
+etc/gimp/2.2/controllerrc
+etc/gimp/2.2/gimprc
+etc/gimp/2.2/gtkrc
+etc/gimp/2.2/ps-menurc
+etc/gimp/2.2/sessionrc
+etc/gimp/2.2/templaterc
+etc/gimp/2.2/unitrc
 include/gimp-2.0/libgimp/gimp.h
 include/gimp-2.0/libgimp/gimp_pdb.h
 include/gimp-2.0/libgimp/gimpaspectpreview.h
 include/gimp-2.0/libgimp/gimpbrush_pdb.h
-include/gimp-2.0/libgimp/gimpbrushes_pdb.h
 include/gimp-2.0/libgimp/gimpbrushes.h
+include/gimp-2.0/libgimp/gimpbrushes_pdb.h
 include/gimp-2.0/libgimp/gimpbrushmenu.h
 include/gimp-2.0/libgimp/gimpbrushselect.h
 include/gimp-2.0/libgimp/gimpbrushselect_pdb.h
@@ -41,8 +41,8 @@ include/gimp-2.0/libgimp/gimpfonts_pdb.h
 include/gimp-2.0/libgimp/gimpfontselect.h
 include/gimp-2.0/libgimp/gimpfontselect_pdb.h
 include/gimp-2.0/libgimp/gimpgimprc_pdb.h
-include/gimp-2.0/libgimp/gimpgradientmenu.h
 include/gimp-2.0/libgimp/gimpgradient_pdb.h
+include/gimp-2.0/libgimp/gimpgradientmenu.h
 include/gimp-2.0/libgimp/gimpgradients.h
 include/gimp-2.0/libgimp/gimpgradients_pdb.h
 include/gimp-2.0/libgimp/gimpgradientselect.h
@@ -168,6 +168,208 @@ include/gimp-2.0/libgimpwidgets/gimpstock.h
 include/gimp-2.0/libgimpwidgets/gimpunitmenu.h
 include/gimp-2.0/libgimpwidgets/gimpwidgets.h
 include/gimp-2.0/libgimpwidgets/gimpwidgetstypes.h
+libexec/gimp/2.2/environ/default.env
+%%PYTHON:%%libexec/gimp/2.2/environ/pygimp.env
+libexec/gimp/2.2/modules/libcdisplay_colorblind.so
+libexec/gimp/2.2/modules/libcdisplay_gamma.so
+libexec/gimp/2.2/modules/libcdisplay_highcontrast.so
+libexec/gimp/2.2/modules/libcdisplay_proof.so
+libexec/gimp/2.2/modules/libcolorsel_cmyk.so
+libexec/gimp/2.2/modules/libcolorsel_triangle.so
+libexec/gimp/2.2/modules/libcolorsel_water.so
+libexec/gimp/2.2/modules/libcontroller_midi.so
+libexec/gimp/2.2/plug-ins/AlienMap2
+libexec/gimp/2.2/plug-ins/CEL
+libexec/gimp/2.2/plug-ins/CML_explorer
+libexec/gimp/2.2/plug-ins/FractalExplorer
+libexec/gimp/2.2/plug-ins/Lighting
+libexec/gimp/2.2/plug-ins/MapObject
+libexec/gimp/2.2/plug-ins/aa
+libexec/gimp/2.2/plug-ins/align_layers
+libexec/gimp/2.2/plug-ins/animationplay
+libexec/gimp/2.2/plug-ins/animoptimize
+libexec/gimp/2.2/plug-ins/apply_lens
+libexec/gimp/2.2/plug-ins/autocrop
+libexec/gimp/2.2/plug-ins/autostretch_hsv
+libexec/gimp/2.2/plug-ins/blinds
+libexec/gimp/2.2/plug-ins/blur
+libexec/gimp/2.2/plug-ins/bmp
+libexec/gimp/2.2/plug-ins/borderaverage
+libexec/gimp/2.2/plug-ins/bumpmap
+libexec/gimp/2.2/plug-ins/c_astretch
+libexec/gimp/2.2/plug-ins/cartoon
+libexec/gimp/2.2/plug-ins/ccanalyze
+libexec/gimp/2.2/plug-ins/channel_mixer
+libexec/gimp/2.2/plug-ins/checkerboard
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/clothify.py
+libexec/gimp/2.2/plug-ins/color_enhance
+libexec/gimp/2.2/plug-ins/colorify
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/colorhtml.py
+libexec/gimp/2.2/plug-ins/colortoalpha
+libexec/gimp/2.2/plug-ins/compose
+libexec/gimp/2.2/plug-ins/compressor
+libexec/gimp/2.2/plug-ins/convmatrix
+libexec/gimp/2.2/plug-ins/csource
+libexec/gimp/2.2/plug-ins/cubism
+libexec/gimp/2.2/plug-ins/curve_bend
+libexec/gimp/2.2/plug-ins/decompose
+libexec/gimp/2.2/plug-ins/deinterlace
+libexec/gimp/2.2/plug-ins/depthmerge
+libexec/gimp/2.2/plug-ins/despeckle
+libexec/gimp/2.2/plug-ins/destripe
+libexec/gimp/2.2/plug-ins/dicom
+libexec/gimp/2.2/plug-ins/diffraction
+libexec/gimp/2.2/plug-ins/displace
+libexec/gimp/2.2/plug-ins/dog
+libexec/gimp/2.2/plug-ins/edge
+libexec/gimp/2.2/plug-ins/emboss
+libexec/gimp/2.2/plug-ins/engrave
+libexec/gimp/2.2/plug-ins/exchange
+libexec/gimp/2.2/plug-ins/faxg3
+libexec/gimp/2.2/plug-ins/film
+libexec/gimp/2.2/plug-ins/fits
+libexec/gimp/2.2/plug-ins/flame
+libexec/gimp/2.2/plug-ins/flarefx
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/foggify.py
+libexec/gimp/2.2/plug-ins/fp
+libexec/gimp/2.2/plug-ins/fractaltrace
+libexec/gimp/2.2/plug-ins/gauss
+libexec/gimp/2.2/plug-ins/gbr
+libexec/gimp/2.2/plug-ins/gee
+libexec/gimp/2.2/plug-ins/gee_zoom
+libexec/gimp/2.2/plug-ins/gfig
+libexec/gimp/2.2/plug-ins/gflare
+libexec/gimp/2.2/plug-ins/gfli
+libexec/gimp/2.2/plug-ins/gif
+libexec/gimp/2.2/plug-ins/gifload
+libexec/gimp/2.2/plug-ins/gih
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/gimpcons.py
+libexec/gimp/2.2/plug-ins/gimpressionist
+libexec/gimp/2.2/plug-ins/glasstile
+libexec/gimp/2.2/plug-ins/glob
+libexec/gimp/2.2/plug-ins/gqbist
+libexec/gimp/2.2/plug-ins/gradmap
+libexec/gimp/2.2/plug-ins/grid
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/gtkcons.py
+libexec/gimp/2.2/plug-ins/gtm
+libexec/gimp/2.2/plug-ins/guillotine
+libexec/gimp/2.2/plug-ins/header
+libexec/gimp/2.2/plug-ins/help
+%%HELPBROWSER:%%libexec/gimp/2.2/plug-ins/helpbrowser
+libexec/gimp/2.2/plug-ins/hot
+libexec/gimp/2.2/plug-ins/ifscompose
+libexec/gimp/2.2/plug-ins/illusion
+libexec/gimp/2.2/plug-ins/imagemap
+libexec/gimp/2.2/plug-ins/iwarp
+libexec/gimp/2.2/plug-ins/jigsaw
+libexec/gimp/2.2/plug-ins/jpeg
+libexec/gimp/2.2/plug-ins/laplace
+libexec/gimp/2.2/plug-ins/lic
+libexec/gimp/2.2/plug-ins/mail
+libexec/gimp/2.2/plug-ins/mapcolor
+libexec/gimp/2.2/plug-ins/max_rgb
+libexec/gimp/2.2/plug-ins/maze
+libexec/gimp/2.2/plug-ins/mblur
+libexec/gimp/2.2/plug-ins/mng
+libexec/gimp/2.2/plug-ins/mosaic
+libexec/gimp/2.2/plug-ins/neon
+libexec/gimp/2.2/plug-ins/newsprint
+libexec/gimp/2.2/plug-ins/nlfilt
+libexec/gimp/2.2/plug-ins/noisify
+libexec/gimp/2.2/plug-ins/normalize
+libexec/gimp/2.2/plug-ins/nova
+libexec/gimp/2.2/plug-ins/oilify
+libexec/gimp/2.2/plug-ins/pagecurl
+libexec/gimp/2.2/plug-ins/papertile
+libexec/gimp/2.2/plug-ins/pat
+libexec/gimp/2.2/plug-ins/pcx
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/pdbbrowse.py
+libexec/gimp/2.2/plug-ins/photocopy
+libexec/gimp/2.2/plug-ins/pix
+libexec/gimp/2.2/plug-ins/pixelize
+libexec/gimp/2.2/plug-ins/plasma
+libexec/gimp/2.2/plug-ins/plugin-browser
+libexec/gimp/2.2/plug-ins/png
+libexec/gimp/2.2/plug-ins/pnm
+libexec/gimp/2.2/plug-ins/polar
+libexec/gimp/2.2/plug-ins/postscript
+%%PRINT%%libexec/gimp/2.2/plug-ins/print
+libexec/gimp/2.2/plug-ins/procedure-browser
+libexec/gimp/2.2/plug-ins/psd
+libexec/gimp/2.2/plug-ins/psd_save
+libexec/gimp/2.2/plug-ins/psp
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/py-slice.py
+libexec/gimp/2.2/plug-ins/randomize
+libexec/gimp/2.2/plug-ins/raw
+libexec/gimp/2.2/plug-ins/rcm
+libexec/gimp/2.2/plug-ins/retinex
+libexec/gimp/2.2/plug-ins/ripple
+libexec/gimp/2.2/plug-ins/rotate
+libexec/gimp/2.2/plug-ins/sample_colorize
+libexec/gimp/2.2/plug-ins/scatter_hsv
+libexec/gimp/2.2/plug-ins/screenshot
+libexec/gimp/2.2/plug-ins/script-fu
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/shadow_bevel.py
+libexec/gimp/2.2/plug-ins/sel2path
+libexec/gimp/2.2/plug-ins/sel_gauss
+libexec/gimp/2.2/plug-ins/semiflatten
+libexec/gimp/2.2/plug-ins/sgi
+libexec/gimp/2.2/plug-ins/sharpen
+libexec/gimp/2.2/plug-ins/shift
+libexec/gimp/2.2/plug-ins/sinus
+libexec/gimp/2.2/plug-ins/smooth_palette
+libexec/gimp/2.2/plug-ins/snoise
+libexec/gimp/2.2/plug-ins/sobel
+libexec/gimp/2.2/plug-ins/softglow
+libexec/gimp/2.2/plug-ins/sparkle
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/sphere.py
+libexec/gimp/2.2/plug-ins/spheredesigner
+libexec/gimp/2.2/plug-ins/spread
+libexec/gimp/2.2/plug-ins/struc
+libexec/gimp/2.2/plug-ins/sunras
+libexec/gimp/2.2/plug-ins/svg
+libexec/gimp/2.2/plug-ins/tga
+libexec/gimp/2.2/plug-ins/threshold_alpha
+libexec/gimp/2.2/plug-ins/tiff
+libexec/gimp/2.2/plug-ins/tile
+libexec/gimp/2.2/plug-ins/tileit
+libexec/gimp/2.2/plug-ins/tiler
+libexec/gimp/2.2/plug-ins/uniteditor
+libexec/gimp/2.2/plug-ins/unsharp
+libexec/gimp/2.2/plug-ins/url
+libexec/gimp/2.2/plug-ins/video
+libexec/gimp/2.2/plug-ins/vinvert
+libexec/gimp/2.2/plug-ins/vpropagate
+libexec/gimp/2.2/plug-ins/warp
+libexec/gimp/2.2/plug-ins/waves
+libexec/gimp/2.2/plug-ins/webbrowser
+%%PYTHON:%%libexec/gimp/2.2/plug-ins/whirlpinch.py
+libexec/gimp/2.2/plug-ins/whirlpinch
+libexec/gimp/2.2/plug-ins/wind
+libexec/gimp/2.2/plug-ins/winicon
+libexec/gimp/2.2/plug-ins/wmf
+libexec/gimp/2.2/plug-ins/xbm
+libexec/gimp/2.2/plug-ins/xjt
+libexec/gimp/2.2/plug-ins/xpm
+libexec/gimp/2.2/plug-ins/xwd
+libexec/gimp/2.2/plug-ins/zealouscrop
+%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpenums.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpfu.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpmodule.so
+%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpplugin.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpprocbrowsermodule.so
+%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpshelf.pyo
+%%PYTHON:%%libexec/gimp/2.2/python/gimpui.py
+%%PYTHON:%%libexec/gimp/2.2/python/gimpui.pyc
+%%PYTHON:%%libexec/gimp/2.2/python/gimpui.pyo
 lib/libgimp-2.0.a
 lib/libgimp-2.0.so
 lib/libgimp-2.0.so.%%SHLIBVER%%
@@ -195,207 +397,6 @@ lib/libgimpwidgets-2.0.so.%%SHLIBVER%%
 libdata/pkgconfig/gimp-2.0.pc
 libdata/pkgconfig/gimpthumb-2.0.pc
 libdata/pkgconfig/gimpui-2.0.pc
-libexec/gimp/2.0/environ/default.env
-%%PYTHON:%%libexec/gimp/2.0/environ/pygimp.env
-libexec/gimp/2.0/modules/libcdisplay_colorblind.so
-libexec/gimp/2.0/modules/libcdisplay_gamma.so
-libexec/gimp/2.0/modules/libcdisplay_highcontrast.so
-libexec/gimp/2.0/modules/libcdisplay_proof.so
-libexec/gimp/2.0/modules/libcolorsel_cmyk.so
-libexec/gimp/2.0/modules/libcolorsel_triangle.so
-libexec/gimp/2.0/modules/libcolorsel_water.so
-libexec/gimp/2.0/modules/libcontroller_midi.so
-libexec/gimp/2.0/plug-ins/AlienMap2
-libexec/gimp/2.0/plug-ins/CEL
-libexec/gimp/2.0/plug-ins/CML_explorer
-libexec/gimp/2.0/plug-ins/FractalExplorer
-libexec/gimp/2.0/plug-ins/Lighting
-libexec/gimp/2.0/plug-ins/MapObject
-libexec/gimp/2.0/plug-ins/aa
-libexec/gimp/2.0/plug-ins/align_layers
-libexec/gimp/2.0/plug-ins/animationplay
-libexec/gimp/2.0/plug-ins/animoptimize
-libexec/gimp/2.0/plug-ins/apply_lens
-libexec/gimp/2.0/plug-ins/autocrop
-libexec/gimp/2.0/plug-ins/autostretch_hsv
-libexec/gimp/2.0/plug-ins/blinds
-libexec/gimp/2.0/plug-ins/blur
-libexec/gimp/2.0/plug-ins/bmp
-libexec/gimp/2.0/plug-ins/borderaverage
-libexec/gimp/2.0/plug-ins/bumpmap
-libexec/gimp/2.0/plug-ins/c_astretch
-libexec/gimp/2.0/plug-ins/cartoon
-libexec/gimp/2.0/plug-ins/ccanalyze
-libexec/gimp/2.0/plug-ins/channel_mixer
-libexec/gimp/2.0/plug-ins/checkerboard
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/clothify.py
-libexec/gimp/2.0/plug-ins/color_enhance
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/colorhtml.py
-libexec/gimp/2.0/plug-ins/colorify
-libexec/gimp/2.0/plug-ins/colortoalpha
-libexec/gimp/2.0/plug-ins/compose
-libexec/gimp/2.0/plug-ins/compressor
-libexec/gimp/2.0/plug-ins/convmatrix
-libexec/gimp/2.0/plug-ins/csource
-libexec/gimp/2.0/plug-ins/cubism
-libexec/gimp/2.0/plug-ins/curve_bend
-libexec/gimp/2.0/plug-ins/decompose
-libexec/gimp/2.0/plug-ins/deinterlace
-libexec/gimp/2.0/plug-ins/depthmerge
-libexec/gimp/2.0/plug-ins/despeckle
-libexec/gimp/2.0/plug-ins/destripe
-libexec/gimp/2.0/plug-ins/dicom
-libexec/gimp/2.0/plug-ins/diffraction
-libexec/gimp/2.0/plug-ins/displace
-libexec/gimp/2.0/plug-ins/dog
-libexec/gimp/2.0/plug-ins/edge
-libexec/gimp/2.0/plug-ins/emboss
-libexec/gimp/2.0/plug-ins/engrave
-libexec/gimp/2.0/plug-ins/exchange
-libexec/gimp/2.0/plug-ins/faxg3
-libexec/gimp/2.0/plug-ins/film
-libexec/gimp/2.0/plug-ins/fits
-libexec/gimp/2.0/plug-ins/flame
-libexec/gimp/2.0/plug-ins/flarefx
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/foggify.py
-libexec/gimp/2.0/plug-ins/fp
-libexec/gimp/2.0/plug-ins/fractaltrace
-libexec/gimp/2.0/plug-ins/gauss
-libexec/gimp/2.0/plug-ins/gbr
-libexec/gimp/2.0/plug-ins/gee
-libexec/gimp/2.0/plug-ins/gee_zoom
-libexec/gimp/2.0/plug-ins/gfig
-libexec/gimp/2.0/plug-ins/gflare
-libexec/gimp/2.0/plug-ins/gfli
-libexec/gimp/2.0/plug-ins/gif
-libexec/gimp/2.0/plug-ins/gifload
-libexec/gimp/2.0/plug-ins/gih
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/gimpcons.py
-libexec/gimp/2.0/plug-ins/gimpressionist
-libexec/gimp/2.0/plug-ins/glasstile
-libexec/gimp/2.0/plug-ins/glob
-libexec/gimp/2.0/plug-ins/gqbist
-libexec/gimp/2.0/plug-ins/gradmap
-libexec/gimp/2.0/plug-ins/grid
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/gtkcons.py
-libexec/gimp/2.0/plug-ins/gtm
-libexec/gimp/2.0/plug-ins/guillotine
-libexec/gimp/2.0/plug-ins/header
-libexec/gimp/2.0/plug-ins/help
-%%HELPBROWSER:%%libexec/gimp/2.0/plug-ins/helpbrowser
-libexec/gimp/2.0/plug-ins/hot
-libexec/gimp/2.0/plug-ins/ifscompose
-libexec/gimp/2.0/plug-ins/illusion
-libexec/gimp/2.0/plug-ins/imagemap
-libexec/gimp/2.0/plug-ins/iwarp
-libexec/gimp/2.0/plug-ins/jigsaw
-libexec/gimp/2.0/plug-ins/jpeg
-libexec/gimp/2.0/plug-ins/laplace
-libexec/gimp/2.0/plug-ins/lic
-libexec/gimp/2.0/plug-ins/mail
-libexec/gimp/2.0/plug-ins/mapcolor
-libexec/gimp/2.0/plug-ins/max_rgb
-libexec/gimp/2.0/plug-ins/maze
-libexec/gimp/2.0/plug-ins/mblur
-libexec/gimp/2.0/plug-ins/mng
-libexec/gimp/2.0/plug-ins/mosaic
-libexec/gimp/2.0/plug-ins/neon
-libexec/gimp/2.0/plug-ins/newsprint
-libexec/gimp/2.0/plug-ins/nlfilt
-libexec/gimp/2.0/plug-ins/noisify
-libexec/gimp/2.0/plug-ins/normalize
-libexec/gimp/2.0/plug-ins/nova
-libexec/gimp/2.0/plug-ins/oilify
-libexec/gimp/2.0/plug-ins/pagecurl
-libexec/gimp/2.0/plug-ins/papertile
-libexec/gimp/2.0/plug-ins/pat
-libexec/gimp/2.0/plug-ins/pcx
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/pdbbrowse.py
-libexec/gimp/2.0/plug-ins/photocopy
-libexec/gimp/2.0/plug-ins/pix
-libexec/gimp/2.0/plug-ins/pixelize
-libexec/gimp/2.0/plug-ins/plasma
-libexec/gimp/2.0/plug-ins/plugin-browser
-libexec/gimp/2.0/plug-ins/png
-libexec/gimp/2.0/plug-ins/pnm
-libexec/gimp/2.0/plug-ins/polar
-libexec/gimp/2.0/plug-ins/postscript
-%%PRINT%%libexec/gimp/2.0/plug-ins/print
-libexec/gimp/2.0/plug-ins/procedure-browser
-libexec/gimp/2.0/plug-ins/psd
-libexec/gimp/2.0/plug-ins/psd_save
-libexec/gimp/2.0/plug-ins/psp
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/py-slice.py
-libexec/gimp/2.0/plug-ins/randomize
-libexec/gimp/2.0/plug-ins/raw
-libexec/gimp/2.0/plug-ins/rcm
-libexec/gimp/2.0/plug-ins/retinex
-libexec/gimp/2.0/plug-ins/ripple
-libexec/gimp/2.0/plug-ins/rotate
-libexec/gimp/2.0/plug-ins/sample_colorize
-libexec/gimp/2.0/plug-ins/scatter_hsv
-libexec/gimp/2.0/plug-ins/screenshot
-libexec/gimp/2.0/plug-ins/script-fu
-libexec/gimp/2.0/plug-ins/sel2path
-libexec/gimp/2.0/plug-ins/sel_gauss
-libexec/gimp/2.0/plug-ins/semiflatten
-libexec/gimp/2.0/plug-ins/sgi
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/shadow_bevel.py
-libexec/gimp/2.0/plug-ins/sharpen
-libexec/gimp/2.0/plug-ins/shift
-libexec/gimp/2.0/plug-ins/sinus
-libexec/gimp/2.0/plug-ins/smooth_palette
-libexec/gimp/2.0/plug-ins/snoise
-libexec/gimp/2.0/plug-ins/sobel
-libexec/gimp/2.0/plug-ins/softglow
-libexec/gimp/2.0/plug-ins/sparkle
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/sphere.py
-libexec/gimp/2.0/plug-ins/spheredesigner
-libexec/gimp/2.0/plug-ins/spread
-libexec/gimp/2.0/plug-ins/struc
-libexec/gimp/2.0/plug-ins/sunras
-libexec/gimp/2.0/plug-ins/svg
-libexec/gimp/2.0/plug-ins/tga
-libexec/gimp/2.0/plug-ins/threshold_alpha
-libexec/gimp/2.0/plug-ins/tiff
-libexec/gimp/2.0/plug-ins/tile
-libexec/gimp/2.0/plug-ins/tileit
-libexec/gimp/2.0/plug-ins/tiler
-libexec/gimp/2.0/plug-ins/uniteditor
-libexec/gimp/2.0/plug-ins/unsharp
-libexec/gimp/2.0/plug-ins/url
-libexec/gimp/2.0/plug-ins/video
-libexec/gimp/2.0/plug-ins/vinvert
-libexec/gimp/2.0/plug-ins/vpropagate
-libexec/gimp/2.0/plug-ins/warp
-libexec/gimp/2.0/plug-ins/waves
-libexec/gimp/2.0/plug-ins/webbrowser
-libexec/gimp/2.0/plug-ins/whirlpinch
-%%PYTHON:%%libexec/gimp/2.0/plug-ins/whirlpinch.py
-libexec/gimp/2.0/plug-ins/wind
-libexec/gimp/2.0/plug-ins/winicon
-libexec/gimp/2.0/plug-ins/wmf
-libexec/gimp/2.0/plug-ins/xbm
-libexec/gimp/2.0/plug-ins/xjt
-libexec/gimp/2.0/plug-ins/xpm
-libexec/gimp/2.0/plug-ins/xwd
-libexec/gimp/2.0/plug-ins/zealouscrop
-%%PYTHON:%%libexec/gimp/2.0/python/gimpenums.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpenums.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpenums.pyo
-%%PYTHON:%%libexec/gimp/2.0/python/gimpfu.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpfu.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpfu.pyo
-%%PYTHON:%%libexec/gimp/2.0/python/gimpmodule.so
-%%PYTHON:%%libexec/gimp/2.0/python/gimpplugin.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpplugin.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpplugin.pyo
-%%PYTHON:%%libexec/gimp/2.0/python/gimpshelf.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpshelf.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpshelf.pyo
-%%PYTHON:%%libexec/gimp/2.0/python/gimpui.py
-%%PYTHON:%%libexec/gimp/2.0/python/gimpui.pyc
-%%PYTHON:%%libexec/gimp/2.0/python/gimpui.pyo
 share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimp/GimpAspectPreview.html
 %%DOCSDIR%%/libgimp/GimpDrawablePreview.html
@@ -405,6 +406,8 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimp/index.html
 %%DOCSDIR%%/libgimp/index.sgml
 %%DOCSDIR%%/libgimp/left.png
+%%DOCSDIR%%/libgimp/libgimp-data.html
+%%DOCSDIR%%/libgimp/libgimp-general.html
 %%DOCSDIR%%/libgimp/libgimp-gimp.html
 %%DOCSDIR%%/libgimp/libgimp-gimpbrush.html
 %%DOCSDIR%%/libgimp/libgimp-gimpbrushes.html
@@ -460,6 +463,8 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimp/libgimp-gimptools.html
 %%DOCSDIR%%/libgimp/libgimp-gimpui.html
 %%DOCSDIR%%/libgimp/libgimp-gimpundo.html
+%%DOCSDIR%%/libgimp/libgimp-image.html
+%%DOCSDIR%%/libgimp/libgimp-selectors.html
 %%DOCSDIR%%/libgimp/libgimp.devhelp
 %%DOCSDIR%%/libgimp/libgimp.html
 %%DOCSDIR%%/libgimp/libgimpui-hierarchy.html
@@ -552,6 +557,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/GimpColorSelect.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorSelection.html
 %%DOCSDIR%%/libgimpwidgets/GimpColorSelector.html
+%%DOCSDIR%%/libgimpwidgets/GimpController.html
 %%DOCSDIR%%/libgimpwidgets/GimpDialog.html
 %%DOCSDIR%%/libgimpwidgets/GimpFileEntry.html
 %%DOCSDIR%%/libgimpwidgets/GimpFrame.html
@@ -578,6 +584,7 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-cell-renderers.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-colordisplay.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-colorselector.html
+%%DOCSDIR%%/libgimpwidgets/libgimpwidgets-controller.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-deprecated.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-gimpoldwidgets.html
 %%DOCSDIR%%/libgimpwidgets/libgimpwidgets-hierarchy.html
@@ -589,6 +596,8 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-cap-butt-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-cap-round-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-cap-square-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-center-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-center-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-channel-32.png
@@ -721,6 +730,8 @@ share/aclocal/gimp-2.0.m4
 %%DOCSDIR%%/libgimpwidgets/stock-paths-22.png
 %%DOCSDIR%%/libgimpwidgets/stock-plugin-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-portrait-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-print-resolution-16.png
+%%DOCSDIR%%/libgimpwidgets/stock-print-resolution-24.png
 %%DOCSDIR%%/libgimpwidgets/stock-qmask-off-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-qmask-on-16.png
 %%DOCSDIR%%/libgimpwidgets/stock-question-64.png
@@ -1127,8 +1138,8 @@ share/gimp/gradients/Wood_1.ggr
 share/gimp/gradients/Wood_2.ggr
 share/gimp/gradients/Yellow_Contrast.ggr
 share/gimp/gradients/Yellow_Orange.ggr
-share/gimp/images/gimp_logo.png
 share/gimp/images/gimp-splash.png
+share/gimp/images/gimp_logo.png
 share/gimp/images/wilber-devel-icon.png
 share/gimp/images/wilber-icon.png
 share/gimp/images/wilber-tips.png
@@ -1152,13 +1163,18 @@ share/gimp/menus/patterns-menu.xml
 share/gimp/menus/qmask-menu.xml
 share/gimp/menus/selection-editor-menu.xml
 share/gimp/menus/templates-menu.xml
+share/gimp/menus/text-editor-toolbar.xml
 share/gimp/menus/tool-options-menu.xml
 share/gimp/menus/toolbox-menu.xml
 share/gimp/menus/tools-menu.xml
 share/gimp/menus/vectors-menu.xml
-share/gimp/misc/gimp.applications
-share/gimp/misc/gimp.desktop
-share/gimp/misc/gimp.keys
+%%GNOMEPANEL:%%share/gimp/misc/gimp.applications
+%%GNOMEPANEL:%%share/gimp/misc/gimp.desktop
+%%GNOMEPANEL:%%share/gimp/misc/gimp.keys
+%%GNOMEPANEL:%%share/gnome/application-registry/gimp-2.2.applications
+%%GNOMEPANEL:%%share/gnome/applications/gimp-2.2.desktop
+%%GNOMEPANEL:%%share/gnome/mime-info/gimp-2.2.keys
+%%GNOMEPANEL:%%share/gnome/pixmaps/gnome-gimp.png
 share/gimp/palettes/Bears.gpl
 share/gimp/palettes/Bgold.gpl
 share/gimp/palettes/Blues.gpl
@@ -1395,6 +1411,8 @@ share/gimp/themes/Default/images/stock-anchor-16.png
 share/gimp/themes/Default/images/stock-cap-butt-16.png
 share/gimp/themes/Default/images/stock-cap-round-16.png
 share/gimp/themes/Default/images/stock-cap-square-16.png
+share/gimp/themes/Default/images/stock-center-16.png
+share/gimp/themes/Default/images/stock-center-24.png
 share/gimp/themes/Default/images/stock-channel-16.png
 share/gimp/themes/Default/images/stock-channel-24.png
 share/gimp/themes/Default/images/stock-channel-32.png
@@ -1527,6 +1545,8 @@ share/gimp/themes/Default/images/stock-paths-16.png
 share/gimp/themes/Default/images/stock-paths-22.png
 share/gimp/themes/Default/images/stock-plugin-16.png
 share/gimp/themes/Default/images/stock-portrait-16.png
+share/gimp/themes/Default/images/stock-print-resolution-16.png
+share/gimp/themes/Default/images/stock-print-resolution-24.png
 share/gimp/themes/Default/images/stock-qmask-off-16.png
 share/gimp/themes/Default/images/stock-qmask-on-16.png
 share/gimp/themes/Default/images/stock-question-64.png
@@ -1662,9 +1682,6 @@ share/gimp/themes/Default/images/stock-wilber-eek-64.png
 share/gimp/themes/Default/images/stock-zoom-follow-window-12.png
 share/gimp/themes/Small/gtkrc
 share/gimp/tips/gimp-tips.xml
-%%GNOMEPANEL:%%share/gnome/application-registry/gimp-2.2.applications
-%%GNOMEPANEL:%%share/gnome/applications/gimp-2.2.desktop
-%%GNOMEPANEL:%%share/gnome/mime-info/gimp-2.2.keys
 share/locale/ca/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ca/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ca/LC_MESSAGES/gimp20-std-plug-ins.mo
@@ -1753,6 +1770,10 @@ share/locale/ms/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/ms/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/ms/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/ms/LC_MESSAGES/gimp20.mo
+share/locale/nb/LC_MESSAGES/gimp20-libgimp.mo
+share/locale/nb/LC_MESSAGES/gimp20-script-fu.mo
+share/locale/nb/LC_MESSAGES/gimp20-std-plug-ins.mo
+share/locale/nb/LC_MESSAGES/gimp20.mo
 share/locale/nl/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/nl/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/nl/LC_MESSAGES/gimp20-std-plug-ins.mo
@@ -1825,14 +1846,6 @@ share/locale/zh_TW/LC_MESSAGES/gimp20-libgimp.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-script-fu.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20-std-plug-ins.mo
 share/locale/zh_TW/LC_MESSAGES/gimp20.mo
-@dirrm %%DOCSDIR%%/libgimpwidgets
-@dirrm %%DOCSDIR%%/libgimpthumb
-@dirrm %%DOCSDIR%%/libgimpmodule
-@dirrm %%DOCSDIR%%/libgimpmath
-@dirrm %%DOCSDIR%%/libgimpcolor
-@dirrm %%DOCSDIR%%/libgimpbase
-@dirrm %%DOCSDIR%%/libgimp
-@dirrm %%DOCSDIR%%
 @dirrm share/gimp/tips
 @dirrm share/gimp/themes/Small
 @dirrm share/gimp/themes/Default/images/preferences
@@ -1857,11 +1870,19 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm share/gimp/fonts
 @dirrm share/gimp/brushes
 @dirrm share/gimp
-%%PYTHON:%%@dirrm libexec/gimp/2.0/python
-@dirrm libexec/gimp/2.0/plug-ins
-@dirrm libexec/gimp/2.0/modules
-@dirrm libexec/gimp/2.0/environ
-@dirrm libexec/gimp/2.0
+@dirrm %%DOCSDIR%%/libgimpwidgets
+@dirrm %%DOCSDIR%%/libgimpthumb
+@dirrm %%DOCSDIR%%/libgimpmodule
+@dirrm %%DOCSDIR%%/libgimpmath
+@dirrm %%DOCSDIR%%/libgimpcolor
+@dirrm %%DOCSDIR%%/libgimpbase
+@dirrm %%DOCSDIR%%/libgimp
+@dirrm %%DOCSDIR%%
+@dirrm libexec/gimp/2.2/plug-ins
+%%PYTHON:%%@dirrm libexec/gimp/2.2/python
+@dirrm libexec/gimp/2.2/modules
+@dirrm libexec/gimp/2.2/environ
+@dirrm libexec/gimp/2.2
 @dirrm libexec/gimp
 @dirrm include/gimp-2.0/libgimpwidgets
 @dirrm include/gimp-2.0/libgimpthumb
@@ -1871,5 +1892,5 @@ share/locale/zh_TW/LC_MESSAGES/gimp20.mo
 @dirrm include/gimp-2.0/libgimpbase
 @dirrm include/gimp-2.0/libgimp
 @dirrm include/gimp-2.0
-@dirrm etc/gimp/2.0
+@dirrm etc/gimp/2.2
 @dirrm etc/gimp