upgrade to 0.99.7

36 files changed, 1680 insertions, 3054 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 5674bde9cb60..a6a96948dec2 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    GIMP
-# Version required:     0.99.6
+# Version required:     0.99.7
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.5 1997/03/02 19:44:41 erich Exp $
+# $Id: Makefile,v 1.6 1997/03/27 21:41:12 erich Exp $
 #
 
-DISTNAME=       gimp-0.99.6
+DISTNAME=       gimp-0.99.7
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
 
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 0abfb6441869..ecc8c7a5cd07 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-0.99.6.tar.gz) = 03e45848f5e631b4ecab96fe2c4e897f
+MD5 (gimp-0.99.7.tar.gz) = ac10f6df1ff610943140994c7b6ee59f
diff --git a/graphics/gimp-app-devel/files/patch-aa b/graphics/gimp-app-devel/files/patch-aa
index 733e3e044551..9049a1722446 100644
--- a/graphics/gimp-app-devel/files/patch-aa
+++ b/graphics/gimp-app-devel/files/patch-aa
@@ -1,3 +1,9 @@
+****
+**** patches for the libtool in all the directories.
+**** These are mostly for linking against the freshly build
+**** libraraies rather than the installed ones.
+****
+
 --- /a/gimp-0.99.6/ltmain.sh	Wed Feb 26 03:39:50 1997
 +++ ltmain.sh	Wed Mar 12 20:20:40 1997
 @@ -334,7 +335,9 @@
@@ -37,214 +43,3 @@
  	;;
  
        -l*) deplibs="$deplibs $arg" ;;
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.am	Mon Mar 10 05:58:16 1997
-+++ gtk+/gtk/Makefile.am	Wed Mar 12 21:10:32 1997
-@@ -149,23 +149,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
-
- 
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.in	Mon Mar 10 07:13:59 1997
-+++ gtk+/gtk/Makefile.in	Wed Mar 12 21:09:50 1997
-@@ -198,23 +198,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- DEPS = \
- DEPS = \
---- /a/gimp-0.99.6/plug-ins/Makefile.am	Mon Mar 10 06:36:32 1997
-+++ plug-ins/Makefile.am	Wed Mar 12 21:49:12 1997
-@@ -43,9 +43,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/Makefile.in	Mon Mar 10 07:13:47 1997
-+++ plug-ins/Makefile.in	Wed Mar 12 21:48:51 1997
-@@ -89,9 +89,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.am	Mon Mar 10 06:36:21 1997
-+++ plug-ins/script-fu/Makefile.am	Wed Mar 12 21:52:31 1997
-@@ -29,9 +29,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.in	Mon Mar 10 07:13:48 1997
-+++ plug-ins/script-fu/Makefile.in	Wed Mar 12 21:52:47 1997
-@@ -76,9 +76,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/app/Makefile.am	Mon Mar 10 06:36:39 1997
-+++ app/Makefile.am	Wed Mar 12 21:58:49 1997
-@@ -267,21 +267,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/app/Makefile.in	Mon Mar 10 07:13:52 1997
-+++ app/Makefile.in	Wed Mar 12 21:59:15 1997
-@@ -314,21 +314,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/configure	Mon Mar 10 05:19:54 1997
-+++ configure	Wed Mar 12 22:09:11 1997
-@@ -617,7 +617,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- 
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
- 
- 
- PACKAGE=gimp
-@@ -2108,7 +2108,7 @@
- 
- 
- gimpdatadir=$datadir/$PACKAGE-$VERSION
--gimpplugindir=$libdir/$PACKAGE-$VERSION
-+gimpplugindir=$libexecdir/$PACKAGE-$VERSION
- 
- 
- 
---- gimprc.in~	Thu Mar 13 10:32:12 1997
-+++ gimprc.in	Thu Mar 13 10:32:25 1997
-@@ -68,7 +68,7 @@
- # causes the gimp to use more swap space and less memory.
- # Note: the gimp will still run even if `tile-cache-size' is
- # set to 0. The actual size can contain a suffix of 'm', 'M',
--* 'k', 'K', 'b' or 'B', which makes the gimp interpret the
-+# 'k', 'K', 'b' or 'B', which makes the gimp interpret the
- # size as being specified in megabytes, kilobytes and bytes
- # respectively. If no suffix is specified the size defaults to
- # being specified in kilobytes.
-@@ -90,7 +90,7 @@
- #  colors remaining after the allocation of the colorcube
- #  will be left to the system palette in an effort to reduce
- #  colormap "flashing".
--(color-cube 6 6 4)
-+(color-cube 6 6 4 24)
- 
- # Install a GIMP colormap by default -- only for 8-bit displays
- # (install-colormap)
diff --git a/graphics/gimp-app-devel/files/patch-ab b/graphics/gimp-app-devel/files/patch-ab
index 4eca93b6171e..27354846adb6 100644
--- a/graphics/gimp-app-devel/files/patch-ab
+++ b/graphics/gimp-app-devel/files/patch-ab
@@ -1,23 +1,8 @@
---- /a/gimp-0.99.6/gtk+/configure	Mon Mar 10 04:44:20 1997
-+++ gtk+/configure	Wed Mar 12 21:29:11 1997
-@@ -570,6 +570,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:574: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
---- /a/gimp-0.99.6/gtk+/glib/configure	Mon Mar 10 04:44:57 1997
-+++ gtk+/glib/configure	Wed Mar 12 21:29:39 1997
-@@ -560,6 +560,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:564: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+
+*****
+***** patches for plug-ins
+*****
+
 --- /a/gimp-0.99.6/plug-ins/url.c	Mon Mar 10 04:57:12 1997
 +++ plug-ins/url.c	Wed Mar 12 21:56:39 1997
 @@ -146,8 +146,8 @@
@@ -31,3 +16,14 @@
        _exit(127);
      }
    else
+--- plug-ins/nova.c~	Tue Apr  8 10:34:29 1997
++++ plug-ins/nova.c	Tue Apr  8 10:34:36 1997
+@@ -1010,7 +1010,7 @@
+ 	      l = sqrt( u*u + v*v );
+ 
+ 	      /* This algorithm is still under construction. */
+-	      c = (atan2(u,v)/(2*PI)+0.51) * pvals.nspoke;
++	      c = (atan2(u,v)/(2*M_PI)+0.51) * pvals.nspoke;
+ 	      i=(int)floor(c); c-=i; i%=pvals.nspoke;
+ 	      w1=spoke[i]*(1-c)+spoke[(i+1)%pvals.nspoke]*c;
+ 	      w1*=w1;
diff --git a/graphics/gimp-app-devel/files/patch-ac b/graphics/gimp-app-devel/files/patch-ac
index 31177deba379..f1efdf5f3839 100644
--- a/graphics/gimp-app-devel/files/patch-ac
+++ b/graphics/gimp-app-devel/files/patch-ac
@@ -1,88 +1,55 @@
---- plug-ins/script-fu/scripts/Makefile.in.orig	Sun Mar  2 05:54:56 1997
-+++ plug-ins/script-fu/scripts/Makefile.in	Sun Mar  2 08:00:11 1997
-@@ -50,7 +50,7 @@
+****
+**** patches for the various configure scripts
+****  1) force INSTALL=`/usr/bin/install -c'
+****     to fix some obsecure problem with firing
+****     ./configure via the ports mechanism
+****  2) put the plug-ins in libexec rather than lib
+****
+--- ./gtk+/glib/configure~	Fri Mar 28 12:03:26 1997
++++ ./gtk+/glib/configure	Tue Apr  8 08:06:14 1997
+@@ -560,6 +560,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:564: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./gtk+/configure~	Fri Mar 28 10:58:42 1997
++++ ./gtk+/configure	Tue Apr  8 08:05:57 1997
+@@ -568,6 +568,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:572: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./configure~	Mon Apr  7 17:42:41 1997
++++ ./configure	Tue Apr  8 08:07:58 1997
+@@ -567,6 +567,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:571: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+@@ -617,7 +618,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
+ 
+ 
+ PACKAGE=gimp
+@@ -2173,7 +2174,7 @@
+ 
+ 
+ gimpdatadir=$datadir/$PACKAGE/$VERSION
+-gimpplugindir=$libdir/$PACKAGE/$VERSION
++gimpplugindir=$libexecdir/$PACKAGE/$VERSION
  
- scriptdatadir = $(pkgdatadir)/scripts
  
--scriptdata_DATA = \
-+_scriptdata_DATA = \
- 	alien-glow.scm		\
- 	bds-logo-textured.scm	\
- 	blend-logo.scm		\
-@@ -76,6 +76,7 @@
  
- DIST_COMMON =  Makefile.am Makefile.in
- 
-+scriptdata_DATA = $(patsubst %.scm,%.sed,${_scriptdata_DATA})
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
- 	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
-@@ -83,7 +84,7 @@
- TAR = tar
- default: all
- 
--.SUFFIXES:
-+.SUFFIXES: .sed
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
- 	cd $(top_srcdir) && automake --gnu plug-ins/script-fu/scripts/Makefile
- 
-@@ -95,13 +96,15 @@
- install-scriptdataDATA: $(scriptdata_DATA)
- 	$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(scriptdatadir)
--	@list="$(scriptdata_DATA)"; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p; \
--	  else if test -f $$p; then \
--	    echo "$(INSTALL_DATA) $$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(scriptdatadir)/$$p; \
-+	@list="$(scriptdata_DATA)"; for s in $$list; do \
-+	  p=$$(basename $$s .sed); \
-+	  if [ $$p != $$s ]; then p=$$p.scm; fi; \
-+	  if test -f $(srcdir)/$$s; then \
-+	    echo "$(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p; \
-+	  else if test -f $$s; then \
-+	    echo "$(INSTALL_DATA) $$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $$s $(scriptdatadir)/$$p; \
- 	  fi; fi; \
- 	done
- 
-@@ -188,3 +191,7 @@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-+
-+
-+%.sed : %.scm
-+	sed 's,@_scriptdatadir_@,${scriptdatadir},' $< > $@
---- plug-ins/script-fu/scripts/chrome-it.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome-it.scm	Sun Mar  2 07:43:14 1997
-@@ -153,5 +153,5 @@
-     (gimp-displays-flush)
-     (gimp-image-enable-undo img)))
- 
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/chrome2.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome2.scm	Sun Mar  2 07:43:14 1997
-@@ -161,6 +161,6 @@
-     (gimp-image-enable-undo img)
-     (gimp-display-new img)))
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/crystal.scm.orig	Sun Mar  2 07:56:25 1997
-+++ plug-ins/script-fu/scripts/crystal.scm	Sun Mar  2 07:57:25 1997
-@@ -164,4 +164,4 @@
-     (gimp-display-new img)))
- 
- 
--(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"/usr/local/share/gimp/scripts/texture1.jpg\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"@_scriptdatadir_@/texture1.jpg\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index d51b454483e7..5e3dbf5fffef 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -1,4 +1,3 @@
-bin/gimp
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdkkeysyms.h
@@ -15,8 +14,9 @@ include/gtk/gtkarrow.h
 include/gtk/gtkbin.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
-include/gtk/gtkcanvas.h
 include/gtk/gtkcheckbutton.h
+include/gtk/gtkcheckmenuitem.h
+include/gtk/gtkcolorsel.h
 include/gtk/gtkcontainer.h
 include/gtk/gtkdata.h
 include/gtk/gtkdialog.h
@@ -24,7 +24,6 @@ include/gtk/gtkdrawingarea.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
 include/gtk/gtkfilesel.h
-include/gtk/gtkfill.h
 include/gtk/gtkframe.h
 include/gtk/gtkgc.h
 include/gtk/gtkhbox.h
@@ -51,6 +50,7 @@ include/gtk/gtkpixmap.h
 include/gtk/gtkpreview.h
 include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
+include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
 include/gtk/gtkrc.h
 include/gtk/gtkruler.h
@@ -63,6 +63,7 @@ include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktogglebutton.h
+include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
 include/gtk/gtktypeutils.h
@@ -74,15 +75,11 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-include/libgimp/gimp.h
-include/libgimp/gimpenums.h
-include/libgimp/gimpmenu.h
-include/libgimp/gimpui.h
-info/gdk.info
-info/gtk.info
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
+lib/libgck.so.0.0
+lib/libgdk.a
+lib/libgdk.la
+lib/libgdk.so
+lib/libgdk.so.1.0
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
@@ -95,181 +92,197 @@ lib/libglib.a
 lib/libglib.la
 lib/libglib.so
 lib/libglib.so.1.0
-libexec/gimp-0.99.6/plug-ins/blur
-libexec/gimp-0.99.6/plug-ins/bumpmap
-libexec/gimp-0.99.6/plug-ins/c_astretch
-libexec/gimp-0.99.6/plug-ins/cubism
-libexec/gimp-0.99.6/plug-ins/demo
-libexec/gimp-0.99.6/plug-ins/displace
-libexec/gimp-0.99.6/plug-ins/gauss_iir
-libexec/gimp-0.99.6/plug-ins/gauss_rle
-libexec/gimp-0.99.6/plug-ins/gif
-libexec/gimp-0.99.6/plug-ins/header
-libexec/gimp-0.99.6/plug-ins/jpeg
-libexec/gimp-0.99.6/plug-ins/mosaic
-libexec/gimp-0.99.6/plug-ins/noisify
-libexec/gimp-0.99.6/plug-ins/oilify
-libexec/gimp-0.99.6/plug-ins/pinch
-libexec/gimp-0.99.6/plug-ins/plasma
-libexec/gimp-0.99.6/plug-ins/pnm
-libexec/gimp-0.99.6/plug-ins/script-fu
-libexec/gimp-0.99.6/plug-ins/sparkle
-libexec/gimp-0.99.6/plug-ins/tiff
-libexec/gimp-0.99.6/plug-ins/tile
-libexec/gimp-0.99.6/plug-ins/url
-libexec/gimp-0.99.6/plug-ins/video
-libexec/gimp-0.99.6/plug-ins/whirl
-libexec/gimp-0.99.6/plug-ins/xpm
-share/gimp-0.99.6/brushes/11circle.gbr
-share/gimp-0.99.6/brushes/11fcircle.gbr
-share/gimp-0.99.6/brushes/13circle.gbr
-share/gimp-0.99.6/brushes/13fcircle.gbr
-share/gimp-0.99.6/brushes/15circle.gbr
-share/gimp-0.99.6/brushes/15fcircle.gbr
-share/gimp-0.99.6/brushes/17circle.gbr
-share/gimp-0.99.6/brushes/17fcircle.gbr
-share/gimp-0.99.6/brushes/19circle.gbr
-share/gimp-0.99.6/brushes/19fcircle.gbr
-share/gimp-0.99.6/brushes/1circle.gbr
-share/gimp-0.99.6/brushes/3circle.gbr
-share/gimp-0.99.6/brushes/3fcircle.gbr
-share/gimp-0.99.6/brushes/5circle.gbr
-share/gimp-0.99.6/brushes/5fcircle.gbr
-share/gimp-0.99.6/brushes/7circle.gbr
-share/gimp-0.99.6/brushes/7fcircle.gbr
-share/gimp-0.99.6/brushes/9circle.gbr
-share/gimp-0.99.6/brushes/9fcircle.gbr
-share/gimp-0.99.6/brushes/airplane.gbr
-share/gimp-0.99.6/brushes/bird.gbr
-share/gimp-0.99.6/brushes/bush.gbr
-share/gimp-0.99.6/brushes/confetti.gbr
-share/gimp-0.99.6/brushes/cross_large.gbr
-share/gimp-0.99.6/brushes/cross_small.gbr
-share/gimp-0.99.6/brushes/diamond.gbr
-share/gimp-0.99.6/brushes/duck.gbr
-share/gimp-0.99.6/brushes/dunes.gbr
-share/gimp-0.99.6/brushes/elk.gbr
-share/gimp-0.99.6/brushes/flags.gbr
-share/gimp-0.99.6/brushes/flower.gbr
-share/gimp-0.99.6/brushes/flower_large.gbr
-share/gimp-0.99.6/brushes/galaxy.gbr
-share/gimp-0.99.6/brushes/galaxy_small.gbr
-share/gimp-0.99.6/brushes/gecko.gbr
-share/gimp-0.99.6/brushes/glyph.gbr
-share/gimp-0.99.6/brushes/guitar.gbr
-share/gimp-0.99.6/brushes/hash.gbr
-share/gimp-0.99.6/brushes/jack.gbr
-share/gimp-0.99.6/brushes/manta.gbr
-share/gimp-0.99.6/brushes/ribbon.gbr
-share/gimp-0.99.6/brushes/rings1.gbr
-share/gimp-0.99.6/brushes/rings2.gbr
-share/gimp-0.99.6/brushes/rings3.gbr
-share/gimp-0.99.6/brushes/rings4.gbr
-share/gimp-0.99.6/brushes/rings5.gbr
-share/gimp-0.99.6/brushes/rings6.gbr
-share/gimp-0.99.6/brushes/rings7.gbr
-share/gimp-0.99.6/brushes/sball.gbr
-share/gimp-0.99.6/brushes/slope.gbr
-share/gimp-0.99.6/brushes/snake.gbr
-share/gimp-0.99.6/brushes/snowflake.gbr
-share/gimp-0.99.6/brushes/sparkle.gbr
-share/gimp-0.99.6/brushes/sparkle2.gbr
-share/gimp-0.99.6/brushes/star_medium.gbr
-share/gimp-0.99.6/brushes/star_small.gbr
-share/gimp-0.99.6/brushes/therefore.gbr
-share/gimp-0.99.6/brushes/tictactoe.gbr
-share/gimp-0.99.6/brushes/tile.gbr
-share/gimp-0.99.6/brushes/triangle.gbr
-share/gimp-0.99.6/brushes/tulip.gbr
-share/gimp-0.99.6/brushes/xcf.gbr
-share/gimp-0.99.6/gimp_logo.ppm
-share/gimp-0.99.6/gimprc
-share/gimp-0.99.6/gradients/Default
-share/gimp-0.99.6/gradients/French_flag
-share/gimp-0.99.6/gradients/French_flag_smooth
-share/gimp-0.99.6/gradients/Full_saturation_spectrum_CCW
-share/gimp-0.99.6/gradients/Full_saturation_spectrum_CW
-share/gimp-0.99.6/gradients/German_flag
-share/gimp-0.99.6/gradients/German_flag_smooth
-share/gimp-0.99.6/gradients/Mexican_flag
-share/gimp-0.99.6/gradients/Mexican_flag_smooth
-share/gimp-0.99.6/palettes/Blues
-share/gimp-0.99.6/palettes/Browns_And_Yellows
-share/gimp-0.99.6/palettes/Cool_Colors
-share/gimp-0.99.6/palettes/Default
-share/gimp-0.99.6/palettes/Grays
-share/gimp-0.99.6/palettes/Greens
-share/gimp-0.99.6/palettes/Lights
-share/gimp-0.99.6/palettes/Muted
-share/gimp-0.99.6/palettes/Pastels
-share/gimp-0.99.6/palettes/Reds_And_Purples
-share/gimp-0.99.6/palettes/Warm_Colors
-share/gimp-0.99.6/patterns/3dgreen.pat
-share/gimp-0.99.6/patterns/amethyst.pat
-share/gimp-0.99.6/patterns/blue.pat
-share/gimp-0.99.6/patterns/chains.pat
-share/gimp-0.99.6/patterns/choc_swirl.pat
-share/gimp-0.99.6/patterns/clouds.pat
-share/gimp-0.99.6/patterns/clovers.pat
-share/gimp-0.99.6/patterns/dunes.pat
-share/gimp-0.99.6/patterns/electric.pat
-share/gimp-0.99.6/patterns/fibers.pat
-share/gimp-0.99.6/patterns/floor_tile.pat
-share/gimp-0.99.6/patterns/granite1.pat
-share/gimp-0.99.6/patterns/granite2.pat
-share/gimp-0.99.6/patterns/green_curtains.pat
-share/gimp-0.99.6/patterns/java.pat
-share/gimp-0.99.6/patterns/krinkle.pat
-share/gimp-0.99.6/patterns/leather.pat
-share/gimp-0.99.6/patterns/leaves.pat
-share/gimp-0.99.6/patterns/leopard.pat
-share/gimp-0.99.6/patterns/lumps.pat
-share/gimp-0.99.6/patterns/marble1.pat
-share/gimp-0.99.6/patterns/marble2.pat
-share/gimp-0.99.6/patterns/marble3.pat
-share/gimp-0.99.6/patterns/mhuerock.pat
-share/gimp-0.99.6/patterns/paper.pat
-share/gimp-0.99.6/patterns/parque1.pat
-share/gimp-0.99.6/patterns/parque2.pat
-share/gimp-0.99.6/patterns/parque3.pat
-share/gimp-0.99.6/patterns/pj.pat
-share/gimp-0.99.6/patterns/pool.pat
-share/gimp-0.99.6/patterns/sky.pat
-share/gimp-0.99.6/patterns/slate.pat
-share/gimp-0.99.6/patterns/sm_squares.pat
-share/gimp-0.99.6/patterns/terra.pat
-share/gimp-0.99.6/patterns/torrents.pat
-share/gimp-0.99.6/patterns/waves.pat
-share/gimp-0.99.6/patterns/wax.pat
-share/gimp-0.99.6/patterns/wood1.pat
-share/gimp-0.99.6/patterns/wood2.pat
-share/gimp-0.99.6/patterns/wood3.pat
-share/gimp-0.99.6/scripts/alien-glow.scm
-share/gimp-0.99.6/scripts/bds-logo-textured.scm
-share/gimp-0.99.6/scripts/beavis.jpg
-share/gimp-0.99.6/scripts/blend-logo.scm
-share/gimp-0.99.6/scripts/chrome-it.scm
-share/gimp-0.99.6/scripts/chrome.scm
-share/gimp-0.99.6/scripts/chrome2.scm
-share/gimp-0.99.6/scripts/crystal.scm
-share/gimp-0.99.6/scripts/ds-logo.scm
-share/gimp-0.99.6/scripts/frozen-text.scm
-share/gimp-0.99.6/scripts/glowing.scm
-share/gimp-0.99.6/scripts/hds-logo.scm
-share/gimp-0.99.6/scripts/neon.scm
-share/gimp-0.99.6/scripts/sphere.scm
-share/gimp-0.99.6/scripts/texture1.jpg
-share/gimp-0.99.6/scripts/texture2.jpg
-share/gimp-0.99.6/user_install
-@dirrm share/gimp-0.99.6/scripts
-@dirrm share/gimp-0.99.6/patterns
-@dirrm share/gimp-0.99.6/palettes
-@dirrm share/gimp-0.99.6/gradients
-@dirrm share/gimp-0.99.6/brushes
-@dirrm share/gimp-0.99.6
-@dirrm libexec/gimp-0.99.6/plug-ins
-@dirrm libexec/gimp-0.99.6
-@dirrm include/gtk
-@dirrm include/glib
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so
+lib/libgtk.so.1.0
+libexec/gimp/0.99.7/plug-ins/blur
+libexec/gimp/0.99.7/plug-ins/bumpmap
+libexec/gimp/0.99.7/plug-ins/c_astretch
+libexec/gimp/0.99.7/plug-ins/checkerboard
+libexec/gimp/0.99.7/plug-ins/cubism
+libexec/gimp/0.99.7/plug-ins/demo
+libexec/gimp/0.99.7/plug-ins/displace
+libexec/gimp/0.99.7/plug-ins/emboss
+libexec/gimp/0.99.7/plug-ins/figures
+libexec/gimp/0.99.7/plug-ins/gauss_iir
+libexec/gimp/0.99.7/plug-ins/gauss_rle
+libexec/gimp/0.99.7/plug-ins/gif
+libexec/gimp/0.99.7/plug-ins/header
+libexec/gimp/0.99.7/plug-ins/jpeg
+libexec/gimp/0.99.7/plug-ins/laplace
+libexec/gimp/0.99.7/plug-ins/mosaic
+libexec/gimp/0.99.7/plug-ins/noisify
+libexec/gimp/0.99.7/plug-ins/normalize
+libexec/gimp/0.99.7/plug-ins/nova
+libexec/gimp/0.99.7/plug-ins/oilify
+libexec/gimp/0.99.7/plug-ins/pinch
+libexec/gimp/0.99.7/plug-ins/pixelize
+libexec/gimp/0.99.7/plug-ins/plasma
+libexec/gimp/0.99.7/plug-ins/pnm
+libexec/gimp/0.99.7/plug-ins/script-fu
+libexec/gimp/0.99.7/plug-ins/shift
+libexec/gimp/0.99.7/plug-ins/sobel
+libexec/gimp/0.99.7/plug-ins/sparkle
+libexec/gimp/0.99.7/plug-ins/spread
+libexec/gimp/0.99.7/plug-ins/tiff
+libexec/gimp/0.99.7/plug-ins/tile
+libexec/gimp/0.99.7/plug-ins/url
+libexec/gimp/0.99.7/plug-ins/video
+libexec/gimp/0.99.7/plug-ins/vinvert
+libexec/gimp/0.99.7/plug-ins/whirl
+libexec/gimp/0.99.7/plug-ins/xpm
+share/gimp/0.99.7/brushes/11circle.gbr
+share/gimp/0.99.7/brushes/11fcircle.gbr
+share/gimp/0.99.7/brushes/13circle.gbr
+share/gimp/0.99.7/brushes/13fcircle.gbr
+share/gimp/0.99.7/brushes/15circle.gbr
+share/gimp/0.99.7/brushes/15fcircle.gbr
+share/gimp/0.99.7/brushes/17circle.gbr
+share/gimp/0.99.7/brushes/17fcircle.gbr
+share/gimp/0.99.7/brushes/19circle.gbr
+share/gimp/0.99.7/brushes/19fcircle.gbr
+share/gimp/0.99.7/brushes/1circle.gbr
+share/gimp/0.99.7/brushes/3circle.gbr
+share/gimp/0.99.7/brushes/3fcircle.gbr
+share/gimp/0.99.7/brushes/5circle.gbr
+share/gimp/0.99.7/brushes/5fcircle.gbr
+share/gimp/0.99.7/brushes/7circle.gbr
+share/gimp/0.99.7/brushes/7fcircle.gbr
+share/gimp/0.99.7/brushes/9circle.gbr
+share/gimp/0.99.7/brushes/9fcircle.gbr
+share/gimp/0.99.7/brushes/airplane.gbr
+share/gimp/0.99.7/brushes/bird.gbr
+share/gimp/0.99.7/brushes/bush.gbr
+share/gimp/0.99.7/brushes/confetti.gbr
+share/gimp/0.99.7/brushes/cross_large.gbr
+share/gimp/0.99.7/brushes/cross_small.gbr
+share/gimp/0.99.7/brushes/diamond.gbr
+share/gimp/0.99.7/brushes/duck.gbr
+share/gimp/0.99.7/brushes/dunes.gbr
+share/gimp/0.99.7/brushes/elk.gbr
+share/gimp/0.99.7/brushes/flags.gbr
+share/gimp/0.99.7/brushes/flower.gbr
+share/gimp/0.99.7/brushes/flower_large.gbr
+share/gimp/0.99.7/brushes/galaxy.gbr
+share/gimp/0.99.7/brushes/galaxy_small.gbr
+share/gimp/0.99.7/brushes/gecko.gbr
+share/gimp/0.99.7/brushes/glyph.gbr
+share/gimp/0.99.7/brushes/guitar.gbr
+share/gimp/0.99.7/brushes/hash.gbr
+share/gimp/0.99.7/brushes/jack.gbr
+share/gimp/0.99.7/brushes/manta.gbr
+share/gimp/0.99.7/brushes/ribbon.gbr
+share/gimp/0.99.7/brushes/rings1.gbr
+share/gimp/0.99.7/brushes/rings2.gbr
+share/gimp/0.99.7/brushes/rings3.gbr
+share/gimp/0.99.7/brushes/rings4.gbr
+share/gimp/0.99.7/brushes/rings5.gbr
+share/gimp/0.99.7/brushes/rings6.gbr
+share/gimp/0.99.7/brushes/rings7.gbr
+share/gimp/0.99.7/brushes/sball.gbr
+share/gimp/0.99.7/brushes/slope.gbr
+share/gimp/0.99.7/brushes/snake.gbr
+share/gimp/0.99.7/brushes/snowflake.gbr
+share/gimp/0.99.7/brushes/sparkle.gbr
+share/gimp/0.99.7/brushes/sparkle2.gbr
+share/gimp/0.99.7/brushes/star_medium.gbr
+share/gimp/0.99.7/brushes/star_small.gbr
+share/gimp/0.99.7/brushes/therefore.gbr
+share/gimp/0.99.7/brushes/tictactoe.gbr
+share/gimp/0.99.7/brushes/tile.gbr
+share/gimp/0.99.7/brushes/triangle.gbr
+share/gimp/0.99.7/brushes/tulip.gbr
+share/gimp/0.99.7/brushes/xcf.gbr
+share/gimp/0.99.7/gimp_logo.ppm
+share/gimp/0.99.7/gimprc
+share/gimp/0.99.7/gradients/Default
+share/gimp/0.99.7/gradients/French_flag
+share/gimp/0.99.7/gradients/French_flag_smooth
+share/gimp/0.99.7/gradients/Full_saturation_spectrum_CCW
+share/gimp/0.99.7/gradients/Full_saturation_spectrum_CW
+share/gimp/0.99.7/gradients/German_flag
+share/gimp/0.99.7/gradients/German_flag_smooth
+share/gimp/0.99.7/gradients/Mexican_flag
+share/gimp/0.99.7/gradients/Mexican_flag_smooth
+share/gimp/0.99.7/palettes/Blues
+share/gimp/0.99.7/palettes/Browns_And_Yellows
+share/gimp/0.99.7/palettes/Cool_Colors
+share/gimp/0.99.7/palettes/Default
+share/gimp/0.99.7/palettes/Grays
+share/gimp/0.99.7/palettes/Greens
+share/gimp/0.99.7/palettes/Lights
+share/gimp/0.99.7/palettes/Muted
+share/gimp/0.99.7/palettes/Pastels
+share/gimp/0.99.7/palettes/Reds_And_Purples
+share/gimp/0.99.7/palettes/Warm_Colors
+share/gimp/0.99.7/patterns/3dgreen.pat
+share/gimp/0.99.7/patterns/amethyst.pat
+share/gimp/0.99.7/patterns/blue.pat
+share/gimp/0.99.7/patterns/chains.pat
+share/gimp/0.99.7/patterns/choc_swirl.pat
+share/gimp/0.99.7/patterns/clouds.pat
+share/gimp/0.99.7/patterns/clovers.pat
+share/gimp/0.99.7/patterns/dunes.pat
+share/gimp/0.99.7/patterns/electric.pat
+share/gimp/0.99.7/patterns/fibers.pat
+share/gimp/0.99.7/patterns/floor_tile.pat
+share/gimp/0.99.7/patterns/granite1.pat
+share/gimp/0.99.7/patterns/granite2.pat
+share/gimp/0.99.7/patterns/green_curtains.pat
+share/gimp/0.99.7/patterns/java.pat
+share/gimp/0.99.7/patterns/krinkle.pat
+share/gimp/0.99.7/patterns/leather.pat
+share/gimp/0.99.7/patterns/leaves.pat
+share/gimp/0.99.7/patterns/leopard.pat
+share/gimp/0.99.7/patterns/lumps.pat
+share/gimp/0.99.7/patterns/marble1.pat
+share/gimp/0.99.7/patterns/marble2.pat
+share/gimp/0.99.7/patterns/marble3.pat
+share/gimp/0.99.7/patterns/mhuerock.pat
+share/gimp/0.99.7/patterns/paper.pat
+share/gimp/0.99.7/patterns/parque1.pat
+share/gimp/0.99.7/patterns/parque2.pat
+share/gimp/0.99.7/patterns/parque3.pat
+share/gimp/0.99.7/patterns/pj.pat
+share/gimp/0.99.7/patterns/pool.pat
+share/gimp/0.99.7/patterns/sky.pat
+share/gimp/0.99.7/patterns/slate.pat
+share/gimp/0.99.7/patterns/sm_squares.pat
+share/gimp/0.99.7/patterns/terra.pat
+share/gimp/0.99.7/patterns/torrents.pat
+share/gimp/0.99.7/patterns/waves.pat
+share/gimp/0.99.7/patterns/wax.pat
+share/gimp/0.99.7/patterns/wood1.pat
+share/gimp/0.99.7/patterns/wood2.pat
+share/gimp/0.99.7/patterns/wood3.pat
+share/gimp/0.99.7/scripts/alien-glow.scm
+share/gimp/0.99.7/scripts/bds-logo-textured.scm
+share/gimp/0.99.7/scripts/beavis.jpg
+share/gimp/0.99.7/scripts/blend-logo.scm
+share/gimp/0.99.7/scripts/chrome-it.scm
+share/gimp/0.99.7/scripts/chrome.scm
+share/gimp/0.99.7/scripts/chrome2.scm
+share/gimp/0.99.7/scripts/crystal.scm
+share/gimp/0.99.7/scripts/ds-logo.scm
+share/gimp/0.99.7/scripts/frozen-text.scm
+share/gimp/0.99.7/scripts/glowing.scm
+share/gimp/0.99.7/scripts/hds-logo.scm
+share/gimp/0.99.7/scripts/neon.scm
+share/gimp/0.99.7/scripts/sphere.scm
+share/gimp/0.99.7/scripts/texture1.jpg
+share/gimp/0.99.7/scripts/texture2.jpg
+share/gimp/0.99.7/user_install
 @dirrm include/gdk
-@dirrm include/libgimp
+@dirrm include/glib
+@dirrm include/gtk
+@dirrm libexec/gimp/0.99.7/plug-ins
+@dirrm libexec/gimp/0.99.7
+@dirrm libexec/gimp
+@dirrm share/gimp/0.99.7/brushes
+@dirrm share/gimp/0.99.7/gradients
+@dirrm share/gimp/0.99.7/palettes
+@dirrm share/gimp/0.99.7/patterns
+@dirrm share/gimp/0.99.7/scripts
+@dirrm share/gimp/0.99.7
+@dirrm share/gimp
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 5674bde9cb60..a6a96948dec2 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    GIMP
-# Version required:     0.99.6
+# Version required:     0.99.7
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.5 1997/03/02 19:44:41 erich Exp $
+# $Id: Makefile,v 1.6 1997/03/27 21:41:12 erich Exp $
 #
 
-DISTNAME=       gimp-0.99.6
+DISTNAME=       gimp-0.99.7
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
 
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 0abfb6441869..ecc8c7a5cd07 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1 +1 @@
-MD5 (gimp-0.99.6.tar.gz) = 03e45848f5e631b4ecab96fe2c4e897f
+MD5 (gimp-0.99.7.tar.gz) = ac10f6df1ff610943140994c7b6ee59f
diff --git a/graphics/gimp-app/files/patch-aa b/graphics/gimp-app/files/patch-aa
index 733e3e044551..9049a1722446 100644
--- a/graphics/gimp-app/files/patch-aa
+++ b/graphics/gimp-app/files/patch-aa
@@ -1,3 +1,9 @@
+****
+**** patches for the libtool in all the directories.
+**** These are mostly for linking against the freshly build
+**** libraraies rather than the installed ones.
+****
+
 --- /a/gimp-0.99.6/ltmain.sh	Wed Feb 26 03:39:50 1997
 +++ ltmain.sh	Wed Mar 12 20:20:40 1997
 @@ -334,7 +335,9 @@
@@ -37,214 +43,3 @@
  	;;
  
        -l*) deplibs="$deplibs $arg" ;;
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.am	Mon Mar 10 05:58:16 1997
-+++ gtk+/gtk/Makefile.am	Wed Mar 12 21:10:32 1997
-@@ -149,23 +149,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
-
- 
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.in	Mon Mar 10 07:13:59 1997
-+++ gtk+/gtk/Makefile.in	Wed Mar 12 21:09:50 1997
-@@ -198,23 +198,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- DEPS = \
- DEPS = \
---- /a/gimp-0.99.6/plug-ins/Makefile.am	Mon Mar 10 06:36:32 1997
-+++ plug-ins/Makefile.am	Wed Mar 12 21:49:12 1997
-@@ -43,9 +43,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/Makefile.in	Mon Mar 10 07:13:47 1997
-+++ plug-ins/Makefile.in	Wed Mar 12 21:48:51 1997
-@@ -89,9 +89,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.am	Mon Mar 10 06:36:21 1997
-+++ plug-ins/script-fu/Makefile.am	Wed Mar 12 21:52:31 1997
-@@ -29,9 +29,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.in	Mon Mar 10 07:13:48 1997
-+++ plug-ins/script-fu/Makefile.in	Wed Mar 12 21:52:47 1997
-@@ -76,9 +76,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/app/Makefile.am	Mon Mar 10 06:36:39 1997
-+++ app/Makefile.am	Wed Mar 12 21:58:49 1997
-@@ -267,21 +267,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/app/Makefile.in	Mon Mar 10 07:13:52 1997
-+++ app/Makefile.in	Wed Mar 12 21:59:15 1997
-@@ -314,21 +314,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/configure	Mon Mar 10 05:19:54 1997
-+++ configure	Wed Mar 12 22:09:11 1997
-@@ -617,7 +617,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- 
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
- 
- 
- PACKAGE=gimp
-@@ -2108,7 +2108,7 @@
- 
- 
- gimpdatadir=$datadir/$PACKAGE-$VERSION
--gimpplugindir=$libdir/$PACKAGE-$VERSION
-+gimpplugindir=$libexecdir/$PACKAGE-$VERSION
- 
- 
- 
---- gimprc.in~	Thu Mar 13 10:32:12 1997
-+++ gimprc.in	Thu Mar 13 10:32:25 1997
-@@ -68,7 +68,7 @@
- # causes the gimp to use more swap space and less memory.
- # Note: the gimp will still run even if `tile-cache-size' is
- # set to 0. The actual size can contain a suffix of 'm', 'M',
--* 'k', 'K', 'b' or 'B', which makes the gimp interpret the
-+# 'k', 'K', 'b' or 'B', which makes the gimp interpret the
- # size as being specified in megabytes, kilobytes and bytes
- # respectively. If no suffix is specified the size defaults to
- # being specified in kilobytes.
-@@ -90,7 +90,7 @@
- #  colors remaining after the allocation of the colorcube
- #  will be left to the system palette in an effort to reduce
- #  colormap "flashing".
--(color-cube 6 6 4)
-+(color-cube 6 6 4 24)
- 
- # Install a GIMP colormap by default -- only for 8-bit displays
- # (install-colormap)
diff --git a/graphics/gimp-app/files/patch-ab b/graphics/gimp-app/files/patch-ab
index 4eca93b6171e..27354846adb6 100644
--- a/graphics/gimp-app/files/patch-ab
+++ b/graphics/gimp-app/files/patch-ab
@@ -1,23 +1,8 @@
---- /a/gimp-0.99.6/gtk+/configure	Mon Mar 10 04:44:20 1997
-+++ gtk+/configure	Wed Mar 12 21:29:11 1997
-@@ -570,6 +570,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:574: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
---- /a/gimp-0.99.6/gtk+/glib/configure	Mon Mar 10 04:44:57 1997
-+++ gtk+/glib/configure	Wed Mar 12 21:29:39 1997
-@@ -560,6 +560,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:564: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+
+*****
+***** patches for plug-ins
+*****
+
 --- /a/gimp-0.99.6/plug-ins/url.c	Mon Mar 10 04:57:12 1997
 +++ plug-ins/url.c	Wed Mar 12 21:56:39 1997
 @@ -146,8 +146,8 @@
