Upgrade to 1.1.2.

Agreed by:	asami

7 files changed, 356 insertions, 421 deletions

diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index f8e48204f0b..270a68f64c8 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,46 +1,42 @@
 # New ports collection makefile for:    Gimp
-# Version required:     1.0.2
+# Version required:     1.1.2
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.51 1998/11/25 09:01:18 asami Exp $
+# $Id: Makefile,v 1.52 1999/01/23 07:05:22 vanilla Exp $
 #
 
-DISTNAME=	gimp-1.0.2
+DISTNAME=	gimp-1.1.2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/v1.0/v1.0.2/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/gimp/v1.0/v1.0.2/ \
-		http://www.ameth.org/gimp/pub/gimp/v1.0/v1.0.2/
-DISTFILES=	gimp-1.0.2.tar.gz gimp-data-extras-1.0.0.tar.gz
+MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.2/ \
+		ftp://ftp.cs.umn.edu/pub/gimp/gimp/unstable/v1.1.2/ \
+		http://www.ameth.org/gimp/pub/gimp/unstable/v1.1.2/
 
 MAINTAINER=	erich@FreeBSD.org
 
-LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
-LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
-LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+=	gtk10.1:${PORTSDIR}/x11-toolkits/gtk10
-LIB_DEPENDS+=	mpeg.1:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	png.3:${PORTSDIR}/graphics/png
-LIB_DEPENDS+=	tiff.4:${PORTSDIR}/graphics/tiff34
+BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
+RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
+		aa.1:${PORTSDIR}/graphics/aalib \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel \
+		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
+		png.3:${PORTSDIR}/graphics/png \
+		tiff.4:${PORTSDIR}/graphics/tiff34
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
-		-I${LOCALBASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk10-config" \
-		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
+CONFIGURE_ARGS=	--disable-perl
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		LIBS="-L${LOCALBASE}/lib" \
+		INSTALL_SCRIPT='$${INSTALL} -m 755'
 
 MAN1=		gimp.1 gimptool.1
 MAN3=		gpc.3
 
-DATASTUFF=  brushes palettes gradients patterns
-
 post-install:
-	${MKDIR} ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-extras-1.0.0; \
-	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
-	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 	@${CAT} ${PKGDIR}/MESSAGE
 
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 64ee64bd438..e89984e6ed4 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,2 +1 @@
-MD5 (gimp-1.0.2.tar.gz) = 39a8d5e927c7deecbcad7fd832239ea3
-MD5 (gimp-data-extras-1.0.0.tar.gz) = 62fbffda0fdc34e89f04fb70c8e17672
+MD5 (gimp-1.1.2.tar.gz) = 806e4cca53e056a0d78492ba436fd8ac
diff --git a/graphics/gimp-app/files/patch-ac b/graphics/gimp-app/files/patch-ac
index 109f237f496..dc9c1c3a3fb 100644
--- a/graphics/gimp-app/files/patch-ac
+++ b/graphics/gimp-app/files/patch-ac
@@ -1,6 +1,6 @@
---- plug-ins/gpc/Makefile.am.orig	Tue Sep 29 22:29:19 1998
-+++ plug-ins/gpc/Makefile.am	Tue Sep 29 22:30:55 1998
-@@ -1,11 +1,15 @@
+--- plug-ins/gpc/Makefile.am.orig	Wed Nov 18 06:14:51 1998
++++ plug-ins/gpc/Makefile.am	Sat Feb 20 17:31:16 1999
+@@ -1,11 +1,14 @@
  ## Process this file with automake to produce Makefile.in
  
  pluginlibdir = $(libdir)
@@ -9,34 +9,32 @@
  pluginlib_LIBRARIES = libgpc.a
  
  libgpc_a_SOURCES = \
--	gpc.c gpc.h
+-	gpc.c		\
 +	gpc.c
 +
 +gimpinclude_HEADERS = \
-+	gpc.h
+ 	gpc.h
  
  INCLUDES = \
- 	$(X_CFLAGS)			\
---- plug-ins/gpc/Makefile.in.orig	Tue Sep 29 22:29:22 1998
-+++ plug-ins/gpc/Makefile.in	Tue Sep 29 22:31:20 1998
-@@ -116,11 +116,15 @@
- patterndata = @patterndata@
+--- plug-ins/gpc/Makefile.in.orig	Thu Feb  4 11:21:25 1999
++++ plug-ins/gpc/Makefile.in	Sat Feb 20 17:33:30 1999
+@@ -162,10 +162,14 @@
+ prefix = @prefix@
  
  pluginlibdir = $(libdir)
 +gimpincludedir = $(includedir)
  
  pluginlib_LIBRARIES = libgpc.a
  
- libgpc_a_SOURCES = \
--	gpc.c gpc.h
-+	gpc.c
+-libgpc_a_SOURCES =  	gpc.c			gpc.h
++libgpc_a_SOURCES =  	gpc.c
 +
-+gimpinclude_HEADERS = \
-+	gpc.h
++
++gimpinclude_HEADERS =  	gpc.h
  
- INCLUDES = \
- 	$(X_CFLAGS)			\
-@@ -162,6 +166,8 @@
+ 
+ INCLUDES =  	-I$(top_srcdir)				$(GTK_CFLAGS)				-I$(includedir)
+@@ -201,6 +205,8 @@
  MANS = $(man_MANS)
  
  NROFF = nroff
@@ -45,20 +43,18 @@
  DIST_COMMON =  Makefile.am Makefile.in
  
  
-@@ -169,17 +175,18 @@
+@@ -208,6 +214,7 @@
  
  TAR = tar
- GZIP = --best
+ GZIP_ENV = --best
 +DEP_FILES =  .deps/gpc.P
  SOURCES = $(libgpc_a_SOURCES)
  OBJECTS = $(libgpc_a_OBJECTS)
  
--all: Makefile $(LIBRARIES) $(MANS)
-+all: Makefile $(LIBRARIES) $(MANS) $(HEADERS)
- 
+@@ -215,9 +222,9 @@
  .SUFFIXES:
  .SUFFIXES: .S .c .lo .o .s
- $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 -	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps plug-ins/gpc/Makefile
 +	cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gpc/Makefile
  
@@ -67,7 +63,7 @@
  	cd $(top_builddir) \
  	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
-@@ -216,9 +223,6 @@
+@@ -254,9 +261,6 @@
  	  rm -f $(DESTDIR)$(pluginlibdir)/$$p; \
  	done
  
@@ -77,7 +73,7 @@
  .s.o:
  	$(COMPILE) -c $<
  
-@@ -235,9 +239,6 @@
+@@ -273,9 +277,6 @@
  
  maintainer-clean-compile:
  
@@ -87,9 +83,9 @@
  .s.lo:
  	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
  
-@@ -298,6 +299,21 @@
+@@ -336,6 +337,21 @@
  	@$(NORMAL_UNINSTALL)
- 	$(MAKE) uninstall-man3
+ 	$(MAKE) $(AM_MAKEFLAGS) uninstall-man3
  
 +install-gimpincludeHEADERS: $(gimpinclude_HEADERS)
 +	@$(NORMAL_INSTALL)
@@ -109,7 +105,7 @@
  tags: TAGS
  
  ID: $(HEADERS) $(SOURCES) $(LISP)
-@@ -328,6 +344,11 @@
+@@ -370,6 +386,11 @@
  subdir = plug-ins/gpc
  
  distdir: $(DISTFILES)
@@ -120,10 +116,14 @@
 +	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu plug-ins/gpc/Makefile
  	@for file in $(DISTFILES); do \
  	  d=$(srcdir); \
- 	  test -f $(distdir)/$$file \
-@@ -335,6 +356,29 @@
- 	  || cp -p $$d/$$file $(distdir)/$$file; \
+ 	  if test -d $$d/$$file; then \
+@@ -380,10 +401,38 @@
+ 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+ 	  fi; \
  	done
+-gpc.o: gpc.c ../../libgimp/gimp.h ../../libgimp/gimpenums.h \
+-	../../libgimp/gimpfeatures.h ../../libgimp/parasite.h \
+-	../../libgimp/parasiteF.h ../../libgimp/parasiteP.h
  
 +DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
 +
@@ -134,89 +134,113 @@
 +clean-depend:
 +
 +distclean-depend:
++	-rm -rf .deps
 +
 +maintainer-clean-depend:
-+	-rm -rf .deps
 +
 +%.o: %.c
 +	@echo '$(COMPILE) -c $<'; \
-+	$(COMPILE) -Wp,-MD,.deps/$(*F).P -c $<
++	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-cp .deps/$(*F).pp .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm .deps/$(*F).pp
 +
 +%.lo: %.c
 +	@echo '$(LTCOMPILE) -c $<'; \
-+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
-+	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
-+	  < .deps/$(*F).p > .deps/$(*F).P
-+	@-rm -f .deps/$(*F).p
- info:
- dvi:
- check: all
-@@ -343,18 +387,19 @@
- install-exec: 
- 	@$(NORMAL_INSTALL)
- 
--install-data: install-pluginlibLIBRARIES install-man
-+install-data: install-pluginlibLIBRARIES install-man install-gimpincludeHEADERS
- 	@$(NORMAL_INSTALL)
- 
- install: install-exec install-data all
- 	@:
- 
--uninstall: uninstall-pluginlibLIBRARIES uninstall-man
-+uninstall: uninstall-pluginlibLIBRARIES uninstall-man uninstall-gimpincludeHEADERS
- 
++	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
++	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
++	  < .deps/$(*F).pp > .deps/$(*F).P; \
++	tr ' ' '\012' < .deps/$(*F).pp \
++	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
++	    >> .deps/$(*F).P; \
++	rm -f .deps/$(*F).pp
+ info-am:
+ info: info-am
+ dvi-am:
+@@ -395,20 +444,23 @@
+ install-exec-am:
+ install-exec: install-exec-am
+ 
+-install-data-am: install-pluginlibLIBRARIES install-man
++install-data-am: install-pluginlibLIBRARIES install-man \
++		install-gimpincludeHEADERS
+ install-data: install-data-am
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+ install: install-am
+-uninstall-am: uninstall-pluginlibLIBRARIES uninstall-man
++uninstall-am: uninstall-pluginlibLIBRARIES uninstall-man \
++		uninstall-gimpincludeHEADERS
+ uninstall: uninstall-am
+-all-am: Makefile $(LIBRARIES) $(MANS)
++all-am: Makefile $(LIBRARIES) $(MANS) $(HEADERS)
+ all-redirect: all-am
  install-strip:
- 	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
  installdirs:
--	$(mkinstalldirs)  $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3
-+	$(mkinstalldirs)  $(DATADIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 \
-+		$(DATADIR)$(gimpincludedir)
+-	$(mkinstalldirs)  $(DESTDIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3
++	$(mkinstalldirs)  $(DESTDIR)$(pluginlibdir) $(DESTDIR)$(mandir)/man3 \
++		$(DESTDIR)$(gimpincludedir)
  
  
  mostlyclean-generic:
-@@ -372,22 +417,22 @@
- 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
- 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
- mostlyclean:  mostlyclean-pluginlibLIBRARIES mostlyclean-compile \
+@@ -421,27 +473,27 @@
+ 
+ maintainer-clean-generic:
+ mostlyclean-am:  mostlyclean-pluginlibLIBRARIES mostlyclean-compile \
 -		mostlyclean-libtool mostlyclean-tags \
 +		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
  		mostlyclean-generic
  
- clean:  clean-pluginlibLIBRARIES clean-compile clean-libtool clean-tags \
--		clean-generic mostlyclean
-+		clean-depend clean-generic mostlyclean
+ mostlyclean: mostlyclean-am
  
- distclean:  distclean-pluginlibLIBRARIES distclean-compile \
+ clean-am:  clean-pluginlibLIBRARIES clean-compile clean-libtool \
+-		clean-tags clean-generic mostlyclean-am
++		clean-tags clean-depend clean-generic mostlyclean-am
+ 
+ clean: clean-am
+ 
+ distclean-am:  distclean-pluginlibLIBRARIES distclean-compile \
 -		distclean-libtool distclean-tags distclean-generic \
--		clean
+-		clean-am
 +		distclean-libtool distclean-tags distclean-depend \
-+		distclean-generic clean
- 	-rm -f config.status
++		distclean-generic clean-am
  	-rm -f libtool
  
- maintainer-clean:  maintainer-clean-pluginlibLIBRARIES \
+ distclean: distclean-am
+ 
+ maintainer-clean-am:  maintainer-clean-pluginlibLIBRARIES \
  		maintainer-clean-compile maintainer-clean-libtool \
 -		maintainer-clean-tags maintainer-clean-generic \
--		distclean
+-		distclean-am
 +		maintainer-clean-tags maintainer-clean-depend \
-+		maintainer-clean-generic distclean
++		maintainer-clean-generic distclean-am
  	@echo "This command is intended for maintainers to use;"
  	@echo "it deletes files that may require special tools to rebuild."
  
-@@ -397,10 +442,12 @@
+@@ -453,13 +505,15 @@
  mostlyclean-compile distclean-compile clean-compile \
  maintainer-clean-compile mostlyclean-libtool distclean-libtool \
  clean-libtool maintainer-clean-libtool install-man3 uninstall-man3 \
 -install-man uninstall-man tags mostlyclean-tags distclean-tags \
--clean-tags maintainer-clean-tags distdir info dvi installcheck \
--install-exec install-data install uninstall all installdirs \
--mostlyclean-generic distclean-generic clean-generic \
+-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
+-check-am installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
 +install-man uninstall-man uninstall-gimpincludeHEADERS \
 +install-gimpincludeHEADERS tags mostlyclean-tags distclean-tags \
 +clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-+distclean-depend clean-depend maintainer-clean-depend info dvi \
-+installcheck install-exec install-data install uninstall all \
-+installdirs mostlyclean-generic distclean-generic clean-generic \
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++distclean-depend clean-depend maintainer-clean-depend info-am info \
++dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
++install-exec install-data-am install-data install-am install \
++uninstall-am uninstall all-redirect all-am all installdirs \
++mostlyclean-generic distclean-generic clean-generic \
++maintainer-clean-generic clean mostlyclean distclean maintainer-clean
  
  
+ .PHONY: files
diff --git a/graphics/gimp-app/files/patch-ae b/graphics/gimp-app/files/patch-ae
new file mode 100644
index 00000000000..bc633c2f961
--- /dev/null
+++ b/graphics/gimp-app/files/patch-ae
@@ -0,0 +1,11 @@
+--- plug-ins/plugindetails/plugindetails.c.orig	Sat Feb 20 18:47:03 1999
++++ plug-ins/plugindetails/plugindetails.c	Sat Feb 20 18:47:11 1999
+@@ -25,7 +25,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <time.h>
+-#include <regex.h>
++#include <gnuregex.h>
+ #include "gtk/gtk.h"
+ #include "libgimp/gimp.h"
+ 
diff --git a/graphics/gimp-app/files/patch-af b/graphics/gimp-app/files/patch-af
new file mode 100644
index 00000000000..72a6fdc08e3
--- /dev/null
+++ b/graphics/gimp-app/files/patch-af
@@ -0,0 +1,20 @@
+--- gimptool.in.orig	Sat Feb 20 19:48:58 1999
++++ gimptool.in	Sat Feb 20 19:49:37 1999
+@@ -198,7 +198,7 @@
+     | --install-script | --install-admin-script)
+       case $1 in
+         --install-bin)
+-          install_cmd="@INSTALL_PROGRAM@"
++          install_cmd="@INSTALL_SCRIPT@"
+           install_dir="$HOME/@gimpdir@/plug-ins"
+           ;;
+         --install-bin-strip)
+@@ -206,7 +206,7 @@
+           install_dir="$HOME/@gimpdir@/plug-ins"
+           ;;
+         --install-admin-bin)
+-          install_cmd="@INSTALL_PROGRAM@"
++          install_cmd="@INSTALL_SCRIPT@"
+           install_dir="$plug_in_dir/plug-ins"
+           ;;
+         --install-admin-bin-strip)
diff --git a/graphics/gimp-app/files/patch-ah b/graphics/gimp-app/files/patch-ah
index 9d364506b01..190924fc41a 100644
--- a/graphics/gimp-app/files/patch-ah
+++ b/graphics/gimp-app/files/patch-ah
@@ -1,36 +1,33 @@
---- configure.in.orig	Sun Sep 27 16:50:04 1998
-+++ configure.in	Tue Sep 29 22:28:31 1998
-@@ -358,7 +358,7 @@
- LIBS="$gimp_save_LIBS"
+--- configure.in.orig	Thu Feb  4 08:37:10 1999
++++ configure.in	Sun Feb 21 00:11:35 1999
+@@ -441,7 +441,7 @@
+ fi
  
  gimpdatadir=$datadir/gimp
 -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
 +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
