svn commit: r373393 - in head: . Mk benchmarks/expedite devel devel/e_dbus devel/ecore devel/ecore-file devel/ecore-ipc devel/ecore-main devel/eet devel/efl devel/efl/files devel/eina devel/eio gra...

Tue Nov 25 03:07:27 UTC 2014

Author: gblach
Date: Tue Nov 25 03:07:22 2014
New Revision: 373393
URL: https://svnweb.freebsd.org/changeset/ports/373393
QAT: https://qat.redports.org/buildarchive/r373393/

Log:
  - 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

Added:
  head/devel/efl/
  head/devel/efl/Makefile   (contents, props changed)
  head/devel/efl/distinfo   (contents, props changed)
  head/devel/efl/files/
  head/devel/efl/files/patch-configure.ac   (contents, props changed)
  head/devel/efl/pkg-descr   (contents, props changed)
  head/devel/efl/pkg-plist   (contents, props changed)
  head/graphics/evas_generic_loaders/
  head/graphics/evas_generic_loaders/Makefile   (contents, props changed)
  head/graphics/evas_generic_loaders/pkg-descr   (contents, props changed)
  head/multimedia/emotion_generic_players-vlc/
  head/multimedia/emotion_generic_players-vlc/Makefile   (contents, props changed)
  head/multimedia/emotion_generic_players-vlc/distinfo   (contents, props changed)
  head/multimedia/emotion_generic_players-vlc/pkg-descr   (contents, props changed)
  head/multimedia/emotion_generic_players-vlc/pkg-plist   (contents, props changed)
  head/multimedia/rage/
  head/multimedia/rage/Makefile   (contents, props changed)
  head/multimedia/rage/distinfo   (contents, props changed)
  head/multimedia/rage/pkg-descr   (contents, props changed)
  head/multimedia/rage/pkg-plist   (contents, props changed)
  head/x11-wm/e-module-alarm/
     - copied from r373391, head/x11-wm/e17-module-alarm/
  head/x11-wm/e-module-cpu/
     - copied from r370735, head/x11-wm/e17-module-cpu/
  head/x11-wm/e-module-deskshow/
     - copied from r370735, head/x11-wm/e17-module-deskshow/
  head/x11-wm/e-module-diskio/
     - copied from r370735, head/x11-wm/e17-module-diskio/
  head/x11-wm/e-module-everything-places/
     - copied from r370735, head/x11-wm/e17-module-everything-places/
  head/x11-wm/e-module-everything-websearch/
     - copied from r370735, head/x11-wm/e17-module-everything-websearch/
  head/x11-wm/e-module-forecasts/
     - copied from r370735, head/x11-wm/e17-module-forecasts/
  head/x11-wm/e-module-mem/
     - copied from r370735, head/x11-wm/e17-module-mem/
  head/x11-wm/e-module-mpdule/
     - copied from r370735, head/x11-wm/e17-module-mpdule/
  head/x11-wm/e-module-net/
     - copied from r370735, head/x11-wm/e17-module-net/
  head/x11-wm/e-module-penguins/
     - copied from r370735, head/x11-wm/e17-module-penguins/
  head/x11-wm/e-module-places/
     - copied from r370735, head/x11-wm/e17-module-places/
  head/x11-wm/e-module-rmb/
     - copied from r370735, head/x11-wm/e17-module-rmb/
  head/x11-wm/e-module-tclock/
     - copied from r370735, head/x11-wm/e17-module-tclock/
  head/x11-wm/e-module-wlan/
     - copied from r370735, head/x11-wm/e17-module-wlan/
  head/x11-wm/e-modules/
     - copied from r370735, head/x11-wm/e17-modules/
  head/x11-wm/enlightenment/Makefile.plist   (contents, props changed)
Deleted:
  head/devel/ecore/
  head/devel/ecore-file/
  head/devel/ecore-ipc/
  head/devel/ecore-main/
  head/devel/eet/
  head/devel/eina/
  head/devel/eio/
  head/graphics/ecore-evas/
  head/graphics/ecore-sdl/
  head/graphics/edje/
  head/graphics/ethumb/
  head/graphics/evas/
  head/graphics/evas-core/
  head/graphics/evas-engine-buffer/
  head/graphics/evas-engine-opengl/
  head/graphics/evas-engine-sdl/
  head/graphics/evas-engine-x11/
  head/graphics/evas-loader-bmp/
  head/graphics/evas-loader-eet/
  head/graphics/evas-loader-generic/
  head/graphics/evas-loader-gif/
  head/graphics/evas-loader-ico/
  head/graphics/evas-loader-jpeg/
  head/graphics/evas-loader-pmaps/
  head/graphics/evas-loader-png/
  head/graphics/evas-loader-psd/
  head/graphics/evas-loader-svg/
  head/graphics/evas-loader-tga/
  head/graphics/evas-loader-tiff/
  head/graphics/evas-loader-wbmp/
  head/graphics/evas-loader-xpm/
  head/lang/embryo/
  head/multimedia/emotion/
  head/net/ecore-con/
  head/x11-wm/e17-module-alarm/
  head/x11-wm/e17-module-cpu/
  head/x11-wm/e17-module-deskshow/
  head/x11-wm/e17-module-diskio/
  head/x11-wm/e17-module-everything-places/
  head/x11-wm/e17-module-everything-websearch/
  head/x11-wm/e17-module-forecasts/
  head/x11-wm/e17-module-mem/
  head/x11-wm/e17-module-mpdule/
  head/x11-wm/e17-module-net/
  head/x11-wm/e17-module-penguins/
  head/x11-wm/e17-module-places/
  head/x11-wm/e17-module-rmb/
  head/x11-wm/e17-module-tclock/
  head/x11-wm/e17-module-wlan/
  head/x11-wm/e17-modules/
  head/x11-wm/enlightenment/files/patch-configure
  head/x11-wm/enlightenment/files/patch-src-bin-e_fm-Makefile.in
  head/x11/ecore-imf/
  head/x11/ecore-imf_evas/
  head/x11/ecore-input/
  head/x11/ecore-input_evas/
  head/x11/ecore-x11/
  head/x11/efreet/
