patches that should have been committed yesterday

Pointed-out-by:	Satoshi

3 files changed, 366 insertions, 337 deletions

diff --git a/graphics/gimp/files/patch-aa b/graphics/gimp/files/patch-aa
index 112021d381c2..733e3e044551 100644
--- a/graphics/gimp/files/patch-aa
+++ b/graphics/gimp/files/patch-aa
@@ -1,88 +1,250 @@
---- 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 @@
+--- /a/gimp-0.99.6/ltmain.sh	Wed Feb 26 03:39:50 1997
++++ ltmain.sh	Wed Mar 12 20:20:40 1997
+@@ -334,7 +335,9 @@
+ 	  exit 1
+ 	  ;;
+ 	esac
+-	deplibs="$deplibs $arg"
++	compile_shlibpath="$compile_shlibpath$dir:"
++	printf "compile_shlibpath: $compile_shlibpath\n"
++	arg=""
+ 	;;
  
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+       -l*) deplibs="$deplibs $arg" ;;
+--- /a/gimp-0.99.6/gtk+/ltmain.sh	Wed Feb 26 03:39:50 1997
++++ gtk+/ltmain.sh	Wed Mar 12 20:20:40 1997
+@@ -334,7 +335,9 @@
+ 	  exit 1
+ 	  ;;
+ 	esac
+-	deplibs="$deplibs $arg"
++	compile_shlibpath="$compile_shlibpath$dir:"
++	printf "compile_shlibpath: $compile_shlibpath\n"
++	arg=""
+ 	;;
+ 
+       -l*) deplibs="$deplibs $arg" ;;
+--- /a/gimp-0.99.6/gtk+/glib/ltmain.sh	Wed Feb 26 03:39:50 1997
++++ gtk+/glib/ltmain.sh	Wed Mar 12 20:20:40 1997
+@@ -334,7 +335,9 @@
+ 	  exit 1
+ 	  ;;
+ 	esac
+-	deplibs="$deplibs $arg"
++	compile_shlibpath="$compile_shlibpath$dir:"
++	printf "compile_shlibpath: $compile_shlibpath\n"
++	arg=""
+ 	;;
+ 
+       -l*) deplibs="$deplibs $arg" ;;
+--- /a/gimp-0.99.6/gtk+/gtk/Makefile.am	Mon Mar 10 05:58:16 1997
++++ gtk+/gtk/Makefile.am	Wed Mar 12 21:10:32 1997
+@@ -149,23 +149,23 @@
+ X_LIBS = @x_libs@
+ 
+ EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
++INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
+-INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
+ 
+ noinst_PROGRAMS = testgtk simple
+ testgtk_LDADD = \
+ 	libgtk.la				\
+ 	$(top_builddir)/gdk/libgdk.la		\
++	$(top_builddir)/glib/libglib.la		\
+ 	$(X_LDFLAGS)				\
+ 	$(X_LIBS)				\
+-	$(top_builddir)/glib/libglib.la		\
+ 	-lm
  
--
-+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.orig	Sun Mar  2 09:06:35 1997
-+++ gtk+/configure	Sun Mar  2 09:06:48 1997
-@@ -570,6 +570,7 @@
- # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
- # ./install, which can be erroneously created by make from ./install.sh.
- echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-+INSTALL="/usr/bin/install -c"
- echo "configure:574: checking for a BSD compatible install" >&5
- if test -z "$INSTALL"; then
- if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
---- gtk+/glib/configure.orig	Sun Mar  2 09:07:07 1997
-+++ gtk+/glib/configure	Sun Mar  2 09:07:22 1997
-@@ -561,6 +561,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:564: 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
+ simple_LDADD = \
+ 	libgtk.la				\
+ 	$(top_builddir)/gdk/libgdk.la		\
++	$(top_builddir)/glib/libglib.la		\
+ 	$(X_LDFLAGS)				\
+ 	$(X_LIBS)				\
+-	$(top_builddir)/glib/libglib.la		\
+ 	-lm
 
