37 files changed, 216 insertions, 158 deletions

diff --git a/deskutils/kompose/Makefile b/deskutils/kompose/Makefile
index d7f495f3997e..8b28a488bf16 100644
--- a/deskutils/kompose/Makefile
+++ b/deskutils/kompose/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://download.berlios.de/kompose/
 MAINTAINER=	lauri@kde.org
 COMMENT=	Full-screen task manager similar to Exposé(tm)
 
-LIB_DEPENDS=	Imlib2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 EXTRA_PATCHES=	${.CURDIR}/../../x11/kde3/files/extrapatch-old_configure
 
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index dc6098c0be69..2165ad108757 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -14,7 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library of assorted spiffy things
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
-		Imlib2.2:${PORTSDIR}/graphics/imlib2
+		Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack
diff --git a/graphics/deep_zoom/Makefile b/graphics/deep_zoom/Makefile
index 9d61f629948b..5e42a4c549b7 100644
--- a/graphics/deep_zoom/Makefile
+++ b/graphics/deep_zoom/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generate very highly zoomed fractals
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	Imlib2:${PORTSDIR}/graphics/imlib2 \
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
 		gmp.6:${PORTSDIR}/math/libgmp4
 
 IMLIB2_CONFIG=	${X11BASE}/bin/imlib2-config
diff --git a/graphics/digikam-kde4/Makefile b/graphics/digikam-kde4/Makefile
index 175ddc115bbc..592ae5058f4b 100644
--- a/graphics/digikam-kde4/Makefile
+++ b/graphics/digikam-kde4/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Photo album manager for KDE with gphoto2 backend
 LIB_DEPENDS=	kexif.0:${PORTSDIR}/graphics/libkexif \
 		kipi.0:${PORTSDIR}/graphics/libkipi \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
-		Imlib2.2:${PORTSDIR}/graphics/imlib2 \
+		Imlib2.3:${PORTSDIR}/graphics/imlib2 \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index 175ddc115bbc..592ae5058f4b 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Photo album manager for KDE with gphoto2 backend
 LIB_DEPENDS=	kexif.0:${PORTSDIR}/graphics/libkexif \
 		kipi.0:${PORTSDIR}/graphics/libkipi \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
-		Imlib2.2:${PORTSDIR}/graphics/imlib2 \
+		Imlib2.3:${PORTSDIR}/graphics/imlib2 \
 		gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