@@ -31,3 +16,14 @@
        _exit(127);
      }
    else
+--- plug-ins/nova.c~	Tue Apr  8 10:34:29 1997
++++ plug-ins/nova.c	Tue Apr  8 10:34:36 1997
+@@ -1010,7 +1010,7 @@
+ 	      l = sqrt( u*u + v*v );
+ 
+ 	      /* This algorithm is still under construction. */
+-	      c = (atan2(u,v)/(2*PI)+0.51) * pvals.nspoke;
++	      c = (atan2(u,v)/(2*M_PI)+0.51) * pvals.nspoke;
+ 	      i=(int)floor(c); c-=i; i%=pvals.nspoke;
+ 	      w1=spoke[i]*(1-c)+spoke[(i+1)%pvals.nspoke]*c;
+ 	      w1*=w1;
diff --git a/graphics/gimp-app/files/patch-ac b/graphics/gimp-app/files/patch-ac
index 31177deba379..f1efdf5f3839 100644
--- a/graphics/gimp-app/files/patch-ac
+++ b/graphics/gimp-app/files/patch-ac
@@ -1,88 +1,55 @@
---- plug-ins/script-fu/scripts/Makefile.in.orig	Sun Mar  2 05:54:56 1997
-+++ plug-ins/script-fu/scripts/Makefile.in	Sun Mar  2 08:00:11 1997
-@@ -50,7 +50,7 @@
+****
+**** patches for the various configure scripts
+****  1) force INSTALL=`/usr/bin/install -c'
+****     to fix some obsecure problem with firing
+****     ./configure via the ports mechanism
+****  2) put the plug-ins in libexec rather than lib
+****
+--- ./gtk+/glib/configure~	Fri Mar 28 12:03:26 1997
++++ ./gtk+/glib/configure	Tue Apr  8 08:06:14 1997
+@@ -560,6 +560,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:564: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./gtk+/configure~	Fri Mar 28 10:58:42 1997
++++ ./gtk+/configure	Tue Apr  8 08:05:57 1997
+@@ -568,6 +568,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:572: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./configure~	Mon Apr  7 17:42:41 1997
++++ ./configure	Tue Apr  8 08:07:58 1997
+@@ -567,6 +567,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:571: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+@@ -617,7 +618,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
+ 
+ 
+ PACKAGE=gimp
+@@ -2173,7 +2174,7 @@
+ 
+ 
+ gimpdatadir=$datadir/$PACKAGE/$VERSION
+-gimpplugindir=$libdir/$PACKAGE/$VERSION
++gimpplugindir=$libexecdir/$PACKAGE/$VERSION
  
- scriptdatadir = $(pkgdatadir)/scripts
  
--scriptdata_DATA = \
-+_scriptdata_DATA = \
- 	alien-glow.scm		\
- 	bds-logo-textured.scm	\
- 	blend-logo.scm		\
-@@ -76,6 +76,7 @@
  
- DIST_COMMON =  Makefile.am Makefile.in
- 
-+scriptdata_DATA = $(patsubst %.scm,%.sed,${_scriptdata_DATA})
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
- 	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
-@@ -83,7 +84,7 @@
- TAR = tar
- default: all
- 
--.SUFFIXES:
-+.SUFFIXES: .sed
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
- 	cd $(top_srcdir) && automake --gnu plug-ins/script-fu/scripts/Makefile
- 
-@@ -95,13 +96,15 @@
- install-scriptdataDATA: $(scriptdata_DATA)
- 	$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(scriptdatadir)
--	@list="$(scriptdata_DATA)"; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p; \
--	  else if test -f $$p; then \
--	    echo "$(INSTALL_DATA) $$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(scriptdatadir)/$$p; \
-+	@list="$(scriptdata_DATA)"; for s in $$list; do \
-+	  p=$$(basename $$s .sed); \
-+	  if [ $$p != $$s ]; then p=$$p.scm; fi; \
-+	  if test -f $(srcdir)/$$s; then \
-+	    echo "$(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p; \
-+	  else if test -f $$s; then \
-+	    echo "$(INSTALL_DATA) $$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $$s $(scriptdatadir)/$$p; \
- 	  fi; fi; \
- 	done
- 
-@@ -188,3 +191,7 @@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-+
-+
-+%.sed : %.scm
-+	sed 's,@_scriptdatadir_@,${scriptdatadir},' $< > $@
---- plug-ins/script-fu/scripts/chrome-it.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome-it.scm	Sun Mar  2 07:43:14 1997
-@@ -153,5 +153,5 @@
-     (gimp-displays-flush)
-     (gimp-image-enable-undo img)))
- 
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/chrome2.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome2.scm	Sun Mar  2 07:43:14 1997
-@@ -161,6 +161,6 @@
-     (gimp-image-enable-undo img)
-     (gimp-display-new img)))
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/crystal.scm.orig	Sun Mar  2 07:56:25 1997
-+++ plug-ins/script-fu/scripts/crystal.scm	Sun Mar  2 07:57:25 1997
-@@ -164,4 +164,4 @@
-     (gimp-display-new img)))
- 
- 
--(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"/usr/local/share/gimp/scripts/texture1.jpg\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"@_scriptdatadir_@/texture1.jpg\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index d51b454483e7..5e3dbf5fffef 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1,4 +1,3 @@
-bin/gimp
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdkkeysyms.h
@@ -15,8 +14,9 @@ include/gtk/gtkarrow.h
 include/gtk/gtkbin.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
-include/gtk/gtkcanvas.h
 include/gtk/gtkcheckbutton.h
+include/gtk/gtkcheckmenuitem.h
+include/gtk/gtkcolorsel.h
 include/gtk/gtkcontainer.h
 include/gtk/gtkdata.h
 include/gtk/gtkdialog.h
@@ -24,7 +24,6 @@ include/gtk/gtkdrawingarea.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
 include/gtk/gtkfilesel.h
-include/gtk/gtkfill.h
 include/gtk/gtkframe.h
 include/gtk/gtkgc.h
 include/gtk/gtkhbox.h
@@ -51,6 +50,7 @@ include/gtk/gtkpixmap.h
 include/gtk/gtkpreview.h
 include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
+include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
 include/gtk/gtkrc.h
 include/gtk/gtkruler.h
@@ -63,6 +63,7 @@ include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktogglebutton.h
+include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
 include/gtk/gtktypeutils.h
@@ -74,15 +75,11 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-include/libgimp/gimp.h
-include/libgimp/gimpenums.h
-include/libgimp/gimpmenu.h
-include/libgimp/gimpui.h
-info/gdk.info
-info/gtk.info
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
+lib/libgck.so.0.0
+lib/libgdk.a
+lib/libgdk.la
+lib/libgdk.so
+lib/libgdk.so.1.0
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
@@ -95,181 +92,197 @@ lib/libglib.a
 lib/libglib.la
 lib/libglib.so
 lib/libglib.so.1.0
-libexec/gimp-0.99.6/plug-ins/blur
-libexec/gimp-0.99.6/plug-ins/bumpmap
-libexec/gimp-0.99.6/plug-ins/c_astretch
-libexec/gimp-0.99.6/plug-ins/cubism
-libexec/gimp-0.99.6/plug-ins/demo
-libexec/gimp-0.99.6/plug-ins/displace
-libexec/gimp-0.99.6/plug-ins/gauss_iir
-libexec/gimp-0.99.6/plug-ins/gauss_rle
-libexec/gimp-0.99.6/plug-ins/gif
-libexec/gimp-0.99.6/plug-ins/header
-libexec/gimp-0.99.6/plug-ins/jpeg
-libexec/gimp-0.99.6/plug-ins/mosaic
-libexec/gimp-0.99.6/plug-ins/noisify
-libexec/gimp-0.99.6/plug-ins/oilify
-libexec/gimp-0.99.6/plug-ins/pinch
-libexec/gimp-0.99.6/plug-ins/plasma
-libexec/gimp-0.99.6/plug-ins/pnm
-libexec/gimp-0.99.6/plug-ins/script-fu
-libexec/gimp-0.99.6/plug-ins/sparkle
-libexec/gimp-0.99.6/plug-ins/tiff
-libexec/gimp-0.99.6/plug-ins/tile
-libexec/gimp-0.99.6/plug-ins/url
-libexec/gimp-0.99.6/plug-ins/video
-libexec/gimp-0.99.6/plug-ins/whirl
-libexec/gimp-0.99.6/plug-ins/xpm
-share/gimp-0.99.6/brushes/11circle.gbr
-share/gimp-0.99.6/brushes/11fcircle.gbr
-share/gimp-0.99.6/brushes/13circle.gbr
-share/gimp-0.99.6/brushes/13fcircle.gbr
-share/gimp-0.99.6/brushes/15circle.gbr
-share/gimp-0.99.6/brushes/15fcircle.gbr
-share/gimp-0.99.6/brushes/17circle.gbr
-share/gimp-0.99.6/brushes/17fcircle.gbr
-share/gimp-0.99.6/brushes/19circle.gbr
-share/gimp-0.99.6/brushes/19fcircle.gbr
-share/gimp-0.99.6/brushes/1circle.gbr
-share/gimp-0.99.6/brushes/3circle.gbr
-share/gimp-0.99.6/brushes/3fcircle.gbr
-share/gimp-0.99.6/brushes/5circle.gbr
-share/gimp-0.99.6/brushes/5fcircle.gbr
-share/gimp-0.99.6/brushes/7circle.gbr
-share/gimp-0.99.6/brushes/7fcircle.gbr
-share/gimp-0.99.6/brushes/9circle.gbr
-share/gimp-0.99.6/brushes/9fcircle.gbr
-share/gimp-0.99.6/brushes/airplane.gbr
-share/gimp-0.99.6/brushes/bird.gbr
-share/gimp-0.99.6/brushes/bush.gbr
-share/gimp-0.99.6/brushes/confetti.gbr
-share/gimp-0.99.6/brushes/cross_large.gbr
-share/gimp-0.99.6/brushes/cross_small.gbr
-share/gimp-0.99.6/brushes/diamond.gbr
-share/gimp-0.99.6/brushes/duck.gbr
-share/gimp-0.99.6/brushes/dunes.gbr
-share/gimp-0.99.6/brushes/elk.gbr
-share/gimp-0.99.6/brushes/flags.gbr
-share/gimp-0.99.6/brushes/flower.gbr
-share/gimp-0.99.6/brushes/flower_large.gbr
-share/gimp-0.99.6/brushes/galaxy.gbr
-share/gimp-0.99.6/brushes/galaxy_small.gbr
-share/gimp-0.99.6/brushes/gecko.gbr
-share/gimp-0.99.6/brushes/glyph.gbr
-share/gimp-0.99.6/brushes/guitar.gbr
-share/gimp-0.99.6/brushes/hash.gbr
-share/gimp-0.99.6/brushes/jack.gbr
-share/gimp-0.99.6/brushes/manta.gbr
-share/gimp-0.99.6/brushes/ribbon.gbr
-share/gimp-0.99.6/brushes/rings1.gbr
-share/gimp-0.99.6/brushes/rings2.gbr
-share/gimp-0.99.6/brushes/rings3.gbr
-share/gimp-0.99.6/brushes/rings4.gbr
-share/gimp-0.99.6/brushes/rings5.gbr
-share/gimp-0.99.6/brushes/rings6.gbr
-share/gimp-0.99.6/brushes/rings7.gbr
-share/gimp-0.99.6/brushes/sball.gbr
-share/gimp-0.99.6/brushes/slope.gbr
-share/gimp-0.99.6/brushes/snake.gbr
-share/gimp-0.99.6/brushes/snowflake.gbr
-share/gimp-0.99.6/brushes/sparkle.gbr
-share/gimp-0.99.6/brushes/sparkle2.gbr
-share/gimp-0.99.6/brushes/star_medium.gbr
-share/gimp-0.99.6/brushes/star_small.gbr
-share/gimp-0.99.6/brushes/therefore.gbr
-share/gimp-0.99.6/brushes/tictactoe.gbr
-share/gimp-0.99.6/brushes/tile.gbr
-share/gimp-0.99.6/brushes/triangle.gbr
-share/gimp-0.99.6/brushes/tulip.gbr
-share/gimp-0.99.6/brushes/xcf.gbr
-share/gimp-0.99.6/gimp_logo.ppm
-share/gimp-0.99.6/gimprc
-share/gimp-0.99.6/gradients/Default
-share/gimp-0.99.6/gradients/French_flag
-share/gimp-0.99.6/gradients/French_flag_smooth
-share/gimp-0.99.6/gradients/Full_saturation_spectrum_CCW
-share/gimp-0.99.6/gradients/Full_saturation_spectrum_CW
-share/gimp-0.99.6/gradients/German_flag
-share/gimp-0.99.6/gradients/German_flag_smooth
-share/gimp-0.99.6/gradients/Mexican_flag
-share/gimp-0.99.6/gradients/Mexican_flag_smooth
-share/gimp-0.99.6/palettes/Blues
-share/gimp-0.99.6/palettes/Browns_And_Yellows
-share/gimp-0.99.6/palettes/Cool_Colors
-share/gimp-0.99.6/palettes/Default
-share/gimp-0.99.6/palettes/Grays
-share/gimp-0.99.6/palettes/Greens
-share/gimp-0.99.6/palettes/Lights
-share/gimp-0.99.6/palettes/Muted
-share/gimp-0.99.6/palettes/Pastels
-share/gimp-0.99.6/palettes/Reds_And_Purples
-share/gimp-0.99.6/palettes/Warm_Colors
-share/gimp-0.99.6/patterns/3dgreen.pat
-share/gimp-0.99.6/patterns/amethyst.pat
-share/gimp-0.99.6/patterns/blue.pat
-share/gimp-0.99.6/patterns/chains.pat
-share/gimp-0.99.6/patterns/choc_swirl.pat
-share/gimp-0.99.6/patterns/clouds.pat
-share/gimp-0.99.6/patterns/clovers.pat
-share/gimp-0.99.6/patterns/dunes.pat
-share/gimp-0.99.6/patterns/electric.pat
-share/gimp-0.99.6/patterns/fibers.pat
-share/gimp-0.99.6/patterns/floor_tile.pat
-share/gimp-0.99.6/patterns/granite1.pat
-share/gimp-0.99.6/patterns/granite2.pat
-share/gimp-0.99.6/patterns/green_curtains.pat
-share/gimp-0.99.6/patterns/java.pat
-share/gimp-0.99.6/patterns/krinkle.pat
-share/gimp-0.99.6/patterns/leather.pat
-share/gimp-0.99.6/patterns/leaves.pat
-share/gimp-0.99.6/patterns/leopard.pat
-share/gimp-0.99.6/patterns/lumps.pat
-share/gimp-0.99.6/patterns/marble1.pat
-share/gimp-0.99.6/patterns/marble2.pat
-share/gimp-0.99.6/patterns/marble3.pat
-share/gimp-0.99.6/patterns/mhuerock.pat
-share/gimp-0.99.6/patterns/paper.pat
-share/gimp-0.99.6/patterns/parque1.pat
-share/gimp-0.99.6/patterns/parque2.pat
-share/gimp-0.99.6/patterns/parque3.pat
-share/gimp-0.99.6/patterns/pj.pat
-share/gimp-0.99.6/patterns/pool.pat
-share/gimp-0.99.6/patterns/sky.pat
-share/gimp-0.99.6/patterns/slate.pat
-share/gimp-0.99.6/patterns/sm_squares.pat
-share/gimp-0.99.6/patterns/terra.pat
-share/gimp-0.99.6/patterns/torrents.pat
-share/gimp-0.99.6/patterns/waves.pat
-share/gimp-0.99.6/patterns/wax.pat
-share/gimp-0.99.6/patterns/wood1.pat
-share/gimp-0.99.6/patterns/wood2.pat
-share/gimp-0.99.6/patterns/wood3.pat
-share/gimp-0.99.6/scripts/alien-glow.scm
-share/gimp-0.99.6/scripts/bds-logo-textured.scm
-share/gimp-0.99.6/scripts/beavis.jpg
-share/gimp-0.99.6/scripts/blend-logo.scm
-share/gimp-0.99.6/scripts/chrome-it.scm
-share/gimp-0.99.6/scripts/chrome.scm
-share/gimp-0.99.6/scripts/chrome2.scm
-share/gimp-0.99.6/scripts/crystal.scm
-share/gimp-0.99.6/scripts/ds-logo.scm
-share/gimp-0.99.6/scripts/frozen-text.scm
-share/gimp-0.99.6/scripts/glowing.scm
-share/gimp-0.99.6/scripts/hds-logo.scm
-share/gimp-0.99.6/scripts/neon.scm
-share/gimp-0.99.6/scripts/sphere.scm
-share/gimp-0.99.6/scripts/texture1.jpg
-share/gimp-0.99.6/scripts/texture2.jpg
-share/gimp-0.99.6/user_install
-@dirrm share/gimp-0.99.6/scripts
-@dirrm share/gimp-0.99.6/patterns
-@dirrm share/gimp-0.99.6/palettes
-@dirrm share/gimp-0.99.6/gradients
-@dirrm share/gimp-0.99.6/brushes
-@dirrm share/gimp-0.99.6
-@dirrm libexec/gimp-0.99.6/plug-ins
-@dirrm libexec/gimp-0.99.6
-@dirrm include/gtk
-@dirrm include/glib
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so
+lib/libgtk.so.1.0
+libexec/gimp/0.99.7/plug-ins/blur
+libexec/gimp/0.99.7/plug-ins/bumpmap
+libexec/gimp/0.99.7/plug-ins/c_astretch
+libexec/gimp/0.99.7/plug-ins/checkerboard
+libexec/gimp/0.99.7/plug-ins/cubism
+libexec/gimp/0.99.7/plug-ins/demo
+libexec/gimp/0.99.7/plug-ins/displace
+libexec/gimp/0.99.7/plug-ins/emboss
+libexec/gimp/0.99.7/plug-ins/figures
+libexec/gimp/0.99.7/plug-ins/gauss_iir
+libexec/gimp/0.99.7/plug-ins/gauss_rle
+libexec/gimp/0.99.7/plug-ins/gif
+libexec/gimp/0.99.7/plug-ins/header
+libexec/gimp/0.99.7/plug-ins/jpeg
+libexec/gimp/0.99.7/plug-ins/laplace
+libexec/gimp/0.99.7/plug-ins/mosaic
+libexec/gimp/0.99.7/plug-ins/noisify
+libexec/gimp/0.99.7/plug-ins/normalize
+libexec/gimp/0.99.7/plug-ins/nova
+libexec/gimp/0.99.7/plug-ins/oilify
+libexec/gimp/0.99.7/plug-ins/pinch
+libexec/gimp/0.99.7/plug-ins/pixelize
+libexec/gimp/0.99.7/plug-ins/plasma
+libexec/gimp/0.99.7/plug-ins/pnm
+libexec/gimp/0.99.7/plug-ins/script-fu
+libexec/gimp/0.99.7/plug-ins/shift
+libexec/gimp/0.99.7/plug-ins/sobel
+libexec/gimp/0.99.7/plug-ins/sparkle
+libexec/gimp/0.99.7/plug-ins/spread
+libexec/gimp/0.99.7/plug-ins/tiff
+libexec/gimp/0.99.7/plug-ins/tile
+libexec/gimp/0.99.7/plug-ins/url
+libexec/gimp/0.99.7/plug-ins/video
+libexec/gimp/0.99.7/plug-ins/vinvert
+libexec/gimp/0.99.7/plug-ins/whirl
+libexec/gimp/0.99.7/plug-ins/xpm
+share/gimp/0.99.7/brushes/11circle.gbr
+share/gimp/0.99.7/brushes/11fcircle.gbr
+share/gimp/0.99.7/brushes/13circle.gbr
+share/gimp/0.99.7/brushes/13fcircle.gbr
+share/gimp/0.99.7/brushes/15circle.gbr
+share/gimp/0.99.7/brushes/15fcircle.gbr
+share/gimp/0.99.7/brushes/17circle.gbr
+share/gimp/0.99.7/brushes/17fcircle.gbr
+share/gimp/0.99.7/brushes/19circle.gbr
+share/gimp/0.99.7/brushes/19fcircle.gbr
+share/gimp/0.99.7/brushes/1circle.gbr
+share/gimp/0.99.7/brushes/3circle.gbr
+share/gimp/0.99.7/brushes/3fcircle.gbr
+share/gimp/0.99.7/brushes/5circle.gbr
+share/gimp/0.99.7/brushes/5fcircle.gbr
+share/gimp/0.99.7/brushes/7circle.gbr
+share/gimp/0.99.7/brushes/7fcircle.gbr
+share/gimp/0.99.7/brushes/9circle.gbr
+share/gimp/0.99.7/brushes/9fcircle.gbr
+share/gimp/0.99.7/brushes/airplane.gbr
+share/gimp/0.99.7/brushes/bird.gbr
+share/gimp/0.99.7/brushes/bush.gbr
+share/gimp/0.99.7/brushes/confetti.gbr
+share/gimp/0.99.7/brushes/cross_large.gbr
+share/gimp/0.99.7/brushes/cross_small.gbr
+share/gimp/0.99.7/brushes/diamond.gbr
+share/gimp/0.99.7/brushes/duck.gbr
+share/gimp/0.99.7/brushes/dunes.gbr
+share/gimp/0.99.7/brushes/elk.gbr
+share/gimp/0.99.7/brushes/flags.gbr
+share/gimp/0.99.7/brushes/flower.gbr
+share/gimp/0.99.7/brushes/flower_large.gbr
+share/gimp/0.99.7/brushes/galaxy.gbr
+share/gimp/0.99.7/brushes/galaxy_small.gbr
+share/gimp/0.99.7/brushes/gecko.gbr
+share/gimp/0.99.7/brushes/glyph.gbr
+share/gimp/0.99.7/brushes/guitar.gbr
+share/gimp/0.99.7/brushes/hash.gbr
+share/gimp/0.99.7/brushes/jack.gbr
+share/gimp/0.99.7/brushes/manta.gbr
+share/gimp/0.99.7/brushes/ribbon.gbr
+share/gimp/0.99.7/brushes/rings1.gbr
+share/gimp/0.99.7/brushes/rings2.gbr
+share/gimp/0.99.7/brushes/rings3.gbr
+share/gimp/0.99.7/brushes/rings4.gbr
+share/gimp/0.99.7/brushes/rings5.gbr
+share/gimp/0.99.7/brushes/rings6.gbr
+share/gimp/0.99.7/brushes/rings7.gbr
+share/gimp/0.99.7/brushes/sball.gbr
+share/gimp/0.99.7/brushes/slope.gbr
+share/gimp/0.99.7/brushes/snake.gbr
+share/gimp/0.99.7/brushes/snowflake.gbr
+share/gimp/0.99.7/brushes/sparkle.gbr
+share/gimp/0.99.7/brushes/sparkle2.gbr
+share/gimp/0.99.7/brushes/star_medium.gbr
+share/gimp/0.99.7/brushes/star_small.gbr
+share/gimp/0.99.7/brushes/therefore.gbr
+share/gimp/0.99.7/brushes/tictactoe.gbr
+share/gimp/0.99.7/brushes/tile.gbr
+share/gimp/0.99.7/brushes/triangle.gbr
+share/gimp/0.99.7/brushes/tulip.gbr
+share/gimp/0.99.7/brushes/xcf.gbr
+share/gimp/0.99.7/gimp_logo.ppm
+share/gimp/0.99.7/gimprc
+share/gimp/0.99.7/gradients/Default
+share/gimp/0.99.7/gradients/French_flag
+share/gimp/0.99.7/gradients/French_flag_smooth
+share/gimp/0.99.7/gradients/Full_saturation_spectrum_CCW
+share/gimp/0.99.7/gradients/Full_saturation_spectrum_CW
+share/gimp/0.99.7/gradients/German_flag
+share/gimp/0.99.7/gradients/German_flag_smooth
+share/gimp/0.99.7/gradients/Mexican_flag
+share/gimp/0.99.7/gradients/Mexican_flag_smooth
+share/gimp/0.99.7/palettes/Blues
+share/gimp/0.99.7/palettes/Browns_And_Yellows
+share/gimp/0.99.7/palettes/Cool_Colors
+share/gimp/0.99.7/palettes/Default
+share/gimp/0.99.7/palettes/Grays
+share/gimp/0.99.7/palettes/Greens
+share/gimp/0.99.7/palettes/Lights
+share/gimp/0.99.7/palettes/Muted
+share/gimp/0.99.7/palettes/Pastels
+share/gimp/0.99.7/palettes/Reds_And_Purples
+share/gimp/0.99.7/palettes/Warm_Colors
+share/gimp/0.99.7/patterns/3dgreen.pat
+share/gimp/0.99.7/patterns/amethyst.pat
+share/gimp/0.99.7/patterns/blue.pat
+share/gimp/0.99.7/patterns/chains.pat
+share/gimp/0.99.7/patterns/choc_swirl.pat
+share/gimp/0.99.7/patterns/clouds.pat
+share/gimp/0.99.7/patterns/clovers.pat
+share/gimp/0.99.7/patterns/dunes.pat
+share/gimp/0.99.7/patterns/electric.pat
+share/gimp/0.99.7/patterns/fibers.pat
+share/gimp/0.99.7/patterns/floor_tile.pat
+share/gimp/0.99.7/patterns/granite1.pat
+share/gimp/0.99.7/patterns/granite2.pat
+share/gimp/0.99.7/patterns/green_curtains.pat
+share/gimp/0.99.7/patterns/java.pat
+share/gimp/0.99.7/patterns/krinkle.pat
+share/gimp/0.99.7/patterns/leather.pat
+share/gimp/0.99.7/patterns/leaves.pat
+share/gimp/0.99.7/patterns/leopard.pat
+share/gimp/0.99.7/patterns/lumps.pat
+share/gimp/0.99.7/patterns/marble1.pat
+share/gimp/0.99.7/patterns/marble2.pat
+share/gimp/0.99.7/patterns/marble3.pat
+share/gimp/0.99.7/patterns/mhuerock.pat
+share/gimp/0.99.7/patterns/paper.pat
+share/gimp/0.99.7/patterns/parque1.pat
+share/gimp/0.99.7/patterns/parque2.pat
+share/gimp/0.99.7/patterns/parque3.pat
+share/gimp/0.99.7/patterns/pj.pat
+share/gimp/0.99.7/patterns/pool.pat
+share/gimp/0.99.7/patterns/sky.pat
+share/gimp/0.99.7/patterns/slate.pat
+share/gimp/0.99.7/patterns/sm_squares.pat
+share/gimp/0.99.7/patterns/terra.pat
+share/gimp/0.99.7/patterns/torrents.pat
+share/gimp/0.99.7/patterns/waves.pat
+share/gimp/0.99.7/patterns/wax.pat
+share/gimp/0.99.7/patterns/wood1.pat
+share/gimp/0.99.7/patterns/wood2.pat
+share/gimp/0.99.7/patterns/wood3.pat
+share/gimp/0.99.7/scripts/alien-glow.scm
+share/gimp/0.99.7/scripts/bds-logo-textured.scm
+share/gimp/0.99.7/scripts/beavis.jpg
+share/gimp/0.99.7/scripts/blend-logo.scm
+share/gimp/0.99.7/scripts/chrome-it.scm
+share/gimp/0.99.7/scripts/chrome.scm
+share/gimp/0.99.7/scripts/chrome2.scm
+share/gimp/0.99.7/scripts/crystal.scm
+share/gimp/0.99.7/scripts/ds-logo.scm
+share/gimp/0.99.7/scripts/frozen-text.scm
+share/gimp/0.99.7/scripts/glowing.scm
+share/gimp/0.99.7/scripts/hds-logo.scm
+share/gimp/0.99.7/scripts/neon.scm
+share/gimp/0.99.7/scripts/sphere.scm
+share/gimp/0.99.7/scripts/texture1.jpg
+share/gimp/0.99.7/scripts/texture2.jpg
+share/gimp/0.99.7/user_install
 @dirrm include/gdk
-@dirrm include/libgimp
+@dirrm include/glib
+@dirrm include/gtk
+@dirrm libexec/gimp/0.99.7/plug-ins
+@dirrm libexec/gimp/0.99.7
+@dirrm libexec/gimp
+@dirrm share/gimp/0.99.7/brushes
+@dirrm share/gimp/0.99.7/gradients
+@dirrm share/gimp/0.99.7/palettes
+@dirrm share/gimp/0.99.7/patterns
+@dirrm share/gimp/0.99.7/scripts
+@dirrm share/gimp/0.99.7
+@dirrm share/gimp
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 5674bde9cb60..a6a96948dec2 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    GIMP
-# Version required:     0.99.6
+# Version required:     0.99.7
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.5 1997/03/02 19:44:41 erich Exp $
+# $Id: Makefile,v 1.6 1997/03/27 21:41:12 erich Exp $
 #
 
-DISTNAME=       gimp-0.99.6
+DISTNAME=       gimp-0.99.7
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
 
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index 0abfb6441869..ecc8c7a5cd07 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1 +1 @@
-MD5 (gimp-0.99.6.tar.gz) = 03e45848f5e631b4ecab96fe2c4e897f
+MD5 (gimp-0.99.7.tar.gz) = ac10f6df1ff610943140994c7b6ee59f
diff --git a/graphics/gimp-devel/files/patch-aa b/graphics/gimp-devel/files/patch-aa
index 733e3e044551..9049a1722446 100644
--- a/graphics/gimp-devel/files/patch-aa
+++ b/graphics/gimp-devel/files/patch-aa
@@ -1,3 +1,9 @@
+****
+**** patches for the libtool in all the directories.
+**** These are mostly for linking against the freshly build
+**** libraraies rather than the installed ones.
+****
+
 --- /a/gimp-0.99.6/ltmain.sh	Wed Feb 26 03:39:50 1997
 +++ ltmain.sh	Wed Mar 12 20:20:40 1997
 @@ -334,7 +335,9 @@
@@ -37,214 +43,3 @@
  	;;
  
        -l*) deplibs="$deplibs $arg" ;;
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.am	Mon Mar 10 05:58:16 1997
-+++ gtk+/gtk/Makefile.am	Wed Mar 12 21:10:32 1997
-@@ -149,23 +149,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
-
- 
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.in	Mon Mar 10 07:13:59 1997
-+++ gtk+/gtk/Makefile.in	Wed Mar 12 21:09:50 1997
-@@ -198,23 +198,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- DEPS = \
- DEPS = \
---- /a/gimp-0.99.6/plug-ins/Makefile.am	Mon Mar 10 06:36:32 1997
-+++ plug-ins/Makefile.am	Wed Mar 12 21:49:12 1997
-@@ -43,9 +43,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/Makefile.in	Mon Mar 10 07:13:47 1997
-+++ plug-ins/Makefile.in	Wed Mar 12 21:48:51 1997
-@@ -89,9 +89,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.am	Mon Mar 10 06:36:21 1997
-+++ plug-ins/script-fu/Makefile.am	Wed Mar 12 21:52:31 1997
-@@ -29,9 +29,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.in	Mon Mar 10 07:13:48 1997
-+++ plug-ins/script-fu/Makefile.in	Wed Mar 12 21:52:47 1997
-@@ -76,9 +76,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/app/Makefile.am	Mon Mar 10 06:36:39 1997
-+++ app/Makefile.am	Wed Mar 12 21:58:49 1997
-@@ -267,21 +267,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/app/Makefile.in	Mon Mar 10 07:13:52 1997
-+++ app/Makefile.in	Wed Mar 12 21:59:15 1997
-@@ -314,21 +314,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/configure	Mon Mar 10 05:19:54 1997
-+++ configure	Wed Mar 12 22:09:11 1997
-@@ -617,7 +617,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- 
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
- 
- 
- PACKAGE=gimp
-@@ -2108,7 +2108,7 @@
- 
- 
- gimpdatadir=$datadir/$PACKAGE-$VERSION
--gimpplugindir=$libdir/$PACKAGE-$VERSION
-+gimpplugindir=$libexecdir/$PACKAGE-$VERSION
- 
- 
- 
---- gimprc.in~	Thu Mar 13 10:32:12 1997
-+++ gimprc.in	Thu Mar 13 10:32:25 1997
-@@ -68,7 +68,7 @@
- # causes the gimp to use more swap space and less memory.
- # Note: the gimp will still run even if `tile-cache-size' is
- # set to 0. The actual size can contain a suffix of 'm', 'M',
--* 'k', 'K', 'b' or 'B', which makes the gimp interpret the
-+# 'k', 'K', 'b' or 'B', which makes the gimp interpret the
- # size as being specified in megabytes, kilobytes and bytes
- # respectively. If no suffix is specified the size defaults to
- # being specified in kilobytes.
-@@ -90,7 +90,7 @@
- #  colors remaining after the allocation of the colorcube
- #  will be left to the system palette in an effort to reduce
- #  colormap "flashing".
--(color-cube 6 6 4)
-+(color-cube 6 6 4 24)
- 
- # Install a GIMP colormap by default -- only for 8-bit displays
- # (install-colormap)
diff --git a/graphics/gimp-devel/files/patch-ab b/graphics/gimp-devel/files/patch-ab
index 4eca93b6171e..27354846adb6 100644
--- a/graphics/gimp-devel/files/patch-ab
+++ b/graphics/gimp-devel/files/patch-ab
@@ -1,23 +1,8 @@
---- /a/gimp-0.99.6/gtk+/configure	Mon Mar 10 04:44:20 1997
-+++ gtk+/configure	Wed Mar 12 21:29:11 1997
-@@ -570,6 +570,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:574: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
---- /a/gimp-0.99.6/gtk+/glib/configure	Mon Mar 10 04:44:57 1997
-+++ gtk+/glib/configure	Wed Mar 12 21:29:39 1997
-@@ -560,6 +560,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:564: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+
+*****
+***** patches for plug-ins
+*****
+
 --- /a/gimp-0.99.6/plug-ins/url.c	Mon Mar 10 04:57:12 1997
 +++ plug-ins/url.c	Wed Mar 12 21:56:39 1997
 @@ -146,8 +146,8 @@
