Upgrade to 1.8.2.

14 files changed, 167 insertions, 86 deletions

diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 1bf1cfab926a..02d9b907c19c 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,16 +1,18 @@
 # New ports collection makefile for:	imlib
-# Version required:	1.8.1
+# Version required:	1.8.2
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.35 1998/11/25 05:06:23 jseger Exp $
+# $Id: Makefile,v 1.36 1998/11/25 09:01:19 asami Exp $
 #
 
-DISTNAME=	imlib-1.8.1
+DISTNAME=	imlib-1.8.2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
-		ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
-		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
+MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
+		ftp://ftp.gnome.org/pub/GNOME/sources/
+#MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
+#		ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
+#		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
@@ -18,7 +20,7 @@ LIB_DEPENDS=    png.2:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff34 \
 		gif.3:${PORTSDIR}/graphics/giflib \
-		gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+		gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index f61f5508275c..d561efc5012b 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.8.1.tar.gz) = f9edec7106791d94d7ddc354db24ade9
+MD5 (imlib-1.8.2.tar.gz) = 4b86ee764f51241ef9a25f563e10c01d
diff --git a/graphics/imlib/files/patch-aa b/graphics/imlib/files/patch-aa
index baa16c3006da..523e93a72960 100644
--- a/graphics/imlib/files/patch-aa
+++ b/graphics/imlib/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Thu Sep 24 02:15:00 1998
-+++ configure	Sat Sep 26 20:57:55 1998
-@@ -1702,143 +1702,6 @@
+--- configure.orig	Thu Dec 24 05:59:01 1998
++++ configure	Thu Dec 24 06:01:01 1998
+@@ -1711,143 +1711,6 @@
    rm -f conf.gtktest
  
  
@@ -9,7 +9,7 @@
 -# Extract the first word of "djpeg", so it can be a program name with args.
 -set dummy djpeg; ac_word=$2
 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1711: checking for $ac_word" >&5
+-echo "configure:1720: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
@@ -40,7 +40,7 @@
 -# Extract the first word of "cjpeg", so it can be a program name with args.
 -set dummy cjpeg; ac_word=$2
 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1742: checking for $ac_word" >&5
+-echo "configure:1751: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
@@ -72,7 +72,7 @@
 -# Extract the first word of "convert", so it can be a program name with args.
 -set dummy convert; ac_word=$2
 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1774: checking for $ac_word" >&5
+-echo "configure:1783: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
@@ -108,7 +108,7 @@
 -# Extract the first word of "giftopnm", so it can be a program name with args.
 -set dummy giftopnm; ac_word=$2
 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1810: checking for $ac_word" >&5
+-echo "configure:1819: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
@@ -142,26 +142,51 @@
 -
 -
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
- echo "configure:1844: checking how to run the C preprocessor" >&5
+ echo "configure:1853: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
-@@ -3821,16 +3684,16 @@
+@@ -4010,16 +3873,16 @@
  
  
  
 -ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:3827: checking for gif_lib.h" >&5
+-echo "configure:4016: 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:3827: checking for giflib/gif_lib.h" >&5
++echo "configure:4016: 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 3832 "configure"
+ #line 4021 "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:3837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ { (eval echo configure:4026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -4234,24 +4097,6 @@
+ else
+   echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2
+ fi
+-
+-echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6
+-echo "configure:4240: checking for libpng version other than 1.0.2" >&5
+-cat > conftest.$ac_ext <<EOF
+-#line 4242 "configure"
+-#include "confdefs.h"
+-#include <png.h>
+-PNG_LIBPNG_VER_STRING
+-EOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep ""1.0.2"" >/dev/null 2>&1; then
+-  rm -rf conftest*
+-  echo "********* WARNING *********** Your libpng version is 1.0.2. Build will not continue until you revert to 1.0.1 or a newer version.";exit
+-else
+-  rm -rf conftest*
+-  png_ok=yes
+-fi
+-rm -f conftest*
+ 
+ echo "$ac_t""$png_ok" 1>&6
+ 
diff --git a/graphics/imlib/files/patch-ab b/graphics/imlib/files/patch-ab
index a0c0c4d3e541..947f7f1cfef4 100644
--- a/graphics/imlib/files/patch-ab
+++ b/graphics/imlib/files/patch-ab
@@ -1,6 +1,6 @@
---- Imlib/Imlib_private.h.orig	Sat Sep 19 03:25:18 1998
-+++ Imlib/Imlib_private.h	Sun Dec  6 23:09:59 1998
-@@ -50,7 +50,7 @@
+--- 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
@@ -9,9 +9,9 @@
  #endif
  
  #define BYTE_ORD_24_RGB 0
