upgrade to 0.99.1

42 files changed, 2190 insertions, 3978 deletions

diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 68c8a8c6d75c..07aca069c5f9 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -1,16 +1,14 @@
 # New ports collection makefile for:    GIMP
-# Version required:     961001
+# Version required:     0.99.1
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/11/19 16:07:26 erich Exp $
+# $Id: Makefile,v 1.3 1996/11/20 11:11:35 asami Exp $
 #
 
-DISTNAME=       gimp
-PKGNAME=        gimp-devel-96.10.01
+DISTNAME=       gimp-0.99.1
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
-DISTFILES=	gimp961001.tgz
 
 MAINTAINER=     erich@FreeBSD.org
 
@@ -21,6 +19,12 @@ LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
+#CONFIGURE_ARGS= --enable-debug
+
 USE_GMAKE=	yes
 
+#post-configure:
+#	cd ${WRKSRC}/gtk+; ./configure
+
 .include <bsd.port.mk>
+
diff --git a/graphics/gimp-app-devel/distinfo b/graphics/gimp-app-devel/distinfo
index aeb842bef317..ed4429db6879 100644
--- a/graphics/gimp-app-devel/distinfo
+++ b/graphics/gimp-app-devel/distinfo
@@ -1,2 +1 @@
-MD5 (gimp961001.tgz) = f7c3971a93a7332a39d7794be491d6e7
-MD5 (gimp-data.tgz) = b13b8382e22a1664f959486132606090
+MD5 (gimp-0.99.1.tar.gz) = fc1b80922cf195d4994d11c556e4d6ec
diff --git a/graphics/gimp-app-devel/files/patch-aa b/graphics/gimp-app-devel/files/patch-aa
index 729403d72c4d..0ce6cf4d3acd 100644
--- a/graphics/gimp-app-devel/files/patch-aa
+++ b/graphics/gimp-app-devel/files/patch-aa
@@ -1,261 +1,99 @@
---- gimprc.in~	Mon Nov 18 09:56:00 1996
-+++ gimprc.in	Mon Nov 18 09:55:52 1996
-@@ -0,0 +1,258 @@
-+# Lines that start with a '#' are comments.
-+# Blank lines are ignored.
-+
-+# Set the temporary storage directory...files will appear here
-+# during the course of running the gimp.  Most files will disappear
-+# when the gimp exits, but some files are likely to remain,
-+# such as working palette files, so it is best if this directory
-+# not be one that is shared by other users or is cleared on machine
-+# reboot such as /tmp.
-+temp-path "~/.gimp/tmp"
-+
-+# Set the brush search path...this path will be searched for valid
-+#  brushes at startup.
-+brush-path "~/.gimp/brushes:@prefix@/share/gimp/brushes"
-+
-+# Specify a default brush. If none is specified it defaults to the
-+#  "1circle.gbr" brush which is just a single pixel sized brush.
-+#  The brush is searched for in the brush path.
-+default-brush "19fcircle.gbr"
-+
-+# Set the pattern search path...this path will be searched for valid
-+#  patterns at startup.
-+pattern-path "~/.gimp/patterns:@prefix@/share/gimp/patterns"
-+
-+# Specify a default pattern.
-+#  The pattern is searched for in the specified pattern paths.
-+default-pattern "wood2.pat"
-+
-+# Set the palette search path...this path will be searched for valid
-+#  palettes at startup.
-+palette-path "~/.gimp/palettes:@prefix@/share/gimp/palettes"
-+
-+# Specify a default palette.
-+#  The pattern is searched for in the specified pattern paths.
-+default-palette "Default"
-+
-+# Set the gradient search path...this path will be searched for valid
-+#  gradients at startup.
-+gradient-path "~/.gimp/gradients:@prefix@/share/gimp/gradients"
-+
-+# Specify a default gradient.
-+#  The gradient is searched for in the specified gradient paths.
-+default-gradient "German_flag_smooth"
-+
-+# Set the plug-in search path...this path will be searched for
-+#  plug-ins when the plug-in is run.
-+plug-in-path "~/.gimp/plug-ins:@prefix@/libexec/gimp/plug-ins"
-+
-+# Speed of marching ants in the selection outline
-+#  this value is in milliseconds
-+#  (less time indicates faster marching)
-+marching-ants-speed 300
-+
-+# Set the number of operations kept on the undo stack
-+undo-levels 5
-+
-+# Set the color-cube resource for dithering on 8-bit displays
-+#  The 3 values stand for Shades of red, green, and blue
-+#  Multiplying the # of shades of each primary color yields
-+#  the total number of colors that will be allocated from the
-+#  gimp colormap.  This number should not exceed 256.  Most of the
-+#  colors remaining after the allocation of the colorcube
-+#  will be left to the system palette in an effort to reduce
-+#  colormap "flashing".
-+color-cube 6, 6, 4
-+
-+# Install a GIMP colormap by default -- only for 8-bit displays
-+# install-colormap
-+
-+# Specify that marching ants for selected regions will be drawn
-+#  with colormap cycling as oposed to redrawing with different stipple masks
-+#  this color cycling option works only with 8-bit displays
-+# colormap-cycling
-+
-+# Tools such as fuzzy-select and bucket fill find regions based on a
-+#  seed-fill algorithm.  The seed fill starts at the intially selected
-+#  pixel and progresses in all directions until the difference of pixel
-+#  intensity from the original is greater than a specified threshold
-+#  ==> This value represents the default threshold
-+default-threshold 15
-+
-+# There is always a tradeoff between memory usage and speed.  In most
-+#  cases, the GIMP opts for speed over memory.  However, if memory is
-+#  a big issue, set stingy-memory-use
-+# stingy-memory-use
-+
-+# When zooming into and out of images, this option enables the
-+#  automatic resizing of windows
-+# allow-resize-windows
-+
-+# Context-dependent cursors are cool.  They are enabled by default.
-+#  However, they require overhead that you may want to do without.
-+#  Uncomment this line to disable them.
-+# no-cursor-updating
-+
-+# Layer preview sizes:
-+#  None:    no previews in layers dialog/layer selector
-+#  Small:   32x32
-+#  Medium:  64x64
-+#  Large:   128x128
-+#  #:       #x#
-+preview-size Medium
-+
-+# Controlling ruler visibility
-+#  The default behavior is for rulers to be ON
-+#  This can also be toggled with the View->Show Rulers command or shift+control+r
-+# dont-show-rulers
-+
-+# Disable auto saving
-+#  Just uncomment the line below...
-+# dont-auto-save
-+
-+# Set the gamma correction values for the display
-+#  1.0 corresponds to no gamma correction.  For most displays,
-+#  gamma correction should be set to between 2.0 and 2.6
-+#  Run the utility "gamma_correct" to determine appropriate values
-+#  for your display.
-+#
-+# One important item to keep in mind:  Many images that you might
-+#  get from outside sources will in all likelihood already be
-+#  gamma-corrected.  In these cases, the image will look washed-out
-+#  if the gimp has gamma-correction turned on.  If you are going
-+#  to work with images of this sort, turn gamma correction off
-+#  by removing this line, or setting the values to 1.0.
-+#  gamma-correction 1.0
-+#  gamma-correction 2.0
-+#                ___
-+gamma-correction 1.6
-+
-+# Set the manner in which transparency is displayed in images
-+#  Transparency type can be one of:
-+#    0: Light Checks
-+#    1: Mid-Tone Checks
-+#    2: Dark Checks
-+#    3: White Only
-+#    4: Gray Only
-+#    5: Black Only
-+#  Check size can be one of:
-+#    0: Small
-+#    1: Medium
-+#    2: Large
-+transparency-type 1
-+transparency-size 2
-+
-+# Notify the GIMP of the available file plug-ins.
-+# The format of the line is as follows:
-+#  file-plug-in <image types> <plug-in name> <plug-in title> <extensions>
-+# The `image types' argument specifies what types of images the
-+#  plug-in can save. It is a 3 digit number where each digit is 0 or
-+#  1. The digits correspond to `indexed images', `grayscale images'
-+#  and `rgb images' respectively. For example, the "jpeg" file plug-in
-+#  can save rgb and grayscale images but not indexed color, so the
-+#  image types argument is 011.
-+# The `plug-in name' is the name of the plug-in program.
-+# The `plug-in title' is the title of the program is it will appear
-+#  from the GIMP. This will most likely be the name of the plug-in.
-+# The `extensions' are a comma separated string of extensions. These
-+#  are used by the GIMP to map file names to images.
-+#  Note: case does not matter for extensions.
-+
-+file-plug-in  jpeg	011	"jpeg"		"jpg,jpeg"
-+file-plug-in  png	111	"png"		"png"
-+file-plug-in  gif	110	"gif"		"gif"
-+file-plug-in  tiff	111	"tiff"		"tiff,tif"
-+file-plug-in  tga	111	"tga"		"tga,targa"
-+file-plug-in  gbrush	010	"brush"		"gbr"
-+file-plug-in  gpattern	010	"pattern"	"pat,gpat"
-+file-plug-in  gicon	010	"gicon"		"gic,gico"
-+file-plug-in  xpm	110	"xpm"		"xpm"
-+file-plug-in  pnm	111	"pnm"		"pgm,ppm,pbm"
-+file-plug-in  matlab	010	"matlab"	"m"
-+file-plug-in  yuv411    001     "yuv"           "yuv"
-+
-+# Notify the GIMP of plug-ins that will exist in the `plug-ins' menu.
-+# The format of the line is as follows:
-+#  plug-in <plug-in name> <menu location> <accelerator>
-+# The `plug-in name' is the name of the plug-in program.
-+# The `menu location' is the item name and location in the plug-in
-+#  menu. A slash indicates a submenu. Therefore, the menu location
-+#  "Blur/Blur" specifies an item name of "Blur" in a submenu entitled
-+#  "Blur". Multiple submenus are possible. If a menu already exists
-+#  the item is simply placed in that menu. Menu items are placed in
-+#  alphabetically sorted order in menus.
-+# The `accelerator' is a string which designates a key combination
-+#  which will invoke the plug-in. The format should be clear by
-+#  inspection.  This string is optional.
-+#
-+# It is convention to only use the `alt' and `shift' key modifiers for
-+#  plug-ins. The `control' key is used as a modifier for menu items by
-+#  the main application. The main application will not use the `alt'
-+#  or `shift' key modifiers.
-+
-+plug-in blur       "Blur/Blur"
-+plug-in blur2      "Blur/Blur (variable)"        "Alt<Key>B"
-+plug-in gauss_recurse      "Blur/Gaussian Blur (IIR)"         "Shift Alt<Key>B"
-+plug-in gauss      "Blur/Gaussian Blur (RLE)"
-+plug-in mblur      "Blur/Motion Blur"
-+
-+plug-in charcoal   "Effects/Artistic/Charcoal"  "Shift Alt<Key>H"
-+plug-in cubism     "Effects/Artistic/Cubism"	"Shift Alt<Key>U"
-+plug-in mosaic     "Effects/Artistic/Mosaic"	"Alt<Key>M"
-+plug-in oilify     "Effects/Artistic/Oilify"
-+plug-in sparkle    "Effects/Artistic/Sparkle"
-+plug-in lic        "Effects/Artistic/Van-Goghify"
-+plug-in bleed      "Effects/Image/Bleed"
-+plug-in c_astretch "Effects/Image/Contrast Auto-Stretch"
-+plug-in enhance    "Effects/Image/Enhance"      "Shift Alt<Key>E"
-+plug-in gamma      "Effects/Image/Gamma"        "Alt<Key>G"
-+plug-in grayify    "Effects/Image/Grayify"
-+plug-in invert     "Effects/Image/Invert"       "Alt<Key>I"
-+plug-in solarize   "Effects/Image/Solarize"     "Alt<Key>1"
-+plug-in bumpmap    "Effects/Lighting/Bump Map"	"Alt<Key>2"
-+plug-in displace   "Effects/Lighting/Displace"	"Alt<Key>3"
-+plug-in lighting   "Effects/Lighting/Lighting"	"Alt<Key>4"
-+plug-in edge       "Effects/Misc Ops/Edge Detect"        "Alt<Key>E"
-+plug-in engrave    "Effects/Misc Ops/Engrave"
-+plug-in extrude    "Effects/Misc Ops/Extrude"
-+plug-in pixelize   "Effects/Misc Ops/Pixelize"
-+plug-in relief     "Effects/Misc Ops/Relief"    "Alt<Key>R"
-+plug-in checkerboard "Effects/Textures/Checkerboard"
-+plug-in plasma     "Effects/Textures/Plasma"
-+plug-in texture2   "Effects/Textures/Texture II"
-+
-+plug-in despeckle  "Distorts/Despeckle"
-+plug-in map_sphere "Distorts/Map Sphere"
-+plug-in noisify    "Distorts/Noise"
-+plug-in pagecurl   "Distorts/Page Curl"         "Alt<Key>U"
-+plug-in pinch      "Distorts/Pinch"             "Alt<Key>P"
-+plug-in ripple     "Distorts/Ripple"
-+plug-in shift      "Distorts/Shift"
-+plug-in spread     "Distorts/Spread"
-+plug-in whirl      "Distorts/Whirl"             "Alt<Key>W"
-+plug-in waves      "Distorts/Waves"
-+
-+plug-in compose    "Conversions/Compose"
-+plug-in decompose  "Conversions/Decompose"
-+plug-in to-color   "Conversions/To Color"       "Shift Alt<Key>C"
-+plug-in to-gray    "Conversions/To Grayscale"   "Shift Alt<Key>G"
-+plug-in to-indexed "Conversions/To Indexed"     "Shift Alt<Key>I"
-+
-+plug-in autocrop   "Transforms/Autocrop"
-+plug-in flip_horz  "Transforms/Flip Horizontal" "Alt<Key>H"
-+plug-in flip_vert  "Transforms/Flip Vertical"   "Alt<Key>V"
-+plug-in polar      "Transforms/Polar"
-+plug-in rotate     "Transforms/Rotate"
-+plug-in scale      "Transforms/Scale"           "Shift Alt<Key>S"
-+plug-in tile       "Transforms/Tile"            "Alt<Key>T"
-+plug-in tiler      "Transforms/Tiler"           "Alt<Key>T"
-+
-+plug-in blend      "Channel Ops/Blend"
-+plug-in calculations "Channel Ops/Calculations" "Alt<Key>C"
-+plug-in duplicate  "Channel Ops/Duplicate"      "Alt<Key>D"
-+plug-in offset     "Channel Ops/Offset"         "Alt<Key>O"
-+
-+plug-in netpbm	   "Miscellaneous/Netpbm Filter" "Shift Alt<Key>N"
-+plug-in rms_error  "Miscellaneous/RMS Error"
-+plug-in photocd    "Miscellaneous/Photo CD"
-+plug-in octave_srv "Miscellaneous/Octave Server"
+--- plug-ins/Makefile.in.orig	Thu Feb 27 05:41:52 1997
++++ plug-ins/Makefile.in	Thu Feb 27 08:46:09 1997
+@@ -28,6 +28,7 @@
+ 
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ 
+ top_builddir = ..
+@@ -58,7 +59,7 @@
+ X_LDFLAGS =
+ X_LIBS =
+ 
+-pluginlibdir = $(pkglibdir)/plug-ins
++pluginlibdir = $(pkglibexecdir)/plug-ins
+ 
+ pluginlib_PROGRAMS =	\
+ 	blur		\
+--- ./app/batch.c~	Mon Feb 24 14:38:51 1997
++++ ./app/batch.c	Wed Feb 26 08:51:05 1997
+@@ -3,7 +3,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-
++#include <errno.h>
+ #include "appenv.h"
+ #include "app_procs.h"
+ #include "batch.h"
+--- ./app/xcf.c~	Wed Feb 26 05:21:25 1997
++++ ./app/xcf.c	Wed Feb 26 09:07:30 1997
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+--- configure.orig	Thu Feb 27 09:55:32 1997
++++ configure	Thu Feb 27 09:55:40 1997
+@@ -609,7 +609,7 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-
++INSTALL_SCRIPT="/usr/bin/install -c -m 755"
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
+ 
+@@ -2040,7 +2040,7 @@
+ CFLAGS="$OPTFLAG $CFLAGS"
+ 
+ gimpdatadir=$datadir/$PACKAGE
+-gimpplugindir=$libdir/$PACKAGE
++gimpplugindir=$libexecdir/$PACKAGE
+ 
+ 
+ 
+--- gtk+/configure~	Thu Feb 27 03:09:52 1997
++++ gtk+/configure	Thu Feb 27 15:10:18 1997
+@@ -569,6 +569,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:572: checking for a BSD compatible install" >&5
++INSTALL="/usr/bin/install -c"
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+--- gtk+/glib/configure~	Thu Feb 27 15:32:15 1997
++++ gtk+/glib/configure	Thu Feb 27 15:32:47 1997
+@@ -559,6 +559,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:562: checking for a BSD compatible install" >&5
++INSTALL="/usr/bin/install -c"
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+--- plug-ins/script-fu/Makefile.in.orig	Thu Feb 27 20:47:10 1997
++++ plug-ins/script-fu/Makefile.in	Thu Feb 27 20:46:30 1997
+@@ -59,7 +59,7 @@
+ 
+ SUBDIRS = scripts
+ 
+-pluginlibdir = $(pkglibdir)/plug-ins
++pluginlibdir = $(gimpplugindir)/plug-ins
+ 
+ pluginlib_PROGRAMS = script-fu
+
+*** /tmp/gimp-0.99.1/app/gimprc.c	Thu Feb 27 06:43:10 1997
+--- ./app/gimprc.c	Thu Feb 27 16:41:19 1997
+***************
+*** 159,161 ****
+  
+!   sprintf (libfilename, "%s/gimprc", LIBDIR);
+    parse_gimprc_file (libfilename);
+--- 159,161 ----
+  
+!   sprintf (libfilename, "%s/gimprc", DATADIR);
+    parse_gimprc_file (libfilename);
diff --git a/graphics/gimp-app-devel/files/patch-ab b/graphics/gimp-app-devel/files/patch-ab
index ac5e5976e46c..f4579f768d02 100644
--- a/graphics/gimp-app-devel/files/patch-ab
+++ b/graphics/gimp-app-devel/files/patch-ab
@@ -1,49 +1,96 @@
---- app/fileops.c~	Mon Nov 18 09:57:19 1996
-+++ app/fileops.c	Mon Nov 18 09:58:01 1996
-@@ -289,7 +289,7 @@
-       gtk_file_selection_set_ok_callback (filesel, file_open_ok_callback, open_options);
-       gtk_file_selection_set_cancel_callback (filesel, file_cancel_callback, open_options);
- 
--      if (gdisp && gdisp->gimage->has_filename)
-+      if (gdisp && gdisp->gimage && gdisp->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisp->gimage));
- 
-       gtk_widget_show (filesel);
-@@ -297,7 +297,7 @@
- 
-   if (! GTK_WIDGET_VISIBLE (filesel))
-     {
--      if (gdisp && gdisp->gimage->has_filename)
-+      if (gdisp && gdisp->gimage && gdisp->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisp->gimage));
-       gtk_widget_show (filesel);
-     }
-@@ -353,7 +353,7 @@
-       gtk_file_selection_set_ok_callback (filesel, file_save_ok_callback, save_options);
-       gtk_file_selection_set_cancel_callback (filesel, file_cancel_callback, save_options);
- 
--      if (gdisplay && gdisplay->gimage->has_filename)
-+      if (gdisplay && gdisplay->gimage && gdisplay->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisplay->gimage));
- 
-       gtk_widget_show (filesel);
-@@ -363,7 +363,7 @@
- 
-   if (! GTK_WIDGET_VISIBLE (filesel))
-     {
--      if (gdisplay && gdisplay->gimage->has_filename)
-+      if (gdisplay && gdisplay->gimage && gdisplay->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisplay->gimage));
- 
-       gtk_widget_show (filesel);
---- app/progress.c~	Mon Nov 18 11:03:58 1996
-+++ app/progress.c	Mon Nov 18 11:04:07 1996
-@@ -57,7 +57,7 @@
-   progress->callback_data = callback_data;
-   progress->pixmap = NULL;
- 
--  progress->shell = gtk_window_new (title, GTK_WINDOW_TOPLEVEL);
-+  progress->shell = gtk_window_new (title, GTK_WINDOW_DIALOG);
-   gtk_widget_set_uposition (progress->shell, progress_x, progress_y);
-   main_vbox = gtk_vbox_new (FALSE, 5);
-   gtk_container_add (progress->shell, main_vbox);
+--- plug-ins/script-fu/scripts/Makefile.in.orig	Fri Feb 28 09:09:07 1997
++++ plug-ins/script-fu/scripts/Makefile.in	Fri Feb 28 09:07:40 1997
+@@ -51,17 +51,17 @@
+ scriptdatadir = $(pkgdatadir)/scripts
+ 
+ scriptdata_DATA = \
+-	alien-glow.scm		\
+-	bds-logo-textured.scm	\
+-	blend-logo.scm		\
+-	chrome.scm		\
+-	chrome-it.scm		\
+-	chrome2.scm		\
+-	ds-logo.scm		\
+-	frozen-text.scm		\
+-	hds-logo.scm		\
+-	neon.scm		\
+-	sphere.scm		\
++	alien-glow.sed		\
++	bds-logo-textured.sed	\
++	blend-logo.sed		\
++	chrome.sed		\
++	chrome-it.sed		\
++	chrome2.sed		\
++	ds-logo.sed		\
++	frozen-text.sed		\
++	hds-logo.sed		\
++	neon.sed		\
++	sphere.sed		\
+ 	beavis.jpg
+ 
+ EXTRA_DIST = $(scriptdata_DATA)
+@@ -79,7 +79,7 @@
+ TAR = tar
+ default: all
+ 
+-.SUFFIXES:
++.SUFFIXES: .sed
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
+ 	cd $(top_srcdir) && automake --gnu plug-ins/script-fu/scripts/Makefile
+ 
+@@ -87,17 +87,18 @@
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+-
+ install-scriptdataDATA: $(scriptdata_DATA)
+ 	$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(scriptdatadir)
+-	@list="$(scriptdata_DATA)"; for p in $$list; do \
+-	  if test -f $(srcdir)/$$p; then \
+-	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p; \
+-	  else if test -f $$p; then \
+-	    echo "$(INSTALL_DATA) $$p $(scriptdatadir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(scriptdatadir)/$$p; \
++	@list="$(scriptdata_DATA)"; for s in $$list; do \
++	  p=$$(basename $$s .sed); \
++	  if [ $$p != $$s ]; then p=$$p.scm; fi; \
++	  if test -f $(srcdir)/$$s; then \
++	    echo "$(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p"; \
++	    $(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p; \
++	  else if test -f $$s; then \
++	    echo "$(INSTALL_DATA) $$s $(scriptdatadir)/$$p"; \
++	    $(INSTALL_DATA) $$s $(scriptdatadir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
+@@ -184,3 +184,7 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++
++%.sed : %.scm
++	sed 's,@_prefix_@,${prefix},' $< > $@
+--- plug-ins/script-fu/scripts/chrome-it.scm.orig	Wed Feb 26 22:51:31 1997
++++ plug-ins/script-fu/scripts/chrome-it.scm	Fri Feb 28 09:01:38 1997
+@@ -153,5 +153,5 @@
+     (gimp-displays-flush)
+     (gimp-image-enable-undo img)))
+ 
+-(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
+-(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
+--- plug-ins/script-fu/scripts/chrome2.scm.orig	Wed Feb 26 20:57:57 1997
++++ plug-ins/script-fu/scripts/chrome2.scm	Fri Feb 28 09:01:38 1997
+@@ -161,6 +161,6 @@
+     (gimp-image-enable-undo img)
+     (gimp-display-new img)))
+ 
+-(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
+ 
+-(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
diff --git a/graphics/gimp-app-devel/files/patch-ac b/graphics/gimp-app-devel/files/patch-ac
deleted file mode 100644
index 7e5a1845afe1..000000000000
--- a/graphics/gimp-app-devel/files/patch-ac
+++ /dev/null
@@ -1,61 +0,0 @@
---- configure~	Mon Nov 18 10:20:48 1996
-+++ configure	Mon Nov 18 10:21:54 1996
-@@ -2324,7 +2324,7 @@
- EOF
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile app/Makefile plug-ins/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile app/Makefile plug-ins/Makefile gimprc"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
---- configure.in~	Mon Nov 18 10:37:13 1996
-+++ configure.in	Mon Nov 18 10:37:25 1996
-@@ -221,4 +221,4 @@
- AC_SUBST(_SHLIBS_)
- 
- dnl Output the Makefiles
--AC_OUTPUT(Makefile app/Makefile plug-ins/Makefile)
-+AC_OUTPUT(Makefile app/Makefile plug-ins/Makefile gimprc)
---- Makefile.in~	Mon Nov 18 11:11:16 1996
-+++ Makefile.in	Mon Nov 18 11:12:22 1996
-@@ -16,7 +16,7 @@
- # set the MAKE variable if necessary
- @SET_MAKE@
- 
--INSTALL	=	./install-sh -c
-+INSTALL	=	/usr/bin/install -c
- 
- all:
- 	( cd gtk ; $(MAKE) )
-@@ -24,22 +24,22 @@
- 	( cd app ; $(MAKE) )
- 
- install:
--	$(INSTALL) -d $(libdir)/gimp
--	$(INSTALL) -d $(libdir)/gimp/brushes
--	$(INSTALL) -m 644 gimprc $(libdir)/gimp
-+	$(INSTALL) -d $(datadir)/gimp
-+	$(INSTALL) -d $(datadir)/gimp/brushes
-+	$(INSTALL) -m 644 gimprc $(datadir)/gimp
- 	for brush in brushes/*; do \
-           echo $$brush; \
--	  $(INSTALL) -m 644 "$$brush" $(libdir)/gimp/brushes; \
-+	  $(INSTALL) -m 644 "$$brush" $(datadir)/gimp/brushes; \
- 	done
--	$(INSTALL) -d $(libdir)/gimp/palettes
-+	$(INSTALL) -d $(datadir)/gimp/palettes
- 	for palette in palettes/*; do \
-           echo $$palette; \
--	  $(INSTALL) -m 644 "$$palette" $(libdir)/gimp/palettes; \
-+	  $(INSTALL) -m 644 "$$palette" $(datadir)/gimp/palettes; \
- 	done
--	$(INSTALL) -d $(libdir)/gimp/patterns
-+	$(INSTALL) -d $(datadir)/gimp/patterns
- 	for pattern in patterns/*; do \
-           echo $$pattern; \
--	  $(INSTALL) -m 644 "$$pattern" $(libdir)/gimp/patterns; \
-+	  $(INSTALL) -m 644 "$$pattern" $(datadir)/gimp/patterns; \
- 	done
- 	( cd plug-ins ; $(MAKE) install )
- 	( cd app ; $(MAKE) install )
diff --git a/graphics/gimp-app-devel/files/patch-ah b/graphics/gimp-app-devel/files/patch-ah
deleted file mode 100644
index 8e508d8ad219..000000000000
--- a/graphics/gimp-app-devel/files/patch-ah
+++ /dev/null
@@ -1,208 +0,0 @@
---- app/autodialog.c.old	Fri Nov 22 15:46:44 1996
-+++ app/autodialog.c	Fri Nov 22 18:08:40 1996
-@@ -49,7 +49,7 @@
- /*  Local functions  */
- static AutoDialogItem dialog_find_item (AutoDialog, int);
- static void dialog_delete_children (AutoDialog, AutoDialogItem);
--static GtkWidget *dialog_create_image_menu (AutoDialog, char *, gpointer,
-+static GtkWidget *dialog_create_image_menu (AutoDialog, AutoDialogItem, char *, gpointer,
- 					    GtkWidget **, GtkWidget **);
- 
- /*  Callback and Update functions  */
-@@ -171,7 +171,8 @@
- 	{
- 	  dlgitem = tmplink->data;
- 	  tmplink = tmplink->next;
--
-+    if (dlgitem->additional_data!=NULL)
-+      xfree(dlgitem->additional_data);
- 	  xfree (dlgitem);
- 	}
-       free_list (dlg->items);
-@@ -206,6 +207,7 @@
-   item->item_ID = dlg->next_item_ID++;
-   item->item_type = type;
-   memset (item->data, 0, 32);
-+  item->additional_data=NULL;
-   item->parent = parent_item;
-   item->children = NULL;
-   item->gtk_data = NULL;
-@@ -276,7 +278,7 @@
-       break;
- 
-     case ITEM_IMAGE_MENU:
--      item_widget = dialog_create_image_menu (dlg, data, extra, &option_menu, &menu);
-+      item_widget = dialog_create_image_menu (dlg, item, data, extra, &option_menu, &menu);
-       break;
- 
-     case ITEM_SCALE:
-@@ -500,7 +502,8 @@
- 	}
-       else
- 	gtk_widget_destroy (item->widget);
--
-+      if (item->additional_data!=NULL)
-+        xfree(item->additional_data);
-       xfree (item);
-     }
- }
-@@ -577,9 +580,32 @@
-     free_list (item->children);
- }
- 
-+typedef struct {
-+  GtkWidget *widget;
-+  long data[2];
-+} _MenuItemData;
-+
-+gint CheckConstrains(GImage *gimage,GImage *constrain,guchar constraint)
-+{
-+  if (((constraint & IMAGE_CONSTRAIN_RGB) &&
-+       (gimage_type (gimage) == RGB_GIMAGE ||
-+	      gimage_type (gimage) == RGBA_GIMAGE)) ||
-+	    ((constraint & IMAGE_CONSTRAIN_GRAY) &&
-+	     (gimage_type (gimage) == GRAY_GIMAGE ||
-+	      gimage_type (gimage) == GRAYA_GIMAGE)) ||
-+	    ((constraint & IMAGE_CONSTRAIN_INDEXED) &&
-+	     (gimage_type (gimage) == INDEXED_GIMAGE ||
-+	      gimage_type (gimage) == INDEXEDA_GIMAGE)))
-+    if ((gimage->width == constrain->width) &&
-+	      (gimage->height == constrain->height))
-+      return(TRUE);
-+  return(FALSE); 
-+}
-+
- static GtkWidget *
--dialog_create_image_menu (dlg, title, image, option_menu, menu)
-+dialog_create_image_menu (dlg, item, title, image, option_menu, menu)
-      AutoDialog dlg;
-+     AutoDialogItem item;
-      char *title;
-      void *image;
-      GtkWidget **option_menu;
-@@ -597,8 +623,8 @@
-   char constraint;
-   link_ptr tmp;
-   long ID;
--  long *data;
-   int num_items = 0;
-+  _MenuItemData *ItemData;
- 
-   hbox = gtk_hbox_new (FALSE, 4);
-   gtk_container_set_border_width (hbox, 0);
-@@ -614,43 +640,55 @@
-   constrain = (ID == 0) ? image : gimage_get_ID (ID);
- 
-   tmp = image_list;
-+
-+  /* Check how many images fit the criteria */
-+  /* ====================================== */
-+
-   while (tmp)
-     {
-       gimage = tmp->data;
-       tmp = next_item (tmp);
--
--      if (((constraint & IMAGE_CONSTRAIN_RGB) &&
--	   (gimage_type (gimage) == RGB_GIMAGE ||
--	    gimage_type (gimage) == RGBA_GIMAGE)) ||
--	  ((constraint & IMAGE_CONSTRAIN_GRAY) &&
--	   (gimage_type (gimage) == GRAY_GIMAGE ||
--	    gimage_type (gimage) == GRAYA_GIMAGE)) ||
--	  ((constraint & IMAGE_CONSTRAIN_INDEXED) &&
--	   (gimage_type (gimage) == INDEXED_GIMAGE ||
--	    gimage_type (gimage) == INDEXEDA_GIMAGE)))
--	if ((gimage->width == constrain->width) &&
--	    (gimage->height == constrain->height))
--	  {
--	    image_name = prune_filename (gimage_filename (gimage));
--	    menu_item_label = (char *) xmalloc (strlen (image_name) + 15);
--	    sprintf (menu_item_label, "%s-%d", image_name, gimage->ID);
--	    menu_item = gtk_menu_item_new_with_label (menu_item_label);
--	    gtk_callback_add (gtk_menu_item_get_state (menu_item),
--			      dialog_image_menu_callback, dlg);
--	    gtk_container_add (*menu, menu_item);
--	    gtk_widget_show (menu_item);
--
--	    data = xmalloc (sizeof (long) * 2);
--	    data[0] = dlg->next_item_ID - 1;
--	    data[1] = (gimage->ID == constrain->ID) ? 0 : gimage->ID;
--	    dlg->additional_data = data;
--
--	    xfree (menu_item_label);
--	    num_items ++;
--	  }
-+      if (CheckConstrains(gimage,constrain,constraint)==TRUE)
-+        num_items++;      
-     }
- 
--  if (!num_items)
-+  /* If we found any matches, allocate memory to hold      */
-+  /* callback data. Put a pointer in "item" to avoid leak. */
-+  /* ===================================================== */
-+  
-+  if (num_items>0)
-+    {
-+      ItemData=(_MenuItemData *)xmalloc(sizeof(_MenuItemData)*(size_t)num_items);
-+      item->additional_data=ItemData;
-+
-+      tmp=image_list;
-+      num_items=0;
-+      while (tmp)
-+        {
-+          gimage = tmp->data;
-+          tmp = next_item (tmp);
-+          if (CheckConstrains(gimage,constrain,constraint)==TRUE)
-+	          {
-+	            image_name = prune_filename (gimage_filename (gimage));
-+	            menu_item_label = (char *) xmalloc (strlen (image_name) + 15);
-+	            sprintf (menu_item_label, "%s-%d", image_name, gimage->ID);
-+      
-+              ItemData[num_items].widget=hbox;
-+              ItemData[num_items].data[0] = dlg->next_item_ID - 1;
-+              ItemData[num_items].data[1] = (gimage->ID == constrain->ID) ? 0 : gimage->ID;
-+      
-+	            menu_item = gtk_menu_item_new_with_label (menu_item_label);
-+	            gtk_callback_add (gtk_menu_item_get_state (menu_item),dialog_image_menu_callback,
-+                (gpointer)&ItemData[num_items]);
-+	            gtk_container_add (*menu, menu_item);
-+	            gtk_widget_show (menu_item);
-+      
-+	            xfree (menu_item_label);
-+	            num_items ++;
-+	          }
-+        }
-+    }
-+  else
-     {
-       menu_item = gtk_menu_item_new_with_label ("none");
-       gtk_container_add (*menu, menu_item);
-@@ -669,14 +707,14 @@
-      gpointer client_data;
-      gpointer call_data;
- {
-+  _MenuItemData *ItemData;
-   AutoDialog dlg;
--  long *data;
- 
--  dlg = client_data;
--  data = (long *) dlg->additional_data;
-+  ItemData=(_MenuItemData *)client_data;
-+  dlg = (AutoDialog) gtk_widget_get_user_data (ItemData->widget);
- 
-   if (dlg->callback)
--    (* dlg->callback) (dlg->dialog_ID, data[0], dlg->callback_data, &data[1]);
-+    (* dlg->callback) (dlg->dialog_ID,ItemData->data[0],dlg->callback_data,&ItemData->data[1]);
- }
- 
- static void
---- app/autodialog.h.old	Fri Nov 22 15:46:47 1996
-+++ app/autodialog.h	Fri Nov 22 17:21:19 1996
-@@ -49,6 +49,7 @@
-   int             item_ID;
-   int             item_type;
-   char            data[32];
-+  void           *additional_data;
-   AutoDialogItem  parent;
-   link_ptr        children;
-   GtkWidget      *widget;
diff --git a/graphics/gimp-app-devel/pkg-plist b/graphics/gimp-app-devel/pkg-plist
index ef35558b371c..a854e9786565 100644
--- a/graphics/gimp-app-devel/pkg-plist
+++ b/graphics/gimp-app-devel/pkg-plist
@@ -1,4 +1,130 @@
 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/gtk/gtk.h
+include/gtk/gtkaccelerator.h
+include/gtk/gtkadjustment.h
+include/gtk/gtkalignment.h
+include/gtk/gtkarrow.h
+include/gtk/gtkbin.h
+include/gtk/gtkbox.h
+include/gtk/gtkbutton.h
+include/gtk/gtkcanvas.h
+include/gtk/gtkcheckbutton.h
+include/gtk/gtkcontainer.h
+include/gtk/gtkdata.h
+include/gtk/gtkdialog.h
+include/gtk/gtkdrawingarea.h
+include/gtk/gtkentry.h
+include/gtk/gtkenums.h
+include/gtk/gtkfilesel.h
+include/gtk/gtkfill.h
+include/gtk/gtkframe.h
+include/gtk/gtkgc.h
+include/gtk/gtkhbox.h
+include/gtk/gtkhruler.h
+include/gtk/gtkhscale.h
+include/gtk/gtkhscrollbar.h
+include/gtk/gtkhseparator.h
+include/gtk/gtkimage.h
+include/gtk/gtkitem.h
+include/gtk/gtklabel.h
+include/gtk/gtklist.h
+include/gtk/gtklistitem.h
+include/gtk/gtkmain.h
+include/gtk/gtkmenu.h
+include/gtk/gtkmenubar.h
+include/gtk/gtkmenufactory.h
+include/gtk/gtkmenuitem.h
+include/gtk/gtkmenushell.h
+include/gtk/gtkmisc.h
+include/gtk/gtknotebook.h
+include/gtk/gtkobject.h
+include/gtk/gtkoptionmenu.h
+include/gtk/gtkpixmap.h
+include/gtk/gtkpreview.h
+include/gtk/gtkprogressbar.h
+include/gtk/gtkradiobutton.h
+include/gtk/gtkrange.h
+include/gtk/gtkrc.h
+include/gtk/gtkruler.h
+include/gtk/gtkscale.h
+include/gtk/gtkscrollbar.h
+include/gtk/gtkscrolledwindow.h
+include/gtk/gtkseparator.h
+include/gtk/gtksignal.h
+include/gtk/gtkstyle.h
+include/gtk/gtktable.h
+include/gtk/gtktext.h
+include/gtk/gtktogglebutton.h
+include/gtk/gtktree.h
+include/gtk/gtktreeitem.h
+include/gtk/gtktypeutils.h
+include/gtk/gtkvbox.h
+include/gtk/gtkviewport.h
+include/gtk/gtkvruler.h
+include/gtk/gtkvscale.h
+include/gtk/gtkvscrollbar.h
+include/gtk/gtkvseparator.h
+include/gtk/gtkwidget.h
+include/gtk/gtkwindow.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.0.0
+lib/libgimp.a
+lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.0.0
+lib/libgimpi.a
+lib/libgimpi.la
+lib/libgimpi.so
+lib/libgimpi.so.0.0
+lib/libgimpui.a
+lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.0.0
+lib/libglib.a
+lib/libglib.la
+lib/libglib.so
+lib/libglib.so.0.0
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so
+lib/libgtk.so.0.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/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/whirl
 share/gimp/brushes/11circle.gbr
 share/gimp/brushes/11fcircle.gbr
 share/gimp/brushes/13circle.gbr
@@ -61,7 +187,17 @@ 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
@@ -95,13 +231,13 @@ share/gimp/patterns/leopard.pat
 share/gimp/patterns/lumps.pat
 share/gimp/patterns/marble1.pat
 share/gimp/patterns/marble2.pat
-share/gimp/patterns/pj.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
@@ -113,79 +249,26 @@ share/gimp/patterns/wax.pat
 share/gimp/patterns/wood1.pat
 share/gimp/patterns/wood2.pat
 share/gimp/patterns/wood3.pat
-libexec/gimp/plug-ins/autocrop
-libexec/gimp/plug-ins/bleed
-libexec/gimp/plug-ins/blend
-libexec/gimp/plug-ins/blur
-libexec/gimp/plug-ins/blur2
-libexec/gimp/plug-ins/brightness
-libexec/gimp/plug-ins/bumpmap
-libexec/gimp/plug-ins/c_astretch
-libexec/gimp/plug-ins/calculations
-libexec/gimp/plug-ins/charcoal
-libexec/gimp/plug-ins/checkerboard
-libexec/gimp/plug-ins/compose
-libexec/gimp/plug-ins/cubism
-libexec/gimp/plug-ins/darken
-libexec/gimp/plug-ins/decompose
-libexec/gimp/plug-ins/despeckle
-libexec/gimp/plug-ins/displace
-libexec/gimp/plug-ins/duplicate
-libexec/gimp/plug-ins/edge
-libexec/gimp/plug-ins/engrave
-libexec/gimp/plug-ins/enhance
-libexec/gimp/plug-ins/extrude
-libexec/gimp/plug-ins/flip_horz
-libexec/gimp/plug-ins/flip_vert
-libexec/gimp/plug-ins/gamma
-libexec/gimp/plug-ins/gauss
-libexec/gimp/plug-ins/gauss_recurse
-libexec/gimp/plug-ins/gbrush
-libexec/gimp/plug-ins/gbrush-old
-libexec/gimp/plug-ins/gicon
-libexec/gimp/plug-ins/gif
-libexec/gimp/plug-ins/gpattern
-libexec/gimp/plug-ins/grayify
-libexec/gimp/plug-ins/invert
-libexec/gimp/plug-ins/jpeg
-libexec/gimp/plug-ins/lic
-libexec/gimp/plug-ins/lighten
-libexec/gimp/plug-ins/lighting
-libexec/gimp/plug-ins/map_sphere
-libexec/gimp/plug-ins/matlab
-libexec/gimp/plug-ins/mblur
-libexec/gimp/plug-ins/mosaic
-libexec/gimp/plug-ins/netpbm
-libexec/gimp/plug-ins/noisify
-libexec/gimp/plug-ins/octave_srv
-libexec/gimp/plug-ins/offset
-libexec/gimp/plug-ins/oilify
-libexec/gimp/plug-ins/pagecurl
-libexec/gimp/plug-ins/photocd
-libexec/gimp/plug-ins/pinch
-libexec/gimp/plug-ins/pixelize
-libexec/gimp/plug-ins/plasma
-libexec/gimp/plug-ins/png
-libexec/gimp/plug-ins/pnm
-libexec/gimp/plug-ins/polar
-libexec/gimp/plug-ins/tga
-libexec/gimp/plug-ins/relief
-libexec/gimp/plug-ins/ripple
-libexec/gimp/plug-ins/rms_error
-libexec/gimp/plug-ins/rotate
-libexec/gimp/plug-ins/shift
-libexec/gimp/plug-ins/spread
-libexec/gimp/plug-ins/scale
-libexec/gimp/plug-ins/solarize
-libexec/gimp/plug-ins/sparkle
-libexec/gimp/plug-ins/texture2
-libexec/gimp/plug-ins/tiff
-libexec/gimp/plug-ins/tile
-libexec/gimp/plug-ins/tiler
-libexec/gimp/plug-ins/to-gray
-libexec/gimp/plug-ins/to-color
-libexec/gimp/plug-ins/to-indexed
-libexec/gimp/plug-ins/waves
-libexec/gimp/plug-ins/whirl
-libexec/gimp/plug-ins/xpm
-libexec/gimp/plug-ins/yuv411
+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/ds-logo.scm
+share/gimp/scripts/frozen-text.scm
+share/gimp/scripts/hds-logo.scm
+share/gimp/scripts/neon.scm
+share/gimp/scripts/sphere.scm
+share/gimp/user_install
+@dirrm include/gdk
+@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
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 68c8a8c6d75c..07aca069c5f9 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -1,16 +1,14 @@
 # New ports collection makefile for:    GIMP
-# Version required:     961001
+# Version required:     0.99.1
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/11/19 16:07:26 erich Exp $
+# $Id: Makefile,v 1.3 1996/11/20 11:11:35 asami Exp $
 #
 
-DISTNAME=       gimp
-PKGNAME=        gimp-devel-96.10.01
+DISTNAME=       gimp-0.99.1
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
-DISTFILES=	gimp961001.tgz
 
 MAINTAINER=     erich@FreeBSD.org
 
@@ -21,6 +19,12 @@ LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
+#CONFIGURE_ARGS= --enable-debug
+
 USE_GMAKE=	yes
 
+#post-configure:
+#	cd ${WRKSRC}/gtk+; ./configure
+
 .include <bsd.port.mk>
+
diff --git a/graphics/gimp-app/distinfo b/graphics/gimp-app/distinfo
index aeb842bef317..ed4429db6879 100644
--- a/graphics/gimp-app/distinfo
+++ b/graphics/gimp-app/distinfo
@@ -1,2 +1 @@
-MD5 (gimp961001.tgz) = f7c3971a93a7332a39d7794be491d6e7
-MD5 (gimp-data.tgz) = b13b8382e22a1664f959486132606090
+MD5 (gimp-0.99.1.tar.gz) = fc1b80922cf195d4994d11c556e4d6ec
diff --git a/graphics/gimp-app/files/patch-aa b/graphics/gimp-app/files/patch-aa
index 729403d72c4d..0ce6cf4d3acd 100644
--- a/graphics/gimp-app/files/patch-aa
+++ b/graphics/gimp-app/files/patch-aa
@@ -1,261 +1,99 @@
---- gimprc.in~	Mon Nov 18 09:56:00 1996
-+++ gimprc.in	Mon Nov 18 09:55:52 1996
-@@ -0,0 +1,258 @@
-+# Lines that start with a '#' are comments.
-+# Blank lines are ignored.
-+
-+# Set the temporary storage directory...files will appear here
-+# during the course of running the gimp.  Most files will disappear
-+# when the gimp exits, but some files are likely to remain,
-+# such as working palette files, so it is best if this directory
-+# not be one that is shared by other users or is cleared on machine
-+# reboot such as /tmp.
-+temp-path "~/.gimp/tmp"
-+
-+# Set the brush search path...this path will be searched for valid
-+#  brushes at startup.
-+brush-path "~/.gimp/brushes:@prefix@/share/gimp/brushes"
-+
-+# Specify a default brush. If none is specified it defaults to the
-+#  "1circle.gbr" brush which is just a single pixel sized brush.
-+#  The brush is searched for in the brush path.
-+default-brush "19fcircle.gbr"
-+
-+# Set the pattern search path...this path will be searched for valid
-+#  patterns at startup.
-+pattern-path "~/.gimp/patterns:@prefix@/share/gimp/patterns"
-+
-+# Specify a default pattern.
-+#  The pattern is searched for in the specified pattern paths.
-+default-pattern "wood2.pat"
-+
-+# Set the palette search path...this path will be searched for valid
-+#  palettes at startup.
-+palette-path "~/.gimp/palettes:@prefix@/share/gimp/palettes"
-+
-+# Specify a default palette.
-+#  The pattern is searched for in the specified pattern paths.
-+default-palette "Default"
-+
-+# Set the gradient search path...this path will be searched for valid
-+#  gradients at startup.
-+gradient-path "~/.gimp/gradients:@prefix@/share/gimp/gradients"
-+
-+# Specify a default gradient.
-+#  The gradient is searched for in the specified gradient paths.
-+default-gradient "German_flag_smooth"
-+
-+# Set the plug-in search path...this path will be searched for
-+#  plug-ins when the plug-in is run.
-+plug-in-path "~/.gimp/plug-ins:@prefix@/libexec/gimp/plug-ins"
-+
-+# Speed of marching ants in the selection outline
-+#  this value is in milliseconds
-+#  (less time indicates faster marching)
-+marching-ants-speed 300
-+
-+# Set the number of operations kept on the undo stack
-+undo-levels 5
-+
-+# Set the color-cube resource for dithering on 8-bit displays
-+#  The 3 values stand for Shades of red, green, and blue
-+#  Multiplying the # of shades of each primary color yields
-+#  the total number of colors that will be allocated from the
-+#  gimp colormap.  This number should not exceed 256.  Most of the
-+#  colors remaining after the allocation of the colorcube
-+#  will be left to the system palette in an effort to reduce
-+#  colormap "flashing".
-+color-cube 6, 6, 4
-+
-+# Install a GIMP colormap by default -- only for 8-bit displays
-+# install-colormap
-+
-+# Specify that marching ants for selected regions will be drawn
-+#  with colormap cycling as oposed to redrawing with different stipple masks
-+#  this color cycling option works only with 8-bit displays
-+# colormap-cycling
-+
-+# Tools such as fuzzy-select and bucket fill find regions based on a
-+#  seed-fill algorithm.  The seed fill starts at the intially selected
-+#  pixel and progresses in all directions until the difference of pixel
-+#  intensity from the original is greater than a specified threshold
-+#  ==> This value represents the default threshold
-+default-threshold 15
-+
-+# There is always a tradeoff between memory usage and speed.  In most
-+#  cases, the GIMP opts for speed over memory.  However, if memory is
-+#  a big issue, set stingy-memory-use
-+# stingy-memory-use
-+
-+# When zooming into and out of images, this option enables the
-+#  automatic resizing of windows
-+# allow-resize-windows
-+
-+# Context-dependent cursors are cool.  They are enabled by default.
-+#  However, they require overhead that you may want to do without.
-+#  Uncomment this line to disable them.
-+# no-cursor-updating
-+
-+# Layer preview sizes:
-+#  None:    no previews in layers dialog/layer selector
-+#  Small:   32x32
-+#  Medium:  64x64
-+#  Large:   128x128
-+#  #:       #x#
-+preview-size Medium
-+
-+# Controlling ruler visibility
-+#  The default behavior is for rulers to be ON
-+#  This can also be toggled with the View->Show Rulers command or shift+control+r
-+# dont-show-rulers
-+
-+# Disable auto saving
-+#  Just uncomment the line below...
-+# dont-auto-save
-+
-+# Set the gamma correction values for the display
-+#  1.0 corresponds to no gamma correction.  For most displays,
-+#  gamma correction should be set to between 2.0 and 2.6
-+#  Run the utility "gamma_correct" to determine appropriate values
-+#  for your display.
-+#
-+# One important item to keep in mind:  Many images that you might
-+#  get from outside sources will in all likelihood already be
-+#  gamma-corrected.  In these cases, the image will look washed-out
-+#  if the gimp has gamma-correction turned on.  If you are going
-+#  to work with images of this sort, turn gamma correction off
-+#  by removing this line, or setting the values to 1.0.
-+#  gamma-correction 1.0
-+#  gamma-correction 2.0
-+#                ___
-+gamma-correction 1.6
-+
-+# Set the manner in which transparency is displayed in images
-+#  Transparency type can be one of:
-+#    0: Light Checks
-+#    1: Mid-Tone Checks
-+#    2: Dark Checks
-+#    3: White Only
-+#    4: Gray Only
-+#    5: Black Only
-+#  Check size can be one of:
-+#    0: Small
-+#    1: Medium
-+#    2: Large
-+transparency-type 1
-+transparency-size 2
-+
-+# Notify the GIMP of the available file plug-ins.
-+# The format of the line is as follows:
-+#  file-plug-in <image types> <plug-in name> <plug-in title> <extensions>
-+# The `image types' argument specifies what types of images the
-+#  plug-in can save. It is a 3 digit number where each digit is 0 or
-+#  1. The digits correspond to `indexed images', `grayscale images'
-+#  and `rgb images' respectively. For example, the "jpeg" file plug-in
-+#  can save rgb and grayscale images but not indexed color, so the
-+#  image types argument is 011.
-+# The `plug-in name' is the name of the plug-in program.
-+# The `plug-in title' is the title of the program is it will appear
-+#  from the GIMP. This will most likely be the name of the plug-in.
-+# The `extensions' are a comma separated string of extensions. These
-+#  are used by the GIMP to map file names to images.
-+#  Note: case does not matter for extensions.
-+
-+file-plug-in  jpeg	011	"jpeg"		"jpg,jpeg"
-+file-plug-in  png	111	"png"		"png"
-+file-plug-in  gif	110	"gif"		"gif"
-+file-plug-in  tiff	111	"tiff"		"tiff,tif"
-+file-plug-in  tga	111	"tga"		"tga,targa"
-+file-plug-in  gbrush	010	"brush"		"gbr"
-+file-plug-in  gpattern	010	"pattern"	"pat,gpat"
-+file-plug-in  gicon	010	"gicon"		"gic,gico"
-+file-plug-in  xpm	110	"xpm"		"xpm"
-+file-plug-in  pnm	111	"pnm"		"pgm,ppm,pbm"
-+file-plug-in  matlab	010	"matlab"	"m"
-+file-plug-in  yuv411    001     "yuv"           "yuv"
-+
-+# Notify the GIMP of plug-ins that will exist in the `plug-ins' menu.
-+# The format of the line is as follows:
-+#  plug-in <plug-in name> <menu location> <accelerator>
-+# The `plug-in name' is the name of the plug-in program.
-+# The `menu location' is the item name and location in the plug-in
-+#  menu. A slash indicates a submenu. Therefore, the menu location
-+#  "Blur/Blur" specifies an item name of "Blur" in a submenu entitled
-+#  "Blur". Multiple submenus are possible. If a menu already exists
-+#  the item is simply placed in that menu. Menu items are placed in
-+#  alphabetically sorted order in menus.
-+# The `accelerator' is a string which designates a key combination
-+#  which will invoke the plug-in. The format should be clear by
-+#  inspection.  This string is optional.
-+#
-+# It is convention to only use the `alt' and `shift' key modifiers for
-+#  plug-ins. The `control' key is used as a modifier for menu items by
-+#  the main application. The main application will not use the `alt'
-+#  or `shift' key modifiers.
-+
-+plug-in blur       "Blur/Blur"
-+plug-in blur2      "Blur/Blur (variable)"        "Alt<Key>B"
-+plug-in gauss_recurse      "Blur/Gaussian Blur (IIR)"         "Shift Alt<Key>B"
-+plug-in gauss      "Blur/Gaussian Blur (RLE)"
-+plug-in mblur      "Blur/Motion Blur"
-+
-+plug-in charcoal   "Effects/Artistic/Charcoal"  "Shift Alt<Key>H"
-+plug-in cubism     "Effects/Artistic/Cubism"	"Shift Alt<Key>U"
-+plug-in mosaic     "Effects/Artistic/Mosaic"	"Alt<Key>M"
-+plug-in oilify     "Effects/Artistic/Oilify"
-+plug-in sparkle    "Effects/Artistic/Sparkle"
-+plug-in lic        "Effects/Artistic/Van-Goghify"
-+plug-in bleed      "Effects/Image/Bleed"
-+plug-in c_astretch "Effects/Image/Contrast Auto-Stretch"
-+plug-in enhance    "Effects/Image/Enhance"      "Shift Alt<Key>E"
-+plug-in gamma      "Effects/Image/Gamma"        "Alt<Key>G"
-+plug-in grayify    "Effects/Image/Grayify"
-+plug-in invert     "Effects/Image/Invert"       "Alt<Key>I"
-+plug-in solarize   "Effects/Image/Solarize"     "Alt<Key>1"
-+plug-in bumpmap    "Effects/Lighting/Bump Map"	"Alt<Key>2"
-+plug-in displace   "Effects/Lighting/Displace"	"Alt<Key>3"
-+plug-in lighting   "Effects/Lighting/Lighting"	"Alt<Key>4"
-+plug-in edge       "Effects/Misc Ops/Edge Detect"        "Alt<Key>E"
-+plug-in engrave    "Effects/Misc Ops/Engrave"
-+plug-in extrude    "Effects/Misc Ops/Extrude"
-+plug-in pixelize   "Effects/Misc Ops/Pixelize"
-+plug-in relief     "Effects/Misc Ops/Relief"    "Alt<Key>R"
-+plug-in checkerboard "Effects/Textures/Checkerboard"
-+plug-in plasma     "Effects/Textures/Plasma"
-+plug-in texture2   "Effects/Textures/Texture II"
-+
-+plug-in despeckle  "Distorts/Despeckle"
-+plug-in map_sphere "Distorts/Map Sphere"
-+plug-in noisify    "Distorts/Noise"
-+plug-in pagecurl   "Distorts/Page Curl"         "Alt<Key>U"
-+plug-in pinch      "Distorts/Pinch"             "Alt<Key>P"
-+plug-in ripple     "Distorts/Ripple"
-+plug-in shift      "Distorts/Shift"
-+plug-in spread     "Distorts/Spread"
-+plug-in whirl      "Distorts/Whirl"             "Alt<Key>W"
-+plug-in waves      "Distorts/Waves"
-+
-+plug-in compose    "Conversions/Compose"
-+plug-in decompose  "Conversions/Decompose"
-+plug-in to-color   "Conversions/To Color"       "Shift Alt<Key>C"
-+plug-in to-gray    "Conversions/To Grayscale"   "Shift Alt<Key>G"
-+plug-in to-indexed "Conversions/To Indexed"     "Shift Alt<Key>I"
-+
-+plug-in autocrop   "Transforms/Autocrop"
-+plug-in flip_horz  "Transforms/Flip Horizontal" "Alt<Key>H"
-+plug-in flip_vert  "Transforms/Flip Vertical"   "Alt<Key>V"
-+plug-in polar      "Transforms/Polar"
-+plug-in rotate     "Transforms/Rotate"
-+plug-in scale      "Transforms/Scale"           "Shift Alt<Key>S"
-+plug-in tile       "Transforms/Tile"            "Alt<Key>T"
-+plug-in tiler      "Transforms/Tiler"           "Alt<Key>T"
-+
-+plug-in blend      "Channel Ops/Blend"
-+plug-in calculations "Channel Ops/Calculations" "Alt<Key>C"
-+plug-in duplicate  "Channel Ops/Duplicate"      "Alt<Key>D"
-+plug-in offset     "Channel Ops/Offset"         "Alt<Key>O"
-+
-+plug-in netpbm	   "Miscellaneous/Netpbm Filter" "Shift Alt<Key>N"
-+plug-in rms_error  "Miscellaneous/RMS Error"
-+plug-in photocd    "Miscellaneous/Photo CD"
-+plug-in octave_srv "Miscellaneous/Octave Server"
+--- plug-ins/Makefile.in.orig	Thu Feb 27 05:41:52 1997
++++ plug-ins/Makefile.in	Thu Feb 27 08:46:09 1997
+@@ -28,6 +28,7 @@
+ 
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ 
+ top_builddir = ..
+@@ -58,7 +59,7 @@
+ X_LDFLAGS =
+ X_LIBS =
+ 
+-pluginlibdir = $(pkglibdir)/plug-ins
++pluginlibdir = $(pkglibexecdir)/plug-ins
+ 
+ pluginlib_PROGRAMS =	\
+ 	blur		\
+--- ./app/batch.c~	Mon Feb 24 14:38:51 1997
++++ ./app/batch.c	Wed Feb 26 08:51:05 1997
+@@ -3,7 +3,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-
++#include <errno.h>
+ #include "appenv.h"
+ #include "app_procs.h"
+ #include "batch.h"
+--- ./app/xcf.c~	Wed Feb 26 05:21:25 1997
++++ ./app/xcf.c	Wed Feb 26 09:07:30 1997
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+--- configure.orig	Thu Feb 27 09:55:32 1997
++++ configure	Thu Feb 27 09:55:40 1997
+@@ -609,7 +609,7 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-
++INSTALL_SCRIPT="/usr/bin/install -c -m 755"
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
+ 
+@@ -2040,7 +2040,7 @@
+ CFLAGS="$OPTFLAG $CFLAGS"
+ 
+ gimpdatadir=$datadir/$PACKAGE
+-gimpplugindir=$libdir/$PACKAGE
++gimpplugindir=$libexecdir/$PACKAGE
+ 
+ 
+ 
+--- gtk+/configure~	Thu Feb 27 03:09:52 1997
++++ gtk+/configure	Thu Feb 27 15:10:18 1997
+@@ -569,6 +569,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:572: checking for a BSD compatible install" >&5
++INSTALL="/usr/bin/install -c"
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+--- gtk+/glib/configure~	Thu Feb 27 15:32:15 1997
++++ gtk+/glib/configure	Thu Feb 27 15:32:47 1997
+@@ -559,6 +559,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:562: checking for a BSD compatible install" >&5
++INSTALL="/usr/bin/install -c"
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+--- plug-ins/script-fu/Makefile.in.orig	Thu Feb 27 20:47:10 1997
++++ plug-ins/script-fu/Makefile.in	Thu Feb 27 20:46:30 1997
+@@ -59,7 +59,7 @@
+ 
+ SUBDIRS = scripts
+ 
+-pluginlibdir = $(pkglibdir)/plug-ins
++pluginlibdir = $(gimpplugindir)/plug-ins
+ 
+ pluginlib_PROGRAMS = script-fu
+
+*** /tmp/gimp-0.99.1/app/gimprc.c	Thu Feb 27 06:43:10 1997
+--- ./app/gimprc.c	Thu Feb 27 16:41:19 1997
+***************
+*** 159,161 ****
+  
+!   sprintf (libfilename, "%s/gimprc", LIBDIR);
+    parse_gimprc_file (libfilename);
+--- 159,161 ----
+  
+!   sprintf (libfilename, "%s/gimprc", DATADIR);
+    parse_gimprc_file (libfilename);
diff --git a/graphics/gimp-app/files/patch-ab b/graphics/gimp-app/files/patch-ab
index ac5e5976e46c..f4579f768d02 100644
--- a/graphics/gimp-app/files/patch-ab
+++ b/graphics/gimp-app/files/patch-ab
@@ -1,49 +1,96 @@
---- app/fileops.c~	Mon Nov 18 09:57:19 1996
-+++ app/fileops.c	Mon Nov 18 09:58:01 1996
-@@ -289,7 +289,7 @@
-       gtk_file_selection_set_ok_callback (filesel, file_open_ok_callback, open_options);
-       gtk_file_selection_set_cancel_callback (filesel, file_cancel_callback, open_options);
- 
--      if (gdisp && gdisp->gimage->has_filename)
-+      if (gdisp && gdisp->gimage && gdisp->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisp->gimage));
- 
-       gtk_widget_show (filesel);
-@@ -297,7 +297,7 @@
- 
-   if (! GTK_WIDGET_VISIBLE (filesel))
-     {
--      if (gdisp && gdisp->gimage->has_filename)
-+      if (gdisp && gdisp->gimage && gdisp->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisp->gimage));
-       gtk_widget_show (filesel);
-     }
-@@ -353,7 +353,7 @@
-       gtk_file_selection_set_ok_callback (filesel, file_save_ok_callback, save_options);
-       gtk_file_selection_set_cancel_callback (filesel, file_cancel_callback, save_options);
- 
--      if (gdisplay && gdisplay->gimage->has_filename)
-+      if (gdisplay && gdisplay->gimage && gdisplay->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisplay->gimage));
- 
-       gtk_widget_show (filesel);
-@@ -363,7 +363,7 @@
- 
-   if (! GTK_WIDGET_VISIBLE (filesel))
-     {
--      if (gdisplay && gdisplay->gimage->has_filename)
-+      if (gdisplay && gdisplay->gimage && gdisplay->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisplay->gimage));
- 
-       gtk_widget_show (filesel);
---- app/progress.c~	Mon Nov 18 11:03:58 1996
-+++ app/progress.c	Mon Nov 18 11:04:07 1996
-@@ -57,7 +57,7 @@
-   progress->callback_data = callback_data;
-   progress->pixmap = NULL;
- 
--  progress->shell = gtk_window_new (title, GTK_WINDOW_TOPLEVEL);
-+  progress->shell = gtk_window_new (title, GTK_WINDOW_DIALOG);
-   gtk_widget_set_uposition (progress->shell, progress_x, progress_y);
-   main_vbox = gtk_vbox_new (FALSE, 5);
-   gtk_container_add (progress->shell, main_vbox);
+--- plug-ins/script-fu/scripts/Makefile.in.orig	Fri Feb 28 09:09:07 1997
++++ plug-ins/script-fu/scripts/Makefile.in	Fri Feb 28 09:07:40 1997
+@@ -51,17 +51,17 @@
+ scriptdatadir = $(pkgdatadir)/scripts
+ 
+ scriptdata_DATA = \
+-	alien-glow.scm		\
+-	bds-logo-textured.scm	\
+-	blend-logo.scm		\
+-	chrome.scm		\
+-	chrome-it.scm		\
+-	chrome2.scm		\
+-	ds-logo.scm		\
+-	frozen-text.scm		\
+-	hds-logo.scm		\
+-	neon.scm		\
+-	sphere.scm		\
++	alien-glow.sed		\
++	bds-logo-textured.sed	\
++	blend-logo.sed		\
++	chrome.sed		\
++	chrome-it.sed		\
++	chrome2.sed		\
++	ds-logo.sed		\
++	frozen-text.sed		\
++	hds-logo.sed		\
++	neon.sed		\
++	sphere.sed		\
+ 	beavis.jpg
+ 
+ EXTRA_DIST = $(scriptdata_DATA)
+@@ -79,7 +79,7 @@
+ TAR = tar
+ default: all
+ 
+-.SUFFIXES:
++.SUFFIXES: .sed
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
+ 	cd $(top_srcdir) && automake --gnu plug-ins/script-fu/scripts/Makefile
+ 
+@@ -87,17 +87,18 @@
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+-
+ install-scriptdataDATA: $(scriptdata_DATA)
+ 	$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(scriptdatadir)
+-	@list="$(scriptdata_DATA)"; for p in $$list; do \
+-	  if test -f $(srcdir)/$$p; then \
+-	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p; \
+-	  else if test -f $$p; then \
+-	    echo "$(INSTALL_DATA) $$p $(scriptdatadir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(scriptdatadir)/$$p; \
++	@list="$(scriptdata_DATA)"; for s in $$list; do \
++	  p=$$(basename $$s .sed); \
++	  if [ $$p != $$s ]; then p=$$p.scm; fi; \
++	  if test -f $(srcdir)/$$s; then \
++	    echo "$(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p"; \
++	    $(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p; \
++	  else if test -f $$s; then \
++	    echo "$(INSTALL_DATA) $$s $(scriptdatadir)/$$p"; \
++	    $(INSTALL_DATA) $$s $(scriptdatadir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
+@@ -184,3 +184,7 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++
++%.sed : %.scm
++	sed 's,@_prefix_@,${prefix},' $< > $@
+--- plug-ins/script-fu/scripts/chrome-it.scm.orig	Wed Feb 26 22:51:31 1997
++++ plug-ins/script-fu/scripts/chrome-it.scm	Fri Feb 28 09:01:38 1997
+@@ -153,5 +153,5 @@
+     (gimp-displays-flush)
+     (gimp-image-enable-undo img)))
+ 
+-(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
+-(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
+--- plug-ins/script-fu/scripts/chrome2.scm.orig	Wed Feb 26 20:57:57 1997
++++ plug-ins/script-fu/scripts/chrome2.scm	Fri Feb 28 09:01:38 1997
+@@ -161,6 +161,6 @@
+     (gimp-image-enable-undo img)
+     (gimp-display-new img)))
+ 
+-(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
+ 
+-(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
diff --git a/graphics/gimp-app/files/patch-ac b/graphics/gimp-app/files/patch-ac
deleted file mode 100644
index 7e5a1845afe1..000000000000
--- a/graphics/gimp-app/files/patch-ac
+++ /dev/null
@@ -1,61 +0,0 @@
---- configure~	Mon Nov 18 10:20:48 1996
-+++ configure	Mon Nov 18 10:21:54 1996
-@@ -2324,7 +2324,7 @@
- EOF
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile app/Makefile plug-ins/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile app/Makefile plug-ins/Makefile gimprc"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
---- configure.in~	Mon Nov 18 10:37:13 1996
-+++ configure.in	Mon Nov 18 10:37:25 1996
-@@ -221,4 +221,4 @@
- AC_SUBST(_SHLIBS_)
- 
- dnl Output the Makefiles
--AC_OUTPUT(Makefile app/Makefile plug-ins/Makefile)
-+AC_OUTPUT(Makefile app/Makefile plug-ins/Makefile gimprc)
---- Makefile.in~	Mon Nov 18 11:11:16 1996
-+++ Makefile.in	Mon Nov 18 11:12:22 1996
-@@ -16,7 +16,7 @@
- # set the MAKE variable if necessary
- @SET_MAKE@
- 
--INSTALL	=	./install-sh -c
-+INSTALL	=	/usr/bin/install -c
- 
- all:
- 	( cd gtk ; $(MAKE) )
-@@ -24,22 +24,22 @@
- 	( cd app ; $(MAKE) )
- 
- install:
--	$(INSTALL) -d $(libdir)/gimp
--	$(INSTALL) -d $(libdir)/gimp/brushes
--	$(INSTALL) -m 644 gimprc $(libdir)/gimp
-+	$(INSTALL) -d $(datadir)/gimp
-+	$(INSTALL) -d $(datadir)/gimp/brushes
-+	$(INSTALL) -m 644 gimprc $(datadir)/gimp
- 	for brush in brushes/*; do \
-           echo $$brush; \
--	  $(INSTALL) -m 644 "$$brush" $(libdir)/gimp/brushes; \
-+	  $(INSTALL) -m 644 "$$brush" $(datadir)/gimp/brushes; \
- 	done
--	$(INSTALL) -d $(libdir)/gimp/palettes
-+	$(INSTALL) -d $(datadir)/gimp/palettes
- 	for palette in palettes/*; do \
-           echo $$palette; \
--	  $(INSTALL) -m 644 "$$palette" $(libdir)/gimp/palettes; \
-+	  $(INSTALL) -m 644 "$$palette" $(datadir)/gimp/palettes; \
- 	done
--	$(INSTALL) -d $(libdir)/gimp/patterns
-+	$(INSTALL) -d $(datadir)/gimp/patterns
- 	for pattern in patterns/*; do \
-           echo $$pattern; \
--	  $(INSTALL) -m 644 "$$pattern" $(libdir)/gimp/patterns; \
-+	  $(INSTALL) -m 644 "$$pattern" $(datadir)/gimp/patterns; \
- 	done
- 	( cd plug-ins ; $(MAKE) install )
- 	( cd app ; $(MAKE) install )
diff --git a/graphics/gimp-app/files/patch-ah b/graphics/gimp-app/files/patch-ah
deleted file mode 100644
index 8e508d8ad219..000000000000
--- a/graphics/gimp-app/files/patch-ah
+++ /dev/null
@@ -1,208 +0,0 @@
---- app/autodialog.c.old	Fri Nov 22 15:46:44 1996
-+++ app/autodialog.c	Fri Nov 22 18:08:40 1996
-@@ -49,7 +49,7 @@
- /*  Local functions  */
- static AutoDialogItem dialog_find_item (AutoDialog, int);
- static void dialog_delete_children (AutoDialog, AutoDialogItem);
--static GtkWidget *dialog_create_image_menu (AutoDialog, char *, gpointer,
-+static GtkWidget *dialog_create_image_menu (AutoDialog, AutoDialogItem, char *, gpointer,
- 					    GtkWidget **, GtkWidget **);
- 
- /*  Callback and Update functions  */
-@@ -171,7 +171,8 @@
- 	{
- 	  dlgitem = tmplink->data;
- 	  tmplink = tmplink->next;
--
-+    if (dlgitem->additional_data!=NULL)
-+      xfree(dlgitem->additional_data);
- 	  xfree (dlgitem);
- 	}
-       free_list (dlg->items);
-@@ -206,6 +207,7 @@
-   item->item_ID = dlg->next_item_ID++;
-   item->item_type = type;
-   memset (item->data, 0, 32);
-+  item->additional_data=NULL;
-   item->parent = parent_item;
-   item->children = NULL;
-   item->gtk_data = NULL;
-@@ -276,7 +278,7 @@
-       break;
- 
-     case ITEM_IMAGE_MENU:
--      item_widget = dialog_create_image_menu (dlg, data, extra, &option_menu, &menu);
-+      item_widget = dialog_create_image_menu (dlg, item, data, extra, &option_menu, &menu);
-       break;
- 
-     case ITEM_SCALE:
-@@ -500,7 +502,8 @@
- 	}
-       else
- 	gtk_widget_destroy (item->widget);
--
-+      if (item->additional_data!=NULL)
-+        xfree(item->additional_data);
-       xfree (item);
-     }
- }
-@@ -577,9 +580,32 @@
-     free_list (item->children);
- }
- 
-+typedef struct {
-+  GtkWidget *widget;
-+  long data[2];
-+} _MenuItemData;
-+
-+gint CheckConstrains(GImage *gimage,GImage *constrain,guchar constraint)
-+{
-+  if (((constraint & IMAGE_CONSTRAIN_RGB) &&
-+       (gimage_type (gimage) == RGB_GIMAGE ||
-+	      gimage_type (gimage) == RGBA_GIMAGE)) ||
-+	    ((constraint & IMAGE_CONSTRAIN_GRAY) &&
-+	     (gimage_type (gimage) == GRAY_GIMAGE ||
-+	      gimage_type (gimage) == GRAYA_GIMAGE)) ||
-+	    ((constraint & IMAGE_CONSTRAIN_INDEXED) &&
-+	     (gimage_type (gimage) == INDEXED_GIMAGE ||
-+	      gimage_type (gimage) == INDEXEDA_GIMAGE)))
-+    if ((gimage->width == constrain->width) &&
-+	      (gimage->height == constrain->height))
-+      return(TRUE);
-+  return(FALSE); 
-+}
-+
- static GtkWidget *
--dialog_create_image_menu (dlg, title, image, option_menu, menu)
-+dialog_create_image_menu (dlg, item, title, image, option_menu, menu)
-      AutoDialog dlg;
-+     AutoDialogItem item;
-      char *title;
-      void *image;
-      GtkWidget **option_menu;
-@@ -597,8 +623,8 @@
-   char constraint;
-   link_ptr tmp;
-   long ID;
--  long *data;
-   int num_items = 0;
-+  _MenuItemData *ItemData;
- 
-   hbox = gtk_hbox_new (FALSE, 4);
-   gtk_container_set_border_width (hbox, 0);
-@@ -614,43 +640,55 @@
-   constrain = (ID == 0) ? image : gimage_get_ID (ID);
- 
-   tmp = image_list;
-+
-+  /* Check how many images fit the criteria */
-+  /* ====================================== */
-+
-   while (tmp)
-     {
-       gimage = tmp->data;
-       tmp = next_item (tmp);
--
--      if (((constraint & IMAGE_CONSTRAIN_RGB) &&
--	   (gimage_type (gimage) == RGB_GIMAGE ||
--	    gimage_type (gimage) == RGBA_GIMAGE)) ||
--	  ((constraint & IMAGE_CONSTRAIN_GRAY) &&
--	   (gimage_type (gimage) == GRAY_GIMAGE ||
--	    gimage_type (gimage) == GRAYA_GIMAGE)) ||
--	  ((constraint & IMAGE_CONSTRAIN_INDEXED) &&
--	   (gimage_type (gimage) == INDEXED_GIMAGE ||
--	    gimage_type (gimage) == INDEXEDA_GIMAGE)))
--	if ((gimage->width == constrain->width) &&
--	    (gimage->height == constrain->height))
--	  {
--	    image_name = prune_filename (gimage_filename (gimage));
--	    menu_item_label = (char *) xmalloc (strlen (image_name) + 15);
--	    sprintf (menu_item_label, "%s-%d", image_name, gimage->ID);
--	    menu_item = gtk_menu_item_new_with_label (menu_item_label);
--	    gtk_callback_add (gtk_menu_item_get_state (menu_item),
--			      dialog_image_menu_callback, dlg);
--	    gtk_container_add (*menu, menu_item);
--	    gtk_widget_show (menu_item);
--
--	    data = xmalloc (sizeof (long) * 2);
--	    data[0] = dlg->next_item_ID - 1;
--	    data[1] = (gimage->ID == constrain->ID) ? 0 : gimage->ID;
--	    dlg->additional_data = data;
--
--	    xfree (menu_item_label);
--	    num_items ++;
--	  }
-+      if (CheckConstrains(gimage,constrain,constraint)==TRUE)
-+        num_items++;      
-     }
- 
--  if (!num_items)
-+  /* If we found any matches, allocate memory to hold      */
-+  /* callback data. Put a pointer in "item" to avoid leak. */
-+  /* ===================================================== */
-+  
-+  if (num_items>0)
-+    {
-+      ItemData=(_MenuItemData *)xmalloc(sizeof(_MenuItemData)*(size_t)num_items);
-+      item->additional_data=ItemData;
-+
-+      tmp=image_list;
-+      num_items=0;
-+      while (tmp)
-+        {
-+          gimage = tmp->data;
-+          tmp = next_item (tmp);
-+          if (CheckConstrains(gimage,constrain,constraint)==TRUE)
-+	          {
-+	            image_name = prune_filename (gimage_filename (gimage));
-+	            menu_item_label = (char *) xmalloc (strlen (image_name) + 15);
-+	            sprintf (menu_item_label, "%s-%d", image_name, gimage->ID);
-+      
-+              ItemData[num_items].widget=hbox;
-+              ItemData[num_items].data[0] = dlg->next_item_ID - 1;
-+              ItemData[num_items].data[1] = (gimage->ID == constrain->ID) ? 0 : gimage->ID;
-+      
-+	            menu_item = gtk_menu_item_new_with_label (menu_item_label);
-+	            gtk_callback_add (gtk_menu_item_get_state (menu_item),dialog_image_menu_callback,
-+                (gpointer)&ItemData[num_items]);
-+	            gtk_container_add (*menu, menu_item);
-+	            gtk_widget_show (menu_item);
-+      
-+	            xfree (menu_item_label);
-+	            num_items ++;
-+	          }
-+        }
-+    }
-+  else
-     {
-       menu_item = gtk_menu_item_new_with_label ("none");
-       gtk_container_add (*menu, menu_item);
-@@ -669,14 +707,14 @@
-      gpointer client_data;
-      gpointer call_data;
- {
-+  _MenuItemData *ItemData;
-   AutoDialog dlg;
--  long *data;
- 
--  dlg = client_data;
--  data = (long *) dlg->additional_data;
-+  ItemData=(_MenuItemData *)client_data;
-+  dlg = (AutoDialog) gtk_widget_get_user_data (ItemData->widget);
- 
-   if (dlg->callback)
--    (* dlg->callback) (dlg->dialog_ID, data[0], dlg->callback_data, &data[1]);
-+    (* dlg->callback) (dlg->dialog_ID,ItemData->data[0],dlg->callback_data,&ItemData->data[1]);
- }
- 
- static void
---- app/autodialog.h.old	Fri Nov 22 15:46:47 1996
-+++ app/autodialog.h	Fri Nov 22 17:21:19 1996
-@@ -49,6 +49,7 @@
-   int             item_ID;
-   int             item_type;
-   char            data[32];
-+  void           *additional_data;
-   AutoDialogItem  parent;
-   link_ptr        children;
-   GtkWidget      *widget;
diff --git a/graphics/gimp-app/pkg-plist b/graphics/gimp-app/pkg-plist
index ef35558b371c..a854e9786565 100644
--- a/graphics/gimp-app/pkg-plist
+++ b/graphics/gimp-app/pkg-plist
@@ -1,4 +1,130 @@
 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/gtk/gtk.h
+include/gtk/gtkaccelerator.h
+include/gtk/gtkadjustment.h
+include/gtk/gtkalignment.h
+include/gtk/gtkarrow.h
+include/gtk/gtkbin.h
+include/gtk/gtkbox.h
+include/gtk/gtkbutton.h
+include/gtk/gtkcanvas.h
+include/gtk/gtkcheckbutton.h
+include/gtk/gtkcontainer.h
+include/gtk/gtkdata.h
+include/gtk/gtkdialog.h
+include/gtk/gtkdrawingarea.h
+include/gtk/gtkentry.h
+include/gtk/gtkenums.h
+include/gtk/gtkfilesel.h
+include/gtk/gtkfill.h
+include/gtk/gtkframe.h
+include/gtk/gtkgc.h
+include/gtk/gtkhbox.h
+include/gtk/gtkhruler.h
+include/gtk/gtkhscale.h
+include/gtk/gtkhscrollbar.h
+include/gtk/gtkhseparator.h
+include/gtk/gtkimage.h
+include/gtk/gtkitem.h
+include/gtk/gtklabel.h
+include/gtk/gtklist.h
+include/gtk/gtklistitem.h
+include/gtk/gtkmain.h
+include/gtk/gtkmenu.h
+include/gtk/gtkmenubar.h
+include/gtk/gtkmenufactory.h
+include/gtk/gtkmenuitem.h
+include/gtk/gtkmenushell.h
+include/gtk/gtkmisc.h
+include/gtk/gtknotebook.h
+include/gtk/gtkobject.h
+include/gtk/gtkoptionmenu.h
+include/gtk/gtkpixmap.h
+include/gtk/gtkpreview.h
+include/gtk/gtkprogressbar.h
+include/gtk/gtkradiobutton.h
+include/gtk/gtkrange.h
+include/gtk/gtkrc.h
+include/gtk/gtkruler.h
+include/gtk/gtkscale.h
+include/gtk/gtkscrollbar.h
+include/gtk/gtkscrolledwindow.h
+include/gtk/gtkseparator.h
+include/gtk/gtksignal.h
+include/gtk/gtkstyle.h
+include/gtk/gtktable.h
+include/gtk/gtktext.h
+include/gtk/gtktogglebutton.h
+include/gtk/gtktree.h
+include/gtk/gtktreeitem.h
+include/gtk/gtktypeutils.h
+include/gtk/gtkvbox.h
+include/gtk/gtkviewport.h
+include/gtk/gtkvruler.h
+include/gtk/gtkvscale.h
+include/gtk/gtkvscrollbar.h
+include/gtk/gtkvseparator.h
+include/gtk/gtkwidget.h
+include/gtk/gtkwindow.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.0.0
+lib/libgimp.a
+lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.0.0
+lib/libgimpi.a
+lib/libgimpi.la
+lib/libgimpi.so
+lib/libgimpi.so.0.0
+lib/libgimpui.a
+lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.0.0
+lib/libglib.a
+lib/libglib.la
+lib/libglib.so
+lib/libglib.so.0.0
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so
+lib/libgtk.so.0.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/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/whirl
 share/gimp/brushes/11circle.gbr
 share/gimp/brushes/11fcircle.gbr
 share/gimp/brushes/13circle.gbr
@@ -61,7 +187,17 @@ 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
@@ -95,13 +231,13 @@ share/gimp/patterns/leopard.pat
 share/gimp/patterns/lumps.pat
 share/gimp/patterns/marble1.pat
 share/gimp/patterns/marble2.pat
-share/gimp/patterns/pj.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
@@ -113,79 +249,26 @@ share/gimp/patterns/wax.pat
 share/gimp/patterns/wood1.pat
 share/gimp/patterns/wood2.pat
 share/gimp/patterns/wood3.pat
-libexec/gimp/plug-ins/autocrop
-libexec/gimp/plug-ins/bleed
-libexec/gimp/plug-ins/blend
-libexec/gimp/plug-ins/blur
-libexec/gimp/plug-ins/blur2
-libexec/gimp/plug-ins/brightness
-libexec/gimp/plug-ins/bumpmap
-libexec/gimp/plug-ins/c_astretch
-libexec/gimp/plug-ins/calculations
-libexec/gimp/plug-ins/charcoal
-libexec/gimp/plug-ins/checkerboard
-libexec/gimp/plug-ins/compose
-libexec/gimp/plug-ins/cubism
-libexec/gimp/plug-ins/darken
-libexec/gimp/plug-ins/decompose
-libexec/gimp/plug-ins/despeckle
-libexec/gimp/plug-ins/displace
-libexec/gimp/plug-ins/duplicate
-libexec/gimp/plug-ins/edge
-libexec/gimp/plug-ins/engrave
-libexec/gimp/plug-ins/enhance
-libexec/gimp/plug-ins/extrude
-libexec/gimp/plug-ins/flip_horz
-libexec/gimp/plug-ins/flip_vert
-libexec/gimp/plug-ins/gamma
-libexec/gimp/plug-ins/gauss
-libexec/gimp/plug-ins/gauss_recurse
-libexec/gimp/plug-ins/gbrush
-libexec/gimp/plug-ins/gbrush-old
-libexec/gimp/plug-ins/gicon
-libexec/gimp/plug-ins/gif
-libexec/gimp/plug-ins/gpattern
-libexec/gimp/plug-ins/grayify
-libexec/gimp/plug-ins/invert
-libexec/gimp/plug-ins/jpeg
-libexec/gimp/plug-ins/lic
-libexec/gimp/plug-ins/lighten
-libexec/gimp/plug-ins/lighting
-libexec/gimp/plug-ins/map_sphere
-libexec/gimp/plug-ins/matlab
-libexec/gimp/plug-ins/mblur
-libexec/gimp/plug-ins/mosaic
-libexec/gimp/plug-ins/netpbm
-libexec/gimp/plug-ins/noisify
-libexec/gimp/plug-ins/octave_srv
-libexec/gimp/plug-ins/offset
-libexec/gimp/plug-ins/oilify
-libexec/gimp/plug-ins/pagecurl
-libexec/gimp/plug-ins/photocd
-libexec/gimp/plug-ins/pinch
-libexec/gimp/plug-ins/pixelize
-libexec/gimp/plug-ins/plasma
-libexec/gimp/plug-ins/png
-libexec/gimp/plug-ins/pnm
-libexec/gimp/plug-ins/polar
-libexec/gimp/plug-ins/tga
-libexec/gimp/plug-ins/relief
-libexec/gimp/plug-ins/ripple
-libexec/gimp/plug-ins/rms_error
-libexec/gimp/plug-ins/rotate
-libexec/gimp/plug-ins/shift
-libexec/gimp/plug-ins/spread
-libexec/gimp/plug-ins/scale
-libexec/gimp/plug-ins/solarize
-libexec/gimp/plug-ins/sparkle
-libexec/gimp/plug-ins/texture2
-libexec/gimp/plug-ins/tiff
-libexec/gimp/plug-ins/tile
-libexec/gimp/plug-ins/tiler
-libexec/gimp/plug-ins/to-gray
-libexec/gimp/plug-ins/to-color
-libexec/gimp/plug-ins/to-indexed
-libexec/gimp/plug-ins/waves
-libexec/gimp/plug-ins/whirl
-libexec/gimp/plug-ins/xpm
-libexec/gimp/plug-ins/yuv411
+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/ds-logo.scm
+share/gimp/scripts/frozen-text.scm
+share/gimp/scripts/hds-logo.scm
+share/gimp/scripts/neon.scm
+share/gimp/scripts/sphere.scm
+share/gimp/user_install
+@dirrm include/gdk
+@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
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 68c8a8c6d75c..07aca069c5f9 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -1,16 +1,14 @@
 # New ports collection makefile for:    GIMP
-# Version required:     961001
+# Version required:     0.99.1
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/11/19 16:07:26 erich Exp $
+# $Id: Makefile,v 1.3 1996/11/20 11:11:35 asami Exp $
 #
 
-DISTNAME=       gimp
-PKGNAME=        gimp-devel-96.10.01
+DISTNAME=       gimp-0.99.1
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
-DISTFILES=	gimp961001.tgz
 
 MAINTAINER=     erich@FreeBSD.org
 
@@ -21,6 +19,12 @@ LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
+#CONFIGURE_ARGS= --enable-debug
+
 USE_GMAKE=	yes
 
+#post-configure:
+#	cd ${WRKSRC}/gtk+; ./configure
+
 .include <bsd.port.mk>
+
diff --git a/graphics/gimp-devel/distinfo b/graphics/gimp-devel/distinfo
index aeb842bef317..ed4429db6879 100644
--- a/graphics/gimp-devel/distinfo
+++ b/graphics/gimp-devel/distinfo
@@ -1,2 +1 @@
-MD5 (gimp961001.tgz) = f7c3971a93a7332a39d7794be491d6e7
-MD5 (gimp-data.tgz) = b13b8382e22a1664f959486132606090
+MD5 (gimp-0.99.1.tar.gz) = fc1b80922cf195d4994d11c556e4d6ec
diff --git a/graphics/gimp-devel/files/patch-aa b/graphics/gimp-devel/files/patch-aa
index 729403d72c4d..0ce6cf4d3acd 100644
--- a/graphics/gimp-devel/files/patch-aa
+++ b/graphics/gimp-devel/files/patch-aa
@@ -1,261 +1,99 @@
---- gimprc.in~	Mon Nov 18 09:56:00 1996
-+++ gimprc.in	Mon Nov 18 09:55:52 1996
-@@ -0,0 +1,258 @@
-+# Lines that start with a '#' are comments.
-+# Blank lines are ignored.
-+
-+# Set the temporary storage directory...files will appear here
-+# during the course of running the gimp.  Most files will disappear
-+# when the gimp exits, but some files are likely to remain,
-+# such as working palette files, so it is best if this directory
-+# not be one that is shared by other users or is cleared on machine
-+# reboot such as /tmp.
-+temp-path "~/.gimp/tmp"
-+
-+# Set the brush search path...this path will be searched for valid
-+#  brushes at startup.
-+brush-path "~/.gimp/brushes:@prefix@/share/gimp/brushes"
-+
-+# Specify a default brush. If none is specified it defaults to the
-+#  "1circle.gbr" brush which is just a single pixel sized brush.
-+#  The brush is searched for in the brush path.
-+default-brush "19fcircle.gbr"
-+
-+# Set the pattern search path...this path will be searched for valid
-+#  patterns at startup.
-+pattern-path "~/.gimp/patterns:@prefix@/share/gimp/patterns"
-+
-+# Specify a default pattern.
-+#  The pattern is searched for in the specified pattern paths.
-+default-pattern "wood2.pat"
-+
-+# Set the palette search path...this path will be searched for valid
-+#  palettes at startup.
-+palette-path "~/.gimp/palettes:@prefix@/share/gimp/palettes"
-+
-+# Specify a default palette.
-+#  The pattern is searched for in the specified pattern paths.
-+default-palette "Default"
-+
-+# Set the gradient search path...this path will be searched for valid
-+#  gradients at startup.
-+gradient-path "~/.gimp/gradients:@prefix@/share/gimp/gradients"
-+
-+# Specify a default gradient.
-+#  The gradient is searched for in the specified gradient paths.
-+default-gradient "German_flag_smooth"
-+
-+# Set the plug-in search path...this path will be searched for
-+#  plug-ins when the plug-in is run.
-+plug-in-path "~/.gimp/plug-ins:@prefix@/libexec/gimp/plug-ins"
-+
-+# Speed of marching ants in the selection outline
-+#  this value is in milliseconds
-+#  (less time indicates faster marching)
-+marching-ants-speed 300
-+
-+# Set the number of operations kept on the undo stack
-+undo-levels 5
-+
-+# Set the color-cube resource for dithering on 8-bit displays
-+#  The 3 values stand for Shades of red, green, and blue
-+#  Multiplying the # of shades of each primary color yields
-+#  the total number of colors that will be allocated from the
-+#  gimp colormap.  This number should not exceed 256.  Most of the
-+#  colors remaining after the allocation of the colorcube
-+#  will be left to the system palette in an effort to reduce
-+#  colormap "flashing".
-+color-cube 6, 6, 4
-+
-+# Install a GIMP colormap by default -- only for 8-bit displays
-+# install-colormap
-+
-+# Specify that marching ants for selected regions will be drawn
-+#  with colormap cycling as oposed to redrawing with different stipple masks
-+#  this color cycling option works only with 8-bit displays
-+# colormap-cycling
-+
-+# Tools such as fuzzy-select and bucket fill find regions based on a
-+#  seed-fill algorithm.  The seed fill starts at the intially selected
-+#  pixel and progresses in all directions until the difference of pixel
-+#  intensity from the original is greater than a specified threshold
-+#  ==> This value represents the default threshold
-+default-threshold 15
-+
-+# There is always a tradeoff between memory usage and speed.  In most
-+#  cases, the GIMP opts for speed over memory.  However, if memory is
-+#  a big issue, set stingy-memory-use
-+# stingy-memory-use
-+
-+# When zooming into and out of images, this option enables the
-+#  automatic resizing of windows
-+# allow-resize-windows
-+
-+# Context-dependent cursors are cool.  They are enabled by default.
-+#  However, they require overhead that you may want to do without.
-+#  Uncomment this line to disable them.
-+# no-cursor-updating
-+
-+# Layer preview sizes:
-+#  None:    no previews in layers dialog/layer selector
-+#  Small:   32x32
-+#  Medium:  64x64
-+#  Large:   128x128
-+#  #:       #x#
-+preview-size Medium
-+
-+# Controlling ruler visibility
-+#  The default behavior is for rulers to be ON
-+#  This can also be toggled with the View->Show Rulers command or shift+control+r
-+# dont-show-rulers
-+
-+# Disable auto saving
-+#  Just uncomment the line below...
-+# dont-auto-save
-+
-+# Set the gamma correction values for the display
-+#  1.0 corresponds to no gamma correction.  For most displays,
-+#  gamma correction should be set to between 2.0 and 2.6
-+#  Run the utility "gamma_correct" to determine appropriate values
-+#  for your display.
-+#
-+# One important item to keep in mind:  Many images that you might
-+#  get from outside sources will in all likelihood already be
-+#  gamma-corrected.  In these cases, the image will look washed-out
-+#  if the gimp has gamma-correction turned on.  If you are going
-+#  to work with images of this sort, turn gamma correction off
-+#  by removing this line, or setting the values to 1.0.
-+#  gamma-correction 1.0
-+#  gamma-correction 2.0
-+#                ___
-+gamma-correction 1.6
-+
-+# Set the manner in which transparency is displayed in images
-+#  Transparency type can be one of:
-+#    0: Light Checks
-+#    1: Mid-Tone Checks
-+#    2: Dark Checks
-+#    3: White Only
-+#    4: Gray Only
-+#    5: Black Only
-+#  Check size can be one of:
-+#    0: Small
-+#    1: Medium
-+#    2: Large
-+transparency-type 1
-+transparency-size 2
-+
-+# Notify the GIMP of the available file plug-ins.
-+# The format of the line is as follows:
-+#  file-plug-in <image types> <plug-in name> <plug-in title> <extensions>
-+# The `image types' argument specifies what types of images the
-+#  plug-in can save. It is a 3 digit number where each digit is 0 or
-+#  1. The digits correspond to `indexed images', `grayscale images'
-+#  and `rgb images' respectively. For example, the "jpeg" file plug-in
-+#  can save rgb and grayscale images but not indexed color, so the
-+#  image types argument is 011.
-+# The `plug-in name' is the name of the plug-in program.
-+# The `plug-in title' is the title of the program is it will appear
-+#  from the GIMP. This will most likely be the name of the plug-in.
-+# The `extensions' are a comma separated string of extensions. These
-+#  are used by the GIMP to map file names to images.
-+#  Note: case does not matter for extensions.
-+
-+file-plug-in  jpeg	011	"jpeg"		"jpg,jpeg"
-+file-plug-in  png	111	"png"		"png"
-+file-plug-in  gif	110	"gif"		"gif"
-+file-plug-in  tiff	111	"tiff"		"tiff,tif"
-+file-plug-in  tga	111	"tga"		"tga,targa"
-+file-plug-in  gbrush	010	"brush"		"gbr"
-+file-plug-in  gpattern	010	"pattern"	"pat,gpat"
-+file-plug-in  gicon	010	"gicon"		"gic,gico"
-+file-plug-in  xpm	110	"xpm"		"xpm"
-+file-plug-in  pnm	111	"pnm"		"pgm,ppm,pbm"
-+file-plug-in  matlab	010	"matlab"	"m"
-+file-plug-in  yuv411    001     "yuv"           "yuv"
-+
-+# Notify the GIMP of plug-ins that will exist in the `plug-ins' menu.
-+# The format of the line is as follows:
-+#  plug-in <plug-in name> <menu location> <accelerator>
-+# The `plug-in name' is the name of the plug-in program.
-+# The `menu location' is the item name and location in the plug-in
-+#  menu. A slash indicates a submenu. Therefore, the menu location
-+#  "Blur/Blur" specifies an item name of "Blur" in a submenu entitled
-+#  "Blur". Multiple submenus are possible. If a menu already exists
-+#  the item is simply placed in that menu. Menu items are placed in
-+#  alphabetically sorted order in menus.
-+# The `accelerator' is a string which designates a key combination
-+#  which will invoke the plug-in. The format should be clear by
-+#  inspection.  This string is optional.
-+#
-+# It is convention to only use the `alt' and `shift' key modifiers for
-+#  plug-ins. The `control' key is used as a modifier for menu items by
-+#  the main application. The main application will not use the `alt'
-+#  or `shift' key modifiers.
-+
-+plug-in blur       "Blur/Blur"
-+plug-in blur2      "Blur/Blur (variable)"        "Alt<Key>B"
-+plug-in gauss_recurse      "Blur/Gaussian Blur (IIR)"         "Shift Alt<Key>B"
-+plug-in gauss      "Blur/Gaussian Blur (RLE)"
-+plug-in mblur      "Blur/Motion Blur"
-+
-+plug-in charcoal   "Effects/Artistic/Charcoal"  "Shift Alt<Key>H"
-+plug-in cubism     "Effects/Artistic/Cubism"	"Shift Alt<Key>U"
-+plug-in mosaic     "Effects/Artistic/Mosaic"	"Alt<Key>M"
-+plug-in oilify     "Effects/Artistic/Oilify"
-+plug-in sparkle    "Effects/Artistic/Sparkle"
-+plug-in lic        "Effects/Artistic/Van-Goghify"
-+plug-in bleed      "Effects/Image/Bleed"
-+plug-in c_astretch "Effects/Image/Contrast Auto-Stretch"
-+plug-in enhance    "Effects/Image/Enhance"      "Shift Alt<Key>E"
-+plug-in gamma      "Effects/Image/Gamma"        "Alt<Key>G"
-+plug-in grayify    "Effects/Image/Grayify"
-+plug-in invert     "Effects/Image/Invert"       "Alt<Key>I"
-+plug-in solarize   "Effects/Image/Solarize"     "Alt<Key>1"
-+plug-in bumpmap    "Effects/Lighting/Bump Map"	"Alt<Key>2"
-+plug-in displace   "Effects/Lighting/Displace"	"Alt<Key>3"
-+plug-in lighting   "Effects/Lighting/Lighting"	"Alt<Key>4"
-+plug-in edge       "Effects/Misc Ops/Edge Detect"        "Alt<Key>E"
-+plug-in engrave    "Effects/Misc Ops/Engrave"
-+plug-in extrude    "Effects/Misc Ops/Extrude"
-+plug-in pixelize   "Effects/Misc Ops/Pixelize"
-+plug-in relief     "Effects/Misc Ops/Relief"    "Alt<Key>R"
-+plug-in checkerboard "Effects/Textures/Checkerboard"
-+plug-in plasma     "Effects/Textures/Plasma"
-+plug-in texture2   "Effects/Textures/Texture II"
-+
-+plug-in despeckle  "Distorts/Despeckle"
-+plug-in map_sphere "Distorts/Map Sphere"
-+plug-in noisify    "Distorts/Noise"
-+plug-in pagecurl   "Distorts/Page Curl"         "Alt<Key>U"
-+plug-in pinch      "Distorts/Pinch"             "Alt<Key>P"
-+plug-in ripple     "Distorts/Ripple"
-+plug-in shift      "Distorts/Shift"
-+plug-in spread     "Distorts/Spread"
-+plug-in whirl      "Distorts/Whirl"             "Alt<Key>W"
-+plug-in waves      "Distorts/Waves"
-+
-+plug-in compose    "Conversions/Compose"
-+plug-in decompose  "Conversions/Decompose"
-+plug-in to-color   "Conversions/To Color"       "Shift Alt<Key>C"
-+plug-in to-gray    "Conversions/To Grayscale"   "Shift Alt<Key>G"
-+plug-in to-indexed "Conversions/To Indexed"     "Shift Alt<Key>I"
-+
-+plug-in autocrop   "Transforms/Autocrop"
-+plug-in flip_horz  "Transforms/Flip Horizontal" "Alt<Key>H"
-+plug-in flip_vert  "Transforms/Flip Vertical"   "Alt<Key>V"
-+plug-in polar      "Transforms/Polar"
-+plug-in rotate     "Transforms/Rotate"
-+plug-in scale      "Transforms/Scale"           "Shift Alt<Key>S"
-+plug-in tile       "Transforms/Tile"            "Alt<Key>T"
-+plug-in tiler      "Transforms/Tiler"           "Alt<Key>T"
-+
-+plug-in blend      "Channel Ops/Blend"
-+plug-in calculations "Channel Ops/Calculations" "Alt<Key>C"
-+plug-in duplicate  "Channel Ops/Duplicate"      "Alt<Key>D"
-+plug-in offset     "Channel Ops/Offset"         "Alt<Key>O"
-+
-+plug-in netpbm	   "Miscellaneous/Netpbm Filter" "Shift Alt<Key>N"
-+plug-in rms_error  "Miscellaneous/RMS Error"
-+plug-in photocd    "Miscellaneous/Photo CD"
-+plug-in octave_srv "Miscellaneous/Octave Server"
+--- plug-ins/Makefile.in.orig	Thu Feb 27 05:41:52 1997
++++ plug-ins/Makefile.in	Thu Feb 27 08:46:09 1997
+@@ -28,6 +28,7 @@
+ 
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ 
+ top_builddir = ..
+@@ -58,7 +59,7 @@
+ X_LDFLAGS =
+ X_LIBS =
+ 
+-pluginlibdir = $(pkglibdir)/plug-ins
++pluginlibdir = $(pkglibexecdir)/plug-ins
+ 
+ pluginlib_PROGRAMS =	\
+ 	blur		\
+--- ./app/batch.c~	Mon Feb 24 14:38:51 1997
++++ ./app/batch.c	Wed Feb 26 08:51:05 1997
+@@ -3,7 +3,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-
++#include <errno.h>
+ #include "appenv.h"
+ #include "app_procs.h"
+ #include "batch.h"
+--- ./app/xcf.c~	Wed Feb 26 05:21:25 1997
++++ ./app/xcf.c	Wed Feb 26 09:07:30 1997
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+--- configure.orig	Thu Feb 27 09:55:32 1997
++++ configure	Thu Feb 27 09:55:40 1997
+@@ -609,7 +609,7 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-
++INSTALL_SCRIPT="/usr/bin/install -c -m 755"
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
+ 
+@@ -2040,7 +2040,7 @@
+ CFLAGS="$OPTFLAG $CFLAGS"
+ 
+ gimpdatadir=$datadir/$PACKAGE
+-gimpplugindir=$libdir/$PACKAGE
++gimpplugindir=$libexecdir/$PACKAGE
+ 
+ 
+ 
+--- gtk+/configure~	Thu Feb 27 03:09:52 1997
++++ gtk+/configure	Thu Feb 27 15:10:18 1997
+@@ -569,6 +569,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:572: checking for a BSD compatible install" >&5
++INSTALL="/usr/bin/install -c"
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+--- gtk+/glib/configure~	Thu Feb 27 15:32:15 1997
++++ gtk+/glib/configure	Thu Feb 27 15:32:47 1997
+@@ -559,6 +559,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:562: checking for a BSD compatible install" >&5
++INSTALL="/usr/bin/install -c"
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+--- plug-ins/script-fu/Makefile.in.orig	Thu Feb 27 20:47:10 1997
++++ plug-ins/script-fu/Makefile.in	Thu Feb 27 20:46:30 1997
+@@ -59,7 +59,7 @@
+ 
+ SUBDIRS = scripts
+ 
+-pluginlibdir = $(pkglibdir)/plug-ins
++pluginlibdir = $(gimpplugindir)/plug-ins
+ 
+ pluginlib_PROGRAMS = script-fu
+
+*** /tmp/gimp-0.99.1/app/gimprc.c	Thu Feb 27 06:43:10 1997
+--- ./app/gimprc.c	Thu Feb 27 16:41:19 1997
+***************
+*** 159,161 ****
+  
+!   sprintf (libfilename, "%s/gimprc", LIBDIR);
+    parse_gimprc_file (libfilename);
+--- 159,161 ----
+  
+!   sprintf (libfilename, "%s/gimprc", DATADIR);
+    parse_gimprc_file (libfilename);
diff --git a/graphics/gimp-devel/files/patch-ab b/graphics/gimp-devel/files/patch-ab
index ac5e5976e46c..f4579f768d02 100644
--- a/graphics/gimp-devel/files/patch-ab
+++ b/graphics/gimp-devel/files/patch-ab
@@ -1,49 +1,96 @@
---- app/fileops.c~	Mon Nov 18 09:57:19 1996
-+++ app/fileops.c	Mon Nov 18 09:58:01 1996
-@@ -289,7 +289,7 @@
-       gtk_file_selection_set_ok_callback (filesel, file_open_ok_callback, open_options);
-       gtk_file_selection_set_cancel_callback (filesel, file_cancel_callback, open_options);
- 
--      if (gdisp && gdisp->gimage->has_filename)
-+      if (gdisp && gdisp->gimage && gdisp->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisp->gimage));
- 
-       gtk_widget_show (filesel);
-@@ -297,7 +297,7 @@
- 
-   if (! GTK_WIDGET_VISIBLE (filesel))
-     {
--      if (gdisp && gdisp->gimage->has_filename)
-+      if (gdisp && gdisp->gimage && gdisp->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisp->gimage));
-       gtk_widget_show (filesel);
-     }
-@@ -353,7 +353,7 @@
-       gtk_file_selection_set_ok_callback (filesel, file_save_ok_callback, save_options);
-       gtk_file_selection_set_cancel_callback (filesel, file_cancel_callback, save_options);
- 
--      if (gdisplay && gdisplay->gimage->has_filename)
-+      if (gdisplay && gdisplay->gimage && gdisplay->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisplay->gimage));
- 
-       gtk_widget_show (filesel);
-@@ -363,7 +363,7 @@
- 
-   if (! GTK_WIDGET_VISIBLE (filesel))
-     {
--      if (gdisplay && gdisplay->gimage->has_filename)
-+      if (gdisplay && gdisplay->gimage && gdisplay->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisplay->gimage));
- 
-       gtk_widget_show (filesel);
---- app/progress.c~	Mon Nov 18 11:03:58 1996
-+++ app/progress.c	Mon Nov 18 11:04:07 1996
-@@ -57,7 +57,7 @@
-   progress->callback_data = callback_data;
-   progress->pixmap = NULL;
- 
--  progress->shell = gtk_window_new (title, GTK_WINDOW_TOPLEVEL);
-+  progress->shell = gtk_window_new (title, GTK_WINDOW_DIALOG);
-   gtk_widget_set_uposition (progress->shell, progress_x, progress_y);
-   main_vbox = gtk_vbox_new (FALSE, 5);
-   gtk_container_add (progress->shell, main_vbox);
+--- plug-ins/script-fu/scripts/Makefile.in.orig	Fri Feb 28 09:09:07 1997
++++ plug-ins/script-fu/scripts/Makefile.in	Fri Feb 28 09:07:40 1997
+@@ -51,17 +51,17 @@
+ scriptdatadir = $(pkgdatadir)/scripts
+ 
+ scriptdata_DATA = \
+-	alien-glow.scm		\
+-	bds-logo-textured.scm	\
+-	blend-logo.scm		\
+-	chrome.scm		\
+-	chrome-it.scm		\
+-	chrome2.scm		\
+-	ds-logo.scm		\
+-	frozen-text.scm		\
+-	hds-logo.scm		\
+-	neon.scm		\
+-	sphere.scm		\
++	alien-glow.sed		\
++	bds-logo-textured.sed	\
++	blend-logo.sed		\
++	chrome.sed		\
++	chrome-it.sed		\
++	chrome2.sed		\
++	ds-logo.sed		\
++	frozen-text.sed		\
++	hds-logo.sed		\
++	neon.sed		\
++	sphere.sed		\
+ 	beavis.jpg
+ 
+ EXTRA_DIST = $(scriptdata_DATA)
+@@ -79,7 +79,7 @@
+ TAR = tar
+ default: all
+ 
+-.SUFFIXES:
++.SUFFIXES: .sed
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
+ 	cd $(top_srcdir) && automake --gnu plug-ins/script-fu/scripts/Makefile
+ 
+@@ -87,17 +87,18 @@
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+-
+ install-scriptdataDATA: $(scriptdata_DATA)
+ 	$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(scriptdatadir)
+-	@list="$(scriptdata_DATA)"; for p in $$list; do \
+-	  if test -f $(srcdir)/$$p; then \
+-	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p; \
+-	  else if test -f $$p; then \
+-	    echo "$(INSTALL_DATA) $$p $(scriptdatadir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(scriptdatadir)/$$p; \
++	@list="$(scriptdata_DATA)"; for s in $$list; do \
++	  p=$$(basename $$s .sed); \
++	  if [ $$p != $$s ]; then p=$$p.scm; fi; \
++	  if test -f $(srcdir)/$$s; then \
++	    echo "$(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p"; \
++	    $(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p; \
++	  else if test -f $$s; then \
++	    echo "$(INSTALL_DATA) $$s $(scriptdatadir)/$$p"; \
++	    $(INSTALL_DATA) $$s $(scriptdatadir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
+@@ -184,3 +184,7 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++
++%.sed : %.scm
++	sed 's,@_prefix_@,${prefix},' $< > $@
+--- plug-ins/script-fu/scripts/chrome-it.scm.orig	Wed Feb 26 22:51:31 1997
++++ plug-ins/script-fu/scripts/chrome-it.scm	Fri Feb 28 09:01:38 1997
+@@ -153,5 +153,5 @@
+     (gimp-displays-flush)
+     (gimp-image-enable-undo img)))
+ 
+-(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
+-(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
+--- plug-ins/script-fu/scripts/chrome2.scm.orig	Wed Feb 26 20:57:57 1997
++++ plug-ins/script-fu/scripts/chrome2.scm	Fri Feb 28 09:01:38 1997
+@@ -161,6 +161,6 @@
+     (gimp-image-enable-undo img)
+     (gimp-display-new img)))
+ 
+-(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
+ 
+-(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
diff --git a/graphics/gimp-devel/files/patch-ac b/graphics/gimp-devel/files/patch-ac
deleted file mode 100644
index 7e5a1845afe1..000000000000
--- a/graphics/gimp-devel/files/patch-ac
+++ /dev/null
@@ -1,61 +0,0 @@
---- configure~	Mon Nov 18 10:20:48 1996
-+++ configure	Mon Nov 18 10:21:54 1996
-@@ -2324,7 +2324,7 @@
- EOF
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile app/Makefile plug-ins/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile app/Makefile plug-ins/Makefile gimprc"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
---- configure.in~	Mon Nov 18 10:37:13 1996
-+++ configure.in	Mon Nov 18 10:37:25 1996
-@@ -221,4 +221,4 @@
- AC_SUBST(_SHLIBS_)
- 
- dnl Output the Makefiles
--AC_OUTPUT(Makefile app/Makefile plug-ins/Makefile)
-+AC_OUTPUT(Makefile app/Makefile plug-ins/Makefile gimprc)
---- Makefile.in~	Mon Nov 18 11:11:16 1996
-+++ Makefile.in	Mon Nov 18 11:12:22 1996
-@@ -16,7 +16,7 @@
- # set the MAKE variable if necessary
- @SET_MAKE@
- 
--INSTALL	=	./install-sh -c
-+INSTALL	=	/usr/bin/install -c
- 
- all:
- 	( cd gtk ; $(MAKE) )
-@@ -24,22 +24,22 @@
- 	( cd app ; $(MAKE) )
- 
- install:
--	$(INSTALL) -d $(libdir)/gimp
--	$(INSTALL) -d $(libdir)/gimp/brushes
--	$(INSTALL) -m 644 gimprc $(libdir)/gimp
-+	$(INSTALL) -d $(datadir)/gimp
-+	$(INSTALL) -d $(datadir)/gimp/brushes
-+	$(INSTALL) -m 644 gimprc $(datadir)/gimp
- 	for brush in brushes/*; do \
-           echo $$brush; \
--	  $(INSTALL) -m 644 "$$brush" $(libdir)/gimp/brushes; \
-+	  $(INSTALL) -m 644 "$$brush" $(datadir)/gimp/brushes; \
- 	done
--	$(INSTALL) -d $(libdir)/gimp/palettes
-+	$(INSTALL) -d $(datadir)/gimp/palettes
- 	for palette in palettes/*; do \
-           echo $$palette; \
--	  $(INSTALL) -m 644 "$$palette" $(libdir)/gimp/palettes; \
-+	  $(INSTALL) -m 644 "$$palette" $(datadir)/gimp/palettes; \
- 	done
--	$(INSTALL) -d $(libdir)/gimp/patterns
-+	$(INSTALL) -d $(datadir)/gimp/patterns
- 	for pattern in patterns/*; do \
-           echo $$pattern; \
--	  $(INSTALL) -m 644 "$$pattern" $(libdir)/gimp/patterns; \
-+	  $(INSTALL) -m 644 "$$pattern" $(datadir)/gimp/patterns; \
- 	done
- 	( cd plug-ins ; $(MAKE) install )
- 	( cd app ; $(MAKE) install )
diff --git a/graphics/gimp-devel/files/patch-ah b/graphics/gimp-devel/files/patch-ah
deleted file mode 100644
index 8e508d8ad219..000000000000
--- a/graphics/gimp-devel/files/patch-ah
+++ /dev/null
@@ -1,208 +0,0 @@
---- app/autodialog.c.old	Fri Nov 22 15:46:44 1996
-+++ app/autodialog.c	Fri Nov 22 18:08:40 1996
-@@ -49,7 +49,7 @@
- /*  Local functions  */
- static AutoDialogItem dialog_find_item (AutoDialog, int);
- static void dialog_delete_children (AutoDialog, AutoDialogItem);
--static GtkWidget *dialog_create_image_menu (AutoDialog, char *, gpointer,
-+static GtkWidget *dialog_create_image_menu (AutoDialog, AutoDialogItem, char *, gpointer,
- 					    GtkWidget **, GtkWidget **);
- 
- /*  Callback and Update functions  */
-@@ -171,7 +171,8 @@
- 	{
- 	  dlgitem = tmplink->data;
- 	  tmplink = tmplink->next;
--
-+    if (dlgitem->additional_data!=NULL)
-+      xfree(dlgitem->additional_data);
- 	  xfree (dlgitem);
- 	}
-       free_list (dlg->items);
-@@ -206,6 +207,7 @@
-   item->item_ID = dlg->next_item_ID++;
-   item->item_type = type;
-   memset (item->data, 0, 32);
-+  item->additional_data=NULL;
-   item->parent = parent_item;
-   item->children = NULL;
-   item->gtk_data = NULL;
-@@ -276,7 +278,7 @@
-       break;
- 
-     case ITEM_IMAGE_MENU:
--      item_widget = dialog_create_image_menu (dlg, data, extra, &option_menu, &menu);
-+      item_widget = dialog_create_image_menu (dlg, item, data, extra, &option_menu, &menu);
-       break;
- 
-     case ITEM_SCALE:
-@@ -500,7 +502,8 @@
- 	}
-       else
- 	gtk_widget_destroy (item->widget);
--
-+      if (item->additional_data!=NULL)
-+        xfree(item->additional_data);
-       xfree (item);
-     }
- }
-@@ -577,9 +580,32 @@
-     free_list (item->children);
- }
- 
-+typedef struct {
-+  GtkWidget *widget;
-+  long data[2];
-+} _MenuItemData;
-+
-+gint CheckConstrains(GImage *gimage,GImage *constrain,guchar constraint)
-+{
-+  if (((constraint & IMAGE_CONSTRAIN_RGB) &&
-+       (gimage_type (gimage) == RGB_GIMAGE ||
-+	      gimage_type (gimage) == RGBA_GIMAGE)) ||
-+	    ((constraint & IMAGE_CONSTRAIN_GRAY) &&
-+	     (gimage_type (gimage) == GRAY_GIMAGE ||
-+	      gimage_type (gimage) == GRAYA_GIMAGE)) ||
-+	    ((constraint & IMAGE_CONSTRAIN_INDEXED) &&
-+	     (gimage_type (gimage) == INDEXED_GIMAGE ||
-+	      gimage_type (gimage) == INDEXEDA_GIMAGE)))
-+    if ((gimage->width == constrain->width) &&
-+	      (gimage->height == constrain->height))
-+      return(TRUE);
-+  return(FALSE); 
-+}
-+
- static GtkWidget *
--dialog_create_image_menu (dlg, title, image, option_menu, menu)
-+dialog_create_image_menu (dlg, item, title, image, option_menu, menu)
-      AutoDialog dlg;
-+     AutoDialogItem item;
-      char *title;
-      void *image;
-      GtkWidget **option_menu;
-@@ -597,8 +623,8 @@
-   char constraint;
-   link_ptr tmp;
-   long ID;
--  long *data;
-   int num_items = 0;
-+  _MenuItemData *ItemData;
- 
-   hbox = gtk_hbox_new (FALSE, 4);
-   gtk_container_set_border_width (hbox, 0);
-@@ -614,43 +640,55 @@
-   constrain = (ID == 0) ? image : gimage_get_ID (ID);
- 
-   tmp = image_list;
-+
-+  /* Check how many images fit the criteria */
-+  /* ====================================== */
-+
-   while (tmp)
-     {
-       gimage = tmp->data;
-       tmp = next_item (tmp);
--
--      if (((constraint & IMAGE_CONSTRAIN_RGB) &&
--	   (gimage_type (gimage) == RGB_GIMAGE ||
--	    gimage_type (gimage) == RGBA_GIMAGE)) ||
--	  ((constraint & IMAGE_CONSTRAIN_GRAY) &&
--	   (gimage_type (gimage) == GRAY_GIMAGE ||
--	    gimage_type (gimage) == GRAYA_GIMAGE)) ||
--	  ((constraint & IMAGE_CONSTRAIN_INDEXED) &&
--	   (gimage_type (gimage) == INDEXED_GIMAGE ||
--	    gimage_type (gimage) == INDEXEDA_GIMAGE)))
--	if ((gimage->width == constrain->width) &&
--	    (gimage->height == constrain->height))
--	  {
--	    image_name = prune_filename (gimage_filename (gimage));
--	    menu_item_label = (char *) xmalloc (strlen (image_name) + 15);
--	    sprintf (menu_item_label, "%s-%d", image_name, gimage->ID);
--	    menu_item = gtk_menu_item_new_with_label (menu_item_label);
--	    gtk_callback_add (gtk_menu_item_get_state (menu_item),
--			      dialog_image_menu_callback, dlg);
--	    gtk_container_add (*menu, menu_item);
--	    gtk_widget_show (menu_item);
--
--	    data = xmalloc (sizeof (long) * 2);
--	    data[0] = dlg->next_item_ID - 1;
--	    data[1] = (gimage->ID == constrain->ID) ? 0 : gimage->ID;
--	    dlg->additional_data = data;
--
--	    xfree (menu_item_label);
--	    num_items ++;
--	  }
-+      if (CheckConstrains(gimage,constrain,constraint)==TRUE)
-+        num_items++;      
-     }
- 
--  if (!num_items)
-+  /* If we found any matches, allocate memory to hold      */
-+  /* callback data. Put a pointer in "item" to avoid leak. */
-+  /* ===================================================== */
-+  
-+  if (num_items>0)
-+    {
-+      ItemData=(_MenuItemData *)xmalloc(sizeof(_MenuItemData)*(size_t)num_items);
-+      item->additional_data=ItemData;
-+
-+      tmp=image_list;
-+      num_items=0;
-+      while (tmp)
-+        {
-+          gimage = tmp->data;
-+          tmp = next_item (tmp);
-+          if (CheckConstrains(gimage,constrain,constraint)==TRUE)
-+	          {
-+	            image_name = prune_filename (gimage_filename (gimage));
-+	            menu_item_label = (char *) xmalloc (strlen (image_name) + 15);
-+	            sprintf (menu_item_label, "%s-%d", image_name, gimage->ID);
-+      
-+              ItemData[num_items].widget=hbox;
-+              ItemData[num_items].data[0] = dlg->next_item_ID - 1;
-+              ItemData[num_items].data[1] = (gimage->ID == constrain->ID) ? 0 : gimage->ID;
-+      
-+	            menu_item = gtk_menu_item_new_with_label (menu_item_label);
-+	            gtk_callback_add (gtk_menu_item_get_state (menu_item),dialog_image_menu_callback,
-+                (gpointer)&ItemData[num_items]);
-+	            gtk_container_add (*menu, menu_item);
-+	            gtk_widget_show (menu_item);
-+      
-+	            xfree (menu_item_label);
-+	            num_items ++;
-+	          }
-+        }
-+    }
-+  else
-     {
-       menu_item = gtk_menu_item_new_with_label ("none");
-       gtk_container_add (*menu, menu_item);
-@@ -669,14 +707,14 @@
-      gpointer client_data;
-      gpointer call_data;
- {
-+  _MenuItemData *ItemData;
-   AutoDialog dlg;
--  long *data;
- 
--  dlg = client_data;
--  data = (long *) dlg->additional_data;
-+  ItemData=(_MenuItemData *)client_data;
-+  dlg = (AutoDialog) gtk_widget_get_user_data (ItemData->widget);
- 
-   if (dlg->callback)
--    (* dlg->callback) (dlg->dialog_ID, data[0], dlg->callback_data, &data[1]);
-+    (* dlg->callback) (dlg->dialog_ID,ItemData->data[0],dlg->callback_data,&ItemData->data[1]);
- }
- 
- static void
---- app/autodialog.h.old	Fri Nov 22 15:46:47 1996
-+++ app/autodialog.h	Fri Nov 22 17:21:19 1996
-@@ -49,6 +49,7 @@
-   int             item_ID;
-   int             item_type;
-   char            data[32];
-+  void           *additional_data;
-   AutoDialogItem  parent;
-   link_ptr        children;
-   GtkWidget      *widget;
diff --git a/graphics/gimp-devel/pkg-plist b/graphics/gimp-devel/pkg-plist
index ef35558b371c..a854e9786565 100644
--- a/graphics/gimp-devel/pkg-plist
+++ b/graphics/gimp-devel/pkg-plist
@@ -1,4 +1,130 @@
 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/gtk/gtk.h
+include/gtk/gtkaccelerator.h
+include/gtk/gtkadjustment.h
+include/gtk/gtkalignment.h
+include/gtk/gtkarrow.h
+include/gtk/gtkbin.h
+include/gtk/gtkbox.h
+include/gtk/gtkbutton.h
+include/gtk/gtkcanvas.h
+include/gtk/gtkcheckbutton.h
+include/gtk/gtkcontainer.h
+include/gtk/gtkdata.h
+include/gtk/gtkdialog.h
+include/gtk/gtkdrawingarea.h
+include/gtk/gtkentry.h
+include/gtk/gtkenums.h
+include/gtk/gtkfilesel.h
+include/gtk/gtkfill.h
+include/gtk/gtkframe.h
+include/gtk/gtkgc.h
+include/gtk/gtkhbox.h
+include/gtk/gtkhruler.h
+include/gtk/gtkhscale.h
+include/gtk/gtkhscrollbar.h
+include/gtk/gtkhseparator.h
+include/gtk/gtkimage.h
+include/gtk/gtkitem.h
+include/gtk/gtklabel.h
+include/gtk/gtklist.h
+include/gtk/gtklistitem.h
+include/gtk/gtkmain.h
+include/gtk/gtkmenu.h
+include/gtk/gtkmenubar.h
+include/gtk/gtkmenufactory.h
+include/gtk/gtkmenuitem.h
+include/gtk/gtkmenushell.h
+include/gtk/gtkmisc.h
+include/gtk/gtknotebook.h
+include/gtk/gtkobject.h
+include/gtk/gtkoptionmenu.h
+include/gtk/gtkpixmap.h
+include/gtk/gtkpreview.h
+include/gtk/gtkprogressbar.h
+include/gtk/gtkradiobutton.h
+include/gtk/gtkrange.h
+include/gtk/gtkrc.h
+include/gtk/gtkruler.h
+include/gtk/gtkscale.h
+include/gtk/gtkscrollbar.h
+include/gtk/gtkscrolledwindow.h
+include/gtk/gtkseparator.h
+include/gtk/gtksignal.h
+include/gtk/gtkstyle.h
+include/gtk/gtktable.h
+include/gtk/gtktext.h
+include/gtk/gtktogglebutton.h
+include/gtk/gtktree.h
+include/gtk/gtktreeitem.h
+include/gtk/gtktypeutils.h
+include/gtk/gtkvbox.h
+include/gtk/gtkviewport.h
+include/gtk/gtkvruler.h
+include/gtk/gtkvscale.h
+include/gtk/gtkvscrollbar.h
+include/gtk/gtkvseparator.h
+include/gtk/gtkwidget.h
+include/gtk/gtkwindow.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.0.0
+lib/libgimp.a
+lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.0.0
+lib/libgimpi.a
+lib/libgimpi.la
+lib/libgimpi.so
+lib/libgimpi.so.0.0
+lib/libgimpui.a
+lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.0.0
+lib/libglib.a
+lib/libglib.la
+lib/libglib.so
+lib/libglib.so.0.0
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so
+lib/libgtk.so.0.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/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/whirl
 share/gimp/brushes/11circle.gbr
 share/gimp/brushes/11fcircle.gbr
 share/gimp/brushes/13circle.gbr
@@ -61,7 +187,17 @@ 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
@@ -95,13 +231,13 @@ share/gimp/patterns/leopard.pat
 share/gimp/patterns/lumps.pat
 share/gimp/patterns/marble1.pat
 share/gimp/patterns/marble2.pat
-share/gimp/patterns/pj.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
@@ -113,79 +249,26 @@ share/gimp/patterns/wax.pat
 share/gimp/patterns/wood1.pat
 share/gimp/patterns/wood2.pat
 share/gimp/patterns/wood3.pat
-libexec/gimp/plug-ins/autocrop
-libexec/gimp/plug-ins/bleed
-libexec/gimp/plug-ins/blend
-libexec/gimp/plug-ins/blur
-libexec/gimp/plug-ins/blur2
-libexec/gimp/plug-ins/brightness
-libexec/gimp/plug-ins/bumpmap
-libexec/gimp/plug-ins/c_astretch
-libexec/gimp/plug-ins/calculations
-libexec/gimp/plug-ins/charcoal
-libexec/gimp/plug-ins/checkerboard
-libexec/gimp/plug-ins/compose
-libexec/gimp/plug-ins/cubism
-libexec/gimp/plug-ins/darken
-libexec/gimp/plug-ins/decompose
-libexec/gimp/plug-ins/despeckle
-libexec/gimp/plug-ins/displace
-libexec/gimp/plug-ins/duplicate
-libexec/gimp/plug-ins/edge
-libexec/gimp/plug-ins/engrave
-libexec/gimp/plug-ins/enhance
-libexec/gimp/plug-ins/extrude
-libexec/gimp/plug-ins/flip_horz
-libexec/gimp/plug-ins/flip_vert
-libexec/gimp/plug-ins/gamma
-libexec/gimp/plug-ins/gauss
-libexec/gimp/plug-ins/gauss_recurse
-libexec/gimp/plug-ins/gbrush
-libexec/gimp/plug-ins/gbrush-old
-libexec/gimp/plug-ins/gicon
-libexec/gimp/plug-ins/gif
-libexec/gimp/plug-ins/gpattern
-libexec/gimp/plug-ins/grayify
-libexec/gimp/plug-ins/invert
-libexec/gimp/plug-ins/jpeg
-libexec/gimp/plug-ins/lic
-libexec/gimp/plug-ins/lighten
-libexec/gimp/plug-ins/lighting
-libexec/gimp/plug-ins/map_sphere
-libexec/gimp/plug-ins/matlab
-libexec/gimp/plug-ins/mblur
-libexec/gimp/plug-ins/mosaic
-libexec/gimp/plug-ins/netpbm
-libexec/gimp/plug-ins/noisify
-libexec/gimp/plug-ins/octave_srv
-libexec/gimp/plug-ins/offset
-libexec/gimp/plug-ins/oilify
-libexec/gimp/plug-ins/pagecurl
-libexec/gimp/plug-ins/photocd
-libexec/gimp/plug-ins/pinch
-libexec/gimp/plug-ins/pixelize
-libexec/gimp/plug-ins/plasma
-libexec/gimp/plug-ins/png
-libexec/gimp/plug-ins/pnm
-libexec/gimp/plug-ins/polar
-libexec/gimp/plug-ins/tga
-libexec/gimp/plug-ins/relief
-libexec/gimp/plug-ins/ripple
-libexec/gimp/plug-ins/rms_error
-libexec/gimp/plug-ins/rotate
-libexec/gimp/plug-ins/shift
-libexec/gimp/plug-ins/spread
-libexec/gimp/plug-ins/scale
-libexec/gimp/plug-ins/solarize
-libexec/gimp/plug-ins/sparkle
-libexec/gimp/plug-ins/texture2
-libexec/gimp/plug-ins/tiff
-libexec/gimp/plug-ins/tile
-libexec/gimp/plug-ins/tiler
-libexec/gimp/plug-ins/to-gray
-libexec/gimp/plug-ins/to-color
-libexec/gimp/plug-ins/to-indexed
-libexec/gimp/plug-ins/waves
-libexec/gimp/plug-ins/whirl
-libexec/gimp/plug-ins/xpm
-libexec/gimp/plug-ins/yuv411
+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/ds-logo.scm
+share/gimp/scripts/frozen-text.scm
+share/gimp/scripts/hds-logo.scm
+share/gimp/scripts/neon.scm
+share/gimp/scripts/sphere.scm
+share/gimp/user_install
+@dirrm include/gdk
+@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
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 68c8a8c6d75c..07aca069c5f9 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,16 +1,14 @@
 # New ports collection makefile for:    GIMP
-# Version required:     961001
+# Version required:     0.99.1
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/11/19 16:07:26 erich Exp $
+# $Id: Makefile,v 1.3 1996/11/20 11:11:35 asami Exp $
 #
 
-DISTNAME=       gimp
-PKGNAME=        gimp-devel-96.10.01
+DISTNAME=       gimp-0.99.1
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
-DISTFILES=	gimp961001.tgz
 
 MAINTAINER=     erich@FreeBSD.org
 
@@ -21,6 +19,12 @@ LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
+#CONFIGURE_ARGS= --enable-debug
+
 USE_GMAKE=	yes
 
+#post-configure:
+#	cd ${WRKSRC}/gtk+; ./configure
+
 .include <bsd.port.mk>
+
diff --git a/graphics/gimp/distinfo b/graphics/gimp/distinfo
index aeb842bef317..ed4429db6879 100644
--- a/graphics/gimp/distinfo
+++ b/graphics/gimp/distinfo
@@ -1,2 +1 @@
-MD5 (gimp961001.tgz) = f7c3971a93a7332a39d7794be491d6e7
-MD5 (gimp-data.tgz) = b13b8382e22a1664f959486132606090
+MD5 (gimp-0.99.1.tar.gz) = fc1b80922cf195d4994d11c556e4d6ec
diff --git a/graphics/gimp/files/patch-aa b/graphics/gimp/files/patch-aa
index 729403d72c4d..0ce6cf4d3acd 100644
--- a/graphics/gimp/files/patch-aa
+++ b/graphics/gimp/files/patch-aa
@@ -1,261 +1,99 @@
---- gimprc.in~	Mon Nov 18 09:56:00 1996
-+++ gimprc.in	Mon Nov 18 09:55:52 1996
-@@ -0,0 +1,258 @@
-+# Lines that start with a '#' are comments.
-+# Blank lines are ignored.
-+
-+# Set the temporary storage directory...files will appear here
-+# during the course of running the gimp.  Most files will disappear
-+# when the gimp exits, but some files are likely to remain,
-+# such as working palette files, so it is best if this directory
-+# not be one that is shared by other users or is cleared on machine
-+# reboot such as /tmp.
-+temp-path "~/.gimp/tmp"
-+
-+# Set the brush search path...this path will be searched for valid
-+#  brushes at startup.
-+brush-path "~/.gimp/brushes:@prefix@/share/gimp/brushes"
-+
-+# Specify a default brush. If none is specified it defaults to the
-+#  "1circle.gbr" brush which is just a single pixel sized brush.
-+#  The brush is searched for in the brush path.
-+default-brush "19fcircle.gbr"
-+
-+# Set the pattern search path...this path will be searched for valid
-+#  patterns at startup.
-+pattern-path "~/.gimp/patterns:@prefix@/share/gimp/patterns"
-+
-+# Specify a default pattern.
-+#  The pattern is searched for in the specified pattern paths.
-+default-pattern "wood2.pat"
-+
-+# Set the palette search path...this path will be searched for valid
-+#  palettes at startup.
-+palette-path "~/.gimp/palettes:@prefix@/share/gimp/palettes"
-+
-+# Specify a default palette.
-+#  The pattern is searched for in the specified pattern paths.
-+default-palette "Default"
-+
-+# Set the gradient search path...this path will be searched for valid
-+#  gradients at startup.
-+gradient-path "~/.gimp/gradients:@prefix@/share/gimp/gradients"
-+
-+# Specify a default gradient.
-+#  The gradient is searched for in the specified gradient paths.
-+default-gradient "German_flag_smooth"
-+
-+# Set the plug-in search path...this path will be searched for
-+#  plug-ins when the plug-in is run.
-+plug-in-path "~/.gimp/plug-ins:@prefix@/libexec/gimp/plug-ins"
-+
-+# Speed of marching ants in the selection outline
-+#  this value is in milliseconds
-+#  (less time indicates faster marching)
-+marching-ants-speed 300
-+
-+# Set the number of operations kept on the undo stack
-+undo-levels 5
-+
-+# Set the color-cube resource for dithering on 8-bit displays
-+#  The 3 values stand for Shades of red, green, and blue
-+#  Multiplying the # of shades of each primary color yields
-+#  the total number of colors that will be allocated from the
-+#  gimp colormap.  This number should not exceed 256.  Most of the
-+#  colors remaining after the allocation of the colorcube
-+#  will be left to the system palette in an effort to reduce
-+#  colormap "flashing".
-+color-cube 6, 6, 4
-+
-+# Install a GIMP colormap by default -- only for 8-bit displays
-+# install-colormap
-+
-+# Specify that marching ants for selected regions will be drawn
-+#  with colormap cycling as oposed to redrawing with different stipple masks
-+#  this color cycling option works only with 8-bit displays
-+# colormap-cycling
-+
-+# Tools such as fuzzy-select and bucket fill find regions based on a
-+#  seed-fill algorithm.  The seed fill starts at the intially selected
-+#  pixel and progresses in all directions until the difference of pixel
-+#  intensity from the original is greater than a specified threshold
-+#  ==> This value represents the default threshold
-+default-threshold 15
-+
-+# There is always a tradeoff between memory usage and speed.  In most
-+#  cases, the GIMP opts for speed over memory.  However, if memory is
-+#  a big issue, set stingy-memory-use
-+# stingy-memory-use
-+
-+# When zooming into and out of images, this option enables the
-+#  automatic resizing of windows
-+# allow-resize-windows
-+
-+# Context-dependent cursors are cool.  They are enabled by default.
-+#  However, they require overhead that you may want to do without.
-+#  Uncomment this line to disable them.
-+# no-cursor-updating
-+
-+# Layer preview sizes:
-+#  None:    no previews in layers dialog/layer selector
-+#  Small:   32x32
-+#  Medium:  64x64
-+#  Large:   128x128
-+#  #:       #x#
-+preview-size Medium
-+
-+# Controlling ruler visibility
-+#  The default behavior is for rulers to be ON
-+#  This can also be toggled with the View->Show Rulers command or shift+control+r
-+# dont-show-rulers
-+
-+# Disable auto saving
-+#  Just uncomment the line below...
-+# dont-auto-save
-+
-+# Set the gamma correction values for the display
-+#  1.0 corresponds to no gamma correction.  For most displays,
-+#  gamma correction should be set to between 2.0 and 2.6
-+#  Run the utility "gamma_correct" to determine appropriate values
-+#  for your display.
-+#
-+# One important item to keep in mind:  Many images that you might
-+#  get from outside sources will in all likelihood already be
-+#  gamma-corrected.  In these cases, the image will look washed-out
-+#  if the gimp has gamma-correction turned on.  If you are going
-+#  to work with images of this sort, turn gamma correction off
-+#  by removing this line, or setting the values to 1.0.
-+#  gamma-correction 1.0
-+#  gamma-correction 2.0
-+#                ___
-+gamma-correction 1.6
-+
-+# Set the manner in which transparency is displayed in images
-+#  Transparency type can be one of:
-+#    0: Light Checks
-+#    1: Mid-Tone Checks
-+#    2: Dark Checks
-+#    3: White Only
-+#    4: Gray Only
-+#    5: Black Only
-+#  Check size can be one of:
-+#    0: Small
-+#    1: Medium
-+#    2: Large
-+transparency-type 1
-+transparency-size 2
-+
-+# Notify the GIMP of the available file plug-ins.
-+# The format of the line is as follows:
-+#  file-plug-in <image types> <plug-in name> <plug-in title> <extensions>
-+# The `image types' argument specifies what types of images the
-+#  plug-in can save. It is a 3 digit number where each digit is 0 or
-+#  1. The digits correspond to `indexed images', `grayscale images'
-+#  and `rgb images' respectively. For example, the "jpeg" file plug-in
-+#  can save rgb and grayscale images but not indexed color, so the
-+#  image types argument is 011.
-+# The `plug-in name' is the name of the plug-in program.
-+# The `plug-in title' is the title of the program is it will appear
-+#  from the GIMP. This will most likely be the name of the plug-in.
-+# The `extensions' are a comma separated string of extensions. These
-+#  are used by the GIMP to map file names to images.
-+#  Note: case does not matter for extensions.
-+
-+file-plug-in  jpeg	011	"jpeg"		"jpg,jpeg"
-+file-plug-in  png	111	"png"		"png"
-+file-plug-in  gif	110	"gif"		"gif"
-+file-plug-in  tiff	111	"tiff"		"tiff,tif"
-+file-plug-in  tga	111	"tga"		"tga,targa"
-+file-plug-in  gbrush	010	"brush"		"gbr"
-+file-plug-in  gpattern	010	"pattern"	"pat,gpat"
-+file-plug-in  gicon	010	"gicon"		"gic,gico"
-+file-plug-in  xpm	110	"xpm"		"xpm"
-+file-plug-in  pnm	111	"pnm"		"pgm,ppm,pbm"
-+file-plug-in  matlab	010	"matlab"	"m"
-+file-plug-in  yuv411    001     "yuv"           "yuv"
-+
-+# Notify the GIMP of plug-ins that will exist in the `plug-ins' menu.
-+# The format of the line is as follows:
-+#  plug-in <plug-in name> <menu location> <accelerator>
-+# The `plug-in name' is the name of the plug-in program.
-+# The `menu location' is the item name and location in the plug-in
-+#  menu. A slash indicates a submenu. Therefore, the menu location
-+#  "Blur/Blur" specifies an item name of "Blur" in a submenu entitled
-+#  "Blur". Multiple submenus are possible. If a menu already exists
-+#  the item is simply placed in that menu. Menu items are placed in
-+#  alphabetically sorted order in menus.
-+# The `accelerator' is a string which designates a key combination
-+#  which will invoke the plug-in. The format should be clear by
-+#  inspection.  This string is optional.
-+#
-+# It is convention to only use the `alt' and `shift' key modifiers for
-+#  plug-ins. The `control' key is used as a modifier for menu items by
-+#  the main application. The main application will not use the `alt'
-+#  or `shift' key modifiers.
-+
-+plug-in blur       "Blur/Blur"
-+plug-in blur2      "Blur/Blur (variable)"        "Alt<Key>B"
-+plug-in gauss_recurse      "Blur/Gaussian Blur (IIR)"         "Shift Alt<Key>B"
-+plug-in gauss      "Blur/Gaussian Blur (RLE)"
-+plug-in mblur      "Blur/Motion Blur"
-+
-+plug-in charcoal   "Effects/Artistic/Charcoal"  "Shift Alt<Key>H"
-+plug-in cubism     "Effects/Artistic/Cubism"	"Shift Alt<Key>U"
-+plug-in mosaic     "Effects/Artistic/Mosaic"	"Alt<Key>M"
-+plug-in oilify     "Effects/Artistic/Oilify"
-+plug-in sparkle    "Effects/Artistic/Sparkle"
-+plug-in lic        "Effects/Artistic/Van-Goghify"
-+plug-in bleed      "Effects/Image/Bleed"
-+plug-in c_astretch "Effects/Image/Contrast Auto-Stretch"
-+plug-in enhance    "Effects/Image/Enhance"      "Shift Alt<Key>E"
-+plug-in gamma      "Effects/Image/Gamma"        "Alt<Key>G"
-+plug-in grayify    "Effects/Image/Grayify"
-+plug-in invert     "Effects/Image/Invert"       "Alt<Key>I"
-+plug-in solarize   "Effects/Image/Solarize"     "Alt<Key>1"
-+plug-in bumpmap    "Effects/Lighting/Bump Map"	"Alt<Key>2"
-+plug-in displace   "Effects/Lighting/Displace"	"Alt<Key>3"
-+plug-in lighting   "Effects/Lighting/Lighting"	"Alt<Key>4"
-+plug-in edge       "Effects/Misc Ops/Edge Detect"        "Alt<Key>E"
-+plug-in engrave    "Effects/Misc Ops/Engrave"
-+plug-in extrude    "Effects/Misc Ops/Extrude"
-+plug-in pixelize   "Effects/Misc Ops/Pixelize"
-+plug-in relief     "Effects/Misc Ops/Relief"    "Alt<Key>R"
-+plug-in checkerboard "Effects/Textures/Checkerboard"
-+plug-in plasma     "Effects/Textures/Plasma"
-+plug-in texture2   "Effects/Textures/Texture II"
-+
-+plug-in despeckle  "Distorts/Despeckle"
-+plug-in map_sphere "Distorts/Map Sphere"
-+plug-in noisify    "Distorts/Noise"
-+plug-in pagecurl   "Distorts/Page Curl"         "Alt<Key>U"
-+plug-in pinch      "Distorts/Pinch"             "Alt<Key>P"
-+plug-in ripple     "Distorts/Ripple"
-+plug-in shift      "Distorts/Shift"
-+plug-in spread     "Distorts/Spread"
-+plug-in whirl      "Distorts/Whirl"             "Alt<Key>W"
-+plug-in waves      "Distorts/Waves"
-+
-+plug-in compose    "Conversions/Compose"
-+plug-in decompose  "Conversions/Decompose"
-+plug-in to-color   "Conversions/To Color"       "Shift Alt<Key>C"
-+plug-in to-gray    "Conversions/To Grayscale"   "Shift Alt<Key>G"
-+plug-in to-indexed "Conversions/To Indexed"     "Shift Alt<Key>I"
-+
-+plug-in autocrop   "Transforms/Autocrop"
-+plug-in flip_horz  "Transforms/Flip Horizontal" "Alt<Key>H"
-+plug-in flip_vert  "Transforms/Flip Vertical"   "Alt<Key>V"
-+plug-in polar      "Transforms/Polar"
-+plug-in rotate     "Transforms/Rotate"
-+plug-in scale      "Transforms/Scale"           "Shift Alt<Key>S"
-+plug-in tile       "Transforms/Tile"            "Alt<Key>T"
-+plug-in tiler      "Transforms/Tiler"           "Alt<Key>T"
-+
-+plug-in blend      "Channel Ops/Blend"
-+plug-in calculations "Channel Ops/Calculations" "Alt<Key>C"
-+plug-in duplicate  "Channel Ops/Duplicate"      "Alt<Key>D"
-+plug-in offset     "Channel Ops/Offset"         "Alt<Key>O"
-+
-+plug-in netpbm	   "Miscellaneous/Netpbm Filter" "Shift Alt<Key>N"
-+plug-in rms_error  "Miscellaneous/RMS Error"
-+plug-in photocd    "Miscellaneous/Photo CD"
-+plug-in octave_srv "Miscellaneous/Octave Server"
+--- plug-ins/Makefile.in.orig	Thu Feb 27 05:41:52 1997
++++ plug-ins/Makefile.in	Thu Feb 27 08:46:09 1997
+@@ -28,6 +28,7 @@
+ 
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ 
+ top_builddir = ..
+@@ -58,7 +59,7 @@
+ X_LDFLAGS =
+ X_LIBS =
+ 
+-pluginlibdir = $(pkglibdir)/plug-ins
++pluginlibdir = $(pkglibexecdir)/plug-ins
+ 
+ pluginlib_PROGRAMS =	\
+ 	blur		\
+--- ./app/batch.c~	Mon Feb 24 14:38:51 1997
++++ ./app/batch.c	Wed Feb 26 08:51:05 1997
+@@ -3,7 +3,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-
++#include <errno.h>
+ #include "appenv.h"
+ #include "app_procs.h"
+ #include "batch.h"
+--- ./app/xcf.c~	Wed Feb 26 05:21:25 1997
++++ ./app/xcf.c	Wed Feb 26 09:07:30 1997
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+--- configure.orig	Thu Feb 27 09:55:32 1997
++++ configure	Thu Feb 27 09:55:40 1997
+@@ -609,7 +609,7 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-
++INSTALL_SCRIPT="/usr/bin/install -c -m 755"
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
+ 
+@@ -2040,7 +2040,7 @@
+ CFLAGS="$OPTFLAG $CFLAGS"
+ 
+ gimpdatadir=$datadir/$PACKAGE
+-gimpplugindir=$libdir/$PACKAGE
++gimpplugindir=$libexecdir/$PACKAGE
+ 
+ 
+ 
+--- gtk+/configure~	Thu Feb 27 03:09:52 1997
++++ gtk+/configure	Thu Feb 27 15:10:18 1997
+@@ -569,6 +569,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:572: checking for a BSD compatible install" >&5
++INSTALL="/usr/bin/install -c"
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+--- gtk+/glib/configure~	Thu Feb 27 15:32:15 1997
++++ gtk+/glib/configure	Thu Feb 27 15:32:47 1997
+@@ -559,6 +559,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:562: checking for a BSD compatible install" >&5
++INSTALL="/usr/bin/install -c"
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+--- plug-ins/script-fu/Makefile.in.orig	Thu Feb 27 20:47:10 1997
++++ plug-ins/script-fu/Makefile.in	Thu Feb 27 20:46:30 1997
+@@ -59,7 +59,7 @@
+ 
+ SUBDIRS = scripts
+ 
+-pluginlibdir = $(pkglibdir)/plug-ins
++pluginlibdir = $(gimpplugindir)/plug-ins
+ 
+ pluginlib_PROGRAMS = script-fu
+
+*** /tmp/gimp-0.99.1/app/gimprc.c	Thu Feb 27 06:43:10 1997
+--- ./app/gimprc.c	Thu Feb 27 16:41:19 1997
+***************
+*** 159,161 ****
+  
+!   sprintf (libfilename, "%s/gimprc", LIBDIR);
+    parse_gimprc_file (libfilename);
+--- 159,161 ----
+  
+!   sprintf (libfilename, "%s/gimprc", DATADIR);
+    parse_gimprc_file (libfilename);
diff --git a/graphics/gimp/files/patch-ab b/graphics/gimp/files/patch-ab
index ac5e5976e46c..f4579f768d02 100644
--- a/graphics/gimp/files/patch-ab
+++ b/graphics/gimp/files/patch-ab
@@ -1,49 +1,96 @@
---- app/fileops.c~	Mon Nov 18 09:57:19 1996
-+++ app/fileops.c	Mon Nov 18 09:58:01 1996
-@@ -289,7 +289,7 @@
-       gtk_file_selection_set_ok_callback (filesel, file_open_ok_callback, open_options);
-       gtk_file_selection_set_cancel_callback (filesel, file_cancel_callback, open_options);
- 
--      if (gdisp && gdisp->gimage->has_filename)
-+      if (gdisp && gdisp->gimage && gdisp->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisp->gimage));
- 
-       gtk_widget_show (filesel);
-@@ -297,7 +297,7 @@
- 
-   if (! GTK_WIDGET_VISIBLE (filesel))
-     {
--      if (gdisp && gdisp->gimage->has_filename)
-+      if (gdisp && gdisp->gimage && gdisp->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisp->gimage));
-       gtk_widget_show (filesel);
-     }
-@@ -353,7 +353,7 @@
-       gtk_file_selection_set_ok_callback (filesel, file_save_ok_callback, save_options);
-       gtk_file_selection_set_cancel_callback (filesel, file_cancel_callback, save_options);
- 
--      if (gdisplay && gdisplay->gimage->has_filename)
-+      if (gdisplay && gdisplay->gimage && gdisplay->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisplay->gimage));
- 
-       gtk_widget_show (filesel);
-@@ -363,7 +363,7 @@
- 
-   if (! GTK_WIDGET_VISIBLE (filesel))
-     {
--      if (gdisplay && gdisplay->gimage->has_filename)
-+      if (gdisplay && gdisplay->gimage && gdisplay->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisplay->gimage));
- 
-       gtk_widget_show (filesel);
---- app/progress.c~	Mon Nov 18 11:03:58 1996
-+++ app/progress.c	Mon Nov 18 11:04:07 1996
-@@ -57,7 +57,7 @@
-   progress->callback_data = callback_data;
-   progress->pixmap = NULL;
- 
--  progress->shell = gtk_window_new (title, GTK_WINDOW_TOPLEVEL);
-+  progress->shell = gtk_window_new (title, GTK_WINDOW_DIALOG);
-   gtk_widget_set_uposition (progress->shell, progress_x, progress_y);
-   main_vbox = gtk_vbox_new (FALSE, 5);
-   gtk_container_add (progress->shell, main_vbox);
+--- plug-ins/script-fu/scripts/Makefile.in.orig	Fri Feb 28 09:09:07 1997
++++ plug-ins/script-fu/scripts/Makefile.in	Fri Feb 28 09:07:40 1997
+@@ -51,17 +51,17 @@
+ scriptdatadir = $(pkgdatadir)/scripts
+ 
+ scriptdata_DATA = \
+-	alien-glow.scm		\
+-	bds-logo-textured.scm	\
+-	blend-logo.scm		\
+-	chrome.scm		\
+-	chrome-it.scm		\
+-	chrome2.scm		\
+-	ds-logo.scm		\
+-	frozen-text.scm		\
+-	hds-logo.scm		\
+-	neon.scm		\
+-	sphere.scm		\
++	alien-glow.sed		\
++	bds-logo-textured.sed	\
++	blend-logo.sed		\
++	chrome.sed		\
++	chrome-it.sed		\
++	chrome2.sed		\
++	ds-logo.sed		\
++	frozen-text.sed		\
++	hds-logo.sed		\
++	neon.sed		\
++	sphere.sed		\
+ 	beavis.jpg
+ 
+ EXTRA_DIST = $(scriptdata_DATA)
+@@ -79,7 +79,7 @@
+ TAR = tar
+ default: all
+ 
+-.SUFFIXES:
++.SUFFIXES: .sed
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
+ 	cd $(top_srcdir) && automake --gnu plug-ins/script-fu/scripts/Makefile
+ 
+@@ -87,17 +87,18 @@
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+-
+ install-scriptdataDATA: $(scriptdata_DATA)
+ 	$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(scriptdatadir)
+-	@list="$(scriptdata_DATA)"; for p in $$list; do \
+-	  if test -f $(srcdir)/$$p; then \
+-	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p; \
+-	  else if test -f $$p; then \
+-	    echo "$(INSTALL_DATA) $$p $(scriptdatadir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(scriptdatadir)/$$p; \
++	@list="$(scriptdata_DATA)"; for s in $$list; do \
++	  p=$$(basename $$s .sed); \
++	  if [ $$p != $$s ]; then p=$$p.scm; fi; \
++	  if test -f $(srcdir)/$$s; then \
++	    echo "$(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p"; \
++	    $(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p; \
++	  else if test -f $$s; then \
++	    echo "$(INSTALL_DATA) $$s $(scriptdatadir)/$$p"; \
++	    $(INSTALL_DATA) $$s $(scriptdatadir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
+@@ -184,3 +184,7 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++
++%.sed : %.scm
++	sed 's,@_prefix_@,${prefix},' $< > $@
+--- plug-ins/script-fu/scripts/chrome-it.scm.orig	Wed Feb 26 22:51:31 1997
++++ plug-ins/script-fu/scripts/chrome-it.scm	Fri Feb 28 09:01:38 1997
+@@ -153,5 +153,5 @@
+     (gimp-displays-flush)
+     (gimp-image-enable-undo img)))
+ 
+-(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
+-(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
+--- plug-ins/script-fu/scripts/chrome2.scm.orig	Wed Feb 26 20:57:57 1997
++++ plug-ins/script-fu/scripts/chrome2.scm	Fri Feb 28 09:01:38 1997
+@@ -161,6 +161,6 @@
+     (gimp-image-enable-undo img)
+     (gimp-display-new img)))
+ 
+-(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
+ 
+-(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
diff --git a/graphics/gimp/files/patch-ac b/graphics/gimp/files/patch-ac
deleted file mode 100644
index 7e5a1845afe1..000000000000
--- a/graphics/gimp/files/patch-ac
+++ /dev/null
@@ -1,61 +0,0 @@
---- configure~	Mon Nov 18 10:20:48 1996
-+++ configure	Mon Nov 18 10:21:54 1996
-@@ -2324,7 +2324,7 @@
- EOF
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile app/Makefile plug-ins/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile app/Makefile plug-ins/Makefile gimprc"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
---- configure.in~	Mon Nov 18 10:37:13 1996
-+++ configure.in	Mon Nov 18 10:37:25 1996
-@@ -221,4 +221,4 @@
- AC_SUBST(_SHLIBS_)
- 
- dnl Output the Makefiles
--AC_OUTPUT(Makefile app/Makefile plug-ins/Makefile)
-+AC_OUTPUT(Makefile app/Makefile plug-ins/Makefile gimprc)
---- Makefile.in~	Mon Nov 18 11:11:16 1996
-+++ Makefile.in	Mon Nov 18 11:12:22 1996
-@@ -16,7 +16,7 @@
- # set the MAKE variable if necessary
- @SET_MAKE@
- 
--INSTALL	=	./install-sh -c
-+INSTALL	=	/usr/bin/install -c
- 
- all:
- 	( cd gtk ; $(MAKE) )
-@@ -24,22 +24,22 @@
- 	( cd app ; $(MAKE) )
- 
- install:
--	$(INSTALL) -d $(libdir)/gimp
--	$(INSTALL) -d $(libdir)/gimp/brushes
--	$(INSTALL) -m 644 gimprc $(libdir)/gimp
-+	$(INSTALL) -d $(datadir)/gimp
-+	$(INSTALL) -d $(datadir)/gimp/brushes
-+	$(INSTALL) -m 644 gimprc $(datadir)/gimp
- 	for brush in brushes/*; do \
-           echo $$brush; \
--	  $(INSTALL) -m 644 "$$brush" $(libdir)/gimp/brushes; \
-+	  $(INSTALL) -m 644 "$$brush" $(datadir)/gimp/brushes; \
- 	done
--	$(INSTALL) -d $(libdir)/gimp/palettes
-+	$(INSTALL) -d $(datadir)/gimp/palettes
- 	for palette in palettes/*; do \
-           echo $$palette; \
--	  $(INSTALL) -m 644 "$$palette" $(libdir)/gimp/palettes; \
-+	  $(INSTALL) -m 644 "$$palette" $(datadir)/gimp/palettes; \
- 	done
--	$(INSTALL) -d $(libdir)/gimp/patterns
-+	$(INSTALL) -d $(datadir)/gimp/patterns
- 	for pattern in patterns/*; do \
-           echo $$pattern; \
--	  $(INSTALL) -m 644 "$$pattern" $(libdir)/gimp/patterns; \
-+	  $(INSTALL) -m 644 "$$pattern" $(datadir)/gimp/patterns; \
- 	done
- 	( cd plug-ins ; $(MAKE) install )
- 	( cd app ; $(MAKE) install )
diff --git a/graphics/gimp/files/patch-ah b/graphics/gimp/files/patch-ah
deleted file mode 100644
index 8e508d8ad219..000000000000
--- a/graphics/gimp/files/patch-ah
+++ /dev/null
@@ -1,208 +0,0 @@
---- app/autodialog.c.old	Fri Nov 22 15:46:44 1996
-+++ app/autodialog.c	Fri Nov 22 18:08:40 1996
-@@ -49,7 +49,7 @@
- /*  Local functions  */
- static AutoDialogItem dialog_find_item (AutoDialog, int);
- static void dialog_delete_children (AutoDialog, AutoDialogItem);
--static GtkWidget *dialog_create_image_menu (AutoDialog, char *, gpointer,
-+static GtkWidget *dialog_create_image_menu (AutoDialog, AutoDialogItem, char *, gpointer,
- 					    GtkWidget **, GtkWidget **);
- 
- /*  Callback and Update functions  */
-@@ -171,7 +171,8 @@
- 	{
- 	  dlgitem = tmplink->data;
- 	  tmplink = tmplink->next;
--
-+    if (dlgitem->additional_data!=NULL)
-+      xfree(dlgitem->additional_data);
- 	  xfree (dlgitem);
- 	}
-       free_list (dlg->items);
-@@ -206,6 +207,7 @@
-   item->item_ID = dlg->next_item_ID++;
-   item->item_type = type;
-   memset (item->data, 0, 32);
-+  item->additional_data=NULL;
-   item->parent = parent_item;
-   item->children = NULL;
-   item->gtk_data = NULL;
-@@ -276,7 +278,7 @@
-       break;
- 
-     case ITEM_IMAGE_MENU:
--      item_widget = dialog_create_image_menu (dlg, data, extra, &option_menu, &menu);
-+      item_widget = dialog_create_image_menu (dlg, item, data, extra, &option_menu, &menu);
-       break;
- 
-     case ITEM_SCALE:
-@@ -500,7 +502,8 @@
- 	}
-       else
- 	gtk_widget_destroy (item->widget);
--
-+      if (item->additional_data!=NULL)
-+        xfree(item->additional_data);
-       xfree (item);
-     }
- }
-@@ -577,9 +580,32 @@
-     free_list (item->children);
- }
- 
-+typedef struct {
-+  GtkWidget *widget;
-+  long data[2];
-+} _MenuItemData;
-+
-+gint CheckConstrains(GImage *gimage,GImage *constrain,guchar constraint)
-+{
-+  if (((constraint & IMAGE_CONSTRAIN_RGB) &&
-+       (gimage_type (gimage) == RGB_GIMAGE ||
-+	      gimage_type (gimage) == RGBA_GIMAGE)) ||
-+	    ((constraint & IMAGE_CONSTRAIN_GRAY) &&
-+	     (gimage_type (gimage) == GRAY_GIMAGE ||
-+	      gimage_type (gimage) == GRAYA_GIMAGE)) ||
-+	    ((constraint & IMAGE_CONSTRAIN_INDEXED) &&
-+	     (gimage_type (gimage) == INDEXED_GIMAGE ||
-+	      gimage_type (gimage) == INDEXEDA_GIMAGE)))
-+    if ((gimage->width == constrain->width) &&
-+	      (gimage->height == constrain->height))
-+      return(TRUE);
-+  return(FALSE); 
-+}
-+
- static GtkWidget *
--dialog_create_image_menu (dlg, title, image, option_menu, menu)
-+dialog_create_image_menu (dlg, item, title, image, option_menu, menu)
-      AutoDialog dlg;
-+     AutoDialogItem item;
-      char *title;
-      void *image;
-      GtkWidget **option_menu;
-@@ -597,8 +623,8 @@
-   char constraint;
-   link_ptr tmp;
-   long ID;
--  long *data;
-   int num_items = 0;
-+  _MenuItemData *ItemData;
- 
-   hbox = gtk_hbox_new (FALSE, 4);
-   gtk_container_set_border_width (hbox, 0);
-@@ -614,43 +640,55 @@
-   constrain = (ID == 0) ? image : gimage_get_ID (ID);
- 
-   tmp = image_list;
-+
-+  /* Check how many images fit the criteria */
-+  /* ====================================== */
-+
-   while (tmp)
-     {
-       gimage = tmp->data;
-       tmp = next_item (tmp);
--
--      if (((constraint & IMAGE_CONSTRAIN_RGB) &&
--	   (gimage_type (gimage) == RGB_GIMAGE ||
--	    gimage_type (gimage) == RGBA_GIMAGE)) ||
--	  ((constraint & IMAGE_CONSTRAIN_GRAY) &&
--	   (gimage_type (gimage) == GRAY_GIMAGE ||
--	    gimage_type (gimage) == GRAYA_GIMAGE)) ||
--	  ((constraint & IMAGE_CONSTRAIN_INDEXED) &&
--	   (gimage_type (gimage) == INDEXED_GIMAGE ||
--	    gimage_type (gimage) == INDEXEDA_GIMAGE)))
--	if ((gimage->width == constrain->width) &&
--	    (gimage->height == constrain->height))
--	  {
--	    image_name = prune_filename (gimage_filename (gimage));
--	    menu_item_label = (char *) xmalloc (strlen (image_name) + 15);
--	    sprintf (menu_item_label, "%s-%d", image_name, gimage->ID);
--	    menu_item = gtk_menu_item_new_with_label (menu_item_label);
--	    gtk_callback_add (gtk_menu_item_get_state (menu_item),
--			      dialog_image_menu_callback, dlg);
--	    gtk_container_add (*menu, menu_item);
--	    gtk_widget_show (menu_item);
--
--	    data = xmalloc (sizeof (long) * 2);
--	    data[0] = dlg->next_item_ID - 1;
--	    data[1] = (gimage->ID == constrain->ID) ? 0 : gimage->ID;
--	    dlg->additional_data = data;
--
--	    xfree (menu_item_label);
--	    num_items ++;
--	  }
-+      if (CheckConstrains(gimage,constrain,constraint)==TRUE)
-+        num_items++;      
-     }
- 
--  if (!num_items)
-+  /* If we found any matches, allocate memory to hold      */
-+  /* callback data. Put a pointer in "item" to avoid leak. */
-+  /* ===================================================== */
-+  
-+  if (num_items>0)
-+    {
-+      ItemData=(_MenuItemData *)xmalloc(sizeof(_MenuItemData)*(size_t)num_items);
-+      item->additional_data=ItemData;
-+
-+      tmp=image_list;
-+      num_items=0;
-+      while (tmp)
-+        {
-+          gimage = tmp->data;
-+          tmp = next_item (tmp);
-+          if (CheckConstrains(gimage,constrain,constraint)==TRUE)
-+	          {
-+	            image_name = prune_filename (gimage_filename (gimage));
-+	            menu_item_label = (char *) xmalloc (strlen (image_name) + 15);
-+	            sprintf (menu_item_label, "%s-%d", image_name, gimage->ID);
-+      
-+              ItemData[num_items].widget=hbox;
-+              ItemData[num_items].data[0] = dlg->next_item_ID - 1;
-+              ItemData[num_items].data[1] = (gimage->ID == constrain->ID) ? 0 : gimage->ID;
-+      
-+	            menu_item = gtk_menu_item_new_with_label (menu_item_label);
-+	            gtk_callback_add (gtk_menu_item_get_state (menu_item),dialog_image_menu_callback,
-+                (gpointer)&ItemData[num_items]);
-+	            gtk_container_add (*menu, menu_item);
-+	            gtk_widget_show (menu_item);
-+      
-+	            xfree (menu_item_label);
-+	            num_items ++;
-+	          }
-+        }
-+    }
-+  else
-     {
-       menu_item = gtk_menu_item_new_with_label ("none");
-       gtk_container_add (*menu, menu_item);
-@@ -669,14 +707,14 @@
-      gpointer client_data;
-      gpointer call_data;
- {
-+  _MenuItemData *ItemData;
-   AutoDialog dlg;
--  long *data;
- 
--  dlg = client_data;
--  data = (long *) dlg->additional_data;
-+  ItemData=(_MenuItemData *)client_data;
-+  dlg = (AutoDialog) gtk_widget_get_user_data (ItemData->widget);
- 
-   if (dlg->callback)
--    (* dlg->callback) (dlg->dialog_ID, data[0], dlg->callback_data, &data[1]);
-+    (* dlg->callback) (dlg->dialog_ID,ItemData->data[0],dlg->callback_data,&ItemData->data[1]);
- }
- 
- static void
---- app/autodialog.h.old	Fri Nov 22 15:46:47 1996
-+++ app/autodialog.h	Fri Nov 22 17:21:19 1996
-@@ -49,6 +49,7 @@
-   int             item_ID;
-   int             item_type;
-   char            data[32];
-+  void           *additional_data;
-   AutoDialogItem  parent;
-   link_ptr        children;
-   GtkWidget      *widget;
diff --git a/graphics/gimp/pkg-plist b/graphics/gimp/pkg-plist
index ef35558b371c..a854e9786565 100644
--- a/graphics/gimp/pkg-plist
+++ b/graphics/gimp/pkg-plist
@@ -1,4 +1,130 @@
 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/gtk/gtk.h
+include/gtk/gtkaccelerator.h
+include/gtk/gtkadjustment.h
+include/gtk/gtkalignment.h
+include/gtk/gtkarrow.h
+include/gtk/gtkbin.h
+include/gtk/gtkbox.h
+include/gtk/gtkbutton.h
+include/gtk/gtkcanvas.h
+include/gtk/gtkcheckbutton.h
+include/gtk/gtkcontainer.h
+include/gtk/gtkdata.h
+include/gtk/gtkdialog.h
+include/gtk/gtkdrawingarea.h
+include/gtk/gtkentry.h
+include/gtk/gtkenums.h
+include/gtk/gtkfilesel.h
+include/gtk/gtkfill.h
+include/gtk/gtkframe.h
+include/gtk/gtkgc.h
+include/gtk/gtkhbox.h
+include/gtk/gtkhruler.h
+include/gtk/gtkhscale.h
+include/gtk/gtkhscrollbar.h
+include/gtk/gtkhseparator.h
+include/gtk/gtkimage.h
+include/gtk/gtkitem.h
+include/gtk/gtklabel.h
+include/gtk/gtklist.h
+include/gtk/gtklistitem.h
+include/gtk/gtkmain.h
+include/gtk/gtkmenu.h
+include/gtk/gtkmenubar.h
+include/gtk/gtkmenufactory.h
+include/gtk/gtkmenuitem.h
+include/gtk/gtkmenushell.h
+include/gtk/gtkmisc.h
+include/gtk/gtknotebook.h
+include/gtk/gtkobject.h
+include/gtk/gtkoptionmenu.h
+include/gtk/gtkpixmap.h
+include/gtk/gtkpreview.h
+include/gtk/gtkprogressbar.h
+include/gtk/gtkradiobutton.h
+include/gtk/gtkrange.h
+include/gtk/gtkrc.h
+include/gtk/gtkruler.h
+include/gtk/gtkscale.h
+include/gtk/gtkscrollbar.h
+include/gtk/gtkscrolledwindow.h
+include/gtk/gtkseparator.h
+include/gtk/gtksignal.h
+include/gtk/gtkstyle.h
+include/gtk/gtktable.h
+include/gtk/gtktext.h
+include/gtk/gtktogglebutton.h
+include/gtk/gtktree.h
+include/gtk/gtktreeitem.h
+include/gtk/gtktypeutils.h
+include/gtk/gtkvbox.h
+include/gtk/gtkviewport.h
+include/gtk/gtkvruler.h
+include/gtk/gtkvscale.h
+include/gtk/gtkvscrollbar.h
+include/gtk/gtkvseparator.h
+include/gtk/gtkwidget.h
+include/gtk/gtkwindow.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.0.0
+lib/libgimp.a
+lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.0.0
+lib/libgimpi.a
+lib/libgimpi.la
+lib/libgimpi.so
+lib/libgimpi.so.0.0
+lib/libgimpui.a
+lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.0.0
+lib/libglib.a
+lib/libglib.la
+lib/libglib.so
+lib/libglib.so.0.0
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so
+lib/libgtk.so.0.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/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/whirl
 share/gimp/brushes/11circle.gbr
 share/gimp/brushes/11fcircle.gbr
 share/gimp/brushes/13circle.gbr
@@ -61,7 +187,17 @@ 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
@@ -95,13 +231,13 @@ share/gimp/patterns/leopard.pat
 share/gimp/patterns/lumps.pat
 share/gimp/patterns/marble1.pat
 share/gimp/patterns/marble2.pat
-share/gimp/patterns/pj.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
@@ -113,79 +249,26 @@ share/gimp/patterns/wax.pat
 share/gimp/patterns/wood1.pat
 share/gimp/patterns/wood2.pat
 share/gimp/patterns/wood3.pat
-libexec/gimp/plug-ins/autocrop
-libexec/gimp/plug-ins/bleed
-libexec/gimp/plug-ins/blend
-libexec/gimp/plug-ins/blur
-libexec/gimp/plug-ins/blur2
-libexec/gimp/plug-ins/brightness
-libexec/gimp/plug-ins/bumpmap
-libexec/gimp/plug-ins/c_astretch
-libexec/gimp/plug-ins/calculations
-libexec/gimp/plug-ins/charcoal
-libexec/gimp/plug-ins/checkerboard
-libexec/gimp/plug-ins/compose
-libexec/gimp/plug-ins/cubism
-libexec/gimp/plug-ins/darken
-libexec/gimp/plug-ins/decompose
-libexec/gimp/plug-ins/despeckle
-libexec/gimp/plug-ins/displace
-libexec/gimp/plug-ins/duplicate
-libexec/gimp/plug-ins/edge
-libexec/gimp/plug-ins/engrave
-libexec/gimp/plug-ins/enhance
-libexec/gimp/plug-ins/extrude
-libexec/gimp/plug-ins/flip_horz
-libexec/gimp/plug-ins/flip_vert
-libexec/gimp/plug-ins/gamma
-libexec/gimp/plug-ins/gauss
-libexec/gimp/plug-ins/gauss_recurse
-libexec/gimp/plug-ins/gbrush
-libexec/gimp/plug-ins/gbrush-old
-libexec/gimp/plug-ins/gicon
-libexec/gimp/plug-ins/gif
-libexec/gimp/plug-ins/gpattern
-libexec/gimp/plug-ins/grayify
-libexec/gimp/plug-ins/invert
-libexec/gimp/plug-ins/jpeg
-libexec/gimp/plug-ins/lic
-libexec/gimp/plug-ins/lighten
-libexec/gimp/plug-ins/lighting
-libexec/gimp/plug-ins/map_sphere
-libexec/gimp/plug-ins/matlab
-libexec/gimp/plug-ins/mblur
-libexec/gimp/plug-ins/mosaic
-libexec/gimp/plug-ins/netpbm
-libexec/gimp/plug-ins/noisify
-libexec/gimp/plug-ins/octave_srv
-libexec/gimp/plug-ins/offset
-libexec/gimp/plug-ins/oilify
-libexec/gimp/plug-ins/pagecurl
-libexec/gimp/plug-ins/photocd
-libexec/gimp/plug-ins/pinch
-libexec/gimp/plug-ins/pixelize
-libexec/gimp/plug-ins/plasma
-libexec/gimp/plug-ins/png
-libexec/gimp/plug-ins/pnm
-libexec/gimp/plug-ins/polar
-libexec/gimp/plug-ins/tga
-libexec/gimp/plug-ins/relief
-libexec/gimp/plug-ins/ripple
-libexec/gimp/plug-ins/rms_error
-libexec/gimp/plug-ins/rotate
-libexec/gimp/plug-ins/shift
-libexec/gimp/plug-ins/spread
-libexec/gimp/plug-ins/scale
-libexec/gimp/plug-ins/solarize
-libexec/gimp/plug-ins/sparkle
-libexec/gimp/plug-ins/texture2
-libexec/gimp/plug-ins/tiff
-libexec/gimp/plug-ins/tile
-libexec/gimp/plug-ins/tiler
-libexec/gimp/plug-ins/to-gray
-libexec/gimp/plug-ins/to-color
-libexec/gimp/plug-ins/to-indexed
-libexec/gimp/plug-ins/waves
-libexec/gimp/plug-ins/whirl
-libexec/gimp/plug-ins/xpm
-libexec/gimp/plug-ins/yuv411
+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/ds-logo.scm
+share/gimp/scripts/frozen-text.scm
+share/gimp/scripts/hds-logo.scm
+share/gimp/scripts/neon.scm
+share/gimp/scripts/sphere.scm
+share/gimp/user_install
+@dirrm include/gdk
+@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
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 68c8a8c6d75c..07aca069c5f9 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -1,16 +1,14 @@
 # New ports collection makefile for:    GIMP
-# Version required:     961001
+# Version required:     0.99.1
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/11/19 16:07:26 erich Exp $
+# $Id: Makefile,v 1.3 1996/11/20 11:11:35 asami Exp $
 #
 
-DISTNAME=       gimp
-PKGNAME=        gimp-devel-96.10.01
+DISTNAME=       gimp-0.99.1
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
-DISTFILES=	gimp961001.tgz
 
 MAINTAINER=     erich@FreeBSD.org
 
@@ -21,6 +19,12 @@ LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
+#CONFIGURE_ARGS= --enable-debug
+
 USE_GMAKE=	yes
 
+#post-configure:
+#	cd ${WRKSRC}/gtk+; ./configure
+
 .include <bsd.port.mk>
+
diff --git a/graphics/gimp1/distinfo b/graphics/gimp1/distinfo
index aeb842bef317..ed4429db6879 100644
--- a/graphics/gimp1/distinfo
+++ b/graphics/gimp1/distinfo
@@ -1,2 +1 @@
-MD5 (gimp961001.tgz) = f7c3971a93a7332a39d7794be491d6e7
-MD5 (gimp-data.tgz) = b13b8382e22a1664f959486132606090
+MD5 (gimp-0.99.1.tar.gz) = fc1b80922cf195d4994d11c556e4d6ec
diff --git a/graphics/gimp1/files/patch-aa b/graphics/gimp1/files/patch-aa
index 729403d72c4d..0ce6cf4d3acd 100644
--- a/graphics/gimp1/files/patch-aa
+++ b/graphics/gimp1/files/patch-aa
@@ -1,261 +1,99 @@
---- gimprc.in~	Mon Nov 18 09:56:00 1996
-+++ gimprc.in	Mon Nov 18 09:55:52 1996
-@@ -0,0 +1,258 @@
-+# Lines that start with a '#' are comments.
-+# Blank lines are ignored.
-+
-+# Set the temporary storage directory...files will appear here
-+# during the course of running the gimp.  Most files will disappear
-+# when the gimp exits, but some files are likely to remain,
-+# such as working palette files, so it is best if this directory
-+# not be one that is shared by other users or is cleared on machine
-+# reboot such as /tmp.
-+temp-path "~/.gimp/tmp"
-+
-+# Set the brush search path...this path will be searched for valid
-+#  brushes at startup.
-+brush-path "~/.gimp/brushes:@prefix@/share/gimp/brushes"
-+
-+# Specify a default brush. If none is specified it defaults to the
-+#  "1circle.gbr" brush which is just a single pixel sized brush.
-+#  The brush is searched for in the brush path.
-+default-brush "19fcircle.gbr"
-+
-+# Set the pattern search path...this path will be searched for valid
-+#  patterns at startup.
-+pattern-path "~/.gimp/patterns:@prefix@/share/gimp/patterns"
-+
-+# Specify a default pattern.
-+#  The pattern is searched for in the specified pattern paths.
-+default-pattern "wood2.pat"
-+
-+# Set the palette search path...this path will be searched for valid
-+#  palettes at startup.
-+palette-path "~/.gimp/palettes:@prefix@/share/gimp/palettes"
-+
-+# Specify a default palette.
-+#  The pattern is searched for in the specified pattern paths.
-+default-palette "Default"
-+
-+# Set the gradient search path...this path will be searched for valid
-+#  gradients at startup.
-+gradient-path "~/.gimp/gradients:@prefix@/share/gimp/gradients"
-+
-+# Specify a default gradient.
-+#  The gradient is searched for in the specified gradient paths.
-+default-gradient "German_flag_smooth"
-+
-+# Set the plug-in search path...this path will be searched for
-+#  plug-ins when the plug-in is run.
-+plug-in-path "~/.gimp/plug-ins:@prefix@/libexec/gimp/plug-ins"
-+
-+# Speed of marching ants in the selection outline
-+#  this value is in milliseconds
-+#  (less time indicates faster marching)
-+marching-ants-speed 300
-+
-+# Set the number of operations kept on the undo stack
-+undo-levels 5
-+
-+# Set the color-cube resource for dithering on 8-bit displays
-+#  The 3 values stand for Shades of red, green, and blue
-+#  Multiplying the # of shades of each primary color yields
-+#  the total number of colors that will be allocated from the
-+#  gimp colormap.  This number should not exceed 256.  Most of the
-+#  colors remaining after the allocation of the colorcube
-+#  will be left to the system palette in an effort to reduce
-+#  colormap "flashing".
-+color-cube 6, 6, 4
-+
-+# Install a GIMP colormap by default -- only for 8-bit displays
-+# install-colormap
-+
-+# Specify that marching ants for selected regions will be drawn
-+#  with colormap cycling as oposed to redrawing with different stipple masks
-+#  this color cycling option works only with 8-bit displays
-+# colormap-cycling
-+
-+# Tools such as fuzzy-select and bucket fill find regions based on a
-+#  seed-fill algorithm.  The seed fill starts at the intially selected
-+#  pixel and progresses in all directions until the difference of pixel
-+#  intensity from the original is greater than a specified threshold
-+#  ==> This value represents the default threshold
-+default-threshold 15
-+
-+# There is always a tradeoff between memory usage and speed.  In most
-+#  cases, the GIMP opts for speed over memory.  However, if memory is
-+#  a big issue, set stingy-memory-use
-+# stingy-memory-use
-+
-+# When zooming into and out of images, this option enables the
-+#  automatic resizing of windows
-+# allow-resize-windows
-+
-+# Context-dependent cursors are cool.  They are enabled by default.
-+#  However, they require overhead that you may want to do without.
-+#  Uncomment this line to disable them.
-+# no-cursor-updating
-+
-+# Layer preview sizes:
-+#  None:    no previews in layers dialog/layer selector
-+#  Small:   32x32
-+#  Medium:  64x64
-+#  Large:   128x128
-+#  #:       #x#
-+preview-size Medium
-+
-+# Controlling ruler visibility
-+#  The default behavior is for rulers to be ON
-+#  This can also be toggled with the View->Show Rulers command or shift+control+r
-+# dont-show-rulers
-+
-+# Disable auto saving
-+#  Just uncomment the line below...
-+# dont-auto-save
-+
-+# Set the gamma correction values for the display
-+#  1.0 corresponds to no gamma correction.  For most displays,
-+#  gamma correction should be set to between 2.0 and 2.6
-+#  Run the utility "gamma_correct" to determine appropriate values
-+#  for your display.
-+#
-+# One important item to keep in mind:  Many images that you might
-+#  get from outside sources will in all likelihood already be
-+#  gamma-corrected.  In these cases, the image will look washed-out
-+#  if the gimp has gamma-correction turned on.  If you are going
-+#  to work with images of this sort, turn gamma correction off
-+#  by removing this line, or setting the values to 1.0.
-+#  gamma-correction 1.0
-+#  gamma-correction 2.0
-+#                ___
-+gamma-correction 1.6
-+
-+# Set the manner in which transparency is displayed in images
-+#  Transparency type can be one of:
-+#    0: Light Checks
-+#    1: Mid-Tone Checks
-+#    2: Dark Checks
-+#    3: White Only
-+#    4: Gray Only
-+#    5: Black Only
-+#  Check size can be one of:
-+#    0: Small
-+#    1: Medium
-+#    2: Large
-+transparency-type 1
-+transparency-size 2
-+
-+# Notify the GIMP of the available file plug-ins.
-+# The format of the line is as follows:
-+#  file-plug-in <image types> <plug-in name> <plug-in title> <extensions>
-+# The `image types' argument specifies what types of images the
-+#  plug-in can save. It is a 3 digit number where each digit is 0 or
-+#  1. The digits correspond to `indexed images', `grayscale images'
-+#  and `rgb images' respectively. For example, the "jpeg" file plug-in
-+#  can save rgb and grayscale images but not indexed color, so the
-+#  image types argument is 011.
-+# The `plug-in name' is the name of the plug-in program.
-+# The `plug-in title' is the title of the program is it will appear
-+#  from the GIMP. This will most likely be the name of the plug-in.
-+# The `extensions' are a comma separated string of extensions. These
-+#  are used by the GIMP to map file names to images.
-+#  Note: case does not matter for extensions.
-+
-+file-plug-in  jpeg	011	"jpeg"		"jpg,jpeg"
-+file-plug-in  png	111	"png"		"png"
-+file-plug-in  gif	110	"gif"		"gif"
-+file-plug-in  tiff	111	"tiff"		"tiff,tif"
-+file-plug-in  tga	111	"tga"		"tga,targa"
-+file-plug-in  gbrush	010	"brush"		"gbr"
-+file-plug-in  gpattern	010	"pattern"	"pat,gpat"
-+file-plug-in  gicon	010	"gicon"		"gic,gico"
-+file-plug-in  xpm	110	"xpm"		"xpm"
-+file-plug-in  pnm	111	"pnm"		"pgm,ppm,pbm"
-+file-plug-in  matlab	010	"matlab"	"m"
-+file-plug-in  yuv411    001     "yuv"           "yuv"
-+
-+# Notify the GIMP of plug-ins that will exist in the `plug-ins' menu.
-+# The format of the line is as follows:
-+#  plug-in <plug-in name> <menu location> <accelerator>
-+# The `plug-in name' is the name of the plug-in program.
-+# The `menu location' is the item name and location in the plug-in
-+#  menu. A slash indicates a submenu. Therefore, the menu location
-+#  "Blur/Blur" specifies an item name of "Blur" in a submenu entitled
-+#  "Blur". Multiple submenus are possible. If a menu already exists
-+#  the item is simply placed in that menu. Menu items are placed in
-+#  alphabetically sorted order in menus.
-+# The `accelerator' is a string which designates a key combination
-+#  which will invoke the plug-in. The format should be clear by
-+#  inspection.  This string is optional.
-+#
-+# It is convention to only use the `alt' and `shift' key modifiers for
-+#  plug-ins. The `control' key is used as a modifier for menu items by
-+#  the main application. The main application will not use the `alt'
-+#  or `shift' key modifiers.
-+
-+plug-in blur       "Blur/Blur"
-+plug-in blur2      "Blur/Blur (variable)"        "Alt<Key>B"
-+plug-in gauss_recurse      "Blur/Gaussian Blur (IIR)"         "Shift Alt<Key>B"
-+plug-in gauss      "Blur/Gaussian Blur (RLE)"
-+plug-in mblur      "Blur/Motion Blur"
-+
-+plug-in charcoal   "Effects/Artistic/Charcoal"  "Shift Alt<Key>H"
-+plug-in cubism     "Effects/Artistic/Cubism"	"Shift Alt<Key>U"
-+plug-in mosaic     "Effects/Artistic/Mosaic"	"Alt<Key>M"
-+plug-in oilify     "Effects/Artistic/Oilify"
-+plug-in sparkle    "Effects/Artistic/Sparkle"
-+plug-in lic        "Effects/Artistic/Van-Goghify"
-+plug-in bleed      "Effects/Image/Bleed"
-+plug-in c_astretch "Effects/Image/Contrast Auto-Stretch"
-+plug-in enhance    "Effects/Image/Enhance"      "Shift Alt<Key>E"
-+plug-in gamma      "Effects/Image/Gamma"        "Alt<Key>G"
-+plug-in grayify    "Effects/Image/Grayify"
-+plug-in invert     "Effects/Image/Invert"       "Alt<Key>I"
-+plug-in solarize   "Effects/Image/Solarize"     "Alt<Key>1"
-+plug-in bumpmap    "Effects/Lighting/Bump Map"	"Alt<Key>2"
-+plug-in displace   "Effects/Lighting/Displace"	"Alt<Key>3"
-+plug-in lighting   "Effects/Lighting/Lighting"	"Alt<Key>4"
-+plug-in edge       "Effects/Misc Ops/Edge Detect"        "Alt<Key>E"
-+plug-in engrave    "Effects/Misc Ops/Engrave"
-+plug-in extrude    "Effects/Misc Ops/Extrude"
-+plug-in pixelize   "Effects/Misc Ops/Pixelize"
-+plug-in relief     "Effects/Misc Ops/Relief"    "Alt<Key>R"
-+plug-in checkerboard "Effects/Textures/Checkerboard"
-+plug-in plasma     "Effects/Textures/Plasma"
-+plug-in texture2   "Effects/Textures/Texture II"
-+
-+plug-in despeckle  "Distorts/Despeckle"
-+plug-in map_sphere "Distorts/Map Sphere"
-+plug-in noisify    "Distorts/Noise"
-+plug-in pagecurl   "Distorts/Page Curl"         "Alt<Key>U"
-+plug-in pinch      "Distorts/Pinch"             "Alt<Key>P"
-+plug-in ripple     "Distorts/Ripple"
-+plug-in shift      "Distorts/Shift"
-+plug-in spread     "Distorts/Spread"
-+plug-in whirl      "Distorts/Whirl"             "Alt<Key>W"
-+plug-in waves      "Distorts/Waves"
-+
-+plug-in compose    "Conversions/Compose"
-+plug-in decompose  "Conversions/Decompose"
-+plug-in to-color   "Conversions/To Color"       "Shift Alt<Key>C"
-+plug-in to-gray    "Conversions/To Grayscale"   "Shift Alt<Key>G"
-+plug-in to-indexed "Conversions/To Indexed"     "Shift Alt<Key>I"
-+
-+plug-in autocrop   "Transforms/Autocrop"
-+plug-in flip_horz  "Transforms/Flip Horizontal" "Alt<Key>H"
-+plug-in flip_vert  "Transforms/Flip Vertical"   "Alt<Key>V"
-+plug-in polar      "Transforms/Polar"
-+plug-in rotate     "Transforms/Rotate"
-+plug-in scale      "Transforms/Scale"           "Shift Alt<Key>S"
-+plug-in tile       "Transforms/Tile"            "Alt<Key>T"
-+plug-in tiler      "Transforms/Tiler"           "Alt<Key>T"
-+
-+plug-in blend      "Channel Ops/Blend"
-+plug-in calculations "Channel Ops/Calculations" "Alt<Key>C"
-+plug-in duplicate  "Channel Ops/Duplicate"      "Alt<Key>D"
-+plug-in offset     "Channel Ops/Offset"         "Alt<Key>O"
-+
-+plug-in netpbm	   "Miscellaneous/Netpbm Filter" "Shift Alt<Key>N"
-+plug-in rms_error  "Miscellaneous/RMS Error"
-+plug-in photocd    "Miscellaneous/Photo CD"
-+plug-in octave_srv "Miscellaneous/Octave Server"
+--- plug-ins/Makefile.in.orig	Thu Feb 27 05:41:52 1997
++++ plug-ins/Makefile.in	Thu Feb 27 08:46:09 1997
+@@ -28,6 +28,7 @@
+ 
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ 
+ top_builddir = ..
+@@ -58,7 +59,7 @@
+ X_LDFLAGS =
+ X_LIBS =
+ 
+-pluginlibdir = $(pkglibdir)/plug-ins
++pluginlibdir = $(pkglibexecdir)/plug-ins
+ 
+ pluginlib_PROGRAMS =	\
+ 	blur		\
+--- ./app/batch.c~	Mon Feb 24 14:38:51 1997
++++ ./app/batch.c	Wed Feb 26 08:51:05 1997
+@@ -3,7 +3,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-
++#include <errno.h>
+ #include "appenv.h"
+ #include "app_procs.h"
+ #include "batch.h"
+--- ./app/xcf.c~	Wed Feb 26 05:21:25 1997
++++ ./app/xcf.c	Wed Feb 26 09:07:30 1997
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+--- configure.orig	Thu Feb 27 09:55:32 1997
++++ configure	Thu Feb 27 09:55:40 1997
+@@ -609,7 +609,7 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-
++INSTALL_SCRIPT="/usr/bin/install -c -m 755"
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
+ 
+@@ -2040,7 +2040,7 @@
+ CFLAGS="$OPTFLAG $CFLAGS"
+ 
+ gimpdatadir=$datadir/$PACKAGE
+-gimpplugindir=$libdir/$PACKAGE
++gimpplugindir=$libexecdir/$PACKAGE
+ 
+ 
+ 
+--- gtk+/configure~	Thu Feb 27 03:09:52 1997
++++ gtk+/configure	Thu Feb 27 15:10:18 1997
+@@ -569,6 +569,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:572: checking for a BSD compatible install" >&5
++INSTALL="/usr/bin/install -c"
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+--- gtk+/glib/configure~	Thu Feb 27 15:32:15 1997
++++ gtk+/glib/configure	Thu Feb 27 15:32:47 1997
+@@ -559,6 +559,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:562: checking for a BSD compatible install" >&5
++INSTALL="/usr/bin/install -c"
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+--- plug-ins/script-fu/Makefile.in.orig	Thu Feb 27 20:47:10 1997
++++ plug-ins/script-fu/Makefile.in	Thu Feb 27 20:46:30 1997
+@@ -59,7 +59,7 @@
+ 
+ SUBDIRS = scripts
+ 
+-pluginlibdir = $(pkglibdir)/plug-ins
++pluginlibdir = $(gimpplugindir)/plug-ins
+ 
+ pluginlib_PROGRAMS = script-fu
+
+*** /tmp/gimp-0.99.1/app/gimprc.c	Thu Feb 27 06:43:10 1997
+--- ./app/gimprc.c	Thu Feb 27 16:41:19 1997
+***************
+*** 159,161 ****
+  
+!   sprintf (libfilename, "%s/gimprc", LIBDIR);
+    parse_gimprc_file (libfilename);
+--- 159,161 ----
+  
+!   sprintf (libfilename, "%s/gimprc", DATADIR);
+    parse_gimprc_file (libfilename);
diff --git a/graphics/gimp1/files/patch-ab b/graphics/gimp1/files/patch-ab
index ac5e5976e46c..f4579f768d02 100644
--- a/graphics/gimp1/files/patch-ab
+++ b/graphics/gimp1/files/patch-ab
@@ -1,49 +1,96 @@
---- app/fileops.c~	Mon Nov 18 09:57:19 1996
-+++ app/fileops.c	Mon Nov 18 09:58:01 1996
-@@ -289,7 +289,7 @@
-       gtk_file_selection_set_ok_callback (filesel, file_open_ok_callback, open_options);
-       gtk_file_selection_set_cancel_callback (filesel, file_cancel_callback, open_options);
- 
--      if (gdisp && gdisp->gimage->has_filename)
-+      if (gdisp && gdisp->gimage && gdisp->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisp->gimage));
- 
-       gtk_widget_show (filesel);
-@@ -297,7 +297,7 @@
- 
-   if (! GTK_WIDGET_VISIBLE (filesel))
-     {
--      if (gdisp && gdisp->gimage->has_filename)
-+      if (gdisp && gdisp->gimage && gdisp->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisp->gimage));
-       gtk_widget_show (filesel);
-     }
-@@ -353,7 +353,7 @@
-       gtk_file_selection_set_ok_callback (filesel, file_save_ok_callback, save_options);
-       gtk_file_selection_set_cancel_callback (filesel, file_cancel_callback, save_options);
- 
--      if (gdisplay && gdisplay->gimage->has_filename)
-+      if (gdisplay && gdisplay->gimage && gdisplay->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisplay->gimage));
- 
-       gtk_widget_show (filesel);
-@@ -363,7 +363,7 @@
- 
-   if (! GTK_WIDGET_VISIBLE (filesel))
-     {
--      if (gdisplay && gdisplay->gimage->has_filename)
-+      if (gdisplay && gdisplay->gimage && gdisplay->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisplay->gimage));
- 
-       gtk_widget_show (filesel);
---- app/progress.c~	Mon Nov 18 11:03:58 1996
-+++ app/progress.c	Mon Nov 18 11:04:07 1996
-@@ -57,7 +57,7 @@
-   progress->callback_data = callback_data;
-   progress->pixmap = NULL;
- 
--  progress->shell = gtk_window_new (title, GTK_WINDOW_TOPLEVEL);
-+  progress->shell = gtk_window_new (title, GTK_WINDOW_DIALOG);
-   gtk_widget_set_uposition (progress->shell, progress_x, progress_y);
-   main_vbox = gtk_vbox_new (FALSE, 5);
-   gtk_container_add (progress->shell, main_vbox);
+--- plug-ins/script-fu/scripts/Makefile.in.orig	Fri Feb 28 09:09:07 1997
++++ plug-ins/script-fu/scripts/Makefile.in	Fri Feb 28 09:07:40 1997
+@@ -51,17 +51,17 @@
+ scriptdatadir = $(pkgdatadir)/scripts
+ 
+ scriptdata_DATA = \
+-	alien-glow.scm		\
+-	bds-logo-textured.scm	\
+-	blend-logo.scm		\
+-	chrome.scm		\
+-	chrome-it.scm		\
+-	chrome2.scm		\
+-	ds-logo.scm		\
+-	frozen-text.scm		\
+-	hds-logo.scm		\
+-	neon.scm		\
+-	sphere.scm		\
++	alien-glow.sed		\
++	bds-logo-textured.sed	\
++	blend-logo.sed		\
++	chrome.sed		\
++	chrome-it.sed		\
++	chrome2.sed		\
++	ds-logo.sed		\
++	frozen-text.sed		\
++	hds-logo.sed		\
++	neon.sed		\
++	sphere.sed		\
+ 	beavis.jpg
+ 
+ EXTRA_DIST = $(scriptdata_DATA)
+@@ -79,7 +79,7 @@
+ TAR = tar
+ default: all
+ 
+-.SUFFIXES:
++.SUFFIXES: .sed
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
+ 	cd $(top_srcdir) && automake --gnu plug-ins/script-fu/scripts/Makefile
+ 
+@@ -87,17 +87,18 @@
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+-
+ install-scriptdataDATA: $(scriptdata_DATA)
+ 	$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(scriptdatadir)
+-	@list="$(scriptdata_DATA)"; for p in $$list; do \
+-	  if test -f $(srcdir)/$$p; then \
+-	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p; \
+-	  else if test -f $$p; then \
+-	    echo "$(INSTALL_DATA) $$p $(scriptdatadir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(scriptdatadir)/$$p; \
++	@list="$(scriptdata_DATA)"; for s in $$list; do \
++	  p=$$(basename $$s .sed); \
++	  if [ $$p != $$s ]; then p=$$p.scm; fi; \
++	  if test -f $(srcdir)/$$s; then \
++	    echo "$(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p"; \
++	    $(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p; \
++	  else if test -f $$s; then \
++	    echo "$(INSTALL_DATA) $$s $(scriptdatadir)/$$p"; \
++	    $(INSTALL_DATA) $$s $(scriptdatadir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
+@@ -184,3 +184,7 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++
++%.sed : %.scm
++	sed 's,@_prefix_@,${prefix},' $< > $@
+--- plug-ins/script-fu/scripts/chrome-it.scm.orig	Wed Feb 26 22:51:31 1997
++++ plug-ins/script-fu/scripts/chrome-it.scm	Fri Feb 28 09:01:38 1997
+@@ -153,5 +153,5 @@
+     (gimp-displays-flush)
+     (gimp-image-enable-undo img)))
+ 
+-(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
+-(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
+--- plug-ins/script-fu/scripts/chrome2.scm.orig	Wed Feb 26 20:57:57 1997
++++ plug-ins/script-fu/scripts/chrome2.scm	Fri Feb 28 09:01:38 1997
+@@ -161,6 +161,6 @@
+     (gimp-image-enable-undo img)
+     (gimp-display-new img)))
+ 
+-(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
+ 
+-(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
diff --git a/graphics/gimp1/files/patch-ac b/graphics/gimp1/files/patch-ac
deleted file mode 100644
index 7e5a1845afe1..000000000000
--- a/graphics/gimp1/files/patch-ac
+++ /dev/null
@@ -1,61 +0,0 @@
---- configure~	Mon Nov 18 10:20:48 1996
-+++ configure	Mon Nov 18 10:21:54 1996
-@@ -2324,7 +2324,7 @@
- EOF
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile app/Makefile plug-ins/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile app/Makefile plug-ins/Makefile gimprc"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
---- configure.in~	Mon Nov 18 10:37:13 1996
-+++ configure.in	Mon Nov 18 10:37:25 1996
-@@ -221,4 +221,4 @@
- AC_SUBST(_SHLIBS_)
- 
- dnl Output the Makefiles
--AC_OUTPUT(Makefile app/Makefile plug-ins/Makefile)
-+AC_OUTPUT(Makefile app/Makefile plug-ins/Makefile gimprc)
---- Makefile.in~	Mon Nov 18 11:11:16 1996
-+++ Makefile.in	Mon Nov 18 11:12:22 1996
-@@ -16,7 +16,7 @@
- # set the MAKE variable if necessary
- @SET_MAKE@
- 
--INSTALL	=	./install-sh -c
-+INSTALL	=	/usr/bin/install -c
- 
- all:
- 	( cd gtk ; $(MAKE) )
-@@ -24,22 +24,22 @@
- 	( cd app ; $(MAKE) )
- 
- install:
--	$(INSTALL) -d $(libdir)/gimp
--	$(INSTALL) -d $(libdir)/gimp/brushes
--	$(INSTALL) -m 644 gimprc $(libdir)/gimp
-+	$(INSTALL) -d $(datadir)/gimp
-+	$(INSTALL) -d $(datadir)/gimp/brushes
-+	$(INSTALL) -m 644 gimprc $(datadir)/gimp
- 	for brush in brushes/*; do \
-           echo $$brush; \
--	  $(INSTALL) -m 644 "$$brush" $(libdir)/gimp/brushes; \
-+	  $(INSTALL) -m 644 "$$brush" $(datadir)/gimp/brushes; \
- 	done
--	$(INSTALL) -d $(libdir)/gimp/palettes
-+	$(INSTALL) -d $(datadir)/gimp/palettes
- 	for palette in palettes/*; do \
-           echo $$palette; \
--	  $(INSTALL) -m 644 "$$palette" $(libdir)/gimp/palettes; \
-+	  $(INSTALL) -m 644 "$$palette" $(datadir)/gimp/palettes; \
- 	done
--	$(INSTALL) -d $(libdir)/gimp/patterns
-+	$(INSTALL) -d $(datadir)/gimp/patterns
- 	for pattern in patterns/*; do \
-           echo $$pattern; \
--	  $(INSTALL) -m 644 "$$pattern" $(libdir)/gimp/patterns; \
-+	  $(INSTALL) -m 644 "$$pattern" $(datadir)/gimp/patterns; \
- 	done
- 	( cd plug-ins ; $(MAKE) install )
- 	( cd app ; $(MAKE) install )
diff --git a/graphics/gimp1/files/patch-ah b/graphics/gimp1/files/patch-ah
deleted file mode 100644
index 8e508d8ad219..000000000000
--- a/graphics/gimp1/files/patch-ah
+++ /dev/null
@@ -1,208 +0,0 @@
---- app/autodialog.c.old	Fri Nov 22 15:46:44 1996
-+++ app/autodialog.c	Fri Nov 22 18:08:40 1996
-@@ -49,7 +49,7 @@
- /*  Local functions  */
- static AutoDialogItem dialog_find_item (AutoDialog, int);
- static void dialog_delete_children (AutoDialog, AutoDialogItem);
--static GtkWidget *dialog_create_image_menu (AutoDialog, char *, gpointer,
-+static GtkWidget *dialog_create_image_menu (AutoDialog, AutoDialogItem, char *, gpointer,
- 					    GtkWidget **, GtkWidget **);
- 
- /*  Callback and Update functions  */
-@@ -171,7 +171,8 @@
- 	{
- 	  dlgitem = tmplink->data;
- 	  tmplink = tmplink->next;
--
-+    if (dlgitem->additional_data!=NULL)
-+      xfree(dlgitem->additional_data);
- 	  xfree (dlgitem);
- 	}
-       free_list (dlg->items);
-@@ -206,6 +207,7 @@
-   item->item_ID = dlg->next_item_ID++;
-   item->item_type = type;
-   memset (item->data, 0, 32);
-+  item->additional_data=NULL;
-   item->parent = parent_item;
-   item->children = NULL;
-   item->gtk_data = NULL;
-@@ -276,7 +278,7 @@
-       break;
- 
-     case ITEM_IMAGE_MENU:
--      item_widget = dialog_create_image_menu (dlg, data, extra, &option_menu, &menu);
-+      item_widget = dialog_create_image_menu (dlg, item, data, extra, &option_menu, &menu);
-       break;
- 
-     case ITEM_SCALE:
-@@ -500,7 +502,8 @@
- 	}
-       else
- 	gtk_widget_destroy (item->widget);
--
-+      if (item->additional_data!=NULL)
-+        xfree(item->additional_data);
-       xfree (item);
-     }
- }
-@@ -577,9 +580,32 @@
-     free_list (item->children);
- }
- 
-+typedef struct {
-+  GtkWidget *widget;
-+  long data[2];
-+} _MenuItemData;
-+
-+gint CheckConstrains(GImage *gimage,GImage *constrain,guchar constraint)
-+{
-+  if (((constraint & IMAGE_CONSTRAIN_RGB) &&
-+       (gimage_type (gimage) == RGB_GIMAGE ||
-+	      gimage_type (gimage) == RGBA_GIMAGE)) ||
-+	    ((constraint & IMAGE_CONSTRAIN_GRAY) &&
-+	     (gimage_type (gimage) == GRAY_GIMAGE ||
-+	      gimage_type (gimage) == GRAYA_GIMAGE)) ||
-+	    ((constraint & IMAGE_CONSTRAIN_INDEXED) &&
-+	     (gimage_type (gimage) == INDEXED_GIMAGE ||
-+	      gimage_type (gimage) == INDEXEDA_GIMAGE)))
-+    if ((gimage->width == constrain->width) &&
-+	      (gimage->height == constrain->height))
-+      return(TRUE);
-+  return(FALSE); 
-+}
-+
- static GtkWidget *
--dialog_create_image_menu (dlg, title, image, option_menu, menu)
-+dialog_create_image_menu (dlg, item, title, image, option_menu, menu)
-      AutoDialog dlg;
-+     AutoDialogItem item;
-      char *title;
-      void *image;
-      GtkWidget **option_menu;
-@@ -597,8 +623,8 @@
-   char constraint;
-   link_ptr tmp;
-   long ID;
--  long *data;
-   int num_items = 0;
-+  _MenuItemData *ItemData;
- 
-   hbox = gtk_hbox_new (FALSE, 4);
-   gtk_container_set_border_width (hbox, 0);
-@@ -614,43 +640,55 @@
-   constrain = (ID == 0) ? image : gimage_get_ID (ID);
- 
-   tmp = image_list;
-+
-+  /* Check how many images fit the criteria */
-+  /* ====================================== */
-+
-   while (tmp)
-     {
-       gimage = tmp->data;
-       tmp = next_item (tmp);
--
--      if (((constraint & IMAGE_CONSTRAIN_RGB) &&
--	   (gimage_type (gimage) == RGB_GIMAGE ||
--	    gimage_type (gimage) == RGBA_GIMAGE)) ||
--	  ((constraint & IMAGE_CONSTRAIN_GRAY) &&
--	   (gimage_type (gimage) == GRAY_GIMAGE ||
--	    gimage_type (gimage) == GRAYA_GIMAGE)) ||
--	  ((constraint & IMAGE_CONSTRAIN_INDEXED) &&
--	   (gimage_type (gimage) == INDEXED_GIMAGE ||
--	    gimage_type (gimage) == INDEXEDA_GIMAGE)))
--	if ((gimage->width == constrain->width) &&
--	    (gimage->height == constrain->height))
--	  {
--	    image_name = prune_filename (gimage_filename (gimage));
--	    menu_item_label = (char *) xmalloc (strlen (image_name) + 15);
--	    sprintf (menu_item_label, "%s-%d", image_name, gimage->ID);
--	    menu_item = gtk_menu_item_new_with_label (menu_item_label);
--	    gtk_callback_add (gtk_menu_item_get_state (menu_item),
--			      dialog_image_menu_callback, dlg);
--	    gtk_container_add (*menu, menu_item);
--	    gtk_widget_show (menu_item);
--
--	    data = xmalloc (sizeof (long) * 2);
--	    data[0] = dlg->next_item_ID - 1;
--	    data[1] = (gimage->ID == constrain->ID) ? 0 : gimage->ID;
--	    dlg->additional_data = data;
--
--	    xfree (menu_item_label);
--	    num_items ++;
--	  }
-+      if (CheckConstrains(gimage,constrain,constraint)==TRUE)
-+        num_items++;      
-     }
- 
--  if (!num_items)
-+  /* If we found any matches, allocate memory to hold      */
-+  /* callback data. Put a pointer in "item" to avoid leak. */
-+  /* ===================================================== */
-+  
-+  if (num_items>0)
-+    {
-+      ItemData=(_MenuItemData *)xmalloc(sizeof(_MenuItemData)*(size_t)num_items);
-+      item->additional_data=ItemData;
-+
-+      tmp=image_list;
-+      num_items=0;
-+      while (tmp)
-+        {
-+          gimage = tmp->data;
-+          tmp = next_item (tmp);
-+          if (CheckConstrains(gimage,constrain,constraint)==TRUE)
-+	          {
-+	            image_name = prune_filename (gimage_filename (gimage));
-+	            menu_item_label = (char *) xmalloc (strlen (image_name) + 15);
-+	            sprintf (menu_item_label, "%s-%d", image_name, gimage->ID);
-+      
-+              ItemData[num_items].widget=hbox;
-+              ItemData[num_items].data[0] = dlg->next_item_ID - 1;
-+              ItemData[num_items].data[1] = (gimage->ID == constrain->ID) ? 0 : gimage->ID;
-+      
-+	            menu_item = gtk_menu_item_new_with_label (menu_item_label);
-+	            gtk_callback_add (gtk_menu_item_get_state (menu_item),dialog_image_menu_callback,
-+                (gpointer)&ItemData[num_items]);
-+	            gtk_container_add (*menu, menu_item);
-+	            gtk_widget_show (menu_item);
-+      
-+	            xfree (menu_item_label);
-+	            num_items ++;
-+	          }
-+        }
-+    }
-+  else
-     {
-       menu_item = gtk_menu_item_new_with_label ("none");
-       gtk_container_add (*menu, menu_item);
-@@ -669,14 +707,14 @@
-      gpointer client_data;
-      gpointer call_data;
- {
-+  _MenuItemData *ItemData;
-   AutoDialog dlg;
--  long *data;
- 
--  dlg = client_data;
--  data = (long *) dlg->additional_data;
-+  ItemData=(_MenuItemData *)client_data;
-+  dlg = (AutoDialog) gtk_widget_get_user_data (ItemData->widget);
- 
-   if (dlg->callback)
--    (* dlg->callback) (dlg->dialog_ID, data[0], dlg->callback_data, &data[1]);
-+    (* dlg->callback) (dlg->dialog_ID,ItemData->data[0],dlg->callback_data,&ItemData->data[1]);
- }
- 
- static void
---- app/autodialog.h.old	Fri Nov 22 15:46:47 1996
-+++ app/autodialog.h	Fri Nov 22 17:21:19 1996
-@@ -49,6 +49,7 @@
-   int             item_ID;
-   int             item_type;
-   char            data[32];
-+  void           *additional_data;
-   AutoDialogItem  parent;
-   link_ptr        children;
-   GtkWidget      *widget;
diff --git a/graphics/gimp1/pkg-plist b/graphics/gimp1/pkg-plist
index ef35558b371c..a854e9786565 100644
--- a/graphics/gimp1/pkg-plist
+++ b/graphics/gimp1/pkg-plist
@@ -1,4 +1,130 @@
 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/gtk/gtk.h
+include/gtk/gtkaccelerator.h
+include/gtk/gtkadjustment.h
+include/gtk/gtkalignment.h
+include/gtk/gtkarrow.h
+include/gtk/gtkbin.h
+include/gtk/gtkbox.h
+include/gtk/gtkbutton.h
+include/gtk/gtkcanvas.h
+include/gtk/gtkcheckbutton.h
+include/gtk/gtkcontainer.h
+include/gtk/gtkdata.h
+include/gtk/gtkdialog.h
+include/gtk/gtkdrawingarea.h
+include/gtk/gtkentry.h
+include/gtk/gtkenums.h
+include/gtk/gtkfilesel.h
+include/gtk/gtkfill.h
+include/gtk/gtkframe.h
+include/gtk/gtkgc.h
+include/gtk/gtkhbox.h
+include/gtk/gtkhruler.h
+include/gtk/gtkhscale.h
+include/gtk/gtkhscrollbar.h
+include/gtk/gtkhseparator.h
+include/gtk/gtkimage.h
+include/gtk/gtkitem.h
+include/gtk/gtklabel.h
+include/gtk/gtklist.h
+include/gtk/gtklistitem.h
+include/gtk/gtkmain.h
+include/gtk/gtkmenu.h
+include/gtk/gtkmenubar.h
+include/gtk/gtkmenufactory.h
+include/gtk/gtkmenuitem.h
+include/gtk/gtkmenushell.h
+include/gtk/gtkmisc.h
+include/gtk/gtknotebook.h
+include/gtk/gtkobject.h
+include/gtk/gtkoptionmenu.h
+include/gtk/gtkpixmap.h
+include/gtk/gtkpreview.h
+include/gtk/gtkprogressbar.h
+include/gtk/gtkradiobutton.h
+include/gtk/gtkrange.h
+include/gtk/gtkrc.h
+include/gtk/gtkruler.h
+include/gtk/gtkscale.h
+include/gtk/gtkscrollbar.h
+include/gtk/gtkscrolledwindow.h
+include/gtk/gtkseparator.h
+include/gtk/gtksignal.h
+include/gtk/gtkstyle.h
+include/gtk/gtktable.h
+include/gtk/gtktext.h
+include/gtk/gtktogglebutton.h
+include/gtk/gtktree.h
+include/gtk/gtktreeitem.h
+include/gtk/gtktypeutils.h
+include/gtk/gtkvbox.h
+include/gtk/gtkviewport.h
+include/gtk/gtkvruler.h
+include/gtk/gtkvscale.h
+include/gtk/gtkvscrollbar.h
+include/gtk/gtkvseparator.h
+include/gtk/gtkwidget.h
+include/gtk/gtkwindow.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.0.0
+lib/libgimp.a
+lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.0.0
+lib/libgimpi.a
+lib/libgimpi.la
+lib/libgimpi.so
+lib/libgimpi.so.0.0
+lib/libgimpui.a
+lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.0.0
+lib/libglib.a
+lib/libglib.la
+lib/libglib.so
+lib/libglib.so.0.0
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so
+lib/libgtk.so.0.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/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/whirl
 share/gimp/brushes/11circle.gbr
 share/gimp/brushes/11fcircle.gbr
 share/gimp/brushes/13circle.gbr
@@ -61,7 +187,17 @@ 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
@@ -95,13 +231,13 @@ share/gimp/patterns/leopard.pat
 share/gimp/patterns/lumps.pat
 share/gimp/patterns/marble1.pat
 share/gimp/patterns/marble2.pat
-share/gimp/patterns/pj.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
@@ -113,79 +249,26 @@ share/gimp/patterns/wax.pat
 share/gimp/patterns/wood1.pat
 share/gimp/patterns/wood2.pat
 share/gimp/patterns/wood3.pat
-libexec/gimp/plug-ins/autocrop
-libexec/gimp/plug-ins/bleed
-libexec/gimp/plug-ins/blend
-libexec/gimp/plug-ins/blur
-libexec/gimp/plug-ins/blur2
-libexec/gimp/plug-ins/brightness
-libexec/gimp/plug-ins/bumpmap
-libexec/gimp/plug-ins/c_astretch
-libexec/gimp/plug-ins/calculations
-libexec/gimp/plug-ins/charcoal
-libexec/gimp/plug-ins/checkerboard
-libexec/gimp/plug-ins/compose
-libexec/gimp/plug-ins/cubism
-libexec/gimp/plug-ins/darken
-libexec/gimp/plug-ins/decompose
-libexec/gimp/plug-ins/despeckle
-libexec/gimp/plug-ins/displace
-libexec/gimp/plug-ins/duplicate
-libexec/gimp/plug-ins/edge
-libexec/gimp/plug-ins/engrave
-libexec/gimp/plug-ins/enhance
-libexec/gimp/plug-ins/extrude
-libexec/gimp/plug-ins/flip_horz
-libexec/gimp/plug-ins/flip_vert
-libexec/gimp/plug-ins/gamma
-libexec/gimp/plug-ins/gauss
-libexec/gimp/plug-ins/gauss_recurse
-libexec/gimp/plug-ins/gbrush
-libexec/gimp/plug-ins/gbrush-old
-libexec/gimp/plug-ins/gicon
-libexec/gimp/plug-ins/gif
-libexec/gimp/plug-ins/gpattern
-libexec/gimp/plug-ins/grayify
-libexec/gimp/plug-ins/invert
-libexec/gimp/plug-ins/jpeg
-libexec/gimp/plug-ins/lic
-libexec/gimp/plug-ins/lighten
-libexec/gimp/plug-ins/lighting
-libexec/gimp/plug-ins/map_sphere
-libexec/gimp/plug-ins/matlab
-libexec/gimp/plug-ins/mblur
-libexec/gimp/plug-ins/mosaic
-libexec/gimp/plug-ins/netpbm
-libexec/gimp/plug-ins/noisify
-libexec/gimp/plug-ins/octave_srv
-libexec/gimp/plug-ins/offset
-libexec/gimp/plug-ins/oilify
-libexec/gimp/plug-ins/pagecurl
-libexec/gimp/plug-ins/photocd
-libexec/gimp/plug-ins/pinch
-libexec/gimp/plug-ins/pixelize
-libexec/gimp/plug-ins/plasma
-libexec/gimp/plug-ins/png
-libexec/gimp/plug-ins/pnm
-libexec/gimp/plug-ins/polar
-libexec/gimp/plug-ins/tga
-libexec/gimp/plug-ins/relief
-libexec/gimp/plug-ins/ripple
-libexec/gimp/plug-ins/rms_error
-libexec/gimp/plug-ins/rotate
-libexec/gimp/plug-ins/shift
-libexec/gimp/plug-ins/spread
-libexec/gimp/plug-ins/scale
-libexec/gimp/plug-ins/solarize
-libexec/gimp/plug-ins/sparkle
-libexec/gimp/plug-ins/texture2
-libexec/gimp/plug-ins/tiff
-libexec/gimp/plug-ins/tile
-libexec/gimp/plug-ins/tiler
-libexec/gimp/plug-ins/to-gray
-libexec/gimp/plug-ins/to-color
-libexec/gimp/plug-ins/to-indexed
-libexec/gimp/plug-ins/waves
-libexec/gimp/plug-ins/whirl
-libexec/gimp/plug-ins/xpm
-libexec/gimp/plug-ins/yuv411
+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/ds-logo.scm
+share/gimp/scripts/frozen-text.scm
+share/gimp/scripts/hds-logo.scm
+share/gimp/scripts/neon.scm
+share/gimp/scripts/sphere.scm
+share/gimp/user_install
+@dirrm include/gdk
+@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
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 68c8a8c6d75c..07aca069c5f9 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -1,16 +1,14 @@
 # New ports collection makefile for:    GIMP
-# Version required:     961001
+# Version required:     0.99.1
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.2 1996/11/19 16:07:26 erich Exp $
+# $Id: Makefile,v 1.3 1996/11/20 11:11:35 asami Exp $
 #
 
-DISTNAME=       gimp
-PKGNAME=        gimp-devel-96.10.01
+DISTNAME=       gimp-0.99.1
 CATEGORIES=     graphics
 MASTER_SITES=   ftp://ftp.xcf.berkeley.edu/pub/gimp/developers/
-DISTFILES=	gimp961001.tgz
 
 MAINTAINER=     erich@FreeBSD.org
 
@@ -21,6 +19,12 @@ LIB_DEPENDS+=	Xpm\\.4\\.:${PORTSDIR}/graphics/xpm
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
+#CONFIGURE_ARGS= --enable-debug
+
 USE_GMAKE=	yes
 
+#post-configure:
+#	cd ${WRKSRC}/gtk+; ./configure
+
 .include <bsd.port.mk>
+
diff --git a/graphics/gimpshop/distinfo b/graphics/gimpshop/distinfo
index aeb842bef317..ed4429db6879 100644
--- a/graphics/gimpshop/distinfo
+++ b/graphics/gimpshop/distinfo
@@ -1,2 +1 @@
-MD5 (gimp961001.tgz) = f7c3971a93a7332a39d7794be491d6e7
-MD5 (gimp-data.tgz) = b13b8382e22a1664f959486132606090
+MD5 (gimp-0.99.1.tar.gz) = fc1b80922cf195d4994d11c556e4d6ec
diff --git a/graphics/gimpshop/files/patch-aa b/graphics/gimpshop/files/patch-aa
index 729403d72c4d..0ce6cf4d3acd 100644
--- a/graphics/gimpshop/files/patch-aa
+++ b/graphics/gimpshop/files/patch-aa
@@ -1,261 +1,99 @@
---- gimprc.in~	Mon Nov 18 09:56:00 1996
-+++ gimprc.in	Mon Nov 18 09:55:52 1996
-@@ -0,0 +1,258 @@
-+# Lines that start with a '#' are comments.
-+# Blank lines are ignored.
-+
-+# Set the temporary storage directory...files will appear here
-+# during the course of running the gimp.  Most files will disappear
-+# when the gimp exits, but some files are likely to remain,
-+# such as working palette files, so it is best if this directory
-+# not be one that is shared by other users or is cleared on machine
-+# reboot such as /tmp.
-+temp-path "~/.gimp/tmp"
-+
-+# Set the brush search path...this path will be searched for valid
-+#  brushes at startup.
-+brush-path "~/.gimp/brushes:@prefix@/share/gimp/brushes"
-+
-+# Specify a default brush. If none is specified it defaults to the
-+#  "1circle.gbr" brush which is just a single pixel sized brush.
-+#  The brush is searched for in the brush path.
-+default-brush "19fcircle.gbr"
-+
-+# Set the pattern search path...this path will be searched for valid
-+#  patterns at startup.
-+pattern-path "~/.gimp/patterns:@prefix@/share/gimp/patterns"
-+
-+# Specify a default pattern.
-+#  The pattern is searched for in the specified pattern paths.
-+default-pattern "wood2.pat"
-+
-+# Set the palette search path...this path will be searched for valid
-+#  palettes at startup.
-+palette-path "~/.gimp/palettes:@prefix@/share/gimp/palettes"
-+
-+# Specify a default palette.
-+#  The pattern is searched for in the specified pattern paths.
-+default-palette "Default"
-+
-+# Set the gradient search path...this path will be searched for valid
-+#  gradients at startup.
-+gradient-path "~/.gimp/gradients:@prefix@/share/gimp/gradients"
-+
-+# Specify a default gradient.
-+#  The gradient is searched for in the specified gradient paths.
-+default-gradient "German_flag_smooth"
-+
-+# Set the plug-in search path...this path will be searched for
-+#  plug-ins when the plug-in is run.
-+plug-in-path "~/.gimp/plug-ins:@prefix@/libexec/gimp/plug-ins"
-+
-+# Speed of marching ants in the selection outline
-+#  this value is in milliseconds
-+#  (less time indicates faster marching)
-+marching-ants-speed 300
-+
-+# Set the number of operations kept on the undo stack
-+undo-levels 5
-+
-+# Set the color-cube resource for dithering on 8-bit displays
-+#  The 3 values stand for Shades of red, green, and blue
-+#  Multiplying the # of shades of each primary color yields
-+#  the total number of colors that will be allocated from the
-+#  gimp colormap.  This number should not exceed 256.  Most of the
-+#  colors remaining after the allocation of the colorcube
-+#  will be left to the system palette in an effort to reduce
-+#  colormap "flashing".
-+color-cube 6, 6, 4
-+
-+# Install a GIMP colormap by default -- only for 8-bit displays
-+# install-colormap
-+
-+# Specify that marching ants for selected regions will be drawn
-+#  with colormap cycling as oposed to redrawing with different stipple masks
-+#  this color cycling option works only with 8-bit displays
-+# colormap-cycling
-+
-+# Tools such as fuzzy-select and bucket fill find regions based on a
-+#  seed-fill algorithm.  The seed fill starts at the intially selected
-+#  pixel and progresses in all directions until the difference of pixel
-+#  intensity from the original is greater than a specified threshold
-+#  ==> This value represents the default threshold
-+default-threshold 15
-+
-+# There is always a tradeoff between memory usage and speed.  In most
-+#  cases, the GIMP opts for speed over memory.  However, if memory is
-+#  a big issue, set stingy-memory-use
-+# stingy-memory-use
-+
-+# When zooming into and out of images, this option enables the
-+#  automatic resizing of windows
-+# allow-resize-windows
-+
-+# Context-dependent cursors are cool.  They are enabled by default.
-+#  However, they require overhead that you may want to do without.
-+#  Uncomment this line to disable them.
-+# no-cursor-updating
-+
-+# Layer preview sizes:
-+#  None:    no previews in layers dialog/layer selector
-+#  Small:   32x32
-+#  Medium:  64x64
-+#  Large:   128x128
-+#  #:       #x#
-+preview-size Medium
-+
-+# Controlling ruler visibility
-+#  The default behavior is for rulers to be ON
-+#  This can also be toggled with the View->Show Rulers command or shift+control+r
-+# dont-show-rulers
-+
-+# Disable auto saving
-+#  Just uncomment the line below...
-+# dont-auto-save
-+
-+# Set the gamma correction values for the display
-+#  1.0 corresponds to no gamma correction.  For most displays,
-+#  gamma correction should be set to between 2.0 and 2.6
-+#  Run the utility "gamma_correct" to determine appropriate values
-+#  for your display.
-+#
-+# One important item to keep in mind:  Many images that you might
-+#  get from outside sources will in all likelihood already be
-+#  gamma-corrected.  In these cases, the image will look washed-out
-+#  if the gimp has gamma-correction turned on.  If you are going
-+#  to work with images of this sort, turn gamma correction off
-+#  by removing this line, or setting the values to 1.0.
-+#  gamma-correction 1.0
-+#  gamma-correction 2.0
-+#                ___
-+gamma-correction 1.6
-+
-+# Set the manner in which transparency is displayed in images
-+#  Transparency type can be one of:
-+#    0: Light Checks
-+#    1: Mid-Tone Checks
-+#    2: Dark Checks
-+#    3: White Only
-+#    4: Gray Only
-+#    5: Black Only
-+#  Check size can be one of:
-+#    0: Small
-+#    1: Medium
-+#    2: Large
-+transparency-type 1
-+transparency-size 2
-+
-+# Notify the GIMP of the available file plug-ins.
-+# The format of the line is as follows:
-+#  file-plug-in <image types> <plug-in name> <plug-in title> <extensions>
-+# The `image types' argument specifies what types of images the
-+#  plug-in can save. It is a 3 digit number where each digit is 0 or
-+#  1. The digits correspond to `indexed images', `grayscale images'
-+#  and `rgb images' respectively. For example, the "jpeg" file plug-in
-+#  can save rgb and grayscale images but not indexed color, so the
-+#  image types argument is 011.
-+# The `plug-in name' is the name of the plug-in program.
-+# The `plug-in title' is the title of the program is it will appear
-+#  from the GIMP. This will most likely be the name of the plug-in.
-+# The `extensions' are a comma separated string of extensions. These
-+#  are used by the GIMP to map file names to images.
-+#  Note: case does not matter for extensions.
-+
-+file-plug-in  jpeg	011	"jpeg"		"jpg,jpeg"
-+file-plug-in  png	111	"png"		"png"
-+file-plug-in  gif	110	"gif"		"gif"
-+file-plug-in  tiff	111	"tiff"		"tiff,tif"
-+file-plug-in  tga	111	"tga"		"tga,targa"
-+file-plug-in  gbrush	010	"brush"		"gbr"
-+file-plug-in  gpattern	010	"pattern"	"pat,gpat"
-+file-plug-in  gicon	010	"gicon"		"gic,gico"
-+file-plug-in  xpm	110	"xpm"		"xpm"
-+file-plug-in  pnm	111	"pnm"		"pgm,ppm,pbm"
-+file-plug-in  matlab	010	"matlab"	"m"
-+file-plug-in  yuv411    001     "yuv"           "yuv"
-+
-+# Notify the GIMP of plug-ins that will exist in the `plug-ins' menu.
-+# The format of the line is as follows:
-+#  plug-in <plug-in name> <menu location> <accelerator>
-+# The `plug-in name' is the name of the plug-in program.
-+# The `menu location' is the item name and location in the plug-in
-+#  menu. A slash indicates a submenu. Therefore, the menu location
-+#  "Blur/Blur" specifies an item name of "Blur" in a submenu entitled
-+#  "Blur". Multiple submenus are possible. If a menu already exists
-+#  the item is simply placed in that menu. Menu items are placed in
-+#  alphabetically sorted order in menus.
-+# The `accelerator' is a string which designates a key combination
-+#  which will invoke the plug-in. The format should be clear by
-+#  inspection.  This string is optional.
-+#
-+# It is convention to only use the `alt' and `shift' key modifiers for
-+#  plug-ins. The `control' key is used as a modifier for menu items by
-+#  the main application. The main application will not use the `alt'
-+#  or `shift' key modifiers.
-+
-+plug-in blur       "Blur/Blur"
-+plug-in blur2      "Blur/Blur (variable)"        "Alt<Key>B"
-+plug-in gauss_recurse      "Blur/Gaussian Blur (IIR)"         "Shift Alt<Key>B"
-+plug-in gauss      "Blur/Gaussian Blur (RLE)"
-+plug-in mblur      "Blur/Motion Blur"
-+
-+plug-in charcoal   "Effects/Artistic/Charcoal"  "Shift Alt<Key>H"
-+plug-in cubism     "Effects/Artistic/Cubism"	"Shift Alt<Key>U"
-+plug-in mosaic     "Effects/Artistic/Mosaic"	"Alt<Key>M"
-+plug-in oilify     "Effects/Artistic/Oilify"
-+plug-in sparkle    "Effects/Artistic/Sparkle"
-+plug-in lic        "Effects/Artistic/Van-Goghify"
-+plug-in bleed      "Effects/Image/Bleed"
-+plug-in c_astretch "Effects/Image/Contrast Auto-Stretch"
-+plug-in enhance    "Effects/Image/Enhance"      "Shift Alt<Key>E"
-+plug-in gamma      "Effects/Image/Gamma"        "Alt<Key>G"
-+plug-in grayify    "Effects/Image/Grayify"
-+plug-in invert     "Effects/Image/Invert"       "Alt<Key>I"
-+plug-in solarize   "Effects/Image/Solarize"     "Alt<Key>1"
-+plug-in bumpmap    "Effects/Lighting/Bump Map"	"Alt<Key>2"
-+plug-in displace   "Effects/Lighting/Displace"	"Alt<Key>3"
-+plug-in lighting   "Effects/Lighting/Lighting"	"Alt<Key>4"
-+plug-in edge       "Effects/Misc Ops/Edge Detect"        "Alt<Key>E"
-+plug-in engrave    "Effects/Misc Ops/Engrave"
-+plug-in extrude    "Effects/Misc Ops/Extrude"
-+plug-in pixelize   "Effects/Misc Ops/Pixelize"
-+plug-in relief     "Effects/Misc Ops/Relief"    "Alt<Key>R"
-+plug-in checkerboard "Effects/Textures/Checkerboard"
-+plug-in plasma     "Effects/Textures/Plasma"
-+plug-in texture2   "Effects/Textures/Texture II"
-+
-+plug-in despeckle  "Distorts/Despeckle"
-+plug-in map_sphere "Distorts/Map Sphere"
-+plug-in noisify    "Distorts/Noise"
-+plug-in pagecurl   "Distorts/Page Curl"         "Alt<Key>U"
-+plug-in pinch      "Distorts/Pinch"             "Alt<Key>P"
-+plug-in ripple     "Distorts/Ripple"
-+plug-in shift      "Distorts/Shift"
-+plug-in spread     "Distorts/Spread"
-+plug-in whirl      "Distorts/Whirl"             "Alt<Key>W"
-+plug-in waves      "Distorts/Waves"
-+
-+plug-in compose    "Conversions/Compose"
-+plug-in decompose  "Conversions/Decompose"
-+plug-in to-color   "Conversions/To Color"       "Shift Alt<Key>C"
-+plug-in to-gray    "Conversions/To Grayscale"   "Shift Alt<Key>G"
-+plug-in to-indexed "Conversions/To Indexed"     "Shift Alt<Key>I"
-+
-+plug-in autocrop   "Transforms/Autocrop"
-+plug-in flip_horz  "Transforms/Flip Horizontal" "Alt<Key>H"
-+plug-in flip_vert  "Transforms/Flip Vertical"   "Alt<Key>V"
-+plug-in polar      "Transforms/Polar"
-+plug-in rotate     "Transforms/Rotate"
-+plug-in scale      "Transforms/Scale"           "Shift Alt<Key>S"
-+plug-in tile       "Transforms/Tile"            "Alt<Key>T"
-+plug-in tiler      "Transforms/Tiler"           "Alt<Key>T"
-+
-+plug-in blend      "Channel Ops/Blend"
-+plug-in calculations "Channel Ops/Calculations" "Alt<Key>C"
-+plug-in duplicate  "Channel Ops/Duplicate"      "Alt<Key>D"
-+plug-in offset     "Channel Ops/Offset"         "Alt<Key>O"
-+
-+plug-in netpbm	   "Miscellaneous/Netpbm Filter" "Shift Alt<Key>N"
-+plug-in rms_error  "Miscellaneous/RMS Error"
-+plug-in photocd    "Miscellaneous/Photo CD"
-+plug-in octave_srv "Miscellaneous/Octave Server"
+--- plug-ins/Makefile.in.orig	Thu Feb 27 05:41:52 1997
++++ plug-ins/Makefile.in	Thu Feb 27 08:46:09 1997
+@@ -28,6 +28,7 @@
+ 
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
++pkglibexecdir = $(libexecdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ 
+ top_builddir = ..
+@@ -58,7 +59,7 @@
+ X_LDFLAGS =
+ X_LIBS =
+ 
+-pluginlibdir = $(pkglibdir)/plug-ins
++pluginlibdir = $(pkglibexecdir)/plug-ins
+ 
+ pluginlib_PROGRAMS =	\
+ 	blur		\
+--- ./app/batch.c~	Mon Feb 24 14:38:51 1997
++++ ./app/batch.c	Wed Feb 26 08:51:05 1997
+@@ -3,7 +3,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-
++#include <errno.h>
+ #include "appenv.h"
+ #include "app_procs.h"
+ #include "batch.h"
+--- ./app/xcf.c~	Wed Feb 26 05:21:25 1997
++++ ./app/xcf.c	Wed Feb 26 09:07:30 1997
+@@ -1,3 +1,4 @@
++#include <sys/types.h>
+ #include <netinet/in.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+--- configure.orig	Thu Feb 27 09:55:32 1997
++++ configure	Thu Feb 27 09:55:40 1997
+@@ -609,7 +609,7 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-
++INSTALL_SCRIPT="/usr/bin/install -c -m 755"
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
+ 
+@@ -2040,7 +2040,7 @@
+ CFLAGS="$OPTFLAG $CFLAGS"
+ 
+ gimpdatadir=$datadir/$PACKAGE
+-gimpplugindir=$libdir/$PACKAGE
++gimpplugindir=$libexecdir/$PACKAGE
+ 
+ 
+ 
+--- gtk+/configure~	Thu Feb 27 03:09:52 1997
++++ gtk+/configure	Thu Feb 27 15:10:18 1997
+@@ -569,6 +569,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:572: checking for a BSD compatible install" >&5
++INSTALL="/usr/bin/install -c"
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+--- gtk+/glib/configure~	Thu Feb 27 15:32:15 1997
++++ gtk+/glib/configure	Thu Feb 27 15:32:47 1997
+@@ -559,6 +559,7 @@
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:562: checking for a BSD compatible install" >&5
++INSTALL="/usr/bin/install -c"
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+--- plug-ins/script-fu/Makefile.in.orig	Thu Feb 27 20:47:10 1997
++++ plug-ins/script-fu/Makefile.in	Thu Feb 27 20:46:30 1997
+@@ -59,7 +59,7 @@
+ 
+ SUBDIRS = scripts
+ 
+-pluginlibdir = $(pkglibdir)/plug-ins
++pluginlibdir = $(gimpplugindir)/plug-ins
+ 
+ pluginlib_PROGRAMS = script-fu
+
+*** /tmp/gimp-0.99.1/app/gimprc.c	Thu Feb 27 06:43:10 1997
+--- ./app/gimprc.c	Thu Feb 27 16:41:19 1997
+***************
+*** 159,161 ****
+  
+!   sprintf (libfilename, "%s/gimprc", LIBDIR);
+    parse_gimprc_file (libfilename);
+--- 159,161 ----
+  
+!   sprintf (libfilename, "%s/gimprc", DATADIR);
+    parse_gimprc_file (libfilename);
diff --git a/graphics/gimpshop/files/patch-ab b/graphics/gimpshop/files/patch-ab
index ac5e5976e46c..f4579f768d02 100644
--- a/graphics/gimpshop/files/patch-ab
+++ b/graphics/gimpshop/files/patch-ab
@@ -1,49 +1,96 @@
---- app/fileops.c~	Mon Nov 18 09:57:19 1996
-+++ app/fileops.c	Mon Nov 18 09:58:01 1996
-@@ -289,7 +289,7 @@
-       gtk_file_selection_set_ok_callback (filesel, file_open_ok_callback, open_options);
-       gtk_file_selection_set_cancel_callback (filesel, file_cancel_callback, open_options);
- 
--      if (gdisp && gdisp->gimage->has_filename)
-+      if (gdisp && gdisp->gimage && gdisp->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisp->gimage));
- 
-       gtk_widget_show (filesel);
-@@ -297,7 +297,7 @@
- 
-   if (! GTK_WIDGET_VISIBLE (filesel))
-     {
--      if (gdisp && gdisp->gimage->has_filename)
-+      if (gdisp && gdisp->gimage && gdisp->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisp->gimage));
-       gtk_widget_show (filesel);
-     }
-@@ -353,7 +353,7 @@
-       gtk_file_selection_set_ok_callback (filesel, file_save_ok_callback, save_options);
-       gtk_file_selection_set_cancel_callback (filesel, file_cancel_callback, save_options);
- 
--      if (gdisplay && gdisplay->gimage->has_filename)
-+      if (gdisplay && gdisplay->gimage && gdisplay->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisplay->gimage));
- 
-       gtk_widget_show (filesel);
-@@ -363,7 +363,7 @@
- 
-   if (! GTK_WIDGET_VISIBLE (filesel))
-     {
--      if (gdisplay && gdisplay->gimage->has_filename)
-+      if (gdisplay && gdisplay->gimage && gdisplay->gimage->has_filename)
- 	gtk_file_selection_set_filename (filesel, gimage_filename (gdisplay->gimage));
- 
-       gtk_widget_show (filesel);
---- app/progress.c~	Mon Nov 18 11:03:58 1996
-+++ app/progress.c	Mon Nov 18 11:04:07 1996
-@@ -57,7 +57,7 @@
-   progress->callback_data = callback_data;
-   progress->pixmap = NULL;
- 
--  progress->shell = gtk_window_new (title, GTK_WINDOW_TOPLEVEL);
-+  progress->shell = gtk_window_new (title, GTK_WINDOW_DIALOG);
-   gtk_widget_set_uposition (progress->shell, progress_x, progress_y);
-   main_vbox = gtk_vbox_new (FALSE, 5);
-   gtk_container_add (progress->shell, main_vbox);
+--- plug-ins/script-fu/scripts/Makefile.in.orig	Fri Feb 28 09:09:07 1997
++++ plug-ins/script-fu/scripts/Makefile.in	Fri Feb 28 09:07:40 1997
+@@ -51,17 +51,17 @@
+ scriptdatadir = $(pkgdatadir)/scripts
+ 
+ scriptdata_DATA = \
+-	alien-glow.scm		\
+-	bds-logo-textured.scm	\
+-	blend-logo.scm		\
+-	chrome.scm		\
+-	chrome-it.scm		\
+-	chrome2.scm		\
+-	ds-logo.scm		\
+-	frozen-text.scm		\
+-	hds-logo.scm		\
+-	neon.scm		\
+-	sphere.scm		\
++	alien-glow.sed		\
++	bds-logo-textured.sed	\
++	blend-logo.sed		\
++	chrome.sed		\
++	chrome-it.sed		\
++	chrome2.sed		\
++	ds-logo.sed		\
++	frozen-text.sed		\
++	hds-logo.sed		\
++	neon.sed		\
++	sphere.sed		\
+ 	beavis.jpg
+ 
+ EXTRA_DIST = $(scriptdata_DATA)
+@@ -79,7 +79,7 @@
+ TAR = tar
+ default: all
+ 
+-.SUFFIXES:
++.SUFFIXES: .sed
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL) 
+ 	cd $(top_srcdir) && automake --gnu plug-ins/script-fu/scripts/Makefile
+ 
+@@ -87,17 +87,18 @@
+ 	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
+-
+ install-scriptdataDATA: $(scriptdata_DATA)
+ 	$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(scriptdatadir)
+-	@list="$(scriptdata_DATA)"; for p in $$list; do \
+-	  if test -f $(srcdir)/$$p; then \
+-	    echo "$(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(scriptdatadir)/$$p; \
+-	  else if test -f $$p; then \
+-	    echo "$(INSTALL_DATA) $$p $(scriptdatadir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(scriptdatadir)/$$p; \
++	@list="$(scriptdata_DATA)"; for s in $$list; do \
++	  p=$$(basename $$s .sed); \
++	  if [ $$p != $$s ]; then p=$$p.scm; fi; \
++	  if test -f $(srcdir)/$$s; then \
++	    echo "$(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p"; \
++	    $(INSTALL_DATA) $(srcdir)/$$s $(scriptdatadir)/$$p; \
++	  else if test -f $$s; then \
++	    echo "$(INSTALL_DATA) $$s $(scriptdatadir)/$$p"; \
++	    $(INSTALL_DATA) $$s $(scriptdatadir)/$$p; \
+ 	  fi; fi; \
+ 	done
+ 
+@@ -184,3 +184,7 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
++
++
++%.sed : %.scm
++	sed 's,@_prefix_@,${prefix},' $< > $@
+--- plug-ins/script-fu/scripts/chrome-it.scm.orig	Wed Feb 26 22:51:31 1997
++++ plug-ins/script-fu/scripts/chrome-it.scm	Fri Feb 28 09:01:38 1997
+@@ -153,5 +153,5 @@
+     (gimp-displays-flush)
+     (gimp-image-enable-undo img)))
+ 
+-(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
+-(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Gold Trim)" "Input Image" "1" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-it" "SOTA Chrome-IT (Copper Trim)" "Input Image" "1" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
+--- plug-ins/script-fu/scripts/chrome2.scm.orig	Wed Feb 26 20:57:57 1997
++++ plug-ins/script-fu/scripts/chrome2.scm	Fri Feb 28 09:01:38 1997
+@@ -161,6 +161,6 @@
+     (gimp-image-enable-undo img)
+     (gimp-display-new img)))
+ 
+-(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Gold Trim)" "Highlight Color" "'(211 95 0)" "Chrome Color" "'(0 27 209)" "Chrome Saturation" "-80" "Chrome Lightness" "-47" "Chrome Factor" "0.75" "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"GoodCityModern(kbd)\"" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
+ 
+-(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "sota-chrome-logo" "SOTA Chromed Logos (Copper Trim)" "Highlight Color" "'(220 50 -20)" "Chrome Color" "'(0 0 0)" "Chrome Saturation" "0" "Chrome Lightness" "0" "Chrome Factor" "0.75"  "Text String" "\"The GIMP\"" "Font Size (in pixels)" "150" "Font" "\"RoostHeavy\"" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
diff --git a/graphics/gimpshop/files/patch-ac b/graphics/gimpshop/files/patch-ac
deleted file mode 100644
index 7e5a1845afe1..000000000000
--- a/graphics/gimpshop/files/patch-ac
+++ /dev/null
@@ -1,61 +0,0 @@
---- configure~	Mon Nov 18 10:20:48 1996
-+++ configure	Mon Nov 18 10:21:54 1996
-@@ -2324,7 +2324,7 @@
- EOF
- cat >> $CONFIG_STATUS <<EOF
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile app/Makefile plug-ins/Makefile"}
-+CONFIG_FILES=\${CONFIG_FILES-"Makefile app/Makefile plug-ins/Makefile gimprc"}
- EOF
- cat >> $CONFIG_STATUS <<\EOF
- for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
---- configure.in~	Mon Nov 18 10:37:13 1996
-+++ configure.in	Mon Nov 18 10:37:25 1996
-@@ -221,4 +221,4 @@
- AC_SUBST(_SHLIBS_)
- 
- dnl Output the Makefiles
--AC_OUTPUT(Makefile app/Makefile plug-ins/Makefile)
-+AC_OUTPUT(Makefile app/Makefile plug-ins/Makefile gimprc)
---- Makefile.in~	Mon Nov 18 11:11:16 1996
-+++ Makefile.in	Mon Nov 18 11:12:22 1996
-@@ -16,7 +16,7 @@
- # set the MAKE variable if necessary
- @SET_MAKE@
- 
--INSTALL	=	./install-sh -c
-+INSTALL	=	/usr/bin/install -c
- 
- all:
- 	( cd gtk ; $(MAKE) )
-@@ -24,22 +24,22 @@
- 	( cd app ; $(MAKE) )
- 
- install:
--	$(INSTALL) -d $(libdir)/gimp
--	$(INSTALL) -d $(libdir)/gimp/brushes
--	$(INSTALL) -m 644 gimprc $(libdir)/gimp
-+	$(INSTALL) -d $(datadir)/gimp
-+	$(INSTALL) -d $(datadir)/gimp/brushes
-+	$(INSTALL) -m 644 gimprc $(datadir)/gimp
- 	for brush in brushes/*; do \
-           echo $$brush; \
--	  $(INSTALL) -m 644 "$$brush" $(libdir)/gimp/brushes; \
-+	  $(INSTALL) -m 644 "$$brush" $(datadir)/gimp/brushes; \
- 	done
--	$(INSTALL) -d $(libdir)/gimp/palettes
-+	$(INSTALL) -d $(datadir)/gimp/palettes
- 	for palette in palettes/*; do \
-           echo $$palette; \
--	  $(INSTALL) -m 644 "$$palette" $(libdir)/gimp/palettes; \
-+	  $(INSTALL) -m 644 "$$palette" $(datadir)/gimp/palettes; \
- 	done
--	$(INSTALL) -d $(libdir)/gimp/patterns
-+	$(INSTALL) -d $(datadir)/gimp/patterns
- 	for pattern in patterns/*; do \
-           echo $$pattern; \
--	  $(INSTALL) -m 644 "$$pattern" $(libdir)/gimp/patterns; \
-+	  $(INSTALL) -m 644 "$$pattern" $(datadir)/gimp/patterns; \
- 	done
- 	( cd plug-ins ; $(MAKE) install )
- 	( cd app ; $(MAKE) install )
diff --git a/graphics/gimpshop/files/patch-ah b/graphics/gimpshop/files/patch-ah
deleted file mode 100644
index 8e508d8ad219..000000000000
--- a/graphics/gimpshop/files/patch-ah
+++ /dev/null
@@ -1,208 +0,0 @@
---- app/autodialog.c.old	Fri Nov 22 15:46:44 1996
-+++ app/autodialog.c	Fri Nov 22 18:08:40 1996
-@@ -49,7 +49,7 @@
- /*  Local functions  */
- static AutoDialogItem dialog_find_item (AutoDialog, int);
- static void dialog_delete_children (AutoDialog, AutoDialogItem);
--static GtkWidget *dialog_create_image_menu (AutoDialog, char *, gpointer,
-+static GtkWidget *dialog_create_image_menu (AutoDialog, AutoDialogItem, char *, gpointer,
- 					    GtkWidget **, GtkWidget **);
- 
- /*  Callback and Update functions  */
-@@ -171,7 +171,8 @@
- 	{
- 	  dlgitem = tmplink->data;
- 	  tmplink = tmplink->next;
--
-+    if (dlgitem->additional_data!=NULL)
-+      xfree(dlgitem->additional_data);
- 	  xfree (dlgitem);
- 	}
-       free_list (dlg->items);
-@@ -206,6 +207,7 @@
-   item->item_ID = dlg->next_item_ID++;
-   item->item_type = type;
-   memset (item->data, 0, 32);
-+  item->additional_data=NULL;
-   item->parent = parent_item;
-   item->children = NULL;
-   item->gtk_data = NULL;
-@@ -276,7 +278,7 @@
-       break;
- 
-     case ITEM_IMAGE_MENU:
--      item_widget = dialog_create_image_menu (dlg, data, extra, &option_menu, &menu);
-+      item_widget = dialog_create_image_menu (dlg, item, data, extra, &option_menu, &menu);
-       break;
- 
-     case ITEM_SCALE:
-@@ -500,7 +502,8 @@
- 	}
-       else
- 	gtk_widget_destroy (item->widget);
--
-+      if (item->additional_data!=NULL)
-+        xfree(item->additional_data);
-       xfree (item);
-     }
- }
-@@ -577,9 +580,32 @@
-     free_list (item->children);
- }
- 
-+typedef struct {
-+  GtkWidget *widget;
-+  long data[2];
-+} _MenuItemData;
-+
-+gint CheckConstrains(GImage *gimage,GImage *constrain,guchar constraint)
-+{
-+  if (((constraint & IMAGE_CONSTRAIN_RGB) &&
-+       (gimage_type (gimage) == RGB_GIMAGE ||
-+	      gimage_type (gimage) == RGBA_GIMAGE)) ||
-+	    ((constraint & IMAGE_CONSTRAIN_GRAY) &&
-+	     (gimage_type (gimage) == GRAY_GIMAGE ||
-+	      gimage_type (gimage) == GRAYA_GIMAGE)) ||
-+	    ((constraint & IMAGE_CONSTRAIN_INDEXED) &&
-+	     (gimage_type (gimage) == INDEXED_GIMAGE ||
-+	      gimage_type (gimage) == INDEXEDA_GIMAGE)))
-+    if ((gimage->width == constrain->width) &&
-+	      (gimage->height == constrain->height))
-+      return(TRUE);
-+  return(FALSE); 
-+}
-+
- static GtkWidget *
--dialog_create_image_menu (dlg, title, image, option_menu, menu)
-+dialog_create_image_menu (dlg, item, title, image, option_menu, menu)
-      AutoDialog dlg;
-+     AutoDialogItem item;
-      char *title;
-      void *image;
-      GtkWidget **option_menu;
-@@ -597,8 +623,8 @@
-   char constraint;
-   link_ptr tmp;
-   long ID;
--  long *data;
-   int num_items = 0;
-+  _MenuItemData *ItemData;
- 
-   hbox = gtk_hbox_new (FALSE, 4);
-   gtk_container_set_border_width (hbox, 0);
-@@ -614,43 +640,55 @@
-   constrain = (ID == 0) ? image : gimage_get_ID (ID);
- 
-   tmp = image_list;
-+
-+  /* Check how many images fit the criteria */
-+  /* ====================================== */
-+
-   while (tmp)
-     {
-       gimage = tmp->data;
-       tmp = next_item (tmp);
--
--      if (((constraint & IMAGE_CONSTRAIN_RGB) &&
--	   (gimage_type (gimage) == RGB_GIMAGE ||
--	    gimage_type (gimage) == RGBA_GIMAGE)) ||
--	  ((constraint & IMAGE_CONSTRAIN_GRAY) &&
--	   (gimage_type (gimage) == GRAY_GIMAGE ||
--	    gimage_type (gimage) == GRAYA_GIMAGE)) ||
--	  ((constraint & IMAGE_CONSTRAIN_INDEXED) &&
--	   (gimage_type (gimage) == INDEXED_GIMAGE ||
--	    gimage_type (gimage) == INDEXEDA_GIMAGE)))
--	if ((gimage->width == constrain->width) &&
--	    (gimage->height == constrain->height))
--	  {
--	    image_name = prune_filename (gimage_filename (gimage));
--	    menu_item_label = (char *) xmalloc (strlen (image_name) + 15);
--	    sprintf (menu_item_label, "%s-%d", image_name, gimage->ID);
--	    menu_item = gtk_menu_item_new_with_label (menu_item_label);
--	    gtk_callback_add (gtk_menu_item_get_state (menu_item),
--			      dialog_image_menu_callback, dlg);
--	    gtk_container_add (*menu, menu_item);
--	    gtk_widget_show (menu_item);
--
--	    data = xmalloc (sizeof (long) * 2);
--	    data[0] = dlg->next_item_ID - 1;
--	    data[1] = (gimage->ID == constrain->ID) ? 0 : gimage->ID;
--	    dlg->additional_data = data;
--
--	    xfree (menu_item_label);
--	    num_items ++;
--	  }
-+      if (CheckConstrains(gimage,constrain,constraint)==TRUE)
-+        num_items++;      
-     }
- 
--  if (!num_items)
-+  /* If we found any matches, allocate memory to hold      */
-+  /* callback data. Put a pointer in "item" to avoid leak. */
-+  /* ===================================================== */
-+  
-+  if (num_items>0)
-+    {
-+      ItemData=(_MenuItemData *)xmalloc(sizeof(_MenuItemData)*(size_t)num_items);
-+      item->additional_data=ItemData;
-+
-+      tmp=image_list;
-+      num_items=0;
-+      while (tmp)
-+        {
-+          gimage = tmp->data;
-+          tmp = next_item (tmp);
-+          if (CheckConstrains(gimage,constrain,constraint)==TRUE)
-+	          {
-+	            image_name = prune_filename (gimage_filename (gimage));
-+	            menu_item_label = (char *) xmalloc (strlen (image_name) + 15);
-+	            sprintf (menu_item_label, "%s-%d", image_name, gimage->ID);
-+      
-+              ItemData[num_items].widget=hbox;
-+              ItemData[num_items].data[0] = dlg->next_item_ID - 1;
-+              ItemData[num_items].data[1] = (gimage->ID == constrain->ID) ? 0 : gimage->ID;
-+      
-+	            menu_item = gtk_menu_item_new_with_label (menu_item_label);
-+	            gtk_callback_add (gtk_menu_item_get_state (menu_item),dialog_image_menu_callback,
-+                (gpointer)&ItemData[num_items]);
-+	            gtk_container_add (*menu, menu_item);
-+	            gtk_widget_show (menu_item);
-+      
-+	            xfree (menu_item_label);
-+	            num_items ++;
-+	          }
-+        }
-+    }
-+  else
-     {
-       menu_item = gtk_menu_item_new_with_label ("none");
-       gtk_container_add (*menu, menu_item);
-@@ -669,14 +707,14 @@
-      gpointer client_data;
-      gpointer call_data;
- {
-+  _MenuItemData *ItemData;
-   AutoDialog dlg;
--  long *data;
- 
--  dlg = client_data;
--  data = (long *) dlg->additional_data;
-+  ItemData=(_MenuItemData *)client_data;
-+  dlg = (AutoDialog) gtk_widget_get_user_data (ItemData->widget);
- 
-   if (dlg->callback)
--    (* dlg->callback) (dlg->dialog_ID, data[0], dlg->callback_data, &data[1]);
-+    (* dlg->callback) (dlg->dialog_ID,ItemData->data[0],dlg->callback_data,&ItemData->data[1]);
- }
- 
- static void
---- app/autodialog.h.old	Fri Nov 22 15:46:47 1996
-+++ app/autodialog.h	Fri Nov 22 17:21:19 1996
-@@ -49,6 +49,7 @@
-   int             item_ID;
-   int             item_type;
-   char            data[32];
-+  void           *additional_data;
-   AutoDialogItem  parent;
-   link_ptr        children;
-   GtkWidget      *widget;
diff --git a/graphics/gimpshop/pkg-plist b/graphics/gimpshop/pkg-plist
index ef35558b371c..a854e9786565 100644
--- a/graphics/gimpshop/pkg-plist
+++ b/graphics/gimpshop/pkg-plist
@@ -1,4 +1,130 @@
 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/gtk/gtk.h
+include/gtk/gtkaccelerator.h
+include/gtk/gtkadjustment.h
+include/gtk/gtkalignment.h
+include/gtk/gtkarrow.h
+include/gtk/gtkbin.h
+include/gtk/gtkbox.h
+include/gtk/gtkbutton.h
+include/gtk/gtkcanvas.h
+include/gtk/gtkcheckbutton.h
+include/gtk/gtkcontainer.h
+include/gtk/gtkdata.h
+include/gtk/gtkdialog.h
+include/gtk/gtkdrawingarea.h
+include/gtk/gtkentry.h
+include/gtk/gtkenums.h
+include/gtk/gtkfilesel.h
+include/gtk/gtkfill.h
+include/gtk/gtkframe.h
+include/gtk/gtkgc.h
+include/gtk/gtkhbox.h
+include/gtk/gtkhruler.h
+include/gtk/gtkhscale.h
+include/gtk/gtkhscrollbar.h
+include/gtk/gtkhseparator.h
+include/gtk/gtkimage.h
+include/gtk/gtkitem.h
+include/gtk/gtklabel.h
+include/gtk/gtklist.h
+include/gtk/gtklistitem.h
+include/gtk/gtkmain.h
+include/gtk/gtkmenu.h
+include/gtk/gtkmenubar.h
+include/gtk/gtkmenufactory.h
+include/gtk/gtkmenuitem.h
+include/gtk/gtkmenushell.h
+include/gtk/gtkmisc.h
+include/gtk/gtknotebook.h
+include/gtk/gtkobject.h
+include/gtk/gtkoptionmenu.h
+include/gtk/gtkpixmap.h
+include/gtk/gtkpreview.h
+include/gtk/gtkprogressbar.h
+include/gtk/gtkradiobutton.h
+include/gtk/gtkrange.h
+include/gtk/gtkrc.h
+include/gtk/gtkruler.h
+include/gtk/gtkscale.h
+include/gtk/gtkscrollbar.h
+include/gtk/gtkscrolledwindow.h
+include/gtk/gtkseparator.h
+include/gtk/gtksignal.h
+include/gtk/gtkstyle.h
+include/gtk/gtktable.h
+include/gtk/gtktext.h
+include/gtk/gtktogglebutton.h
+include/gtk/gtktree.h
+include/gtk/gtktreeitem.h
+include/gtk/gtktypeutils.h
+include/gtk/gtkvbox.h
+include/gtk/gtkviewport.h
+include/gtk/gtkvruler.h
+include/gtk/gtkvscale.h
+include/gtk/gtkvscrollbar.h
+include/gtk/gtkvseparator.h
+include/gtk/gtkwidget.h
+include/gtk/gtkwindow.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.0.0
+lib/libgimp.a
+lib/libgimp.la
+lib/libgimp.so
+lib/libgimp.so.0.0
+lib/libgimpi.a
+lib/libgimpi.la
+lib/libgimpi.so
+lib/libgimpi.so.0.0
+lib/libgimpui.a
+lib/libgimpui.la
+lib/libgimpui.so
+lib/libgimpui.so.0.0
+lib/libglib.a
+lib/libglib.la
+lib/libglib.so
+lib/libglib.so.0.0
+lib/libgtk.a
+lib/libgtk.la
+lib/libgtk.so
+lib/libgtk.so.0.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/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/whirl
 share/gimp/brushes/11circle.gbr
 share/gimp/brushes/11fcircle.gbr
 share/gimp/brushes/13circle.gbr
@@ -61,7 +187,17 @@ 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
@@ -95,13 +231,13 @@ share/gimp/patterns/leopard.pat
 share/gimp/patterns/lumps.pat
 share/gimp/patterns/marble1.pat
 share/gimp/patterns/marble2.pat
-share/gimp/patterns/pj.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
@@ -113,79 +249,26 @@ share/gimp/patterns/wax.pat
 share/gimp/patterns/wood1.pat
 share/gimp/patterns/wood2.pat
 share/gimp/patterns/wood3.pat
-libexec/gimp/plug-ins/autocrop
-libexec/gimp/plug-ins/bleed
-libexec/gimp/plug-ins/blend
-libexec/gimp/plug-ins/blur
-libexec/gimp/plug-ins/blur2
-libexec/gimp/plug-ins/brightness
-libexec/gimp/plug-ins/bumpmap
-libexec/gimp/plug-ins/c_astretch
-libexec/gimp/plug-ins/calculations
-libexec/gimp/plug-ins/charcoal
-libexec/gimp/plug-ins/checkerboard
-libexec/gimp/plug-ins/compose
-libexec/gimp/plug-ins/cubism
-libexec/gimp/plug-ins/darken
-libexec/gimp/plug-ins/decompose
-libexec/gimp/plug-ins/despeckle
-libexec/gimp/plug-ins/displace
-libexec/gimp/plug-ins/duplicate
-libexec/gimp/plug-ins/edge
-libexec/gimp/plug-ins/engrave
-libexec/gimp/plug-ins/enhance
-libexec/gimp/plug-ins/extrude
-libexec/gimp/plug-ins/flip_horz
-libexec/gimp/plug-ins/flip_vert
-libexec/gimp/plug-ins/gamma
-libexec/gimp/plug-ins/gauss
-libexec/gimp/plug-ins/gauss_recurse
-libexec/gimp/plug-ins/gbrush
-libexec/gimp/plug-ins/gbrush-old
-libexec/gimp/plug-ins/gicon
-libexec/gimp/plug-ins/gif
-libexec/gimp/plug-ins/gpattern
-libexec/gimp/plug-ins/grayify
-libexec/gimp/plug-ins/invert
-libexec/gimp/plug-ins/jpeg
-libexec/gimp/plug-ins/lic
-libexec/gimp/plug-ins/lighten
-libexec/gimp/plug-ins/lighting
-libexec/gimp/plug-ins/map_sphere
-libexec/gimp/plug-ins/matlab
-libexec/gimp/plug-ins/mblur
-libexec/gimp/plug-ins/mosaic
-libexec/gimp/plug-ins/netpbm
-libexec/gimp/plug-ins/noisify
-libexec/gimp/plug-ins/octave_srv
-libexec/gimp/plug-ins/offset
-libexec/gimp/plug-ins/oilify
-libexec/gimp/plug-ins/pagecurl
-libexec/gimp/plug-ins/photocd
-libexec/gimp/plug-ins/pinch
-libexec/gimp/plug-ins/pixelize
-libexec/gimp/plug-ins/plasma
-libexec/gimp/plug-ins/png
-libexec/gimp/plug-ins/pnm
-libexec/gimp/plug-ins/polar
-libexec/gimp/plug-ins/tga
-libexec/gimp/plug-ins/relief
-libexec/gimp/plug-ins/ripple
-libexec/gimp/plug-ins/rms_error
-libexec/gimp/plug-ins/rotate
-libexec/gimp/plug-ins/shift
-libexec/gimp/plug-ins/spread
-libexec/gimp/plug-ins/scale
-libexec/gimp/plug-ins/solarize
-libexec/gimp/plug-ins/sparkle
-libexec/gimp/plug-ins/texture2
-libexec/gimp/plug-ins/tiff
-libexec/gimp/plug-ins/tile
-libexec/gimp/plug-ins/tiler
-libexec/gimp/plug-ins/to-gray
-libexec/gimp/plug-ins/to-color
-libexec/gimp/plug-ins/to-indexed
-libexec/gimp/plug-ins/waves
-libexec/gimp/plug-ins/whirl
-libexec/gimp/plug-ins/xpm
-libexec/gimp/plug-ins/yuv411
+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/ds-logo.scm
+share/gimp/scripts/frozen-text.scm
+share/gimp/scripts/hds-logo.scm
+share/gimp/scripts/neon.scm
+share/gimp/scripts/sphere.scm
+share/gimp/user_install
+@dirrm include/gdk
+@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