upgrade to 0.99.21, there'll be another port containing the ``unstable''

plug-ins soon.

24 files changed, 1236 insertions, 1488 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index caffb6367ee7..ac10feb918da 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -1,26 +1,25 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.17
+# Version required:     0.99.19
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.19 1998/01/28 15:39:56 erich Exp $
+# $Id: Makefile,v 1.20 1998/02/21 22:37:56 fenner Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	18
+MICRO=	21
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}b.tar.gz \
-            gimp-data-extras-${MM_VERSION}a.tar.gz
+DISTFILES+=     gimp-data-extras-${MM_VERSION}a.tar.gz
 
-CATEGORIES=     graphics tk80
-MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/0.99/${VERSION}/ \
-                ftp://ftp.cs.umn.edu/pub/gimp/gimp/0.99/${VERSION}/ \
+CATEGORIES=     graphics
+MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/v${MAJOR}.${MINOR}/v${VERSION}/ \
+                ftp://ftp.cs.umn.edu/pub/gimp/gimp/v${MAJOR}.${MINOR}/v${VERSION}/ \
 
 MAINTAINER=     erich@FreeBSD.org
 
@@ -30,25 +29,20 @@ LIB_DEPENDS+=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 LIB_DEPENDS+=	xdelta\\.0:${PORTSDIR}/misc/xdelta
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
-		-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
-CONFIGURE_ARGS=  --with-tcl=tcl80 --with-tk=tk80
 
 DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}b; \
-	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
-	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 764774e1d585..3f054db50319 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.18.tar.gz) = 1d07aa3f2f0f7024bfdb786dd15e8d58
-MD5 (gimp-data-min-0.99b.tar.gz) = 55f735d5bb2604a100707e9638df3d4b
+MD5 (gimp-0.99.21.tar.gz) = e1544aec645d7be6586485e6a131ece7
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
+MD5 (gimp-plugins-unstable-0.99.21.tar.gz) = 3dcd9c1d27557aebeceeb6f3fa6b7f9a
diff --git a/graphics/gimp-app-devel/files/patch-ah b/graphics/gimp-app-devel/files/patch-ah
index d05ddb1cd23f..7add97cf89ce 100644
--- a/graphics/gimp-app-devel/files/patch-ah
+++ b/graphics/gimp-app-devel/files/patch-ah
@@ -1,6 +1,6 @@
---- configure.in~	Mon Jan 26 10:34:48 1998
-+++ configure.in	Mon Jan 26 10:35:31 1998
-@@ -120,10 +120,10 @@
+--- configure.in~	Tue Mar 17 08:28:37 1998
++++ configure.in	Tue Mar 17 08:30:07 1998
+@@ -108,10 +108,10 @@
  
  dnl Test for libtiff
    if test -z "$LIBTIFF_LIB"; then
@@ -15,26 +15,26 @@
          AC_MSG_WARN(*** TIFF plug-in will not be built ***), -lz -ljpeg -lm), -lm)
    fi
  
-@@ -240,7 +240,7 @@
- AC_C_INLINE
+@@ -219,7 +219,7 @@
+ LIBS="$gimp_save_LIBS"
  
- gimpdatadir=$datadir/$PACKAGE
+ gimpdatadir=$datadir/gimp
 -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
 +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
  
- dnl This is for generating PDB docuemntation.
- AC_PATH_PROG(EMACS, emacs, :)
---- configure~	Mon Jan 26 10:36:08 1998
-+++ configure	Mon Jan 26 10:37:35 1998
-@@ -2738,14 +2738,14 @@
- fi
+ brushdata=`ls -1 data/brushes | grep -v Makefile`
+ gradientdata=`ls -1 data/gradients | grep -v Makefile`
+--- configure~	Tue Mar 17 08:28:43 1998
++++ configure	Tue Mar 17 08:31:40 1998
+@@ -1960,14 +1960,14 @@
+   fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2743: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:1965: checking for TIFFReadScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
 +    echo $ac_n "checking for TIFFReadScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2743: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:1965: checking for TIFFReadScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -43,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2751 "configure"
+ #line 1973 "configure"
  #include "confdefs.h"
-@@ -2773,17 +2773,17 @@
+@@ -1995,17 +1995,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -54,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2781: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2003: checking for TIFFWriteScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for TIFFWriteScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2781: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2003: checking for TIFFWriteScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -66,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2789 "configure"
+ #line 2011 "configure"
  #include "confdefs.h"
-@@ -2811,7 +2811,7 @@
+@@ -2033,7 +2033,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -77,12 +77,3 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3949,7 +3949,7 @@
- 
- 
- gimpdatadir=$datadir/$PACKAGE
--gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
-+gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
- 
- # Extract the first word of "emacs", so it can be a program name with args.
- set dummy emacs; ac_word=$2
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 615e7b8c6e17..c43364ca85c8 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -4,172 +4,127 @@ lib/libgimp.a
 lib/libgimpui.so.1.0
 lib/libgimpui.la
 lib/libgimpui.a
-lib/libgck.so.0.1
-lib/libgck.la
-lib/libgck.a
+lib/libmegawidget.a
+lib/gimp/0.99/plug-ins/AlienMap
+lib/gimp/0.99/plug-ins/dbbrowser
+lib/gimp/0.99/plug-ins/script-fu
+lib/gimp/0.99/plug-ins/struc
+lib/gimp/0.99/plug-ins/webbrowser
+lib/gimp/0.99/plug-ins/tiff
+lib/gimp/0.99/plug-ins/jpeg
+lib/gimp/0.99/plug-ins/png
+lib/gimp/0.99/plug-ins/mpeg
+lib/gimp/0.99/plug-ins/xd
+lib/gimp/0.99/plug-ins/xpm
+lib/gimp/0.99/plug-ins/CML_explorer
+lib/gimp/0.99/plug-ins/align_layers
+lib/gimp/0.99/plug-ins/animoptimize
+lib/gimp/0.99/plug-ins/apply_lens
+lib/gimp/0.99/plug-ins/autocrop
+lib/gimp/0.99/plug-ins/animationplay
+lib/gimp/0.99/plug-ins/autostretch_hsv
+lib/gimp/0.99/plug-ins/blinds
+lib/gimp/0.99/plug-ins/blur
+lib/gimp/0.99/plug-ins/bmp
+lib/gimp/0.99/plug-ins/bumpmap
+lib/gimp/0.99/plug-ins/bz2
+lib/gimp/0.99/plug-ins/c_astretch
+lib/gimp/0.99/plug-ins/CEL
+lib/gimp/0.99/plug-ins/colorify
+lib/gimp/0.99/plug-ins/checkerboard
+lib/gimp/0.99/plug-ins/compose
+lib/gimp/0.99/plug-ins/convmatrix
+lib/gimp/0.99/plug-ins/cubism
+lib/gimp/0.99/plug-ins/decompose
+lib/gimp/0.99/plug-ins/deinterlace
+lib/gimp/0.99/plug-ins/depthmerge
+lib/gimp/0.99/plug-ins/despeckle
+lib/gimp/0.99/plug-ins/destripe
+lib/gimp/0.99/plug-ins/diffraction
+lib/gimp/0.99/plug-ins/displace
+lib/gimp/0.99/plug-ins/edge
+lib/gimp/0.99/plug-ins/emboss
+lib/gimp/0.99/plug-ins/engrave
+lib/gimp/0.99/plug-ins/exchange
+lib/gimp/0.99/plug-ins/faxg3
+lib/gimp/0.99/plug-ins/film
+lib/gimp/0.99/plug-ins/fits
+lib/gimp/0.99/plug-ins/flame
+lib/gimp/0.99/plug-ins/flarefx
+lib/gimp/0.99/plug-ins/fractaltrace
+lib/gimp/0.99/plug-ins/gauss_iir
+lib/gimp/0.99/plug-ins/gauss_rle
+lib/gimp/0.99/plug-ins/gbr
+lib/gimp/0.99/plug-ins/gfli
+lib/gimp/0.99/plug-ins/gicon
+lib/gimp/0.99/plug-ins/gif
+lib/gimp/0.99/plug-ins/glasstile
+lib/gimp/0.99/plug-ins/gqbist
+lib/gimp/0.99/plug-ins/gradmap
+lib/gimp/0.99/plug-ins/grid
+lib/gimp/0.99/plug-ins/gtm
+lib/gimp/0.99/plug-ins/gz
+lib/gimp/0.99/plug-ins/header
+lib/gimp/0.99/plug-ins/hot
+lib/gimp/0.99/plug-ins/hrz
+lib/gimp/0.99/plug-ins/ifscompose
+lib/gimp/0.99/plug-ins/illusion
+lib/gimp/0.99/plug-ins/iwarp
+lib/gimp/0.99/plug-ins/laplace
+lib/gimp/0.99/plug-ins/mail
+lib/gimp/0.99/plug-ins/max_rgb
+lib/gimp/0.99/plug-ins/maze
+lib/gimp/0.99/plug-ins/mblur
+lib/gimp/0.99/plug-ins/mosaic
+lib/gimp/0.99/plug-ins/nlfilt
+lib/gimp/0.99/plug-ins/noisify
+lib/gimp/0.99/plug-ins/normalize
+lib/gimp/0.99/plug-ins/nova
+lib/gimp/0.99/plug-ins/oilify
+lib/gimp/0.99/plug-ins/papertile
+lib/gimp/0.99/plug-ins/pat
+lib/gimp/0.99/plug-ins/pcx
+lib/gimp/0.99/plug-ins/pix
+lib/gimp/0.99/plug-ins/pixelize
+lib/gimp/0.99/plug-ins/plasma
+lib/gimp/0.99/plug-ins/pnm
+lib/gimp/0.99/plug-ins/polar
+lib/gimp/0.99/plug-ins/print
+lib/gimp/0.99/plug-ins/ps
+lib/gimp/0.99/plug-ins/ripple
+lib/gimp/0.99/plug-ins/randomize
+lib/gimp/0.99/plug-ins/rotate
+lib/gimp/0.99/plug-ins/rotators
+lib/gimp/0.99/plug-ins/scatter_hsv
+lib/gimp/0.99/plug-ins/semiflatten
+lib/gimp/0.99/plug-ins/sgi
+lib/gimp/0.99/plug-ins/shift
+lib/gimp/0.99/plug-ins/sinus
+lib/gimp/0.99/plug-ins/smooth_palette
+lib/gimp/0.99/plug-ins/snoise
+lib/gimp/0.99/plug-ins/snp
+lib/gimp/0.99/plug-ins/sobel
+lib/gimp/0.99/plug-ins/sparkle
+lib/gimp/0.99/plug-ins/spread
+lib/gimp/0.99/plug-ins/sunras
+lib/gimp/0.99/plug-ins/tga
+lib/gimp/0.99/plug-ins/threshold_alpha
+lib/gimp/0.99/plug-ins/tile
+lib/gimp/0.99/plug-ins/tileit
+lib/gimp/0.99/plug-ins/tiler
+lib/gimp/0.99/plug-ins/url
+lib/gimp/0.99/plug-ins/video
+lib/gimp/0.99/plug-ins/vinvert
+lib/gimp/0.99/plug-ins/vpropagate
+lib/gimp/0.99/plug-ins/waves
+lib/gimp/0.99/plug-ins/whirlpinch
+lib/gimp/0.99/plug-ins/xwd
+lib/gimp/0.99/plug-ins/zealouscrop
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpui.h
-include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gcknotebook.h
-include/gck/gckvector.h
-libexec/gimp/0.99/plug-ins/libmegawidget.a
-libexec/gimp/0.99/plug-ins/MapObject
-libexec/gimp/0.99/plug-ins/AlienMap
-libexec/gimp/0.99/plug-ins/Anamorphose
-libexec/gimp/0.99/plug-ins/CentralReflection
-libexec/gimp/0.99/plug-ins/Curtain
-libexec/gimp/0.99/plug-ins/Encrypt_Decrypt
-libexec/gimp/0.99/plug-ins/Julia
-libexec/gimp/0.99/plug-ins/Mandelbrot
-libexec/gimp/0.99/plug-ins/DigitalSignature
-libexec/gimp/0.99/plug-ins/dbbrowser
-libexec/gimp/0.99/plug-ins/fuse
-libexec/gimp/0.99/plug-ins/gflare
-libexec/gimp/0.99/plug-ins/consolio
-libexec/gimp/0.99/plug-ins/pdb_help
-libexec/gimp/0.99/plug-ins/stained_glass
-libexec/gimp/0.99/plug-ins/sbutton
-libexec/gimp/0.99/plug-ins/refract
-libexec/gimp/0.99/plug-ins/script-fu
-libexec/gimp/0.99/plug-ins/struc
-libexec/gimp/0.99/plug-ins/twist
-libexec/gimp/0.99/plug-ins/warp
-libexec/gimp/0.99/plug-ins/tiff
-libexec/gimp/0.99/plug-ins/jpeg
-libexec/gimp/0.99/plug-ins/png
-libexec/gimp/0.99/plug-ins/xd
-libexec/gimp/0.99/plug-ins/mpeg
-libexec/gimp/0.99/plug-ins/xpm
-libexec/gimp/0.99/plug-ins/CML_explorer
-libexec/gimp/0.99/plug-ins/align_layers
-libexec/gimp/0.99/plug-ins/apply_lens
-libexec/gimp/0.99/plug-ins/autocrop
-libexec/gimp/0.99/plug-ins/animationplay
-libexec/gimp/0.99/plug-ins/autostretch_hsv
-libexec/gimp/0.99/plug-ins/blinds
-libexec/gimp/0.99/plug-ins/blur
-libexec/gimp/0.99/plug-ins/blur2
-libexec/gimp/0.99/plug-ins/bmp
-libexec/gimp/0.99/plug-ins/bumpmap
-libexec/gimp/0.99/plug-ins/bz2
-libexec/gimp/0.99/plug-ins/c_astretch
-libexec/gimp/0.99/plug-ins/CEL
-libexec/gimp/0.99/plug-ins/checkerboard
-libexec/gimp/0.99/plug-ins/colorify
-libexec/gimp/0.99/plug-ins/compose
-libexec/gimp/0.99/plug-ins/convmatrix
-libexec/gimp/0.99/plug-ins/coordmap
-libexec/gimp/0.99/plug-ins/cubism
-libexec/gimp/0.99/plug-ins/decompose
-libexec/gimp/0.99/plug-ins/deinterlace
-libexec/gimp/0.99/plug-ins/depthmerge
-libexec/gimp/0.99/plug-ins/despeckle
-libexec/gimp/0.99/plug-ins/destripe
-libexec/gimp/0.99/plug-ins/fp
-libexec/gimp/0.99/plug-ins/diffraction
-libexec/gimp/0.99/plug-ins/displace
-libexec/gimp/0.99/plug-ins/edge
-libexec/gimp/0.99/plug-ins/emboss
-libexec/gimp/0.99/plug-ins/engrave
-libexec/gimp/0.99/plug-ins/exchange
-libexec/gimp/0.99/plug-ins/faxg3
-libexec/gimp/0.99/plug-ins/figures
-libexec/gimp/0.99/plug-ins/film
-libexec/gimp/0.99/plug-ins/fits
-libexec/gimp/0.99/plug-ins/flame
-libexec/gimp/0.99/plug-ins/flarefx
-libexec/gimp/0.99/plug-ins/fractaltrace
-libexec/gimp/0.99/plug-ins/gauss_iir
-libexec/gimp/0.99/plug-ins/gauss_rle
-libexec/gimp/0.99/plug-ins/gbr
-libexec/gimp/0.99/plug-ins/gfli
-libexec/gimp/0.99/plug-ins/gicon
-libexec/gimp/0.99/plug-ins/gif
-libexec/gimp/0.99/plug-ins/glasstile
-libexec/gimp/0.99/plug-ins/gqbist
-libexec/gimp/0.99/plug-ins/gradmap
-libexec/gimp/0.99/plug-ins/grid
-libexec/gimp/0.99/plug-ins/gz
-libexec/gimp/0.99/plug-ins/header
-libexec/gimp/0.99/plug-ins/holes
-libexec/gimp/0.99/plug-ins/hot
-libexec/gimp/0.99/plug-ins/hrz
-libexec/gimp/0.99/plug-ins/ifscompose
-libexec/gimp/0.99/plug-ins/illusion
-libexec/gimp/0.99/plug-ins/lic
-libexec/gimp/0.99/plug-ins/iwarp
-libexec/gimp/0.99/plug-ins/laplace
-libexec/gimp/0.99/plug-ins/magiceye
-libexec/gimp/0.99/plug-ins/mail
-libexec/gimp/0.99/plug-ins/max_rgb
-libexec/gimp/0.99/plug-ins/maze
-libexec/gimp/0.99/plug-ins/mblur
-libexec/gimp/0.99/plug-ins/mosaic
-libexec/gimp/0.99/plug-ins/nlfilt
-libexec/gimp/0.99/plug-ins/noisify
-libexec/gimp/0.99/plug-ins/normalize
-libexec/gimp/0.99/plug-ins/nova
-libexec/gimp/0.99/plug-ins/oilify
-libexec/gimp/0.99/plug-ins/papertile
-libexec/gimp/0.99/plug-ins/pat
-libexec/gimp/0.99/plug-ins/pcx
-libexec/gimp/0.99/plug-ins/pix
-libexec/gimp/0.99/plug-ins/pixelize
-libexec/gimp/0.99/plug-ins/plasma
-libexec/gimp/0.99/plug-ins/pnm
-libexec/gimp/0.99/plug-ins/polar
-libexec/gimp/0.99/plug-ins/print
-libexec/gimp/0.99/plug-ins/ps
-libexec/gimp/0.99/plug-ins/psd
-libexec/gimp/0.99/plug-ins/randomize
-libexec/gimp/0.99/plug-ins/ripple
-libexec/gimp/0.99/plug-ins/rotate
-libexec/gimp/0.99/plug-ins/rotators
-libexec/gimp/0.99/plug-ins/scatter_hsv
-libexec/gimp/0.99/plug-ins/sgi
-libexec/gimp/0.99/plug-ins/sharpen
-libexec/gimp/0.99/plug-ins/shift
-libexec/gimp/0.99/plug-ins/sinus
-libexec/gimp/0.99/plug-ins/smooth_palette
-libexec/gimp/0.99/plug-ins/snoise
-libexec/gimp/0.99/plug-ins/snp
-libexec/gimp/0.99/plug-ins/sobel
-libexec/gimp/0.99/plug-ins/sparkle
-libexec/gimp/0.99/plug-ins/spread
-libexec/gimp/0.99/plug-ins/stegano
-libexec/gimp/0.99/plug-ins/stereogram
-libexec/gimp/0.99/plug-ins/sunras
-libexec/gimp/0.99/plug-ins/tga
-libexec/gimp/0.99/plug-ins/threshold_alpha
-libexec/gimp/0.99/plug-ins/tile
-libexec/gimp/0.99/plug-ins/tileit
-libexec/gimp/0.99/plug-ins/tiler
-libexec/gimp/0.99/plug-ins/universal
-libexec/gimp/0.99/plug-ins/url
-libexec/gimp/0.99/plug-ins/video
-libexec/gimp/0.99/plug-ins/vinvert
-libexec/gimp/0.99/plug-ins/vpropagate
-libexec/gimp/0.99/plug-ins/waves
-libexec/gimp/0.99/plug-ins/whirlpinch
-libexec/gimp/0.99/plug-ins/xwd
-libexec/gimp/0.99/plug-ins/zealouscrop
-libexec/gimptcl
-share/gimp/gflares/Bright_Star
-share/gimp/gflares/Classic
-share/gimp/gflares/Default
-share/gimp/gflares/Distant_Sun
-share/gimp/gflares/GFlare_101
-share/gimp/gflares/GFlare_102
-share/gimp/gflares/Hidden_Planet
+include/megawidget.h
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -247,13 +202,7 @@ share/gimp/scripts/truchet.scm
 share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
 share/gimp/scripts/xach-effect.scm
