upgrade to 0.99.17

30 files changed, 810 insertions, 852 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index bc8d5fb5d069..0b7883cd1d96 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.14
+# Version required:     0.99.17
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.15 1997/12/16 23:25:34 erich Exp $
+# $Id: Makefile,v 1.16 1997/12/18 20:40:15 erich Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	16
+MICRO=	17
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}.tar.gz \
-            gimp-data-extras-${MM_VERSION}.tar.gz
+DISTFILES+=	gimp-data-min-${MM_VERSION}a.tar.gz \
+            gimp-data-extras-${MM_VERSION}a.tar.gz
 
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/0.99/${VERSION}/ \
@@ -44,17 +44,12 @@ DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}; \
+	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
-	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}; \
+	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 
-post-extract:
-	rm -f ${WRKSRC}/plug-ins/gimptcl/scripts/consolio \
-		${WRKSRC}/plug-ins/gimptcl/scripts/pdb_help \
-		${WRKSRC}/plug-ins/gimptcl/scripts/stained_glass
-
 .include <bsd.port.mk>
 
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 3dcdb45a8ad2..56f9833c91b5 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.16.tar.gz) = 3409cc14d5958c25a7761aa43f502668
-MD5 (gimp-data-min-0.99.tar.gz) = 81e4e4571f71f1bd6bba158071671edd
-MD5 (gimp-data-extras-0.99.tar.gz) = 361eed158157acbc65da47ed8332d8fa
+MD5 (gimp-0.99.17.tar.gz) = 6400f3c18c2aa3d908f5f4485645e85f
+MD5 (gimp-data-min-0.99a.tar.gz) = 0716202f1d277ea8e73bc9b4bcde2352
+MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp-app-devel/files/patch-ac b/graphics/gimp-app-devel/files/patch-ac
deleted file mode 100644
index 6e5af3f2bc81..000000000000
--- a/graphics/gimp-app-devel/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- plug-ins/libgck/gck/Makefile.in.orig	Tue Dec 16 08:26:17 1997
-+++ plug-ins/libgck/gck/Makefile.in	Tue Dec 16 08:26:31 1997
-@@ -111,9 +111,10 @@
- libgck_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir) 
- 
- INCLUDES = \
-+	-I$(srcdir)/..			\
- 	-I$(top_srcdir)		\
--	-I$(includedir)		\
--	-I$(srcdir)/..
-+	-I$(includedir)
-+
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/graphics/gimp-app-devel/files/patch-ah b/graphics/gimp-app-devel/files/patch-ah
index 08a2094a4159..d46998d2fe62 100644
--- a/graphics/gimp-app-devel/files/patch-ah
+++ b/graphics/gimp-app-devel/files/patch-ah
@@ -1,16 +1,5 @@
---- aclocal.m4.orig	Tue Oct 14 20:48:14 1997
-+++ aclocal.m4	Tue Oct 14 20:49:02 1997
-@@ -48,7 +48,7 @@
- 
- AC_DEFUN(AM_PROG_INSTALL,
- [AC_REQUIRE([AC_PROG_INSTALL])
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -c -m 755'
- AC_SUBST(INSTALL_SCRIPT)dnl
- ])
- 
---- configure.in.orig	Mon Dec 15 11:44:48 1997
-+++ configure.in	Thu Dec 18 00:36:24 1997
+--- configure.in.orig	Sat Jan  3 19:31:29 1998
++++ configure.in	Mon Jan  5 09:42:49 1998
 @@ -120,10 +120,10 @@
  
  dnl Test for libtiff
@@ -35,17 +24,17 @@
  
  dnl This is for generating PDB docuemntation.
  AC_PATH_PROG(EMACS, emacs, :)
---- configure.orig	Mon Dec 15 12:39:24 1997
-+++ configure	Thu Dec 18 00:38:43 1997
-@@ -2722,14 +2722,14 @@
+--- configure.orig	Mon Jan  5 09:44:02 1998
++++ configure	Mon Jan  5 09:46:45 1998
+@@ -2531,14 +2531,14 @@
  fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2727: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2536: 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:2727: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2536: 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
@@ -54,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2735 "configure"
+ #line 2544 "configure"
  #include "confdefs.h"
-@@ -2757,17 +2757,17 @@
+@@ -2566,17 +2566,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -65,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2765: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2574: 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:2765: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2574: 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
@@ -77,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2773 "configure"
+ #line 2582 "configure"
  #include "confdefs.h"
-@@ -2795,7 +2795,7 @@
+@@ -2604,7 +2604,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -88,7 +77,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3933,7 +3933,7 @@
+@@ -3742,7 +3742,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 182dd9d74684..772e87aa4c10 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -31,15 +31,17 @@ 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/Encript_Decript
+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
@@ -48,8 +50,8 @@ 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/mpeg
 libexec/gimp/0.99/plug-ins/xpm
+libexec/gimp/0.99/plug-ins/mpeg
 libexec/gimp/0.99/plug-ins/CML_explorer
 libexec/gimp/0.99/plug-ins/align_layers
 libexec/gimp/0.99/plug-ins/apply_lens
@@ -140,11 +142,12 @@ 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/snp
 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
@@ -189,6 +192,7 @@ share/gimp/scripts/chrome-logo.scm
 share/gimp/scripts/circle-logo.scm
 share/gimp/scripts/circuit.scm
 share/gimp/scripts/clothify.scm
+share/gimp/scripts/color-cycling.scm
 share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
@@ -260,18 +264,30 @@ share/gimp/brushes/20x20square.gbr
 share/gimp/brushes/20x20squareBlur.gbr
 share/gimp/brushes/3circle.gbr
 share/gimp/brushes/3fcircle.gbr
-share/gimp/brushes/50x50cone.gbr
-share/gimp/brushes/50x50square.gbr
-share/gimp/brushes/50x50squareBlur.gbr
-share/gimp/brushes/50x50squareBlur2.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
+share/gimp/brushes/callig1.gbr
+share/gimp/brushes/callig2.gbr
+share/gimp/brushes/callig3.gbr
+share/gimp/brushes/callig4.gbr
+share/gimp/brushes/confetti.gbr
+share/gimp/brushes/dunes.gbr
+share/gimp/brushes/galaxy.gbr
+share/gimp/brushes/galaxy_big.gbr
+share/gimp/brushes/galaxy_small.gbr
+share/gimp/brushes/pixel.gbr
+share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/50x50cone.gbr
+share/gimp/brushes/50x50square.gbr
+share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
@@ -279,19 +295,13 @@ share/gimp/brushes/bigcircle4.gbr
 share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
-share/gimp/brushes/confetti.gbr
-share/gimp/brushes/dunes.gbr
 share/gimp/brushes/flower.gbr
 share/gimp/brushes/flower_large.gbr
-share/gimp/brushes/galaxy.gbr
-share/gimp/brushes/galaxy_big.gbr
-share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/gecko.gbr
 share/gimp/brushes/grid.gbr
 share/gimp/brushes/grid2.gbr
 share/gimp/brushes/guitar.gbr
 share/gimp/brushes/nova.gbr
-share/gimp/brushes/pixel.gbr
 share/gimp/brushes/point.gbr
 share/gimp/brushes/punch.gbr
 share/gimp/brushes/qbert2.gbr
@@ -302,16 +312,32 @@ share/gimp/brushes/sphere36.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
+share/gimp/brushes/star5.gbr
 share/gimp/brushes/swirl.gbr
 share/gimp/brushes/swirl2.gbr
 share/gimp/brushes/text1.gbr
 share/gimp/brushes/text2.gbr
 share/gimp/brushes/text3.gbr
 share/gimp/brushes/text4.gbr
-share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/tulip.gbr
 share/gimp/brushes/wave.gbr
-share/gimp/brushes/xcf.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
@@ -334,6 +360,8 @@ share/gimp/gradients/Default
 share/gimp/gradients/Flare_Glow_Angular_1
 share/gimp/gradients/Flare_Glow_Radial_1
 share/gimp/gradients/Flare_Glow_Radial_2
+share/gimp/gradients/Flare_Glow_Radial_3
+share/gimp/gradients/Flare_Glow_Radial_4
 share/gimp/gradients/Flare_Radial_101
 share/gimp/gradients/Flare_Radial_102
 share/gimp/gradients/Flare_Radial_103
@@ -351,9 +379,10 @@ share/gimp/gradients/German_flag_smooth
 share/gimp/gradients/Golden
 share/gimp/gradients/Greens
 share/gimp/gradients/Horizon_1
+share/gimp/gradients/Land_1
 share/gimp/gradients/Horizon_2
 share/gimp/gradients/Incandescent
-share/gimp/gradients/Land_1
+share/gimp/gradients/Metallic_Something
 share/gimp/gradients/Mexican_flag
 share/gimp/gradients/Mexican_flag_smooth
 share/gimp/gradients/Nauseating_Headache
@@ -361,6 +390,7 @@ share/gimp/gradients/Neon_Cyan
 share/gimp/gradients/Neon_Green
 share/gimp/gradients/Neon_Yellow
 share/gimp/gradients/Pastel_Rainbow
+share/gimp/gradients/Pastels
 share/gimp/gradients/Purples
 share/gimp/gradients/Radial_Eyeball_Blue
 share/gimp/gradients/Radial_Eyeball_Brown
@@ -372,6 +402,7 @@ share/gimp/gradients/Romanian_flag_smooth
 share/gimp/gradients/Rounded_edge
 share/gimp/gradients/Shadows_1
 share/gimp/gradients/Shadows_2
+share/gimp/gradients/Shadows_3
 share/gimp/gradients/Skyline
 share/gimp/gradients/Skyline_polluted
 share/gimp/gradients/Square_Wood_Frame
@@ -381,48 +412,80 @@ share/gimp/gradients/Tropical_Colors
 share/gimp/gradients/Tube_Red
 share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
+share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
-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/patterns/3dgreen.pat
-share/gimp/patterns/3dweave.pat
 share/gimp/patterns/Craters.pat
 share/gimp/patterns/Moonfoot.pat
-share/gimp/patterns/abstract_flowers.pat
 share/gimp/patterns/amethyst.pat
 share/gimp/patterns/bark.pat
+share/gimp/patterns/blue.pat
+share/gimp/patterns/bluegrid.pat
+share/gimp/patterns/bluesquares.pat
+share/gimp/patterns/blueweb.pat
+share/gimp/patterns/brick.pat
+share/gimp/patterns/burlap.pat
+share/gimp/patterns/burlwood.pat
+share/gimp/patterns/choc_swirl.pat
+share/gimp/patterns/corkboard.pat
+share/gimp/patterns/cracked.pat
+share/gimp/patterns/crinklepaper.pat
+share/gimp/patterns/electric.pat
+share/gimp/patterns/fibers.pat
+share/gimp/patterns/granite1.pat
+share/gimp/patterns/ground1.pat
+share/gimp/patterns/ice.pat
+share/gimp/patterns/java.pat
+share/gimp/patterns/leather.pat
+share/gimp/patterns/leaves.pat
+share/gimp/patterns/leopard.pat
+share/gimp/patterns/lightning.pat
+share/gimp/patterns/marble1.pat
+share/gimp/patterns/marble2.pat
+share/gimp/patterns/marble3.pat
+share/gimp/patterns/nops.pat
+share/gimp/patterns/paper.pat
+share/gimp/patterns/parque1.pat
+share/gimp/patterns/parque2.pat
+share/gimp/patterns/parque3.pat
+share/gimp/patterns/pastel.pat
+share/gimp/patterns/pine.pat
+share/gimp/patterns/pink_marble.pat
+share/gimp/patterns/pool.pat
+share/gimp/patterns/qube1.pat
+share/gimp/patterns/rain.pat
+share/gimp/patterns/recessed.pat
+share/gimp/patterns/redcube.pat
+share/gimp/patterns/rock.pat
+share/gimp/patterns/sky.pat
+share/gimp/patterns/slate.pat
+share/gimp/patterns/sm_squares.pat
+share/gimp/patterns/stone33.pat
+share/gimp/patterns/starfield.pat
+share/gimp/patterns/terra.pat
+share/gimp/patterns/walnut.pat
+share/gimp/patterns/warning.pat
+share/gimp/patterns/wood1.pat
+share/gimp/patterns/wood2.pat
+share/gimp/patterns/wood3.pat
+share/gimp/patterns/wood4.pat
+share/gimp/patterns/wood5.pat
+share/gimp/patterns/3dweave.pat
+share/gimp/patterns/abstract_flowers.pat
 share/gimp/patterns/blackoil.pat
 share/gimp/patterns/blackwhitefloor.pat
 share/gimp/patterns/blob1.pat
 share/gimp/patterns/blob2.pat
-share/gimp/patterns/blue.pat
 share/gimp/patterns/bluebar.pat
 share/gimp/patterns/bluecanyons.pat
-share/gimp/patterns/bluegrid.pat
 share/gimp/patterns/bluemars.pat
 share/gimp/patterns/bluemetal.pat
 share/gimp/patterns/bluespikes.pat
-share/gimp/patterns/bluesquares.pat
-share/gimp/patterns/blueweb.pat
-share/gimp/patterns/brick.pat
 share/gimp/patterns/brownie.pat
-share/gimp/patterns/burlap.pat
-share/gimp/patterns/burlwood.pat
 share/gimp/patterns/bwcubes.pat
 share/gimp/patterns/canyons2.pat
 share/gimp/patterns/cashew.pat
 share/gimp/patterns/chains.pat
-share/gimp/patterns/choc_swirl.pat
 share/gimp/patterns/chroma.pat
 share/gimp/patterns/circuit.pat
 share/gimp/patterns/clouds.pat
@@ -434,12 +497,9 @@ share/gimp/patterns/colored_rock.pat
 share/gimp/patterns/colorwhirl.pat
 share/gimp/patterns/connestoga.pat
 share/gimp/patterns/contrawhirl.pat
-share/gimp/patterns/corkboard.pat
 share/gimp/patterns/cow.pat
-share/gimp/patterns/cracked.pat
 share/gimp/patterns/crash1.pat
 share/gimp/patterns/crazytile.pat
-share/gimp/patterns/crinklepaper.pat
 share/gimp/patterns/crystals.pat
 share/gimp/patterns/curvedledge.pat
 share/gimp/patterns/deepswirl.pat
@@ -447,13 +507,12 @@ share/gimp/patterns/diffpat.pat
 share/gimp/patterns/dirt.pat
 share/gimp/patterns/disco.pat
 share/gimp/patterns/drymud.pat
+share/gimp/patterns/pj.pat
 share/gimp/patterns/dunemaze.pat
 share/gimp/patterns/dunes.pat
 share/gimp/patterns/eggcarton.pat
 share/gimp/patterns/electric-blue-ribbons.pat
-share/gimp/patterns/electric.pat
 share/gimp/patterns/etbf.pat
-share/gimp/patterns/fibers.pat
 share/gimp/patterns/floor_tile.pat
 share/gimp/patterns/funnyblobs.pat
 share/gimp/patterns/funnymess.pat
@@ -461,7 +520,6 @@ share/gimp/patterns/funnymess2.pat
 share/gimp/patterns/fuzzy-colors.pat
 share/gimp/patterns/gold.pat
 share/gimp/patterns/goldcloth.pat
-share/gimp/patterns/granite1.pat
 share/gimp/patterns/granite2.pat
 share/gimp/patterns/green_curtains.pat
 share/gimp/patterns/green_eek.pat
@@ -469,109 +527,75 @@ share/gimp/patterns/greyweave.pat
 share/gimp/patterns/greyweave2.pat
 share/gimp/patterns/grid.pat
 share/gimp/patterns/gridwhirltile.pat
-share/gimp/patterns/ground1.pat
 share/gimp/patterns/headache.pat
 share/gimp/patterns/horiz.pat
-share/gimp/patterns/ice.pat
 share/gimp/patterns/ice2.pat
 share/gimp/patterns/icechex.pat
 share/gimp/patterns/inlay.pat
-share/gimp/patterns/java.pat
 share/gimp/patterns/krinkle.pat
 share/gimp/patterns/land1.pat
 share/gimp/patterns/land2.pat
 share/gimp/patterns/lathe.pat
-share/gimp/patterns/leather.pat
-share/gimp/patterns/leaves.pat
 share/gimp/patterns/leaves3.pat
 share/gimp/patterns/leaves4.pat
 share/gimp/patterns/leaves6.pat
-share/gimp/patterns/leopard.pat
-share/gimp/patterns/lightning.pat
 share/gimp/patterns/lumps.pat
-share/gimp/patterns/marble1.pat
-share/gimp/patterns/marble2.pat
-share/gimp/patterns/marble3.pat
 share/gimp/patterns/meltedcolors.pat
 share/gimp/patterns/metallica.pat
 share/gimp/patterns/metalpaths.pat
 share/gimp/patterns/mhuerock.pat
 share/gimp/patterns/money.pat
 share/gimp/patterns/neurons.pat
-share/gimp/patterns/nops.pat
 share/gimp/patterns/novaugh.pat
 share/gimp/patterns/oooh.pat
 share/gimp/patterns/oooh3.pat
 share/gimp/patterns/orange_eek.pat
 share/gimp/patterns/orangebrown.pat
 share/gimp/patterns/orangecheese.pat
+share/gimp/patterns/wax.pat
 share/gimp/patterns/paint-explosion.pat
-share/gimp/patterns/paper.pat
-share/gimp/patterns/parque1.pat
-share/gimp/patterns/parque2.pat
-share/gimp/patterns/parque3.pat
-share/gimp/patterns/pastel.pat
 share/gimp/patterns/pastel2.pat
 share/gimp/patterns/pebbles.pat
-share/gimp/patterns/pine.pat
-share/gimp/patterns/pink_marble.pat
 share/gimp/patterns/pixeled1.pat
-share/gimp/patterns/pj.pat
-share/gimp/patterns/pool.pat
 share/gimp/patterns/psycho1.pat
 share/gimp/patterns/purple-ribbons.pat
 share/gimp/patterns/purple.pat
 share/gimp/patterns/purple_glow.pat
-share/gimp/patterns/qube1.pat
-share/gimp/patterns/rain.pat
-share/gimp/patterns/recessed.pat
-share/gimp/patterns/redcube.pat
 share/gimp/patterns/redishstuff.pat
 share/gimp/patterns/redmess.pat
 share/gimp/patterns/redrings.pat
-share/gimp/patterns/rock.pat
 share/gimp/patterns/rust.pat
 share/gimp/patterns/sandytext.pat
 share/gimp/patterns/send1.pat
 share/gimp/patterns/silver.pat
-share/gimp/patterns/sky.pat
-share/gimp/patterns/slate.pat
 share/gimp/patterns/slice1.pat
-share/gimp/patterns/sm_squares.pat
 share/gimp/patterns/spectbar.pat
-share/gimp/patterns/starfield.pat
 share/gimp/patterns/startile.pat
-share/gimp/patterns/stone33.pat
 share/gimp/patterns/swirl.pat
 share/gimp/patterns/swirl2.pat
-share/gimp/patterns/terra.pat
 share/gimp/patterns/torrents.pat
 share/gimp/patterns/tube.pat
-share/gimp/patterns/unsharpswirl.pat
-share/gimp/patterns/walnut.pat
-share/gimp/patterns/warning.pat
 share/gimp/patterns/water3.pat
+share/gimp/patterns/unsharpswirl.pat
 share/gimp/patterns/waves.pat
-share/gimp/patterns/wax.pat
 share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
-share/gimp/patterns/wood1.pat
-share/gimp/patterns/wood2.pat
-share/gimp/patterns/wood3.pat
-share/gimp/patterns/wood4.pat
-share/gimp/patterns/wood5.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
 lib/libgimp.so
+@unexec rm %D/%F
 lib/libgimpui.so
+@unexec rm %D/%F
 lib/libgck.so
+@unexec rm %D/%F
 @dirrm include/libgimp
 @dirrm include/gck
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
+@dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
-@dirrm share/gimp/patterns
-@dirrm share/gimp/gradients
 @dirrm share/gimp/palettes
+@dirrm share/gimp/gradients
+@dirrm share/gimp/patterns
 @dirrm share/gimp
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index bc8d5fb5d069..0b7883cd1d96 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.14
+# Version required:     0.99.17
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.15 1997/12/16 23:25:34 erich Exp $
+# $Id: Makefile,v 1.16 1997/12/18 20:40:15 erich Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	16
+MICRO=	17
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}.tar.gz \
-            gimp-data-extras-${MM_VERSION}.tar.gz
+DISTFILES+=	gimp-data-min-${MM_VERSION}a.tar.gz \
+            gimp-data-extras-${MM_VERSION}a.tar.gz
 
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/0.99/${VERSION}/ \
@@ -44,17 +44,12 @@ DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}; \
+	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
-	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}; \
+	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 
-post-extract:
-	rm -f ${WRKSRC}/plug-ins/gimptcl/scripts/consolio \
-		${WRKSRC}/plug-ins/gimptcl/scripts/pdb_help \
-		${WRKSRC}/plug-ins/gimptcl/scripts/stained_glass
-
 .include <bsd.port.mk>
 
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 3dcdb45a8ad2..56f9833c91b5 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.16.tar.gz) = 3409cc14d5958c25a7761aa43f502668
-MD5 (gimp-data-min-0.99.tar.gz) = 81e4e4571f71f1bd6bba158071671edd
-MD5 (gimp-data-extras-0.99.tar.gz) = 361eed158157acbc65da47ed8332d8fa
+MD5 (gimp-0.99.17.tar.gz) = 6400f3c18c2aa3d908f5f4485645e85f
+MD5 (gimp-data-min-0.99a.tar.gz) = 0716202f1d277ea8e73bc9b4bcde2352
+MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp-app/files/patch-ac b/graphics/gimp-app/files/patch-ac
deleted file mode 100644
index 6e5af3f2bc81..000000000000
--- a/graphics/gimp-app/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- plug-ins/libgck/gck/Makefile.in.orig	Tue Dec 16 08:26:17 1997
-+++ plug-ins/libgck/gck/Makefile.in	Tue Dec 16 08:26:31 1997
-@@ -111,9 +111,10 @@
- libgck_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir) 
- 
- INCLUDES = \
-+	-I$(srcdir)/..			\
- 	-I$(top_srcdir)		\
--	-I$(includedir)		\
--	-I$(srcdir)/..
-+	-I$(includedir)
-+
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/graphics/gimp-app/files/patch-ah b/graphics/gimp-app/files/patch-ah
index 08a2094a4159..d46998d2fe62 100644
--- a/graphics/gimp-app/files/patch-ah
+++ b/graphics/gimp-app/files/patch-ah
@@ -1,16 +1,5 @@
---- aclocal.m4.orig	Tue Oct 14 20:48:14 1997
-+++ aclocal.m4	Tue Oct 14 20:49:02 1997
-@@ -48,7 +48,7 @@
- 
- AC_DEFUN(AM_PROG_INSTALL,
- [AC_REQUIRE([AC_PROG_INSTALL])
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -c -m 755'
- AC_SUBST(INSTALL_SCRIPT)dnl
- ])
- 
---- configure.in.orig	Mon Dec 15 11:44:48 1997
-+++ configure.in	Thu Dec 18 00:36:24 1997
+--- configure.in.orig	Sat Jan  3 19:31:29 1998
++++ configure.in	Mon Jan  5 09:42:49 1998
 @@ -120,10 +120,10 @@
  
  dnl Test for libtiff
@@ -35,17 +24,17 @@
  
  dnl This is for generating PDB docuemntation.
  AC_PATH_PROG(EMACS, emacs, :)
---- configure.orig	Mon Dec 15 12:39:24 1997
-+++ configure	Thu Dec 18 00:38:43 1997
-@@ -2722,14 +2722,14 @@
+--- configure.orig	Mon Jan  5 09:44:02 1998
++++ configure	Mon Jan  5 09:46:45 1998
+@@ -2531,14 +2531,14 @@
  fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2727: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2536: 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:2727: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2536: 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
@@ -54,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2735 "configure"
+ #line 2544 "configure"
  #include "confdefs.h"
-@@ -2757,17 +2757,17 @@
+@@ -2566,17 +2566,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -65,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2765: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2574: 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:2765: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2574: 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
@@ -77,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2773 "configure"
+ #line 2582 "configure"
  #include "confdefs.h"
-@@ -2795,7 +2795,7 @@
+@@ -2604,7 +2604,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -88,7 +77,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3933,7 +3933,7 @@
+@@ -3742,7 +3742,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 182dd9d74684..772e87aa4c10 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -31,15 +31,17 @@ 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/Encript_Decript
+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
@@ -48,8 +50,8 @@ 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/mpeg
 libexec/gimp/0.99/plug-ins/xpm
+libexec/gimp/0.99/plug-ins/mpeg
 libexec/gimp/0.99/plug-ins/CML_explorer
 libexec/gimp/0.99/plug-ins/align_layers
 libexec/gimp/0.99/plug-ins/apply_lens
@@ -140,11 +142,12 @@ 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/snp
 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
@@ -189,6 +192,7 @@ share/gimp/scripts/chrome-logo.scm
 share/gimp/scripts/circle-logo.scm
 share/gimp/scripts/circuit.scm
 share/gimp/scripts/clothify.scm
+share/gimp/scripts/color-cycling.scm
 share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
@@ -260,18 +264,30 @@ share/gimp/brushes/20x20square.gbr
 share/gimp/brushes/20x20squareBlur.gbr
 share/gimp/brushes/3circle.gbr
 share/gimp/brushes/3fcircle.gbr
-share/gimp/brushes/50x50cone.gbr
-share/gimp/brushes/50x50square.gbr
-share/gimp/brushes/50x50squareBlur.gbr
-share/gimp/brushes/50x50squareBlur2.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
+share/gimp/brushes/callig1.gbr
+share/gimp/brushes/callig2.gbr
+share/gimp/brushes/callig3.gbr
+share/gimp/brushes/callig4.gbr
+share/gimp/brushes/confetti.gbr
+share/gimp/brushes/dunes.gbr
+share/gimp/brushes/galaxy.gbr
+share/gimp/brushes/galaxy_big.gbr
+share/gimp/brushes/galaxy_small.gbr
+share/gimp/brushes/pixel.gbr
+share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/50x50cone.gbr
+share/gimp/brushes/50x50square.gbr
+share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
@@ -279,19 +295,13 @@ share/gimp/brushes/bigcircle4.gbr
 share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
-share/gimp/brushes/confetti.gbr
-share/gimp/brushes/dunes.gbr
 share/gimp/brushes/flower.gbr
 share/gimp/brushes/flower_large.gbr
-share/gimp/brushes/galaxy.gbr
-share/gimp/brushes/galaxy_big.gbr
-share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/gecko.gbr
 share/gimp/brushes/grid.gbr
 share/gimp/brushes/grid2.gbr
 share/gimp/brushes/guitar.gbr
 share/gimp/brushes/nova.gbr
-share/gimp/brushes/pixel.gbr
 share/gimp/brushes/point.gbr
 share/gimp/brushes/punch.gbr
 share/gimp/brushes/qbert2.gbr
@@ -302,16 +312,32 @@ share/gimp/brushes/sphere36.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
+share/gimp/brushes/star5.gbr
 share/gimp/brushes/swirl.gbr
 share/gimp/brushes/swirl2.gbr
 share/gimp/brushes/text1.gbr
 share/gimp/brushes/text2.gbr
 share/gimp/brushes/text3.gbr
 share/gimp/brushes/text4.gbr
-share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/tulip.gbr
 share/gimp/brushes/wave.gbr
-share/gimp/brushes/xcf.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
@@ -334,6 +360,8 @@ share/gimp/gradients/Default
 share/gimp/gradients/Flare_Glow_Angular_1
 share/gimp/gradients/Flare_Glow_Radial_1
 share/gimp/gradients/Flare_Glow_Radial_2
+share/gimp/gradients/Flare_Glow_Radial_3
+share/gimp/gradients/Flare_Glow_Radial_4
 share/gimp/gradients/Flare_Radial_101
 share/gimp/gradients/Flare_Radial_102
 share/gimp/gradients/Flare_Radial_103
@@ -351,9 +379,10 @@ share/gimp/gradients/German_flag_smooth
 share/gimp/gradients/Golden
 share/gimp/gradients/Greens
 share/gimp/gradients/Horizon_1
+share/gimp/gradients/Land_1
 share/gimp/gradients/Horizon_2
 share/gimp/gradients/Incandescent
-share/gimp/gradients/Land_1
+share/gimp/gradients/Metallic_Something
 share/gimp/gradients/Mexican_flag
 share/gimp/gradients/Mexican_flag_smooth
 share/gimp/gradients/Nauseating_Headache
@@ -361,6 +390,7 @@ share/gimp/gradients/Neon_Cyan
 share/gimp/gradients/Neon_Green
 share/gimp/gradients/Neon_Yellow
 share/gimp/gradients/Pastel_Rainbow
+share/gimp/gradients/Pastels
 share/gimp/gradients/Purples
 share/gimp/gradients/Radial_Eyeball_Blue
 share/gimp/gradients/Radial_Eyeball_Brown
@@ -372,6 +402,7 @@ share/gimp/gradients/Romanian_flag_smooth
 share/gimp/gradients/Rounded_edge
 share/gimp/gradients/Shadows_1
 share/gimp/gradients/Shadows_2
+share/gimp/gradients/Shadows_3
 share/gimp/gradients/Skyline
 share/gimp/gradients/Skyline_polluted
 share/gimp/gradients/Square_Wood_Frame
@@ -381,48 +412,80 @@ share/gimp/gradients/Tropical_Colors
 share/gimp/gradients/Tube_Red
 share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
+share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
-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/patterns/3dgreen.pat
-share/gimp/patterns/3dweave.pat
 share/gimp/patterns/Craters.pat
 share/gimp/patterns/Moonfoot.pat
-share/gimp/patterns/abstract_flowers.pat
 share/gimp/patterns/amethyst.pat
 share/gimp/patterns/bark.pat
+share/gimp/patterns/blue.pat
+share/gimp/patterns/bluegrid.pat
+share/gimp/patterns/bluesquares.pat
+share/gimp/patterns/blueweb.pat
+share/gimp/patterns/brick.pat
+share/gimp/patterns/burlap.pat
+share/gimp/patterns/burlwood.pat
+share/gimp/patterns/choc_swirl.pat
+share/gimp/patterns/corkboard.pat
+share/gimp/patterns/cracked.pat
+share/gimp/patterns/crinklepaper.pat
+share/gimp/patterns/electric.pat
+share/gimp/patterns/fibers.pat
+share/gimp/patterns/granite1.pat
+share/gimp/patterns/ground1.pat
+share/gimp/patterns/ice.pat
+share/gimp/patterns/java.pat
+share/gimp/patterns/leather.pat
+share/gimp/patterns/leaves.pat
+share/gimp/patterns/leopard.pat
+share/gimp/patterns/lightning.pat
+share/gimp/patterns/marble1.pat
+share/gimp/patterns/marble2.pat
+share/gimp/patterns/marble3.pat
+share/gimp/patterns/nops.pat
+share/gimp/patterns/paper.pat
+share/gimp/patterns/parque1.pat
+share/gimp/patterns/parque2.pat
+share/gimp/patterns/parque3.pat
+share/gimp/patterns/pastel.pat
+share/gimp/patterns/pine.pat
+share/gimp/patterns/pink_marble.pat
+share/gimp/patterns/pool.pat
+share/gimp/patterns/qube1.pat
+share/gimp/patterns/rain.pat
+share/gimp/patterns/recessed.pat
+share/gimp/patterns/redcube.pat
+share/gimp/patterns/rock.pat
+share/gimp/patterns/sky.pat
+share/gimp/patterns/slate.pat
+share/gimp/patterns/sm_squares.pat
+share/gimp/patterns/stone33.pat
+share/gimp/patterns/starfield.pat
+share/gimp/patterns/terra.pat
+share/gimp/patterns/walnut.pat
+share/gimp/patterns/warning.pat
+share/gimp/patterns/wood1.pat
+share/gimp/patterns/wood2.pat
+share/gimp/patterns/wood3.pat
+share/gimp/patterns/wood4.pat
+share/gimp/patterns/wood5.pat
+share/gimp/patterns/3dweave.pat
+share/gimp/patterns/abstract_flowers.pat
 share/gimp/patterns/blackoil.pat
 share/gimp/patterns/blackwhitefloor.pat
 share/gimp/patterns/blob1.pat
 share/gimp/patterns/blob2.pat
-share/gimp/patterns/blue.pat
 share/gimp/patterns/bluebar.pat
 share/gimp/patterns/bluecanyons.pat
-share/gimp/patterns/bluegrid.pat
 share/gimp/patterns/bluemars.pat
 share/gimp/patterns/bluemetal.pat
 share/gimp/patterns/bluespikes.pat
-share/gimp/patterns/bluesquares.pat
-share/gimp/patterns/blueweb.pat
-share/gimp/patterns/brick.pat
 share/gimp/patterns/brownie.pat
-share/gimp/patterns/burlap.pat
-share/gimp/patterns/burlwood.pat
 share/gimp/patterns/bwcubes.pat
 share/gimp/patterns/canyons2.pat
 share/gimp/patterns/cashew.pat
 share/gimp/patterns/chains.pat
-share/gimp/patterns/choc_swirl.pat
 share/gimp/patterns/chroma.pat
 share/gimp/patterns/circuit.pat
 share/gimp/patterns/clouds.pat
@@ -434,12 +497,9 @@ share/gimp/patterns/colored_rock.pat
 share/gimp/patterns/colorwhirl.pat
 share/gimp/patterns/connestoga.pat
 share/gimp/patterns/contrawhirl.pat
-share/gimp/patterns/corkboard.pat
 share/gimp/patterns/cow.pat
-share/gimp/patterns/cracked.pat
 share/gimp/patterns/crash1.pat
 share/gimp/patterns/crazytile.pat
-share/gimp/patterns/crinklepaper.pat
 share/gimp/patterns/crystals.pat
 share/gimp/patterns/curvedledge.pat
 share/gimp/patterns/deepswirl.pat
@@ -447,13 +507,12 @@ share/gimp/patterns/diffpat.pat
 share/gimp/patterns/dirt.pat
 share/gimp/patterns/disco.pat
 share/gimp/patterns/drymud.pat
+share/gimp/patterns/pj.pat
 share/gimp/patterns/dunemaze.pat
 share/gimp/patterns/dunes.pat
 share/gimp/patterns/eggcarton.pat
 share/gimp/patterns/electric-blue-ribbons.pat
-share/gimp/patterns/electric.pat
 share/gimp/patterns/etbf.pat
-share/gimp/patterns/fibers.pat
 share/gimp/patterns/floor_tile.pat
 share/gimp/patterns/funnyblobs.pat
 share/gimp/patterns/funnymess.pat
@@ -461,7 +520,6 @@ share/gimp/patterns/funnymess2.pat
 share/gimp/patterns/fuzzy-colors.pat
 share/gimp/patterns/gold.pat
 share/gimp/patterns/goldcloth.pat
-share/gimp/patterns/granite1.pat
 share/gimp/patterns/granite2.pat
 share/gimp/patterns/green_curtains.pat
 share/gimp/patterns/green_eek.pat
@@ -469,109 +527,75 @@ share/gimp/patterns/greyweave.pat
 share/gimp/patterns/greyweave2.pat
 share/gimp/patterns/grid.pat
 share/gimp/patterns/gridwhirltile.pat
-share/gimp/patterns/ground1.pat
 share/gimp/patterns/headache.pat
 share/gimp/patterns/horiz.pat
-share/gimp/patterns/ice.pat
 share/gimp/patterns/ice2.pat
 share/gimp/patterns/icechex.pat
 share/gimp/patterns/inlay.pat
-share/gimp/patterns/java.pat
 share/gimp/patterns/krinkle.pat
 share/gimp/patterns/land1.pat
 share/gimp/patterns/land2.pat
 share/gimp/patterns/lathe.pat
-share/gimp/patterns/leather.pat
-share/gimp/patterns/leaves.pat
 share/gimp/patterns/leaves3.pat
 share/gimp/patterns/leaves4.pat
 share/gimp/patterns/leaves6.pat
-share/gimp/patterns/leopard.pat
-share/gimp/patterns/lightning.pat
 share/gimp/patterns/lumps.pat
-share/gimp/patterns/marble1.pat
-share/gimp/patterns/marble2.pat
-share/gimp/patterns/marble3.pat
 share/gimp/patterns/meltedcolors.pat
 share/gimp/patterns/metallica.pat
 share/gimp/patterns/metalpaths.pat
 share/gimp/patterns/mhuerock.pat
 share/gimp/patterns/money.pat
 share/gimp/patterns/neurons.pat
-share/gimp/patterns/nops.pat
 share/gimp/patterns/novaugh.pat
 share/gimp/patterns/oooh.pat
 share/gimp/patterns/oooh3.pat
 share/gimp/patterns/orange_eek.pat
 share/gimp/patterns/orangebrown.pat
 share/gimp/patterns/orangecheese.pat
+share/gimp/patterns/wax.pat
 share/gimp/patterns/paint-explosion.pat
-share/gimp/patterns/paper.pat
-share/gimp/patterns/parque1.pat
-share/gimp/patterns/parque2.pat
-share/gimp/patterns/parque3.pat
-share/gimp/patterns/pastel.pat
 share/gimp/patterns/pastel2.pat
 share/gimp/patterns/pebbles.pat
-share/gimp/patterns/pine.pat
-share/gimp/patterns/pink_marble.pat
 share/gimp/patterns/pixeled1.pat
-share/gimp/patterns/pj.pat
-share/gimp/patterns/pool.pat
 share/gimp/patterns/psycho1.pat
 share/gimp/patterns/purple-ribbons.pat
 share/gimp/patterns/purple.pat
 share/gimp/patterns/purple_glow.pat
-share/gimp/patterns/qube1.pat
-share/gimp/patterns/rain.pat
-share/gimp/patterns/recessed.pat
-share/gimp/patterns/redcube.pat
 share/gimp/patterns/redishstuff.pat
 share/gimp/patterns/redmess.pat
 share/gimp/patterns/redrings.pat
-share/gimp/patterns/rock.pat
 share/gimp/patterns/rust.pat
 share/gimp/patterns/sandytext.pat
 share/gimp/patterns/send1.pat
 share/gimp/patterns/silver.pat
-share/gimp/patterns/sky.pat
-share/gimp/patterns/slate.pat
 share/gimp/patterns/slice1.pat
-share/gimp/patterns/sm_squares.pat
 share/gimp/patterns/spectbar.pat
-share/gimp/patterns/starfield.pat
 share/gimp/patterns/startile.pat
-share/gimp/patterns/stone33.pat
 share/gimp/patterns/swirl.pat
 share/gimp/patterns/swirl2.pat
-share/gimp/patterns/terra.pat
 share/gimp/patterns/torrents.pat
 share/gimp/patterns/tube.pat
-share/gimp/patterns/unsharpswirl.pat
-share/gimp/patterns/walnut.pat
-share/gimp/patterns/warning.pat
 share/gimp/patterns/water3.pat
+share/gimp/patterns/unsharpswirl.pat
 share/gimp/patterns/waves.pat
-share/gimp/patterns/wax.pat
 share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
-share/gimp/patterns/wood1.pat
-share/gimp/patterns/wood2.pat
-share/gimp/patterns/wood3.pat
-share/gimp/patterns/wood4.pat
-share/gimp/patterns/wood5.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
 lib/libgimp.so
+@unexec rm %D/%F
 lib/libgimpui.so
+@unexec rm %D/%F
 lib/libgck.so
+@unexec rm %D/%F
 @dirrm include/libgimp
 @dirrm include/gck
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
+@dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
-@dirrm share/gimp/patterns
-@dirrm share/gimp/gradients
 @dirrm share/gimp/palettes
+@dirrm share/gimp/gradients
+@dirrm share/gimp/patterns
 @dirrm share/gimp
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index bc8d5fb5d069..0b7883cd1d96 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.14
+# Version required:     0.99.17
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.15 1997/12/16 23:25:34 erich Exp $
+# $Id: Makefile,v 1.16 1997/12/18 20:40:15 erich Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	16
+MICRO=	17
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}.tar.gz \
-            gimp-data-extras-${MM_VERSION}.tar.gz
+DISTFILES+=	gimp-data-min-${MM_VERSION}a.tar.gz \
+            gimp-data-extras-${MM_VERSION}a.tar.gz
 
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/0.99/${VERSION}/ \
@@ -44,17 +44,12 @@ DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}; \
+	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
-	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}; \
+	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 
-post-extract:
-	rm -f ${WRKSRC}/plug-ins/gimptcl/scripts/consolio \
-		${WRKSRC}/plug-ins/gimptcl/scripts/pdb_help \
-		${WRKSRC}/plug-ins/gimptcl/scripts/stained_glass
-
 .include <bsd.port.mk>
 
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index 3dcdb45a8ad2..56f9833c91b5 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.16.tar.gz) = 3409cc14d5958c25a7761aa43f502668
-MD5 (gimp-data-min-0.99.tar.gz) = 81e4e4571f71f1bd6bba158071671edd
-MD5 (gimp-data-extras-0.99.tar.gz) = 361eed158157acbc65da47ed8332d8fa
+MD5 (gimp-0.99.17.tar.gz) = 6400f3c18c2aa3d908f5f4485645e85f
+MD5 (gimp-data-min-0.99a.tar.gz) = 0716202f1d277ea8e73bc9b4bcde2352
+MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp-devel/files/patch-ac b/graphics/gimp-devel/files/patch-ac
deleted file mode 100644
index 6e5af3f2bc81..000000000000
--- a/graphics/gimp-devel/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- plug-ins/libgck/gck/Makefile.in.orig	Tue Dec 16 08:26:17 1997
-+++ plug-ins/libgck/gck/Makefile.in	Tue Dec 16 08:26:31 1997
-@@ -111,9 +111,10 @@
- libgck_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir) 
- 
- INCLUDES = \
-+	-I$(srcdir)/..			\
- 	-I$(top_srcdir)		\
--	-I$(includedir)		\
--	-I$(srcdir)/..
-+	-I$(includedir)
-+
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/graphics/gimp-devel/files/patch-ah b/graphics/gimp-devel/files/patch-ah
index 08a2094a4159..d46998d2fe62 100644
--- a/graphics/gimp-devel/files/patch-ah
+++ b/graphics/gimp-devel/files/patch-ah
@@ -1,16 +1,5 @@
---- aclocal.m4.orig	Tue Oct 14 20:48:14 1997
-+++ aclocal.m4	Tue Oct 14 20:49:02 1997
-@@ -48,7 +48,7 @@
- 
- AC_DEFUN(AM_PROG_INSTALL,
- [AC_REQUIRE([AC_PROG_INSTALL])
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -c -m 755'
- AC_SUBST(INSTALL_SCRIPT)dnl
- ])
- 
---- configure.in.orig	Mon Dec 15 11:44:48 1997
-+++ configure.in	Thu Dec 18 00:36:24 1997
+--- configure.in.orig	Sat Jan  3 19:31:29 1998
++++ configure.in	Mon Jan  5 09:42:49 1998
 @@ -120,10 +120,10 @@
  
  dnl Test for libtiff
@@ -35,17 +24,17 @@
  
  dnl This is for generating PDB docuemntation.
  AC_PATH_PROG(EMACS, emacs, :)
---- configure.orig	Mon Dec 15 12:39:24 1997
-+++ configure	Thu Dec 18 00:38:43 1997
-@@ -2722,14 +2722,14 @@
+--- configure.orig	Mon Jan  5 09:44:02 1998
++++ configure	Mon Jan  5 09:46:45 1998
+@@ -2531,14 +2531,14 @@
  fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2727: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2536: 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:2727: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2536: 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
@@ -54,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2735 "configure"
+ #line 2544 "configure"
  #include "confdefs.h"
-@@ -2757,17 +2757,17 @@
+@@ -2566,17 +2566,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -65,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2765: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2574: 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:2765: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2574: 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
@@ -77,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2773 "configure"
+ #line 2582 "configure"
  #include "confdefs.h"
-@@ -2795,7 +2795,7 @@
+@@ -2604,7 +2604,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -88,7 +77,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3933,7 +3933,7 @@
+@@ -3742,7 +3742,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index 182dd9d74684..772e87aa4c10 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -31,15 +31,17 @@ 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/Encript_Decript
+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
@@ -48,8 +50,8 @@ 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/mpeg
 libexec/gimp/0.99/plug-ins/xpm
+libexec/gimp/0.99/plug-ins/mpeg
 libexec/gimp/0.99/plug-ins/CML_explorer
 libexec/gimp/0.99/plug-ins/align_layers
 libexec/gimp/0.99/plug-ins/apply_lens
@@ -140,11 +142,12 @@ 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/snp
 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
