Upgrade to 0.99.28.

PR:		ports/6442
Submitted by:	Donald Burr <dburr@POBoxes.com>

36 files changed, 948 insertions, 900 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 515519bafb86..e79c13730011 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.19
+# Version required:     0.99.28
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.27 1998/04/19 11:37:17 andreas Exp $
+# $Id: Makefile,v 1.28 1998/04/19 17:03:57 andreas Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	26
+MICRO=	28
 
 VERSION=	${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION=	${MAJOR}.${MINOR}
@@ -40,6 +40,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
 
+MAN1=		gimp.1
+
 DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 58fadd3c77a0..15286709020e 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-0.99.26.tar.gz) = 5007046065c3640ca8ead70d9a5a9ea5
+MD5 (gimp-0.99.28.tar.gz) = 22912ec257b264ad0f664d214eac2371
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp-app-devel/files/patch-aa b/graphics/gimp-app-devel/files/patch-aa
new file mode 100644
index 000000000000..8be51189fdab
--- /dev/null
+++ b/graphics/gimp-app-devel/files/patch-aa
@@ -0,0 +1,11 @@
+--- app/main.c.old	Tue Apr 28 09:54:27 1998
++++ app/main.c	Tue Apr 28 09:53:51 1998
+@@ -80,6 +80,8 @@
+   int i, j;
+   gchar *display_name, *display_env;
+ 
++#define ATEXIT(proc)   (atexit (proc))
++
+   ATEXIT (g_mem_profile);
+ 
+   /* Initialize variables */
diff --git a/graphics/gimp-app-devel/files/patch-ab b/graphics/gimp-app-devel/files/patch-ab
index e8b6e0cc0bad..3c90bafc4593 100644
--- a/graphics/gimp-app-devel/files/patch-ab
+++ b/graphics/gimp-app-devel/files/patch-ab
@@ -18,14 +18,3 @@
    else
 
 
---- plug-ins/mail/mail.c.orig	Tue Nov 25 06:04:27 1997
-+++ plug-ins/mail/mail.c	Thu Dec 18 00:40:23 1997
-@@ -89,7 +89,7 @@
-    *
-  */
- #ifndef MAILER
--#define MAILER "/usr/lib/sendmail"
-+#define MAILER "/usr/sbin/sendmail"
- #endif
- 
- #ifndef UUENCODE
diff --git a/graphics/gimp-app-devel/files/patch-ah b/graphics/gimp-app-devel/files/patch-ah
index cb95c3ff7920..79f3c093e80f 100644
--- a/graphics/gimp-app-devel/files/patch-ah
+++ b/graphics/gimp-app-devel/files/patch-ah
@@ -1,5 +1,5 @@
---- configure.in~	Thu Apr 16 20:00:52 1998
-+++ configure.in	Thu Apr 16 20:02:07 1998
+--- configure.in.old	Tue Apr 28 09:04:13 1998
++++ configure.in	Tue Apr 28 09:07:13 1998
 @@ -115,13 +115,13 @@
  
  dnl Test for libtiff
