9 files changed, 20 insertions, 16 deletions

diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index 9c49f8b65d8f..467267fecf97 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -14,8 +14,7 @@ DISTNAME=	ee-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
+LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -23,8 +22,7 @@ USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome \
-		--with-gnome=${PREFIX}
+		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 67ff6aa710d6..273579a7bc79 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	unstable/sources/gdk-pixbuf
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	gnome.3:${PORTSDIR}/x11/gnomelibs
+LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/graphics/gdk-pixbuf/pkg-plist b/graphics/gdk-pixbuf/pkg-plist
index fced2cbcda86..58c9c8f0e34b 100644
--- a/graphics/gdk-pixbuf/pkg-plist
+++ b/graphics/gdk-pixbuf/pkg-plist
@@ -38,6 +38,8 @@ lib/libgdk_pixbuf.so.2
 lib/libgnomecanvaspixbuf.a
 lib/libgnomecanvaspixbuf.so
 lib/libgnomecanvaspixbuf.so.1
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 share/aclocal/gdk-pixbuf.m4
 share/gnome/html/gdk-pixbuf-decl.txt
 share/gnome/html/gdk-pixbuf-sections.txt
@@ -60,8 +62,6 @@ share/gnome/html/gdk-pixbuf/gdkpixbufloader.html
 share/gnome/html/gdk-pixbuf/gnomecanvaspixbuf.html
 share/gnome/html/gdk-pixbuf/r14.html
 share/gnome/html/gdk-pixbuf/r15.html
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @dirrm share/gnome/html/gdk-pixbuf
 @dirrm share/gnome/html
 @dirrm include/gdk-pixbuf
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index f385ee0fb049..61b842ef0455 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	imlib
-PORTVERSION=	1.9.8
+PORTVERSION=	1.9.8.1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.enlightenment.org/enlightenment/enlightenment/libs/
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/imlib
 
 MAINTAINER=	vanilla@FreeBSD.org
 
@@ -16,6 +17,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo
index 3cf753b90d5a..9f05597792ac 100644
--- a/graphics/imlib/distinfo
+++ b/graphics/imlib/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.9.8.tar.gz) = b6a8034777554bc5287b367301c25635
+MD5 (imlib-1.9.8.1.tar.gz) = 224948ee96653990cd96daec090a5599
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index f385ee0fb049..61b842ef0455 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	imlib
-PORTVERSION=	1.9.8
+PORTVERSION=	1.9.8.1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.enlightenment.org/enlightenment/enlightenment/libs/
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/imlib
 
 MAINTAINER=	vanilla@FreeBSD.org
 
@@ -16,6 +17,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/graphics/imlib2-tmp/distinfo b/graphics/imlib2-tmp/distinfo
index 3cf753b90d5a..9f05597792ac 100644
--- a/graphics/imlib2-tmp/distinfo
+++ b/graphics/imlib2-tmp/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.9.8.tar.gz) = b6a8034777554bc5287b367301c25635
+MD5 (imlib-1.9.8.1.tar.gz) = 224948ee96653990cd96daec090a5599
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index f385ee0fb049..61b842ef0455 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	imlib
-PORTVERSION=	1.9.8
+PORTVERSION=	1.9.8.1
 CATEGORIES=	graphics
-MASTER_SITES=	ftp://ftp.enlightenment.org/enlightenment/enlightenment/libs/
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	stable/sources/imlib
 
 MAINTAINER=	vanilla@FreeBSD.org
 
@@ -16,6 +17,7 @@ LIB_DEPENDS=	png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		ungif.5:${PORTSDIR}/graphics/libungif \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo
index 3cf753b90d5a..9f05597792ac 100644
--- a/graphics/imlib2/distinfo
+++ b/graphics/imlib2/distinfo
@@ -1 +1 @@
-MD5 (imlib-1.9.8.tar.gz) = b6a8034777554bc5287b367301c25635
+MD5 (imlib-1.9.8.1.tar.gz) = 224948ee96653990cd96daec090a5599