-share/gimp/user_install
-share/gimp/gimprc
-share/gimp/gimprc_user
-share/gimp/gtkrc
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_tips.txt
-share/gimp/ps-menurc
+share/gimp/scripts/web-browser.scm
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -272,11 +221,10 @@ share/gimp/brushes/20x20squareBlur.gbr
 share/gimp/brushes/3circle.gbr
 share/gimp/brushes/3fcircle.gbr
 share/gimp/brushes/5circle.gbr
-share/gimp/brushes/7circle.gbr
 share/gimp/brushes/5fcircle.gbr
-share/gimp/brushes/xcf.gbr
 share/gimp/brushes/5x5square.gbr
 share/gimp/brushes/5x5squareBlur.gbr
+share/gimp/brushes/7circle.gbr
 share/gimp/brushes/7fcircle.gbr
 share/gimp/brushes/9circle.gbr
 share/gimp/brushes/9fcircle.gbr
@@ -294,15 +242,16 @@ share/gimp/brushes/galaxy_big.gbr
 share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/pixel.gbr
 share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/xcf.gbr
 share/gimp/brushes/50x50cone.gbr
 share/gimp/brushes/50x50square.gbr
 share/gimp/brushes/50x50squareBlur.gbr
-share/gimp/brushes/bird.gbr
 share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
 share/gimp/brushes/bigcircle4.gbr
+share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
 share/gimp/brushes/flower.gbr
@@ -319,10 +268,10 @@ share/gimp/brushes/qbert3Blur.gbr
 share/gimp/brushes/reach.gbr
 share/gimp/brushes/sphere29.gbr
 share/gimp/brushes/sphere36.gbr
+share/gimp/brushes/star1.gbr
 share/gimp/brushes/sphere47.gbr
 share/gimp/brushes/sphere55.gbr
 share/gimp/brushes/sphere79.gbr
-share/gimp/brushes/star1.gbr
 share/gimp/brushes/star2.gbr
 share/gimp/brushes/star3.gbr
 share/gimp/brushes/star4.gbr
@@ -335,19 +284,6 @@ share/gimp/brushes/text3.gbr
 share/gimp/brushes/text4.gbr
 share/gimp/brushes/tulip.gbr
 share/gimp/brushes/wave.gbr
-share/gimp/palettes/Blues
-share/gimp/palettes/Browns_And_Yellows
-share/gimp/palettes/Cool_Colors
-share/gimp/palettes/Default
-share/gimp/palettes/Grays
-share/gimp/palettes/Greens
-share/gimp/palettes/Lights
-share/gimp/palettes/Muted
-share/gimp/palettes/Named_Colors
-share/gimp/palettes/Pastels
-share/gimp/palettes/Reds_And_Purples
-share/gimp/palettes/Warm_Colors
-share/gimp/palettes/Web
 share/gimp/gradients/Abstract_1
 share/gimp/gradients/Abstract_2
 share/gimp/gradients/Abstract_3
@@ -424,6 +360,43 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
+share/gimp/palettes/Bears
+share/gimp/palettes/Bgold
+share/gimp/palettes/Blues
+share/gimp/palettes/Borders
+share/gimp/palettes/Browns_And_Yellows
+share/gimp/palettes/Caramel
+share/gimp/palettes/Cascade
+share/gimp/palettes/China
+share/gimp/palettes/Coldfire
+share/gimp/palettes/Cool_Colors
+share/gimp/palettes/Cranes
+share/gimp/palettes/Dark_pastels
+share/gimp/palettes/Default
+share/gimp/palettes/Ega
+share/gimp/palettes/Firecode
+share/gimp/palettes/Gold
+share/gimp/palettes/GrayViolet
+share/gimp/palettes/Grayblue
+share/gimp/palettes/Grays
+share/gimp/palettes/Greens
+share/gimp/palettes/Hilite
+share/gimp/palettes/Kahki
+share/gimp/palettes/Lights
+share/gimp/palettes/Muted
+share/gimp/palettes/Named_Colors
+share/gimp/palettes/News3
+share/gimp/palettes/Op2
+share/gimp/palettes/Pastels
+share/gimp/palettes/Paintjet
+share/gimp/palettes/Plasma
+share/gimp/palettes/Reds
+share/gimp/palettes/Reds_And_Purples
+share/gimp/palettes/Royal
+share/gimp/palettes/Topographic
+share/gimp/palettes/Volcano
+share/gimp/palettes/Warm_Colors
+share/gimp/palettes/Web
 share/gimp/patterns/3dgreen.pat
 share/gimp/patterns/Craters.pat
 share/gimp/patterns/Moonfoot.pat
@@ -592,28 +565,28 @@ share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
+share/gimp/user_install
+share/gimp/gimprc
+share/gimp/gimprc_user
+share/gimp/gtkrc
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimp_tips.txt
+share/gimp/ps-menurc
 bin/gimp
-@unexec install-info --delete %D/info/pdb.info %D/info/dir
-@unexec install-info --delete %D/info/pdb.info-1 %D/info/dir
-@unexec install-info --delete %D/info/pdb.info-2 %D/info/dir
-@exec install-info %D/info/pdb.info %D/info/dir
-@exec install-info %D/info/pdb.info-1 %D/info/dir
-@exec install-info %D/info/pdb.info-2 %D/info/dir
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
 lib/libgimp.so
 lib/libgimpui.so
-lib/libgck.so
+@dirrm lib/gimp/0.99/plug-ins
+@dirrm lib/gimp/0.99
+@dirrm lib/gimp
+@dirrm lib
 @dirrm include/libgimp
-@dirrm include/gck
-@dirrm libexec/gimp/0.99/plug-ins
-@dirrm libexec/gimp/0.99
-@dirrm libexec/gimp
-@dirrm share/gimp/gflares
+@dirrm include
 @dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
-@dirrm share/gimp/palettes
 @dirrm share/gimp/gradients
+@dirrm share/gimp/palettes
 @dirrm share/gimp/patterns
 @dirrm share/gimp
+@dirrm share
+@dirrm bin
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index caffb6367ee7..ac10feb918da 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,26 +1,25 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.17
+# Version required:     0.99.19
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.19 1998/01/28 15:39:56 erich Exp $
+# $Id: Makefile,v 1.20 1998/02/21 22:37:56 fenner Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	18
+MICRO=	21
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}b.tar.gz \
-            gimp-data-extras-${MM_VERSION}a.tar.gz
+DISTFILES+=     gimp-data-extras-${MM_VERSION}a.tar.gz
 
-CATEGORIES=     graphics tk80
-MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/0.99/${VERSION}/ \
-                ftp://ftp.cs.umn.edu/pub/gimp/gimp/0.99/${VERSION}/ \
+CATEGORIES=     graphics
+MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/v${MAJOR}.${MINOR}/v${VERSION}/ \
+                ftp://ftp.cs.umn.edu/pub/gimp/gimp/v${MAJOR}.${MINOR}/v${VERSION}/ \
 
 MAINTAINER=     erich@FreeBSD.org
 
@@ -30,25 +29,20 @@ LIB_DEPENDS+=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 LIB_DEPENDS+=	xdelta\\.0:${PORTSDIR}/misc/xdelta
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
-		-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
-CONFIGURE_ARGS=  --with-tcl=tcl80 --with-tk=tk80
 
 DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}b; \
-	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
-	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 764774e1d585..3f054db50319 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.18.tar.gz) = 1d07aa3f2f0f7024bfdb786dd15e8d58
-MD5 (gimp-data-min-0.99b.tar.gz) = 55f735d5bb2604a100707e9638df3d4b
+MD5 (gimp-0.99.21.tar.gz) = e1544aec645d7be6586485e6a131ece7
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
+MD5 (gimp-plugins-unstable-0.99.21.tar.gz) = 3dcd9c1d27557aebeceeb6f3fa6b7f9a
diff --git a/graphics/gimp-app/files/patch-ah b/graphics/gimp-app/files/patch-ah
index d05ddb1cd23f..7add97cf89ce 100644
--- a/graphics/gimp-app/files/patch-ah
+++ b/graphics/gimp-app/files/patch-ah
@@ -1,6 +1,6 @@
---- configure.in~	Mon Jan 26 10:34:48 1998
-+++ configure.in	Mon Jan 26 10:35:31 1998
-@@ -120,10 +120,10 @@
+--- configure.in~	Tue Mar 17 08:28:37 1998
++++ configure.in	Tue Mar 17 08:30:07 1998
+@@ -108,10 +108,10 @@
  
  dnl Test for libtiff
    if test -z "$LIBTIFF_LIB"; then
@@ -15,26 +15,26 @@
          AC_MSG_WARN(*** TIFF plug-in will not be built ***), -lz -ljpeg -lm), -lm)
    fi
  
-@@ -240,7 +240,7 @@
- AC_C_INLINE
+@@ -219,7 +219,7 @@
+ LIBS="$gimp_save_LIBS"
  
- gimpdatadir=$datadir/$PACKAGE
+ gimpdatadir=$datadir/gimp
 -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
 +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
  
- dnl This is for generating PDB docuemntation.
- AC_PATH_PROG(EMACS, emacs, :)
---- configure~	Mon Jan 26 10:36:08 1998
-+++ configure	Mon Jan 26 10:37:35 1998
-@@ -2738,14 +2738,14 @@
- fi
+ brushdata=`ls -1 data/brushes | grep -v Makefile`
+ gradientdata=`ls -1 data/gradients | grep -v Makefile`
+--- configure~	Tue Mar 17 08:28:43 1998
++++ configure	Tue Mar 17 08:31:40 1998
+@@ -1960,14 +1960,14 @@
+   fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2743: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:1965: checking for TIFFReadScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
 +    echo $ac_n "checking for TIFFReadScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2743: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:1965: checking for TIFFReadScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -43,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2751 "configure"
+ #line 1973 "configure"
  #include "confdefs.h"
-@@ -2773,17 +2773,17 @@
+@@ -1995,17 +1995,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -54,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2781: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2003: checking for TIFFWriteScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for TIFFWriteScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2781: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2003: checking for TIFFWriteScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -66,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2789 "configure"
+ #line 2011 "configure"
  #include "confdefs.h"
-@@ -2811,7 +2811,7 @@
+@@ -2033,7 +2033,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -77,12 +77,3 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3949,7 +3949,7 @@
- 
- 
- gimpdatadir=$datadir/$PACKAGE
--gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
-+gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
- 
- # Extract the first word of "emacs", so it can be a program name with args.
- set dummy emacs; ac_word=$2
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 615e7b8c6e17..c43364ca85c8 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -4,172 +4,127 @@ lib/libgimp.a
 lib/libgimpui.so.1.0
 lib/libgimpui.la
 lib/libgimpui.a
-lib/libgck.so.0.1
-lib/libgck.la
-lib/libgck.a
+lib/libmegawidget.a
+lib/gimp/0.99/plug-ins/AlienMap
+lib/gimp/0.99/plug-ins/dbbrowser
+lib/gimp/0.99/plug-ins/script-fu
+lib/gimp/0.99/plug-ins/struc
+lib/gimp/0.99/plug-ins/webbrowser
+lib/gimp/0.99/plug-ins/tiff
+lib/gimp/0.99/plug-ins/jpeg
+lib/gimp/0.99/plug-ins/png
+lib/gimp/0.99/plug-ins/mpeg
+lib/gimp/0.99/plug-ins/xd
+lib/gimp/0.99/plug-ins/xpm
+lib/gimp/0.99/plug-ins/CML_explorer
+lib/gimp/0.99/plug-ins/align_layers
+lib/gimp/0.99/plug-ins/animoptimize
+lib/gimp/0.99/plug-ins/apply_lens
+lib/gimp/0.99/plug-ins/autocrop
+lib/gimp/0.99/plug-ins/animationplay
+lib/gimp/0.99/plug-ins/autostretch_hsv
+lib/gimp/0.99/plug-ins/blinds
+lib/gimp/0.99/plug-ins/blur
+lib/gimp/0.99/plug-ins/bmp
+lib/gimp/0.99/plug-ins/bumpmap
+lib/gimp/0.99/plug-ins/bz2
+lib/gimp/0.99/plug-ins/c_astretch
+lib/gimp/0.99/plug-ins/CEL
+lib/gimp/0.99/plug-ins/colorify
+lib/gimp/0.99/plug-ins/checkerboard
+lib/gimp/0.99/plug-ins/compose
+lib/gimp/0.99/plug-ins/convmatrix
+lib/gimp/0.99/plug-ins/cubism
+lib/gimp/0.99/plug-ins/decompose
+lib/gimp/0.99/plug-ins/deinterlace
+lib/gimp/0.99/plug-ins/depthmerge
+lib/gimp/0.99/plug-ins/despeckle
+lib/gimp/0.99/plug-ins/destripe
+lib/gimp/0.99/plug-ins/diffraction
+lib/gimp/0.99/plug-ins/displace
+lib/gimp/0.99/plug-ins/edge
+lib/gimp/0.99/plug-ins/emboss
+lib/gimp/0.99/plug-ins/engrave
+lib/gimp/0.99/plug-ins/exchange
+lib/gimp/0.99/plug-ins/faxg3
+lib/gimp/0.99/plug-ins/film
+lib/gimp/0.99/plug-ins/fits
+lib/gimp/0.99/plug-ins/flame
+lib/gimp/0.99/plug-ins/flarefx
+lib/gimp/0.99/plug-ins/fractaltrace
+lib/gimp/0.99/plug-ins/gauss_iir
+lib/gimp/0.99/plug-ins/gauss_rle
+lib/gimp/0.99/plug-ins/gbr
+lib/gimp/0.99/plug-ins/gfli
+lib/gimp/0.99/plug-ins/gicon
+lib/gimp/0.99/plug-ins/gif
+lib/gimp/0.99/plug-ins/glasstile
+lib/gimp/0.99/plug-ins/gqbist
+lib/gimp/0.99/plug-ins/gradmap
+lib/gimp/0.99/plug-ins/grid
+lib/gimp/0.99/plug-ins/gtm
+lib/gimp/0.99/plug-ins/gz
+lib/gimp/0.99/plug-ins/header
+lib/gimp/0.99/plug-ins/hot
+lib/gimp/0.99/plug-ins/hrz
+lib/gimp/0.99/plug-ins/ifscompose
+lib/gimp/0.99/plug-ins/illusion
+lib/gimp/0.99/plug-ins/iwarp
+lib/gimp/0.99/plug-ins/laplace
+lib/gimp/0.99/plug-ins/mail
+lib/gimp/0.99/plug-ins/max_rgb
+lib/gimp/0.99/plug-ins/maze
+lib/gimp/0.99/plug-ins/mblur
+lib/gimp/0.99/plug-ins/mosaic
+lib/gimp/0.99/plug-ins/nlfilt
+lib/gimp/0.99/plug-ins/noisify
+lib/gimp/0.99/plug-ins/normalize
+lib/gimp/0.99/plug-ins/nova
+lib/gimp/0.99/plug-ins/oilify
+lib/gimp/0.99/plug-ins/papertile
+lib/gimp/0.99/plug-ins/pat
+lib/gimp/0.99/plug-ins/pcx
+lib/gimp/0.99/plug-ins/pix
+lib/gimp/0.99/plug-ins/pixelize
+lib/gimp/0.99/plug-ins/plasma
+lib/gimp/0.99/plug-ins/pnm
+lib/gimp/0.99/plug-ins/polar
+lib/gimp/0.99/plug-ins/print
+lib/gimp/0.99/plug-ins/ps
+lib/gimp/0.99/plug-ins/ripple
+lib/gimp/0.99/plug-ins/randomize
+lib/gimp/0.99/plug-ins/rotate
+lib/gimp/0.99/plug-ins/rotators
+lib/gimp/0.99/plug-ins/scatter_hsv
+lib/gimp/0.99/plug-ins/semiflatten
+lib/gimp/0.99/plug-ins/sgi
+lib/gimp/0.99/plug-ins/shift
+lib/gimp/0.99/plug-ins/sinus
+lib/gimp/0.99/plug-ins/smooth_palette
+lib/gimp/0.99/plug-ins/snoise
+lib/gimp/0.99/plug-ins/snp
+lib/gimp/0.99/plug-ins/sobel
+lib/gimp/0.99/plug-ins/sparkle
+lib/gimp/0.99/plug-ins/spread
+lib/gimp/0.99/plug-ins/sunras
+lib/gimp/0.99/plug-ins/tga
+lib/gimp/0.99/plug-ins/threshold_alpha
+lib/gimp/0.99/plug-ins/tile
+lib/gimp/0.99/plug-ins/tileit
+lib/gimp/0.99/plug-ins/tiler
+lib/gimp/0.99/plug-ins/url
+lib/gimp/0.99/plug-ins/video
+lib/gimp/0.99/plug-ins/vinvert
+lib/gimp/0.99/plug-ins/vpropagate
+lib/gimp/0.99/plug-ins/waves
+lib/gimp/0.99/plug-ins/whirlpinch
+lib/gimp/0.99/plug-ins/xwd
+lib/gimp/0.99/plug-ins/zealouscrop
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpui.h
-include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gcknotebook.h
-include/gck/gckvector.h
-libexec/gimp/0.99/plug-ins/libmegawidget.a
-libexec/gimp/0.99/plug-ins/MapObject
-libexec/gimp/0.99/plug-ins/AlienMap
-libexec/gimp/0.99/plug-ins/Anamorphose
-libexec/gimp/0.99/plug-ins/CentralReflection
-libexec/gimp/0.99/plug-ins/Curtain
-libexec/gimp/0.99/plug-ins/Encrypt_Decrypt
-libexec/gimp/0.99/plug-ins/Julia
-libexec/gimp/0.99/plug-ins/Mandelbrot
-libexec/gimp/0.99/plug-ins/DigitalSignature
-libexec/gimp/0.99/plug-ins/dbbrowser
-libexec/gimp/0.99/plug-ins/fuse
-libexec/gimp/0.99/plug-ins/gflare
-libexec/gimp/0.99/plug-ins/consolio
-libexec/gimp/0.99/plug-ins/pdb_help
-libexec/gimp/0.99/plug-ins/stained_glass
-libexec/gimp/0.99/plug-ins/sbutton
-libexec/gimp/0.99/plug-ins/refract
-libexec/gimp/0.99/plug-ins/script-fu
-libexec/gimp/0.99/plug-ins/struc
-libexec/gimp/0.99/plug-ins/twist
-libexec/gimp/0.99/plug-ins/warp
-libexec/gimp/0.99/plug-ins/tiff
-libexec/gimp/0.99/plug-ins/jpeg
-libexec/gimp/0.99/plug-ins/png
-libexec/gimp/0.99/plug-ins/xd
-libexec/gimp/0.99/plug-ins/mpeg
-libexec/gimp/0.99/plug-ins/xpm
-libexec/gimp/0.99/plug-ins/CML_explorer
-libexec/gimp/0.99/plug-ins/align_layers
-libexec/gimp/0.99/plug-ins/apply_lens
-libexec/gimp/0.99/plug-ins/autocrop
-libexec/gimp/0.99/plug-ins/animationplay
-libexec/gimp/0.99/plug-ins/autostretch_hsv
-libexec/gimp/0.99/plug-ins/blinds
-libexec/gimp/0.99/plug-ins/blur
-libexec/gimp/0.99/plug-ins/blur2
-libexec/gimp/0.99/plug-ins/bmp
-libexec/gimp/0.99/plug-ins/bumpmap
-libexec/gimp/0.99/plug-ins/bz2
-libexec/gimp/0.99/plug-ins/c_astretch
-libexec/gimp/0.99/plug-ins/CEL
-libexec/gimp/0.99/plug-ins/checkerboard
-libexec/gimp/0.99/plug-ins/colorify
-libexec/gimp/0.99/plug-ins/compose
-libexec/gimp/0.99/plug-ins/convmatrix
-libexec/gimp/0.99/plug-ins/coordmap
-libexec/gimp/0.99/plug-ins/cubism
-libexec/gimp/0.99/plug-ins/decompose
-libexec/gimp/0.99/plug-ins/deinterlace
-libexec/gimp/0.99/plug-ins/depthmerge
-libexec/gimp/0.99/plug-ins/despeckle
-libexec/gimp/0.99/plug-ins/destripe
-libexec/gimp/0.99/plug-ins/fp
-libexec/gimp/0.99/plug-ins/diffraction
-libexec/gimp/0.99/plug-ins/displace
-libexec/gimp/0.99/plug-ins/edge
-libexec/gimp/0.99/plug-ins/emboss
-libexec/gimp/0.99/plug-ins/engrave
-libexec/gimp/0.99/plug-ins/exchange
-libexec/gimp/0.99/plug-ins/faxg3
-libexec/gimp/0.99/plug-ins/figures
-libexec/gimp/0.99/plug-ins/film
-libexec/gimp/0.99/plug-ins/fits
-libexec/gimp/0.99/plug-ins/flame
-libexec/gimp/0.99/plug-ins/flarefx
-libexec/gimp/0.99/plug-ins/fractaltrace
-libexec/gimp/0.99/plug-ins/gauss_iir
-libexec/gimp/0.99/plug-ins/gauss_rle
-libexec/gimp/0.99/plug-ins/gbr
-libexec/gimp/0.99/plug-ins/gfli
-libexec/gimp/0.99/plug-ins/gicon
-libexec/gimp/0.99/plug-ins/gif
-libexec/gimp/0.99/plug-ins/glasstile
-libexec/gimp/0.99/plug-ins/gqbist
-libexec/gimp/0.99/plug-ins/gradmap
-libexec/gimp/0.99/plug-ins/grid
-libexec/gimp/0.99/plug-ins/gz
-libexec/gimp/0.99/plug-ins/header
-libexec/gimp/0.99/plug-ins/holes
-libexec/gimp/0.99/plug-ins/hot
-libexec/gimp/0.99/plug-ins/hrz
-libexec/gimp/0.99/plug-ins/ifscompose
-libexec/gimp/0.99/plug-ins/illusion
-libexec/gimp/0.99/plug-ins/lic
-libexec/gimp/0.99/plug-ins/iwarp
-libexec/gimp/0.99/plug-ins/laplace
-libexec/gimp/0.99/plug-ins/magiceye
-libexec/gimp/0.99/plug-ins/mail
-libexec/gimp/0.99/plug-ins/max_rgb
-libexec/gimp/0.99/plug-ins/maze
-libexec/gimp/0.99/plug-ins/mblur
-libexec/gimp/0.99/plug-ins/mosaic
-libexec/gimp/0.99/plug-ins/nlfilt
-libexec/gimp/0.99/plug-ins/noisify
-libexec/gimp/0.99/plug-ins/normalize
-libexec/gimp/0.99/plug-ins/nova
-libexec/gimp/0.99/plug-ins/oilify
-libexec/gimp/0.99/plug-ins/papertile
-libexec/gimp/0.99/plug-ins/pat
-libexec/gimp/0.99/plug-ins/pcx
-libexec/gimp/0.99/plug-ins/pix
-libexec/gimp/0.99/plug-ins/pixelize
-libexec/gimp/0.99/plug-ins/plasma
-libexec/gimp/0.99/plug-ins/pnm
-libexec/gimp/0.99/plug-ins/polar
-libexec/gimp/0.99/plug-ins/print
-libexec/gimp/0.99/plug-ins/ps
-libexec/gimp/0.99/plug-ins/psd
-libexec/gimp/0.99/plug-ins/randomize
-libexec/gimp/0.99/plug-ins/ripple
-libexec/gimp/0.99/plug-ins/rotate
-libexec/gimp/0.99/plug-ins/rotators
-libexec/gimp/0.99/plug-ins/scatter_hsv
-libexec/gimp/0.99/plug-ins/sgi
-libexec/gimp/0.99/plug-ins/sharpen
-libexec/gimp/0.99/plug-ins/shift
-libexec/gimp/0.99/plug-ins/sinus
-libexec/gimp/0.99/plug-ins/smooth_palette
-libexec/gimp/0.99/plug-ins/snoise
-libexec/gimp/0.99/plug-ins/snp
-libexec/gimp/0.99/plug-ins/sobel
-libexec/gimp/0.99/plug-ins/sparkle
-libexec/gimp/0.99/plug-ins/spread
-libexec/gimp/0.99/plug-ins/stegano
-libexec/gimp/0.99/plug-ins/stereogram
-libexec/gimp/0.99/plug-ins/sunras
-libexec/gimp/0.99/plug-ins/tga
-libexec/gimp/0.99/plug-ins/threshold_alpha
-libexec/gimp/0.99/plug-ins/tile
-libexec/gimp/0.99/plug-ins/tileit
-libexec/gimp/0.99/plug-ins/tiler
-libexec/gimp/0.99/plug-ins/universal
-libexec/gimp/0.99/plug-ins/url
-libexec/gimp/0.99/plug-ins/video
-libexec/gimp/0.99/plug-ins/vinvert
-libexec/gimp/0.99/plug-ins/vpropagate
-libexec/gimp/0.99/plug-ins/waves
-libexec/gimp/0.99/plug-ins/whirlpinch
-libexec/gimp/0.99/plug-ins/xwd
-libexec/gimp/0.99/plug-ins/zealouscrop
-libexec/gimptcl
-share/gimp/gflares/Bright_Star
-share/gimp/gflares/Classic
-share/gimp/gflares/Default
-share/gimp/gflares/Distant_Sun
-share/gimp/gflares/GFlare_101
-share/gimp/gflares/GFlare_102
-share/gimp/gflares/Hidden_Planet
+include/megawidget.h
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -247,13 +202,7 @@ share/gimp/scripts/truchet.scm
 share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
 share/gimp/scripts/xach-effect.scm