Modified:
  head/MOVED
  head/Mk/bsd.efl.mk
  head/UPDATING
  head/benchmarks/expedite/Makefile
  head/benchmarks/expedite/distinfo
  head/devel/Makefile
  head/devel/e_dbus/Makefile
  head/devel/e_dbus/distinfo
  head/devel/e_dbus/pkg-plist
  head/graphics/Makefile
  head/graphics/edje_viewer/Makefile
  head/graphics/ender/Makefile
  head/graphics/enesim/Makefile
  head/graphics/etch/Makefile
  head/graphics/evas_generic_loaders-gst/Makefile
  head/graphics/evas_generic_loaders-gst/distinfo
  head/graphics/evas_generic_loaders-pdf/Makefile
  head/graphics/evas_generic_loaders-pdf/distinfo
  head/graphics/evas_generic_loaders-pdf/pkg-plist
  head/graphics/evas_generic_loaders-ps/Makefile
  head/graphics/evas_generic_loaders-ps/distinfo
  head/graphics/evas_generic_loaders-raw/Makefile
  head/graphics/evas_generic_loaders-raw/distinfo
  head/graphics/evas_generic_loaders-svg/Makefile
  head/graphics/evas_generic_loaders-svg/distinfo
  head/graphics/evas_generic_loaders-svg/pkg-plist
  head/graphics/evas_generic_loaders-xcf/Makefile
  head/graphics/evas_generic_loaders-xcf/distinfo
  head/graphics/exact-image/Makefile
  head/graphics/imlib2_loaders/Makefile
  head/lang/Makefile
  head/multimedia/Makefile
  head/net/Makefile
  head/www/egueb/Makefile
  head/x11-toolkits/elementary/Makefile
  head/x11-toolkits/elementary/distinfo
  head/x11-toolkits/elementary/pkg-plist
  head/x11-wm/Makefile
  head/x11-wm/e-module-alarm/Makefile
  head/x11-wm/e-module-alarm/distinfo
  head/x11-wm/e-module-alarm/pkg-plist
  head/x11-wm/e-module-cpu/Makefile
  head/x11-wm/e-module-cpu/distinfo
  head/x11-wm/e-module-cpu/pkg-plist
  head/x11-wm/e-module-deskshow/Makefile
  head/x11-wm/e-module-deskshow/pkg-plist
  head/x11-wm/e-module-diskio/Makefile
  head/x11-wm/e-module-diskio/distinfo
  head/x11-wm/e-module-diskio/pkg-plist
  head/x11-wm/e-module-everything-places/Makefile
  head/x11-wm/e-module-everything-places/distinfo
  head/x11-wm/e-module-everything-places/pkg-plist
  head/x11-wm/e-module-everything-websearch/Makefile
  head/x11-wm/e-module-everything-websearch/distinfo
  head/x11-wm/e-module-everything-websearch/pkg-plist
  head/x11-wm/e-module-forecasts/Makefile
  head/x11-wm/e-module-forecasts/distinfo
  head/x11-wm/e-module-forecasts/pkg-plist
  head/x11-wm/e-module-mem/Makefile
  head/x11-wm/e-module-mem/distinfo
  head/x11-wm/e-module-mem/pkg-plist
  head/x11-wm/e-module-mpdule/Makefile
  head/x11-wm/e-module-mpdule/distinfo
  head/x11-wm/e-module-mpdule/pkg-plist
  head/x11-wm/e-module-net/Makefile
  head/x11-wm/e-module-net/distinfo
  head/x11-wm/e-module-net/pkg-plist
  head/x11-wm/e-module-penguins/Makefile
  head/x11-wm/e-module-penguins/distinfo
  head/x11-wm/e-module-penguins/pkg-plist
  head/x11-wm/e-module-places/Makefile
  head/x11-wm/e-module-places/distinfo
  head/x11-wm/e-module-places/pkg-plist
  head/x11-wm/e-module-rmb/Makefile
  head/x11-wm/e-module-rmb/pkg-plist
  head/x11-wm/e-module-tclock/Makefile
  head/x11-wm/e-module-tclock/distinfo
  head/x11-wm/e-module-tclock/pkg-plist
  head/x11-wm/e-module-wlan/Makefile
  head/x11-wm/e-module-wlan/distinfo
  head/x11-wm/e-module-wlan/pkg-plist
  head/x11-wm/e-modules/Makefile
  head/x11-wm/e17-module-comp-scale/Makefile
  head/x11-wm/e17-module-eektool/Makefile
  head/x11-wm/e17-module-elfe/Makefile
  head/x11-wm/e17-module-empris/Makefile
  head/x11-wm/e17-module-engage/Makefile
  head/x11-wm/e17-module-eooorg/Makefile
  head/x11-wm/e17-module-everything-aspell/Makefile
  head/x11-wm/e17-module-everything-mpris/Makefile
  head/x11-wm/e17-module-everything-pidgin/Makefile
  head/x11-wm/e17-module-everything-shotgun/Makefile
  head/x11-wm/e17-module-everything-wallpaper/Makefile
  head/x11-wm/e17-module-exebuf/Makefile
  head/x11-wm/e17-module-execwatch/Makefile
  head/x11-wm/e17-module-flame/Makefile
  head/x11-wm/e17-module-iiirk/Makefile
  head/x11-wm/e17-module-itask/Makefile
  head/x11-wm/e17-module-mail/Makefile
  head/x11-wm/e17-module-moon/Makefile
  head/x11-wm/e17-module-news/Makefile
  head/x11-wm/e17-module-photo/Makefile
  head/x11-wm/e17-module-rain/Makefile
  head/x11-wm/e17-module-screenshot/Makefile
  head/x11-wm/e17-module-slideshow/Makefile
  head/x11-wm/e17-module-snow/Makefile
  head/x11-wm/e17-module-taskbar/Makefile
  head/x11-wm/e17-module-uptime/Makefile
  head/x11-wm/e17-module-weather/Makefile
  head/x11-wm/e17-module-winlist-ng/Makefile
  head/x11-wm/e17-module-winselector/Makefile
  head/x11-wm/enlightenment/Makefile
  head/x11-wm/enlightenment/distinfo
  head/x11-wm/enlightenment/files/patch-data-etc-sysactions.conf.in
  head/x11-wm/enlightenment/pkg-plist
  head/x11/Makefile
  head/x11/emprint/Makefile
  head/x11/terminology/Makefile
  head/x11/terminology/distinfo
  head/x11/terminology/pkg-plist

Modified: head/MOVED
==============================================================================

--- head/MOVED	Tue Nov 25 02:56:41 2014	(r373392)
+++ head/MOVED	Tue Nov 25 03:07:22 2014	(r373393)
@@ -7234,3 +7234,59 @@ graphics/linux-c6-gdk-pixbuf|graphics/li
 devel/libole2||2014-11-24|Abandoned upstream, incomplete, not depend on
 net/p5-SOAP-Transport-TCP|net/p5-SOAP-Lite|2014-11-24|Has been integrated into net/p5-SOAP-Lite
 www/chimera||2014-11-24|Has expired: Abandonware (last update in 1997), restrictive license
+devel/ecore|devel/efl|2014-11-25|Merged to devel/efl
+devel/ecore-file|devel/efl|2014-11-25|Merged to devel/efl
+devel/ecore-ipc|devel/efl|2014-11-25|Merged to devel/efl
+devel/ecore-main|devel/efl|2014-11-25|Merged to devel/efl
+devel/eet|devel/efl|2014-11-25|Merged to devel/efl
+devel/eina|devel/efl|2014-11-25|Merged to devel/efl
+devel/eio|devel/efl|2014-11-25|Merged to devel/efl
+graphics/ecore-evas|devel/efl|2014-11-25|Merged to devel/efl
+graphics/ecore-sdl|devel/efl|2014-11-25|Merged to devel/efl
+graphics/edje|devel/efl|2014-11-25|Merged to devel/efl
+graphics/ethumb|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-core|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-engine-buffer|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-engine-opengl|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-engine-sdl|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-engine-x11|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-bmp|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-eet|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-generic|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-gif|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-ico|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-jpeg|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-pmaps|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-png|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-psd|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-svg|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-tga|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-tiff|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-wbmp|devel/efl|2014-11-25|Merged to devel/efl
+graphics/evas-loader-xpm|devel/efl|2014-11-25|Merged to devel/efl
+lang/embryo|devel/efl|2014-11-25|Merged to devel/efl
+multimedia/emotion|devel/efl|2014-11-25|Merged to devel/efl
+net/ecore-con|devel/efl|2014-11-25|Merged to devel/efl
+x11/ecore-imf|devel/efl|2014-11-25|Merged to devel/efl
+x11/ecore-imf_evas|devel/efl|2014-11-25|Merged to devel/efl
+x11/ecore-input|devel/efl|2014-11-25|Merged to devel/efl
+x11/ecore-input_evas|devel/efl|2014-11-25|Merged to devel/efl
+x11/ecore-x11|devel/efl|2014-11-25|Merged to devel/efl
+x11/efreet|devel/efl|2014-11-25|Merged to devel/efl
+x11-wm/e17-module-alarm|x11-wm/e-module-alarm|2014-11-25|Renamed
+x11-wm/e17-module-cpu|x11-wm/e-module-cpu|2014-11-25|Renamed
+x11-wm/e17-module-deskshow|x11-wm/e-module-deskshow|2014-11-25|Renamed
+x11-wm/e17-module-diskio|x11-wm/e-module-diskio|2014-11-25|Renamed
+x11-wm/e17-module-everything-places|x11-wm/e-module-everything-places|2014-11-25|Renamed
+x11-wm/e17-module-everything-websearch|x11-wm/e-module-everything-websearch|2014-11-25|Renamed
+x11-wm/e17-module-forecasts|x11-wm/e-module-forecasts|2014-11-25|Renamed
+x11-wm/e17-module-mem|x11-wm/e-module-mem|2014-11-25|Renamed
+x11-wm/e17-module-mpdule|x11-wm/e-module-mpdule|2014-11-25|Renamed
+x11-wm/e17-module-net|x11-wm/e-module-net|2014-11-25|Renamed
+x11-wm/e17-module-penguins|x11-wm/e-module-penguins|2014-11-25|Renamed
+x11-wm/e17-module-places|x11-wm/e-module-places|2014-11-25|Renamed
+x11-wm/e17-module-rmb|x11-wm/e-module-rmb|2014-11-25|Renamed
+x11-wm/e17-module-tclock|x11-wm/e-module-tclock|2014-11-25|Renamed
+x11-wm/e17-module-wlan|x11-wm/e-module-wlan|2014-11-25|Renamed
+x11-wm/e17-modules|x11-wm/e-modules|2014-11-25|Renamed

