24 files changed, 366 insertions, 252 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 28220c445ecf..4f7125a3a9da 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -3,19 +3,19 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.17 1998/01/05 17:56:39 erich Exp $
+# $Id: Makefile,v 1.18 1998/01/07 13:34:07 erich Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	17
+MICRO=	18
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}a.tar.gz \
+DISTFILES+=	gimp-data-min-${MM_VERSION}b.tar.gz \
             gimp-data-extras-${MM_VERSION}a.tar.gz
 
 CATEGORIES=     graphics
@@ -31,12 +31,13 @@ LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS+=	xdelta\\.0:${PORTSDIR}/misc/xdelta
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	LD=/usr/bin/ld \
-		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
+
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
 		-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
 CONFIGURE_ARGS=  --with-tcl=tcl80 --with-tk=tk80
@@ -45,7 +46,7 @@ DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}a; \
+	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}b; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index 56f9833c91b5..764774e1d585 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.17.tar.gz) = 6400f3c18c2aa3d908f5f4485645e85f
-MD5 (gimp-data-min-0.99a.tar.gz) = 0716202f1d277ea8e73bc9b4bcde2352
+MD5 (gimp-0.99.18.tar.gz) = 1d07aa3f2f0f7024bfdb786dd15e8d58
+MD5 (gimp-data-min-0.99b.tar.gz) = 55f735d5bb2604a100707e9638df3d4b
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp-app-devel/files/patch-ah b/graphics/gimp-app-devel/files/patch-ah
index d46998d2fe62..d05ddb1cd23f 100644
--- a/graphics/gimp-app-devel/files/patch-ah
+++ b/graphics/gimp-app-devel/files/patch-ah
@@ -1,5 +1,5 @@
---- configure.in.orig	Sat Jan  3 19:31:29 1998
-+++ configure.in	Mon Jan  5 09:42:49 1998
+--- configure.in~	Mon Jan 26 10:34:48 1998
++++ configure.in	Mon Jan 26 10:35:31 1998
 @@ -120,10 +120,10 @@
  
  dnl Test for libtiff
@@ -24,17 +24,17 @@
  
  dnl This is for generating PDB docuemntation.
  AC_PATH_PROG(EMACS, emacs, :)
---- configure.orig	Mon Jan  5 09:44:02 1998
-+++ configure	Mon Jan  5 09:46:45 1998
-@@ -2531,14 +2531,14 @@
+--- configure~	Mon Jan 26 10:36:08 1998
++++ configure	Mon Jan 26 10:37:35 1998
+@@ -2738,14 +2738,14 @@
  fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2536: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2743: 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:2536: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2743: checking for TIFFReadScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -43,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2544 "configure"
+ #line 2751 "configure"
  #include "confdefs.h"
-@@ -2566,17 +2566,17 @@
+@@ -2773,17 +2773,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -54,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2574: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2781: 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:2574: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2781: checking for TIFFWriteScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -66,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2582 "configure"
+ #line 2789 "configure"
  #include "confdefs.h"
-@@ -2604,7 +2604,7 @@
+@@ -2811,7 +2811,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -77,7 +77,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3742,7 +3742,7 @@
+@@ -3949,7 +3949,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index 772e87aa4c10..615e7b8c6e17 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -1,4 +1,12 @@
-bin/gimp
+lib/libgimp.so.1.0
+lib/libgimp.la
+lib/libgimp.a
+lib/libgimpui.so.1.0
+lib/libgimpui.la
+lib/libgimpui.a
+lib/libgck.so.0.1
+lib/libgck.la
+lib/libgck.a
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
 include/libgimp/gimpmenu.h
@@ -13,18 +21,6 @@ include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gcknotebook.h
 include/gck/gckvector.h
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
-lib/libgimp.so.1.0
-lib/libgimp.la
-lib/libgimp.a
-lib/libgimpui.so.1.0
-lib/libgimpui.la
-lib/libgimpui.a
-lib/libgck.so.0.1
-lib/libgck.la
-lib/libgck.a
 libexec/gimp/0.99/plug-ins/libmegawidget.a
 libexec/gimp/0.99/plug-ins/MapObject
 libexec/gimp/0.99/plug-ins/AlienMap
@@ -50,8 +46,9 @@ libexec/gimp/0.99/plug-ins/warp
 libexec/gimp/0.99/plug-ins/tiff
 libexec/gimp/0.99/plug-ins/jpeg
 libexec/gimp/0.99/plug-ins/png
-libexec/gimp/0.99/plug-ins/xpm
+libexec/gimp/0.99/plug-ins/xd
 libexec/gimp/0.99/plug-ins/mpeg
+libexec/gimp/0.99/plug-ins/xpm
 libexec/gimp/0.99/plug-ins/CML_explorer
 libexec/gimp/0.99/plug-ins/align_layers
 libexec/gimp/0.99/plug-ins/apply_lens
@@ -77,6 +74,7 @@ libexec/gimp/0.99/plug-ins/deinterlace
 libexec/gimp/0.99/plug-ins/depthmerge
 libexec/gimp/0.99/plug-ins/despeckle
 libexec/gimp/0.99/plug-ins/destripe
+libexec/gimp/0.99/plug-ins/fp
 libexec/gimp/0.99/plug-ins/diffraction
 libexec/gimp/0.99/plug-ins/displace
 libexec/gimp/0.99/plug-ins/edge
@@ -88,7 +86,7 @@ libexec/gimp/0.99/plug-ins/figures
 libexec/gimp/0.99/plug-ins/film
 libexec/gimp/0.99/plug-ins/fits
 libexec/gimp/0.99/plug-ins/flame
-libexec/gimp/0.99/plug-ins/fp
+libexec/gimp/0.99/plug-ins/flarefx
 libexec/gimp/0.99/plug-ins/fractaltrace
 libexec/gimp/0.99/plug-ins/gauss_iir
 libexec/gimp/0.99/plug-ins/gauss_rle
@@ -107,9 +105,9 @@ libexec/gimp/0.99/plug-ins/hot
 libexec/gimp/0.99/plug-ins/hrz
 libexec/gimp/0.99/plug-ins/ifscompose
 libexec/gimp/0.99/plug-ins/illusion
+libexec/gimp/0.99/plug-ins/lic
 libexec/gimp/0.99/plug-ins/iwarp
 libexec/gimp/0.99/plug-ins/laplace
-libexec/gimp/0.99/plug-ins/lic
 libexec/gimp/0.99/plug-ins/magiceye
 libexec/gimp/0.99/plug-ins/mail
 libexec/gimp/0.99/plug-ins/max_rgb
@@ -165,6 +163,13 @@ libexec/gimp/0.99/plug-ins/whirlpinch
 libexec/gimp/0.99/plug-ins/xwd
 libexec/gimp/0.99/plug-ins/zealouscrop
 libexec/gimptcl
+share/gimp/gflares/Bright_Star
+share/gimp/gflares/Classic
+share/gimp/gflares/Default
+share/gimp/gflares/Distant_Sun
+share/gimp/gflares/GFlare_101
+share/gimp/gflares/GFlare_102
+share/gimp/gflares/Hidden_Planet
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -187,6 +192,7 @@ share/gimp/scripts/blended-logo.scm
 share/gimp/scripts/carve-it.scm
 share/gimp/scripts/carved-logo.scm
 share/gimp/scripts/chalk.scm
+share/gimp/scripts/chip-away.scm
 share/gimp/scripts/chrome-it.scm
 share/gimp/scripts/chrome-logo.scm
 share/gimp/scripts/circle-logo.scm