-share/gimp/user_install
-share/gimp/gimprc
-share/gimp/gimprc_user
-share/gimp/gtkrc
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_tips.txt
-share/gimp/ps-menurc
+share/gimp/scripts/web-browser.scm
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -272,11 +221,10 @@ share/gimp/brushes/20x20squareBlur.gbr
 share/gimp/brushes/3circle.gbr
 share/gimp/brushes/3fcircle.gbr
 share/gimp/brushes/5circle.gbr
-share/gimp/brushes/7circle.gbr
 share/gimp/brushes/5fcircle.gbr
-share/gimp/brushes/xcf.gbr
 share/gimp/brushes/5x5square.gbr
 share/gimp/brushes/5x5squareBlur.gbr
+share/gimp/brushes/7circle.gbr
 share/gimp/brushes/7fcircle.gbr
 share/gimp/brushes/9circle.gbr
 share/gimp/brushes/9fcircle.gbr
@@ -294,15 +242,16 @@ share/gimp/brushes/galaxy_big.gbr
 share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/pixel.gbr
 share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/xcf.gbr
 share/gimp/brushes/50x50cone.gbr
 share/gimp/brushes/50x50square.gbr
 share/gimp/brushes/50x50squareBlur.gbr
-share/gimp/brushes/bird.gbr
 share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
 share/gimp/brushes/bigcircle4.gbr
+share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
 share/gimp/brushes/flower.gbr
@@ -319,10 +268,10 @@ share/gimp/brushes/qbert3Blur.gbr
 share/gimp/brushes/reach.gbr
 share/gimp/brushes/sphere29.gbr
 share/gimp/brushes/sphere36.gbr
+share/gimp/brushes/star1.gbr
 share/gimp/brushes/sphere47.gbr
 share/gimp/brushes/sphere55.gbr
 share/gimp/brushes/sphere79.gbr
-share/gimp/brushes/star1.gbr
 share/gimp/brushes/star2.gbr
 share/gimp/brushes/star3.gbr
 share/gimp/brushes/star4.gbr
@@ -335,19 +284,6 @@ share/gimp/brushes/text3.gbr
 share/gimp/brushes/text4.gbr
 share/gimp/brushes/tulip.gbr
 share/gimp/brushes/wave.gbr
-share/gimp/palettes/Blues
-share/gimp/palettes/Browns_And_Yellows
-share/gimp/palettes/Cool_Colors
-share/gimp/palettes/Default
-share/gimp/palettes/Grays
-share/gimp/palettes/Greens
-share/gimp/palettes/Lights
-share/gimp/palettes/Muted
-share/gimp/palettes/Named_Colors
-share/gimp/palettes/Pastels
-share/gimp/palettes/Reds_And_Purples
-share/gimp/palettes/Warm_Colors
-share/gimp/palettes/Web
 share/gimp/gradients/Abstract_1
 share/gimp/gradients/Abstract_2
 share/gimp/gradients/Abstract_3
@@ -424,6 +360,43 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
+share/gimp/palettes/Bears
+share/gimp/palettes/Bgold
+share/gimp/palettes/Blues
+share/gimp/palettes/Borders
+share/gimp/palettes/Browns_And_Yellows
+share/gimp/palettes/Caramel
+share/gimp/palettes/Cascade
+share/gimp/palettes/China
+share/gimp/palettes/Coldfire
+share/gimp/palettes/Cool_Colors
+share/gimp/palettes/Cranes
+share/gimp/palettes/Dark_pastels
+share/gimp/palettes/Default
+share/gimp/palettes/Ega
+share/gimp/palettes/Firecode
+share/gimp/palettes/Gold
+share/gimp/palettes/GrayViolet
+share/gimp/palettes/Grayblue
+share/gimp/palettes/Grays
+share/gimp/palettes/Greens
+share/gimp/palettes/Hilite
+share/gimp/palettes/Kahki
+share/gimp/palettes/Lights
+share/gimp/palettes/Muted
+share/gimp/palettes/Named_Colors
+share/gimp/palettes/News3
+share/gimp/palettes/Op2
+share/gimp/palettes/Pastels
+share/gimp/palettes/Paintjet
+share/gimp/palettes/Plasma
+share/gimp/palettes/Reds
+share/gimp/palettes/Reds_And_Purples
+share/gimp/palettes/Royal
+share/gimp/palettes/Topographic
+share/gimp/palettes/Volcano
+share/gimp/palettes/Warm_Colors
+share/gimp/palettes/Web
 share/gimp/patterns/3dgreen.pat
 share/gimp/patterns/Craters.pat
 share/gimp/patterns/Moonfoot.pat
@@ -592,28 +565,28 @@ share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
+share/gimp/user_install
+share/gimp/gimprc
+share/gimp/gimprc_user
+share/gimp/gtkrc
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimp_tips.txt
+share/gimp/ps-menurc
 bin/gimp
-@unexec install-info --delete %D/info/pdb.info %D/info/dir
-@unexec install-info --delete %D/info/pdb.info-1 %D/info/dir
-@unexec install-info --delete %D/info/pdb.info-2 %D/info/dir
-@exec install-info %D/info/pdb.info %D/info/dir
-@exec install-info %D/info/pdb.info-1 %D/info/dir
-@exec install-info %D/info/pdb.info-2 %D/info/dir
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
 lib/libgimp.so
 lib/libgimpui.so
-lib/libgck.so
+@dirrm lib/gimp/0.99/plug-ins
+@dirrm lib/gimp/0.99
+@dirrm lib/gimp
+@dirrm lib
 @dirrm include/libgimp
-@dirrm include/gck
-@dirrm libexec/gimp/0.99/plug-ins
-@dirrm libexec/gimp/0.99
-@dirrm libexec/gimp
-@dirrm share/gimp/gflares
+@dirrm include
 @dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
-@dirrm share/gimp/palettes
 @dirrm share/gimp/gradients
+@dirrm share/gimp/palettes
 @dirrm share/gimp/patterns
 @dirrm share/gimp
+@dirrm share
+@dirrm bin
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index caffb6367ee7..ac10feb918da 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -1,26 +1,25 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.17
+# Version required:     0.99.19
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.19 1998/01/28 15:39:56 erich Exp $
+# $Id: Makefile,v 1.20 1998/02/21 22:37:56 fenner Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	18
+MICRO=	21
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}b.tar.gz \
-            gimp-data-extras-${MM_VERSION}a.tar.gz
+DISTFILES+=     gimp-data-extras-${MM_VERSION}a.tar.gz
 
-CATEGORIES=     graphics tk80
-MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/0.99/${VERSION}/ \
-                ftp://ftp.cs.umn.edu/pub/gimp/gimp/0.99/${VERSION}/ \
+CATEGORIES=     graphics
+MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/v${MAJOR}.${MINOR}/v${VERSION}/ \
+                ftp://ftp.cs.umn.edu/pub/gimp/gimp/v${MAJOR}.${MINOR}/v${VERSION}/ \
 
 MAINTAINER=     erich@FreeBSD.org
 
@@ -30,25 +29,20 @@ LIB_DEPENDS+=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 LIB_DEPENDS+=	xdelta\\.0:${PORTSDIR}/misc/xdelta
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
-		-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
-CONFIGURE_ARGS=  --with-tcl=tcl80 --with-tk=tk80
 
 DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}b; \
-	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
-	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index 764774e1d585..3f054db50319 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.18.tar.gz) = 1d07aa3f2f0f7024bfdb786dd15e8d58
-MD5 (gimp-data-min-0.99b.tar.gz) = 55f735d5bb2604a100707e9638df3d4b
+MD5 (gimp-0.99.21.tar.gz) = e1544aec645d7be6586485e6a131ece7
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
+MD5 (gimp-plugins-unstable-0.99.21.tar.gz) = 3dcd9c1d27557aebeceeb6f3fa6b7f9a
diff --git a/graphics/gimp-devel/files/patch-ah b/graphics/gimp-devel/files/patch-ah
index d05ddb1cd23f..7add97cf89ce 100644
--- a/graphics/gimp-devel/files/patch-ah
+++ b/graphics/gimp-devel/files/patch-ah
@@ -1,6 +1,6 @@
---- configure.in~	Mon Jan 26 10:34:48 1998
-+++ configure.in	Mon Jan 26 10:35:31 1998
-@@ -120,10 +120,10 @@
+--- configure.in~	Tue Mar 17 08:28:37 1998
++++ configure.in	Tue Mar 17 08:30:07 1998
+@@ -108,10 +108,10 @@
  
  dnl Test for libtiff
    if test -z "$LIBTIFF_LIB"; then
@@ -15,26 +15,26 @@
          AC_MSG_WARN(*** TIFF plug-in will not be built ***), -lz -ljpeg -lm), -lm)
    fi
  
-@@ -240,7 +240,7 @@
- AC_C_INLINE
+@@ -219,7 +219,7 @@
+ LIBS="$gimp_save_LIBS"
  
- gimpdatadir=$datadir/$PACKAGE
+ gimpdatadir=$datadir/gimp
 -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
 +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
  
- dnl This is for generating PDB docuemntation.
- AC_PATH_PROG(EMACS, emacs, :)
---- configure~	Mon Jan 26 10:36:08 1998
-+++ configure	Mon Jan 26 10:37:35 1998
-@@ -2738,14 +2738,14 @@
- fi
+ brushdata=`ls -1 data/brushes | grep -v Makefile`
+ gradientdata=`ls -1 data/gradients | grep -v Makefile`
+--- configure~	Tue Mar 17 08:28:43 1998
++++ configure	Tue Mar 17 08:31:40 1998
+@@ -1960,14 +1960,14 @@
+   fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2743: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:1965: checking for TIFFReadScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
 +    echo $ac_n "checking for TIFFReadScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2743: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:1965: checking for TIFFReadScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -43,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2751 "configure"
+ #line 1973 "configure"
  #include "confdefs.h"
-@@ -2773,17 +2773,17 @@
+@@ -1995,17 +1995,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -54,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2781: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2003: checking for TIFFWriteScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for TIFFWriteScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2781: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2003: checking for TIFFWriteScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -66,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2789 "configure"
+ #line 2011 "configure"
  #include "confdefs.h"
-@@ -2811,7 +2811,7 @@
+@@ -2033,7 +2033,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -77,12 +77,3 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3949,7 +3949,7 @@
- 
- 
- gimpdatadir=$datadir/$PACKAGE
--gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
-+gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
- 
- # Extract the first word of "emacs", so it can be a program name with args.
- set dummy emacs; ac_word=$2
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index 615e7b8c6e17..c43364ca85c8 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -4,172 +4,127 @@ lib/libgimp.a
 lib/libgimpui.so.1.0
 lib/libgimpui.la
 lib/libgimpui.a