+ localedir=$datadir/locale
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
- gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
---- configure.orig	Mon Sep 28 06:00:09 1998
-+++ configure	Tue Sep 29 22:28:31 1998
-@@ -4379,7 +4379,7 @@
- LIBS="$gimp_save_LIBS"
+--- configure.orig	Thu Feb  4 08:38:47 1999
++++ configure	Sun Feb 21 00:11:46 1999
+@@ -7254,7 +7254,7 @@
+ fi
  
  gimpdatadir=$datadir/gimp
 -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
 +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION
+ localedir=$datadir/locale
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
- gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
---- Makefile.in.orig	Wed Sep 30 00:52:20 1998
-+++ Makefile.in	Wed Sep 30 00:52:41 1998
-@@ -440,9 +440,9 @@
+--- Makefile.in.orig	Sat Feb 20 23:45:16 1999
++++ Makefile.in	Sun Feb 21 00:12:00 1999
+@@ -530,7 +530,7 @@
+ install-exec: install-exec-recursive
  
- install-exec-am: install-binSCRIPTS
+ install-data-am: install-gimpdataSCRIPTS install-man \
+-		install-gimpdataDATA install-m4dataDATA
++		install-gimpdataDATA
+ install-data: install-data-recursive
  
--install-data-am: install-gimpdataSCRIPTS install-man install-gimpdataDATA install-m4dataDATA
-+install-data-am: install-gimpdataSCRIPTS install-man install-gimpdataDATA
- 
--uninstall-am: uninstall-binSCRIPTS uninstall-gimpdataSCRIPTS uninstall-man uninstall-gimpdataDATA uninstall-m4dataDATA
-+uninstall-am: uninstall-binSCRIPTS uninstall-gimpdataSCRIPTS uninstall-man uninstall-gimpdataDATA
- 
- install-exec: install-exec-recursive install-exec-am
- 	@$(NORMAL_INSTALL)
+ install-am: all-am
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 42cc27d568c..8b9a4906822 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -11,150 +11,175 @@ include/gck/gckmath.h
 include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gckvector.h