@@ -243,6 +249,7 @@ share/gimp/scripts/weave.scm
 share/gimp/scripts/xach-effect.scm
 share/gimp/user_install
 share/gimp/gimprc
+share/gimp/gimprc_user
 share/gimp/gtkrc
 share/gimp/gimp_logo.ppm
 share/gimp/gimp_tips.txt
@@ -273,6 +280,9 @@ share/gimp/brushes/5x5squareBlur.gbr
 share/gimp/brushes/7fcircle.gbr
 share/gimp/brushes/9circle.gbr
 share/gimp/brushes/9fcircle.gbr
+share/gimp/brushes/DStar11.gbr
+share/gimp/brushes/DStar17.gbr
+share/gimp/brushes/DStar25.gbr
 share/gimp/brushes/callig1.gbr
 share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
@@ -287,12 +297,12 @@ share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/50x50cone.gbr
 share/gimp/brushes/50x50square.gbr
 share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/bird.gbr
 share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
 share/gimp/brushes/bigcircle4.gbr
-share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
 share/gimp/brushes/flower.gbr
@@ -582,17 +592,25 @@ share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
+bin/gimp
+@unexec install-info --delete %D/info/pdb.info %D/info/dir
+@unexec install-info --delete %D/info/pdb.info-1 %D/info/dir
+@unexec install-info --delete %D/info/pdb.info-2 %D/info/dir
+@exec install-info %D/info/pdb.info %D/info/dir
+@exec install-info %D/info/pdb.info-1 %D/info/dir
+@exec install-info %D/info/pdb.info-2 %D/info/dir
+info/pdb.info
+info/pdb.info-1
+info/pdb.info-2
 lib/libgimp.so
-@unexec rm %D/%F
 lib/libgimpui.so
-@unexec rm %D/%F
 lib/libgck.so
-@unexec rm %D/%F
 @dirrm include/libgimp
 @dirrm include/gck
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
+@dirrm share/gimp/gflares
 @dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
 @dirrm share/gimp/palettes
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 28220c445ecf..4f7125a3a9da 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,19 +3,19 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.17 1998/01/05 17:56:39 erich Exp $
+# $Id: Makefile,v 1.18 1998/01/07 13:34:07 erich Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	17
+MICRO=	18
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}a.tar.gz \
+DISTFILES+=	gimp-data-min-${MM_VERSION}b.tar.gz \
             gimp-data-extras-${MM_VERSION}a.tar.gz
 
 CATEGORIES=     graphics
@@ -31,12 +31,13 @@ LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS+=	xdelta\\.0:${PORTSDIR}/misc/xdelta
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	LD=/usr/bin/ld \
-		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
+
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
 		-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
 CONFIGURE_ARGS=  --with-tcl=tcl80 --with-tk=tk80
@@ -45,7 +46,7 @@ DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}a; \
+	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}b; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index 56f9833c91b5..764774e1d585 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.17.tar.gz) = 6400f3c18c2aa3d908f5f4485645e85f
-MD5 (gimp-data-min-0.99a.tar.gz) = 0716202f1d277ea8e73bc9b4bcde2352
+MD5 (gimp-0.99.18.tar.gz) = 1d07aa3f2f0f7024bfdb786dd15e8d58
+MD5 (gimp-data-min-0.99b.tar.gz) = 55f735d5bb2604a100707e9638df3d4b
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp-app/files/patch-ah b/graphics/gimp-app/files/patch-ah
index d46998d2fe62..d05ddb1cd23f 100644
--- a/graphics/gimp-app/files/patch-ah
+++ b/graphics/gimp-app/files/patch-ah
@@ -1,5 +1,5 @@
---- configure.in.orig	Sat Jan  3 19:31:29 1998
-+++ configure.in	Mon Jan  5 09:42:49 1998
+--- configure.in~	Mon Jan 26 10:34:48 1998
++++ configure.in	Mon Jan 26 10:35:31 1998
 @@ -120,10 +120,10 @@
  
  dnl Test for libtiff
@@ -24,17 +24,17 @@
  
  dnl This is for generating PDB docuemntation.
  AC_PATH_PROG(EMACS, emacs, :)
---- configure.orig	Mon Jan  5 09:44:02 1998
-+++ configure	Mon Jan  5 09:46:45 1998
-@@ -2531,14 +2531,14 @@
+--- configure~	Mon Jan 26 10:36:08 1998
++++ configure	Mon Jan 26 10:37:35 1998
+@@ -2738,14 +2738,14 @@
  fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2536: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2743: 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:2536: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2743: checking for TIFFReadScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -43,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2544 "configure"
+ #line 2751 "configure"
  #include "confdefs.h"
-@@ -2566,17 +2566,17 @@
+@@ -2773,17 +2773,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -54,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2574: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2781: 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:2574: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2781: checking for TIFFWriteScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -66,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2582 "configure"
+ #line 2789 "configure"
  #include "confdefs.h"
-@@ -2604,7 +2604,7 @@
+@@ -2811,7 +2811,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -77,7 +77,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3742,7 +3742,7 @@
+@@ -3949,7 +3949,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index 772e87aa4c10..615e7b8c6e17 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1,4 +1,12 @@
-bin/gimp
+lib/libgimp.so.1.0
+lib/libgimp.la
+lib/libgimp.a
+lib/libgimpui.so.1.0
+lib/libgimpui.la
+lib/libgimpui.a
+lib/libgck.so.0.1
+lib/libgck.la
+lib/libgck.a
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
 include/libgimp/gimpmenu.h
@@ -13,18 +21,6 @@ include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gcknotebook.h
 include/gck/gckvector.h
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
-lib/libgimp.so.1.0
-lib/libgimp.la
-lib/libgimp.a
-lib/libgimpui.so.1.0
-lib/libgimpui.la
-lib/libgimpui.a
-lib/libgck.so.0.1
-lib/libgck.la
-lib/libgck.a
 libexec/gimp/0.99/plug-ins/libmegawidget.a
 libexec/gimp/0.99/plug-ins/MapObject
 libexec/gimp/0.99/plug-ins/AlienMap
@@ -50,8 +46,9 @@ libexec/gimp/0.99/plug-ins/warp
 libexec/gimp/0.99/plug-ins/tiff
 libexec/gimp/0.99/plug-ins/jpeg
 libexec/gimp/0.99/plug-ins/png
-libexec/gimp/0.99/plug-ins/xpm
+libexec/gimp/0.99/plug-ins/xd
 libexec/gimp/0.99/plug-ins/mpeg
+libexec/gimp/0.99/plug-ins/xpm
 libexec/gimp/0.99/plug-ins/CML_explorer
 libexec/gimp/0.99/plug-ins/align_layers
 libexec/gimp/0.99/plug-ins/apply_lens
@@ -77,6 +74,7 @@ libexec/gimp/0.99/plug-ins/deinterlace
 libexec/gimp/0.99/plug-ins/depthmerge
 libexec/gimp/0.99/plug-ins/despeckle
 libexec/gimp/0.99/plug-ins/destripe
+libexec/gimp/0.99/plug-ins/fp
 libexec/gimp/0.99/plug-ins/diffraction
 libexec/gimp/0.99/plug-ins/displace
 libexec/gimp/0.99/plug-ins/edge
