- Remove Mk/bsd.efl.mk

- Convert USE_EFL=libtool_hack to USES=libtool
- Convert USE_EFL=imlib2 to LIB_DEPENDS=libImlib2.so:...
- Bump PORTVERSION in graphics/imlib2 and in all ports
  which depends on imlib2

PR:		196062
Approved by:	portmgr

51 files changed, 121 insertions, 378 deletions

diff --git a/Mk/bsd.efl.mk b/Mk/bsd.efl.mk
deleted file mode 100644
index b2b484c..0000000
--- a/Mk/bsd.efl.mk
+++ /dev/null
@@ -1,269 +0,0 @@
-#
-# $MBSDlabs: portmk/bsd.efl.mk,v 1.17 2006/10/02 14:57:48 stas Exp $
-# $FreeBSD$
-#
-# bsd.efl.mk - Support for Enlightenment Foundation Libraries (EFL)
-#
-# Author: Stanislav Sedov <stas@FreeBSD.org>
-# Inspired by bsd.sdl.mk by Edwin Groothuis <edwin@freebsd.org>
-#
-# You can specify EFL-related library dependency using "USE_EFL=" statement,
-# e.g. "USE_EFL= ecore evas" will add x11/ecore and graphics/evas as dependency
-# for your port.
-# You can check existency of certain library throught "WANT_EFL/HAVE_EFL" pair.
-# Note: WANT_EFL should be defined before including <bsd.port.pre.mk>, and
-# HAVE_EFL variable could be tested after it. For example:
-#
-#	WANT_EFL=	yes
-#	.include <bsd.port.pre.mk>
-#	.if ${HAVE_EFL:Mevas}
-#	USE_EFL+=	evas
-#	.endif
-#
-# Currently recognized variables are:
-# USE_EFL	- lists all EFL libraries which port depends on
-# WANT_EFL	- the port wants to test which of EFL libraries are installed
-#			on the target system
-#
-# The following variables could be tested after inclusion of bsd.port.pre.mk:
-# HAVE_EFL	- lists all EFL libraries which are available on target system
-#
-# Feel free to send any comments and suggestion to maintainer.
-#
-
-EFL_Include_MAINTAINER=	gblach@FreeBSD.org
-
-#
-# Define all supported libraries
-#
-_USE_EFL_ALL=	epeg imlib2
-
-# For each library supported we define the following variables:
-#	_%%LIB%%_CATEGORY	- category the port belongs to
-#	_%%LIB%%_PREFIX		- where the library is installed
-#	_%%LIB%%_VERSION	- version of the shared library
-#	_%%LIB%%_SLIB		- name of the shared library
-#
-
-_epeg_CATEGORY=		graphics
-_epeg_VERSION=		9
-
-_imlib2_CATEGORY=	graphics
-_imlib2_VERSION=	5
-_imlib2_SLIB=		Imlib2
-
-#
-# Assign values for variables which were not defined explicitly
-#
-.for LIB in ${_USE_EFL_ALL}
-. if !defined(_${LIB}_SLIB)
-_${LIB}_SLIB=${LIB}
-. endif
-. if !defined(_${LIB}_PORTNAME)
-_${LIB}_PORTNAME=${LIB}
-. endif
-. if !defined(_${LIB}_PREFIX)
-_${LIB}_PREFIX=${LOCALBASE}
-. endif
-.endfor
-
-#
-# Handle WANT_EFL feature
-#
-.if !defined(AFTERPORTMK)
-.if !defined(EFL_Include_pre)
-
-EFL_Include_pre=	bsd.efl.mk
-
-HAVE_EFL?=
-.if defined(WANT_EFL)
-#
-# General EFL components
-#
-. for LIB in ${_USE_EFL_ALL}
-.  if exists(${_${LIB}_PREFIX}/lib/lib${_${LIB}_SLIB}.so.${_${LIB}_VERSION})
-HAVE_EFL+=	${LIB}
-.  endif
-. endfor
-.endif
-
-.endif #EFL_Include_pre
-.endif #AFTERPORTMK
-
-#
-# Handle USE_EFL feature
-#
-.if !defined(BEFOREPORTMK)
-.if !defined(EFL_Include_post)
-
-.if defined(USE_EFL_EVAS_ENGINES)
-
-USE_EFL+=	evas
-
-_USE_EFL_EVAS_ENGINES=	#empty
-. for COMP in ${USE_EFL_EVAS_ENGINES}
-.  if ${_EFL_EVAS_ENGINES_ALL:M${COMP}}==""
-IGNORE=	cannot install: unknown evas engine ${COMP}
-.  else
-_USE_EFL_EVAS_ENGINES+=	${COMP}
-.  endif
-. endfor
-
-# Get rid of duplicates
-_USE_EFL_EVAS_ENGINES_UQ=	#empty
-. for COMP in ${_USE_EFL_EVAS_ENGINES}
-.  if ${_USE_EFL_EVAS_ENGINES_UQ:M${COMP}}==""
-_USE_EFL_EVAS_ENGINES_UQ+=	${COMP}
-.  endif
-. endfor
-
-. for COMP in ${_USE_EFL_EVAS_ENGINES_UQ}
-BUILD_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/${OPSYS:tl}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
-RUN_DEPENDS+=	${_EFL_EVAS_ENGINES_MODDIR}/${_evas_engine_${COMP}_DIR}/${OPSYS:tl}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_engine_${COMP}_CATEGORY}/${_evas_engine_${COMP}_PORTNAME}
-. endfor
-
-.endif #USE_EFL_EVAS_ENGINES
-
-.if defined(USE_EFL_EVAS_LOADERS)
-
-USE_EFL+=	evas
-
-_USE_EFL_EVAS_LOADERS=	#empty
-. for COMP in ${USE_EFL_EVAS_LOADERS}
-.  if ${_EFL_EVAS_LOADERS_ALL:M${COMP}}==""
-IGNORE=	cannot install: unknown evas loader ${COMP}
-.  else
-_USE_EFL_EVAS_LOADERS+=	${COMP}
-.  endif
-. endfor
-
-# Get rid of duplicates
-_USE_EFL_EVAS_LOADERS_UQ=	#empty
-. for COMP in ${_USE_EFL_EVAS_LOADERS}
-.  if ${_USE_EFL_EVAS_LOADERS_UQ:M${COMP}}==""
-_USE_EFL_EVAS_LOADERS_UQ+=	${COMP}
-.  endif
-. endfor
-
-. for COMP in ${_USE_EFL_EVAS_LOADERS_UQ}
-BUILD_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/${OPSYS:tl}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
-RUN_DEPENDS+=	${_EFL_EVAS_LOADERS_MODDIR}/${_evas_loader_${COMP}_DIR}/${OPSYS:tl}${OSREL}-${ARCH}/module.so:${PORTSDIR}/${_evas_loader_${COMP}_CATEGORY}/${_evas_loader_${COMP}_PORTNAME}
-. endfor
-
-.endif #USE_EFL_EVAS_LOADERS
-
-.if defined(USE_EFL_ECORE)
-
-USE_EFL+=	ecore
-
-_USE_EFL_ECORE=	#empty
-. for COMP in ${USE_EFL_ECORE}
-.  if ${_EFL_ECORE_ALL:M${COMP}}==""
-IGNORE=	cannot install: unknown ecore module ${COMP}
-.  else
-_USE_EFL_ECORE+=	${COMP}
-.  endif
-. endfor
-
-# Get rid of duplicates
-_USE_EFL_ECORE_UQ=	#empty
-. for COMP in ${_USE_EFL_ECORE}
-.  if ${_USE_EFL_ECORE_UQ:M${COMP}}==""
-_USE_EFL_ECORE_UQ+=	${COMP}
-.  endif
-. endfor
-
-. for COMP in ${_USE_EFL_ECORE_UQ}
-LIB_DEPENDS+=	lib${_ecore_${COMP}_NAME}.so.${_ecore_VERSION}:${PORTSDIR}/${_ecore_${COMP}_CATEGORY}/${_ecore_${COMP}_PORTNAME}
-. endfor
-
-.endif #USE_EFL_ECORE
-
-.if defined(USE_EFL)
-
-EFL_Include_post=	bsd.efl.mk
-
-#
-# Check if we have all libraries requiested and build depends list
-#
-.if ${USE_EFL:Mlibrt_hack}
-_USE_EFL_LIBRT_HACK=	yes
-.endif
-.if ${USE_EFL:Mmodarch_hack}
-_USE_EFL_MODARCH_HACK=	yes
-.endif
-.if ${USE_EFL:Mlibtool_hack}
-_USE_EFL_LIBTOOL_HACK=	yes
-.endif
-_USE_EFL=	#empty
-.for LIB in ${USE_EFL:Nlibrt_hack:Nmodarch_hack:Nlibtool_hack}
-. if ${_USE_EFL_ALL:M${LIB}}==""
-IGNORE=	cannot install: unknown library ${LIB}
-. else
-_USE_EFL+=	${LIB}
-. endif
-.endfor
-
-#
-# Get rid of duplicates
-#
-_USE_EFL_UQ=	#empty
-.for LIB in ${_USE_EFL}
-. if ${_USE_EFL_UQ:M${LIB}}==""
-_USE_EFL_UQ+=	${LIB}
-. endif
-.endfor
-
-#
-# define dependencies
-#
-.for LIB in ${_USE_EFL_UQ}
-LIB_DEPENDS+=	lib${_${LIB}_SLIB}.so.${_${LIB}_VERSION}:${PORTSDIR}/${_${LIB}_CATEGORY}/${_${LIB}_PORTNAME}
-.endfor
-
-#
-# Initialize configure enviropment
-#
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CFLAGS+=	-I${LOCALBASE}/include
-
-PLIST_SUB+=	E17_ARCH=${OPSYS:tl}${OSREL}-${ARCH}
-
-.if defined(_USE_EFL_LIBRT_HACK)
-#
-# Don't use librt
-#
-post-patch: efl_drop_librt
-efl_drop_librt:
-	@${REINPLACE_CMD} -E \
-		-e '/^[[:space:]]+freebsd\*/,/^[[:space:]];;/s/-lrt//g' \
-		${WRKSRC}/configure
-.endif
-
-.if defined(_USE_EFL_MODARCH_HACK)
-#
-# Use correct module arch path
-#
-post-patch: efl_patch_modarch
-efl_patch_modarch:
-	@${REINPLACE_CMD} -E \
-		-e 's/(MODULE_ARCH="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
-		-e 's/(MODULE_EDJE="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
-		${WRKSRC}/configure
-.endif
-
-.if defined(_USE_EFL_LIBTOOL_HACK)
-#
-# Get rid of .la and static library files
-#
-post-configure: efl_drop_la
-efl_drop_la:
-	${REINPLACE_CMD} -E -e \
-		'/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
-.endif
-
-.endif #USE_EFL
-
-.endif #EFL_Include_post
-.endif #BEFOREPORTMK
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 8f3eaef..6a422a0 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -383,9 +383,6 @@ FreeBSD_MAINTAINER=	portmgr@FreeBSD.org
 #				  (libtool, autoconf, autoheader, automake et al.)
 #				  See bsd.autotools.mk for more details.
 ##