@@ -31,3 +16,14 @@
        _exit(127);
      }
    else
+--- plug-ins/nova.c~	Tue Apr  8 10:34:29 1997
++++ plug-ins/nova.c	Tue Apr  8 10:34:36 1997
+@@ -1010,7 +1010,7 @@
+ 	      l = sqrt( u*u + v*v );
+ 
+ 	      /* This algorithm is still under construction. */
+-	      c = (atan2(u,v)/(2*PI)+0.51) * pvals.nspoke;
++	      c = (atan2(u,v)/(2*M_PI)+0.51) * pvals.nspoke;
+ 	      i=(int)floor(c); c-=i; i%=pvals.nspoke;
+ 	      w1=spoke[i]*(1-c)+spoke[(i+1)%pvals.nspoke]*c;
+ 	      w1*=w1;
diff --git a/graphics/gimp-devel/files/patch-ac b/graphics/gimp-devel/files/patch-ac
index 31177deba379..f1efdf5f3839 100644
--- a/graphics/gimp-devel/files/patch-ac
+++ b/graphics/gimp-devel/files/patch-ac
@@ -1,88 +1,55 @@
---- plug-ins/script-fu/scripts/Makefile.in.orig	Sun Mar  2 05:54:56 1997
-+++ plug-ins/script-fu/scripts/Makefile.in	Sun Mar  2 08:00:11 1997
-@@ -50,7 +50,7 @@
+****
+**** patches for the various configure scripts
+****  1) force INSTALL=`/usr/bin/install -c'
+****     to fix some obsecure problem with firing
+****     ./configure via the ports mechanism
+****  2) put the plug-ins in libexec rather than lib
+****
+--- ./gtk+/glib/configure~	Fri Mar 28 12:03:26 1997
++++ ./gtk+/glib/configure	Tue Apr  8 08:06:14 1997
+@@ -560,6 +560,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:564: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./gtk+/configure~	Fri Mar 28 10:58:42 1997
++++ ./gtk+/configure	Tue Apr  8 08:05:57 1997
+@@ -568,6 +568,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:572: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./configure~	Mon Apr  7 17:42:41 1997
++++ ./configure	Tue Apr  8 08:07:58 1997
+@@ -567,6 +567,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:571: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+@@ -617,7 +618,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
+ 
+ 
+ PACKAGE=gimp
+@@ -2173,7 +2174,7 @@
+ 
+ 
+ gimpdatadir=$datadir/$PACKAGE/$VERSION
+-gimpplugindir=$libdir/$PACKAGE/$VERSION
++gimpplugindir=$libexecdir/$PACKAGE/$VERSION
  
- scriptdatadir = $(pkgdatadir)/scripts
  
--scriptdata_DATA = \
-+_scriptdata_DATA = \
- 	alien-glow.scm		\
- 	bds-logo-textured.scm	\
- 	blend-logo.scm		\
-@@ -76,6 +76,7 @@
  
- DIST_COMMON =  Makefile.am Makefile.in
- 
-+scriptdata_DATA = $(patsubst %.scm,%.sed,${_scriptdata_DATA})
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
- 	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
-@@ -83,7 +84,7 @@
- TAR = tar
- default: all
- 
--.SUFFIXES:
-+.SUFFIXES: .sed
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
- 	cd $(top_srcdir) && automake --gnu plug-ins/script-fu/scripts/Makefile
- 
-@@ -95,13 +96,15 @@
- install-scriptdataDATA: $(scriptdata_DATA)
- 	$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(scriptdatadir)
--	@list="$(scriptdata_DATA)"; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p; \
--	  else if test -f $$p; then \
--	    echo "$(INSTALL_DATA) $$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(scriptdatadir)/$$p; \
-+	@list="$(scriptdata_DATA)"; for s in $$list; do \
-+	  p=$$(basename $$s .sed); \
-+	  if [ $$p != $$s ]; then p=$$p.scm; fi; \
-+	  if test -f $(srcdir)/$$s; then \
-+	    echo "$(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p; \
-+	  else if test -f $$s; then \
-+	    echo "$(INSTALL_DATA) $$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $$s $(scriptdatadir)/$$p; \
- 	  fi; fi; \
- 	done
- 
-@@ -188,3 +191,7 @@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-+
-+
-+%.sed : %.scm
-+	sed 's,@_scriptdatadir_@,${scriptdatadir},' $< > $@
---- plug-ins/script-fu/scripts/chrome-it.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome-it.scm	Sun Mar  2 07:43:14 1997
-@@ -153,5 +153,5 @@
-     (gimp-displays-flush)
-     (gimp-image-enable-undo img)))
- 
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/chrome2.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome2.scm	Sun Mar  2 07:43:14 1997
-@@ -161,6 +161,6 @@
-     (gimp-image-enable-undo img)
-     (gimp-display-new img)))
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/crystal.scm.orig	Sun Mar  2 07:56:25 1997
-+++ plug-ins/script-fu/scripts/crystal.scm	Sun Mar  2 07:57:25 1997
-@@ -164,4 +164,4 @@
-     (gimp-display-new img)))
- 
- 
--(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"/usr/local/share/gimp/scripts/texture1.jpg\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"@_scriptdatadir_@/texture1.jpg\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index d51b454483e7..5e3dbf5fffef 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -1,4 +1,3 @@
-bin/gimp
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdkkeysyms.h
@@ -15,8 +14,9 @@ include/gtk/gtkarrow.h
 include/gtk/gtkbin.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
-include/gtk/gtkcanvas.h
 include/gtk/gtkcheckbutton.h
+include/gtk/gtkcheckmenuitem.h
+include/gtk/gtkcolorsel.h
 include/gtk/gtkcontainer.h
 include/gtk/gtkdata.h
 include/gtk/gtkdialog.h
@@ -24,7 +24,6 @@ include/gtk/gtkdrawingarea.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
 include/gtk/gtkfilesel.h
-include/gtk/gtkfill.h
 include/gtk/gtkframe.h
 include/gtk/gtkgc.h
 include/gtk/gtkhbox.h
@@ -51,6 +50,7 @@ include/gtk/gtkpixmap.h
 include/gtk/gtkpreview.h
 include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
+include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
 include/gtk/gtkrc.h
 include/gtk/gtkruler.h
@@ -63,6 +63,7 @@ include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktogglebutton.h
+include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
 include/gtk/gtktypeutils.h
@@ -74,15 +75,11 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-include/libgimp/gimp.h
-include/libgimp/gimpenums.h
-include/libgimp/gimpmenu.h
-include/libgimp/gimpui.h
-info/gdk.info
-info/gtk.info
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
+lib/libgck.so.0.0
+lib/libgdk.a
+lib/libgdk.la
+lib/libgdk.so
+lib/libgdk.so.1.0
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
@@ -95,181 +92,197 @@ lib/libglib.a
 lib/libglib.la
 lib/libglib.so
 lib/libglib.so.1.0
-libexec/gimp-0.99.6/plug-ins/blur
-libexec/gimp-0.99.6/plug-ins/bumpmap
-libexec/gimp-0.99.6/plug-ins/c_astretch
-libexec/gimp-0.99.6/plug-ins/cubism
-libexec/gimp-0.99.6/plug-ins/demo
-libexec/gimp-0.99.6/plug-ins/displace
-libexec/gimp-0.99.6/plug-ins/gauss_iir
-libexec/gimp-0.99.6/plug-ins/gauss_rle
-libexec/gimp-0.99.6/plug-ins/gif
-libexec/gimp-0.99.6/plug-ins/header
-libexec/gimp-0.99.6/plug-ins/jpeg
-libexec/gimp-0.99.6/plug-ins/mosaic
-libexec/gimp-0.99.6/plug-ins/noisify
-libexec/gimp-0.99.6/plug-ins/oilify
-libexec/gimp-0.99.6/plug-ins/pinch
-libexec/gimp-0.99.6/plug-ins/plasma
-libexec/gimp-0.99.6/plug-ins/pnm
-libexec/gimp-0.99.6/plug-ins/script-fu
-libexec/gimp-0.99.6/plug-ins/sparkle
-libexec/gimp-0.99.6/plug-ins/tiff
-libexec/gimp-0.99.6/plug-ins/tile
-libexec/gimp-0.99.6/plug-ins/url
-libexec/gimp-0.99.6/plug-ins/video
-libexec/gimp-0.99.6/plug-ins/whirl
-libexec/gimp-0.99.6/plug-ins/xpm
-share/gimp-0.99.6/brushes/11circle.gbr
-share/gimp-0.99.6/brushes/11fcircle.gbr
-share/gimp-0.99.6/brushes/13circle.gbr
-share/gimp-0.99.6/brushes/13fcircle.gbr
-share/gimp-0.99.6/brushes/15circle.gbr
-share/gimp-0.99.6/brushes/15fcircle.gbr
-share/gimp-0.99.6/brushes/17circle.gbr
-share/gimp-0.99.6/brushes/17fcircle.gbr
-share/gimp-0.99.6/brushes/19circle.gbr
-share/gimp-0.99.6/brushes/19fcircle.gbr
-share/gimp-0.99.6/brushes/1circle.gbr
-share/gimp-0.99.6/brushes/3circle.gbr
-share/gimp-0.99.6/brushes/3fcircle.gbr
-share/gimp-0.99.6/brushes/5circle.gbr
-share/gimp-0.99.6/brushes/5fcircle.gbr
-share/gimp-0.99.6/brushes/7circle.gbr
-share/gimp-0.99.6/brushes/7fcircle.gbr
-share/gimp-0.99.6/brushes/9circle.gbr
-share/gimp-0.99.6/brushes/9fcircle.gbr
-share/gimp-0.99.6/brushes/airplane.gbr
-share/gimp-0.99.6/brushes/bird.gbr
-share/gimp-0.99.6/brushes/bush.gbr
-share/gimp-0.99.6/brushes/confetti.gbr
-share/gimp-0.99.6/brushes/cross_large.gbr
-share/gimp-0.99.6/brushes/cross_small.gbr
-share/gimp-0.99.6/brushes/diamond.gbr
-share/gimp-0.99.6/brushes/duck.gbr
-share/gimp-0.99.6/brushes/dunes.gbr
-share/gimp-0.99.6/brushes/elk.gbr
-share/gimp-0.99.6/brushes/flags.gbr
-share/gimp-0.99.6/brushes/flower.gbr
-share/gimp-0.99.6/brushes/flower_large.gbr
-share/gimp-0.99.6/brushes/galaxy.gbr
-share/gimp-0.99.6/brushes/galaxy_small.gbr
-share/gimp-0.99.6/brushes/gecko.gbr
-share/gimp-0.99.6/brushes/glyph.gbr
-share/gimp-0.99.6/brushes/guitar.gbr
-share/gimp-0.99.6/brushes/hash.gbr
-share/gimp-0.99.6/brushes/jack.gbr
-share/gimp-0.99.6/brushes/manta.gbr
-share/gimp-0.99.6/brushes/ribbon.gbr
-share/gimp-0.99.6/brushes/rings1.gbr
-share/gimp-0.99.6/brushes/rings2.gbr
-share/gimp-0.99.6/brushes/rings3.gbr
-share/gimp-0.99.6/brushes/rings4.gbr
-share/gimp-0.99.6/brushes/rings5.gbr
-share/gimp-0.99.6/brushes/rings6.gbr
-share/gimp-0.99.6/brushes/rings7.gbr
-share/gimp-0.99.6/brushes/sball.gbr
-share/gimp-0.99.6/brushes/slope.gbr
-share/gimp-0.99.6/brushes/snake.gbr
-share/gimp-0.99.6/brushes/snowflake.gbr
-share/gimp-0.99.6/brushes/sparkle.gbr
-share/gimp-0.99.6/brushes/sparkle2.gbr
-share/gimp-0.99.6/brushes/star_medium.gbr
-share/gimp-0.99.6/brushes/star_small.gbr
-share/gimp-0.99.6/brushes/therefore.gbr
-share/gimp-0.99.6/brushes/tictactoe.gbr
-share/gimp-0.99.6/brushes/tile.gbr
-share/gimp-0.99.6/brushes/triangle.gbr
-share/gimp-0.99.6/brushes/tulip.gbr
-share/gimp-0.99.6/brushes/xcf.gbr
-share/gimp-0.99.6/gimp_logo.ppm
-share/gimp-0.99.6/gimprc
-share/gimp-0.99.6/gradients/Default
-share/gimp-0.99.6/gradients/French_flag
-share/gimp-0.99.6/gradients/French_flag_smooth
-share/gimp-0.99.6/gradients/Full_saturation_spectrum_CCW
-share/gimp-0.99.6/gradients/Full_saturation_spectrum_CW
-share/gimp-0.99.6/gradients/German_flag
-share/gimp-0.99.6/gradients/German_flag_smooth
-share/gimp-0.99.6/gradients/Mexican_flag
-share/gimp-0.99.6/gradients/Mexican_flag_smooth
-share/gimp-0.99.6/palettes/Blues
-share/gimp-0.99.6/palettes/Browns_And_Yellows
-share/gimp-0.99.6/palettes/Cool_Colors
-share/gimp-0.99.6/palettes/Default
-share/gimp-0.99.6/palettes/Grays
-share/gimp-0.99.6/palettes/Greens
-share/gimp-0.99.6/palettes/Lights
-share/gimp-0.99.6/palettes/Muted
-share/gimp-0.99.6/palettes/Pastels
-share/gimp-0.99.6/palettes/Reds_And_Purples
-share/gimp-0.99.6/palettes/Warm_Colors
-share/gimp-0.99.6/patterns/3dgreen.pat
-share/gimp-0.99.6/patterns/amethyst.pat
-share/gimp-0.99.6/patterns/blue.pat
-share/gimp-0.99.6/patterns/chains.pat
-share/gimp-0.99.6/patterns/choc_swirl.pat
-share/gimp-0.99.6/patterns/clouds.pat
-share/gimp-0.99.6/patterns/clovers.pat
-share/gimp-0.99.6/patterns/dunes.pat
-share/gimp-0.99.6/patterns/electric.pat
-share/gimp-0.99.6/patterns/fibers.pat
-share/gimp-0.99.6/patterns/floor_tile.pat
-share/gimp-0.99.6/patterns/granite1.pat
-share/gimp-0.99.6/patterns/granite2.pat
-share/gimp-0.99.6/patterns/green_curtains.pat
-share/gimp-0.99.6/patterns/java.pat
-share/gimp-0.99.6/patterns/krinkle.pat
-share/gimp-0.99.6/patterns/leather.pat
-share/gimp-0.99.6/patterns/leaves.pat
-share/gimp-0.99.6/patterns/leopard.pat
-share/gimp-0.99.6/patterns/lumps.pat
-share/gimp-0.99.6/patterns/marble1.pat
-share/gimp-0.99.6/patterns/marble2.pat
-share/gimp-0.99.6/patterns/marble3.pat
-share/gimp-0.99.6/patterns/mhuerock.pat
-share/gimp-0.99.6/patterns/paper.pat
-share/gimp-0.99.6/patterns/parque1.pat
-share/gimp-0.99.6/patterns/parque2.pat
-share/gimp-0.99.6/patterns/parque3.pat
-share/gimp-0.99.6/patterns/pj.pat
-share/gimp-0.99.6/patterns/pool.pat
-share/gimp-0.99.6/patterns/sky.pat
-share/gimp-0.99.6/patterns/slate.pat
-share/gimp-0.99.6/patterns/sm_squares.pat
-share/gimp-0.99.6/patterns/terra.pat
-share/gimp-0.99.6/patterns/torrents.pat
-share/gimp-0.99.6/patterns/waves.pat
-share/gimp-0.99.6/patterns/wax.pat
-share/gimp-0.99.6/patterns/wood1.pat
-share/gimp-0.99.6/patterns/wood2.pat
-share/gimp-0.99.6/patterns/wood3.pat
-share/gimp-0.99.6/scripts/alien-glow.scm
-share/gimp-0.99.6/scripts/bds-logo-textured.scm
-share/gimp-0.99.6/scripts/beavis.jpg
-share/gimp-0.99.6/scripts/blend-logo.scm
-share/gimp-0.99.6/scripts/chrome-it.scm
-share/gimp-0.99.6/scripts/chrome.scm
-share/gimp-0.99.6/scripts/chrome2.scm
-share/gimp-0.99.6/scripts/crystal.scm
-share/gimp-0.99.6/scripts/ds-logo.scm
-share/gimp-0.99.6/scripts/frozen-text.scm
-share/gimp-0.99.6/scripts/glowing.scm
-share/gimp-0.99.6/scripts/hds-logo.scm
-share/gimp-0.99.6/scripts/neon.scm
-share/gimp-0.99.6/scripts/sphere.scm
-share/gimp-0.99.6/scripts/texture1.jpg
-share/gimp-0.99.6/scripts/texture2.jpg
-share/gimp-0.99.6/user_install
-@dirrm share/gimp-0.99.6/scripts
-@dirrm share/gimp-0.99.6/patterns
-@dirrm share/gimp-0.99.6/palettes
-@dirrm share/gimp-0.99.6/gradients
-@dirrm share/gimp-0.99.6/brushes
-@dirrm share/gimp-0.99.6
-@dirrm libexec/gimp-0.99.6/plug-ins
-@dirrm libexec/gimp-0.99.6
-@dirrm include/gtk
-@dirrm include/glib
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so
+lib/libgtk.so.1.0
+libexec/gimp/0.99.7/plug-ins/blur
+libexec/gimp/0.99.7/plug-ins/bumpmap
+libexec/gimp/0.99.7/plug-ins/c_astretch
+libexec/gimp/0.99.7/plug-ins/checkerboard
+libexec/gimp/0.99.7/plug-ins/cubism
+libexec/gimp/0.99.7/plug-ins/demo
+libexec/gimp/0.99.7/plug-ins/displace
+libexec/gimp/0.99.7/plug-ins/emboss
+libexec/gimp/0.99.7/plug-ins/figures
+libexec/gimp/0.99.7/plug-ins/gauss_iir
+libexec/gimp/0.99.7/plug-ins/gauss_rle
+libexec/gimp/0.99.7/plug-ins/gif
+libexec/gimp/0.99.7/plug-ins/header
+libexec/gimp/0.99.7/plug-ins/jpeg
+libexec/gimp/0.99.7/plug-ins/laplace
+libexec/gimp/0.99.7/plug-ins/mosaic
+libexec/gimp/0.99.7/plug-ins/noisify
+libexec/gimp/0.99.7/plug-ins/normalize
+libexec/gimp/0.99.7/plug-ins/nova
+libexec/gimp/0.99.7/plug-ins/oilify
+libexec/gimp/0.99.7/plug-ins/pinch
+libexec/gimp/0.99.7/plug-ins/pixelize
+libexec/gimp/0.99.7/plug-ins/plasma
+libexec/gimp/0.99.7/plug-ins/pnm
+libexec/gimp/0.99.7/plug-ins/script-fu
+libexec/gimp/0.99.7/plug-ins/shift
+libexec/gimp/0.99.7/plug-ins/sobel
+libexec/gimp/0.99.7/plug-ins/sparkle
+libexec/gimp/0.99.7/plug-ins/spread
+libexec/gimp/0.99.7/plug-ins/tiff
+libexec/gimp/0.99.7/plug-ins/tile
+libexec/gimp/0.99.7/plug-ins/url
+libexec/gimp/0.99.7/plug-ins/video
+libexec/gimp/0.99.7/plug-ins/vinvert
+libexec/gimp/0.99.7/plug-ins/whirl
+libexec/gimp/0.99.7/plug-ins/xpm
+share/gimp/0.99.7/brushes/11circle.gbr
+share/gimp/0.99.7/brushes/11fcircle.gbr
+share/gimp/0.99.7/brushes/13circle.gbr
+share/gimp/0.99.7/brushes/13fcircle.gbr
+share/gimp/0.99.7/brushes/15circle.gbr
+share/gimp/0.99.7/brushes/15fcircle.gbr
+share/gimp/0.99.7/brushes/17circle.gbr
+share/gimp/0.99.7/brushes/17fcircle.gbr
+share/gimp/0.99.7/brushes/19circle.gbr
+share/gimp/0.99.7/brushes/19fcircle.gbr
+share/gimp/0.99.7/brushes/1circle.gbr
+share/gimp/0.99.7/brushes/3circle.gbr
+share/gimp/0.99.7/brushes/3fcircle.gbr
+share/gimp/0.99.7/brushes/5circle.gbr
+share/gimp/0.99.7/brushes/5fcircle.gbr
+share/gimp/0.99.7/brushes/7circle.gbr
+share/gimp/0.99.7/brushes/7fcircle.gbr
+share/gimp/0.99.7/brushes/9circle.gbr
+share/gimp/0.99.7/brushes/9fcircle.gbr
+share/gimp/0.99.7/brushes/airplane.gbr
+share/gimp/0.99.7/brushes/bird.gbr
+share/gimp/0.99.7/brushes/bush.gbr
+share/gimp/0.99.7/brushes/confetti.gbr
+share/gimp/0.99.7/brushes/cross_large.gbr
+share/gimp/0.99.7/brushes/cross_small.gbr
+share/gimp/0.99.7/brushes/diamond.gbr
+share/gimp/0.99.7/brushes/duck.gbr
+share/gimp/0.99.7/brushes/dunes.gbr
+share/gimp/0.99.7/brushes/elk.gbr
+share/gimp/0.99.7/brushes/flags.gbr
+share/gimp/0.99.7/brushes/flower.gbr
+share/gimp/0.99.7/brushes/flower_large.gbr
+share/gimp/0.99.7/brushes/galaxy.gbr
+share/gimp/0.99.7/brushes/galaxy_small.gbr
+share/gimp/0.99.7/brushes/gecko.gbr
+share/gimp/0.99.7/brushes/glyph.gbr
+share/gimp/0.99.7/brushes/guitar.gbr
+share/gimp/0.99.7/brushes/hash.gbr
+share/gimp/0.99.7/brushes/jack.gbr
+share/gimp/0.99.7/brushes/manta.gbr
+share/gimp/0.99.7/brushes/ribbon.gbr
+share/gimp/0.99.7/brushes/rings1.gbr
+share/gimp/0.99.7/brushes/rings2.gbr
+share/gimp/0.99.7/brushes/rings3.gbr
+share/gimp/0.99.7/brushes/rings4.gbr
+share/gimp/0.99.7/brushes/rings5.gbr
+share/gimp/0.99.7/brushes/rings6.gbr
+share/gimp/0.99.7/brushes/rings7.gbr
+share/gimp/0.99.7/brushes/sball.gbr
+share/gimp/0.99.7/brushes/slope.gbr
+share/gimp/0.99.7/brushes/snake.gbr
+share/gimp/0.99.7/brushes/snowflake.gbr
+share/gimp/0.99.7/brushes/sparkle.gbr
+share/gimp/0.99.7/brushes/sparkle2.gbr
+share/gimp/0.99.7/brushes/star_medium.gbr
+share/gimp/0.99.7/brushes/star_small.gbr
+share/gimp/0.99.7/brushes/therefore.gbr
+share/gimp/0.99.7/brushes/tictactoe.gbr
+share/gimp/0.99.7/brushes/tile.gbr
+share/gimp/0.99.7/brushes/triangle.gbr
+share/gimp/0.99.7/brushes/tulip.gbr
+share/gimp/0.99.7/brushes/xcf.gbr
+share/gimp/0.99.7/gimp_logo.ppm
+share/gimp/0.99.7/gimprc
+share/gimp/0.99.7/gradients/Default
+share/gimp/0.99.7/gradients/French_flag
+share/gimp/0.99.7/gradients/French_flag_smooth
+share/gimp/0.99.7/gradients/Full_saturation_spectrum_CCW
+share/gimp/0.99.7/gradients/Full_saturation_spectrum_CW
+share/gimp/0.99.7/gradients/German_flag
+share/gimp/0.99.7/gradients/German_flag_smooth
+share/gimp/0.99.7/gradients/Mexican_flag
+share/gimp/0.99.7/gradients/Mexican_flag_smooth
+share/gimp/0.99.7/palettes/Blues
+share/gimp/0.99.7/palettes/Browns_And_Yellows
+share/gimp/0.99.7/palettes/Cool_Colors
+share/gimp/0.99.7/palettes/Default
+share/gimp/0.99.7/palettes/Grays
+share/gimp/0.99.7/palettes/Greens
+share/gimp/0.99.7/palettes/Lights
+share/gimp/0.99.7/palettes/Muted
+share/gimp/0.99.7/palettes/Pastels
+share/gimp/0.99.7/palettes/Reds_And_Purples
+share/gimp/0.99.7/palettes/Warm_Colors
+share/gimp/0.99.7/patterns/3dgreen.pat
+share/gimp/0.99.7/patterns/amethyst.pat
+share/gimp/0.99.7/patterns/blue.pat
+share/gimp/0.99.7/patterns/chains.pat
+share/gimp/0.99.7/patterns/choc_swirl.pat
+share/gimp/0.99.7/patterns/clouds.pat
+share/gimp/0.99.7/patterns/clovers.pat
+share/gimp/0.99.7/patterns/dunes.pat
+share/gimp/0.99.7/patterns/electric.pat
+share/gimp/0.99.7/patterns/fibers.pat
+share/gimp/0.99.7/patterns/floor_tile.pat
+share/gimp/0.99.7/patterns/granite1.pat
+share/gimp/0.99.7/patterns/granite2.pat
+share/gimp/0.99.7/patterns/green_curtains.pat
+share/gimp/0.99.7/patterns/java.pat
+share/gimp/0.99.7/patterns/krinkle.pat
+share/gimp/0.99.7/patterns/leather.pat
+share/gimp/0.99.7/patterns/leaves.pat
+share/gimp/0.99.7/patterns/leopard.pat
+share/gimp/0.99.7/patterns/lumps.pat
+share/gimp/0.99.7/patterns/marble1.pat
+share/gimp/0.99.7/patterns/marble2.pat
+share/gimp/0.99.7/patterns/marble3.pat
+share/gimp/0.99.7/patterns/mhuerock.pat
+share/gimp/0.99.7/patterns/paper.pat
+share/gimp/0.99.7/patterns/parque1.pat
+share/gimp/0.99.7/patterns/parque2.pat
+share/gimp/0.99.7/patterns/parque3.pat
+share/gimp/0.99.7/patterns/pj.pat
+share/gimp/0.99.7/patterns/pool.pat
+share/gimp/0.99.7/patterns/sky.pat
+share/gimp/0.99.7/patterns/slate.pat
+share/gimp/0.99.7/patterns/sm_squares.pat
+share/gimp/0.99.7/patterns/terra.pat
+share/gimp/0.99.7/patterns/torrents.pat
+share/gimp/0.99.7/patterns/waves.pat
+share/gimp/0.99.7/patterns/wax.pat
+share/gimp/0.99.7/patterns/wood1.pat
+share/gimp/0.99.7/patterns/wood2.pat
+share/gimp/0.99.7/patterns/wood3.pat
+share/gimp/0.99.7/scripts/alien-glow.scm
+share/gimp/0.99.7/scripts/bds-logo-textured.scm
+share/gimp/0.99.7/scripts/beavis.jpg
+share/gimp/0.99.7/scripts/blend-logo.scm
+share/gimp/0.99.7/scripts/chrome-it.scm
+share/gimp/0.99.7/scripts/chrome.scm
+share/gimp/0.99.7/scripts/chrome2.scm
+share/gimp/0.99.7/scripts/crystal.scm
+share/gimp/0.99.7/scripts/ds-logo.scm
+share/gimp/0.99.7/scripts/frozen-text.scm
+share/gimp/0.99.7/scripts/glowing.scm
+share/gimp/0.99.7/scripts/hds-logo.scm
+share/gimp/0.99.7/scripts/neon.scm
+share/gimp/0.99.7/scripts/sphere.scm
+share/gimp/0.99.7/scripts/texture1.jpg
+share/gimp/0.99.7/scripts/texture2.jpg
+share/gimp/0.99.7/user_install
 @dirrm include/gdk
-@dirrm include/libgimp
+@dirrm include/glib
+@dirrm include/gtk
+@dirrm libexec/gimp/0.99.7/plug-ins
+@dirrm libexec/gimp/0.99.7
+@dirrm libexec/gimp
+@dirrm share/gimp/0.99.7/brushes
+@dirrm share/gimp/0.99.7/gradients
+@dirrm share/gimp/0.99.7/palettes
+@dirrm share/gimp/0.99.7/patterns
+@dirrm share/gimp/0.99.7/scripts
+@dirrm share/gimp/0.99.7
+@dirrm share/gimp
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 5674bde9cb60..a6a96948dec2 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    GIMP
-# Version required:     0.99.6
+# Version required:     0.99.7
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.5 1997/03/02 19:44:41 erich Exp $
+# $Id: Makefile,v 1.6 1997/03/27 21:41:12 erich Exp $
 #
 
-DISTNAME=       gimp-0.99.6
+DISTNAME=       gimp-0.99.7
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
 
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 0abfb6441869..ecc8c7a5cd07 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1 +1 @@
-MD5 (gimp-0.99.6.tar.gz) = 03e45848f5e631b4ecab96fe2c4e897f
+MD5 (gimp-0.99.7.tar.gz) = ac10f6df1ff610943140994c7b6ee59f
diff --git a/graphics/gimp/files/patch-aa b/graphics/gimp/files/patch-aa
index 733e3e044551..9049a1722446 100644
--- a/graphics/gimp/files/patch-aa
+++ b/graphics/gimp/files/patch-aa
@@ -1,3 +1,9 @@
+****
+**** patches for the libtool in all the directories.
+**** These are mostly for linking against the freshly build
+**** libraraies rather than the installed ones.
+****
+
 --- /a/gimp-0.99.6/ltmain.sh	Wed Feb 26 03:39:50 1997
 +++ ltmain.sh	Wed Mar 12 20:20:40 1997
 @@ -334,7 +335,9 @@
@@ -37,214 +43,3 @@
  	;;
  
        -l*) deplibs="$deplibs $arg" ;;
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.am	Mon Mar 10 05:58:16 1997
-+++ gtk+/gtk/Makefile.am	Wed Mar 12 21:10:32 1997
-@@ -149,23 +149,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
-
- 
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.in	Mon Mar 10 07:13:59 1997
-+++ gtk+/gtk/Makefile.in	Wed Mar 12 21:09:50 1997
-@@ -198,23 +198,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- DEPS = \
- DEPS = \
---- /a/gimp-0.99.6/plug-ins/Makefile.am	Mon Mar 10 06:36:32 1997
-+++ plug-ins/Makefile.am	Wed Mar 12 21:49:12 1997
-@@ -43,9 +43,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/Makefile.in	Mon Mar 10 07:13:47 1997
-+++ plug-ins/Makefile.in	Wed Mar 12 21:48:51 1997
-@@ -89,9 +89,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.am	Mon Mar 10 06:36:21 1997
-+++ plug-ins/script-fu/Makefile.am	Wed Mar 12 21:52:31 1997
-@@ -29,9 +29,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.in	Mon Mar 10 07:13:48 1997
-+++ plug-ins/script-fu/Makefile.in	Wed Mar 12 21:52:47 1997
-@@ -76,9 +76,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/app/Makefile.am	Mon Mar 10 06:36:39 1997
-+++ app/Makefile.am	Wed Mar 12 21:58:49 1997
-@@ -267,21 +267,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/app/Makefile.in	Mon Mar 10 07:13:52 1997
-+++ app/Makefile.in	Wed Mar 12 21:59:15 1997
-@@ -314,21 +314,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/configure	Mon Mar 10 05:19:54 1997
-+++ configure	Wed Mar 12 22:09:11 1997
-@@ -617,7 +617,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- 
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
- 
- 
- PACKAGE=gimp
-@@ -2108,7 +2108,7 @@
- 
- 
- gimpdatadir=$datadir/$PACKAGE-$VERSION
--gimpplugindir=$libdir/$PACKAGE-$VERSION
-+gimpplugindir=$libexecdir/$PACKAGE-$VERSION
- 
- 
- 
---- gimprc.in~	Thu Mar 13 10:32:12 1997
-+++ gimprc.in	Thu Mar 13 10:32:25 1997
-@@ -68,7 +68,7 @@
- # causes the gimp to use more swap space and less memory.
- # Note: the gimp will still run even if `tile-cache-size' is
- # set to 0. The actual size can contain a suffix of 'm', 'M',
--* 'k', 'K', 'b' or 'B', which makes the gimp interpret the
-+# 'k', 'K', 'b' or 'B', which makes the gimp interpret the
- # size as being specified in megabytes, kilobytes and bytes
- # respectively. If no suffix is specified the size defaults to
- # being specified in kilobytes.
-@@ -90,7 +90,7 @@
- #  colors remaining after the allocation of the colorcube
- #  will be left to the system palette in an effort to reduce
- #  colormap "flashing".
--(color-cube 6 6 4)
-+(color-cube 6 6 4 24)
- 
- # Install a GIMP colormap by default -- only for 8-bit displays
- # (install-colormap)
diff --git a/graphics/gimp/files/patch-ab b/graphics/gimp/files/patch-ab
index 4eca93b6171e..27354846adb6 100644
--- a/graphics/gimp/files/patch-ab
+++ b/graphics/gimp/files/patch-ab
@@ -1,23 +1,8 @@
---- /a/gimp-0.99.6/gtk+/configure	Mon Mar 10 04:44:20 1997
-+++ gtk+/configure	Wed Mar 12 21:29:11 1997
-@@ -570,6 +570,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:574: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
---- /a/gimp-0.99.6/gtk+/glib/configure	Mon Mar 10 04:44:57 1997
-+++ gtk+/glib/configure	Wed Mar 12 21:29:39 1997
-@@ -560,6 +560,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:564: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+
+*****
+***** patches for plug-ins
+*****
+
 --- /a/gimp-0.99.6/plug-ins/url.c	Mon Mar 10 04:57:12 1997
 +++ plug-ins/url.c	Wed Mar 12 21:56:39 1997
 @@ -146,8 +146,8 @@