@@ -88,7 +86,7 @@ libexec/gimp/0.99/plug-ins/figures
 libexec/gimp/0.99/plug-ins/film
 libexec/gimp/0.99/plug-ins/fits
 libexec/gimp/0.99/plug-ins/flame
-libexec/gimp/0.99/plug-ins/fp
+libexec/gimp/0.99/plug-ins/flarefx
 libexec/gimp/0.99/plug-ins/fractaltrace
 libexec/gimp/0.99/plug-ins/gauss_iir
 libexec/gimp/0.99/plug-ins/gauss_rle
@@ -107,9 +105,9 @@ libexec/gimp/0.99/plug-ins/hot
 libexec/gimp/0.99/plug-ins/hrz
 libexec/gimp/0.99/plug-ins/ifscompose
 libexec/gimp/0.99/plug-ins/illusion
+libexec/gimp/0.99/plug-ins/lic
 libexec/gimp/0.99/plug-ins/iwarp
 libexec/gimp/0.99/plug-ins/laplace
-libexec/gimp/0.99/plug-ins/lic
 libexec/gimp/0.99/plug-ins/magiceye
 libexec/gimp/0.99/plug-ins/mail
 libexec/gimp/0.99/plug-ins/max_rgb
@@ -165,6 +163,13 @@ libexec/gimp/0.99/plug-ins/whirlpinch
 libexec/gimp/0.99/plug-ins/xwd
 libexec/gimp/0.99/plug-ins/zealouscrop
 libexec/gimptcl
+share/gimp/gflares/Bright_Star
+share/gimp/gflares/Classic
+share/gimp/gflares/Default
+share/gimp/gflares/Distant_Sun
+share/gimp/gflares/GFlare_101
+share/gimp/gflares/GFlare_102
+share/gimp/gflares/Hidden_Planet
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -187,6 +192,7 @@ share/gimp/scripts/blended-logo.scm
 share/gimp/scripts/carve-it.scm
 share/gimp/scripts/carved-logo.scm
 share/gimp/scripts/chalk.scm
+share/gimp/scripts/chip-away.scm
 share/gimp/scripts/chrome-it.scm
 share/gimp/scripts/chrome-logo.scm
 share/gimp/scripts/circle-logo.scm
@@ -243,6 +249,7 @@ share/gimp/scripts/weave.scm
 share/gimp/scripts/xach-effect.scm
 share/gimp/user_install
 share/gimp/gimprc
+share/gimp/gimprc_user
 share/gimp/gtkrc
 share/gimp/gimp_logo.ppm
 share/gimp/gimp_tips.txt
@@ -273,6 +280,9 @@ share/gimp/brushes/5x5squareBlur.gbr
 share/gimp/brushes/7fcircle.gbr
 share/gimp/brushes/9circle.gbr
 share/gimp/brushes/9fcircle.gbr
+share/gimp/brushes/DStar11.gbr
+share/gimp/brushes/DStar17.gbr
+share/gimp/brushes/DStar25.gbr
 share/gimp/brushes/callig1.gbr
 share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
@@ -287,12 +297,12 @@ share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/50x50cone.gbr
 share/gimp/brushes/50x50square.gbr
 share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/bird.gbr
 share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
 share/gimp/brushes/bigcircle4.gbr
-share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
 share/gimp/brushes/flower.gbr
@@ -582,17 +592,25 @@ share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
+bin/gimp
+@unexec install-info --delete %D/info/pdb.info %D/info/dir
+@unexec install-info --delete %D/info/pdb.info-1 %D/info/dir
+@unexec install-info --delete %D/info/pdb.info-2 %D/info/dir
+@exec install-info %D/info/pdb.info %D/info/dir
+@exec install-info %D/info/pdb.info-1 %D/info/dir
+@exec install-info %D/info/pdb.info-2 %D/info/dir
+info/pdb.info
+info/pdb.info-1
+info/pdb.info-2
 lib/libgimp.so
-@unexec rm %D/%F
 lib/libgimpui.so
-@unexec rm %D/%F
 lib/libgck.so
-@unexec rm %D/%F
 @dirrm include/libgimp
 @dirrm include/gck
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
+@dirrm share/gimp/gflares
 @dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
 @dirrm share/gimp/palettes
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 28220c445ecf..4f7125a3a9da 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -3,19 +3,19 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.17 1998/01/05 17:56:39 erich Exp $
+# $Id: Makefile,v 1.18 1998/01/07 13:34:07 erich Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	17
+MICRO=	18
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}a.tar.gz \
+DISTFILES+=	gimp-data-min-${MM_VERSION}b.tar.gz \
             gimp-data-extras-${MM_VERSION}a.tar.gz
 
 CATEGORIES=     graphics
@@ -31,12 +31,13 @@ LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS+=	xdelta\\.0:${PORTSDIR}/misc/xdelta
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	LD=/usr/bin/ld \
-		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
+
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
 		-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
 CONFIGURE_ARGS=  --with-tcl=tcl80 --with-tk=tk80
@@ -45,7 +46,7 @@ DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}a; \
+	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}b; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index 56f9833c91b5..764774e1d585 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.17.tar.gz) = 6400f3c18c2aa3d908f5f4485645e85f
-MD5 (gimp-data-min-0.99a.tar.gz) = 0716202f1d277ea8e73bc9b4bcde2352
+MD5 (gimp-0.99.18.tar.gz) = 1d07aa3f2f0f7024bfdb786dd15e8d58
+MD5 (gimp-data-min-0.99b.tar.gz) = 55f735d5bb2604a100707e9638df3d4b
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp-devel/files/patch-ah b/graphics/gimp-devel/files/patch-ah
index d46998d2fe62..d05ddb1cd23f 100644
--- a/graphics/gimp-devel/files/patch-ah
+++ b/graphics/gimp-devel/files/patch-ah
@@ -1,5 +1,5 @@
---- configure.in.orig	Sat Jan  3 19:31:29 1998
-+++ configure.in	Mon Jan  5 09:42:49 1998
+--- configure.in~	Mon Jan 26 10:34:48 1998
++++ configure.in	Mon Jan 26 10:35:31 1998
 @@ -120,10 +120,10 @@
  
  dnl Test for libtiff
@@ -24,17 +24,17 @@
  
  dnl This is for generating PDB docuemntation.
  AC_PATH_PROG(EMACS, emacs, :)
---- configure.orig	Mon Jan  5 09:44:02 1998
-+++ configure	Mon Jan  5 09:46:45 1998
-@@ -2531,14 +2531,14 @@
+--- configure~	Mon Jan 26 10:36:08 1998
++++ configure	Mon Jan 26 10:37:35 1998
+@@ -2738,14 +2738,14 @@
  fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2536: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2743: 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:2536: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2743: checking for TIFFReadScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -43,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2544 "configure"
+ #line 2751 "configure"
  #include "confdefs.h"
-@@ -2566,17 +2566,17 @@
+@@ -2773,17 +2773,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -54,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2574: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2781: 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:2574: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2781: checking for TIFFWriteScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -66,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2582 "configure"
+ #line 2789 "configure"
  #include "confdefs.h"
-@@ -2604,7 +2604,7 @@
+@@ -2811,7 +2811,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -77,7 +77,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3742,7 +3742,7 @@
+@@ -3949,7 +3949,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index 772e87aa4c10..615e7b8c6e17 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -1,4 +1,12 @@
-bin/gimp
+lib/libgimp.so.1.0
+lib/libgimp.la
+lib/libgimp.a
+lib/libgimpui.so.1.0
+lib/libgimpui.la
+lib/libgimpui.a
+lib/libgck.so.0.1
+lib/libgck.la
+lib/libgck.a
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
 include/libgimp/gimpmenu.h