+include/libgimp/color_selector.h
 include/libgimp/gimp.h
+include/libgimp/gimpentry.h
 include/libgimp/gimpenums.h
 include/libgimp/gimpfeatures.h
+include/libgimp/gimpintl.h
+include/libgimp/gimpmatrix.h
 include/libgimp/gimpmenu.h
+include/libgimp/gimpmodule.h
 include/libgimp/gimpui.h
+include/libgimp/gserialize.h
+include/libgimp/parasite.h
+include/libgimp/parasiteF.h
+include/libgimp/parasiteP.h
+lib/libgck-1.1.so.2
 lib/libgck.a
 lib/libgck.la
-lib/libgck.so
-lib/libgck.so.1
+lib/libgck.so.2
+lib/libgimp-1.1.so.2
 lib/libgimp.a
 lib/libgimp.la
-lib/libgimp.so
-lib/libgimp.so.1.2
+lib/libgimp.so.2
+lib/libgimpui-1.1.so.2
 lib/libgimpui.a
 lib/libgimpui.la
-lib/libgimpui.so
-lib/libgimpui.so.1.2
+lib/libgimpui.so.2
 lib/libgpc.a
 lib/libmegawidget.a
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
-libexec/gimp/1.0/plug-ins/AlienMap
-libexec/gimp/1.0/plug-ins/CEL
-libexec/gimp/1.0/plug-ins/CML_explorer
-libexec/gimp/1.0/plug-ins/MapObject
-libexec/gimp/1.0/plug-ins/aa
-libexec/gimp/1.0/plug-ins/align_layers
-libexec/gimp/1.0/plug-ins/animationplay
-libexec/gimp/1.0/plug-ins/animoptimize
-libexec/gimp/1.0/plug-ins/apply_lens
-libexec/gimp/1.0/plug-ins/autocrop
-libexec/gimp/1.0/plug-ins/autostretch_hsv
-libexec/gimp/1.0/plug-ins/blinds
-libexec/gimp/1.0/plug-ins/blur
-libexec/gimp/1.0/plug-ins/bmp
-libexec/gimp/1.0/plug-ins/bumpmap
-libexec/gimp/1.0/plug-ins/bz2
-libexec/gimp/1.0/plug-ins/c_astretch
-libexec/gimp/1.0/plug-ins/checkerboard
-libexec/gimp/1.0/plug-ins/colorify
-libexec/gimp/1.0/plug-ins/compose
-libexec/gimp/1.0/plug-ins/convmatrix
-libexec/gimp/1.0/plug-ins/cubism
-libexec/gimp/1.0/plug-ins/dbbrowser
-libexec/gimp/1.0/plug-ins/decompose
-libexec/gimp/1.0/plug-ins/deinterlace
-libexec/gimp/1.0/plug-ins/depthmerge
-libexec/gimp/1.0/plug-ins/despeckle
-libexec/gimp/1.0/plug-ins/destripe
-libexec/gimp/1.0/plug-ins/diffraction
-libexec/gimp/1.0/plug-ins/displace
-libexec/gimp/1.0/plug-ins/edge
-libexec/gimp/1.0/plug-ins/emboss
-libexec/gimp/1.0/plug-ins/engrave
-libexec/gimp/1.0/plug-ins/exchange
-libexec/gimp/1.0/plug-ins/faxg3
-libexec/gimp/1.0/plug-ins/film
-libexec/gimp/1.0/plug-ins/fits
-libexec/gimp/1.0/plug-ins/flame
-libexec/gimp/1.0/plug-ins/flarefx
-libexec/gimp/1.0/plug-ins/fractaltrace
-libexec/gimp/1.0/plug-ins/gauss_iir
-libexec/gimp/1.0/plug-ins/gauss_rle
-libexec/gimp/1.0/plug-ins/gbr
-libexec/gimp/1.0/plug-ins/gee
-libexec/gimp/1.0/plug-ins/gfig
-libexec/gimp/1.0/plug-ins/gfli
-libexec/gimp/1.0/plug-ins/gicon
-libexec/gimp/1.0/plug-ins/gif
-libexec/gimp/1.0/plug-ins/glasstile
-libexec/gimp/1.0/plug-ins/gqbist
-libexec/gimp/1.0/plug-ins/gradmap
-libexec/gimp/1.0/plug-ins/grid
-libexec/gimp/1.0/plug-ins/gtm
-libexec/gimp/1.0/plug-ins/gz
-libexec/gimp/1.0/plug-ins/header
-libexec/gimp/1.0/plug-ins/hot
-libexec/gimp/1.0/plug-ins/hrz
-libexec/gimp/1.0/plug-ins/ifscompose
-libexec/gimp/1.0/plug-ins/illusion
-libexec/gimp/1.0/plug-ins/iwarp
-libexec/gimp/1.0/plug-ins/jpeg
-libexec/gimp/1.0/plug-ins/laplace
-libexec/gimp/1.0/plug-ins/mail
-libexec/gimp/1.0/plug-ins/max_rgb
-libexec/gimp/1.0/plug-ins/maze
-libexec/gimp/1.0/plug-ins/mblur
-libexec/gimp/1.0/plug-ins/mosaic
-libexec/gimp/1.0/plug-ins/mpeg
-libexec/gimp/1.0/plug-ins/nlfilt
-libexec/gimp/1.0/plug-ins/noisify
-libexec/gimp/1.0/plug-ins/normalize
-libexec/gimp/1.0/plug-ins/nova
-libexec/gimp/1.0/plug-ins/oilify
-libexec/gimp/1.0/plug-ins/pagecurl
-libexec/gimp/1.0/plug-ins/palette
-libexec/gimp/1.0/plug-ins/papertile
-libexec/gimp/1.0/plug-ins/pat
-libexec/gimp/1.0/plug-ins/pcx
-libexec/gimp/1.0/plug-ins/pix
-libexec/gimp/1.0/plug-ins/pixelize
-libexec/gimp/1.0/plug-ins/plasma
-libexec/gimp/1.0/plug-ins/png
-libexec/gimp/1.0/plug-ins/pnm
-libexec/gimp/1.0/plug-ins/polar
-libexec/gimp/1.0/plug-ins/print
-libexec/gimp/1.0/plug-ins/ps
-libexec/gimp/1.0/plug-ins/psd
-libexec/gimp/1.0/plug-ins/randomize
-libexec/gimp/1.0/plug-ins/ripple
-libexec/gimp/1.0/plug-ins/rotate
-libexec/gimp/1.0/plug-ins/rotators
-libexec/gimp/1.0/plug-ins/scatter_hsv
-libexec/gimp/1.0/plug-ins/screenshot
-libexec/gimp/1.0/plug-ins/script-fu
-libexec/gimp/1.0/plug-ins/semiflatten
-libexec/gimp/1.0/plug-ins/sgi
-libexec/gimp/1.0/plug-ins/sharpen
-libexec/gimp/1.0/plug-ins/shift
-libexec/gimp/1.0/plug-ins/sinus
-libexec/gimp/1.0/plug-ins/smooth_palette
-libexec/gimp/1.0/plug-ins/snoise
-libexec/gimp/1.0/plug-ins/snp
-libexec/gimp/1.0/plug-ins/sobel
-libexec/gimp/1.0/plug-ins/sparkle
-libexec/gimp/1.0/plug-ins/spread
-libexec/gimp/1.0/plug-ins/struc
-libexec/gimp/1.0/plug-ins/sunras
-libexec/gimp/1.0/plug-ins/tga
-libexec/gimp/1.0/plug-ins/threshold_alpha
-libexec/gimp/1.0/plug-ins/tiff
-libexec/gimp/1.0/plug-ins/tile
-libexec/gimp/1.0/plug-ins/tileit
-libexec/gimp/1.0/plug-ins/tiler
-libexec/gimp/1.0/plug-ins/url
-libexec/gimp/1.0/plug-ins/video
-libexec/gimp/1.0/plug-ins/vinvert
-libexec/gimp/1.0/plug-ins/vpropagate
-libexec/gimp/1.0/plug-ins/waves
-libexec/gimp/1.0/plug-ins/webbrowser
-libexec/gimp/1.0/plug-ins/whirlpinch
-libexec/gimp/1.0/plug-ins/xpm
-libexec/gimp/1.0/plug-ins/xwd
-libexec/gimp/1.0/plug-ins/zealouscrop
+libexec/gimp/1.1/modules/libcolorsel_gtk.a
+libexec/gimp/1.1/modules/libcolorsel_gtk.la
+libexec/gimp/1.1/modules/libcolorsel_triangle.a
+libexec/gimp/1.1/modules/libcolorsel_triangle.la
+libexec/gimp/1.1/plug-ins/AlienMap
+libexec/gimp/1.1/plug-ins/CEL
+libexec/gimp/1.1/plug-ins/CML_explorer
+libexec/gimp/1.1/plug-ins/Lighting
+libexec/gimp/1.1/plug-ins/MapObject
+libexec/gimp/1.1/plug-ins/aa
+libexec/gimp/1.1/plug-ins/align_layers
+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/blinds
+libexec/gimp/1.1/plug-ins/blur
+libexec/gimp/1.1/plug-ins/bmp
+libexec/gimp/1.1/plug-ins/borderaverage
+libexec/gimp/1.1/plug-ins/bumpmap
+libexec/gimp/1.1/plug-ins/bz2
+libexec/gimp/1.1/plug-ins/c_astretch
+libexec/gimp/1.1/plug-ins/checkerboard
+libexec/gimp/1.1/plug-ins/colorify
+libexec/gimp/1.1/plug-ins/compose
+libexec/gimp/1.1/plug-ins/convmatrix
+libexec/gimp/1.1/plug-ins/cubism
+libexec/gimp/1.1/plug-ins/dbbrowser
+libexec/gimp/1.1/plug-ins/decompose
+libexec/gimp/1.1/plug-ins/deinterlace
+libexec/gimp/1.1/plug-ins/depthmerge
+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/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/fits
+libexec/gimp/1.1/plug-ins/flame
+libexec/gimp/1.1/plug-ins/flarefx
+libexec/gimp/1.1/plug-ins/fp
+libexec/gimp/1.1/plug-ins/fractaltrace
+libexec/gimp/1.1/plug-ins/gauss_iir
+libexec/gimp/1.1/plug-ins/gauss_rle
+libexec/gimp/1.1/plug-ins/gbr
+libexec/gimp/1.1/plug-ins/gee
+libexec/gimp/1.1/plug-ins/gfig
+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/glasstile
+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/guillotine
+libexec/gimp/1.1/plug-ins/gz
+libexec/gimp/1.1/plug-ins/header
+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/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/lic
+libexec/gimp/1.1/plug-ins/mail
+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/mosaic
+libexec/gimp/1.1/plug-ins/mpeg
+libexec/gimp/1.1/plug-ins/newsprint
+libexec/gimp/1.1/plug-ins/nlfilt
+libexec/gimp/1.1/plug-ins/noisify
+libexec/gimp/1.1/plug-ins/normalize
+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/palette
+libexec/gimp/1.1/plug-ins/papertile
+libexec/gimp/1.1/plug-ins/pat
+libexec/gimp/1.1/plug-ins/pcx
+libexec/gimp/1.1/plug-ins/pix
+libexec/gimp/1.1/plug-ins/pixelize
+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/print
+libexec/gimp/1.1/plug-ins/ps
+libexec/gimp/1.1/plug-ins/psd
+libexec/gimp/1.1/plug-ins/randomize
+libexec/gimp/1.1/plug-ins/ripple
+libexec/gimp/1.1/plug-ins/rotate
+libexec/gimp/1.1/plug-ins/rotators
+libexec/gimp/1.1/plug-ins/scatter_hsv
+libexec/gimp/1.1/plug-ins/screenshot
+libexec/gimp/1.1/plug-ins/script-fu
+libexec/gimp/1.1/plug-ins/semiflatten
+libexec/gimp/1.1/plug-ins/sgi
+libexec/gimp/1.1/plug-ins/sharpen
+libexec/gimp/1.1/plug-ins/shift
+libexec/gimp/1.1/plug-ins/sinus
+libexec/gimp/1.1/plug-ins/smooth_palette
+libexec/gimp/1.1/plug-ins/snoise
+libexec/gimp/1.1/plug-ins/snp
+libexec/gimp/1.1/plug-ins/sobel
+libexec/gimp/1.1/plug-ins/sparkle
+libexec/gimp/1.1/plug-ins/spread
+libexec/gimp/1.1/plug-ins/struc
+libexec/gimp/1.1/plug-ins/sunras
+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/url
+libexec/gimp/1.1/plug-ins/video
+libexec/gimp/1.1/plug-ins/vinvert
+libexec/gimp/1.1/plug-ins/vpropagate
+libexec/gimp/1.1/plug-ins/waves
+libexec/gimp/1.1/plug-ins/waterselect
+libexec/gimp/1.1/plug-ins/webbrowser
+libexec/gimp/1.1/plug-ins/whirlpinch
+libexec/gimp/1.1/plug-ins/wind
+libexec/gimp/1.1/plug-ins/xbm
+libexec/gimp/1.1/plug-ins/xpm
+libexec/gimp/1.1/plug-ins/xwd
+libexec/gimp/1.1/plug-ins/zealouscrop
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -193,49 +218,9 @@ share/gimp/brushes/galaxy.gbr
 share/gimp/brushes/galaxy_big.gbr
 share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/pixel.gbr
