11 files changed, 517 insertions, 267 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 00a342b689c5..da12d91e6ab9 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -1,5 +1,5 @@
-# New ports collection makefile for:    Gimp
-# Version required:     1.1.15
+# New ports collection makefile for:    The GIMP
+# Version required:     1.1.17
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
@@ -9,21 +9,26 @@
 DISTNAME=	gimp-${VERSION}
 CATEGORIES=	graphics
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v${VERSION}/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v${VERSION}/ \
-		http://www.ameth.org/gimp/pub/gimp/unstable/v${VERSION}/ \
-		ftp://ftp.gimp.org/pub/gimp/unstable/old/v${VERSION}/
+		ftp://ftp.insync.net/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/ \
+		ftp://ftp.ameth.org/pub/mirrors/ftp.gimp.org/gimp/unstable/v${VERSION}/
 
 MAINTAINER=	erich@FreeBSD.org
 
+BUILD_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
+RUN_DEPENDS=	perldl:${PORTSDIR}/math/PDL \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
 		png.3:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		intl.1:${PORTSDIR}/devel/gettext
+
+VERSION=	1.1.17
 
-VERSION=	1.1.15
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -31,7 +36,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--disable-perl
+LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GLIB_CONFIG="${GLIB_CONFIG}" \
 		GTK_CONFIG="${GTK_CONFIG}" \
@@ -40,4 +45,20 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		gimp.1 gimptool.1
 MAN5=		gimprc.5
 
+.if !defined(WITH_GNOME) && exists(${X11BASE}/bin/gnome-config)
+WITH_GNOME=	yes
+.endif
+
+.if defined(WITH_GNOME) && ${WITH_GNOME} == yes
+LIB_DEPENDS+=	gtkxmhtml.3:${PORTSDIR}/x11/gnomelibs
+.else
+PLIST=		${WRKDIR}/PLIST
+pre-install:
+	@${SED} -e '/helpbrowser/d' ${PKGDIR}/PLIST > ${PLIST}
+.endif
+
+post-install:
+	${INSTALL_SCRIPT} ${FILESDIR}/gimp.setfont ${PREFIX}/bin
+	@${CAT} ${PKGDIR}/MESSAGE
+
 .include <bsd.port.mk>
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 7a8346031ab1..4bfc5bc43ff1 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-1.1.15.tar.bz2) = cdfc7538824d262da0cc6ae3a39d85c7
+MD5 (gimp-1.1.17.tar.bz2) = 5599cb98b3a17324f2ad2682348a7df9
diff --git a/graphics/gimp-app-devel/files/patch-aa b/graphics/gimp-app-devel/files/patch-aa
index 16de4cd974ff..33a7ddbd83b8 100644
--- a/graphics/gimp-app-devel/files/patch-aa
+++ b/graphics/gimp-app-devel/files/patch-aa
@@ -1,21 +1,20 @@
---- app/main.c.orig	Wed Oct  6 13:55:38 1999
-+++ app/main.c	Tue Oct 12 13:23:44 1999
-@@ -16,7 +16,7 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-  */
- #include "config.h"
--
+--- app/main.c.orig	Thu Feb 10 14:41:02 2000
++++ app/main.c	Sat Feb 19 13:51:36 2000
+@@ -22,6 +22,7 @@
+ #include <signal.h>
+ #include <string.h>
+ #include <sys/types.h>
 +#include <floatingpoint.h>
- #include <locale.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -117,6 +117,9 @@
  
+ #ifdef HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+@@ -129,6 +130,9 @@
    /* Initialize variables */
+ 
    prog_name = argv[0];
 +
 +  /* Ignore floating point exceptions */
 +  fpsetmask(0);
  
    /* Initialize i18n support */
- 
+   INIT_LOCALE ("gimp");
diff --git a/graphics/gimp-app-devel/files/patch-ab b/graphics/gimp-app-devel/files/patch-ab
index 4a00a2ad60f9..2e37f7c44cff 100644
--- a/graphics/gimp-app-devel/files/patch-ab
+++ b/graphics/gimp-app-devel/files/patch-ab
@@ -1,6 +1,6 @@
---- plug-ins/common/url.c	Sun Nov  7 19:24:37 1999
-+++ plug-ins/common/url.c.new	Sun Nov  7 19:26:39 1999
-@@ -151,8 +151,8 @@
+--- plug-ins/common/url.c.orig	Tue Feb  1 16:09:01 2000
++++ plug-ins/common/url.c	Sat Feb 19 13:51:36 2000
+@@ -158,8 +158,8 @@
      }
    else if (pid == 0)
      {
diff --git a/graphics/gimp-app-devel/files/patch-ah b/graphics/gimp-app-devel/files/patch-ah
index 80d4d82eb59c..95af0d629b7f 100644
--- a/graphics/gimp-app-devel/files/patch-ah
+++ b/graphics/gimp-app-devel/files/patch-ah
@@ -1,6 +1,6 @@
---- configure.orig	Wed Oct  6 14:00:22 1999
-+++ configure	Tue Oct 12 13:37:31 1999
-@@ -3471,7 +3471,11 @@
+--- configure.orig	Fri Feb 11 10:32:12 2000
++++ configure	Sat Feb 19 13:51:36 2000
+@@ -3480,7 +3480,11 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -13,7 +13,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7108,7 +7112,7 @@
+@@ -7017,7 +7021,7 @@
  fi
  
  gimpdatadir=$datadir/gimp
@@ -22,7 +22,7 @@
  localedir='${prefix}/${DATADIRNAME}/locale'
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
-@@ -8513,10 +8517,6 @@
+@@ -8561,10 +8565,6 @@
      top_srcdir="$ac_dots$ac_given_srcdir" ;;
    esac
  
diff --git a/graphics/gimp-app-devel/files/patch-ak b/graphics/gimp-app-devel/files/patch-ak
index 0d660de2f208..90837d0254f2 100644
--- a/graphics/gimp-app-devel/files/patch-ak
+++ b/graphics/gimp-app-devel/files/patch-ak
@@ -1,17 +1,11 @@
---- libgimp/Makefile.in.orig	Tue Mar  9 02:58:39 1999
-+++ libgimp/Makefile.in	Tue May 18 09:42:40 1999
-@@ -188,11 +188,11 @@
- gimpinclude_HEADERS =  	color_selector.h		gimp.h				gimpchainbutton.h		gimpenums.h			gimpenv.h			gimpfeatures.h			gimpmatrix.h			gimpmenu.h			gimpmodule.h			gimpsizeentry.h			gimpui.h			gimpunit.h              	gimpunitmenu.h          	gimpintl.h			gserialize.h			parasite.h			parasiteF.h			parasiteP.h
+--- libgimp/Makefile.in.orig	Fri Feb 11 10:42:12 2000
++++ libgimp/Makefile.in	Sat Feb 19 15:18:59 2000
+@@ -211,7 +211,7 @@
  
- 
--libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ libgimp_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
  
 -libgimp_la_LIBADD = $(GLIB_LIBS) -lm
 +libgimp_la_LIBADD = $(GTK_LIBS) -lm
  
--libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
-+libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ libgimpui_la_LDFLAGS =  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 	-release $(LT_RELEASE)
  
- libgimpui_la_LIBADD = $(GTK_LIBS)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gimp-app-devel/files/patch-am b/graphics/gimp-app-devel/files/patch-am
index 368e279354da..530b1aaa081e 100644
--- a/graphics/gimp-app-devel/files/patch-am
+++ b/graphics/gimp-app-devel/files/patch-am
@@ -1,19 +1,20 @@
---- libgimp/gimp.c.orig	Tue Sep 29 22:35:20 1998
-+++ libgimp/gimp.c	Tue Sep 29 22:36:00 1998
-@@ -19,6 +19,7 @@
- #include "config.h"
- 
- #include <errno.h>
+--- libgimp/gimp.c.orig	Mon Dec  6 14:44:39 1999
++++ libgimp/gimp.c	Sat Feb 19 13:51:36 2000
+@@ -26,6 +26,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
 +#include <floatingpoint.h>
- #include <signal.h>
- #include <stdarg.h>
- #include <stdio.h>
-@@ -95,6 +96,8 @@
+ #ifdef HAVE_SYS_TIME_H
+ #include <sys/time.h>
+ #endif
+@@ -186,6 +187,9 @@
      }
  
    progname = argv[0];
 +