@@ -13,18 +21,6 @@ include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gcknotebook.h
 include/gck/gckvector.h
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
-lib/libgimp.so.1.0
-lib/libgimp.la
-lib/libgimp.a
-lib/libgimpui.so.1.0
-lib/libgimpui.la
-lib/libgimpui.a
-lib/libgck.so.0.1
-lib/libgck.la
-lib/libgck.a
 libexec/gimp/0.99/plug-ins/libmegawidget.a
 libexec/gimp/0.99/plug-ins/MapObject
 libexec/gimp/0.99/plug-ins/AlienMap
@@ -50,8 +46,9 @@ libexec/gimp/0.99/plug-ins/warp
 libexec/gimp/0.99/plug-ins/tiff
 libexec/gimp/0.99/plug-ins/jpeg
 libexec/gimp/0.99/plug-ins/png
-libexec/gimp/0.99/plug-ins/xpm
+libexec/gimp/0.99/plug-ins/xd
 libexec/gimp/0.99/plug-ins/mpeg
+libexec/gimp/0.99/plug-ins/xpm
 libexec/gimp/0.99/plug-ins/CML_explorer
 libexec/gimp/0.99/plug-ins/align_layers
 libexec/gimp/0.99/plug-ins/apply_lens
@@ -77,6 +74,7 @@ libexec/gimp/0.99/plug-ins/deinterlace
 libexec/gimp/0.99/plug-ins/depthmerge
 libexec/gimp/0.99/plug-ins/despeckle
 libexec/gimp/0.99/plug-ins/destripe
+libexec/gimp/0.99/plug-ins/fp
 libexec/gimp/0.99/plug-ins/diffraction
 libexec/gimp/0.99/plug-ins/displace
 libexec/gimp/0.99/plug-ins/edge
@@ -88,7 +86,7 @@ libexec/gimp/0.99/plug-ins/figures
 libexec/gimp/0.99/plug-ins/film
 libexec/gimp/0.99/plug-ins/fits
 libexec/gimp/0.99/plug-ins/flame
-libexec/gimp/0.99/plug-ins/fp
+libexec/gimp/0.99/plug-ins/flarefx
 libexec/gimp/0.99/plug-ins/fractaltrace
 libexec/gimp/0.99/plug-ins/gauss_iir
 libexec/gimp/0.99/plug-ins/gauss_rle
@@ -107,9 +105,9 @@ libexec/gimp/0.99/plug-ins/hot
 libexec/gimp/0.99/plug-ins/hrz
 libexec/gimp/0.99/plug-ins/ifscompose
 libexec/gimp/0.99/plug-ins/illusion
+libexec/gimp/0.99/plug-ins/lic
 libexec/gimp/0.99/plug-ins/iwarp
 libexec/gimp/0.99/plug-ins/laplace
-libexec/gimp/0.99/plug-ins/lic
 libexec/gimp/0.99/plug-ins/magiceye
 libexec/gimp/0.99/plug-ins/mail
 libexec/gimp/0.99/plug-ins/max_rgb
@@ -165,6 +163,13 @@ libexec/gimp/0.99/plug-ins/whirlpinch
 libexec/gimp/0.99/plug-ins/xwd
 libexec/gimp/0.99/plug-ins/zealouscrop
 libexec/gimptcl
+share/gimp/gflares/Bright_Star
+share/gimp/gflares/Classic
+share/gimp/gflares/Default
+share/gimp/gflares/Distant_Sun
+share/gimp/gflares/GFlare_101
+share/gimp/gflares/GFlare_102
+share/gimp/gflares/Hidden_Planet
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -187,6 +192,7 @@ share/gimp/scripts/blended-logo.scm
 share/gimp/scripts/carve-it.scm
 share/gimp/scripts/carved-logo.scm
 share/gimp/scripts/chalk.scm
+share/gimp/scripts/chip-away.scm
 share/gimp/scripts/chrome-it.scm
 share/gimp/scripts/chrome-logo.scm
 share/gimp/scripts/circle-logo.scm
@@ -243,6 +249,7 @@ share/gimp/scripts/weave.scm
 share/gimp/scripts/xach-effect.scm
 share/gimp/user_install
 share/gimp/gimprc
+share/gimp/gimprc_user
 share/gimp/gtkrc
 share/gimp/gimp_logo.ppm
 share/gimp/gimp_tips.txt
@@ -273,6 +280,9 @@ share/gimp/brushes/5x5squareBlur.gbr
 share/gimp/brushes/7fcircle.gbr
 share/gimp/brushes/9circle.gbr
 share/gimp/brushes/9fcircle.gbr
+share/gimp/brushes/DStar11.gbr
+share/gimp/brushes/DStar17.gbr
+share/gimp/brushes/DStar25.gbr
 share/gimp/brushes/callig1.gbr
 share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
@@ -287,12 +297,12 @@ share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/50x50cone.gbr
 share/gimp/brushes/50x50square.gbr
 share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/bird.gbr
 share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
 share/gimp/brushes/bigcircle4.gbr
-share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
 share/gimp/brushes/flower.gbr
@@ -582,17 +592,25 @@ share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
+bin/gimp
+@unexec install-info --delete %D/info/pdb.info %D/info/dir
+@unexec install-info --delete %D/info/pdb.info-1 %D/info/dir
+@unexec install-info --delete %D/info/pdb.info-2 %D/info/dir
+@exec install-info %D/info/pdb.info %D/info/dir
+@exec install-info %D/info/pdb.info-1 %D/info/dir
+@exec install-info %D/info/pdb.info-2 %D/info/dir
+info/pdb.info
+info/pdb.info-1
+info/pdb.info-2
 lib/libgimp.so
-@unexec rm %D/%F
 lib/libgimpui.so
-@unexec rm %D/%F
 lib/libgck.so
-@unexec rm %D/%F
 @dirrm include/libgimp
 @dirrm include/gck
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
+@dirrm share/gimp/gflares
 @dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
 @dirrm share/gimp/palettes
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 28220c445ecf..4f7125a3a9da 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,19 +3,19 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.17 1998/01/05 17:56:39 erich Exp $
+# $Id: Makefile,v 1.18 1998/01/07 13:34:07 erich Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	17
+MICRO=	18
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}a.tar.gz \
+DISTFILES+=	gimp-data-min-${MM_VERSION}b.tar.gz \
             gimp-data-extras-${MM_VERSION}a.tar.gz
 
 CATEGORIES=     graphics
@@ -31,12 +31,13 @@ LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS+=	xdelta\\.0:${PORTSDIR}/misc/xdelta
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	LD=/usr/bin/ld \
-		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
+
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
 		-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
 CONFIGURE_ARGS=  --with-tcl=tcl80 --with-tk=tk80
@@ -45,7 +46,7 @@ DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}a; \
+	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}b; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index 56f9833c91b5..764774e1d585 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.17.tar.gz) = 6400f3c18c2aa3d908f5f4485645e85f
-MD5 (gimp-data-min-0.99a.tar.gz) = 0716202f1d277ea8e73bc9b4bcde2352
+MD5 (gimp-0.99.18.tar.gz) = 1d07aa3f2f0f7024bfdb786dd15e8d58
+MD5 (gimp-data-min-0.99b.tar.gz) = 55f735d5bb2604a100707e9638df3d4b
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp/files/patch-ah b/graphics/gimp/files/patch-ah
index d46998d2fe62..d05ddb1cd23f 100644
--- a/graphics/gimp/files/patch-ah
+++ b/graphics/gimp/files/patch-ah
@@ -1,5 +1,5 @@
---- configure.in.orig	Sat Jan  3 19:31:29 1998
-+++ configure.in	Mon Jan  5 09:42:49 1998
+--- configure.in~	Mon Jan 26 10:34:48 1998
++++ configure.in	Mon Jan 26 10:35:31 1998
 @@ -120,10 +120,10 @@
  
  dnl Test for libtiff