diff --git a/graphics/evas/Makefile b/graphics/evas/Makefile
index c704faacf25e..4b149d3839f4 100644
--- a/graphics/evas/Makefile
+++ b/graphics/evas/Makefile
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	enlightenment
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A hardware-accelerated canvas API for X-Windows
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/graphics/geist/Makefile b/graphics/geist/Makefile
index 08f8b8b4867e..f430ce5c6571 100644
--- a/graphics/geist/Makefile
+++ b/graphics/geist/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://www.linuxbrit.co.uk/downloads/
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	An object-based image creation/layout application
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2 \
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 XML_CONFIG?=	${LOCALBASE}/bin/xml2-config
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index cb04468644fb..0dbe3fb78aa5 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.linuxbrit.co.uk/downloads/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A utility library that includes a wrapper for imlib2
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
diff --git a/graphics/hsetroot/Makefile b/graphics/hsetroot/Makefile
index 12726dd1457b..291cee657740 100644
--- a/graphics/hsetroot/Makefile
+++ b/graphics/hsetroot/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://thegraveyard.org/files/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Root window parameter setting background for X
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 PLIST_FILES=	bin/hsetroot
 USE_X_PREFIX=	YES
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index 75fe904daf83..cdfa05bce49c 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	imlib2
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.2.0
+PORTREVISION=	0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	enlightenment
@@ -27,8 +27,9 @@ USE_X_PREFIX=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+USE_AUTOCONF_VER=	259
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${PREFIX}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -L${PREFIX}/lib"
 INSTALLS_SHLIB=	yes
 
 .include <bsd.port.pre.mk>
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 0f60b7cbfda3..6bd1ca660015 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1,2 +1,2 @@
-MD5 (imlib2-1.1.2.tar.gz) = 3389bad516032c951fda4fe620df0cef
-SIZE (imlib2-1.1.2.tar.gz) = 875843
+MD5 (imlib2-1.2.0.tar.gz) = 853fb77100ee3c3ca944f52c892ab49b
+SIZE (imlib2-1.2.0.tar.gz) = 890457
diff --git a/graphics/imlib2/files/patch-configure.in b/graphics/imlib2/files/patch-configure.in
new file mode 100644
index 000000000000..b2219d63d4d1
--- /dev/null
+++ b/graphics/imlib2/files/patch-configure.in
@@ -0,0 +1,121 @@
+--- configure.in.orig	Wed Jan  5 01:39:08 2005
++++ configure.in	Sun Feb 27 21:16:57 2005
+@@ -6,7 +6,7 @@
+ AC_CANONICAL_HOST
+ AC_CANONICAL_TARGET
+ AC_ISC_POSIX
+-AM_INIT_AUTOMAKE(imlib2, 1.2.0)
++AM_INIT_AUTOMAKE(imlib2, 1.2.0.001)
+ AM_CONFIG_HEADER(config.h)
+ 
+ AC_C_BIGENDIAN
+@@ -86,6 +86,9 @@
+ packagesrcdir=`cd $srcdir && pwd`
+ AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
+ 
++# FIXME: fill in requirements for pc.in - but only ft2 has a pc file!
++requirements="freetype2"
++
+ mmx=no
+ AC_ARG_ENABLE(mmx,[  --disable-mmx           attempt compiling using mmx assembly [default=yes]],
+ [
+@@ -98,15 +101,16 @@
+   fi
+ ],
+ [
+-if test x$target_os = xlinux-gnu; then
++if test x$target_os = xlinux-gnu -o x$target_os = xlinux; then
+   if test x$target_cpu = x$host_cpu; then
+     mmx=`cat /proc/cpuinfo | grep mmx`
+     if test -n "$mmx"; then
+       mmx=yes
++      echo "You appear to be compiling on a "$target_cpu/$target_os" system; using MMX."
+     fi
+   else
+     echo ""
+-    echo "You are cross-compiling on a "$host_cpu" machine for a "$target_os" machine."
++    echo "You are cross-compiling on a "$host_cpu" machine for a "$target_cpu/$target_os" machine."
+     echo "If this target supports mmx, please enable mmx with --enable-mmx as a"
+     echo "configure option."
+     echo ""
+@@ -114,6 +118,7 @@
+ else
+   echo ""
+   echo "You are not running Linux - This script cannot auto-detect mmx assembly."
++  echo "(You appear to be running $target_os.)"
+   echo "You will have to enable the mmx assembly (which gives anywhere from 10%"
+   echo "to 300% speedups) by adding --enable-mmx on the configure command-line."
+   echo ""
+@@ -139,35 +144,28 @@
+ freetype_cflags=`$FREETYPE_CONFIG --cflags`
+ freetype_libs=`$FREETYPE_CONFIG --libs`
+ 
+-x11=no
+-AC_ARG_ENABLE(x11,[  --disable-x11           attempt to build with X11 support [default=yes]],
+-[
+-  if test x$enableval = xyes; then
+-    have_x=yes
+-  else
+-    have_x=no
+-  fi
+-],
+-[
+-  AC_CHECK_HEADER(X11/X.h,
+-    [ have_x="yes" ],
+-    [ have_x="no" ]
+-  )
+-]
+-)
+-AC_MSG_CHECKING(whether X11 support is to be enabled)
++AC_PATH_X([X], [X11/Xlib.h], [XOpenDisplay(NULL)])
++
++if test "x$have_x" = "xno"; then
++   # If --without-x was passed, this will be "disabled" instead of "no" --
++   # so always treat "no" as an error
++   AC_MSG_ERROR(
++[no X support found.  Use --x-includes and --x-libraries to specify the X
++path on your system, or --without-x to disable X support.])
++fi
++
+ if test "x$have_x" = "xyes"; then
+-  x_dir="/usr/X11R6";
+-  x_cflags="-I"$x_dir"/include"
+-  x_libs="-L"$x_dir"/lib -lX11 -lXext"
+-  AC_MSG_RESULT(enabling X11 support)
++  if test "x$x_includes" != "x"; then
++    x_cflags="-I$x_includes"
++  fi
++  if test "x$x_libraries" != "x"; then
++    x_libs="-L$x_libraries -lX11 -lXext"
++  fi
+   AM_CONDITIONAL(BUILD_X11, true)
+   AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
+ else
+-  x_dir=""
+   x_cflags=""
+   x_libs=""
+-  AC_MSG_RESULT(disabling X11 support)
+   AM_CONDITIONAL(BUILD_X11, false)
+ fi
+ 
+@@ -354,7 +352,9 @@
+ fi
+ AM_CONDITIONAL(BUILD_BZ2_LOADER, test "$bz2_ok" = yes)
+ AC_SUBST(BZ2LIBS)
+-  
++
++AC_SUBST(requirements)
++
+ AC_OUTPUT([
+ Makefile
+ src/Makefile
+@@ -395,6 +395,9 @@
+ echo "  GIF.....................: $gif_ok"
+ echo "  ZLIB....................: $zlib_ok"
+ echo "  BZIP2...................: $bz2_ok"
++echo
++echo
++echo "Use MMX for extra speed...: $mmx"
+ echo
+ echo
+ echo "Installation Path.........: $prefix"
diff --git a/graphics/imlib2/files/patch-security-1 b/graphics/imlib2/files/patch-security-1
deleted file mode 100644
index 520160f14fed..000000000000
--- a/graphics/imlib2/files/patch-security-1
+++ /dev/null
@@ -1,90 +0,0 @@
-===================================================================
-RCS file: /cvsroot/enlightenment/e17/libs/imlib2/src/modules/loaders/loader_xpm.c,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- enlightenment/e17/libs/imlib2/src/modules/loaders/loader_xpm.c	2004/12/14 03:50:46	1.2
-+++ loaders/loader_xpm.c	2005/01/04 03:34:03	1.3
-@@ -192,37 +192,37 @@
-                     {
-                        /* Header */
-                        sscanf(line, "%i %i %i %i", &w, &h, &ncolors, &cpp);
--                       if (ncolors > 32766)
-+                       if ((ncolors > 32766) || (ncolors < 1))
-                          {
-                             fprintf(stderr,
--                                    "IMLIB ERROR: XPM files with colors > 32766 not supported\n");
-+                                    "IMLIB ERROR: XPM files with colors > 32766 or < 1 not supported\n");
-                             free(line);
-                             fclose(f);
-                             xpm_parse_done();
-                             return 0;
-                          }
--                       if (cpp > 5)
-+                       if ((cpp > 5) || (cpp < 1))
-                          {
-                             fprintf(stderr,
--                                    "IMLIB ERROR: XPM files with characters per pixel > 5 not supported\n");
-+                                    "IMLIB ERROR: XPM files with characters per pixel > 5 or < 1not supported\n");
-                             free(line);
-                             fclose(f);
-                             xpm_parse_done();
-                             return 0;
-                          }
--                       if (w > 32767)
-+                       if ((w > 32767) || (w < 1))
-                          {
-                             fprintf(stderr,
--                                    "IMLIB ERROR: Image width > 32767 pixels for file\n");
-+                                    "IMLIB ERROR: Image width > 32767 or < 1 pixels for file\n");
-                             free(line);
-                             fclose(f);
-                             xpm_parse_done();
-                             return 0;
-                          }
--                       if (h > 32767)
-+                       if ((h > 32767) || (h < 1))
-                          {
-                             fprintf(stderr,
--                                    "IMLIB ERROR: Image height > 32767 pixels for file\n");
-+                                    "IMLIB ERROR: Image height > 32767 or < 1 pixels for file\n");
-                             free(line);
-                             fclose(f);
-                             xpm_parse_done();
-@@ -284,9 +284,14 @@
-                                            if (k >= len)
-                                              {
-                                                 if (col[0])
--                                                   strcat(col, " ");
-+						  {
-+						     if (strlen(col) < ( sizeof(col) - 2))
-+						       strcat(col, " ");
-+						     else
-+						       done = 1;
-+						  }
-                                                 if (strlen(col) + strlen(s) <
--                                                    sizeof(col))
-+                                                    (sizeof(col) - 1))
-                                                    strcat(col, s);
-                                              }
-                                            if (col[0])
-@@ -322,9 +327,16 @@
-                                         }
-                                       else
-                                         {
--                                           if (col[0])
--                                              strcat(col, " ");
--                                           strcat(col, s);
-+					   if (col[0])
-+					     {
-+						if (strlen(col) < ( sizeof(col) - 2))
-+						  strcat(col, " ");
-+						else
-+						  done = 1;
-+					     }
-+					   if (strlen(col) + strlen(s) <
-+					       (sizeof(col) - 1))
-+					     strcat(col, s);
-                                         }
-                                    }
-                               }
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index d303c7020842..18596c6abe5f 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -1,31 +1,57 @@
-bin/bumpmaptest
-bin/color_spaces
-bin/imconvert
-bin/imlib2
+bin/imlib2_bumpmap
+bin/imlib2_colorspace
+bin/imlib2_conv
+bin/imlib2_poly
+bin/imlib2_show
 bin/imlib2_test
 bin/imlib2_view
 bin/imlib2-config