@@ -189,6 +192,7 @@ share/gimp/scripts/chrome-logo.scm
 share/gimp/scripts/circle-logo.scm
 share/gimp/scripts/circuit.scm
 share/gimp/scripts/clothify.scm
+share/gimp/scripts/color-cycling.scm
 share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
@@ -260,18 +264,30 @@ share/gimp/brushes/20x20square.gbr
 share/gimp/brushes/20x20squareBlur.gbr
 share/gimp/brushes/3circle.gbr
 share/gimp/brushes/3fcircle.gbr
-share/gimp/brushes/50x50cone.gbr
-share/gimp/brushes/50x50square.gbr
-share/gimp/brushes/50x50squareBlur.gbr
-share/gimp/brushes/50x50squareBlur2.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
+share/gimp/brushes/callig1.gbr
+share/gimp/brushes/callig2.gbr
+share/gimp/brushes/callig3.gbr
+share/gimp/brushes/callig4.gbr
+share/gimp/brushes/confetti.gbr
+share/gimp/brushes/dunes.gbr
+share/gimp/brushes/galaxy.gbr
+share/gimp/brushes/galaxy_big.gbr
+share/gimp/brushes/galaxy_small.gbr
+share/gimp/brushes/pixel.gbr
+share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/50x50cone.gbr
+share/gimp/brushes/50x50square.gbr
+share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
@@ -279,19 +295,13 @@ share/gimp/brushes/bigcircle4.gbr
 share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
-share/gimp/brushes/confetti.gbr
-share/gimp/brushes/dunes.gbr
 share/gimp/brushes/flower.gbr
 share/gimp/brushes/flower_large.gbr
-share/gimp/brushes/galaxy.gbr
-share/gimp/brushes/galaxy_big.gbr
-share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/gecko.gbr
 share/gimp/brushes/grid.gbr
 share/gimp/brushes/grid2.gbr
 share/gimp/brushes/guitar.gbr
 share/gimp/brushes/nova.gbr
-share/gimp/brushes/pixel.gbr
 share/gimp/brushes/point.gbr
 share/gimp/brushes/punch.gbr
 share/gimp/brushes/qbert2.gbr
@@ -302,16 +312,32 @@ share/gimp/brushes/sphere36.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
+share/gimp/brushes/star5.gbr
 share/gimp/brushes/swirl.gbr
 share/gimp/brushes/swirl2.gbr
 share/gimp/brushes/text1.gbr
 share/gimp/brushes/text2.gbr
 share/gimp/brushes/text3.gbr
 share/gimp/brushes/text4.gbr
-share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/tulip.gbr
 share/gimp/brushes/wave.gbr
-share/gimp/brushes/xcf.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
@@ -334,6 +360,8 @@ share/gimp/gradients/Default
 share/gimp/gradients/Flare_Glow_Angular_1
 share/gimp/gradients/Flare_Glow_Radial_1
 share/gimp/gradients/Flare_Glow_Radial_2
+share/gimp/gradients/Flare_Glow_Radial_3
+share/gimp/gradients/Flare_Glow_Radial_4
 share/gimp/gradients/Flare_Radial_101
 share/gimp/gradients/Flare_Radial_102
 share/gimp/gradients/Flare_Radial_103
@@ -351,9 +379,10 @@ share/gimp/gradients/German_flag_smooth
 share/gimp/gradients/Golden
 share/gimp/gradients/Greens
 share/gimp/gradients/Horizon_1
+share/gimp/gradients/Land_1
 share/gimp/gradients/Horizon_2
 share/gimp/gradients/Incandescent
-share/gimp/gradients/Land_1
+share/gimp/gradients/Metallic_Something
 share/gimp/gradients/Mexican_flag
 share/gimp/gradients/Mexican_flag_smooth
 share/gimp/gradients/Nauseating_Headache
@@ -361,6 +390,7 @@ share/gimp/gradients/Neon_Cyan
 share/gimp/gradients/Neon_Green
 share/gimp/gradients/Neon_Yellow
 share/gimp/gradients/Pastel_Rainbow
+share/gimp/gradients/Pastels
 share/gimp/gradients/Purples
 share/gimp/gradients/Radial_Eyeball_Blue
 share/gimp/gradients/Radial_Eyeball_Brown
@@ -372,6 +402,7 @@ share/gimp/gradients/Romanian_flag_smooth
 share/gimp/gradients/Rounded_edge
 share/gimp/gradients/Shadows_1
 share/gimp/gradients/Shadows_2
+share/gimp/gradients/Shadows_3
 share/gimp/gradients/Skyline
 share/gimp/gradients/Skyline_polluted
 share/gimp/gradients/Square_Wood_Frame
@@ -381,48 +412,80 @@ share/gimp/gradients/Tropical_Colors
 share/gimp/gradients/Tube_Red
 share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
+share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
-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/patterns/3dgreen.pat
-share/gimp/patterns/3dweave.pat
 share/gimp/patterns/Craters.pat
 share/gimp/patterns/Moonfoot.pat
-share/gimp/patterns/abstract_flowers.pat
 share/gimp/patterns/amethyst.pat
 share/gimp/patterns/bark.pat
+share/gimp/patterns/blue.pat
+share/gimp/patterns/bluegrid.pat
+share/gimp/patterns/bluesquares.pat
+share/gimp/patterns/blueweb.pat
+share/gimp/patterns/brick.pat
+share/gimp/patterns/burlap.pat
+share/gimp/patterns/burlwood.pat
+share/gimp/patterns/choc_swirl.pat
+share/gimp/patterns/corkboard.pat
+share/gimp/patterns/cracked.pat
+share/gimp/patterns/crinklepaper.pat
+share/gimp/patterns/electric.pat
+share/gimp/patterns/fibers.pat
+share/gimp/patterns/granite1.pat
+share/gimp/patterns/ground1.pat
+share/gimp/patterns/ice.pat
+share/gimp/patterns/java.pat
+share/gimp/patterns/leather.pat
+share/gimp/patterns/leaves.pat
+share/gimp/patterns/leopard.pat
+share/gimp/patterns/lightning.pat
+share/gimp/patterns/marble1.pat
+share/gimp/patterns/marble2.pat
+share/gimp/patterns/marble3.pat
+share/gimp/patterns/nops.pat
+share/gimp/patterns/paper.pat
+share/gimp/patterns/parque1.pat
+share/gimp/patterns/parque2.pat
+share/gimp/patterns/parque3.pat
+share/gimp/patterns/pastel.pat
+share/gimp/patterns/pine.pat
+share/gimp/patterns/pink_marble.pat
+share/gimp/patterns/pool.pat
+share/gimp/patterns/qube1.pat
+share/gimp/patterns/rain.pat
+share/gimp/patterns/recessed.pat
+share/gimp/patterns/redcube.pat
+share/gimp/patterns/rock.pat
+share/gimp/patterns/sky.pat
+share/gimp/patterns/slate.pat
+share/gimp/patterns/sm_squares.pat
+share/gimp/patterns/stone33.pat
+share/gimp/patterns/starfield.pat
+share/gimp/patterns/terra.pat
+share/gimp/patterns/walnut.pat
+share/gimp/patterns/warning.pat
+share/gimp/patterns/wood1.pat
+share/gimp/patterns/wood2.pat
+share/gimp/patterns/wood3.pat
+share/gimp/patterns/wood4.pat
+share/gimp/patterns/wood5.pat
+share/gimp/patterns/3dweave.pat
+share/gimp/patterns/abstract_flowers.pat
 share/gimp/patterns/blackoil.pat
 share/gimp/patterns/blackwhitefloor.pat
 share/gimp/patterns/blob1.pat
 share/gimp/patterns/blob2.pat
-share/gimp/patterns/blue.pat
 share/gimp/patterns/bluebar.pat
 share/gimp/patterns/bluecanyons.pat
-share/gimp/patterns/bluegrid.pat
 share/gimp/patterns/bluemars.pat
 share/gimp/patterns/bluemetal.pat
 share/gimp/patterns/bluespikes.pat
-share/gimp/patterns/bluesquares.pat
-share/gimp/patterns/blueweb.pat
-share/gimp/patterns/brick.pat
 share/gimp/patterns/brownie.pat
-share/gimp/patterns/burlap.pat
-share/gimp/patterns/burlwood.pat
 share/gimp/patterns/bwcubes.pat
 share/gimp/patterns/canyons2.pat
 share/gimp/patterns/cashew.pat
 share/gimp/patterns/chains.pat
-share/gimp/patterns/choc_swirl.pat
 share/gimp/patterns/chroma.pat
 share/gimp/patterns/circuit.pat
 share/gimp/patterns/clouds.pat
@@ -434,12 +497,9 @@ share/gimp/patterns/colored_rock.pat
 share/gimp/patterns/colorwhirl.pat
 share/gimp/patterns/connestoga.pat
 share/gimp/patterns/contrawhirl.pat
-share/gimp/patterns/corkboard.pat
 share/gimp/patterns/cow.pat
-share/gimp/patterns/cracked.pat
 share/gimp/patterns/crash1.pat
 share/gimp/patterns/crazytile.pat
-share/gimp/patterns/crinklepaper.pat
 share/gimp/patterns/crystals.pat
 share/gimp/patterns/curvedledge.pat
 share/gimp/patterns/deepswirl.pat
@@ -447,13 +507,12 @@ share/gimp/patterns/diffpat.pat
 share/gimp/patterns/dirt.pat
 share/gimp/patterns/disco.pat
 share/gimp/patterns/drymud.pat
+share/gimp/patterns/pj.pat
 share/gimp/patterns/dunemaze.pat
 share/gimp/patterns/dunes.pat
 share/gimp/patterns/eggcarton.pat
 share/gimp/patterns/electric-blue-ribbons.pat
-share/gimp/patterns/electric.pat
 share/gimp/patterns/etbf.pat
-share/gimp/patterns/fibers.pat
 share/gimp/patterns/floor_tile.pat
 share/gimp/patterns/funnyblobs.pat
 share/gimp/patterns/funnymess.pat
@@ -461,7 +520,6 @@ share/gimp/patterns/funnymess2.pat
 share/gimp/patterns/fuzzy-colors.pat
 share/gimp/patterns/gold.pat
 share/gimp/patterns/goldcloth.pat
-share/gimp/patterns/granite1.pat
 share/gimp/patterns/granite2.pat
 share/gimp/patterns/green_curtains.pat
 share/gimp/patterns/green_eek.pat
@@ -469,109 +527,75 @@ share/gimp/patterns/greyweave.pat
 share/gimp/patterns/greyweave2.pat
 share/gimp/patterns/grid.pat
 share/gimp/patterns/gridwhirltile.pat
-share/gimp/patterns/ground1.pat
 share/gimp/patterns/headache.pat
 share/gimp/patterns/horiz.pat
-share/gimp/patterns/ice.pat
 share/gimp/patterns/ice2.pat
 share/gimp/patterns/icechex.pat
 share/gimp/patterns/inlay.pat
-share/gimp/patterns/java.pat
 share/gimp/patterns/krinkle.pat
 share/gimp/patterns/land1.pat
 share/gimp/patterns/land2.pat
 share/gimp/patterns/lathe.pat
-share/gimp/patterns/leather.pat
-share/gimp/patterns/leaves.pat
 share/gimp/patterns/leaves3.pat
 share/gimp/patterns/leaves4.pat
 share/gimp/patterns/leaves6.pat
-share/gimp/patterns/leopard.pat
-share/gimp/patterns/lightning.pat
 share/gimp/patterns/lumps.pat
-share/gimp/patterns/marble1.pat
-share/gimp/patterns/marble2.pat
-share/gimp/patterns/marble3.pat
 share/gimp/patterns/meltedcolors.pat
 share/gimp/patterns/metallica.pat
 share/gimp/patterns/metalpaths.pat
 share/gimp/patterns/mhuerock.pat
 share/gimp/patterns/money.pat
 share/gimp/patterns/neurons.pat
-share/gimp/patterns/nops.pat
 share/gimp/patterns/novaugh.pat
 share/gimp/patterns/oooh.pat
 share/gimp/patterns/oooh3.pat
 share/gimp/patterns/orange_eek.pat
 share/gimp/patterns/orangebrown.pat
 share/gimp/patterns/orangecheese.pat
+share/gimp/patterns/wax.pat
 share/gimp/patterns/paint-explosion.pat
-share/gimp/patterns/paper.pat
-share/gimp/patterns/parque1.pat
-share/gimp/patterns/parque2.pat
-share/gimp/patterns/parque3.pat
-share/gimp/patterns/pastel.pat
 share/gimp/patterns/pastel2.pat
 share/gimp/patterns/pebbles.pat
-share/gimp/patterns/pine.pat
-share/gimp/patterns/pink_marble.pat
 share/gimp/patterns/pixeled1.pat
-share/gimp/patterns/pj.pat
-share/gimp/patterns/pool.pat
 share/gimp/patterns/psycho1.pat
 share/gimp/patterns/purple-ribbons.pat
 share/gimp/patterns/purple.pat
 share/gimp/patterns/purple_glow.pat
-share/gimp/patterns/qube1.pat
-share/gimp/patterns/rain.pat
-share/gimp/patterns/recessed.pat
-share/gimp/patterns/redcube.pat
 share/gimp/patterns/redishstuff.pat
 share/gimp/patterns/redmess.pat
 share/gimp/patterns/redrings.pat
-share/gimp/patterns/rock.pat
 share/gimp/patterns/rust.pat
 share/gimp/patterns/sandytext.pat
 share/gimp/patterns/send1.pat
 share/gimp/patterns/silver.pat
-share/gimp/patterns/sky.pat
-share/gimp/patterns/slate.pat
 share/gimp/patterns/slice1.pat
-share/gimp/patterns/sm_squares.pat
 share/gimp/patterns/spectbar.pat
-share/gimp/patterns/starfield.pat
 share/gimp/patterns/startile.pat
-share/gimp/patterns/stone33.pat
 share/gimp/patterns/swirl.pat
 share/gimp/patterns/swirl2.pat
-share/gimp/patterns/terra.pat
 share/gimp/patterns/torrents.pat
 share/gimp/patterns/tube.pat
-share/gimp/patterns/unsharpswirl.pat
-share/gimp/patterns/walnut.pat
-share/gimp/patterns/warning.pat
 share/gimp/patterns/water3.pat
+share/gimp/patterns/unsharpswirl.pat
 share/gimp/patterns/waves.pat
-share/gimp/patterns/wax.pat
 share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
-share/gimp/patterns/wood1.pat
-share/gimp/patterns/wood2.pat
-share/gimp/patterns/wood3.pat
-share/gimp/patterns/wood4.pat
-share/gimp/patterns/wood5.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
 lib/libgimp.so
+@unexec rm %D/%F
 lib/libgimpui.so
+@unexec rm %D/%F
 lib/libgck.so
+@unexec rm %D/%F
 @dirrm include/libgimp
 @dirrm include/gck
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
+@dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
-@dirrm share/gimp/patterns
-@dirrm share/gimp/gradients
 @dirrm share/gimp/palettes