@@ -24,17 +24,17 @@
  
  dnl This is for generating PDB docuemntation.
  AC_PATH_PROG(EMACS, emacs, :)
---- configure.orig	Mon Jan  5 09:44:02 1998
-+++ configure	Mon Jan  5 09:46:45 1998
-@@ -2531,14 +2531,14 @@
+--- configure~	Mon Jan 26 10:36:08 1998
++++ configure	Mon Jan 26 10:37:35 1998
+@@ -2738,14 +2738,14 @@
  fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2536: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2743: 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:2536: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2743: checking for TIFFReadScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -43,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2544 "configure"
+ #line 2751 "configure"
  #include "confdefs.h"
-@@ -2566,17 +2566,17 @@
+@@ -2773,17 +2773,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -54,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2574: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2781: 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:2574: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2781: checking for TIFFWriteScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -66,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2582 "configure"
+ #line 2789 "configure"
  #include "confdefs.h"
-@@ -2604,7 +2604,7 @@
+@@ -2811,7 +2811,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -77,7 +77,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3742,7 +3742,7 @@
+@@ -3949,7 +3949,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index 772e87aa4c10..615e7b8c6e17 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -1,4 +1,12 @@
-bin/gimp
+lib/libgimp.so.1.0
+lib/libgimp.la
+lib/libgimp.a
+lib/libgimpui.so.1.0
+lib/libgimpui.la
+lib/libgimpui.a
+lib/libgck.so.0.1
+lib/libgck.la
+lib/libgck.a
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
 include/libgimp/gimpmenu.h
@@ -13,18 +21,6 @@ include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gcknotebook.h
 include/gck/gckvector.h
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
-lib/libgimp.so.1.0
-lib/libgimp.la
-lib/libgimp.a
-lib/libgimpui.so.1.0
-lib/libgimpui.la
-lib/libgimpui.a
-lib/libgck.so.0.1
-lib/libgck.la
-lib/libgck.a
 libexec/gimp/0.99/plug-ins/libmegawidget.a
 libexec/gimp/0.99/plug-ins/MapObject
 libexec/gimp/0.99/plug-ins/AlienMap
@@ -50,8 +46,9 @@ libexec/gimp/0.99/plug-ins/warp
 libexec/gimp/0.99/plug-ins/tiff
 libexec/gimp/0.99/plug-ins/jpeg
 libexec/gimp/0.99/plug-ins/png
-libexec/gimp/0.99/plug-ins/xpm
+libexec/gimp/0.99/plug-ins/xd
 libexec/gimp/0.99/plug-ins/mpeg
+libexec/gimp/0.99/plug-ins/xpm
 libexec/gimp/0.99/plug-ins/CML_explorer
 libexec/gimp/0.99/plug-ins/align_layers
 libexec/gimp/0.99/plug-ins/apply_lens
@@ -77,6 +74,7 @@ libexec/gimp/0.99/plug-ins/deinterlace
 libexec/gimp/0.99/plug-ins/depthmerge
 libexec/gimp/0.99/plug-ins/despeckle
 libexec/gimp/0.99/plug-ins/destripe
+libexec/gimp/0.99/plug-ins/fp
 libexec/gimp/0.99/plug-ins/diffraction
 libexec/gimp/0.99/plug-ins/displace
 libexec/gimp/0.99/plug-ins/edge
@@ -88,7 +86,7 @@ libexec/gimp/0.99/plug-ins/figures
 libexec/gimp/0.99/plug-ins/film
 libexec/gimp/0.99/plug-ins/fits
 libexec/gimp/0.99/plug-ins/flame
-libexec/gimp/0.99/plug-ins/fp
+libexec/gimp/0.99/plug-ins/flarefx
 libexec/gimp/0.99/plug-ins/fractaltrace
 libexec/gimp/0.99/plug-ins/gauss_iir
 libexec/gimp/0.99/plug-ins/gauss_rle
@@ -107,9 +105,9 @@ libexec/gimp/0.99/plug-ins/hot
 libexec/gimp/0.99/plug-ins/hrz
 libexec/gimp/0.99/plug-ins/ifscompose
 libexec/gimp/0.99/plug-ins/illusion
+libexec/gimp/0.99/plug-ins/lic
 libexec/gimp/0.99/plug-ins/iwarp
 libexec/gimp/0.99/plug-ins/laplace
-libexec/gimp/0.99/plug-ins/lic
 libexec/gimp/0.99/plug-ins/magiceye
 libexec/gimp/0.99/plug-ins/mail
 libexec/gimp/0.99/plug-ins/max_rgb
@@ -165,6 +163,13 @@ libexec/gimp/0.99/plug-ins/whirlpinch
 libexec/gimp/0.99/plug-ins/xwd
 libexec/gimp/0.99/plug-ins/zealouscrop
 libexec/gimptcl
+share/gimp/gflares/Bright_Star
+share/gimp/gflares/Classic
+share/gimp/gflares/Default
+share/gimp/gflares/Distant_Sun
+share/gimp/gflares/GFlare_101
+share/gimp/gflares/GFlare_102
+share/gimp/gflares/Hidden_Planet
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -187,6 +192,7 @@ share/gimp/scripts/blended-logo.scm
 share/gimp/scripts/carve-it.scm
 share/gimp/scripts/carved-logo.scm
 share/gimp/scripts/chalk.scm
+share/gimp/scripts/chip-away.scm
 share/gimp/scripts/chrome-it.scm
 share/gimp/scripts/chrome-logo.scm
 share/gimp/scripts/circle-logo.scm
@@ -243,6 +249,7 @@ share/gimp/scripts/weave.scm
 share/gimp/scripts/xach-effect.scm
 share/gimp/user_install
 share/gimp/gimprc
+share/gimp/gimprc_user
 share/gimp/gtkrc
 share/gimp/gimp_logo.ppm
 share/gimp/gimp_tips.txt
@@ -273,6 +280,9 @@ share/gimp/brushes/5x5squareBlur.gbr
 share/gimp/brushes/7fcircle.gbr
 share/gimp/brushes/9circle.gbr
 share/gimp/brushes/9fcircle.gbr
+share/gimp/brushes/DStar11.gbr
+share/gimp/brushes/DStar17.gbr
+share/gimp/brushes/DStar25.gbr
 share/gimp/brushes/callig1.gbr
 share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
@@ -287,12 +297,12 @@ share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/50x50cone.gbr
 share/gimp/brushes/50x50square.gbr
 share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/bird.gbr
 share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
 share/gimp/brushes/bigcircle4.gbr
-share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
 share/gimp/brushes/flower.gbr