+share/gimp/brushes/round1.vbr
 share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/xcf.gbr
-share/gimp/brushes/50x50cone.gbr
-share/gimp/brushes/50x50square.gbr
-share/gimp/brushes/50x50squareBlur.gbr
-share/gimp/brushes/50x50squareBlur2.gbr
-share/gimp/brushes/bigcircle.gbr
-share/gimp/brushes/bigcircle2.gbr
-share/gimp/brushes/bigcircle3.gbr
-share/gimp/brushes/bigcircle4.gbr
-share/gimp/brushes/bird.gbr
-share/gimp/brushes/bullethole.gbr
-share/gimp/brushes/cloth.gbr
-share/gimp/brushes/flower.gbr
-share/gimp/brushes/flower_large.gbr
-share/gimp/brushes/gecko.gbr
-share/gimp/brushes/grid.gbr
-share/gimp/brushes/grid2.gbr
-share/gimp/brushes/guitar.gbr
-share/gimp/brushes/nova.gbr
-share/gimp/brushes/point.gbr
-share/gimp/brushes/punch.gbr
-share/gimp/brushes/qbert2.gbr
-share/gimp/brushes/qbert3Blur.gbr
-share/gimp/brushes/reach.gbr
-share/gimp/brushes/sphere29.gbr
-share/gimp/brushes/sphere36.gbr
-share/gimp/brushes/star1.gbr
-share/gimp/brushes/sphere47.gbr
-share/gimp/brushes/sphere55.gbr
-share/gimp/brushes/sphere79.gbr
-share/gimp/brushes/star2.gbr
-share/gimp/brushes/star3.gbr
-share/gimp/brushes/star4.gbr
-share/gimp/brushes/star5.gbr
-share/gimp/brushes/swirl.gbr
-share/gimp/brushes/swirl2.gbr
-share/gimp/brushes/text1.gbr
-share/gimp/brushes/text2.gbr
-share/gimp/brushes/text3.gbr
-share/gimp/brushes/text4.gbr
-share/gimp/brushes/tulip.gbr
-share/gimp/brushes/wave.gbr
 share/gimp/gfig/A_star
 share/gimp/gfig/curves
 share/gimp/gfig/polys
