upgrade to 0.99.6, plus a few patches from the gimp-developers list

3 files changed, 188 insertions, 192 deletions

diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 920c887d4f9c..5674bde9cb60 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    GIMP
-# Version required:     0.99.3
+# Version required:     0.99.6
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.4 1997/02/28 19:19:31 erich Exp $
+# $Id: Makefile,v 1.5 1997/03/02 19:44:41 erich Exp $
 #
 
-DISTNAME=       gimp-0.99.3
+DISTNAME=       gimp-0.99.6
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
 
@@ -19,6 +19,7 @@ LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
+
 USE_GMAKE=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index 383b7eba5172..0abfb6441869 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1 +1 @@
-MD5 (gimp-0.99.3.tar.gz) = 17ca93175558dfd7be194db15b4cec20
+MD5 (gimp-0.99.6.tar.gz) = 03e45848f5e631b4ecab96fe2c4e897f
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index 639062e6fff1..d51b454483e7 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1,16 +1,12 @@
 bin/gimp
-include/gconfig.h
 include/gdk/gdk.h
 include/gdk/gdkcursors.h
 include/gdk/gdkkeysyms.h
 include/gdk/gdkprivate.h
 include/gdk/gdktypes.h
 include/gdk/gdkx.h
-include/gimp.h
-include/gimpenums.h
-include/gimpmenu.h
-include/gimpui.h
-include/glib.h
+include/glib/gconfig.h
+include/glib/glib.h
 include/gtk/gtk.h
 include/gtk/gtkaccelerator.h
 include/gtk/gtkadjustment.h
@@ -78,23 +74,19 @@ include/gtk/gtkvscrollbar.h
 include/gtk/gtkvseparator.h
 include/gtk/gtkwidget.h
 include/gtk/gtkwindow.h
+include/libgimp/gimp.h
+include/libgimp/gimpenums.h
+include/libgimp/gimpmenu.h
+include/libgimp/gimpui.h
 info/gdk.info
 info/gtk.info
 info/pdb.info
 info/pdb.info-1
 info/pdb.info-2
-lib/libgdk.a
-lib/libgdk.la
-lib/libgdk.so
-lib/libgdk.so.1.0
 lib/libgimp.a
 lib/libgimp.la
 lib/libgimp.so
 lib/libgimp.so.1.0
-lib/libgimpi.a
-lib/libgimpi.la
-lib/libgimpi.so
-lib/libgimpi.so.1.0
 lib/libgimpui.a
 lib/libgimpui.la
 lib/libgimpui.so
@@ -103,178 +95,181 @@ lib/libglib.a
 lib/libglib.la
 lib/libglib.so
 lib/libglib.so.1.0