@@ -582,17 +592,25 @@ share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
+bin/gimp
+@unexec install-info --delete %D/info/pdb.info %D/info/dir
+@unexec install-info --delete %D/info/pdb.info-1 %D/info/dir
+@unexec install-info --delete %D/info/pdb.info-2 %D/info/dir
+@exec install-info %D/info/pdb.info %D/info/dir
+@exec install-info %D/info/pdb.info-1 %D/info/dir
+@exec install-info %D/info/pdb.info-2 %D/info/dir
+info/pdb.info
+info/pdb.info-1
+info/pdb.info-2
 lib/libgimp.so
-@unexec rm %D/%F
 lib/libgimpui.so
-@unexec rm %D/%F
 lib/libgck.so
-@unexec rm %D/%F
 @dirrm include/libgimp
 @dirrm include/gck
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
+@dirrm share/gimp/gflares
 @dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
 @dirrm share/gimp/palettes
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 28220c445ecf..4f7125a3a9da 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -3,19 +3,19 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.17 1998/01/05 17:56:39 erich Exp $
+# $Id: Makefile,v 1.18 1998/01/07 13:34:07 erich Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	17
+MICRO=	18
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}a.tar.gz \
+DISTFILES+=	gimp-data-min-${MM_VERSION}b.tar.gz \
             gimp-data-extras-${MM_VERSION}a.tar.gz
 
 CATEGORIES=     graphics
@@ -31,12 +31,13 @@ LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS+=	xdelta\\.0:${PORTSDIR}/misc/xdelta
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	LD=/usr/bin/ld \
-		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
+
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
 		-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
 CONFIGURE_ARGS=  --with-tcl=tcl80 --with-tk=tk80
@@ -45,7 +46,7 @@ DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}a; \
+	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}b; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index 56f9833c91b5..764774e1d585 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.17.tar.gz) = 6400f3c18c2aa3d908f5f4485645e85f
-MD5 (gimp-data-min-0.99a.tar.gz) = 0716202f1d277ea8e73bc9b4bcde2352
+MD5 (gimp-0.99.18.tar.gz) = 1d07aa3f2f0f7024bfdb786dd15e8d58
+MD5 (gimp-data-min-0.99b.tar.gz) = 55f735d5bb2604a100707e9638df3d4b
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimp1/files/patch-ah b/graphics/gimp1/files/patch-ah
index d46998d2fe62..d05ddb1cd23f 100644
--- a/graphics/gimp1/files/patch-ah
+++ b/graphics/gimp1/files/patch-ah
@@ -1,5 +1,5 @@
---- configure.in.orig	Sat Jan  3 19:31:29 1998
-+++ configure.in	Mon Jan  5 09:42:49 1998
+--- configure.in~	Mon Jan 26 10:34:48 1998
++++ configure.in	Mon Jan 26 10:35:31 1998
 @@ -120,10 +120,10 @@
  
  dnl Test for libtiff
@@ -24,17 +24,17 @@
  
  dnl This is for generating PDB docuemntation.
  AC_PATH_PROG(EMACS, emacs, :)
---- configure.orig	Mon Jan  5 09:44:02 1998
-+++ configure	Mon Jan  5 09:46:45 1998
-@@ -2531,14 +2531,14 @@
+--- configure~	Mon Jan 26 10:36:08 1998
++++ configure	Mon Jan 26 10:37:35 1998
+@@ -2738,14 +2738,14 @@
  fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2536: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2743: 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:2536: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2743: checking for TIFFReadScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -43,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2544 "configure"
+ #line 2751 "configure"
  #include "confdefs.h"
-@@ -2566,17 +2566,17 @@
+@@ -2773,17 +2773,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -54,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2574: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2781: 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:2574: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2781: checking for TIFFWriteScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -66,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2582 "configure"
+ #line 2789 "configure"
  #include "confdefs.h"
-@@ -2604,7 +2604,7 @@
+@@ -2811,7 +2811,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -77,7 +77,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3742,7 +3742,7 @@
+@@ -3949,7 +3949,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index 772e87aa4c10..615e7b8c6e17 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -1,4 +1,12 @@
-bin/gimp
+lib/libgimp.so.1.0
+lib/libgimp.la
+lib/libgimp.a
+lib/libgimpui.so.1.0
+lib/libgimpui.la
+lib/libgimpui.a
+lib/libgck.so.0.1
+lib/libgck.la
+lib/libgck.a
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
 include/libgimp/gimpmenu.h
@@ -13,18 +21,6 @@ include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gcknotebook.h
 include/gck/gckvector.h
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
-lib/libgimp.so.1.0
-lib/libgimp.la
-lib/libgimp.a
-lib/libgimpui.so.1.0
-lib/libgimpui.la
-lib/libgimpui.a
-lib/libgck.so.0.1
-lib/libgck.la
-lib/libgck.a
 libexec/gimp/0.99/plug-ins/libmegawidget.a
 libexec/gimp/0.99/plug-ins/MapObject
 libexec/gimp/0.99/plug-ins/AlienMap
@@ -50,8 +46,9 @@ libexec/gimp/0.99/plug-ins/warp
 libexec/gimp/0.99/plug-ins/tiff
 libexec/gimp/0.99/plug-ins/jpeg
 libexec/gimp/0.99/plug-ins/png
-libexec/gimp/0.99/plug-ins/xpm
+libexec/gimp/0.99/plug-ins/xd
 libexec/gimp/0.99/plug-ins/mpeg
+libexec/gimp/0.99/plug-ins/xpm
 libexec/gimp/0.99/plug-ins/CML_explorer
 libexec/gimp/0.99/plug-ins/align_layers
 libexec/gimp/0.99/plug-ins/apply_lens
@@ -77,6 +74,7 @@ libexec/gimp/0.99/plug-ins/deinterlace
 libexec/gimp/0.99/plug-ins/depthmerge
 libexec/gimp/0.99/plug-ins/despeckle
 libexec/gimp/0.99/plug-ins/destripe
+libexec/gimp/0.99/plug-ins/fp
 libexec/gimp/0.99/plug-ins/diffraction
 libexec/gimp/0.99/plug-ins/displace
 libexec/gimp/0.99/plug-ins/edge
@@ -88,7 +86,7 @@ libexec/gimp/0.99/plug-ins/figures
 libexec/gimp/0.99/plug-ins/film
 libexec/gimp/0.99/plug-ins/fits
 libexec/gimp/0.99/plug-ins/flame
-libexec/gimp/0.99/plug-ins/fp
+libexec/gimp/0.99/plug-ins/flarefx
 libexec/gimp/0.99/plug-ins/fractaltrace
 libexec/gimp/0.99/plug-ins/gauss_iir
 libexec/gimp/0.99/plug-ins/gauss_rle
@@ -107,9 +105,9 @@ libexec/gimp/0.99/plug-ins/hot
 libexec/gimp/0.99/plug-ins/hrz
 libexec/gimp/0.99/plug-ins/ifscompose
 libexec/gimp/0.99/plug-ins/illusion
+libexec/gimp/0.99/plug-ins/lic
 libexec/gimp/0.99/plug-ins/iwarp
 libexec/gimp/0.99/plug-ins/laplace
-libexec/gimp/0.99/plug-ins/lic
 libexec/gimp/0.99/plug-ins/magiceye
 libexec/gimp/0.99/plug-ins/mail
 libexec/gimp/0.99/plug-ins/max_rgb
@@ -165,6 +163,13 @@ libexec/gimp/0.99/plug-ins/whirlpinch
 libexec/gimp/0.99/plug-ins/xwd
 libexec/gimp/0.99/plug-ins/zealouscrop
 libexec/gimptcl