@@ -31,3 +16,14 @@
        _exit(127);
      }
    else
+--- plug-ins/nova.c~	Tue Apr  8 10:34:29 1997
++++ plug-ins/nova.c	Tue Apr  8 10:34:36 1997
+@@ -1010,7 +1010,7 @@
+ 	      l = sqrt( u*u + v*v );
+ 
+ 	      /* This algorithm is still under construction. */
+-	      c = (atan2(u,v)/(2*PI)+0.51) * pvals.nspoke;
++	      c = (atan2(u,v)/(2*M_PI)+0.51) * pvals.nspoke;
+ 	      i=(int)floor(c); c-=i; i%=pvals.nspoke;
+ 	      w1=spoke[i]*(1-c)+spoke[(i+1)%pvals.nspoke]*c;
+ 	      w1*=w1;
diff --git a/graphics/gimp/files/patch-ac b/graphics/gimp/files/patch-ac
index 31177deba379..f1efdf5f3839 100644
--- a/graphics/gimp/files/patch-ac
+++ b/graphics/gimp/files/patch-ac
@@ -1,88 +1,55 @@
---- plug-ins/script-fu/scripts/Makefile.in.orig	Sun Mar  2 05:54:56 1997
-+++ plug-ins/script-fu/scripts/Makefile.in	Sun Mar  2 08:00:11 1997
-@@ -50,7 +50,7 @@
+****
+**** patches for the various configure scripts
+****  1) force INSTALL=`/usr/bin/install -c'
+****     to fix some obsecure problem with firing
+****     ./configure via the ports mechanism
+****  2) put the plug-ins in libexec rather than lib
+****
+--- ./gtk+/glib/configure~	Fri Mar 28 12:03:26 1997
++++ ./gtk+/glib/configure	Tue Apr  8 08:06:14 1997
+@@ -560,6 +560,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:564: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./gtk+/configure~	Fri Mar 28 10:58:42 1997
++++ ./gtk+/configure	Tue Apr  8 08:05:57 1997
+@@ -568,6 +568,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:572: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./configure~	Mon Apr  7 17:42:41 1997
++++ ./configure	Tue Apr  8 08:07:58 1997
+@@ -567,6 +567,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:571: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+@@ -617,7 +618,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
+ 
+ 
+ PACKAGE=gimp
+@@ -2173,7 +2174,7 @@
+ 
+ 
+ gimpdatadir=$datadir/$PACKAGE/$VERSION
+-gimpplugindir=$libdir/$PACKAGE/$VERSION
++gimpplugindir=$libexecdir/$PACKAGE/$VERSION
  
- scriptdatadir = $(pkgdatadir)/scripts
  
--scriptdata_DATA = \
-+_scriptdata_DATA = \
- 	alien-glow.scm		\
- 	bds-logo-textured.scm	\
- 	blend-logo.scm		\
-@@ -76,6 +76,7 @@
  
- DIST_COMMON =  Makefile.am Makefile.in
- 
-+scriptdata_DATA = $(patsubst %.scm,%.sed,${_scriptdata_DATA})
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
- 	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
-@@ -83,7 +84,7 @@
- TAR = tar
- default: all
- 
--.SUFFIXES:
-+.SUFFIXES: .sed
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
- 	cd $(top_srcdir) && automake --gnu plug-ins/script-fu/scripts/Makefile
- 
-@@ -95,13 +96,15 @@
- install-scriptdataDATA: $(scriptdata_DATA)
- 	$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(scriptdatadir)
--	@list="$(scriptdata_DATA)"; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p; \
--	  else if test -f $$p; then \
--	    echo "$(INSTALL_DATA) $$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(scriptdatadir)/$$p; \
-+	@list="$(scriptdata_DATA)"; for s in $$list; do \
-+	  p=$$(basename $$s .sed); \
-+	  if [ $$p != $$s ]; then p=$$p.scm; fi; \
-+	  if test -f $(srcdir)/$$s; then \
-+	    echo "$(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p; \
-+	  else if test -f $$s; then \
-+	    echo "$(INSTALL_DATA) $$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $$s $(scriptdatadir)/$$p; \
- 	  fi; fi; \
- 	done
- 
-@@ -188,3 +191,7 @@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-+
-+
-+%.sed : %.scm
-+	sed 's,@_scriptdatadir_@,${scriptdatadir},' $< > $@
---- plug-ins/script-fu/scripts/chrome-it.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome-it.scm	Sun Mar  2 07:43:14 1997
-@@ -153,5 +153,5 @@
-     (gimp-displays-flush)
-     (gimp-image-enable-undo img)))
- 
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/chrome2.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome2.scm	Sun Mar  2 07:43:14 1997
-@@ -161,6 +161,6 @@
-     (gimp-image-enable-undo img)
-     (gimp-display-new img)))
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/crystal.scm.orig	Sun Mar  2 07:56:25 1997
-+++ plug-ins/script-fu/scripts/crystal.scm	Sun Mar  2 07:57:25 1997
-@@ -164,4 +164,4 @@
-     (gimp-display-new img)))
- 
- 
--(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"/usr/local/share/gimp/scripts/texture1.jpg\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"@_scriptdatadir_@/texture1.jpg\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index d51b454483e7..5e3dbf5fffef 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -1,4 +1,3 @@
-bin/gimp
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdkkeysyms.h
@@ -15,8 +14,9 @@ include/gtk/gtkarrow.h
 include/gtk/gtkbin.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
-include/gtk/gtkcanvas.h
 include/gtk/gtkcheckbutton.h
+include/gtk/gtkcheckmenuitem.h
+include/gtk/gtkcolorsel.h
 include/gtk/gtkcontainer.h
 include/gtk/gtkdata.h
 include/gtk/gtkdialog.h
@@ -24,7 +24,6 @@ include/gtk/gtkdrawingarea.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
 include/gtk/gtkfilesel.h
-include/gtk/gtkfill.h
 include/gtk/gtkframe.h
 include/gtk/gtkgc.h
 include/gtk/gtkhbox.h
@@ -51,6 +50,7 @@ include/gtk/gtkpixmap.h
 include/gtk/gtkpreview.h
 include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
+include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
 include/gtk/gtkrc.h
 include/gtk/gtkruler.h
@@ -63,6 +63,7 @@ include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktogglebutton.h
+include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
 include/gtk/gtktypeutils.h
@@ -74,15 +75,11 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-include/libgimp/gimp.h
-include/libgimp/gimpenums.h
-include/libgimp/gimpmenu.h
-include/libgimp/gimpui.h
-info/gdk.info
-info/gtk.info
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
+lib/libgck.so.0.0
+lib/libgdk.a
+lib/libgdk.la
+lib/libgdk.so
+lib/libgdk.so.1.0
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
@@ -95,181 +92,197 @@ lib/libglib.a
 lib/libglib.la
 lib/libglib.so
 lib/libglib.so.1.0
-libexec/gimp-0.99.6/plug-ins/blur
-libexec/gimp-0.99.6/plug-ins/bumpmap
-libexec/gimp-0.99.6/plug-ins/c_astretch
-libexec/gimp-0.99.6/plug-ins/cubism
-libexec/gimp-0.99.6/plug-ins/demo
-libexec/gimp-0.99.6/plug-ins/displace
-libexec/gimp-0.99.6/plug-ins/gauss_iir
-libexec/gimp-0.99.6/plug-ins/gauss_rle
-libexec/gimp-0.99.6/plug-ins/gif
-libexec/gimp-0.99.6/plug-ins/header
-libexec/gimp-0.99.6/plug-ins/jpeg
-libexec/gimp-0.99.6/plug-ins/mosaic
-libexec/gimp-0.99.6/plug-ins/noisify
-libexec/gimp-0.99.6/plug-ins/oilify
-libexec/gimp-0.99.6/plug-ins/pinch
-libexec/gimp-0.99.6/plug-ins/plasma
-libexec/gimp-0.99.6/plug-ins/pnm
-libexec/gimp-0.99.6/plug-ins/script-fu
-libexec/gimp-0.99.6/plug-ins/sparkle
-libexec/gimp-0.99.6/plug-ins/tiff
-libexec/gimp-0.99.6/plug-ins/tile
-libexec/gimp-0.99.6/plug-ins/url
-libexec/gimp-0.99.6/plug-ins/video
-libexec/gimp-0.99.6/plug-ins/whirl
-libexec/gimp-0.99.6/plug-ins/xpm
-share/gimp-0.99.6/brushes/11circle.gbr
-share/gimp-0.99.6/brushes/11fcircle.gbr
-share/gimp-0.99.6/brushes/13circle.gbr
-share/gimp-0.99.6/brushes/13fcircle.gbr
-share/gimp-0.99.6/brushes/15circle.gbr
-share/gimp-0.99.6/brushes/15fcircle.gbr
-share/gimp-0.99.6/brushes/17circle.gbr
-share/gimp-0.99.6/brushes/17fcircle.gbr
-share/gimp-0.99.6/brushes/19circle.gbr
-share/gimp-0.99.6/brushes/19fcircle.gbr
-share/gimp-0.99.6/brushes/1circle.gbr
-share/gimp-0.99.6/brushes/3circle.gbr
-share/gimp-0.99.6/brushes/3fcircle.gbr
-share/gimp-0.99.6/brushes/5circle.gbr
-share/gimp-0.99.6/brushes/5fcircle.gbr
-share/gimp-0.99.6/brushes/7circle.gbr
-share/gimp-0.99.6/brushes/7fcircle.gbr
-share/gimp-0.99.6/brushes/9circle.gbr
-share/gimp-0.99.6/brushes/9fcircle.gbr
-share/gimp-0.99.6/brushes/airplane.gbr
-share/gimp-0.99.6/brushes/bird.gbr
-share/gimp-0.99.6/brushes/bush.gbr
-share/gimp-0.99.6/brushes/confetti.gbr
-share/gimp-0.99.6/brushes/cross_large.gbr
-share/gimp-0.99.6/brushes/cross_small.gbr
-share/gimp-0.99.6/brushes/diamond.gbr
-share/gimp-0.99.6/brushes/duck.gbr
-share/gimp-0.99.6/brushes/dunes.gbr
-share/gimp-0.99.6/brushes/elk.gbr
-share/gimp-0.99.6/brushes/flags.gbr
-share/gimp-0.99.6/brushes/flower.gbr
-share/gimp-0.99.6/brushes/flower_large.gbr
-share/gimp-0.99.6/brushes/galaxy.gbr
-share/gimp-0.99.6/brushes/galaxy_small.gbr
-share/gimp-0.99.6/brushes/gecko.gbr
-share/gimp-0.99.6/brushes/glyph.gbr
-share/gimp-0.99.6/brushes/guitar.gbr
-share/gimp-0.99.6/brushes/hash.gbr
-share/gimp-0.99.6/brushes/jack.gbr
-share/gimp-0.99.6/brushes/manta.gbr
-share/gimp-0.99.6/brushes/ribbon.gbr
-share/gimp-0.99.6/brushes/rings1.gbr
-share/gimp-0.99.6/brushes/rings2.gbr
-share/gimp-0.99.6/brushes/rings3.gbr
-share/gimp-0.99.6/brushes/rings4.gbr
-share/gimp-0.99.6/brushes/rings5.gbr
-share/gimp-0.99.6/brushes/rings6.gbr
-share/gimp-0.99.6/brushes/rings7.gbr
-share/gimp-0.99.6/brushes/sball.gbr
-share/gimp-0.99.6/brushes/slope.gbr
-share/gimp-0.99.6/brushes/snake.gbr
-share/gimp-0.99.6/brushes/snowflake.gbr
-share/gimp-0.99.6/brushes/sparkle.gbr
-share/gimp-0.99.6/brushes/sparkle2.gbr
-share/gimp-0.99.6/brushes/star_medium.gbr
-share/gimp-0.99.6/brushes/star_small.gbr
-share/gimp-0.99.6/brushes/therefore.gbr
-share/gimp-0.99.6/brushes/tictactoe.gbr
-share/gimp-0.99.6/brushes/tile.gbr
-share/gimp-0.99.6/brushes/triangle.gbr
-share/gimp-0.99.6/brushes/tulip.gbr
-share/gimp-0.99.6/brushes/xcf.gbr
-share/gimp-0.99.6/gimp_logo.ppm
-share/gimp-0.99.6/gimprc
-share/gimp-0.99.6/gradients/Default
-share/gimp-0.99.6/gradients/French_flag
-share/gimp-0.99.6/gradients/French_flag_smooth
-share/gimp-0.99.6/gradients/Full_saturation_spectrum_CCW
-share/gimp-0.99.6/gradients/Full_saturation_spectrum_CW
-share/gimp-0.99.6/gradients/German_flag
-share/gimp-0.99.6/gradients/German_flag_smooth
-share/gimp-0.99.6/gradients/Mexican_flag
-share/gimp-0.99.6/gradients/Mexican_flag_smooth
-share/gimp-0.99.6/palettes/Blues
-share/gimp-0.99.6/palettes/Browns_And_Yellows
-share/gimp-0.99.6/palettes/Cool_Colors
-share/gimp-0.99.6/palettes/Default
-share/gimp-0.99.6/palettes/Grays
-share/gimp-0.99.6/palettes/Greens
-share/gimp-0.99.6/palettes/Lights
-share/gimp-0.99.6/palettes/Muted
-share/gimp-0.99.6/palettes/Pastels
-share/gimp-0.99.6/palettes/Reds_And_Purples
-share/gimp-0.99.6/palettes/Warm_Colors
-share/gimp-0.99.6/patterns/3dgreen.pat
-share/gimp-0.99.6/patterns/amethyst.pat
-share/gimp-0.99.6/patterns/blue.pat
-share/gimp-0.99.6/patterns/chains.pat
-share/gimp-0.99.6/patterns/choc_swirl.pat
-share/gimp-0.99.6/patterns/clouds.pat
-share/gimp-0.99.6/patterns/clovers.pat
-share/gimp-0.99.6/patterns/dunes.pat
-share/gimp-0.99.6/patterns/electric.pat
-share/gimp-0.99.6/patterns/fibers.pat
-share/gimp-0.99.6/patterns/floor_tile.pat
-share/gimp-0.99.6/patterns/granite1.pat
-share/gimp-0.99.6/patterns/granite2.pat
-share/gimp-0.99.6/patterns/green_curtains.pat
-share/gimp-0.99.6/patterns/java.pat
-share/gimp-0.99.6/patterns/krinkle.pat
-share/gimp-0.99.6/patterns/leather.pat
-share/gimp-0.99.6/patterns/leaves.pat
-share/gimp-0.99.6/patterns/leopard.pat
-share/gimp-0.99.6/patterns/lumps.pat
-share/gimp-0.99.6/patterns/marble1.pat
-share/gimp-0.99.6/patterns/marble2.pat
-share/gimp-0.99.6/patterns/marble3.pat
-share/gimp-0.99.6/patterns/mhuerock.pat
-share/gimp-0.99.6/patterns/paper.pat
-share/gimp-0.99.6/patterns/parque1.pat
-share/gimp-0.99.6/patterns/parque2.pat
-share/gimp-0.99.6/patterns/parque3.pat
-share/gimp-0.99.6/patterns/pj.pat
-share/gimp-0.99.6/patterns/pool.pat
-share/gimp-0.99.6/patterns/sky.pat
-share/gimp-0.99.6/patterns/slate.pat
-share/gimp-0.99.6/patterns/sm_squares.pat
-share/gimp-0.99.6/patterns/terra.pat
-share/gimp-0.99.6/patterns/torrents.pat
-share/gimp-0.99.6/patterns/waves.pat
-share/gimp-0.99.6/patterns/wax.pat
-share/gimp-0.99.6/patterns/wood1.pat
-share/gimp-0.99.6/patterns/wood2.pat
-share/gimp-0.99.6/patterns/wood3.pat
-share/gimp-0.99.6/scripts/alien-glow.scm
-share/gimp-0.99.6/scripts/bds-logo-textured.scm
-share/gimp-0.99.6/scripts/beavis.jpg
-share/gimp-0.99.6/scripts/blend-logo.scm
-share/gimp-0.99.6/scripts/chrome-it.scm
-share/gimp-0.99.6/scripts/chrome.scm
-share/gimp-0.99.6/scripts/chrome2.scm
-share/gimp-0.99.6/scripts/crystal.scm
-share/gimp-0.99.6/scripts/ds-logo.scm
-share/gimp-0.99.6/scripts/frozen-text.scm
-share/gimp-0.99.6/scripts/glowing.scm
-share/gimp-0.99.6/scripts/hds-logo.scm
-share/gimp-0.99.6/scripts/neon.scm
-share/gimp-0.99.6/scripts/sphere.scm
-share/gimp-0.99.6/scripts/texture1.jpg
-share/gimp-0.99.6/scripts/texture2.jpg
-share/gimp-0.99.6/user_install
-@dirrm share/gimp-0.99.6/scripts
-@dirrm share/gimp-0.99.6/patterns
-@dirrm share/gimp-0.99.6/palettes
-@dirrm share/gimp-0.99.6/gradients
-@dirrm share/gimp-0.99.6/brushes
-@dirrm share/gimp-0.99.6
-@dirrm libexec/gimp-0.99.6/plug-ins
-@dirrm libexec/gimp-0.99.6
-@dirrm include/gtk
-@dirrm include/glib
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so
+lib/libgtk.so.1.0
+libexec/gimp/0.99.7/plug-ins/blur
+libexec/gimp/0.99.7/plug-ins/bumpmap
+libexec/gimp/0.99.7/plug-ins/c_astretch
+libexec/gimp/0.99.7/plug-ins/checkerboard
+libexec/gimp/0.99.7/plug-ins/cubism
+libexec/gimp/0.99.7/plug-ins/demo
+libexec/gimp/0.99.7/plug-ins/displace
+libexec/gimp/0.99.7/plug-ins/emboss
+libexec/gimp/0.99.7/plug-ins/figures
+libexec/gimp/0.99.7/plug-ins/gauss_iir
+libexec/gimp/0.99.7/plug-ins/gauss_rle
+libexec/gimp/0.99.7/plug-ins/gif
+libexec/gimp/0.99.7/plug-ins/header
+libexec/gimp/0.99.7/plug-ins/jpeg
+libexec/gimp/0.99.7/plug-ins/laplace
+libexec/gimp/0.99.7/plug-ins/mosaic
+libexec/gimp/0.99.7/plug-ins/noisify
+libexec/gimp/0.99.7/plug-ins/normalize
+libexec/gimp/0.99.7/plug-ins/nova
+libexec/gimp/0.99.7/plug-ins/oilify
+libexec/gimp/0.99.7/plug-ins/pinch
+libexec/gimp/0.99.7/plug-ins/pixelize
+libexec/gimp/0.99.7/plug-ins/plasma
+libexec/gimp/0.99.7/plug-ins/pnm
+libexec/gimp/0.99.7/plug-ins/script-fu
+libexec/gimp/0.99.7/plug-ins/shift
+libexec/gimp/0.99.7/plug-ins/sobel
+libexec/gimp/0.99.7/plug-ins/sparkle
+libexec/gimp/0.99.7/plug-ins/spread
+libexec/gimp/0.99.7/plug-ins/tiff
+libexec/gimp/0.99.7/plug-ins/tile
+libexec/gimp/0.99.7/plug-ins/url
+libexec/gimp/0.99.7/plug-ins/video
+libexec/gimp/0.99.7/plug-ins/vinvert
+libexec/gimp/0.99.7/plug-ins/whirl
+libexec/gimp/0.99.7/plug-ins/xpm
+share/gimp/0.99.7/brushes/11circle.gbr
+share/gimp/0.99.7/brushes/11fcircle.gbr
+share/gimp/0.99.7/brushes/13circle.gbr
+share/gimp/0.99.7/brushes/13fcircle.gbr
+share/gimp/0.99.7/brushes/15circle.gbr
+share/gimp/0.99.7/brushes/15fcircle.gbr
+share/gimp/0.99.7/brushes/17circle.gbr
+share/gimp/0.99.7/brushes/17fcircle.gbr
+share/gimp/0.99.7/brushes/19circle.gbr
+share/gimp/0.99.7/brushes/19fcircle.gbr
+share/gimp/0.99.7/brushes/1circle.gbr
+share/gimp/0.99.7/brushes/3circle.gbr
+share/gimp/0.99.7/brushes/3fcircle.gbr
+share/gimp/0.99.7/brushes/5circle.gbr
+share/gimp/0.99.7/brushes/5fcircle.gbr
+share/gimp/0.99.7/brushes/7circle.gbr
+share/gimp/0.99.7/brushes/7fcircle.gbr
+share/gimp/0.99.7/brushes/9circle.gbr
+share/gimp/0.99.7/brushes/9fcircle.gbr
+share/gimp/0.99.7/brushes/airplane.gbr
+share/gimp/0.99.7/brushes/bird.gbr
+share/gimp/0.99.7/brushes/bush.gbr
+share/gimp/0.99.7/brushes/confetti.gbr
+share/gimp/0.99.7/brushes/cross_large.gbr
+share/gimp/0.99.7/brushes/cross_small.gbr
+share/gimp/0.99.7/brushes/diamond.gbr
+share/gimp/0.99.7/brushes/duck.gbr
+share/gimp/0.99.7/brushes/dunes.gbr
+share/gimp/0.99.7/brushes/elk.gbr
+share/gimp/0.99.7/brushes/flags.gbr
+share/gimp/0.99.7/brushes/flower.gbr
+share/gimp/0.99.7/brushes/flower_large.gbr
+share/gimp/0.99.7/brushes/galaxy.gbr
+share/gimp/0.99.7/brushes/galaxy_small.gbr
+share/gimp/0.99.7/brushes/gecko.gbr
+share/gimp/0.99.7/brushes/glyph.gbr
+share/gimp/0.99.7/brushes/guitar.gbr
+share/gimp/0.99.7/brushes/hash.gbr
+share/gimp/0.99.7/brushes/jack.gbr
+share/gimp/0.99.7/brushes/manta.gbr
+share/gimp/0.99.7/brushes/ribbon.gbr
+share/gimp/0.99.7/brushes/rings1.gbr
+share/gimp/0.99.7/brushes/rings2.gbr
+share/gimp/0.99.7/brushes/rings3.gbr
+share/gimp/0.99.7/brushes/rings4.gbr
+share/gimp/0.99.7/brushes/rings5.gbr
+share/gimp/0.99.7/brushes/rings6.gbr
+share/gimp/0.99.7/brushes/rings7.gbr
+share/gimp/0.99.7/brushes/sball.gbr
+share/gimp/0.99.7/brushes/slope.gbr
+share/gimp/0.99.7/brushes/snake.gbr
+share/gimp/0.99.7/brushes/snowflake.gbr
+share/gimp/0.99.7/brushes/sparkle.gbr
+share/gimp/0.99.7/brushes/sparkle2.gbr
+share/gimp/0.99.7/brushes/star_medium.gbr
+share/gimp/0.99.7/brushes/star_small.gbr
+share/gimp/0.99.7/brushes/therefore.gbr
+share/gimp/0.99.7/brushes/tictactoe.gbr
+share/gimp/0.99.7/brushes/tile.gbr
+share/gimp/0.99.7/brushes/triangle.gbr
+share/gimp/0.99.7/brushes/tulip.gbr
+share/gimp/0.99.7/brushes/xcf.gbr
+share/gimp/0.99.7/gimp_logo.ppm
+share/gimp/0.99.7/gimprc
+share/gimp/0.99.7/gradients/Default
+share/gimp/0.99.7/gradients/French_flag
+share/gimp/0.99.7/gradients/French_flag_smooth
+share/gimp/0.99.7/gradients/Full_saturation_spectrum_CCW
+share/gimp/0.99.7/gradients/Full_saturation_spectrum_CW
+share/gimp/0.99.7/gradients/German_flag
+share/gimp/0.99.7/gradients/German_flag_smooth
+share/gimp/0.99.7/gradients/Mexican_flag
+share/gimp/0.99.7/gradients/Mexican_flag_smooth
+share/gimp/0.99.7/palettes/Blues
+share/gimp/0.99.7/palettes/Browns_And_Yellows
+share/gimp/0.99.7/palettes/Cool_Colors
+share/gimp/0.99.7/palettes/Default
+share/gimp/0.99.7/palettes/Grays
+share/gimp/0.99.7/palettes/Greens
+share/gimp/0.99.7/palettes/Lights
+share/gimp/0.99.7/palettes/Muted
+share/gimp/0.99.7/palettes/Pastels
+share/gimp/0.99.7/palettes/Reds_And_Purples
+share/gimp/0.99.7/palettes/Warm_Colors
+share/gimp/0.99.7/patterns/3dgreen.pat
+share/gimp/0.99.7/patterns/amethyst.pat
+share/gimp/0.99.7/patterns/blue.pat
+share/gimp/0.99.7/patterns/chains.pat
+share/gimp/0.99.7/patterns/choc_swirl.pat
+share/gimp/0.99.7/patterns/clouds.pat
+share/gimp/0.99.7/patterns/clovers.pat
+share/gimp/0.99.7/patterns/dunes.pat
+share/gimp/0.99.7/patterns/electric.pat
+share/gimp/0.99.7/patterns/fibers.pat
+share/gimp/0.99.7/patterns/floor_tile.pat
+share/gimp/0.99.7/patterns/granite1.pat
+share/gimp/0.99.7/patterns/granite2.pat
+share/gimp/0.99.7/patterns/green_curtains.pat
+share/gimp/0.99.7/patterns/java.pat
+share/gimp/0.99.7/patterns/krinkle.pat
+share/gimp/0.99.7/patterns/leather.pat
+share/gimp/0.99.7/patterns/leaves.pat
+share/gimp/0.99.7/patterns/leopard.pat
+share/gimp/0.99.7/patterns/lumps.pat
+share/gimp/0.99.7/patterns/marble1.pat
+share/gimp/0.99.7/patterns/marble2.pat
+share/gimp/0.99.7/patterns/marble3.pat
+share/gimp/0.99.7/patterns/mhuerock.pat
+share/gimp/0.99.7/patterns/paper.pat
+share/gimp/0.99.7/patterns/parque1.pat
+share/gimp/0.99.7/patterns/parque2.pat
+share/gimp/0.99.7/patterns/parque3.pat
+share/gimp/0.99.7/patterns/pj.pat
+share/gimp/0.99.7/patterns/pool.pat
+share/gimp/0.99.7/patterns/sky.pat
+share/gimp/0.99.7/patterns/slate.pat
+share/gimp/0.99.7/patterns/sm_squares.pat
+share/gimp/0.99.7/patterns/terra.pat
+share/gimp/0.99.7/patterns/torrents.pat
+share/gimp/0.99.7/patterns/waves.pat
+share/gimp/0.99.7/patterns/wax.pat
+share/gimp/0.99.7/patterns/wood1.pat
+share/gimp/0.99.7/patterns/wood2.pat
+share/gimp/0.99.7/patterns/wood3.pat
+share/gimp/0.99.7/scripts/alien-glow.scm
+share/gimp/0.99.7/scripts/bds-logo-textured.scm
+share/gimp/0.99.7/scripts/beavis.jpg
+share/gimp/0.99.7/scripts/blend-logo.scm
+share/gimp/0.99.7/scripts/chrome-it.scm
+share/gimp/0.99.7/scripts/chrome.scm
+share/gimp/0.99.7/scripts/chrome2.scm
+share/gimp/0.99.7/scripts/crystal.scm
+share/gimp/0.99.7/scripts/ds-logo.scm
+share/gimp/0.99.7/scripts/frozen-text.scm
+share/gimp/0.99.7/scripts/glowing.scm
+share/gimp/0.99.7/scripts/hds-logo.scm
+share/gimp/0.99.7/scripts/neon.scm
+share/gimp/0.99.7/scripts/sphere.scm
+share/gimp/0.99.7/scripts/texture1.jpg
+share/gimp/0.99.7/scripts/texture2.jpg
+share/gimp/0.99.7/user_install
 @dirrm include/gdk
-@dirrm include/libgimp
+@dirrm include/glib
+@dirrm include/gtk
+@dirrm libexec/gimp/0.99.7/plug-ins
+@dirrm libexec/gimp/0.99.7
+@dirrm libexec/gimp
+@dirrm share/gimp/0.99.7/brushes
+@dirrm share/gimp/0.99.7/gradients
+@dirrm share/gimp/0.99.7/palettes
+@dirrm share/gimp/0.99.7/patterns
+@dirrm share/gimp/0.99.7/scripts
+@dirrm share/gimp/0.99.7
+@dirrm share/gimp
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 5674bde9cb60..a6a96948dec2 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    GIMP
-# Version required:     0.99.6
+# Version required:     0.99.7
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.5 1997/03/02 19:44:41 erich Exp $
+# $Id: Makefile,v 1.6 1997/03/27 21:41:12 erich Exp $
 #
 
-DISTNAME=       gimp-0.99.6
+DISTNAME=       gimp-0.99.7
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
 
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index 0abfb6441869..ecc8c7a5cd07 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1 +1 @@
-MD5 (gimp-0.99.6.tar.gz) = 03e45848f5e631b4ecab96fe2c4e897f
+MD5 (gimp-0.99.7.tar.gz) = ac10f6df1ff610943140994c7b6ee59f
diff --git a/graphics/gimp1/files/patch-aa b/graphics/gimp1/files/patch-aa
index 733e3e044551..9049a1722446 100644
--- a/graphics/gimp1/files/patch-aa
+++ b/graphics/gimp1/files/patch-aa
@@ -1,3 +1,9 @@
+****
+**** patches for the libtool in all the directories.
+**** These are mostly for linking against the freshly build
+**** libraraies rather than the installed ones.
+****
+
 --- /a/gimp-0.99.6/ltmain.sh	Wed Feb 26 03:39:50 1997
 +++ ltmain.sh	Wed Mar 12 20:20:40 1997
 @@ -334,7 +335,9 @@
@@ -37,214 +43,3 @@
  	;;
  
        -l*) deplibs="$deplibs $arg" ;;
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.am	Mon Mar 10 05:58:16 1997
-+++ gtk+/gtk/Makefile.am	Wed Mar 12 21:10:32 1997
-@@ -149,23 +149,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
-
- 
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.in	Mon Mar 10 07:13:59 1997
-+++ gtk+/gtk/Makefile.in	Wed Mar 12 21:09:50 1997
-@@ -198,23 +198,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- DEPS = \
- DEPS = \
---- /a/gimp-0.99.6/plug-ins/Makefile.am	Mon Mar 10 06:36:32 1997
-+++ plug-ins/Makefile.am	Wed Mar 12 21:49:12 1997
-@@ -43,9 +43,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/Makefile.in	Mon Mar 10 07:13:47 1997
-+++ plug-ins/Makefile.in	Wed Mar 12 21:48:51 1997
-@@ -89,9 +89,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.am	Mon Mar 10 06:36:21 1997
-+++ plug-ins/script-fu/Makefile.am	Wed Mar 12 21:52:31 1997
-@@ -29,9 +29,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.in	Mon Mar 10 07:13:48 1997
-+++ plug-ins/script-fu/Makefile.in	Wed Mar 12 21:52:47 1997
-@@ -76,9 +76,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/app/Makefile.am	Mon Mar 10 06:36:39 1997
-+++ app/Makefile.am	Wed Mar 12 21:58:49 1997
-@@ -267,21 +267,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/app/Makefile.in	Mon Mar 10 07:13:52 1997
-+++ app/Makefile.in	Wed Mar 12 21:59:15 1997
-@@ -314,21 +314,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/configure	Mon Mar 10 05:19:54 1997
-+++ configure	Wed Mar 12 22:09:11 1997
-@@ -617,7 +617,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- 
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
- 
- 
- PACKAGE=gimp
-@@ -2108,7 +2108,7 @@
- 
- 
- gimpdatadir=$datadir/$PACKAGE-$VERSION
--gimpplugindir=$libdir/$PACKAGE-$VERSION
-+gimpplugindir=$libexecdir/$PACKAGE-$VERSION
- 
- 
- 
---- gimprc.in~	Thu Mar 13 10:32:12 1997
-+++ gimprc.in	Thu Mar 13 10:32:25 1997
-@@ -68,7 +68,7 @@
- # causes the gimp to use more swap space and less memory.
- # Note: the gimp will still run even if `tile-cache-size' is
- # set to 0. The actual size can contain a suffix of 'm', 'M',
--* 'k', 'K', 'b' or 'B', which makes the gimp interpret the
-+# 'k', 'K', 'b' or 'B', which makes the gimp interpret the
- # size as being specified in megabytes, kilobytes and bytes
- # respectively. If no suffix is specified the size defaults to
- # being specified in kilobytes.
-@@ -90,7 +90,7 @@
- #  colors remaining after the allocation of the colorcube
- #  will be left to the system palette in an effort to reduce
- #  colormap "flashing".
--(color-cube 6 6 4)
-+(color-cube 6 6 4 24)
- 
- # Install a GIMP colormap by default -- only for 8-bit displays
- # (install-colormap)
diff --git a/graphics/gimp1/files/patch-ab b/graphics/gimp1/files/patch-ab
index 4eca93b6171e..27354846adb6 100644
--- a/graphics/gimp1/files/patch-ab
+++ b/graphics/gimp1/files/patch-ab
@@ -1,23 +1,8 @@
---- /a/gimp-0.99.6/gtk+/configure	Mon Mar 10 04:44:20 1997
-+++ gtk+/configure	Wed Mar 12 21:29:11 1997
-@@ -570,6 +570,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:574: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
---- /a/gimp-0.99.6/gtk+/glib/configure	Mon Mar 10 04:44:57 1997
-+++ gtk+/glib/configure	Wed Mar 12 21:29:39 1997
-@@ -560,6 +560,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:564: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+
+*****
+***** patches for plug-ins
+*****
+
 --- /a/gimp-0.99.6/plug-ins/url.c	Mon Mar 10 04:57:12 1997
 +++ plug-ins/url.c	Wed Mar 12 21:56:39 1997
 @@ -146,8 +146,8 @@