Modified: head/Mk/bsd.efl.mk
==============================================================================
--- head/Mk/bsd.efl.mk	Tue Nov 25 02:56:41 2014	(r373392)
+++ head/Mk/bsd.efl.mk	Tue Nov 25 03:07:22 2014	(r373393)
@@ -36,8 +36,7 @@ EFL_Include_MAINTAINER=	gblach at FreeBSD.o
 #
 # Define all supported libraries
 #
-_USE_EFL_ALL=	ecore edbus edje eet efreet eio eina elementary embryo \
-		emotion ender enesim epeg esvg etch ethumb evas imlib2
+_USE_EFL_ALL=	epeg imlib2
 
 # For each library supported we define the following variables:
 #	_%%LIB%%_CATEGORY	- category the port belongs to
@@ -46,61 +45,9 @@ _USE_EFL_ALL=	ecore edbus edje eet efree
 #	_%%LIB%%_SLIB		- name of the shared library
 #
 
-_ecore_CATEGORY=	devel
-_ecore_PORTNAME=	ecore-main
-_ecore_VERSION=		8
-
-_edbus_CATEGORY=	devel
-_edbus_PORTNAME=	e_dbus
-_edbus_VERSION=		8
-
-_eet_CATEGORY=		devel
-_eet_VERSION=		8
-
-_efreet_CATEGORY=	x11
-_efreet_VERSION=	8
-
-_edje_CATEGORY=		graphics
-_edje_VERSION=		8
-
-_eio_CATEGORY=		devel
-_eio_VERSION=		8
-
-_eina_CATEGORY=		devel
-_eina_VERSION=		8
-
-_elementary_CATEGORY=	x11-toolkits
-_elementary_VERSION=	8
-
-_embryo_CATEGORY=	lang
-_embryo_VERSION=	8
-
-_emotion_CATEGORY=	multimedia
-_emotion_VERSION=	8
-
-_ender_CATEGORY=	graphics
-_ender_VERSION=		0
-
-_enesim_CATEGORY=	graphics
-_enesim_VERSION=	0
-
 _epeg_CATEGORY=		graphics
 _epeg_VERSION=		9
 
-_esvg_CATEGORY=		www
-_esvg_PORTNAME=		egueb
-_esvg_VERSION=		0
-
-_etch_CATEGORY=		graphics
-_etch_VERSION=		0
-
-_ethumb_CATEGORY=	graphics
-_ethumb_VERSION=	8
-
-_evas_CATEGORY=		graphics
-_evas_PORTNAME=		evas-core
-_evas_VERSION=		8
-
 _imlib2_CATEGORY=	graphics
 _imlib2_VERSION=	5
 _imlib2_SLIB=		Imlib2
@@ -121,113 +68,6 @@ _${LIB}_PREFIX=${LOCALBASE}
 .endfor
 
 #
-# Evas engines and loaders support.
-# Values processed:
-# _evas_engine_COMP_CATEGORY	- Where the port for this object is located
-# _evas_engine_COMP_PORTNAME	- Object's port subdirectory
-# _evas_engine_COMP_DIR		- Evas object's subdir
-#
-
-# All components that are currently supported
-_EFL_EVAS_ENGINES_ALL=	buffer opengl sdl x11
-_EFL_EVAS_LOADERS_ALL=	bmp eet generic gif ico jpeg \
-			png pmaps psd svg tga tiff wbmp xpm
-
-#
-# Generic evas engines definitions
-#
-_EFL_EVAS_CATEGORY=		graphics
-_EFL_EVAS_MODDIR=		${LOCALBASE}/lib/evas/modules
-_EFL_EVAS_ENGINES_MODDIR=	${_EFL_EVAS_MODDIR}/engines
-_EFL_EVAS_LOADERS_MODDIR=	${_EFL_EVAS_MODDIR}/loaders
-
-#
-# Evas engine modules definitions
-#
-
-_evas_engine_buffer_DIR=	buffer
-_evas_engine_opengl_DIR=	gl_x11
-_evas_engine_sdl_DIR=		software_16_sdl
-_evas_engine_x11_DIR=		software_x11
-
-#
-# Assign values for variables which were not defined explicitly
-#
-.for COMP in ${_EFL_EVAS_ENGINES_ALL}
-. if !defined(_evas_engine_${COMP}_CATEGORY)
-_evas_engine_${COMP}_CATEGORY=	${_EFL_EVAS_CATEGORY}
-. endif
-. if !defined(_evas_engine_${COMP}_PORTNAME)
-_evas_engine_${COMP}_PORTNAME=	evas-engine-${COMP}
-. endif
-. if !defined(_evas_engine_${COMP}_DIR)
-_evas_engine_${COMP}_DIR=	${COMP}
-. endif
-.endfor
-
-.for COMP in ${_EFL_EVAS_LOADERS_ALL}
-. if !defined(_evas_loader_${COMP}_CATEGORY)
-_evas_loader_${COMP}_CATEGORY=	${_EFL_EVAS_CATEGORY}
-. endif
-. if !defined(_evas_loader_${COMP}_PORTNAME)
-_evas_loader_${COMP}_PORTNAME=	evas-loader-${COMP}
-. endif
-. if !defined(_evas_loader_${COMP}_DIR)
-_evas_loader_${COMP}_DIR=	${COMP}
-. endif
-.endfor
-
-#
-# Ecore modules support
-# Values processed:
-# _ecore_COMP_CATEGORY	- Where the port for this object is located
-# _ecore_COMP_PORTNAME	- Object's port subdirectory
-# _ecore_COMP_NAME	- Ecore library name
-#
-
-# All components that are currently supported
-_EFL_ECORE_ALL=	con config desktop evas file imf imf_evas \
-		input input_evas ipc job sdl txt x11
-
-#
-# Generic ecore definitions
-#
-_EFL_ECORE_CATEGORY=	devel
-_EFL_ECORE_MODDIR=	${LOCALBASE}/lib/
-
-#
-# Ecore modules definitions
-#
-
-_ecore_con_CATEGORY=		net
-_ecore_config_CATEGORY=		sysutils
-_ecore_desktop_CATEGORY=	x11
-_ecore_evas_CATEGORY=		graphics
-_ecore_sdl_CATEGORY=		graphics
-_ecore_txt_CATEGORY=		converters
-_ecore_imf_CATEGORY=		x11
-_ecore_imf_evas_CATEGORY=	x11
-_ecore_input_CATEGORY=		x11
-_ecore_input_evas_CATEGORY=	x11
-_ecore_x11_CATEGORY=		x11
-_ecore_x11_NAME=		ecore_x
-
-#
-# Assign values for variables which were not defined explicitly
-#
-.for COMP in ${_EFL_ECORE_ALL}
-. if !defined(_ecore_${COMP}_CATEGORY)
-_ecore_${COMP}_CATEGORY=${_EFL_ECORE_CATEGORY}
-. endif
-. if !defined(_ecore_${COMP}_PORTNAME)
-_ecore_${COMP}_PORTNAME=ecore-${COMP}
-. endif
-. if !defined(_ecore_${COMP}_NAME)
-_ecore_${COMP}_NAME=	ecore_${COMP}
-. endif
-.endfor
-
-#
 # Handle WANT_EFL feature
 #
 .if !defined(AFTERPORTMK)