++  /* Ignore floating point exceptions */
 +  fpsetmask(0);
  
-   signal (SIGHUP, gimp_signal);
-   signal (SIGINT, gimp_signal);
+ #ifndef G_OS_WIN32
+   /* No use catching these on Win32, the user won't get any meaningful
diff --git a/graphics/gimp-app-devel/pkg-comment b/graphics/gimp-app-devel/pkg-comment
index ff65708efa09..542abe0b835e 100644
--- a/graphics/gimp-app-devel/pkg-comment
+++ b/graphics/gimp-app-devel/pkg-comment
@@ -1 +1 @@
-Developer's beta release of the General Image Manipulation Program
+Developer's beta release of the GNU Image Manipulation Program
diff --git a/graphics/gimp-app-devel/pkg-descr b/graphics/gimp-app-devel/pkg-descr
index 49008ee52473..dc35cdf95b7a 100644
--- a/graphics/gimp-app-devel/pkg-descr
+++ b/graphics/gimp-app-devel/pkg-descr
@@ -17,3 +17,5 @@ major features:
    *  Plug-ins which allow for the easy addition of new file formats and
       new effect filters.
    *  Multiple undo/redo.
+
+To enable I18N extensions, execute "gimp.setfont" before you use GIMP.
diff --git a/graphics/gimp-app-devel/pkg-message b/graphics/gimp-app-devel/pkg-message
new file mode 100644
index 000000000000..e86b05293253
--- /dev/null
+++ b/graphics/gimp-app-devel/pkg-message
@@ -0,0 +1,6 @@
+***************************************************
+*                                                 *
+* For I18N support, please execute "gimp.setfont" *
+* before running the GIMP.                        *
+*                                                 *
+***************************************************
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 204febe2de3a..87f412103a6f 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -1,4 +1,6 @@
 bin/gimp
+bin/gimp-config
+bin/gimp.setfont
 bin/gimptool
 include/gck/gck.h
 include/gck/gckcolor.h
@@ -30,6 +32,7 @@ include/libgimp/gimpmatrix.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpmodule.h
 include/libgimp/gimppatheditor.h
+include/libgimp/gimpquerybox.h
 include/libgimp/gimpsizeentry.h
 include/libgimp/gimpui.h
 include/libgimp/gimpunit.h
@@ -42,14 +45,13 @@ include/libgimp/parasiteP.h
 include/libgimp/parasiteio.h
 lib/libgck.a
 lib/libgck.so
-lib/libgck.so.15
+lib/libgck.so.17
 lib/libgimp.a
 lib/libgimp.so
-lib/libgimp.so.15
+lib/libgimp.so.17
 lib/libgimpui.a
 lib/libgimpui.so
-lib/libgimpui.so.15
-lib/libmegawidget.a
+lib/libgimpui.so.17
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 libexec/gimp/1.1/modules/libcdisplay_gamma.so
@@ -63,29 +65,41 @@ libexec/gimp/1.1/plug-ins/CML_explorer
 libexec/gimp/1.1/plug-ins/FractalExplorer
 libexec/gimp/1.1/plug-ins/Lighting
 libexec/gimp/1.1/plug-ins/MapObject
+libexec/gimp/1.1/plug-ins/PDB
+libexec/gimp/1.1/plug-ins/Perl-Server
 libexec/gimp/1.1/plug-ins/aa
 libexec/gimp/1.1/plug-ins/align_layers
+libexec/gimp/1.1/plug-ins/animate_cells
 libexec/gimp/1.1/plug-ins/animationplay
 libexec/gimp/1.1/plug-ins/animoptimize
 libexec/gimp/1.1/plug-ins/apply_lens
 libexec/gimp/1.1/plug-ins/autocrop
 libexec/gimp/1.1/plug-ins/autostretch_hsv
+libexec/gimp/1.1/plug-ins/avi
+libexec/gimp/1.1/plug-ins/blended2
 libexec/gimp/1.1/plug-ins/blinds
+libexec/gimp/1.1/plug-ins/blowinout
 libexec/gimp/1.1/plug-ins/blur
 libexec/gimp/1.1/plug-ins/bmp
+libexec/gimp/1.1/plug-ins/border
 libexec/gimp/1.1/plug-ins/borderaverage
+libexec/gimp/1.1/plug-ins/bricks
 libexec/gimp/1.1/plug-ins/bumpmap
+libexec/gimp/1.1/plug-ins/burst
 libexec/gimp/1.1/plug-ins/bz2
 libexec/gimp/1.1/plug-ins/c_astretch
+libexec/gimp/1.1/plug-ins/centerguide
 libexec/gimp/1.1/plug-ins/checkerboard
+libexec/gimp/1.1/plug-ins/color_enhance
+libexec/gimp/1.1/plug-ins/colorhtml
 libexec/gimp/1.1/plug-ins/colorify
 libexec/gimp/1.1/plug-ins/colortoalpha
-libexec/gimp/1.1/plug-ins/color_enhance
 libexec/gimp/1.1/plug-ins/compose
 libexec/gimp/1.1/plug-ins/convmatrix
 libexec/gimp/1.1/plug-ins/csource
 libexec/gimp/1.1/plug-ins/cubism
 libexec/gimp/1.1/plug-ins/curve_bend
+libexec/gimp/1.1/plug-ins/dataurl
 libexec/gimp/1.1/plug-ins/dbbrowser
 libexec/gimp/1.1/plug-ins/decompose
 libexec/gimp/1.1/plug-ins/deinterlace
@@ -94,17 +108,23 @@ libexec/gimp/1.1/plug-ins/despeckle
 libexec/gimp/1.1/plug-ins/destripe
 libexec/gimp/1.1/plug-ins/diffraction
 libexec/gimp/1.1/plug-ins/displace
+libexec/gimp/1.1/plug-ins/ditherize
 libexec/gimp/1.1/plug-ins/edge
 libexec/gimp/1.1/plug-ins/emboss
 libexec/gimp/1.1/plug-ins/engrave
 libexec/gimp/1.1/plug-ins/exchange
 libexec/gimp/1.1/plug-ins/faxg3
 libexec/gimp/1.1/plug-ins/film
+libexec/gimp/1.1/plug-ins/fire
+libexec/gimp/1.1/plug-ins/fit-text
 libexec/gimp/1.1/plug-ins/fits
 libexec/gimp/1.1/plug-ins/flame
 libexec/gimp/1.1/plug-ins/flarefx
+libexec/gimp/1.1/plug-ins/font_table
 libexec/gimp/1.1/plug-ins/fp
 libexec/gimp/1.1/plug-ins/fractaltrace
+libexec/gimp/1.1/plug-ins/frame_filter
+libexec/gimp/1.1/plug-ins/frame_reshuffle
 libexec/gimp/1.1/plug-ins/gap_decode_mpeg
 libexec/gimp/1.1/plug-ins/gap_filter
 libexec/gimp/1.1/plug-ins/gap_frontends
@@ -121,31 +141,46 @@ libexec/gimp/1.1/plug-ins/gfli
 libexec/gimp/1.1/plug-ins/gicon
 libexec/gimp/1.1/plug-ins/gif
 libexec/gimp/1.1/plug-ins/gifload
+libexec/gimp/1.1/plug-ins/gimpmagick
 libexec/gimp/1.1/plug-ins/gimpressionist
 libexec/gimp/1.1/plug-ins/glasstile
+libexec/gimp/1.1/plug-ins/glowing_steel
+libexec/gimp/1.1/plug-ins/goldenmean
+libexec/gimp/1.1/plug-ins/gouge
 libexec/gimp/1.1/plug-ins/gpb
 libexec/gimp/1.1/plug-ins/gqbist
 libexec/gimp/1.1/plug-ins/gradmap
 libexec/gimp/1.1/plug-ins/grid
 libexec/gimp/1.1/plug-ins/gtm
+libexec/gimp/1.1/plug-ins/guide_remove
+libexec/gimp/1.1/plug-ins/guidegrid
+libexec/gimp/1.1/plug-ins/guides_to_selection
 libexec/gimp/1.1/plug-ins/guillotine
 libexec/gimp/1.1/plug-ins/gz
 libexec/gimp/1.1/plug-ins/header
+libexec/gimp/1.1/plug-ins/helpbrowser
 libexec/gimp/1.1/plug-ins/hot
 libexec/gimp/1.1/plug-ins/hrz
 libexec/gimp/1.1/plug-ins/ifscompose
 libexec/gimp/1.1/plug-ins/illusion
+libexec/gimp/1.1/plug-ins/image_tile
 libexec/gimp/1.1/plug-ins/imagemap
+libexec/gimp/1.1/plug-ins/innerbevel
 libexec/gimp/1.1/plug-ins/iwarp
 libexec/gimp/1.1/plug-ins/jigsaw
 libexec/gimp/1.1/plug-ins/jpeg
 libexec/gimp/1.1/plug-ins/laplace
+libexec/gimp/1.1/plug-ins/layerfuncs
 libexec/gimp/1.1/plug-ins/lic
+libexec/gimp/1.1/plug-ins/logulator
 libexec/gimp/1.1/plug-ins/mail
+libexec/gimp/1.1/plug-ins/map_to_gradient
 libexec/gimp/1.1/plug-ins/mapcolor
 libexec/gimp/1.1/plug-ins/max_rgb
 libexec/gimp/1.1/plug-ins/maze
 libexec/gimp/1.1/plug-ins/mblur
+libexec/gimp/1.1/plug-ins/miff
+libexec/gimp/1.1/plug-ins/mirrorsplit
 libexec/gimp/1.1/plug-ins/mosaic
 libexec/gimp/1.1/plug-ins/mpeg
 libexec/gimp/1.1/plug-ins/newsprint
@@ -156,30 +191,43 @@ libexec/gimp/1.1/plug-ins/nova
 libexec/gimp/1.1/plug-ins/oilify
 libexec/gimp/1.1/plug-ins/pagecurl
 libexec/gimp/1.1/plug-ins/papertile
+libexec/gimp/1.1/plug-ins/parasite-editor
 libexec/gimp/1.1/plug-ins/pat
 libexec/gimp/1.1/plug-ins/pcx
+libexec/gimp/1.1/plug-ins/perlcc
+libexec/gimp/1.1/plug-ins/perlotine
 libexec/gimp/1.1/plug-ins/pix
 libexec/gimp/1.1/plug-ins/pixelize
+libexec/gimp/1.1/plug-ins/pixelmap
 libexec/gimp/1.1/plug-ins/plasma
 libexec/gimp/1.1/plug-ins/plugindetails
 libexec/gimp/1.1/plug-ins/png
 libexec/gimp/1.1/plug-ins/pnm
 libexec/gimp/1.1/plug-ins/polar
+libexec/gimp/1.1/plug-ins/povray
+libexec/gimp/1.1/plug-ins/prep4gif
 libexec/gimp/1.1/plug-ins/print
 libexec/gimp/1.1/plug-ins/ps
 libexec/gimp/1.1/plug-ins/psd
 libexec/gimp/1.1/plug-ins/psp
+libexec/gimp/1.1/plug-ins/randomart1
+libexec/gimp/1.1/plug-ins/randomblends
 libexec/gimp/1.1/plug-ins/randomize
 libexec/gimp/1.1/plug-ins/rcm
+libexec/gimp/1.1/plug-ins/repdup
 libexec/gimp/1.1/plug-ins/ripple
 libexec/gimp/1.1/plug-ins/rotate
+libexec/gimp/1.1/plug-ins/roundrectsel
+libexec/gimp/1.1/plug-ins/roundsel
 libexec/gimp/1.1/plug-ins/sample_colorize
 libexec/gimp/1.1/plug-ins/scatter_hsv
+libexec/gimp/1.1/plug-ins/scratches
 libexec/gimp/1.1/plug-ins/screenshot
 libexec/gimp/1.1/plug-ins/script-fu
 libexec/gimp/1.1/plug-ins/sel2path
 libexec/gimp/1.1/plug-ins/sel_gauss
 libexec/gimp/1.1/plug-ins/semiflatten
+libexec/gimp/1.1/plug-ins/sethspin
 libexec/gimp/1.1/plug-ins/sgi
 libexec/gimp/1.1/plug-ins/sharpen
 libexec/gimp/1.1/plug-ins/shift
@@ -190,29 +238,42 @@ libexec/gimp/1.1/plug-ins/sobel
 libexec/gimp/1.1/plug-ins/sparkle
 libexec/gimp/1.1/plug-ins/spheredesigner
 libexec/gimp/1.1/plug-ins/spread
+libexec/gimp/1.1/plug-ins/stampify
+libexec/gimp/1.1/plug-ins/stamps
 libexec/gimp/1.1/plug-ins/struc
 libexec/gimp/1.1/plug-ins/sunras
+libexec/gimp/1.1/plug-ins/terral_text
+libexec/gimp/1.1/plug-ins/tex-to-float
 libexec/gimp/1.1/plug-ins/tga
 libexec/gimp/1.1/plug-ins/threshold_alpha
 libexec/gimp/1.1/plug-ins/tiff
 libexec/gimp/1.1/plug-ins/tile
 libexec/gimp/1.1/plug-ins/tileit
 libexec/gimp/1.1/plug-ins/tiler
+libexec/gimp/1.1/plug-ins/translogo
+libexec/gimp/1.1/plug-ins/triangle
 libexec/gimp/1.1/plug-ins/unsharp
 libexec/gimp/1.1/plug-ins/url
 libexec/gimp/1.1/plug-ins/video
+libexec/gimp/1.1/plug-ins/view3d
 libexec/gimp/1.1/plug-ins/vinvert
 libexec/gimp/1.1/plug-ins/vpropagate
 libexec/gimp/1.1/plug-ins/warp
 libexec/gimp/1.1/plug-ins/waves
 libexec/gimp/1.1/plug-ins/webbrowser
+libexec/gimp/1.1/plug-ins/webify
 libexec/gimp/1.1/plug-ins/whirlpinch
 libexec/gimp/1.1/plug-ins/wind
+libexec/gimp/1.1/plug-ins/windify
 libexec/gimp/1.1/plug-ins/wmf
+libexec/gimp/1.1/plug-ins/xachlego
+libexec/gimp/1.1/plug-ins/xachshadow
+libexec/gimp/1.1/plug-ins/xachvision
 libexec/gimp/1.1/plug-ins/xbm
 libexec/gimp/1.1/plug-ins/xjt
 libexec/gimp/1.1/plug-ins/xpm
 libexec/gimp/1.1/plug-ins/xwd
+libexec/gimp/1.1/plug-ins/yinyang
 libexec/gimp/1.1/plug-ins/zealouscrop
 share/aclocal/gimp.m4
 share/gimp/brushes/10x10square.gbr
@@ -257,6 +318,42 @@ share/gimp/brushes/pixel.gbr
 share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/vine.gih
 share/gimp/brushes/xcf.gbr
+share/gimp/devel-docs/html/libgimp/book1.html
+share/gimp/devel-docs/html/libgimp/gimpchainbutton.html
+share/gimp/devel-docs/html/libgimp/gimpcolorbutton.html
+share/gimp/devel-docs/html/libgimp/gimpdefinitions.html
+share/gimp/devel-docs/html/libgimp/gimpfileselection.html
+share/gimp/devel-docs/html/libgimp/gimpmodule.html
+share/gimp/devel-docs/html/libgimp/gimppatheditor.html
+share/gimp/devel-docs/html/libgimp/gimpsizeentry.html
+share/gimp/devel-docs/html/libgimp/gimpunitmenu.html
+share/gimp/devel-docs/html/libgimp/libgimp-color-display.html
+share/gimp/devel-docs/html/libgimp/libgimp-color-selector.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimp.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpcolorspace.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpcompat.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpdialog.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpenums.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpenv.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpexport.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpfeatures.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimphelpui.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimplimits.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmath.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmatrix.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmenu.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpmodule.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpprotocol.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpunit.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpwidgets.html
+share/gimp/devel-docs/html/libgimp/libgimp-gimpwire.html
+share/gimp/devel-docs/html/libgimp/libgimp-gserialize.html
+share/gimp/devel-docs/html/libgimp/libgimp-parasite.html
+share/gimp/devel-docs/html/libgimp/libgimp-parasitef.html
+share/gimp/devel-docs/html/libgimp/libgimp-parasiteio.html
+share/gimp/devel-docs/html/libgimp/libgimp-parasitep.html
+share/gimp/devel-docs/html/libgimp/libgimp.html
+share/gimp/devel-docs/html/libgimp/libgimpui.html
 share/gimp/fractalexplorer/Asteroid_Field
 share/gimp/fractalexplorer/Bar_Code_Label
 share/gimp/fractalexplorer/Beauty_of_Nature
@@ -302,11 +399,16 @@ share/gimp/gfig/star2
 share/gimp/gfig/stars
 share/gimp/gflare/Bright_Star
 share/gimp/gflare/Classic
-share/gimp/gflare/Distant_Sun
 share/gimp/gflare/Default
+share/gimp/gflare/Distant_Sun
 share/gimp/gflare/GFlare_101
 share/gimp/gflare/GFlare_102
 share/gimp/gflare/Hidden_Planet
+share/gimp/gimp1_1_splash.ppm
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimprc
+share/gimp/gimprc_user
 share/gimp/gimpressionist/Brushes/arrow01.pgm
 share/gimp/gimpressionist/Brushes/ball.ppm
 share/gimp/gimpressionist/Brushes/blob.ppm
@@ -398,11 +500,6 @@ share/gimp/gimpressionist/Presets/Smash
 share/gimp/gimpressionist/Presets/Straws
 share/gimp/gimpressionist/Presets/Weave
 share/gimp/gimpressionist/Presets/Wormcan
-share/gimp/gimp1_1_splash.ppm
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_splash.ppm
-share/gimp/gimprc
-share/gimp/gimprc_user
 share/gimp/gradients/Abstract_1
 share/gimp/gradients/Abstract_2
 share/gimp/gradients/Abstract_3
@@ -481,64 +578,38 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
-share/gimp/help/C/dialogs/layers/add_mask.html
-share/gimp/help/C/dialogs/layers/apply_mask.html
-share/gimp/help/C/dialogs/layers/edit_layer_attributes.html
-share/gimp/help/C/dialogs/layers/index.html
-share/gimp/help/C/dialogs/layers/layer_boundary_size.html
-share/gimp/help/C/dialogs/layers/layers.html
-share/gimp/help/C/dialogs/layers/merge_visible_layers.html
-share/gimp/help/C/dialogs/layers/new_layer.html
-share/gimp/help/C/dialogs/layers/scale_layer.html
+share/gimp/gtkrc
+share/gimp/help/C/channels/channel_to_selection.html
+share/gimp/help/C/channels/channels.html
+share/gimp/help/C/channels/delete_channel.html
+@exec mkdir -p %D/share/gimp/help/C/channels
+@exec ln -sf %D/share/gimp/help/C/dialogs/channels %D/share/gimp/help/C/channels/dialogs
+@unexec rm -f %D/share/gimp/help/C/channels/dialogs
+share/gimp/help/C/channels/duplicate_channel.html
+share/gimp/help/C/channels/index.html
+share/gimp/help/C/channels/lower_channel.html
+share/gimp/help/C/channels/raise_channel.html
+share/gimp/help/C/contents.html
+share/gimp/help/C/dialogs/about.html
+share/gimp/help/C/dialogs/border_selection.html
+share/gimp/help/C/dialogs/brush_editor.html
+share/gimp/help/C/dialogs/brush_selection.html
 share/gimp/help/C/dialogs/channels/channels.html
 share/gimp/help/C/dialogs/channels/edit_channel_attributes.html
 share/gimp/help/C/dialogs/channels/index.html
 share/gimp/help/C/dialogs/channels/new_channel.html
-share/gimp/help/C/dialogs/paths/export_path.html
-share/gimp/help/C/dialogs/paths/import_path.html
-share/gimp/help/C/dialogs/paths/index.html
-share/gimp/help/C/dialogs/paths/paths.html
-share/gimp/help/C/dialogs/paths/rename_path.html
-share/gimp/help/C/dialogs/palette_editor/import_palette.html
-share/gimp/help/C/dialogs/palette_editor/index.html
-share/gimp/help/C/dialogs/palette_editor/merge_palette.html
-share/gimp/help/C/dialogs/palette_editor/new_palette.html
-share/gimp/help/C/dialogs/palette_editor/palette_editor.html
-share/gimp/help/C/dialogs/gradient_editor/copy_gradient.html
-share/gimp/help/C/dialogs/gradient_editor/delete_gradient.html
-share/gimp/help/C/dialogs/gradient_editor/gradient_editor.html
-share/gimp/help/C/dialogs/gradient_editor/index.html
-share/gimp/help/C/dialogs/gradient_editor/new_gradient.html
-share/gimp/help/C/dialogs/gradient_editor/rename_gradient.html
-share/gimp/help/C/dialogs/gradient_editor/replicate_segment.html
-share/gimp/help/C/dialogs/gradient_editor/save_as_pov_ray.html
-share/gimp/help/C/dialogs/gradient_editor/split_segments_uniformly.html
-share/gimp/help/C/dialogs/display_filters/display_filters.html
-share/gimp/help/C/dialogs/display_filters/gamma.html
-share/gimp/help/C/dialogs/display_filters/index.html
 share/gimp/help/C/dialogs/color_selectors/built_in.html
 share/gimp/help/C/dialogs/color_selectors/gtk.html
 share/gimp/help/C/dialogs/color_selectors/index.html
 share/gimp/help/C/dialogs/color_selectors/triangle.html
 share/gimp/help/C/dialogs/color_selectors/watercolor.html
-share/gimp/help/C/dialogs/palette_editor/delete_palette.html
-share/gimp/help/C/dialogs/preferences/directories.html
-share/gimp/help/C/dialogs/preferences/display.html
-share/gimp/help/C/dialogs/preferences/environment.html
-share/gimp/help/C/dialogs/preferences/index.html
-share/gimp/help/C/dialogs/preferences/interface.html
-share/gimp/help/C/dialogs/preferences/monitor.html
-share/gimp/help/C/dialogs/preferences/new_file.html
-share/gimp/help/C/dialogs/preferences/preferences.html
-share/gimp/help/C/dialogs/preferences/session.html
-share/gimp/help/C/dialogs/about.html
-share/gimp/help/C/dialogs/border_selection.html
-share/gimp/help/C/dialogs/brush_editor.html
-share/gimp/help/C/dialogs/brush_selection.html
 share/gimp/help/C/dialogs/convert_to_indexed.html
 share/gimp/help/C/dialogs/copy_named.html
 share/gimp/help/C/dialogs/cut_named.html
 share/gimp/help/C/dialogs/device_status.html
+share/gimp/help/C/dialogs/display_filters/display_filters.html
+share/gimp/help/C/dialogs/display_filters/gamma.html
+share/gimp/help/C/dialogs/display_filters/index.html
 share/gimp/help/C/dialogs/document_index.html
 share/gimp/help/C/dialogs/edit_qmask_attributes.html
 share/gimp/help/C/dialogs/error_console.html
@@ -546,6 +617,15 @@ share/gimp/help/C/dialogs/feather_selection.html
 share/gimp/help/C/dialogs/file_new.html
 share/gimp/help/C/dialogs/file_open.html
 share/gimp/help/C/dialogs/file_save.html
+share/gimp/help/C/dialogs/gradient_editor/copy_gradient.html
+share/gimp/help/C/dialogs/gradient_editor/delete_gradient.html
+share/gimp/help/C/dialogs/gradient_editor/gradient_editor.html
+share/gimp/help/C/dialogs/gradient_editor/index.html
+share/gimp/help/C/dialogs/gradient_editor/new_gradient.html
+share/gimp/help/C/dialogs/gradient_editor/rename_gradient.html
+share/gimp/help/C/dialogs/gradient_editor/replicate_segment.html
+share/gimp/help/C/dialogs/gradient_editor/save_as_pov_ray.html
+share/gimp/help/C/dialogs/gradient_editor/split_segments_uniformly.html
 share/gimp/help/C/dialogs/gradient_selection.html
 share/gimp/help/C/dialogs/grow_selection.html
 share/gimp/help/C/dialogs/help.html
@@ -553,13 +633,42 @@ share/gimp/help/C/dialogs/index.html
 share/gimp/help/C/dialogs/indexed_palette.html
 share/gimp/help/C/dialogs/info_window.html
 share/gimp/help/C/dialogs/input_devices.html
+share/gimp/help/C/dialogs/layers/add_mask.html
+share/gimp/help/C/dialogs/layers/apply_mask.html
+share/gimp/help/C/dialogs/layers/edit_layer_attributes.html
+share/gimp/help/C/dialogs/layers/index.html
+share/gimp/help/C/dialogs/layers/layer_boundary_size.html
+share/gimp/help/C/dialogs/layers/layers.html
+share/gimp/help/C/dialogs/layers/merge_visible_layers.html
+share/gimp/help/C/dialogs/layers/new_layer.html
+share/gimp/help/C/dialogs/layers/scale_layer.html
 share/gimp/help/C/dialogs/layers_and_channels.html
 share/gimp/help/C/dialogs/module_browser.html
 share/gimp/help/C/dialogs/navigation_window.html
 share/gimp/help/C/dialogs/offset.html
+share/gimp/help/C/dialogs/palette_editor/delete_palette.html
+share/gimp/help/C/dialogs/palette_editor/import_palette.html
+share/gimp/help/C/dialogs/palette_editor/index.html
+share/gimp/help/C/dialogs/palette_editor/merge_palette.html
+share/gimp/help/C/dialogs/palette_editor/new_palette.html
+share/gimp/help/C/dialogs/palette_editor/palette_editor.html
 share/gimp/help/C/dialogs/palette_selection.html
 share/gimp/help/C/dialogs/paste_named.html
+share/gimp/help/C/dialogs/paths/export_path.html
+share/gimp/help/C/dialogs/paths/import_path.html
+share/gimp/help/C/dialogs/paths/index.html
+share/gimp/help/C/dialogs/paths/paths.html
+share/gimp/help/C/dialogs/paths/rename_path.html
 share/gimp/help/C/dialogs/pattern_selection.html
+share/gimp/help/C/dialogs/preferences/directories.html
+share/gimp/help/C/dialogs/preferences/display.html
+share/gimp/help/C/dialogs/preferences/environment.html
+share/gimp/help/C/dialogs/preferences/index.html
+share/gimp/help/C/dialogs/preferences/interface.html
+share/gimp/help/C/dialogs/preferences/monitor.html
+share/gimp/help/C/dialogs/preferences/new_file.html
+share/gimp/help/C/dialogs/preferences/preferences.html
+share/gimp/help/C/dialogs/preferences/session.html
 share/gimp/help/C/dialogs/really_close.html
 share/gimp/help/C/dialogs/really_quit.html
 share/gimp/help/C/dialogs/scale_image.html
@@ -568,119 +677,20 @@ share/gimp/help/C/dialogs/shrink_selection.html
 share/gimp/help/C/dialogs/tip_of_the_day.html
 share/gimp/help/C/dialogs/tool_options.html
 share/gimp/help/C/dialogs/undo_history.html
-share/gimp/help/C/tools/airbrush.html
-share/gimp/help/C/tools/bezier_select.html
-share/gimp/help/C/tools/blend.html
-share/gimp/help/C/tools/brightness_contrast.html
-share/gimp/help/C/tools/bucket_fill.html
-share/gimp/help/C/tools/by_color_select.html
-share/gimp/help/C/tools/clone.html
-share/gimp/help/C/tools/color_balance.html
-share/gimp/help/C/tools/color_picker.html
-share/gimp/help/C/tools/convolve.html
-share/gimp/help/C/tools/crop.html
-share/gimp/help/C/tools/curves.html
-share/gimp/help/C/tools/dodgeburn.html
-share/gimp/help/C/tools/ellipse_select.html
-share/gimp/help/C/tools/eraser.html
-share/gimp/help/C/tools/flip.html
-share/gimp/help/C/tools/free_select.html
-share/gimp/help/C/tools/fuzzy_select.html
-share/gimp/help/C/tools/histogram.html
-share/gimp/help/C/tools/hue_saturation.html
-share/gimp/help/C/tools/index.html
-share/gimp/help/C/tools/ink.html
-share/gimp/help/C/tools/intelligent_scissors.html
-share/gimp/help/C/tools/levels.html
-share/gimp/help/C/tools/magnify.html
-share/gimp/help/C/tools/measure.html
-share/gimp/help/C/tools/move.html
-share/gimp/help/C/tools/paintbrush.html
-share/gimp/help/C/tools/path.html
-share/gimp/help/C/tools/pencil.html
-share/gimp/help/C/tools/posterize.html
-share/gimp/help/C/tools/rect_select.html
-share/gimp/help/C/tools/smudge.html
-share/gimp/help/C/tools/text.html
-share/gimp/help/C/tools/threshold.html
-share/gimp/help/C/tools/transform.html
-share/gimp/help/C/tools/transform_perspective.html
-share/gimp/help/C/tools/transform_rotate.html
-share/gimp/help/C/tools/transform_scale.html
-share/gimp/help/C/tools/transform_shear.html
-share/gimp/help/C/tools/xinput_airbrush.html
-share/gimp/help/C/layers/stack/index.html
-share/gimp/help/C/layers/stack/stack.html
-share/gimp/help/C/layers/add_alpha_channel.html
-share/gimp/help/C/layers/alpha_to_selection.html
-share/gimp/help/C/layers/anchor_layer.html
-share/gimp/help/C/layers/delete_layer.html
-share/gimp/help/C/layers/duplicate_layer.html
-share/gimp/help/C/layers/flatten_image.html
-share/gimp/help/C/layers/index.html
-share/gimp/help/C/layers/layer_to_image_size.html
-share/gimp/help/C/layers/mask_to_selection.html
-share/gimp/help/C/layers/merge_down.html
-share/gimp/help/C/channels/channel_to_selection.html
-share/gimp/help/C/channels/channels.html
-share/gimp/help/C/channels/delete_channel.html
-share/gimp/help/C/channels/duplicate_channel.html
-share/gimp/help/C/channels/index.html
-share/gimp/help/C/channels/lower_channel.html
-share/gimp/help/C/channels/raise_channel.html
-share/gimp/help/C/paths/copy_path.html
-share/gimp/help/C/paths/delete_path.html
-share/gimp/help/C/paths/duplicate_path.html
-share/gimp/help/C/paths/index.html
-share/gimp/help/C/paths/new_path.html
-share/gimp/help/C/paths/paste_path.html
-share/gimp/help/C/paths/path_to_selection.html
-share/gimp/help/C/paths/stroke_path.html
-share/gimp/help/C/toolbox/index.html
-share/gimp/help/C/toolbox/help/index.html
-share/gimp/help/C/toolbox/toolbox.html
-share/gimp/help/C/image/edit/clear.html
-share/gimp/help/C/image/edit/copy.html
-share/gimp/help/C/image/edit/cut.html
-share/gimp/help/C/image/edit/fill.html
-share/gimp/help/C/image/edit/index.html
-share/gimp/help/C/image/edit/paste.html
-share/gimp/help/C/image/edit/paste_as_new.html
-share/gimp/help/C/image/edit/paste_into.html
-share/gimp/help/C/image/edit/redo.html
-share/gimp/help/C/image/edit/stroke.html
-share/gimp/help/C/image/edit/undo.html
-share/gimp/help/C/image/select/all.html
-share/gimp/help/C/image/select/float.html
-share/gimp/help/C/image/select/index.html
-share/gimp/help/C/image/select/invert.html
-share/gimp/help/C/image/select/none.html
-share/gimp/help/C/image/select/save_to_channel.html
-share/gimp/help/C/image/select/sharpen.html
-share/gimp/help/C/image/view/dot_for_dot.html
-share/gimp/help/C/image/view/index.html
-share/gimp/help/C/image/view/new_view.html
-share/gimp/help/C/image/view/shrink_wrap.html
-share/gimp/help/C/image/view/snap_to_guides.html
-share/gimp/help/C/image/view/toggle_guides.html
-share/gimp/help/C/image/view/toggle_rulers.html
-share/gimp/help/C/image/view/toggle_selection.html
-share/gimp/help/C/image/view/toggle_statusbar.html
-share/gimp/help/C/image/view/zoom.html
-share/gimp/help/C/image/image/transforms/index.html
-share/gimp/help/C/image/image/colors/desaturate.html
-share/gimp/help/C/image/image/colors/index.html
-share/gimp/help/C/image/image/colors/invert.html
-share/gimp/help/C/image/image/colors/auto/equalize.html
-share/gimp/help/C/image/image/colors/auto/index.html
-share/gimp/help/C/image/image/duplicate.html
-share/gimp/help/C/image/image/index.html
-share/gimp/help/C/image/image_window.html
-share/gimp/help/C/image/index.html
-share/gimp/help/C/open/index.html
-share/gimp/help/C/open/open_by_extension.html
-share/gimp/help/C/save/index.html
-share/gimp/help/C/save/save_by_extension.html
+share/gimp/help/C/file/close.html
+@exec mkdir -p %D/share/gimp/help/C/file
+@exec ln -sf %D/share/gimp/help/C/dialogs %D/share/gimp/help/C/file/dialogs
+@unexec rm -f %D/share/gimp/help/C/file/dialogs
+@exec ln -sf %D/share/gimp/help/C/filters %D/share/gimp/help/C/file/filters
+@unexec rm -f %D/share/gimp/help/C/file/filters
+share/gimp/help/C/file/index.html
+share/gimp/help/C/file/last_opened.html
+@exec ln -sf %D/share/gimp/help/C/open %D/share/gimp/help/C/file/open
+@unexec rm -f %D/share/gimp/help/C/file/open
+share/gimp/help/C/file/quit.html
+@exec ln -sf %D/share/gimp/help/C/save %D/share/gimp/help/C/file/save
+@unexec rm -f %D/share/gimp/help/C/file/save
+share/gimp/help/C/file/revert.html
 share/gimp/help/C/filters/alienmap.html
 share/gimp/help/C/filters/alienmap2.html
 share/gimp/help/C/filters/align_layers.html
@@ -700,7 +710,6 @@ share/gimp/help/C/filters/cel.html
 share/gimp/help/C/filters/checkerboard.html
 share/gimp/help/C/filters/cml_explorer.html
 share/gimp/help/C/filters/color_enhance.html
-share/gimp/help/C/filters/fp.html
 share/gimp/help/C/filters/colorify.html
 share/gimp/help/C/filters/compose.html
 share/gimp/help/C/filters/convmatrix.html
@@ -724,6 +733,7 @@ share/gimp/help/C/filters/film.html
 share/gimp/help/C/filters/fits.html
 share/gimp/help/C/filters/flame.html
 share/gimp/help/C/filters/flarefx.html
+share/gimp/help/C/filters/fp.html
 share/gimp/help/C/filters/fractalexplorer.html
 share/gimp/help/C/filters/fractaltrace.html
 share/gimp/help/C/filters/gap_filter.html
@@ -770,8 +780,8 @@ share/gimp/help/C/filters/max_rgb.html
 share/gimp/help/C/filters/maze.html
 share/gimp/help/C/filters/mblur.html
 share/gimp/help/C/filters/mosaic.html
-share/gimp/help/C/filters/nlfilt.html
 share/gimp/help/C/filters/newsprint.html
+share/gimp/help/C/filters/nlfilt.html
 share/gimp/help/C/filters/noisify.html
 share/gimp/help/C/filters/normalize.html
 share/gimp/help/C/filters/nova.html
@@ -839,19 +849,182 @@ share/gimp/help/C/filters/xjt.html
 share/gimp/help/C/filters/xpm.html
 share/gimp/help/C/filters/xwd.html
 share/gimp/help/C/filters/zealouscrop.html
-share/gimp/help/C/file/close.html
-share/gimp/help/C/file/index.html
-share/gimp/help/C/file/last_opened.html
-share/gimp/help/C/file/quit.html
-share/gimp/help/C/file/revert.html
-share/gimp/help/C/contents.html
+@exec mkdir -p %D/share/gimp/help/C/image
+@exec ln -sf %D/share/gimp/help/C/dialogs %D/share/gimp/help/C/image/dialogs
+@unexec rm -f %D/share/gimp/help/C/image/dialogs
+share/gimp/help/C/image/edit/clear.html
+share/gimp/help/C/image/edit/copy.html
+share/gimp/help/C/image/edit/cut.html
+@exec mkdir -p %D/share/gimp/help/C/image/edit
+@exec ln -sf %D/share/gimp/help/C/dialogs %D/share/gimp/help/C/image/edit/dialogs
+@unexec rm -f %D/share/gimp/help/C/image/edit/dialogs
+share/gimp/help/C/image/edit/fill.html
+share/gimp/help/C/image/edit/index.html
+share/gimp/help/C/image/edit/paste.html
+share/gimp/help/C/image/edit/paste_as_new.html
+share/gimp/help/C/image/edit/paste_into.html
+share/gimp/help/C/image/edit/redo.html
+share/gimp/help/C/image/edit/stroke.html
+share/gimp/help/C/image/edit/undo.html
+@exec ln -sf %D/share/gimp/help/C/file %D/share/gimp/help/C/image/file
+@unexec rm -f %D/share/gimp/help/C/image/file
+@exec ln -sf %D/share/gimp/help/C/filters %D/share/gimp/help/C/image/filters
+@unexec rm -f %D/share/gimp/help/C/image/filters
+share/gimp/help/C/image/image/colors/auto/equalize.html
+share/gimp/help/C/image/image/colors/auto/index.html
+share/gimp/help/C/image/image/colors/desaturate.html
+share/gimp/help/C/image/image/colors/index.html
+share/gimp/help/C/image/image/colors/invert.html
+@exec mkdir -p %D/share/gimp/help/C/image/image
+@exec ln -sf %D/share/gimp/help/C/dialogs %D/share/gimp/help/C/image/image/dialogs
+@unexec rm -f %D/share/gimp/help/C/image/image/dialogs
+share/gimp/help/C/image/image/duplicate.html
+share/gimp/help/C/image/image/index.html
+share/gimp/help/C/image/image/mode/convert_to_grayscale.html
+share/gimp/help/C/image/image/mode/convert_to_rgb.html
+@exec mkdir -p %D/share/gimp/help/C/image/image/mode
+@exec ln -sf %D/share/gimp/help/C/dialogs %D/share/gimp/help/C/image/image/mode/dialogs
+@unexec rm -f %D/share/gimp/help/C/image/image/mode/dialogs
+share/gimp/help/C/image/image/mode/index.html
+share/gimp/help/C/image/image/transforms/index.html
+@exec mkdir -p %D/share/gimp/help/C/image/image/transforms
+@exec ln -sf %D/share/gimp/help/C/dialogs %D/share/gimp/help/C/image/image/transforms/dialogs
+@unexec rm -f %D/share/gimp/help/C/image/image/transforms/dialogs
+share/gimp/help/C/image/image_window.html
+share/gimp/help/C/image/index.html
+@exec ln -sf %D/share/gimp/help/C/layers %D/share/gimp/help/C/image/layers
+@unexec rm -f %D/share/gimp/help/C/image/layers
+share/gimp/help/C/image/select/all.html
+@exec mkdir -p %D/share/gimp/help/C/image/select
+@exec ln -sf %D/share/gimp/help/C/dialogs %D/share/gimp/help/C/image/select/dialogs
+@unexec rm -f %D/share/gimp/help/C/image/select/dialogs
+share/gimp/help/C/image/select/float.html
+share/gimp/help/C/image/select/index.html
+share/gimp/help/C/image/select/invert.html
+share/gimp/help/C/image/select/none.html
+share/gimp/help/C/image/select/save_to_channel.html
+share/gimp/help/C/image/select/sharpen.html
+@exec ln -sf %D/share/gimp/help/C/toolbox %D/share/gimp/help/C/image/toolbox
+@unexec rm -f %D/share/gimp/help/C/image/toolbox
+@exec ln -sf %D/share/gimp/help/C/tools %D/share/gimp/help/C/image/tools
+@unexec rm -f %D/share/gimp/help/C/image/tools
+@exec mkdir -p %D/share/gimp/help/C/image/view
+@exec ln -sf %D/share/gimp/help/C/dialogs %D/share/gimp/help/C/image/view/dialogs
+@unexec rm -f %D/share/gimp/help/C/image/view/dialogs
+share/gimp/help/C/image/view/dot_for_dot.html
+share/gimp/help/C/image/view/index.html
+share/gimp/help/C/image/view/new_view.html
+share/gimp/help/C/image/view/shrink_wrap.html
+share/gimp/help/C/image/view/snap_to_guides.html
+share/gimp/help/C/image/view/toggle_guides.html
+share/gimp/help/C/image/view/toggle_rulers.html
+share/gimp/help/C/image/view/toggle_selection.html
+share/gimp/help/C/image/view/toggle_statusbar.html
+share/gimp/help/C/image/view/zoom.html
 share/gimp/help/C/index.html
+share/gimp/help/C/layers/add_alpha_channel.html
+share/gimp/help/C/layers/alpha_to_selection.html
+share/gimp/help/C/layers/anchor_layer.html
+@exec mkdir -p %D/share/gimp/help/C/layers
+@exec ln -sf %D/share/gimp/help/C/dialogs/layers %D/share/gimp/help/C/layers/dialogs
+@unexec rm -f %D/share/gimp/help/C/layers/dialogs
+share/gimp/help/C/layers/delete_layer.html
+share/gimp/help/C/layers/duplicate_layer.html
+share/gimp/help/C/layers/flatten_image.html
+share/gimp/help/C/layers/index.html
+share/gimp/help/C/layers/layer_to_image_size.html
+share/gimp/help/C/layers/mask_to_selection.html
+share/gimp/help/C/layers/merge_down.html
+share/gimp/help/C/layers/stack/index.html
+share/gimp/help/C/layers/stack/stack.html
 share/gimp/help/C/modes.html
+@exec mkdir -p %D/share/gimp/help/C/open
+@exec ln -sf %D/share/gimp/help/C/dialogs %D/share/gimp/help/C/open/dialogs
+@unexec rm -f %D/share/gimp/help/C/open/dialogs
+@exec ln -sf %D/share/gimp/help/C/filters %D/share/gimp/help/C/open/filters
+@unexec rm -f %D/share/gimp/help/C/open/filters
+share/gimp/help/C/open/index.html
+share/gimp/help/C/open/open_by_extension.html
+share/gimp/help/C/paths/copy_path.html
+share/gimp/help/C/paths/delete_path.html
+@exec mkdir -p %D/share/gimp/help/C/paths
+@exec ln -sf %D/share/gimp/help/C/dialogs %D/share/gimp/help/C/paths/dialogs
+@unexec rm -f %D/share/gimp/help/C/paths/dialogs
+share/gimp/help/C/paths/duplicate_path.html
+@exec ln -sf %D/share/gimp/help/C/filters %D/share/gimp/help/C/paths/filters
+@unexec rm -f %D/share/gimp/help/C/paths/filters
+share/gimp/help/C/paths/index.html
+share/gimp/help/C/paths/new_path.html
+share/gimp/help/C/paths/paste_path.html
+share/gimp/help/C/paths/path_to_selection.html
+share/gimp/help/C/paths/stroke_path.html
+@exec mkdir -p %D/share/gimp/help/C/save
+@exec ln -sf %D/share/gimp/help/C/dialogs %D/share/gimp/help/C/save/dialogs
+@unexec rm -f %D/share/gimp/help/C/save/dialogs
+@exec ln -sf %D/share/gimp/help/C/filters %D/share/gimp/help/C/save/filters
+@unexec rm -f %D/share/gimp/help/C/save/filters
+share/gimp/help/C/save/index.html
+share/gimp/help/C/save/save_by_extension.html
+@exec mkdir -p %D/share/gimp/help/C/toolbox
+@exec ln -sf %D/share/gimp/help/C/dialogs %D/share/gimp/help/C/toolbox/dialogs
+@unexec rm -f %D/share/gimp/help/C/toolbox/dialogs
+@exec ln -sf %D/share/gimp/help/C/file %D/share/gimp/help/C/toolbox/file
+@unexec rm -f %D/share/gimp/help/C/toolbox/file
+@exec ln -sf %D/share/gimp/help/C/filters %D/share/gimp/help/C/toolbox/filters
+@unexec rm -f %D/share/gimp/help/C/toolbox/filters
+share/gimp/help/C/toolbox/help/context_help.html
+share/gimp/help/C/toolbox/help/index.html
+@exec mkdir -p %D/share/gimp/help/C/toolbox/help
+@exec ln -sf %D/share/gimp/help/C/dialogs %D/share/gimp/help/C/toolbox/help/dialogs
+@unexec rm -f %D/share/gimp/help/C/toolbox/help/dialogs
+@exec ln -sf %D/share/gimp/help/C/filters %D/share/gimp/help/C/toolbox/help/filters
+@unexec rm -f %D/share/gimp/help/C/toolbox/help/filters
+share/gimp/help/C/toolbox/index.html
+share/gimp/help/C/toolbox/toolbox.html
+share/gimp/help/C/tools/airbrush.html
+share/gimp/help/C/tools/bezier_select.html
+share/gimp/help/C/tools/blend.html
+share/gimp/help/C/tools/brightness_contrast.html
+share/gimp/help/C/tools/bucket_fill.html
+share/gimp/help/C/tools/by_color_select.html
+share/gimp/help/C/tools/clone.html
+share/gimp/help/C/tools/color_balance.html
+share/gimp/help/C/tools/color_picker.html
+share/gimp/help/C/tools/convolve.html
+share/gimp/help/C/tools/crop.html
+share/gimp/help/C/tools/curves.html
+share/gimp/help/C/tools/dodgeburn.html
+share/gimp/help/C/tools/ellipse_select.html
+share/gimp/help/C/tools/eraser.html
+share/gimp/help/C/tools/flip.html
+share/gimp/help/C/tools/free_select.html
+share/gimp/help/C/tools/fuzzy_select.html
+share/gimp/help/C/tools/histogram.html
+share/gimp/help/C/tools/hue_saturation.html
+share/gimp/help/C/tools/index.html
+share/gimp/help/C/tools/ink.html
+share/gimp/help/C/tools/intelligent_scissors.html
+share/gimp/help/C/tools/levels.html
+share/gimp/help/C/tools/magnify.html
+share/gimp/help/C/tools/measure.html
+share/gimp/help/C/tools/move.html
+share/gimp/help/C/tools/paintbrush.html
+share/gimp/help/C/tools/path.html
+share/gimp/help/C/tools/pencil.html
+share/gimp/help/C/tools/posterize.html
+share/gimp/help/C/tools/rect_select.html
+share/gimp/help/C/tools/smudge.html
+share/gimp/help/C/tools/text.html
+share/gimp/help/C/tools/threshold.html
+share/gimp/help/C/tools/transform.html
+share/gimp/help/C/tools/transform_perspective.html
+share/gimp/help/C/tools/transform_rotate.html
+share/gimp/help/C/tools/transform_scale.html
+share/gimp/help/C/tools/transform_shear.html
+share/gimp/help/C/tools/xinput_airbrush.html
 share/gimp/help/C/welcome.html
 share/gimp/help/images/eek.png
 share/gimp/help/images/wilber.png
-share/gimp/gtkrc
-share/gimp/gtkrc.forest2
 share/gimp/palettes/Bears
 share/gimp/palettes/Bgold
 share/gimp/palettes/Blues
@@ -1046,70 +1219,124 @@ share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
 share/gimp/scripts/web-browser.scm
 share/gimp/scripts/xach-effect.scm
-share/gimp/tips/gimp_tips.txt
+share/gimp/tips/gimp_conseils.fr.txt
 share/gimp/tips/gimp_tips.cs.txt
 share/gimp/tips/gimp_tips.de.txt
-share/gimp/tips/gimp_tips.ja.txt
 share/gimp/tips/gimp_tips.it.txt
-share/gimp/tips/gimp_conseils.fr.txt
-share/gimp/tips/gimp_tips.ru.txt
+share/gimp/tips/gimp_tips.ja.txt
 share/gimp/tips/gimp_tips.ko.txt
 share/gimp/tips/gimp_tips.pl.txt
+share/gimp/tips/gimp_tips.ru.txt
+share/gimp/tips/gimp_tips.txt
 share/gimp/unitrc
 share/gimp/user_install
-share/locale/cs/LC_MESSAGES/gimp.mo
-share/locale/da/LC_MESSAGES/gimp.mo
-share/locale/de/LC_MESSAGES/gimp.mo
-share/locale/fi/LC_MESSAGES/gimp.mo
-share/locale/fr/LC_MESSAGES/gimp.mo
-share/locale/hu/LC_MESSAGES/gimp.mo
-share/locale/it/LC_MESSAGES/gimp.mo
-share/locale/ja/LC_MESSAGES/gimp.mo
-share/locale/ko/LC_MESSAGES/gimp.mo
-share/locale/nl/LC_MESSAGES/gimp.mo
-share/locale/no/LC_MESSAGES/gimp.mo
-share/locale/pl/LC_MESSAGES/gimp.mo
-share/locale/ru/LC_MESSAGES/gimp.mo
-share/locale/sk/LC_MESSAGES/gimp.mo
-share/locale/sv/LC_MESSAGES/gimp.mo
-share/locale/uk/LC_MESSAGES/gimp.mo
+share/locale/cs/LC_MESSAGES/gimp-libgimp.mo
+share/locale/cs/LC_MESSAGES/gimp-perl.mo
 share/locale/cs/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/cs/LC_MESSAGES/gimp.mo
+share/locale/da/LC_MESSAGES/gimp-libgimp.mo
 share/locale/da/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/da/LC_MESSAGES/gimp.mo
+share/locale/de/LC_MESSAGES/gimp-libgimp.mo
+share/locale/de/LC_MESSAGES/gimp-perl.mo
 share/locale/de/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/de/LC_MESSAGES/gimp.mo
+share/locale/en_GB/LC_MESSAGES/gimp-libgimp.mo
+share/locale/en_GB/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/en_GB/LC_MESSAGES/gimp.mo
+share/locale/fi/LC_MESSAGES/gimp-libgimp.mo
 share/locale/fi/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/fi/LC_MESSAGES/gimp.mo
+share/locale/fr/LC_MESSAGES/gimp-libgimp.mo
 share/locale/fr/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/fr/LC_MESSAGES/gimp.mo
+share/locale/hu/LC_MESSAGES/gimp-libgimp.mo
 share/locale/hu/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/hu/LC_MESSAGES/gimp.mo
+share/locale/it/LC_MESSAGES/gimp-libgimp.mo
+share/locale/it/LC_MESSAGES/gimp-perl.mo
 share/locale/it/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/it/LC_MESSAGES/gimp.mo
+share/locale/ja/LC_MESSAGES/gimp-libgimp.mo
 share/locale/ja/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/ja/LC_MESSAGES/gimp.mo
+share/locale/ko/LC_MESSAGES/gimp-libgimp.mo
 share/locale/ko/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/ko/LC_MESSAGES/gimp.mo
+share/locale/nl/LC_MESSAGES/gimp-libgimp.mo
 share/locale/nl/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/nl/LC_MESSAGES/gimp.mo
+share/locale/no/LC_MESSAGES/gimp-libgimp.mo
+share/locale/no/LC_MESSAGES/gimp-perl.mo
 share/locale/no/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/no/LC_MESSAGES/gimp.mo
+share/locale/pl/LC_MESSAGES/gimp-libgimp.mo
 share/locale/pl/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/pl/LC_MESSAGES/gimp.mo
+share/locale/ru/LC_MESSAGES/gimp-libgimp.mo
 share/locale/ru/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/ru/LC_MESSAGES/gimp.mo
+share/locale/sk/LC_MESSAGES/gimp-libgimp.mo
 share/locale/sk/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/sk/LC_MESSAGES/gimp.mo
+share/locale/sv/LC_MESSAGES/gimp-libgimp.mo
 share/locale/sv/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/sv/LC_MESSAGES/gimp.mo
+share/locale/uk/LC_MESSAGES/gimp-libgimp.mo
 share/locale/uk/LC_MESSAGES/gimp-std-plugins.mo
+share/locale/uk/LC_MESSAGES/gimp.mo
+@dirrm include/gck
+@dirrm include/libgimp
+@dirrm libexec/gimp/1.1/plug-ins
+@dirrm libexec/gimp/1.1/modules
+@dirrm libexec/gimp/1.1
+@dirrm libexec/gimp
+@dirrm share/gimp/brushes
+@dirrm share/gimp/devel-docs/html/libgimp
+@dirrm share/gimp/devel-docs/html
+@dirrm share/gimp/devel-docs
+@dirrm share/gimp/fractalexplorer
+@dirrm share/gimp/gfig
 @dirrm share/gimp/gflare
 @dirrm share/gimp/gimpressionist/Brushes
 @dirrm share/gimp/gimpressionist/Paper
 @dirrm share/gimp/gimpressionist/Presets
 @dirrm share/gimp/gimpressionist
-@dirrm share/gimp/tips
+@dirrm share/gimp/gradients
+@dirrm share/gimp/help/C/dialogs/layers
+@dirrm share/gimp/help/C/dialogs/channels
+@dirrm share/gimp/help/C/dialogs/paths
+@dirrm share/gimp/help/C/dialogs/palette_editor
+@dirrm share/gimp/help/C/dialogs/gradient_editor
+@dirrm share/gimp/help/C/dialogs/display_filters
+@dirrm share/gimp/help/C/dialogs/color_selectors
+@dirrm share/gimp/help/C/dialogs/preferences
+@dirrm share/gimp/help/C/dialogs
+@dirrm share/gimp/help/C/tools
+@dirrm share/gimp/help/C/layers/stack
+@dirrm share/gimp/help/C/layers
+@dirrm share/gimp/help/C/channels
+@dirrm share/gimp/help/C/paths
+@dirrm share/gimp/help/C/toolbox/help
+@dirrm share/gimp/help/C/toolbox
+@dirrm share/gimp/help/C/image/edit
+@dirrm share/gimp/help/C/image/select
+@dirrm share/gimp/help/C/image/view
+@dirrm share/gimp/help/C/image/image/colors/auto
+@dirrm share/gimp/help/C/image/image/colors
+@dirrm share/gimp/help/C/image/image/mode
+@dirrm share/gimp/help/C/image/image/transforms
+@dirrm share/gimp/help/C/image/image
+@dirrm share/gimp/help/C/image
+@dirrm share/gimp/help/C/open
+@dirrm share/gimp/help/C/save
+@dirrm share/gimp/help/C/filters
+@dirrm share/gimp/help/C/file
+@dirrm share/gimp/help/C
 @dirrm share/gimp/help/images
-@unexec rm -rf %D/share/gimp/help/C
 @dirrm share/gimp/help
-@dirrm share/gimp/scripts
-@dirrm share/gimp/patterns
 @dirrm share/gimp/palettes
-@dirrm share/gimp/gradients
-@dirrm share/gimp/gfig
-@dirrm share/gimp/fractalexplorer
-@dirrm share/gimp/brushes
+@dirrm share/gimp/patterns
+@dirrm share/gimp/scripts
+@dirrm share/gimp/tips
 @dirrm share/gimp
-@dirrm libexec/gimp/1.1/plug-ins
-@dirrm libexec/gimp/1.1/modules
-@dirrm libexec/gimp/1.1
-@dirrm libexec/gimp
-@dirrm include/libgimp
-@dirrm include/gck
-@unexec rmdir %D/share/aclocal 2>/dev/null || true