-lib/libgtk.a
-lib/libgtk.la
-lib/libgtk.so
-lib/libgtk.so.1.0
-libexec/gimp/plug-ins/blur
-libexec/gimp/plug-ins/c_astretch
-libexec/gimp/plug-ins/cubism
-libexec/gimp/plug-ins/demo
-libexec/gimp/plug-ins/displace
-libexec/gimp/plug-ins/gauss_iir
-libexec/gimp/plug-ins/gauss_rle
-libexec/gimp/plug-ins/gif
-libexec/gimp/plug-ins/header
-libexec/gimp/plug-ins/jpeg
-libexec/gimp/plug-ins/mosaic
-libexec/gimp/plug-ins/noisify
-libexec/gimp/plug-ins/oilify
-libexec/gimp/plug-ins/pinch
-libexec/gimp/plug-ins/pnm
-libexec/gimp/plug-ins/script-fu
-libexec/gimp/plug-ins/sparkle
-libexec/gimp/plug-ins/tiff
-libexec/gimp/plug-ins/tile
-libexec/gimp/plug-ins/whirl
-share/gimp/brushes/11circle.gbr
-share/gimp/brushes/11fcircle.gbr
-share/gimp/brushes/13circle.gbr
-share/gimp/brushes/13fcircle.gbr
-share/gimp/brushes/15circle.gbr
-share/gimp/brushes/15fcircle.gbr
-share/gimp/brushes/17circle.gbr
-share/gimp/brushes/17fcircle.gbr
-share/gimp/brushes/19circle.gbr
-share/gimp/brushes/19fcircle.gbr
-share/gimp/brushes/1circle.gbr
-share/gimp/brushes/3circle.gbr
-share/gimp/brushes/3fcircle.gbr
-share/gimp/brushes/5circle.gbr
-share/gimp/brushes/5fcircle.gbr
-share/gimp/brushes/7circle.gbr
-share/gimp/brushes/7fcircle.gbr
-share/gimp/brushes/9circle.gbr
-share/gimp/brushes/9fcircle.gbr
-share/gimp/brushes/airplane.gbr
-share/gimp/brushes/bird.gbr
-share/gimp/brushes/bush.gbr
-share/gimp/brushes/confetti.gbr
-share/gimp/brushes/cross_large.gbr
-share/gimp/brushes/cross_small.gbr
-share/gimp/brushes/diamond.gbr
-share/gimp/brushes/duck.gbr
-share/gimp/brushes/dunes.gbr
-share/gimp/brushes/elk.gbr
-share/gimp/brushes/flags.gbr
-share/gimp/brushes/flower.gbr
-share/gimp/brushes/flower_large.gbr
-share/gimp/brushes/galaxy.gbr
-share/gimp/brushes/galaxy_small.gbr
-share/gimp/brushes/gecko.gbr
-share/gimp/brushes/glyph.gbr
-share/gimp/brushes/guitar.gbr
-share/gimp/brushes/hash.gbr
-share/gimp/brushes/jack.gbr
-share/gimp/brushes/manta.gbr
-share/gimp/brushes/ribbon.gbr
-share/gimp/brushes/rings1.gbr
-share/gimp/brushes/rings2.gbr
-share/gimp/brushes/rings3.gbr
-share/gimp/brushes/rings4.gbr
-share/gimp/brushes/rings5.gbr
-share/gimp/brushes/rings6.gbr
-share/gimp/brushes/rings7.gbr
-share/gimp/brushes/sball.gbr
-share/gimp/brushes/slope.gbr
-share/gimp/brushes/snake.gbr
-share/gimp/brushes/snowflake.gbr
-share/gimp/brushes/sparkle.gbr
-share/gimp/brushes/sparkle2.gbr
-share/gimp/brushes/star_medium.gbr
-share/gimp/brushes/star_small.gbr
-share/gimp/brushes/therefore.gbr
-share/gimp/brushes/tictactoe.gbr
-share/gimp/brushes/tile.gbr
-share/gimp/brushes/triangle.gbr
-share/gimp/brushes/tulip.gbr
-share/gimp/brushes/xcf.gbr
-share/gimp/gimp_logo.ppm
-share/gimp/gimprc
-share/gimp/gradients/Default
-share/gimp/gradients/French_flag
-share/gimp/gradients/French_flag_smooth
-share/gimp/gradients/Full_saturation_spectrum_CCW
-share/gimp/gradients/Full_saturation_spectrum_CW
-share/gimp/gradients/German_flag
-share/gimp/gradients/German_flag_smooth
-share/gimp/gradients/Mexican_flag
-share/gimp/gradients/Mexican_flag_smooth
-share/gimp/palettes/Blues
-share/gimp/palettes/Browns_And_Yellows
-share/gimp/palettes/Cool_Colors
-share/gimp/palettes/Default
-share/gimp/palettes/Grays
-share/gimp/palettes/Greens
-share/gimp/palettes/Lights
-share/gimp/palettes/Muted
-share/gimp/palettes/Pastels
-share/gimp/palettes/Reds_And_Purples
-share/gimp/palettes/Warm_Colors
-share/gimp/patterns/3dgreen.pat
-share/gimp/patterns/amethyst.pat
-share/gimp/patterns/blue.pat
-share/gimp/patterns/chains.pat
-share/gimp/patterns/choc_swirl.pat
-share/gimp/patterns/clouds.pat
-share/gimp/patterns/clovers.pat
-share/gimp/patterns/dunes.pat
-share/gimp/patterns/electric.pat
-share/gimp/patterns/fibers.pat
-share/gimp/patterns/floor_tile.pat
-share/gimp/patterns/granite1.pat
-share/gimp/patterns/granite2.pat
-share/gimp/patterns/green_curtains.pat
-share/gimp/patterns/java.pat
-share/gimp/patterns/krinkle.pat
-share/gimp/patterns/leather.pat
-share/gimp/patterns/leaves.pat
-share/gimp/patterns/leopard.pat
-share/gimp/patterns/lumps.pat
-share/gimp/patterns/marble1.pat
-share/gimp/patterns/marble2.pat
-share/gimp/patterns/marble3.pat
-share/gimp/patterns/mhuerock.pat
-share/gimp/patterns/paper.pat
-share/gimp/patterns/parque1.pat
-share/gimp/patterns/parque2.pat
-share/gimp/patterns/parque3.pat
-share/gimp/patterns/pj.pat
-share/gimp/patterns/pool.pat
-share/gimp/patterns/sky.pat
-share/gimp/patterns/slate.pat
-share/gimp/patterns/sm_squares.pat
-share/gimp/patterns/terra.pat
-share/gimp/patterns/torrents.pat
-share/gimp/patterns/waves.pat
-share/gimp/patterns/wax.pat
-share/gimp/patterns/wood1.pat
-share/gimp/patterns/wood2.pat
-share/gimp/patterns/wood3.pat
-share/gimp/scripts/alien-glow.scm
-share/gimp/scripts/bds-logo-textured.scm
-share/gimp/scripts/beavis.jpg
-share/gimp/scripts/blend-logo.scm
-share/gimp/scripts/chrome-it.scm
-share/gimp/scripts/chrome.scm
-share/gimp/scripts/chrome2.scm
-share/gimp/scripts/crystal.scm
-share/gimp/scripts/ds-logo.scm
-share/gimp/scripts/frozen-text.scm
-share/gimp/scripts/glowing.scm
-share/gimp/scripts/hds-logo.scm
-share/gimp/scripts/neon.scm
-share/gimp/scripts/sphere.scm
-share/gimp/scripts/texture1.jpg
-share/gimp/scripts/texture2.jpg
-share/gimp/user_install
-@dirrm include/gdk
+libexec/gimp-0.99.6/plug-ins/blur
+libexec/gimp-0.99.6/plug-ins/bumpmap
+libexec/gimp-0.99.6/plug-ins/c_astretch
+libexec/gimp-0.99.6/plug-ins/cubism
+libexec/gimp-0.99.6/plug-ins/demo
+libexec/gimp-0.99.6/plug-ins/displace
+libexec/gimp-0.99.6/plug-ins/gauss_iir
+libexec/gimp-0.99.6/plug-ins/gauss_rle
+libexec/gimp-0.99.6/plug-ins/gif
+libexec/gimp-0.99.6/plug-ins/header
+libexec/gimp-0.99.6/plug-ins/jpeg
+libexec/gimp-0.99.6/plug-ins/mosaic
+libexec/gimp-0.99.6/plug-ins/noisify
+libexec/gimp-0.99.6/plug-ins/oilify
+libexec/gimp-0.99.6/plug-ins/pinch
+libexec/gimp-0.99.6/plug-ins/plasma
+libexec/gimp-0.99.6/plug-ins/pnm
+libexec/gimp-0.99.6/plug-ins/script-fu
+libexec/gimp-0.99.6/plug-ins/sparkle
+libexec/gimp-0.99.6/plug-ins/tiff
+libexec/gimp-0.99.6/plug-ins/tile
+libexec/gimp-0.99.6/plug-ins/url
+libexec/gimp-0.99.6/plug-ins/video
+libexec/gimp-0.99.6/plug-ins/whirl
+libexec/gimp-0.99.6/plug-ins/xpm
+share/gimp-0.99.6/brushes/11circle.gbr
+share/gimp-0.99.6/brushes/11fcircle.gbr
+share/gimp-0.99.6/brushes/13circle.gbr
+share/gimp-0.99.6/brushes/13fcircle.gbr
+share/gimp-0.99.6/brushes/15circle.gbr
+share/gimp-0.99.6/brushes/15fcircle.gbr
+share/gimp-0.99.6/brushes/17circle.gbr
+share/gimp-0.99.6/brushes/17fcircle.gbr
+share/gimp-0.99.6/brushes/19circle.gbr
+share/gimp-0.99.6/brushes/19fcircle.gbr
+share/gimp-0.99.6/brushes/1circle.gbr
+share/gimp-0.99.6/brushes/3circle.gbr
+share/gimp-0.99.6/brushes/3fcircle.gbr
+share/gimp-0.99.6/brushes/5circle.gbr
+share/gimp-0.99.6/brushes/5fcircle.gbr
+share/gimp-0.99.6/brushes/7circle.gbr
+share/gimp-0.99.6/brushes/7fcircle.gbr
+share/gimp-0.99.6/brushes/9circle.gbr
+share/gimp-0.99.6/brushes/9fcircle.gbr
+share/gimp-0.99.6/brushes/airplane.gbr
+share/gimp-0.99.6/brushes/bird.gbr
+share/gimp-0.99.6/brushes/bush.gbr
+share/gimp-0.99.6/brushes/confetti.gbr
+share/gimp-0.99.6/brushes/cross_large.gbr
+share/gimp-0.99.6/brushes/cross_small.gbr
+share/gimp-0.99.6/brushes/diamond.gbr
+share/gimp-0.99.6/brushes/duck.gbr
+share/gimp-0.99.6/brushes/dunes.gbr
+share/gimp-0.99.6/brushes/elk.gbr
+share/gimp-0.99.6/brushes/flags.gbr
+share/gimp-0.99.6/brushes/flower.gbr
+share/gimp-0.99.6/brushes/flower_large.gbr
+share/gimp-0.99.6/brushes/galaxy.gbr
+share/gimp-0.99.6/brushes/galaxy_small.gbr
+share/gimp-0.99.6/brushes/gecko.gbr
+share/gimp-0.99.6/brushes/glyph.gbr
+share/gimp-0.99.6/brushes/guitar.gbr
+share/gimp-0.99.6/brushes/hash.gbr
+share/gimp-0.99.6/brushes/jack.gbr
+share/gimp-0.99.6/brushes/manta.gbr
+share/gimp-0.99.6/brushes/ribbon.gbr
+share/gimp-0.99.6/brushes/rings1.gbr
+share/gimp-0.99.6/brushes/rings2.gbr
+share/gimp-0.99.6/brushes/rings3.gbr
+share/gimp-0.99.6/brushes/rings4.gbr
+share/gimp-0.99.6/brushes/rings5.gbr
+share/gimp-0.99.6/brushes/rings6.gbr
+share/gimp-0.99.6/brushes/rings7.gbr
+share/gimp-0.99.6/brushes/sball.gbr
+share/gimp-0.99.6/brushes/slope.gbr
+share/gimp-0.99.6/brushes/snake.gbr
+share/gimp-0.99.6/brushes/snowflake.gbr
+share/gimp-0.99.6/brushes/sparkle.gbr
+share/gimp-0.99.6/brushes/sparkle2.gbr
+share/gimp-0.99.6/brushes/star_medium.gbr
+share/gimp-0.99.6/brushes/star_small.gbr
+share/gimp-0.99.6/brushes/therefore.gbr
+share/gimp-0.99.6/brushes/tictactoe.gbr
+share/gimp-0.99.6/brushes/tile.gbr
+share/gimp-0.99.6/brushes/triangle.gbr
+share/gimp-0.99.6/brushes/tulip.gbr
+share/gimp-0.99.6/brushes/xcf.gbr
+share/gimp-0.99.6/gimp_logo.ppm
+share/gimp-0.99.6/gimprc
+share/gimp-0.99.6/gradients/Default
+share/gimp-0.99.6/gradients/French_flag
+share/gimp-0.99.6/gradients/French_flag_smooth
+share/gimp-0.99.6/gradients/Full_saturation_spectrum_CCW
+share/gimp-0.99.6/gradients/Full_saturation_spectrum_CW
+share/gimp-0.99.6/gradients/German_flag
+share/gimp-0.99.6/gradients/German_flag_smooth
+share/gimp-0.99.6/gradients/Mexican_flag
+share/gimp-0.99.6/gradients/Mexican_flag_smooth
+share/gimp-0.99.6/palettes/Blues
+share/gimp-0.99.6/palettes/Browns_And_Yellows
+share/gimp-0.99.6/palettes/Cool_Colors
+share/gimp-0.99.6/palettes/Default
+share/gimp-0.99.6/palettes/Grays
+share/gimp-0.99.6/palettes/Greens
+share/gimp-0.99.6/palettes/Lights
+share/gimp-0.99.6/palettes/Muted
+share/gimp-0.99.6/palettes/Pastels
+share/gimp-0.99.6/palettes/Reds_And_Purples
+share/gimp-0.99.6/palettes/Warm_Colors
+share/gimp-0.99.6/patterns/3dgreen.pat
+share/gimp-0.99.6/patterns/amethyst.pat
+share/gimp-0.99.6/patterns/blue.pat
+share/gimp-0.99.6/patterns/chains.pat
+share/gimp-0.99.6/patterns/choc_swirl.pat
+share/gimp-0.99.6/patterns/clouds.pat
+share/gimp-0.99.6/patterns/clovers.pat
+share/gimp-0.99.6/patterns/dunes.pat
+share/gimp-0.99.6/patterns/electric.pat
+share/gimp-0.99.6/patterns/fibers.pat
+share/gimp-0.99.6/patterns/floor_tile.pat
+share/gimp-0.99.6/patterns/granite1.pat
+share/gimp-0.99.6/patterns/granite2.pat
+share/gimp-0.99.6/patterns/green_curtains.pat
+share/gimp-0.99.6/patterns/java.pat
+share/gimp-0.99.6/patterns/krinkle.pat
+share/gimp-0.99.6/patterns/leather.pat
+share/gimp-0.99.6/patterns/leaves.pat
+share/gimp-0.99.6/patterns/leopard.pat
+share/gimp-0.99.6/patterns/lumps.pat
+share/gimp-0.99.6/patterns/marble1.pat
+share/gimp-0.99.6/patterns/marble2.pat
+share/gimp-0.99.6/patterns/marble3.pat
+share/gimp-0.99.6/patterns/mhuerock.pat
+share/gimp-0.99.6/patterns/paper.pat
+share/gimp-0.99.6/patterns/parque1.pat
+share/gimp-0.99.6/patterns/parque2.pat
+share/gimp-0.99.6/patterns/parque3.pat
+share/gimp-0.99.6/patterns/pj.pat
+share/gimp-0.99.6/patterns/pool.pat
+share/gimp-0.99.6/patterns/sky.pat
+share/gimp-0.99.6/patterns/slate.pat
+share/gimp-0.99.6/patterns/sm_squares.pat
+share/gimp-0.99.6/patterns/terra.pat
+share/gimp-0.99.6/patterns/torrents.pat
+share/gimp-0.99.6/patterns/waves.pat
+share/gimp-0.99.6/patterns/wax.pat
+share/gimp-0.99.6/patterns/wood1.pat
+share/gimp-0.99.6/patterns/wood2.pat
+share/gimp-0.99.6/patterns/wood3.pat
+share/gimp-0.99.6/scripts/alien-glow.scm
+share/gimp-0.99.6/scripts/bds-logo-textured.scm
+share/gimp-0.99.6/scripts/beavis.jpg
+share/gimp-0.99.6/scripts/blend-logo.scm
+share/gimp-0.99.6/scripts/chrome-it.scm
+share/gimp-0.99.6/scripts/chrome.scm
+share/gimp-0.99.6/scripts/chrome2.scm
+share/gimp-0.99.6/scripts/crystal.scm
+share/gimp-0.99.6/scripts/ds-logo.scm
+share/gimp-0.99.6/scripts/frozen-text.scm
+share/gimp-0.99.6/scripts/glowing.scm
+share/gimp-0.99.6/scripts/hds-logo.scm
+share/gimp-0.99.6/scripts/neon.scm
+share/gimp-0.99.6/scripts/sphere.scm
+share/gimp-0.99.6/scripts/texture1.jpg
+share/gimp-0.99.6/scripts/texture2.jpg
+share/gimp-0.99.6/user_install
+@dirrm share/gimp-0.99.6/scripts
+@dirrm share/gimp-0.99.6/patterns
+@dirrm share/gimp-0.99.6/palettes
+@dirrm share/gimp-0.99.6/gradients
+@dirrm share/gimp-0.99.6/brushes
+@dirrm share/gimp-0.99.6
+@dirrm libexec/gimp-0.99.6/plug-ins
+@dirrm libexec/gimp-0.99.6
 @dirrm include/gtk
-@dirrm libexec/gimp/plug-ins
-@dirrm libexec/gimp
-@dirrm share/gimp/brushes
-@dirrm share/gimp/gradients
-@dirrm share/gimp/palettes
-@dirrm share/gimp/patterns
-@dirrm share/gimp/scripts
-@dirrm share/gimp
+@dirrm include/glib
+@dirrm include/gdk
+@dirrm include/libgimp