@@ -236,7 +76,6 @@ _ecore_${COMP}_NAME=	ecore_${COMP}
 EFL_Include_pre=	bsd.efl.mk
 
 HAVE_EFL?=
-HAVE_EFL_ECORE?=
 .if defined(WANT_EFL)
 #
 # General EFL components
@@ -246,22 +85,13 @@ HAVE_EFL_ECORE?=
 HAVE_EFL+=	${LIB}
 .  endif
 . endfor
-
-#
-# Ecore components
-#
-. for COMP in ${_EFL_ECORE_ALL}
-.  if exists(${_ecore_PREFIX}/lib/lib${_ecore_${COMP}_NAME}.so.${_ecore_VERSION})
-HAVE_EFL_ECORE+=	${COMP}
-.  endif
-. endfor
 .endif
 
 .endif #EFL_Include_pre
 .endif #AFTERPORTMK
 
 #
-# Handle USE_EFL, USE_EFL_EVAS_* and USE_EFL_ECORE features
+# Handle USE_EFL feature
 #
 .if !defined(BEFOREPORTMK)
 .if !defined(EFL_Include_post)

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Tue Nov 25 02:56:41 2014	(r373392)
+++ head/UPDATING	Tue Nov 25 03:07:22 2014	(r373393)
@@ -5,6 +5,33 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20141125:
+  AFFECTS: users of EFL libraries
+  AUTHOR: gblach at FreeBSD.org
+
+  EFL libraries has been merged into one port. Before installing devel/efl
+  you must deinstall old EFL libraries:
+
+  # pkg delete -f eina eet evas evas-\* ecore\* eio efreet embryo edje \
+      ethumb emotion
+  # make -C /usr/ports/devel/efl install clean
+
+20141125:
+  AFFECTS: users of x11-wm/e17-module*
+  AUTHOR: gblach at FreeBSD.org
+
+  Enlightenment has been updated to 0.19.1. Some of e-modules can't be build
+  with updated Enlightenment, these modules has been marked as broken.
+  E-modules which work with new Enlightenment has been renamed to
+  x11-wm/e-module-*. To update these modules you must call the following
+  commands (substituting the name of module in place *):
+
+  # portmaster -o x11-wm/e-module-* x11-wm/e17-module-*
+  # portmaster -o x11-wm/e-modules x11-wm/e17-modules
+  or
+  # portupgrade -fo x11-wm/e-module-* x11-wm/e17-module-*
+  # portupgrade -fo x11-wm/e-modules x11-wm/e17-modules
+
 20141123:
   AFFECTS: users of security/heimdal
   AUTHOR: hrs at FreeBSD.org

Modified: head/benchmarks/expedite/Makefile
==============================================================================
--- head/benchmarks/expedite/Makefile	Tue Nov 25 02:56:41 2014	(r373392)
+++ head/benchmarks/expedite/Makefile	Tue Nov 25 03:07:22 2014	(r373393)
@@ -2,22 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	expedite
-PORTVERSION=	1.7.9
-PORTREVISION=	1
+PORTVERSION=	1.7.10
 CATEGORIES=	benchmarks enlightenment
-MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		LOCAL/gblach/e17/
+MASTER_SITES=	http://download.enlightenment.org/releases/
 
 MAINTAINER=	gblach at FreeBSD.org
 COMMENT=	Expedite is a benchmark suite for Evas
 
 LICENSE=	BSD2CLAUSE
 
-DIST_SUBDIR=	e17
+LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl
+
+DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
 USES=		tar:bzip2 pkgconfig
-USE_EFL=	evas
-USE_EFL_EVAS_ENGINES=	buffer
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	OPENGL SDL X11
@@ -29,21 +27,18 @@ X11_DESC=	Enable X11 evas engine
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENGL}
-USE_EFL_EVAS_ENGINES+=	opengl
 CONFIGURE_ARGS+=	--enable-opengl-x11
 .else
 CONFIGURE_ARGS+=	--disable-opengl-x11
 .endif
 
 .if ${PORT_OPTIONS:MSDL}
-USE_EFL_EVAS_ENGINES+=	sdl
 CONFIGURE_ARGS+=	--enable-software-sdl
 .else
 CONFIGURE_ARGS+=	--disable-software-sdl
 .endif
 
 .if ${PORT_OPTIONS:MX11}
-USE_EFL_EVAS_ENGINES+=	x11
 CONFIGURE_ARGS+=	--enable-software-x11 --enable-xrender-x11
 .else
 CONFIGURE_ARGS+=	--disable-software-x11 --disable-xrender-x11

Modified: head/benchmarks/expedite/distinfo
==============================================================================
--- head/benchmarks/expedite/distinfo	Tue Nov 25 02:56:41 2014	(r373392)
+++ head/benchmarks/expedite/distinfo	Tue Nov 25 03:07:22 2014	(r373393)
@@ -1,2 +1,2 @@
-SHA256 (e17/expedite-1.7.9.tar.bz2) = 258aaac9ba6eac50c046c6267dad2da79481206b761b225da26094911720b62a
-SIZE (e17/expedite-1.7.9.tar.bz2) = 5736114
+SHA256 (enlightenment/expedite-1.7.10.tar.bz2) = 91d0290ba3635a4440c389647643beaa8e39def2789d685d54a58a723398cc10
+SIZE (enlightenment/expedite-1.7.10.tar.bz2) = 5736765

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Tue Nov 25 02:56:41 2014	(r373392)
+++ head/devel/Makefile	Tue Nov 25 03:07:22 2014	(r373393)
@@ -382,17 +382,11 @@
     SUBDIR += ebnf2yacc
     SUBDIR += ecb
     SUBDIR += ecgi
-    SUBDIR += ecore
-    SUBDIR += ecore-file
-    SUBDIR += ecore-ipc
-    SUBDIR += ecore-main
     SUBDIR += edb
-    SUBDIR += eet
+    SUBDIR += efl
     SUBDIR += eggdbus
     SUBDIR += egypt
     SUBDIR += eiffelstudio
-    SUBDIR += eina
-    SUBDIR += eio
     SUBDIR += elf
     SUBDIR += elfio
     SUBDIR += elfkickers

