3 files changed, 14 insertions, 79 deletions
diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa
index cb282fe13003..1d43b872d636 100644
--- a/graphics/imlib/files/patch-aa
+++ b/graphics/imlib/files/patch-aa
@@ -1,13 +1,13 @@
---- configure.orig	Fri Feb 12 14:06:46 1999
-+++ configure	Thu Feb 18 00:47:01 1999
+--- configure.orig	Thu Feb 25 01:44:38 1999
++++ configure	Mon Mar  1 20:30:08 1999
 @@ -2304,8 +2304,8 @@
  echo "configure:2305: checking If dynamic linking works on this system" >&5
    oLIBS="$LIBS"
    oCFLAGS="$CFLAGS"
 -  LIBS="$LIBS `glib-config --libs gmodule`"
 -  CFLAGS="$CFLAGS `glib-config --cflags gmodule`"
-+  LIBS="$LIBS `glib11d-config --libs gmodule`"
-+  CFLAGS="$CFLAGS `glib11d-config --cflags gmodule`"
++  LIBS="$LIBS `glib12-config --libs gmodule`"
++  CFLAGS="$CFLAGS `glib12-config --cflags gmodule`"
    if test "$cross_compiling" = yes; then
      { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
  else
@@ -17,8 +17,8 @@
  
 -   GMODULE_LIBS="`glib-config --libs gmodule`"
 -   GMODULE_FLAGS="`glib-config --cflags gmodule`"
-+   GMODULE_LIBS="`glib11d-config --libs gmodule`"
-+   GMODULE_FLAGS="`glib11d-config --cflags gmodule`"
++   GMODULE_LIBS="`glib12-config --libs gmodule`"
++   GMODULE_FLAGS="`glib12-config --cflags gmodule`"
     
     
     echo "$ac_t""yes" 1>&6
@@ -40,24 +40,3 @@
  cat > conftest.$ac_ext <<EOF
  #line 4494 "configure"
  #include "confdefs.h"
-@@ -4715,16 +4715,16 @@
- 
- 
- 
--ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:4721: checking for gif_lib.h" >&5
-+ac_safe=`echo "giflib/gif_lib.h" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for giflib/gif_lib.h""... $ac_c" 1>&6
-+echo "configure:4721: checking for giflib/gif_lib.h" >&5
- if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
- #line 4726 "configure"
- #include "confdefs.h"
--#include <gif_lib.h>
-+#include <giflib/gif_lib.h>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:4731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
diff --git a/graphics/imlib/files/patch-ab b/graphics/imlib/files/patch-ab
deleted file mode 100644
index 3af5b0f15868..000000000000
--- a/graphics/imlib/files/patch-ab
+++ /dev/null
@@ -1,22 +0,0 @@
---- Imlib/Imlib_private.h.orig	Wed Dec 16 11:13:56 1998
-+++ Imlib/Imlib_private.h	Thu Dec 24 06:01:57 1998
-@@ -56,7 +56,7 @@
- #include <tiffio.h>
- #endif
- #ifdef HAVE_LIBGIF
--#include <gif_lib.h>
-+#include <giflib/gif_lib.h>
- #endif
- 
- #define BYTE_ORD_24_RGB 0
---- gdk_imlib/io-gif.c.orig	Wed Jan 13 05:56:51 1999
-+++ gdk_imlib/io-gif.c	Thu Jan 14 18:12:05 1999
-@@ -8,7 +8,7 @@
- 	return NULL;
- }
- #else
--#include <gif_lib.h>
-+#include <giflib/gif_lib.h>
- 
- unsigned char      *
- loader_gif(FILE *f, int *w, int *h, int *t)
diff --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac
index 1d81083ae0f3..457515765db9 100644
--- a/graphics/imlib/files/patch-ac
+++ b/graphics/imlib/files/patch-ac
@@ -1,44 +1,22 @@
---- config/Makefile.in.orig	Fri Feb 12 14:29:22 1999
-+++ config/Makefile.in	Wed Feb 17 22:12:52 1999
-@@ -23,7 +23,7 @@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
- datadir = @datadir@
--sysconfdir = @sysconfdir@
-+sysconfdir = @sysconfdir@/imlib
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
- libdir = @libdir@
---- Imlib/Makefile.in.orig	Fri Feb 12 14:29:20 1999
-+++ Imlib/Makefile.in	Wed Feb 17 22:13:37 1999
-@@ -123,11 +123,11 @@
+--- Imlib/Makefile.in.orig	Thu Feb 25 02:17:45 1999
++++ Imlib/Makefile.in	Mon Mar  1 19:55:08 1999
+@@ -123,7 +123,7 @@
  libImlib_la_SOURCES =  	cache.c			colors.c		load.c			misc.c			rend.c			utils.c			save.c			snprintf.c
  
  
--libImlib_la_LDFLAGS = -version-info 10:3:9
+-libImlib_la_LDFLAGS = -version-info 10:4:9
 +libImlib_la_LDFLAGS = -version-info 2:1:0
  #libImlib_la_LDDADD     = $(SUPPORT_LIBS)
  libImlib_la_LIBADD = $(SUPPORT_LIBS)
  
--DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" 	-DCONVERT_PATH=\"@CONVERT_PATH@\" 	-DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imrc\"
-+DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" 	-DCONVERT_PATH=\"@CONVERT_PATH@\" 	-DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imlib/imrc\"
- 
- 
- INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(X_CFLAGS)
---- gdk_imlib/Makefile.in.orig	Fri Feb 12 14:29:16 1999
-+++ gdk_imlib/Makefile.in	Wed Feb 17 22:14:09 1999
-@@ -157,12 +157,12 @@
+--- gdk_imlib/Makefile.in.orig	Thu Feb 25 02:17:39 1999
++++ gdk_imlib/Makefile.in	Mon Mar  1 19:56:18 1999
+@@ -157,7 +157,7 @@
  libgdk_imlib_la_SOURCES =  	cache.c      			colors.c     			globals.c    			load.c       			misc.c       			rend.c       			utils.c      			save.c				modules.c
  
  
--libgdk_imlib_la_LDFLAGS = -version-info 10:3:9
+-libgdk_imlib_la_LDFLAGS = -version-info 10:4:9
 +libgdk_imlib_la_LDFLAGS = -version-info 2:1:0
  libgdk_imlib_la_LIBADD = $(GMODULE_LIBS)
  
  include_HEADERS = gdk_imlib.h gdk_imlib_private.h gdk_imlib_types.h
- 
--DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" 	-DCONVERT_PATH=\"@CONVERT_PATH@\" 	-DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imrc\" 	-DIMLIB_LIB=\""$(libdir)"\"
-+DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" 	-DCONVERT_PATH=\"@CONVERT_PATH@\" 	-DNETPBM_PATH=\"@NETPBM_PATH@\" -DSYSTEM_IMRC=\"@sysconfdir@/imlib/imrc\" 	-DIMLIB_LIB=\""$(libdir)"\"
- 
- 
- INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. 	$(GTK_CFLAGS) $(X_CFLAGS) $(GMODULE_FLAGS)