+@dirrm share/gimp/gradients
+@dirrm share/gimp/patterns
 @dirrm share/gimp
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index bc8d5fb5d069..0b7883cd1d96 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.14
+# Version required:     0.99.17
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.15 1997/12/16 23:25:34 erich Exp $
+# $Id: Makefile,v 1.16 1997/12/18 20:40:15 erich Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	16
+MICRO=	17
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}.tar.gz \
-            gimp-data-extras-${MM_VERSION}.tar.gz
+DISTFILES+=	gimp-data-min-${MM_VERSION}a.tar.gz \
+            gimp-data-extras-${MM_VERSION}a.tar.gz
 
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/0.99/${VERSION}/ \
@@ -44,17 +44,12 @@ DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}; \
+	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
-	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}; \
+	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 
-post-extract:
-	rm -f ${WRKSRC}/plug-ins/gimptcl/scripts/consolio \
-		${WRKSRC}/plug-ins/gimptcl/scripts/pdb_help \
-		${WRKSRC}/plug-ins/gimptcl/scripts/stained_glass
-
 .include <bsd.port.mk>
 
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 3dcdb45a8ad2..56f9833c91b5 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.16.tar.gz) = 3409cc14d5958c25a7761aa43f502668
-MD5 (gimp-data-min-0.99.tar.gz) = 81e4e4571f71f1bd6bba158071671edd
-MD5 (gimp-data-extras-0.99.tar.gz) = 361eed158157acbc65da47ed8332d8fa
+MD5 (gimp-0.99.17.tar.gz) = 6400f3c18c2aa3d908f5f4485645e85f
+MD5 (gimp-data-min-0.99a.tar.gz) = 0716202f1d277ea8e73bc9b4bcde2352
+MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp/files/patch-ac b/graphics/gimp/files/patch-ac
deleted file mode 100644
index 6e5af3f2bc81..000000000000
--- a/graphics/gimp/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- plug-ins/libgck/gck/Makefile.in.orig	Tue Dec 16 08:26:17 1997
-+++ plug-ins/libgck/gck/Makefile.in	Tue Dec 16 08:26:31 1997
-@@ -111,9 +111,10 @@
- libgck_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir) 
- 
- INCLUDES = \
-+	-I$(srcdir)/..			\
- 	-I$(top_srcdir)		\
--	-I$(includedir)		\
--	-I$(srcdir)/..
-+	-I$(includedir)
-+
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/graphics/gimp/files/patch-ah b/graphics/gimp/files/patch-ah
index 08a2094a4159..d46998d2fe62 100644
--- a/graphics/gimp/files/patch-ah
+++ b/graphics/gimp/files/patch-ah
@@ -1,16 +1,5 @@
---- aclocal.m4.orig	Tue Oct 14 20:48:14 1997
-+++ aclocal.m4	Tue Oct 14 20:49:02 1997
-@@ -48,7 +48,7 @@
- 
- AC_DEFUN(AM_PROG_INSTALL,
- [AC_REQUIRE([AC_PROG_INSTALL])
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -c -m 755'
- AC_SUBST(INSTALL_SCRIPT)dnl
- ])
- 
---- configure.in.orig	Mon Dec 15 11:44:48 1997
-+++ configure.in	Thu Dec 18 00:36:24 1997
+--- configure.in.orig	Sat Jan  3 19:31:29 1998
++++ configure.in	Mon Jan  5 09:42:49 1998
 @@ -120,10 +120,10 @@
  
  dnl Test for libtiff
@@ -35,17 +24,17 @@
  
  dnl This is for generating PDB docuemntation.
  AC_PATH_PROG(EMACS, emacs, :)
---- configure.orig	Mon Dec 15 12:39:24 1997
-+++ configure	Thu Dec 18 00:38:43 1997
-@@ -2722,14 +2722,14 @@
+--- configure.orig	Mon Jan  5 09:44:02 1998
++++ configure	Mon Jan  5 09:46:45 1998
+@@ -2531,14 +2531,14 @@
  fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2727: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2536: 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:2727: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2536: 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
@@ -54,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2735 "configure"
+ #line 2544 "configure"
  #include "confdefs.h"
-@@ -2757,17 +2757,17 @@
+@@ -2566,17 +2566,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -65,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2765: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2574: 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:2765: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2574: 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
@@ -77,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2773 "configure"
+ #line 2582 "configure"
  #include "confdefs.h"
-@@ -2795,7 +2795,7 @@
+@@ -2604,7 +2604,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -88,7 +77,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3933,7 +3933,7 @@
+@@ -3742,7 +3742,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 182dd9d74684..772e87aa4c10 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -31,15 +31,17 @@ 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/Encript_Decript
+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
@@ -48,8 +50,8 @@ 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/mpeg
 libexec/gimp/0.99/plug-ins/xpm
+libexec/gimp/0.99/plug-ins/mpeg
 libexec/gimp/0.99/plug-ins/CML_explorer
 libexec/gimp/0.99/plug-ins/align_layers
 libexec/gimp/0.99/plug-ins/apply_lens
@@ -140,11 +142,12 @@ 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/snp
 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
@@ -189,6 +192,7 @@ share/gimp/scripts/chrome-logo.scm
 share/gimp/scripts/circle-logo.scm
 share/gimp/scripts/circuit.scm
 share/gimp/scripts/clothify.scm
+share/gimp/scripts/color-cycling.scm
 share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
@@ -260,18 +264,30 @@ share/gimp/brushes/20x20square.gbr
 share/gimp/brushes/20x20squareBlur.gbr
 share/gimp/brushes/3circle.gbr
 share/gimp/brushes/3fcircle.gbr
-share/gimp/brushes/50x50cone.gbr
-share/gimp/brushes/50x50square.gbr
-share/gimp/brushes/50x50squareBlur.gbr
-share/gimp/brushes/50x50squareBlur2.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
+share/gimp/brushes/callig1.gbr
+share/gimp/brushes/callig2.gbr
+share/gimp/brushes/callig3.gbr
+share/gimp/brushes/callig4.gbr
+share/gimp/brushes/confetti.gbr
+share/gimp/brushes/dunes.gbr
+share/gimp/brushes/galaxy.gbr
+share/gimp/brushes/galaxy_big.gbr
+share/gimp/brushes/galaxy_small.gbr
+share/gimp/brushes/pixel.gbr
+share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/50x50cone.gbr
+share/gimp/brushes/50x50square.gbr
+share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
@@ -279,19 +295,13 @@ share/gimp/brushes/bigcircle4.gbr
 share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
-share/gimp/brushes/confetti.gbr
-share/gimp/brushes/dunes.gbr
 share/gimp/brushes/flower.gbr
 share/gimp/brushes/flower_large.gbr
-share/gimp/brushes/galaxy.gbr
-share/gimp/brushes/galaxy_big.gbr
-share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/gecko.gbr
 share/gimp/brushes/grid.gbr
 share/gimp/brushes/grid2.gbr
 share/gimp/brushes/guitar.gbr
 share/gimp/brushes/nova.gbr
-share/gimp/brushes/pixel.gbr
 share/gimp/brushes/point.gbr
 share/gimp/brushes/punch.gbr
 share/gimp/brushes/qbert2.gbr
@@ -302,16 +312,32 @@ share/gimp/brushes/sphere36.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
+share/gimp/brushes/star5.gbr
 share/gimp/brushes/swirl.gbr
 share/gimp/brushes/swirl2.gbr
 share/gimp/brushes/text1.gbr
 share/gimp/brushes/text2.gbr
 share/gimp/brushes/text3.gbr
 share/gimp/brushes/text4.gbr
-share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/tulip.gbr
 share/gimp/brushes/wave.gbr
-share/gimp/brushes/xcf.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
@@ -334,6 +360,8 @@ share/gimp/gradients/Default
 share/gimp/gradients/Flare_Glow_Angular_1
 share/gimp/gradients/Flare_Glow_Radial_1
 share/gimp/gradients/Flare_Glow_Radial_2
+share/gimp/gradients/Flare_Glow_Radial_3
+share/gimp/gradients/Flare_Glow_Radial_4
 share/gimp/gradients/Flare_Radial_101
 share/gimp/gradients/Flare_Radial_102
 share/gimp/gradients/Flare_Radial_103
@@ -351,9 +379,10 @@ share/gimp/gradients/German_flag_smooth
 share/gimp/gradients/Golden
 share/gimp/gradients/Greens
 share/gimp/gradients/Horizon_1
+share/gimp/gradients/Land_1
 share/gimp/gradients/Horizon_2
 share/gimp/gradients/Incandescent
-share/gimp/gradients/Land_1
+share/gimp/gradients/Metallic_Something
 share/gimp/gradients/Mexican_flag
 share/gimp/gradients/Mexican_flag_smooth
 share/gimp/gradients/Nauseating_Headache
@@ -361,6 +390,7 @@ share/gimp/gradients/Neon_Cyan
 share/gimp/gradients/Neon_Green
 share/gimp/gradients/Neon_Yellow
 share/gimp/gradients/Pastel_Rainbow
+share/gimp/gradients/Pastels
 share/gimp/gradients/Purples
 share/gimp/gradients/Radial_Eyeball_Blue
 share/gimp/gradients/Radial_Eyeball_Brown
@@ -372,6 +402,7 @@ share/gimp/gradients/Romanian_flag_smooth
 share/gimp/gradients/Rounded_edge
 share/gimp/gradients/Shadows_1
 share/gimp/gradients/Shadows_2
+share/gimp/gradients/Shadows_3
 share/gimp/gradients/Skyline
 share/gimp/gradients/Skyline_polluted
 share/gimp/gradients/Square_Wood_Frame
@@ -381,48 +412,80 @@ share/gimp/gradients/Tropical_Colors
 share/gimp/gradients/Tube_Red
 share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
+share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
-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/patterns/3dgreen.pat
-share/gimp/patterns/3dweave.pat
 share/gimp/patterns/Craters.pat
 share/gimp/patterns/Moonfoot.pat
-share/gimp/patterns/abstract_flowers.pat
 share/gimp/patterns/amethyst.pat
 share/gimp/patterns/bark.pat
+share/gimp/patterns/blue.pat
+share/gimp/patterns/bluegrid.pat
+share/gimp/patterns/bluesquares.pat
+share/gimp/patterns/blueweb.pat
+share/gimp/patterns/brick.pat
+share/gimp/patterns/burlap.pat
+share/gimp/patterns/burlwood.pat
+share/gimp/patterns/choc_swirl.pat
+share/gimp/patterns/corkboard.pat
+share/gimp/patterns/cracked.pat
+share/gimp/patterns/crinklepaper.pat
+share/gimp/patterns/electric.pat
+share/gimp/patterns/fibers.pat
+share/gimp/patterns/granite1.pat
+share/gimp/patterns/ground1.pat
+share/gimp/patterns/ice.pat
+share/gimp/patterns/java.pat
+share/gimp/patterns/leather.pat
+share/gimp/patterns/leaves.pat
+share/gimp/patterns/leopard.pat
+share/gimp/patterns/lightning.pat
+share/gimp/patterns/marble1.pat
+share/gimp/patterns/marble2.pat
+share/gimp/patterns/marble3.pat
+share/gimp/patterns/nops.pat
+share/gimp/patterns/paper.pat
+share/gimp/patterns/parque1.pat
+share/gimp/patterns/parque2.pat
+share/gimp/patterns/parque3.pat
+share/gimp/patterns/pastel.pat
+share/gimp/patterns/pine.pat
+share/gimp/patterns/pink_marble.pat
+share/gimp/patterns/pool.pat
+share/gimp/patterns/qube1.pat
+share/gimp/patterns/rain.pat
+share/gimp/patterns/recessed.pat
+share/gimp/patterns/redcube.pat
+share/gimp/patterns/rock.pat
+share/gimp/patterns/sky.pat
+share/gimp/patterns/slate.pat
+share/gimp/patterns/sm_squares.pat
+share/gimp/patterns/stone33.pat
+share/gimp/patterns/starfield.pat
+share/gimp/patterns/terra.pat
+share/gimp/patterns/walnut.pat
+share/gimp/patterns/warning.pat
+share/gimp/patterns/wood1.pat
+share/gimp/patterns/wood2.pat
+share/gimp/patterns/wood3.pat
+share/gimp/patterns/wood4.pat
+share/gimp/patterns/wood5.pat
+share/gimp/patterns/3dweave.pat
+share/gimp/patterns/abstract_flowers.pat
 share/gimp/patterns/blackoil.pat
 share/gimp/patterns/blackwhitefloor.pat
 share/gimp/patterns/blob1.pat
 share/gimp/patterns/blob2.pat
-share/gimp/patterns/blue.pat
 share/gimp/patterns/bluebar.pat
 share/gimp/patterns/bluecanyons.pat
-share/gimp/patterns/bluegrid.pat
 share/gimp/patterns/bluemars.pat
 share/gimp/patterns/bluemetal.pat
 share/gimp/patterns/bluespikes.pat
-share/gimp/patterns/bluesquares.pat
-share/gimp/patterns/blueweb.pat
-share/gimp/patterns/brick.pat
 share/gimp/patterns/brownie.pat
-share/gimp/patterns/burlap.pat
-share/gimp/patterns/burlwood.pat
 share/gimp/patterns/bwcubes.pat
 share/gimp/patterns/canyons2.pat
 share/gimp/patterns/cashew.pat
 share/gimp/patterns/chains.pat
-share/gimp/patterns/choc_swirl.pat
 share/gimp/patterns/chroma.pat
 share/gimp/patterns/circuit.pat
 share/gimp/patterns/clouds.pat
@@ -434,12 +497,9 @@ share/gimp/patterns/colored_rock.pat
 share/gimp/patterns/colorwhirl.pat
 share/gimp/patterns/connestoga.pat
 share/gimp/patterns/contrawhirl.pat
-share/gimp/patterns/corkboard.pat
 share/gimp/patterns/cow.pat
-share/gimp/patterns/cracked.pat
 share/gimp/patterns/crash1.pat
 share/gimp/patterns/crazytile.pat
-share/gimp/patterns/crinklepaper.pat
 share/gimp/patterns/crystals.pat
 share/gimp/patterns/curvedledge.pat
 share/gimp/patterns/deepswirl.pat
@@ -447,13 +507,12 @@ share/gimp/patterns/diffpat.pat
 share/gimp/patterns/dirt.pat
 share/gimp/patterns/disco.pat
 share/gimp/patterns/drymud.pat
+share/gimp/patterns/pj.pat
 share/gimp/patterns/dunemaze.pat
 share/gimp/patterns/dunes.pat
 share/gimp/patterns/eggcarton.pat
 share/gimp/patterns/electric-blue-ribbons.pat
-share/gimp/patterns/electric.pat
 share/gimp/patterns/etbf.pat
-share/gimp/patterns/fibers.pat
 share/gimp/patterns/floor_tile.pat
 share/gimp/patterns/funnyblobs.pat
 share/gimp/patterns/funnymess.pat
@@ -461,7 +520,6 @@ share/gimp/patterns/funnymess2.pat
 share/gimp/patterns/fuzzy-colors.pat
 share/gimp/patterns/gold.pat
 share/gimp/patterns/goldcloth.pat