-lib/libgck.so.0.1
-lib/libgck.la
-lib/libgck.a
+lib/libmegawidget.a
+lib/gimp/0.99/plug-ins/AlienMap
+lib/gimp/0.99/plug-ins/dbbrowser
+lib/gimp/0.99/plug-ins/script-fu
+lib/gimp/0.99/plug-ins/struc
+lib/gimp/0.99/plug-ins/webbrowser
+lib/gimp/0.99/plug-ins/tiff
+lib/gimp/0.99/plug-ins/jpeg
+lib/gimp/0.99/plug-ins/png
+lib/gimp/0.99/plug-ins/mpeg
+lib/gimp/0.99/plug-ins/xd
+lib/gimp/0.99/plug-ins/xpm
+lib/gimp/0.99/plug-ins/CML_explorer
+lib/gimp/0.99/plug-ins/align_layers
+lib/gimp/0.99/plug-ins/animoptimize
+lib/gimp/0.99/plug-ins/apply_lens
+lib/gimp/0.99/plug-ins/autocrop
+lib/gimp/0.99/plug-ins/animationplay
+lib/gimp/0.99/plug-ins/autostretch_hsv
+lib/gimp/0.99/plug-ins/blinds
+lib/gimp/0.99/plug-ins/blur
+lib/gimp/0.99/plug-ins/bmp
+lib/gimp/0.99/plug-ins/bumpmap
+lib/gimp/0.99/plug-ins/bz2
+lib/gimp/0.99/plug-ins/c_astretch
+lib/gimp/0.99/plug-ins/CEL
+lib/gimp/0.99/plug-ins/colorify
+lib/gimp/0.99/plug-ins/checkerboard
+lib/gimp/0.99/plug-ins/compose
+lib/gimp/0.99/plug-ins/convmatrix
+lib/gimp/0.99/plug-ins/cubism
+lib/gimp/0.99/plug-ins/decompose
+lib/gimp/0.99/plug-ins/deinterlace
+lib/gimp/0.99/plug-ins/depthmerge
+lib/gimp/0.99/plug-ins/despeckle
+lib/gimp/0.99/plug-ins/destripe
+lib/gimp/0.99/plug-ins/diffraction
+lib/gimp/0.99/plug-ins/displace
+lib/gimp/0.99/plug-ins/edge
+lib/gimp/0.99/plug-ins/emboss
+lib/gimp/0.99/plug-ins/engrave
+lib/gimp/0.99/plug-ins/exchange
+lib/gimp/0.99/plug-ins/faxg3
+lib/gimp/0.99/plug-ins/film
+lib/gimp/0.99/plug-ins/fits
+lib/gimp/0.99/plug-ins/flame
+lib/gimp/0.99/plug-ins/flarefx
+lib/gimp/0.99/plug-ins/fractaltrace
+lib/gimp/0.99/plug-ins/gauss_iir
+lib/gimp/0.99/plug-ins/gauss_rle
+lib/gimp/0.99/plug-ins/gbr
+lib/gimp/0.99/plug-ins/gfli
+lib/gimp/0.99/plug-ins/gicon
+lib/gimp/0.99/plug-ins/gif
+lib/gimp/0.99/plug-ins/glasstile
+lib/gimp/0.99/plug-ins/gqbist
+lib/gimp/0.99/plug-ins/gradmap
+lib/gimp/0.99/plug-ins/grid
+lib/gimp/0.99/plug-ins/gtm
+lib/gimp/0.99/plug-ins/gz
+lib/gimp/0.99/plug-ins/header
+lib/gimp/0.99/plug-ins/hot
+lib/gimp/0.99/plug-ins/hrz
+lib/gimp/0.99/plug-ins/ifscompose
+lib/gimp/0.99/plug-ins/illusion
+lib/gimp/0.99/plug-ins/iwarp
+lib/gimp/0.99/plug-ins/laplace
+lib/gimp/0.99/plug-ins/mail
+lib/gimp/0.99/plug-ins/max_rgb
+lib/gimp/0.99/plug-ins/maze
+lib/gimp/0.99/plug-ins/mblur
+lib/gimp/0.99/plug-ins/mosaic
+lib/gimp/0.99/plug-ins/nlfilt
+lib/gimp/0.99/plug-ins/noisify
+lib/gimp/0.99/plug-ins/normalize
+lib/gimp/0.99/plug-ins/nova
+lib/gimp/0.99/plug-ins/oilify
+lib/gimp/0.99/plug-ins/papertile
+lib/gimp/0.99/plug-ins/pat
+lib/gimp/0.99/plug-ins/pcx
+lib/gimp/0.99/plug-ins/pix
+lib/gimp/0.99/plug-ins/pixelize
+lib/gimp/0.99/plug-ins/plasma
+lib/gimp/0.99/plug-ins/pnm
+lib/gimp/0.99/plug-ins/polar
+lib/gimp/0.99/plug-ins/print
+lib/gimp/0.99/plug-ins/ps
+lib/gimp/0.99/plug-ins/ripple
+lib/gimp/0.99/plug-ins/randomize
+lib/gimp/0.99/plug-ins/rotate
+lib/gimp/0.99/plug-ins/rotators
+lib/gimp/0.99/plug-ins/scatter_hsv
+lib/gimp/0.99/plug-ins/semiflatten
+lib/gimp/0.99/plug-ins/sgi
+lib/gimp/0.99/plug-ins/shift
+lib/gimp/0.99/plug-ins/sinus
+lib/gimp/0.99/plug-ins/smooth_palette
+lib/gimp/0.99/plug-ins/snoise
+lib/gimp/0.99/plug-ins/snp
+lib/gimp/0.99/plug-ins/sobel
+lib/gimp/0.99/plug-ins/sparkle
+lib/gimp/0.99/plug-ins/spread
+lib/gimp/0.99/plug-ins/sunras
+lib/gimp/0.99/plug-ins/tga
+lib/gimp/0.99/plug-ins/threshold_alpha
+lib/gimp/0.99/plug-ins/tile
+lib/gimp/0.99/plug-ins/tileit
+lib/gimp/0.99/plug-ins/tiler
+lib/gimp/0.99/plug-ins/url
+lib/gimp/0.99/plug-ins/video
+lib/gimp/0.99/plug-ins/vinvert
+lib/gimp/0.99/plug-ins/vpropagate
+lib/gimp/0.99/plug-ins/waves
+lib/gimp/0.99/plug-ins/whirlpinch
+lib/gimp/0.99/plug-ins/xwd
+lib/gimp/0.99/plug-ins/zealouscrop
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpui.h
-include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gcknotebook.h
-include/gck/gckvector.h
-libexec/gimp/0.99/plug-ins/libmegawidget.a
-libexec/gimp/0.99/plug-ins/MapObject
-libexec/gimp/0.99/plug-ins/AlienMap
-libexec/gimp/0.99/plug-ins/Anamorphose
-libexec/gimp/0.99/plug-ins/CentralReflection
-libexec/gimp/0.99/plug-ins/Curtain
-libexec/gimp/0.99/plug-ins/Encrypt_Decrypt
-libexec/gimp/0.99/plug-ins/Julia
-libexec/gimp/0.99/plug-ins/Mandelbrot
-libexec/gimp/0.99/plug-ins/DigitalSignature
-libexec/gimp/0.99/plug-ins/dbbrowser
-libexec/gimp/0.99/plug-ins/fuse
-libexec/gimp/0.99/plug-ins/gflare
-libexec/gimp/0.99/plug-ins/consolio
-libexec/gimp/0.99/plug-ins/pdb_help
-libexec/gimp/0.99/plug-ins/stained_glass
-libexec/gimp/0.99/plug-ins/sbutton
-libexec/gimp/0.99/plug-ins/refract
-libexec/gimp/0.99/plug-ins/script-fu
-libexec/gimp/0.99/plug-ins/struc
-libexec/gimp/0.99/plug-ins/twist
-libexec/gimp/0.99/plug-ins/warp
-libexec/gimp/0.99/plug-ins/tiff
-libexec/gimp/0.99/plug-ins/jpeg
-libexec/gimp/0.99/plug-ins/png
-libexec/gimp/0.99/plug-ins/xd
-libexec/gimp/0.99/plug-ins/mpeg
-libexec/gimp/0.99/plug-ins/xpm
-libexec/gimp/0.99/plug-ins/CML_explorer
-libexec/gimp/0.99/plug-ins/align_layers
-libexec/gimp/0.99/plug-ins/apply_lens
-libexec/gimp/0.99/plug-ins/autocrop
-libexec/gimp/0.99/plug-ins/animationplay
-libexec/gimp/0.99/plug-ins/autostretch_hsv
-libexec/gimp/0.99/plug-ins/blinds
-libexec/gimp/0.99/plug-ins/blur
-libexec/gimp/0.99/plug-ins/blur2
-libexec/gimp/0.99/plug-ins/bmp
-libexec/gimp/0.99/plug-ins/bumpmap
-libexec/gimp/0.99/plug-ins/bz2
-libexec/gimp/0.99/plug-ins/c_astretch
-libexec/gimp/0.99/plug-ins/CEL
-libexec/gimp/0.99/plug-ins/checkerboard
-libexec/gimp/0.99/plug-ins/colorify
-libexec/gimp/0.99/plug-ins/compose
-libexec/gimp/0.99/plug-ins/convmatrix
-libexec/gimp/0.99/plug-ins/coordmap
-libexec/gimp/0.99/plug-ins/cubism
-libexec/gimp/0.99/plug-ins/decompose
-libexec/gimp/0.99/plug-ins/deinterlace
-libexec/gimp/0.99/plug-ins/depthmerge
-libexec/gimp/0.99/plug-ins/despeckle
-libexec/gimp/0.99/plug-ins/destripe
-libexec/gimp/0.99/plug-ins/fp
-libexec/gimp/0.99/plug-ins/diffraction
-libexec/gimp/0.99/plug-ins/displace
-libexec/gimp/0.99/plug-ins/edge
-libexec/gimp/0.99/plug-ins/emboss
-libexec/gimp/0.99/plug-ins/engrave
-libexec/gimp/0.99/plug-ins/exchange
-libexec/gimp/0.99/plug-ins/faxg3
-libexec/gimp/0.99/plug-ins/figures
-libexec/gimp/0.99/plug-ins/film
-libexec/gimp/0.99/plug-ins/fits
-libexec/gimp/0.99/plug-ins/flame
-libexec/gimp/0.99/plug-ins/flarefx
-libexec/gimp/0.99/plug-ins/fractaltrace
-libexec/gimp/0.99/plug-ins/gauss_iir
-libexec/gimp/0.99/plug-ins/gauss_rle
-libexec/gimp/0.99/plug-ins/gbr
-libexec/gimp/0.99/plug-ins/gfli
-libexec/gimp/0.99/plug-ins/gicon
-libexec/gimp/0.99/plug-ins/gif
-libexec/gimp/0.99/plug-ins/glasstile
-libexec/gimp/0.99/plug-ins/gqbist
-libexec/gimp/0.99/plug-ins/gradmap
-libexec/gimp/0.99/plug-ins/grid
-libexec/gimp/0.99/plug-ins/gz
-libexec/gimp/0.99/plug-ins/header
-libexec/gimp/0.99/plug-ins/holes
-libexec/gimp/0.99/plug-ins/hot
-libexec/gimp/0.99/plug-ins/hrz
-libexec/gimp/0.99/plug-ins/ifscompose
-libexec/gimp/0.99/plug-ins/illusion
-libexec/gimp/0.99/plug-ins/lic
-libexec/gimp/0.99/plug-ins/iwarp
-libexec/gimp/0.99/plug-ins/laplace
-libexec/gimp/0.99/plug-ins/magiceye
-libexec/gimp/0.99/plug-ins/mail
-libexec/gimp/0.99/plug-ins/max_rgb
-libexec/gimp/0.99/plug-ins/maze
-libexec/gimp/0.99/plug-ins/mblur
-libexec/gimp/0.99/plug-ins/mosaic
-libexec/gimp/0.99/plug-ins/nlfilt
-libexec/gimp/0.99/plug-ins/noisify
-libexec/gimp/0.99/plug-ins/normalize
-libexec/gimp/0.99/plug-ins/nova
-libexec/gimp/0.99/plug-ins/oilify
-libexec/gimp/0.99/plug-ins/papertile
-libexec/gimp/0.99/plug-ins/pat
-libexec/gimp/0.99/plug-ins/pcx
-libexec/gimp/0.99/plug-ins/pix
-libexec/gimp/0.99/plug-ins/pixelize
-libexec/gimp/0.99/plug-ins/plasma
-libexec/gimp/0.99/plug-ins/pnm
-libexec/gimp/0.99/plug-ins/polar
-libexec/gimp/0.99/plug-ins/print
-libexec/gimp/0.99/plug-ins/ps
-libexec/gimp/0.99/plug-ins/psd
-libexec/gimp/0.99/plug-ins/randomize
-libexec/gimp/0.99/plug-ins/ripple
-libexec/gimp/0.99/plug-ins/rotate
-libexec/gimp/0.99/plug-ins/rotators
-libexec/gimp/0.99/plug-ins/scatter_hsv
-libexec/gimp/0.99/plug-ins/sgi
-libexec/gimp/0.99/plug-ins/sharpen
-libexec/gimp/0.99/plug-ins/shift
-libexec/gimp/0.99/plug-ins/sinus
-libexec/gimp/0.99/plug-ins/smooth_palette
-libexec/gimp/0.99/plug-ins/snoise
-libexec/gimp/0.99/plug-ins/snp
-libexec/gimp/0.99/plug-ins/sobel
-libexec/gimp/0.99/plug-ins/sparkle
-libexec/gimp/0.99/plug-ins/spread
-libexec/gimp/0.99/plug-ins/stegano
-libexec/gimp/0.99/plug-ins/stereogram
-libexec/gimp/0.99/plug-ins/sunras
-libexec/gimp/0.99/plug-ins/tga
-libexec/gimp/0.99/plug-ins/threshold_alpha
-libexec/gimp/0.99/plug-ins/tile
-libexec/gimp/0.99/plug-ins/tileit
-libexec/gimp/0.99/plug-ins/tiler
-libexec/gimp/0.99/plug-ins/universal
-libexec/gimp/0.99/plug-ins/url
-libexec/gimp/0.99/plug-ins/video
-libexec/gimp/0.99/plug-ins/vinvert
-libexec/gimp/0.99/plug-ins/vpropagate
-libexec/gimp/0.99/plug-ins/waves
-libexec/gimp/0.99/plug-ins/whirlpinch
-libexec/gimp/0.99/plug-ins/xwd
-libexec/gimp/0.99/plug-ins/zealouscrop
-libexec/gimptcl
-share/gimp/gflares/Bright_Star
-share/gimp/gflares/Classic
-share/gimp/gflares/Default
-share/gimp/gflares/Distant_Sun
-share/gimp/gflares/GFlare_101
-share/gimp/gflares/GFlare_102
-share/gimp/gflares/Hidden_Planet
+include/megawidget.h
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -247,13 +202,7 @@ share/gimp/scripts/truchet.scm
 share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
 share/gimp/scripts/xach-effect.scm
-share/gimp/user_install
-share/gimp/gimprc
-share/gimp/gimprc_user
-share/gimp/gtkrc
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_tips.txt
-share/gimp/ps-menurc
+share/gimp/scripts/web-browser.scm
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -272,11 +221,10 @@ share/gimp/brushes/20x20squareBlur.gbr
 share/gimp/brushes/3circle.gbr
 share/gimp/brushes/3fcircle.gbr
 share/gimp/brushes/5circle.gbr
-share/gimp/brushes/7circle.gbr
 share/gimp/brushes/5fcircle.gbr
-share/gimp/brushes/xcf.gbr
 share/gimp/brushes/5x5square.gbr
 share/gimp/brushes/5x5squareBlur.gbr
+share/gimp/brushes/7circle.gbr
 share/gimp/brushes/7fcircle.gbr
 share/gimp/brushes/9circle.gbr
 share/gimp/brushes/9fcircle.gbr
@@ -294,15 +242,16 @@ share/gimp/brushes/galaxy_big.gbr
 share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/pixel.gbr
 share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/xcf.gbr
 share/gimp/brushes/50x50cone.gbr
 share/gimp/brushes/50x50square.gbr
 share/gimp/brushes/50x50squareBlur.gbr
-share/gimp/brushes/bird.gbr
 share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
 share/gimp/brushes/bigcircle4.gbr
+share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
 share/gimp/brushes/flower.gbr
@@ -319,10 +268,10 @@ share/gimp/brushes/qbert3Blur.gbr
 share/gimp/brushes/reach.gbr
 share/gimp/brushes/sphere29.gbr
 share/gimp/brushes/sphere36.gbr
+share/gimp/brushes/star1.gbr
 share/gimp/brushes/sphere47.gbr
 share/gimp/brushes/sphere55.gbr
 share/gimp/brushes/sphere79.gbr
-share/gimp/brushes/star1.gbr
 share/gimp/brushes/star2.gbr
 share/gimp/brushes/star3.gbr
 share/gimp/brushes/star4.gbr
@@ -335,19 +284,6 @@ share/gimp/brushes/text3.gbr
 share/gimp/brushes/text4.gbr
 share/gimp/brushes/tulip.gbr
 share/gimp/brushes/wave.gbr
-share/gimp/palettes/Blues
-share/gimp/palettes/Browns_And_Yellows
-share/gimp/palettes/Cool_Colors
-share/gimp/palettes/Default
-share/gimp/palettes/Grays
-share/gimp/palettes/Greens
-share/gimp/palettes/Lights
-share/gimp/palettes/Muted
-share/gimp/palettes/Named_Colors
-share/gimp/palettes/Pastels
-share/gimp/palettes/Reds_And_Purples
-share/gimp/palettes/Warm_Colors
-share/gimp/palettes/Web
 share/gimp/gradients/Abstract_1
 share/gimp/gradients/Abstract_2
 share/gimp/gradients/Abstract_3
@@ -424,6 +360,43 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
+share/gimp/palettes/Bears
+share/gimp/palettes/Bgold
+share/gimp/palettes/Blues
+share/gimp/palettes/Borders
+share/gimp/palettes/Browns_And_Yellows
+share/gimp/palettes/Caramel
+share/gimp/palettes/Cascade
+share/gimp/palettes/China
+share/gimp/palettes/Coldfire
+share/gimp/palettes/Cool_Colors
+share/gimp/palettes/Cranes
+share/gimp/palettes/Dark_pastels
+share/gimp/palettes/Default
+share/gimp/palettes/Ega
+share/gimp/palettes/Firecode
+share/gimp/palettes/Gold
+share/gimp/palettes/GrayViolet
+share/gimp/palettes/Grayblue
+share/gimp/palettes/Grays
+share/gimp/palettes/Greens
+share/gimp/palettes/Hilite
+share/gimp/palettes/Kahki
+share/gimp/palettes/Lights
+share/gimp/palettes/Muted
+share/gimp/palettes/Named_Colors
+share/gimp/palettes/News3
+share/gimp/palettes/Op2
+share/gimp/palettes/Pastels
+share/gimp/palettes/Paintjet
+share/gimp/palettes/Plasma
+share/gimp/palettes/Reds
+share/gimp/palettes/Reds_And_Purples
+share/gimp/palettes/Royal
+share/gimp/palettes/Topographic
+share/gimp/palettes/Volcano
+share/gimp/palettes/Warm_Colors
+share/gimp/palettes/Web
 share/gimp/patterns/3dgreen.pat
 share/gimp/patterns/Craters.pat
 share/gimp/patterns/Moonfoot.pat
@@ -592,28 +565,28 @@ share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
+share/gimp/user_install
+share/gimp/gimprc
+share/gimp/gimprc_user
+share/gimp/gtkrc
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimp_tips.txt
+share/gimp/ps-menurc
 bin/gimp
-@unexec install-info --delete %D/info/pdb.info %D/info/dir
-@unexec install-info --delete %D/info/pdb.info-1 %D/info/dir
-@unexec install-info --delete %D/info/pdb.info-2 %D/info/dir
-@exec install-info %D/info/pdb.info %D/info/dir
-@exec install-info %D/info/pdb.info-1 %D/info/dir
-@exec install-info %D/info/pdb.info-2 %D/info/dir
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
 lib/libgimp.so
 lib/libgimpui.so
-lib/libgck.so
+@dirrm lib/gimp/0.99/plug-ins
+@dirrm lib/gimp/0.99
+@dirrm lib/gimp
+@dirrm lib
 @dirrm include/libgimp
-@dirrm include/gck
-@dirrm libexec/gimp/0.99/plug-ins
-@dirrm libexec/gimp/0.99
-@dirrm libexec/gimp
-@dirrm share/gimp/gflares
+@dirrm include
 @dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
-@dirrm share/gimp/palettes
 @dirrm share/gimp/gradients
+@dirrm share/gimp/palettes
 @dirrm share/gimp/patterns
 @dirrm share/gimp
