upgrade to 0.99.16

3 files changed, 34 insertions, 52 deletions

diff --git a/graphics/gimp-app/files/patch-ab b/graphics/gimp-app/files/patch-ab
index 405f8b713151..3c90bafc4593 100644
--- a/graphics/gimp-app/files/patch-ab
+++ b/graphics/gimp-app/files/patch-ab
@@ -3,8 +3,8 @@
 ***** patches for plug-ins
 *****
 
---- /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
+--- /a/gimp-0.99.6/plug-ins/url/url.c	Mon Mar 10 04:57:12 1997
++++ plug-ins/url/url.c	Wed Mar 12 21:56:39 1997
 @@ -146,8 +146,8 @@
      }
    else if (pid == 0)
@@ -18,21 +18,3 @@
    else
 
 
---- plug-ins/script-fu/interp_regex.c~	Fri Apr 18 14:00:00 1997
-+++ plug-ins/script-fu/interp_regex.c	Fri Apr 18 14:00:45 1997
-@@ -1,3 +1,4 @@
-+#include <sys/types.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-
---- plug-ins/dgimp/dgimp.c.orig	Wed Apr 30 11:39:18 1997
-+++ plug-ins/dgimp/dgimp.c	Wed Apr 30 11:38:42 1997
-@@ -15,6 +15,7 @@
-  * along with this program; if not, write to the Free Software
-  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  */
-+#include <sys/types.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/graphics/gimp-app/files/patch-ac b/graphics/gimp-app/files/patch-ac
new file mode 100644
index 000000000000..6e5af3f2bc81
--- /dev/null
+++ b/graphics/gimp-app/files/patch-ac
@@ -0,0 +1,15 @@
+--- plug-ins/libgck/gck/Makefile.in.orig	Tue Dec 16 08:26:17 1997
++++ plug-ins/libgck/gck/Makefile.in	Tue Dec 16 08:26:31 1997
+@@ -111,9 +111,10 @@
+ libgck_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir) 
+ 
+ INCLUDES = \
++	-I$(srcdir)/..			\
+ 	-I$(top_srcdir)		\
+-	-I$(includedir)		\
+-	-I$(srcdir)/..
++	-I$(includedir)
++
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/graphics/gimp-app/files/patch-ah b/graphics/gimp-app/files/patch-ah
index dba1b4f5c0c9..8acc0093b135 100644
--- a/graphics/gimp-app/files/patch-ah
+++ b/graphics/gimp-app/files/patch-ah
@@ -9,40 +9,25 @@
  AC_SUBST(INSTALL_SCRIPT)dnl
  ])
  
---- configure.in.orig	Tue Oct 14 20:50:42 1997
-+++ configure.in	Tue Oct 14 20:50:51 1997
-@@ -185,7 +185,7 @@
- fi
+--- configure.in.orig	Sun Dec 14 21:44:48 1997
++++ configure.in	Mon Dec 15 11:14:59 1997
+@@ -240,7 +240,7 @@
+ AC_C_INLINE
  
- gimpdatadir=$datadir/$PACKAGE/$VERSION
--gimpplugindir=$libdir/$PACKAGE/$VERSION
-+gimpplugindir=$libexecdir/$PACKAGE/$VERSION
+ gimpdatadir=$datadir/$PACKAGE
+-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
  
- scriptdata=`ls -1 plug-ins/script-fu/scripts | grep -v Makefile`
- scriptdata=`echo $scriptdata`
---- configure.orig	Wed Oct  1 12:51:27 1997
-+++ configure	Tue Oct 14 21:28:44 1997
-@@ -615,12 +615,12 @@
+ dnl This is for generating PDB docuemntation.
+ AC_PATH_PROG(EMACS, emacs, :)
+--- configure.orig	Mon Dec 15 11:13:24 1997
++++ configure	Mon Dec 15 11:13:41 1997
+@@ -3933,7 +3933,7 @@
  
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
--test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL} -c -s -m 755'
  
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ gimpdatadir=$datadir/$PACKAGE
+-gimpplugindir=$libdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
++gimpplugindir=$libexecdir/$PACKAGE/$GIMP_MAJOR_VERSION_NUMBER.$GIMP_MINOR_VERSION_NUMBER
  
- 
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -c -m 755'
- 
- 
- PACKAGE=gimp
-@@ -3692,7 +3692,7 @@
- fi
- 
- gimpdatadir=$datadir/$PACKAGE/$VERSION
--gimpplugindir=$libdir/$PACKAGE/$VERSION
-+gimpplugindir=$libexecdir/$PACKAGE/$VERSION
- 
- scriptdata=`ls -1 plug-ins/script-fu/scripts | grep -v Makefile`
- scriptdata=`echo $scriptdata`
+ # Extract the first word of "emacs", so it can be a program name with args.
+ set dummy emacs; ac_word=$2