aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorgblach <gblach@FreeBSD.org>2014-11-25 11:07:22 +0800
committergblach <gblach@FreeBSD.org>2014-11-25 11:07:22 +0800
commit87b54e3e367990399c42dbb255ce6e12cf180129 (patch)
treea3ede366da71e5f2c9d8a5565a987a08de3b99d0 /x11
parent27ee458dbd7d23c67cbb7706bdadfec14bf6018d (diff)
downloadfreebsd-ports-gnome-87b54e3e367990399c42dbb255ce6e12cf180129.tar.gz
freebsd-ports-gnome-87b54e3e367990399c42dbb255ce6e12cf180129.tar.zst
freebsd-ports-gnome-87b54e3e367990399c42dbb255ce6e12cf180129.zip
- Merge EFL libraries into devel/efl and update to 1.12.0
- Update x11-toolkits/elementary to 1.12.0 - Update x11-wm/enlightenment to 0.19.1 - Update graphics/evas_generic_loaders-* to 1.12.0 - Update devel/e_dbus to 1.7.10 - Update benchmarks/expedite to 1.7.10 - Move some of x11-wm/e17-module-* to x11-wm/e-module-* and update to recent snapshots - Add multimedia/emotion_generic_players-vlc - Add multimedia/rage Reviewed by: crees, antoine
Diffstat (limited to 'x11')
-rw-r--r--x11/Makefile6
-rw-r--r--x11/ecore-imf/Makefile42
-rw-r--r--x11/ecore-imf/distinfo2
-rw-r--r--x11/ecore-imf/pkg-descr5
-rw-r--r--x11/ecore-imf/pkg-plist5
-rw-r--r--x11/ecore-imf_evas/Makefile45
-rw-r--r--x11/ecore-imf_evas/distinfo2
-rw-r--r--x11/ecore-imf_evas/pkg-descr5
-rw-r--r--x11/ecore-imf_evas/pkg-plist5
-rw-r--r--x11/ecore-input/Makefile39
-rw-r--r--x11/ecore-input/distinfo2
-rw-r--r--x11/ecore-input/pkg-descr5
-rw-r--r--x11/ecore-input/pkg-plist5
-rw-r--r--x11/ecore-input_evas/Makefile43
-rw-r--r--x11/ecore-input_evas/distinfo2
-rw-r--r--x11/ecore-input_evas/pkg-descr5
-rw-r--r--x11/ecore-input_evas/pkg-plist5
-rw-r--r--x11/ecore-x11/Makefile103
-rw-r--r--x11/ecore-x11/distinfo2
-rw-r--r--x11/ecore-x11/pkg-descr5
-rw-r--r--x11/ecore-x11/pkg-plist7
-rw-r--r--x11/efreet/Makefile24
-rw-r--r--x11/efreet/distinfo2
-rw-r--r--x11/efreet/pkg-descr10
-rw-r--r--x11/efreet/pkg-plist43
-rw-r--r--x11/emprint/Makefile6
-rw-r--r--x11/terminology/Makefile23
-rw-r--r--x11/terminology/distinfo4
-rw-r--r--x11/terminology/pkg-plist20
29 files changed, 28 insertions, 444 deletions
diff --git a/x11/Makefile b/x11/Makefile
index 9afc0fa5ff9e..b0dba2234097 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -51,13 +51,7 @@
SUBDIR += dynamag
SUBDIR += dzen2
SUBDIR += eaglemode
- SUBDIR += ecore-imf
- SUBDIR += ecore-imf_evas
- SUBDIR += ecore-input
- SUBDIR += ecore-input_evas
- SUBDIR += ecore-x11
SUBDIR += editres
- SUBDIR += efreet
SUBDIR += emprint
SUBDIR += erun
SUBDIR += eterm
diff --git a/x11/ecore-imf/Makefile b/x11/ecore-imf/Makefile
deleted file mode 100644
index 85ad4d291271..000000000000
--- a/x11/ecore-imf/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# Created by: Stanislav Sedov <stas@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= imf
-PORTVERSION= 1.7.9
-CATEGORIES= x11 enlightenment
-MASTER_SITES= http://download.enlightenment.org/releases/ \
- LOCAL/gblach/e17/
-PKGNAMEPREFIX= ecore-
-DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}
-
-MAINTAINER= gblach@FreeBSD.org
-COMMENT= Enlightenment core abstraction library (IMF module)
-
-LICENSE= BSD
-
-DIST_SUBDIR= e17
-GNU_CONFIGURE= yes
-USE_EFL= ecore libtool_hack
-USES= gmake pkgconfig tar:bzip2
-USE_LDCONFIG= yes
-BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_imf
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-
-.include "../../devel/ecore-main/Makefile.inc"
-
-CONFIGURE_ARGS+= --enable-ecore-con \
- --enable-ecore-imf
-
-post-patch:
- @${REINPLACE_CMD} -E \
- -e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore_con/\.libs,${LOCALBASE}/lib,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore_con/libecore_con\.la,-lecore_con,'\
- ${BUILD_WRKSRC}/Makefile.in
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/ecore-imf.pc \
- ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
-
-.include <bsd.port.mk>
diff --git a/x11/ecore-imf/distinfo b/x11/ecore-imf/distinfo
deleted file mode 100644
index 0664f1d1285a..000000000000
--- a/x11/ecore-imf/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (e17/ecore-1.7.9.tar.bz2) = dedab13e9602c301b1a3be6fdc4bdb17b4d8adb802d7e2d468b3282af2640b65
-SIZE (e17/ecore-1.7.9.tar.bz2) = 3454403
diff --git a/x11/ecore-imf/pkg-descr b/x11/ecore-imf/pkg-descr
deleted file mode 100644
index de0d636325d6..000000000000
--- a/x11/ecore-imf/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-A core event abstracter layer and X abstraction layer that makes doing
-selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
-fast, optimised, and convenient.
-
-WWW: http://docs.enlightenment.org/auto/ecore/
diff --git a/x11/ecore-imf/pkg-plist b/x11/ecore-imf/pkg-plist
deleted file mode 100644
index 69e6dd392291..000000000000
--- a/x11/ecore-imf/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-include/ecore-1/Ecore_IMF.h
-lib/libecore_imf.so
-lib/libecore_imf.so.8
-libdata/pkgconfig/ecore-imf.pc
-@dirrmtry include/ecore-1
diff --git a/x11/ecore-imf_evas/Makefile b/x11/ecore-imf_evas/Makefile
deleted file mode 100644
index 5114036eeaa6..000000000000
--- a/x11/ecore-imf_evas/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Created by: Stanislav Sedov <stas@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= imf_evas
-PORTVERSION= 1.7.9
-CATEGORIES= x11 enlightenment
-MASTER_SITES= http://download.enlightenment.org/releases/ \
- LOCAL/gblach/e17/
-PKGNAMEPREFIX= ecore-
-DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}
-
-MAINTAINER= gblach@FreeBSD.org
-COMMENT= Enlightenment core abstraction library (IMF-Evas module)
-
-LICENSE= BSD
-
-DIST_SUBDIR= e17
-GNU_CONFIGURE= yes
-USE_EFL= ecore evas libtool_hack
-USE_EFL_ECORE= imf
-USES= gmake pkgconfig tar:bzip2
-USE_LDCONFIG= yes
-BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_imf_evas
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-
-.include "../../devel/ecore-main/Makefile.inc"
-
-CONFIGURE_ARGS+= --enable-ecore-con \
- --enable-ecore-ipc \
- --enable-ecore-imf \
- --enable-ecore-imf_evas
-
-post-patch:
- @${REINPLACE_CMD} -E \
- -e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore_imf/\.libs,${LOCALBASE}/lib,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore_imf/libecore_imf\.la,-lecore_imf,'\
- ${BUILD_WRKSRC}/Makefile.in
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/ecore-imf-evas.pc \
- ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
-
-.include <bsd.port.mk>
diff --git a/x11/ecore-imf_evas/distinfo b/x11/ecore-imf_evas/distinfo
deleted file mode 100644
index 0664f1d1285a..000000000000
--- a/x11/ecore-imf_evas/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (e17/ecore-1.7.9.tar.bz2) = dedab13e9602c301b1a3be6fdc4bdb17b4d8adb802d7e2d468b3282af2640b65
-SIZE (e17/ecore-1.7.9.tar.bz2) = 3454403
diff --git a/x11/ecore-imf_evas/pkg-descr b/x11/ecore-imf_evas/pkg-descr
deleted file mode 100644
index de0d636325d6..000000000000
--- a/x11/ecore-imf_evas/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-A core event abstracter layer and X abstraction layer that makes doing
-selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
-fast, optimised, and convenient.
-
-WWW: http://docs.enlightenment.org/auto/ecore/
diff --git a/x11/ecore-imf_evas/pkg-plist b/x11/ecore-imf_evas/pkg-plist
deleted file mode 100644
index ed383b86ab61..000000000000
--- a/x11/ecore-imf_evas/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-include/ecore-1/Ecore_IMF_Evas.h
-lib/libecore_imf_evas.so
-lib/libecore_imf_evas.so.8
-libdata/pkgconfig/ecore-imf-evas.pc
-@dirrmtry include/ecore-1
diff --git a/x11/ecore-input/Makefile b/x11/ecore-input/Makefile
deleted file mode 100644
index 45cb0f2c6dbc..000000000000
--- a/x11/ecore-input/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# Created by: Grzegorz Blach <gblach@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= input
-PORTVERSION= 1.7.9
-CATEGORIES= x11 enlightenment
-MASTER_SITES= http://download.enlightenment.org/releases/ \
- LOCAL/gblach/e17/
-PKGNAMEPREFIX= ecore-
-DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}
-
-MAINTAINER= gblach@FreeBSD.org
-COMMENT= Enlightenment core abstraction library (input module)
-
-LICENSE= BSD
-
-DIST_SUBDIR= e17
-GNU_CONFIGURE= yes
-USE_EFL= ecore libtool_hack
-USES= gmake pkgconfig tar:bzip2
-USE_LDCONFIG= yes
-BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_input
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-
-.include "../../devel/ecore-main/Makefile.inc"
-
-CONFIGURE_ARGS+= --enable-ecore-input
-
-post-patch:
- @${REINPLACE_CMD} -E \
- -e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
- ${BUILD_WRKSRC}/Makefile.in
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/ecore-input.pc \
- ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
-
-.include <bsd.port.mk>
diff --git a/x11/ecore-input/distinfo b/x11/ecore-input/distinfo
deleted file mode 100644
index 0664f1d1285a..000000000000
--- a/x11/ecore-input/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (e17/ecore-1.7.9.tar.bz2) = dedab13e9602c301b1a3be6fdc4bdb17b4d8adb802d7e2d468b3282af2640b65
-SIZE (e17/ecore-1.7.9.tar.bz2) = 3454403
diff --git a/x11/ecore-input/pkg-descr b/x11/ecore-input/pkg-descr
deleted file mode 100644
index de0d636325d6..000000000000
--- a/x11/ecore-input/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-A core event abstracter layer and X abstraction layer that makes doing
-selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
-fast, optimised, and convenient.
-
-WWW: http://docs.enlightenment.org/auto/ecore/
diff --git a/x11/ecore-input/pkg-plist b/x11/ecore-input/pkg-plist
deleted file mode 100644
index 807f9dec0bdf..000000000000
--- a/x11/ecore-input/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-include/ecore-1/Ecore_Input.h
-lib/libecore_input.so
-lib/libecore_input.so.8
-libdata/pkgconfig/ecore-input.pc
-@dirrmtry include/ecore-1
diff --git a/x11/ecore-input_evas/Makefile b/x11/ecore-input_evas/Makefile
deleted file mode 100644
index aeb7643be022..000000000000
--- a/x11/ecore-input_evas/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Created by: Grzegorz Blach <gblach@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= input_evas
-PORTVERSION= 1.7.9
-CATEGORIES= x11 enlightenment
-MASTER_SITES= http://download.enlightenment.org/releases/ \
- LOCAL/gblach/e17/
-PKGNAMEPREFIX= ecore-
-DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}
-
-MAINTAINER= gblach@FreeBSD.org
-COMMENT= Enlightenment core abstraction library (evas input module)
-
-LICENSE= BSD
-
-DIST_SUBDIR= e17
-GNU_CONFIGURE= yes
-USE_EFL= ecore evas libtool_hack
-USE_EFL_ECORE= input
-USES= gmake pkgconfig tar:bzip2
-USE_LDCONFIG= yes
-BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_input_evas
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-
-.include "../../devel/ecore-main/Makefile.inc"
-
-CONFIGURE_ARGS+= --enable-ecore-input \
- --enable-ecore-input_evas
-
-post-patch:
- @${REINPLACE_CMD} -E \
- -e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore_input/\.libs,${LOCALBASE}/lib,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore_input/libecore_input\.la,-lecore_input,'\
- ${BUILD_WRKSRC}/Makefile.in
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/ecore-input-evas.pc \
- ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
-
-.include <bsd.port.mk>
diff --git a/x11/ecore-input_evas/distinfo b/x11/ecore-input_evas/distinfo
deleted file mode 100644
index 0664f1d1285a..000000000000
--- a/x11/ecore-input_evas/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (e17/ecore-1.7.9.tar.bz2) = dedab13e9602c301b1a3be6fdc4bdb17b4d8adb802d7e2d468b3282af2640b65
-SIZE (e17/ecore-1.7.9.tar.bz2) = 3454403
diff --git a/x11/ecore-input_evas/pkg-descr b/x11/ecore-input_evas/pkg-descr
deleted file mode 100644
index de0d636325d6..000000000000
--- a/x11/ecore-input_evas/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-A core event abstracter layer and X abstraction layer that makes doing
-selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
-fast, optimised, and convenient.
-
-WWW: http://docs.enlightenment.org/auto/ecore/
diff --git a/x11/ecore-input_evas/pkg-plist b/x11/ecore-input_evas/pkg-plist
deleted file mode 100644
index 0fe9f2944dd0..000000000000
--- a/x11/ecore-input_evas/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-include/ecore-1/Ecore_Input_Evas.h
-lib/libecore_input_evas.so
-lib/libecore_input_evas.so.8
-libdata/pkgconfig/ecore-input-evas.pc
-@dirrmtry include/ecore-1
diff --git a/x11/ecore-x11/Makefile b/x11/ecore-x11/Makefile
deleted file mode 100644
index 95e56daffef0..000000000000
--- a/x11/ecore-x11/Makefile
+++ /dev/null
@@ -1,103 +0,0 @@
-# Created by: Stanislav Sedov <stas@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= x11
-PORTVERSION= 1.7.9
-CATEGORIES= x11 enlightenment
-MASTER_SITES= http://download.enlightenment.org/releases/ \
- LOCAL/gblach/e17/
-PKGNAMEPREFIX= ecore-
-DISTNAME= ${PKGNAMEPREFIX}${PORTVERSION}
-
-MAINTAINER= gblach@FreeBSD.org
-COMMENT= Enlightenment core abstraction library (x11 module)
-
-LICENSE= BSD
-
-DIST_SUBDIR= e17
-GNU_CONFIGURE= yes
-USES= gmake pkgconfig tar:bzip2
-USE_EFL= ecore libtool_hack
-USE_EFL_ECORE= input
-USE_LDCONFIG= yes
-BUILD_WRKSRC= ${WRKSRC}/src/lib/ecore_x
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-XEXTDIR= ${LOCALBASE}/include/X11/extensions
-
-.include "../../devel/ecore-main/Makefile.inc"
-
-CONFIGURE_ARGS+= --enable-ecore-x \
- --enable-ecore-input
-
-OPTIONS_DEFINE= XCURSOR XDAMAGE XDPMS XFIXES XINERAMA XPRINT XRANDR XRENDER XSS
-OPTIONS_DEFAULT=XCURSOR XDAMAGE XDPMS XFIXES XINERAMA XPRINT XRANDR XRENDER XSS
-XDAMAGE_DESC= X11 Xdamage extension support
-XDPMS_DESC= X11 Xdpms extension support
-XFIXES_DESC= X11 Xfixes extension support
-XPRINT_DESC= X11 Xprint extension support
-XRENDER_DESC= X11 Xrender extension support
-XSS_DESC= X11 Xscrnsaver extension support
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MXCURSOR} \
- || exists(${LOCALBASE}/include/X11/Xcursor/Xcursor.h)
-USE_XORG+= xcursor
-WITH_X11= yes
-.endif
-
-.if ${PORT_OPTIONS:MXDAMAGE} || exists(${XEXTDIR}/Xdamage.h)
-USE_XORG+= xdamage
-WITH_X11= yes
-.endif
-
-.if ${PORT_OPTIONS:MXDPMS} || exists(${XEXTDIR}/dpms.h)
-USE_XORG+= xextproto
-WITH_X11= yes
-.endif
-
-.if ${PORT_OPTIONS:MXFIXES} || exists(${XEXTDIR}/Xfixes.h)
-USE_XORG+= xfixes
-WITH_X11= yes
-.endif
-
-.if ${PORT_OPTIONS:MXINERAMA} || exists(${XEXTDIR}/Xinerama.h)
-USE_XORG+= xineramaproto
-WITH_X11= yes
-.endif
-
-.if ${PORT_OPTIONS:MXPRINT} || exists(${XEXTDIR}/Print.h)
-USE_XORG+= printproto
-WITH_X11= yes
-.endif
-
-.if ${PORT_OPTIONS:MXRANDR} || exists(${XEXTDIR}/Xrandr.h)
-USE_XORG+= xrandr
-WITH_X11= yes
-.endif
-
-.if ${PORT_OPTIONS:MXRENDER} || exists(${XEXTDIR}/Xrender.h)
-USE_XORG+= xrender
-WITH_X11= yes
-.endif
-
-.if ${PORT_OPTIONS:MXSS} || exists(${XEXTDIR}/scrnsaver.h)
-USE_XORG+= xscrnsaver
-WITH_X11= yes
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -E \
- -e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore_input/\.libs,${LOCALBASE}/lib,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore/libecore\.la,-lecore,'\
- -e 's,\$$\(top_builddir\)/src/lib/ecore_input/libecore_input\.la,-lecore_input,'\
- ${BUILD_WRKSRC}/Makefile.in \
- ${BUILD_WRKSRC}/xcb/Makefile.in \
- ${BUILD_WRKSRC}/xlib/Makefile.in
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/ecore-x.pc \
- ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
-
-.include <bsd.port.mk>
diff --git a/x11/ecore-x11/distinfo b/x11/ecore-x11/distinfo
deleted file mode 100644
index 0664f1d1285a..000000000000
--- a/x11/ecore-x11/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (e17/ecore-1.7.9.tar.bz2) = dedab13e9602c301b1a3be6fdc4bdb17b4d8adb802d7e2d468b3282af2640b65
-SIZE (e17/ecore-1.7.9.tar.bz2) = 3454403
diff --git a/x11/ecore-x11/pkg-descr b/x11/ecore-x11/pkg-descr
deleted file mode 100644
index de0d636325d6..000000000000
--- a/x11/ecore-x11/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-A core event abstracter layer and X abstraction layer that makes doing
-selections, Xdnd, general X stuff, and event loops, timeouts and idle handlers
-fast, optimised, and convenient.
-
-WWW: http://docs.enlightenment.org/auto/ecore/
diff --git a/x11/ecore-x11/pkg-plist b/x11/ecore-x11/pkg-plist
deleted file mode 100644
index d1aaa3d7386c..000000000000
--- a/x11/ecore-x11/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-include/ecore-1/Ecore_X.h
-include/ecore-1/Ecore_X_Atoms.h
-include/ecore-1/Ecore_X_Cursor.h
-lib/libecore_x.so
-lib/libecore_x.so.8
-libdata/pkgconfig/ecore-x.pc
-@dirrmtry include/ecore-1
diff --git a/x11/efreet/Makefile b/x11/efreet/Makefile
deleted file mode 100644
index 9914a4935fb5..000000000000
--- a/x11/efreet/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-# Created by: Stanislav Sedov <stas@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME= efreet
-PORTVERSION= 1.7.9
-CATEGORIES= x11 enlightenment
-MASTER_SITES= http://download.enlightenment.org/releases/ \
- LOCAL/gblach/e17/
-
-MAINTAINER= gblach@FreeBSD.org
-COMMENT= Freedesktop.org EFL compatibility layer
-
-LICENSE= BSD
-
-DIST_SUBDIR= e17
-GNU_CONFIGURE= yes
-USES= pathfix pkgconfig tar:bzip2
-USE_EFL= eet eina ecore libtool_hack librt_hack
-USE_EFL_ECORE= file
-USE_LDCONFIG= yes
-
-CONFIGURE_ARGS= --disable-nls
-
-.include <bsd.port.mk>
diff --git a/x11/efreet/distinfo b/x11/efreet/distinfo
deleted file mode 100644
index 2edc738354f2..000000000000
--- a/x11/efreet/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (e17/efreet-1.7.9.tar.bz2) = 3595bbed3f88152713581755594a9f4a3bc4d131111fb003bb6a3c15e597f3f5
-SIZE (e17/efreet-1.7.9.tar.bz2) = 450920
diff --git a/x11/efreet/pkg-descr b/x11/efreet/pkg-descr
deleted file mode 100644
index da637f498641..000000000000
--- a/x11/efreet/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Efreet is an implementation of several specifications from freedesktop.org
-intended for use in Enlightenment DR17 (e17) and other applications using
-the Enlightenment Foundation Libraries (EFL). Currently, the following
-specifications are included:
- o Base Directory
- o Desktop Entry
- o Icon Theme
- o Menu
-
-WWW: http://docs.enlightenment.org/auto/efreet/
diff --git a/x11/efreet/pkg-plist b/x11/efreet/pkg-plist
deleted file mode 100644
index 99be34f1f9a2..000000000000
--- a/x11/efreet/pkg-plist
+++ /dev/null
@@ -1,43 +0,0 @@
-bin/efreet_alloc
-bin/efreet_cache_test
-bin/efreet_icon_cache_dump
-bin/efreet_menu_alloc
-bin/efreet_spec_test
-bin/efreet_test
-include/efreet-1/Efreet.h
-include/efreet-1/Efreet_Mime.h
-include/efreet-1/Efreet_Trash.h
-include/efreet-1/efreet_base.h
-include/efreet-1/efreet_desktop.h
-include/efreet-1/efreet_icon.h
-include/efreet-1/efreet_ini.h
-include/efreet-1/efreet_menu.h
-include/efreet-1/efreet_uri.h
-include/efreet-1/efreet_utils.h
-lib/libefreet.so
-lib/libefreet.so.8
-lib/libefreet_mime.so
-lib/libefreet_mime.so.8
-lib/libefreet_trash.so
-lib/libefreet_trash.so.8
-lib/efreet/efreet_desktop_cache_create
-lib/efreet/efreet_icon_cache_create
-libdata/pkgconfig/efreet-mime.pc
-libdata/pkgconfig/efreet-trash.pc
-libdata/pkgconfig/efreet.pc
-%%DATADIR%%/test/entry
-%%DATADIR%%/test/entry.png
-%%DATADIR%%/test/long.ini
-%%DATADIR%%/test/preferences.menu
-%%DATADIR%%/test/sub/test.desktop
-%%DATADIR%%/test/test.desktop
-%%DATADIR%%/test/test.ini
-%%DATADIR%%/test/test.menu
-%%DATADIR%%/test/test_garbage
-%%DATADIR%%/test/test_menu_slash_bad.menu
-%%DATADIR%%/test/test_type.desktop
-@dirrm %%DATADIR%%/test/sub
-@dirrm %%DATADIR%%/test
-@dirrm %%DATADIR%%
-@dirrm lib/efreet
-@dirrm include/efreet-1
diff --git a/x11/emprint/Makefile b/x11/emprint/Makefile
index ae55291a57c1..60c3965b136d 100644
--- a/x11/emprint/Makefile
+++ b/x11/emprint/Makefile
@@ -3,17 +3,17 @@
PORTNAME= emprint
PORTVERSION= 20130520
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 enlightenment
MASTER_SITES= LOCAL/gblach/e17/extra/
MAINTAINER= gblach@FreeBSD.org
COMMENT= Utility for taking screenshots for E17
+LIB_DEPENDS= libefl.so:${PORTSDIR}/devel/efl
+
DIST_SUBDIR= e17
GNU_CONFIGURE= yes
USES= pkgconfig tar:bzip2
-USE_EFL= eina evas ecore
-USE_EFL_ECORE= evas file input x11
.include <bsd.port.mk>
diff --git a/x11/terminology/Makefile b/x11/terminology/Makefile
index e656666b7b61..6bbc66664f0c 100644
--- a/x11/terminology/Makefile
+++ b/x11/terminology/Makefile
@@ -3,25 +3,28 @@
PORTNAME= terminology
PORTVERSION= 0.7.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11 enlightenment
-MASTER_SITES= http://download.enlightenment.org/rel/apps/terminology/
+MASTER_SITES= http://download.enlightenment.org/rel/apps/${PORTNAME}/
MAINTAINER= gblach@FreeBSD.org
COMMENT= EFL Terminal Emulator
-LICENSE= BSD
+LICENSE= BSD2CLAUSE
-USES= pkgconfig tar:xz
-DIST_SUBDIR= e17
+LIB_DEPENDS= libefl.so:${PORTSDIR}/devel/efl \
+ libelementary.so:${PORTSDIR}/x11-toolkits/elementary
+
+DIST_SUBDIR= enlightenment
GNU_CONFIGURE= yes
-USE_EFL= eina eet evas ecore edje emotion elementary
-USE_EFL_ECORE= imf imf_evas input ipc
+USES= pkgconfig tar:xz
+
+OPTIONS_DEFINE= NLS
+OPTIONS_SUB= yes
-OPTIONS_DEFINE= NLS
-OPTIONS_SUB= yes
+.include <bsd.port.options.mk>
-NLS_USES= gettext
+NLS_USES= gettext
NLS_CONFIGURE_ENABLE= nls
.include <bsd.port.mk>
diff --git a/x11/terminology/distinfo b/x11/terminology/distinfo
index 84516e1cb2ec..1827694f3a9c 100644
--- a/x11/terminology/distinfo
+++ b/x11/terminology/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/terminology-0.7.0.tar.xz) = 4fe3ca0fa4ec7e1d8bb83a224df29871801bbf1bd3a9da34e732e3a6e8272275
-SIZE (e17/terminology-0.7.0.tar.xz) = 3194548
+SHA256 (enlightenment/terminology-0.7.0.tar.xz) = 4fe3ca0fa4ec7e1d8bb83a224df29871801bbf1bd3a9da34e732e3a6e8272275
+SIZE (enlightenment/terminology-0.7.0.tar.xz) = 3194548
diff --git a/x11/terminology/pkg-plist b/x11/terminology/pkg-plist
index daaeca3d0ff3..accc0f2a595c 100644
--- a/x11/terminology/pkg-plist
+++ b/x11/terminology/pkg-plist
@@ -8,16 +8,6 @@ bin/tyq
man/man1/terminology.1.gz
share/applications/terminology.desktop
share/icons/terminology.png
-%%NLS%%share/locale/ca/LC_MESSAGES/terminology.mo
-%%NLS%%share/locale/de/LC_MESSAGES/terminology.mo
-%%NLS%%share/locale/el/LC_MESSAGES/terminology.mo
-%%NLS%%share/locale/eo/LC_MESSAGES/terminology.mo
-%%NLS%%share/locale/fi/LC_MESSAGES/terminology.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/terminology.mo
-%%NLS%%share/locale/it/LC_MESSAGES/terminology.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/terminology.mo
-%%NLS%%share/locale/ms/LC_MESSAGES/terminology.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/terminology.mo
%%DATADIR%%/backgrounds/mystic.png
%%DATADIR%%/backgrounds/texture_background.png
%%DATADIR%%/fonts/10x20.pcf
@@ -53,3 +43,13 @@ share/icons/terminology.png
%%DATADIR%%/themes/smyck.edj
%%DATADIR%%/themes/solarized.edj
%%DATADIR%%/themes/solarized_light.edj
+%%NLS%%share/locale/ca/LC_MESSAGES/terminology.mo
+%%NLS%%share/locale/de/LC_MESSAGES/terminology.mo
+%%NLS%%share/locale/el/LC_MESSAGES/terminology.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/terminology.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/terminology.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/terminology.mo
+%%NLS%%share/locale/it/LC_MESSAGES/terminology.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/terminology.mo
+%%NLS%%share/locale/ms/LC_MESSAGES/terminology.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/terminology.mo