+@dirrm share
+@dirrm bin
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index caffb6367ee7..ac10feb918da 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,26 +1,25 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.17
+# Version required:     0.99.19
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.19 1998/01/28 15:39:56 erich Exp $
+# $Id: Makefile,v 1.20 1998/02/21 22:37:56 fenner Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	18
+MICRO=	21
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}b.tar.gz \
-            gimp-data-extras-${MM_VERSION}a.tar.gz
+DISTFILES+=     gimp-data-extras-${MM_VERSION}a.tar.gz
 
-CATEGORIES=     graphics tk80
-MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/0.99/${VERSION}/ \
-                ftp://ftp.cs.umn.edu/pub/gimp/gimp/0.99/${VERSION}/ \
+CATEGORIES=     graphics
+MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/v${MAJOR}.${MINOR}/v${VERSION}/ \
+                ftp://ftp.cs.umn.edu/pub/gimp/gimp/v${MAJOR}.${MINOR}/v${VERSION}/ \
 
 MAINTAINER=     erich@FreeBSD.org
 
@@ -30,25 +29,20 @@ LIB_DEPENDS+=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 LIB_DEPENDS+=	xdelta\\.0:${PORTSDIR}/misc/xdelta
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
-		-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
-CONFIGURE_ARGS=  --with-tcl=tcl80 --with-tk=tk80
 
 DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}b; \
-	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
-	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 764774e1d585..3f054db50319 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.18.tar.gz) = 1d07aa3f2f0f7024bfdb786dd15e8d58
-MD5 (gimp-data-min-0.99b.tar.gz) = 55f735d5bb2604a100707e9638df3d4b
+MD5 (gimp-0.99.21.tar.gz) = e1544aec645d7be6586485e6a131ece7
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
+MD5 (gimp-plugins-unstable-0.99.21.tar.gz) = 3dcd9c1d27557aebeceeb6f3fa6b7f9a
diff --git a/graphics/gimp/files/patch-ah b/graphics/gimp/files/patch-ah
index d05ddb1cd23f..7add97cf89ce 100644
--- a/graphics/gimp/files/patch-ah
+++ b/graphics/gimp/files/patch-ah
@@ -1,6 +1,6 @@
---- configure.in~	Mon Jan 26 10:34:48 1998
-+++ configure.in	Mon Jan 26 10:35:31 1998
-@@ -120,10 +120,10 @@
+--- configure.in~	Tue Mar 17 08:28:37 1998
++++ configure.in	Tue Mar 17 08:30:07 1998
+@@ -108,10 +108,10 @@
  
  dnl Test for libtiff
    if test -z "$LIBTIFF_LIB"; then
@@ -15,26 +15,26 @@
          AC_MSG_WARN(*** TIFF plug-in will not be built ***), -lz -ljpeg -lm), -lm)
    fi
  
-@@ -240,7 +240,7 @@
- AC_C_INLINE
+@@ -219,7 +219,7 @@
+ LIBS="$gimp_save_LIBS"
  
- gimpdatadir=$datadir/$PACKAGE
+ gimpdatadir=$datadir/gimp
 -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
 +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
  
- dnl This is for generating PDB docuemntation.
- AC_PATH_PROG(EMACS, emacs, :)
---- configure~	Mon Jan 26 10:36:08 1998
-+++ configure	Mon Jan 26 10:37:35 1998
-@@ -2738,14 +2738,14 @@
- fi
+ brushdata=`ls -1 data/brushes | grep -v Makefile`
+ gradientdata=`ls -1 data/gradients | grep -v Makefile`
+--- configure~	Tue Mar 17 08:28:43 1998
++++ configure	Tue Mar 17 08:31:40 1998
+@@ -1960,14 +1960,14 @@
+   fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2743: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:1965: checking for TIFFReadScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
 +    echo $ac_n "checking for TIFFReadScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2743: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:1965: checking for TIFFReadScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -43,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2751 "configure"
+ #line 1973 "configure"
  #include "confdefs.h"
-@@ -2773,17 +2773,17 @@
+@@ -1995,17 +1995,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -54,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2781: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2003: checking for TIFFWriteScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for TIFFWriteScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2781: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2003: checking for TIFFWriteScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -66,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2789 "configure"
+ #line 2011 "configure"
  #include "confdefs.h"
-@@ -2811,7 +2811,7 @@
+@@ -2033,7 +2033,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -77,12 +77,3 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3949,7 +3949,7 @@
- 
- 
- gimpdatadir=$datadir/$PACKAGE
--gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
-+gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
- 
- # Extract the first word of "emacs", so it can be a program name with args.
- set dummy emacs; ac_word=$2
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 615e7b8c6e17..c43364ca85c8 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -4,172 +4,127 @@ lib/libgimp.a
 lib/libgimpui.so.1.0
 lib/libgimpui.la
 lib/libgimpui.a
-lib/libgck.so.0.1
-lib/libgck.la
-lib/libgck.a
+lib/libmegawidget.a
+lib/gimp/0.99/plug-ins/AlienMap
+lib/gimp/0.99/plug-ins/dbbrowser
+lib/gimp/0.99/plug-ins/script-fu
+lib/gimp/0.99/plug-ins/struc
+lib/gimp/0.99/plug-ins/webbrowser
+lib/gimp/0.99/plug-ins/tiff
+lib/gimp/0.99/plug-ins/jpeg
+lib/gimp/0.99/plug-ins/png
+lib/gimp/0.99/plug-ins/mpeg
+lib/gimp/0.99/plug-ins/xd
+lib/gimp/0.99/plug-ins/xpm
+lib/gimp/0.99/plug-ins/CML_explorer
+lib/gimp/0.99/plug-ins/align_layers
+lib/gimp/0.99/plug-ins/animoptimize
+lib/gimp/0.99/plug-ins/apply_lens
+lib/gimp/0.99/plug-ins/autocrop
+lib/gimp/0.99/plug-ins/animationplay
+lib/gimp/0.99/plug-ins/autostretch_hsv
+lib/gimp/0.99/plug-ins/blinds
+lib/gimp/0.99/plug-ins/blur
+lib/gimp/0.99/plug-ins/bmp
+lib/gimp/0.99/plug-ins/bumpmap
+lib/gimp/0.99/plug-ins/bz2
+lib/gimp/0.99/plug-ins/c_astretch
+lib/gimp/0.99/plug-ins/CEL
+lib/gimp/0.99/plug-ins/colorify
+lib/gimp/0.99/plug-ins/checkerboard
+lib/gimp/0.99/plug-ins/compose
+lib/gimp/0.99/plug-ins/convmatrix
+lib/gimp/0.99/plug-ins/cubism
+lib/gimp/0.99/plug-ins/decompose
+lib/gimp/0.99/plug-ins/deinterlace
+lib/gimp/0.99/plug-ins/depthmerge
+lib/gimp/0.99/plug-ins/despeckle
+lib/gimp/0.99/plug-ins/destripe
+lib/gimp/0.99/plug-ins/diffraction
+lib/gimp/0.99/plug-ins/displace
+lib/gimp/0.99/plug-ins/edge
+lib/gimp/0.99/plug-ins/emboss
+lib/gimp/0.99/plug-ins/engrave
+lib/gimp/0.99/plug-ins/exchange
+lib/gimp/0.99/plug-ins/faxg3
+lib/gimp/0.99/plug-ins/film
+lib/gimp/0.99/plug-ins/fits
+lib/gimp/0.99/plug-ins/flame
+lib/gimp/0.99/plug-ins/flarefx
+lib/gimp/0.99/plug-ins/fractaltrace
+lib/gimp/0.99/plug-ins/gauss_iir
+lib/gimp/0.99/plug-ins/gauss_rle
+lib/gimp/0.99/plug-ins/gbr
+lib/gimp/0.99/plug-ins/gfli
+lib/gimp/0.99/plug-ins/gicon
+lib/gimp/0.99/plug-ins/gif
+lib/gimp/0.99/plug-ins/glasstile
+lib/gimp/0.99/plug-ins/gqbist
+lib/gimp/0.99/plug-ins/gradmap
+lib/gimp/0.99/plug-ins/grid
+lib/gimp/0.99/plug-ins/gtm
+lib/gimp/0.99/plug-ins/gz
+lib/gimp/0.99/plug-ins/header
+lib/gimp/0.99/plug-ins/hot
+lib/gimp/0.99/plug-ins/hrz
+lib/gimp/0.99/plug-ins/ifscompose
+lib/gimp/0.99/plug-ins/illusion
+lib/gimp/0.99/plug-ins/iwarp
+lib/gimp/0.99/plug-ins/laplace
+lib/gimp/0.99/plug-ins/mail
+lib/gimp/0.99/plug-ins/max_rgb
+lib/gimp/0.99/plug-ins/maze
+lib/gimp/0.99/plug-ins/mblur
+lib/gimp/0.99/plug-ins/mosaic
+lib/gimp/0.99/plug-ins/nlfilt
+lib/gimp/0.99/plug-ins/noisify
+lib/gimp/0.99/plug-ins/normalize
+lib/gimp/0.99/plug-ins/nova
+lib/gimp/0.99/plug-ins/oilify
+lib/gimp/0.99/plug-ins/papertile
+lib/gimp/0.99/plug-ins/pat
+lib/gimp/0.99/plug-ins/pcx
+lib/gimp/0.99/plug-ins/pix
+lib/gimp/0.99/plug-ins/pixelize
+lib/gimp/0.99/plug-ins/plasma
+lib/gimp/0.99/plug-ins/pnm
+lib/gimp/0.99/plug-ins/polar
+lib/gimp/0.99/plug-ins/print
+lib/gimp/0.99/plug-ins/ps
+lib/gimp/0.99/plug-ins/ripple
+lib/gimp/0.99/plug-ins/randomize
+lib/gimp/0.99/plug-ins/rotate
+lib/gimp/0.99/plug-ins/rotators
+lib/gimp/0.99/plug-ins/scatter_hsv
+lib/gimp/0.99/plug-ins/semiflatten
+lib/gimp/0.99/plug-ins/sgi
+lib/gimp/0.99/plug-ins/shift
+lib/gimp/0.99/plug-ins/sinus
+lib/gimp/0.99/plug-ins/smooth_palette
+lib/gimp/0.99/plug-ins/snoise
+lib/gimp/0.99/plug-ins/snp
+lib/gimp/0.99/plug-ins/sobel
+lib/gimp/0.99/plug-ins/sparkle
+lib/gimp/0.99/plug-ins/spread
+lib/gimp/0.99/plug-ins/sunras
+lib/gimp/0.99/plug-ins/tga
+lib/gimp/0.99/plug-ins/threshold_alpha
+lib/gimp/0.99/plug-ins/tile
+lib/gimp/0.99/plug-ins/tileit
+lib/gimp/0.99/plug-ins/tiler
+lib/gimp/0.99/plug-ins/url
+lib/gimp/0.99/plug-ins/video
+lib/gimp/0.99/plug-ins/vinvert
+lib/gimp/0.99/plug-ins/vpropagate
+lib/gimp/0.99/plug-ins/waves
+lib/gimp/0.99/plug-ins/whirlpinch
+lib/gimp/0.99/plug-ins/xwd
+lib/gimp/0.99/plug-ins/zealouscrop
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpui.h
-include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gcknotebook.h
-include/gck/gckvector.h
-libexec/gimp/0.99/plug-ins/libmegawidget.a
-libexec/gimp/0.99/plug-ins/MapObject
-libexec/gimp/0.99/plug-ins/AlienMap
-libexec/gimp/0.99/plug-ins/Anamorphose
-libexec/gimp/0.99/plug-ins/CentralReflection
-libexec/gimp/0.99/plug-ins/Curtain
-libexec/gimp/0.99/plug-ins/Encrypt_Decrypt
-libexec/gimp/0.99/plug-ins/Julia
-libexec/gimp/0.99/plug-ins/Mandelbrot
-libexec/gimp/0.99/plug-ins/DigitalSignature
-libexec/gimp/0.99/plug-ins/dbbrowser
-libexec/gimp/0.99/plug-ins/fuse
-libexec/gimp/0.99/plug-ins/gflare
-libexec/gimp/0.99/plug-ins/consolio
-libexec/gimp/0.99/plug-ins/pdb_help
-libexec/gimp/0.99/plug-ins/stained_glass
-libexec/gimp/0.99/plug-ins/sbutton
-libexec/gimp/0.99/plug-ins/refract
-libexec/gimp/0.99/plug-ins/script-fu
-libexec/gimp/0.99/plug-ins/struc
-libexec/gimp/0.99/plug-ins/twist
-libexec/gimp/0.99/plug-ins/warp
-libexec/gimp/0.99/plug-ins/tiff
-libexec/gimp/0.99/plug-ins/jpeg
-libexec/gimp/0.99/plug-ins/png
-libexec/gimp/0.99/plug-ins/xd
-libexec/gimp/0.99/plug-ins/mpeg
-libexec/gimp/0.99/plug-ins/xpm
-libexec/gimp/0.99/plug-ins/CML_explorer
-libexec/gimp/0.99/plug-ins/align_layers
-libexec/gimp/0.99/plug-ins/apply_lens
-libexec/gimp/0.99/plug-ins/autocrop
-libexec/gimp/0.99/plug-ins/animationplay
-libexec/gimp/0.99/plug-ins/autostretch_hsv
-libexec/gimp/0.99/plug-ins/blinds
-libexec/gimp/0.99/plug-ins/blur
-libexec/gimp/0.99/plug-ins/blur2
-libexec/gimp/0.99/plug-ins/bmp
-libexec/gimp/0.99/plug-ins/bumpmap
-libexec/gimp/0.99/plug-ins/bz2
-libexec/gimp/0.99/plug-ins/c_astretch
-libexec/gimp/0.99/plug-ins/CEL
-libexec/gimp/0.99/plug-ins/checkerboard
-libexec/gimp/0.99/plug-ins/colorify
-libexec/gimp/0.99/plug-ins/compose
-libexec/gimp/0.99/plug-ins/convmatrix
-libexec/gimp/0.99/plug-ins/coordmap
-libexec/gimp/0.99/plug-ins/cubism
-libexec/gimp/0.99/plug-ins/decompose
-libexec/gimp/0.99/plug-ins/deinterlace
-libexec/gimp/0.99/plug-ins/depthmerge
-libexec/gimp/0.99/plug-ins/despeckle
-libexec/gimp/0.99/plug-ins/destripe
-libexec/gimp/0.99/plug-ins/fp
-libexec/gimp/0.99/plug-ins/diffraction
-libexec/gimp/0.99/plug-ins/displace
-libexec/gimp/0.99/plug-ins/edge
-libexec/gimp/0.99/plug-ins/emboss
-libexec/gimp/0.99/plug-ins/engrave
-libexec/gimp/0.99/plug-ins/exchange
-libexec/gimp/0.99/plug-ins/faxg3
-libexec/gimp/0.99/plug-ins/figures
-libexec/gimp/0.99/plug-ins/film
-libexec/gimp/0.99/plug-ins/fits
-libexec/gimp/0.99/plug-ins/flame
-libexec/gimp/0.99/plug-ins/flarefx
-libexec/gimp/0.99/plug-ins/fractaltrace
-libexec/gimp/0.99/plug-ins/gauss_iir
-libexec/gimp/0.99/plug-ins/gauss_rle
-libexec/gimp/0.99/plug-ins/gbr
-libexec/gimp/0.99/plug-ins/gfli
-libexec/gimp/0.99/plug-ins/gicon
-libexec/gimp/0.99/plug-ins/gif
-libexec/gimp/0.99/plug-ins/glasstile
-libexec/gimp/0.99/plug-ins/gqbist
-libexec/gimp/0.99/plug-ins/gradmap
-libexec/gimp/0.99/plug-ins/grid
-libexec/gimp/0.99/plug-ins/gz
-libexec/gimp/0.99/plug-ins/header
-libexec/gimp/0.99/plug-ins/holes
-libexec/gimp/0.99/plug-ins/hot
-libexec/gimp/0.99/plug-ins/hrz
-libexec/gimp/0.99/plug-ins/ifscompose
-libexec/gimp/0.99/plug-ins/illusion
-libexec/gimp/0.99/plug-ins/lic
-libexec/gimp/0.99/plug-ins/iwarp
-libexec/gimp/0.99/plug-ins/laplace
-libexec/gimp/0.99/plug-ins/magiceye
-libexec/gimp/0.99/plug-ins/mail
-libexec/gimp/0.99/plug-ins/max_rgb
-libexec/gimp/0.99/plug-ins/maze
-libexec/gimp/0.99/plug-ins/mblur
-libexec/gimp/0.99/plug-ins/mosaic
-libexec/gimp/0.99/plug-ins/nlfilt
-libexec/gimp/0.99/plug-ins/noisify
-libexec/gimp/0.99/plug-ins/normalize
-libexec/gimp/0.99/plug-ins/nova
-libexec/gimp/0.99/plug-ins/oilify
-libexec/gimp/0.99/plug-ins/papertile
-libexec/gimp/0.99/plug-ins/pat
-libexec/gimp/0.99/plug-ins/pcx
-libexec/gimp/0.99/plug-ins/pix
-libexec/gimp/0.99/plug-ins/pixelize
-libexec/gimp/0.99/plug-ins/plasma
-libexec/gimp/0.99/plug-ins/pnm
-libexec/gimp/0.99/plug-ins/polar
-libexec/gimp/0.99/plug-ins/print
-libexec/gimp/0.99/plug-ins/ps
-libexec/gimp/0.99/plug-ins/psd
-libexec/gimp/0.99/plug-ins/randomize
-libexec/gimp/0.99/plug-ins/ripple
-libexec/gimp/0.99/plug-ins/rotate
-libexec/gimp/0.99/plug-ins/rotators
-libexec/gimp/0.99/plug-ins/scatter_hsv
-libexec/gimp/0.99/plug-ins/sgi
-libexec/gimp/0.99/plug-ins/sharpen
-libexec/gimp/0.99/plug-ins/shift
-libexec/gimp/0.99/plug-ins/sinus
-libexec/gimp/0.99/plug-ins/smooth_palette
-libexec/gimp/0.99/plug-ins/snoise
-libexec/gimp/0.99/plug-ins/snp
-libexec/gimp/0.99/plug-ins/sobel
-libexec/gimp/0.99/plug-ins/sparkle
-libexec/gimp/0.99/plug-ins/spread
-libexec/gimp/0.99/plug-ins/stegano
-libexec/gimp/0.99/plug-ins/stereogram
-libexec/gimp/0.99/plug-ins/sunras
-libexec/gimp/0.99/plug-ins/tga
-libexec/gimp/0.99/plug-ins/threshold_alpha
-libexec/gimp/0.99/plug-ins/tile
-libexec/gimp/0.99/plug-ins/tileit
-libexec/gimp/0.99/plug-ins/tiler
-libexec/gimp/0.99/plug-ins/universal
-libexec/gimp/0.99/plug-ins/url
-libexec/gimp/0.99/plug-ins/video
-libexec/gimp/0.99/plug-ins/vinvert
-libexec/gimp/0.99/plug-ins/vpropagate
-libexec/gimp/0.99/plug-ins/waves
-libexec/gimp/0.99/plug-ins/whirlpinch
-libexec/gimp/0.99/plug-ins/xwd
-libexec/gimp/0.99/plug-ins/zealouscrop
-libexec/gimptcl
-share/gimp/gflares/Bright_Star
-share/gimp/gflares/Classic
-share/gimp/gflares/Default
-share/gimp/gflares/Distant_Sun
-share/gimp/gflares/GFlare_101
-share/gimp/gflares/GFlare_102
-share/gimp/gflares/Hidden_Planet
+include/megawidget.h
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -247,13 +202,7 @@ share/gimp/scripts/truchet.scm
 share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
 share/gimp/scripts/xach-effect.scm
