Index: head/graphics/imlib2/Makefile
===================================================================
--- head/graphics/imlib2/Makefile	(revision 528025)
+++ head/graphics/imlib2/Makefile	(revision 528026)
@@ -1,79 +1,73 @@
 # Created by: Jeremy Norris <ishmael27@home.com>
 # $FreeBSD$
 
 PORTNAME=	imlib2
 PORTVERSION=	1.6.1
 PORTEPOCH=	2
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	SF/enlightenment/imlib2-src/${PORTVERSION}
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT=	The next generation graphics library for Enlightenment
 
 LICENSE=	imlib2
 LICENSE_NAME=	imlib2 license
 LICENSE_FILE=	${WRKSRC}/COPYING
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2
 
-CONFLICTS_INSTALL=	imlib2-webp
-
+USES=		libtool pathfix pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
-USES=		libtool pathfix pkgconfig tar:bzip2
 
 CONFIGURE_ARGS=	--enable-visibility-hiding --disable-static \
 		--with-zlib --with-bzip2
 CONFIGURE_ENV=	ac_cv_lib_dl_dlopen=no
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	JPEG PNG TIFF GIF ID3 X11 WEBP
-OPTIONS_DEFAULT=	JPEG PNG TIFF GIF ID3 X11 WEBP
+CONFLICTS_INSTALL=	imlib2-webp
+
+OPTIONS_DEFINE=		GIF ID3 JPEG PNG TIFF WEBP X11
+OPTIONS_DEFAULT=	GIF ID3 JPEG PNG TIFF WEBP X11
 OPTIONS_SUB=	yes
 
-X11_USES=		xorg
-X11_USE=		XORG=x11,sm,xcb,xext
-X11_CONFIGURE_ON=	--with-x --with-x-shm-fd
-X11_CONFIGURE_OFF=	--without-x --without-x-shm-fd
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
+GIF_CONFIGURE_WITH=	gif
 
+ID3_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
+ID3_CONFIGURE_WITH=	id3
+
 JPEG_USES=		jpeg
-JPEG_CONFIGURE_ON=	--with-jpeg
-JPEG_CONFIGURE_OFF=	--without-jpeg
+JPEG_CONFIGURE_WITH=	jpeg
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
-PNG_CONFIGURE_ON=	--with-png
-PNG_CONFIGURE_OFF=	--without-png
+PNG_CONFIGURE_WITH=	png
 
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
-TIFF_CONFIGURE_ON=	--with-tiff
-TIFF_CONFIGURE_OFF=	--without-tiff
+TIFF_CONFIGURE_WITH=	tiff
 
-GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
-GIF_CONFIGURE_ON=	--with-gif
-GIF_CONFIGURE_OFF=	--without-gif
-
-ID3_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
-ID3_CONFIGURE_ON=	--with-id3
-ID3_CONFIGURE_OFF=	--without-id3
-
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 WEBP_CONFIGURE_WITH=	webp
+
+X11_USES=		xorg
+X11_USE=		XORG=x11,sm,xcb,xext
+X11_CONFIGURE_WITH=	x x-shm-fd
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx)
 CONFIGURE_ARGS+=	--enable-mmx
 .else
 CONFIGURE_ARGS+=	--disable-mmx
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_ARGS+=	--enable-amd64
 .else
 CONFIGURE_ARGS+=	--disable-amd64
 .endif
 
 .include <bsd.port.mk>