Modified: head/devel/e_dbus/Makefile
==============================================================================
--- head/devel/e_dbus/Makefile	Tue Nov 25 02:56:41 2014	(r373392)
+++ head/devel/e_dbus/Makefile	Tue Nov 25 03:07:22 2014	(r373393)
@@ -2,32 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	e_dbus
-PORTVERSION=	1.7.9
-PORTREVISION=	1
+PORTVERSION=	1.7.10
 PORTEPOCH=	1
 CATEGORIES=	devel enlightenment
-MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		LOCAL/gblach/e17/
+MASTER_SITES=	http://download.enlightenment.org/releases/
 
 MAINTAINER=	gblach at FreeBSD.org
 COMMENT=	EFL DBUS connectivity library
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
-LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	libefl.so:${PORTSDIR}/devel/efl \
+		libdbus-1.so:${PORTSDIR}/devel/dbus
 
-DIST_SUBDIR=	e17
+DIST_SUBDIR=	enlightenment
 GNU_CONFIGURE=	yes
-USES=		pathfix pkgconfig tar:bzip2
-USE_EFL=	eina evas ecore libtool_hack librt_hack
-USE_EFL_ECORE=	evas
+USES=		libtool pathfix pkgconfig tar:bzip2
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
-CONFIGURE_ARGS=	--enable-ehal \
-		--enable-eukit \
-		--enable-enotify \
-		--disable-econnman0_7x \
-		--disable-eofono \
-		--disable-ebluez
+CONFIGURE_ARGS=	--enable-ehal --disable-enotify --disable-eukit \
+		--disable-econnman0_7x --disable-eofono --disable-ebluez \
+		--disable-edbus-test --disable-edbus-test-client \
+		--disable-edbus-async-test --disable-static
 
 .include <bsd.port.mk>

Modified: head/devel/e_dbus/distinfo
==============================================================================
--- head/devel/e_dbus/distinfo	Tue Nov 25 02:56:41 2014	(r373392)
+++ head/devel/e_dbus/distinfo	Tue Nov 25 03:07:22 2014	(r373393)
@@ -1,2 +1,2 @@
-SHA256 (e17/e_dbus-1.7.9.tar.bz2) = c6d9ce7bf75a70cc777473c61837e676c978a6280be2cb925c4090d17cd89678
-SIZE (e17/e_dbus-1.7.9.tar.bz2) = 438685
+SHA256 (enlightenment/e_dbus-1.7.10.tar.bz2) = b93f778a4bf50ce044b4798e08a03f62e9b890c47305f9d5839989481f38ddd4
+SIZE (enlightenment/e_dbus-1.7.10.tar.bz2) = 439191

Modified: head/devel/e_dbus/pkg-plist
==============================================================================
--- head/devel/e_dbus/pkg-plist	Tue Nov 25 02:56:41 2014	(r373392)
+++ head/devel/e_dbus/pkg-plist	Tue Nov 25 03:07:22 2014	(r373393)
@@ -1,26 +1,10 @@
-bin/e-notify-send
-bin/e_dbus_async_client_test
-bin/e_dbus_async_server_test
-bin/e_dbus_notification_daemon
-bin/e_dbus_notify
-bin/e_dbus_test
-bin/e_dbus_test_client
-bin/e_dbus_ukit_test
 include/e_dbus-1/E_DBus.h
 include/e_dbus-1/E_Hal.h
-include/e_dbus-1/E_Notification_Daemon.h
-include/e_dbus-1/E_Notify.h
-include/e_dbus-1/E_Ukit.h
 lib/libedbus.so
-lib/libedbus.so.8
+lib/libedbus.so.1
+lib/libedbus.so.1.7.10
 lib/libehal.so
-lib/libehal.so.8
-lib/libenotify.so
-lib/libenotify.so.8
-lib/libeukit.so
-lib/libeukit.so.8
+lib/libehal.so.1
+lib/libehal.so.1.7.10
 libdata/pkgconfig/edbus.pc
 libdata/pkgconfig/ehal.pc
-libdata/pkgconfig/enotify.pc
-libdata/pkgconfig/eukit.pc
-%%DATADIR%%/logo.png

Added: head/devel/efl/Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/efl/Makefile	Tue Nov 25 03:07:22 2014	(r373393)
@@ -0,0 +1,148 @@
+# Created by: Grzegorz Blach <gblach at FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	efl
+PORTVERSION=	1.12.0
+CATEGORIES=	devel enlightenment
+MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
+
+MAINTAINER=	gblach at FreeBSD.org
+COMMENT=	Enlightenment Foundation Libraries
+
+LICENSE=	BSD2CLAUSE LGPL21
+LICENSE_COMB=	multi
+
+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
+		libgif.so:${PORTSDIR}/graphics/giflib \
+		libpng.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
+		libdbus-1.so:${PORTSDIR}/devel/dbus \
+		libluajit-5.1.so:${PORTSDIR}/lang/luajit \
+		libsndfile.so:${PORTSDIR}/audio/libsndfile
+
+DIST_SUBDIR=	enlightenment
+USE_AUTOTOOLS=	automake aclocal autoconf
+GNU_CONFIGURE=	yes
+USES=		compiler:c++11-lib gmake libtool pathfix pkgconfig shared-mime-info tar:xz
+USE_XORG=	x11 xcursor xcomposite xdamage xext xinerama xp xrandr xtst xscrnsaver
+USE_LDCONFIG=	yes
+
+CONFIGURE_ARGS=	--with-profile=release \
+		--enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-aba
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+PLIST_SUB=	BRANCHVERSION=${PORTVERSION:R} PORTVERSION=${PORTVERSION}
+
+OPTIONS_DEFINE=		AVAHI FRIBIDI HARFBUZZ PHYSICS PULSEAUDIO SSL
+OPTIONS_GROUP=		ENGINE EMOTION INPUT LOADER
+OPTIONS_GROUP_ENGINE=	OPENGL SDL
+OPTIONS_GROUP_EMOTION=	GSTREAMER LIBXINE V4L
+OPTIONS_GROUP_INPUT=	IBUS SCIM
+OPTIONS_GROUP_LOADER=	OPENJPEG WEBP
+OPTIONS_DEFAULT=	FRIBIDI HARFBUZZ PHYSICS SSL OPENGL GSTREAMER
+OPTIONS_SUB=		yes
+
+HARFBUZZ_DESC=		OpenType text shaping engine
+PHYSICS_DESC=		Physics effects
+IBUS_DESC=		Intelligent Input Bus
+SCIM_DESC=		Smart Common Input Method
+
+AVAHI_LIB_DEPENDS=		libavahi-client.so:${PORTSDIR}/net/avahi-app
+AVAHI_CONFIGURE_ENABLE=		avahi
+
+FRIBIDI_LIB_DEPENDS=		libfribidi.so:${PORTSDIR}/converters/fribidi
+FRIBIDI_CONFIGURE_ENABLE=	fribidi
+
+HARFBUZZ_LIB_DEPENDS=		libharfbuzz.so:${PORTSDIR}/print/harfbuzz
+HARFBUZZ_CONFIGURE_ENABLE=	harfbuzz
+
+PULSEAUDIO_LIB_DEPENDS=		libpulse.so:${PORTSDIR}/audio/pulseaudio
+PULSEAUDIO_CONFIGURE_ENABLE=	pulseaudio
+
+PHYSICS_LIB_DEPENDS=		libBulletDynamics.so:${PORTSDIR}/devel/bullet
+PHYSICS_CONFIGURE_ENABLE=	physics
+
+OPENGL_USE=			GL=gl
+
+SLD_USE=			SLD=sdl
+SLD_CONFIGURE_ENABLE=		sdl
+
+GSTREAMER_USE=			GSTREAMER1=core
+GSTREAMER_CONFIGURE_ENABLE=	gstreamer1
+
+LIBXINE_LIB_DEPENDS=		libxine.so:${PORTSDIR}/multimedia/libxine
+LIBXINE_CONFIGURE_ENABLE=	xine
+
+V4L_BUILD_DEPENDS=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+V4L_CONFIGURE_ENABLE=		v4l2
+
+IBUS_LIB_DEPENDS=		libibus-1.0.so:${PORTSDIR}/textproc/ibus
+
+SCIM_LIB_DEPENDS=		libscim-1.0.so:${PORTSDIR}/textproc/scim
+SCIM_CONFIGURE_ENABLE=		scim
+
+OPENJPEG_LIB_DEPENDS=		libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+OPENJPEG_CONFIGURE_ENABLE=	image-loader-jp2k
+
+WEBP_LIB_DEPENDS=		libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_CONFIGURE_ENABLE=		image-loader-webp
+
+DOCS_BUILD_DEPENDS=		doxygen:${PORTSDIR}/devel/doxygen
+DOCS_CONFIGURE_ENABLE=		doc
+
+NLS_USES=			gettext
+NLS_CONFIGURE_ENABLE=		nls
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSSL}
+USE_OPENSSL=			yes
+WITH_OPENSSL_PORT=		yes
+.else
+CONFIGURE_ARGS+=		--with-crypto=none
+.endif
+
+.if empty(PORT_OPTIONS:MOPENGL)
+CONFIGURE_ARGS+=		--with-opengl=none
+.endif
+
+.if ${PORT_OPTIONS:MGSTREAMER} || ${PORT_OPTIONS:MLIBXINE} || ${PORT_OPTIONS:MV4L}
+PLIST_SUB+=			EMOTION=""
+.else
+PLIST_SUB+=			EMOTION="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MIBUS}
+CONFIGURE_ARGS+=		--with-glib=yes
+.else
+CONFIGURE_ARGS+=		--disable-ibus --with-glib=no
+.endif
+
+.if ${PORT_OPTIONS:MNLS}
+PLIST_SUB+=			NLS=""
+.else
+PLIST_SUB+=			NLS="@comment "
+.endif
+
+.if ${PORT_OPTIONS:MPULSEAUDIO}
+PLIST_SUB+=			AUDIO=""
+.else
+CONFIGURE_ARGS+=		--disable-audio
+PLIST_SUB+=			AUDIO="@comment "
+.endif
+
+pre-patch:
+	@${REINPLACE_CMD} -e \
+		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+		${WRKSRC}/Makefile.am
+
+post-stage:
+	${RM} -rf ${STAGEDIR}${PREFIX}/share/gdb
+	for i in `${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f`; do \
+	    if ${FILE} $$i | ${GREP} -q "not stripped"; then ${STRIP_CMD} $$i; fi; \
+	done
+
+.include <bsd.port.mk>