@@ -13,12 +13,12 @@
 -      AC_CHECK_LIB(tiff, TIFFWriteScanline,
 +      AC_CHECK_LIB(tiff34, TIFFWriteScanline,
  	AC_CHECK_HEADER(tiffio.h,
--          TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
-+          TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg',
+-          TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz',
++          TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz',
  	  AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
-         AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -lz -ljpeg -lm), -lm)
-   fi
-@@ -299,7 +299,7 @@
+ 	AC_CHECK_LIB(tiff34, TIFFFlushData,
+ 	  AC_CHECK_HEADER(tiffio.h,
+@@ -303,7 +303,7 @@
  LIBS="$gimp_save_LIBS"
  
  gimpdatadir=$datadir/gimp
@@ -27,17 +27,17 @@
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
  gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
---- configure~	Thu Apr 16 20:00:58 1998
-+++ configure	Thu Apr 16 20:04:59 1998
-@@ -2282,14 +2282,14 @@
+--- configure.old	Tue Apr 28 09:04:06 1998
++++ configure	Tue Apr 28 09:09:45 1998
+@@ -2281,14 +2281,14 @@
    fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2287: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2286: 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:2287: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2286: 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
@@ -46,9 +46,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2295 "configure"
+ #line 2294 "configure"
  #include "confdefs.h"
-@@ -2345,7 +2345,7 @@
+@@ -2344,7 +2344,7 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -57,35 +57,35 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -2353,14 +2353,14 @@
+@@ -2352,14 +2352,14 @@
  
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2358: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2357: 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:2358: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2357: 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
  else
    ac_save_LIBS="$LIBS"
--LIBS="-ltiff -lz -ljpeg -lm $LIBS"
-+LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
+-LIBS="-ltiff -ljpeg -lz -lm $LIBS"
++LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2366 "configure"
+ #line 2365 "configure"
  #include "confdefs.h"
-@@ -2416,7 +2416,7 @@
+@@ -2415,7 +2415,7 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
--  TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg'
-+  TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg'
+-  TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz'
++  TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz'
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -4070,7 +4070,7 @@
+@@ -4144,7 +4144,7 @@
  LIBS="$gimp_save_LIBS"
  
  gimpdatadir=$datadir/gimp
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index e8f70f9e83f1..7cdeea880bec 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -1,12 +1,30 @@
-lib/libgimp.so.1.0
-lib/libgimp.la
+bin/gimp
+include/megawidget.h
+include/gck/gck.h
+include/gck/gckcolor.h
+include/gck/gckcommon.h
+include/gck/gckimage.h
+include/gck/gcklistbox.h
+include/gck/gckmath.h
+include/gck/gcktypes.h
+include/gck/gckui.h
+include/gck/gckvector.h
+include/libgimp/gimp.h
+include/libgimp/gimpenums.h
+include/libgimp/gimpmenu.h
+include/libgimp/gimpui.h
+lib/libgck.a
+lib/libgck.la
+lib/libgck.so
+lib/libgck.so.1.0
 lib/libgimp.a
-lib/libgimpui.so.1.0
-lib/libgimpui.la
+lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.1.0
 lib/libgimpui.a
-lib/libgck.so.1.0
-lib/libgck.la
-lib/libgck.a
+lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.1.0
 lib/libmegawidget.a
 libexec/gimp/0.99/plug-ins/AlienMap
 libexec/gimp/0.99/plug-ins/CEL
@@ -53,6 +71,7 @@ libexec/gimp/0.99/plug-ins/gauss_rle
 libexec/gimp/0.99/plug-ins/gbr
 libexec/gimp/0.99/plug-ins/gfig
 libexec/gimp/0.99/plug-ins/gfli
+libexec/gimp/0.99/plug-ins/gee
 libexec/gimp/0.99/plug-ins/gicon
 libexec/gimp/0.99/plug-ins/gif
 libexec/gimp/0.99/plug-ins/glasstile
@@ -93,14 +112,17 @@ libexec/gimp/0.99/plug-ins/pnm
 libexec/gimp/0.99/plug-ins/polar
 libexec/gimp/0.99/plug-ins/print
 libexec/gimp/0.99/plug-ins/ps
+libexec/gimp/0.99/plug-ins/psd
 libexec/gimp/0.99/plug-ins/randomize
 libexec/gimp/0.99/plug-ins/ripple
 libexec/gimp/0.99/plug-ins/rotate
 libexec/gimp/0.99/plug-ins/rotators
 libexec/gimp/0.99/plug-ins/scatter_hsv
+libexec/gimp/0.99/plug-ins/screenshot
 libexec/gimp/0.99/plug-ins/script-fu
 libexec/gimp/0.99/plug-ins/semiflatten
 libexec/gimp/0.99/plug-ins/sgi
+libexec/gimp/0.99/plug-ins/sharpen
 libexec/gimp/0.99/plug-ins/shift
 libexec/gimp/0.99/plug-ins/sinus
 libexec/gimp/0.99/plug-ins/smooth_palette
@@ -128,20 +150,7 @@ libexec/gimp/0.99/plug-ins/xd
 libexec/gimp/0.99/plug-ins/xpm
 libexec/gimp/0.99/plug-ins/xwd
 libexec/gimp/0.99/plug-ins/zealouscrop
-include/libgimp/gimp.h
-include/libgimp/gimpenums.h
-include/libgimp/gimpmenu.h
-include/libgimp/gimpui.h
-include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gckvector.h
-include/megawidget.h
+man/man1/gimp.1.gz
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -159,10 +168,6 @@ 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/5fcircle.gbr
 share/gimp/brushes/5x5square.gbr
@@ -174,30 +179,36 @@ share/gimp/brushes/9fcircle.gbr
 share/gimp/brushes/DStar11.gbr
 share/gimp/brushes/DStar17.gbr
 share/gimp/brushes/DStar25.gbr
-share/gimp/brushes/bigcircle.gbr
-share/gimp/brushes/bigcircle2.gbr
-share/gimp/brushes/bigcircle3.gbr
-share/gimp/brushes/bigcircle4.gbr
-share/gimp/brushes/bird.gbr
-share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/callig1.gbr
 share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
 share/gimp/brushes/callig4.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/pixel.gbr
+share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/xcf.gbr
+share/gimp/brushes/50x50cone.gbr
+share/gimp/brushes/50x50square.gbr
+share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/50x50squareBlur2.gbr
+share/gimp/brushes/bigcircle.gbr
+share/gimp/brushes/bigcircle2.gbr
+share/gimp/brushes/bigcircle3.gbr
+share/gimp/brushes/bigcircle4.gbr
+share/gimp/brushes/bird.gbr
+share/gimp/brushes/bullethole.gbr
+share/gimp/brushes/cloth.gbr
+share/gimp/brushes/flower.gbr
+share/gimp/brushes/flower_large.gbr
 share/gimp/brushes/gecko.gbr
 share/gimp/brushes/grid.gbr
 share/gimp/brushes/grid2.gbr
 share/gimp/brushes/guitar.gbr
 share/gimp/brushes/nova.gbr
-share/gimp/brushes/pixel.gbr
 share/gimp/brushes/point.gbr
 share/gimp/brushes/punch.gbr
 share/gimp/brushes/qbert2.gbr
@@ -205,10 +216,10 @@ share/gimp/brushes/qbert3Blur.gbr
 share/gimp/brushes/reach.gbr
 share/gimp/brushes/sphere29.gbr
 share/gimp/brushes/sphere36.gbr
+share/gimp/brushes/star1.gbr
 share/gimp/brushes/sphere47.gbr
 share/gimp/brushes/sphere55.gbr
 share/gimp/brushes/sphere79.gbr
-share/gimp/brushes/star1.gbr
 share/gimp/brushes/star2.gbr
 share/gimp/brushes/star3.gbr
 share/gimp/brushes/star4.gbr
@@ -219,10 +230,8 @@ 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/gfig/A_star
 share/gimp/gfig/curves
 share/gimp/gfig/polys
@@ -233,11 +242,6 @@ share/gimp/gfig/spirals_and_stars
 share/gimp/gfig/sprial
 share/gimp/gfig/star2
 share/gimp/gfig/stars
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_splash.ppm
-share/gimp/gimp_tips.txt
-share/gimp/gimprc
-share/gimp/gimprc_user
 share/gimp/gradients/Abstract_1
 share/gimp/gradients/Abstract_2
 share/gimp/gradients/Abstract_3
@@ -279,9 +283,9 @@ 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
@@ -314,7 +318,6 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
-share/gimp/gtkrc
 share/gimp/palettes/Bears
 share/gimp/palettes/Bgold
 share/gimp/palettes/Blues
@@ -342,8 +345,8 @@ share/gimp/palettes/Muted
 share/gimp/palettes/Named_Colors
 share/gimp/palettes/News3
 share/gimp/palettes/Op2
-share/gimp/palettes/Paintjet
 share/gimp/palettes/Pastels
+share/gimp/palettes/Paintjet
 share/gimp/palettes/Plasma
 share/gimp/palettes/Reds
 share/gimp/palettes/Reds_And_Purples
@@ -353,34 +356,77 @@ share/gimp/palettes/Volcano
 share/gimp/palettes/Warm_Colors
 share/gimp/palettes/Web
 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
@@ -392,12 +438,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
@@ -405,13 +448,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
@@ -419,7 +461,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
@@ -427,100 +468,61 @@ 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
-share/gimp/ps-menurc
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -537,8 +539,8 @@ share/gimp/scripts/beveled-pattern-arrow.scm
 share/gimp/scripts/beveled-pattern-bullet.scm
 share/gimp/scripts/beveled-pattern-button.scm
 share/gimp/scripts/beveled-pattern-heading.scm
-share/gimp/scripts/beveled-pattern-hrule.scm
 share/gimp/scripts/blend-anim.scm
+share/gimp/scripts/beveled-pattern-hrule.scm
 share/gimp/scripts/blended-logo.scm
 share/gimp/scripts/bovinated-logo.scm
 share/gimp/scripts/carve-it.scm
@@ -555,6 +557,7 @@ share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
 share/gimp/scripts/drop-shadow.scm
+share/gimp/scripts/egg.scm
 share/gimp/scripts/erase-rows.scm
 share/gimp/scripts/flatland.scm
 share/gimp/scripts/font-map.scm
@@ -600,22 +603,25 @@ share/gimp/scripts/truchet.scm
 share/gimp/scripts/unsharp-mask.scm
 share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
-share/gimp/scripts/web-browser.scm
 share/gimp/scripts/xach-effect.scm
+share/gimp/scripts/web-browser.scm
 share/gimp/user_install
-bin/gimp
-lib/libgimp.so
-lib/libgimpui.so
-lib/libgck.so
+share/gimp/gimprc
+share/gimp/gimprc_user
+share/gimp/gtkrc
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimp_tips.txt
+share/gimp/ps-menurc
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
 @dirrm include/libgimp
 @dirrm include/gck
-@dirrm share/gimp/scripts
-@dirrm share/gimp/gfig
 @dirrm share/gimp/brushes
+@dirrm share/gimp/gfig
 @dirrm share/gimp/gradients
 @dirrm share/gimp/palettes
 @dirrm share/gimp/patterns
+@dirrm share/gimp/scripts
 @dirrm share/gimp
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 515519bafb86..e79c13730011 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.19
+# Version required:     0.99.28
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.27 1998/04/19 11:37:17 andreas Exp $
+# $Id: Makefile,v 1.28 1998/04/19 17:03:57 andreas Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	26
+MICRO=	28
 
 VERSION=	${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION=	${MAJOR}.${MINOR}
@@ -40,6 +40,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
 
+MAN1=		gimp.1
+
 DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 58fadd3c77a0..15286709020e 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-0.99.26.tar.gz) = 5007046065c3640ca8ead70d9a5a9ea5
+MD5 (gimp-0.99.28.tar.gz) = 22912ec257b264ad0f664d214eac2371
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp-app/files/patch-aa b/graphics/gimp-app/files/patch-aa
new file mode 100644
index 000000000000..8be51189fdab
--- /dev/null
+++ b/graphics/gimp-app/files/patch-aa
@@ -0,0 +1,11 @@
+--- app/main.c.old	Tue Apr 28 09:54:27 1998
++++ app/main.c	Tue Apr 28 09:53:51 1998
+@@ -80,6 +80,8 @@
+   int i, j;
+   gchar *display_name, *display_env;
+ 
++#define ATEXIT(proc)   (atexit (proc))
++
+   ATEXIT (g_mem_profile);
+ 
+   /* Initialize variables */
diff --git a/graphics/gimp-app/files/patch-ab b/graphics/gimp-app/files/patch-ab
index e8b6e0cc0bad..3c90bafc4593 100644
--- a/graphics/gimp-app/files/patch-ab
+++ b/graphics/gimp-app/files/patch-ab
@@ -18,14 +18,3 @@
    else
 
 
---- plug-ins/mail/mail.c.orig	Tue Nov 25 06:04:27 1997
-+++ plug-ins/mail/mail.c	Thu Dec 18 00:40:23 1997
-@@ -89,7 +89,7 @@
-    *
-  */
- #ifndef MAILER
--#define MAILER "/usr/lib/sendmail"
-+#define MAILER "/usr/sbin/sendmail"
- #endif
- 
- #ifndef UUENCODE
diff --git a/graphics/gimp-app/files/patch-ah b/graphics/gimp-app/files/patch-ah
index cb95c3ff7920..79f3c093e80f 100644
--- a/graphics/gimp-app/files/patch-ah
+++ b/graphics/gimp-app/files/patch-ah
@@ -1,5 +1,5 @@
---- configure.in~	Thu Apr 16 20:00:52 1998
-+++ configure.in	Thu Apr 16 20:02:07 1998
+--- configure.in.old	Tue Apr 28 09:04:13 1998
++++ configure.in	Tue Apr 28 09:07:13 1998
 @@ -115,13 +115,13 @@
  
  dnl Test for libtiff
@@ -13,12 +13,12 @@
 -      AC_CHECK_LIB(tiff, TIFFWriteScanline,
 +      AC_CHECK_LIB(tiff34, TIFFWriteScanline,
  	AC_CHECK_HEADER(tiffio.h,
--          TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
-+          TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg',
+-          TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz',
++          TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz',
  	  AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
-         AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -lz -ljpeg -lm), -lm)
-   fi
-@@ -299,7 +299,7 @@
+ 	AC_CHECK_LIB(tiff34, TIFFFlushData,
+ 	  AC_CHECK_HEADER(tiffio.h,
+@@ -303,7 +303,7 @@
  LIBS="$gimp_save_LIBS"
  
  gimpdatadir=$datadir/gimp
@@ -27,17 +27,17 @@
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
  gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
---- configure~	Thu Apr 16 20:00:58 1998
-+++ configure	Thu Apr 16 20:04:59 1998
-@@ -2282,14 +2282,14 @@
+--- configure.old	Tue Apr 28 09:04:06 1998
++++ configure	Tue Apr 28 09:09:45 1998
+@@ -2281,14 +2281,14 @@
    fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2287: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2286: 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:2287: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2286: 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
@@ -46,9 +46,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2295 "configure"
+ #line 2294 "configure"
  #include "confdefs.h"
-@@ -2345,7 +2345,7 @@
+@@ -2344,7 +2344,7 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -57,35 +57,35 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -2353,14 +2353,14 @@
+@@ -2352,14 +2352,14 @@
  
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2358: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2357: 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:2358: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2357: 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
  else
    ac_save_LIBS="$LIBS"
--LIBS="-ltiff -lz -ljpeg -lm $LIBS"
-+LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
+-LIBS="-ltiff -ljpeg -lz -lm $LIBS"
++LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2366 "configure"
+ #line 2365 "configure"
  #include "confdefs.h"
-@@ -2416,7 +2416,7 @@
+@@ -2415,7 +2415,7 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
--  TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg'
-+  TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg'
+-  TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz'
++  TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz'
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -4070,7 +4070,7 @@
+@@ -4144,7 +4144,7 @@
  LIBS="$gimp_save_LIBS"
  
  gimpdatadir=$datadir/gimp
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index e8f70f9e83f1..7cdeea880bec 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1,12 +1,30 @@
-lib/libgimp.so.1.0
-lib/libgimp.la
+bin/gimp
+include/megawidget.h
+include/gck/gck.h
+include/gck/gckcolor.h
+include/gck/gckcommon.h
+include/gck/gckimage.h
+include/gck/gcklistbox.h
+include/gck/gckmath.h
+include/gck/gcktypes.h
+include/gck/gckui.h
+include/gck/gckvector.h
+include/libgimp/gimp.h
+include/libgimp/gimpenums.h
+include/libgimp/gimpmenu.h
+include/libgimp/gimpui.h
+lib/libgck.a
+lib/libgck.la
+lib/libgck.so
+lib/libgck.so.1.0
 lib/libgimp.a
-lib/libgimpui.so.1.0
-lib/libgimpui.la
+lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.1.0
 lib/libgimpui.a
-lib/libgck.so.1.0
-lib/libgck.la
-lib/libgck.a
+lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.1.0
 lib/libmegawidget.a
 libexec/gimp/0.99/plug-ins/AlienMap
 libexec/gimp/0.99/plug-ins/CEL
@@ -53,6 +71,7 @@ libexec/gimp/0.99/plug-ins/gauss_rle
 libexec/gimp/0.99/plug-ins/gbr
 libexec/gimp/0.99/plug-ins/gfig
 libexec/gimp/0.99/plug-ins/gfli
+libexec/gimp/0.99/plug-ins/gee
 libexec/gimp/0.99/plug-ins/gicon
 libexec/gimp/0.99/plug-ins/gif
 libexec/gimp/0.99/plug-ins/glasstile
@@ -93,14 +112,17 @@ libexec/gimp/0.99/plug-ins/pnm
 libexec/gimp/0.99/plug-ins/polar
 libexec/gimp/0.99/plug-ins/print
 libexec/gimp/0.99/plug-ins/ps
+libexec/gimp/0.99/plug-ins/psd
 libexec/gimp/0.99/plug-ins/randomize
 libexec/gimp/0.99/plug-ins/ripple
 libexec/gimp/0.99/plug-ins/rotate
 libexec/gimp/0.99/plug-ins/rotators
 libexec/gimp/0.99/plug-ins/scatter_hsv
+libexec/gimp/0.99/plug-ins/screenshot
 libexec/gimp/0.99/plug-ins/script-fu
 libexec/gimp/0.99/plug-ins/semiflatten
 libexec/gimp/0.99/plug-ins/sgi
+libexec/gimp/0.99/plug-ins/sharpen
 libexec/gimp/0.99/plug-ins/shift
 libexec/gimp/0.99/plug-ins/sinus
 libexec/gimp/0.99/plug-ins/smooth_palette
@@ -128,20 +150,7 @@ libexec/gimp/0.99/plug-ins/xd
 libexec/gimp/0.99/plug-ins/xpm
 libexec/gimp/0.99/plug-ins/xwd
 libexec/gimp/0.99/plug-ins/zealouscrop
-include/libgimp/gimp.h
-include/libgimp/gimpenums.h
-include/libgimp/gimpmenu.h
-include/libgimp/gimpui.h
-include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gckvector.h
-include/megawidget.h
+man/man1/gimp.1.gz
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -159,10 +168,6 @@ 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/5fcircle.gbr
 share/gimp/brushes/5x5square.gbr
@@ -174,30 +179,36 @@ share/gimp/brushes/9fcircle.gbr
 share/gimp/brushes/DStar11.gbr
 share/gimp/brushes/DStar17.gbr
 share/gimp/brushes/DStar25.gbr
-share/gimp/brushes/bigcircle.gbr
-share/gimp/brushes/bigcircle2.gbr
-share/gimp/brushes/bigcircle3.gbr
-share/gimp/brushes/bigcircle4.gbr
-share/gimp/brushes/bird.gbr
-share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/callig1.gbr
 share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
 share/gimp/brushes/callig4.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/pixel.gbr
+share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/xcf.gbr
+share/gimp/brushes/50x50cone.gbr
+share/gimp/brushes/50x50square.gbr
+share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/50x50squareBlur2.gbr
+share/gimp/brushes/bigcircle.gbr
+share/gimp/brushes/bigcircle2.gbr
+share/gimp/brushes/bigcircle3.gbr
+share/gimp/brushes/bigcircle4.gbr
+share/gimp/brushes/bird.gbr
+share/gimp/brushes/bullethole.gbr
+share/gimp/brushes/cloth.gbr
+share/gimp/brushes/flower.gbr
+share/gimp/brushes/flower_large.gbr
 share/gimp/brushes/gecko.gbr
 share/gimp/brushes/grid.gbr
 share/gimp/brushes/grid2.gbr
 share/gimp/brushes/guitar.gbr
 share/gimp/brushes/nova.gbr
-share/gimp/brushes/pixel.gbr
 share/gimp/brushes/point.gbr
 share/gimp/brushes/punch.gbr
 share/gimp/brushes/qbert2.gbr
@@ -205,10 +216,10 @@ share/gimp/brushes/qbert3Blur.gbr
 share/gimp/brushes/reach.gbr
 share/gimp/brushes/sphere29.gbr
 share/gimp/brushes/sphere36.gbr
+share/gimp/brushes/star1.gbr
 share/gimp/brushes/sphere47.gbr
 share/gimp/brushes/sphere55.gbr
 share/gimp/brushes/sphere79.gbr
-share/gimp/brushes/star1.gbr
 share/gimp/brushes/star2.gbr
 share/gimp/brushes/star3.gbr
 share/gimp/brushes/star4.gbr
@@ -219,10 +230,8 @@ 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/gfig/A_star
 share/gimp/gfig/curves
 share/gimp/gfig/polys
@@ -233,11 +242,6 @@ share/gimp/gfig/spirals_and_stars
 share/gimp/gfig/sprial
 share/gimp/gfig/star2
 share/gimp/gfig/stars
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_splash.ppm
-share/gimp/gimp_tips.txt
-share/gimp/gimprc
-share/gimp/gimprc_user
 share/gimp/gradients/Abstract_1
 share/gimp/gradients/Abstract_2
 share/gimp/gradients/Abstract_3
@@ -279,9 +283,9 @@ 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
@@ -314,7 +318,6 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
-share/gimp/gtkrc
 share/gimp/palettes/Bears
 share/gimp/palettes/Bgold
 share/gimp/palettes/Blues
@@ -342,8 +345,8 @@ share/gimp/palettes/Muted
 share/gimp/palettes/Named_Colors
 share/gimp/palettes/News3
 share/gimp/palettes/Op2
-share/gimp/palettes/Paintjet
 share/gimp/palettes/Pastels
+share/gimp/palettes/Paintjet
 share/gimp/palettes/Plasma
 share/gimp/palettes/Reds
 share/gimp/palettes/Reds_And_Purples
@@ -353,34 +356,77 @@ share/gimp/palettes/Volcano
 share/gimp/palettes/Warm_Colors
 share/gimp/palettes/Web
 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
@@ -392,12 +438,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
@@ -405,13 +448,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
@@ -419,7 +461,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
@@ -427,100 +468,61 @@ 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
-share/gimp/ps-menurc
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -537,8 +539,8 @@ share/gimp/scripts/beveled-pattern-arrow.scm
 share/gimp/scripts/beveled-pattern-bullet.scm
 share/gimp/scripts/beveled-pattern-button.scm
 share/gimp/scripts/beveled-pattern-heading.scm
-share/gimp/scripts/beveled-pattern-hrule.scm
 share/gimp/scripts/blend-anim.scm
+share/gimp/scripts/beveled-pattern-hrule.scm
 share/gimp/scripts/blended-logo.scm
 share/gimp/scripts/bovinated-logo.scm
 share/gimp/scripts/carve-it.scm
@@ -555,6 +557,7 @@ share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
 share/gimp/scripts/drop-shadow.scm
+share/gimp/scripts/egg.scm
 share/gimp/scripts/erase-rows.scm
 share/gimp/scripts/flatland.scm
 share/gimp/scripts/font-map.scm
@@ -600,22 +603,25 @@ share/gimp/scripts/truchet.scm
 share/gimp/scripts/unsharp-mask.scm
 share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
-share/gimp/scripts/web-browser.scm
 share/gimp/scripts/xach-effect.scm
+share/gimp/scripts/web-browser.scm
 share/gimp/user_install
-bin/gimp
-lib/libgimp.so
-lib/libgimpui.so
-lib/libgck.so
+share/gimp/gimprc
+share/gimp/gimprc_user
+share/gimp/gtkrc
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimp_tips.txt
+share/gimp/ps-menurc
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
 @dirrm include/libgimp
 @dirrm include/gck
-@dirrm share/gimp/scripts
-@dirrm share/gimp/gfig
 @dirrm share/gimp/brushes
+@dirrm share/gimp/gfig
 @dirrm share/gimp/gradients
 @dirrm share/gimp/palettes
 @dirrm share/gimp/patterns
+@dirrm share/gimp/scripts
 @dirrm share/gimp
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 515519bafb86..e79c13730011 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.19
+# Version required:     0.99.28
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.27 1998/04/19 11:37:17 andreas Exp $
+# $Id: Makefile,v 1.28 1998/04/19 17:03:57 andreas Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	26
+MICRO=	28
 
 VERSION=	${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION=	${MAJOR}.${MINOR}
@@ -40,6 +40,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
 
+MAN1=		gimp.1
+
 DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index 58fadd3c77a0..15286709020e 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-0.99.26.tar.gz) = 5007046065c3640ca8ead70d9a5a9ea5
+MD5 (gimp-0.99.28.tar.gz) = 22912ec257b264ad0f664d214eac2371
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp-devel/files/patch-aa b/graphics/gimp-devel/files/patch-aa
new file mode 100644
index 000000000000..8be51189fdab
--- /dev/null
+++ b/graphics/gimp-devel/files/patch-aa
@@ -0,0 +1,11 @@
+--- app/main.c.old	Tue Apr 28 09:54:27 1998
++++ app/main.c	Tue Apr 28 09:53:51 1998
+@@ -80,6 +80,8 @@
+   int i, j;
+   gchar *display_name, *display_env;
+ 
++#define ATEXIT(proc)   (atexit (proc))
++
+   ATEXIT (g_mem_profile);
+ 
+   /* Initialize variables */
diff --git a/graphics/gimp-devel/files/patch-ab b/graphics/gimp-devel/files/patch-ab
index e8b6e0cc0bad..3c90bafc4593 100644
--- a/graphics/gimp-devel/files/patch-ab
+++ b/graphics/gimp-devel/files/patch-ab
@@ -18,14 +18,3 @@
    else
 
 
---- plug-ins/mail/mail.c.orig	Tue Nov 25 06:04:27 1997
-+++ plug-ins/mail/mail.c	Thu Dec 18 00:40:23 1997
-@@ -89,7 +89,7 @@
-    *
-  */
- #ifndef MAILER
--#define MAILER "/usr/lib/sendmail"
-+#define MAILER "/usr/sbin/sendmail"
- #endif
- 
- #ifndef UUENCODE
diff --git a/graphics/gimp-devel/files/patch-ah b/graphics/gimp-devel/files/patch-ah
index cb95c3ff7920..79f3c093e80f 100644
--- a/graphics/gimp-devel/files/patch-ah
+++ b/graphics/gimp-devel/files/patch-ah
@@ -1,5 +1,5 @@
---- configure.in~	Thu Apr 16 20:00:52 1998
-+++ configure.in	Thu Apr 16 20:02:07 1998
+--- configure.in.old	Tue Apr 28 09:04:13 1998
++++ configure.in	Tue Apr 28 09:07:13 1998
 @@ -115,13 +115,13 @@
  
  dnl Test for libtiff
@@ -13,12 +13,12 @@
 -      AC_CHECK_LIB(tiff, TIFFWriteScanline,
 +      AC_CHECK_LIB(tiff34, TIFFWriteScanline,
  	AC_CHECK_HEADER(tiffio.h,
--          TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
-+          TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg',
+-          TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz',
++          TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz',
  	  AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
-         AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -lz -ljpeg -lm), -lm)
-   fi
-@@ -299,7 +299,7 @@
+ 	AC_CHECK_LIB(tiff34, TIFFFlushData,
+ 	  AC_CHECK_HEADER(tiffio.h,
+@@ -303,7 +303,7 @@
  LIBS="$gimp_save_LIBS"
  
  gimpdatadir=$datadir/gimp
@@ -27,17 +27,17 @@
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
  gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
---- configure~	Thu Apr 16 20:00:58 1998
-+++ configure	Thu Apr 16 20:04:59 1998
-@@ -2282,14 +2282,14 @@
+--- configure.old	Tue Apr 28 09:04:06 1998
++++ configure	Tue Apr 28 09:09:45 1998
+@@ -2281,14 +2281,14 @@
    fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2287: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2286: 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:2287: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2286: 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
@@ -46,9 +46,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2295 "configure"
+ #line 2294 "configure"
  #include "confdefs.h"
-@@ -2345,7 +2345,7 @@
+@@ -2344,7 +2344,7 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -57,35 +57,35 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -2353,14 +2353,14 @@
+@@ -2352,14 +2352,14 @@
  
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2358: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2357: 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:2358: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2357: 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
  else
    ac_save_LIBS="$LIBS"
--LIBS="-ltiff -lz -ljpeg -lm $LIBS"
-+LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
+-LIBS="-ltiff -ljpeg -lz -lm $LIBS"
++LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2366 "configure"
+ #line 2365 "configure"
  #include "confdefs.h"
-@@ -2416,7 +2416,7 @@
+@@ -2415,7 +2415,7 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
--  TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg'
-+  TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg'
+-  TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz'
++  TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz'
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -4070,7 +4070,7 @@
+@@ -4144,7 +4144,7 @@
  LIBS="$gimp_save_LIBS"
  
  gimpdatadir=$datadir/gimp
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index e8f70f9e83f1..7cdeea880bec 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -1,12 +1,30 @@
-lib/libgimp.so.1.0
-lib/libgimp.la
+bin/gimp
+include/megawidget.h
+include/gck/gck.h
+include/gck/gckcolor.h
+include/gck/gckcommon.h
+include/gck/gckimage.h
+include/gck/gcklistbox.h
+include/gck/gckmath.h
+include/gck/gcktypes.h
+include/gck/gckui.h
+include/gck/gckvector.h
+include/libgimp/gimp.h
+include/libgimp/gimpenums.h
+include/libgimp/gimpmenu.h
+include/libgimp/gimpui.h
+lib/libgck.a
+lib/libgck.la
+lib/libgck.so
+lib/libgck.so.1.0
 lib/libgimp.a
-lib/libgimpui.so.1.0
-lib/libgimpui.la
+lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.1.0
 lib/libgimpui.a
-lib/libgck.so.1.0
-lib/libgck.la
-lib/libgck.a
+lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.1.0
 lib/libmegawidget.a
 libexec/gimp/0.99/plug-ins/AlienMap
 libexec/gimp/0.99/plug-ins/CEL
@@ -53,6 +71,7 @@ libexec/gimp/0.99/plug-ins/gauss_rle
 libexec/gimp/0.99/plug-ins/gbr
 libexec/gimp/0.99/plug-ins/gfig
 libexec/gimp/0.99/plug-ins/gfli
+libexec/gimp/0.99/plug-ins/gee
 libexec/gimp/0.99/plug-ins/gicon
 libexec/gimp/0.99/plug-ins/gif
 libexec/gimp/0.99/plug-ins/glasstile
@@ -93,14 +112,17 @@ libexec/gimp/0.99/plug-ins/pnm
 libexec/gimp/0.99/plug-ins/polar
 libexec/gimp/0.99/plug-ins/print
 libexec/gimp/0.99/plug-ins/ps
+libexec/gimp/0.99/plug-ins/psd
 libexec/gimp/0.99/plug-ins/randomize
 libexec/gimp/0.99/plug-ins/ripple
 libexec/gimp/0.99/plug-ins/rotate
 libexec/gimp/0.99/plug-ins/rotators
 libexec/gimp/0.99/plug-ins/scatter_hsv
+libexec/gimp/0.99/plug-ins/screenshot
 libexec/gimp/0.99/plug-ins/script-fu
 libexec/gimp/0.99/plug-ins/semiflatten
 libexec/gimp/0.99/plug-ins/sgi
+libexec/gimp/0.99/plug-ins/sharpen
 libexec/gimp/0.99/plug-ins/shift
 libexec/gimp/0.99/plug-ins/sinus
 libexec/gimp/0.99/plug-ins/smooth_palette
@@ -128,20 +150,7 @@ libexec/gimp/0.99/plug-ins/xd
 libexec/gimp/0.99/plug-ins/xpm
 libexec/gimp/0.99/plug-ins/xwd
 libexec/gimp/0.99/plug-ins/zealouscrop
-include/libgimp/gimp.h
-include/libgimp/gimpenums.h
-include/libgimp/gimpmenu.h
-include/libgimp/gimpui.h
-include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gckvector.h
-include/megawidget.h
+man/man1/gimp.1.gz
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -159,10 +168,6 @@ 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/5fcircle.gbr
 share/gimp/brushes/5x5square.gbr
@@ -174,30 +179,36 @@ share/gimp/brushes/9fcircle.gbr
 share/gimp/brushes/DStar11.gbr
 share/gimp/brushes/DStar17.gbr
 share/gimp/brushes/DStar25.gbr
-share/gimp/brushes/bigcircle.gbr
-share/gimp/brushes/bigcircle2.gbr
-share/gimp/brushes/bigcircle3.gbr
-share/gimp/brushes/bigcircle4.gbr
-share/gimp/brushes/bird.gbr
-share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/callig1.gbr
 share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
 share/gimp/brushes/callig4.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/pixel.gbr
+share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/xcf.gbr
+share/gimp/brushes/50x50cone.gbr
+share/gimp/brushes/50x50square.gbr
+share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/50x50squareBlur2.gbr
+share/gimp/brushes/bigcircle.gbr
+share/gimp/brushes/bigcircle2.gbr
+share/gimp/brushes/bigcircle3.gbr
+share/gimp/brushes/bigcircle4.gbr
+share/gimp/brushes/bird.gbr
+share/gimp/brushes/bullethole.gbr
+share/gimp/brushes/cloth.gbr
+share/gimp/brushes/flower.gbr
+share/gimp/brushes/flower_large.gbr
 share/gimp/brushes/gecko.gbr
 share/gimp/brushes/grid.gbr
 share/gimp/brushes/grid2.gbr
 share/gimp/brushes/guitar.gbr
 share/gimp/brushes/nova.gbr
-share/gimp/brushes/pixel.gbr
 share/gimp/brushes/point.gbr
 share/gimp/brushes/punch.gbr
 share/gimp/brushes/qbert2.gbr
@@ -205,10 +216,10 @@ share/gimp/brushes/qbert3Blur.gbr
 share/gimp/brushes/reach.gbr
 share/gimp/brushes/sphere29.gbr
 share/gimp/brushes/sphere36.gbr
+share/gimp/brushes/star1.gbr
 share/gimp/brushes/sphere47.gbr
 share/gimp/brushes/sphere55.gbr
 share/gimp/brushes/sphere79.gbr
-share/gimp/brushes/star1.gbr
 share/gimp/brushes/star2.gbr
 share/gimp/brushes/star3.gbr
 share/gimp/brushes/star4.gbr
@@ -219,10 +230,8 @@ 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/gfig/A_star
 share/gimp/gfig/curves
 share/gimp/gfig/polys
@@ -233,11 +242,6 @@ share/gimp/gfig/spirals_and_stars
 share/gimp/gfig/sprial
 share/gimp/gfig/star2
 share/gimp/gfig/stars
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_splash.ppm
-share/gimp/gimp_tips.txt
-share/gimp/gimprc
-share/gimp/gimprc_user
 share/gimp/gradients/Abstract_1
 share/gimp/gradients/Abstract_2
 share/gimp/gradients/Abstract_3
@@ -279,9 +283,9 @@ 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
@@ -314,7 +318,6 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
-share/gimp/gtkrc
 share/gimp/palettes/Bears
 share/gimp/palettes/Bgold
 share/gimp/palettes/Blues
@@ -342,8 +345,8 @@ share/gimp/palettes/Muted
 share/gimp/palettes/Named_Colors
 share/gimp/palettes/News3
 share/gimp/palettes/Op2
-share/gimp/palettes/Paintjet
 share/gimp/palettes/Pastels
+share/gimp/palettes/Paintjet
 share/gimp/palettes/Plasma
 share/gimp/palettes/Reds
 share/gimp/palettes/Reds_And_Purples
@@ -353,34 +356,77 @@ share/gimp/palettes/Volcano
 share/gimp/palettes/Warm_Colors
 share/gimp/palettes/Web
 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
@@ -392,12 +438,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
@@ -405,13 +448,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
@@ -419,7 +461,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
@@ -427,100 +468,61 @@ 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
-share/gimp/ps-menurc
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -537,8 +539,8 @@ share/gimp/scripts/beveled-pattern-arrow.scm
 share/gimp/scripts/beveled-pattern-bullet.scm
 share/gimp/scripts/beveled-pattern-button.scm
 share/gimp/scripts/beveled-pattern-heading.scm
-share/gimp/scripts/beveled-pattern-hrule.scm
 share/gimp/scripts/blend-anim.scm
+share/gimp/scripts/beveled-pattern-hrule.scm
 share/gimp/scripts/blended-logo.scm
 share/gimp/scripts/bovinated-logo.scm
 share/gimp/scripts/carve-it.scm
@@ -555,6 +557,7 @@ share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
 share/gimp/scripts/drop-shadow.scm
+share/gimp/scripts/egg.scm
 share/gimp/scripts/erase-rows.scm
 share/gimp/scripts/flatland.scm
 share/gimp/scripts/font-map.scm
@@ -600,22 +603,25 @@ share/gimp/scripts/truchet.scm
 share/gimp/scripts/unsharp-mask.scm
 share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
-share/gimp/scripts/web-browser.scm
 share/gimp/scripts/xach-effect.scm
+share/gimp/scripts/web-browser.scm
 share/gimp/user_install
-bin/gimp
-lib/libgimp.so
-lib/libgimpui.so
-lib/libgck.so
+share/gimp/gimprc
+share/gimp/gimprc_user
+share/gimp/gtkrc
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimp_tips.txt
+share/gimp/ps-menurc
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
 @dirrm include/libgimp
 @dirrm include/gck
-@dirrm share/gimp/scripts
-@dirrm share/gimp/gfig
 @dirrm share/gimp/brushes
+@dirrm share/gimp/gfig
 @dirrm share/gimp/gradients
 @dirrm share/gimp/palettes
 @dirrm share/gimp/patterns
+@dirrm share/gimp/scripts
 @dirrm share/gimp
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 515519bafb86..e79c13730011 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.19
+# Version required:     0.99.28
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.27 1998/04/19 11:37:17 andreas Exp $
+# $Id: Makefile,v 1.28 1998/04/19 17:03:57 andreas Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	26
+MICRO=	28
 
 VERSION=	${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION=	${MAJOR}.${MINOR}
@@ -40,6 +40,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
 
+MAN1=		gimp.1
+
 DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 58fadd3c77a0..15286709020e 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-0.99.26.tar.gz) = 5007046065c3640ca8ead70d9a5a9ea5
+MD5 (gimp-0.99.28.tar.gz) = 22912ec257b264ad0f664d214eac2371
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp/files/patch-aa b/graphics/gimp/files/patch-aa
new file mode 100644
index 000000000000..8be51189fdab
--- /dev/null
+++ b/graphics/gimp/files/patch-aa
@@ -0,0 +1,11 @@
+--- app/main.c.old	Tue Apr 28 09:54:27 1998
++++ app/main.c	Tue Apr 28 09:53:51 1998
+@@ -80,6 +80,8 @@
+   int i, j;
+   gchar *display_name, *display_env;
+ 
++#define ATEXIT(proc)   (atexit (proc))
++
+   ATEXIT (g_mem_profile);
+ 
+   /* Initialize variables */
diff --git a/graphics/gimp/files/patch-ab b/graphics/gimp/files/patch-ab
index e8b6e0cc0bad..3c90bafc4593 100644
--- a/graphics/gimp/files/patch-ab
+++ b/graphics/gimp/files/patch-ab
@@ -18,14 +18,3 @@
    else
 
 
---- plug-ins/mail/mail.c.orig	Tue Nov 25 06:04:27 1997
-+++ plug-ins/mail/mail.c	Thu Dec 18 00:40:23 1997
-@@ -89,7 +89,7 @@
-    *
-  */
- #ifndef MAILER
--#define MAILER "/usr/lib/sendmail"
-+#define MAILER "/usr/sbin/sendmail"
- #endif
- 
- #ifndef UUENCODE
diff --git a/graphics/gimp/files/patch-ah b/graphics/gimp/files/patch-ah
index cb95c3ff7920..79f3c093e80f 100644
--- a/graphics/gimp/files/patch-ah
+++ b/graphics/gimp/files/patch-ah
@@ -1,5 +1,5 @@
---- configure.in~	Thu Apr 16 20:00:52 1998
-+++ configure.in	Thu Apr 16 20:02:07 1998
+--- configure.in.old	Tue Apr 28 09:04:13 1998
++++ configure.in	Tue Apr 28 09:07:13 1998
 @@ -115,13 +115,13 @@
  
  dnl Test for libtiff
@@ -13,12 +13,12 @@
 -      AC_CHECK_LIB(tiff, TIFFWriteScanline,
 +      AC_CHECK_LIB(tiff34, TIFFWriteScanline,
  	AC_CHECK_HEADER(tiffio.h,
--          TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
-+          TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg',
+-          TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz',
++          TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz',
  	  AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
-         AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -lz -ljpeg -lm), -lm)
-   fi
-@@ -299,7 +299,7 @@
+ 	AC_CHECK_LIB(tiff34, TIFFFlushData,
+ 	  AC_CHECK_HEADER(tiffio.h,
+@@ -303,7 +303,7 @@
  LIBS="$gimp_save_LIBS"
  
  gimpdatadir=$datadir/gimp
@@ -27,17 +27,17 @@
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
  gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
---- configure~	Thu Apr 16 20:00:58 1998
-+++ configure	Thu Apr 16 20:04:59 1998
-@@ -2282,14 +2282,14 @@
+--- configure.old	Tue Apr 28 09:04:06 1998
++++ configure	Tue Apr 28 09:09:45 1998
+@@ -2281,14 +2281,14 @@
    fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2287: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2286: 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:2287: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2286: 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
@@ -46,9 +46,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2295 "configure"
+ #line 2294 "configure"
  #include "confdefs.h"
-@@ -2345,7 +2345,7 @@
+@@ -2344,7 +2344,7 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -57,35 +57,35 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -2353,14 +2353,14 @@
+@@ -2352,14 +2352,14 @@
  
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2358: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2357: 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:2358: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2357: 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
  else
    ac_save_LIBS="$LIBS"
--LIBS="-ltiff -lz -ljpeg -lm $LIBS"
-+LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
+-LIBS="-ltiff -ljpeg -lz -lm $LIBS"
++LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2366 "configure"
+ #line 2365 "configure"
  #include "confdefs.h"
-@@ -2416,7 +2416,7 @@
+@@ -2415,7 +2415,7 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
--  TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg'
-+  TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg'
+-  TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz'
++  TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz'
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -4070,7 +4070,7 @@
+@@ -4144,7 +4144,7 @@
  LIBS="$gimp_save_LIBS"
  
  gimpdatadir=$datadir/gimp
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index e8f70f9e83f1..7cdeea880bec 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -1,12 +1,30 @@
-lib/libgimp.so.1.0
-lib/libgimp.la
+bin/gimp
+include/megawidget.h
+include/gck/gck.h
+include/gck/gckcolor.h
+include/gck/gckcommon.h
+include/gck/gckimage.h
+include/gck/gcklistbox.h
+include/gck/gckmath.h
+include/gck/gcktypes.h
+include/gck/gckui.h
+include/gck/gckvector.h
+include/libgimp/gimp.h
+include/libgimp/gimpenums.h
+include/libgimp/gimpmenu.h
+include/libgimp/gimpui.h
+lib/libgck.a
+lib/libgck.la
+lib/libgck.so
+lib/libgck.so.1.0
 lib/libgimp.a
-lib/libgimpui.so.1.0
-lib/libgimpui.la
+lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.1.0
 lib/libgimpui.a
-lib/libgck.so.1.0
-lib/libgck.la
-lib/libgck.a
+lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.1.0
 lib/libmegawidget.a
 libexec/gimp/0.99/plug-ins/AlienMap
 libexec/gimp/0.99/plug-ins/CEL
@@ -53,6 +71,7 @@ libexec/gimp/0.99/plug-ins/gauss_rle
 libexec/gimp/0.99/plug-ins/gbr
 libexec/gimp/0.99/plug-ins/gfig
 libexec/gimp/0.99/plug-ins/gfli
+libexec/gimp/0.99/plug-ins/gee
 libexec/gimp/0.99/plug-ins/gicon
 libexec/gimp/0.99/plug-ins/gif
 libexec/gimp/0.99/plug-ins/glasstile
@@ -93,14 +112,17 @@ libexec/gimp/0.99/plug-ins/pnm
 libexec/gimp/0.99/plug-ins/polar
 libexec/gimp/0.99/plug-ins/print
 libexec/gimp/0.99/plug-ins/ps
+libexec/gimp/0.99/plug-ins/psd
 libexec/gimp/0.99/plug-ins/randomize
 libexec/gimp/0.99/plug-ins/ripple
 libexec/gimp/0.99/plug-ins/rotate
 libexec/gimp/0.99/plug-ins/rotators
 libexec/gimp/0.99/plug-ins/scatter_hsv
+libexec/gimp/0.99/plug-ins/screenshot
 libexec/gimp/0.99/plug-ins/script-fu
 libexec/gimp/0.99/plug-ins/semiflatten
 libexec/gimp/0.99/plug-ins/sgi
+libexec/gimp/0.99/plug-ins/sharpen
 libexec/gimp/0.99/plug-ins/shift
 libexec/gimp/0.99/plug-ins/sinus
 libexec/gimp/0.99/plug-ins/smooth_palette
@@ -128,20 +150,7 @@ libexec/gimp/0.99/plug-ins/xd
 libexec/gimp/0.99/plug-ins/xpm
 libexec/gimp/0.99/plug-ins/xwd
 libexec/gimp/0.99/plug-ins/zealouscrop
-include/libgimp/gimp.h
-include/libgimp/gimpenums.h
-include/libgimp/gimpmenu.h
-include/libgimp/gimpui.h
-include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gckvector.h
-include/megawidget.h
+man/man1/gimp.1.gz
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -159,10 +168,6 @@ 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/5fcircle.gbr
 share/gimp/brushes/5x5square.gbr
@@ -174,30 +179,36 @@ share/gimp/brushes/9fcircle.gbr
 share/gimp/brushes/DStar11.gbr
 share/gimp/brushes/DStar17.gbr
 share/gimp/brushes/DStar25.gbr
-share/gimp/brushes/bigcircle.gbr
-share/gimp/brushes/bigcircle2.gbr
-share/gimp/brushes/bigcircle3.gbr
-share/gimp/brushes/bigcircle4.gbr
-share/gimp/brushes/bird.gbr
-share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/callig1.gbr
 share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
 share/gimp/brushes/callig4.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/pixel.gbr
+share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/xcf.gbr
+share/gimp/brushes/50x50cone.gbr
+share/gimp/brushes/50x50square.gbr
+share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/50x50squareBlur2.gbr
+share/gimp/brushes/bigcircle.gbr
+share/gimp/brushes/bigcircle2.gbr
+share/gimp/brushes/bigcircle3.gbr
+share/gimp/brushes/bigcircle4.gbr
+share/gimp/brushes/bird.gbr
+share/gimp/brushes/bullethole.gbr
+share/gimp/brushes/cloth.gbr
+share/gimp/brushes/flower.gbr
+share/gimp/brushes/flower_large.gbr
 share/gimp/brushes/gecko.gbr
 share/gimp/brushes/grid.gbr
 share/gimp/brushes/grid2.gbr
 share/gimp/brushes/guitar.gbr
 share/gimp/brushes/nova.gbr
-share/gimp/brushes/pixel.gbr
 share/gimp/brushes/point.gbr
 share/gimp/brushes/punch.gbr
 share/gimp/brushes/qbert2.gbr
@@ -205,10 +216,10 @@ share/gimp/brushes/qbert3Blur.gbr
 share/gimp/brushes/reach.gbr
 share/gimp/brushes/sphere29.gbr
 share/gimp/brushes/sphere36.gbr
+share/gimp/brushes/star1.gbr
 share/gimp/brushes/sphere47.gbr
 share/gimp/brushes/sphere55.gbr
 share/gimp/brushes/sphere79.gbr
-share/gimp/brushes/star1.gbr
 share/gimp/brushes/star2.gbr
 share/gimp/brushes/star3.gbr
 share/gimp/brushes/star4.gbr
@@ -219,10 +230,8 @@ 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/gfig/A_star
 share/gimp/gfig/curves
 share/gimp/gfig/polys
@@ -233,11 +242,6 @@ share/gimp/gfig/spirals_and_stars
 share/gimp/gfig/sprial
 share/gimp/gfig/star2
 share/gimp/gfig/stars
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_splash.ppm
-share/gimp/gimp_tips.txt
-share/gimp/gimprc
-share/gimp/gimprc_user
 share/gimp/gradients/Abstract_1
 share/gimp/gradients/Abstract_2
 share/gimp/gradients/Abstract_3
@@ -279,9 +283,9 @@ 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
@@ -314,7 +318,6 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
-share/gimp/gtkrc
 share/gimp/palettes/Bears
 share/gimp/palettes/Bgold
 share/gimp/palettes/Blues
@@ -342,8 +345,8 @@ share/gimp/palettes/Muted
 share/gimp/palettes/Named_Colors
 share/gimp/palettes/News3
 share/gimp/palettes/Op2
-share/gimp/palettes/Paintjet
 share/gimp/palettes/Pastels
+share/gimp/palettes/Paintjet
 share/gimp/palettes/Plasma
 share/gimp/palettes/Reds
 share/gimp/palettes/Reds_And_Purples
@@ -353,34 +356,77 @@ share/gimp/palettes/Volcano
 share/gimp/palettes/Warm_Colors
 share/gimp/palettes/Web
 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
@@ -392,12 +438,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
@@ -405,13 +448,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
@@ -419,7 +461,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
@@ -427,100 +468,61 @@ 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
-share/gimp/ps-menurc
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -537,8 +539,8 @@ share/gimp/scripts/beveled-pattern-arrow.scm
 share/gimp/scripts/beveled-pattern-bullet.scm
 share/gimp/scripts/beveled-pattern-button.scm
 share/gimp/scripts/beveled-pattern-heading.scm
-share/gimp/scripts/beveled-pattern-hrule.scm
 share/gimp/scripts/blend-anim.scm
+share/gimp/scripts/beveled-pattern-hrule.scm
 share/gimp/scripts/blended-logo.scm
 share/gimp/scripts/bovinated-logo.scm
 share/gimp/scripts/carve-it.scm
@@ -555,6 +557,7 @@ share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
 share/gimp/scripts/drop-shadow.scm
+share/gimp/scripts/egg.scm
 share/gimp/scripts/erase-rows.scm
 share/gimp/scripts/flatland.scm
 share/gimp/scripts/font-map.scm
@@ -600,22 +603,25 @@ share/gimp/scripts/truchet.scm
 share/gimp/scripts/unsharp-mask.scm
 share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
-share/gimp/scripts/web-browser.scm
 share/gimp/scripts/xach-effect.scm
+share/gimp/scripts/web-browser.scm
 share/gimp/user_install
-bin/gimp
-lib/libgimp.so
-lib/libgimpui.so
-lib/libgck.so
+share/gimp/gimprc
+share/gimp/gimprc_user
+share/gimp/gtkrc
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimp_tips.txt
+share/gimp/ps-menurc
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
 @dirrm include/libgimp
 @dirrm include/gck
-@dirrm share/gimp/scripts
-@dirrm share/gimp/gfig
 @dirrm share/gimp/brushes
+@dirrm share/gimp/gfig
 @dirrm share/gimp/gradients
 @dirrm share/gimp/palettes
 @dirrm share/gimp/patterns
+@dirrm share/gimp/scripts
 @dirrm share/gimp
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 515519bafb86..e79c13730011 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.19
+# Version required:     0.99.28
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.27 1998/04/19 11:37:17 andreas Exp $
+# $Id: Makefile,v 1.28 1998/04/19 17:03:57 andreas Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	26
+MICRO=	28
 
 VERSION=	${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION=	${MAJOR}.${MINOR}
@@ -40,6 +40,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
 
+MAN1=		gimp.1
+
 DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index 58fadd3c77a0..15286709020e 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-0.99.26.tar.gz) = 5007046065c3640ca8ead70d9a5a9ea5
+MD5 (gimp-0.99.28.tar.gz) = 22912ec257b264ad0f664d214eac2371
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp1/files/patch-aa b/graphics/gimp1/files/patch-aa
new file mode 100644
index 000000000000..8be51189fdab
--- /dev/null
+++ b/graphics/gimp1/files/patch-aa
@@ -0,0 +1,11 @@
+--- app/main.c.old	Tue Apr 28 09:54:27 1998
++++ app/main.c	Tue Apr 28 09:53:51 1998
+@@ -80,6 +80,8 @@
+   int i, j;
+   gchar *display_name, *display_env;
+ 
++#define ATEXIT(proc)   (atexit (proc))
++
+   ATEXIT (g_mem_profile);
+ 
+   /* Initialize variables */
diff --git a/graphics/gimp1/files/patch-ab b/graphics/gimp1/files/patch-ab
index e8b6e0cc0bad..3c90bafc4593 100644
--- a/graphics/gimp1/files/patch-ab
+++ b/graphics/gimp1/files/patch-ab
@@ -18,14 +18,3 @@
    else
 
 
---- plug-ins/mail/mail.c.orig	Tue Nov 25 06:04:27 1997
-+++ plug-ins/mail/mail.c	Thu Dec 18 00:40:23 1997
-@@ -89,7 +89,7 @@
-    *
-  */
- #ifndef MAILER
--#define MAILER "/usr/lib/sendmail"
-+#define MAILER "/usr/sbin/sendmail"
- #endif
- 
- #ifndef UUENCODE
diff --git a/graphics/gimp1/files/patch-ah b/graphics/gimp1/files/patch-ah
index cb95c3ff7920..79f3c093e80f 100644
--- a/graphics/gimp1/files/patch-ah
+++ b/graphics/gimp1/files/patch-ah
@@ -1,5 +1,5 @@
---- configure.in~	Thu Apr 16 20:00:52 1998
-+++ configure.in	Thu Apr 16 20:02:07 1998
+--- configure.in.old	Tue Apr 28 09:04:13 1998
++++ configure.in	Tue Apr 28 09:07:13 1998
 @@ -115,13 +115,13 @@
  
  dnl Test for libtiff
@@ -13,12 +13,12 @@
 -      AC_CHECK_LIB(tiff, TIFFWriteScanline,
 +      AC_CHECK_LIB(tiff34, TIFFWriteScanline,
  	AC_CHECK_HEADER(tiffio.h,
--          TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
-+          TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg',
+-          TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz',
++          TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz',
  	  AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
-         AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -lz -ljpeg -lm), -lm)
-   fi
-@@ -299,7 +299,7 @@
+ 	AC_CHECK_LIB(tiff34, TIFFFlushData,
+ 	  AC_CHECK_HEADER(tiffio.h,
+@@ -303,7 +303,7 @@
  LIBS="$gimp_save_LIBS"
  
  gimpdatadir=$datadir/gimp
@@ -27,17 +27,17 @@
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
  gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
---- configure~	Thu Apr 16 20:00:58 1998
-+++ configure	Thu Apr 16 20:04:59 1998
-@@ -2282,14 +2282,14 @@
+--- configure.old	Tue Apr 28 09:04:06 1998
++++ configure	Tue Apr 28 09:09:45 1998
+@@ -2281,14 +2281,14 @@
    fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2287: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2286: 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:2287: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2286: 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
@@ -46,9 +46,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2295 "configure"
+ #line 2294 "configure"
  #include "confdefs.h"
-@@ -2345,7 +2345,7 @@
+@@ -2344,7 +2344,7 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -57,35 +57,35 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -2353,14 +2353,14 @@
+@@ -2352,14 +2352,14 @@
  
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2358: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2357: 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:2358: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2357: 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
  else
    ac_save_LIBS="$LIBS"
--LIBS="-ltiff -lz -ljpeg -lm $LIBS"
-+LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
+-LIBS="-ltiff -ljpeg -lz -lm $LIBS"
++LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2366 "configure"
+ #line 2365 "configure"
  #include "confdefs.h"
-@@ -2416,7 +2416,7 @@
+@@ -2415,7 +2415,7 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
--  TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg'
-+  TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg'
+-  TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz'
++  TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz'
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -4070,7 +4070,7 @@
+@@ -4144,7 +4144,7 @@
  LIBS="$gimp_save_LIBS"
  
  gimpdatadir=$datadir/gimp
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index e8f70f9e83f1..7cdeea880bec 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -1,12 +1,30 @@
-lib/libgimp.so.1.0
-lib/libgimp.la
+bin/gimp
+include/megawidget.h
+include/gck/gck.h
+include/gck/gckcolor.h
+include/gck/gckcommon.h
+include/gck/gckimage.h
+include/gck/gcklistbox.h
+include/gck/gckmath.h
+include/gck/gcktypes.h
+include/gck/gckui.h
+include/gck/gckvector.h
+include/libgimp/gimp.h
+include/libgimp/gimpenums.h
+include/libgimp/gimpmenu.h
+include/libgimp/gimpui.h
+lib/libgck.a
+lib/libgck.la
+lib/libgck.so
+lib/libgck.so.1.0
 lib/libgimp.a
-lib/libgimpui.so.1.0
-lib/libgimpui.la
+lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.1.0
 lib/libgimpui.a
-lib/libgck.so.1.0
-lib/libgck.la
-lib/libgck.a
+lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.1.0
 lib/libmegawidget.a
 libexec/gimp/0.99/plug-ins/AlienMap
 libexec/gimp/0.99/plug-ins/CEL
@@ -53,6 +71,7 @@ libexec/gimp/0.99/plug-ins/gauss_rle
 libexec/gimp/0.99/plug-ins/gbr
 libexec/gimp/0.99/plug-ins/gfig
 libexec/gimp/0.99/plug-ins/gfli
+libexec/gimp/0.99/plug-ins/gee
 libexec/gimp/0.99/plug-ins/gicon
 libexec/gimp/0.99/plug-ins/gif
 libexec/gimp/0.99/plug-ins/glasstile
@@ -93,14 +112,17 @@ libexec/gimp/0.99/plug-ins/pnm
 libexec/gimp/0.99/plug-ins/polar
 libexec/gimp/0.99/plug-ins/print
 libexec/gimp/0.99/plug-ins/ps
+libexec/gimp/0.99/plug-ins/psd
 libexec/gimp/0.99/plug-ins/randomize
 libexec/gimp/0.99/plug-ins/ripple
 libexec/gimp/0.99/plug-ins/rotate
 libexec/gimp/0.99/plug-ins/rotators
 libexec/gimp/0.99/plug-ins/scatter_hsv
+libexec/gimp/0.99/plug-ins/screenshot
 libexec/gimp/0.99/plug-ins/script-fu
 libexec/gimp/0.99/plug-ins/semiflatten
 libexec/gimp/0.99/plug-ins/sgi
+libexec/gimp/0.99/plug-ins/sharpen
 libexec/gimp/0.99/plug-ins/shift
 libexec/gimp/0.99/plug-ins/sinus
 libexec/gimp/0.99/plug-ins/smooth_palette
@@ -128,20 +150,7 @@ libexec/gimp/0.99/plug-ins/xd
 libexec/gimp/0.99/plug-ins/xpm
 libexec/gimp/0.99/plug-ins/xwd
 libexec/gimp/0.99/plug-ins/zealouscrop
-include/libgimp/gimp.h
-include/libgimp/gimpenums.h
-include/libgimp/gimpmenu.h
-include/libgimp/gimpui.h
-include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gckvector.h
-include/megawidget.h
+man/man1/gimp.1.gz
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -159,10 +168,6 @@ 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/5fcircle.gbr
 share/gimp/brushes/5x5square.gbr
@@ -174,30 +179,36 @@ share/gimp/brushes/9fcircle.gbr
 share/gimp/brushes/DStar11.gbr
 share/gimp/brushes/DStar17.gbr
 share/gimp/brushes/DStar25.gbr
-share/gimp/brushes/bigcircle.gbr
-share/gimp/brushes/bigcircle2.gbr
-share/gimp/brushes/bigcircle3.gbr
-share/gimp/brushes/bigcircle4.gbr
-share/gimp/brushes/bird.gbr
-share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/callig1.gbr
 share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
 share/gimp/brushes/callig4.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/pixel.gbr
+share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/xcf.gbr
+share/gimp/brushes/50x50cone.gbr
+share/gimp/brushes/50x50square.gbr
+share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/50x50squareBlur2.gbr
+share/gimp/brushes/bigcircle.gbr
+share/gimp/brushes/bigcircle2.gbr
+share/gimp/brushes/bigcircle3.gbr
+share/gimp/brushes/bigcircle4.gbr
+share/gimp/brushes/bird.gbr
+share/gimp/brushes/bullethole.gbr
+share/gimp/brushes/cloth.gbr
+share/gimp/brushes/flower.gbr
+share/gimp/brushes/flower_large.gbr
 share/gimp/brushes/gecko.gbr
 share/gimp/brushes/grid.gbr
 share/gimp/brushes/grid2.gbr
 share/gimp/brushes/guitar.gbr
 share/gimp/brushes/nova.gbr
-share/gimp/brushes/pixel.gbr
 share/gimp/brushes/point.gbr
 share/gimp/brushes/punch.gbr
 share/gimp/brushes/qbert2.gbr
@@ -205,10 +216,10 @@ share/gimp/brushes/qbert3Blur.gbr
 share/gimp/brushes/reach.gbr
 share/gimp/brushes/sphere29.gbr
 share/gimp/brushes/sphere36.gbr
+share/gimp/brushes/star1.gbr
 share/gimp/brushes/sphere47.gbr
 share/gimp/brushes/sphere55.gbr
 share/gimp/brushes/sphere79.gbr
-share/gimp/brushes/star1.gbr
 share/gimp/brushes/star2.gbr
 share/gimp/brushes/star3.gbr
 share/gimp/brushes/star4.gbr
@@ -219,10 +230,8 @@ 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/gfig/A_star
 share/gimp/gfig/curves
 share/gimp/gfig/polys
@@ -233,11 +242,6 @@ share/gimp/gfig/spirals_and_stars
 share/gimp/gfig/sprial
 share/gimp/gfig/star2
 share/gimp/gfig/stars
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_splash.ppm
-share/gimp/gimp_tips.txt
-share/gimp/gimprc
-share/gimp/gimprc_user
 share/gimp/gradients/Abstract_1
 share/gimp/gradients/Abstract_2
 share/gimp/gradients/Abstract_3
@@ -279,9 +283,9 @@ 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
@@ -314,7 +318,6 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
-share/gimp/gtkrc
 share/gimp/palettes/Bears
 share/gimp/palettes/Bgold
 share/gimp/palettes/Blues
@@ -342,8 +345,8 @@ share/gimp/palettes/Muted
 share/gimp/palettes/Named_Colors
 share/gimp/palettes/News3
 share/gimp/palettes/Op2
-share/gimp/palettes/Paintjet
 share/gimp/palettes/Pastels
+share/gimp/palettes/Paintjet
 share/gimp/palettes/Plasma
 share/gimp/palettes/Reds
 share/gimp/palettes/Reds_And_Purples
@@ -353,34 +356,77 @@ share/gimp/palettes/Volcano
 share/gimp/palettes/Warm_Colors
 share/gimp/palettes/Web
 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
@@ -392,12 +438,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
@@ -405,13 +448,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
@@ -419,7 +461,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
@@ -427,100 +468,61 @@ 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
-share/gimp/ps-menurc
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -537,8 +539,8 @@ share/gimp/scripts/beveled-pattern-arrow.scm
 share/gimp/scripts/beveled-pattern-bullet.scm
 share/gimp/scripts/beveled-pattern-button.scm
 share/gimp/scripts/beveled-pattern-heading.scm
-share/gimp/scripts/beveled-pattern-hrule.scm
 share/gimp/scripts/blend-anim.scm
+share/gimp/scripts/beveled-pattern-hrule.scm
 share/gimp/scripts/blended-logo.scm
 share/gimp/scripts/bovinated-logo.scm
 share/gimp/scripts/carve-it.scm
@@ -555,6 +557,7 @@ share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
 share/gimp/scripts/drop-shadow.scm
+share/gimp/scripts/egg.scm
 share/gimp/scripts/erase-rows.scm
 share/gimp/scripts/flatland.scm
 share/gimp/scripts/font-map.scm
@@ -600,22 +603,25 @@ share/gimp/scripts/truchet.scm
 share/gimp/scripts/unsharp-mask.scm
 share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
-share/gimp/scripts/web-browser.scm
 share/gimp/scripts/xach-effect.scm
+share/gimp/scripts/web-browser.scm
 share/gimp/user_install
-bin/gimp
-lib/libgimp.so
-lib/libgimpui.so
-lib/libgck.so
+share/gimp/gimprc
+share/gimp/gimprc_user
+share/gimp/gtkrc
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimp_tips.txt
+share/gimp/ps-menurc
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
 @dirrm include/libgimp
 @dirrm include/gck
-@dirrm share/gimp/scripts
-@dirrm share/gimp/gfig
 @dirrm share/gimp/brushes
+@dirrm share/gimp/gfig
 @dirrm share/gimp/gradients
 @dirrm share/gimp/palettes
 @dirrm share/gimp/patterns
+@dirrm share/gimp/scripts
 @dirrm share/gimp
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 515519bafb86..e79c13730011 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:    Gimp
-# Version required:     0.99.19
+# Version required:     0.99.28
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.27 1998/04/19 11:37:17 andreas Exp $
+# $Id: Makefile,v 1.28 1998/04/19 17:03:57 andreas Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	26
+MICRO=	28
 
 VERSION=	${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION=	${MAJOR}.${MINOR}
@@ -40,6 +40,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
 
+MAN1=		gimp.1
+
 DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 58fadd3c77a0..15286709020e 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gimp-0.99.26.tar.gz) = 5007046065c3640ca8ead70d9a5a9ea5
+MD5 (gimp-0.99.28.tar.gz) = 22912ec257b264ad0f664d214eac2371
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimpshop/files/patch-aa b/graphics/gimpshop/files/patch-aa
new file mode 100644
index 000000000000..8be51189fdab
--- /dev/null
+++ b/graphics/gimpshop/files/patch-aa
@@ -0,0 +1,11 @@
+--- app/main.c.old	Tue Apr 28 09:54:27 1998
++++ app/main.c	Tue Apr 28 09:53:51 1998
+@@ -80,6 +80,8 @@
+   int i, j;
+   gchar *display_name, *display_env;
+ 
++#define ATEXIT(proc)   (atexit (proc))
++
+   ATEXIT (g_mem_profile);
+ 
+   /* Initialize variables */
diff --git a/graphics/gimpshop/files/patch-ab b/graphics/gimpshop/files/patch-ab
index e8b6e0cc0bad..3c90bafc4593 100644
--- a/graphics/gimpshop/files/patch-ab
+++ b/graphics/gimpshop/files/patch-ab
@@ -18,14 +18,3 @@
    else
 
 
---- plug-ins/mail/mail.c.orig	Tue Nov 25 06:04:27 1997
-+++ plug-ins/mail/mail.c	Thu Dec 18 00:40:23 1997
-@@ -89,7 +89,7 @@
-    *
-  */
- #ifndef MAILER
--#define MAILER "/usr/lib/sendmail"
-+#define MAILER "/usr/sbin/sendmail"
- #endif
- 
- #ifndef UUENCODE
diff --git a/graphics/gimpshop/files/patch-ah b/graphics/gimpshop/files/patch-ah
index cb95c3ff7920..79f3c093e80f 100644
--- a/graphics/gimpshop/files/patch-ah
+++ b/graphics/gimpshop/files/patch-ah
@@ -1,5 +1,5 @@
---- configure.in~	Thu Apr 16 20:00:52 1998
-+++ configure.in	Thu Apr 16 20:02:07 1998
+--- configure.in.old	Tue Apr 28 09:04:13 1998
++++ configure.in	Tue Apr 28 09:07:13 1998
 @@ -115,13 +115,13 @@
  
  dnl Test for libtiff
@@ -13,12 +13,12 @@
 -      AC_CHECK_LIB(tiff, TIFFWriteScanline,
 +      AC_CHECK_LIB(tiff34, TIFFWriteScanline,
  	AC_CHECK_HEADER(tiffio.h,
--          TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg',
-+          TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg',
+-          TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz',
++          TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz',
  	  AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF header files not found) ***)),
-         AC_MSG_WARN(*** TIFF plug-in will not be built (TIFF library not found) ***), -lz -ljpeg -lm), -lm)
-   fi
-@@ -299,7 +299,7 @@
+ 	AC_CHECK_LIB(tiff34, TIFFFlushData,
+ 	  AC_CHECK_HEADER(tiffio.h,
+@@ -303,7 +303,7 @@
  LIBS="$gimp_save_LIBS"
  
  gimpdatadir=$datadir/gimp
@@ -27,17 +27,17 @@
  
  brushdata=`ls -1 $srcdir/data/brushes | grep -v Makefile`
  gradientdata=`ls -1 $srcdir/data/gradients | grep -v Makefile`
---- configure~	Thu Apr 16 20:00:58 1998
-+++ configure	Thu Apr 16 20:04:59 1998
-@@ -2282,14 +2282,14 @@
+--- configure.old	Tue Apr 28 09:04:06 1998
++++ configure	Tue Apr 28 09:09:45 1998
+@@ -2281,14 +2281,14 @@
    fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2287: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2286: 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:2287: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2286: 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
@@ -46,9 +46,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2295 "configure"
+ #line 2294 "configure"
  #include "confdefs.h"
-@@ -2345,7 +2345,7 @@
+@@ -2344,7 +2344,7 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -57,35 +57,35 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -2353,14 +2353,14 @@
+@@ -2352,14 +2352,14 @@
  
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2358: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2357: 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:2358: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2357: 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
  else
    ac_save_LIBS="$LIBS"
--LIBS="-ltiff -lz -ljpeg -lm $LIBS"
-+LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
+-LIBS="-ltiff -ljpeg -lz -lm $LIBS"
++LIBS="-ltiff34 -ljpeg -lz -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2366 "configure"
+ #line 2365 "configure"
  #include "confdefs.h"
-@@ -2416,7 +2416,7 @@
+@@ -2415,7 +2415,7 @@
  fi
  if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
    echo "$ac_t""yes" 1>&6
--  TIFF='tiff'; LIBTIFF_LIB='-ltiff -lz -ljpeg'
-+  TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -lz -ljpeg'
+-  TIFF='tiff'; LIBTIFF_LIB='-ltiff -ljpeg -lz'
++  TIFF='tiff'; LIBTIFF_LIB='-ltiff34 -ljpeg -lz'
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built (TIFF header files not found) ***" 1>&2
-@@ -4070,7 +4070,7 @@
+@@ -4144,7 +4144,7 @@
  LIBS="$gimp_save_LIBS"
  
  gimpdatadir=$datadir/gimp
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index e8f70f9e83f1..7cdeea880bec 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1,12 +1,30 @@
-lib/libgimp.so.1.0
-lib/libgimp.la
+bin/gimp
+include/megawidget.h
+include/gck/gck.h
+include/gck/gckcolor.h
+include/gck/gckcommon.h
+include/gck/gckimage.h
+include/gck/gcklistbox.h
+include/gck/gckmath.h
+include/gck/gcktypes.h
+include/gck/gckui.h
+include/gck/gckvector.h
+include/libgimp/gimp.h
+include/libgimp/gimpenums.h
+include/libgimp/gimpmenu.h
+include/libgimp/gimpui.h
+lib/libgck.a
+lib/libgck.la
+lib/libgck.so
+lib/libgck.so.1.0
 lib/libgimp.a
-lib/libgimpui.so.1.0
-lib/libgimpui.la
+lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.1.0
 lib/libgimpui.a
-lib/libgck.so.1.0
-lib/libgck.la
-lib/libgck.a
+lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.1.0
 lib/libmegawidget.a
 libexec/gimp/0.99/plug-ins/AlienMap
 libexec/gimp/0.99/plug-ins/CEL
@@ -53,6 +71,7 @@ libexec/gimp/0.99/plug-ins/gauss_rle
 libexec/gimp/0.99/plug-ins/gbr
 libexec/gimp/0.99/plug-ins/gfig
 libexec/gimp/0.99/plug-ins/gfli
+libexec/gimp/0.99/plug-ins/gee
 libexec/gimp/0.99/plug-ins/gicon
 libexec/gimp/0.99/plug-ins/gif
 libexec/gimp/0.99/plug-ins/glasstile
@@ -93,14 +112,17 @@ libexec/gimp/0.99/plug-ins/pnm
 libexec/gimp/0.99/plug-ins/polar
 libexec/gimp/0.99/plug-ins/print
 libexec/gimp/0.99/plug-ins/ps
+libexec/gimp/0.99/plug-ins/psd
 libexec/gimp/0.99/plug-ins/randomize
 libexec/gimp/0.99/plug-ins/ripple
 libexec/gimp/0.99/plug-ins/rotate
 libexec/gimp/0.99/plug-ins/rotators
 libexec/gimp/0.99/plug-ins/scatter_hsv
+libexec/gimp/0.99/plug-ins/screenshot
 libexec/gimp/0.99/plug-ins/script-fu
 libexec/gimp/0.99/plug-ins/semiflatten
 libexec/gimp/0.99/plug-ins/sgi
+libexec/gimp/0.99/plug-ins/sharpen
 libexec/gimp/0.99/plug-ins/shift
 libexec/gimp/0.99/plug-ins/sinus
 libexec/gimp/0.99/plug-ins/smooth_palette
@@ -128,20 +150,7 @@ libexec/gimp/0.99/plug-ins/xd
 libexec/gimp/0.99/plug-ins/xpm
 libexec/gimp/0.99/plug-ins/xwd
 libexec/gimp/0.99/plug-ins/zealouscrop
-include/libgimp/gimp.h
-include/libgimp/gimpenums.h
-include/libgimp/gimpmenu.h
-include/libgimp/gimpui.h
-include/gck/gck.h
-include/gck/gckcolor.h
-include/gck/gckcommon.h
-include/gck/gckimage.h
-include/gck/gcklistbox.h
-include/gck/gckmath.h
-include/gck/gcktypes.h
-include/gck/gckui.h
-include/gck/gckvector.h
-include/megawidget.h
+man/man1/gimp.1.gz
 share/gimp/brushes/10x10square.gbr
 share/gimp/brushes/10x10squareBlur.gbr
 share/gimp/brushes/11circle.gbr
@@ -159,10 +168,6 @@ 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/5fcircle.gbr
 share/gimp/brushes/5x5square.gbr
@@ -174,30 +179,36 @@ share/gimp/brushes/9fcircle.gbr
 share/gimp/brushes/DStar11.gbr
 share/gimp/brushes/DStar17.gbr
 share/gimp/brushes/DStar25.gbr
-share/gimp/brushes/bigcircle.gbr
-share/gimp/brushes/bigcircle2.gbr
-share/gimp/brushes/bigcircle3.gbr
-share/gimp/brushes/bigcircle4.gbr
-share/gimp/brushes/bird.gbr
-share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/callig1.gbr
 share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
 share/gimp/brushes/callig4.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/pixel.gbr
+share/gimp/brushes/thegimp.gbr
+share/gimp/brushes/xcf.gbr
+share/gimp/brushes/50x50cone.gbr
+share/gimp/brushes/50x50square.gbr
+share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/50x50squareBlur2.gbr
+share/gimp/brushes/bigcircle.gbr
+share/gimp/brushes/bigcircle2.gbr
+share/gimp/brushes/bigcircle3.gbr
+share/gimp/brushes/bigcircle4.gbr
+share/gimp/brushes/bird.gbr
+share/gimp/brushes/bullethole.gbr
+share/gimp/brushes/cloth.gbr
+share/gimp/brushes/flower.gbr
+share/gimp/brushes/flower_large.gbr
 share/gimp/brushes/gecko.gbr
 share/gimp/brushes/grid.gbr
 share/gimp/brushes/grid2.gbr
 share/gimp/brushes/guitar.gbr
 share/gimp/brushes/nova.gbr
-share/gimp/brushes/pixel.gbr
 share/gimp/brushes/point.gbr
 share/gimp/brushes/punch.gbr
 share/gimp/brushes/qbert2.gbr
@@ -205,10 +216,10 @@ share/gimp/brushes/qbert3Blur.gbr
 share/gimp/brushes/reach.gbr
 share/gimp/brushes/sphere29.gbr
 share/gimp/brushes/sphere36.gbr
+share/gimp/brushes/star1.gbr
 share/gimp/brushes/sphere47.gbr
 share/gimp/brushes/sphere55.gbr
 share/gimp/brushes/sphere79.gbr
-share/gimp/brushes/star1.gbr
 share/gimp/brushes/star2.gbr
 share/gimp/brushes/star3.gbr
 share/gimp/brushes/star4.gbr
@@ -219,10 +230,8 @@ 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/gfig/A_star
 share/gimp/gfig/curves
 share/gimp/gfig/polys
@@ -233,11 +242,6 @@ share/gimp/gfig/spirals_and_stars
 share/gimp/gfig/sprial
 share/gimp/gfig/star2
 share/gimp/gfig/stars
-share/gimp/gimp_logo.ppm
-share/gimp/gimp_splash.ppm
-share/gimp/gimp_tips.txt
-share/gimp/gimprc
-share/gimp/gimprc_user
 share/gimp/gradients/Abstract_1
 share/gimp/gradients/Abstract_2
 share/gimp/gradients/Abstract_3
@@ -279,9 +283,9 @@ 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
@@ -314,7 +318,6 @@ share/gimp/gradients/Wood_1
 share/gimp/gradients/Wood_2
 share/gimp/gradients/Yellow_Contrast
 share/gimp/gradients/Yellow_Orange
-share/gimp/gtkrc
 share/gimp/palettes/Bears
 share/gimp/palettes/Bgold
 share/gimp/palettes/Blues
@@ -342,8 +345,8 @@ share/gimp/palettes/Muted
 share/gimp/palettes/Named_Colors
 share/gimp/palettes/News3
 share/gimp/palettes/Op2
-share/gimp/palettes/Paintjet
 share/gimp/palettes/Pastels
+share/gimp/palettes/Paintjet
 share/gimp/palettes/Plasma
 share/gimp/palettes/Reds
 share/gimp/palettes/Reds_And_Purples
@@ -353,34 +356,77 @@ share/gimp/palettes/Volcano
 share/gimp/palettes/Warm_Colors
 share/gimp/palettes/Web
 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
@@ -392,12 +438,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
@@ -405,13 +448,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
@@ -419,7 +461,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
@@ -427,100 +468,61 @@ 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
-share/gimp/ps-menurc
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -537,8 +539,8 @@ share/gimp/scripts/beveled-pattern-arrow.scm
 share/gimp/scripts/beveled-pattern-bullet.scm
 share/gimp/scripts/beveled-pattern-button.scm
 share/gimp/scripts/beveled-pattern-heading.scm
-share/gimp/scripts/beveled-pattern-hrule.scm
 share/gimp/scripts/blend-anim.scm
+share/gimp/scripts/beveled-pattern-hrule.scm
 share/gimp/scripts/blended-logo.scm
 share/gimp/scripts/bovinated-logo.scm
 share/gimp/scripts/carve-it.scm
@@ -555,6 +557,7 @@ share/gimp/scripts/coolmetal-logo.scm
 share/gimp/scripts/copy-visible.scm
 share/gimp/scripts/crystal-logo.scm
 share/gimp/scripts/drop-shadow.scm
+share/gimp/scripts/egg.scm
 share/gimp/scripts/erase-rows.scm
 share/gimp/scripts/flatland.scm
 share/gimp/scripts/font-map.scm
@@ -600,22 +603,25 @@ share/gimp/scripts/truchet.scm
 share/gimp/scripts/unsharp-mask.scm
 share/gimp/scripts/waves-anim.scm
 share/gimp/scripts/weave.scm
-share/gimp/scripts/web-browser.scm
 share/gimp/scripts/xach-effect.scm
+share/gimp/scripts/web-browser.scm
 share/gimp/user_install
-bin/gimp
-lib/libgimp.so
-lib/libgimpui.so
-lib/libgck.so
+share/gimp/gimprc
+share/gimp/gimprc_user
+share/gimp/gtkrc
+share/gimp/gimp_logo.ppm
+share/gimp/gimp_splash.ppm
+share/gimp/gimp_tips.txt
+share/gimp/ps-menurc
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
 @dirrm include/libgimp
 @dirrm include/gck
-@dirrm share/gimp/scripts
-@dirrm share/gimp/gfig
 @dirrm share/gimp/brushes
+@dirrm share/gimp/gfig
 @dirrm share/gimp/gradients
 @dirrm share/gimp/palettes
 @dirrm share/gimp/patterns
+@dirrm share/gimp/scripts
 @dirrm share/gimp