-# USE_EFL		- If set, this port use EFL libraries.
-#				  Implies inclusion of bsd.efl.mk.  (Also see
-#				  that file for more information on USE_EFL_*).
 # USE_FPC		- If set, this port relies on the Free Pascal language.
 # 				  Implies inclusion of bsd.fpc.mk.  (Also see
 #				  that file for more information on WANT_FPC_*).
@@ -1423,10 +1420,6 @@ PKGCOMPATDIR?=		${LOCALBASE}/lib/compat/pkg
 USES+=	python
 .endif
 
-.if defined(USE_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART)
-.include "${PORTSDIR}/Mk/bsd.efl.mk"
-.endif
-
 .if defined(USE_FPC) || defined(WANT_FPC_BASE) || defined(WANT_FPC_ALL)
 .include "${PORTSDIR}/Mk/bsd.fpc.mk"
 .endif
@@ -1857,10 +1850,6 @@ _FORCE_POST_PATTERNS=	rmdir kldxref mkfontscale mkfontdir fc-cache \
 .include "${PORTSDIR}/Mk/bsd.gstreamer.mk"
 .endif
 
-.if defined(USE_EFL) || defined(WANT_EFL) || defined(USE_EFL_ESMART)
-.include "${PORTSDIR}/Mk/bsd.efl.mk"
-.endif
-
 .if defined(USE_JAVA)
 .include "${PORTSDIR}/Mk/bsd.java.mk"
 .endif
diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile
index 5f8957f..65fcc87 100644
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	deadbeef
 PORTVERSION=	0.6.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio
 MASTER_SITES=	SF/${PORTNAME}/
 
diff --git a/deskutils/pypanel/Makefile b/deskutils/pypanel/Makefile
index de022f1..8b95b85 100644
--- a/deskutils/pypanel/Makefile
+++ b/deskutils/pypanel/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	pypanel
 PORTVERSION=	2.4
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	deskutils
 MASTER_SITES=	SF
 DISTNAME=	PyPanel-${PORTVERSION}
@@ -11,13 +11,13 @@ DISTNAME=	PyPanel-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop panel written in Python
 
-LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Xlib/X.py:${PORTSDIR}/x11-toolkits/py-xlib
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		python
 USE_PYTHON=	distutils autoplist
-USE_EFL=	imlib2
 USE_XORG=	xft
 
 PORTDOCS=	*
diff --git a/devel/libast/Makefile b/devel/libast/Makefile
index 8bcd356..c131167 100644
--- a/devel/libast/Makefile
+++ b/devel/libast/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libast
 PORTVERSION=	0.7
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	devel
 MASTER_SITES=	http://www.eterm.org/download/ \
 		CRITICAL
@@ -13,9 +13,9 @@ COMMENT=	Library of assorted spiffy things
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2
 
-USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index ce70a83..f082b1c 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	texmacs
 PORTVERSION=	1.0.7.21
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	editors print
 MASTER_SITES=	ftp://ftp.texmacs.org/TeXmacs/tmftp/source/ \
 		http://www.predatorlabs.net/dl/
@@ -45,7 +45,7 @@ GHOSTSCRIPT_CONFIGURE_WITH=	gs=yes
 ICONV_USES=		iconv
 ICONV_CONFIGURE_WITH=	iconv
 
-IMLIB2_USE=		EFL=imlib2
+IMLIB2_LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
 IMLIB2_CONFIGURE_ON=	--with-imlib2
 IMLIB2_CONFIGURE_OFF=	--without-imlib
 
diff --git a/games/netrek-client-cow/Makefile b/games/netrek-client-cow/Makefile
index 7816f73..c64d89a 100644
--- a/games/netrek-client-cow/Makefile
+++ b/games/netrek-client-cow/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	netrek-client-cow
 PORTVERSION=	3.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games
 MASTER_SITES=	http://www.netrek.org/files/COW/ \
 		http://quozl.us.netrek.org/netrek/
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index 840a172..b23b259 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xteddy
 PORTVERSION=	2.2
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	http://webstaff.itn.liu.se/~stegu/xteddy/ \
 		http://www.skysmurf.nl/comp/FreeBSD/distfiles/
@@ -12,8 +13,9 @@ COMMENT=	Cuddlesome teddy for the X desktop
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 USES=		pkgconfig
-USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 23e41c7..2123506 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	feh
 PORTVERSION=	2.12
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://feh.finalrewind.org/ \
 		${MASTER_SITE_LOCAL}
@@ -13,11 +14,11 @@ COMMENT=	Image viewer that utilizes Imlib2
 
 LICENSE=	MIT
 
-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 USE_XORG=	x11 xt xinerama
 USES=		gmake perl5 tar:bzip2 shebangfix desktop-file-utils
-USE_EFL=	imlib2
 USE_PERL5=	run
 
 CPPFLAGS+=	-I${LOCALBASE}/include -std=c99
diff --git a/graphics/giblib/Makefile b/graphics/giblib/Makefile
index 2bd2d48..51d54d1 100644
--- a/graphics/giblib/Makefile
+++ b/graphics/giblib/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	giblib
 PORTVERSION=	1.2.4
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://linuxbrit.co.uk/downloads/
 