Added: head/devel/efl/distinfo
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/efl/distinfo	Tue Nov 25 03:07:22 2014	(r373393)
@@ -0,0 +1,2 @@
+SHA256 (enlightenment/efl-1.12.0.tar.xz) = ec0ff8f7a939b78d6d4aacb8cfb82b733483b35c6a30283ec3993e546a299744
+SIZE (enlightenment/efl-1.12.0.tar.xz) = 39855616

Added: head/devel/efl/files/patch-configure.ac
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/efl/files/patch-configure.ac	Tue Nov 25 03:07:22 2014	(r373393)
@@ -0,0 +1,19 @@
+--- configure.ac.orig	2014-11-10 12:02:43.000000000 +0100
++++ configure.ac	2014-11-20 23:35:26.000000000 +0100
+@@ -407,14 +407,15 @@
+ execinfo.h \
+ mcheck.h \
+ sys/epoll.h \
+-sys/inotify.h \
+ sys/signalfd.h \
+ sys/types.h \
+ sys/param.h \
+ sys/mman.h \
+ netinet/in.h \
++netinet/tcp.h \
+ ])
+ 
++ac_cv_header_sys_inotify_h="no"
+ have_inotify="${ac_cv_header_sys_inotify_h}"
+ AM_CONDITIONAL([HAVE_INOTIFY], [test "x${have_inotify}" = "xyes"])
+ 

Added: head/devel/efl/pkg-descr
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/efl/pkg-descr	Tue Nov 25 03:07:22 2014	(r373393)
@@ -0,0 +1,4 @@
+Enlightenment Foundation Libraries is a set of libraries each providing
+a great deal of functionality.
+
+WWW: http://docs.enlightenment.org/auto/efl/