+ 
+--- /a/gimp-0.99.6/gtk+/gtk/Makefile.in	Mon Mar 10 07:13:59 1997
++++ gtk+/gtk/Makefile.in	Wed Mar 12 21:09:50 1997
+@@ -198,23 +198,23 @@
+ X_LIBS = @x_libs@
+ 
+ EXTRA_DIST = line-arrow.xbm line-wrap.xbm testgtkrc
++INCLUDES = -I$(top_srcdir) $(X_CFLAGS)
+-INCLUDES = $(X_CFLAGS) -I$(top_srcdir)
+ 
+ noinst_PROGRAMS = testgtk simple
+ testgtk_LDADD = \
+ 	libgtk.la				\
+ 	$(top_builddir)/gdk/libgdk.la		\
++	$(top_builddir)/glib/libglib.la		\
+ 	$(X_LDFLAGS)				\
+ 	$(X_LIBS)				\
+-	$(top_builddir)/glib/libglib.la		\
+ 	-lm
+ 
+ simple_LDADD = \
+ 	libgtk.la				\
+ 	$(top_builddir)/gdk/libgdk.la		\
++	$(top_builddir)/glib/libglib.la		\
+ 	$(X_LDFLAGS)				\
+ 	$(X_LIBS)				\
+-	$(top_builddir)/glib/libglib.la		\
+ 	-lm
+ 
+ DEPS = \
+ DEPS = \
+--- /a/gimp-0.99.6/plug-ins/Makefile.am	Mon Mar 10 06:36:32 1997
++++ plug-ins/Makefile.am	Wed Mar 12 21:49:12 1997
+@@ -43,9 +43,9 @@
+ mosaic_SOURCES = mosaic.c mosaic_logo.h
+ 
+ INCLUDES = \
+-	$(X_CFLAGS)			\
+ 	-I$(top_srcdir)			\
+ 	-I$(top_srcdir)/gtk+		\
++	$(X_CFLAGS)			\
+ 	-I/usr/local/include
+ 
+ x_LDADD = \
+--- /a/gimp-0.99.6/plug-ins/Makefile.in	Mon Mar 10 07:13:47 1997
++++ plug-ins/Makefile.in	Wed Mar 12 21:48:51 1997
+@@ -89,9 +89,9 @@
+ mosaic_SOURCES = mosaic.c mosaic_logo.h
+ 
+ INCLUDES = \
+-	$(X_CFLAGS)			\
+ 	-I$(top_srcdir)			\
+ 	-I$(top_srcdir)/gtk+		\
++	$(X_CFLAGS)			\
+ 	-I/usr/local/include
+ 
+ x_LDADD = \
+--- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.am	Mon Mar 10 06:36:21 1997
++++ plug-ins/script-fu/Makefile.am	Wed Mar 12 21:52:31 1997
+@@ -29,9 +29,9 @@
+ 	siodp.h
+ 
+ INCLUDES = \
+-	$(X_CFLAGS)			\
+ 	-I$(top_srcdir)			\
+-	-I$(top_srcdir)/gtk+
++	-I$(top_srcdir)/gtk+    \
++	$(X_CFLAGS)
+ 
+ LDADD = \
+ 	$(top_builddir)/libgimp/libgimp.la	\
+--- /a/gimp-0.99.6/plug-ins/script-fu/Makefile.in	Mon Mar 10 07:13:48 1997
++++ plug-ins/script-fu/Makefile.in	Wed Mar 12 21:52:47 1997
+@@ -76,9 +76,9 @@
+ 	siodp.h
+ 
+ INCLUDES = \
+-	$(X_CFLAGS)			\
+ 	-I$(top_srcdir)			\
+-	-I$(top_srcdir)/gtk+
++	-I$(top_srcdir)/gtk+    \
++	$(X_CFLAGS)
+ 
+ LDADD = \
+ 	$(top_builddir)/libgimp/libgimp.la	\
+--- /a/gimp-0.99.6/app/Makefile.am	Mon Mar 10 06:36:39 1997
++++ app/Makefile.am	Wed Mar 12 21:58:49 1997
+@@ -267,21 +267,21 @@
+ 
+ CPPFLAGS = \
+ 	-DLIBDIR=\""$(pkglibdir)"\"	\
+-	-DDATADIR=\""$(pkgdatadir)"\"	\
++	-DDATADIR=\""$(gimpdatadir)"\"	\
+ 	-DVERSION=\"$(VERSION)\"
+ 
+ INCLUDES = \
+-	$(X_CFLAGS)			\
+ 	-I$(top_srcdir)/gtk+		\
+-	-I$(top_srcdir)
++	-I$(top_srcdir)         \
++	$(X_CFLAGS)
+ 
+ gimp_LDADD = \
+ 	$(top_builddir)/gtk+/gtk/libgtk.la	\
+ 	$(top_builddir)/gtk+/gdk/libgdk.la	\
+-	$(X_LDFLAGS)				\
+-	$(X_LIBS)				\
+ 	$(top_builddir)/libgimp/libgimpi.a	\
+ 	$(top_builddir)/gtk+/glib/libglib.la	\
++	$(X_LDFLAGS)				\
++	$(X_LIBS)				\
+ 	-lm
+ 
+ DEPS = \
+--- /a/gimp-0.99.6/app/Makefile.in	Mon Mar 10 07:13:52 1997
++++ app/Makefile.in	Wed Mar 12 21:59:15 1997
+@@ -314,21 +314,21 @@
+ 
+ CPPFLAGS = \
+ 	-DLIBDIR=\""$(pkglibdir)"\"	\
+-	-DDATADIR=\""$(pkgdatadir)"\"	\
++	-DDATADIR=\""$(gimpdatadir)"\"	\
+ 	-DVERSION=\"$(VERSION)\"
+ 
+ INCLUDES = \
+-	$(X_CFLAGS)			\
+ 	-I$(top_srcdir)/gtk+		\
+-	-I$(top_srcdir)
++	-I$(top_srcdir)         \
++	$(X_CFLAGS)
+ 
+ gimp_LDADD = \
+ 	$(top_builddir)/gtk+/gtk/libgtk.la	\
+ 	$(top_builddir)/gtk+/gdk/libgdk.la	\
+-	$(X_LDFLAGS)				\
+-	$(X_LIBS)				\
+ 	$(top_builddir)/libgimp/libgimpi.a	\
+ 	$(top_builddir)/gtk+/glib/libglib.la	\
++	$(X_LDFLAGS)				\
++	$(X_LIBS)				\
+ 	-lm
+ 
+ DEPS = \
+--- /a/gimp-0.99.6/configure	Mon Mar 10 05:19:54 1997
++++ configure	Wed Mar 12 22:09:11 1997
+@@ -617,7 +617,7 @@
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+ 
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
+ 
+ 
+ PACKAGE=gimp
+@@ -2108,7 +2108,7 @@
+ 
+ 
+ gimpdatadir=$datadir/$PACKAGE-$VERSION
+-gimpplugindir=$libdir/$PACKAGE-$VERSION
++gimpplugindir=$libexecdir/$PACKAGE-$VERSION
+ 
+ 
+ 
+--- gimprc.in~	Thu Mar 13 10:32:12 1997
++++ gimprc.in	Thu Mar 13 10:32:25 1997
+@@ -68,7 +68,7 @@
+ # causes the gimp to use more swap space and less memory.
+ # Note: the gimp will still run even if `tile-cache-size' is
+ # set to 0. The actual size can contain a suffix of 'm', 'M',
+-* 'k', 'K', 'b' or 'B', which makes the gimp interpret the
++# 'k', 'K', 'b' or 'B', which makes the gimp interpret the
+ # size as being specified in megabytes, kilobytes and bytes
+ # respectively. If no suffix is specified the size defaults to
+ # being specified in kilobytes.
+@@ -90,7 +90,7 @@
+ #  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)
++(color-cube 6 6 4 24)
+ 
+ # Install a GIMP colormap by default -- only for 8-bit displays
+ # (install-colormap)
diff --git a/graphics/gimp/files/patch-ab b/graphics/gimp/files/patch-ab
index 16bd7bafe45f..4eca93b6171e 100644
--- a/graphics/gimp/files/patch-ab
+++ b/graphics/gimp/files/patch-ab
@@ -1,88 +1,33 @@
---- plug-ins/script-fu/scripts/Makefile.in.orig	Sun Mar  2 05:54:56 1997
-+++ plug-ins/script-fu/scripts/Makefile.in	Sun Mar  2 08:00:11 1997
-@@ -50,7 +50,7 @@
- 
- scriptdatadir = $(pkgdatadir)/scripts
- 
--scriptdata_DATA = \
-+_scriptdata_DATA = \
- 	alien-glow.scm		\
- 	bds-logo-textured.scm	\
- 	blend-logo.scm		\
-@@ -76,6 +76,7 @@
- 
- DIST_COMMON =  Makefile.am Makefile.in
- 
-+scriptdata_DATA = $(patsubst %.scm,%.sed,${_scriptdata_DATA})
- 
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
- 	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
-@@ -83,7 +84,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
- 
-@@ -95,13 +96,15 @@
- 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
- 
-@@ -188,3 +191,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},g' $< > $@
---- plug-ins/script-fu/scripts/chrome-it.scm.orig	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome-it.scm	Sun Mar  2 07:43:14 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	Sun Mar  2 05:12:07 1997
-+++ plug-ins/script-fu/scripts/chrome2.scm	Sun Mar  2 07:43:14 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\"")
---- plug-ins/script-fu/scripts/crystal.scm.orig	Sun Mar  2 07:56:25 1997
-+++ plug-ins/script-fu/scripts/crystal.scm	Sun Mar  2 07:57:25 1997
-@@ -164,4 +164,4 @@
-     (gimp-display-new img)))
- 
- 
--(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"/usr/local/share/gimp/scripts/texture1.jpg\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
-+(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"@_prefix_@/share/gimp/scripts/texture1.jpg\"" "Environment Map" "\"@_prefix_@/share/gimp/scripts/beavis.jpg\"")
+--- /a/gimp-0.99.6/gtk+/configure	Mon Mar 10 04:44:20 1997
++++ gtk+/configure	Wed Mar 12 21:29:11 1997
+@@ -570,6 +570,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:574: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- /a/gimp-0.99.6/gtk+/glib/configure	Mon Mar 10 04:44:57 1997
++++ gtk+/glib/configure	Wed Mar 12 21:29:39 1997
+@@ -560,6 +560,7 @@
+ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+ # ./install, which can be erroneously created by make from ./install.sh.
+ echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
++INSTALL="/usr/bin/install -c"
+ echo "configure:564: checking for a BSD compatible install" >&5
+ if test -z "$INSTALL"; then
+ if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
+--- /a/gimp-0.99.6/plug-ins/url.c	Mon Mar 10 04:57:12 1997
++++ plug-ins/url.c	Wed Mar 12 21:56:39 1997
+@@ -146,8 +146,8 @@
+     }
+   else if (pid == 0)
+     {
+-      execlp ("wget", "wget", filename, "-O", tmpname, NULL);
+-      g_warning ("url: exec failed: wget: %s\n", g_strerror(errno));
++      execlp ("fetch", "fetch", filename, "-p -o", tmpname, NULL);
++      g_warning ("url: exec failed: fetch: %s\n", g_strerror(errno));
+       _exit(127);
+     }
+   else
diff --git a/graphics/gimp/files/patch-ac b/graphics/gimp/files/patch-ac
index 84060dc21103..31177deba379 100644
--- a/graphics/gimp/files/patch-ac
+++ b/graphics/gimp/files/patch-ac
@@ -1,166 +1,88 @@
-diff -ru /a/gimp-0.99.1/app/app_procs.c app/app_procs.c
---- /a/gimp-0.99.1/app/app_procs.c	Wed Feb 26 06:00:43 1997
-+++ app/app_procs.c	Fri Feb 28 21:25:57 1997
-@@ -217,6 +217,8 @@
-   menus_set_sensitive ("<Image>/File/Quit", FALSE);
- 
-   dialog = gtk_dialog_new ();
-+  GTK_WINDOW(dialog)->type = GTK_WINDOW_DIALOG;
+--- plug-ins/script-fu/scripts/Makefile.in.orig	Sun Mar  2 05:54:56 1997
++++ plug-ins/script-fu/scripts/Makefile.in	Sun Mar  2 08:00:11 1997
+@@ -50,7 +50,7 @@
+ 
+ scriptdatadir = $(pkgdatadir)/scripts
+ 
+-scriptdata_DATA = \
++_scriptdata_DATA = \
+ 	alien-glow.scm		\
+ 	bds-logo-textured.scm	\
+ 	blend-logo.scm		\
+@@ -76,6 +76,7 @@
+ 
+ DIST_COMMON =  Makefile.am Makefile.in
+ 
++scriptdata_DATA = $(patsubst %.scm,%.sed,${_scriptdata_DATA})
+ 
+ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) \
+ 	$(TEXINFOS) $(MANS) $(EXTRA_DIST)
+@@ -83,7 +84,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
+ 
+@@ -95,13 +96,15 @@
+ 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
+ 
+@@ -188,3 +191,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:
 +