@@ -417,120 +402,8 @@ share/gimp/patterns/wood2.pat
 share/gimp/patterns/wood3.pat
 share/gimp/patterns/wood4.pat
 share/gimp/patterns/wood5.pat
-share/gimp/patterns/3dweave.pat
-share/gimp/patterns/abstract_flowers.pat
-share/gimp/patterns/blackoil.pat
-share/gimp/patterns/blackwhitefloor.pat
-share/gimp/patterns/blob1.pat
-share/gimp/patterns/blob2.pat
-share/gimp/patterns/bluebar.pat
-share/gimp/patterns/bluecanyons.pat
-share/gimp/patterns/bluemars.pat
-share/gimp/patterns/bluemetal.pat
-share/gimp/patterns/bluespikes.pat
-share/gimp/patterns/brownie.pat
-share/gimp/patterns/bwcubes.pat
-share/gimp/patterns/canyons2.pat
-share/gimp/patterns/cashew.pat
-share/gimp/patterns/chains.pat
-share/gimp/patterns/chroma.pat
-share/gimp/patterns/circuit.pat
-share/gimp/patterns/clouds.pat
-share/gimp/patterns/clovers.pat
-share/gimp/patterns/coins.pat
-share/gimp/patterns/color.pat
-share/gimp/patterns/colorblob.pat
-share/gimp/patterns/colored_rock.pat
-share/gimp/patterns/colorwhirl.pat
-share/gimp/patterns/connestoga.pat
-share/gimp/patterns/contrawhirl.pat
-share/gimp/patterns/cow.pat
-share/gimp/patterns/crash1.pat
-share/gimp/patterns/crazytile.pat
-share/gimp/patterns/crystals.pat
-share/gimp/patterns/curvedledge.pat
-share/gimp/patterns/deepswirl.pat
-share/gimp/patterns/diffpat.pat
-share/gimp/patterns/dirt.pat
-share/gimp/patterns/disco.pat
-share/gimp/patterns/drymud.pat
-share/gimp/patterns/pj.pat
-share/gimp/patterns/dunemaze.pat
-share/gimp/patterns/dunes.pat
-share/gimp/patterns/eggcarton.pat
-share/gimp/patterns/electric-blue-ribbons.pat
-share/gimp/patterns/etbf.pat
-share/gimp/patterns/floor_tile.pat
-share/gimp/patterns/funnyblobs.pat
-share/gimp/patterns/funnymess.pat
-share/gimp/patterns/funnymess2.pat
-share/gimp/patterns/fuzzy-colors.pat
-share/gimp/patterns/gold.pat
-share/gimp/patterns/goldcloth.pat
-share/gimp/patterns/granite2.pat
-share/gimp/patterns/green_curtains.pat
-share/gimp/patterns/green_eek.pat
-share/gimp/patterns/greyweave.pat
-share/gimp/patterns/greyweave2.pat
-share/gimp/patterns/grid.pat
-share/gimp/patterns/gridwhirltile.pat
-share/gimp/patterns/headache.pat
-share/gimp/patterns/horiz.pat
-share/gimp/patterns/ice2.pat
-share/gimp/patterns/icechex.pat
-share/gimp/patterns/inlay.pat
-share/gimp/patterns/krinkle.pat
-share/gimp/patterns/land1.pat
-share/gimp/patterns/land2.pat
-share/gimp/patterns/lathe.pat
-share/gimp/patterns/leaves3.pat
-share/gimp/patterns/leaves4.pat
-share/gimp/patterns/leaves6.pat
-share/gimp/patterns/lumps.pat
-share/gimp/patterns/meltedcolors.pat
-share/gimp/patterns/metallica.pat
-share/gimp/patterns/metalpaths.pat
-share/gimp/patterns/mhuerock.pat
-share/gimp/patterns/money.pat
-share/gimp/patterns/neurons.pat
-share/gimp/patterns/novaugh.pat
-share/gimp/patterns/oooh.pat
-share/gimp/patterns/oooh3.pat
-share/gimp/patterns/orange_eek.pat
-share/gimp/patterns/orangebrown.pat
-share/gimp/patterns/orangecheese.pat
-share/gimp/patterns/wax.pat
-share/gimp/patterns/paint-explosion.pat
-share/gimp/patterns/pastel2.pat
-share/gimp/patterns/pebbles.pat
-share/gimp/patterns/pixeled1.pat
-share/gimp/patterns/psycho1.pat
-share/gimp/patterns/purple-ribbons.pat
-share/gimp/patterns/purple.pat
-share/gimp/patterns/purple_glow.pat
-share/gimp/patterns/redishstuff.pat
-share/gimp/patterns/redmess.pat
-share/gimp/patterns/redrings.pat
-share/gimp/patterns/rust.pat
-share/gimp/patterns/sandytext.pat
-share/gimp/patterns/send1.pat
-share/gimp/patterns/silver.pat
-share/gimp/patterns/slice1.pat
-share/gimp/patterns/spectbar.pat
-share/gimp/patterns/startile.pat
-share/gimp/patterns/swirl.pat
-share/gimp/patterns/swirl2.pat
-share/gimp/patterns/torrents.pat
-share/gimp/patterns/tube.pat
-share/gimp/patterns/water3.pat
-share/gimp/patterns/unsharpswirl.pat
-share/gimp/patterns/waves.pat
-share/gimp/patterns/weird2.pat
-share/gimp/patterns/whirledstuff.pat
-share/gimp/patterns/woodblind.pat
-share/gimp/patterns/worn_metal_chex.pat
-share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/3d-outline.scm
+share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
 share/gimp/scripts/alien-glow-arrow.scm