@@ -13,8 +13,9 @@ COMMENT=	Utility library that includes a wrapper for imlib2
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 USES=		pathfix pkgconfig libtool
-USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_ARGS=	docsdir=${DOCSDIR}
diff --git a/graphics/hsetroot/Makefile b/graphics/hsetroot/Makefile
index 18c5b25..5c03c98 100644
--- a/graphics/hsetroot/Makefile
+++ b/graphics/hsetroot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	hsetroot
 PORTVERSION=	1.0.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics
 MASTER_SITES=	http://cdn.thegraveyard.org/releases/hsetroot/ \
 		http://www.skysmurf.nl/comp/FreeBSD/distfiles/
@@ -13,11 +13,12 @@ COMMENT=	Wallpaper manipulation utility for X11
 
 LICENSE=	GPLv2
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 GNU_CONFIGURE=	yes
 USES=		gmake
-USE_EFL=	imlib2
 USE_XORG=	x11
-LDFLAGS+=	-lX11
+LDFLAGS+=	-L${LOCALBASE}/lib -lX11
 
 PLIST_FILES=	bin/hsetroot
 
diff --git a/graphics/icat/Makefile b/graphics/icat/Makefile
index 9c4b80d..897d9e3 100644
--- a/graphics/icat/Makefile
+++ b/graphics/icat/Makefile
@@ -3,13 +3,15 @@
 
 PORTNAME=	icat
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Displays images in 256-color capable terminals
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 USES=		gmake dos2unix
-USE_EFL=	imlib2
 USE_GITHUB=	yes
 GH_ACCOUNT=	atextor
 GH_TAGNAME=	v${PORTVERSION}
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index e4e8fed..7b0d2d6 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	imlib2
 PORTVERSION=	1.4.6
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	2
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -20,11 +20,10 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 
 GNU_CONFIGURE=	yes
-USE_EFL=	libtool_hack
 USE_LDCONFIG=	yes
-USES=		pathfix pkgconfig tar:bzip2
+USES=		libtool pathfix pkgconfig tar:bzip2
 
-CONFIGURE_ARGS+=	--enable-visibility-hiding
+CONFIGURE_ARGS+=	--enable-visibility-hiding --disable-static
 CONFIGURE_ENV+=	ac_cv_lib_dl_dlopen=no
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/graphics/imlib2/pkg-plist b/graphics/imlib2/pkg-plist
index 7921c7d..bf53525 100644
--- a/graphics/imlib2/pkg-plist
+++ b/graphics/imlib2/pkg-plist
@@ -25,7 +25,8 @@ lib/imlib2/loaders/tga.so
 lib/imlib2/loaders/xpm.so
 lib/imlib2/loaders/zlib.so
 lib/libImlib2.so
-lib/libImlib2.so.5
+lib/libImlib2.so.1
+lib/libImlib2.so.1.4.6
 libdata/pkgconfig/imlib2.pc
 %%DATADIR%%/data/fonts/cinema.ttf
 %%DATADIR%%/data/fonts/grunge.ttf
diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile
index 4885936..f997af0 100644
--- a/graphics/imlib2_loaders/Makefile
+++ b/graphics/imlib2_loaders/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	imlib2_loaders
 PORTVERSION=	1.4.6
+PORTREVISION=	1
 PORTEPOCH=	2
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -17,15 +18,17 @@ LICENSE_NAME_imlib2=	imlib2 license
 LICENSE_FILE_imlib2=	${WRKSRC}/COPYING
 LICENSE_PERMS_imlib2=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 GNU_CONFIGURE=	yes
-USES=		pathfix pkgconfig tar:bzip2
-USE_EFL=	imlib2 libtool_hack
+USES=		libtool pathfix pkgconfig tar:bzip2
 
 OPTIONS_DEFINE=	EET XCF
 OPTIONS_DEFAULT=	EET XCF
 EET_DESC=	Enable eet loader
 XCF_DESC=	Enable XCF loader
 
+CONFIGURE_ARGS=	--disable-static
 MAKE_ENV+=	INSTALL_STRIP_FLAG="${STRIP}"
 
 .include <bsd.port.options.mk>
diff --git a/graphics/libcaca/Makefile b/graphics/libcaca/Makefile
index f03982e..f40d49b 100644
--- a/graphics/libcaca/Makefile
+++ b/graphics/libcaca/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	libcaca
 DISTVERSION=	0.99.beta19
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://caca.zoy.org/raw-attachment/wiki/libcaca/
 
@@ -32,7 +33,7 @@ FTGL_DESC=	Freetype font rendering in OpenGL
 
 X11_USE=	XORG=x11 GL=glut
 X11_CONFIGURE_OFF=	--disable-x11 --disable-gl
-IMLIB2_USE=	EFL=imlib2
+IMLIB2_LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
 IMLIB2_CONFIGURE_ENABLE=	imlib2
 SLANG_LIB_DEPENDS=	libslang.so.2:${PORTSDIR}/devel/libslang2
 SLANG_CONFIGURE_ENABLE=	slang
diff --git a/graphics/maim/Makefile b/graphics/maim/Makefile
index ff8f44e..82e5472 100644
--- a/graphics/maim/Makefile
+++ b/graphics/maim/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	maim
 PORTVERSION=	3.3.41
+PORTREVISION=	1
 CATEGORIES=	graphics
 
 MAINTAINER=	neel@neelc.org