@@ -31,3 +16,14 @@
        _exit(127);
      }
    else
+--- plug-ins/nova.c~	Tue Apr  8 10:34:29 1997
++++ plug-ins/nova.c	Tue Apr  8 10:34:36 1997
+@@ -1010,7 +1010,7 @@
+ 	      l = sqrt( u*u + v*v );
+ 
+ 	      /* This algorithm is still under construction. */
+-	      c = (atan2(u,v)/(2*PI)+0.51) * pvals.nspoke;
++	      c = (atan2(u,v)/(2*M_PI)+0.51) * pvals.nspoke;
+ 	      i=(int)floor(c); c-=i; i%=pvals.nspoke;
+ 	      w1=spoke[i]*(1-c)+spoke[(i+1)%pvals.nspoke]*c;
+ 	      w1*=w1;
diff --git a/graphics/gimp1/files/patch-ac b/graphics/gimp1/files/patch-ac
index 31177deba379..f1efdf5f3839 100644
--- a/graphics/gimp1/files/patch-ac
+++ b/graphics/gimp1/files/patch-ac
@@ -1,88 +1,55 @@
---- plug-ins/script-fu/scripts/Makefile.in.orig	Sun Mar  2 05:54:56 1997
-+++ plug-ins/script-fu/scripts/Makefile.in	Sun Mar  2 08:00:11 1997
-@@ -50,7 +50,7 @@
+****
+**** patches for the various configure scripts
+****  1) force INSTALL=`/usr/bin/install -c'
+****     to fix some obsecure problem with firing
+****     ./configure via the ports mechanism
+****  2) put the plug-ins in libexec rather than lib
+****
+--- ./gtk+/glib/configure~	Fri Mar 28 12:03:26 1997
++++ ./gtk+/glib/configure	Tue Apr  8 08:06:14 1997
+@@ -560,6 +560,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:564: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./gtk+/configure~	Fri Mar 28 10:58:42 1997
++++ ./gtk+/configure	Tue Apr  8 08:05:57 1997
+@@ -568,6 +568,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:572: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./configure~	Mon Apr  7 17:42:41 1997
++++ ./configure	Tue Apr  8 08:07:58 1997
+@@ -567,6 +567,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:571: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+@@ -617,7 +618,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
+ 
+ 
+ PACKAGE=gimp
+@@ -2173,7 +2174,7 @@
+ 
+ 
+ gimpdatadir=$datadir/$PACKAGE/$VERSION
+-gimpplugindir=$libdir/$PACKAGE/$VERSION
++gimpplugindir=$libexecdir/$PACKAGE/$VERSION
  
- scriptdatadir = $(pkgdatadir)/scripts
  
--scriptdata_DATA = \
-+_scriptdata_DATA = \
- 	alien-glow.scm		\
- 	bds-logo-textured.scm	\
- 	blend-logo.scm		\
-@@ -76,6 +76,7 @@
  
- DIST_COMMON =  Makefile.am Makefile.in
- 
-+scriptdata_DATA = $(patsubst %.scm,%.sed,${_scriptdata_DATA})
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
- 	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
-@@ -83,7 +84,7 @@
- TAR = tar
- default: all
- 
--.SUFFIXES:
-+.SUFFIXES: .sed
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
- 	cd $(top_srcdir) && automake --gnu plug-ins/script-fu/scripts/Makefile
- 
-@@ -95,13 +96,15 @@
- install-scriptdataDATA: $(scriptdata_DATA)
- 	$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(scriptdatadir)
--	@list="$(scriptdata_DATA)"; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p; \
--	  else if test -f $$p; then \
--	    echo "$(INSTALL_DATA) $$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(scriptdatadir)/$$p; \
-+	@list="$(scriptdata_DATA)"; for s in $$list; do \
-+	  p=$$(basename $$s .sed); \
-+	  if [ $$p != $$s ]; then p=$$p.scm; fi; \
-+	  if test -f $(srcdir)/$$s; then \
-+	    echo "$(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p; \
-+	  else if test -f $$s; then \
-+	    echo "$(INSTALL_DATA) $$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $$s $(scriptdatadir)/$$p; \
- 	  fi; fi; \
- 	done
- 
-@@ -188,3 +191,7 @@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-+
-+
-+%.sed : %.scm
-+	sed 's,@_scriptdatadir_@,${scriptdatadir},' $< > $@
---- plug-ins/script-fu/scripts/chrome-it.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome-it.scm	Sun Mar  2 07:43:14 1997
-@@ -153,5 +153,5 @@
-     (gimp-displays-flush)
-     (gimp-image-enable-undo img)))
- 
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/chrome2.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome2.scm	Sun Mar  2 07:43:14 1997
-@@ -161,6 +161,6 @@
-     (gimp-image-enable-undo img)
-     (gimp-display-new img)))
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/crystal.scm.orig	Sun Mar  2 07:56:25 1997
-+++ plug-ins/script-fu/scripts/crystal.scm	Sun Mar  2 07:57:25 1997
-@@ -164,4 +164,4 @@
-     (gimp-display-new img)))
- 
- 
--(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"/usr/local/share/gimp/scripts/texture1.jpg\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"@_scriptdatadir_@/texture1.jpg\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index d51b454483e7..5e3dbf5fffef 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -1,4 +1,3 @@
-bin/gimp
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdkkeysyms.h
@@ -15,8 +14,9 @@ include/gtk/gtkarrow.h
 include/gtk/gtkbin.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
-include/gtk/gtkcanvas.h
 include/gtk/gtkcheckbutton.h
+include/gtk/gtkcheckmenuitem.h
+include/gtk/gtkcolorsel.h
 include/gtk/gtkcontainer.h
 include/gtk/gtkdata.h
 include/gtk/gtkdialog.h
@@ -24,7 +24,6 @@ include/gtk/gtkdrawingarea.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
 include/gtk/gtkfilesel.h
-include/gtk/gtkfill.h
 include/gtk/gtkframe.h
 include/gtk/gtkgc.h
 include/gtk/gtkhbox.h
@@ -51,6 +50,7 @@ include/gtk/gtkpixmap.h
 include/gtk/gtkpreview.h
 include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
+include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
 include/gtk/gtkrc.h
 include/gtk/gtkruler.h
@@ -63,6 +63,7 @@ include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktogglebutton.h
+include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
 include/gtk/gtktypeutils.h
@@ -74,15 +75,11 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-include/libgimp/gimp.h
-include/libgimp/gimpenums.h
-include/libgimp/gimpmenu.h
-include/libgimp/gimpui.h
-info/gdk.info
-info/gtk.info
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
+lib/libgck.so.0.0
+lib/libgdk.a
+lib/libgdk.la
+lib/libgdk.so
+lib/libgdk.so.1.0
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
@@ -95,181 +92,197 @@ lib/libglib.a
 lib/libglib.la
 lib/libglib.so
 lib/libglib.so.1.0
-libexec/gimp-0.99.6/plug-ins/blur
-libexec/gimp-0.99.6/plug-ins/bumpmap
-libexec/gimp-0.99.6/plug-ins/c_astretch
-libexec/gimp-0.99.6/plug-ins/cubism
-libexec/gimp-0.99.6/plug-ins/demo
-libexec/gimp-0.99.6/plug-ins/displace
-libexec/gimp-0.99.6/plug-ins/gauss_iir
-libexec/gimp-0.99.6/plug-ins/gauss_rle
-libexec/gimp-0.99.6/plug-ins/gif
-libexec/gimp-0.99.6/plug-ins/header
-libexec/gimp-0.99.6/plug-ins/jpeg
-libexec/gimp-0.99.6/plug-ins/mosaic
-libexec/gimp-0.99.6/plug-ins/noisify
-libexec/gimp-0.99.6/plug-ins/oilify
-libexec/gimp-0.99.6/plug-ins/pinch
-libexec/gimp-0.99.6/plug-ins/plasma
-libexec/gimp-0.99.6/plug-ins/pnm
-libexec/gimp-0.99.6/plug-ins/script-fu
-libexec/gimp-0.99.6/plug-ins/sparkle
-libexec/gimp-0.99.6/plug-ins/tiff
-libexec/gimp-0.99.6/plug-ins/tile
-libexec/gimp-0.99.6/plug-ins/url
-libexec/gimp-0.99.6/plug-ins/video
-libexec/gimp-0.99.6/plug-ins/whirl
-libexec/gimp-0.99.6/plug-ins/xpm
-share/gimp-0.99.6/brushes/11circle.gbr
-share/gimp-0.99.6/brushes/11fcircle.gbr
-share/gimp-0.99.6/brushes/13circle.gbr
-share/gimp-0.99.6/brushes/13fcircle.gbr
-share/gimp-0.99.6/brushes/15circle.gbr
-share/gimp-0.99.6/brushes/15fcircle.gbr
-share/gimp-0.99.6/brushes/17circle.gbr
-share/gimp-0.99.6/brushes/17fcircle.gbr
-share/gimp-0.99.6/brushes/19circle.gbr
-share/gimp-0.99.6/brushes/19fcircle.gbr
-share/gimp-0.99.6/brushes/1circle.gbr
-share/gimp-0.99.6/brushes/3circle.gbr
-share/gimp-0.99.6/brushes/3fcircle.gbr
-share/gimp-0.99.6/brushes/5circle.gbr
-share/gimp-0.99.6/brushes/5fcircle.gbr
-share/gimp-0.99.6/brushes/7circle.gbr
-share/gimp-0.99.6/brushes/7fcircle.gbr
-share/gimp-0.99.6/brushes/9circle.gbr
-share/gimp-0.99.6/brushes/9fcircle.gbr
-share/gimp-0.99.6/brushes/airplane.gbr
-share/gimp-0.99.6/brushes/bird.gbr
-share/gimp-0.99.6/brushes/bush.gbr
-share/gimp-0.99.6/brushes/confetti.gbr
-share/gimp-0.99.6/brushes/cross_large.gbr
-share/gimp-0.99.6/brushes/cross_small.gbr
-share/gimp-0.99.6/brushes/diamond.gbr
-share/gimp-0.99.6/brushes/duck.gbr
-share/gimp-0.99.6/brushes/dunes.gbr
-share/gimp-0.99.6/brushes/elk.gbr
-share/gimp-0.99.6/brushes/flags.gbr
-share/gimp-0.99.6/brushes/flower.gbr
-share/gimp-0.99.6/brushes/flower_large.gbr
-share/gimp-0.99.6/brushes/galaxy.gbr
-share/gimp-0.99.6/brushes/galaxy_small.gbr
-share/gimp-0.99.6/brushes/gecko.gbr
-share/gimp-0.99.6/brushes/glyph.gbr
-share/gimp-0.99.6/brushes/guitar.gbr
-share/gimp-0.99.6/brushes/hash.gbr
-share/gimp-0.99.6/brushes/jack.gbr
-share/gimp-0.99.6/brushes/manta.gbr
-share/gimp-0.99.6/brushes/ribbon.gbr
-share/gimp-0.99.6/brushes/rings1.gbr
-share/gimp-0.99.6/brushes/rings2.gbr
-share/gimp-0.99.6/brushes/rings3.gbr
-share/gimp-0.99.6/brushes/rings4.gbr
-share/gimp-0.99.6/brushes/rings5.gbr
-share/gimp-0.99.6/brushes/rings6.gbr
-share/gimp-0.99.6/brushes/rings7.gbr
-share/gimp-0.99.6/brushes/sball.gbr
-share/gimp-0.99.6/brushes/slope.gbr
-share/gimp-0.99.6/brushes/snake.gbr
-share/gimp-0.99.6/brushes/snowflake.gbr
-share/gimp-0.99.6/brushes/sparkle.gbr
-share/gimp-0.99.6/brushes/sparkle2.gbr
-share/gimp-0.99.6/brushes/star_medium.gbr
-share/gimp-0.99.6/brushes/star_small.gbr
-share/gimp-0.99.6/brushes/therefore.gbr
-share/gimp-0.99.6/brushes/tictactoe.gbr
-share/gimp-0.99.6/brushes/tile.gbr
-share/gimp-0.99.6/brushes/triangle.gbr
-share/gimp-0.99.6/brushes/tulip.gbr
-share/gimp-0.99.6/brushes/xcf.gbr
-share/gimp-0.99.6/gimp_logo.ppm
-share/gimp-0.99.6/gimprc
-share/gimp-0.99.6/gradients/Default
-share/gimp-0.99.6/gradients/French_flag
-share/gimp-0.99.6/gradients/French_flag_smooth
-share/gimp-0.99.6/gradients/Full_saturation_spectrum_CCW
-share/gimp-0.99.6/gradients/Full_saturation_spectrum_CW
-share/gimp-0.99.6/gradients/German_flag
-share/gimp-0.99.6/gradients/German_flag_smooth
-share/gimp-0.99.6/gradients/Mexican_flag
-share/gimp-0.99.6/gradients/Mexican_flag_smooth
-share/gimp-0.99.6/palettes/Blues
-share/gimp-0.99.6/palettes/Browns_And_Yellows
-share/gimp-0.99.6/palettes/Cool_Colors
-share/gimp-0.99.6/palettes/Default
-share/gimp-0.99.6/palettes/Grays
-share/gimp-0.99.6/palettes/Greens
-share/gimp-0.99.6/palettes/Lights
-share/gimp-0.99.6/palettes/Muted
-share/gimp-0.99.6/palettes/Pastels
-share/gimp-0.99.6/palettes/Reds_And_Purples
-share/gimp-0.99.6/palettes/Warm_Colors
-share/gimp-0.99.6/patterns/3dgreen.pat
-share/gimp-0.99.6/patterns/amethyst.pat
-share/gimp-0.99.6/patterns/blue.pat
-share/gimp-0.99.6/patterns/chains.pat
-share/gimp-0.99.6/patterns/choc_swirl.pat
-share/gimp-0.99.6/patterns/clouds.pat
-share/gimp-0.99.6/patterns/clovers.pat
-share/gimp-0.99.6/patterns/dunes.pat
-share/gimp-0.99.6/patterns/electric.pat
-share/gimp-0.99.6/patterns/fibers.pat
-share/gimp-0.99.6/patterns/floor_tile.pat
-share/gimp-0.99.6/patterns/granite1.pat
-share/gimp-0.99.6/patterns/granite2.pat
-share/gimp-0.99.6/patterns/green_curtains.pat
-share/gimp-0.99.6/patterns/java.pat
-share/gimp-0.99.6/patterns/krinkle.pat
-share/gimp-0.99.6/patterns/leather.pat
-share/gimp-0.99.6/patterns/leaves.pat
-share/gimp-0.99.6/patterns/leopard.pat
-share/gimp-0.99.6/patterns/lumps.pat
-share/gimp-0.99.6/patterns/marble1.pat
-share/gimp-0.99.6/patterns/marble2.pat
-share/gimp-0.99.6/patterns/marble3.pat
-share/gimp-0.99.6/patterns/mhuerock.pat
-share/gimp-0.99.6/patterns/paper.pat
-share/gimp-0.99.6/patterns/parque1.pat
-share/gimp-0.99.6/patterns/parque2.pat
-share/gimp-0.99.6/patterns/parque3.pat
-share/gimp-0.99.6/patterns/pj.pat
-share/gimp-0.99.6/patterns/pool.pat
-share/gimp-0.99.6/patterns/sky.pat
-share/gimp-0.99.6/patterns/slate.pat
-share/gimp-0.99.6/patterns/sm_squares.pat
-share/gimp-0.99.6/patterns/terra.pat
-share/gimp-0.99.6/patterns/torrents.pat
-share/gimp-0.99.6/patterns/waves.pat
-share/gimp-0.99.6/patterns/wax.pat
-share/gimp-0.99.6/patterns/wood1.pat
-share/gimp-0.99.6/patterns/wood2.pat
-share/gimp-0.99.6/patterns/wood3.pat
-share/gimp-0.99.6/scripts/alien-glow.scm
-share/gimp-0.99.6/scripts/bds-logo-textured.scm
-share/gimp-0.99.6/scripts/beavis.jpg
-share/gimp-0.99.6/scripts/blend-logo.scm
-share/gimp-0.99.6/scripts/chrome-it.scm
-share/gimp-0.99.6/scripts/chrome.scm
-share/gimp-0.99.6/scripts/chrome2.scm
-share/gimp-0.99.6/scripts/crystal.scm
-share/gimp-0.99.6/scripts/ds-logo.scm
-share/gimp-0.99.6/scripts/frozen-text.scm
-share/gimp-0.99.6/scripts/glowing.scm
-share/gimp-0.99.6/scripts/hds-logo.scm
-share/gimp-0.99.6/scripts/neon.scm
-share/gimp-0.99.6/scripts/sphere.scm
-share/gimp-0.99.6/scripts/texture1.jpg
-share/gimp-0.99.6/scripts/texture2.jpg
-share/gimp-0.99.6/user_install
-@dirrm share/gimp-0.99.6/scripts
-@dirrm share/gimp-0.99.6/patterns
-@dirrm share/gimp-0.99.6/palettes
-@dirrm share/gimp-0.99.6/gradients
-@dirrm share/gimp-0.99.6/brushes
-@dirrm share/gimp-0.99.6
-@dirrm libexec/gimp-0.99.6/plug-ins
-@dirrm libexec/gimp-0.99.6
-@dirrm include/gtk
-@dirrm include/glib
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so
+lib/libgtk.so.1.0
+libexec/gimp/0.99.7/plug-ins/blur
+libexec/gimp/0.99.7/plug-ins/bumpmap
+libexec/gimp/0.99.7/plug-ins/c_astretch
+libexec/gimp/0.99.7/plug-ins/checkerboard
+libexec/gimp/0.99.7/plug-ins/cubism
+libexec/gimp/0.99.7/plug-ins/demo
+libexec/gimp/0.99.7/plug-ins/displace
+libexec/gimp/0.99.7/plug-ins/emboss
+libexec/gimp/0.99.7/plug-ins/figures
+libexec/gimp/0.99.7/plug-ins/gauss_iir
+libexec/gimp/0.99.7/plug-ins/gauss_rle
+libexec/gimp/0.99.7/plug-ins/gif
+libexec/gimp/0.99.7/plug-ins/header
+libexec/gimp/0.99.7/plug-ins/jpeg
+libexec/gimp/0.99.7/plug-ins/laplace
+libexec/gimp/0.99.7/plug-ins/mosaic
+libexec/gimp/0.99.7/plug-ins/noisify
+libexec/gimp/0.99.7/plug-ins/normalize
+libexec/gimp/0.99.7/plug-ins/nova
+libexec/gimp/0.99.7/plug-ins/oilify
+libexec/gimp/0.99.7/plug-ins/pinch
+libexec/gimp/0.99.7/plug-ins/pixelize
+libexec/gimp/0.99.7/plug-ins/plasma
+libexec/gimp/0.99.7/plug-ins/pnm
+libexec/gimp/0.99.7/plug-ins/script-fu
+libexec/gimp/0.99.7/plug-ins/shift
+libexec/gimp/0.99.7/plug-ins/sobel
+libexec/gimp/0.99.7/plug-ins/sparkle
+libexec/gimp/0.99.7/plug-ins/spread
+libexec/gimp/0.99.7/plug-ins/tiff
+libexec/gimp/0.99.7/plug-ins/tile
+libexec/gimp/0.99.7/plug-ins/url
+libexec/gimp/0.99.7/plug-ins/video
+libexec/gimp/0.99.7/plug-ins/vinvert
+libexec/gimp/0.99.7/plug-ins/whirl
+libexec/gimp/0.99.7/plug-ins/xpm
+share/gimp/0.99.7/brushes/11circle.gbr
+share/gimp/0.99.7/brushes/11fcircle.gbr
+share/gimp/0.99.7/brushes/13circle.gbr
+share/gimp/0.99.7/brushes/13fcircle.gbr
+share/gimp/0.99.7/brushes/15circle.gbr
+share/gimp/0.99.7/brushes/15fcircle.gbr
+share/gimp/0.99.7/brushes/17circle.gbr
+share/gimp/0.99.7/brushes/17fcircle.gbr
+share/gimp/0.99.7/brushes/19circle.gbr
+share/gimp/0.99.7/brushes/19fcircle.gbr
+share/gimp/0.99.7/brushes/1circle.gbr
+share/gimp/0.99.7/brushes/3circle.gbr
+share/gimp/0.99.7/brushes/3fcircle.gbr
+share/gimp/0.99.7/brushes/5circle.gbr
+share/gimp/0.99.7/brushes/5fcircle.gbr
+share/gimp/0.99.7/brushes/7circle.gbr
+share/gimp/0.99.7/brushes/7fcircle.gbr
+share/gimp/0.99.7/brushes/9circle.gbr
+share/gimp/0.99.7/brushes/9fcircle.gbr
+share/gimp/0.99.7/brushes/airplane.gbr
+share/gimp/0.99.7/brushes/bird.gbr
+share/gimp/0.99.7/brushes/bush.gbr
+share/gimp/0.99.7/brushes/confetti.gbr
+share/gimp/0.99.7/brushes/cross_large.gbr
+share/gimp/0.99.7/brushes/cross_small.gbr
+share/gimp/0.99.7/brushes/diamond.gbr
+share/gimp/0.99.7/brushes/duck.gbr
+share/gimp/0.99.7/brushes/dunes.gbr
+share/gimp/0.99.7/brushes/elk.gbr
+share/gimp/0.99.7/brushes/flags.gbr
+share/gimp/0.99.7/brushes/flower.gbr
+share/gimp/0.99.7/brushes/flower_large.gbr
+share/gimp/0.99.7/brushes/galaxy.gbr
+share/gimp/0.99.7/brushes/galaxy_small.gbr
+share/gimp/0.99.7/brushes/gecko.gbr
+share/gimp/0.99.7/brushes/glyph.gbr
+share/gimp/0.99.7/brushes/guitar.gbr
+share/gimp/0.99.7/brushes/hash.gbr
+share/gimp/0.99.7/brushes/jack.gbr
+share/gimp/0.99.7/brushes/manta.gbr
+share/gimp/0.99.7/brushes/ribbon.gbr
+share/gimp/0.99.7/brushes/rings1.gbr
+share/gimp/0.99.7/brushes/rings2.gbr
+share/gimp/0.99.7/brushes/rings3.gbr
+share/gimp/0.99.7/brushes/rings4.gbr
+share/gimp/0.99.7/brushes/rings5.gbr
+share/gimp/0.99.7/brushes/rings6.gbr
+share/gimp/0.99.7/brushes/rings7.gbr
+share/gimp/0.99.7/brushes/sball.gbr
+share/gimp/0.99.7/brushes/slope.gbr
+share/gimp/0.99.7/brushes/snake.gbr
+share/gimp/0.99.7/brushes/snowflake.gbr
+share/gimp/0.99.7/brushes/sparkle.gbr
+share/gimp/0.99.7/brushes/sparkle2.gbr
+share/gimp/0.99.7/brushes/star_medium.gbr
+share/gimp/0.99.7/brushes/star_small.gbr
+share/gimp/0.99.7/brushes/therefore.gbr
+share/gimp/0.99.7/brushes/tictactoe.gbr
+share/gimp/0.99.7/brushes/tile.gbr
+share/gimp/0.99.7/brushes/triangle.gbr
+share/gimp/0.99.7/brushes/tulip.gbr
+share/gimp/0.99.7/brushes/xcf.gbr
+share/gimp/0.99.7/gimp_logo.ppm
+share/gimp/0.99.7/gimprc
+share/gimp/0.99.7/gradients/Default
+share/gimp/0.99.7/gradients/French_flag
+share/gimp/0.99.7/gradients/French_flag_smooth
+share/gimp/0.99.7/gradients/Full_saturation_spectrum_CCW
+share/gimp/0.99.7/gradients/Full_saturation_spectrum_CW
+share/gimp/0.99.7/gradients/German_flag
+share/gimp/0.99.7/gradients/German_flag_smooth
+share/gimp/0.99.7/gradients/Mexican_flag
+share/gimp/0.99.7/gradients/Mexican_flag_smooth
+share/gimp/0.99.7/palettes/Blues
+share/gimp/0.99.7/palettes/Browns_And_Yellows
+share/gimp/0.99.7/palettes/Cool_Colors
+share/gimp/0.99.7/palettes/Default
+share/gimp/0.99.7/palettes/Grays
+share/gimp/0.99.7/palettes/Greens
+share/gimp/0.99.7/palettes/Lights
+share/gimp/0.99.7/palettes/Muted
+share/gimp/0.99.7/palettes/Pastels
+share/gimp/0.99.7/palettes/Reds_And_Purples
+share/gimp/0.99.7/palettes/Warm_Colors
+share/gimp/0.99.7/patterns/3dgreen.pat
+share/gimp/0.99.7/patterns/amethyst.pat
+share/gimp/0.99.7/patterns/blue.pat
+share/gimp/0.99.7/patterns/chains.pat
+share/gimp/0.99.7/patterns/choc_swirl.pat
+share/gimp/0.99.7/patterns/clouds.pat
+share/gimp/0.99.7/patterns/clovers.pat
+share/gimp/0.99.7/patterns/dunes.pat
+share/gimp/0.99.7/patterns/electric.pat
+share/gimp/0.99.7/patterns/fibers.pat
+share/gimp/0.99.7/patterns/floor_tile.pat
+share/gimp/0.99.7/patterns/granite1.pat
+share/gimp/0.99.7/patterns/granite2.pat
+share/gimp/0.99.7/patterns/green_curtains.pat
+share/gimp/0.99.7/patterns/java.pat
+share/gimp/0.99.7/patterns/krinkle.pat
+share/gimp/0.99.7/patterns/leather.pat
+share/gimp/0.99.7/patterns/leaves.pat
+share/gimp/0.99.7/patterns/leopard.pat
+share/gimp/0.99.7/patterns/lumps.pat
+share/gimp/0.99.7/patterns/marble1.pat
+share/gimp/0.99.7/patterns/marble2.pat
+share/gimp/0.99.7/patterns/marble3.pat
+share/gimp/0.99.7/patterns/mhuerock.pat
+share/gimp/0.99.7/patterns/paper.pat
+share/gimp/0.99.7/patterns/parque1.pat
+share/gimp/0.99.7/patterns/parque2.pat
+share/gimp/0.99.7/patterns/parque3.pat
+share/gimp/0.99.7/patterns/pj.pat
+share/gimp/0.99.7/patterns/pool.pat
+share/gimp/0.99.7/patterns/sky.pat
+share/gimp/0.99.7/patterns/slate.pat
+share/gimp/0.99.7/patterns/sm_squares.pat
+share/gimp/0.99.7/patterns/terra.pat
+share/gimp/0.99.7/patterns/torrents.pat
+share/gimp/0.99.7/patterns/waves.pat
+share/gimp/0.99.7/patterns/wax.pat
+share/gimp/0.99.7/patterns/wood1.pat
+share/gimp/0.99.7/patterns/wood2.pat
+share/gimp/0.99.7/patterns/wood3.pat
+share/gimp/0.99.7/scripts/alien-glow.scm
+share/gimp/0.99.7/scripts/bds-logo-textured.scm
+share/gimp/0.99.7/scripts/beavis.jpg
+share/gimp/0.99.7/scripts/blend-logo.scm
+share/gimp/0.99.7/scripts/chrome-it.scm
+share/gimp/0.99.7/scripts/chrome.scm
+share/gimp/0.99.7/scripts/chrome2.scm
+share/gimp/0.99.7/scripts/crystal.scm
+share/gimp/0.99.7/scripts/ds-logo.scm
+share/gimp/0.99.7/scripts/frozen-text.scm
+share/gimp/0.99.7/scripts/glowing.scm
+share/gimp/0.99.7/scripts/hds-logo.scm
+share/gimp/0.99.7/scripts/neon.scm
+share/gimp/0.99.7/scripts/sphere.scm
+share/gimp/0.99.7/scripts/texture1.jpg
+share/gimp/0.99.7/scripts/texture2.jpg
+share/gimp/0.99.7/user_install
 @dirrm include/gdk
-@dirrm include/libgimp
+@dirrm include/glib
+@dirrm include/gtk
+@dirrm libexec/gimp/0.99.7/plug-ins
+@dirrm libexec/gimp/0.99.7
+@dirrm libexec/gimp
+@dirrm share/gimp/0.99.7/brushes
+@dirrm share/gimp/0.99.7/gradients
+@dirrm share/gimp/0.99.7/palettes
+@dirrm share/gimp/0.99.7/patterns
+@dirrm share/gimp/0.99.7/scripts
+@dirrm share/gimp/0.99.7
+@dirrm share/gimp
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 5674bde9cb60..a6a96948dec2 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    GIMP
-# Version required:     0.99.6
+# Version required:     0.99.7
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.5 1997/03/02 19:44:41 erich Exp $
+# $Id: Makefile,v 1.6 1997/03/27 21:41:12 erich Exp $
 #
 
-DISTNAME=       gimp-0.99.6
+DISTNAME=       gimp-0.99.7
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
 
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 0abfb6441869..ecc8c7a5cd07 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1 +1 @@
-MD5 (gimp-0.99.6.tar.gz) = 03e45848f5e631b4ecab96fe2c4e897f
+MD5 (gimp-0.99.7.tar.gz) = ac10f6df1ff610943140994c7b6ee59f
diff --git a/graphics/gimpshop/files/patch-aa b/graphics/gimpshop/files/patch-aa
index 733e3e044551..9049a1722446 100644
--- a/graphics/gimpshop/files/patch-aa
+++ b/graphics/gimpshop/files/patch-aa
@@ -1,3 +1,9 @@
+****
+**** patches for the libtool in all the directories.
+**** These are mostly for linking against the freshly build
+**** libraraies rather than the installed ones.
+****
+
 --- /a/gimp-0.99.6/ltmain.sh	Wed Feb 26 03:39:50 1997
 +++ ltmain.sh	Wed Mar 12 20:20:40 1997
 @@ -334,7 +335,9 @@
@@ -37,214 +43,3 @@
  	;;
  
        -l*) deplibs="$deplibs $arg" ;;
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.am	Mon Mar 10 05:58:16 1997
-+++ gtk+/gtk/Makefile.am	Wed Mar 12 21:10:32 1997
-@@ -149,23 +149,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
-
- 
---- /a/gimp-0.99.6/gtk+/gtk/Makefile.in	Mon Mar 10 07:13:59 1997
-+++ gtk+/gtk/Makefile.in	Wed Mar 12 21:09:50 1997
-@@ -198,23 +198,23 @@
- X_LIBS = @x_libs@
- 
- EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
-+INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
--INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
- 
- noinst_PROGRAMS = testgtk simple
- testgtk_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- simple_LDADD = \
- 	libgtk.la				\
- 	$(top_builddir)/gdk/libgdk.la		\
-+	$(top_builddir)/glib/libglib.la		\
- 	$(X_LDFLAGS)				\
- 	$(X_LIBS)				\
--	$(top_builddir)/glib/libglib.la		\
- 	-lm
- 
- DEPS = \
- DEPS = \
---- /a/gimp-0.99.6/plug-ins/Makefile.am	Mon Mar 10 06:36:32 1997
-+++ plug-ins/Makefile.am	Wed Mar 12 21:49:12 1997
-@@ -43,9 +43,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/Makefile.in	Mon Mar 10 07:13:47 1997
-+++ plug-ins/Makefile.in	Wed Mar 12 21:48:51 1997
-@@ -89,9 +89,9 @@
- mosaic_SOURCES = mosaic.c mosaic_logo.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/gtk+		\
-+	$(X_CFLAGS)			\
- 	-I/usr/local/include
- 
- x_LDADD = \
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.am	Mon Mar 10 06:36:21 1997
-+++ plug-ins/script-fu/Makefile.am	Wed Mar 12 21:52:31 1997
-@@ -29,9 +29,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.in	Mon Mar 10 07:13:48 1997
-+++ plug-ins/script-fu/Makefile.in	Wed Mar 12 21:52:47 1997
-@@ -76,9 +76,9 @@
- 	siodp.h
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)			\
--	-I$(top_srcdir)/gtk+
-+	-I$(top_srcdir)/gtk+    \
-+	$(X_CFLAGS)
- 
- LDADD = \
- 	$(top_builddir)/libgimp/libgimp.la	\
---- /a/gimp-0.99.6/app/Makefile.am	Mon Mar 10 06:36:39 1997
-+++ app/Makefile.am	Wed Mar 12 21:58:49 1997
-@@ -267,21 +267,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/app/Makefile.in	Mon Mar 10 07:13:52 1997
-+++ app/Makefile.in	Wed Mar 12 21:59:15 1997
-@@ -314,21 +314,21 @@
- 
- CPPFLAGS = \
- 	-DLIBDIR=\""$(pkglibdir)"\"	\
--	-DDATADIR=\""$(pkgdatadir)"\"	\
-+	-DDATADIR=\""$(gimpdatadir)"\"	\
- 	-DVERSION=\"$(VERSION)\"
- 
- INCLUDES = \
--	$(X_CFLAGS)			\
- 	-I$(top_srcdir)/gtk+		\
--	-I$(top_srcdir)
-+	-I$(top_srcdir)         \
-+	$(X_CFLAGS)
- 
- gimp_LDADD = \
- 	$(top_builddir)/gtk+/gtk/libgtk.la	\
- 	$(top_builddir)/gtk+/gdk/libgdk.la	\
--	$(X_LDFLAGS)				\
--	$(X_LIBS)				\
- 	$(top_builddir)/libgimp/libgimpi.a	\
- 	$(top_builddir)/gtk+/glib/libglib.la	\
-+	$(X_LDFLAGS)				\
-+	$(X_LIBS)				\
- 	-lm
- 
- DEPS = \
---- /a/gimp-0.99.6/configure	Mon Mar 10 05:19:54 1997
-+++ configure	Wed Mar 12 22:09:11 1997
-@@ -617,7 +617,7 @@
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
- 
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
- 
- 
- PACKAGE=gimp
-@@ -2108,7 +2108,7 @@
- 
- 
- gimpdatadir=$datadir/$PACKAGE-$VERSION
--gimpplugindir=$libdir/$PACKAGE-$VERSION
-+gimpplugindir=$libexecdir/$PACKAGE-$VERSION
- 
- 
- 
---- gimprc.in~	Thu Mar 13 10:32:12 1997
-+++ gimprc.in	Thu Mar 13 10:32:25 1997
-@@ -68,7 +68,7 @@
- # causes the gimp to use more swap space and less memory.
- # Note: the gimp will still run even if `tile-cache-size' is
- # set to 0. The actual size can contain a suffix of 'm', 'M',
--* 'k', 'K', 'b' or 'B', which makes the gimp interpret the
-+# 'k', 'K', 'b' or 'B', which makes the gimp interpret the
- # size as being specified in megabytes, kilobytes and bytes
- # respectively. If no suffix is specified the size defaults to
- # being specified in kilobytes.
-@@ -90,7 +90,7 @@
- #  colors remaining after the allocation of the colorcube
- #  will be left to the system palette in an effort to reduce
- #  colormap "flashing".
--(color-cube 6 6 4)
-+(color-cube 6 6 4 24)
- 
- # Install a GIMP colormap by default -- only for 8-bit displays
- # (install-colormap)
diff --git a/graphics/gimpshop/files/patch-ab b/graphics/gimpshop/files/patch-ab
index 4eca93b6171e..27354846adb6 100644
--- a/graphics/gimpshop/files/patch-ab
+++ b/graphics/gimpshop/files/patch-ab
@@ -1,23 +1,8 @@
---- /a/gimp-0.99.6/gtk+/configure	Mon Mar 10 04:44:20 1997
-+++ gtk+/configure	Wed Mar 12 21:29:11 1997
-@@ -570,6 +570,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:574: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
---- /a/gimp-0.99.6/gtk+/glib/configure	Mon Mar 10 04:44:57 1997
-+++ gtk+/glib/configure	Wed Mar 12 21:29:39 1997
-@@ -560,6 +560,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:564: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+
+*****
+***** patches for plug-ins
+*****
+
 --- /a/gimp-0.99.6/plug-ins/url.c	Mon Mar 10 04:57:12 1997
 +++ plug-ins/url.c	Wed Mar 12 21:56:39 1997
 @@ -146,8 +146,8 @@
@@ -31,3 +16,14 @@
        _exit(127);
      }
    else
+--- plug-ins/nova.c~	Tue Apr  8 10:34:29 1997
++++ plug-ins/nova.c	Tue Apr  8 10:34:36 1997
+@@ -1010,7 +1010,7 @@
+ 	      l = sqrt( u*u + v*v );
+ 
+ 	      /* This algorithm is still under construction. */
+-	      c = (atan2(u,v)/(2*PI)+0.51) * pvals.nspoke;
++	      c = (atan2(u,v)/(2*M_PI)+0.51) * pvals.nspoke;
+ 	      i=(int)floor(c); c-=i; i%=pvals.nspoke;
+ 	      w1=spoke[i]*(1-c)+spoke[(i+1)%pvals.nspoke]*c;
+ 	      w1*=w1;
diff --git a/graphics/gimpshop/files/patch-ac b/graphics/gimpshop/files/patch-ac
index 31177deba379..f1efdf5f3839 100644
--- a/graphics/gimpshop/files/patch-ac
+++ b/graphics/gimpshop/files/patch-ac
@@ -1,88 +1,55 @@
---- plug-ins/script-fu/scripts/Makefile.in.orig	Sun Mar  2 05:54:56 1997
-+++ plug-ins/script-fu/scripts/Makefile.in	Sun Mar  2 08:00:11 1997
-@@ -50,7 +50,7 @@
+****
+**** patches for the various configure scripts
+****  1) force INSTALL=`/usr/bin/install -c'
+****     to fix some obsecure problem with firing
+****     ./configure via the ports mechanism
+****  2) put the plug-ins in libexec rather than lib
+****
+--- ./gtk+/glib/configure~	Fri Mar 28 12:03:26 1997
++++ ./gtk+/glib/configure	Tue Apr  8 08:06:14 1997
+@@ -560,6 +560,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:564: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./gtk+/configure~	Fri Mar 28 10:58:42 1997
++++ ./gtk+/configure	Tue Apr  8 08:05:57 1997
+@@ -568,6 +568,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:572: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- ./configure~	Mon Apr  7 17:42:41 1997
++++ ./configure	Tue Apr  8 08:07:58 1997
+@@ -567,6 +567,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:571: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+@@ -617,7 +618,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
+ 
+ 
+ PACKAGE=gimp
+@@ -2173,7 +2174,7 @@
+ 
+ 
+ gimpdatadir=$datadir/$PACKAGE/$VERSION
+-gimpplugindir=$libdir/$PACKAGE/$VERSION
++gimpplugindir=$libexecdir/$PACKAGE/$VERSION
  
- scriptdatadir = $(pkgdatadir)/scripts
  
--scriptdata_DATA = \
-+_scriptdata_DATA = \
- 	alien-glow.scm		\
- 	bds-logo-textured.scm	\
- 	blend-logo.scm		\
-@@ -76,6 +76,7 @@
  
- DIST_COMMON =  Makefile.am Makefile.in
- 
-+scriptdata_DATA = $(patsubst %.scm,%.sed,${_scriptdata_DATA})
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
- 	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
-@@ -83,7 +84,7 @@
- TAR = tar
- default: all
- 
--.SUFFIXES:
-+.SUFFIXES: .sed
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
- 	cd $(top_srcdir) && automake --gnu plug-ins/script-fu/scripts/Makefile
- 
-@@ -95,13 +96,15 @@
- install-scriptdataDATA: $(scriptdata_DATA)
- 	$(NORMAL_INSTALL)
- 	$(mkinstalldirs) $(scriptdatadir)
--	@list="$(scriptdata_DATA)"; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p; \
--	  else if test -f $$p; then \
--	    echo "$(INSTALL_DATA) $$p $(scriptdatadir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(scriptdatadir)/$$p; \
-+	@list="$(scriptdata_DATA)"; for s in $$list; do \
-+	  p=$$(basename $$s .sed); \
-+	  if [ $$p != $$s ]; then p=$$p.scm; fi; \
-+	  if test -f $(srcdir)/$$s; then \
-+	    echo "$(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p; \
-+	  else if test -f $$s; then \
-+	    echo "$(INSTALL_DATA) $$s $(scriptdatadir)/$$p"; \
-+	    $(INSTALL_DATA) $$s $(scriptdatadir)/$$p; \
- 	  fi; fi; \
- 	done
- 
-@@ -188,3 +191,7 @@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-+
-+
-+%.sed : %.scm
-+	sed 's,@_scriptdatadir_@,${scriptdatadir},' $< > $@
---- plug-ins/script-fu/scripts/chrome-it.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome-it.scm	Sun Mar  2 07:43:14 1997
-@@ -153,5 +153,5 @@
-     (gimp-displays-flush)
-     (gimp-image-enable-undo img)))
- 
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
--(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
-+(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/chrome2.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome2.scm	Sun Mar  2 07:43:14 1997
-@@ -161,6 +161,6 @@
-     (gimp-image-enable-undo img)
-     (gimp-display-new img)))
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
- 
--(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
---- plug-ins/script-fu/scripts/crystal.scm.orig	Sun Mar  2 07:56:25 1997
-+++ plug-ins/script-fu/scripts/crystal.scm	Sun Mar  2 07:57:25 1997
-@@ -164,4 +164,4 @@
-     (gimp-display-new img)))
- 
- 
--(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"/usr/local/share/gimp/scripts/texture1.jpg\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"@_scriptdatadir_@/texture1.jpg\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index d51b454483e7..5e3dbf5fffef 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1,4 +1,3 @@
-bin/gimp
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdkkeysyms.h
@@ -15,8 +14,9 @@ include/gtk/gtkarrow.h
 include/gtk/gtkbin.h
 include/gtk/gtkbox.h
 include/gtk/gtkbutton.h
-include/gtk/gtkcanvas.h
 include/gtk/gtkcheckbutton.h
+include/gtk/gtkcheckmenuitem.h
+include/gtk/gtkcolorsel.h
 include/gtk/gtkcontainer.h
 include/gtk/gtkdata.h
 include/gtk/gtkdialog.h
@@ -24,7 +24,6 @@ include/gtk/gtkdrawingarea.h
 include/gtk/gtkentry.h
 include/gtk/gtkenums.h
 include/gtk/gtkfilesel.h
-include/gtk/gtkfill.h
 include/gtk/gtkframe.h
 include/gtk/gtkgc.h
 include/gtk/gtkhbox.h
@@ -51,6 +50,7 @@ include/gtk/gtkpixmap.h
 include/gtk/gtkpreview.h
 include/gtk/gtkprogressbar.h
 include/gtk/gtkradiobutton.h
+include/gtk/gtkradiomenuitem.h
 include/gtk/gtkrange.h
 include/gtk/gtkrc.h
 include/gtk/gtkruler.h
@@ -63,6 +63,7 @@ include/gtk/gtkstyle.h
 include/gtk/gtktable.h
 include/gtk/gtktext.h
 include/gtk/gtktogglebutton.h
+include/gtk/gtktooltips.h
 include/gtk/gtktree.h
 include/gtk/gtktreeitem.h
 include/gtk/gtktypeutils.h
@@ -74,15 +75,11 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
-include/libgimp/gimp.h
-include/libgimp/gimpenums.h
-include/libgimp/gimpmenu.h
-include/libgimp/gimpui.h
-info/gdk.info
-info/gtk.info
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
+lib/libgck.so.0.0
+lib/libgdk.a
+lib/libgdk.la
+lib/libgdk.so
+lib/libgdk.so.1.0
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
@@ -95,181 +92,197 @@ lib/libglib.a
 lib/libglib.la
 lib/libglib.so
 lib/libglib.so.1.0
-libexec/gimp-0.99.6/plug-ins/blur
-libexec/gimp-0.99.6/plug-ins/bumpmap
-libexec/gimp-0.99.6/plug-ins/c_astretch
-libexec/gimp-0.99.6/plug-ins/cubism
-libexec/gimp-0.99.6/plug-ins/demo
-libexec/gimp-0.99.6/plug-ins/displace
-libexec/gimp-0.99.6/plug-ins/gauss_iir
-libexec/gimp-0.99.6/plug-ins/gauss_rle
-libexec/gimp-0.99.6/plug-ins/gif
-libexec/gimp-0.99.6/plug-ins/header
-libexec/gimp-0.99.6/plug-ins/jpeg
-libexec/gimp-0.99.6/plug-ins/mosaic
-libexec/gimp-0.99.6/plug-ins/noisify
-libexec/gimp-0.99.6/plug-ins/oilify
-libexec/gimp-0.99.6/plug-ins/pinch
-libexec/gimp-0.99.6/plug-ins/plasma
-libexec/gimp-0.99.6/plug-ins/pnm
-libexec/gimp-0.99.6/plug-ins/script-fu
-libexec/gimp-0.99.6/plug-ins/sparkle
-libexec/gimp-0.99.6/plug-ins/tiff
-libexec/gimp-0.99.6/plug-ins/tile
-libexec/gimp-0.99.6/plug-ins/url
-libexec/gimp-0.99.6/plug-ins/video
-libexec/gimp-0.99.6/plug-ins/whirl
-libexec/gimp-0.99.6/plug-ins/xpm
-share/gimp-0.99.6/brushes/11circle.gbr
-share/gimp-0.99.6/brushes/11fcircle.gbr
-share/gimp-0.99.6/brushes/13circle.gbr
-share/gimp-0.99.6/brushes/13fcircle.gbr
-share/gimp-0.99.6/brushes/15circle.gbr
-share/gimp-0.99.6/brushes/15fcircle.gbr
-share/gimp-0.99.6/brushes/17circle.gbr
-share/gimp-0.99.6/brushes/17fcircle.gbr
-share/gimp-0.99.6/brushes/19circle.gbr
-share/gimp-0.99.6/brushes/19fcircle.gbr
-share/gimp-0.99.6/brushes/1circle.gbr
-share/gimp-0.99.6/brushes/3circle.gbr
-share/gimp-0.99.6/brushes/3fcircle.gbr
-share/gimp-0.99.6/brushes/5circle.gbr
-share/gimp-0.99.6/brushes/5fcircle.gbr
-share/gimp-0.99.6/brushes/7circle.gbr
-share/gimp-0.99.6/brushes/7fcircle.gbr
-share/gimp-0.99.6/brushes/9circle.gbr
-share/gimp-0.99.6/brushes/9fcircle.gbr
-share/gimp-0.99.6/brushes/airplane.gbr
-share/gimp-0.99.6/brushes/bird.gbr
-share/gimp-0.99.6/brushes/bush.gbr
-share/gimp-0.99.6/brushes/confetti.gbr
-share/gimp-0.99.6/brushes/cross_large.gbr
-share/gimp-0.99.6/brushes/cross_small.gbr
-share/gimp-0.99.6/brushes/diamond.gbr
-share/gimp-0.99.6/brushes/duck.gbr
-share/gimp-0.99.6/brushes/dunes.gbr
-share/gimp-0.99.6/brushes/elk.gbr
-share/gimp-0.99.6/brushes/flags.gbr
-share/gimp-0.99.6/brushes/flower.gbr
-share/gimp-0.99.6/brushes/flower_large.gbr
-share/gimp-0.99.6/brushes/galaxy.gbr
-share/gimp-0.99.6/brushes/galaxy_small.gbr
-share/gimp-0.99.6/brushes/gecko.gbr
-share/gimp-0.99.6/brushes/glyph.gbr
-share/gimp-0.99.6/brushes/guitar.gbr
-share/gimp-0.99.6/brushes/hash.gbr
-share/gimp-0.99.6/brushes/jack.gbr
-share/gimp-0.99.6/brushes/manta.gbr
-share/gimp-0.99.6/brushes/ribbon.gbr
-share/gimp-0.99.6/brushes/rings1.gbr
-share/gimp-0.99.6/brushes/rings2.gbr
-share/gimp-0.99.6/brushes/rings3.gbr
-share/gimp-0.99.6/brushes/rings4.gbr
-share/gimp-0.99.6/brushes/rings5.gbr
-share/gimp-0.99.6/brushes/rings6.gbr
-share/gimp-0.99.6/brushes/rings7.gbr
-share/gimp-0.99.6/brushes/sball.gbr
-share/gimp-0.99.6/brushes/slope.gbr
-share/gimp-0.99.6/brushes/snake.gbr
-share/gimp-0.99.6/brushes/snowflake.gbr
-share/gimp-0.99.6/brushes/sparkle.gbr
-share/gimp-0.99.6/brushes/sparkle2.gbr
-share/gimp-0.99.6/brushes/star_medium.gbr
-share/gimp-0.99.6/brushes/star_small.gbr
-share/gimp-0.99.6/brushes/therefore.gbr
-share/gimp-0.99.6/brushes/tictactoe.gbr
-share/gimp-0.99.6/brushes/tile.gbr
-share/gimp-0.99.6/brushes/triangle.gbr
-share/gimp-0.99.6/brushes/tulip.gbr
-share/gimp-0.99.6/brushes/xcf.gbr
-share/gimp-0.99.6/gimp_logo.ppm
-share/gimp-0.99.6/gimprc
-share/gimp-0.99.6/gradients/Default
-share/gimp-0.99.6/gradients/French_flag
-share/gimp-0.99.6/gradients/French_flag_smooth
-share/gimp-0.99.6/gradients/Full_saturation_spectrum_CCW
-share/gimp-0.99.6/gradients/Full_saturation_spectrum_CW
-share/gimp-0.99.6/gradients/German_flag
-share/gimp-0.99.6/gradients/German_flag_smooth
-share/gimp-0.99.6/gradients/Mexican_flag
-share/gimp-0.99.6/gradients/Mexican_flag_smooth
-share/gimp-0.99.6/palettes/Blues
-share/gimp-0.99.6/palettes/Browns_And_Yellows
-share/gimp-0.99.6/palettes/Cool_Colors
-share/gimp-0.99.6/palettes/Default
-share/gimp-0.99.6/palettes/Grays
-share/gimp-0.99.6/palettes/Greens
-share/gimp-0.99.6/palettes/Lights
-share/gimp-0.99.6/palettes/Muted
-share/gimp-0.99.6/palettes/Pastels
-share/gimp-0.99.6/palettes/Reds_And_Purples
-share/gimp-0.99.6/palettes/Warm_Colors
-share/gimp-0.99.6/patterns/3dgreen.pat
-share/gimp-0.99.6/patterns/amethyst.pat
-share/gimp-0.99.6/patterns/blue.pat
-share/gimp-0.99.6/patterns/chains.pat
-share/gimp-0.99.6/patterns/choc_swirl.pat
-share/gimp-0.99.6/patterns/clouds.pat
-share/gimp-0.99.6/patterns/clovers.pat
-share/gimp-0.99.6/patterns/dunes.pat
-share/gimp-0.99.6/patterns/electric.pat
-share/gimp-0.99.6/patterns/fibers.pat
-share/gimp-0.99.6/patterns/floor_tile.pat
-share/gimp-0.99.6/patterns/granite1.pat
-share/gimp-0.99.6/patterns/granite2.pat
-share/gimp-0.99.6/patterns/green_curtains.pat
-share/gimp-0.99.6/patterns/java.pat
-share/gimp-0.99.6/patterns/krinkle.pat
-share/gimp-0.99.6/patterns/leather.pat
-share/gimp-0.99.6/patterns/leaves.pat
-share/gimp-0.99.6/patterns/leopard.pat
-share/gimp-0.99.6/patterns/lumps.pat
-share/gimp-0.99.6/patterns/marble1.pat
-share/gimp-0.99.6/patterns/marble2.pat
-share/gimp-0.99.6/patterns/marble3.pat
-share/gimp-0.99.6/patterns/mhuerock.pat
-share/gimp-0.99.6/patterns/paper.pat
-share/gimp-0.99.6/patterns/parque1.pat
-share/gimp-0.99.6/patterns/parque2.pat
-share/gimp-0.99.6/patterns/parque3.pat
-share/gimp-0.99.6/patterns/pj.pat
-share/gimp-0.99.6/patterns/pool.pat
-share/gimp-0.99.6/patterns/sky.pat
-share/gimp-0.99.6/patterns/slate.pat
-share/gimp-0.99.6/patterns/sm_squares.pat
-share/gimp-0.99.6/patterns/terra.pat
-share/gimp-0.99.6/patterns/torrents.pat
-share/gimp-0.99.6/patterns/waves.pat
-share/gimp-0.99.6/patterns/wax.pat
-share/gimp-0.99.6/patterns/wood1.pat
-share/gimp-0.99.6/patterns/wood2.pat
-share/gimp-0.99.6/patterns/wood3.pat
-share/gimp-0.99.6/scripts/alien-glow.scm
-share/gimp-0.99.6/scripts/bds-logo-textured.scm
-share/gimp-0.99.6/scripts/beavis.jpg
-share/gimp-0.99.6/scripts/blend-logo.scm
-share/gimp-0.99.6/scripts/chrome-it.scm
-share/gimp-0.99.6/scripts/chrome.scm
-share/gimp-0.99.6/scripts/chrome2.scm
-share/gimp-0.99.6/scripts/crystal.scm
-share/gimp-0.99.6/scripts/ds-logo.scm
-share/gimp-0.99.6/scripts/frozen-text.scm
-share/gimp-0.99.6/scripts/glowing.scm
-share/gimp-0.99.6/scripts/hds-logo.scm
-share/gimp-0.99.6/scripts/neon.scm
-share/gimp-0.99.6/scripts/sphere.scm
-share/gimp-0.99.6/scripts/texture1.jpg
-share/gimp-0.99.6/scripts/texture2.jpg
-share/gimp-0.99.6/user_install
-@dirrm share/gimp-0.99.6/scripts
-@dirrm share/gimp-0.99.6/patterns
-@dirrm share/gimp-0.99.6/palettes
-@dirrm share/gimp-0.99.6/gradients
-@dirrm share/gimp-0.99.6/brushes
-@dirrm share/gimp-0.99.6
-@dirrm libexec/gimp-0.99.6/plug-ins
-@dirrm libexec/gimp-0.99.6
-@dirrm include/gtk
-@dirrm include/glib
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so
+lib/libgtk.so.1.0
+libexec/gimp/0.99.7/plug-ins/blur
+libexec/gimp/0.99.7/plug-ins/bumpmap
+libexec/gimp/0.99.7/plug-ins/c_astretch
+libexec/gimp/0.99.7/plug-ins/checkerboard
+libexec/gimp/0.99.7/plug-ins/cubism
+libexec/gimp/0.99.7/plug-ins/demo
+libexec/gimp/0.99.7/plug-ins/displace
+libexec/gimp/0.99.7/plug-ins/emboss
+libexec/gimp/0.99.7/plug-ins/figures
+libexec/gimp/0.99.7/plug-ins/gauss_iir
+libexec/gimp/0.99.7/plug-ins/gauss_rle
+libexec/gimp/0.99.7/plug-ins/gif
+libexec/gimp/0.99.7/plug-ins/header
+libexec/gimp/0.99.7/plug-ins/jpeg
+libexec/gimp/0.99.7/plug-ins/laplace
+libexec/gimp/0.99.7/plug-ins/mosaic
+libexec/gimp/0.99.7/plug-ins/noisify
+libexec/gimp/0.99.7/plug-ins/normalize
+libexec/gimp/0.99.7/plug-ins/nova
+libexec/gimp/0.99.7/plug-ins/oilify
+libexec/gimp/0.99.7/plug-ins/pinch
+libexec/gimp/0.99.7/plug-ins/pixelize
+libexec/gimp/0.99.7/plug-ins/plasma
+libexec/gimp/0.99.7/plug-ins/pnm
+libexec/gimp/0.99.7/plug-ins/script-fu
+libexec/gimp/0.99.7/plug-ins/shift
+libexec/gimp/0.99.7/plug-ins/sobel
+libexec/gimp/0.99.7/plug-ins/sparkle
+libexec/gimp/0.99.7/plug-ins/spread
+libexec/gimp/0.99.7/plug-ins/tiff
+libexec/gimp/0.99.7/plug-ins/tile
+libexec/gimp/0.99.7/plug-ins/url
+libexec/gimp/0.99.7/plug-ins/video
+libexec/gimp/0.99.7/plug-ins/vinvert
+libexec/gimp/0.99.7/plug-ins/whirl
+libexec/gimp/0.99.7/plug-ins/xpm
+share/gimp/0.99.7/brushes/11circle.gbr
+share/gimp/0.99.7/brushes/11fcircle.gbr
+share/gimp/0.99.7/brushes/13circle.gbr
+share/gimp/0.99.7/brushes/13fcircle.gbr
+share/gimp/0.99.7/brushes/15circle.gbr
+share/gimp/0.99.7/brushes/15fcircle.gbr
+share/gimp/0.99.7/brushes/17circle.gbr
+share/gimp/0.99.7/brushes/17fcircle.gbr
+share/gimp/0.99.7/brushes/19circle.gbr
+share/gimp/0.99.7/brushes/19fcircle.gbr
+share/gimp/0.99.7/brushes/1circle.gbr
+share/gimp/0.99.7/brushes/3circle.gbr
+share/gimp/0.99.7/brushes/3fcircle.gbr
+share/gimp/0.99.7/brushes/5circle.gbr
+share/gimp/0.99.7/brushes/5fcircle.gbr
+share/gimp/0.99.7/brushes/7circle.gbr
+share/gimp/0.99.7/brushes/7fcircle.gbr
+share/gimp/0.99.7/brushes/9circle.gbr
+share/gimp/0.99.7/brushes/9fcircle.gbr
+share/gimp/0.99.7/brushes/airplane.gbr
+share/gimp/0.99.7/brushes/bird.gbr
+share/gimp/0.99.7/brushes/bush.gbr
+share/gimp/0.99.7/brushes/confetti.gbr
+share/gimp/0.99.7/brushes/cross_large.gbr
+share/gimp/0.99.7/brushes/cross_small.gbr
+share/gimp/0.99.7/brushes/diamond.gbr
+share/gimp/0.99.7/brushes/duck.gbr
+share/gimp/0.99.7/brushes/dunes.gbr
+share/gimp/0.99.7/brushes/elk.gbr
+share/gimp/0.99.7/brushes/flags.gbr
+share/gimp/0.99.7/brushes/flower.gbr
+share/gimp/0.99.7/brushes/flower_large.gbr
+share/gimp/0.99.7/brushes/galaxy.gbr
+share/gimp/0.99.7/brushes/galaxy_small.gbr
+share/gimp/0.99.7/brushes/gecko.gbr
+share/gimp/0.99.7/brushes/glyph.gbr
+share/gimp/0.99.7/brushes/guitar.gbr
+share/gimp/0.99.7/brushes/hash.gbr
+share/gimp/0.99.7/brushes/jack.gbr
+share/gimp/0.99.7/brushes/manta.gbr
+share/gimp/0.99.7/brushes/ribbon.gbr
+share/gimp/0.99.7/brushes/rings1.gbr
+share/gimp/0.99.7/brushes/rings2.gbr
+share/gimp/0.99.7/brushes/rings3.gbr
+share/gimp/0.99.7/brushes/rings4.gbr
+share/gimp/0.99.7/brushes/rings5.gbr
+share/gimp/0.99.7/brushes/rings6.gbr
+share/gimp/0.99.7/brushes/rings7.gbr
+share/gimp/0.99.7/brushes/sball.gbr
+share/gimp/0.99.7/brushes/slope.gbr
+share/gimp/0.99.7/brushes/snake.gbr
+share/gimp/0.99.7/brushes/snowflake.gbr
+share/gimp/0.99.7/brushes/sparkle.gbr
+share/gimp/0.99.7/brushes/sparkle2.gbr
+share/gimp/0.99.7/brushes/star_medium.gbr
+share/gimp/0.99.7/brushes/star_small.gbr
+share/gimp/0.99.7/brushes/therefore.gbr
+share/gimp/0.99.7/brushes/tictactoe.gbr
+share/gimp/0.99.7/brushes/tile.gbr
+share/gimp/0.99.7/brushes/triangle.gbr
+share/gimp/0.99.7/brushes/tulip.gbr
+share/gimp/0.99.7/brushes/xcf.gbr
+share/gimp/0.99.7/gimp_logo.ppm
+share/gimp/0.99.7/gimprc
+share/gimp/0.99.7/gradients/Default
+share/gimp/0.99.7/gradients/French_flag
+share/gimp/0.99.7/gradients/French_flag_smooth
+share/gimp/0.99.7/gradients/Full_saturation_spectrum_CCW
+share/gimp/0.99.7/gradients/Full_saturation_spectrum_CW
+share/gimp/0.99.7/gradients/German_flag
+share/gimp/0.99.7/gradients/German_flag_smooth
+share/gimp/0.99.7/gradients/Mexican_flag
+share/gimp/0.99.7/gradients/Mexican_flag_smooth
+share/gimp/0.99.7/palettes/Blues
+share/gimp/0.99.7/palettes/Browns_And_Yellows
+share/gimp/0.99.7/palettes/Cool_Colors
+share/gimp/0.99.7/palettes/Default
+share/gimp/0.99.7/palettes/Grays
+share/gimp/0.99.7/palettes/Greens
+share/gimp/0.99.7/palettes/Lights
+share/gimp/0.99.7/palettes/Muted
+share/gimp/0.99.7/palettes/Pastels
+share/gimp/0.99.7/palettes/Reds_And_Purples
+share/gimp/0.99.7/palettes/Warm_Colors
+share/gimp/0.99.7/patterns/3dgreen.pat
+share/gimp/0.99.7/patterns/amethyst.pat
+share/gimp/0.99.7/patterns/blue.pat
+share/gimp/0.99.7/patterns/chains.pat
+share/gimp/0.99.7/patterns/choc_swirl.pat
+share/gimp/0.99.7/patterns/clouds.pat
+share/gimp/0.99.7/patterns/clovers.pat
+share/gimp/0.99.7/patterns/dunes.pat
+share/gimp/0.99.7/patterns/electric.pat
+share/gimp/0.99.7/patterns/fibers.pat
+share/gimp/0.99.7/patterns/floor_tile.pat
+share/gimp/0.99.7/patterns/granite1.pat
+share/gimp/0.99.7/patterns/granite2.pat
+share/gimp/0.99.7/patterns/green_curtains.pat
+share/gimp/0.99.7/patterns/java.pat
+share/gimp/0.99.7/patterns/krinkle.pat
+share/gimp/0.99.7/patterns/leather.pat
+share/gimp/0.99.7/patterns/leaves.pat
+share/gimp/0.99.7/patterns/leopard.pat
+share/gimp/0.99.7/patterns/lumps.pat
+share/gimp/0.99.7/patterns/marble1.pat
+share/gimp/0.99.7/patterns/marble2.pat
+share/gimp/0.99.7/patterns/marble3.pat
+share/gimp/0.99.7/patterns/mhuerock.pat
+share/gimp/0.99.7/patterns/paper.pat
+share/gimp/0.99.7/patterns/parque1.pat
+share/gimp/0.99.7/patterns/parque2.pat
+share/gimp/0.99.7/patterns/parque3.pat
+share/gimp/0.99.7/patterns/pj.pat
+share/gimp/0.99.7/patterns/pool.pat
+share/gimp/0.99.7/patterns/sky.pat
+share/gimp/0.99.7/patterns/slate.pat
+share/gimp/0.99.7/patterns/sm_squares.pat
+share/gimp/0.99.7/patterns/terra.pat
+share/gimp/0.99.7/patterns/torrents.pat
+share/gimp/0.99.7/patterns/waves.pat
+share/gimp/0.99.7/patterns/wax.pat
+share/gimp/0.99.7/patterns/wood1.pat
+share/gimp/0.99.7/patterns/wood2.pat
+share/gimp/0.99.7/patterns/wood3.pat
+share/gimp/0.99.7/scripts/alien-glow.scm
+share/gimp/0.99.7/scripts/bds-logo-textured.scm
+share/gimp/0.99.7/scripts/beavis.jpg
+share/gimp/0.99.7/scripts/blend-logo.scm
+share/gimp/0.99.7/scripts/chrome-it.scm
+share/gimp/0.99.7/scripts/chrome.scm
+share/gimp/0.99.7/scripts/chrome2.scm
+share/gimp/0.99.7/scripts/crystal.scm
+share/gimp/0.99.7/scripts/ds-logo.scm
+share/gimp/0.99.7/scripts/frozen-text.scm
+share/gimp/0.99.7/scripts/glowing.scm
+share/gimp/0.99.7/scripts/hds-logo.scm
+share/gimp/0.99.7/scripts/neon.scm
+share/gimp/0.99.7/scripts/sphere.scm
+share/gimp/0.99.7/scripts/texture1.jpg
+share/gimp/0.99.7/scripts/texture2.jpg
+share/gimp/0.99.7/user_install
 @dirrm include/gdk
-@dirrm include/libgimp
+@dirrm include/glib
+@dirrm include/gtk
+@dirrm libexec/gimp/0.99.7/plug-ins
+@dirrm libexec/gimp/0.99.7
+@dirrm libexec/gimp
+@dirrm share/gimp/0.99.7/brushes
+@dirrm share/gimp/0.99.7/gradients
+@dirrm share/gimp/0.99.7/palettes
+@dirrm share/gimp/0.99.7/patterns
+@dirrm share/gimp/0.99.7/scripts
+@dirrm share/gimp/0.99.7
+@dirrm share/gimp