@@ -547,8 +420,8 @@ share/gimp/scripts/beveled-pattern-arrow.scm
 share/gimp/scripts/beveled-pattern-bullet.scm
 share/gimp/scripts/beveled-pattern-button.scm
 share/gimp/scripts/beveled-pattern-heading.scm
-share/gimp/scripts/blend-anim.scm
 share/gimp/scripts/beveled-pattern-hrule.scm
+share/gimp/scripts/blend-anim.scm
 share/gimp/scripts/blended-logo.scm
 share/gimp/scripts/bovinated-logo.scm
 share/gimp/scripts/camo.scm
@@ -568,7 +441,6 @@ share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
 share/gimp/scripts/distress_selection.scm
 share/gimp/scripts/drop-shadow.scm
-share/gimp/scripts/egg.scm
 share/gimp/scripts/erase-rows.scm
 share/gimp/scripts/fade-outline.scm
 share/gimp/scripts/flatland.scm
@@ -590,9 +462,11 @@ share/gimp/scripts/lava.scm
 share/gimp/scripts/line-nova.scm
 share/gimp/scripts/mkbrush.scm
 share/gimp/scripts/neon-logo.scm
+share/gimp/scripts/news-text.scm
 share/gimp/scripts/old_photo.scm
 share/gimp/scripts/perspective-shadow.scm
 share/gimp/scripts/predator.scm