---- gdk_imlib/gdk_imlib_private.h.orig	Wed Sep 23 07:02:01 1998
-+++ gdk_imlib/gdk_imlib_private.h	Sun Dec  6 23:09:59 1998
-@@ -51,7 +51,7 @@
+--- gdk_imlib/gdk_imlib_private.h.orig	Wed Dec 16 11:14:01 1998
++++ gdk_imlib/gdk_imlib_private.h	Thu Dec 24 06:01:57 1998
+@@ -57,7 +57,7 @@
  #include <tiffio.h>
  #endif
  #ifdef HAVE_LIBGIF
diff --git a/graphics/imlib/files/patch-ac b/graphics/imlib/files/patch-ac
index df8e9a516235..ad851e03dbf0 100644
--- a/graphics/imlib/files/patch-ac
+++ b/graphics/imlib/files/patch-ac
@@ -1,5 +1,5 @@
---- config/Makefile.in.orig	Thu Sep 24 02:46:54 1998
-+++ config/Makefile.in	Sat Sep 26 21:42:51 1998
+--- config/Makefile.in.orig	Wed Dec 16 11:15:46 1998
++++ config/Makefile.in	Thu Dec 24 06:02:32 1998
 @@ -23,7 +23,7 @@
  sbindir = @sbindir@
  libexecdir = @libexecdir@
@@ -9,14 +9,14 @@
  sharedstatedir = @sharedstatedir@
  localstatedir = @localstatedir@
  libdir = @libdir@
---- Imlib/Makefile.in.orig	Thu Sep 24 02:46:53 1998
-+++ Imlib/Makefile.in	Sat Sep 26 21:45:12 1998
-@@ -118,12 +118,12 @@
- utils.c       \
- save.c
+--- Imlib/Makefile.in.orig	Wed Dec 16 11:15:45 1998
++++ Imlib/Makefile.in	Thu Dec 24 06:02:55 1998
+@@ -119,12 +119,12 @@
+ 	save.c		\
+ 	snprintf.c
  
 -libImlib_la_LDFLAGS    = -version-info 9:1:8
-+libImlib_la_LDFLAGS    = -version-info 1:8:0
++libImlib_la_LDFLAGS    = -version-info 1:9:0
  libImlib_la_LDDADD     = $(LIBS)
  
  DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" \
@@ -26,14 +26,14 @@
  
  INCLUDES = -I. -I$(srcdir) -I.. -I$(srcdir)/.. $(X_CFLAGS)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- gdk_imlib/Makefile.in.orig	Thu Sep 24 02:46:51 1998
-+++ gdk_imlib/Makefile.in	Sat Sep 26 21:46:04 1998
+--- gdk_imlib/Makefile.in.orig	Wed Dec 16 11:15:43 1998
++++ gdk_imlib/Makefile.in	Thu Dec 24 06:03:08 1998
 @@ -119,12 +119,12 @@
  utils.c      \
  save.c
  
 -libgdk_imlib_la_LDFLAGS      = -version-info 9:1:8
-+libgdk_imlib_la_LDFLAGS      = -version-info 1:8:0
++libgdk_imlib_la_LDFLAGS      = -version-info 1:9:0
  libgdk_imlib_la_LDDADD = $(LIBS)
  
  DEFS = -DDJPEG_PROG=\"@DJPEG_PROG@\"  -DCJPEG_PROG=\"@CJPEG_PROG@\" \
diff --git a/graphics/imlib/pkg-plist b/graphics/imlib/pkg-plist
index 70d093b6ccc8..183192b07faf 100644
--- a/graphics/imlib/pkg-plist
+++ b/graphics/imlib/pkg-plist
@@ -11,11 +11,11 @@ include/gdk_imlib_types.h
 lib/libImlib.a
 lib/libImlib.la
 lib/libImlib.so
-lib/libImlib.so.1.8
+lib/libImlib.so.1.9
 lib/libgdk_imlib.a
 lib/libgdk_imlib.la
 lib/libgdk_imlib.so
-lib/libgdk_imlib.so.1.8
+lib/libgdk_imlib.so.1.9
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm etc/imlib
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index 1bf1cfab926a..02d9b907c19c 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -1,16 +1,18 @@
 # New ports collection makefile for:	imlib
-# Version required:	1.8.1
+# Version required:	1.8.2
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.35 1998/11/25 05:06:23 jseger Exp $
+# $Id: Makefile,v 1.36 1998/11/25 09:01:19 asami Exp $
 #
 
-DISTNAME=	imlib-1.8.1
+DISTNAME=	imlib-1.8.2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
-		ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
-		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
+MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
+		ftp://ftp.gnome.org/pub/GNOME/sources/
+#MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
+#		ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
+#		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
@@ -18,7 +20,7 @@ LIB_DEPENDS=    png.2:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff34 \
 		gif.3:${PORTSDIR}/graphics/giflib \
-		gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+		gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/graphics/imlib2-tmp/distinfo b/graphics/imlib2-tmp/distinfo
index f61f5508275c..d561efc5012b 100644
--- a/graphics/imlib2-tmp/distinfo
+++ b/graphics/imlib2-tmp/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.8.1.tar.gz) = f9edec7106791d94d7ddc354db24ade9
+MD5 (imlib-1.8.2.tar.gz) = 4b86ee764f51241ef9a25f563e10c01d
diff --git a/graphics/imlib2-tmp/files/patch-aa b/graphics/imlib2-tmp/files/patch-aa
index baa16c3006da..523e93a72960 100644
--- a/graphics/imlib2-tmp/files/patch-aa
+++ b/graphics/imlib2-tmp/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Thu Sep 24 02:15:00 1998
-+++ configure	Sat Sep 26 20:57:55 1998
-@@ -1702,143 +1702,6 @@
+--- configure.orig	Thu Dec 24 05:59:01 1998
++++ configure	Thu Dec 24 06:01:01 1998
+@@ -1711,143 +1711,6 @@
    rm -f conf.gtktest
  
  
@@ -9,7 +9,7 @@
 -# Extract the first word of "djpeg", so it can be a program name with args.
 -set dummy djpeg; ac_word=$2
 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1711: checking for $ac_word" >&5
+-echo "configure:1720: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
@@ -40,7 +40,7 @@
 -# Extract the first word of "cjpeg", so it can be a program name with args.
 -set dummy cjpeg; ac_word=$2
 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1742: checking for $ac_word" >&5
+-echo "configure:1751: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
@@ -72,7 +72,7 @@
 -# Extract the first word of "convert", so it can be a program name with args.
 -set dummy convert; ac_word=$2
 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1774: checking for $ac_word" >&5
+-echo "configure:1783: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
@@ -108,7 +108,7 @@
 -# Extract the first word of "giftopnm", so it can be a program name with args.
 -set dummy giftopnm; ac_word=$2
 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1810: checking for $ac_word" >&5
+-echo "configure:1819: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
@@ -142,26 +142,51 @@
 -
 -
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
- echo "configure:1844: checking how to run the C preprocessor" >&5
+ echo "configure:1853: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
-@@ -3821,16 +3684,16 @@
+@@ -4010,16 +3873,16 @@
  
  
  
 -ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:3827: checking for gif_lib.h" >&5
+-echo "configure:4016: 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:3827: checking for giflib/gif_lib.h" >&5
++echo "configure:4016: 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 3832 "configure"
+ #line 4021 "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:3837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ { (eval echo configure:4026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -4234,24 +4097,6 @@
+ else
+   echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2
+ fi
+-
+-echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6
+-echo "configure:4240: checking for libpng version other than 1.0.2" >&5
+-cat > conftest.$ac_ext <<EOF
+-#line 4242 "configure"
+-#include "confdefs.h"
+-#include <png.h>
+-PNG_LIBPNG_VER_STRING
+-EOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep ""1.0.2"" >/dev/null 2>&1; then
+-  rm -rf conftest*
+-  echo "********* WARNING *********** Your libpng version is 1.0.2. Build will not continue until you revert to 1.0.1 or a newer version.";exit
+-else
+-  rm -rf conftest*
+-  png_ok=yes
+-fi
+-rm -f conftest*
+ 
+ echo "$ac_t""$png_ok" 1>&6
+ 
diff --git a/graphics/imlib2-tmp/pkg-plist b/graphics/imlib2-tmp/pkg-plist
index 70d093b6ccc8..183192b07faf 100644
--- a/graphics/imlib2-tmp/pkg-plist
+++ b/graphics/imlib2-tmp/pkg-plist
@@ -11,11 +11,11 @@ include/gdk_imlib_types.h
 lib/libImlib.a
 lib/libImlib.la
 lib/libImlib.so
-lib/libImlib.so.1.8
+lib/libImlib.so.1.9
 lib/libgdk_imlib.a
 lib/libgdk_imlib.la
 lib/libgdk_imlib.so
-lib/libgdk_imlib.so.1.8
+lib/libgdk_imlib.so.1.9
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm etc/imlib
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 1bf1cfab926a..02d9b907c19c 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -1,16 +1,18 @@
 # New ports collection makefile for:	imlib
-# Version required:	1.8.1
+# Version required:	1.8.2
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.35 1998/11/25 05:06:23 jseger Exp $
+# $Id: Makefile,v 1.36 1998/11/25 09:01:19 asami Exp $
 #
 
