diff --git a/x11/e17/Makefile.inc b/x11/e17/Makefile.inc
index 57d4e11f5b5..3ec8f0c88ed 100644
--- a/x11/e17/Makefile.inc
+++ b/x11/e17/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.20 2013/03/31 18:48:00 rpe Exp $
+# $OpenBSD: Makefile.inc,v 1.21 2013/05/09 17:03:55 rpe Exp $
 
 CATEGORIES ?=		x11
 
@@ -17,10 +17,3 @@ LIBTOOL_FLAGS ?=	--tag=disable-static
 
 FULLARCH =		${MACHINE_ARCH:S/amd64/x86_64/}
 SUBST_VARS +=		FULLARCH OSREV VERSION
-
-#FLAVORS = debug
-#FLAVOR ?=
-#.if ${FLAVOR:Mdebug}
-#CFLAGS +=		-O0 -g
-#INSTALL_STRIP =
-#.endif
diff --git a/x11/e17/e/Makefile b/x11/e17/e/Makefile
index f4eb349caa9..3727086a6f8 100644
--- a/x11/e17/e/Makefile
+++ b/x11/e17/e/Makefile
@@ -1,23 +1,15 @@
-# $OpenBSD: Makefile,v 1.49 2013/05/09 13:00:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.50 2013/05/09 17:03:55 rpe Exp $
 
 COMMENT =		the enlightened window manager
 
 VERSION = 		0.17.2.1
 DISTNAME =		enlightenment-${VERSION}