@@ -9,6 +10,8 @@ COMMENT=	Screenshot utility with performance improvements over scrot
 
 LICENSE=	GPLv3
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 USE_GITHUB=	yes
 GH_ACCOUNT=	naelstrof
 GH_PROJECT=	maim
@@ -16,7 +19,6 @@ GH_TAGNAME=	v${PORTVERSION}
 GH_COMMIT=	178b253
 
 USES=		cmake
-USE_EFL=	imlib2
 USE_XORG=	x11 xrandr xfixes
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index fa6c6c8..bbf045b6 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Image-Imlib2
 PORTVERSION=	2.03
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -12,10 +12,10 @@ MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to the Imlib2 image library
 
 BUILD_DEPENDS+=	p5-Test-Simple>=0:${PORTSDIR}/devel/p5-Test-Simple
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 USES=		perl5
 USE_PERL5=	modbuild
-USE_EFL=	imlib2
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
diff --git a/graphics/p5-Imlib2/Makefile b/graphics/p5-Imlib2/Makefile
index b99afbf..f360428 100644
--- a/graphics/p5-Imlib2/Makefile
+++ b/graphics/p5-Imlib2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	Imlib2
 PORTVERSION=	1.0.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.muhri.net/
 PKGNAMEPREFIX=	p5-
@@ -12,7 +12,8 @@ DISTNAME=	${PORTNAME}-Perl-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl bindings for Imlib2
 
-USE_EFL=	imlib2
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 USES=		perl5
 USE_PERL5=	configure
 
diff --git a/graphics/pecl-imlib2/Makefile b/graphics/pecl-imlib2/Makefile
index dec568e..2fb3db9 100644
--- a/graphics/pecl-imlib2/Makefile
+++ b/graphics/pecl-imlib2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	imlib2
 PORTVERSION=	0.1.00
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@@ -13,11 +13,12 @@ DIST_SUBDIR=	PECL
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	PECL extension if imlib2
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 USE_PHP=	yes
 USE_PHPEXT=	yes
 DEFAULT_PHP_VER=53
 IGNORE_WITH_PHP=5
-USE_EFL=	imlib2
 
 # libImlib2 may or may not depend on X, however,
 # imlib2 extension doesn't need X related functions in libImlib2
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 57eb988..08f1dbb 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qiv
 PORTVERSION=	2.3.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://spiegl.de/qiv/download/ \
 		http://www.predatorlabs.net/dl/
diff --git a/graphics/ruby-imlib2/Makefile b/graphics/ruby-imlib2/Makefile
index 7481b5a..b3e6939 100644
--- a/graphics/ruby-imlib2/Makefile
+++ b/graphics/ruby-imlib2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	imlib2
 PORTVERSION=	0.5.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics ruby
 MASTER_SITES=	http://www.pablotron.org/download/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -13,11 +13,12 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Imlib2 bindings for Ruby
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_EFL=	imlib2
 
 INSTALL_TARGET=	site-install
 
diff --git a/graphics/scrot/Makefile b/graphics/scrot/Makefile
index 136f2ee..bfb43eb 100644
--- a/graphics/scrot/Makefile
+++ b/graphics/scrot/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	scrot
 PORTVERSION=	0.8
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	graphics
 MASTER_SITES=	http://linuxbrit.co.uk/downloads/ \
 		http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/simpleviewer/Makefile b/graphics/simpleviewer/Makefile
index dcdf7a8..ae01295 100644
--- a/graphics/simpleviewer/Makefile
+++ b/graphics/simpleviewer/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	simpleviewer
 PORTVERSION=	1.7.1553.8560
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/OpenGL%20edition
 DISTNAME=	sviewgl-src-${PORTVERSION}
@@ -15,10 +15,10 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
-		libgif.so:${PORTSDIR}/graphics/giflib
+		libgif.so:${PORTSDIR}/graphics/giflib \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 USES=		tar:bzip2
-USE_EFL=	imlib2
 USE_GL=		glut
 WRKSRC=		${WRKDIR}/sviewgl-src
 MAKE_ARGS=	CC="${CXX}"
diff --git a/graphics/sxiv/Makefile b/graphics/sxiv/Makefile
index c888a74..5e90877 100644
--- a/graphics/sxiv/Makefile
+++ b/graphics/sxiv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	sxiv
 PORTVERSION=	1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/muennich/sxiv/archive/
 DISTNAME=	v${PORTVERSION}
diff --git a/graphics/telak/Makefile b/graphics/telak/Makefile
index 9fde869..cfdaa3e 100644
--- a/graphics/telak/Makefile
+++ b/graphics/telak/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	telak
 PORTVERSION=	0.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://julien.danjou.info/telak/ \
 		CRITICAL
@@ -14,10 +14,10 @@ COMMENT=	Tool to draw pictures on your root window
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-		libgcrypt.so:${PORTSDIR}/security/libgcrypt
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 USES=		gmake
-USE_EFL=	imlib2
 
 ALL_TARGET=	${PORTNAME}
 
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index 766a501..cdb8b2f 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	zphoto
 PORTVERSION=	1.2
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	graphics www
 MASTER_SITES=	http://namazu.org/~satoru/zphoto/
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,8 @@ OPTIONS_DEFAULT=	ZIP
 ZIP_DESC=	Enable zip support
 
 LIB_DEPENDS=	libming.so:${PORTSDIR}/graphics/ming \