-   gtk_window_set_title (GTK_WINDOW (dialog), "Really Quit?");
-   gtk_window_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
- 
-diff -ru /a/gimp-0.99.1/app/channels_dialog.c app/channels_dialog.c
---- /a/gimp-0.99.1/app/channels_dialog.c	Wed Feb 26 06:00:43 1997
-+++ app/channels_dialog.c	Fri Feb 28 21:30:04 1997
-@@ -1812,6 +1812,8 @@
- 
-   /*  the dialog  */
-   options->query_box = gtk_dialog_new ();
-+  GTK_WINDOW(options->query_box)->type = GTK_WINDOW_DIALOG;
 +
-   gtk_window_set_title (GTK_WINDOW (options->query_box), "New Channel Options");
-   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
- 
-@@ -1967,6 +1969,7 @@
- 
-   /*  the dialog  */
-   options->query_box = gtk_dialog_new ();
-+  GTK_WINDOW(options->query_box)->type = GTK_WINDOW_DIALOG;
-   gtk_window_set_title (GTK_WINDOW (options->query_box), "Edit Channel Attributes");
-   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
- 
-diff -ru /a/gimp-0.99.1/app/fileops.c app/fileops.c
---- /a/gimp-0.99.1/app/fileops.c	Thu Feb 27 03:08:56 1997
-+++ app/fileops.c	Fri Feb 28 21:45:28 1997
-@@ -706,6 +708,7 @@
- 
-   overwrite_box->full_filename = filename;
-   overwrite_box->obox = gtk_dialog_new ();
-+  GTK_WINDOW(overwrite_box->obox)->type = GTK_WINDOW_DIALOG;
-   gtk_window_set_title (GTK_WINDOW (overwrite_box->obox), "File Exists!");
-   gtk_window_position (GTK_WINDOW (overwrite_box->obox), GTK_WIN_POS_MOUSE);
- 
-diff -ru /a/gimp-0.99.1/app/gdisplay_ops.c app/gdisplay_ops.c
---- /a/gimp-0.99.1/app/gdisplay_ops.c	Thu Feb 27 02:21:41 1997
-+++ app/gdisplay_ops.c	Fri Feb 28 21:28:29 1997
-@@ -334,6 +334,7 @@
-   menus_set_sensitive ("<Image>/File/Close", FALSE);
- 
-   mbox = gtk_dialog_new ();
-+  GTK_WINDOW(mbox)->type = GTK_WINDOW_DIALOG;
-   gtk_window_set_title (GTK_WINDOW (mbox), image_name);
-   gtk_window_position (GTK_WINDOW (mbox), GTK_WIN_POS_MOUSE);
-   gtk_object_set_user_data (GTK_OBJECT (mbox), gdisp);
-diff -ru /a/gimp-0.99.1/app/global_edit.c app/global_edit.c
---- /a/gimp-0.99.1/app/global_edit.c	Thu Feb 27 01:01:22 1997
-+++ app/global_edit.c	Fri Feb 28 21:32:29 1997
-@@ -558,6 +558,7 @@
-   pn_dlg->gdisp = gdisp;
- 
-   pn_dlg->shell = gtk_dialog_new ();
-+  GTK_WINDOW(pn_dlg->shell)->type = GTK_WINDOW_DIALOG;
-   gtk_window_set_title (GTK_WINDOW (pn_dlg->shell), "Paste Named Buffer");
-   gtk_window_position (GTK_WINDOW (pn_dlg->shell), GTK_WIN_POS_MOUSE);
- 
-diff -ru /a/gimp-0.99.1/app/interface.c app/interface.c
---- /a/gimp-0.99.1/app/interface.c	Wed Feb 26 17:30:13 1997
-+++ app/interface.c	Fri Feb 28 21:32:56 1997
-@@ -758,6 +758,7 @@
-   query_box = (QueryBox *) g_malloc (sizeof (QueryBox));
- 
-   qbox = gtk_dialog_new ();
-+  GTK_WINDOW(qbox)->type = GTK_WINDOW_DIALOG;
-   gtk_window_set_title (GTK_WINDOW (qbox), title);
-   gtk_window_position (GTK_WINDOW (qbox), GTK_WIN_POS_MOUSE);
- 
-@@ -875,6 +876,7 @@
-   msg_box = (MessageBox *) g_malloc (sizeof (MessageBox));
- 
-   mbox = gtk_dialog_new ();
-+  GTK_WINDOW(mbox)->type = GTK_WINDOW_DIALOG;
-   gtk_window_set_title (GTK_WINDOW (mbox), "GIMP Message");
-   gtk_window_position (GTK_WINDOW (mbox), GTK_WIN_POS_MOUSE);
- 
-diff -ru /a/gimp-0.99.1/app/layer_select.c app/layer_select.c
---- /a/gimp-0.99.1/app/layer_select.c	Mon Feb 24 20:04:52 1997
-+++ app/layer_select.c	Fri Feb 28 21:33:18 1997
-@@ -94,6 +94,7 @@
- 
-       /*  The shell and main vbox  */
-       layer_select->shell = gtk_window_new (GTK_WINDOW_POPUP);
-+      GTK_WINDOW(layer_select->shell)->type = GTK_WINDOW_DIALOG;
-       gtk_window_set_title (GTK_WINDOW (layer_select->shell), "Layer Select");
-       gtk_window_position (GTK_WINDOW (layer_select->shell), GTK_WIN_POS_MOUSE);
-       gtk_signal_connect (GTK_OBJECT (layer_select->shell), "event",
-diff -ru /a/gimp-0.99.1/app/layers_dialog.c app/layers_dialog.c
---- /a/gimp-0.99.1/app/layers_dialog.c	Thu Feb 27 01:25:32 1997
-+++ app/layers_dialog.c	Fri Feb 28 21:34:14 1997
-@@ -2772,6 +2772,7 @@
- 
-   /*  the dialog  */
-   options->query_box = gtk_dialog_new ();
-+  GTK_WINDOW(options->query_box)->type = GTK_WINDOW_DIALOG;
-   gtk_window_set_title (GTK_WINDOW (options->query_box), "New Layer Options");
-   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
- 
-@@ -2930,6 +2931,7 @@
- 
-   /*  the dialog  */
-   options->query_box = gtk_dialog_new ();
-+  GTK_WINDOW(options->query_box)->type = GTK_WINDOW_DIALOG;
-   gtk_window_set_title (GTK_WINDOW (options->query_box), "Edit Layer Attributes");
-   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
- 
-@@ -3072,6 +3074,7 @@
- 
-   /*  the dialog  */
-   options->query_box = gtk_dialog_new ();
-+  GTK_WINDOW(options->query_box)->type = GTK_WINDOW_DIALOG;
-   gtk_window_set_title (GTK_WINDOW (options->query_box), "Add Mask Options");
-   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
- 
-@@ -3184,6 +3187,7 @@
- 
-   /*  the dialog  */
-   options->query_box = gtk_dialog_new ();
-+  GTK_WINDOW(options->query_box)->type = GTK_WINDOW_DIALOG;
-   gtk_window_set_title (GTK_WINDOW (options->query_box), "Layer Mask Options");
-   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
- 
-@@ -3291,6 +3295,7 @@
- 
-   /*  the dialog  */
-   options->query_box = gtk_dialog_new ();
-+  GTK_WINDOW(options->query_box)->type = GTK_WINDOW_DIALOG;
-   gtk_window_set_title (GTK_WINDOW (options->query_box), "Scale Layer");
-   gtk_window_set_policy (GTK_WINDOW (options->query_box), FALSE, FALSE, TRUE);
-   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
-@@ -3396,6 +3401,7 @@
- 
-   /*  the dialog  */
-   options->query_box = gtk_dialog_new ();
-+  GTK_WINDOW(options->query_box)->type = GTK_WINDOW_DIALOG;
-   gtk_window_set_title (GTK_WINDOW (options->query_box), "Resize Layer");
-   gtk_window_set_policy (GTK_WINDOW (options->query_box), FALSE, TRUE, TRUE);
-   gtk_window_set_policy (GTK_WINDOW (options->query_box), FALSE, FALSE, TRUE);
-@@ -3528,6 +3534,7 @@
- 
-   /*  the dialog  */
-   options->query_box = gtk_dialog_new ();
-+  GTK_WINDOW(options->query_box)->type = GTK_WINDOW_DIALOG;
-   gtk_window_set_title (GTK_WINDOW (options->query_box), "Layer Merge Options");
-   gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE);
- 
-diff -ru /a/gimp-0.99.1/app/plug_in.c app/plug_in.c
---- /a/gimp-0.99.1/app/plug_in.c	Thu Feb 27 03:08:38 1997
-+++ app/plug_in.c	Fri Feb 28 21:23:35 1997
-@@ -2349,6 +2349,8 @@
-   if (!plug_in->progress)
-     {
-       plug_in->progress = gtk_dialog_new ();
-+		gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y);
-+		GTK_WINDOW(plug_in->progress)->type=GTK_WINDOW_DIALOG;
-       gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0]));
-       gtk_signal_connect (GTK_OBJECT (plug_in->progress), "destroy",
- 			  (GtkSignalFunc) plug_in_progress_cancel,
++%.sed : %.scm
++	sed 's,@_scriptdatadir_@,${scriptdatadir},' $< > $@
+--- plug-ins/script-fu/scripts/chrome-it.scm.orig	Sun Mar  2 05:12:07 1997
++++ plug-ins/script-fu/scripts/chrome-it.scm	Sun Mar  2 07:43:14 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" "\"@_scriptdatadir_@/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" "\"@_scriptdatadir_@/beavis.jpg\"")
+--- plug-ins/script-fu/scripts/chrome2.scm.orig	Sun Mar  2 05:12:07 1997
++++ plug-ins/script-fu/scripts/chrome2.scm	Sun Mar  2 07:43:14 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" "\"@_scriptdatadir_@/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" "\"@_scriptdatadir_@/beavis.jpg\"")
+--- plug-ins/script-fu/scripts/crystal.scm.orig	Sun Mar  2 07:56:25 1997
++++ plug-ins/script-fu/scripts/crystal.scm	Sun Mar  2 07:57:25 1997
+@@ -164,4 +164,4 @@
+     (gimp-display-new img)))
+ 
+ 
+-(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"/usr/local/share/gimp/scripts/texture1.jpg\"" "Environment Map" "\"/usr/local/share/gimp/scripts/beavis.jpg\"")
++(script-fu-register "crystal-logo" "Crystal Logos" "Chrome Factor" "1.0" "Text String" "\"Crystal\"" "Font Size (in pixels)" "150" "Font" "\"Engraver\"" "Background Img" "\"@_scriptdatadir_@/texture1.jpg\"" "Environment Map" "\"@_scriptdatadir_@/beavis.jpg\"")