-share/gimp/patterns/granite1.pat
 share/gimp/patterns/granite2.pat
 share/gimp/patterns/green_curtains.pat
 share/gimp/patterns/green_eek.pat
@@ -469,109 +527,75 @@ share/gimp/patterns/greyweave.pat
 share/gimp/patterns/greyweave2.pat
 share/gimp/patterns/grid.pat
 share/gimp/patterns/gridwhirltile.pat
-share/gimp/patterns/ground1.pat
 share/gimp/patterns/headache.pat
 share/gimp/patterns/horiz.pat
-share/gimp/patterns/ice.pat
 share/gimp/patterns/ice2.pat
 share/gimp/patterns/icechex.pat
 share/gimp/patterns/inlay.pat
-share/gimp/patterns/java.pat
 share/gimp/patterns/krinkle.pat
 share/gimp/patterns/land1.pat
 share/gimp/patterns/land2.pat
 share/gimp/patterns/lathe.pat
-share/gimp/patterns/leather.pat
-share/gimp/patterns/leaves.pat
 share/gimp/patterns/leaves3.pat
 share/gimp/patterns/leaves4.pat
 share/gimp/patterns/leaves6.pat
-share/gimp/patterns/leopard.pat
-share/gimp/patterns/lightning.pat
 share/gimp/patterns/lumps.pat
-share/gimp/patterns/marble1.pat
-share/gimp/patterns/marble2.pat
-share/gimp/patterns/marble3.pat
 share/gimp/patterns/meltedcolors.pat
 share/gimp/patterns/metallica.pat
 share/gimp/patterns/metalpaths.pat
 share/gimp/patterns/mhuerock.pat
 share/gimp/patterns/money.pat
 share/gimp/patterns/neurons.pat
-share/gimp/patterns/nops.pat
 share/gimp/patterns/novaugh.pat
 share/gimp/patterns/oooh.pat
 share/gimp/patterns/oooh3.pat
 share/gimp/patterns/orange_eek.pat
 share/gimp/patterns/orangebrown.pat
 share/gimp/patterns/orangecheese.pat
+share/gimp/patterns/wax.pat
 share/gimp/patterns/paint-explosion.pat
-share/gimp/patterns/paper.pat
-share/gimp/patterns/parque1.pat
-share/gimp/patterns/parque2.pat
-share/gimp/patterns/parque3.pat
-share/gimp/patterns/pastel.pat
 share/gimp/patterns/pastel2.pat
 share/gimp/patterns/pebbles.pat
-share/gimp/patterns/pine.pat
-share/gimp/patterns/pink_marble.pat
 share/gimp/patterns/pixeled1.pat
-share/gimp/patterns/pj.pat
-share/gimp/patterns/pool.pat
 share/gimp/patterns/psycho1.pat
 share/gimp/patterns/purple-ribbons.pat
 share/gimp/patterns/purple.pat
 share/gimp/patterns/purple_glow.pat
-share/gimp/patterns/qube1.pat
-share/gimp/patterns/rain.pat
-share/gimp/patterns/recessed.pat
-share/gimp/patterns/redcube.pat
 share/gimp/patterns/redishstuff.pat
 share/gimp/patterns/redmess.pat
 share/gimp/patterns/redrings.pat
-share/gimp/patterns/rock.pat
 share/gimp/patterns/rust.pat
 share/gimp/patterns/sandytext.pat
 share/gimp/patterns/send1.pat
 share/gimp/patterns/silver.pat
-share/gimp/patterns/sky.pat
-share/gimp/patterns/slate.pat
 share/gimp/patterns/slice1.pat
-share/gimp/patterns/sm_squares.pat
 share/gimp/patterns/spectbar.pat
-share/gimp/patterns/starfield.pat
 share/gimp/patterns/startile.pat
-share/gimp/patterns/stone33.pat
 share/gimp/patterns/swirl.pat
 share/gimp/patterns/swirl2.pat
-share/gimp/patterns/terra.pat
 share/gimp/patterns/torrents.pat
 share/gimp/patterns/tube.pat
-share/gimp/patterns/unsharpswirl.pat
-share/gimp/patterns/walnut.pat
-share/gimp/patterns/warning.pat
 share/gimp/patterns/water3.pat
+share/gimp/patterns/unsharpswirl.pat
 share/gimp/patterns/waves.pat
-share/gimp/patterns/wax.pat
 share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
-share/gimp/patterns/wood1.pat
-share/gimp/patterns/wood2.pat
-share/gimp/patterns/wood3.pat
-share/gimp/patterns/wood4.pat
-share/gimp/patterns/wood5.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
 lib/libgimp.so
+@unexec rm %D/%F
 lib/libgimpui.so
+@unexec rm %D/%F
 lib/libgck.so
+@unexec rm %D/%F
 @dirrm include/libgimp
 @dirrm include/gck
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
+@dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
-@dirrm share/gimp/patterns
-@dirrm share/gimp/gradients
 @dirrm share/gimp/palettes
+@dirrm share/gimp/gradients
+@dirrm share/gimp/patterns
 @dirrm share/gimp
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index bc8d5fb5d069..0b7883cd1d96 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.14
+# Version required:     0.99.17
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.15 1997/12/16 23:25:34 erich Exp $
+# $Id: Makefile,v 1.16 1997/12/18 20:40:15 erich Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	16
+MICRO=	17
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}.tar.gz \
-            gimp-data-extras-${MM_VERSION}.tar.gz
+DISTFILES+=	gimp-data-min-${MM_VERSION}a.tar.gz \
+            gimp-data-extras-${MM_VERSION}a.tar.gz
 
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/0.99/${VERSION}/ \
@@ -44,17 +44,12 @@ DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}; \
+	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
-	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}; \
+	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 
-post-extract:
-	rm -f ${WRKSRC}/plug-ins/gimptcl/scripts/consolio \
-		${WRKSRC}/plug-ins/gimptcl/scripts/pdb_help \
-		${WRKSRC}/plug-ins/gimptcl/scripts/stained_glass
-
 .include <bsd.port.mk>
 
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index 3dcdb45a8ad2..56f9833c91b5 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.16.tar.gz) = 3409cc14d5958c25a7761aa43f502668
-MD5 (gimp-data-min-0.99.tar.gz) = 81e4e4571f71f1bd6bba158071671edd
-MD5 (gimp-data-extras-0.99.tar.gz) = 361eed158157acbc65da47ed8332d8fa
+MD5 (gimp-0.99.17.tar.gz) = 6400f3c18c2aa3d908f5f4485645e85f
+MD5 (gimp-data-min-0.99a.tar.gz) = 0716202f1d277ea8e73bc9b4bcde2352
+MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp1/files/patch-ac b/graphics/gimp1/files/patch-ac
deleted file mode 100644
index 6e5af3f2bc81..000000000000
--- a/graphics/gimp1/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- plug-ins/libgck/gck/Makefile.in.orig	Tue Dec 16 08:26:17 1997
-+++ plug-ins/libgck/gck/Makefile.in	Tue Dec 16 08:26:31 1997
-@@ -111,9 +111,10 @@
- libgck_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir) 
- 
- INCLUDES = \
-+	-I$(srcdir)/..			\
- 	-I$(top_srcdir)		\
--	-I$(includedir)		\
--	-I$(srcdir)/..
-+	-I$(includedir)
-+
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/graphics/gimp1/files/patch-ah b/graphics/gimp1/files/patch-ah
index 08a2094a4159..d46998d2fe62 100644
--- a/graphics/gimp1/files/patch-ah
+++ b/graphics/gimp1/files/patch-ah
@@ -1,16 +1,5 @@
---- aclocal.m4.orig	Tue Oct 14 20:48:14 1997
-+++ aclocal.m4	Tue Oct 14 20:49:02 1997
-@@ -48,7 +48,7 @@
- 
- AC_DEFUN(AM_PROG_INSTALL,
- [AC_REQUIRE([AC_PROG_INSTALL])
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -c -m 755'
- AC_SUBST(INSTALL_SCRIPT)dnl
- ])
- 
---- configure.in.orig	Mon Dec 15 11:44:48 1997
-+++ configure.in	Thu Dec 18 00:36:24 1997
+--- configure.in.orig	Sat Jan  3 19:31:29 1998
++++ configure.in	Mon Jan  5 09:42:49 1998
 @@ -120,10 +120,10 @@
  
  dnl Test for libtiff
@@ -35,17 +24,17 @@
  
  dnl This is for generating PDB docuemntation.
  AC_PATH_PROG(EMACS, emacs, :)
---- configure.orig	Mon Dec 15 12:39:24 1997
-+++ configure	Thu Dec 18 00:38:43 1997
-@@ -2722,14 +2722,14 @@
+--- configure.orig	Mon Jan  5 09:44:02 1998
++++ configure	Mon Jan  5 09:46:45 1998
+@@ -2531,14 +2531,14 @@
  fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2727: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2536: 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:2727: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2536: 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
@@ -54,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2735 "configure"
+ #line 2544 "configure"
  #include "confdefs.h"
-@@ -2757,17 +2757,17 @@
+@@ -2566,17 +2566,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -65,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2765: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2574: 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:2765: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2574: 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
@@ -77,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2773 "configure"
+ #line 2582 "configure"
  #include "confdefs.h"
-@@ -2795,7 +2795,7 @@
+@@ -2604,7 +2604,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -88,7 +77,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3933,7 +3933,7 @@
+@@ -3742,7 +3742,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index 182dd9d74684..772e87aa4c10 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -31,15 +31,17 @@ 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/Encript_Decript
+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
@@ -48,8 +50,8 @@ 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/mpeg
 libexec/gimp/0.99/plug-ins/xpm
+libexec/gimp/0.99/plug-ins/mpeg
 libexec/gimp/0.99/plug-ins/CML_explorer
 libexec/gimp/0.99/plug-ins/align_layers
 libexec/gimp/0.99/plug-ins/apply_lens
@@ -140,11 +142,12 @@ 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/snp
 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
@@ -189,6 +192,7 @@ share/gimp/scripts/chrome-logo.scm
 share/gimp/scripts/circle-logo.scm
 share/gimp/scripts/circuit.scm
 share/gimp/scripts/clothify.scm
+share/gimp/scripts/color-cycling.scm
 share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
@@ -260,18 +264,30 @@ share/gimp/brushes/20x20square.gbr
 share/gimp/brushes/20x20squareBlur.gbr
 share/gimp/brushes/3circle.gbr
 share/gimp/brushes/3fcircle.gbr
-share/gimp/brushes/50x50cone.gbr
-share/gimp/brushes/50x50square.gbr
-share/gimp/brushes/50x50squareBlur.gbr
-share/gimp/brushes/50x50squareBlur2.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
+share/gimp/brushes/callig1.gbr
+share/gimp/brushes/callig2.gbr
+share/gimp/brushes/callig3.gbr
+share/gimp/brushes/callig4.gbr
+share/gimp/brushes/confetti.gbr
+share/gimp/brushes/dunes.gbr
+share/gimp/brushes/galaxy.gbr
+share/gimp/brushes/galaxy_big.gbr
+share/gimp/brushes/galaxy_small.gbr
+share/gimp/brushes/pixel.gbr
+share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/50x50cone.gbr
+share/gimp/brushes/50x50square.gbr
+share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
@@ -279,19 +295,13 @@ share/gimp/brushes/bigcircle4.gbr
 share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
-share/gimp/brushes/confetti.gbr
-share/gimp/brushes/dunes.gbr
 share/gimp/brushes/flower.gbr
 share/gimp/brushes/flower_large.gbr
-share/gimp/brushes/galaxy.gbr
-share/gimp/brushes/galaxy_big.gbr
-share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/gecko.gbr
 share/gimp/brushes/grid.gbr
 share/gimp/brushes/grid2.gbr
 share/gimp/brushes/guitar.gbr
 share/gimp/brushes/nova.gbr
-share/gimp/brushes/pixel.gbr
 share/gimp/brushes/point.gbr
 share/gimp/brushes/punch.gbr
 share/gimp/brushes/qbert2.gbr
@@ -302,16 +312,32 @@ share/gimp/brushes/sphere36.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
+share/gimp/brushes/star5.gbr
 share/gimp/brushes/swirl.gbr
 share/gimp/brushes/swirl2.gbr
 share/gimp/brushes/text1.gbr
 share/gimp/brushes/text2.gbr
 share/gimp/brushes/text3.gbr
 share/gimp/brushes/text4.gbr
-share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/tulip.gbr
 share/gimp/brushes/wave.gbr
-share/gimp/brushes/xcf.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
@@ -334,6 +360,8 @@ share/gimp/gradients/Default
 share/gimp/gradients/Flare_Glow_Angular_1
 share/gimp/gradients/Flare_Glow_Radial_1
 share/gimp/gradients/Flare_Glow_Radial_2
+share/gimp/gradients/Flare_Glow_Radial_3
+share/gimp/gradients/Flare_Glow_Radial_4
 share/gimp/gradients/Flare_Radial_101
 share/gimp/gradients/Flare_Radial_102
 share/gimp/gradients/Flare_Radial_103
@@ -351,9 +379,10 @@ share/gimp/gradients/German_flag_smooth
 share/gimp/gradients/Golden
 share/gimp/gradients/Greens
 share/gimp/gradients/Horizon_1
+share/gimp/gradients/Land_1
 share/gimp/gradients/Horizon_2
 share/gimp/gradients/Incandescent
-share/gimp/gradients/Land_1
+share/gimp/gradients/Metallic_Something
 share/gimp/gradients/Mexican_flag
 share/gimp/gradients/Mexican_flag_smooth
 share/gimp/gradients/Nauseating_Headache
@@ -361,6 +390,7 @@ share/gimp/gradients/Neon_Cyan
 share/gimp/gradients/Neon_Green
 share/gimp/gradients/Neon_Yellow
 share/gimp/gradients/Pastel_Rainbow
+share/gimp/gradients/Pastels
 share/gimp/gradients/Purples
 share/gimp/gradients/Radial_Eyeball_Blue
 share/gimp/gradients/Radial_Eyeball_Brown
@@ -372,6 +402,7 @@ share/gimp/gradients/Romanian_flag_smooth
 share/gimp/gradients/Rounded_edge
 share/gimp/gradients/Shadows_1
 share/gimp/gradients/Shadows_2
+share/gimp/gradients/Shadows_3
 share/gimp/gradients/Skyline
 share/gimp/gradients/Skyline_polluted
 share/gimp/gradients/Square_Wood_Frame
@@ -381,48 +412,80 @@ share/gimp/gradients/Tropical_Colors
 share/gimp/gradients/Tube_Red
 share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
+share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
-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/patterns/3dgreen.pat
-share/gimp/patterns/3dweave.pat
 share/gimp/patterns/Craters.pat
 share/gimp/patterns/Moonfoot.pat
-share/gimp/patterns/abstract_flowers.pat
 share/gimp/patterns/amethyst.pat
 share/gimp/patterns/bark.pat