-DISTNAME=	imlib-1.8.1
+DISTNAME=	imlib-1.8.2
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
-		ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
-		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
+MASTER_SITES=	ftp://ftp.jimpick.com/pub/mirrors/gnome/sources/ \
+		ftp://ftp.gnome.org/pub/GNOME/sources/
+#MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/ \
+#		ftp://www.rasterman.com/pub/enlightenment/enlightenment/ \
+#		ftp://ftp.labs.redhat.com/pub/imlib/TAR/
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
@@ -18,7 +20,7 @@ LIB_DEPENDS=    png.2:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff34 \
 		gif.3:${PORTSDIR}/graphics/giflib \
-		gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+		gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index f61f5508275c..d561efc5012b 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.8.1.tar.gz) = f9edec7106791d94d7ddc354db24ade9
+MD5 (imlib-1.8.2.tar.gz) = 4b86ee764f51241ef9a25f563e10c01d
diff --git a/graphics/imlib2/files/patch-aa b/graphics/imlib2/files/patch-aa
index baa16c3006da..523e93a72960 100644
--- a/graphics/imlib2/files/patch-aa
+++ b/graphics/imlib2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Thu Sep 24 02:15:00 1998
-+++ configure	Sat Sep 26 20:57:55 1998
-@@ -1702,143 +1702,6 @@
+--- configure.orig	Thu Dec 24 05:59:01 1998
++++ configure	Thu Dec 24 06:01:01 1998
+@@ -1711,143 +1711,6 @@
    rm -f conf.gtktest
  
  
@@ -9,7 +9,7 @@
 -# Extract the first word of "djpeg", so it can be a program name with args.
 -set dummy djpeg; ac_word=$2
 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1711: checking for $ac_word" >&5
+-echo "configure:1720: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_path_DJPEG_PROG'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
@@ -40,7 +40,7 @@
 -# Extract the first word of "cjpeg", so it can be a program name with args.
 -set dummy cjpeg; ac_word=$2
 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1742: checking for $ac_word" >&5
+-echo "configure:1751: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_path_CJPEG_PROG'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
@@ -72,7 +72,7 @@
 -# Extract the first word of "convert", so it can be a program name with args.
 -set dummy convert; ac_word=$2
 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1774: checking for $ac_word" >&5
+-echo "configure:1783: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_path_CONVERT_PROG'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
@@ -108,7 +108,7 @@
 -# Extract the first word of "giftopnm", so it can be a program name with args.
 -set dummy giftopnm; ac_word=$2
 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1810: checking for $ac_word" >&5
+-echo "configure:1819: checking for $ac_word" >&5
 -if eval "test \"`echo '$''{'ac_cv_path_GIFTOPNM_PROG'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
 -else
@@ -142,26 +142,51 @@
 -
 -
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
- echo "configure:1844: checking how to run the C preprocessor" >&5
+ echo "configure:1853: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
-@@ -3821,16 +3684,16 @@
+@@ -4010,16 +3873,16 @@
  
  
  
 -ac_safe=`echo "gif_lib.h" | sed 'y%./+-%__p_%'`
 -echo $ac_n "checking for gif_lib.h""... $ac_c" 1>&6
--echo "configure:3827: checking for gif_lib.h" >&5
+-echo "configure:4016: 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:3827: checking for giflib/gif_lib.h" >&5
++echo "configure:4016: 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 3832 "configure"
+ #line 4021 "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:3837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ { (eval echo configure:4026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+@@ -4234,24 +4097,6 @@
+ else
+   echo "configure: warning: *** Native PNG support will not be built (PNG header file not found) ***" 1>&2
+ fi
+-
+-echo $ac_n "checking for libpng version other than 1.0.2""... $ac_c" 1>&6
+-echo "configure:4240: checking for libpng version other than 1.0.2" >&5
+-cat > conftest.$ac_ext <<EOF
+-#line 4242 "configure"
+-#include "confdefs.h"
+-#include <png.h>
+-PNG_LIBPNG_VER_STRING
+-EOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  egrep ""1.0.2"" >/dev/null 2>&1; then
+-  rm -rf conftest*
+-  echo "********* WARNING *********** Your libpng version is 1.0.2. Build will not continue until you revert to 1.0.1 or a newer version.";exit
+-else
+-  rm -rf conftest*
+-  png_ok=yes
+-fi
+-rm -f conftest*
+ 
+ echo "$ac_t""$png_ok" 1>&6
+ 
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index 70d093b6ccc8..183192b07faf 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -11,11 +11,11 @@ include/gdk_imlib_types.h
 lib/libImlib.a
 lib/libImlib.la
 lib/libImlib.so
-lib/libImlib.so.1.8
+lib/libImlib.so.1.9
 lib/libgdk_imlib.a
 lib/libgdk_imlib.la
 lib/libgdk_imlib.so
-lib/libgdk_imlib.so.1.8
+lib/libgdk_imlib.so.1.9
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm etc/imlib