+share/gimp/scripts/pupi-button.scm
 share/gimp/scripts/rendermap.scm
 share/gimp/scripts/ripply-anim.scm
 share/gimp/scripts/round-corners.scm
@@ -601,6 +475,7 @@ share/gimp/scripts/select_to_image.scm
 share/gimp/scripts/selection-round.scm
 share/gimp/scripts/slide.scm
 share/gimp/scripts/sota-chrome-logo.scm
+share/gimp/scripts/speed-text.scm
 share/gimp/scripts/sphere.scm
 share/gimp/scripts/spinning_globe.scm
 share/gimp/scripts/starburst-logo.scm
@@ -608,6 +483,7 @@ share/gimp/scripts/starscape-logo.scm
 share/gimp/scripts/swirltile.scm
 share/gimp/scripts/swirly-pattern.scm
 share/gimp/scripts/t-o-p-logo.scm
+share/gimp/scripts/test-sphere.scm
 share/gimp/scripts/text-circle.scm
 share/gimp/scripts/texture.jpg
 share/gimp/scripts/texture1.jpg
@@ -621,19 +497,31 @@ share/gimp/scripts/truchet.scm
 share/gimp/scripts/unsharp-mask.scm
 share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
-share/gimp/scripts/xach-effect.scm
 share/gimp/scripts/web-browser.scm
-share/gimp/user_install
+share/gimp/scripts/xach-effect.scm
+share/gimp/gimp1_1_splash.ppm
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimp_tips.txt
 share/gimp/gimprc
 share/gimp/gimprc_user
 share/gimp/gtkrc
 share/gimp/gtkrc.forest2
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_splash.ppm
-share/gimp/gimp_tips.txt
 share/gimp/ps-menurc
-@dirrm libexec/gimp/1.0/plug-ins
-@dirrm libexec/gimp/1.0
+share/gimp/user_install
+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/pl/LC_MESSAGES/gimp.mo
+share/locale/sv/LC_MESSAGES/gimp.mo
+@dirrm libexec/gimp/1.1/modules
+@dirrm libexec/gimp/1.1/plug-ins
+@dirrm libexec/gimp/1.1
 @dirrm libexec/gimp
 @dirrm include/libgimp
 @dirrm include/gck