-bin/polytest
 include/Imlib2.h
 lib/libImlib2.a
 lib/libImlib2.so
-lib/libImlib2.so.2
-lib/imlib2_loaders/filter/bump_map.so
-lib/imlib2_loaders/filter/colormod.so
-lib/imlib2_loaders/filter/testfilter.so
-lib/imlib2_loaders/image/argb.so
-lib/imlib2_loaders/image/bmp.so
-lib/imlib2_loaders/image/bz2.so
-lib/imlib2_loaders/image/gif.so
-lib/imlib2_loaders/image/jpeg.so
-lib/imlib2_loaders/image/lbm.so
-lib/imlib2_loaders/image/png.so
-lib/imlib2_loaders/image/pnm.so
-lib/imlib2_loaders/image/tga.so
-lib/imlib2_loaders/image/tiff.so
-lib/imlib2_loaders/image/xpm.so
-lib/imlib2_loaders/image/zlib.so
+lib/libImlib2.so.3
+lib/imlib2/filters/bumpmap.so
+lib/imlib2/filters/colormod.so
+lib/imlib2/filters/testfilter.so
+lib/imlib2/loaders/argb.so
+lib/imlib2/loaders/bmp.so
+lib/imlib2/loaders/bz2.so
+lib/imlib2/loaders/gif.so
+lib/imlib2/loaders/jpeg.so
+lib/imlib2/loaders/lbm.so
+lib/imlib2/loaders/png.so
+lib/imlib2/loaders/pnm.so
+lib/imlib2/loaders/tga.so
+lib/imlib2/loaders/tiff.so
+lib/imlib2/loaders/xpm.so
+lib/imlib2/loaders/zlib.so
 libdata/pkgconfig/imlib2.pc