-share/gimp/user_install
-share/gimp/gimprc
-share/gimp/gimprc_user
-share/gimp/gtkrc
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_tips.txt
-share/gimp/ps-menurc
+share/gimp/scripts/web-browser.scm
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -272,11 +221,10 @@ share/gimp/brushes/20x20squareBlur.gbr
 share/gimp/brushes/3circle.gbr
 share/gimp/brushes/3fcircle.gbr
 share/gimp/brushes/5circle.gbr
-share/gimp/brushes/7circle.gbr
 share/gimp/brushes/5fcircle.gbr
-share/gimp/brushes/xcf.gbr
 share/gimp/brushes/5x5square.gbr
 share/gimp/brushes/5x5squareBlur.gbr
+share/gimp/brushes/7circle.gbr
 share/gimp/brushes/7fcircle.gbr
 share/gimp/brushes/9circle.gbr
 share/gimp/brushes/9fcircle.gbr
@@ -294,15 +242,16 @@ share/gimp/brushes/galaxy_big.gbr
 share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/pixel.gbr
 share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/xcf.gbr
 share/gimp/brushes/50x50cone.gbr
 share/gimp/brushes/50x50square.gbr
 share/gimp/brushes/50x50squareBlur.gbr
-share/gimp/brushes/bird.gbr
 share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
 share/gimp/brushes/bigcircle4.gbr
+share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
 share/gimp/brushes/flower.gbr
@@ -319,10 +268,10 @@ share/gimp/brushes/qbert3Blur.gbr
 share/gimp/brushes/reach.gbr
 share/gimp/brushes/sphere29.gbr
 share/gimp/brushes/sphere36.gbr
+share/gimp/brushes/star1.gbr
 share/gimp/brushes/sphere47.gbr
 share/gimp/brushes/sphere55.gbr
 share/gimp/brushes/sphere79.gbr
-share/gimp/brushes/star1.gbr
 share/gimp/brushes/star2.gbr
 share/gimp/brushes/star3.gbr
 share/gimp/brushes/star4.gbr
@@ -335,19 +284,6 @@ share/gimp/brushes/text3.gbr
 share/gimp/brushes/text4.gbr
 share/gimp/brushes/tulip.gbr
 share/gimp/brushes/wave.gbr
-share/gimp/palettes/Blues
-share/gimp/palettes/Browns_And_Yellows
-share/gimp/palettes/Cool_Colors
-share/gimp/palettes/Default
-share/gimp/palettes/Grays
-share/gimp/palettes/Greens
-share/gimp/palettes/Lights
-share/gimp/palettes/Muted
-share/gimp/palettes/Named_Colors
-share/gimp/palettes/Pastels
-share/gimp/palettes/Reds_And_Purples
-share/gimp/palettes/Warm_Colors
-share/gimp/palettes/Web
 share/gimp/gradients/Abstract_1
 share/gimp/gradients/Abstract_2
 share/gimp/gradients/Abstract_3
@@ -424,6 +360,43 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
+share/gimp/palettes/Bears
+share/gimp/palettes/Bgold
+share/gimp/palettes/Blues
+share/gimp/palettes/Borders
+share/gimp/palettes/Browns_And_Yellows
+share/gimp/palettes/Caramel
+share/gimp/palettes/Cascade
+share/gimp/palettes/China
+share/gimp/palettes/Coldfire
+share/gimp/palettes/Cool_Colors
+share/gimp/palettes/Cranes
+share/gimp/palettes/Dark_pastels
+share/gimp/palettes/Default
+share/gimp/palettes/Ega
+share/gimp/palettes/Firecode
+share/gimp/palettes/Gold
+share/gimp/palettes/GrayViolet
+share/gimp/palettes/Grayblue
+share/gimp/palettes/Grays
+share/gimp/palettes/Greens
+share/gimp/palettes/Hilite
+share/gimp/palettes/Kahki
+share/gimp/palettes/Lights
+share/gimp/palettes/Muted
+share/gimp/palettes/Named_Colors
+share/gimp/palettes/News3
+share/gimp/palettes/Op2
+share/gimp/palettes/Pastels
+share/gimp/palettes/Paintjet
+share/gimp/palettes/Plasma
+share/gimp/palettes/Reds
+share/gimp/palettes/Reds_And_Purples
+share/gimp/palettes/Royal
+share/gimp/palettes/Topographic
+share/gimp/palettes/Volcano
+share/gimp/palettes/Warm_Colors
+share/gimp/palettes/Web
 share/gimp/patterns/3dgreen.pat
 share/gimp/patterns/Craters.pat
 share/gimp/patterns/Moonfoot.pat
@@ -592,28 +565,28 @@ share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
+share/gimp/user_install
+share/gimp/gimprc
+share/gimp/gimprc_user
+share/gimp/gtkrc
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimp_tips.txt
+share/gimp/ps-menurc
 bin/gimp
-@unexec install-info --delete %D/info/pdb.info %D/info/dir
-@unexec install-info --delete %D/info/pdb.info-1 %D/info/dir
-@unexec install-info --delete %D/info/pdb.info-2 %D/info/dir
-@exec install-info %D/info/pdb.info %D/info/dir
-@exec install-info %D/info/pdb.info-1 %D/info/dir
-@exec install-info %D/info/pdb.info-2 %D/info/dir
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
 lib/libgimp.so
 lib/libgimpui.so
-lib/libgck.so
+@dirrm lib/gimp/0.99/plug-ins
+@dirrm lib/gimp/0.99
+@dirrm lib/gimp
+@dirrm lib
 @dirrm include/libgimp
-@dirrm include/gck
-@dirrm libexec/gimp/0.99/plug-ins
-@dirrm libexec/gimp/0.99
-@dirrm libexec/gimp
-@dirrm share/gimp/gflares
+@dirrm include
 @dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
-@dirrm share/gimp/palettes
 @dirrm share/gimp/gradients
+@dirrm share/gimp/palettes
 @dirrm share/gimp/patterns
 @dirrm share/gimp
+@dirrm share
+@dirrm bin
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index caffb6367ee7..ac10feb918da 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -1,26 +1,25 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.17
+# Version required:     0.99.19
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.19 1998/01/28 15:39:56 erich Exp $
+# $Id: Makefile,v 1.20 1998/02/21 22:37:56 fenner Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	18
+MICRO=	21
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}b.tar.gz \
-            gimp-data-extras-${MM_VERSION}a.tar.gz
+DISTFILES+=     gimp-data-extras-${MM_VERSION}a.tar.gz
 
-CATEGORIES=     graphics tk80
-MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/0.99/${VERSION}/ \
-                ftp://ftp.cs.umn.edu/pub/gimp/gimp/0.99/${VERSION}/ \
+CATEGORIES=     graphics
+MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/v${MAJOR}.${MINOR}/v${VERSION}/ \
+                ftp://ftp.cs.umn.edu/pub/gimp/gimp/v${MAJOR}.${MINOR}/v${VERSION}/ \
 
 MAINTAINER=     erich@FreeBSD.org
 
@@ -30,25 +29,20 @@ LIB_DEPENDS+=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 LIB_DEPENDS+=	xdelta\\.0:${PORTSDIR}/misc/xdelta
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
-		-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
-CONFIGURE_ARGS=  --with-tcl=tcl80 --with-tk=tk80
 
 DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}b; \
-	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
-	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index 764774e1d585..3f054db50319 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.18.tar.gz) = 1d07aa3f2f0f7024bfdb786dd15e8d58
-MD5 (gimp-data-min-0.99b.tar.gz) = 55f735d5bb2604a100707e9638df3d4b
+MD5 (gimp-0.99.21.tar.gz) = e1544aec645d7be6586485e6a131ece7
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
+MD5 (gimp-plugins-unstable-0.99.21.tar.gz) = 3dcd9c1d27557aebeceeb6f3fa6b7f9a
diff --git a/graphics/gimp1/files/patch-ah b/graphics/gimp1/files/patch-ah
index d05ddb1cd23f..7add97cf89ce 100644
--- a/graphics/gimp1/files/patch-ah
+++ b/graphics/gimp1/files/patch-ah
@@ -1,6 +1,6 @@
---- configure.in~	Mon Jan 26 10:34:48 1998
-+++ configure.in	Mon Jan 26 10:35:31 1998
-@@ -120,10 +120,10 @@
+--- configure.in~	Tue Mar 17 08:28:37 1998
++++ configure.in	Tue Mar 17 08:30:07 1998
+@@ -108,10 +108,10 @@
  
  dnl Test for libtiff
    if test -z "$LIBTIFF_LIB"; then
@@ -15,26 +15,26 @@
          AC_MSG_WARN(*** TIFF plug-in will not be built ***), -lz -ljpeg -lm), -lm)
    fi
  
-@@ -240,7 +240,7 @@
- AC_C_INLINE
+@@ -219,7 +219,7 @@
+ LIBS="$gimp_save_LIBS"
  
- gimpdatadir=$datadir/$PACKAGE
+ gimpdatadir=$datadir/gimp
 -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
 +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
  
- dnl This is for generating PDB docuemntation.
- AC_PATH_PROG(EMACS, emacs, :)
---- configure~	Mon Jan 26 10:36:08 1998
-+++ configure	Mon Jan 26 10:37:35 1998
-@@ -2738,14 +2738,14 @@
- fi
+ brushdata=`ls -1 data/brushes | grep -v Makefile`
+ gradientdata=`ls -1 data/gradients | grep -v Makefile`
+--- configure~	Tue Mar 17 08:28:43 1998
++++ configure	Tue Mar 17 08:31:40 1998
+@@ -1960,14 +1960,14 @@
+   fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2743: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:1965: checking for TIFFReadScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
 +    echo $ac_n "checking for TIFFReadScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2743: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:1965: checking for TIFFReadScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -43,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2751 "configure"
+ #line 1973 "configure"
  #include "confdefs.h"
-@@ -2773,17 +2773,17 @@
+@@ -1995,17 +1995,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -54,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2781: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2003: checking for TIFFWriteScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for TIFFWriteScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2781: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2003: checking for TIFFWriteScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -66,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2789 "configure"
+ #line 2011 "configure"
  #include "confdefs.h"
-@@ -2811,7 +2811,7 @@
+@@ -2033,7 +2033,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -77,12 +77,3 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3949,7 +3949,7 @@
- 
- 
- gimpdatadir=$datadir/$PACKAGE
--gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
-+gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
- 
- # Extract the first word of "emacs", so it can be a program name with args.
- set dummy emacs; ac_word=$2
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index 615e7b8c6e17..c43364ca85c8 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -4,172 +4,127 @@ lib/libgimp.a
 lib/libgimpui.so.1.0
 lib/libgimpui.la
 lib/libgimpui.a
-lib/libgck.so.0.1
-lib/libgck.la
-lib/libgck.a
+lib/libmegawidget.a
+lib/gimp/0.99/plug-ins/AlienMap
+lib/gimp/0.99/plug-ins/dbbrowser
+lib/gimp/0.99/plug-ins/script-fu
+lib/gimp/0.99/plug-ins/struc
+lib/gimp/0.99/plug-ins/webbrowser
+lib/gimp/0.99/plug-ins/tiff
+lib/gimp/0.99/plug-ins/jpeg
+lib/gimp/0.99/plug-ins/png
+lib/gimp/0.99/plug-ins/mpeg
+lib/gimp/0.99/plug-ins/xd
+lib/gimp/0.99/plug-ins/xpm
+lib/gimp/0.99/plug-ins/CML_explorer
+lib/gimp/0.99/plug-ins/align_layers
+lib/gimp/0.99/plug-ins/animoptimize
+lib/gimp/0.99/plug-ins/apply_lens
+lib/gimp/0.99/plug-ins/autocrop
+lib/gimp/0.99/plug-ins/animationplay
+lib/gimp/0.99/plug-ins/autostretch_hsv
+lib/gimp/0.99/plug-ins/blinds
+lib/gimp/0.99/plug-ins/blur
+lib/gimp/0.99/plug-ins/bmp
+lib/gimp/0.99/plug-ins/bumpmap
+lib/gimp/0.99/plug-ins/bz2
+lib/gimp/0.99/plug-ins/c_astretch
+lib/gimp/0.99/plug-ins/CEL
+lib/gimp/0.99/plug-ins/colorify
+lib/gimp/0.99/plug-ins/checkerboard
+lib/gimp/0.99/plug-ins/compose
+lib/gimp/0.99/plug-ins/convmatrix
+lib/gimp/0.99/plug-ins/cubism
+lib/gimp/0.99/plug-ins/decompose
+lib/gimp/0.99/plug-ins/deinterlace
+lib/gimp/0.99/plug-ins/depthmerge
+lib/gimp/0.99/plug-ins/despeckle
+lib/gimp/0.99/plug-ins/destripe
+lib/gimp/0.99/plug-ins/diffraction
+lib/gimp/0.99/plug-ins/displace
+lib/gimp/0.99/plug-ins/edge
+lib/gimp/0.99/plug-ins/emboss
+lib/gimp/0.99/plug-ins/engrave
+lib/gimp/0.99/plug-ins/exchange
+lib/gimp/0.99/plug-ins/faxg3
+lib/gimp/0.99/plug-ins/film
+lib/gimp/0.99/plug-ins/fits
+lib/gimp/0.99/plug-ins/flame
+lib/gimp/0.99/plug-ins/flarefx
+lib/gimp/0.99/plug-ins/fractaltrace
+lib/gimp/0.99/plug-ins/gauss_iir
+lib/gimp/0.99/plug-ins/gauss_rle
+lib/gimp/0.99/plug-ins/gbr
+lib/gimp/0.99/plug-ins/gfli
+lib/gimp/0.99/plug-ins/gicon
+lib/gimp/0.99/plug-ins/gif
+lib/gimp/0.99/plug-ins/glasstile
+lib/gimp/0.99/plug-ins/gqbist
+lib/gimp/0.99/plug-ins/gradmap
+lib/gimp/0.99/plug-ins/grid
+lib/gimp/0.99/plug-ins/gtm
+lib/gimp/0.99/plug-ins/gz
+lib/gimp/0.99/plug-ins/header
+lib/gimp/0.99/plug-ins/hot
+lib/gimp/0.99/plug-ins/hrz
+lib/gimp/0.99/plug-ins/ifscompose
+lib/gimp/0.99/plug-ins/illusion
+lib/gimp/0.99/plug-ins/iwarp
+lib/gimp/0.99/plug-ins/laplace
+lib/gimp/0.99/plug-ins/mail
+lib/gimp/0.99/plug-ins/max_rgb
+lib/gimp/0.99/plug-ins/maze
+lib/gimp/0.99/plug-ins/mblur
+lib/gimp/0.99/plug-ins/mosaic
+lib/gimp/0.99/plug-ins/nlfilt
+lib/gimp/0.99/plug-ins/noisify
+lib/gimp/0.99/plug-ins/normalize
+lib/gimp/0.99/plug-ins/nova
+lib/gimp/0.99/plug-ins/oilify
+lib/gimp/0.99/plug-ins/papertile
+lib/gimp/0.99/plug-ins/pat
+lib/gimp/0.99/plug-ins/pcx
+lib/gimp/0.99/plug-ins/pix
+lib/gimp/0.99/plug-ins/pixelize
+lib/gimp/0.99/plug-ins/plasma
+lib/gimp/0.99/plug-ins/pnm
+lib/gimp/0.99/plug-ins/polar
+lib/gimp/0.99/plug-ins/print
+lib/gimp/0.99/plug-ins/ps
+lib/gimp/0.99/plug-ins/ripple
+lib/gimp/0.99/plug-ins/randomize
+lib/gimp/0.99/plug-ins/rotate
+lib/gimp/0.99/plug-ins/rotators
+lib/gimp/0.99/plug-ins/scatter_hsv
+lib/gimp/0.99/plug-ins/semiflatten
+lib/gimp/0.99/plug-ins/sgi
+lib/gimp/0.99/plug-ins/shift
+lib/gimp/0.99/plug-ins/sinus
+lib/gimp/0.99/plug-ins/smooth_palette
+lib/gimp/0.99/plug-ins/snoise
+lib/gimp/0.99/plug-ins/snp
+lib/gimp/0.99/plug-ins/sobel
+lib/gimp/0.99/plug-ins/sparkle
+lib/gimp/0.99/plug-ins/spread
+lib/gimp/0.99/plug-ins/sunras
+lib/gimp/0.99/plug-ins/tga
+lib/gimp/0.99/plug-ins/threshold_alpha
+lib/gimp/0.99/plug-ins/tile
+lib/gimp/0.99/plug-ins/tileit
+lib/gimp/0.99/plug-ins/tiler
+lib/gimp/0.99/plug-ins/url
+lib/gimp/0.99/plug-ins/video
+lib/gimp/0.99/plug-ins/vinvert
+lib/gimp/0.99/plug-ins/vpropagate
+lib/gimp/0.99/plug-ins/waves
+lib/gimp/0.99/plug-ins/whirlpinch
+lib/gimp/0.99/plug-ins/xwd
+lib/gimp/0.99/plug-ins/zealouscrop
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpui.h
-include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gcknotebook.h
-include/gck/gckvector.h
-libexec/gimp/0.99/plug-ins/libmegawidget.a
-libexec/gimp/0.99/plug-ins/MapObject
-libexec/gimp/0.99/plug-ins/AlienMap
-libexec/gimp/0.99/plug-ins/Anamorphose
-libexec/gimp/0.99/plug-ins/CentralReflection
-libexec/gimp/0.99/plug-ins/Curtain
-libexec/gimp/0.99/plug-ins/Encrypt_Decrypt
-libexec/gimp/0.99/plug-ins/Julia
-libexec/gimp/0.99/plug-ins/Mandelbrot
-libexec/gimp/0.99/plug-ins/DigitalSignature
-libexec/gimp/0.99/plug-ins/dbbrowser
-libexec/gimp/0.99/plug-ins/fuse
-libexec/gimp/0.99/plug-ins/gflare
-libexec/gimp/0.99/plug-ins/consolio
-libexec/gimp/0.99/plug-ins/pdb_help
-libexec/gimp/0.99/plug-ins/stained_glass
-libexec/gimp/0.99/plug-ins/sbutton
-libexec/gimp/0.99/plug-ins/refract
-libexec/gimp/0.99/plug-ins/script-fu
-libexec/gimp/0.99/plug-ins/struc
-libexec/gimp/0.99/plug-ins/twist
-libexec/gimp/0.99/plug-ins/warp
-libexec/gimp/0.99/plug-ins/tiff
-libexec/gimp/0.99/plug-ins/jpeg
-libexec/gimp/0.99/plug-ins/png
-libexec/gimp/0.99/plug-ins/xd
-libexec/gimp/0.99/plug-ins/mpeg
-libexec/gimp/0.99/plug-ins/xpm
-libexec/gimp/0.99/plug-ins/CML_explorer
-libexec/gimp/0.99/plug-ins/align_layers
-libexec/gimp/0.99/plug-ins/apply_lens
-libexec/gimp/0.99/plug-ins/autocrop
-libexec/gimp/0.99/plug-ins/animationplay
-libexec/gimp/0.99/plug-ins/autostretch_hsv
-libexec/gimp/0.99/plug-ins/blinds
-libexec/gimp/0.99/plug-ins/blur
-libexec/gimp/0.99/plug-ins/blur2
-libexec/gimp/0.99/plug-ins/bmp
-libexec/gimp/0.99/plug-ins/bumpmap
-libexec/gimp/0.99/plug-ins/bz2
-libexec/gimp/0.99/plug-ins/c_astretch
-libexec/gimp/0.99/plug-ins/CEL
-libexec/gimp/0.99/plug-ins/checkerboard
-libexec/gimp/0.99/plug-ins/colorify
-libexec/gimp/0.99/plug-ins/compose
-libexec/gimp/0.99/plug-ins/convmatrix
-libexec/gimp/0.99/plug-ins/coordmap
-libexec/gimp/0.99/plug-ins/cubism
-libexec/gimp/0.99/plug-ins/decompose
-libexec/gimp/0.99/plug-ins/deinterlace
-libexec/gimp/0.99/plug-ins/depthmerge
-libexec/gimp/0.99/plug-ins/despeckle
-libexec/gimp/0.99/plug-ins/destripe
-libexec/gimp/0.99/plug-ins/fp
-libexec/gimp/0.99/plug-ins/diffraction
-libexec/gimp/0.99/plug-ins/displace
-libexec/gimp/0.99/plug-ins/edge
-libexec/gimp/0.99/plug-ins/emboss
-libexec/gimp/0.99/plug-ins/engrave
-libexec/gimp/0.99/plug-ins/exchange
-libexec/gimp/0.99/plug-ins/faxg3
-libexec/gimp/0.99/plug-ins/figures
-libexec/gimp/0.99/plug-ins/film
-libexec/gimp/0.99/plug-ins/fits
-libexec/gimp/0.99/plug-ins/flame
-libexec/gimp/0.99/plug-ins/flarefx
-libexec/gimp/0.99/plug-ins/fractaltrace
-libexec/gimp/0.99/plug-ins/gauss_iir
-libexec/gimp/0.99/plug-ins/gauss_rle
-libexec/gimp/0.99/plug-ins/gbr
-libexec/gimp/0.99/plug-ins/gfli
-libexec/gimp/0.99/plug-ins/gicon
-libexec/gimp/0.99/plug-ins/gif
-libexec/gimp/0.99/plug-ins/glasstile
-libexec/gimp/0.99/plug-ins/gqbist
-libexec/gimp/0.99/plug-ins/gradmap
-libexec/gimp/0.99/plug-ins/grid
-libexec/gimp/0.99/plug-ins/gz
-libexec/gimp/0.99/plug-ins/header
-libexec/gimp/0.99/plug-ins/holes
-libexec/gimp/0.99/plug-ins/hot
-libexec/gimp/0.99/plug-ins/hrz
-libexec/gimp/0.99/plug-ins/ifscompose
-libexec/gimp/0.99/plug-ins/illusion
-libexec/gimp/0.99/plug-ins/lic
-libexec/gimp/0.99/plug-ins/iwarp
-libexec/gimp/0.99/plug-ins/laplace
-libexec/gimp/0.99/plug-ins/magiceye
-libexec/gimp/0.99/plug-ins/mail
-libexec/gimp/0.99/plug-ins/max_rgb
-libexec/gimp/0.99/plug-ins/maze
-libexec/gimp/0.99/plug-ins/mblur
-libexec/gimp/0.99/plug-ins/mosaic
-libexec/gimp/0.99/plug-ins/nlfilt
-libexec/gimp/0.99/plug-ins/noisify
-libexec/gimp/0.99/plug-ins/normalize
-libexec/gimp/0.99/plug-ins/nova
-libexec/gimp/0.99/plug-ins/oilify
-libexec/gimp/0.99/plug-ins/papertile
-libexec/gimp/0.99/plug-ins/pat
-libexec/gimp/0.99/plug-ins/pcx
-libexec/gimp/0.99/plug-ins/pix
-libexec/gimp/0.99/plug-ins/pixelize
-libexec/gimp/0.99/plug-ins/plasma
-libexec/gimp/0.99/plug-ins/pnm
-libexec/gimp/0.99/plug-ins/polar
-libexec/gimp/0.99/plug-ins/print
-libexec/gimp/0.99/plug-ins/ps
-libexec/gimp/0.99/plug-ins/psd
-libexec/gimp/0.99/plug-ins/randomize
-libexec/gimp/0.99/plug-ins/ripple
-libexec/gimp/0.99/plug-ins/rotate
-libexec/gimp/0.99/plug-ins/rotators
-libexec/gimp/0.99/plug-ins/scatter_hsv
-libexec/gimp/0.99/plug-ins/sgi
-libexec/gimp/0.99/plug-ins/sharpen
-libexec/gimp/0.99/plug-ins/shift
-libexec/gimp/0.99/plug-ins/sinus
-libexec/gimp/0.99/plug-ins/smooth_palette
-libexec/gimp/0.99/plug-ins/snoise
-libexec/gimp/0.99/plug-ins/snp
-libexec/gimp/0.99/plug-ins/sobel
-libexec/gimp/0.99/plug-ins/sparkle
-libexec/gimp/0.99/plug-ins/spread
-libexec/gimp/0.99/plug-ins/stegano
-libexec/gimp/0.99/plug-ins/stereogram
-libexec/gimp/0.99/plug-ins/sunras
-libexec/gimp/0.99/plug-ins/tga
-libexec/gimp/0.99/plug-ins/threshold_alpha
-libexec/gimp/0.99/plug-ins/tile
-libexec/gimp/0.99/plug-ins/tileit
-libexec/gimp/0.99/plug-ins/tiler
-libexec/gimp/0.99/plug-ins/universal
-libexec/gimp/0.99/plug-ins/url
-libexec/gimp/0.99/plug-ins/video
-libexec/gimp/0.99/plug-ins/vinvert
-libexec/gimp/0.99/plug-ins/vpropagate
-libexec/gimp/0.99/plug-ins/waves
-libexec/gimp/0.99/plug-ins/whirlpinch
-libexec/gimp/0.99/plug-ins/xwd
-libexec/gimp/0.99/plug-ins/zealouscrop
-libexec/gimptcl
-share/gimp/gflares/Bright_Star
-share/gimp/gflares/Classic
-share/gimp/gflares/Default
-share/gimp/gflares/Distant_Sun
-share/gimp/gflares/GFlare_101
-share/gimp/gflares/GFlare_102
-share/gimp/gflares/Hidden_Planet
+include/megawidget.h
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -247,13 +202,7 @@ share/gimp/scripts/truchet.scm
 share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
 share/gimp/scripts/xach-effect.scm