+share/gimp/gflares/Bright_Star
+share/gimp/gflares/Classic
+share/gimp/gflares/Default
+share/gimp/gflares/Distant_Sun
+share/gimp/gflares/GFlare_101
+share/gimp/gflares/GFlare_102
+share/gimp/gflares/Hidden_Planet
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -187,6 +192,7 @@ share/gimp/scripts/blended-logo.scm
 share/gimp/scripts/carve-it.scm
 share/gimp/scripts/carved-logo.scm
 share/gimp/scripts/chalk.scm
+share/gimp/scripts/chip-away.scm
 share/gimp/scripts/chrome-it.scm
 share/gimp/scripts/chrome-logo.scm
 share/gimp/scripts/circle-logo.scm
@@ -243,6 +249,7 @@ share/gimp/scripts/weave.scm
 share/gimp/scripts/xach-effect.scm
 share/gimp/user_install
 share/gimp/gimprc
+share/gimp/gimprc_user
 share/gimp/gtkrc
 share/gimp/gimp_logo.ppm
 share/gimp/gimp_tips.txt
@@ -273,6 +280,9 @@ share/gimp/brushes/5x5squareBlur.gbr
 share/gimp/brushes/7fcircle.gbr
 share/gimp/brushes/9circle.gbr
 share/gimp/brushes/9fcircle.gbr
+share/gimp/brushes/DStar11.gbr
+share/gimp/brushes/DStar17.gbr
+share/gimp/brushes/DStar25.gbr
 share/gimp/brushes/callig1.gbr
 share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
@@ -287,12 +297,12 @@ share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/50x50cone.gbr
 share/gimp/brushes/50x50square.gbr
 share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/bird.gbr
 share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
 share/gimp/brushes/bigcircle4.gbr
-share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
 share/gimp/brushes/flower.gbr
@@ -582,17 +592,25 @@ share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
+bin/gimp
+@unexec install-info --delete %D/info/pdb.info %D/info/dir
+@unexec install-info --delete %D/info/pdb.info-1 %D/info/dir
+@unexec install-info --delete %D/info/pdb.info-2 %D/info/dir
+@exec install-info %D/info/pdb.info %D/info/dir
+@exec install-info %D/info/pdb.info-1 %D/info/dir
+@exec install-info %D/info/pdb.info-2 %D/info/dir
+info/pdb.info
+info/pdb.info-1
+info/pdb.info-2
 lib/libgimp.so
-@unexec rm %D/%F
 lib/libgimpui.so
-@unexec rm %D/%F
 lib/libgck.so
-@unexec rm %D/%F
 @dirrm include/libgimp
 @dirrm include/gck
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
+@dirrm share/gimp/gflares
 @dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
 @dirrm share/gimp/palettes
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 28220c445ecf..4f7125a3a9da 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -3,19 +3,19 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.17 1998/01/05 17:56:39 erich Exp $
+# $Id: Makefile,v 1.18 1998/01/07 13:34:07 erich Exp $
 #
 
 MAJOR=	0
 MINOR=	99
-MICRO=	17
+MICRO=	18
 
 VERSION=		${MAJOR}.${MINOR}.${MICRO}
 MM_VERSION= ${MAJOR}.${MINOR}
 
 DISTNAME=   gimp-${VERSION}
 DISTFILES=	${DISTNAME}.tar.gz
-DISTFILES+=	gimp-data-min-${MM_VERSION}a.tar.gz \
+DISTFILES+=	gimp-data-min-${MM_VERSION}b.tar.gz \
             gimp-data-extras-${MM_VERSION}a.tar.gz
 
 CATEGORIES=     graphics
@@ -31,12 +31,13 @@ LIB_DEPENDS+=	tiff34\\.1\\.:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	mpeg\\.1\\.2:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	tk80\\.1\\.:${PORTSDIR}/x11/tk80
+LIB_DEPENDS+=	xdelta\\.0:${PORTSDIR}/misc/xdelta
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ENV=	LD=/usr/bin/ld \
-		CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
+
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/tcl8.0 \
 		-I${LOCALBASE}/include/tk8.0 -I${LOCALBASE}/include/tiff34" \
 		LIBS=-L${LOCALBASE}/lib INSTALL_SCRIPT='$${INSTALL} -m 755'
 CONFIGURE_ARGS=  --with-tcl=tcl80 --with-tk=tk80
@@ -45,7 +46,7 @@ DATASTUFF=  brushes palettes gradients patterns
 
 post-install:
 	mkdir -p ${PREFIX}/share/gimp/;
-	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}a; \
+	cd ${WRKDIR}/gimp-data-min-${MM_VERSION}b; \
 	tar -cf - --exclude '*Makefile*' ${DATASTUFF} |\
 	(cd ${PREFIX}/share/gimp/; tar -xvf -)
 	cd ${WRKDIR}/gimp-data-extras-${MM_VERSION}a; \
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 56f9833c91b5..764774e1d585 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1,3 +1,3 @@
-MD5 (gimp-0.99.17.tar.gz) = 6400f3c18c2aa3d908f5f4485645e85f
-MD5 (gimp-data-min-0.99a.tar.gz) = 0716202f1d277ea8e73bc9b4bcde2352
+MD5 (gimp-0.99.18.tar.gz) = 1d07aa3f2f0f7024bfdb786dd15e8d58
+MD5 (gimp-data-min-0.99b.tar.gz) = 55f735d5bb2604a100707e9638df3d4b
 MD5 (gimp-data-extras-0.99a.tar.gz) = 7035455b77b6996bc14e35922de08a39
diff --git a/graphics/gimpshop/files/patch-ah b/graphics/gimpshop/files/patch-ah
index d46998d2fe62..d05ddb1cd23f 100644
--- a/graphics/gimpshop/files/patch-ah
+++ b/graphics/gimpshop/files/patch-ah
@@ -1,5 +1,5 @@
---- configure.in.orig	Sat Jan  3 19:31:29 1998
-+++ configure.in	Mon Jan  5 09:42:49 1998
+--- configure.in~	Mon Jan 26 10:34:48 1998
++++ configure.in	Mon Jan 26 10:35:31 1998
 @@ -120,10 +120,10 @@
  
  dnl Test for libtiff
@@ -24,17 +24,17 @@
  
  dnl This is for generating PDB docuemntation.
  AC_PATH_PROG(EMACS, emacs, :)
---- configure.orig	Mon Jan  5 09:44:02 1998
-+++ configure	Mon Jan  5 09:46:45 1998
-@@ -2531,14 +2531,14 @@
+--- configure~	Mon Jan 26 10:36:08 1998
++++ configure	Mon Jan 26 10:37:35 1998
+@@ -2738,14 +2738,14 @@
  fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2536: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2743: 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:2536: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2743: checking for TIFFReadScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -43,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2544 "configure"
+ #line 2751 "configure"
  #include "confdefs.h"
-@@ -2566,17 +2566,17 @@
+@@ -2773,17 +2773,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -54,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2574: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2781: 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:2574: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2781: checking for TIFFWriteScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -66,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2582 "configure"
+ #line 2789 "configure"
  #include "confdefs.h"
-@@ -2604,7 +2604,7 @@
+@@ -2811,7 +2811,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -77,7 +77,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3742,7 +3742,7 @@
+@@ -3949,7 +3949,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 772e87aa4c10..615e7b8c6e17 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1,4 +1,12 @@
-bin/gimp
+lib/libgimp.so.1.0
+lib/libgimp.la
+lib/libgimp.a
+lib/libgimpui.so.1.0
+lib/libgimpui.la
+lib/libgimpui.a
+lib/libgck.so.0.1
+lib/libgck.la
+lib/libgck.a
 include/libgimp/gimp.h
 include/libgimp/gimpenums.h
 include/libgimp/gimpmenu.h
