diff options
66 files changed, 45 insertions, 167 deletions
diff --git a/audio/emphasis/Makefile b/audio/emphasis/Makefile index a6048ecef793..677a981a6517 100644 --- a/audio/emphasis/Makefile +++ b/audio/emphasis/Makefile @@ -24,6 +24,4 @@ USE_GNOME= gnomehack pkgconfig gnometarget libxml2 USE_EFL= ecore enhance etk 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/deskutils/estickies/Makefile b/deskutils/estickies/Makefile index 0284947afe85..5b27c7049dae 100644 --- a/deskutils/estickies/Makefile +++ b/deskutils/estickies/Makefile @@ -20,6 +20,4 @@ USE_GNOME= gnomehack pkgconfig gnometarget USE_EFL= etk eet 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/devel/engrave/Makefile b/devel/engrave/Makefile index 28cb13741227..a15c790e92c9 100644 --- a/devel/engrave/Makefile +++ b/devel/engrave/Makefile @@ -20,6 +20,4 @@ USE_EFL= ecore evas USE_LDCONFIG= yes 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/devel/evfs/Makefile b/devel/evfs/Makefile index 60ba2c0d51dd..774aa881dd34 100644 --- a/devel/evfs/Makefile +++ b/devel/evfs/Makefile @@ -29,7 +29,6 @@ OPTIONS= SAMBA "Build samba plugin" off \ XTRACT "Enable extended metadata extraction via libextractor" on .include <bsd.port.pre.mk> -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .if defined(WITH_SAMBA) LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient diff --git a/devel/ruby-ecore/Makefile b/devel/ruby-ecore/Makefile index 0a259e79d6a0..1fa8162cfe41 100644 --- a/devel/ruby-ecore/Makefile +++ b/devel/ruby-ecore/Makefile @@ -38,5 +38,4 @@ do-install: @(cd ${WRKSRC}; ${SETENV} ECORE_PREFIX=${LOCALBASE} \ ${LOCALBASE}/bin/rake install) -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .include <bsd.port.post.mk> diff --git a/graphics/edje/Makefile b/graphics/edje/Makefile index df65a5d36950..3738b19f37d1 100644 --- a/graphics/edje/Makefile +++ b/graphics/edje/Makefile @@ -32,5 +32,4 @@ IGNORE= does not build on 4.X BROKEN= edje is broken on ia64 .endif -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .include <bsd.port.post.mk> diff --git a/graphics/edje_viewer/Makefile b/graphics/edje_viewer/Makefile index 98e489f2fd80..8db37b502fcc 100644 --- a/graphics/edje_viewer/Makefile +++ b/graphics/edje_viewer/Makefile @@ -20,6 +20,4 @@ USE_GNOME= gnomehack pkgconfig gnometarget USE_EFL= evas ecore edje etk 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/graphics/entice/Makefile b/graphics/entice/Makefile index abc9a846d657..ffff6cb0d342 100644 --- a/graphics/entice/Makefile +++ b/graphics/entice/Makefile @@ -29,5 +29,4 @@ USE_EFL_ESMART= thumb BROKEN= does not install on ${ARCH} .endif -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .include <bsd.port.post.mk> diff --git a/graphics/epsilon/Makefile b/graphics/epsilon/Makefile index a7298bfbc00a..d11a024fd1c5 100644 --- a/graphics/epsilon/Makefile +++ b/graphics/epsilon/Makefile @@ -50,5 +50,4 @@ CONFIGURE_ARGS+=--disable-thumbnailer-xine PLIST_SUB+= XINE="@comment " .endif -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .include <bsd.port.post.mk> diff --git a/graphics/esmart/Makefile b/graphics/esmart/Makefile index ef5223c939c4..e3218ee3d0bc 100644 --- a/graphics/esmart/Makefile +++ b/graphics/esmart/Makefile @@ -22,6 +22,4 @@ USE_GNOME= gnomehack pkgconfig gnometarget USE_EFL= ecore evas epsilon edje USE_LDCONFIG= 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/graphics/evas/Makefile b/graphics/evas/Makefile index af19608af8b6..6fae39536e71 100644 --- a/graphics/evas/Makefile +++ b/graphics/evas/Makefile @@ -176,5 +176,4 @@ CONFIGURE_ARGS+= --disable-image-loader-svg PLIST_SUB+= SVG="@comment " .endif -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .include <bsd.port.post.mk> diff --git a/graphics/exhibit/Makefile b/graphics/exhibit/Makefile index dda886cad730..cb3de1a53b30 100644 --- a/graphics/exhibit/Makefile +++ b/graphics/exhibit/Makefile @@ -28,9 +28,6 @@ PLIST_FILES= bin/exhibit %%DATADIR%%/gui.edj PLIST_DIRS= %%DATADIR%% .include <bsd.port.pre.mk> -BEFOREPORTMK= yes -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" -.undef BEFOREPORTMK .if !defined(WITHOUT_ENGRAVE) || ${HAVE_EFL:Mengrave} USE_EFL+= engrave @@ -41,5 +38,4 @@ BUILD_DEPENDS+= enlightenment_remote:${PORTSDIR}/x11-wm/enlightenment-devel RUN_DEPENDS+= enlightenment_remote:${PORTSDIR}/x11-wm/enlightenment-devel .endif -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .include <bsd.port.post.mk> diff --git a/graphics/imlib2_loaders/Makefile b/graphics/imlib2_loaders/Makefile index e97b634b9241..9c2c4293685a 100644 --- a/graphics/imlib2_loaders/Makefile +++ b/graphics/imlib2_loaders/Makefile @@ -49,5 +49,4 @@ CONFIGURE_ARGS+= --disable-xcf PLIST_SUB+= XCF="@comment " .endif -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .include <bsd.port.post.mk> diff --git a/graphics/ruby-edje/Makefile b/graphics/ruby-edje/Makefile index 04a81e3b865a..2a6d9287cce3 100644 --- a/graphics/ruby-edje/Makefile +++ b/graphics/ruby-edje/Makefile @@ -38,5 +38,4 @@ do-install: @(cd ${WRKSRC}; ${SETENV} EDJE_PREFIX=${LOCALBASE} \ ${LOCALBASE}/bin/rake install) -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .include <bsd.port.post.mk> diff --git a/graphics/ruby-esmart/Makefile b/graphics/ruby-esmart/Makefile index 9bf2ca496d9e..c1c62d234b24 100644 --- a/graphics/ruby-esmart/Makefile +++ b/graphics/ruby-esmart/Makefile @@ -36,5 +36,4 @@ do-install: @(cd ${WRKSRC}; ${SETENV} ESMART_PREFIX=${LOCALBASE} \ ${LOCALBASE}/bin/rake install) -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .include <bsd.port.post.mk> diff --git a/graphics/ruby-evas/Makefile b/graphics/ruby-evas/Makefile index 522c89d801e0..74da7c25cb0b 100644 --- a/graphics/ruby-evas/Makefile +++ b/graphics/ruby-evas/Makefile @@ -32,5 +32,4 @@ do-install: @(cd ${WRKSRC}; ${SETENV} EVAS_PREFIX=${LOCALBASE} \ ${LOCALBASE}/bin/rake install) -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .include <bsd.port.post.mk> diff --git a/multimedia/eclair/Makefile b/multimedia/eclair/Makefile index 8d373e16dc4e..5053bb9ae6df 100644 --- a/multimedia/eclair/Makefile +++ b/multimedia/eclair/Makefile @@ -24,6 +24,4 @@ USE_EFL= ecore edje evas emotion USE_EFL_ESMART= trans_x11 USE_SQLITE= 3 -.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/multimedia/emotion/Makefile b/multimedia/emotion/Makefile index 5431e658e013..1ba8b1102b89 100644 --- a/multimedia/emotion/Makefile +++ b/multimedia/emotion/Makefile @@ -26,7 +26,6 @@ OPTIONS= XINE "Build Xine module" on \ GST "Build GStreamer module" on .include <bsd.port.pre.mk> -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .if defined(WITHOUT_XINE) && defined(WITHOUT_GST) IGNORE= is useless without playback library. Please run 'make config' and choose one of XINE and GST diff --git a/sysutils/empower/Makefile b/sysutils/empower/Makefile index c9586bc6df96..eab715fb7cc2 100644 --- a/sysutils/empower/Makefile +++ b/sysutils/empower/Makefile @@ -25,9 +25,6 @@ OPTIONS= EWL "Build EWL backend" on \ ETK "Build ETK backed" off .include <bsd.port.pre.mk> -BEFOREPORTMK= yes -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" -.undef BEFOREPORTMK .if defined(WITHOUT_EWL) && !defined(WITH_ETK) BROKEN= you should select either ETK or EWL @@ -43,5 +40,4 @@ USE_EFL+= etk PLIST_FILES+= bin/empower_etk .endif -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .include <bsd.port.post.mk> diff --git a/sysutils/extrackt/Makefile b/sysutils/extrackt/Makefile index ddf53a211a1d..a4595fba38fc 100644 --- a/sysutils/extrackt/Makefile +++ b/sysutils/extrackt/Makefile @@ -20,6 +20,4 @@ USE_GNOME= gnomehack pkgconfig gnometarget USE_EFL= evas ecore eet etk enhance 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/textproc/exml/Makefile b/textproc/exml/Makefile index 128e286b6297..7fa8eb741dee 100644 --- a/textproc/exml/Makefile +++ b/textproc/exml/Makefile @@ -19,6 +19,4 @@ USE_GNOME= libxml2 libxslt gnomehack gnometarget pkgconfig USE_EFL= ecore USE_LDCONFIG= 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-fm/entropyfm/Makefile b/x11-fm/entropyfm/Makefile index 26411d983c0d..a8f4cd3f075f 100644 --- a/x11-fm/entropyfm/Makefile +++ b/x11-fm/entropyfm/Makefile @@ -29,7 +29,6 @@ OPTIONS= XTRACT "Enable metadata extraction via libextractor" on \ DATADIR= ${PREFIX}/share/entropy .include <bsd.port.pre.mk> -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .if !defined(WITHOUT_XTRACT) LIB_DEPENDS+= extractor.2:${PORTSDIR}/textproc/libextractor diff --git a/x11-toolkits/enhance/Makefile b/x11-toolkits/enhance/Makefile index e7144cbf9882..d18a5bd0c409 100644 --- a/x11-toolkits/enhance/Makefile +++ b/x11-toolkits/enhance/Makefile @@ -22,6 +22,4 @@ USE_LDCONFIG= yes USE_EFL= ecore etk exml 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-toolkits/etk/Makefile b/x11-toolkits/etk/Makefile index 658e35dec118..6a1a1038d724 100644 --- a/x11-toolkits/etk/Makefile +++ b/x11-toolkits/etk/Makefile @@ -24,6 +24,4 @@ USE_LDCONFIG= yes USE_GETTEXT= yes LDFLAGS= "-lintl" -.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-toolkits/ewl/Makefile b/x11-toolkits/ewl/Makefile index 108c638ea1eb..7442e7d8a1cb 100644 --- a/x11-toolkits/ewl/Makefile +++ b/x11-toolkits/ewl/Makefile @@ -27,9 +27,6 @@ OPTIONS= EPSILON "Enable Epsilon Support for Ewl_Image" on \ EMOTION "Enable Emotion Support for Ewl_Media" on .include <bsd.port.pre.mk> -BEFOREPORTMK= yes -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" -.undef BEFOREPORTMK .if ${ARCH} == ia64 BROKEN= does not compile on ${ARCH} @@ -55,5 +52,4 @@ PLIST_SUB+= EVAS_GL="" PLIST_SUB+= EVAS_GL="@comment " .endif -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .include <bsd.port.post.mk> diff --git a/x11-wm/e17-module-calendar/Makefile b/x11-wm/e17-module-calendar/Makefile index 96735db318aa..0b0dfcbc44c0 100644 --- a/x11-wm/e17-module-calendar/Makefile +++ b/x11-wm/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-wm/e17-module-cpu/Makefile b/x11-wm/e17-module-cpu/Makefile index 8ab175e48743..e8d1947ec084 100644 --- a/x11-wm/e17-module-cpu/Makefile +++ b/x11-wm/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-wm/e17-module-deskshow/Makefile b/x11-wm/e17-module-deskshow/Makefile index 8a50532eec2d..6737fb2fa962 100644 --- a/x11-wm/e17-module-deskshow/Makefile +++ b/x11-wm/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-wm/e17-module-flame/Makefile b/x11-wm/e17-module-flame/Makefile index 5e7b1fc09a4a..d519978d532c 100644 --- a/x11-wm/e17-module-flame/Makefile +++ b/x11-wm/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-wm/e17-module-language/Makefile b/x11-wm/e17-module-language/Makefile index a1b6bf26521d..8aa1a785a725 100644 --- a/x11-wm/e17-module-language/Makefile +++ b/x11-wm/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-wm/e17-module-mail/Makefile b/x11-wm/e17-module-mail/Makefile index b98454bdd4af..80231798718e 100644 --- a/x11-wm/e17-module-mail/Makefile +++ b/x11-wm/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-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile index f09773a6980b..e4429d12de3a 100644 --- a/x11-wm/e17-module-mem/Makefile +++ b/x11-wm/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-wm/e17-module-mixer/Makefile b/x11-wm/e17-module-mixer/Makefile index a4ff2f184ec5..383d88e5b9ec 100644 --- a/x11-wm/e17-module-mixer/Makefile +++ b/x11-wm/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-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile index f1a7b0b84955..afd824050568 100644 --- a/x11-wm/e17-module-moon/Makefile +++ b/x11-wm/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-wm/e17-module-rain/Makefile b/x11-wm/e17-module-rain/Makefile index daa433e7d545..749f7c611194 100644 --- a/x11-wm/e17-module-rain/Makefile +++ b/x11-wm/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-wm/e17-module-screenshot/Makefile b/x11-wm/e17-module-screenshot/Makefile index 2e6ddd67d8c7..e81eef644530 100644 --- a/x11-wm/e17-module-screenshot/Makefile +++ b/x11-wm/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-wm/e17-module-slideshow/Makefile b/x11-wm/e17-module-slideshow/Makefile index 883222cf321e..7689744ff0e3 100644 --- a/x11-wm/e17-module-slideshow/Makefile +++ b/x11-wm/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-wm/e17-module-snow/Makefile b/x11-wm/e17-module-snow/Makefile index 5576b057f405..5ac1467b5ce1 100644 --- a/x11-wm/e17-module-snow/Makefile +++ b/x11-wm/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-wm/e17-module-uptime/Makefile b/x11-wm/e17-module-uptime/Makefile index 6d945e31c188..1cb0635f052f 100644 --- a/x11-wm/e17-module-uptime/Makefile +++ b/x11-wm/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-wm/e17-module-weather/Makefile b/x11-wm/e17-module-weather/Makefile index aa6f87e22d5e..600f766a78b0 100644 --- a/x11-wm/e17-module-weather/Makefile +++ b/x11-wm/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-wm/e17-module-winselector/Makefile b/x11-wm/e17-module-winselector/Makefile index 7cf706db8f18..60053eb75610 100644 --- a/x11-wm/e17-module-winselector/Makefile +++ b/x11-wm/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-wm/e17-utils/Makefile b/x11-wm/e17-utils/Makefile index 1e9ac8df90e3..6ac2e659b61e 100644 --- a/x11-wm/e17-utils/Makefile +++ b/x11-wm/e17-utils/Makefile @@ -28,6 +28,4 @@ USE_GNOME= gnometarget pkgconfig USE_EFL= imlib2 evas edje ecore embryo eet ewl engrave epsilon USE_EFL_ESMART= trans_x11 -.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-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile index e60dba48fddb..a1434fdd68b1 100644 --- a/x11-wm/enlightenment-devel/Makefile +++ b/x11-wm/enlightenment-devel/Makefile @@ -32,5 +32,4 @@ GNU_CONFIGURE= yes IGNORE= does not build on 4.X .endif -.include "../../x11-wm/enlightenment-devel/bsd.efl.mk" .include <bsd.port.post.mk> 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> |