+share/gimp/patterns/blue.pat
+share/gimp/patterns/bluegrid.pat
+share/gimp/patterns/bluesquares.pat
+share/gimp/patterns/blueweb.pat
+share/gimp/patterns/brick.pat
+share/gimp/patterns/burlap.pat
+share/gimp/patterns/burlwood.pat
+share/gimp/patterns/choc_swirl.pat
+share/gimp/patterns/corkboard.pat
+share/gimp/patterns/cracked.pat
+share/gimp/patterns/crinklepaper.pat
+share/gimp/patterns/electric.pat
+share/gimp/patterns/fibers.pat
+share/gimp/patterns/granite1.pat
+share/gimp/patterns/ground1.pat
+share/gimp/patterns/ice.pat
+share/gimp/patterns/java.pat
+share/gimp/patterns/leather.pat
+share/gimp/patterns/leaves.pat
+share/gimp/patterns/leopard.pat
+share/gimp/patterns/lightning.pat
+share/gimp/patterns/marble1.pat
+share/gimp/patterns/marble2.pat
+share/gimp/patterns/marble3.pat
+share/gimp/patterns/nops.pat
+share/gimp/patterns/paper.pat
+share/gimp/patterns/parque1.pat
+share/gimp/patterns/parque2.pat
+share/gimp/patterns/parque3.pat
+share/gimp/patterns/pastel.pat
+share/gimp/patterns/pine.pat
+share/gimp/patterns/pink_marble.pat
+share/gimp/patterns/pool.pat
+share/gimp/patterns/qube1.pat
+share/gimp/patterns/rain.pat
+share/gimp/patterns/recessed.pat
+share/gimp/patterns/redcube.pat
+share/gimp/patterns/rock.pat
+share/gimp/patterns/sky.pat
+share/gimp/patterns/slate.pat
+share/gimp/patterns/sm_squares.pat
+share/gimp/patterns/stone33.pat
+share/gimp/patterns/starfield.pat
+share/gimp/patterns/terra.pat
+share/gimp/patterns/walnut.pat
+share/gimp/patterns/warning.pat
+share/gimp/patterns/wood1.pat
+share/gimp/patterns/wood2.pat
+share/gimp/patterns/wood3.pat
+share/gimp/patterns/wood4.pat
+share/gimp/patterns/wood5.pat
+share/gimp/patterns/3dweave.pat
+share/gimp/patterns/abstract_flowers.pat
 share/gimp/patterns/blackoil.pat
 share/gimp/patterns/blackwhitefloor.pat
 share/gimp/patterns/blob1.pat
 share/gimp/patterns/blob2.pat
-share/gimp/patterns/blue.pat
 share/gimp/patterns/bluebar.pat
 share/gimp/patterns/bluecanyons.pat
-share/gimp/patterns/bluegrid.pat
 share/gimp/patterns/bluemars.pat
 share/gimp/patterns/bluemetal.pat
 share/gimp/patterns/bluespikes.pat
-share/gimp/patterns/bluesquares.pat
-share/gimp/patterns/blueweb.pat
-share/gimp/patterns/brick.pat
 share/gimp/patterns/brownie.pat
-share/gimp/patterns/burlap.pat
-share/gimp/patterns/burlwood.pat
 share/gimp/patterns/bwcubes.pat
 share/gimp/patterns/canyons2.pat
 share/gimp/patterns/cashew.pat
 share/gimp/patterns/chains.pat
-share/gimp/patterns/choc_swirl.pat
 share/gimp/patterns/chroma.pat
 share/gimp/patterns/circuit.pat
 share/gimp/patterns/clouds.pat
@@ -434,12 +497,9 @@ share/gimp/patterns/colored_rock.pat
 share/gimp/patterns/colorwhirl.pat
 share/gimp/patterns/connestoga.pat
 share/gimp/patterns/contrawhirl.pat
-share/gimp/patterns/corkboard.pat
 share/gimp/patterns/cow.pat
-share/gimp/patterns/cracked.pat
 share/gimp/patterns/crash1.pat
 share/gimp/patterns/crazytile.pat
-share/gimp/patterns/crinklepaper.pat
 share/gimp/patterns/crystals.pat
 share/gimp/patterns/curvedledge.pat
 share/gimp/patterns/deepswirl.pat
@@ -447,13 +507,12 @@ share/gimp/patterns/diffpat.pat
 share/gimp/patterns/dirt.pat
 share/gimp/patterns/disco.pat
 share/gimp/patterns/drymud.pat
+share/gimp/patterns/pj.pat
 share/gimp/patterns/dunemaze.pat
 share/gimp/patterns/dunes.pat
 share/gimp/patterns/eggcarton.pat
 share/gimp/patterns/electric-blue-ribbons.pat
-share/gimp/patterns/electric.pat
 share/gimp/patterns/etbf.pat
-share/gimp/patterns/fibers.pat
 share/gimp/patterns/floor_tile.pat
 share/gimp/patterns/funnyblobs.pat
 share/gimp/patterns/funnymess.pat
@@ -461,7 +520,6 @@ share/gimp/patterns/funnymess2.pat
 share/gimp/patterns/fuzzy-colors.pat
 share/gimp/patterns/gold.pat
 share/gimp/patterns/goldcloth.pat
-share/gimp/patterns/granite1.pat
 share/gimp/patterns/granite2.pat
 share/gimp/patterns/green_curtains.pat
 share/gimp/patterns/green_eek.pat
@@ -469,109 +527,75 @@ share/gimp/patterns/greyweave.pat
 share/gimp/patterns/greyweave2.pat
 share/gimp/patterns/grid.pat
 share/gimp/patterns/gridwhirltile.pat
-share/gimp/patterns/ground1.pat
 share/gimp/patterns/headache.pat
 share/gimp/patterns/horiz.pat
-share/gimp/patterns/ice.pat
 share/gimp/patterns/ice2.pat
 share/gimp/patterns/icechex.pat
 share/gimp/patterns/inlay.pat
-share/gimp/patterns/java.pat
 share/gimp/patterns/krinkle.pat
 share/gimp/patterns/land1.pat
 share/gimp/patterns/land2.pat
 share/gimp/patterns/lathe.pat
-share/gimp/patterns/leather.pat
-share/gimp/patterns/leaves.pat
 share/gimp/patterns/leaves3.pat
 share/gimp/patterns/leaves4.pat
 share/gimp/patterns/leaves6.pat
-share/gimp/patterns/leopard.pat
-share/gimp/patterns/lightning.pat
 share/gimp/patterns/lumps.pat
-share/gimp/patterns/marble1.pat
-share/gimp/patterns/marble2.pat
-share/gimp/patterns/marble3.pat
 share/gimp/patterns/meltedcolors.pat
 share/gimp/patterns/metallica.pat
 share/gimp/patterns/metalpaths.pat
 share/gimp/patterns/mhuerock.pat
 share/gimp/patterns/money.pat
 share/gimp/patterns/neurons.pat
-share/gimp/patterns/nops.pat
 share/gimp/patterns/novaugh.pat
 share/gimp/patterns/oooh.pat
 share/gimp/patterns/oooh3.pat
 share/gimp/patterns/orange_eek.pat
 share/gimp/patterns/orangebrown.pat
 share/gimp/patterns/orangecheese.pat
+share/gimp/patterns/wax.pat
 share/gimp/patterns/paint-explosion.pat
-share/gimp/patterns/paper.pat
-share/gimp/patterns/parque1.pat
-share/gimp/patterns/parque2.pat
-share/gimp/patterns/parque3.pat
-share/gimp/patterns/pastel.pat
 share/gimp/patterns/pastel2.pat
 share/gimp/patterns/pebbles.pat
-share/gimp/patterns/pine.pat
-share/gimp/patterns/pink_marble.pat
 share/gimp/patterns/pixeled1.pat
-share/gimp/patterns/pj.pat
-share/gimp/patterns/pool.pat
 share/gimp/patterns/psycho1.pat
 share/gimp/patterns/purple-ribbons.pat
 share/gimp/patterns/purple.pat
 share/gimp/patterns/purple_glow.pat
-share/gimp/patterns/qube1.pat
-share/gimp/patterns/rain.pat
-share/gimp/patterns/recessed.pat
-share/gimp/patterns/redcube.pat
 share/gimp/patterns/redishstuff.pat
 share/gimp/patterns/redmess.pat
 share/gimp/patterns/redrings.pat
-share/gimp/patterns/rock.pat
 share/gimp/patterns/rust.pat
 share/gimp/patterns/sandytext.pat
 share/gimp/patterns/send1.pat
 share/gimp/patterns/silver.pat
-share/gimp/patterns/sky.pat
-share/gimp/patterns/slate.pat
 share/gimp/patterns/slice1.pat
-share/gimp/patterns/sm_squares.pat
 share/gimp/patterns/spectbar.pat
-share/gimp/patterns/starfield.pat
 share/gimp/patterns/startile.pat
-share/gimp/patterns/stone33.pat
 share/gimp/patterns/swirl.pat
 share/gimp/patterns/swirl2.pat
-share/gimp/patterns/terra.pat
 share/gimp/patterns/torrents.pat
 share/gimp/patterns/tube.pat
-share/gimp/patterns/unsharpswirl.pat
-share/gimp/patterns/walnut.pat
-share/gimp/patterns/warning.pat
 share/gimp/patterns/water3.pat
+share/gimp/patterns/unsharpswirl.pat
 share/gimp/patterns/waves.pat
-share/gimp/patterns/wax.pat
 share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
-share/gimp/patterns/wood1.pat
-share/gimp/patterns/wood2.pat
-share/gimp/patterns/wood3.pat
-share/gimp/patterns/wood4.pat
-share/gimp/patterns/wood5.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
 lib/libgimp.so
+@unexec rm %D/%F
 lib/libgimpui.so
+@unexec rm %D/%F
 lib/libgck.so
+@unexec rm %D/%F
 @dirrm include/libgimp
 @dirrm include/gck
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
+@dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
-@dirrm share/gimp/patterns
-@dirrm share/gimp/gradients
 @dirrm share/gimp/palettes
+@dirrm share/gimp/gradients
+@dirrm share/gimp/patterns
 @dirrm share/gimp
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index bc8d5fb5d069..0b7883cd1d96 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.14
+# Version required:     0.99.17
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.15 1997/12/16 23:25:34 erich Exp $
+# $Id: Makefile,v 1.16 1997/12/18 20:40:15 erich Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	16
+MICRO=	17
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}.tar.gz \
-            gimp-data-extras-${MM_VERSION}.tar.gz
+DISTFILES+=	gimp-data-min-${MM_VERSION}a.tar.gz \
+            gimp-data-extras-${MM_VERSION}a.tar.gz
 
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.gimp.org/pub/gimp/0.99/${VERSION}/ \
@@ -44,17 +44,12 @@ DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}; \
+	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
-	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}; \
+	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 
-post-extract:
-	rm -f ${WRKSRC}/plug-ins/gimptcl/scripts/consolio \
-		${WRKSRC}/plug-ins/gimptcl/scripts/pdb_help \
-		${WRKSRC}/plug-ins/gimptcl/scripts/stained_glass
-
 .include <bsd.port.mk>
 
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 3dcdb45a8ad2..56f9833c91b5 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.16.tar.gz) = 3409cc14d5958c25a7761aa43f502668
-MD5 (gimp-data-min-0.99.tar.gz) = 81e4e4571f71f1bd6bba158071671edd
-MD5 (gimp-data-extras-0.99.tar.gz) = 361eed158157acbc65da47ed8332d8fa
+MD5 (gimp-0.99.17.tar.gz) = 6400f3c18c2aa3d908f5f4485645e85f
+MD5 (gimp-data-min-0.99a.tar.gz) = 0716202f1d277ea8e73bc9b4bcde2352
+MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimpshop/files/patch-ac b/graphics/gimpshop/files/patch-ac
deleted file mode 100644
index 6e5af3f2bc81..000000000000
--- a/graphics/gimpshop/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- plug-ins/libgck/gck/Makefile.in.orig	Tue Dec 16 08:26:17 1997
-+++ plug-ins/libgck/gck/Makefile.in	Tue Dec 16 08:26:31 1997
-@@ -111,9 +111,10 @@
- libgck_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir) 
- 
- INCLUDES = \
-+	-I$(srcdir)/..			\
- 	-I$(top_srcdir)		\
--	-I$(includedir)		\
--	-I$(srcdir)/..
-+	-I$(includedir)
-+
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/graphics/gimpshop/files/patch-ah b/graphics/gimpshop/files/patch-ah
index 08a2094a4159..d46998d2fe62 100644
--- a/graphics/gimpshop/files/patch-ah
+++ b/graphics/gimpshop/files/patch-ah
@@ -1,16 +1,5 @@
---- aclocal.m4.orig	Tue Oct 14 20:48:14 1997
-+++ aclocal.m4	Tue Oct 14 20:49:02 1997
-@@ -48,7 +48,7 @@
- 
- AC_DEFUN(AM_PROG_INSTALL,
- [AC_REQUIRE([AC_PROG_INSTALL])
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -c -m 755'
- AC_SUBST(INSTALL_SCRIPT)dnl
- ])
- 
---- configure.in.orig	Mon Dec 15 11:44:48 1997
-+++ configure.in	Thu Dec 18 00:36:24 1997
+--- configure.in.orig	Sat Jan  3 19:31:29 1998
++++ configure.in	Mon Jan  5 09:42:49 1998
 @@ -120,10 +120,10 @@
  
  dnl Test for libtiff
@@ -35,17 +24,17 @@
  
  dnl This is for generating PDB docuemntation.
  AC_PATH_PROG(EMACS, emacs, :)
---- configure.orig	Mon Dec 15 12:39:24 1997
-+++ configure	Thu Dec 18 00:38:43 1997
-@@ -2722,14 +2722,14 @@
+--- configure.orig	Mon Jan  5 09:44:02 1998
++++ configure	Mon Jan  5 09:46:45 1998
+@@ -2531,14 +2531,14 @@
  fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2727: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2536: 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:2727: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2536: 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
@@ -54,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2735 "configure"
+ #line 2544 "configure"
  #include "confdefs.h"
-@@ -2757,17 +2757,17 @@
+@@ -2566,17 +2566,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -65,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2765: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2574: 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:2765: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2574: 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
@@ -77,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2773 "configure"
+ #line 2582 "configure"
  #include "confdefs.h"
-@@ -2795,7 +2795,7 @@
+@@ -2604,7 +2604,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -88,7 +77,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3933,7 +3933,7 @@
+@@ -3742,7 +3742,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 182dd9d74684..772e87aa4c10 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -31,15 +31,17 @@ 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/Encript_Decript
+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
@@ -48,8 +50,8 @@ 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/mpeg
 libexec/gimp/0.99/plug-ins/xpm
+libexec/gimp/0.99/plug-ins/mpeg
 libexec/gimp/0.99/plug-ins/CML_explorer
 libexec/gimp/0.99/plug-ins/align_layers
 libexec/gimp/0.99/plug-ins/apply_lens
@@ -140,11 +142,12 @@ 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/snp
 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
@@ -189,6 +192,7 @@ share/gimp/scripts/chrome-logo.scm
 share/gimp/scripts/circle-logo.scm
 share/gimp/scripts/circuit.scm
 share/gimp/scripts/clothify.scm
+share/gimp/scripts/color-cycling.scm
 share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
@@ -260,18 +264,30 @@ share/gimp/brushes/20x20square.gbr
 share/gimp/brushes/20x20squareBlur.gbr
 share/gimp/brushes/3circle.gbr
 share/gimp/brushes/3fcircle.gbr
-share/gimp/brushes/50x50cone.gbr
-share/gimp/brushes/50x50square.gbr
-share/gimp/brushes/50x50squareBlur.gbr
-share/gimp/brushes/50x50squareBlur2.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
+share/gimp/brushes/callig1.gbr
+share/gimp/brushes/callig2.gbr
+share/gimp/brushes/callig3.gbr
+share/gimp/brushes/callig4.gbr
+share/gimp/brushes/confetti.gbr
+share/gimp/brushes/dunes.gbr
+share/gimp/brushes/galaxy.gbr
+share/gimp/brushes/galaxy_big.gbr
+share/gimp/brushes/galaxy_small.gbr
+share/gimp/brushes/pixel.gbr
+share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/50x50cone.gbr
+share/gimp/brushes/50x50square.gbr
+share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
@@ -279,19 +295,13 @@ share/gimp/brushes/bigcircle4.gbr
 share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
-share/gimp/brushes/confetti.gbr
-share/gimp/brushes/dunes.gbr
 share/gimp/brushes/flower.gbr
 share/gimp/brushes/flower_large.gbr
-share/gimp/brushes/galaxy.gbr
-share/gimp/brushes/galaxy_big.gbr
-share/gimp/brushes/galaxy_small.gbr
 share/gimp/brushes/gecko.gbr
 share/gimp/brushes/grid.gbr
 share/gimp/brushes/grid2.gbr
 share/gimp/brushes/guitar.gbr
 share/gimp/brushes/nova.gbr
-share/gimp/brushes/pixel.gbr
 share/gimp/brushes/point.gbr
 share/gimp/brushes/punch.gbr
 share/gimp/brushes/qbert2.gbr
@@ -302,16 +312,32 @@ share/gimp/brushes/sphere36.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
+share/gimp/brushes/star5.gbr
 share/gimp/brushes/swirl.gbr
 share/gimp/brushes/swirl2.gbr
 share/gimp/brushes/text1.gbr
 share/gimp/brushes/text2.gbr
 share/gimp/brushes/text3.gbr
 share/gimp/brushes/text4.gbr
-share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/tulip.gbr
 share/gimp/brushes/wave.gbr
-share/gimp/brushes/xcf.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
@@ -334,6 +360,8 @@ share/gimp/gradients/Default
 share/gimp/gradients/Flare_Glow_Angular_1
 share/gimp/gradients/Flare_Glow_Radial_1
 share/gimp/gradients/Flare_Glow_Radial_2
+share/gimp/gradients/Flare_Glow_Radial_3
+share/gimp/gradients/Flare_Glow_Radial_4
 share/gimp/gradients/Flare_Radial_101
 share/gimp/gradients/Flare_Radial_102
 share/gimp/gradients/Flare_Radial_103
@@ -351,9 +379,10 @@ share/gimp/gradients/German_flag_smooth
 share/gimp/gradients/Golden
 share/gimp/gradients/Greens
 share/gimp/gradients/Horizon_1
+share/gimp/gradients/Land_1
 share/gimp/gradients/Horizon_2
 share/gimp/gradients/Incandescent
-share/gimp/gradients/Land_1
+share/gimp/gradients/Metallic_Something
 share/gimp/gradients/Mexican_flag
 share/gimp/gradients/Mexican_flag_smooth
 share/gimp/gradients/Nauseating_Headache
@@ -361,6 +390,7 @@ share/gimp/gradients/Neon_Cyan
 share/gimp/gradients/Neon_Green
 share/gimp/gradients/Neon_Yellow
 share/gimp/gradients/Pastel_Rainbow
+share/gimp/gradients/Pastels
 share/gimp/gradients/Purples
 share/gimp/gradients/Radial_Eyeball_Blue
 share/gimp/gradients/Radial_Eyeball_Brown
@@ -372,6 +402,7 @@ share/gimp/gradients/Romanian_flag_smooth
 share/gimp/gradients/Rounded_edge
 share/gimp/gradients/Shadows_1
 share/gimp/gradients/Shadows_2
+share/gimp/gradients/Shadows_3
 share/gimp/gradients/Skyline
 share/gimp/gradients/Skyline_polluted
 share/gimp/gradients/Square_Wood_Frame
@@ -381,48 +412,80 @@ share/gimp/gradients/Tropical_Colors
 share/gimp/gradients/Tube_Red
 share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
+share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
-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/patterns/3dgreen.pat
-share/gimp/patterns/3dweave.pat
 share/gimp/patterns/Craters.pat
 share/gimp/patterns/Moonfoot.pat
-share/gimp/patterns/abstract_flowers.pat
 share/gimp/patterns/amethyst.pat
 share/gimp/patterns/bark.pat
+share/gimp/patterns/blue.pat
+share/gimp/patterns/bluegrid.pat
+share/gimp/patterns/bluesquares.pat
+share/gimp/patterns/blueweb.pat
+share/gimp/patterns/brick.pat
+share/gimp/patterns/burlap.pat
+share/gimp/patterns/burlwood.pat
+share/gimp/patterns/choc_swirl.pat
+share/gimp/patterns/corkboard.pat
+share/gimp/patterns/cracked.pat
+share/gimp/patterns/crinklepaper.pat
+share/gimp/patterns/electric.pat
+share/gimp/patterns/fibers.pat
+share/gimp/patterns/granite1.pat
+share/gimp/patterns/ground1.pat
+share/gimp/patterns/ice.pat
+share/gimp/patterns/java.pat
+share/gimp/patterns/leather.pat
+share/gimp/patterns/leaves.pat
+share/gimp/patterns/leopard.pat
+share/gimp/patterns/lightning.pat
+share/gimp/patterns/marble1.pat
+share/gimp/patterns/marble2.pat
+share/gimp/patterns/marble3.pat
+share/gimp/patterns/nops.pat
+share/gimp/patterns/paper.pat
+share/gimp/patterns/parque1.pat
+share/gimp/patterns/parque2.pat
+share/gimp/patterns/parque3.pat
+share/gimp/patterns/pastel.pat
+share/gimp/patterns/pine.pat
+share/gimp/patterns/pink_marble.pat
+share/gimp/patterns/pool.pat
+share/gimp/patterns/qube1.pat
+share/gimp/patterns/rain.pat
+share/gimp/patterns/recessed.pat
+share/gimp/patterns/redcube.pat
+share/gimp/patterns/rock.pat
+share/gimp/patterns/sky.pat
+share/gimp/patterns/slate.pat
+share/gimp/patterns/sm_squares.pat
+share/gimp/patterns/stone33.pat
+share/gimp/patterns/starfield.pat
+share/gimp/patterns/terra.pat
+share/gimp/patterns/walnut.pat
+share/gimp/patterns/warning.pat
+share/gimp/patterns/wood1.pat
+share/gimp/patterns/wood2.pat
+share/gimp/patterns/wood3.pat
+share/gimp/patterns/wood4.pat
+share/gimp/patterns/wood5.pat
+share/gimp/patterns/3dweave.pat
+share/gimp/patterns/abstract_flowers.pat
 share/gimp/patterns/blackoil.pat
 share/gimp/patterns/blackwhitefloor.pat
 share/gimp/patterns/blob1.pat
 share/gimp/patterns/blob2.pat
-share/gimp/patterns/blue.pat
 share/gimp/patterns/bluebar.pat
 share/gimp/patterns/bluecanyons.pat
-share/gimp/patterns/bluegrid.pat
 share/gimp/patterns/bluemars.pat
 share/gimp/patterns/bluemetal.pat
 share/gimp/patterns/bluespikes.pat
-share/gimp/patterns/bluesquares.pat
-share/gimp/patterns/blueweb.pat
-share/gimp/patterns/brick.pat
 share/gimp/patterns/brownie.pat
-share/gimp/patterns/burlap.pat
-share/gimp/patterns/burlwood.pat
 share/gimp/patterns/bwcubes.pat
 share/gimp/patterns/canyons2.pat
 share/gimp/patterns/cashew.pat
 share/gimp/patterns/chains.pat
-share/gimp/patterns/choc_swirl.pat
 share/gimp/patterns/chroma.pat
 share/gimp/patterns/circuit.pat
 share/gimp/patterns/clouds.pat
@@ -434,12 +497,9 @@ share/gimp/patterns/colored_rock.pat
 share/gimp/patterns/colorwhirl.pat
 share/gimp/patterns/connestoga.pat
 share/gimp/patterns/contrawhirl.pat
-share/gimp/patterns/corkboard.pat
 share/gimp/patterns/cow.pat
-share/gimp/patterns/cracked.pat
 share/gimp/patterns/crash1.pat
 share/gimp/patterns/crazytile.pat
-share/gimp/patterns/crinklepaper.pat
 share/gimp/patterns/crystals.pat
 share/gimp/patterns/curvedledge.pat
 share/gimp/patterns/deepswirl.pat
@@ -447,13 +507,12 @@ share/gimp/patterns/diffpat.pat
 share/gimp/patterns/dirt.pat
 share/gimp/patterns/disco.pat
 share/gimp/patterns/drymud.pat
+share/gimp/patterns/pj.pat
 share/gimp/patterns/dunemaze.pat
 share/gimp/patterns/dunes.pat
 share/gimp/patterns/eggcarton.pat
 share/gimp/patterns/electric-blue-ribbons.pat
-share/gimp/patterns/electric.pat
 share/gimp/patterns/etbf.pat
-share/gimp/patterns/fibers.pat
 share/gimp/patterns/floor_tile.pat
 share/gimp/patterns/funnyblobs.pat
 share/gimp/patterns/funnymess.pat
@@ -461,7 +520,6 @@ share/gimp/patterns/funnymess2.pat
 share/gimp/patterns/fuzzy-colors.pat
 share/gimp/patterns/gold.pat
 share/gimp/patterns/goldcloth.pat
-share/gimp/patterns/granite1.pat
 share/gimp/patterns/granite2.pat
 share/gimp/patterns/green_curtains.pat
 share/gimp/patterns/green_eek.pat
@@ -469,109 +527,75 @@ share/gimp/patterns/greyweave.pat
 share/gimp/patterns/greyweave2.pat
 share/gimp/patterns/grid.pat
 share/gimp/patterns/gridwhirltile.pat
-share/gimp/patterns/ground1.pat
 share/gimp/patterns/headache.pat
 share/gimp/patterns/horiz.pat
-share/gimp/patterns/ice.pat
 share/gimp/patterns/ice2.pat
 share/gimp/patterns/icechex.pat
 share/gimp/patterns/inlay.pat
-share/gimp/patterns/java.pat
 share/gimp/patterns/krinkle.pat
 share/gimp/patterns/land1.pat
 share/gimp/patterns/land2.pat
 share/gimp/patterns/lathe.pat
-share/gimp/patterns/leather.pat
-share/gimp/patterns/leaves.pat
 share/gimp/patterns/leaves3.pat
 share/gimp/patterns/leaves4.pat
 share/gimp/patterns/leaves6.pat
-share/gimp/patterns/leopard.pat
-share/gimp/patterns/lightning.pat
 share/gimp/patterns/lumps.pat
-share/gimp/patterns/marble1.pat
-share/gimp/patterns/marble2.pat
-share/gimp/patterns/marble3.pat
 share/gimp/patterns/meltedcolors.pat
 share/gimp/patterns/metallica.pat
 share/gimp/patterns/metalpaths.pat
 share/gimp/patterns/mhuerock.pat
 share/gimp/patterns/money.pat
 share/gimp/patterns/neurons.pat
-share/gimp/patterns/nops.pat
 share/gimp/patterns/novaugh.pat
 share/gimp/patterns/oooh.pat
 share/gimp/patterns/oooh3.pat
 share/gimp/patterns/orange_eek.pat
 share/gimp/patterns/orangebrown.pat
 share/gimp/patterns/orangecheese.pat
+share/gimp/patterns/wax.pat
 share/gimp/patterns/paint-explosion.pat
-share/gimp/patterns/paper.pat
-share/gimp/patterns/parque1.pat
-share/gimp/patterns/parque2.pat
-share/gimp/patterns/parque3.pat
-share/gimp/patterns/pastel.pat
 share/gimp/patterns/pastel2.pat
 share/gimp/patterns/pebbles.pat
-share/gimp/patterns/pine.pat
-share/gimp/patterns/pink_marble.pat
 share/gimp/patterns/pixeled1.pat
-share/gimp/patterns/pj.pat
-share/gimp/patterns/pool.pat
 share/gimp/patterns/psycho1.pat
 share/gimp/patterns/purple-ribbons.pat
 share/gimp/patterns/purple.pat
 share/gimp/patterns/purple_glow.pat
-share/gimp/patterns/qube1.pat
-share/gimp/patterns/rain.pat
-share/gimp/patterns/recessed.pat
-share/gimp/patterns/redcube.pat
 share/gimp/patterns/redishstuff.pat
 share/gimp/patterns/redmess.pat
 share/gimp/patterns/redrings.pat
-share/gimp/patterns/rock.pat
 share/gimp/patterns/rust.pat
 share/gimp/patterns/sandytext.pat
 share/gimp/patterns/send1.pat
 share/gimp/patterns/silver.pat
-share/gimp/patterns/sky.pat
-share/gimp/patterns/slate.pat
 share/gimp/patterns/slice1.pat
-share/gimp/patterns/sm_squares.pat
 share/gimp/patterns/spectbar.pat
-share/gimp/patterns/starfield.pat
 share/gimp/patterns/startile.pat
-share/gimp/patterns/stone33.pat
 share/gimp/patterns/swirl.pat
 share/gimp/patterns/swirl2.pat
-share/gimp/patterns/terra.pat
 share/gimp/patterns/torrents.pat
 share/gimp/patterns/tube.pat
-share/gimp/patterns/unsharpswirl.pat
-share/gimp/patterns/walnut.pat
-share/gimp/patterns/warning.pat
 share/gimp/patterns/water3.pat
+share/gimp/patterns/unsharpswirl.pat
 share/gimp/patterns/waves.pat
-share/gimp/patterns/wax.pat
 share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
-share/gimp/patterns/wood1.pat
-share/gimp/patterns/wood2.pat
-share/gimp/patterns/wood3.pat
-share/gimp/patterns/wood4.pat
-share/gimp/patterns/wood5.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
 lib/libgimp.so
+@unexec rm %D/%F
 lib/libgimpui.so
+@unexec rm %D/%F
 lib/libgck.so
+@unexec rm %D/%F
 @dirrm include/libgimp
 @dirrm include/gck
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
+@dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
-@dirrm share/gimp/patterns
-@dirrm share/gimp/gradients
 @dirrm share/gimp/palettes
+@dirrm share/gimp/gradients
+@dirrm share/gimp/patterns
 @dirrm share/gimp