@@ -13,18 +21,6 @@ include/gck/gcktypes.h
 include/gck/gckui.h
 include/gck/gcknotebook.h
 include/gck/gckvector.h
-info/pdb.info
-info/pdb.info-1
-info/pdb.info-2
-lib/libgimp.so.1.0
-lib/libgimp.la
-lib/libgimp.a
-lib/libgimpui.so.1.0
-lib/libgimpui.la
-lib/libgimpui.a
-lib/libgck.so.0.1
-lib/libgck.la
-lib/libgck.a
 libexec/gimp/0.99/plug-ins/libmegawidget.a
 libexec/gimp/0.99/plug-ins/MapObject
 libexec/gimp/0.99/plug-ins/AlienMap
@@ -50,8 +46,9 @@ libexec/gimp/0.99/plug-ins/warp
 libexec/gimp/0.99/plug-ins/tiff
 libexec/gimp/0.99/plug-ins/jpeg
 libexec/gimp/0.99/plug-ins/png
-libexec/gimp/0.99/plug-ins/xpm
+libexec/gimp/0.99/plug-ins/xd
 libexec/gimp/0.99/plug-ins/mpeg
+libexec/gimp/0.99/plug-ins/xpm
 libexec/gimp/0.99/plug-ins/CML_explorer
 libexec/gimp/0.99/plug-ins/align_layers
 libexec/gimp/0.99/plug-ins/apply_lens
@@ -77,6 +74,7 @@ libexec/gimp/0.99/plug-ins/deinterlace
 libexec/gimp/0.99/plug-ins/depthmerge
 libexec/gimp/0.99/plug-ins/despeckle
 libexec/gimp/0.99/plug-ins/destripe
+libexec/gimp/0.99/plug-ins/fp
 libexec/gimp/0.99/plug-ins/diffraction
 libexec/gimp/0.99/plug-ins/displace
 libexec/gimp/0.99/plug-ins/edge
@@ -88,7 +86,7 @@ libexec/gimp/0.99/plug-ins/figures
 libexec/gimp/0.99/plug-ins/film
 libexec/gimp/0.99/plug-ins/fits
 libexec/gimp/0.99/plug-ins/flame
-libexec/gimp/0.99/plug-ins/fp
+libexec/gimp/0.99/plug-ins/flarefx
 libexec/gimp/0.99/plug-ins/fractaltrace
 libexec/gimp/0.99/plug-ins/gauss_iir
 libexec/gimp/0.99/plug-ins/gauss_rle
@@ -107,9 +105,9 @@ libexec/gimp/0.99/plug-ins/hot
 libexec/gimp/0.99/plug-ins/hrz
 libexec/gimp/0.99/plug-ins/ifscompose
 libexec/gimp/0.99/plug-ins/illusion
+libexec/gimp/0.99/plug-ins/lic
 libexec/gimp/0.99/plug-ins/iwarp
 libexec/gimp/0.99/plug-ins/laplace
-libexec/gimp/0.99/plug-ins/lic
 libexec/gimp/0.99/plug-ins/magiceye
 libexec/gimp/0.99/plug-ins/mail
 libexec/gimp/0.99/plug-ins/max_rgb
@@ -165,6 +163,13 @@ libexec/gimp/0.99/plug-ins/whirlpinch
 libexec/gimp/0.99/plug-ins/xwd
 libexec/gimp/0.99/plug-ins/zealouscrop
 libexec/gimptcl
+share/gimp/gflares/Bright_Star
+share/gimp/gflares/Classic
+share/gimp/gflares/Default
+share/gimp/gflares/Distant_Sun
+share/gimp/gflares/GFlare_101
+share/gimp/gflares/GFlare_102
+share/gimp/gflares/Hidden_Planet
 share/gimp/scripts/3dTruchet.scm
 share/gimp/scripts/add-bevel.scm
 share/gimp/scripts/addborder.scm
@@ -187,6 +192,7 @@ share/gimp/scripts/blended-logo.scm
 share/gimp/scripts/carve-it.scm
 share/gimp/scripts/carved-logo.scm
 share/gimp/scripts/chalk.scm
+share/gimp/scripts/chip-away.scm
 share/gimp/scripts/chrome-it.scm
 share/gimp/scripts/chrome-logo.scm
 share/gimp/scripts/circle-logo.scm
@@ -243,6 +249,7 @@ share/gimp/scripts/weave.scm
 share/gimp/scripts/xach-effect.scm
 share/gimp/user_install
 share/gimp/gimprc
+share/gimp/gimprc_user
 share/gimp/gtkrc
 share/gimp/gimp_logo.ppm
 share/gimp/gimp_tips.txt
@@ -273,6 +280,9 @@ share/gimp/brushes/5x5squareBlur.gbr
 share/gimp/brushes/7fcircle.gbr
 share/gimp/brushes/9circle.gbr
 share/gimp/brushes/9fcircle.gbr
+share/gimp/brushes/DStar11.gbr
+share/gimp/brushes/DStar17.gbr
+share/gimp/brushes/DStar25.gbr
 share/gimp/brushes/callig1.gbr
 share/gimp/brushes/callig2.gbr
 share/gimp/brushes/callig3.gbr
@@ -287,12 +297,12 @@ share/gimp/brushes/thegimp.gbr
 share/gimp/brushes/50x50cone.gbr
 share/gimp/brushes/50x50square.gbr
 share/gimp/brushes/50x50squareBlur.gbr
+share/gimp/brushes/bird.gbr
 share/gimp/brushes/50x50squareBlur2.gbr
 share/gimp/brushes/bigcircle.gbr
 share/gimp/brushes/bigcircle2.gbr
 share/gimp/brushes/bigcircle3.gbr
 share/gimp/brushes/bigcircle4.gbr
-share/gimp/brushes/bird.gbr
 share/gimp/brushes/bullethole.gbr
 share/gimp/brushes/cloth.gbr
 share/gimp/brushes/flower.gbr
@@ -582,17 +592,25 @@ share/gimp/patterns/weird2.pat
 share/gimp/patterns/whirledstuff.pat
 share/gimp/patterns/woodblind.pat
 share/gimp/patterns/worn_metal_chex.pat
+bin/gimp
+@unexec install-info --delete %D/info/pdb.info %D/info/dir
+@unexec install-info --delete %D/info/pdb.info-1 %D/info/dir
+@unexec install-info --delete %D/info/pdb.info-2 %D/info/dir
+@exec install-info %D/info/pdb.info %D/info/dir
+@exec install-info %D/info/pdb.info-1 %D/info/dir
+@exec install-info %D/info/pdb.info-2 %D/info/dir
+info/pdb.info
+info/pdb.info-1
+info/pdb.info-2
 lib/libgimp.so
-@unexec rm %D/%F
 lib/libgimpui.so
-@unexec rm %D/%F
 lib/libgck.so
-@unexec rm %D/%F
 @dirrm include/libgimp
 @dirrm include/gck
 @dirrm libexec/gimp/0.99/plug-ins
 @dirrm libexec/gimp/0.99
 @dirrm libexec/gimp
+@dirrm share/gimp/gflares
 @dirrm share/gimp/scripts
 @dirrm share/gimp/brushes
 @dirrm share/gimp/palettes