-@dirrm lib/imlib2_loaders/image
-@dirrm lib/imlib2_loaders/filter
-@dirrm lib/imlib2_loaders
+%%DATADIR%%/data/fonts/cinema.ttf
+%%DATADIR%%/data/fonts/grunge.ttf
+%%DATADIR%%/data/fonts/morpheus.ttf
+%%DATADIR%%/data/fonts/notepad.ttf
+%%DATADIR%%/data/images/audio.png
+%%DATADIR%%/data/images/bg.png
+%%DATADIR%%/data/images/bulb.png
+%%DATADIR%%/data/images/cal.png
+%%DATADIR%%/data/images/calc.png
+%%DATADIR%%/data/images/folder.png
+%%DATADIR%%/data/images/globe.png
+%%DATADIR%%/data/images/imlib2.png
+%%DATADIR%%/data/images/lock.png
+%%DATADIR%%/data/images/mail.png
+%%DATADIR%%/data/images/menu.png
+%%DATADIR%%/data/images/mush.png
+%%DATADIR%%/data/images/paper.png
+%%DATADIR%%/data/images/sh1.png
+%%DATADIR%%/data/images/sh2.png
+%%DATADIR%%/data/images/sh3.png
+%%DATADIR%%/data/images/stop.png
+%%DATADIR%%/data/images/tnt.png
+@dirrm %%DATADIR%%/data/images
+@dirrm %%DATADIR%%/data/fonts
+@dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%
+@dirrm lib/imlib2/loaders
+@dirrm lib/imlib2/filters
+@dirrm lib/imlib2
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index baabe43cbb8a..5e13e48ca7d9 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	imlib2_loaders
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2.0
 PORTREVISION=	0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	enlightenment
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	Extra image loader plugins for Imlib 2
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2 \
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
 		edb.1:${PORTSDIR}/databases/edb \
 		eet.9:${PORTSDIR}/devel/eet
 
diff --git a/graphics/imlib2_loaders/distinfo b/graphics/imlib2_loaders/distinfo
index 6aa16270e115..6721a3bc7a28 100644
--- a/graphics/imlib2_loaders/distinfo
+++ b/graphics/imlib2_loaders/distinfo
@@ -1,2 +1,2 @@
-MD5 (imlib2_loaders-1.1.2.tar.gz) = 093664396dd3a0de3218993d3f5422b8
-SIZE (imlib2_loaders-1.1.2.tar.gz) = 308382
+MD5 (imlib2_loaders-1.2.0.tar.gz) = 564f8c5e1f6c131e73d6f6f8ee3d36e7
+SIZE (imlib2_loaders-1.2.0.tar.gz) = 310243
diff --git a/graphics/imlib2_loaders/pkg-plist b/graphics/imlib2_loaders/pkg-plist
index f4e6d1b4248a..fde48c18ff3b 100644
--- a/graphics/imlib2_loaders/pkg-plist
+++ b/graphics/imlib2_loaders/pkg-plist
@@ -1,5 +1,5 @@
-lib/imlib2_loaders/image/ani.so
-lib/imlib2_loaders/image/db.so
-lib/imlib2_loaders/image/eet.so
-lib/imlib2_loaders/image/ico.so
-lib/imlib2_loaders/image/xcf.so
+lib/imlib2/loaders/ani.so
+lib/imlib2/loaders/db.so
+lib/imlib2/loaders/eet.so
+lib/imlib2/loaders/ico.so
+lib/imlib2/loaders/xcf.so
diff --git a/graphics/kipi-plugins-kde4/Makefile b/graphics/kipi-plugins-kde4/Makefile
index aa99a0199f97..2304100c1c68 100644
--- a/graphics/kipi-plugins-kde4/Makefile
+++ b/graphics/kipi-plugins-kde4/Makefile
@@ -19,7 +19,7 @@ COMMENT=	KDE Image Plugin Interface plugins
 LIB_DEPENDS=	kexif:${PORTSDIR}/graphics/libkexif \
 		kipi:${PORTSDIR}/graphics/libkipi \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
-		Imlib2.2:${PORTSDIR}/graphics/imlib2
+		Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 OPTIONS=	ACQUIREIMAGES "scanner/screenshot plugin" on \
 		BATCHPROCESSIMAGES "batch processing on images" on \
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index aa99a0199f97..2304100c1c68 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -19,7 +19,7 @@ COMMENT=	KDE Image Plugin Interface plugins
 LIB_DEPENDS=	kexif:${PORTSDIR}/graphics/libkexif \
 		kipi:${PORTSDIR}/graphics/libkipi \
 		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
-		Imlib2.2:${PORTSDIR}/graphics/imlib2
+		Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 OPTIONS=	ACQUIREIMAGES "scanner/screenshot plugin" on \
 		BATCHPROCESSIMAGES "batch processing on images" on \
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index cae6484aaf1b..4fa9a28266cb 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -29,7 +29,7 @@ USE_XLIB=	yes
 .if defined(WITHOUT_IMLIB2)
 CONFIGURE_ARGS+=	--disable-imlib2
 .else
-LIB_DEPENDS+=		Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+=		Imlib2.3:${PORTSDIR}/graphics/imlib2
 .endif
 .endif
 
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 04a8a33f48d8..b45e295d1013 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to the Imlib2 image library
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 PERL_MODBUILD=	yes
 
diff --git a/graphics/p5-Imlib2/Makefile b/graphics/p5-Imlib2/Makefile
index e26fca52b63d..f18d7d074a03 100644
--- a/graphics/p5-Imlib2/Makefile
+++ b/graphics/p5-Imlib2/Makefile
@@ -16,7 +16,7 @@ DISTNAME=	${PORTNAME}-Perl-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl bindings for Imlib2
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 PERL_CONFIGURE=	yes
 
diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile
index b5565190d8b9..54849eb886ce 100644
--- a/graphics/ruby-imlib2/Makefile
+++ b/graphics/ruby-imlib2/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Imlib2 bindings for Ruby
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index 62780dab5ce5..63f42a222ce8 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	umeno@rr.iij4u.or.jp
 COMMENT=	Zooming photo album generator
 
 LIB_DEPENDS=	ming.3:${PORTSDIR}/graphics/ming \
-		Imlib2.2:${PORTSDIR}/graphics/imlib2 \
+		Imlib2.3:${PORTSDIR}/graphics/imlib2 \
 		popt.0:${PORTSDIR}/devel/popt
 .if !defined (WITHOUT_AVIPLAY)
 LIB_DEPENDS+=	aviplay.0:${PORTSDIR}/multimedia/avifile
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 14f1a8509814..f3f548fc44bc 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	q@uni.de
 COMMENT=	Camserv is a free program to do streaming video via the web
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		Imlib2.2:${PORTSDIR}/graphics/imlib2 \
+		Imlib2.3:${PORTSDIR}/graphics/imlib2 \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
 		freetype.9:${PORTSDIR}/print/freetype2
 
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index bddefe9bb499..2791b8d1c1c0 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -126,7 +126,7 @@ PLIST_SUB+=	DRAWTEXT="@comment "
 .endif
 ## enable imlib2
 .if !defined(WITHOUT_VHOOK) && defined(WITH_IMLIB2)
-LIB_DEPENDS+=	Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 PLIST_SUB+=	IMLIB2=""
 .else
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index bddefe9bb499..2791b8d1c1c0 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -126,7 +126,7 @@ PLIST_SUB+=	DRAWTEXT="@comment "
 .endif
 ## enable imlib2
 .if !defined(WITHOUT_VHOOK) && defined(WITH_IMLIB2)
-LIB_DEPENDS+=	Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 PLIST_SUB+=	IMLIB2=""
 .else
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 218f006c0952..bce3b3914bc2 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A very artistic X window manager
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 218f006c0952..bce3b3914bc2 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A very artistic X window manager
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 218f006c0952..bce3b3914bc2 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	A very artistic X window manager
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-wm/kahakai/Makefile b/x11-wm/kahakai/Makefile
index 72aac7248761..daaf003cc22b 100644
--- a/x11-wm/kahakai/Makefile
+++ b/x11-wm/kahakai/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Kahakai window manager
 
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/swig13 \
 	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2 \
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
 RUN_DEPENDS=	\
 	${X11BASE}/lib/X11/fonts/artwiz-fonts:${PORTSDIR}/x11-fonts/artwiz-fonts
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index 6c71ec7c4204..16db3bb94a24 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	phluid
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A window manager that emphasizes efficiency, speed, and beauty
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11-wm/skippy/Makefile b/x11-wm/skippy/Makefile
index 375c8d3eb535..37bea5dcc786 100644
--- a/x11-wm/skippy/Makefile
+++ b/x11-wm/skippy/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://thegraveyard.org/files/
 MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	A full-screen X11 task-switcher like Apple's Expose
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2 \
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
 		Xft.2:${PORTSDIR}/x11-fonts/libXft
 
 USE_XLIB=	yes
diff --git a/x11-wm/waimea/Makefile b/x11-wm/waimea/Makefile
index 39e01ba61694..99a030a34e4f 100644
--- a/x11-wm/waimea/Makefile
+++ b/x11-wm/waimea/Makefile
@@ -27,7 +27,7 @@ GNU_CONFIGURE=	yes
 MAN1=		waimea.1
 
 .if !defined(WITHOUT_PIXMAP)
-LIB_DEPENDS+=	Imlib2.2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS+=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index a88c1beab9d4..d83f2275662c 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D Virtual Desktop Switcher
 
 LIB_DEPENDS=	glut.3:${PORTSDIR}/graphics/libglut \
-		Imlib2.2:${PORTSDIR}/graphics/imlib2
+		Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 USE_AUTOCONF_VER=	259
 USE_GL=		yes
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index e4e1c14f5244..caf847c68927 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -16,7 +16,7 @@ COMMENT?=	X11 terminal emulator based on rxvt/xterm
 
 BUILD_DEPENDS=	man2html:${PORTSDIR}/textproc/man2html
 
-LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2 \
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2 \
 		ast.2:${PORTSDIR}/devel/libast
 
 USE_X_PREFIX=	yes
diff --git a/x11/wmmsg/Makefile b/x11/wmmsg/Makefile
index ff600fcab6a3..ed66d9367c2f 100644
--- a/x11/wmmsg/Makefile
+++ b/x11/wmmsg/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://taxiway.swapspace.net/~matt/wmmsg/
 MAINTAINER=	t.kempka@web.de
 COMMENT=	Dockapp that notifies you on ICQ, AIM and IRC events
 
-LIB_DEPENDS=	Imlib2:${PORTSDIR}/graphics/imlib2
+LIB_DEPENDS=	Imlib2.3:${PORTSDIR}/graphics/imlib2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}