23 files changed, 19 insertions, 62 deletions

diff --git a/x11/e17-module-calendar/Makefile b/x11/e17-module-calendar/Makefile
index 96735db318aa..0b0dfcbc44c0 100644
--- a/x11/e17-module-calendar/Makefile
+++ b/x11/e17-module-calendar/Makefile
@@ -37,10 +37,7 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -e s,`${PRINTF} '\r'`,,g ${WRKSRC}/src/*.[ch]
 
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-cpu/Makefile b/x11/e17-module-cpu/Makefile
index 8ab175e48743..e8d1947ec084 100644
--- a/x11/e17-module-cpu/Makefile
+++ b/x11/e17-module-cpu/Makefile
@@ -33,6 +33,4 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-deskshow/Makefile b/x11/e17-module-deskshow/Makefile
index 8a50532eec2d..6737fb2fa962 100644
--- a/x11/e17-module-deskshow/Makefile
+++ b/x11/e17-module-deskshow/Makefile
@@ -25,6 +25,4 @@ USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_EFL=	edje
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-devian/Makefile b/x11/e17-module-devian/Makefile
index 5d5e7017d2d6..2a3a8639abc4 100644
--- a/x11/e17-module-devian/Makefile
+++ b/x11/e17-module-devian/Makefile
@@ -26,6 +26,4 @@ USE_EFL=	edje
 
 IGNORE=		doesn't compile with recent e17
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-eveil/Makefile b/x11/e17-module-eveil/Makefile
index ab0099dd2dcf..9b4cdf15164c 100644
--- a/x11/e17-module-eveil/Makefile
+++ b/x11/e17-module-eveil/Makefile
@@ -33,6 +33,4 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-flame/Makefile b/x11/e17-module-flame/Makefile
index 5e7b1fc09a4a..d519978d532c 100644
--- a/x11/e17-module-flame/Makefile
+++ b/x11/e17-module-flame/Makefile
@@ -33,6 +33,4 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-language/Makefile b/x11/e17-module-language/Makefile
index a1b6bf26521d..8aa1a785a725 100644
--- a/x11/e17-module-language/Makefile
+++ b/x11/e17-module-language/Makefile
@@ -26,6 +26,4 @@ USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_EFL=	edje exml
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-mail/Makefile b/x11/e17-module-mail/Makefile
index b98454bdd4af..80231798718e 100644
--- a/x11/e17-module-mail/Makefile
+++ b/x11/e17-module-mail/Makefile
@@ -26,6 +26,4 @@ USE_GMAKE=	yes
 USE_GNOME=	gnometarget pkgconfig
 USE_EFL=	edje
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-mem/Makefile b/x11/e17-module-mem/Makefile
index f09773a6980b..e4429d12de3a 100644
--- a/x11/e17-module-mem/Makefile
+++ b/x11/e17-module-mem/Makefile
@@ -34,6 +34,4 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-mixer/Makefile b/x11/e17-module-mixer/Makefile
index a4ff2f184ec5..383d88e5b9ec 100644
--- a/x11/e17-module-mixer/Makefile
+++ b/x11/e17-module-mixer/Makefile
@@ -32,6 +32,4 @@ CONFIGURE_ARGS= --disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-moon/Makefile b/x11/e17-module-moon/Makefile
index f1a7b0b84955..afd824050568 100644
--- a/x11/e17-module-moon/Makefile
+++ b/x11/e17-module-moon/Makefile
@@ -34,6 +34,4 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-rain/Makefile b/x11/e17-module-rain/Makefile
index daa433e7d545..749f7c611194 100644
--- a/x11/e17-module-rain/Makefile
+++ b/x11/e17-module-rain/Makefile
@@ -33,6 +33,4 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-screenshot/Makefile b/x11/e17-module-screenshot/Makefile
index 2e6ddd67d8c7..e81eef644530 100644
--- a/x11/e17-module-screenshot/Makefile
+++ b/x11/e17-module-screenshot/Makefile
@@ -48,5 +48,4 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/x11/e17-module-slideshow/Makefile b/x11/e17-module-slideshow/Makefile
index 883222cf321e..7689744ff0e3 100644
--- a/x11/e17-module-slideshow/Makefile
+++ b/x11/e17-module-slideshow/Makefile
@@ -33,6 +33,4 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-snow/Makefile b/x11/e17-module-snow/Makefile
index 5576b057f405..5ac1467b5ce1 100644
--- a/x11/e17-module-snow/Makefile
+++ b/x11/e17-module-snow/Makefile
@@ -33,6 +33,4 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-uptime/Makefile b/x11/e17-module-uptime/Makefile
index 6d945e31c188..1cb0635f052f 100644
--- a/x11/e17-module-uptime/Makefile
+++ b/x11/e17-module-uptime/Makefile
@@ -33,6 +33,4 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-weather/Makefile b/x11/e17-module-weather/Makefile
index aa6f87e22d5e..600f766a78b0 100644
--- a/x11/e17-module-weather/Makefile
+++ b/x11/e17-module-weather/Makefile
@@ -34,6 +34,4 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/e17-module-winselector/Makefile b/x11/e17-module-winselector/Makefile
index 7cf706db8f18..60053eb75610 100644
--- a/x11/e17-module-winselector/Makefile
+++ b/x11/e17-module-winselector/Makefile
@@ -24,6 +24,4 @@ USE_GMAKE=	yes
 USE_GNOME=	pkgconfig gnometarget
 USE_EFL=	edje
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile
index cf7587bc3aad..3f28e3ec9304 100644
--- a/x11/ecore/Makefile
+++ b/x11/ecore/Makefile
@@ -97,5 +97,4 @@ CONFIGURE_ARGS+=	--disable-ecore-config
 PLIST_SUB+=		EET="@comment "
 .endif
 
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/x11/elicit/Makefile b/x11/elicit/Makefile
index b9de513f5903..924d92801a02 100644
--- a/x11/elicit/Makefile
+++ b/x11/elicit/Makefile
@@ -26,5 +26,4 @@ USE_EFL_ESMART=	trans_x11
 BROKEN=		edje is broken on ia64
 .endif
 
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/x11/enity/Makefile b/x11/enity/Makefile
index 0398b0aa7017..a8019d1fd56a 100644
--- a/x11/enity/Makefile
+++ b/x11/enity/Makefile
@@ -29,5 +29,4 @@ PLIST_FILES=	bin/enity
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_bin_enity.c
 .endif
 
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
 .include <bsd.port.post.mk>
diff --git a/x11/enterminus/Makefile b/x11/enterminus/Makefile
index 0c6470f4ef71..1e1b76d34d3f 100644
--- a/x11/enterminus/Makefile
+++ b/x11/enterminus/Makefile
@@ -20,6 +20,4 @@ USE_GNOME=	gnomehack pkgconfig gnometarget
 USE_EFL=	evas ecore
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/examine/Makefile b/x11/examine/Makefile
index ac2d02d472b8..e19c84d04bf9 100644
--- a/x11/examine/Makefile
+++ b/x11/examine/Makefile
@@ -22,6 +22,4 @@ USE_EFL=	ecore ewl
 
 PLIST_FILES=	bin/examine bin/exsh
 
-.include <bsd.port.pre.mk>
-.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>