Added: head/devel/efl/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/efl/pkg-plist	Tue Nov 25 03:07:22 2014	(r373393)
@@ -0,0 +1,799 @@
+bin/ecore_evas_convert
+bin/edje_cc
+bin/edje_codegen
+bin/edje_decc
+bin/edje_external_inspector
+bin/edje_inspector
+bin/edje_pick
+bin/edje_player
+bin/edje_recc
+bin/edje_watch
+bin/eet
+bin/efreetd
+bin/eina-bench-cmp
+bin/eldbus-codegen
+bin/elua
+bin/embryo_cc
+bin/eolian_cxx
+bin/eolian_gen
+bin/ethumb
+bin/ethumbd
+bin/ethumbd_client
+bin/vieet
+include/ecore-1/Ecore.h
+include/ecore-1/Ecore_Common.h
+include/ecore-1/Ecore_Eo.h
+include/ecore-1/Ecore_Getopt.h
+include/ecore-1/Ecore_Legacy.h
+include/ecore-1/ecore_animator.eo.h
+include/ecore-1/ecore_animator.eo.legacy.h
+include/ecore-1/ecore_exe.eo.h
+include/ecore-1/ecore_exe.eo.legacy.h
+include/ecore-1/ecore_idle_enterer.eo.h
+include/ecore-1/ecore_idle_enterer.eo.legacy.h
+include/ecore-1/ecore_idle_exiter.eo.h
+include/ecore-1/ecore_idle_exiter.eo.legacy.h
+include/ecore-1/ecore_idler.eo.h
+include/ecore-1/ecore_idler.eo.legacy.h
+include/ecore-1/ecore_job.eo.h
+include/ecore-1/ecore_job.eo.legacy.h
+include/ecore-1/ecore_mainloop.eo.h
+include/ecore-1/ecore_parent.eo.h
+include/ecore-1/ecore_poller.eo.h
+include/ecore-1/ecore_poller.eo.legacy.h
+include/ecore-1/ecore_timer.eo.h
+include/ecore-1/ecore_timer.eo.legacy.h
+%%AUDIO%%include/ecore-audio-1/Ecore_Audio.h
+%%AUDIO%%include/ecore-audio-1/ecore_audio.eo.h
+%%AUDIO%%include/ecore-audio-1/ecore_audio_in.eo.h
+%%AUDIO%%include/ecore-audio-1/ecore_audio_in_sndfile.eo.h
+%%AUDIO%%include/ecore-audio-1/ecore_audio_in_tone.eo.h
+%%AUDIO%%include/ecore-audio-1/ecore_audio_obj.h
+%%AUDIO%%include/ecore-audio-1/ecore_audio_obj_in.h
+%%AUDIO%%include/ecore-audio-1/ecore_audio_obj_in_sndfile.h
+%%AUDIO%%include/ecore-audio-1/ecore_audio_obj_in_tone.h
+%%AUDIO%%include/ecore-audio-1/ecore_audio_obj_out.h
+%%AUDIO%%include/ecore-audio-1/ecore_audio_obj_out_sndfile.h
+%%AUDIO%%include/ecore-audio-1/ecore_audio_out.eo.h
+%%PULSEAUDIO%%include/ecore-audio-1/ecore_audio_out_pulse.eo.h
+%%AUDIO%%include/ecore-audio-1/ecore_audio_out_sndfile.eo.h
+%%AUDIO%%include/ecore-audio-1/ecore_audio_protected.h
+%%PULSEAUDIO%%include/ecore-audio-1/ecore_audio_obj_out_pulse.h
+%%AUDIO%%include/ecore-audio-cxx-1/Ecore_Audio.hh
+%%AUDIO%%include/ecore-audio-cxx-1/ecore_audio.eo.hh
+%%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_in.eo.hh
+%%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_in_sndfile.eo.hh
+%%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_in_tone.eo.hh
+%%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_out.eo.hh
+%%PULSEAUDIO%%include/ecore-audio-cxx-1/ecore_audio_out_pulse.eo.hh
+%%AUDIO%%include/ecore-audio-cxx-1/ecore_audio_out_sndfile.eo.hh
+include/ecore-avahi-1/Ecore_Avahi.h
+include/ecore-con-1/Ecore_Con.h
+include/ecore-con-1/Ecore_Con_Eet.h
+include/ecore-con-1/Ecore_Con_Eo.h
+include/ecore-con-1/Ecore_Con_Legacy.h
+include/ecore-con-1/ecore_con_base.eo.h
+include/ecore-con-1/ecore_con_base.eo.legacy.h
+include/ecore-con-1/ecore_con_client.eo.h
+include/ecore-con-1/ecore_con_client.eo.legacy.h
+include/ecore-con-1/ecore_con_connector.eo.h
+include/ecore-con-1/ecore_con_connector.eo.legacy.h
+include/ecore-con-1/ecore_con_server.eo.h
+include/ecore-con-1/ecore_con_server.eo.legacy.h
+include/ecore-con-1/ecore_con_url.eo.h
+include/ecore-con-1/ecore_con_url.eo.legacy.h
+include/ecore-cxx-1/Ecore.eo.hh
+include/ecore-cxx-1/Ecore.hh
+include/ecore-cxx-1/ecore_animator.eo.hh
+include/ecore-cxx-1/ecore_idle_exiter.eo.hh
+include/ecore-cxx-1/ecore_idler.eo.hh
+include/ecore-cxx-1/ecore_job.eo.hh
+include/ecore-cxx-1/ecore_parent.eo.hh
+include/ecore-cxx-1/ecore_poller.eo.hh
+include/ecore-evas-1/Ecore_Evas.h
+include/ecore-evas-1/Ecore_Evas_Types.h
+include/ecore-file-1/Ecore_File.h
+include/ecore-imf-1/Ecore_IMF.h
+include/ecore-imf-evas-1/Ecore_IMF_Evas.h
+include/ecore-input-1/Ecore_Input.h
+include/ecore-input-evas-1/Ecore_Input_Evas.h
+include/ecore-ipc-1/Ecore_Ipc.h
+include/ecore-x-1/Ecore_X.h
+include/ecore-x-1/Ecore_X_Atoms.h
+include/ecore-x-1/Ecore_X_Cursor.h
+include/ecore-x-1/ecore_x_version.h
+%%SDL%%include/ecore-sdl-1/Ecore_Sdl.h
+include/edje-1/Edje.h
+include/edje-1/Edje_Common.h
+include/edje-1/Edje_Edit.h
+include/edje-1/Edje_Eo.h
+include/edje-1/Edje_Legacy.h
+include/edje-1/edje_edit.eo.h
+include/edje-1/edje_edit.eo.legacy.h
+include/edje-1/edje_object.eo.h
+include/edje-1/edje_object.eo.legacy.h
+include/edje-cxx-1/Edje.hh
+include/edje-cxx-1/edje_edit.eo.hh
+include/edje-cxx-1/edje_object.eo.hh
+include/eet-1/Eet.h
+include/eet-cxx-1/Eet.hh
+include/eet-cxx-1/eet-cxx/eet_composite.hh
+include/eet-cxx-1/eet-cxx/eet_register.hh
+include/eet-cxx-1/eet-cxx/eet_type.hh
+include/efl-1/Efl.h
+include/efl-1/Efl_Config.h
+include/efl-1/interfaces/efl_control.eo.h
+include/efl-1/interfaces/efl_file.eo.h
+include/efl-1/interfaces/efl_image.eo.h
+include/efl-1/interfaces/efl_player.eo.h
+include/efl-1/interfaces/efl_text.eo.h
+include/efl-1/interfaces/efl_text_properties.eo.h
+include/efl-cxx-1/Efl.hh
+include/efl-cxx-1/efl_control.eo.hh
+include/efl-cxx-1/efl_file.eo.hh
+include/efl-cxx-1/efl_image.eo.hh
+include/efl-cxx-1/efl_player.eo.hh
+include/efl-cxx-1/efl_text.eo.hh
+include/efl-cxx-1/efl_text_properties.eo.hh
+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
+include/eina-1/Eina.h
+include/eina-1/eina/eina_accessor.h
+include/eina-1/eina/eina_alloca.h
+include/eina-1/eina/eina_array.h
+include/eina-1/eina/eina_benchmark.h
+include/eina-1/eina/eina_binbuf.h
+include/eina-1/eina/eina_binshare.h
+include/eina-1/eina/eina_clist.h
+include/eina-1/eina/eina_convert.h
+include/eina-1/eina/eina_counter.h
+include/eina-1/eina/eina_cow.h
+include/eina-1/eina/eina_cpu.h
+include/eina-1/eina/eina_error.h
+include/eina-1/eina/eina_file.h
+include/eina-1/eina/eina_fp.h
+include/eina-1/eina/eina_hamster.h
+include/eina-1/eina/eina_hash.h
+include/eina-1/eina/eina_inarray.h
+include/eina-1/eina/eina_inline_array.x
+include/eina-1/eina/eina_inline_clist.x
+include/eina-1/eina/eina_inline_cpu.x
+include/eina-1/eina/eina_inline_f16p16.x
+include/eina-1/eina/eina_inline_f32p32.x
+include/eina-1/eina/eina_inline_f8p24.x
+include/eina-1/eina/eina_inline_fp.x
+include/eina-1/eina/eina_inline_hash.x
+include/eina-1/eina/eina_inline_inlist.x
+include/eina-1/eina/eina_inline_list.x
+include/eina-1/eina/eina_inline_lock_barrier.x
+include/eina-1/eina/eina_inline_lock_posix.x
+include/eina-1/eina/eina_inline_log.x
+include/eina-1/eina/eina_inline_mempool.x
+include/eina-1/eina/eina_inline_rbtree.x
+include/eina-1/eina/eina_inline_rectangle.x
+include/eina-1/eina/eina_inline_str.x
+include/eina-1/eina/eina_inline_stringshare.x
+include/eina-1/eina/eina_inline_tiler.x
+include/eina-1/eina/eina_inline_trash.x
+include/eina-1/eina/eina_inline_unicode.x
+include/eina-1/eina/eina_inline_ustringshare.x
+include/eina-1/eina/eina_inline_value.x
+include/eina-1/eina/eina_inline_value_util.x
+include/eina-1/eina/eina_inlist.h
+include/eina-1/eina/eina_iterator.h
+include/eina-1/eina/eina_lalloc.h
+include/eina-1/eina/eina_list.h
+include/eina-1/eina/eina_lock.h
+include/eina-1/eina/eina_log.h
+include/eina-1/eina/eina_magic.h
+include/eina-1/eina/eina_main.h
+include/eina-1/eina/eina_matrixsparse.h
+include/eina-1/eina/eina_mempool.h
+include/eina-1/eina/eina_mmap.h
+include/eina-1/eina/eina_module.h
+include/eina-1/eina/eina_prefix.h
+include/eina-1/eina/eina_quadtree.h
+include/eina-1/eina/eina_rbtree.h
+include/eina-1/eina/eina_rectangle.h
+include/eina-1/eina/eina_refcount.h
+include/eina-1/eina/eina_safety_checks.h
+include/eina-1/eina/eina_sched.h
+include/eina-1/eina/eina_simple_xml_parser.h
+include/eina-1/eina/eina_str.h
+include/eina-1/eina/eina_strbuf.h
+include/eina-1/eina/eina_stringshare.h
+include/eina-1/eina/eina_thread.h
+include/eina-1/eina/eina_thread_queue.h
+include/eina-1/eina/eina_tiler.h
+include/eina-1/eina/eina_tmpstr.h
+include/eina-1/eina/eina_trash.h
+include/eina-1/eina/eina_types.h
+include/eina-1/eina/eina_unicode.h
+include/eina-1/eina/eina_ustrbuf.h
+include/eina-1/eina/eina_ustringshare.h
+include/eina-1/eina/eina_value.h
+include/eina-1/eina/eina_value_util.h
+include/eina-1/eina/eina_xattr.h
+include/eina-1/eina_config.h
+include/eina-cxx-1/Eina.hh
+include/eina-cxx-1/eina-cxx/eina_accessor.hh
+include/eina-cxx-1/eina-cxx/eina_array.hh
+include/eina-cxx-1/eina-cxx/eina_clone_allocators.hh
+include/eina-cxx-1/eina-cxx/eina_eo_base_fwd.hh
+include/eina-cxx-1/eina-cxx/eina_error.hh
+include/eina-cxx-1/eina-cxx/eina_fold.hh
+include/eina-cxx-1/eina-cxx/eina_inarray.hh
+include/eina-cxx-1/eina-cxx/eina_inlist.hh
+include/eina-cxx-1/eina-cxx/eina_integer_sequence.hh
+include/eina-cxx-1/eina-cxx/eina_iterator.hh
+include/eina-cxx-1/eina-cxx/eina_list.hh
+include/eina-cxx-1/eina-cxx/eina_lists_auxiliary.hh
+include/eina-cxx-1/eina-cxx/eina_log.hh
+include/eina-cxx-1/eina-cxx/eina_optional.hh
+include/eina-cxx-1/eina-cxx/eina_ptrarray.hh
+include/eina-cxx-1/eina-cxx/eina_ptrlist.hh
+include/eina-cxx-1/eina-cxx/eina_range_types.hh
+include/eina-cxx-1/eina-cxx/eina_ref.hh
+include/eina-cxx-1/eina-cxx/eina_stringshare.hh
+include/eina-cxx-1/eina-cxx/eina_thread.hh
+include/eina-cxx-1/eina-cxx/eina_throw.hh
+include/eina-cxx-1/eina-cxx/eina_tuple.hh
+include/eina-cxx-1/eina-cxx/eina_tuple_unwrap.hh
+include/eina-cxx-1/eina-cxx/eina_type_traits.hh
+include/eina-cxx-1/eina-cxx/eina_value.hh
+include/eio-1/Eio.h
+include/eio-1/eio_inline_helper.x
+include/eldbus-1/Eldbus.h
+include/eldbus-1/eldbus_connection.h
+include/eldbus-1/eldbus_freedesktop.h
+include/eldbus-1/eldbus_message.h
+include/eldbus-1/eldbus_message_eina_value.h
+include/eldbus-1/eldbus_message_helper.h
+include/eldbus-1/eldbus_object.h
+include/eldbus-1/eldbus_pending.h
+include/eldbus-1/eldbus_proxy.h
+include/eldbus-1/eldbus_service.h
+include/eldbus-1/eldbus_signal_handler.h
+include/eldbus_cxx-1/Eldbus.hh
+include/eldbus_cxx-1/eldbus_basic.hh
+include/eldbus_cxx-1/eldbus_error.hh
+include/eldbus_cxx-1/eldbus_freedesktop.hh
+include/eldbus_cxx-1/eldbus_integer_sequence.hh
+include/eldbus_cxx-1/eldbus_message.hh
+include/eldbus_cxx-1/eldbus_message_arguments.hh
+include/eldbus_cxx-1/eldbus_proxy_call.hh
+include/eldbus_cxx-1/eldbus_raw_tuple.hh
+include/eldbus_cxx-1/eldbus_service.hh
+include/eldbus_cxx-1/eldbus_signature_traits.hh
+include/embryo-1/Embryo.h
+include/emotion-1/Emotion.h
+include/emotion-1/Emotion_Eo.h
+include/emotion-1/Emotion_Generic_Plugin.h
+include/emotion-1/Emotion_Legacy.h
+include/emotion-1/emotion_object.eo.h
+include/emotion-1/emotion_object.eo.legacy.h
+include/eo-1/Eo.h
+include/eo-1/eo_abstract_class.eo.h
+include/eo-1/eo_base.eo.h
+include/eo-cxx-1/Eo.hh
+include/eo-cxx-1/eo_base.hh
+include/eo-cxx-1/eo_cxx_interop.hh
+include/eo-cxx-1/eo_event.hh
+include/eo-cxx-1/eo_inherit.hh
+include/eo-cxx-1/eo_inherit_bindings.hh
+include/eo-cxx-1/eo_init.hh
+include/eo-cxx-1/eo_ops.hh
+include/eo-cxx-1/eo_private.hh
+include/eo-cxx-1/eo_wref.hh
+include/eolian-1/Eolian.h
+include/eolian-cxx-1/Eolian_Cxx.hh
+include/eolian-cxx-1/eo_generate.hh
+include/eolian-cxx-1/eo_types.hh
+include/eolian-cxx-1/eo_validate.hh
+include/eolian-cxx-1/grammar/comment.hh
+include/eolian-cxx-1/grammar/eo_class_constructors_generator.hh
+include/eolian-cxx-1/grammar/eo_class_events_generator.hh
+include/eolian-cxx-1/grammar/eo_class_functions_generator.hh
+include/eolian-cxx-1/grammar/eo_class_generator.hh
+include/eolian-cxx-1/grammar/eo_header_generator.hh
+include/eolian-cxx-1/grammar/inheritance_base_generator.hh
+include/eolian-cxx-1/grammar/parameters_generator.hh
+include/eolian-cxx-1/grammar/tab.hh
+include/eolian-cxx-1/grammar/type_generator.hh
+%%PHYSICS%%include/ephysics-1/EPhysics.h
+include/ethumb-1/Ethumb.h
+include/ethumb-client-1/Ethumb_Client.h
+include/evas-1/Evas.h
+include/evas-1/Evas_Common.h
+include/evas-1/Evas_Engine_Buffer.h
+include/evas-1/Evas_Engine_Software_X11.h
+include/evas-1/Evas_Eo.h
+include/evas-1/Evas_GL.h
+include/evas-1/Evas_Legacy.h
+include/evas-1/Evas_Loader.h
+%%OPENGL%%include/evas-1/Evas_Engine_GL_X11.h
+%%OPENGL%%%%SDL%%include/evas-1/Evas_Engine_GL_SDL.h
+include/evas-1/canvas/evas_canvas.eo.h
+include/evas-1/canvas/evas_canvas.eo.legacy.h
+include/evas-1/canvas/evas_3d_camera.eo.h
+include/evas-1/canvas/evas_3d_camera.eo.legacy.h

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
