upgrade to 0.99.17

2 files changed, 14 insertions, 40 deletions

diff --git a/graphics/gimpshop/files/patch-ac b/graphics/gimpshop/files/patch-ac
deleted file mode 100644
index 6e5af3f2bc81..000000000000
--- a/graphics/gimpshop/files/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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/gimpshop/files/patch-ah b/graphics/gimpshop/files/patch-ah
index 08a2094a4159..d46998d2fe62 100644
--- a/graphics/gimpshop/files/patch-ah
+++ b/graphics/gimpshop/files/patch-ah
@@ -1,16 +1,5 @@
---- aclocal.m4.orig	Tue Oct 14 20:48:14 1997
-+++ aclocal.m4	Tue Oct 14 20:49:02 1997
-@@ -48,7 +48,7 @@
- 
- AC_DEFUN(AM_PROG_INSTALL,
- [AC_REQUIRE([AC_PROG_INSTALL])
--test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -c -m 755'
- AC_SUBST(INSTALL_SCRIPT)dnl
- ])
- 
---- configure.in.orig	Mon Dec 15 11:44:48 1997
-+++ configure.in	Thu Dec 18 00:36:24 1997
+--- configure.in.orig	Sat Jan  3 19:31:29 1998
++++ configure.in	Mon Jan  5 09:42:49 1998
 @@ -120,10 +120,10 @@
  
  dnl Test for libtiff
@@ -35,17 +24,17 @@
  
  dnl This is for generating PDB docuemntation.
  AC_PATH_PROG(EMACS, emacs, :)
---- configure.orig	Mon Dec 15 12:39:24 1997
-+++ configure	Thu Dec 18 00:38:43 1997
-@@ -2722,14 +2722,14 @@
+--- configure.orig	Mon Jan  5 09:44:02 1998
++++ configure	Mon Jan  5 09:46:45 1998
+@@ -2531,14 +2531,14 @@
  fi
  
    if test -z "$LIBTIFF_LIB"; then
 -    echo $ac_n "checking for TIFFReadScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2727: checking for TIFFReadScanline in -ltiff" >&5
+-echo "configure:2536: checking for TIFFReadScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
 +    echo $ac_n "checking for TIFFReadScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2727: checking for TIFFReadScanline in -ltiff34" >&5
++echo "configure:2536: checking for TIFFReadScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFReadScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -54,9 +43,9 @@
 -LIBS="-ltiff -lm $LIBS"
 +LIBS="-ltiff34 -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2735 "configure"
+ #line 2544 "configure"
  #include "confdefs.h"
-@@ -2757,17 +2757,17 @@
+@@ -2566,17 +2566,17 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -65,10 +54,10 @@
  else
    echo "$ac_t""no" 1>&6
 -echo $ac_n "checking for TIFFWriteScanline in -ltiff""... $ac_c" 1>&6
--echo "configure:2765: checking for TIFFWriteScanline in -ltiff" >&5
+-echo "configure:2574: checking for TIFFWriteScanline in -ltiff" >&5
 -ac_lib_var=`echo tiff'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
 +echo $ac_n "checking for TIFFWriteScanline in -ltiff34""... $ac_c" 1>&6
-+echo "configure:2765: checking for TIFFWriteScanline in -ltiff34" >&5
++echo "configure:2574: checking for TIFFWriteScanline in -ltiff34" >&5
 +ac_lib_var=`echo tiff34'_'TIFFWriteScanline | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
@@ -77,9 +66,9 @@
 -LIBS="-ltiff -lz -ljpeg -lm $LIBS"
 +LIBS="-ltiff34 -lz -ljpeg -lm $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 2773 "configure"
+ #line 2582 "configure"
  #include "confdefs.h"
-@@ -2795,7 +2795,7 @@
+@@ -2604,7 +2604,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
@@ -88,7 +77,7 @@
  else
    echo "$ac_t""no" 1>&6
  echo "configure: warning: *** TIFF plug-in will not be built ***" 1>&2
-@@ -3933,7 +3933,7 @@
+@@ -3742,7 +3742,7 @@
  
  
  gimpdatadir=$datadir/$PACKAGE