-PKGNAME =		enlightenment-${VERSION:S/-//}
 
 EPOCH =			1
 
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes
 
-MODULES +=		devel/gettext \
-			lang/lua \
-			x11/e17
-
-MODE17_DESKTOP_FILE =	Yes
-MODE17_PURGE_LA =	lib/enlightenment/modules
-
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender Xss Xtst c cares crypto
 WANTLIB += curl dbus-1 ecore ecore_con ecore_evas ecore_file ecore_imf
@@ -29,69 +21,22 @@ WANTLIB += freetype graphite2 fribidi glib-2.0 gobject-2.0 harfbuzz
 WANTLIB += icudata icule icuuc idn jpeg m pcre pthread pthread-stubs
 WANTLIB += ssl xcb xcb-keysyms xcb-shape z ${MODLUA_WANTLIB}
 
+MODULES +=		devel/gettext \
+			lang/lua \
+			x11/e17
+
+MODE17_DESKTOP_FILE =	Yes
+MODE17_PURGE_LA =	lib/enlightenment/modules
+
 LIB_DEPENDS =		x11/e17/elementary>=1.7.6 \
 			devel/libexecinfo
 
 CONFIGURE_ARGS +=	--disable-doc \
 			--disable-nls
 
-# Broken configure shit HAVE_ECORE_TXT=TRUE not defined correctly
-# does not appear in AM_CONDITIONAL . Usually this means the macro
-# was only invoked conditionally.
-# This prevent us from disabeling the broken/useless modules in configure
-#CONFIGURE_ARGS +=	--disable-battery \
-#			--disable-temperature \
-#			--disable-cpufreq \
-#			--disable-mixer \
-#			--disable-conf-theme \
-#			--disable-conf-icon-theme
-#CONFIGURE_ARGS +=	--disable-nls \
-#			--disable-ibar \
-#			--disable-dropshadow \
-#			--disable-clock \
-#			--disable-pager \
-#			--disable-battery \
-#			--disable-temperature \
-#			--disable-cpufreq  \
-#			--disable-ibox \
-#			--disable-start \
-#			--disable-exebuf \
-#			--disable-winlist \
-#			--disable-fileman \
-#			--disable-fileman-opinfo \
-#			--disable-wizard \
-#			--disable-conf \
-#			--disable-conf-wallpaper \
-#			--disable-conf-wallpaper2 \
-#			--disable-conf-theme \
-#			--disable-conf-colors \
-#			--disable-conf-intl \
-#			--disable-mixer \
-#			--with-x \
-#			--disable-dependency-tracking
-
-#CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-#			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lcrypto -pthread -liconv -lintl" \
-#			E_REMOTE_LIBS="-lecore_file -lecore_ipc -lecore_con -lecore -lglib-2.0 -lintl -liconv -leina -leet" \
-#			E_REMOTE_CFLAGS="-I$(LOCALABSE)/include/ecore-1 -I$(LOCALBASE)/include/glib-2.0 -I/$(LOCALBASE)/lib/glib-2.0/include -I$(LOCALBASE)/include/eina-1 -I$(LOCALBASE)/include/eina-1/eina" \
-#			E_IMC_CFLAGS="-I$(LOCALABSE)/include/ecore-1 -I$(LOCALBASE)/include/glib-2.0 -I/$(LOCALBASE)/lib/glib-2.0/include -I$(LOCALBASE)/include/eina-1 -I$(LOCALBASE)/include/eina-1/eina" \
-#			E_IMC_LIBS="-L${LOCALBASE}/lib -lecore_file -lecore_ipc -lecore_con -lecore -lglib-2.0 -lintl -liconv -leina -leet" \
-#			E_THUMB_CFLAGS="-I$(LOCALBASE)/include/efreet-1 -I$(LOCALBASE)/include/edje-1 -I$(LOCALBASE)/include -I$(LOCALBASE)/include/embryo-1 -I$(LOCALBASE)/include/glib-2.0 -I$(LOCALBASE)/lib/glib-2.0/include -I$(LOCALBASE)/include/ecore-1 -I$(LOCALBASE)/include/evas-1 -I$(LOCALBASE)/eet-1 -I$(X11BASE)/include -I$(X11BASE)/include/freetype2 -I$(LOCALBASE)/include/eina-1 -I$(LOCALBASE)/include/eina-1/eina" \
-#			E_THUMB_LIBS="-L$(LOCALBASE)/lib -L$(LOCALBASE)/lib -lecore_evas -lecore_x -lecore_input_evas -lecore_input -lecore_ipc -lecore_con -lecore_file -lefreet -levas -ledje -lecore_imf_evas -lecore_imf -llua -lm -lembryo -lecore -lglib-2.0 -lintl -liconv -levas -lfontconfig -lexpat -lfreetype -lz -leet -leina" \
-#			E_FM_CFLAGS="-I${LOCALBASE}/include/efreet-1-I${LOCALBASE}/include/eet-1 -I${LOCALBASE}/include/e_dbus-1 -I${LOCALBASE}/include/ecore-1 -I${LOCALBASE}/include/glib-2.0 -I${LOCALBASE}/lib/glib-2.0/include -I${LOCALBASE}/include/eina-1 -I${LOCALBASE}/include/eina-1/eina -I${LOCALBASE}/include/dbus-1.0 -I${LOCALBASE}/lib/dbus-1.0/include" \
-#			E_FM_LIBS="-L${LOCALBASE}/lib -pthread -lehal -ledbus -lecore -lglib-2.0 -lintl -liconv -leina -ldbus-1 -lecore_ipc -lecore_con -lecore_file -leet -lefreet" \
-#			E_FM_OP_LIBS="-L${LOCALBASE}/lib -lecore_file -lecore_con -lecore -lglib-2.0 -lintl -liconv -leina" \
-#			E_FM_OP_CFLAGS="-I${LOCALBASE}/include/ecore-1 -I${LOCALBASE}/include/glib-2.0 -I${LOCALBASE}/lib/glib-2.0/include -I${LOCALBASE}/include/eina-1 -I${LOCALBASE}/include/eina-1/eina" \
-#			E_FM_OPEN_LIBS="-L${LOCALBASE}/lib -lecore_ipc -lecore_con -lecore -lglib-2.0 -lintl -liconv -leina" \
-#			E_FM_OPEN_CFLAGS="-I${LOCALBASE}/include/ecore-1 -I${LOCALBASE}/include/glib-2.0 -I${LOCALBASE}/lib/glib-2.0/include -I${LOCALBASE}/include/eina-1 -I${LOCALBASE}/include/eina-1/eina" \
-#			E_SYS_CFLAGS="-I${LOCALBASE}/include/eina-1 -I${LOCALBASE}/include/eina-1/eina" \
-#			E_SYS_LIBS="-L${LOCALBASE}/lib -leina" \
-#			E_INIT_CFLAGS="-I${LOCALBASE}/include/edje-1 -I${LOCALBASE}/include -I${LOCALBASE}/include/embryo-1 -I${LOCALBASE}/include/ecore-1 -I${LOCALBASE}/include/evas-1 -I${LOCALBASE}/include/eet-1 -I${X11BASE}/include -I${X11BASE}/include/freetype2 -I${LOCALBASE}/include/glib-2.0 -I${LOCALBASE}/lib/glib-2.0/include -I${LOCALBASE}/include/eina-1 -I${LOCALBASE}/include/eina-1/eina" \
-#			E_INIT_LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lecore_x -lecore_evas -lecore_ipc -lecore_con -lecore_input -ledje -lecore_imf_evas -lecore_imf -llua -lm -lembryo -lecore -lglib-2.0 -lintl -liconv -levas -lfontconfig -lexpat -lfreetype -lz -leet -leina"
 CONFIGURE_ENV +=	CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
 			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
 
-
 # Stupid crap in /src/modules/illume/dicts chokes in regular make.
 # Some issue with the "(US)" bit
 USE_GMAKE =		Yes
diff --git a/x11/e17/e_dbus/Makefile b/x11/e17/e_dbus/Makefile
index ca28825d39e..aa09a035320 100644
--- a/x11/e17/e_dbus/Makefile
+++ b/x11/e17/e_dbus/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.18 2013/05/09 13:00:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.19 2013/05/09 17:03:55 rpe Exp $
 
 COMMENT =		enlightenment DBus component
+
 DISTNAME =		e_dbus-1.7.6
 EPOCH = 		1
 
diff --git a/x11/e17/ecore/Makefile b/x11/e17/ecore/Makefile
index 7abb866faeb..00d6f510ddc 100644
--- a/x11/e17/ecore/Makefile
+++ b/x11/e17/ecore/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.29 2013/05/09 13:00:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.30 2013/05/09 17:03:55 rpe Exp $
 
 COMMENT =		core event/X abstraction layer
+
 DISTNAME =		ecore-1.7.6
 EPOCH =			2
 
@@ -15,9 +16,6 @@ SHARED_LIBS +=		${_lib}	${SO_VERSION}
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
-MODULES =		devel/gettext
-
-
 WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
 WANTLIB += Xrandr Xrender Xss Xtst cares crypto curl eet eina
 WANTLIB += evas expat ffi fontconfig freetype fribidi gio-2.0
@@ -26,6 +24,8 @@ WANTLIB += ibus-1.0 icudata icule icuuc idn jpeg m pcre pthread
 WANTLIB += icudata icule icuuc idn jpeg m pcre pthread
 WANTLIB += pthread-stubs ssl xcb z
 
+MODULES =		devel/gettext
+
 LIB_DEPENDS =		devel/glib2 \
 			devel/fribidi \
 			inputmethods/ibus \
@@ -37,8 +37,6 @@ CONFIGURE_ARGS +=	--disable-doc \
 			--disable-gnutls \
 			--enable-cares \
 			--disable-ecore-cocoa
-# perf ?
-#			--with-internal-maximum-log-level=2
 
 CONFIGURE_ENV +=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
diff --git a/x11/e17/edje/Makefile b/x11/e17/edje/Makefile
index dd4561364c4..da4e3bb36a6 100644
--- a/x11/e17/edje/Makefile
+++ b/x11/e17/edje/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.34 2013/05/09 13:00:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.35 2013/05/09 17:03:55 rpe Exp $
 
 COMMENT =		complex graphical design & layout library
+
 DISTNAME =		edje-1.7.6
 EPOCH =			2
 
-SHARED_LIBS +=		edje 3.0	# 8.6
+SHARED_LIBS +=	edje                 3.0      # 8.6
 
 # BSD (epp binary GPLv2)
 PERMIT_PACKAGE_CDROM =	Yes
@@ -23,17 +24,11 @@ MODULES =		devel/gettext \
 
 MODE17_MIME_DB =	Yes
 
-
 LIB_DEPENDS +=		devel/fribidi \
 			x11/e17/eio>=1.7.6 \
 			x11/e17/embryo>=1.7.6v2 \
 			${MODLUA_LIB_DEPENDS}
 
 CONFIGURE_ARGS +=	--disable-doc
-# perf ?
-#	--enable-amalgamation
-#	--enable-edje-program-cache
-#    don't use floating point, for architectures without FPU
-#	--enable-fixed-point
 
 .include <bsd.port.mk>
diff --git a/x11/e17/eet/Makefile b/x11/e17/eet/Makefile
index 286b820abdc..3c24b23c309 100644
--- a/x11/e17/eet/Makefile
+++ b/x11/e17/eet/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.26 2013/05/09 13:00:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.27 2013/05/09 17:03:55 rpe Exp $
 
 COMMENT =		library to write an arbitary set of chunks of data to a file
+
 DISTNAME =		eet-1.7.6
 EPOCH =			2
 
-SHARED_LIBS +=  eet                  3.0      # 8.6
+SHARED_LIBS +=	eet                  3.0      # 8.6
 
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes
@@ -16,12 +17,8 @@ MODULES =		converters/libiconv
 LIB_DEPENDS =		x11/e17/eina>=1.7.6v1 \
 			graphics/jpeg
 
-
 CONFIGURE_ARGS =	--disable-doc \
 			--disable-gnutls
-# perf ?
-#			--enable-amalgamation
-#			--disable-assert
 
 # configure script doesn't heed LDFLAGS correctly, so put -L into CFLAGS, too
 CONFIGURE_ENV =		CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
diff --git a/x11/e17/efreet/Makefile b/x11/e17/efreet/Makefile
index cb6e716b09a..1a254f19d64 100644
--- a/x11/e17/efreet/Makefile
+++ b/x11/e17/efreet/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.25 2013/05/09 13:00:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.26 2013/05/09 17:03:55 rpe Exp $
 
 COMMENT =		implementations of freedesktop.org specifications
+
 DISTNAME =		efreet-1.7.6
 EPOCH =			2
 
@@ -21,11 +22,6 @@ MODULES =		devel/gettext
 
 LIB_DEPENDS =		x11/e17/ecore>=1.7.6v2
 
-
 CONFIGURE_ARGS =	--disable-doc
-# enable strict specification compliance
-#			--enable-strict-spec
-# disable sloppy specification compliance
-#			--disable-sloppy-spec
 
 .include <bsd.port.mk>
diff --git a/x11/e17/eina/Makefile b/x11/e17/eina/Makefile
index 9e647c2842e..1b720bb1672 100644
--- a/x11/e17/eina/Makefile
+++ b/x11/e17/eina/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.17 2013/05/09 13:00:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.18 2013/05/09 17:03:55 rpe Exp $
 
 COMMENT =		EFL API for data types
+
 VERSION = 		1.7.6
 DISTNAME =		eina-${VERSION}
 EPOCH=			1
 
-SHARED_LIBS +=  eina                 3.0      # 8.6
+SHARED_LIBS +=	eina                 3.0      # 8.6
 
 # LGPL v2.1
 PERMIT_PACKAGE_CDROM =	Yes
@@ -14,7 +15,6 @@ WANTLIB += 		m pthread
 
 MODULES =		converters/libiconv
 
-
 CONFIGURE_ARGS =	--disable-doc \
 			--enable-mempool-chained-pool=static \
 			--disable-mempool-ememoa-fixed \
@@ -24,25 +24,9 @@ CONFIGURE_ARGS =	--disable-doc \
 			--disable-mempool-buddy \
 			--enable-mempool-one-big=static
 
-# mempool
-#			--enable-default-mempool
-#			--enable-mempool-chained-pool
-#			--enable-mempool-ememoa-fixed
-#			--enable-mempool-ememoa-unknown
-#			--enable-mempool-fixed-bitmap
-#			--enable-mempool-pass-through
-#			--enable-mempool-buddy
-#			--enable-mempool-one-big
-# perf ?
-#			--enable-amalgamation
-#			--with-internal-maximum-log-level=2
-#			--disable-magic-debug
-#			--disable-safety-checks
-#			--disable-assert
-
 CONFIGURE_ENV =		CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 			LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
-TEST_TARGET = 	check-local
+TEST_TARGET = 		check-local
 
 .include <bsd.port.mk>
diff --git a/x11/e17/eio/Makefile b/x11/e17/eio/Makefile
index af90c9ed669..6cd9dee153f 100644
--- a/x11/e17/eio/Makefile
+++ b/x11/e17/eio/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2013/05/09 13:00:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.10 2013/05/09 17:03:55 rpe Exp $
 
 COMMENT =		async i/o library
 
 DISTNAME =		eio-1.7.6
 
-SHARED_LIBS +=		eio 1.0 	# 8.6
+SHARED_LIBS +=	eio                  1.0      # 8.6
 
 # LGPL v2.1
 PERMIT_PACKAGE_CDROM =	Yes
@@ -16,7 +16,6 @@ MODULES =		devel/gettext
 
 LIB_DEPENDS =		x11/e17/ecore>=1.7.6v2
 
-
 CONFIGURE_ARGS =	--disable-doc
 
 .include <bsd.port.mk>
diff --git a/x11/e17/elementary/Makefile b/x11/e17/elementary/Makefile
index 8c5d7bc8461..613a92564a2 100644
--- a/x11/e17/elementary/Makefile
+++ b/x11/e17/elementary/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2013/05/09 13:00:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.10 2013/05/09 17:03:55 rpe Exp $
 
 COMMENT =		basic widget set, based on EFL
 
 VERSION =		1.7.6
 DISTNAME =		elementary-${VERSION}
 
-SHARED_LIBS +=  elementary                0.0 # 8.6
+SHARED_LIBS +=	elementary                0.0 # 8.6
 
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM =	Yes
diff --git a/x11/e17/embryo/Makefile b/x11/e17/embryo/Makefile
index 51179ec3543..3805abef69f 100644
--- a/x11/e17/embryo/Makefile
+++ b/x11/e17/embryo/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.19 2013/05/09 13:00:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.20 2013/05/09 17:03:55 rpe Exp $
 
 COMMENT =		C like scripting language used in E17
 
 DISTNAME =		embryo-1.7.6
 EPOCH =			2
 
-SHARED_LIBS +=		embryo 3.0 	# 8.6
+SHARED_LIBS +=	embryo               3.0      # 8.6
 
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes
@@ -16,7 +16,6 @@ MODULES =		converters/libiconv
 
 LIB_DEPENDS =		x11/e17/eina>=1.7.6v1
 
-
 CONFIGURE_ARGS =	--disable-doc
 
 .include <bsd.port.mk>
diff --git a/x11/e17/emotion/Makefile b/x11/e17/emotion/Makefile
index 21554fa91b2..d82d1058b9b 100644
--- a/x11/e17/emotion/Makefile
+++ b/x11/e17/emotion/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.7 2013/05/09 13:00:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.8 2013/05/09 17:03:55 rpe Exp $
 
 COMMENT =		video (and audio) codec playback library
+
 DISTNAME =		emotion-1.7.6
 
-SHARED_LIBS +=  emotion                   1.0 # 8.6
+SHARED_LIBS +=	emotion                   1.0 # 8.6
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -30,7 +31,6 @@ LIB_DEPENDS =		devel/orc \
 			x11/e17/edje>=1.7.6v2 \
 			x11/e17/embryo>=1.7.6v2
 
-
 CONFIGURE_ARGS +=	--disable-doc
 
 .include <bsd.port.mk>
diff --git a/x11/e17/ethumb/Makefile b/x11/e17/ethumb/Makefile
index 2fa6e24d509..f569f221611 100644
--- a/x11/e17/ethumb/Makefile
+++ b/x11/e17/ethumb/Makefile
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.4 2013/05/09 13:00:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.5 2013/05/09 17:03:55 rpe Exp $
 
 COMMENT =		EFL thumbnail generation library
+
 DISTNAME =		ethumb-1.7.6
 
 SHARED_LIBS +=	ethumb                    0.0 # 8.6
diff --git a/x11/e17/evas/Makefile b/x11/e17/evas/Makefile
index 80cf2704fbf..9ebe9be125d 100644
--- a/x11/e17/evas/Makefile
+++ b/x11/e17/evas/Makefile
@@ -1,16 +1,16 @@
-# $OpenBSD: Makefile,v 1.32 2013/05/09 13:00:13 rpe Exp $
+# $OpenBSD: Makefile,v 1.33 2013/05/09 17:03:55 rpe Exp $
 
 COMMENT =		canvas API for X
+
 VERSION = 		1.7.6
 DISTNAME =		evas-${VERSION}.1
 EPOCH =			2
 
-SHARED_LIBS +=  evas                 3.0      # 8.6
+SHARED_LIBS +=	evas                 3.0      # 8.6
 
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes
 
-
 WANTLIB += GL X11 Xdamage Xext Xfixes Xrender Xxf86vm crypto drm
 WANTLIB += eet eina expat ffi fontconfig freetype fribidi gif
 WANTLIB += glib-2.0 gobject-2.0 graphite2 harfbuzz icudata icule
@@ -22,7 +22,7 @@ MODULES=		devel/gettext \
 
 MODE17_PURGE_LA =	lib/evas/modules
 
-VMEM_WARNING =	Yes
+VMEM_WARNING =		Yes
 
 LIB_DEPENDS =		x11/e17/eet>=1.7.6v2 \
 			graphics/libungif \
@@ -44,38 +44,6 @@ CONFIGURE_ARGS +=	--disable-doc \
 			--disable-wayland-shm \
 			--disable-wayland-egl
 
-# ARGB Conversion from 32 to other pixel depths (slower -> faster)(nice -> ugly)
-#			--enable-small-dither-mask
-#			--enable-line-dither-mask
-#			--enable-no-dither-mask
-# Experimental performance
-#	Enable experimental word caching to speed up rendering [[default=disabled]]
-#			--enable-word-cache
-#	Enable experimental metric caching to speed up rendering [[default=disabled]]
-#			--enable-metric-cache
-# performance
-#			--disable-evas-magic-debug
-# performance multi CPU / rthread needed (attach thread to CPU, pipe rendering)
-#			--enable-pipe-render
-#			--enable-async-render
-# performance / cahing, activate by user, need shm_open() ! (fix with shm_get() ?)
-#			--enable-evas-cserve
-# engine modules : for performance, static ?
-#	software
-#			--enable-software-xlib: libx11 (http://xorg.freedesktop.org/)
-#			--enable-software-xcb: libxcb (http://xorg.freedesktop.org/)
-#			--enable-software-8-x11
-#			--enable-software-16-x11: libxrender (http://xorg.freedesktop.org/)
-#	xrender x11 : libxrender (http://xorg.freedesktop.org/)
-#			--enable-xrender-x11
-#			--enable-xrender-xcb
-#	gl x11 engine : libxrender (http://xorg.freedesktop.org/)
-#			--enable-gl-x11
-#	gl engine flavor (active gles + choose one of variety)
-#			--enable-gl-flavor-gles
-#			--enable-gles-variety-sgx (Most GL-ES2 GPUs with shader compiler)
-#			--enable-gles-variety-s3c6410 (s3c6410 with offline shader compiler)
-
 CONFIGURE_ENV +=	CXXFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
 			CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
 			CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \