diff --git a/x11/e17/Makefile.inc b/x11/e17/Makefile.inc
index 5ee3588db01..996e51d4e58 100644
--- a/x11/e17/Makefile.inc
+++ b/x11/e17/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.2 2007/12/02 13:55:21 bernd Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2007/12/02 18:18:10 bernd Exp $
 
 CATEGORIES?=		x11
 
@@ -9,6 +9,11 @@ DIST_SUBDIR?=		e17
 
 USE_LIBTOOL?=		Yes
 
+AUTOCONF_VERSION?=	2.61
+AUTOMAKE_VERSION?=	1.9
+AUTOMAKE_ENV?=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
+
 e17-post-patch:
 	@cd ${WRKSRC} && ${SETENV} ${AUTOMAKE_ENV} NOCONFIGURE=true \
 		${SH} autogen.sh
diff --git a/x11/e17/e/Makefile b/x11/e17/e/Makefile
index bbd272d1c9e..f79012d00fb 100644
--- a/x11/e17/e/Makefile
+++ b/x11/e17/e/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2007/12/02 13:55:21 bernd Exp $
+# $OpenBSD: Makefile,v 1.3 2007/12/02 18:18:10 bernd Exp $
 
 COMMENT=	the enlightened window manager
 DISTNAME=	e-20071107
@@ -22,11 +22,6 @@ LIB_DEPENDS=		SDL::devel/sdl \
 			efreet,efreet_mime::x11/e17/efreet
 RUN_DEPENDS=		::devel/desktop-file-utils
 
-AUTOCONF_VERSION=	2.61
-AUTOMAKE_VERSION=	1.9
-AUTOMAKE_ENV=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
-
 CONFIGURE_STYLE=	automake autoconf
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
diff --git a/x11/e17/ecore/Makefile b/x11/e17/ecore/Makefile
index e5615357bac..c481175d323 100644
--- a/x11/e17/ecore/Makefile
+++ b/x11/e17/ecore/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2007/12/02 13:55:21 bernd Exp $
+# $OpenBSD: Makefile,v 1.3 2007/12/02 18:18:10 bernd Exp $
 
 COMMENT=	core event/X abstraction layer
 DISTNAME=	ecore-20071107
@@ -25,11 +25,6 @@ MODULES=		devel/gettext
 
 USE_X11=		Yes
 
-AUTOCONF_VERSION=	2.61
-AUTOMAKE_VERSION=	1.9
-AUTOMAKE_ENV=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
-
 LIB_DEPENDS=		SDL::devel/sdl \
 			curl::net/curl \
 			evas::x11/e17/evas
diff --git a/x11/e17/edb/Makefile b/x11/e17/edb/Makefile
index f7939f1e773..56cf5464c2a 100644
--- a/x11/e17/edb/Makefile
+++ b/x11/e17/edb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2007/12/02 13:58:12 bernd Exp $
+# $OpenBSD: Makefile,v 1.4 2007/12/02 18:18:10 bernd Exp $
 
 COMMENT=		database convenience library based on db 2.7.7
 DISTNAME=		edb-20071107
@@ -15,11 +15,6 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=		c ncurses
 
-AUTOCONF_VERSION=	2.61
-AUTOMAKE_VERSION=	1.9
-AUTOMAKE_ENV=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
-
 CONFIGURE_STYLE=	automake autoconf
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/e17/edje/Makefile b/x11/e17/edje/Makefile
index 2e2a3ba2800..a6157857943 100644
--- a/x11/e17/edje/Makefile
+++ b/x11/e17/edje/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2007/12/02 13:55:21 bernd Exp $
+# $OpenBSD: Makefile,v 1.3 2007/12/02 18:18:10 bernd Exp $
 
 COMMENT=	complex graphical design & layout library
 DISTNAME=	edje-20071107
@@ -16,11 +16,6 @@ WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 
 USE_X11=		Yes
 
-AUTOCONF_VERSION=	2.61
-AUTOMAKE_VERSION=	1.9
-AUTOMAKE_ENV=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
-
 LIB_DEPENDS=		SDL::devel/sdl \
 			ecore,ecore_evas,ecore_job,ecore_txt,ecore_x::x11/e17/ecore \
 			embryo::x11/e17/embryo
diff --git a/x11/e17/eet/Makefile b/x11/e17/eet/Makefile
index 9e4f4b39e26..81824e5084d 100644
--- a/x11/e17/eet/Makefile
+++ b/x11/e17/eet/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2007/12/02 13:55:21 bernd Exp $
+# $OpenBSD: Makefile,v 1.3 2007/12/02 18:18:10 bernd Exp $
 
 COMMENT=	library to write an arbitary set of chunks of data to a file
 DISTNAME=	eet-20071107
@@ -15,11 +15,6 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB= 		c m z
 
-AUTOCONF_VERSION=	2.61
-AUTOMAKE_VERSION=	1.9
-AUTOMAKE_ENV=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
-
 LIB_DEPENDS=		jpeg::graphics/jpeg
 
 CONFIGURE_STYLE=	automake
diff --git a/x11/e17/efreet/Makefile b/x11/e17/efreet/Makefile
index 8a1f5f27594..d4717bfb55e 100644
--- a/x11/e17/efreet/Makefile
+++ b/x11/e17/efreet/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2007/12/02 13:55:21 bernd Exp $
+# $OpenBSD: Makefile,v 1.3 2007/12/02 18:18:10 bernd Exp $
 
 COMMENT=	implementations of freedesktop.org specifications
 DISTNAME=	efreet-20071107
@@ -15,11 +15,6 @@ WANTLIB=		c crypto curl idn m ssl z
 
 MODULES=		devel/gettext
 
-AUTOCONF_VERSION=	2.61
-AUTOMAKE_VERSION=	1.9
-AUTOMAKE_ENV=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
-
 LIB_DEPENDS=		ecore,ecore_file::x11/e17/ecore
 RUN_DEPENDS=		::devel/desktop-file-utils
 
diff --git a/x11/e17/embryo/Makefile b/x11/e17/embryo/Makefile
index df3da043153..978d6f690fa 100644
--- a/x11/e17/embryo/Makefile
+++ b/x11/e17/embryo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2007/12/02 13:55:21 bernd Exp $
+# $OpenBSD: Makefile,v 1.3 2007/12/02 18:18:10 bernd Exp $
 
 COMMENT=	C like scripting language used in the Enlightenment project
 DISTNAME=	embryo-20071107
@@ -12,11 +12,6 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB=		c m
 
-AUTOCONF_VERSION=	2.61
-AUTOMAKE_VERSION=	1.9
-AUTOMAKE_ENV=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
-
 CONFIGURE_STYLE=	automake
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/e17/epeg/Makefile b/x11/e17/epeg/Makefile
index 8a6a1b48bd6..86a1147db25 100644
--- a/x11/e17/epeg/Makefile
+++ b/x11/e17/epeg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2007/12/02 13:55:21 bernd Exp $
+# $OpenBSD: Makefile,v 1.3 2007/12/02 18:18:10 bernd Exp $
 
 COMMENT=	immensly fast JPEG thumbnailer library
 DISTNAME=	epeg-20071107
@@ -15,11 +15,6 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB= 		c
 
-AUTOCONF_VERSION=	2.61
-AUTOMAKE_VERSION=	1.9
-AUTOMAKE_ENV=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
-
 LIB_DEPENDS=		jpeg::graphics/jpeg
 
 CONFIGURE_STYLE=	automake autoconf
diff --git a/x11/e17/etk/Makefile b/x11/e17/etk/Makefile
index 830499fe1ff..58b58404c17 100644
--- a/x11/e17/etk/Makefile
+++ b/x11/e17/etk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2007/12/02 14:18:37 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2007/12/02 18:18:10 bernd Exp $
 
 COMMENT=	toolkit based on the EFL
 DISTNAME=	etk-20071107
@@ -23,11 +23,6 @@ LIB_DEPENDS=		ecore,ecore_evas,ecore_file,ecore_job,ecore_txt,ecore_x::x11/e17/e
 
 RUN_DEPENDS=		::devel/desktop-file-utils
 
-AUTOCONF_VERSION=	2.61
-AUTOMAKE_VERSION=	1.9
-AUTOMAKE_ENV=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
-
 USE_GMAKE=		Yes
 
 CONFIGURE_STYLE=	automake autoconf
diff --git a/x11/e17/evas/Makefile b/x11/e17/evas/Makefile
index 82c8baaca99..13014f04e99 100644
--- a/x11/e17/evas/Makefile
+++ b/x11/e17/evas/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2007/12/02 13:55:21 bernd Exp $
+# $OpenBSD: Makefile,v 1.3 2007/12/02 18:18:10 bernd Exp $
 
 COMMENT=	canvas API for X
 DISTNAME=	evas-20071107
@@ -17,11 +17,6 @@ WANTLIB=		X11 Xau Xdmcp Xext Xrender expat fontconfig freetype \
 USE_X11=		Yes
 USE_LIBTOOL=		Yes
 
-AUTOCONF_VERSION=	2.61
-AUTOMAKE_VERSION=	1.9
-AUTOMAKE_ENV=		AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-			AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
-
 LIB_DEPENDS=		gif::graphics/libungif \
 			png::graphics/png \
 			tiff::graphics/tiff \