-share/gimp/user_install
-share/gimp/gimprc
-share/gimp/gimprc_user
-share/gimp/gtkrc
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_tips.txt
-share/gimp/ps-menurc
+share/gimp/scripts/web-browser.scm
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -272,11 +221,10 @@ share/gimp/brushes/20x20squareBlur.gbr
 share/gimp/brushes/3circle.gbr
 share/gimp/brushes/3fcircle.gbr
 share/gimp/brushes/5circle.gbr
-share/gimp/brushes/7circle.gbr
 share/gimp/brushes/5fcircle.gbr
-share/gimp/brushes/xcf.gbr
 share/gimp/brushes/5x5square.gbr
 share/gimp/brushes/5x5squareBlur.gbr
+share/gimp/brushes/7circle.gbr
 share/gimp/brushes/7fcircle.gbr
 share/gimp/brushes/9circle.gbr
 share/gimp/brushes/9fcircle.gbr
@@ -294,15 +242,16 @@ share/gimp/brushes/galaxy_big.gbr
 share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/pixel.gbr
 share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/xcf.gbr
 share/gimp/brushes/50x50cone.gbr
 share/gimp/brushes/50x50square.gbr
 share/gimp/brushes/50x50squareBlur.gbr
-share/gimp/brushes/bird.gbr
 share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
 share/gimp/brushes/bigcircle4.gbr
+share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
 share/gimp/brushes/flower.gbr
@@ -319,10 +268,10 @@ share/gimp/brushes/qbert3Blur.gbr
 share/gimp/brushes/reach.gbr
 share/gimp/brushes/sphere29.gbr
 share/gimp/brushes/sphere36.gbr
+share/gimp/brushes/star1.gbr
 share/gimp/brushes/sphere47.gbr
 share/gimp/brushes/sphere55.gbr
 share/gimp/brushes/sphere79.gbr
-share/gimp/brushes/star1.gbr
 share/gimp/brushes/star2.gbr
 share/gimp/brushes/star3.gbr
 share/gimp/brushes/star4.gbr
@@ -335,19 +284,6 @@ share/gimp/brushes/text3.gbr
 share/gimp/brushes/text4.gbr
 share/gimp/brushes/tulip.gbr
 share/gimp/brushes/wave.gbr
-share/gimp/palettes/Blues
-share/gimp/palettes/Browns_And_Yellows
-share/gimp/palettes/Cool_Colors
-share/gimp/palettes/Default
-share/gimp/palettes/Grays
-share/gimp/palettes/Greens
-share/gimp/palettes/Lights
-share/gimp/palettes/Muted
-share/gimp/palettes/Named_Colors
-share/gimp/palettes/Pastels
-share/gimp/palettes/Reds_And_Purples
-share/gimp/palettes/Warm_Colors
-share/gimp/palettes/Web
 share/gimp/gradients/Abstract_1
 share/gimp/gradients/Abstract_2
 share/gimp/gradients/Abstract_3
@@ -424,6 +360,43 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
+share/gimp/palettes/Bears
+share/gimp/palettes/Bgold
+share/gimp/palettes/Blues
+share/gimp/palettes/Borders
+share/gimp/palettes/Browns_And_Yellows
+share/gimp/palettes/Caramel
+share/gimp/palettes/Cascade
+share/gimp/palettes/China
+share/gimp/palettes/Coldfire
+share/gimp/palettes/Cool_Colors
+share/gimp/palettes/Cranes
+share/gimp/palettes/Dark_pastels
+share/gimp/palettes/Default
+share/gimp/palettes/Ega
+share/gimp/palettes/Firecode
+share/gimp/palettes/Gold
+share/gimp/palettes/GrayViolet
+share/gimp/palettes/Grayblue
+share/gimp/palettes/Grays
+share/gimp/palettes/Greens
+share/gimp/palettes/Hilite
+share/gimp/palettes/Kahki
+share/gimp/palettes/Lights
+share/gimp/palettes/Muted
+share/gimp/palettes/Named_Colors
+share/gimp/palettes/News3
+share/gimp/palettes/Op2
+share/gimp/palettes/Pastels
+share/gimp/palettes/Paintjet
+share/gimp/palettes/Plasma
+share/gimp/palettes/Reds
+share/gimp/palettes/Reds_And_Purples
+share/gimp/palettes/Royal
+share/gimp/palettes/Topographic
+share/gimp/palettes/Volcano
+share/gimp/palettes/Warm_Colors
+share/gimp/palettes/Web
 share/gimp/patterns/3dgreen.pat
 share/gimp/patterns/Craters.pat
 share/gimp/patterns/Moonfoot.pat
@@ -592,28 +565,28 @@ share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
+share/gimp/user_install
+share/gimp/gimprc
+share/gimp/gimprc_user
+share/gimp/gtkrc
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimp_tips.txt
+share/gimp/ps-menurc
 bin/gimp
-@unexec install-info --delete %D/info/pdb.info %D/info/dir
-@unexec install-info --delete %D/info/pdb.info-1 %D/info/dir
-@unexec install-info --delete %D/info/pdb.info-2 %D/info/dir
-@exec install-info %D/info/pdb.info %D/info/dir
-@exec install-info %D/info/pdb.info-1 %D/info/dir
-@exec install-info %D/info/pdb.info-2 %D/info/dir
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
 lib/libgimp.so
 lib/libgimpui.so
-lib/libgck.so
+@dirrm lib/gimp/0.99/plug-ins
+@dirrm lib/gimp/0.99
+@dirrm lib/gimp
+@dirrm lib
 @dirrm include/libgimp
-@dirrm include/gck
-@dirrm libexec/gimp/0.99/plug-ins
-@dirrm libexec/gimp/0.99
-@dirrm libexec/gimp
-@dirrm share/gimp/gflares
+@dirrm include
 @dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
-@dirrm share/gimp/palettes
 @dirrm share/gimp/gradients
+@dirrm share/gimp/palettes
 @dirrm share/gimp/patterns
 @dirrm share/gimp
+@dirrm share
+@dirrm bin
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index caffb6367ee7..ac10feb918da 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -1,26 +1,25 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.17
+# Version required:     0.99.19
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.19 1998/01/28 15:39:56 erich Exp $
+# $Id: Makefile,v 1.20 1998/02/21 22:37:56 fenner Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	18
+MICRO=	21
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}b.tar.gz \
-            gimp-data-extras-${MM_VERSION}a.tar.gz
+DISTFILES+=     gimp-data-extras-${MM_VERSION}a.tar.gz
 
-CATEGORIES=     graphics tk80
-MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/0.99/${VERSION}/ \
-                ftp://ftp.cs.umn.edu/pub/gimp/gimp/0.99/${VERSION}/ \
+CATEGORIES=     graphics
+MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/v${MAJOR}.${MINOR}/v${VERSION}/ \
+                ftp://ftp.cs.umn.edu/pub/gimp/gimp/v${MAJOR}.${MINOR}/v${VERSION}/ \
 
 MAINTAINER=     erich@FreeBSD.org
 
@@ -30,25 +29,20 @@ LIB_DEPENDS+=	jpeg\\.7\\.:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
-LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
 LIB_DEPENDS+=	xdelta\\.0:${PORTSDIR}/misc/xdelta
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
-		-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
-CONFIGURE_ARGS=  --with-tcl=tcl80 --with-tk=tk80
 
 DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}b; \
-	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
-	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 764774e1d585..3f054db50319 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.18.tar.gz) = 1d07aa3f2f0f7024bfdb786dd15e8d58
-MD5 (gimp-data-min-0.99b.tar.gz) = 55f735d5bb2604a100707e9638df3d4b
+MD5 (gimp-0.99.21.tar.gz) = e1544aec645d7be6586485e6a131ece7
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
+MD5 (gimp-plugins-unstable-0.99.21.tar.gz) = 3dcd9c1d27557aebeceeb6f3fa6b7f9a
diff --git a/graphics/gimpshop/files/patch-ah b/graphics/gimpshop/files/patch-ah
index d05ddb1cd23f..7add97cf89ce 100644
--- a/graphics/gimpshop/files/patch-ah
+++ b/graphics/gimpshop/files/patch-ah
@@ -1,6 +1,6 @@
---- configure.in~	Mon Jan 26 10:34:48 1998
-+++ configure.in	Mon Jan 26 10:35:31 1998
-@@ -120,10 +120,10 @@
+--- configure.in~	Tue Mar 17 08:28:37 1998
++++ configure.in	Tue Mar 17 08:30:07 1998
+@@ -108,10 +108,10 @@
  
  dnl Test for libtiff
    if test -z "$LIBTIFF_LIB"; then
@@ -15,26 +15,26 @@
          AC_MSG_WARN(*** TIFF plug-in will not be built ***), -lz -ljpeg -lm), -lm)
    fi
  
-@@ -240,7 +240,7 @@
- AC_C_INLINE
+@@ -219,7 +219,7 @@
+ LIBS="$gimp_save_LIBS"
  
- gimpdatadir=$datadir/$PACKAGE
+ gimpdatadir=$datadir/gimp
 -gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
 +gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
  
- dnl This is for generating PDB docuemntation.
- AC_PATH_PROG(EMACS, emacs, :)
---- configure~	Mon Jan 26 10:36:08 1998
-+++ configure	Mon Jan 26 10:37:35 1998
-@@ -2738,14 +2738,14 @@
- fi
+ brushdata=`ls -1 data/brushes | grep -v Makefile`
+ gradientdata=`ls -1 data/gradients | grep -v Makefile`
+--- configure~	Tue Mar 17 08:28:43 1998
++++ configure	Tue Mar 17 08:31:40 1998
+@@ -1960,14 +1960,14 @@
+   fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2743: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:1965: checking for TIFFReadScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
 +    echo $ac_n "checking for TIFFReadScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2743: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:1965: checking for TIFFReadScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -43,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2751 "configure"
+ #line 1973 "configure"
  #include "confdefs.h"
-@@ -2773,17 +2773,17 @@
+@@ -1995,17 +1995,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -54,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2781: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2003: checking for TIFFWriteScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for TIFFWriteScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2781: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2003: checking for TIFFWriteScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -66,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2789 "configure"
+ #line 2011 "configure"
  #include "confdefs.h"
-@@ -2811,7 +2811,7 @@
+@@ -2033,7 +2033,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -77,12 +77,3 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3949,7 +3949,7 @@
- 
- 
- gimpdatadir=$datadir/$PACKAGE
--gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
-+gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
- 
- # Extract the first word of "emacs", so it can be a program name with args.
- set dummy emacs; ac_word=$2
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 615e7b8c6e17..c43364ca85c8 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -4,172 +4,127 @@ lib/libgimp.a
 lib/libgimpui.so.1.0
 lib/libgimpui.la
 lib/libgimpui.a
-lib/libgck.so.0.1
-lib/libgck.la
-lib/libgck.a
+lib/libmegawidget.a
+lib/gimp/0.99/plug-ins/AlienMap
+lib/gimp/0.99/plug-ins/dbbrowser
+lib/gimp/0.99/plug-ins/script-fu
+lib/gimp/0.99/plug-ins/struc
+lib/gimp/0.99/plug-ins/webbrowser
+lib/gimp/0.99/plug-ins/tiff
+lib/gimp/0.99/plug-ins/jpeg
+lib/gimp/0.99/plug-ins/png
+lib/gimp/0.99/plug-ins/mpeg
+lib/gimp/0.99/plug-ins/xd
+lib/gimp/0.99/plug-ins/xpm
+lib/gimp/0.99/plug-ins/CML_explorer
+lib/gimp/0.99/plug-ins/align_layers
+lib/gimp/0.99/plug-ins/animoptimize
+lib/gimp/0.99/plug-ins/apply_lens
+lib/gimp/0.99/plug-ins/autocrop
+lib/gimp/0.99/plug-ins/animationplay
+lib/gimp/0.99/plug-ins/autostretch_hsv
+lib/gimp/0.99/plug-ins/blinds
+lib/gimp/0.99/plug-ins/blur
+lib/gimp/0.99/plug-ins/bmp
+lib/gimp/0.99/plug-ins/bumpmap
+lib/gimp/0.99/plug-ins/bz2
+lib/gimp/0.99/plug-ins/c_astretch
+lib/gimp/0.99/plug-ins/CEL
+lib/gimp/0.99/plug-ins/colorify
+lib/gimp/0.99/plug-ins/checkerboard
+lib/gimp/0.99/plug-ins/compose
+lib/gimp/0.99/plug-ins/convmatrix
+lib/gimp/0.99/plug-ins/cubism
+lib/gimp/0.99/plug-ins/decompose
+lib/gimp/0.99/plug-ins/deinterlace
+lib/gimp/0.99/plug-ins/depthmerge
+lib/gimp/0.99/plug-ins/despeckle
+lib/gimp/0.99/plug-ins/destripe
+lib/gimp/0.99/plug-ins/diffraction
+lib/gimp/0.99/plug-ins/displace
+lib/gimp/0.99/plug-ins/edge
+lib/gimp/0.99/plug-ins/emboss
+lib/gimp/0.99/plug-ins/engrave
+lib/gimp/0.99/plug-ins/exchange
+lib/gimp/0.99/plug-ins/faxg3
+lib/gimp/0.99/plug-ins/film
+lib/gimp/0.99/plug-ins/fits
+lib/gimp/0.99/plug-ins/flame
+lib/gimp/0.99/plug-ins/flarefx
+lib/gimp/0.99/plug-ins/fractaltrace
+lib/gimp/0.99/plug-ins/gauss_iir
+lib/gimp/0.99/plug-ins/gauss_rle
+lib/gimp/0.99/plug-ins/gbr
+lib/gimp/0.99/plug-ins/gfli
+lib/gimp/0.99/plug-ins/gicon
+lib/gimp/0.99/plug-ins/gif
+lib/gimp/0.99/plug-ins/glasstile
+lib/gimp/0.99/plug-ins/gqbist
+lib/gimp/0.99/plug-ins/gradmap
+lib/gimp/0.99/plug-ins/grid
+lib/gimp/0.99/plug-ins/gtm
+lib/gimp/0.99/plug-ins/gz
+lib/gimp/0.99/plug-ins/header
+lib/gimp/0.99/plug-ins/hot
+lib/gimp/0.99/plug-ins/hrz
+lib/gimp/0.99/plug-ins/ifscompose
+lib/gimp/0.99/plug-ins/illusion
+lib/gimp/0.99/plug-ins/iwarp
+lib/gimp/0.99/plug-ins/laplace
+lib/gimp/0.99/plug-ins/mail
+lib/gimp/0.99/plug-ins/max_rgb
+lib/gimp/0.99/plug-ins/maze
+lib/gimp/0.99/plug-ins/mblur
+lib/gimp/0.99/plug-ins/mosaic
+lib/gimp/0.99/plug-ins/nlfilt
+lib/gimp/0.99/plug-ins/noisify
+lib/gimp/0.99/plug-ins/normalize
+lib/gimp/0.99/plug-ins/nova
+lib/gimp/0.99/plug-ins/oilify
+lib/gimp/0.99/plug-ins/papertile
+lib/gimp/0.99/plug-ins/pat
+lib/gimp/0.99/plug-ins/pcx
+lib/gimp/0.99/plug-ins/pix
+lib/gimp/0.99/plug-ins/pixelize
+lib/gimp/0.99/plug-ins/plasma
+lib/gimp/0.99/plug-ins/pnm
+lib/gimp/0.99/plug-ins/polar
+lib/gimp/0.99/plug-ins/print
+lib/gimp/0.99/plug-ins/ps
+lib/gimp/0.99/plug-ins/ripple
+lib/gimp/0.99/plug-ins/randomize
+lib/gimp/0.99/plug-ins/rotate
+lib/gimp/0.99/plug-ins/rotators
+lib/gimp/0.99/plug-ins/scatter_hsv
+lib/gimp/0.99/plug-ins/semiflatten
+lib/gimp/0.99/plug-ins/sgi
+lib/gimp/0.99/plug-ins/shift
+lib/gimp/0.99/plug-ins/sinus
+lib/gimp/0.99/plug-ins/smooth_palette
+lib/gimp/0.99/plug-ins/snoise
+lib/gimp/0.99/plug-ins/snp
+lib/gimp/0.99/plug-ins/sobel
+lib/gimp/0.99/plug-ins/sparkle
+lib/gimp/0.99/plug-ins/spread
+lib/gimp/0.99/plug-ins/sunras
+lib/gimp/0.99/plug-ins/tga
+lib/gimp/0.99/plug-ins/threshold_alpha
+lib/gimp/0.99/plug-ins/tile
+lib/gimp/0.99/plug-ins/tileit
+lib/gimp/0.99/plug-ins/tiler
+lib/gimp/0.99/plug-ins/url
+lib/gimp/0.99/plug-ins/video
+lib/gimp/0.99/plug-ins/vinvert
+lib/gimp/0.99/plug-ins/vpropagate
+lib/gimp/0.99/plug-ins/waves
+lib/gimp/0.99/plug-ins/whirlpinch
+lib/gimp/0.99/plug-ins/xwd
+lib/gimp/0.99/plug-ins/zealouscrop
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
 include/libgimp/gimpmenu.h
 include/libgimp/gimpui.h
-include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gcknotebook.h
-include/gck/gckvector.h
-libexec/gimp/0.99/plug-ins/libmegawidget.a
-libexec/gimp/0.99/plug-ins/MapObject
-libexec/gimp/0.99/plug-ins/AlienMap
-libexec/gimp/0.99/plug-ins/Anamorphose
-libexec/gimp/0.99/plug-ins/CentralReflection
-libexec/gimp/0.99/plug-ins/Curtain
-libexec/gimp/0.99/plug-ins/Encrypt_Decrypt
-libexec/gimp/0.99/plug-ins/Julia
-libexec/gimp/0.99/plug-ins/Mandelbrot
-libexec/gimp/0.99/plug-ins/DigitalSignature
-libexec/gimp/0.99/plug-ins/dbbrowser
-libexec/gimp/0.99/plug-ins/fuse
-libexec/gimp/0.99/plug-ins/gflare
-libexec/gimp/0.99/plug-ins/consolio
-libexec/gimp/0.99/plug-ins/pdb_help
-libexec/gimp/0.99/plug-ins/stained_glass
-libexec/gimp/0.99/plug-ins/sbutton
-libexec/gimp/0.99/plug-ins/refract
-libexec/gimp/0.99/plug-ins/script-fu
-libexec/gimp/0.99/plug-ins/struc
-libexec/gimp/0.99/plug-ins/twist
-libexec/gimp/0.99/plug-ins/warp
-libexec/gimp/0.99/plug-ins/tiff
-libexec/gimp/0.99/plug-ins/jpeg
-libexec/gimp/0.99/plug-ins/png
-libexec/gimp/0.99/plug-ins/xd
-libexec/gimp/0.99/plug-ins/mpeg
-libexec/gimp/0.99/plug-ins/xpm
-libexec/gimp/0.99/plug-ins/CML_explorer
-libexec/gimp/0.99/plug-ins/align_layers
-libexec/gimp/0.99/plug-ins/apply_lens
-libexec/gimp/0.99/plug-ins/autocrop
-libexec/gimp/0.99/plug-ins/animationplay
-libexec/gimp/0.99/plug-ins/autostretch_hsv
-libexec/gimp/0.99/plug-ins/blinds
-libexec/gimp/0.99/plug-ins/blur
-libexec/gimp/0.99/plug-ins/blur2
-libexec/gimp/0.99/plug-ins/bmp
-libexec/gimp/0.99/plug-ins/bumpmap
-libexec/gimp/0.99/plug-ins/bz2
-libexec/gimp/0.99/plug-ins/c_astretch
-libexec/gimp/0.99/plug-ins/CEL
-libexec/gimp/0.99/plug-ins/checkerboard
-libexec/gimp/0.99/plug-ins/colorify
-libexec/gimp/0.99/plug-ins/compose
-libexec/gimp/0.99/plug-ins/convmatrix
-libexec/gimp/0.99/plug-ins/coordmap
-libexec/gimp/0.99/plug-ins/cubism
-libexec/gimp/0.99/plug-ins/decompose
-libexec/gimp/0.99/plug-ins/deinterlace
-libexec/gimp/0.99/plug-ins/depthmerge
-libexec/gimp/0.99/plug-ins/despeckle
-libexec/gimp/0.99/plug-ins/destripe
-libexec/gimp/0.99/plug-ins/fp
-libexec/gimp/0.99/plug-ins/diffraction
-libexec/gimp/0.99/plug-ins/displace
-libexec/gimp/0.99/plug-ins/edge
-libexec/gimp/0.99/plug-ins/emboss
-libexec/gimp/0.99/plug-ins/engrave
-libexec/gimp/0.99/plug-ins/exchange
-libexec/gimp/0.99/plug-ins/faxg3
-libexec/gimp/0.99/plug-ins/figures
-libexec/gimp/0.99/plug-ins/film
-libexec/gimp/0.99/plug-ins/fits
-libexec/gimp/0.99/plug-ins/flame
-libexec/gimp/0.99/plug-ins/flarefx
-libexec/gimp/0.99/plug-ins/fractaltrace
-libexec/gimp/0.99/plug-ins/gauss_iir
-libexec/gimp/0.99/plug-ins/gauss_rle
-libexec/gimp/0.99/plug-ins/gbr
-libexec/gimp/0.99/plug-ins/gfli
-libexec/gimp/0.99/plug-ins/gicon
-libexec/gimp/0.99/plug-ins/gif
-libexec/gimp/0.99/plug-ins/glasstile
-libexec/gimp/0.99/plug-ins/gqbist
-libexec/gimp/0.99/plug-ins/gradmap
-libexec/gimp/0.99/plug-ins/grid
-libexec/gimp/0.99/plug-ins/gz
-libexec/gimp/0.99/plug-ins/header
-libexec/gimp/0.99/plug-ins/holes
-libexec/gimp/0.99/plug-ins/hot
-libexec/gimp/0.99/plug-ins/hrz
-libexec/gimp/0.99/plug-ins/ifscompose
-libexec/gimp/0.99/plug-ins/illusion
-libexec/gimp/0.99/plug-ins/lic
-libexec/gimp/0.99/plug-ins/iwarp
-libexec/gimp/0.99/plug-ins/laplace
-libexec/gimp/0.99/plug-ins/magiceye
-libexec/gimp/0.99/plug-ins/mail
-libexec/gimp/0.99/plug-ins/max_rgb
-libexec/gimp/0.99/plug-ins/maze
-libexec/gimp/0.99/plug-ins/mblur
-libexec/gimp/0.99/plug-ins/mosaic
-libexec/gimp/0.99/plug-ins/nlfilt
-libexec/gimp/0.99/plug-ins/noisify
-libexec/gimp/0.99/plug-ins/normalize
-libexec/gimp/0.99/plug-ins/nova
-libexec/gimp/0.99/plug-ins/oilify
-libexec/gimp/0.99/plug-ins/papertile
-libexec/gimp/0.99/plug-ins/pat
-libexec/gimp/0.99/plug-ins/pcx
-libexec/gimp/0.99/plug-ins/pix
-libexec/gimp/0.99/plug-ins/pixelize
-libexec/gimp/0.99/plug-ins/plasma
-libexec/gimp/0.99/plug-ins/pnm
-libexec/gimp/0.99/plug-ins/polar
-libexec/gimp/0.99/plug-ins/print
-libexec/gimp/0.99/plug-ins/ps
-libexec/gimp/0.99/plug-ins/psd
-libexec/gimp/0.99/plug-ins/randomize
-libexec/gimp/0.99/plug-ins/ripple
-libexec/gimp/0.99/plug-ins/rotate
-libexec/gimp/0.99/plug-ins/rotators
-libexec/gimp/0.99/plug-ins/scatter_hsv
-libexec/gimp/0.99/plug-ins/sgi
-libexec/gimp/0.99/plug-ins/sharpen
-libexec/gimp/0.99/plug-ins/shift
-libexec/gimp/0.99/plug-ins/sinus
-libexec/gimp/0.99/plug-ins/smooth_palette
-libexec/gimp/0.99/plug-ins/snoise
-libexec/gimp/0.99/plug-ins/snp
-libexec/gimp/0.99/plug-ins/sobel
-libexec/gimp/0.99/plug-ins/sparkle
-libexec/gimp/0.99/plug-ins/spread
-libexec/gimp/0.99/plug-ins/stegano
-libexec/gimp/0.99/plug-ins/stereogram
-libexec/gimp/0.99/plug-ins/sunras
-libexec/gimp/0.99/plug-ins/tga
-libexec/gimp/0.99/plug-ins/threshold_alpha
-libexec/gimp/0.99/plug-ins/tile
-libexec/gimp/0.99/plug-ins/tileit
-libexec/gimp/0.99/plug-ins/tiler
-libexec/gimp/0.99/plug-ins/universal
-libexec/gimp/0.99/plug-ins/url
-libexec/gimp/0.99/plug-ins/video
-libexec/gimp/0.99/plug-ins/vinvert
-libexec/gimp/0.99/plug-ins/vpropagate
-libexec/gimp/0.99/plug-ins/waves
-libexec/gimp/0.99/plug-ins/whirlpinch
-libexec/gimp/0.99/plug-ins/xwd
-libexec/gimp/0.99/plug-ins/zealouscrop
-libexec/gimptcl
-share/gimp/gflares/Bright_Star
-share/gimp/gflares/Classic
-share/gimp/gflares/Default
-share/gimp/gflares/Distant_Sun
-share/gimp/gflares/GFlare_101
-share/gimp/gflares/GFlare_102
-share/gimp/gflares/Hidden_Planet
+include/megawidget.h
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -247,13 +202,7 @@ share/gimp/scripts/truchet.scm
 share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
 share/gimp/scripts/xach-effect.scm
-share/gimp/user_install
-share/gimp/gimprc
-share/gimp/gimprc_user
-share/gimp/gtkrc
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_tips.txt
-share/gimp/ps-menurc
+share/gimp/scripts/web-browser.scm
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -272,11 +221,10 @@ share/gimp/brushes/20x20squareBlur.gbr
 share/gimp/brushes/3circle.gbr
 share/gimp/brushes/3fcircle.gbr
 share/gimp/brushes/5circle.gbr
-share/gimp/brushes/7circle.gbr
 share/gimp/brushes/5fcircle.gbr
-share/gimp/brushes/xcf.gbr
 share/gimp/brushes/5x5square.gbr
 share/gimp/brushes/5x5squareBlur.gbr
+share/gimp/brushes/7circle.gbr
 share/gimp/brushes/7fcircle.gbr
 share/gimp/brushes/9circle.gbr
 share/gimp/brushes/9fcircle.gbr
@@ -294,15 +242,16 @@ share/gimp/brushes/galaxy_big.gbr
 share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/pixel.gbr
 share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/xcf.gbr
 share/gimp/brushes/50x50cone.gbr
 share/gimp/brushes/50x50square.gbr
 share/gimp/brushes/50x50squareBlur.gbr
-share/gimp/brushes/bird.gbr
 share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
 share/gimp/brushes/bigcircle4.gbr
+share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
 share/gimp/brushes/flower.gbr
@@ -319,10 +268,10 @@ share/gimp/brushes/qbert3Blur.gbr
 share/gimp/brushes/reach.gbr
 share/gimp/brushes/sphere29.gbr
 share/gimp/brushes/sphere36.gbr
+share/gimp/brushes/star1.gbr
 share/gimp/brushes/sphere47.gbr
 share/gimp/brushes/sphere55.gbr
 share/gimp/brushes/sphere79.gbr
-share/gimp/brushes/star1.gbr
 share/gimp/brushes/star2.gbr
 share/gimp/brushes/star3.gbr
 share/gimp/brushes/star4.gbr
@@ -335,19 +284,6 @@ share/gimp/brushes/text3.gbr
 share/gimp/brushes/text4.gbr
 share/gimp/brushes/tulip.gbr
 share/gimp/brushes/wave.gbr
-share/gimp/palettes/Blues
-share/gimp/palettes/Browns_And_Yellows
-share/gimp/palettes/Cool_Colors
-share/gimp/palettes/Default
-share/gimp/palettes/Grays
-share/gimp/palettes/Greens
-share/gimp/palettes/Lights
-share/gimp/palettes/Muted
-share/gimp/palettes/Named_Colors
-share/gimp/palettes/Pastels
-share/gimp/palettes/Reds_And_Purples
-share/gimp/palettes/Warm_Colors
-share/gimp/palettes/Web
 share/gimp/gradients/Abstract_1
 share/gimp/gradients/Abstract_2
 share/gimp/gradients/Abstract_3
@@ -424,6 +360,43 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
+share/gimp/palettes/Bears
+share/gimp/palettes/Bgold
+share/gimp/palettes/Blues
+share/gimp/palettes/Borders
+share/gimp/palettes/Browns_And_Yellows
+share/gimp/palettes/Caramel
+share/gimp/palettes/Cascade
+share/gimp/palettes/China
+share/gimp/palettes/Coldfire
+share/gimp/palettes/Cool_Colors
+share/gimp/palettes/Cranes
+share/gimp/palettes/Dark_pastels
+share/gimp/palettes/Default
+share/gimp/palettes/Ega
+share/gimp/palettes/Firecode
+share/gimp/palettes/Gold
+share/gimp/palettes/GrayViolet
+share/gimp/palettes/Grayblue
+share/gimp/palettes/Grays
+share/gimp/palettes/Greens
+share/gimp/palettes/Hilite
+share/gimp/palettes/Kahki
+share/gimp/palettes/Lights
+share/gimp/palettes/Muted
+share/gimp/palettes/Named_Colors
+share/gimp/palettes/News3
+share/gimp/palettes/Op2
+share/gimp/palettes/Pastels
+share/gimp/palettes/Paintjet
+share/gimp/palettes/Plasma
+share/gimp/palettes/Reds
+share/gimp/palettes/Reds_And_Purples
+share/gimp/palettes/Royal
+share/gimp/palettes/Topographic
+share/gimp/palettes/Volcano
+share/gimp/palettes/Warm_Colors
+share/gimp/palettes/Web
 share/gimp/patterns/3dgreen.pat
 share/gimp/patterns/Craters.pat
 share/gimp/patterns/Moonfoot.pat
@@ -592,28 +565,28 @@ share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
+share/gimp/user_install
+share/gimp/gimprc
+share/gimp/gimprc_user
+share/gimp/gtkrc
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimp_tips.txt
+share/gimp/ps-menurc
 bin/gimp
-@unexec install-info --delete %D/info/pdb.info %D/info/dir
-@unexec install-info --delete %D/info/pdb.info-1 %D/info/dir
-@unexec install-info --delete %D/info/pdb.info-2 %D/info/dir
-@exec install-info %D/info/pdb.info %D/info/dir
-@exec install-info %D/info/pdb.info-1 %D/info/dir
-@exec install-info %D/info/pdb.info-2 %D/info/dir
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
 lib/libgimp.so
 lib/libgimpui.so
-lib/libgck.so
+@dirrm lib/gimp/0.99/plug-ins
+@dirrm lib/gimp/0.99
+@dirrm lib/gimp
+@dirrm lib
 @dirrm include/libgimp
-@dirrm include/gck
-@dirrm libexec/gimp/0.99/plug-ins
-@dirrm libexec/gimp/0.99
-@dirrm libexec/gimp
-@dirrm share/gimp/gflares
+@dirrm include
 @dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
-@dirrm share/gimp/palettes
 @dirrm share/gimp/gradients
+@dirrm share/gimp/palettes
 @dirrm share/gimp/patterns
 @dirrm share/gimp
+@dirrm share
+@dirrm bin