30 files changed, 2700 insertions, 1680 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index a6a96948dec2..5c6f6d1643f5 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -3,10 +3,13 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.6 1997/03/27 21:41:12 erich Exp $
+# $Id: Makefile,v 1.7 1997/04/08 22:06:51 erich Exp $
 #
 
-DISTNAME=       gimp-0.99.7
+VERSION=			0.99.8
+DISTNAME=       gimp-${VERSION}
+DISTFILES=	${DISTNAME}.tar.gz gimp-data-0.99.8.tar.gz
+
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
 
@@ -22,5 +25,13 @@ GNU_CONFIGURE=	yes
 
 USE_GMAKE=	yes
 
+DATASTUFF=  brushes palettes gradients patterns
+
+post-install:
+	cd ${WRKDIR}/gimp-data-${VERSION}; \
+	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
+	(cd ${PREFIX}/share/gimp/${VERSION}; tar -xvf -)
+
+
 .include <bsd.port.mk>
 
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index ecc8c7a5cd07..de8ff392435a 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1 +1,2 @@
-MD5 (gimp-0.99.7.tar.gz) = ac10f6df1ff610943140994c7b6ee59f
+MD5 (gimp-0.99.8.tar.gz) = 0466a576f25bfdb56774ba342059b343
+MD5 (gimp-data-0.99.8.tar.gz) = 80c4296ef85ffdec045b52a498b5caaa
diff --git a/graphics/gimp-app-devel/files/patch-ab b/graphics/gimp-app-devel/files/patch-ab
index 27354846adb6..081000754daa 100644
--- a/graphics/gimp-app-devel/files/patch-ab
+++ b/graphics/gimp-app-devel/files/patch-ab
@@ -16,14 +16,143 @@
        _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;
+--- plug-ins/ripple.c~	Fri Apr 18 09:21:26 1997
++++ plug-ins/ripple.c	Fri Apr 18 09:21:31 1997
+@@ -1015,7 +1015,7 @@
+     switch (rvals.waveform)
+     {
+         case SINE:
+-            return rvals.amplitude*sin(location*(2*PI)/(double)rvals.period);
++            return rvals.amplitude*sin(location*(2*M_PI)/(double)rvals.period);
+             break;
+         case SAWTOOTH:
+             return floor(rvals.amplitude*(fabs((((location%rvals.period)/(double)rvals.period)*4)-2)-1));
+
+The patches for displace
+------------------------
+*** plug-ins/displace.c.ots	Tue Apr  8 09:07:34 1997
+--- plug-ins/displace.c	Tue Apr  8 09:53:32 1997
+***************
+*** 222,231 ****
+  	  dvals.amount_x = param[3].data.d_float;
+  	  dvals.amount_y = param[4].data.d_float;
+  	  dvals.do_x = param[5].data.d_int32;
+! 	  dvals.do_x = param[6].data.d_int32;
+  	  dvals.displace_map_x = param[7].data.d_int32;
+  	  dvals.displace_map_y = param[8].data.d_int32;
+  	  dvals.displace_type = param[9].data.d_int32;
+  	}
+        break;
+  
+--- 222,238 ----
+  	  dvals.amount_x = param[3].data.d_float;
+  	  dvals.amount_y = param[4].data.d_float;
+  	  dvals.do_x = param[5].data.d_int32;
+! 	  dvals.do_y = param[6].data.d_int32;
+  	  dvals.displace_map_x = param[7].data.d_int32;
+  	  dvals.displace_map_y = param[8].data.d_int32;
+  	  dvals.displace_type = param[9].data.d_int32;
++ 
++ 	  if (dvals.do_x && 
++ 	      gimp_drawable_type(dvals.displace_map_x) != GRAY_IMAGE)
++ 	    status = STATUS_CALLING_ERROR;
++ 	  if (dvals.do_y && 
++ 	      gimp_drawable_type(dvals.displace_map_y) != GRAY_IMAGE)
++ 	    status = STATUS_CALLING_ERROR;
+  	}
+        break;
+  
+***************
+*** 566,592 ****
+  	      if (dvals.displace_type == WRAP)
+  		{
+  		  if (xi < 0)
+! 		    xi = width - (-xi % width);
+  		  else
+! 		    xi %= width;
+  
+  		  if (yi < 0)
+! 		    yi = height - (-yi % height);
+  		  else
+! 		    yi %= height;
+  		}
+  	      /* Smear out the edges of the image by repeating pixels. */
+  	      else if (dvals.displace_type == SMEAR)
+  		{
+  		  if (xi < 0)
+  		    xi = 0;
+! 		  else if (xi > width - 1)
+! 		    xi = width - 1;
+  
+  		  if (yi < 0)
+  		    yi = 0;
+! 		  else if (yi > height - 1)
+! 		    yi = height - 1;
+  		}
+  
+  	      tile = displace_pixel (drawable, tile, x1, y1, x2, y2, xi, yi, &row, &col, pixel[0]);
+--- 573,599 ----
+  	      if (dvals.displace_type == WRAP)
+  		{
+  		  if (xi < 0)
+! 		    xi = (width-1) - (-xi % (width-1));
+  		  else
+! 		    xi %= (width-1);
+  
+  		  if (yi < 0)
+! 		    yi = (height-1) - (-yi % (height-1));
+  		  else
+! 		    yi %= (height-1);
+  		}
+  	      /* Smear out the edges of the image by repeating pixels. */
+  	      else if (dvals.displace_type == SMEAR)
+  		{
+  		  if (xi < 0)
+  		    xi = 0;
+! 		  else if (xi > width - 2)
+! 		    xi = width - 2;
+  
+  		  if (yi < 0)
+  		    yi = 0;
+! 		  else if (yi > height - 2)
+! 		    yi = height - 2;
+  		}
+  
+  	      tile = displace_pixel (drawable, tile, x1, y1, x2, y2, xi, yi, &row, &col, pixel[0]);
+***************
+*** 712,718 ****
+      return TRUE;
+  
+    if (gimp_drawable_width (drawable_id) == drawable->width &&
+!       gimp_drawable_height (drawable_id) == drawable->height)
+      return TRUE;
+    else
+      return FALSE;
+--- 719,726 ----
+      return TRUE;
+  
+    if (gimp_drawable_width (drawable_id) == drawable->width &&
+!       gimp_drawable_height (drawable_id) == drawable->height &&
+!       gimp_drawable_type (drawable_id) == GRAY_IMAGE)
+      return TRUE;
+    else
+      return FALSE;
+
+--- plug-ins/script-fu/interp_regex.c~	Fri Apr 18 14:00:00 1997
++++ plug-ins/script-fu/interp_regex.c	Fri Apr 18 14:00:45 1997
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- plug-ins/plasma.c~	Fri Apr 18 15:01:43 1997
++++ plug-ins/plasma.c	Fri Apr 18 15:01:53 1997
+@@ -310,7 +310,7 @@
+   gtk_widget_set_usize( entry, ENTRY_WIDTH, 0 );
+   sprintf( buffer, "%d", pvals.seed );
+   gtk_entry_set_text (GTK_ENTRY (entry), buffer );
+-  gtk_signal_connect (GTK_OBJECT (entry), "changed_text",
++  gtk_signal_connect (GTK_OBJECT (entry), "changed",
+ 		      (GtkSignalFunc) plasma_entry_callback,
+ 		      &pvals.seed);
+   gtk_widget_show (entry);
diff --git a/graphics/gimp-app-devel/files/patch-ac b/graphics/gimp-app-devel/files/patch-ac
index f1efdf5f3839..6ee30980df23 100644
--- a/graphics/gimp-app-devel/files/patch-ac
+++ b/graphics/gimp-app-devel/files/patch-ac
@@ -25,17 +25,17 @@
  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
+--- configure.orig	Fri Apr 18 03:57:14 1997
++++ configure	Fri Apr 18 08:44:36 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
+ echo "configure:570: checking for a BSD compatible install" >&5
 +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 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -616,7 +617,7 @@
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
@@ -44,7 +44,7 @@
  
  
  PACKAGE=gimp
-@@ -2173,7 +2174,7 @@
+@@ -2172,7 +2173,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE/$VERSION
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 7d1b270a48f3..4a3891fb0068 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -1,3 +1,4 @@
+bin/gimp
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdkkeysyms.h
@@ -5,283 +6,311 @@ include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
 include/glib/gconfig.h
+include/glib/gconfig.h
+include/glib/glib.h
 include/glib/glib.h
-include/gtk/gtk.h
-include/gtk/gtkaccelerator.h
-include/gtk/gtkadjustment.h
-include/gtk/gtkalignment.h
-include/gtk/gtkarrow.h
-include/gtk/gtkbin.h
-include/gtk/gtkbox.h
-include/gtk/gtkbutton.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
-include/gtk/gtkdrawingarea.h
-include/gtk/gtkentry.h
-include/gtk/gtkenums.h
-include/gtk/gtkfilesel.h
-include/gtk/gtkframe.h
-include/gtk/gtkgc.h
-include/gtk/gtkhbox.h
-include/gtk/gtkhruler.h
-include/gtk/gtkhscale.h
-include/gtk/gtkhscrollbar.h
-include/gtk/gtkhseparator.h
-include/gtk/gtkimage.h
-include/gtk/gtkitem.h
-include/gtk/gtklabel.h
-include/gtk/gtklist.h
-include/gtk/gtklistitem.h
-include/gtk/gtkmain.h
-include/gtk/gtkmenu.h
-include/gtk/gtkmenubar.h
-include/gtk/gtkmenufactory.h
-include/gtk/gtkmenuitem.h
-include/gtk/gtkmenushell.h
-include/gtk/gtkmisc.h
-include/gtk/gtknotebook.h
-include/gtk/gtkobject.h
-include/gtk/gtkoptionmenu.h
-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
-include/gtk/gtkscale.h
-include/gtk/gtkscrollbar.h
-include/gtk/gtkscrolledwindow.h
-include/gtk/gtkseparator.h
-include/gtk/gtksignal.h
-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
-include/gtk/gtkvbox.h
-include/gtk/gtkviewport.h
-include/gtk/gtkvruler.h
-include/gtk/gtkvscale.h
-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/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/pdb.info
+info/pdb.info-1
+info/pdb.info-2
 lib/libgdk.a
 lib/libgdk.la
-lib/libgdk.so
 lib/libgdk.so.1.0
 lib/libgimp.a
 lib/libgimp.la
-lib/libgimp.so
 lib/libgimp.so.1.0
 lib/libgimpui.a
 lib/libgimpui.la
-lib/libgimpui.so
 lib/libgimpui.so.1.0
 lib/libglib.a
 lib/libglib.la
-lib/libglib.so
 lib/libglib.so.1.0
 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
+libexec/gimp/0.99.8/plug-ins/CML_explorer
+libexec/gimp/0.99.8/plug-ins/autocrop
+libexec/gimp/0.99.8/plug-ins/blur
+libexec/gimp/0.99.8/plug-ins/bumpmap
+libexec/gimp/0.99.8/plug-ins/c_astretch
+libexec/gimp/0.99.8/plug-ins/checkerboard
+libexec/gimp/0.99.8/plug-ins/cubism
+libexec/gimp/0.99.8/plug-ins/demo
+libexec/gimp/0.99.8/plug-ins/diffraction
+libexec/gimp/0.99.8/plug-ins/displace
+libexec/gimp/0.99.8/plug-ins/edge
+libexec/gimp/0.99.8/plug-ins/emboss
+libexec/gimp/0.99.8/plug-ins/figures
+libexec/gimp/0.99.8/plug-ins/gauss_iir
+libexec/gimp/0.99.8/plug-ins/gauss_rle
+libexec/gimp/0.99.8/plug-ins/gbr
+libexec/gimp/0.99.8/plug-ins/gif
+libexec/gimp/0.99.8/plug-ins/gradmap
+libexec/gimp/0.99.8/plug-ins/grid
+libexec/gimp/0.99.8/plug-ins/header
+libexec/gimp/0.99.8/plug-ins/holes
+libexec/gimp/0.99.8/plug-ins/hot
+libexec/gimp/0.99.8/plug-ins/hrz
+libexec/gimp/0.99.8/plug-ins/ifscompose
+libexec/gimp/0.99.8/plug-ins/jpeg
+libexec/gimp/0.99.8/plug-ins/laplace
+libexec/gimp/0.99.8/plug-ins/mosaic
+libexec/gimp/0.99.8/plug-ins/nlfilt
+libexec/gimp/0.99.8/plug-ins/noisify
+libexec/gimp/0.99.8/plug-ins/normalize
+libexec/gimp/0.99.8/plug-ins/nova
+libexec/gimp/0.99.8/plug-ins/oilify
+libexec/gimp/0.99.8/plug-ins/pat
+libexec/gimp/0.99.8/plug-ins/pcx
+libexec/gimp/0.99.8/plug-ins/pinch
+libexec/gimp/0.99.8/plug-ins/pixelize
+libexec/gimp/0.99.8/plug-ins/plasma
+libexec/gimp/0.99.8/plug-ins/pnm
+libexec/gimp/0.99.8/plug-ins/ps
+libexec/gimp/0.99.8/plug-ins/ripple
+libexec/gimp/0.99.8/plug-ins/script-fu
+libexec/gimp/0.99.8/plug-ins/shift
+libexec/gimp/0.99.8/plug-ins/sobel
+libexec/gimp/0.99.8/plug-ins/sparkle
+libexec/gimp/0.99.8/plug-ins/spread
+libexec/gimp/0.99.8/plug-ins/sunras
+libexec/gimp/0.99.8/plug-ins/tiff
+libexec/gimp/0.99.8/plug-ins/tile
+libexec/gimp/0.99.8/plug-ins/url
+libexec/gimp/0.99.8/plug-ins/video
+libexec/gimp/0.99.8/plug-ins/vinvert
+libexec/gimp/0.99.8/plug-ins/waves
+libexec/gimp/0.99.8/plug-ins/whirl
+libexec/gimp/0.99.8/plug-ins/xpm
+libexec/gimp/0.99.8/plug-ins/xwd
+share/gimp/0.99.8/brushes/10x10square.gbr
+share/gimp/0.99.8/brushes/10x10squareBlur.gbr
+share/gimp/0.99.8/brushes/11circle.gbr
+share/gimp/0.99.8/brushes/11fcircle.gbr
+share/gimp/0.99.8/brushes/13circle.gbr
+share/gimp/0.99.8/brushes/13fcircle.gbr
+share/gimp/0.99.8/brushes/15circle.gbr
+share/gimp/0.99.8/brushes/15fcircle.gbr
+share/gimp/0.99.8/brushes/17circle.gbr
+share/gimp/0.99.8/brushes/17fcircle.gbr
+share/gimp/0.99.8/brushes/19circle.gbr
+share/gimp/0.99.8/brushes/19fcircle.gbr
+share/gimp/0.99.8/brushes/1circle.gbr
+share/gimp/0.99.8/brushes/20x20square.gbr
+share/gimp/0.99.8/brushes/20x20squareBlur.gbr
+share/gimp/0.99.8/brushes/3circle.gbr
+share/gimp/0.99.8/brushes/3fcircle.gbr
+share/gimp/0.99.8/brushes/50x50cone.gbr
+share/gimp/0.99.8/brushes/50x50square.gbr
+share/gimp/0.99.8/brushes/50x50squareBlur.gbr
+share/gimp/0.99.8/brushes/50x50squareBlur2.gbr
+share/gimp/0.99.8/brushes/5circle.gbr
+share/gimp/0.99.8/brushes/5fcircle.gbr
+share/gimp/0.99.8/brushes/5x5square.gbr
+share/gimp/0.99.8/brushes/5x5squareBlur.gbr
+share/gimp/0.99.8/brushes/7circle.gbr
+share/gimp/0.99.8/brushes/7fcircle.gbr
+share/gimp/0.99.8/brushes/9circle.gbr
+share/gimp/0.99.8/brushes/9fcircle.gbr
+share/gimp/0.99.8/brushes/WindozeSux.gbr
+share/gimp/0.99.8/brushes/airplane.gbr
+share/gimp/0.99.8/brushes/bigGalaxy.gbr
+share/gimp/0.99.8/brushes/bird.gbr
+share/gimp/0.99.8/brushes/bush.gbr
+share/gimp/0.99.8/brushes/cloth.gbr
+share/gimp/0.99.8/brushes/confetti.gbr
+share/gimp/0.99.8/brushes/cross.gbr
+share/gimp/0.99.8/brushes/cross_large.gbr
+share/gimp/0.99.8/brushes/cross_small.gbr
+share/gimp/0.99.8/brushes/diamond.gbr
+share/gimp/0.99.8/brushes/duck.gbr
+share/gimp/0.99.8/brushes/dunes.gbr
+share/gimp/0.99.8/brushes/elk.gbr
+share/gimp/0.99.8/brushes/flags.gbr
+share/gimp/0.99.8/brushes/flower.gbr
+share/gimp/0.99.8/brushes/flower_large.gbr
+share/gimp/0.99.8/brushes/galaxy.gbr
+share/gimp/0.99.8/brushes/galaxy_small.gbr
+share/gimp/0.99.8/brushes/gecko.gbr
+share/gimp/0.99.8/brushes/glyph.gbr
+share/gimp/0.99.8/brushes/grid.gbr
+share/gimp/0.99.8/brushes/grid2.gbr
+share/gimp/0.99.8/brushes/guitar.gbr
+share/gimp/0.99.8/brushes/hash.gbr
+share/gimp/0.99.8/brushes/jack.gbr
+share/gimp/0.99.8/brushes/manta.gbr
+share/gimp/0.99.8/brushes/nova.gbr
+share/gimp/0.99.8/brushes/pixel.gbr
+share/gimp/0.99.8/brushes/qbert2.gbr
+share/gimp/0.99.8/brushes/qbert3Blur.gbr
+share/gimp/0.99.8/brushes/ribbon.gbr
+share/gimp/0.99.8/brushes/rings1.gbr
+share/gimp/0.99.8/brushes/rings2.gbr
+share/gimp/0.99.8/brushes/rings3.gbr
+share/gimp/0.99.8/brushes/rings4.gbr
+share/gimp/0.99.8/brushes/rings5.gbr
+share/gimp/0.99.8/brushes/rings6.gbr
+share/gimp/0.99.8/brushes/rings7.gbr
+share/gimp/0.99.8/brushes/sball.gbr
+share/gimp/0.99.8/brushes/slope.gbr
+share/gimp/0.99.8/brushes/snake.gbr
+share/gimp/0.99.8/brushes/snowflake.gbr
+share/gimp/0.99.8/brushes/sparkle.gbr
+share/gimp/0.99.8/brushes/sparkle2.gbr
+share/gimp/0.99.8/brushes/star_medium.gbr
+share/gimp/0.99.8/brushes/star_small.gbr
+share/gimp/0.99.8/brushes/swirl.gbr
+share/gimp/0.99.8/brushes/swirl2.gbr
+share/gimp/0.99.8/brushes/thegimp.gbr
+share/gimp/0.99.8/brushes/therefore.gbr
+share/gimp/0.99.8/brushes/tictactoe.gbr
+share/gimp/0.99.8/brushes/tile.gbr
+share/gimp/0.99.8/brushes/triangle.gbr
+share/gimp/0.99.8/brushes/tulip.gbr
+share/gimp/0.99.8/brushes/xcf.gbr
+share/gimp/0.99.8/gimp_logo.ppm
+share/gimp/0.99.8/gimprc
+share/gimp/0.99.8/gradients/Default
+share/gimp/0.99.8/gradients/French_flag
+share/gimp/0.99.8/gradients/French_flag_smooth
+share/gimp/0.99.8/gradients/Full_saturation_spectrum_CCW
+share/gimp/0.99.8/gradients/Full_saturation_spectrum_CW
+share/gimp/0.99.8/gradients/German_flag
+share/gimp/0.99.8/gradients/German_flag_smooth
+share/gimp/0.99.8/gradients/Mexican_flag
+share/gimp/0.99.8/gradients/Mexican_flag_smooth
+share/gimp/0.99.8/palettes/Blues
+share/gimp/0.99.8/palettes/Browns_And_Yellows
+share/gimp/0.99.8/palettes/Cool_Colors
+share/gimp/0.99.8/palettes/Default
+share/gimp/0.99.8/palettes/Grays
+share/gimp/0.99.8/palettes/Greens
+share/gimp/0.99.8/palettes/Lights
+share/gimp/0.99.8/palettes/Muted
+share/gimp/0.99.8/palettes/Pastels
+share/gimp/0.99.8/palettes/Reds_And_Purples
+share/gimp/0.99.8/palettes/Warm_Colors
+share/gimp/0.99.8/patterns/3dgreen.pat
+share/gimp/0.99.8/patterns/Craters.pat
+share/gimp/0.99.8/patterns/Moonfoot.pat
+share/gimp/0.99.8/patterns/amethyst.pat
+share/gimp/0.99.8/patterns/bark.pat
+share/gimp/0.99.8/patterns/blackwhitefloor.pat
+share/gimp/0.99.8/patterns/blue.pat
+share/gimp/0.99.8/patterns/blueweb.pat
+share/gimp/0.99.8/patterns/brick.pat
+share/gimp/0.99.8/patterns/burlap.pat
+share/gimp/0.99.8/patterns/burlwood.pat
+share/gimp/0.99.8/patterns/chains.pat
+share/gimp/0.99.8/patterns/choc_swirl.pat
+share/gimp/0.99.8/patterns/circuit.pat
+share/gimp/0.99.8/patterns/clouds.pat
+share/gimp/0.99.8/patterns/clovers.pat
+share/gimp/0.99.8/patterns/coins.pat
+share/gimp/0.99.8/patterns/color.pat
+share/gimp/0.99.8/patterns/corkboard.pat
+share/gimp/0.99.8/patterns/cracked.pat
+share/gimp/0.99.8/patterns/crazytile.pat
+share/gimp/0.99.8/patterns/crinklepaper.pat
+share/gimp/0.99.8/patterns/drymud.pat
+share/gimp/0.99.8/patterns/dunes.pat
+share/gimp/0.99.8/patterns/eggcarton.pat
+share/gimp/0.99.8/patterns/electric.pat
+share/gimp/0.99.8/patterns/fibers.pat
+share/gimp/0.99.8/patterns/floor_tile.pat
+share/gimp/0.99.8/patterns/granite1.pat
+share/gimp/0.99.8/patterns/granite2.pat
+share/gimp/0.99.8/patterns/green_curtains.pat
+share/gimp/0.99.8/patterns/ground1.pat
+share/gimp/0.99.8/patterns/java.pat
+share/gimp/0.99.8/patterns/krinkle.pat
+share/gimp/0.99.8/patterns/lathe.pat
+share/gimp/0.99.8/patterns/leather.pat
+share/gimp/0.99.8/patterns/leaves.pat
+share/gimp/0.99.8/patterns/leaves3.pat
+share/gimp/0.99.8/patterns/leaves4.pat
+share/gimp/0.99.8/patterns/leaves6.pat
+share/gimp/0.99.8/patterns/leopard.pat
+share/gimp/0.99.8/patterns/lightning.pat
+share/gimp/0.99.8/patterns/lumps.pat
+share/gimp/0.99.8/patterns/marble1.pat
+share/gimp/0.99.8/patterns/marble2.pat
+share/gimp/0.99.8/patterns/marble3.pat
+share/gimp/0.99.8/patterns/mhuerock.pat
+share/gimp/0.99.8/patterns/money.pat
+share/gimp/0.99.8/patterns/oooh.pat
+share/gimp/0.99.8/patterns/oooh3.pat
+share/gimp/0.99.8/patterns/paper.pat
+share/gimp/0.99.8/patterns/parque1.pat
+share/gimp/0.99.8/patterns/parque2.pat
+share/gimp/0.99.8/patterns/parque3.pat
+share/gimp/0.99.8/patterns/pine.pat
+share/gimp/0.99.8/patterns/pink_marble.pat
+share/gimp/0.99.8/patterns/pj.pat
+share/gimp/0.99.8/patterns/pool.pat
+share/gimp/0.99.8/patterns/qube1.pat
+share/gimp/0.99.8/patterns/recessed.pat
+share/gimp/0.99.8/patterns/rock.pat
+share/gimp/0.99.8/patterns/sky.pat
+share/gimp/0.99.8/patterns/slate.pat
+share/gimp/0.99.8/patterns/sm_squares.pat
+share/gimp/0.99.8/patterns/startile.pat
+share/gimp/0.99.8/patterns/stone33.pat
+share/gimp/0.99.8/patterns/swirl.pat
+share/gimp/0.99.8/patterns/swirl2.pat
+share/gimp/0.99.8/patterns/terra.pat
+share/gimp/0.99.8/patterns/torrents.pat
+share/gimp/0.99.8/patterns/walnut.pat
+share/gimp/0.99.8/patterns/water3.pat
+share/gimp/0.99.8/patterns/waves.pat
+share/gimp/0.99.8/patterns/wax.pat
+share/gimp/0.99.8/patterns/wood1.pat
+share/gimp/0.99.8/patterns/wood2.pat
+share/gimp/0.99.8/patterns/wood3.pat
+share/gimp/0.99.8/patterns/wood4.pat
+share/gimp/0.99.8/patterns/wood5.pat
+share/gimp/0.99.8/scripts/alien-glow.scm
+share/gimp/0.99.8/scripts/bds-logo-textured.scm
+share/gimp/0.99.8/scripts/beavis.jpg
+share/gimp/0.99.8/scripts/blend-logo.scm
+share/gimp/0.99.8/scripts/carve.scm
+share/gimp/0.99.8/scripts/chrome-it.scm
+share/gimp/0.99.8/scripts/chrome.scm
+share/gimp/0.99.8/scripts/chrome2.scm
+share/gimp/0.99.8/scripts/clothify.scm
+share/gimp/0.99.8/scripts/crystal.scm
+share/gimp/0.99.8/scripts/ds-logo.scm
+share/gimp/0.99.8/scripts/frozen-text.scm
+share/gimp/0.99.8/scripts/glowing.scm
+share/gimp/0.99.8/scripts/hds-logo.scm
+share/gimp/0.99.8/scripts/neon.scm
+share/gimp/0.99.8/scripts/sphere.scm
+share/gimp/0.99.8/scripts/swirltile.scm
+share/gimp/0.99.8/scripts/t-o-p.scm
+share/gimp/0.99.8/scripts/text-circle.scm
+share/gimp/0.99.8/scripts/texture1.jpg
+share/gimp/0.99.8/scripts/texture2.jpg
+share/gimp/0.99.8/user_install
+@dirrm include/glib
 @dirrm include/gdk
 @dirrm include/glib
-@dirrm include/gtk
-@dirrm libexec/gimp/0.99.7/plug-ins
-@dirrm libexec/gimp/0.99.7
+@dirrm include/libgimp
+@dirrm libexec/gimp/0.99.8/plug-ins
+@dirrm libexec/gimp/0.99.8
 @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/0.99.8/scripts
+@dirrm share/gimp/0.99.8/brushes
+@dirrm share/gimp/0.99.8/palettes
+@dirrm share/gimp/0.99.8/gradients
+@dirrm share/gimp/0.99.8/patterns
+@dirrm share/gimp/0.99.8
 @dirrm share/gimp
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index a6a96948dec2..5c6f6d1643f5 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,10 +3,13 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.6 1997/03/27 21:41:12 erich Exp $
+# $Id: Makefile,v 1.7 1997/04/08 22:06:51 erich Exp $
 #
 
-DISTNAME=       gimp-0.99.7
+VERSION=			0.99.8
+DISTNAME=       gimp-${VERSION}
+DISTFILES=	${DISTNAME}.tar.gz gimp-data-0.99.8.tar.gz
+
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
 
@@ -22,5 +25,13 @@ GNU_CONFIGURE=	yes
 
 USE_GMAKE=	yes
 
+DATASTUFF=  brushes palettes gradients patterns
+
+post-install:
+	cd ${WRKDIR}/gimp-data-${VERSION}; \
+	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
+	(cd ${PREFIX}/share/gimp/${VERSION}; tar -xvf -)
+
+
 .include <bsd.port.mk>
 
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index ecc8c7a5cd07..de8ff392435a 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1 +1,2 @@
-MD5 (gimp-0.99.7.tar.gz) = ac10f6df1ff610943140994c7b6ee59f
+MD5 (gimp-0.99.8.tar.gz) = 0466a576f25bfdb56774ba342059b343
+MD5 (gimp-data-0.99.8.tar.gz) = 80c4296ef85ffdec045b52a498b5caaa
diff --git a/graphics/gimp-app/files/patch-ab b/graphics/gimp-app/files/patch-ab
index 27354846adb6..081000754daa 100644
--- a/graphics/gimp-app/files/patch-ab
+++ b/graphics/gimp-app/files/patch-ab
@@ -16,14 +16,143 @@
        _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;
+--- plug-ins/ripple.c~	Fri Apr 18 09:21:26 1997
++++ plug-ins/ripple.c	Fri Apr 18 09:21:31 1997
+@@ -1015,7 +1015,7 @@
+     switch (rvals.waveform)
+     {
+         case SINE:
+-            return rvals.amplitude*sin(location*(2*PI)/(double)rvals.period);
++            return rvals.amplitude*sin(location*(2*M_PI)/(double)rvals.period);
+             break;
+         case SAWTOOTH:
+             return floor(rvals.amplitude*(fabs((((location%rvals.period)/(double)rvals.period)*4)-2)-1));
+
+The patches for displace
+------------------------
+*** plug-ins/displace.c.ots	Tue Apr  8 09:07:34 1997
+--- plug-ins/displace.c	Tue Apr  8 09:53:32 1997
+***************
+*** 222,231 ****
+  	  dvals.amount_x = param[3].data.d_float;
+  	  dvals.amount_y = param[4].data.d_float;
+  	  dvals.do_x = param[5].data.d_int32;
+! 	  dvals.do_x = param[6].data.d_int32;
+  	  dvals.displace_map_x = param[7].data.d_int32;
+  	  dvals.displace_map_y = param[8].data.d_int32;
+  	  dvals.displace_type = param[9].data.d_int32;
+  	}
+        break;
+  
+--- 222,238 ----
+  	  dvals.amount_x = param[3].data.d_float;
+  	  dvals.amount_y = param[4].data.d_float;
+  	  dvals.do_x = param[5].data.d_int32;
+! 	  dvals.do_y = param[6].data.d_int32;
+  	  dvals.displace_map_x = param[7].data.d_int32;
+  	  dvals.displace_map_y = param[8].data.d_int32;
+  	  dvals.displace_type = param[9].data.d_int32;
++ 
++ 	  if (dvals.do_x && 
++ 	      gimp_drawable_type(dvals.displace_map_x) != GRAY_IMAGE)
++ 	    status = STATUS_CALLING_ERROR;
++ 	  if (dvals.do_y && 
++ 	      gimp_drawable_type(dvals.displace_map_y) != GRAY_IMAGE)
++ 	    status = STATUS_CALLING_ERROR;
+  	}
+        break;
+  
+***************
+*** 566,592 ****
+  	      if (dvals.displace_type == WRAP)
+  		{
+  		  if (xi < 0)
+! 		    xi = width - (-xi % width);
+  		  else
+! 		    xi %= width;
+  
+  		  if (yi < 0)
+! 		    yi = height - (-yi % height);
+  		  else
+! 		    yi %= height;
+  		}
+  	      /* Smear out the edges of the image by repeating pixels. */
+  	      else if (dvals.displace_type == SMEAR)
+  		{
+  		  if (xi < 0)
+  		    xi = 0;
+! 		  else if (xi > width - 1)
+! 		    xi = width - 1;
+  
+  		  if (yi < 0)
+  		    yi = 0;
+! 		  else if (yi > height - 1)
+! 		    yi = height - 1;
+  		}
+  
+  	      tile = displace_pixel (drawable, tile, x1, y1, x2, y2, xi, yi, &row, &col, pixel[0]);
+--- 573,599 ----
+  	      if (dvals.displace_type == WRAP)
+  		{
+  		  if (xi < 0)
+! 		    xi = (width-1) - (-xi % (width-1));
+  		  else
+! 		    xi %= (width-1);
+  
+  		  if (yi < 0)
+! 		    yi = (height-1) - (-yi % (height-1));
+  		  else
+! 		    yi %= (height-1);
+  		}
+  	      /* Smear out the edges of the image by repeating pixels. */
+  	      else if (dvals.displace_type == SMEAR)
+  		{
+  		  if (xi < 0)
+  		    xi = 0;
+! 		  else if (xi > width - 2)
+! 		    xi = width - 2;
+  
+  		  if (yi < 0)
+  		    yi = 0;
+! 		  else if (yi > height - 2)
+! 		    yi = height - 2;
+  		}
+  
+  	      tile = displace_pixel (drawable, tile, x1, y1, x2, y2, xi, yi, &row, &col, pixel[0]);
+***************
+*** 712,718 ****
+      return TRUE;
+  
+    if (gimp_drawable_width (drawable_id) == drawable->width &&
+!       gimp_drawable_height (drawable_id) == drawable->height)
+      return TRUE;
+    else
+      return FALSE;
+--- 719,726 ----
+      return TRUE;
+  
+    if (gimp_drawable_width (drawable_id) == drawable->width &&
+!       gimp_drawable_height (drawable_id) == drawable->height &&
+!       gimp_drawable_type (drawable_id) == GRAY_IMAGE)
+      return TRUE;
+    else
+      return FALSE;
+
+--- plug-ins/script-fu/interp_regex.c~	Fri Apr 18 14:00:00 1997
++++ plug-ins/script-fu/interp_regex.c	Fri Apr 18 14:00:45 1997
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- plug-ins/plasma.c~	Fri Apr 18 15:01:43 1997
++++ plug-ins/plasma.c	Fri Apr 18 15:01:53 1997
+@@ -310,7 +310,7 @@
+   gtk_widget_set_usize( entry, ENTRY_WIDTH, 0 );
+   sprintf( buffer, "%d", pvals.seed );
+   gtk_entry_set_text (GTK_ENTRY (entry), buffer );
+-  gtk_signal_connect (GTK_OBJECT (entry), "changed_text",
++  gtk_signal_connect (GTK_OBJECT (entry), "changed",
+ 		      (GtkSignalFunc) plasma_entry_callback,
+ 		      &pvals.seed);
+   gtk_widget_show (entry);
diff --git a/graphics/gimp-app/files/patch-ac b/graphics/gimp-app/files/patch-ac
index f1efdf5f3839..6ee30980df23 100644
--- a/graphics/gimp-app/files/patch-ac
+++ b/graphics/gimp-app/files/patch-ac
@@ -25,17 +25,17 @@
  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
+--- configure.orig	Fri Apr 18 03:57:14 1997
++++ configure	Fri Apr 18 08:44:36 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
+ echo "configure:570: checking for a BSD compatible install" >&5
 +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 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -616,7 +617,7 @@
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
@@ -44,7 +44,7 @@
  
  
  PACKAGE=gimp
-@@ -2173,7 +2174,7 @@
+@@ -2172,7 +2173,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE/$VERSION
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 7d1b270a48f3..4a3891fb0068 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1,3 +1,4 @@
+bin/gimp
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdkkeysyms.h
@@ -5,283 +6,311 @@ include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
 include/glib/gconfig.h
+include/glib/gconfig.h
+include/glib/glib.h
 include/glib/glib.h
-include/gtk/gtk.h
-include/gtk/gtkaccelerator.h
-include/gtk/gtkadjustment.h
-include/gtk/gtkalignment.h
-include/gtk/gtkarrow.h
-include/gtk/gtkbin.h
-include/gtk/gtkbox.h
-include/gtk/gtkbutton.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
-include/gtk/gtkdrawingarea.h
-include/gtk/gtkentry.h
-include/gtk/gtkenums.h
-include/gtk/gtkfilesel.h
-include/gtk/gtkframe.h
-include/gtk/gtkgc.h
-include/gtk/gtkhbox.h
-include/gtk/gtkhruler.h
-include/gtk/gtkhscale.h
-include/gtk/gtkhscrollbar.h
-include/gtk/gtkhseparator.h
-include/gtk/gtkimage.h
-include/gtk/gtkitem.h
-include/gtk/gtklabel.h
-include/gtk/gtklist.h
-include/gtk/gtklistitem.h
-include/gtk/gtkmain.h
-include/gtk/gtkmenu.h
-include/gtk/gtkmenubar.h
-include/gtk/gtkmenufactory.h
-include/gtk/gtkmenuitem.h
-include/gtk/gtkmenushell.h
-include/gtk/gtkmisc.h
-include/gtk/gtknotebook.h
-include/gtk/gtkobject.h
-include/gtk/gtkoptionmenu.h
-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
-include/gtk/gtkscale.h
-include/gtk/gtkscrollbar.h
-include/gtk/gtkscrolledwindow.h
-include/gtk/gtkseparator.h
-include/gtk/gtksignal.h
-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
-include/gtk/gtkvbox.h
-include/gtk/gtkviewport.h
-include/gtk/gtkvruler.h
-include/gtk/gtkvscale.h
-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/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/pdb.info
+info/pdb.info-1
+info/pdb.info-2
 lib/libgdk.a
 lib/libgdk.la
-lib/libgdk.so
 lib/libgdk.so.1.0
 lib/libgimp.a
 lib/libgimp.la
-lib/libgimp.so
 lib/libgimp.so.1.0
 lib/libgimpui.a
 lib/libgimpui.la
-lib/libgimpui.so
 lib/libgimpui.so.1.0
 lib/libglib.a
 lib/libglib.la
-lib/libglib.so
 lib/libglib.so.1.0
 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
+libexec/gimp/0.99.8/plug-ins/CML_explorer
+libexec/gimp/0.99.8/plug-ins/autocrop
+libexec/gimp/0.99.8/plug-ins/blur
+libexec/gimp/0.99.8/plug-ins/bumpmap
+libexec/gimp/0.99.8/plug-ins/c_astretch
+libexec/gimp/0.99.8/plug-ins/checkerboard
+libexec/gimp/0.99.8/plug-ins/cubism
+libexec/gimp/0.99.8/plug-ins/demo
+libexec/gimp/0.99.8/plug-ins/diffraction
+libexec/gimp/0.99.8/plug-ins/displace
+libexec/gimp/0.99.8/plug-ins/edge
+libexec/gimp/0.99.8/plug-ins/emboss
+libexec/gimp/0.99.8/plug-ins/figures
+libexec/gimp/0.99.8/plug-ins/gauss_iir
+libexec/gimp/0.99.8/plug-ins/gauss_rle
+libexec/gimp/0.99.8/plug-ins/gbr
+libexec/gimp/0.99.8/plug-ins/gif
+libexec/gimp/0.99.8/plug-ins/gradmap
+libexec/gimp/0.99.8/plug-ins/grid
+libexec/gimp/0.99.8/plug-ins/header
+libexec/gimp/0.99.8/plug-ins/holes
+libexec/gimp/0.99.8/plug-ins/hot
+libexec/gimp/0.99.8/plug-ins/hrz
+libexec/gimp/0.99.8/plug-ins/ifscompose
+libexec/gimp/0.99.8/plug-ins/jpeg
+libexec/gimp/0.99.8/plug-ins/laplace
+libexec/gimp/0.99.8/plug-ins/mosaic
+libexec/gimp/0.99.8/plug-ins/nlfilt
+libexec/gimp/0.99.8/plug-ins/noisify
+libexec/gimp/0.99.8/plug-ins/normalize
+libexec/gimp/0.99.8/plug-ins/nova
+libexec/gimp/0.99.8/plug-ins/oilify
+libexec/gimp/0.99.8/plug-ins/pat
+libexec/gimp/0.99.8/plug-ins/pcx
+libexec/gimp/0.99.8/plug-ins/pinch
+libexec/gimp/0.99.8/plug-ins/pixelize
+libexec/gimp/0.99.8/plug-ins/plasma
+libexec/gimp/0.99.8/plug-ins/pnm
+libexec/gimp/0.99.8/plug-ins/ps
+libexec/gimp/0.99.8/plug-ins/ripple
+libexec/gimp/0.99.8/plug-ins/script-fu
+libexec/gimp/0.99.8/plug-ins/shift
+libexec/gimp/0.99.8/plug-ins/sobel
+libexec/gimp/0.99.8/plug-ins/sparkle
+libexec/gimp/0.99.8/plug-ins/spread
+libexec/gimp/0.99.8/plug-ins/sunras
+libexec/gimp/0.99.8/plug-ins/tiff
+libexec/gimp/0.99.8/plug-ins/tile
+libexec/gimp/0.99.8/plug-ins/url
+libexec/gimp/0.99.8/plug-ins/video
+libexec/gimp/0.99.8/plug-ins/vinvert
+libexec/gimp/0.99.8/plug-ins/waves
+libexec/gimp/0.99.8/plug-ins/whirl
+libexec/gimp/0.99.8/plug-ins/xpm
+libexec/gimp/0.99.8/plug-ins/xwd
+share/gimp/0.99.8/brushes/10x10square.gbr
+share/gimp/0.99.8/brushes/10x10squareBlur.gbr
+share/gimp/0.99.8/brushes/11circle.gbr
+share/gimp/0.99.8/brushes/11fcircle.gbr
+share/gimp/0.99.8/brushes/13circle.gbr
+share/gimp/0.99.8/brushes/13fcircle.gbr
+share/gimp/0.99.8/brushes/15circle.gbr
+share/gimp/0.99.8/brushes/15fcircle.gbr
+share/gimp/0.99.8/brushes/17circle.gbr
+share/gimp/0.99.8/brushes/17fcircle.gbr
+share/gimp/0.99.8/brushes/19circle.gbr
+share/gimp/0.99.8/brushes/19fcircle.gbr
+share/gimp/0.99.8/brushes/1circle.gbr
+share/gimp/0.99.8/brushes/20x20square.gbr
+share/gimp/0.99.8/brushes/20x20squareBlur.gbr
+share/gimp/0.99.8/brushes/3circle.gbr
+share/gimp/0.99.8/brushes/3fcircle.gbr
+share/gimp/0.99.8/brushes/50x50cone.gbr
+share/gimp/0.99.8/brushes/50x50square.gbr
+share/gimp/0.99.8/brushes/50x50squareBlur.gbr
+share/gimp/0.99.8/brushes/50x50squareBlur2.gbr
+share/gimp/0.99.8/brushes/5circle.gbr
+share/gimp/0.99.8/brushes/5fcircle.gbr
+share/gimp/0.99.8/brushes/5x5square.gbr
+share/gimp/0.99.8/brushes/5x5squareBlur.gbr
+share/gimp/0.99.8/brushes/7circle.gbr
+share/gimp/0.99.8/brushes/7fcircle.gbr
+share/gimp/0.99.8/brushes/9circle.gbr
+share/gimp/0.99.8/brushes/9fcircle.gbr
+share/gimp/0.99.8/brushes/WindozeSux.gbr
+share/gimp/0.99.8/brushes/airplane.gbr
+share/gimp/0.99.8/brushes/bigGalaxy.gbr
+share/gimp/0.99.8/brushes/bird.gbr
+share/gimp/0.99.8/brushes/bush.gbr
+share/gimp/0.99.8/brushes/cloth.gbr
+share/gimp/0.99.8/brushes/confetti.gbr
+share/gimp/0.99.8/brushes/cross.gbr
+share/gimp/0.99.8/brushes/cross_large.gbr
+share/gimp/0.99.8/brushes/cross_small.gbr
+share/gimp/0.99.8/brushes/diamond.gbr
+share/gimp/0.99.8/brushes/duck.gbr
+share/gimp/0.99.8/brushes/dunes.gbr
+share/gimp/0.99.8/brushes/elk.gbr
+share/gimp/0.99.8/brushes/flags.gbr
+share/gimp/0.99.8/brushes/flower.gbr
+share/gimp/0.99.8/brushes/flower_large.gbr
+share/gimp/0.99.8/brushes/galaxy.gbr
+share/gimp/0.99.8/brushes/galaxy_small.gbr
+share/gimp/0.99.8/brushes/gecko.gbr
+share/gimp/0.99.8/brushes/glyph.gbr
+share/gimp/0.99.8/brushes/grid.gbr
+share/gimp/0.99.8/brushes/grid2.gbr
+share/gimp/0.99.8/brushes/guitar.gbr
+share/gimp/0.99.8/brushes/hash.gbr
+share/gimp/0.99.8/brushes/jack.gbr
+share/gimp/0.99.8/brushes/manta.gbr
+share/gimp/0.99.8/brushes/nova.gbr
+share/gimp/0.99.8/brushes/pixel.gbr
+share/gimp/0.99.8/brushes/qbert2.gbr
+share/gimp/0.99.8/brushes/qbert3Blur.gbr
+share/gimp/0.99.8/brushes/ribbon.gbr
+share/gimp/0.99.8/brushes/rings1.gbr
+share/gimp/0.99.8/brushes/rings2.gbr
+share/gimp/0.99.8/brushes/rings3.gbr
+share/gimp/0.99.8/brushes/rings4.gbr
+share/gimp/0.99.8/brushes/rings5.gbr
+share/gimp/0.99.8/brushes/rings6.gbr
+share/gimp/0.99.8/brushes/rings7.gbr
+share/gimp/0.99.8/brushes/sball.gbr
+share/gimp/0.99.8/brushes/slope.gbr
+share/gimp/0.99.8/brushes/snake.gbr
+share/gimp/0.99.8/brushes/snowflake.gbr
+share/gimp/0.99.8/brushes/sparkle.gbr
+share/gimp/0.99.8/brushes/sparkle2.gbr
+share/gimp/0.99.8/brushes/star_medium.gbr
+share/gimp/0.99.8/brushes/star_small.gbr
+share/gimp/0.99.8/brushes/swirl.gbr
+share/gimp/0.99.8/brushes/swirl2.gbr
+share/gimp/0.99.8/brushes/thegimp.gbr
+share/gimp/0.99.8/brushes/therefore.gbr
+share/gimp/0.99.8/brushes/tictactoe.gbr
+share/gimp/0.99.8/brushes/tile.gbr
+share/gimp/0.99.8/brushes/triangle.gbr
+share/gimp/0.99.8/brushes/tulip.gbr
+share/gimp/0.99.8/brushes/xcf.gbr
+share/gimp/0.99.8/gimp_logo.ppm
+share/gimp/0.99.8/gimprc
+share/gimp/0.99.8/gradients/Default
+share/gimp/0.99.8/gradients/French_flag
+share/gimp/0.99.8/gradients/French_flag_smooth
+share/gimp/0.99.8/gradients/Full_saturation_spectrum_CCW
+share/gimp/0.99.8/gradients/Full_saturation_spectrum_CW
+share/gimp/0.99.8/gradients/German_flag
+share/gimp/0.99.8/gradients/German_flag_smooth
+share/gimp/0.99.8/gradients/Mexican_flag
+share/gimp/0.99.8/gradients/Mexican_flag_smooth
+share/gimp/0.99.8/palettes/Blues
+share/gimp/0.99.8/palettes/Browns_And_Yellows
+share/gimp/0.99.8/palettes/Cool_Colors
+share/gimp/0.99.8/palettes/Default
+share/gimp/0.99.8/palettes/Grays
+share/gimp/0.99.8/palettes/Greens
+share/gimp/0.99.8/palettes/Lights
+share/gimp/0.99.8/palettes/Muted
+share/gimp/0.99.8/palettes/Pastels
+share/gimp/0.99.8/palettes/Reds_And_Purples
+share/gimp/0.99.8/palettes/Warm_Colors
+share/gimp/0.99.8/patterns/3dgreen.pat
+share/gimp/0.99.8/patterns/Craters.pat
+share/gimp/0.99.8/patterns/Moonfoot.pat
+share/gimp/0.99.8/patterns/amethyst.pat
+share/gimp/0.99.8/patterns/bark.pat
+share/gimp/0.99.8/patterns/blackwhitefloor.pat
+share/gimp/0.99.8/patterns/blue.pat
+share/gimp/0.99.8/patterns/blueweb.pat
+share/gimp/0.99.8/patterns/brick.pat
+share/gimp/0.99.8/patterns/burlap.pat
+share/gimp/0.99.8/patterns/burlwood.pat
+share/gimp/0.99.8/patterns/chains.pat
+share/gimp/0.99.8/patterns/choc_swirl.pat
+share/gimp/0.99.8/patterns/circuit.pat
+share/gimp/0.99.8/patterns/clouds.pat
+share/gimp/0.99.8/patterns/clovers.pat
+share/gimp/0.99.8/patterns/coins.pat
+share/gimp/0.99.8/patterns/color.pat
+share/gimp/0.99.8/patterns/corkboard.pat
+share/gimp/0.99.8/patterns/cracked.pat
+share/gimp/0.99.8/patterns/crazytile.pat
+share/gimp/0.99.8/patterns/crinklepaper.pat
+share/gimp/0.99.8/patterns/drymud.pat
+share/gimp/0.99.8/patterns/dunes.pat
+share/gimp/0.99.8/patterns/eggcarton.pat
+share/gimp/0.99.8/patterns/electric.pat
+share/gimp/0.99.8/patterns/fibers.pat
+share/gimp/0.99.8/patterns/floor_tile.pat
+share/gimp/0.99.8/patterns/granite1.pat
+share/gimp/0.99.8/patterns/granite2.pat
+share/gimp/0.99.8/patterns/green_curtains.pat
+share/gimp/0.99.8/patterns/ground1.pat
+share/gimp/0.99.8/patterns/java.pat
+share/gimp/0.99.8/patterns/krinkle.pat
+share/gimp/0.99.8/patterns/lathe.pat
+share/gimp/0.99.8/patterns/leather.pat
+share/gimp/0.99.8/patterns/leaves.pat
+share/gimp/0.99.8/patterns/leaves3.pat
+share/gimp/0.99.8/patterns/leaves4.pat
+share/gimp/0.99.8/patterns/leaves6.pat
+share/gimp/0.99.8/patterns/leopard.pat
+share/gimp/0.99.8/patterns/lightning.pat
+share/gimp/0.99.8/patterns/lumps.pat
+share/gimp/0.99.8/patterns/marble1.pat
+share/gimp/0.99.8/patterns/marble2.pat
+share/gimp/0.99.8/patterns/marble3.pat
+share/gimp/0.99.8/patterns/mhuerock.pat
+share/gimp/0.99.8/patterns/money.pat
+share/gimp/0.99.8/patterns/oooh.pat
+share/gimp/0.99.8/patterns/oooh3.pat
+share/gimp/0.99.8/patterns/paper.pat
+share/gimp/0.99.8/patterns/parque1.pat
+share/gimp/0.99.8/patterns/parque2.pat
+share/gimp/0.99.8/patterns/parque3.pat
+share/gimp/0.99.8/patterns/pine.pat
+share/gimp/0.99.8/patterns/pink_marble.pat
+share/gimp/0.99.8/patterns/pj.pat
+share/gimp/0.99.8/patterns/pool.pat
+share/gimp/0.99.8/patterns/qube1.pat
+share/gimp/0.99.8/patterns/recessed.pat
+share/gimp/0.99.8/patterns/rock.pat
+share/gimp/0.99.8/patterns/sky.pat
+share/gimp/0.99.8/patterns/slate.pat
+share/gimp/0.99.8/patterns/sm_squares.pat
+share/gimp/0.99.8/patterns/startile.pat
+share/gimp/0.99.8/patterns/stone33.pat
+share/gimp/0.99.8/patterns/swirl.pat
+share/gimp/0.99.8/patterns/swirl2.pat
+share/gimp/0.99.8/patterns/terra.pat
+share/gimp/0.99.8/patterns/torrents.pat
+share/gimp/0.99.8/patterns/walnut.pat
+share/gimp/0.99.8/patterns/water3.pat
+share/gimp/0.99.8/patterns/waves.pat
+share/gimp/0.99.8/patterns/wax.pat
+share/gimp/0.99.8/patterns/wood1.pat
+share/gimp/0.99.8/patterns/wood2.pat
+share/gimp/0.99.8/patterns/wood3.pat
+share/gimp/0.99.8/patterns/wood4.pat
+share/gimp/0.99.8/patterns/wood5.pat
+share/gimp/0.99.8/scripts/alien-glow.scm
+share/gimp/0.99.8/scripts/bds-logo-textured.scm
+share/gimp/0.99.8/scripts/beavis.jpg
+share/gimp/0.99.8/scripts/blend-logo.scm
+share/gimp/0.99.8/scripts/carve.scm
+share/gimp/0.99.8/scripts/chrome-it.scm
+share/gimp/0.99.8/scripts/chrome.scm
+share/gimp/0.99.8/scripts/chrome2.scm
+share/gimp/0.99.8/scripts/clothify.scm
+share/gimp/0.99.8/scripts/crystal.scm
+share/gimp/0.99.8/scripts/ds-logo.scm
+share/gimp/0.99.8/scripts/frozen-text.scm
+share/gimp/0.99.8/scripts/glowing.scm
+share/gimp/0.99.8/scripts/hds-logo.scm
+share/gimp/0.99.8/scripts/neon.scm
+share/gimp/0.99.8/scripts/sphere.scm
+share/gimp/0.99.8/scripts/swirltile.scm
+share/gimp/0.99.8/scripts/t-o-p.scm
+share/gimp/0.99.8/scripts/text-circle.scm
+share/gimp/0.99.8/scripts/texture1.jpg
+share/gimp/0.99.8/scripts/texture2.jpg
+share/gimp/0.99.8/user_install
+@dirrm include/glib
 @dirrm include/gdk
 @dirrm include/glib
-@dirrm include/gtk
-@dirrm libexec/gimp/0.99.7/plug-ins
-@dirrm libexec/gimp/0.99.7
+@dirrm include/libgimp
+@dirrm libexec/gimp/0.99.8/plug-ins
+@dirrm libexec/gimp/0.99.8
 @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/0.99.8/scripts
+@dirrm share/gimp/0.99.8/brushes
+@dirrm share/gimp/0.99.8/palettes
+@dirrm share/gimp/0.99.8/gradients
+@dirrm share/gimp/0.99.8/patterns
+@dirrm share/gimp/0.99.8
 @dirrm share/gimp
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index a6a96948dec2..5c6f6d1643f5 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -3,10 +3,13 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.6 1997/03/27 21:41:12 erich Exp $
+# $Id: Makefile,v 1.7 1997/04/08 22:06:51 erich Exp $
 #
 
-DISTNAME=       gimp-0.99.7
+VERSION=			0.99.8
+DISTNAME=       gimp-${VERSION}
+DISTFILES=	${DISTNAME}.tar.gz gimp-data-0.99.8.tar.gz
+
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
 
@@ -22,5 +25,13 @@ GNU_CONFIGURE=	yes
 
 USE_GMAKE=	yes
 
+DATASTUFF=  brushes palettes gradients patterns
+
+post-install:
+	cd ${WRKDIR}/gimp-data-${VERSION}; \
+	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
+	(cd ${PREFIX}/share/gimp/${VERSION}; tar -xvf -)
+
+
 .include <bsd.port.mk>
 
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index ecc8c7a5cd07..de8ff392435a 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1 +1,2 @@
-MD5 (gimp-0.99.7.tar.gz) = ac10f6df1ff610943140994c7b6ee59f
+MD5 (gimp-0.99.8.tar.gz) = 0466a576f25bfdb56774ba342059b343
+MD5 (gimp-data-0.99.8.tar.gz) = 80c4296ef85ffdec045b52a498b5caaa
diff --git a/graphics/gimp-devel/files/patch-ab b/graphics/gimp-devel/files/patch-ab
index 27354846adb6..081000754daa 100644
--- a/graphics/gimp-devel/files/patch-ab
+++ b/graphics/gimp-devel/files/patch-ab
@@ -16,14 +16,143 @@
        _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;
+--- plug-ins/ripple.c~	Fri Apr 18 09:21:26 1997
++++ plug-ins/ripple.c	Fri Apr 18 09:21:31 1997
+@@ -1015,7 +1015,7 @@
+     switch (rvals.waveform)
+     {
+         case SINE:
+-            return rvals.amplitude*sin(location*(2*PI)/(double)rvals.period);
++            return rvals.amplitude*sin(location*(2*M_PI)/(double)rvals.period);
+             break;
+         case SAWTOOTH:
+             return floor(rvals.amplitude*(fabs((((location%rvals.period)/(double)rvals.period)*4)-2)-1));
+
+The patches for displace
+------------------------
+*** plug-ins/displace.c.ots	Tue Apr  8 09:07:34 1997
+--- plug-ins/displace.c	Tue Apr  8 09:53:32 1997
+***************
+*** 222,231 ****
+  	  dvals.amount_x = param[3].data.d_float;
+  	  dvals.amount_y = param[4].data.d_float;
+  	  dvals.do_x = param[5].data.d_int32;
+! 	  dvals.do_x = param[6].data.d_int32;
+  	  dvals.displace_map_x = param[7].data.d_int32;
+  	  dvals.displace_map_y = param[8].data.d_int32;
+  	  dvals.displace_type = param[9].data.d_int32;
+  	}
+        break;
+  
+--- 222,238 ----
+  	  dvals.amount_x = param[3].data.d_float;
+  	  dvals.amount_y = param[4].data.d_float;
+  	  dvals.do_x = param[5].data.d_int32;
+! 	  dvals.do_y = param[6].data.d_int32;
+  	  dvals.displace_map_x = param[7].data.d_int32;
+  	  dvals.displace_map_y = param[8].data.d_int32;
+  	  dvals.displace_type = param[9].data.d_int32;
++ 
++ 	  if (dvals.do_x && 
++ 	      gimp_drawable_type(dvals.displace_map_x) != GRAY_IMAGE)
++ 	    status = STATUS_CALLING_ERROR;
++ 	  if (dvals.do_y && 
++ 	      gimp_drawable_type(dvals.displace_map_y) != GRAY_IMAGE)
++ 	    status = STATUS_CALLING_ERROR;
+  	}
+        break;
+  
+***************
+*** 566,592 ****
+  	      if (dvals.displace_type == WRAP)
+  		{
+  		  if (xi < 0)
+! 		    xi = width - (-xi % width);
+  		  else
+! 		    xi %= width;
+  
+  		  if (yi < 0)
+! 		    yi = height - (-yi % height);
+  		  else
+! 		    yi %= height;
+  		}
+  	      /* Smear out the edges of the image by repeating pixels. */
+  	      else if (dvals.displace_type == SMEAR)
+  		{
+  		  if (xi < 0)
+  		    xi = 0;
+! 		  else if (xi > width - 1)
+! 		    xi = width - 1;
+  
+  		  if (yi < 0)
+  		    yi = 0;
+! 		  else if (yi > height - 1)
+! 		    yi = height - 1;
+  		}
+  
+  	      tile = displace_pixel (drawable, tile, x1, y1, x2, y2, xi, yi, &row, &col, pixel[0]);
+--- 573,599 ----
+  	      if (dvals.displace_type == WRAP)
+  		{
+  		  if (xi < 0)
+! 		    xi = (width-1) - (-xi % (width-1));
+  		  else
+! 		    xi %= (width-1);
+  
+  		  if (yi < 0)
+! 		    yi = (height-1) - (-yi % (height-1));
+  		  else
+! 		    yi %= (height-1);
+  		}
+  	      /* Smear out the edges of the image by repeating pixels. */
+  	      else if (dvals.displace_type == SMEAR)
+  		{
+  		  if (xi < 0)
+  		    xi = 0;
+! 		  else if (xi > width - 2)
+! 		    xi = width - 2;
+  
+  		  if (yi < 0)
+  		    yi = 0;
+! 		  else if (yi > height - 2)
+! 		    yi = height - 2;
+  		}
+  
+  	      tile = displace_pixel (drawable, tile, x1, y1, x2, y2, xi, yi, &row, &col, pixel[0]);
+***************
+*** 712,718 ****
+      return TRUE;
+  
+    if (gimp_drawable_width (drawable_id) == drawable->width &&
+!       gimp_drawable_height (drawable_id) == drawable->height)
+      return TRUE;
+    else
+      return FALSE;
+--- 719,726 ----
+      return TRUE;
+  
+    if (gimp_drawable_width (drawable_id) == drawable->width &&
+!       gimp_drawable_height (drawable_id) == drawable->height &&
+!       gimp_drawable_type (drawable_id) == GRAY_IMAGE)
+      return TRUE;
+    else
+      return FALSE;
+
+--- plug-ins/script-fu/interp_regex.c~	Fri Apr 18 14:00:00 1997
++++ plug-ins/script-fu/interp_regex.c	Fri Apr 18 14:00:45 1997
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- plug-ins/plasma.c~	Fri Apr 18 15:01:43 1997
++++ plug-ins/plasma.c	Fri Apr 18 15:01:53 1997
+@@ -310,7 +310,7 @@
+   gtk_widget_set_usize( entry, ENTRY_WIDTH, 0 );
+   sprintf( buffer, "%d", pvals.seed );
+   gtk_entry_set_text (GTK_ENTRY (entry), buffer );
+-  gtk_signal_connect (GTK_OBJECT (entry), "changed_text",
++  gtk_signal_connect (GTK_OBJECT (entry), "changed",
+ 		      (GtkSignalFunc) plasma_entry_callback,
+ 		      &pvals.seed);
+   gtk_widget_show (entry);
diff --git a/graphics/gimp-devel/files/patch-ac b/graphics/gimp-devel/files/patch-ac
index f1efdf5f3839..6ee30980df23 100644
--- a/graphics/gimp-devel/files/patch-ac
+++ b/graphics/gimp-devel/files/patch-ac
@@ -25,17 +25,17 @@
  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
+--- configure.orig	Fri Apr 18 03:57:14 1997
++++ configure	Fri Apr 18 08:44:36 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
+ echo "configure:570: checking for a BSD compatible install" >&5
 +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 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -616,7 +617,7 @@
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
@@ -44,7 +44,7 @@
  
  
  PACKAGE=gimp
-@@ -2173,7 +2174,7 @@
+@@ -2172,7 +2173,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE/$VERSION
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index 7d1b270a48f3..4a3891fb0068 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -1,3 +1,4 @@
+bin/gimp
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdkkeysyms.h
@@ -5,283 +6,311 @@ include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
 include/glib/gconfig.h
+include/glib/gconfig.h
+include/glib/glib.h
 include/glib/glib.h
-include/gtk/gtk.h
-include/gtk/gtkaccelerator.h
-include/gtk/gtkadjustment.h
-include/gtk/gtkalignment.h
-include/gtk/gtkarrow.h
-include/gtk/gtkbin.h
-include/gtk/gtkbox.h
-include/gtk/gtkbutton.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
-include/gtk/gtkdrawingarea.h
-include/gtk/gtkentry.h
-include/gtk/gtkenums.h
-include/gtk/gtkfilesel.h
-include/gtk/gtkframe.h
-include/gtk/gtkgc.h
-include/gtk/gtkhbox.h
-include/gtk/gtkhruler.h
-include/gtk/gtkhscale.h
-include/gtk/gtkhscrollbar.h
-include/gtk/gtkhseparator.h
-include/gtk/gtkimage.h
-include/gtk/gtkitem.h
-include/gtk/gtklabel.h
-include/gtk/gtklist.h
-include/gtk/gtklistitem.h
-include/gtk/gtkmain.h
-include/gtk/gtkmenu.h
-include/gtk/gtkmenubar.h
-include/gtk/gtkmenufactory.h
-include/gtk/gtkmenuitem.h
-include/gtk/gtkmenushell.h
-include/gtk/gtkmisc.h
-include/gtk/gtknotebook.h
-include/gtk/gtkobject.h
-include/gtk/gtkoptionmenu.h
-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
-include/gtk/gtkscale.h
-include/gtk/gtkscrollbar.h
-include/gtk/gtkscrolledwindow.h
-include/gtk/gtkseparator.h
-include/gtk/gtksignal.h
-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
-include/gtk/gtkvbox.h
-include/gtk/gtkviewport.h
-include/gtk/gtkvruler.h
-include/gtk/gtkvscale.h
-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/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/pdb.info
+info/pdb.info-1
+info/pdb.info-2
 lib/libgdk.a
 lib/libgdk.la
-lib/libgdk.so
 lib/libgdk.so.1.0
 lib/libgimp.a
 lib/libgimp.la
-lib/libgimp.so
 lib/libgimp.so.1.0
 lib/libgimpui.a
 lib/libgimpui.la
-lib/libgimpui.so
 lib/libgimpui.so.1.0
 lib/libglib.a
 lib/libglib.la
-lib/libglib.so
 lib/libglib.so.1.0
 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
+libexec/gimp/0.99.8/plug-ins/CML_explorer
+libexec/gimp/0.99.8/plug-ins/autocrop
+libexec/gimp/0.99.8/plug-ins/blur
+libexec/gimp/0.99.8/plug-ins/bumpmap
+libexec/gimp/0.99.8/plug-ins/c_astretch
+libexec/gimp/0.99.8/plug-ins/checkerboard
+libexec/gimp/0.99.8/plug-ins/cubism
+libexec/gimp/0.99.8/plug-ins/demo
+libexec/gimp/0.99.8/plug-ins/diffraction
+libexec/gimp/0.99.8/plug-ins/displace
+libexec/gimp/0.99.8/plug-ins/edge
+libexec/gimp/0.99.8/plug-ins/emboss
+libexec/gimp/0.99.8/plug-ins/figures
+libexec/gimp/0.99.8/plug-ins/gauss_iir
+libexec/gimp/0.99.8/plug-ins/gauss_rle
+libexec/gimp/0.99.8/plug-ins/gbr
+libexec/gimp/0.99.8/plug-ins/gif
+libexec/gimp/0.99.8/plug-ins/gradmap
+libexec/gimp/0.99.8/plug-ins/grid
+libexec/gimp/0.99.8/plug-ins/header
+libexec/gimp/0.99.8/plug-ins/holes
+libexec/gimp/0.99.8/plug-ins/hot
+libexec/gimp/0.99.8/plug-ins/hrz
+libexec/gimp/0.99.8/plug-ins/ifscompose
+libexec/gimp/0.99.8/plug-ins/jpeg
+libexec/gimp/0.99.8/plug-ins/laplace
+libexec/gimp/0.99.8/plug-ins/mosaic
+libexec/gimp/0.99.8/plug-ins/nlfilt
+libexec/gimp/0.99.8/plug-ins/noisify
+libexec/gimp/0.99.8/plug-ins/normalize
+libexec/gimp/0.99.8/plug-ins/nova
+libexec/gimp/0.99.8/plug-ins/oilify
+libexec/gimp/0.99.8/plug-ins/pat
+libexec/gimp/0.99.8/plug-ins/pcx
+libexec/gimp/0.99.8/plug-ins/pinch
+libexec/gimp/0.99.8/plug-ins/pixelize
+libexec/gimp/0.99.8/plug-ins/plasma
+libexec/gimp/0.99.8/plug-ins/pnm
+libexec/gimp/0.99.8/plug-ins/ps
+libexec/gimp/0.99.8/plug-ins/ripple
+libexec/gimp/0.99.8/plug-ins/script-fu
+libexec/gimp/0.99.8/plug-ins/shift
+libexec/gimp/0.99.8/plug-ins/sobel
+libexec/gimp/0.99.8/plug-ins/sparkle
+libexec/gimp/0.99.8/plug-ins/spread
+libexec/gimp/0.99.8/plug-ins/sunras
+libexec/gimp/0.99.8/plug-ins/tiff
+libexec/gimp/0.99.8/plug-ins/tile
+libexec/gimp/0.99.8/plug-ins/url
+libexec/gimp/0.99.8/plug-ins/video
+libexec/gimp/0.99.8/plug-ins/vinvert
+libexec/gimp/0.99.8/plug-ins/waves
+libexec/gimp/0.99.8/plug-ins/whirl
+libexec/gimp/0.99.8/plug-ins/xpm
+libexec/gimp/0.99.8/plug-ins/xwd
+share/gimp/0.99.8/brushes/10x10square.gbr
+share/gimp/0.99.8/brushes/10x10squareBlur.gbr
+share/gimp/0.99.8/brushes/11circle.gbr
+share/gimp/0.99.8/brushes/11fcircle.gbr
+share/gimp/0.99.8/brushes/13circle.gbr
+share/gimp/0.99.8/brushes/13fcircle.gbr
+share/gimp/0.99.8/brushes/15circle.gbr
+share/gimp/0.99.8/brushes/15fcircle.gbr
+share/gimp/0.99.8/brushes/17circle.gbr
+share/gimp/0.99.8/brushes/17fcircle.gbr
+share/gimp/0.99.8/brushes/19circle.gbr
+share/gimp/0.99.8/brushes/19fcircle.gbr
+share/gimp/0.99.8/brushes/1circle.gbr
+share/gimp/0.99.8/brushes/20x20square.gbr
+share/gimp/0.99.8/brushes/20x20squareBlur.gbr
+share/gimp/0.99.8/brushes/3circle.gbr
+share/gimp/0.99.8/brushes/3fcircle.gbr
+share/gimp/0.99.8/brushes/50x50cone.gbr
+share/gimp/0.99.8/brushes/50x50square.gbr
+share/gimp/0.99.8/brushes/50x50squareBlur.gbr
+share/gimp/0.99.8/brushes/50x50squareBlur2.gbr
+share/gimp/0.99.8/brushes/5circle.gbr
+share/gimp/0.99.8/brushes/5fcircle.gbr
+share/gimp/0.99.8/brushes/5x5square.gbr
+share/gimp/0.99.8/brushes/5x5squareBlur.gbr
+share/gimp/0.99.8/brushes/7circle.gbr
+share/gimp/0.99.8/brushes/7fcircle.gbr
+share/gimp/0.99.8/brushes/9circle.gbr
+share/gimp/0.99.8/brushes/9fcircle.gbr
+share/gimp/0.99.8/brushes/WindozeSux.gbr
+share/gimp/0.99.8/brushes/airplane.gbr
+share/gimp/0.99.8/brushes/bigGalaxy.gbr
+share/gimp/0.99.8/brushes/bird.gbr
+share/gimp/0.99.8/brushes/bush.gbr
+share/gimp/0.99.8/brushes/cloth.gbr
+share/gimp/0.99.8/brushes/confetti.gbr
+share/gimp/0.99.8/brushes/cross.gbr
+share/gimp/0.99.8/brushes/cross_large.gbr
+share/gimp/0.99.8/brushes/cross_small.gbr
+share/gimp/0.99.8/brushes/diamond.gbr
+share/gimp/0.99.8/brushes/duck.gbr
+share/gimp/0.99.8/brushes/dunes.gbr
+share/gimp/0.99.8/brushes/elk.gbr
+share/gimp/0.99.8/brushes/flags.gbr
+share/gimp/0.99.8/brushes/flower.gbr
+share/gimp/0.99.8/brushes/flower_large.gbr
+share/gimp/0.99.8/brushes/galaxy.gbr
+share/gimp/0.99.8/brushes/galaxy_small.gbr
+share/gimp/0.99.8/brushes/gecko.gbr
+share/gimp/0.99.8/brushes/glyph.gbr
+share/gimp/0.99.8/brushes/grid.gbr
+share/gimp/0.99.8/brushes/grid2.gbr
+share/gimp/0.99.8/brushes/guitar.gbr
+share/gimp/0.99.8/brushes/hash.gbr
+share/gimp/0.99.8/brushes/jack.gbr
+share/gimp/0.99.8/brushes/manta.gbr
+share/gimp/0.99.8/brushes/nova.gbr
+share/gimp/0.99.8/brushes/pixel.gbr
+share/gimp/0.99.8/brushes/qbert2.gbr
+share/gimp/0.99.8/brushes/qbert3Blur.gbr
+share/gimp/0.99.8/brushes/ribbon.gbr
+share/gimp/0.99.8/brushes/rings1.gbr
+share/gimp/0.99.8/brushes/rings2.gbr
+share/gimp/0.99.8/brushes/rings3.gbr
+share/gimp/0.99.8/brushes/rings4.gbr
+share/gimp/0.99.8/brushes/rings5.gbr
+share/gimp/0.99.8/brushes/rings6.gbr
+share/gimp/0.99.8/brushes/rings7.gbr
+share/gimp/0.99.8/brushes/sball.gbr
+share/gimp/0.99.8/brushes/slope.gbr
+share/gimp/0.99.8/brushes/snake.gbr
+share/gimp/0.99.8/brushes/snowflake.gbr
+share/gimp/0.99.8/brushes/sparkle.gbr
+share/gimp/0.99.8/brushes/sparkle2.gbr
+share/gimp/0.99.8/brushes/star_medium.gbr
+share/gimp/0.99.8/brushes/star_small.gbr
+share/gimp/0.99.8/brushes/swirl.gbr
+share/gimp/0.99.8/brushes/swirl2.gbr
+share/gimp/0.99.8/brushes/thegimp.gbr
+share/gimp/0.99.8/brushes/therefore.gbr
+share/gimp/0.99.8/brushes/tictactoe.gbr
+share/gimp/0.99.8/brushes/tile.gbr
+share/gimp/0.99.8/brushes/triangle.gbr
+share/gimp/0.99.8/brushes/tulip.gbr
+share/gimp/0.99.8/brushes/xcf.gbr
+share/gimp/0.99.8/gimp_logo.ppm
+share/gimp/0.99.8/gimprc
+share/gimp/0.99.8/gradients/Default
+share/gimp/0.99.8/gradients/French_flag
+share/gimp/0.99.8/gradients/French_flag_smooth
+share/gimp/0.99.8/gradients/Full_saturation_spectrum_CCW
+share/gimp/0.99.8/gradients/Full_saturation_spectrum_CW
+share/gimp/0.99.8/gradients/German_flag
+share/gimp/0.99.8/gradients/German_flag_smooth
+share/gimp/0.99.8/gradients/Mexican_flag
+share/gimp/0.99.8/gradients/Mexican_flag_smooth
+share/gimp/0.99.8/palettes/Blues
+share/gimp/0.99.8/palettes/Browns_And_Yellows
+share/gimp/0.99.8/palettes/Cool_Colors
+share/gimp/0.99.8/palettes/Default
+share/gimp/0.99.8/palettes/Grays
+share/gimp/0.99.8/palettes/Greens
+share/gimp/0.99.8/palettes/Lights
+share/gimp/0.99.8/palettes/Muted
+share/gimp/0.99.8/palettes/Pastels
+share/gimp/0.99.8/palettes/Reds_And_Purples
+share/gimp/0.99.8/palettes/Warm_Colors
+share/gimp/0.99.8/patterns/3dgreen.pat
+share/gimp/0.99.8/patterns/Craters.pat
+share/gimp/0.99.8/patterns/Moonfoot.pat
+share/gimp/0.99.8/patterns/amethyst.pat
+share/gimp/0.99.8/patterns/bark.pat
+share/gimp/0.99.8/patterns/blackwhitefloor.pat
+share/gimp/0.99.8/patterns/blue.pat
+share/gimp/0.99.8/patterns/blueweb.pat
+share/gimp/0.99.8/patterns/brick.pat
+share/gimp/0.99.8/patterns/burlap.pat
+share/gimp/0.99.8/patterns/burlwood.pat
+share/gimp/0.99.8/patterns/chains.pat
+share/gimp/0.99.8/patterns/choc_swirl.pat
+share/gimp/0.99.8/patterns/circuit.pat
+share/gimp/0.99.8/patterns/clouds.pat
+share/gimp/0.99.8/patterns/clovers.pat
+share/gimp/0.99.8/patterns/coins.pat
+share/gimp/0.99.8/patterns/color.pat
+share/gimp/0.99.8/patterns/corkboard.pat
+share/gimp/0.99.8/patterns/cracked.pat
+share/gimp/0.99.8/patterns/crazytile.pat
+share/gimp/0.99.8/patterns/crinklepaper.pat
+share/gimp/0.99.8/patterns/drymud.pat
+share/gimp/0.99.8/patterns/dunes.pat
+share/gimp/0.99.8/patterns/eggcarton.pat
+share/gimp/0.99.8/patterns/electric.pat
+share/gimp/0.99.8/patterns/fibers.pat
+share/gimp/0.99.8/patterns/floor_tile.pat
+share/gimp/0.99.8/patterns/granite1.pat
+share/gimp/0.99.8/patterns/granite2.pat
+share/gimp/0.99.8/patterns/green_curtains.pat
+share/gimp/0.99.8/patterns/ground1.pat
+share/gimp/0.99.8/patterns/java.pat
+share/gimp/0.99.8/patterns/krinkle.pat
+share/gimp/0.99.8/patterns/lathe.pat
+share/gimp/0.99.8/patterns/leather.pat
+share/gimp/0.99.8/patterns/leaves.pat
+share/gimp/0.99.8/patterns/leaves3.pat
+share/gimp/0.99.8/patterns/leaves4.pat
+share/gimp/0.99.8/patterns/leaves6.pat
+share/gimp/0.99.8/patterns/leopard.pat
+share/gimp/0.99.8/patterns/lightning.pat
+share/gimp/0.99.8/patterns/lumps.pat
+share/gimp/0.99.8/patterns/marble1.pat
+share/gimp/0.99.8/patterns/marble2.pat
+share/gimp/0.99.8/patterns/marble3.pat
+share/gimp/0.99.8/patterns/mhuerock.pat
+share/gimp/0.99.8/patterns/money.pat
+share/gimp/0.99.8/patterns/oooh.pat
+share/gimp/0.99.8/patterns/oooh3.pat
+share/gimp/0.99.8/patterns/paper.pat
+share/gimp/0.99.8/patterns/parque1.pat
+share/gimp/0.99.8/patterns/parque2.pat
+share/gimp/0.99.8/patterns/parque3.pat
+share/gimp/0.99.8/patterns/pine.pat
+share/gimp/0.99.8/patterns/pink_marble.pat
+share/gimp/0.99.8/patterns/pj.pat
+share/gimp/0.99.8/patterns/pool.pat
+share/gimp/0.99.8/patterns/qube1.pat
+share/gimp/0.99.8/patterns/recessed.pat
+share/gimp/0.99.8/patterns/rock.pat
+share/gimp/0.99.8/patterns/sky.pat
+share/gimp/0.99.8/patterns/slate.pat
+share/gimp/0.99.8/patterns/sm_squares.pat
+share/gimp/0.99.8/patterns/startile.pat
+share/gimp/0.99.8/patterns/stone33.pat
+share/gimp/0.99.8/patterns/swirl.pat
+share/gimp/0.99.8/patterns/swirl2.pat
+share/gimp/0.99.8/patterns/terra.pat
+share/gimp/0.99.8/patterns/torrents.pat
+share/gimp/0.99.8/patterns/walnut.pat
+share/gimp/0.99.8/patterns/water3.pat
+share/gimp/0.99.8/patterns/waves.pat
+share/gimp/0.99.8/patterns/wax.pat
+share/gimp/0.99.8/patterns/wood1.pat
+share/gimp/0.99.8/patterns/wood2.pat
+share/gimp/0.99.8/patterns/wood3.pat
+share/gimp/0.99.8/patterns/wood4.pat
+share/gimp/0.99.8/patterns/wood5.pat
+share/gimp/0.99.8/scripts/alien-glow.scm
+share/gimp/0.99.8/scripts/bds-logo-textured.scm
+share/gimp/0.99.8/scripts/beavis.jpg
+share/gimp/0.99.8/scripts/blend-logo.scm
+share/gimp/0.99.8/scripts/carve.scm
+share/gimp/0.99.8/scripts/chrome-it.scm
+share/gimp/0.99.8/scripts/chrome.scm
+share/gimp/0.99.8/scripts/chrome2.scm
+share/gimp/0.99.8/scripts/clothify.scm
+share/gimp/0.99.8/scripts/crystal.scm
+share/gimp/0.99.8/scripts/ds-logo.scm
+share/gimp/0.99.8/scripts/frozen-text.scm
+share/gimp/0.99.8/scripts/glowing.scm
+share/gimp/0.99.8/scripts/hds-logo.scm
+share/gimp/0.99.8/scripts/neon.scm
+share/gimp/0.99.8/scripts/sphere.scm
+share/gimp/0.99.8/scripts/swirltile.scm
+share/gimp/0.99.8/scripts/t-o-p.scm
+share/gimp/0.99.8/scripts/text-circle.scm
+share/gimp/0.99.8/scripts/texture1.jpg
+share/gimp/0.99.8/scripts/texture2.jpg
+share/gimp/0.99.8/user_install
+@dirrm include/glib
 @dirrm include/gdk
 @dirrm include/glib
-@dirrm include/gtk
-@dirrm libexec/gimp/0.99.7/plug-ins
-@dirrm libexec/gimp/0.99.7
+@dirrm include/libgimp
+@dirrm libexec/gimp/0.99.8/plug-ins
+@dirrm libexec/gimp/0.99.8
 @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/0.99.8/scripts
+@dirrm share/gimp/0.99.8/brushes
+@dirrm share/gimp/0.99.8/palettes
+@dirrm share/gimp/0.99.8/gradients
+@dirrm share/gimp/0.99.8/patterns
+@dirrm share/gimp/0.99.8
 @dirrm share/gimp
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index a6a96948dec2..5c6f6d1643f5 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,10 +3,13 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.6 1997/03/27 21:41:12 erich Exp $
+# $Id: Makefile,v 1.7 1997/04/08 22:06:51 erich Exp $
 #
 
-DISTNAME=       gimp-0.99.7
+VERSION=			0.99.8
+DISTNAME=       gimp-${VERSION}
+DISTFILES=	${DISTNAME}.tar.gz gimp-data-0.99.8.tar.gz
+
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
 
@@ -22,5 +25,13 @@ GNU_CONFIGURE=	yes
 
 USE_GMAKE=	yes
 
+DATASTUFF=  brushes palettes gradients patterns
+
+post-install:
+	cd ${WRKDIR}/gimp-data-${VERSION}; \
+	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
+	(cd ${PREFIX}/share/gimp/${VERSION}; tar -xvf -)
+
+
 .include <bsd.port.mk>
 
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index ecc8c7a5cd07..de8ff392435a 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1 +1,2 @@
-MD5 (gimp-0.99.7.tar.gz) = ac10f6df1ff610943140994c7b6ee59f
+MD5 (gimp-0.99.8.tar.gz) = 0466a576f25bfdb56774ba342059b343
+MD5 (gimp-data-0.99.8.tar.gz) = 80c4296ef85ffdec045b52a498b5caaa
diff --git a/graphics/gimp/files/patch-ab b/graphics/gimp/files/patch-ab
index 27354846adb6..081000754daa 100644
--- a/graphics/gimp/files/patch-ab
+++ b/graphics/gimp/files/patch-ab
@@ -16,14 +16,143 @@
        _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;
+--- plug-ins/ripple.c~	Fri Apr 18 09:21:26 1997
++++ plug-ins/ripple.c	Fri Apr 18 09:21:31 1997
+@@ -1015,7 +1015,7 @@
+     switch (rvals.waveform)
+     {
+         case SINE:
+-            return rvals.amplitude*sin(location*(2*PI)/(double)rvals.period);
++            return rvals.amplitude*sin(location*(2*M_PI)/(double)rvals.period);
+             break;
+         case SAWTOOTH:
+             return floor(rvals.amplitude*(fabs((((location%rvals.period)/(double)rvals.period)*4)-2)-1));
+
+The patches for displace
+------------------------
+*** plug-ins/displace.c.ots	Tue Apr  8 09:07:34 1997
+--- plug-ins/displace.c	Tue Apr  8 09:53:32 1997
+***************
+*** 222,231 ****
+  	  dvals.amount_x = param[3].data.d_float;
+  	  dvals.amount_y = param[4].data.d_float;
+  	  dvals.do_x = param[5].data.d_int32;
+! 	  dvals.do_x = param[6].data.d_int32;
+  	  dvals.displace_map_x = param[7].data.d_int32;
+  	  dvals.displace_map_y = param[8].data.d_int32;
+  	  dvals.displace_type = param[9].data.d_int32;
+  	}
+        break;
+  
+--- 222,238 ----
+  	  dvals.amount_x = param[3].data.d_float;
+  	  dvals.amount_y = param[4].data.d_float;
+  	  dvals.do_x = param[5].data.d_int32;
+! 	  dvals.do_y = param[6].data.d_int32;
+  	  dvals.displace_map_x = param[7].data.d_int32;
+  	  dvals.displace_map_y = param[8].data.d_int32;
+  	  dvals.displace_type = param[9].data.d_int32;
++ 
++ 	  if (dvals.do_x && 
++ 	      gimp_drawable_type(dvals.displace_map_x) != GRAY_IMAGE)
++ 	    status = STATUS_CALLING_ERROR;
++ 	  if (dvals.do_y && 
++ 	      gimp_drawable_type(dvals.displace_map_y) != GRAY_IMAGE)
++ 	    status = STATUS_CALLING_ERROR;
+  	}
+        break;
+  
+***************
+*** 566,592 ****
+  	      if (dvals.displace_type == WRAP)
+  		{
+  		  if (xi < 0)
+! 		    xi = width - (-xi % width);
+  		  else
+! 		    xi %= width;
+  
+  		  if (yi < 0)
+! 		    yi = height - (-yi % height);
+  		  else
+! 		    yi %= height;
+  		}
+  	      /* Smear out the edges of the image by repeating pixels. */
+  	      else if (dvals.displace_type == SMEAR)
+  		{
+  		  if (xi < 0)
+  		    xi = 0;
+! 		  else if (xi > width - 1)
+! 		    xi = width - 1;
+  
+  		  if (yi < 0)
+  		    yi = 0;
+! 		  else if (yi > height - 1)
+! 		    yi = height - 1;
+  		}
+  
+  	      tile = displace_pixel (drawable, tile, x1, y1, x2, y2, xi, yi, &row, &col, pixel[0]);
+--- 573,599 ----
+  	      if (dvals.displace_type == WRAP)
+  		{
+  		  if (xi < 0)
+! 		    xi = (width-1) - (-xi % (width-1));
+  		  else
+! 		    xi %= (width-1);
+  
+  		  if (yi < 0)
+! 		    yi = (height-1) - (-yi % (height-1));
+  		  else
+! 		    yi %= (height-1);
+  		}
+  	      /* Smear out the edges of the image by repeating pixels. */
+  	      else if (dvals.displace_type == SMEAR)
+  		{
+  		  if (xi < 0)
+  		    xi = 0;
+! 		  else if (xi > width - 2)
+! 		    xi = width - 2;
+  
+  		  if (yi < 0)
+  		    yi = 0;
+! 		  else if (yi > height - 2)
+! 		    yi = height - 2;
+  		}
+  
+  	      tile = displace_pixel (drawable, tile, x1, y1, x2, y2, xi, yi, &row, &col, pixel[0]);
+***************
+*** 712,718 ****
+      return TRUE;
+  
+    if (gimp_drawable_width (drawable_id) == drawable->width &&
+!       gimp_drawable_height (drawable_id) == drawable->height)
+      return TRUE;
+    else
+      return FALSE;
+--- 719,726 ----
+      return TRUE;
+  
+    if (gimp_drawable_width (drawable_id) == drawable->width &&
+!       gimp_drawable_height (drawable_id) == drawable->height &&
+!       gimp_drawable_type (drawable_id) == GRAY_IMAGE)
+      return TRUE;
+    else
+      return FALSE;
+
+--- plug-ins/script-fu/interp_regex.c~	Fri Apr 18 14:00:00 1997
++++ plug-ins/script-fu/interp_regex.c	Fri Apr 18 14:00:45 1997
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- plug-ins/plasma.c~	Fri Apr 18 15:01:43 1997
++++ plug-ins/plasma.c	Fri Apr 18 15:01:53 1997
+@@ -310,7 +310,7 @@
+   gtk_widget_set_usize( entry, ENTRY_WIDTH, 0 );
+   sprintf( buffer, "%d", pvals.seed );
+   gtk_entry_set_text (GTK_ENTRY (entry), buffer );
+-  gtk_signal_connect (GTK_OBJECT (entry), "changed_text",
++  gtk_signal_connect (GTK_OBJECT (entry), "changed",
+ 		      (GtkSignalFunc) plasma_entry_callback,
+ 		      &pvals.seed);
+   gtk_widget_show (entry);
diff --git a/graphics/gimp/files/patch-ac b/graphics/gimp/files/patch-ac
index f1efdf5f3839..6ee30980df23 100644
--- a/graphics/gimp/files/patch-ac
+++ b/graphics/gimp/files/patch-ac
@@ -25,17 +25,17 @@
  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
+--- configure.orig	Fri Apr 18 03:57:14 1997
++++ configure	Fri Apr 18 08:44:36 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
+ echo "configure:570: checking for a BSD compatible install" >&5
 +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 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -616,7 +617,7 @@
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
@@ -44,7 +44,7 @@
  
  
  PACKAGE=gimp
-@@ -2173,7 +2174,7 @@
+@@ -2172,7 +2173,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE/$VERSION
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 7d1b270a48f3..4a3891fb0068 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -1,3 +1,4 @@
+bin/gimp
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdkkeysyms.h
@@ -5,283 +6,311 @@ include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
 include/glib/gconfig.h
+include/glib/gconfig.h
+include/glib/glib.h
 include/glib/glib.h
-include/gtk/gtk.h
-include/gtk/gtkaccelerator.h
-include/gtk/gtkadjustment.h
-include/gtk/gtkalignment.h
-include/gtk/gtkarrow.h
-include/gtk/gtkbin.h
-include/gtk/gtkbox.h
-include/gtk/gtkbutton.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
-include/gtk/gtkdrawingarea.h
-include/gtk/gtkentry.h
-include/gtk/gtkenums.h
-include/gtk/gtkfilesel.h
-include/gtk/gtkframe.h
-include/gtk/gtkgc.h
-include/gtk/gtkhbox.h
-include/gtk/gtkhruler.h
-include/gtk/gtkhscale.h
-include/gtk/gtkhscrollbar.h
-include/gtk/gtkhseparator.h
-include/gtk/gtkimage.h
-include/gtk/gtkitem.h
-include/gtk/gtklabel.h
-include/gtk/gtklist.h
-include/gtk/gtklistitem.h
-include/gtk/gtkmain.h
-include/gtk/gtkmenu.h
-include/gtk/gtkmenubar.h
-include/gtk/gtkmenufactory.h
-include/gtk/gtkmenuitem.h
-include/gtk/gtkmenushell.h
-include/gtk/gtkmisc.h
-include/gtk/gtknotebook.h
-include/gtk/gtkobject.h
-include/gtk/gtkoptionmenu.h
-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
-include/gtk/gtkscale.h
-include/gtk/gtkscrollbar.h
-include/gtk/gtkscrolledwindow.h
-include/gtk/gtkseparator.h
-include/gtk/gtksignal.h
-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
-include/gtk/gtkvbox.h
-include/gtk/gtkviewport.h
-include/gtk/gtkvruler.h
-include/gtk/gtkvscale.h
-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/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/pdb.info
+info/pdb.info-1
+info/pdb.info-2
 lib/libgdk.a
 lib/libgdk.la
-lib/libgdk.so
 lib/libgdk.so.1.0
 lib/libgimp.a
 lib/libgimp.la
-lib/libgimp.so
 lib/libgimp.so.1.0
 lib/libgimpui.a
 lib/libgimpui.la
-lib/libgimpui.so
 lib/libgimpui.so.1.0
 lib/libglib.a
 lib/libglib.la
-lib/libglib.so
 lib/libglib.so.1.0
 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
+libexec/gimp/0.99.8/plug-ins/CML_explorer
+libexec/gimp/0.99.8/plug-ins/autocrop
+libexec/gimp/0.99.8/plug-ins/blur
+libexec/gimp/0.99.8/plug-ins/bumpmap
+libexec/gimp/0.99.8/plug-ins/c_astretch
+libexec/gimp/0.99.8/plug-ins/checkerboard
+libexec/gimp/0.99.8/plug-ins/cubism
+libexec/gimp/0.99.8/plug-ins/demo
+libexec/gimp/0.99.8/plug-ins/diffraction
+libexec/gimp/0.99.8/plug-ins/displace
+libexec/gimp/0.99.8/plug-ins/edge
+libexec/gimp/0.99.8/plug-ins/emboss
+libexec/gimp/0.99.8/plug-ins/figures
+libexec/gimp/0.99.8/plug-ins/gauss_iir
+libexec/gimp/0.99.8/plug-ins/gauss_rle
+libexec/gimp/0.99.8/plug-ins/gbr
+libexec/gimp/0.99.8/plug-ins/gif
+libexec/gimp/0.99.8/plug-ins/gradmap
+libexec/gimp/0.99.8/plug-ins/grid
+libexec/gimp/0.99.8/plug-ins/header
+libexec/gimp/0.99.8/plug-ins/holes
+libexec/gimp/0.99.8/plug-ins/hot
+libexec/gimp/0.99.8/plug-ins/hrz
+libexec/gimp/0.99.8/plug-ins/ifscompose
+libexec/gimp/0.99.8/plug-ins/jpeg
+libexec/gimp/0.99.8/plug-ins/laplace
+libexec/gimp/0.99.8/plug-ins/mosaic
+libexec/gimp/0.99.8/plug-ins/nlfilt
+libexec/gimp/0.99.8/plug-ins/noisify
+libexec/gimp/0.99.8/plug-ins/normalize
+libexec/gimp/0.99.8/plug-ins/nova
+libexec/gimp/0.99.8/plug-ins/oilify
+libexec/gimp/0.99.8/plug-ins/pat
+libexec/gimp/0.99.8/plug-ins/pcx
+libexec/gimp/0.99.8/plug-ins/pinch
+libexec/gimp/0.99.8/plug-ins/pixelize
+libexec/gimp/0.99.8/plug-ins/plasma
+libexec/gimp/0.99.8/plug-ins/pnm
+libexec/gimp/0.99.8/plug-ins/ps
+libexec/gimp/0.99.8/plug-ins/ripple
+libexec/gimp/0.99.8/plug-ins/script-fu
+libexec/gimp/0.99.8/plug-ins/shift
+libexec/gimp/0.99.8/plug-ins/sobel
+libexec/gimp/0.99.8/plug-ins/sparkle
+libexec/gimp/0.99.8/plug-ins/spread
+libexec/gimp/0.99.8/plug-ins/sunras
+libexec/gimp/0.99.8/plug-ins/tiff
+libexec/gimp/0.99.8/plug-ins/tile
+libexec/gimp/0.99.8/plug-ins/url
+libexec/gimp/0.99.8/plug-ins/video
+libexec/gimp/0.99.8/plug-ins/vinvert
+libexec/gimp/0.99.8/plug-ins/waves
+libexec/gimp/0.99.8/plug-ins/whirl
+libexec/gimp/0.99.8/plug-ins/xpm
+libexec/gimp/0.99.8/plug-ins/xwd
+share/gimp/0.99.8/brushes/10x10square.gbr
+share/gimp/0.99.8/brushes/10x10squareBlur.gbr
+share/gimp/0.99.8/brushes/11circle.gbr
+share/gimp/0.99.8/brushes/11fcircle.gbr
+share/gimp/0.99.8/brushes/13circle.gbr
+share/gimp/0.99.8/brushes/13fcircle.gbr
+share/gimp/0.99.8/brushes/15circle.gbr
+share/gimp/0.99.8/brushes/15fcircle.gbr
+share/gimp/0.99.8/brushes/17circle.gbr
+share/gimp/0.99.8/brushes/17fcircle.gbr
+share/gimp/0.99.8/brushes/19circle.gbr
+share/gimp/0.99.8/brushes/19fcircle.gbr
+share/gimp/0.99.8/brushes/1circle.gbr
+share/gimp/0.99.8/brushes/20x20square.gbr
+share/gimp/0.99.8/brushes/20x20squareBlur.gbr
+share/gimp/0.99.8/brushes/3circle.gbr
+share/gimp/0.99.8/brushes/3fcircle.gbr
+share/gimp/0.99.8/brushes/50x50cone.gbr
+share/gimp/0.99.8/brushes/50x50square.gbr
+share/gimp/0.99.8/brushes/50x50squareBlur.gbr
+share/gimp/0.99.8/brushes/50x50squareBlur2.gbr
+share/gimp/0.99.8/brushes/5circle.gbr
+share/gimp/0.99.8/brushes/5fcircle.gbr
+share/gimp/0.99.8/brushes/5x5square.gbr
+share/gimp/0.99.8/brushes/5x5squareBlur.gbr
+share/gimp/0.99.8/brushes/7circle.gbr
+share/gimp/0.99.8/brushes/7fcircle.gbr
+share/gimp/0.99.8/brushes/9circle.gbr
+share/gimp/0.99.8/brushes/9fcircle.gbr
+share/gimp/0.99.8/brushes/WindozeSux.gbr
+share/gimp/0.99.8/brushes/airplane.gbr
+share/gimp/0.99.8/brushes/bigGalaxy.gbr
+share/gimp/0.99.8/brushes/bird.gbr
+share/gimp/0.99.8/brushes/bush.gbr
+share/gimp/0.99.8/brushes/cloth.gbr
+share/gimp/0.99.8/brushes/confetti.gbr
+share/gimp/0.99.8/brushes/cross.gbr
+share/gimp/0.99.8/brushes/cross_large.gbr
+share/gimp/0.99.8/brushes/cross_small.gbr
+share/gimp/0.99.8/brushes/diamond.gbr
+share/gimp/0.99.8/brushes/duck.gbr
+share/gimp/0.99.8/brushes/dunes.gbr
+share/gimp/0.99.8/brushes/elk.gbr
+share/gimp/0.99.8/brushes/flags.gbr
+share/gimp/0.99.8/brushes/flower.gbr
+share/gimp/0.99.8/brushes/flower_large.gbr
+share/gimp/0.99.8/brushes/galaxy.gbr
+share/gimp/0.99.8/brushes/galaxy_small.gbr
+share/gimp/0.99.8/brushes/gecko.gbr
+share/gimp/0.99.8/brushes/glyph.gbr
+share/gimp/0.99.8/brushes/grid.gbr
+share/gimp/0.99.8/brushes/grid2.gbr
+share/gimp/0.99.8/brushes/guitar.gbr
+share/gimp/0.99.8/brushes/hash.gbr
+share/gimp/0.99.8/brushes/jack.gbr
+share/gimp/0.99.8/brushes/manta.gbr
+share/gimp/0.99.8/brushes/nova.gbr
+share/gimp/0.99.8/brushes/pixel.gbr
+share/gimp/0.99.8/brushes/qbert2.gbr
+share/gimp/0.99.8/brushes/qbert3Blur.gbr
+share/gimp/0.99.8/brushes/ribbon.gbr
+share/gimp/0.99.8/brushes/rings1.gbr
+share/gimp/0.99.8/brushes/rings2.gbr
+share/gimp/0.99.8/brushes/rings3.gbr
+share/gimp/0.99.8/brushes/rings4.gbr
+share/gimp/0.99.8/brushes/rings5.gbr
+share/gimp/0.99.8/brushes/rings6.gbr
+share/gimp/0.99.8/brushes/rings7.gbr
+share/gimp/0.99.8/brushes/sball.gbr
+share/gimp/0.99.8/brushes/slope.gbr
+share/gimp/0.99.8/brushes/snake.gbr
+share/gimp/0.99.8/brushes/snowflake.gbr
+share/gimp/0.99.8/brushes/sparkle.gbr
+share/gimp/0.99.8/brushes/sparkle2.gbr
+share/gimp/0.99.8/brushes/star_medium.gbr
+share/gimp/0.99.8/brushes/star_small.gbr
+share/gimp/0.99.8/brushes/swirl.gbr
+share/gimp/0.99.8/brushes/swirl2.gbr
+share/gimp/0.99.8/brushes/thegimp.gbr
+share/gimp/0.99.8/brushes/therefore.gbr
+share/gimp/0.99.8/brushes/tictactoe.gbr
+share/gimp/0.99.8/brushes/tile.gbr
+share/gimp/0.99.8/brushes/triangle.gbr
+share/gimp/0.99.8/brushes/tulip.gbr
+share/gimp/0.99.8/brushes/xcf.gbr
+share/gimp/0.99.8/gimp_logo.ppm
+share/gimp/0.99.8/gimprc
+share/gimp/0.99.8/gradients/Default
+share/gimp/0.99.8/gradients/French_flag
+share/gimp/0.99.8/gradients/French_flag_smooth
+share/gimp/0.99.8/gradients/Full_saturation_spectrum_CCW
+share/gimp/0.99.8/gradients/Full_saturation_spectrum_CW
+share/gimp/0.99.8/gradients/German_flag
+share/gimp/0.99.8/gradients/German_flag_smooth
+share/gimp/0.99.8/gradients/Mexican_flag
+share/gimp/0.99.8/gradients/Mexican_flag_smooth
+share/gimp/0.99.8/palettes/Blues
+share/gimp/0.99.8/palettes/Browns_And_Yellows
+share/gimp/0.99.8/palettes/Cool_Colors
+share/gimp/0.99.8/palettes/Default
+share/gimp/0.99.8/palettes/Grays
+share/gimp/0.99.8/palettes/Greens
+share/gimp/0.99.8/palettes/Lights
+share/gimp/0.99.8/palettes/Muted
+share/gimp/0.99.8/palettes/Pastels
+share/gimp/0.99.8/palettes/Reds_And_Purples
+share/gimp/0.99.8/palettes/Warm_Colors
+share/gimp/0.99.8/patterns/3dgreen.pat
+share/gimp/0.99.8/patterns/Craters.pat
+share/gimp/0.99.8/patterns/Moonfoot.pat
+share/gimp/0.99.8/patterns/amethyst.pat
+share/gimp/0.99.8/patterns/bark.pat
+share/gimp/0.99.8/patterns/blackwhitefloor.pat
+share/gimp/0.99.8/patterns/blue.pat
+share/gimp/0.99.8/patterns/blueweb.pat
+share/gimp/0.99.8/patterns/brick.pat
+share/gimp/0.99.8/patterns/burlap.pat
+share/gimp/0.99.8/patterns/burlwood.pat
+share/gimp/0.99.8/patterns/chains.pat
+share/gimp/0.99.8/patterns/choc_swirl.pat
+share/gimp/0.99.8/patterns/circuit.pat
+share/gimp/0.99.8/patterns/clouds.pat
+share/gimp/0.99.8/patterns/clovers.pat
+share/gimp/0.99.8/patterns/coins.pat
+share/gimp/0.99.8/patterns/color.pat
+share/gimp/0.99.8/patterns/corkboard.pat
+share/gimp/0.99.8/patterns/cracked.pat
+share/gimp/0.99.8/patterns/crazytile.pat
+share/gimp/0.99.8/patterns/crinklepaper.pat
+share/gimp/0.99.8/patterns/drymud.pat
+share/gimp/0.99.8/patterns/dunes.pat
+share/gimp/0.99.8/patterns/eggcarton.pat
+share/gimp/0.99.8/patterns/electric.pat
+share/gimp/0.99.8/patterns/fibers.pat
+share/gimp/0.99.8/patterns/floor_tile.pat
+share/gimp/0.99.8/patterns/granite1.pat
+share/gimp/0.99.8/patterns/granite2.pat
+share/gimp/0.99.8/patterns/green_curtains.pat
+share/gimp/0.99.8/patterns/ground1.pat
+share/gimp/0.99.8/patterns/java.pat
+share/gimp/0.99.8/patterns/krinkle.pat
+share/gimp/0.99.8/patterns/lathe.pat
+share/gimp/0.99.8/patterns/leather.pat
+share/gimp/0.99.8/patterns/leaves.pat
+share/gimp/0.99.8/patterns/leaves3.pat
+share/gimp/0.99.8/patterns/leaves4.pat
+share/gimp/0.99.8/patterns/leaves6.pat
+share/gimp/0.99.8/patterns/leopard.pat
+share/gimp/0.99.8/patterns/lightning.pat
+share/gimp/0.99.8/patterns/lumps.pat
+share/gimp/0.99.8/patterns/marble1.pat
+share/gimp/0.99.8/patterns/marble2.pat
+share/gimp/0.99.8/patterns/marble3.pat
+share/gimp/0.99.8/patterns/mhuerock.pat
+share/gimp/0.99.8/patterns/money.pat
+share/gimp/0.99.8/patterns/oooh.pat
+share/gimp/0.99.8/patterns/oooh3.pat
+share/gimp/0.99.8/patterns/paper.pat
+share/gimp/0.99.8/patterns/parque1.pat
+share/gimp/0.99.8/patterns/parque2.pat
+share/gimp/0.99.8/patterns/parque3.pat
+share/gimp/0.99.8/patterns/pine.pat
+share/gimp/0.99.8/patterns/pink_marble.pat
+share/gimp/0.99.8/patterns/pj.pat
+share/gimp/0.99.8/patterns/pool.pat
+share/gimp/0.99.8/patterns/qube1.pat
+share/gimp/0.99.8/patterns/recessed.pat
+share/gimp/0.99.8/patterns/rock.pat
+share/gimp/0.99.8/patterns/sky.pat
+share/gimp/0.99.8/patterns/slate.pat
+share/gimp/0.99.8/patterns/sm_squares.pat
+share/gimp/0.99.8/patterns/startile.pat
+share/gimp/0.99.8/patterns/stone33.pat
+share/gimp/0.99.8/patterns/swirl.pat
+share/gimp/0.99.8/patterns/swirl2.pat
+share/gimp/0.99.8/patterns/terra.pat
+share/gimp/0.99.8/patterns/torrents.pat
+share/gimp/0.99.8/patterns/walnut.pat
+share/gimp/0.99.8/patterns/water3.pat
+share/gimp/0.99.8/patterns/waves.pat
+share/gimp/0.99.8/patterns/wax.pat
+share/gimp/0.99.8/patterns/wood1.pat
+share/gimp/0.99.8/patterns/wood2.pat
+share/gimp/0.99.8/patterns/wood3.pat
+share/gimp/0.99.8/patterns/wood4.pat
+share/gimp/0.99.8/patterns/wood5.pat
+share/gimp/0.99.8/scripts/alien-glow.scm
+share/gimp/0.99.8/scripts/bds-logo-textured.scm
+share/gimp/0.99.8/scripts/beavis.jpg
+share/gimp/0.99.8/scripts/blend-logo.scm
+share/gimp/0.99.8/scripts/carve.scm
+share/gimp/0.99.8/scripts/chrome-it.scm
+share/gimp/0.99.8/scripts/chrome.scm
+share/gimp/0.99.8/scripts/chrome2.scm
+share/gimp/0.99.8/scripts/clothify.scm
+share/gimp/0.99.8/scripts/crystal.scm
+share/gimp/0.99.8/scripts/ds-logo.scm
+share/gimp/0.99.8/scripts/frozen-text.scm
+share/gimp/0.99.8/scripts/glowing.scm
+share/gimp/0.99.8/scripts/hds-logo.scm
+share/gimp/0.99.8/scripts/neon.scm
+share/gimp/0.99.8/scripts/sphere.scm
+share/gimp/0.99.8/scripts/swirltile.scm
+share/gimp/0.99.8/scripts/t-o-p.scm
+share/gimp/0.99.8/scripts/text-circle.scm
+share/gimp/0.99.8/scripts/texture1.jpg
+share/gimp/0.99.8/scripts/texture2.jpg
+share/gimp/0.99.8/user_install
+@dirrm include/glib
 @dirrm include/gdk
 @dirrm include/glib
-@dirrm include/gtk
-@dirrm libexec/gimp/0.99.7/plug-ins
-@dirrm libexec/gimp/0.99.7
+@dirrm include/libgimp
+@dirrm libexec/gimp/0.99.8/plug-ins
+@dirrm libexec/gimp/0.99.8
 @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/0.99.8/scripts
+@dirrm share/gimp/0.99.8/brushes
+@dirrm share/gimp/0.99.8/palettes
+@dirrm share/gimp/0.99.8/gradients
+@dirrm share/gimp/0.99.8/patterns
+@dirrm share/gimp/0.99.8
 @dirrm share/gimp
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index a6a96948dec2..5c6f6d1643f5 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -3,10 +3,13 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.6 1997/03/27 21:41:12 erich Exp $
+# $Id: Makefile,v 1.7 1997/04/08 22:06:51 erich Exp $
 #
 
-DISTNAME=       gimp-0.99.7
+VERSION=			0.99.8
+DISTNAME=       gimp-${VERSION}
+DISTFILES=	${DISTNAME}.tar.gz gimp-data-0.99.8.tar.gz
+
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
 
@@ -22,5 +25,13 @@ GNU_CONFIGURE=	yes
 
 USE_GMAKE=	yes
 
+DATASTUFF=  brushes palettes gradients patterns
+
+post-install:
+	cd ${WRKDIR}/gimp-data-${VERSION}; \
+	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
+	(cd ${PREFIX}/share/gimp/${VERSION}; tar -xvf -)
+
+
 .include <bsd.port.mk>
 
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index ecc8c7a5cd07..de8ff392435a 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1 +1,2 @@
-MD5 (gimp-0.99.7.tar.gz) = ac10f6df1ff610943140994c7b6ee59f
+MD5 (gimp-0.99.8.tar.gz) = 0466a576f25bfdb56774ba342059b343
+MD5 (gimp-data-0.99.8.tar.gz) = 80c4296ef85ffdec045b52a498b5caaa
diff --git a/graphics/gimp1/files/patch-ab b/graphics/gimp1/files/patch-ab
index 27354846adb6..081000754daa 100644
--- a/graphics/gimp1/files/patch-ab
+++ b/graphics/gimp1/files/patch-ab
@@ -16,14 +16,143 @@
        _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;
+--- plug-ins/ripple.c~	Fri Apr 18 09:21:26 1997
++++ plug-ins/ripple.c	Fri Apr 18 09:21:31 1997
+@@ -1015,7 +1015,7 @@
+     switch (rvals.waveform)
+     {
+         case SINE:
+-            return rvals.amplitude*sin(location*(2*PI)/(double)rvals.period);
++            return rvals.amplitude*sin(location*(2*M_PI)/(double)rvals.period);
+             break;
+         case SAWTOOTH:
+             return floor(rvals.amplitude*(fabs((((location%rvals.period)/(double)rvals.period)*4)-2)-1));
+
+The patches for displace
+------------------------
+*** plug-ins/displace.c.ots	Tue Apr  8 09:07:34 1997
+--- plug-ins/displace.c	Tue Apr  8 09:53:32 1997
+***************
+*** 222,231 ****
+  	  dvals.amount_x = param[3].data.d_float;
+  	  dvals.amount_y = param[4].data.d_float;
+  	  dvals.do_x = param[5].data.d_int32;
+! 	  dvals.do_x = param[6].data.d_int32;
+  	  dvals.displace_map_x = param[7].data.d_int32;
+  	  dvals.displace_map_y = param[8].data.d_int32;
+  	  dvals.displace_type = param[9].data.d_int32;
+  	}
+        break;
+  
+--- 222,238 ----
+  	  dvals.amount_x = param[3].data.d_float;
+  	  dvals.amount_y = param[4].data.d_float;
+  	  dvals.do_x = param[5].data.d_int32;
+! 	  dvals.do_y = param[6].data.d_int32;
+  	  dvals.displace_map_x = param[7].data.d_int32;
+  	  dvals.displace_map_y = param[8].data.d_int32;
+  	  dvals.displace_type = param[9].data.d_int32;
++ 
++ 	  if (dvals.do_x && 
++ 	      gimp_drawable_type(dvals.displace_map_x) != GRAY_IMAGE)
++ 	    status = STATUS_CALLING_ERROR;
++ 	  if (dvals.do_y && 
++ 	      gimp_drawable_type(dvals.displace_map_y) != GRAY_IMAGE)
++ 	    status = STATUS_CALLING_ERROR;
+  	}
+        break;
+  
+***************
+*** 566,592 ****
+  	      if (dvals.displace_type == WRAP)
+  		{
+  		  if (xi < 0)
+! 		    xi = width - (-xi % width);
+  		  else
+! 		    xi %= width;
+  
+  		  if (yi < 0)
+! 		    yi = height - (-yi % height);
+  		  else
+! 		    yi %= height;
+  		}
+  	      /* Smear out the edges of the image by repeating pixels. */
+  	      else if (dvals.displace_type == SMEAR)
+  		{
+  		  if (xi < 0)
+  		    xi = 0;
+! 		  else if (xi > width - 1)
+! 		    xi = width - 1;
+  
+  		  if (yi < 0)
+  		    yi = 0;
+! 		  else if (yi > height - 1)
+! 		    yi = height - 1;
+  		}
+  
+  	      tile = displace_pixel (drawable, tile, x1, y1, x2, y2, xi, yi, &row, &col, pixel[0]);
+--- 573,599 ----
+  	      if (dvals.displace_type == WRAP)
+  		{
+  		  if (xi < 0)
+! 		    xi = (width-1) - (-xi % (width-1));
+  		  else
+! 		    xi %= (width-1);
+  
+  		  if (yi < 0)
+! 		    yi = (height-1) - (-yi % (height-1));
+  		  else
+! 		    yi %= (height-1);
+  		}
+  	      /* Smear out the edges of the image by repeating pixels. */
+  	      else if (dvals.displace_type == SMEAR)
+  		{
+  		  if (xi < 0)
+  		    xi = 0;
+! 		  else if (xi > width - 2)
+! 		    xi = width - 2;
+  
+  		  if (yi < 0)
+  		    yi = 0;
+! 		  else if (yi > height - 2)
+! 		    yi = height - 2;
+  		}
+  
+  	      tile = displace_pixel (drawable, tile, x1, y1, x2, y2, xi, yi, &row, &col, pixel[0]);
+***************
+*** 712,718 ****
+      return TRUE;
+  
+    if (gimp_drawable_width (drawable_id) == drawable->width &&
+!       gimp_drawable_height (drawable_id) == drawable->height)
+      return TRUE;
+    else
+      return FALSE;
+--- 719,726 ----
+      return TRUE;
+  
+    if (gimp_drawable_width (drawable_id) == drawable->width &&
+!       gimp_drawable_height (drawable_id) == drawable->height &&
+!       gimp_drawable_type (drawable_id) == GRAY_IMAGE)
+      return TRUE;
+    else
+      return FALSE;
+
+--- plug-ins/script-fu/interp_regex.c~	Fri Apr 18 14:00:00 1997
++++ plug-ins/script-fu/interp_regex.c	Fri Apr 18 14:00:45 1997
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- plug-ins/plasma.c~	Fri Apr 18 15:01:43 1997
++++ plug-ins/plasma.c	Fri Apr 18 15:01:53 1997
+@@ -310,7 +310,7 @@
+   gtk_widget_set_usize( entry, ENTRY_WIDTH, 0 );
+   sprintf( buffer, "%d", pvals.seed );
+   gtk_entry_set_text (GTK_ENTRY (entry), buffer );
+-  gtk_signal_connect (GTK_OBJECT (entry), "changed_text",
++  gtk_signal_connect (GTK_OBJECT (entry), "changed",
+ 		      (GtkSignalFunc) plasma_entry_callback,
+ 		      &pvals.seed);
+   gtk_widget_show (entry);
diff --git a/graphics/gimp1/files/patch-ac b/graphics/gimp1/files/patch-ac
index f1efdf5f3839..6ee30980df23 100644
--- a/graphics/gimp1/files/patch-ac
+++ b/graphics/gimp1/files/patch-ac
@@ -25,17 +25,17 @@
  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
+--- configure.orig	Fri Apr 18 03:57:14 1997
++++ configure	Fri Apr 18 08:44:36 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
+ echo "configure:570: checking for a BSD compatible install" >&5
 +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 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -616,7 +617,7 @@
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
@@ -44,7 +44,7 @@
  
  
  PACKAGE=gimp
-@@ -2173,7 +2174,7 @@
+@@ -2172,7 +2173,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE/$VERSION
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index 7d1b270a48f3..4a3891fb0068 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -1,3 +1,4 @@
+bin/gimp
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdkkeysyms.h
@@ -5,283 +6,311 @@ include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
 include/glib/gconfig.h
+include/glib/gconfig.h
+include/glib/glib.h
 include/glib/glib.h
-include/gtk/gtk.h
-include/gtk/gtkaccelerator.h
-include/gtk/gtkadjustment.h
-include/gtk/gtkalignment.h
-include/gtk/gtkarrow.h
-include/gtk/gtkbin.h
-include/gtk/gtkbox.h
-include/gtk/gtkbutton.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
-include/gtk/gtkdrawingarea.h
-include/gtk/gtkentry.h
-include/gtk/gtkenums.h
-include/gtk/gtkfilesel.h
-include/gtk/gtkframe.h
-include/gtk/gtkgc.h
-include/gtk/gtkhbox.h
-include/gtk/gtkhruler.h
-include/gtk/gtkhscale.h
-include/gtk/gtkhscrollbar.h
-include/gtk/gtkhseparator.h
-include/gtk/gtkimage.h
-include/gtk/gtkitem.h
-include/gtk/gtklabel.h
-include/gtk/gtklist.h
-include/gtk/gtklistitem.h
-include/gtk/gtkmain.h
-include/gtk/gtkmenu.h
-include/gtk/gtkmenubar.h
-include/gtk/gtkmenufactory.h
-include/gtk/gtkmenuitem.h
-include/gtk/gtkmenushell.h
-include/gtk/gtkmisc.h
-include/gtk/gtknotebook.h
-include/gtk/gtkobject.h
-include/gtk/gtkoptionmenu.h
-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
-include/gtk/gtkscale.h
-include/gtk/gtkscrollbar.h
-include/gtk/gtkscrolledwindow.h
-include/gtk/gtkseparator.h
-include/gtk/gtksignal.h
-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
-include/gtk/gtkvbox.h
-include/gtk/gtkviewport.h
-include/gtk/gtkvruler.h
-include/gtk/gtkvscale.h
-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/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/pdb.info
+info/pdb.info-1
+info/pdb.info-2
 lib/libgdk.a
 lib/libgdk.la
-lib/libgdk.so
 lib/libgdk.so.1.0
 lib/libgimp.a
 lib/libgimp.la
-lib/libgimp.so
 lib/libgimp.so.1.0
 lib/libgimpui.a
 lib/libgimpui.la
-lib/libgimpui.so
 lib/libgimpui.so.1.0
 lib/libglib.a
 lib/libglib.la
-lib/libglib.so
 lib/libglib.so.1.0
 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
+libexec/gimp/0.99.8/plug-ins/CML_explorer
+libexec/gimp/0.99.8/plug-ins/autocrop
+libexec/gimp/0.99.8/plug-ins/blur
+libexec/gimp/0.99.8/plug-ins/bumpmap
+libexec/gimp/0.99.8/plug-ins/c_astretch
+libexec/gimp/0.99.8/plug-ins/checkerboard
+libexec/gimp/0.99.8/plug-ins/cubism
+libexec/gimp/0.99.8/plug-ins/demo
+libexec/gimp/0.99.8/plug-ins/diffraction
+libexec/gimp/0.99.8/plug-ins/displace
+libexec/gimp/0.99.8/plug-ins/edge
+libexec/gimp/0.99.8/plug-ins/emboss
+libexec/gimp/0.99.8/plug-ins/figures
+libexec/gimp/0.99.8/plug-ins/gauss_iir
+libexec/gimp/0.99.8/plug-ins/gauss_rle
+libexec/gimp/0.99.8/plug-ins/gbr
+libexec/gimp/0.99.8/plug-ins/gif
+libexec/gimp/0.99.8/plug-ins/gradmap
+libexec/gimp/0.99.8/plug-ins/grid
+libexec/gimp/0.99.8/plug-ins/header
+libexec/gimp/0.99.8/plug-ins/holes
+libexec/gimp/0.99.8/plug-ins/hot
+libexec/gimp/0.99.8/plug-ins/hrz
+libexec/gimp/0.99.8/plug-ins/ifscompose
+libexec/gimp/0.99.8/plug-ins/jpeg
+libexec/gimp/0.99.8/plug-ins/laplace
+libexec/gimp/0.99.8/plug-ins/mosaic
+libexec/gimp/0.99.8/plug-ins/nlfilt
+libexec/gimp/0.99.8/plug-ins/noisify
+libexec/gimp/0.99.8/plug-ins/normalize
+libexec/gimp/0.99.8/plug-ins/nova
+libexec/gimp/0.99.8/plug-ins/oilify
+libexec/gimp/0.99.8/plug-ins/pat
+libexec/gimp/0.99.8/plug-ins/pcx
+libexec/gimp/0.99.8/plug-ins/pinch
+libexec/gimp/0.99.8/plug-ins/pixelize
+libexec/gimp/0.99.8/plug-ins/plasma
+libexec/gimp/0.99.8/plug-ins/pnm
+libexec/gimp/0.99.8/plug-ins/ps
+libexec/gimp/0.99.8/plug-ins/ripple
+libexec/gimp/0.99.8/plug-ins/script-fu
+libexec/gimp/0.99.8/plug-ins/shift
+libexec/gimp/0.99.8/plug-ins/sobel
+libexec/gimp/0.99.8/plug-ins/sparkle
+libexec/gimp/0.99.8/plug-ins/spread
+libexec/gimp/0.99.8/plug-ins/sunras
+libexec/gimp/0.99.8/plug-ins/tiff
+libexec/gimp/0.99.8/plug-ins/tile
+libexec/gimp/0.99.8/plug-ins/url
+libexec/gimp/0.99.8/plug-ins/video
+libexec/gimp/0.99.8/plug-ins/vinvert
+libexec/gimp/0.99.8/plug-ins/waves
+libexec/gimp/0.99.8/plug-ins/whirl
+libexec/gimp/0.99.8/plug-ins/xpm
+libexec/gimp/0.99.8/plug-ins/xwd
+share/gimp/0.99.8/brushes/10x10square.gbr
+share/gimp/0.99.8/brushes/10x10squareBlur.gbr
+share/gimp/0.99.8/brushes/11circle.gbr
+share/gimp/0.99.8/brushes/11fcircle.gbr
+share/gimp/0.99.8/brushes/13circle.gbr
+share/gimp/0.99.8/brushes/13fcircle.gbr
+share/gimp/0.99.8/brushes/15circle.gbr
+share/gimp/0.99.8/brushes/15fcircle.gbr
+share/gimp/0.99.8/brushes/17circle.gbr
+share/gimp/0.99.8/brushes/17fcircle.gbr
+share/gimp/0.99.8/brushes/19circle.gbr
+share/gimp/0.99.8/brushes/19fcircle.gbr
+share/gimp/0.99.8/brushes/1circle.gbr
+share/gimp/0.99.8/brushes/20x20square.gbr
+share/gimp/0.99.8/brushes/20x20squareBlur.gbr
+share/gimp/0.99.8/brushes/3circle.gbr
+share/gimp/0.99.8/brushes/3fcircle.gbr
+share/gimp/0.99.8/brushes/50x50cone.gbr
+share/gimp/0.99.8/brushes/50x50square.gbr
+share/gimp/0.99.8/brushes/50x50squareBlur.gbr
+share/gimp/0.99.8/brushes/50x50squareBlur2.gbr
+share/gimp/0.99.8/brushes/5circle.gbr
+share/gimp/0.99.8/brushes/5fcircle.gbr
+share/gimp/0.99.8/brushes/5x5square.gbr
+share/gimp/0.99.8/brushes/5x5squareBlur.gbr
+share/gimp/0.99.8/brushes/7circle.gbr
+share/gimp/0.99.8/brushes/7fcircle.gbr
+share/gimp/0.99.8/brushes/9circle.gbr
+share/gimp/0.99.8/brushes/9fcircle.gbr
+share/gimp/0.99.8/brushes/WindozeSux.gbr
+share/gimp/0.99.8/brushes/airplane.gbr
+share/gimp/0.99.8/brushes/bigGalaxy.gbr
+share/gimp/0.99.8/brushes/bird.gbr
+share/gimp/0.99.8/brushes/bush.gbr
+share/gimp/0.99.8/brushes/cloth.gbr
+share/gimp/0.99.8/brushes/confetti.gbr
+share/gimp/0.99.8/brushes/cross.gbr
+share/gimp/0.99.8/brushes/cross_large.gbr
+share/gimp/0.99.8/brushes/cross_small.gbr
+share/gimp/0.99.8/brushes/diamond.gbr
+share/gimp/0.99.8/brushes/duck.gbr
+share/gimp/0.99.8/brushes/dunes.gbr
+share/gimp/0.99.8/brushes/elk.gbr
+share/gimp/0.99.8/brushes/flags.gbr
+share/gimp/0.99.8/brushes/flower.gbr
+share/gimp/0.99.8/brushes/flower_large.gbr
+share/gimp/0.99.8/brushes/galaxy.gbr
+share/gimp/0.99.8/brushes/galaxy_small.gbr
+share/gimp/0.99.8/brushes/gecko.gbr
+share/gimp/0.99.8/brushes/glyph.gbr
+share/gimp/0.99.8/brushes/grid.gbr
+share/gimp/0.99.8/brushes/grid2.gbr
+share/gimp/0.99.8/brushes/guitar.gbr
+share/gimp/0.99.8/brushes/hash.gbr
+share/gimp/0.99.8/brushes/jack.gbr
+share/gimp/0.99.8/brushes/manta.gbr
+share/gimp/0.99.8/brushes/nova.gbr
+share/gimp/0.99.8/brushes/pixel.gbr
+share/gimp/0.99.8/brushes/qbert2.gbr
+share/gimp/0.99.8/brushes/qbert3Blur.gbr
+share/gimp/0.99.8/brushes/ribbon.gbr
+share/gimp/0.99.8/brushes/rings1.gbr
+share/gimp/0.99.8/brushes/rings2.gbr
+share/gimp/0.99.8/brushes/rings3.gbr
+share/gimp/0.99.8/brushes/rings4.gbr
+share/gimp/0.99.8/brushes/rings5.gbr
+share/gimp/0.99.8/brushes/rings6.gbr
+share/gimp/0.99.8/brushes/rings7.gbr
+share/gimp/0.99.8/brushes/sball.gbr
+share/gimp/0.99.8/brushes/slope.gbr
+share/gimp/0.99.8/brushes/snake.gbr
+share/gimp/0.99.8/brushes/snowflake.gbr
+share/gimp/0.99.8/brushes/sparkle.gbr
+share/gimp/0.99.8/brushes/sparkle2.gbr
+share/gimp/0.99.8/brushes/star_medium.gbr
+share/gimp/0.99.8/brushes/star_small.gbr
+share/gimp/0.99.8/brushes/swirl.gbr
+share/gimp/0.99.8/brushes/swirl2.gbr
+share/gimp/0.99.8/brushes/thegimp.gbr
+share/gimp/0.99.8/brushes/therefore.gbr
+share/gimp/0.99.8/brushes/tictactoe.gbr
+share/gimp/0.99.8/brushes/tile.gbr
+share/gimp/0.99.8/brushes/triangle.gbr
+share/gimp/0.99.8/brushes/tulip.gbr
+share/gimp/0.99.8/brushes/xcf.gbr
+share/gimp/0.99.8/gimp_logo.ppm
+share/gimp/0.99.8/gimprc
+share/gimp/0.99.8/gradients/Default
+share/gimp/0.99.8/gradients/French_flag
+share/gimp/0.99.8/gradients/French_flag_smooth
+share/gimp/0.99.8/gradients/Full_saturation_spectrum_CCW
+share/gimp/0.99.8/gradients/Full_saturation_spectrum_CW
+share/gimp/0.99.8/gradients/German_flag
+share/gimp/0.99.8/gradients/German_flag_smooth
+share/gimp/0.99.8/gradients/Mexican_flag
+share/gimp/0.99.8/gradients/Mexican_flag_smooth
+share/gimp/0.99.8/palettes/Blues
+share/gimp/0.99.8/palettes/Browns_And_Yellows
+share/gimp/0.99.8/palettes/Cool_Colors
+share/gimp/0.99.8/palettes/Default
+share/gimp/0.99.8/palettes/Grays
+share/gimp/0.99.8/palettes/Greens
+share/gimp/0.99.8/palettes/Lights
+share/gimp/0.99.8/palettes/Muted
+share/gimp/0.99.8/palettes/Pastels
+share/gimp/0.99.8/palettes/Reds_And_Purples
+share/gimp/0.99.8/palettes/Warm_Colors
+share/gimp/0.99.8/patterns/3dgreen.pat
+share/gimp/0.99.8/patterns/Craters.pat
+share/gimp/0.99.8/patterns/Moonfoot.pat
+share/gimp/0.99.8/patterns/amethyst.pat
+share/gimp/0.99.8/patterns/bark.pat
+share/gimp/0.99.8/patterns/blackwhitefloor.pat
+share/gimp/0.99.8/patterns/blue.pat
+share/gimp/0.99.8/patterns/blueweb.pat
+share/gimp/0.99.8/patterns/brick.pat
+share/gimp/0.99.8/patterns/burlap.pat
+share/gimp/0.99.8/patterns/burlwood.pat
+share/gimp/0.99.8/patterns/chains.pat
+share/gimp/0.99.8/patterns/choc_swirl.pat
+share/gimp/0.99.8/patterns/circuit.pat
+share/gimp/0.99.8/patterns/clouds.pat
+share/gimp/0.99.8/patterns/clovers.pat
+share/gimp/0.99.8/patterns/coins.pat
+share/gimp/0.99.8/patterns/color.pat
+share/gimp/0.99.8/patterns/corkboard.pat
+share/gimp/0.99.8/patterns/cracked.pat
+share/gimp/0.99.8/patterns/crazytile.pat
+share/gimp/0.99.8/patterns/crinklepaper.pat
+share/gimp/0.99.8/patterns/drymud.pat
+share/gimp/0.99.8/patterns/dunes.pat
+share/gimp/0.99.8/patterns/eggcarton.pat
+share/gimp/0.99.8/patterns/electric.pat
+share/gimp/0.99.8/patterns/fibers.pat
+share/gimp/0.99.8/patterns/floor_tile.pat
+share/gimp/0.99.8/patterns/granite1.pat
+share/gimp/0.99.8/patterns/granite2.pat
+share/gimp/0.99.8/patterns/green_curtains.pat
+share/gimp/0.99.8/patterns/ground1.pat
+share/gimp/0.99.8/patterns/java.pat
+share/gimp/0.99.8/patterns/krinkle.pat
+share/gimp/0.99.8/patterns/lathe.pat
+share/gimp/0.99.8/patterns/leather.pat
+share/gimp/0.99.8/patterns/leaves.pat
+share/gimp/0.99.8/patterns/leaves3.pat
+share/gimp/0.99.8/patterns/leaves4.pat
+share/gimp/0.99.8/patterns/leaves6.pat
+share/gimp/0.99.8/patterns/leopard.pat
+share/gimp/0.99.8/patterns/lightning.pat
+share/gimp/0.99.8/patterns/lumps.pat
+share/gimp/0.99.8/patterns/marble1.pat
+share/gimp/0.99.8/patterns/marble2.pat
+share/gimp/0.99.8/patterns/marble3.pat
+share/gimp/0.99.8/patterns/mhuerock.pat
+share/gimp/0.99.8/patterns/money.pat
+share/gimp/0.99.8/patterns/oooh.pat
+share/gimp/0.99.8/patterns/oooh3.pat
+share/gimp/0.99.8/patterns/paper.pat
+share/gimp/0.99.8/patterns/parque1.pat
+share/gimp/0.99.8/patterns/parque2.pat
+share/gimp/0.99.8/patterns/parque3.pat
+share/gimp/0.99.8/patterns/pine.pat
+share/gimp/0.99.8/patterns/pink_marble.pat
+share/gimp/0.99.8/patterns/pj.pat
+share/gimp/0.99.8/patterns/pool.pat
+share/gimp/0.99.8/patterns/qube1.pat
+share/gimp/0.99.8/patterns/recessed.pat
+share/gimp/0.99.8/patterns/rock.pat
+share/gimp/0.99.8/patterns/sky.pat
+share/gimp/0.99.8/patterns/slate.pat
+share/gimp/0.99.8/patterns/sm_squares.pat
+share/gimp/0.99.8/patterns/startile.pat
+share/gimp/0.99.8/patterns/stone33.pat
+share/gimp/0.99.8/patterns/swirl.pat
+share/gimp/0.99.8/patterns/swirl2.pat
+share/gimp/0.99.8/patterns/terra.pat
+share/gimp/0.99.8/patterns/torrents.pat
+share/gimp/0.99.8/patterns/walnut.pat
+share/gimp/0.99.8/patterns/water3.pat
+share/gimp/0.99.8/patterns/waves.pat
+share/gimp/0.99.8/patterns/wax.pat
+share/gimp/0.99.8/patterns/wood1.pat
+share/gimp/0.99.8/patterns/wood2.pat
+share/gimp/0.99.8/patterns/wood3.pat
+share/gimp/0.99.8/patterns/wood4.pat
+share/gimp/0.99.8/patterns/wood5.pat
+share/gimp/0.99.8/scripts/alien-glow.scm
+share/gimp/0.99.8/scripts/bds-logo-textured.scm
+share/gimp/0.99.8/scripts/beavis.jpg
+share/gimp/0.99.8/scripts/blend-logo.scm
+share/gimp/0.99.8/scripts/carve.scm
+share/gimp/0.99.8/scripts/chrome-it.scm
+share/gimp/0.99.8/scripts/chrome.scm
+share/gimp/0.99.8/scripts/chrome2.scm
+share/gimp/0.99.8/scripts/clothify.scm
+share/gimp/0.99.8/scripts/crystal.scm
+share/gimp/0.99.8/scripts/ds-logo.scm
+share/gimp/0.99.8/scripts/frozen-text.scm
+share/gimp/0.99.8/scripts/glowing.scm
+share/gimp/0.99.8/scripts/hds-logo.scm
+share/gimp/0.99.8/scripts/neon.scm
+share/gimp/0.99.8/scripts/sphere.scm
+share/gimp/0.99.8/scripts/swirltile.scm
+share/gimp/0.99.8/scripts/t-o-p.scm
+share/gimp/0.99.8/scripts/text-circle.scm
+share/gimp/0.99.8/scripts/texture1.jpg
+share/gimp/0.99.8/scripts/texture2.jpg
+share/gimp/0.99.8/user_install
+@dirrm include/glib
 @dirrm include/gdk
 @dirrm include/glib
-@dirrm include/gtk
-@dirrm libexec/gimp/0.99.7/plug-ins
-@dirrm libexec/gimp/0.99.7
+@dirrm include/libgimp
+@dirrm libexec/gimp/0.99.8/plug-ins
+@dirrm libexec/gimp/0.99.8
 @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/0.99.8/scripts
+@dirrm share/gimp/0.99.8/brushes
+@dirrm share/gimp/0.99.8/palettes
+@dirrm share/gimp/0.99.8/gradients
+@dirrm share/gimp/0.99.8/patterns
+@dirrm share/gimp/0.99.8
 @dirrm share/gimp
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index a6a96948dec2..5c6f6d1643f5 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -3,10 +3,13 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.6 1997/03/27 21:41:12 erich Exp $
+# $Id: Makefile,v 1.7 1997/04/08 22:06:51 erich Exp $
 #
 
-DISTNAME=       gimp-0.99.7
+VERSION=			0.99.8
+DISTNAME=       gimp-${VERSION}
+DISTFILES=	${DISTNAME}.tar.gz gimp-data-0.99.8.tar.gz
+
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
 
@@ -22,5 +25,13 @@ GNU_CONFIGURE=	yes
 
 USE_GMAKE=	yes
 
+DATASTUFF=  brushes palettes gradients patterns
+
+post-install:
+	cd ${WRKDIR}/gimp-data-${VERSION}; \
+	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
+	(cd ${PREFIX}/share/gimp/${VERSION}; tar -xvf -)
+
+
 .include <bsd.port.mk>
 
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index ecc8c7a5cd07..de8ff392435a 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1 +1,2 @@
-MD5 (gimp-0.99.7.tar.gz) = ac10f6df1ff610943140994c7b6ee59f
+MD5 (gimp-0.99.8.tar.gz) = 0466a576f25bfdb56774ba342059b343
+MD5 (gimp-data-0.99.8.tar.gz) = 80c4296ef85ffdec045b52a498b5caaa
diff --git a/graphics/gimpshop/files/patch-ab b/graphics/gimpshop/files/patch-ab
index 27354846adb6..081000754daa 100644
--- a/graphics/gimpshop/files/patch-ab
+++ b/graphics/gimpshop/files/patch-ab
@@ -16,14 +16,143 @@
        _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;
+--- plug-ins/ripple.c~	Fri Apr 18 09:21:26 1997
++++ plug-ins/ripple.c	Fri Apr 18 09:21:31 1997
+@@ -1015,7 +1015,7 @@
+     switch (rvals.waveform)
+     {
+         case SINE:
+-            return rvals.amplitude*sin(location*(2*PI)/(double)rvals.period);
++            return rvals.amplitude*sin(location*(2*M_PI)/(double)rvals.period);
+             break;
+         case SAWTOOTH:
+             return floor(rvals.amplitude*(fabs((((location%rvals.period)/(double)rvals.period)*4)-2)-1));
+
+The patches for displace
+------------------------
+*** plug-ins/displace.c.ots	Tue Apr  8 09:07:34 1997
+--- plug-ins/displace.c	Tue Apr  8 09:53:32 1997
+***************
+*** 222,231 ****
+  	  dvals.amount_x = param[3].data.d_float;
+  	  dvals.amount_y = param[4].data.d_float;
+  	  dvals.do_x = param[5].data.d_int32;
+! 	  dvals.do_x = param[6].data.d_int32;
+  	  dvals.displace_map_x = param[7].data.d_int32;
+  	  dvals.displace_map_y = param[8].data.d_int32;
+  	  dvals.displace_type = param[9].data.d_int32;
+  	}
+        break;
+  
+--- 222,238 ----
+  	  dvals.amount_x = param[3].data.d_float;
+  	  dvals.amount_y = param[4].data.d_float;
+  	  dvals.do_x = param[5].data.d_int32;
+! 	  dvals.do_y = param[6].data.d_int32;
+  	  dvals.displace_map_x = param[7].data.d_int32;
+  	  dvals.displace_map_y = param[8].data.d_int32;
+  	  dvals.displace_type = param[9].data.d_int32;
++ 
++ 	  if (dvals.do_x && 
++ 	      gimp_drawable_type(dvals.displace_map_x) != GRAY_IMAGE)
++ 	    status = STATUS_CALLING_ERROR;
++ 	  if (dvals.do_y && 
++ 	      gimp_drawable_type(dvals.displace_map_y) != GRAY_IMAGE)
++ 	    status = STATUS_CALLING_ERROR;
+  	}
+        break;
+  
+***************
+*** 566,592 ****
+  	      if (dvals.displace_type == WRAP)
+  		{
+  		  if (xi < 0)
+! 		    xi = width - (-xi % width);
+  		  else
+! 		    xi %= width;
+  
+  		  if (yi < 0)
+! 		    yi = height - (-yi % height);
+  		  else
+! 		    yi %= height;
+  		}
+  	      /* Smear out the edges of the image by repeating pixels. */
+  	      else if (dvals.displace_type == SMEAR)
+  		{
+  		  if (xi < 0)
+  		    xi = 0;
+! 		  else if (xi > width - 1)
+! 		    xi = width - 1;
+  
+  		  if (yi < 0)
+  		    yi = 0;
+! 		  else if (yi > height - 1)
+! 		    yi = height - 1;
+  		}
+  
+  	      tile = displace_pixel (drawable, tile, x1, y1, x2, y2, xi, yi, &row, &col, pixel[0]);
+--- 573,599 ----
+  	      if (dvals.displace_type == WRAP)
+  		{
+  		  if (xi < 0)
+! 		    xi = (width-1) - (-xi % (width-1));
+  		  else
+! 		    xi %= (width-1);
+  
+  		  if (yi < 0)
+! 		    yi = (height-1) - (-yi % (height-1));
+  		  else
+! 		    yi %= (height-1);
+  		}
+  	      /* Smear out the edges of the image by repeating pixels. */
+  	      else if (dvals.displace_type == SMEAR)
+  		{
+  		  if (xi < 0)
+  		    xi = 0;
+! 		  else if (xi > width - 2)
+! 		    xi = width - 2;
+  
+  		  if (yi < 0)
+  		    yi = 0;
+! 		  else if (yi > height - 2)
+! 		    yi = height - 2;
+  		}
+  
+  	      tile = displace_pixel (drawable, tile, x1, y1, x2, y2, xi, yi, &row, &col, pixel[0]);
+***************
+*** 712,718 ****
+      return TRUE;
+  
+    if (gimp_drawable_width (drawable_id) == drawable->width &&
+!       gimp_drawable_height (drawable_id) == drawable->height)
+      return TRUE;
+    else
+      return FALSE;
+--- 719,726 ----
+      return TRUE;
+  
+    if (gimp_drawable_width (drawable_id) == drawable->width &&
+!       gimp_drawable_height (drawable_id) == drawable->height &&
+!       gimp_drawable_type (drawable_id) == GRAY_IMAGE)
+      return TRUE;
+    else
+      return FALSE;
+
+--- plug-ins/script-fu/interp_regex.c~	Fri Apr 18 14:00:00 1997
++++ plug-ins/script-fu/interp_regex.c	Fri Apr 18 14:00:45 1997
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+--- plug-ins/plasma.c~	Fri Apr 18 15:01:43 1997
++++ plug-ins/plasma.c	Fri Apr 18 15:01:53 1997
+@@ -310,7 +310,7 @@
+   gtk_widget_set_usize( entry, ENTRY_WIDTH, 0 );
+   sprintf( buffer, "%d", pvals.seed );
+   gtk_entry_set_text (GTK_ENTRY (entry), buffer );
+-  gtk_signal_connect (GTK_OBJECT (entry), "changed_text",
++  gtk_signal_connect (GTK_OBJECT (entry), "changed",
+ 		      (GtkSignalFunc) plasma_entry_callback,
+ 		      &pvals.seed);
+   gtk_widget_show (entry);
diff --git a/graphics/gimpshop/files/patch-ac b/graphics/gimpshop/files/patch-ac
index f1efdf5f3839..6ee30980df23 100644
--- a/graphics/gimpshop/files/patch-ac
+++ b/graphics/gimpshop/files/patch-ac
@@ -25,17 +25,17 @@
  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
+--- configure.orig	Fri Apr 18 03:57:14 1997
++++ configure	Fri Apr 18 08:44:36 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
+ echo "configure:570: checking for a BSD compatible install" >&5
 +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 @@
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -616,7 +617,7 @@
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
@@ -44,7 +44,7 @@
  
  
  PACKAGE=gimp
-@@ -2173,7 +2174,7 @@
+@@ -2172,7 +2173,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE/$VERSION
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 7d1b270a48f3..4a3891fb0068 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1,3 +1,4 @@
+bin/gimp
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdkkeysyms.h
@@ -5,283 +6,311 @@ include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
 include/glib/gconfig.h
+include/glib/gconfig.h
+include/glib/glib.h
 include/glib/glib.h
-include/gtk/gtk.h
-include/gtk/gtkaccelerator.h
-include/gtk/gtkadjustment.h
-include/gtk/gtkalignment.h
-include/gtk/gtkarrow.h
-include/gtk/gtkbin.h
-include/gtk/gtkbox.h
-include/gtk/gtkbutton.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
-include/gtk/gtkdrawingarea.h
-include/gtk/gtkentry.h
-include/gtk/gtkenums.h
-include/gtk/gtkfilesel.h
-include/gtk/gtkframe.h
-include/gtk/gtkgc.h
-include/gtk/gtkhbox.h
-include/gtk/gtkhruler.h
-include/gtk/gtkhscale.h
-include/gtk/gtkhscrollbar.h
-include/gtk/gtkhseparator.h
-include/gtk/gtkimage.h
-include/gtk/gtkitem.h
-include/gtk/gtklabel.h
-include/gtk/gtklist.h
-include/gtk/gtklistitem.h
-include/gtk/gtkmain.h
-include/gtk/gtkmenu.h
-include/gtk/gtkmenubar.h
-include/gtk/gtkmenufactory.h
-include/gtk/gtkmenuitem.h
-include/gtk/gtkmenushell.h
-include/gtk/gtkmisc.h
-include/gtk/gtknotebook.h
-include/gtk/gtkobject.h
-include/gtk/gtkoptionmenu.h
-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
-include/gtk/gtkscale.h
-include/gtk/gtkscrollbar.h
-include/gtk/gtkscrolledwindow.h
-include/gtk/gtkseparator.h
-include/gtk/gtksignal.h
-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
-include/gtk/gtkvbox.h
-include/gtk/gtkviewport.h
-include/gtk/gtkvruler.h
-include/gtk/gtkvscale.h
-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/gtk.info-1
+info/gtk.info-2
+info/gtk.info-3
+info/gtk.info-4
+info/pdb.info
+info/pdb.info-1
+info/pdb.info-2
 lib/libgdk.a
 lib/libgdk.la
-lib/libgdk.so
 lib/libgdk.so.1.0
 lib/libgimp.a
 lib/libgimp.la
-lib/libgimp.so
 lib/libgimp.so.1.0
 lib/libgimpui.a
 lib/libgimpui.la
-lib/libgimpui.so
 lib/libgimpui.so.1.0
 lib/libglib.a
 lib/libglib.la
-lib/libglib.so
 lib/libglib.so.1.0
 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
+libexec/gimp/0.99.8/plug-ins/CML_explorer
+libexec/gimp/0.99.8/plug-ins/autocrop
+libexec/gimp/0.99.8/plug-ins/blur
+libexec/gimp/0.99.8/plug-ins/bumpmap
+libexec/gimp/0.99.8/plug-ins/c_astretch
+libexec/gimp/0.99.8/plug-ins/checkerboard
+libexec/gimp/0.99.8/plug-ins/cubism
+libexec/gimp/0.99.8/plug-ins/demo
+libexec/gimp/0.99.8/plug-ins/diffraction
+libexec/gimp/0.99.8/plug-ins/displace
+libexec/gimp/0.99.8/plug-ins/edge
+libexec/gimp/0.99.8/plug-ins/emboss
+libexec/gimp/0.99.8/plug-ins/figures
+libexec/gimp/0.99.8/plug-ins/gauss_iir
+libexec/gimp/0.99.8/plug-ins/gauss_rle
+libexec/gimp/0.99.8/plug-ins/gbr
+libexec/gimp/0.99.8/plug-ins/gif
+libexec/gimp/0.99.8/plug-ins/gradmap
+libexec/gimp/0.99.8/plug-ins/grid
+libexec/gimp/0.99.8/plug-ins/header
+libexec/gimp/0.99.8/plug-ins/holes
+libexec/gimp/0.99.8/plug-ins/hot
+libexec/gimp/0.99.8/plug-ins/hrz
+libexec/gimp/0.99.8/plug-ins/ifscompose
+libexec/gimp/0.99.8/plug-ins/jpeg
+libexec/gimp/0.99.8/plug-ins/laplace
+libexec/gimp/0.99.8/plug-ins/mosaic
+libexec/gimp/0.99.8/plug-ins/nlfilt
+libexec/gimp/0.99.8/plug-ins/noisify
+libexec/gimp/0.99.8/plug-ins/normalize
+libexec/gimp/0.99.8/plug-ins/nova
+libexec/gimp/0.99.8/plug-ins/oilify
+libexec/gimp/0.99.8/plug-ins/pat
+libexec/gimp/0.99.8/plug-ins/pcx
+libexec/gimp/0.99.8/plug-ins/pinch
+libexec/gimp/0.99.8/plug-ins/pixelize
+libexec/gimp/0.99.8/plug-ins/plasma
+libexec/gimp/0.99.8/plug-ins/pnm
+libexec/gimp/0.99.8/plug-ins/ps
+libexec/gimp/0.99.8/plug-ins/ripple
+libexec/gimp/0.99.8/plug-ins/script-fu
+libexec/gimp/0.99.8/plug-ins/shift
+libexec/gimp/0.99.8/plug-ins/sobel
+libexec/gimp/0.99.8/plug-ins/sparkle
+libexec/gimp/0.99.8/plug-ins/spread
+libexec/gimp/0.99.8/plug-ins/sunras
+libexec/gimp/0.99.8/plug-ins/tiff
+libexec/gimp/0.99.8/plug-ins/tile
+libexec/gimp/0.99.8/plug-ins/url
+libexec/gimp/0.99.8/plug-ins/video
+libexec/gimp/0.99.8/plug-ins/vinvert
+libexec/gimp/0.99.8/plug-ins/waves
+libexec/gimp/0.99.8/plug-ins/whirl
+libexec/gimp/0.99.8/plug-ins/xpm
+libexec/gimp/0.99.8/plug-ins/xwd
+share/gimp/0.99.8/brushes/10x10square.gbr
+share/gimp/0.99.8/brushes/10x10squareBlur.gbr
+share/gimp/0.99.8/brushes/11circle.gbr
+share/gimp/0.99.8/brushes/11fcircle.gbr
+share/gimp/0.99.8/brushes/13circle.gbr
+share/gimp/0.99.8/brushes/13fcircle.gbr
+share/gimp/0.99.8/brushes/15circle.gbr
+share/gimp/0.99.8/brushes/15fcircle.gbr
+share/gimp/0.99.8/brushes/17circle.gbr
+share/gimp/0.99.8/brushes/17fcircle.gbr
+share/gimp/0.99.8/brushes/19circle.gbr
+share/gimp/0.99.8/brushes/19fcircle.gbr
+share/gimp/0.99.8/brushes/1circle.gbr
+share/gimp/0.99.8/brushes/20x20square.gbr
+share/gimp/0.99.8/brushes/20x20squareBlur.gbr
+share/gimp/0.99.8/brushes/3circle.gbr
+share/gimp/0.99.8/brushes/3fcircle.gbr
+share/gimp/0.99.8/brushes/50x50cone.gbr
+share/gimp/0.99.8/brushes/50x50square.gbr
+share/gimp/0.99.8/brushes/50x50squareBlur.gbr
+share/gimp/0.99.8/brushes/50x50squareBlur2.gbr
+share/gimp/0.99.8/brushes/5circle.gbr
+share/gimp/0.99.8/brushes/5fcircle.gbr
+share/gimp/0.99.8/brushes/5x5square.gbr
+share/gimp/0.99.8/brushes/5x5squareBlur.gbr
+share/gimp/0.99.8/brushes/7circle.gbr
+share/gimp/0.99.8/brushes/7fcircle.gbr
+share/gimp/0.99.8/brushes/9circle.gbr
+share/gimp/0.99.8/brushes/9fcircle.gbr
+share/gimp/0.99.8/brushes/WindozeSux.gbr
+share/gimp/0.99.8/brushes/airplane.gbr
+share/gimp/0.99.8/brushes/bigGalaxy.gbr
+share/gimp/0.99.8/brushes/bird.gbr
+share/gimp/0.99.8/brushes/bush.gbr
+share/gimp/0.99.8/brushes/cloth.gbr
+share/gimp/0.99.8/brushes/confetti.gbr
+share/gimp/0.99.8/brushes/cross.gbr
+share/gimp/0.99.8/brushes/cross_large.gbr
+share/gimp/0.99.8/brushes/cross_small.gbr
+share/gimp/0.99.8/brushes/diamond.gbr
+share/gimp/0.99.8/brushes/duck.gbr
+share/gimp/0.99.8/brushes/dunes.gbr
+share/gimp/0.99.8/brushes/elk.gbr
+share/gimp/0.99.8/brushes/flags.gbr
+share/gimp/0.99.8/brushes/flower.gbr
+share/gimp/0.99.8/brushes/flower_large.gbr
+share/gimp/0.99.8/brushes/galaxy.gbr
+share/gimp/0.99.8/brushes/galaxy_small.gbr
+share/gimp/0.99.8/brushes/gecko.gbr
+share/gimp/0.99.8/brushes/glyph.gbr
+share/gimp/0.99.8/brushes/grid.gbr
+share/gimp/0.99.8/brushes/grid2.gbr
+share/gimp/0.99.8/brushes/guitar.gbr
+share/gimp/0.99.8/brushes/hash.gbr
+share/gimp/0.99.8/brushes/jack.gbr
+share/gimp/0.99.8/brushes/manta.gbr
+share/gimp/0.99.8/brushes/nova.gbr
+share/gimp/0.99.8/brushes/pixel.gbr
+share/gimp/0.99.8/brushes/qbert2.gbr
+share/gimp/0.99.8/brushes/qbert3Blur.gbr
+share/gimp/0.99.8/brushes/ribbon.gbr
+share/gimp/0.99.8/brushes/rings1.gbr
+share/gimp/0.99.8/brushes/rings2.gbr
+share/gimp/0.99.8/brushes/rings3.gbr
+share/gimp/0.99.8/brushes/rings4.gbr
+share/gimp/0.99.8/brushes/rings5.gbr
+share/gimp/0.99.8/brushes/rings6.gbr
+share/gimp/0.99.8/brushes/rings7.gbr
+share/gimp/0.99.8/brushes/sball.gbr
+share/gimp/0.99.8/brushes/slope.gbr
+share/gimp/0.99.8/brushes/snake.gbr
+share/gimp/0.99.8/brushes/snowflake.gbr
+share/gimp/0.99.8/brushes/sparkle.gbr
+share/gimp/0.99.8/brushes/sparkle2.gbr
+share/gimp/0.99.8/brushes/star_medium.gbr
+share/gimp/0.99.8/brushes/star_small.gbr
+share/gimp/0.99.8/brushes/swirl.gbr
+share/gimp/0.99.8/brushes/swirl2.gbr
+share/gimp/0.99.8/brushes/thegimp.gbr
+share/gimp/0.99.8/brushes/therefore.gbr
+share/gimp/0.99.8/brushes/tictactoe.gbr
+share/gimp/0.99.8/brushes/tile.gbr
+share/gimp/0.99.8/brushes/triangle.gbr
+share/gimp/0.99.8/brushes/tulip.gbr
+share/gimp/0.99.8/brushes/xcf.gbr
+share/gimp/0.99.8/gimp_logo.ppm
+share/gimp/0.99.8/gimprc
+share/gimp/0.99.8/gradients/Default
+share/gimp/0.99.8/gradients/French_flag
+share/gimp/0.99.8/gradients/French_flag_smooth
+share/gimp/0.99.8/gradients/Full_saturation_spectrum_CCW
+share/gimp/0.99.8/gradients/Full_saturation_spectrum_CW
+share/gimp/0.99.8/gradients/German_flag
+share/gimp/0.99.8/gradients/German_flag_smooth
+share/gimp/0.99.8/gradients/Mexican_flag
+share/gimp/0.99.8/gradients/Mexican_flag_smooth
+share/gimp/0.99.8/palettes/Blues
+share/gimp/0.99.8/palettes/Browns_And_Yellows
+share/gimp/0.99.8/palettes/Cool_Colors
+share/gimp/0.99.8/palettes/Default
+share/gimp/0.99.8/palettes/Grays
+share/gimp/0.99.8/palettes/Greens
+share/gimp/0.99.8/palettes/Lights
+share/gimp/0.99.8/palettes/Muted
+share/gimp/0.99.8/palettes/Pastels
+share/gimp/0.99.8/palettes/Reds_And_Purples
+share/gimp/0.99.8/palettes/Warm_Colors
+share/gimp/0.99.8/patterns/3dgreen.pat
+share/gimp/0.99.8/patterns/Craters.pat
+share/gimp/0.99.8/patterns/Moonfoot.pat
+share/gimp/0.99.8/patterns/amethyst.pat
+share/gimp/0.99.8/patterns/bark.pat
+share/gimp/0.99.8/patterns/blackwhitefloor.pat
+share/gimp/0.99.8/patterns/blue.pat
+share/gimp/0.99.8/patterns/blueweb.pat
+share/gimp/0.99.8/patterns/brick.pat
+share/gimp/0.99.8/patterns/burlap.pat
+share/gimp/0.99.8/patterns/burlwood.pat
+share/gimp/0.99.8/patterns/chains.pat
+share/gimp/0.99.8/patterns/choc_swirl.pat
+share/gimp/0.99.8/patterns/circuit.pat
+share/gimp/0.99.8/patterns/clouds.pat
+share/gimp/0.99.8/patterns/clovers.pat
+share/gimp/0.99.8/patterns/coins.pat
+share/gimp/0.99.8/patterns/color.pat
+share/gimp/0.99.8/patterns/corkboard.pat
+share/gimp/0.99.8/patterns/cracked.pat
+share/gimp/0.99.8/patterns/crazytile.pat
+share/gimp/0.99.8/patterns/crinklepaper.pat
+share/gimp/0.99.8/patterns/drymud.pat
+share/gimp/0.99.8/patterns/dunes.pat
+share/gimp/0.99.8/patterns/eggcarton.pat
+share/gimp/0.99.8/patterns/electric.pat
+share/gimp/0.99.8/patterns/fibers.pat
+share/gimp/0.99.8/patterns/floor_tile.pat
+share/gimp/0.99.8/patterns/granite1.pat
+share/gimp/0.99.8/patterns/granite2.pat
+share/gimp/0.99.8/patterns/green_curtains.pat
+share/gimp/0.99.8/patterns/ground1.pat
+share/gimp/0.99.8/patterns/java.pat
+share/gimp/0.99.8/patterns/krinkle.pat
+share/gimp/0.99.8/patterns/lathe.pat
+share/gimp/0.99.8/patterns/leather.pat
+share/gimp/0.99.8/patterns/leaves.pat
+share/gimp/0.99.8/patterns/leaves3.pat
+share/gimp/0.99.8/patterns/leaves4.pat
+share/gimp/0.99.8/patterns/leaves6.pat
+share/gimp/0.99.8/patterns/leopard.pat
+share/gimp/0.99.8/patterns/lightning.pat
+share/gimp/0.99.8/patterns/lumps.pat
+share/gimp/0.99.8/patterns/marble1.pat
+share/gimp/0.99.8/patterns/marble2.pat
+share/gimp/0.99.8/patterns/marble3.pat
+share/gimp/0.99.8/patterns/mhuerock.pat
+share/gimp/0.99.8/patterns/money.pat
+share/gimp/0.99.8/patterns/oooh.pat
+share/gimp/0.99.8/patterns/oooh3.pat
+share/gimp/0.99.8/patterns/paper.pat
+share/gimp/0.99.8/patterns/parque1.pat
+share/gimp/0.99.8/patterns/parque2.pat
+share/gimp/0.99.8/patterns/parque3.pat
+share/gimp/0.99.8/patterns/pine.pat
+share/gimp/0.99.8/patterns/pink_marble.pat
+share/gimp/0.99.8/patterns/pj.pat
+share/gimp/0.99.8/patterns/pool.pat
+share/gimp/0.99.8/patterns/qube1.pat
+share/gimp/0.99.8/patterns/recessed.pat
+share/gimp/0.99.8/patterns/rock.pat
+share/gimp/0.99.8/patterns/sky.pat
+share/gimp/0.99.8/patterns/slate.pat
+share/gimp/0.99.8/patterns/sm_squares.pat
+share/gimp/0.99.8/patterns/startile.pat
+share/gimp/0.99.8/patterns/stone33.pat
+share/gimp/0.99.8/patterns/swirl.pat
+share/gimp/0.99.8/patterns/swirl2.pat
+share/gimp/0.99.8/patterns/terra.pat
+share/gimp/0.99.8/patterns/torrents.pat
+share/gimp/0.99.8/patterns/walnut.pat
+share/gimp/0.99.8/patterns/water3.pat
+share/gimp/0.99.8/patterns/waves.pat
+share/gimp/0.99.8/patterns/wax.pat
+share/gimp/0.99.8/patterns/wood1.pat
+share/gimp/0.99.8/patterns/wood2.pat
+share/gimp/0.99.8/patterns/wood3.pat
+share/gimp/0.99.8/patterns/wood4.pat
+share/gimp/0.99.8/patterns/wood5.pat
+share/gimp/0.99.8/scripts/alien-glow.scm
+share/gimp/0.99.8/scripts/bds-logo-textured.scm
+share/gimp/0.99.8/scripts/beavis.jpg
+share/gimp/0.99.8/scripts/blend-logo.scm
+share/gimp/0.99.8/scripts/carve.scm
+share/gimp/0.99.8/scripts/chrome-it.scm
+share/gimp/0.99.8/scripts/chrome.scm
+share/gimp/0.99.8/scripts/chrome2.scm
+share/gimp/0.99.8/scripts/clothify.scm
+share/gimp/0.99.8/scripts/crystal.scm
+share/gimp/0.99.8/scripts/ds-logo.scm
+share/gimp/0.99.8/scripts/frozen-text.scm
+share/gimp/0.99.8/scripts/glowing.scm
+share/gimp/0.99.8/scripts/hds-logo.scm
+share/gimp/0.99.8/scripts/neon.scm
+share/gimp/0.99.8/scripts/sphere.scm
+share/gimp/0.99.8/scripts/swirltile.scm
+share/gimp/0.99.8/scripts/t-o-p.scm
+share/gimp/0.99.8/scripts/text-circle.scm
+share/gimp/0.99.8/scripts/texture1.jpg
+share/gimp/0.99.8/scripts/texture2.jpg
+share/gimp/0.99.8/user_install
+@dirrm include/glib
 @dirrm include/gdk
 @dirrm include/glib
-@dirrm include/gtk
-@dirrm libexec/gimp/0.99.7/plug-ins
-@dirrm libexec/gimp/0.99.7
+@dirrm include/libgimp
+@dirrm libexec/gimp/0.99.8/plug-ins
+@dirrm libexec/gimp/0.99.8
 @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/0.99.8/scripts
+@dirrm share/gimp/0.99.8/brushes
+@dirrm share/gimp/0.99.8/palettes
+@dirrm share/gimp/0.99.8/gradients
+@dirrm share/gimp/0.99.8/patterns
+@dirrm share/gimp/0.99.8
 @dirrm share/gimp