-		libpopt.so:${PORTSDIR}/devel/popt
+		libpopt.so:${PORTSDIR}/devel/popt \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 ZIP_RUN_DEPENDS=	zip:${PORTSDIR}/archivers/zip
 ZIP_CONFIGURE_OFF=	--disable-zip
@@ -25,7 +26,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-avifile
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
-USE_EFL=	imlib2
 USES=		perl5 gmake
 USE_PERL5=	build
 
diff --git a/irc/minbif/Makefile b/irc/minbif/Makefile
index 14c5595..f38d06e 100644
--- a/irc/minbif/Makefile
+++ b/irc/minbif/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	minbif
 PORTVERSION=	1.0.5
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	irc net-im
 MASTER_SITES=	https://symlink.me/attachments/download/148/
 
@@ -64,7 +64,7 @@ CMAKE_ARGS+=	-DENABLE_VIDEO:BOOL=OFF
 .endif
 
 .if ${PORT_OPTIONS:MCACA}
-USE_EFL=	imlib2
+LIB_DEPENDS+=	libImlib2.so:${PORTSDIR}/graphics/imlib2
 .endif
 
 .if ${PORT_OPTIONS:MVIDEO} && empty(PORT_OPTIONS:MCACA)
diff --git a/multimedia/audacious-plugins/Makefile b/multimedia/audacious-plugins/Makefile
index 9284a59..4bc78bc 100644
--- a/multimedia/audacious-plugins/Makefile
+++ b/multimedia/audacious-plugins/Makefile
@@ -21,7 +21,6 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS=	--disable-mpris2
 USE_GNOME=	glib20
-WANT_EFL=	yes
 WANT_SDL=	yes
 
 PORTDOCS=	AUTHORS
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 1946bd8..e7c7f23 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	camserv
 PORTVERSION=	0.5.1
-PORTREVISION=	18
+PORTREVISION=	19
 PORTEPOCH=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/cserv/${PORTNAME}/${PORTVERSION}
@@ -28,7 +28,7 @@ OPTIONS_DEFINE=	IMLIB2 PIXBUF V4L DOCS
 OPTIONS_DEFAULT=IMLIB2
 OPTIONS_SUB=	yes
 
-IMLIB2_USE=	EFL=imlib2
+IMLIB2_LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
 IMLIB2_CONFIGURE_OFF=	ac_cv_path_IMLIB2_CONFIG=no
 
 PIXBUF_USE=	GNOME=gdkpixbuf
diff --git a/multimedia/py-kaa-imlib2/Makefile b/multimedia/py-kaa-imlib2/Makefile
index 3d3a793..37b87b8 100644
--- a/multimedia/py-kaa-imlib2/Makefile
+++ b/multimedia/py-kaa-imlib2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	kaa-imlib2
 PORTVERSION=	0.2.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia python
 MASTER_SITES=	SF/freevo/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,9 +13,9 @@ COMMENT=	Kaa Media Repository - imlib2 wrapper for python
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/kaa/__init__.py:${PORTSDIR}/multimedia/py-kaa-base
 RUN_DEPENDS:=	${BUILD_DEPENDS}
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 USES=		python
 USE_PYTHON=	distutils autoplist
-USE_EFL=	imlib2
 
 .include <bsd.port.mk>
diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index 51db25d..f3baa0a 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	awesome
 PORTVERSION=	3.5.5
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
@@ -30,11 +30,11 @@ LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
 		libxcb-util.so:${PORTSDIR}/x11/xcb-util \
 		libxcb-cursor.so:${PORTSDIR}/x11/xcb-util-cursor \
 		libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms \
-		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm
+		libxcb-icccm.so:${PORTSDIR}/x11/xcb-util-wm \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 USES=		cmake execinfo iconv pkgconfig lua tar:xz
 CMAKE_ARGS+=	-DSYSCONFDIR=${PREFIX}/etc
-USE_EFL=	imlib2
 USE_GNOME=	glib20 pango gdkpixbuf2
 USE_XORG=	pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \
 		xproto
diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile
index e9526b6..d3eda110f 100644
--- a/x11-wm/awesome2/Makefile
+++ b/x11-wm/awesome2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	awesome2
 PORTVERSION=	2.3.6
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://awesome.naquadah.org/download/
 DISTNAME=	awesome-${PORTVERSION}
@@ -17,15 +17,15 @@ BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
 		xmlto:${PORTSDIR}/textproc/xmlto
 LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse \
 		libcairo.so:${PORTSDIR}/graphics/cairo \
-		libfreetype.so:${PORTSDIR}/print/freetype2
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 USES=		iconv pkgconfig python:build
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PYTHON=${PYTHON_CMD}
-USE_EFL=	imlib2
 USE_GNOME=	pango
 USE_XORG=	x11 xft xext xinerama xt xrandr xproto
-LDFLAGS+=	-lX11 -lXext ${ICONV_LIB}
+LDFLAGS+=	-L${LOCALBASE}/lib -lX11 -lXext ${ICONV_LIB}
 
 MAN1S=		awesome2.1 \
 		awesome2-client.1 \
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index fc3a414..ee3426f 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	e16
 PORTVERSION=	1.0.15
+PORTREVISION=	1
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	SF/enlightenment/${PORTNAME}/${PORTVERSION}/
 
@@ -11,6 +12,8 @@ COMMENT=	Enlightenment DR16 window manager
 
 LICENSE=	MIT
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 OPTIONS_DEFINE=		DOCS NLS SOUND
 OPTIONS_SUB=		yes
 SOUND_DESC=		Sound support via pulseaudio/libsndfile
@@ -30,7 +33,6 @@ USE_XORG=	compositeproto damageproto xextproto x11 xbitmaps xcomposite xdamage \
 		xext xfixes xft xinerama xrandr xrender xxf86vm
 USES=		gettext gmake iconv libtool perl5 pkgconfig shebangfix
 SHEBANG_FILES=	scripts/e_gen_menu
-USE_EFL=	imlib2
 CFLAGS+=	-Wno-unused-parameter
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-dependency-tracking \
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index 1b4cf6d..d90b89a 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	epplets
 PORTVERSION=	0.14
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF/enlightenment/${PORTNAME}/${PORTVERSION}
 
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index 2bea381..cb31ad7 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	fluxbox
 PORTVERSION=	1.3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
@@ -65,7 +65,7 @@ PLIST_SUB+=		DOCPDF="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MIMLIB2}
-USE_EFL+=		imlib2
+LIB_DEPENDS+=		libImlib2.so:${PORTSDIR}/graphics/imlib2
 CONFIGURE_ARGS+=	--enable-imlib2
 .else
 CONFIGURE_ARGS+=	--disable-imlib2
diff --git a/x11-wm/obconf/Makefile b/x11-wm/obconf/Makefile
index 2513dcf..eef8224 100644
--- a/x11-wm/obconf/Makefile
+++ b/x11-wm/obconf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	obconf
 PORTVERSION=	2.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://openbox.org/dist/obconf/
 
diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index b440aac..ef1f5c7 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	openbox
 PORTVERSION=	3.5.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://openbox.org/dist/openbox/
 
@@ -37,7 +37,7 @@ NOTIFY_LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notific
 NOTIFY_CONFIGURE_OFF=	--disable-startup-notification
 
 IMLIB_CONFIGURE_ENABLE=	imlib2
-IMLIB_USE=	EFL=imlib2
+IMLIB_LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 SVG_USE=	GNOME=librsvg2
 SVG_CONFIGURE_ENABLE=	librsvg
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index c4aa6ed..05e0214 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -3,15 +3,16 @@
 
 PORTNAME=	phluid
 PORTVERSION=	0.0.3
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	x11-wm
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window manager that emphasizes efficiency, speed, and beauty
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 USES=		gmake
-USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lm -lX11
diff --git a/x11-wm/wmfs/Makefile b/x11-wm/wmfs/Makefile
index 9f759ce..8691e79 100644
--- a/x11-wm/wmfs/Makefile
+++ b/x11-wm/wmfs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wmfs
 DISTVERSION=	201104
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://wmfs.info/attachments/download/45/ \
 		http://cloud.github.com/downloads/xorg62/wmfs/
@@ -32,7 +32,7 @@ XRANDR_USE=	XORG=xrandr
 XRANDR_CONFIGURE_WITH+=	xrandr
 XINERAMA_USE=	XORG=xinerama
 XINERARAM_CONFIGURE_WITH=	xinerama
-IMLIB_USE=	EFL=imlib2
+IMLIB_LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
 IMLIB_CONFIGURE_WITH=	imlib2
 
 .include <bsd.port.mk>
diff --git a/x11/3ddesktop/Makefile b/x11/3ddesktop/Makefile
index c39c8b1..28d4e5d 100644
--- a/x11/3ddesktop/Makefile
+++ b/x11/3ddesktop/Makefile
@@ -3,16 +3,17 @@
 
 PORTNAME=	3ddesktop
 PORTVERSION=	0.2.9
-PORTREVISION=	12
+PORTREVISION=	13 
 CATEGORIES=	x11
 MASTER_SITES=	SF/desk3d/${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	3D Virtual Desktop Switcher
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 USE_XORG=	xmu
 USE_GL=		glut
-USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	README README.windowmanagers
diff --git a/x11/bgs/Makefile b/x11/bgs/Makefile
index edbc7fe..c7f7012 100644
--- a/x11/bgs/Makefile
+++ b/x11/bgs/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bgs
 PORTVERSION=	0.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11
 MASTER_SITES=	http://s01.de/~gottox/files/bgs/ \
 		http://laffaye.free.fr/distfiles/
@@ -11,8 +11,9 @@ MASTER_SITES=	http://s01.de/~gottox/files/bgs/ \
 MAINTAINER=	jlaffaye@FreeBSD.org
 COMMENT=	Simple X11 BackGround Setter using Imlib2
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 USE_XORG=	x11 xinerama
-USE_EFL=	imlib2
 
 PLIST_FILES=	bin/bgs \
 		man/man1/bgs.1.gz
diff --git a/x11/erun/Makefile b/x11/erun/Makefile
index f9c1a9a..efa89c2 100644
--- a/x11/erun/Makefile
+++ b/x11/erun/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	E-Run
 PORTVERSION=	1.2
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	kbyanc
@@ -11,14 +11,14 @@ MASTER_SITE_SUBDIR=	kbyanc
 MAINTAINER=	gblach@FreeBSD.org
 COMMENT=	Simple epplet for launching arbitrary programs
 
-LIB_DEPENDS=	libepplet.so:${PORTSDIR}/x11-wm/epplets
+LIB_DEPENDS=	libepplet.so:${PORTSDIR}/x11-wm/epplets \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 PLIST_FILES=	bin/E-Run.epplet
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_GL=	gl
-USE_EFL=	imlib2
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib -lepplet -lImlib2 -lGL ${PTHREAD_LIBS}
 
diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index ffd5904..8a9afb9 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	eterm
 PORTVERSION=	0.9.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES+=	x11
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Eterm-${PORTVERSION}
 DISTNAME=	Eterm-${PORTVERSION}
@@ -12,7 +12,8 @@ MAINTAINER?=	olgeni@FreeBSD.org
 COMMENT?=	X11 terminal emulator based on rxvt/xterm
 
 BUILD_DEPENDS=	man2html:${PORTSDIR}/textproc/man2html
-LIB_DEPENDS=	libast.so:${PORTSDIR}/devel/libast
+LIB_DEPENDS=	libast.so:${PORTSDIR}/devel/libast \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--enable-trans --enable-utmp \
@@ -25,7 +26,6 @@ USES=		iconv libtool shebangfix
 SHEBANG_FILES=	${WRKSRC}/utils/kEsetroot.in
 perl_OLD_CMD=	@PERL@
 USE_CSTD=	gnu89
-USE_EFL=	imlib2
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xt
 
diff --git a/x11/fbdesk/Makefile b/x11/fbdesk/Makefile
index f4da137..1ff4a23 100644
--- a/x11/fbdesk/Makefile
+++ b/x11/fbdesk/Makefile
@@ -20,7 +20,6 @@ OPTIONS_DEFAULT=	IMLIB2
 
 USE_XORG=	xext xft xpm xrender
 USES=		pkgconfig
-WANT_EFL=	yes
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	ChangeLog INSTALL README
@@ -29,7 +28,7 @@ PLIST_FILES=	bin/fbdesk
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIMLIB2}
-USE_EFL+=	imlib2
+LIB_DEPENDS+=	libImlib2.so:${PORTSDIR}/graphics/imlib2
 .else
 CONFIGURE_ARGS+=	--disable-imlib2
 .endif
diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index 069cd9d..561fb26 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -3,16 +3,16 @@
 
 PORTNAME=	idesk
 PORTVERSION=	0.7.5
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	x11
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Place launch icons and background directly on your desktop
 
-LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS=	libXft.so:${PORTSDIR}/x11-fonts/libXft \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2
 
-USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf
 USES=		gmake pkgconfig tar:bzip2
diff --git a/x11/ipager/Makefile b/x11/ipager/Makefile
index 0cd05ee..ad62b8a 100644
--- a/x11/ipager/Makefile
+++ b/x11/ipager/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ipager
 PORTVERSION=	1.1.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	x11
 MASTER_SITES=	http://useperl.ru/ipager/src/
 
@@ -12,8 +12,9 @@ COMMENT=	X11 pager program
 
 LICENSE=	MIT
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 USES=		scons
-USE_EFL=	imlib2
 
 SUB_FILES=	pkg-message
 
diff --git a/x11/metalock/Makefile b/x11/metalock/Makefile
index 9458f98..d165372 100644
--- a/x11/metalock/Makefile
+++ b/x11/metalock/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	metalock
 PORTVERSION=	0.8.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	BERLIOS GOOGLE_CODE
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -36,7 +36,7 @@ MAKE_ARGS+=	USE_ULTRAGETOPT=no
 .endif
 
 .if ${PORT_OPTIONS:MIMLIB2}
-USE_EFL=	imlib2
+LIB_DEPENDS+=	libImlib2.so:${PORTSDIR}/graphics/imlib2
 MAKE_ARGS+=	USE_IMLIB2=yes
 .else
 MAKE_ARGS+=	USE_IMLIB2=no
diff --git a/x11/tint/Makefile b/x11/tint/Makefile
index e1b6dac..991b98e 100644
--- a/x11/tint/Makefile
+++ b/x11/tint/Makefile
@@ -2,20 +2,20 @@
 
 PORTNAME=	tint2
 PORTVERSION=	0.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
 MAINTAINER=	yamagi@yamagi.org
 COMMENT=	Lightweight freedesktop-compliant panel/taskbar/systray/clock
 
-LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
+LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
+		libImlib2.so:${PORTSDIR}/graphics/imlib2
 
 PROJECTHOST=	tint2
 USES=		cmake pkgconfig tar:bzip2
 USE_GNOME=	pango glib20
 USE_XORG=	xinerama xrandr xdamage xcomposite
-USE_EFL=	imlib2
 
 CMAKE_ARGS=	-DENABLE_BATTERY:BOOL=ON -DMANDIR:PATH=man
 
diff --git a/x11/wbar/Makefile b/x11/wbar/Makefile
index b248480..f4fc222 100644
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wbar
 PORTVERSION=	2.3.4
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 
@@ -12,12 +12,14 @@ COMMENT=	quick launch bar for fluxbox, WindowMaker, Xfce, etc
 
 LICENSE=	GPLv3
 
+LIB_DEPENDS=	libImlib2.so:${PORTSDIR}/graphics/imlib2
+
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX}
 
 USES=		pkgconfig gettext gmake tar:tgz
-USE_EFL=	imlib2
 
 GNU_CONFIGURE=	yes
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	NLS WBARCONFIG
 OPTIONS_DEFAULT=	NLS WBARCONFIG
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index 57f4d63..8987768 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	wmappl
 PORTVERSION=	0.71
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=		DOCS IMLIB2
 
-IMLIB2_USE= 		EFL=imlib2
+IMLIB2_LIB_DEPENDS= 	libImlib2.so:${PORTSDIR}/graphics/imlib2
 IMLIB2_CONFIGURE_ENABLE=Imlib2
 
 post-extract: