svn commit: r309405 - in head: Mk benchmarks/expedite devel/e_dbus devel/ecore devel/ecore-file devel/ecore-ipc devel/ecore-main devel/eet devel/eina devel/eio graphics graphics/ecore-evas graphics...

Grzegorz Blach gblach at FreeBSD.org
Sat Dec 22 20:55:07 UTC 2012 

Author: gblach
Date: Sat Dec 22 20:54:59 2012
New Revision: 309405
URL: http://svnweb.freebsd.org/changeset/ports/309405

Log:
  - Update Enlightenment to 0.17.0
  - Update EFL to 1.7.4
  - Convert to OptionsNG
  
  Approved by:	crees (mentor)

Added:
  head/graphics/ender/
  head/graphics/ender/Makefile   (contents, props changed)
  head/graphics/ender/distinfo   (contents, props changed)
  head/graphics/ender/pkg-descr   (contents, props changed)
  head/graphics/ender/pkg-plist   (contents, props changed)
  head/graphics/enesim/
  head/graphics/enesim/Makefile   (contents, props changed)
  head/graphics/enesim/distinfo   (contents, props changed)
  head/graphics/enesim/pkg-descr   (contents, props changed)
  head/graphics/enesim/pkg-plist   (contents, props changed)
  head/graphics/etch/
  head/graphics/etch/Makefile   (contents, props changed)
  head/graphics/etch/distinfo   (contents, props changed)
  head/graphics/etch/pkg-descr   (contents, props changed)
  head/graphics/etch/pkg-plist   (contents, props changed)
  head/lang/embryo/files/extra-patch-src-lib-embryo_float.c   (contents, props changed)
  head/www/egueb/
  head/www/egueb/Makefile   (contents, props changed)
  head/www/egueb/distinfo   (contents, props changed)
  head/www/egueb/pkg-descr   (contents, props changed)
  head/www/egueb/pkg-plist   (contents, props changed)
  head/x11-wm/e17-module-eektool/
  head/x11-wm/e17-module-eektool/Makefile   (contents, props changed)
  head/x11-wm/e17-module-eektool/distinfo   (contents, props changed)
  head/x11-wm/e17-module-eektool/pkg-descr   (contents, props changed)
  head/x11-wm/e17-module-eektool/pkg-plist   (contents, props changed)
  head/x11-wm/e17-module-mem/files/
  head/x11-wm/e17-module-mem/files/patch-src-e_mod_main.c   (contents, props changed)
  head/x11-wm/e17-module-mem/files/patch-src-machdep_freebsd.c   (contents, props changed)
  head/x11-wm/e17-module-rmb/
  head/x11-wm/e17-module-rmb/Makefile   (contents, props changed)
  head/x11-wm/e17-module-rmb/distinfo   (contents, props changed)
  head/x11-wm/e17-module-rmb/pkg-descr   (contents, props changed)
  head/x11-wm/e17-module-rmb/pkg-plist   (contents, props changed)
  head/x11-wm/enlightenment/files/patch-data-etc-sysactions.conf.in   (contents, props changed)
  head/x11/terminology/
  head/x11/terminology/Makefile   (contents, props changed)
  head/x11/terminology/distinfo   (contents, props changed)
  head/x11/terminology/pkg-descr   (contents, props changed)
  head/x11/terminology/pkg-plist   (contents, props changed)
Modified:
  head/Mk/bsd.efl.mk
  head/benchmarks/expedite/Makefile
  head/benchmarks/expedite/distinfo
  head/devel/e_dbus/Makefile
  head/devel/e_dbus/distinfo
  head/devel/e_dbus/pkg-plist
  head/devel/ecore-file/Makefile
  head/devel/ecore-file/distinfo
  head/devel/ecore-file/pkg-plist
  head/devel/ecore-ipc/Makefile
  head/devel/ecore-ipc/distinfo
  head/devel/ecore-ipc/pkg-plist
  head/devel/ecore-main/Makefile
  head/devel/ecore-main/Makefile.inc
  head/devel/ecore-main/distinfo
  head/devel/ecore-main/pkg-plist
  head/devel/ecore/Makefile
  head/devel/eet/Makefile
  head/devel/eet/distinfo
  head/devel/eet/pkg-plist
  head/devel/eina/Makefile
  head/devel/eina/distinfo
  head/devel/eina/pkg-plist
  head/devel/eio/Makefile
  head/devel/eio/distinfo
  head/devel/eio/pkg-plist
  head/graphics/Makefile
  head/graphics/ecore-evas/Makefile
  head/graphics/ecore-evas/distinfo
  head/graphics/ecore-evas/pkg-plist
  head/graphics/ecore-sdl/Makefile
  head/graphics/ecore-sdl/distinfo
  head/graphics/ecore-sdl/pkg-plist
  head/graphics/edje/Makefile
  head/graphics/edje/distinfo
  head/graphics/edje/pkg-plist
  head/graphics/edje_viewer/Makefile
  head/graphics/edje_viewer/distinfo
  head/graphics/ethumb/Makefile
  head/graphics/ethumb/distinfo
  head/graphics/ethumb/pkg-plist
  head/graphics/evas-core/Makefile
  head/graphics/evas-core/Makefile.inc
  head/graphics/evas-core/distinfo
  head/graphics/evas-core/pkg-plist
  head/graphics/evas-engine-buffer/Makefile
  head/graphics/evas-engine-buffer/distinfo
  head/graphics/evas-engine-opengl/Makefile
  head/graphics/evas-engine-opengl/distinfo
  head/graphics/evas-engine-sdl/Makefile
  head/graphics/evas-engine-sdl/distinfo
  head/graphics/evas-engine-sdl/pkg-plist
  head/graphics/evas-engine-x11/Makefile
  head/graphics/evas-engine-x11/distinfo
  head/graphics/evas-loader-bmp/Makefile
  head/graphics/evas-loader-bmp/distinfo
  head/graphics/evas-loader-eet/Makefile
  head/graphics/evas-loader-eet/distinfo
  head/graphics/evas-loader-generic/Makefile
  head/graphics/evas-loader-generic/distinfo
  head/graphics/evas-loader-gif/Makefile
  head/graphics/evas-loader-gif/distinfo
  head/graphics/evas-loader-ico/Makefile
  head/graphics/evas-loader-ico/distinfo
  head/graphics/evas-loader-jpeg/Makefile
  head/graphics/evas-loader-jpeg/distinfo
  head/graphics/evas-loader-pmaps/Makefile
  head/graphics/evas-loader-pmaps/distinfo
  head/graphics/evas-loader-png/Makefile
  head/graphics/evas-loader-png/distinfo
  head/graphics/evas-loader-psd/Makefile
  head/graphics/evas-loader-psd/distinfo
  head/graphics/evas-loader-svg/Makefile
  head/graphics/evas-loader-svg/distinfo
  head/graphics/evas-loader-tga/Makefile
  head/graphics/evas-loader-tga/distinfo
  head/graphics/evas-loader-tiff/Makefile
  head/graphics/evas-loader-tiff/distinfo
  head/graphics/evas-loader-wbmp/Makefile
  head/graphics/evas-loader-wbmp/distinfo
  head/graphics/evas-loader-xpm/Makefile
  head/graphics/evas-loader-xpm/distinfo
  head/graphics/evas/Makefile
  head/graphics/evas_generic_loaders-gst/Makefile
  head/graphics/evas_generic_loaders-gst/distinfo
  head/graphics/evas_generic_loaders-gst/pkg-plist
  head/graphics/evas_generic_loaders-pdf/Makefile
  head/graphics/evas_generic_loaders-pdf/distinfo
  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-xcf/Makefile
  head/graphics/evas_generic_loaders-xcf/distinfo
  head/lang/embryo/Makefile
  head/lang/embryo/distinfo
  head/lang/embryo/pkg-plist
  head/multimedia/emotion/Makefile
  head/multimedia/emotion/distinfo
  head/multimedia/emotion/pkg-plist
  head/net/ecore-con/Makefile
  head/net/ecore-con/distinfo
  head/net/ecore-con/pkg-plist
  head/sysutils/empower/Makefile
  head/www/Makefile
  head/x11-toolkits/elementary/Makefile
  head/x11-toolkits/elementary/distinfo
  head/x11-toolkits/elementary/pkg-plist
  head/x11-wm/Makefile
  head/x11-wm/e17-module-alarm/Makefile
  head/x11-wm/e17-module-alarm/distinfo
  head/x11-wm/e17-module-calendar/Makefile
  head/x11-wm/e17-module-comp-scale/Makefile
  head/x11-wm/e17-module-comp-scale/distinfo
  head/x11-wm/e17-module-cpu/Makefile
  head/x11-wm/e17-module-cpu/distinfo
  head/x11-wm/e17-module-deskshow/Makefile
  head/x11-wm/e17-module-deskshow/distinfo
  head/x11-wm/e17-module-diskio/Makefile
  head/x11-wm/e17-module-diskio/distinfo
  head/x11-wm/e17-module-drawer/Makefile
  head/x11-wm/e17-module-e-tiling/Makefile
  head/x11-wm/e17-module-elfe/Makefile
  head/x11-wm/e17-module-elfe/distinfo
  head/x11-wm/e17-module-empris/Makefile
  head/x11-wm/e17-module-empris/distinfo
  head/x11-wm/e17-module-engage/Makefile
  head/x11-wm/e17-module-engage/distinfo
  head/x11-wm/e17-module-engage/pkg-plist
  head/x11-wm/e17-module-eooorg/Makefile
  head/x11-wm/e17-module-eooorg/distinfo
  head/x11-wm/e17-module-eooorg/pkg-plist
  head/x11-wm/e17-module-everything-aspell/Makefile
  head/x11-wm/e17-module-everything-aspell/distinfo
  head/x11-wm/e17-module-everything-mpris/Makefile
  head/x11-wm/e17-module-everything-mpris/distinfo
  head/x11-wm/e17-module-everything-mpris/pkg-plist
  head/x11-wm/e17-module-everything-pidgin/Makefile
  head/x11-wm/e17-module-everything-pidgin/distinfo
  head/x11-wm/e17-module-everything-pidgin/pkg-plist
  head/x11-wm/e17-module-everything-places/Makefile
  head/x11-wm/e17-module-everything-places/distinfo
  head/x11-wm/e17-module-everything-places/pkg-plist
  head/x11-wm/e17-module-everything-shotgun/Makefile
  head/x11-wm/e17-module-everything-shotgun/distinfo
  head/x11-wm/e17-module-everything-wallpaper/Makefile
  head/x11-wm/e17-module-everything-wallpaper/distinfo
  head/x11-wm/e17-module-everything-wallpaper/pkg-plist
  head/x11-wm/e17-module-everything-websearch/Makefile
  head/x11-wm/e17-module-everything-websearch/distinfo
  head/x11-wm/e17-module-everything-websearch/pkg-plist
  head/x11-wm/e17-module-exebuf/Makefile
  head/x11-wm/e17-module-exebuf/distinfo
  head/x11-wm/e17-module-execwatch/Makefile
  head/x11-wm/e17-module-execwatch/distinfo
  head/x11-wm/e17-module-flame/Makefile
  head/x11-wm/e17-module-flame/distinfo
  head/x11-wm/e17-module-forecasts/Makefile
  head/x11-wm/e17-module-forecasts/distinfo
  head/x11-wm/e17-module-iiirk/Makefile
  head/x11-wm/e17-module-iiirk/distinfo
  head/x11-wm/e17-module-itask/Makefile
  head/x11-wm/e17-module-itask/distinfo
  head/x11-wm/e17-module-language/Makefile
  head/x11-wm/e17-module-mail/Makefile
  head/x11-wm/e17-module-mail/distinfo
  head/x11-wm/e17-module-mem/Makefile
  head/x11-wm/e17-module-mem/distinfo
  head/x11-wm/e17-module-moon/Makefile
  head/x11-wm/e17-module-moon/distinfo
  head/x11-wm/e17-module-mpdule/Makefile
  head/x11-wm/e17-module-mpdule/distinfo
  head/x11-wm/e17-module-net/Makefile
  head/x11-wm/e17-module-net/distinfo
  head/x11-wm/e17-module-news/Makefile
  head/x11-wm/e17-module-news/distinfo
  head/x11-wm/e17-module-penguins/Makefile
  head/x11-wm/e17-module-penguins/distinfo
  head/x11-wm/e17-module-photo/Makefile
  head/x11-wm/e17-module-photo/distinfo
  head/x11-wm/e17-module-places/Makefile
  head/x11-wm/e17-module-places/distinfo
  head/x11-wm/e17-module-quickaccess/Makefile
  head/x11-wm/e17-module-rain/Makefile
  head/x11-wm/e17-module-rain/distinfo
  head/x11-wm/e17-module-screenshot/Makefile
  head/x11-wm/e17-module-screenshot/distinfo
  head/x11-wm/e17-module-screenshot/pkg-plist
  head/x11-wm/e17-module-slideshow/Makefile
  head/x11-wm/e17-module-slideshow/distinfo
  head/x11-wm/e17-module-snow/Makefile
  head/x11-wm/e17-module-snow/distinfo
  head/x11-wm/e17-module-taskbar/Makefile
  head/x11-wm/e17-module-taskbar/distinfo
  head/x11-wm/e17-module-tclock/Makefile
  head/x11-wm/e17-module-tclock/distinfo
  head/x11-wm/e17-module-tiling/Makefile
  head/x11-wm/e17-module-uptime/Makefile
  head/x11-wm/e17-module-uptime/distinfo
  head/x11-wm/e17-module-weather/Makefile
  head/x11-wm/e17-module-weather/distinfo
  head/x11-wm/e17-module-winlist-ng/Makefile
  head/x11-wm/e17-module-winlist-ng/distinfo
  head/x11-wm/e17-module-winlist-ng/pkg-plist
  head/x11-wm/e17-module-winselector/Makefile
  head/x11-wm/e17-module-winselector/distinfo
  head/x11-wm/e17-module-wlan/Makefile
  head/x11-wm/e17-module-wlan/distinfo
  head/x11-wm/e17-module-xkbswitch/Makefile
  head/x11-wm/e17-modules/Makefile
  head/x11-wm/enlightenment/Makefile
  head/x11-wm/enlightenment/distinfo
  head/x11-wm/enlightenment/pkg-plist
  head/x11/Makefile
  head/x11/ecore-imf/Makefile
  head/x11/ecore-imf/distinfo
  head/x11/ecore-imf/pkg-plist
  head/x11/ecore-imf_evas/Makefile
  head/x11/ecore-imf_evas/distinfo
  head/x11/ecore-imf_evas/pkg-plist
  head/x11/ecore-input/Makefile
  head/x11/ecore-input/distinfo
  head/x11/ecore-input/pkg-plist
  head/x11/ecore-input_evas/Makefile
  head/x11/ecore-input_evas/distinfo
  head/x11/ecore-input_evas/pkg-plist
  head/x11/ecore-x11/Makefile
  head/x11/ecore-x11/distinfo
  head/x11/ecore-x11/pkg-plist
  head/x11/efreet/Makefile
  head/x11/efreet/distinfo
  head/x11/efreet/pkg-plist
  head/x11/emprint/Makefile
  head/x11/emprint/distinfo

Modified: head/Mk/bsd.efl.mk
==============================================================================
--- head/Mk/bsd.efl.mk	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/Mk/bsd.efl.mk	Sat Dec 22 20:54:59 2012	(r309405)
@@ -23,7 +23,7 @@
 # Currently recognized variables are:
 # USE_EFL	- lists all EFL libraries which port depends on
 # WANT_EFL	- the port wants to test which of EFL libraries are installed
-#		  on the target system
+#			on the target system
 #
 # The following variables could be tested after inclusion of bsd.port.pre.mk:
 # HAVE_EFL	- lists all EFL libraries which are available on target system
@@ -36,66 +36,70 @@ EFL_Include_MAINTAINER=	gblach at FreeBSD.o
 #
 # Define all supported libraries
 #
-_USE_EFL_ALL=	ecore edbus edje eet efreet eio eina elementary embryo emotion \
-		epeg evas imlib2
+_USE_EFL_ALL=	ecore edbus edje eet efreet eio eina elementary embryo \
+		emotion ender enesim epeg esvg etch ethumb evas imlib2
 
 # For each library supported we define the following variables:
 #	_%%LIB%%_CATEGORY	- category the port belongs to
-#	_%%LIB%%_DEPENDS	- other EFL libraries the library
-#		itself depends on. We'll define them explicitly
-#		to handle unwanted deinstalls.
 #	_%%LIB%%_PREFIX		- where the library is installed
 #	_%%LIB%%_VERSION	- version of the shared library
 #	_%%LIB%%_SLIB		- name of the shared library
 #
 
 _ecore_CATEGORY=	devel
-_ecore_DEPENDS=		eina
 _ecore_PORTNAME=	ecore-main
-_ecore_VERSION=		2
+_ecore_VERSION=		8
 
 _edbus_CATEGORY=	devel
 _edbus_PORTNAME=	e_dbus
-_edbus_VERSION=		2
+_edbus_VERSION=		8
 
 _eet_CATEGORY=		devel
-_eet_DEPENDS=		eina
-_eet_VERSION=		6
+_eet_VERSION=		8
 
 _efreet_CATEGORY=	x11
-_efreet_DEPENDS=	ecore eina
-_efreet_VERSION=	2
+_efreet_VERSION=	8
 
 _edje_CATEGORY=		graphics
-_edje_DEPENDS=		ecore eet embryo evas
-_edje_VERSION=		2
+_edje_VERSION=		8
 
 _eio_CATEGORY=		devel
-_eio_DEPENDS=		ecore eina
-_eio_VERSION=		1
+_eio_VERSION=		8
 
 _eina_CATEGORY=		devel
-_eina_VERSION=		2
+_eina_VERSION=		8
 
 _elementary_CATEGORY=	x11-toolkits
-_elementary_DEPENDS=	ecore embryo edje
 _elementary_VERSION=	8
 
 _embryo_CATEGORY=	lang
-_embryo_DEPENDS=	eina
-_embryo_VERSION=	2
+_embryo_VERSION=	8
 
 _emotion_CATEGORY=	multimedia
-_emotion_DEPENDS=	ecore edje eet eio embryo evas
-_emotion_VERSION=	2
+_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_DEPENDS=		eina eet
 _evas_PORTNAME=		evas-core
-_evas_VERSION=		2
+_evas_VERSION=		8
 
 _imlib2_CATEGORY=	graphics
 _imlib2_VERSION=	5
@@ -105,9 +109,6 @@ _imlib2_SLIB=		Imlib2
 # Assign values for variables which were not defined explicitly
 #
 .for LIB in ${_USE_EFL_ALL}
-. if !defined(_${LIB}_DEPENDS)
-_${LIB}_DEPENDS=	#empty
-. endif
 . if !defined(_${LIB}_SLIB)
 _${LIB}_SLIB=${LIB}
 . endif
@@ -128,14 +129,15 @@ _${LIB}_PREFIX=${LOCALBASE}
 #
 
 # All components that are currently supported
-_EFL_EVAS_ENGINES_ALL= buffer opengl sdl x11
-_EFL_EVAS_LOADERS_ALL= bmp edb eet gif ico jpeg png pmaps psd svg tga tiff wbmp xpm
+_EFL_EVAS_ENGINES_ALL=	buffer opengl sdl x11
+_EFL_EVAS_LOADERS_ALL=	bmp edb 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_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/
 
@@ -145,7 +147,7 @@ _EFL_EVAS_LOADERS_MODDIR=	${_EFL_EVAS_MO
 
 _evas_engine_buffer_DIR=	buffer
 _evas_engine_opengl_DIR=	gl_x11
-_evas_engine_sdl_DIR=		software_sdl
+_evas_engine_sdl_DIR=		software_16_sdl
 _evas_engine_x11_DIR=		software_x11
 
 #
@@ -184,8 +186,8 @@ _evas_loader_${COMP}_DIR=	${COMP}
 #
 
 # 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
+_EFL_ECORE_ALL=	con config desktop evas file imf imf_evas \
+		input input_evas ipc job sdl txt x11
 
 #
 # Generic ecore definitions
@@ -215,10 +217,10 @@ _ecore_x11_NAME=		ecore_x
 #
 .for COMP in ${_EFL_ECORE_ALL}
 . if !defined(_ecore_${COMP}_CATEGORY)
-_ecore_${COMP}_CATEGORY=	${_EFL_ECORE_CATEGORY}
+_ecore_${COMP}_CATEGORY=${_EFL_ECORE_CATEGORY}
 . endif
 . if !defined(_ecore_${COMP}_PORTNAME)
-_ecore_${COMP}_PORTNAME=	ecore-${COMP}
+_ecore_${COMP}_PORTNAME=ecore-${COMP}
 . endif
 . if !defined(_ecore_${COMP}_NAME)
 _ecore_${COMP}_NAME=	ecore_${COMP}
@@ -368,7 +370,7 @@ _USE_EFL=	#empty
 . if ${_USE_EFL_ALL:M${LIB}}==""
 IGNORE=	cannot install: unknown library ${LIB}
 . else
-_USE_EFL+=	${_${LIB}_DEPENDS} ${LIB}
+_USE_EFL+=	${LIB}
 . endif
 .endfor
 
@@ -405,8 +407,8 @@ PLIST_SUB+=	E17_ARCH=freebsd${OSREL}-${A
 post-patch: efl_drop_librt
 efl_drop_librt:
 	@${REINPLACE_CMD} -E \
-	    -e '/^[[:space:]]+freebsd\*/,/^[[:space:]];;/s/-lrt//g' \
-	    ${WRKSRC}/configure
+		-e '/^[[:space:]]+freebsd\*/,/^[[:space:]];;/s/-lrt//g' \
+		${WRKSRC}/configure
 .endif
 
 .if defined(_USE_EFL_MODARCH_HACK)
@@ -416,9 +418,9 @@ efl_drop_librt:
 post-patch: efl_patch_modarch
 efl_patch_modarch:
 	@${REINPLACE_CMD} -E \
-	    -e 's/(MODULE_ARCH="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
-	    -e 's/(MODULE_EDJE="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
-	    ${WRKSRC}/configure
+		-e 's/(MODULE_ARCH="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
+		-e 's/(MODULE_EDJE="\$$host_os-\$$host_cpu)-[^"]+"/\1"/g' \
+		${WRKSRC}/configure
 .endif
 
 .if defined(_USE_EFL_LIBTOOL_HACK)
@@ -428,7 +430,7 @@ efl_patch_modarch:
 post-configure: efl_drop_la
 efl_drop_la:
 	${REINPLACE_CMD} -E -e \
-	    '/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
+		'/Install the pseudo-library/,/staticlibs=/s,^,#,' ${WRKSRC}/libtool
 .endif
 
 .endif #USE_EFL

Modified: head/benchmarks/expedite/Makefile
==============================================================================
--- head/benchmarks/expedite/Makefile	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/benchmarks/expedite/Makefile	Sat Dec 22 20:54:59 2012	(r309405)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	expedite
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	benchmarks enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 
 MAINTAINER=	gblach at FreeBSD.org
 COMMENT=	Expedite is a benchmark suite for Evas
@@ -20,25 +20,29 @@ USE_EFL_EVAS_ENGINES=	buffer
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 
-OPTIONS=		OPENGL	"Enable OpenGL engine"	on \
-			SDL	"Enable SDL engine"	off \
-			X11	"Enable X11 engine"	on
+OPTIONS_DEFINE=	OPENGL SDL X11
+OPTIONS_DEFAULT=OPENGL X11
+OPENGL_DESC=	Enable OpenGL evas engine
+SDL_DESC=	Enable SDL evas engine
+X11_DESC=	Enable X11 evas engine
 
-.if !defined(WITHOUT_OPENGL)
+.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 !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_EFL_EVAS_ENGINES+=	sdl
 CONFIGURE_ARGS+=	--enable-software-sdl
 .else
 CONFIGURE_ARGS+=	--disable-software-sdl
 .endif
 
-.if !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 USE_EFL_EVAS_ENGINES+=	x11
 CONFIGURE_ARGS+=	--enable-software-x11 --enable-xrender-x11
 .else

Modified: head/benchmarks/expedite/distinfo
==============================================================================
--- head/benchmarks/expedite/distinfo	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/benchmarks/expedite/distinfo	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,2 +1,2 @@
-SHA256 (e17/expedite-1.1.0.tar.bz2) = 47112c44146a91c55bc156b01e710eba9b07109ed09668fd2cdbc558f2db0e8b
-SIZE (e17/expedite-1.1.0.tar.bz2) = 5833503
+SHA256 (e17/expedite-1.7.4.tar.bz2) = 8d547b2cae69045c01765ea5903be17f7174c31133b3309ffc2a9a8409f8c330
+SIZE (e17/expedite-1.7.4.tar.bz2) = 5792836

Modified: head/devel/e_dbus/Makefile
==============================================================================
--- head/devel/e_dbus/Makefile	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/e_dbus/Makefile	Sat Dec 22 20:54:59 2012	(r309405)
@@ -2,18 +2,18 @@
 # $FreeBSD$
 
 PORTNAME=	e_dbus
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 PORTEPOCH=	1
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 
 MAINTAINER=	gblach at FreeBSD.org
 COMMENT=	EFL DBUS connectivity library
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	dbus-1.3:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
@@ -25,9 +25,9 @@ USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS=	--enable-ehal \
 		--enable-eukit \
-		--enable-econnman0_7x \
-		--enable-eofono \
 		--enable-enotify \
-		--disable-ebluez  # Linux specific ??
+		--disable-econnman0_7x \
+		--disable-eofono \
+		--disable-ebluez
 
 .include <bsd.port.mk>

Modified: head/devel/e_dbus/distinfo
==============================================================================
--- head/devel/e_dbus/distinfo	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/e_dbus/distinfo	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,2 +1,2 @@
-SHA256 (e17/e_dbus-1.1.0.tar.bz2) = e3f229ca3f597ab01c89968f6d6e040e977299be19558160a978b9b5377dcb10
-SIZE (e17/e_dbus-1.1.0.tar.bz2) = 404269
+SHA256 (e17/e_dbus-1.7.4.tar.bz2) = c95cd50cbdad1a82bbd993cb6ca431cae8ce918ef38bc1288504da45f5ad733c
+SIZE (e17/e_dbus-1.7.4.tar.bz2) = 440334

Modified: head/devel/e_dbus/pkg-plist
==============================================================================
--- head/devel/e_dbus/pkg-plist	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/e_dbus/pkg-plist	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,37 +1,28 @@
 bin/e-notify-send
-bin/e_dbus_connman0_7x_test
+bin/e_dbus_async_client_test
+bin/e_dbus_async_server_test
 bin/e_dbus_notification_daemon
 bin/e_dbus_notify
-bin/e_dbus_ofono_test
 bin/e_dbus_test
 bin/e_dbus_test_client
 bin/e_dbus_ukit_test
-include/e_dbus-1/connman0_7x/E_Connman.h
 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_Ofono.h
 include/e_dbus-1/E_Ukit.h
-lib/libeconnman0_7x.so
-lib/libeconnman0_7x.so.2
 lib/libedbus.so
-lib/libedbus.so.2
+lib/libedbus.so.8
 lib/libehal.so
-lib/libehal.so.2
+lib/libehal.so.8
 lib/libenotify.so
-lib/libenotify.so.2
-lib/libeofono.so
-lib/libeofono.so.2
+lib/libenotify.so.8
 lib/libeukit.so
-lib/libeukit.so.2
-libdata/pkgconfig/econnman-0.7x.pc
+lib/libeukit.so.8
 libdata/pkgconfig/edbus.pc
 libdata/pkgconfig/ehal.pc
 libdata/pkgconfig/enotify.pc
-libdata/pkgconfig/eofono.pc
 libdata/pkgconfig/eukit.pc
 %%DATADIR%%/logo.png
- at dirrm include/e_dbus-1/connman0_7x
 @dirrm include/e_dbus-1
 @dirrm %%DATADIR%%

Modified: head/devel/ecore-file/Makefile
==============================================================================
--- head/devel/ecore-file/Makefile	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/ecore-file/Makefile	Sat Dec 22 20:54:59 2012	(r309405)
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	file
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	ecore-
-DISTNAME=	ecore-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach at FreeBSD.org
 COMMENT=	Enlightenment core abstraction library (file module)
@@ -25,19 +25,20 @@ INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 .include "../ecore-main/Makefile.inc"
 
-CONFIGURE_ARGS+=	--enable-ecore-file
+CONFIGURE_ARGS+=--enable-ecore-file
 
-OPTIONS=	CURL	"Enable Curl support"	on
+OPTIONS_DEFINE=	CURL
+OPTIONS_DEFAULT=CURL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_CURL)
-USE_EFL_ECORE=		con
-CONFIGURE_ARGS+=	--enable-ecore-con \
-			--enable-curl
-LIB_DEPENDS+=		curl.6:${PORTSDIR}/ftp/curl
+.if ${PORT_OPTIONS:MCURL}
+USE_EFL_ECORE=	con
+CONFIGURE_ARGS+=--enable-ecore-con \
+		--enable-curl
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
 .else
-CONFIGURE_ARGS+=	--disable-curl
+CONFIGURE_ARGS+=--disable-curl
 .endif
 
 post-patch:
@@ -56,4 +57,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ecore-file.pc \
 		${PREFIX}/libdata/pkgconfig/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/ecore-file/distinfo
==============================================================================
--- head/devel/ecore-file/distinfo	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/ecore-file/distinfo	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,2 +1,2 @@
-SHA256 (e17/ecore-1.1.0.tar.bz2) = c701a31941e178babad577ede886a98cf472352e5a73ee4717c0ffdc980152cc
-SIZE (e17/ecore-1.1.0.tar.bz2) = 3217298
+SHA256 (e17/ecore-1.7.4.tar.bz2) = 4fa52dece3cfeeb61c89038391c5c25ff31911a6dd187229f8ddb0a1bd61a03d
+SIZE (e17/ecore-1.7.4.tar.bz2) = 3421866

Modified: head/devel/ecore-file/pkg-plist
==============================================================================
--- head/devel/ecore-file/pkg-plist	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/ecore-file/pkg-plist	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,5 +1,5 @@
 include/ecore-1/Ecore_File.h
 lib/libecore_file.so
-lib/libecore_file.so.2
+lib/libecore_file.so.8
 libdata/pkgconfig/ecore-file.pc
 @dirrmtry include/ecore-1

Modified: head/devel/ecore-ipc/Makefile
==============================================================================
--- head/devel/ecore-ipc/Makefile	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/ecore-ipc/Makefile	Sat Dec 22 20:54:59 2012	(r309405)
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	ipc
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	ecore-
-DISTNAME=	ecore-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach at FreeBSD.org
 COMMENT=	Enlightenment core abstraction library (ipc module)
@@ -24,11 +24,12 @@ USE_LDCONFIG=	yes
 BUILD_WRKSRC=	${WRKSRC}/src/lib/ecore_ipc
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-OPTIONS=	SSL "Enable SSL support" on
+OPTIONS_DEFINE=	SSL
+OPTIONS_DEFAULT=SSL
 
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_SSL)
+.if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ENV=		SSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" SSL_LIBS="-lssl"
 CONFIGURE_ARGS+=	--enable-openssl
 .else

Modified: head/devel/ecore-ipc/distinfo
==============================================================================
--- head/devel/ecore-ipc/distinfo	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/ecore-ipc/distinfo	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,2 +1,2 @@
-SHA256 (e17/ecore-1.1.0.tar.bz2) = c701a31941e178babad577ede886a98cf472352e5a73ee4717c0ffdc980152cc
-SIZE (e17/ecore-1.1.0.tar.bz2) = 3217298
+SHA256 (e17/ecore-1.7.4.tar.bz2) = 4fa52dece3cfeeb61c89038391c5c25ff31911a6dd187229f8ddb0a1bd61a03d
+SIZE (e17/ecore-1.7.4.tar.bz2) = 3421866

Modified: head/devel/ecore-ipc/pkg-plist
==============================================================================
--- head/devel/ecore-ipc/pkg-plist	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/ecore-ipc/pkg-plist	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,5 +1,5 @@
 include/ecore-1/Ecore_Ipc.h
 lib/libecore_ipc.so
-lib/libecore_ipc.so.2
+lib/libecore_ipc.so.8
 libdata/pkgconfig/ecore-ipc.pc
 @dirrmtry include/ecore-1

Modified: head/devel/ecore-main/Makefile
==============================================================================
--- head/devel/ecore-main/Makefile	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/ecore-main/Makefile	Sat Dec 22 20:54:59 2012	(r309405)
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	main
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	ecore-
-DISTNAME=	ecore-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach at FreeBSD.org
 COMMENT=	Enlightenment core abstraction library (main library)
@@ -25,20 +25,21 @@ USE_LDCONFIG=	yes
 EXAMPLESDIR=	${PREFIX}/share/examples/ecore
 
 .include "Makefile.inc"
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
-CONFIGURE_ARGS+=	--enable-nls
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS+=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.if !defined(NOPORTEXAMPLES)
-CONFIGURE_ARGS+=	--enable-install-examples
+.if ${PORT_OPTIONS:MEXAMPLES}
+CONFIGURE_ARGS+=--enable-install-examples
 .else
-CONFIGURE_ARGS+=	--disable-install-examples
+CONFIGURE_ARGS+=--disable-install-examples
 .endif
 
 post-patch:
@@ -46,7 +47,7 @@ post-patch:
 		${WRKSRC}/src/examples/Makefile.in
 
 post-install:
-.if defined(NOPORTEXAMPLES)
+.if empty(PORT_OPTIONS:MEXAMPLES)
 	@${RMDIR} ${EXAMPLESDIR}
 .endif
 

Modified: head/devel/ecore-main/Makefile.inc
==============================================================================
--- head/devel/ecore-main/Makefile.inc	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/ecore-main/Makefile.inc	Sat Dec 22 20:54:59 2012	(r309405)
@@ -15,3 +15,5 @@ CONFIGURE_ARGS=	--disable-ecore-con \
 post-patch: ecore_drop_librt
 ecore_drop_librt:
 	@${REINPLACE_CMD} -E -e 's,(rt_libs=).*,\1,g' ${WRKSRC}/configure
+
+PATCHDIR=	"../../devel/ecore-main/files"

Modified: head/devel/ecore-main/distinfo
==============================================================================
--- head/devel/ecore-main/distinfo	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/ecore-main/distinfo	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,2 +1,2 @@
-SHA256 (e17/ecore-1.1.0.tar.bz2) = c701a31941e178babad577ede886a98cf472352e5a73ee4717c0ffdc980152cc
-SIZE (e17/ecore-1.1.0.tar.bz2) = 3217298
+SHA256 (e17/ecore-1.7.4.tar.bz2) = 4fa52dece3cfeeb61c89038391c5c25ff31911a6dd187229f8ddb0a1bd61a03d
+SIZE (e17/ecore-1.7.4.tar.bz2) = 3421866

Modified: head/devel/ecore-main/pkg-plist
==============================================================================
--- head/devel/ecore-main/pkg-plist	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/ecore-main/pkg-plist	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,7 +1,7 @@
 include/ecore-1/Ecore.h
 include/ecore-1/Ecore_Getopt.h
 lib/libecore.so
-lib/libecore.so.2
+lib/libecore.so.8
 libdata/pkgconfig/ecore.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_animator_example.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_client_bench.c
@@ -21,7 +21,10 @@ libdata/pkgconfig/ecore.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_evas_ews_example.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_evas_object_example.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_evas_window_sizes_example.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_event_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_event_example_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_event_example_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_exe_example.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_exe_example_child.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_fd_handler_example.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_fd_handler_gnutls_example.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ecore_file_download_example.c

Modified: head/devel/ecore/Makefile
==============================================================================
--- head/devel/ecore/Makefile	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/ecore/Makefile	Sat Dec 22 20:54:59 2012	(r309405)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ecore
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 PORTEPOCH=	2
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	# none
@@ -15,33 +15,22 @@ COMMENT=	Enlightenment core abstraction 
 NO_BUILD=	yes
 USE_EFL=	ecore
 
-ECORE_MODULES=	con evas file imf imf_evas input input_evas ipc sdl x11
-ECORE_sdl_off=	yes
+OPTIONS_DEFINE=	CON EVAS FILE IMF IMF_EVAS INPUT INPUT_EVAS IPC SDL X11
+OPTIONS_DEFAULT=CON EVAS FILE IMF IMF_EVAS INPUT INPUT_EVAS IPC X11
 
-.for NODE in ${ECORE_MODULES}
-OPTIONS+=	${NODE:U} "Install ${NODE} ecore module"
-. if !defined(ECORE_${NODE}_off)
-OPTIONS+=	on
-. else
-OPTIONS+=	off
-. endif
+.for NODE in ${OPTIONS_DEFINE}
+${NODE}_DESC=	Install ${NODE:L} module
 .endfor
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.for NODE in ${ECORE_MODULES}
-. if !defined(ECORE_${NODE}_off)
-.  if !defined(WITHOUT_${NODE:U})
-USE_EFL_ECORE+=	${NODE}
+.for NODE in ${OPTIONS_DEFINE}
+.  if ${PORT_OPTIONS:M${NODE}}
+USE_EFL_ECORE+=	${NODE:L}
 .  endif
-. else
-.  if !defined(WITHOUT_${NODE:U})
-USE_EFL_ECORE+=	${NODE}
-.  endif
-. endif
 .endfor
 
 do-install:
 	${DO_NADA}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/eet/Makefile
==============================================================================
--- head/devel/eet/Makefile	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/eet/Makefile	Sat Dec 22 20:54:59 2012	(r309405)
@@ -2,34 +2,36 @@
 # $FreeBSD$
 
 PORTNAME=	eet
-DISTVERSION=	1.5.0
+PORTVERSION=	1.7.4
 PORTEPOCH=	2
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 
 MAINTAINER=	gblach at FreeBSD.org
 COMMENT=	Enlightenment Data Handling Library
 
 LICENSE=	BSD
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_EFL=	eina librt_hack libtool_hack
 USE_GNOME=	gnomehack pkgconfig
-USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
+USE_LDCONFIG=	yes
 
 CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" OPENSSL_LIBS="-lssl"
-CONFIGURE_ARGS=	--disable-gnutls --enable-amalgamation
+CONFIGURE_ARGS=	--disable-gnutls
+
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTEXAMPLES)
-CONFIGURE_ARGS+=	--enable-install-examples
+.if ${PORT_OPTIONS:MEXAMPLES}
+CONFIGURE_ARGS+=--enable-install-examples
 .else
-CONFIGURE_ARGS+=	--disable-install-examples
+CONFIGURE_ARGS+=--disable-install-examples
 .endif
 
 post-patch:
@@ -38,7 +40,7 @@ post-patch:
 
 post-install:
 	@${REINPLACE_CMD} -i '' -e 's/ openssl//' ${PREFIX}/libdata/pkgconfig/eet.pc
-.if defined(NOPORTEXAMPLES)
+.if empty(PORT_OPTIONS:MEXAMPLES)
 	@${RMDIR} ${EXAMPLESDIR}
 .endif
 

Modified: head/devel/eet/distinfo
==============================================================================
--- head/devel/eet/distinfo	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/eet/distinfo	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,2 +1,2 @@
-SHA256 (e17/eet-1.5.0.tar.bz2) = 3a69e4a1b91b3b3d768b2c191624f80511546703dac932088875ca5a590a5d39
-SIZE (e17/eet-1.5.0.tar.bz2) = 518901
+SHA256 (e17/eet-1.7.4.tar.bz2) = 6fce549e89d5828fa70c7d67696932a0b40cf4061d0564eee84b6819f60650ef
+SIZE (e17/eet-1.7.4.tar.bz2) = 575676

Modified: head/devel/eet/pkg-plist
==============================================================================
--- head/devel/eet/pkg-plist	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/eet/pkg-plist	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,7 +1,7 @@
 bin/eet
 include/eet-1/Eet.h
 lib/libeet.so
-lib/libeet.so.6
+lib/libeet.so.8
 libdata/pkgconfig/eet.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eet-basic.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eet-data-cipher_decipher.c

Modified: head/devel/eina/Makefile
==============================================================================
--- head/devel/eina/Makefile	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/eina/Makefile	Sat Dec 22 20:54:59 2012	(r309405)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	eina
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 
 MAINTAINER=	gblach at FreeBSD.org
 COMMENT=	Enlightenment API for data types
@@ -15,17 +15,19 @@ LICENSE=	LGPL21
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack pkgconfig
 USE_EFL=	librt_hack libtool_hack
+USE_GNOME=	gnomehack pkgconfig
 USE_ICONV=	yes
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS=		--enable-amalgamation
+CONFIGURE_ARGS=	--enable-amalgamation
+
+.include <bsd.port.options.mk>
 
-.if !defined(NOPORTEXAMPLES)
-CONFIGURE_ARGS+=	--enable-install-examples
+.if ${PORT_OPTIONS:MEXAMPLES}
+CONFIGURE_ARGS+=--enable-install-examples
 .else
-CONFIGURE_ARGS+=	--disable-install-examples
+CONFIGURE_ARGS+=--disable-install-examples
 .endif
 
 post-patch:
@@ -33,7 +35,7 @@ post-patch:
 		${WRKSRC}/src/examples/Makefile.in
 
 post-install:
-.if defined(NOPORTEXAMPLES)
+.if empty(PORT_OPTIONS:MEXAMPLES)
 	@${RMDIR} ${EXAMPLESDIR}
 .endif
 

Modified: head/devel/eina/distinfo
==============================================================================
--- head/devel/eina/distinfo	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/eina/distinfo	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,2 +1,2 @@
-SHA256 (e17/eina-1.1.0.tar.bz2) = 0c509c8dcef08945d0932ee5ba76e99eb6b5c3035a1b63ff0ce73e21630193c0
-SIZE (e17/eina-1.1.0.tar.bz2) = 9983287
+SHA256 (e17/eina-1.7.4.tar.bz2) = f16da871eabb9e2b34f1fa7d110a9040e07c458bc27ebc7b6b60f43801a78e54
+SIZE (e17/eina-1.7.4.tar.bz2) = 9806158

Modified: head/devel/eina/pkg-plist
==============================================================================
--- head/devel/eina/pkg-plist	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/eina/pkg-plist	Sat Dec 22 20:54:59 2012	(r309405)
@@ -13,7 +13,9 @@ 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_f16p16.x
 include/eina-1/eina/eina_inline_f32p32.x
 include/eina-1/eina/eina_inline_f8p24.x
@@ -30,6 +32,7 @@ include/eina-1/eina/eina_inline_stringsh
 include/eina-1/eina/eina_inline_tiler.x
 include/eina-1/eina/eina_inline_trash.x
 include/eina-1/eina/eina_inline_ustringshare.x
+include/eina-1/eina/eina_inline_value.x
 include/eina-1/eina/eina_inlist.h
 include/eina-1/eina/eina_iterator.h
 include/eina-1/eina/eina_lalloc.h
@@ -59,10 +62,11 @@ 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_xattr.h
 include/eina-1/eina_config.h
 lib/libeina.so
-lib/libeina.so.2
+lib/libeina.so.8
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_accessor_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_array_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_array_02.c
@@ -76,6 +80,8 @@ lib/libeina.so.2
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_06.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_07.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_hash_08.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_inarray_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_inarray_02.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_inlist_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_inlist_02.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_inlist_03.c
@@ -87,9 +93,14 @@ lib/libeina.so.2
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_log_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_log_02.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_log_03.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_simple_xml_parser_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_str_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_strbuf_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_stringshare_01.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_tiler_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_value_01.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_value_02.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/eina_value_03.c
 libdata/pkgconfig/eina.pc
 @dirrm include/eina-1/eina
 @dirrm include/eina-1

Modified: head/devel/eio/Makefile
==============================================================================
--- head/devel/eio/Makefile	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/eio/Makefile	Sat Dec 22 20:54:59 2012	(r309405)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	eio
-DISTVERSION=	0.1.0.65643
+PORTVERSION=	1.7.4
 CATEGORIES=	devel enlightenment
-MASTER_SITES=	http://download.enlightenment.org/snapshots/2011-11-28/ \
-		http://files.roorback.net/e17/base/
+MASTER_SITES=	http://download.enlightenment.org/releases/ \
+		LOCAL/gblach/e17/
 
 MAINTAINER=	gblach at FreeBSD.org
 COMMENT=	Enlightenment Input/Output Library
@@ -15,8 +15,12 @@ LICENSE=	LGPL21
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_EFL=	eina ecore libtool_hack
+USE_EFL=	eina eet ecore libtool_hack
 USE_GNOME=	gnomehack pkgconfig
 USE_LDCONFIG=	yes
 
+post-install:
+	@${RMDIR} ${PREFIX}/share/eio/examples
+	@${RMDIR} ${PREFIX}/share/eio
+
 .include <bsd.port.mk>

Modified: head/devel/eio/distinfo
==============================================================================
--- head/devel/eio/distinfo	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/eio/distinfo	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,2 +1,2 @@
-SHA256 (e17/eio-0.1.0.65643.tar.bz2) = 9352cbf545a66645d07ebdf413b0866b6f13b86e6e0bfed500523427ff6debb7
-SIZE (e17/eio-0.1.0.65643.tar.bz2) = 317461
+SHA256 (e17/eio-1.7.4.tar.bz2) = ec762fdc27779e774b6144d8aaea0127694f43a3dfb9809130429e191c7b4063
+SIZE (e17/eio-1.7.4.tar.bz2) = 355980

Modified: head/devel/eio/pkg-plist
==============================================================================
--- head/devel/eio/pkg-plist	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/devel/eio/pkg-plist	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,6 +1,6 @@
-include/eio-0/Eio.h
-include/eio-0/eio_inline_helper.x
+include/eio-1/Eio.h
+include/eio-1/eio_inline_helper.x
 lib/libeio.so
-lib/libeio.so.1
+lib/libeio.so.8
 libdata/pkgconfig/eio.pc
- at dirrm include/eio-0
+ at dirrm include/eio-1

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/graphics/Makefile	Sat Dec 22 20:54:59 2012	(r309405)
@@ -144,6 +144,8 @@
     SUBDIR += electriceyes
     SUBDIR += electrix
     SUBDIR += enblend
+    SUBDIR += ender
+    SUBDIR += enesim
     SUBDIR += enfle
     SUBDIR += eog
     SUBDIR += eog-plugins
@@ -153,6 +155,7 @@
     SUBDIR += epix
     SUBDIR += eps2png
     SUBDIR += epstool
+    SUBDIR += etch
     SUBDIR += eterm-bg
     SUBDIR += ethumb
     SUBDIR += evas

Modified: head/graphics/ecore-evas/Makefile
==============================================================================
--- head/graphics/ecore-evas/Makefile	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/graphics/ecore-evas/Makefile	Sat Dec 22 20:54:59 2012	(r309405)
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	evas
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/
+		LOCAL/gblach/e17/
 PKGNAMEPREFIX=	ecore-
-DISTNAME=	ecore-${DISTVERSION}
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	gblach at FreeBSD.org
 COMMENT=	Enlightenment core abstraction library (evas module)
@@ -30,14 +30,23 @@ CONFIGURE_ARGS+=	--enable-ecore-evas \
 			--enable-ecore-input \
 			--enable-ecore-input_evas
 
-OPTIONS=	X11	"Enable Evas X11 support"	on \
-		GL	"Enable Evas GL support"	on \
-		BUFFER	"Enable Evas Buffer support"	on \
-		SDL	"Enable Evas SDL support"	off
+OPTIONS_DEFINE=	BUFFER OPENGL SDL X11
+OPTIONS_DEFAULT=BUFFER OPENGL X11
+BUFFER_DESC=	Enable Buffer evas engine
+OPENGL_DESC=	Enable OpenGL evas engine
+SDL_DESC=	Enable SDL evas engine
+X11_DESC=	Enable X11 evas engine
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_GL)
+.if ${PORT_OPTIONS:MBUFFER}
+CONFIGURE_ARGS+=	--enable-ecore-evas-software-buffer
+USE_EFL_EVAS_ENGINES+=	buffer
+.else
+CONFIGURE_ARGS+=	--disable-ecore-evas-software-buffer
+.endif
+
+.if ${PORT_OPTIONS:MOPENGL}
 CONFIGURE_ARGS+=	--enable-ecore-evas-opengl-x11
 USE_EFL_EVAS_ENGINES+=	opengl
 WITH_X=			yes
@@ -45,22 +54,7 @@ WITH_X=			yes
 CONFIGURE_ARGS+=	--disable-ecore-evas-opengl-x11
 .endif
 
-.if !defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--enable-ecore-x
-USE_EFL_ECORE+=		x11
-USE_EFL_EVAS_ENGINES+=	x11
-.else
-CONFIGURE_ARGS+=	--disable-ecore-x
-.endif
-
-.if !defined(WITHOUT_BUFFER)
-CONFIGURE_ARGS+=	--enable-ecore-evas-software-buffer
-USE_EFL_EVAS_ENGINES+=	buffer
-.else
-CONFIGURE_ARGS+=	--disable-ecore-evas-software-buffer
-.endif
-
-.if !defined(WITHOUT_SDL)
+.if ${PORT_OPTIONS:MSDL}
 CONFIGURE_ARGS+=	--enable-ecore-evas-software-sdl --enable-ecore-sdl
 USE_EFL_EVAS_ENGINES+=	sdl
 USE_EFL_ECORE+=	sdl
@@ -68,6 +62,14 @@ USE_EFL_ECORE+=	sdl
 CONFIGURE_ARGS+=	--disable-ecore-evas-software-sdl --disable-ecore-sdl
 .endif
 
+.if ${PORT_OPTIONS:MX11}
+CONFIGURE_ARGS+=	--enable-ecore-x
+USE_EFL_ECORE+=		x11
+USE_EFL_EVAS_ENGINES+=	x11
+.else
+CONFIGURE_ARGS+=	--disable-ecore-x
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -E \
 		-e 's,\$$\(top_builddir\)/src/lib/ecore/\.libs,${LOCALBASE}/lib,'\
@@ -86,4 +88,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/ecore-evas.pc \
 		${PREFIX}/libdata/pkgconfig/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/graphics/ecore-evas/distinfo
==============================================================================
--- head/graphics/ecore-evas/distinfo	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/graphics/ecore-evas/distinfo	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,2 +1,2 @@
-SHA256 (e17/ecore-1.1.0.tar.bz2) = c701a31941e178babad577ede886a98cf472352e5a73ee4717c0ffdc980152cc
-SIZE (e17/ecore-1.1.0.tar.bz2) = 3217298
+SHA256 (e17/ecore-1.7.4.tar.bz2) = 4fa52dece3cfeeb61c89038391c5c25ff31911a6dd187229f8ddb0a1bd61a03d
+SIZE (e17/ecore-1.7.4.tar.bz2) = 3421866

Modified: head/graphics/ecore-evas/pkg-plist
==============================================================================
--- head/graphics/ecore-evas/pkg-plist	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/graphics/ecore-evas/pkg-plist	Sat Dec 22 20:54:59 2012	(r309405)
@@ -1,4 +1,4 @@
 include/ecore-1/Ecore_Evas.h
 lib/libecore_evas.so
-lib/libecore_evas.so.2
+lib/libecore_evas.so.8
 libdata/pkgconfig/ecore-evas.pc

Modified: head/graphics/ecore-sdl/Makefile
==============================================================================
--- head/graphics/ecore-sdl/Makefile	Sat Dec 22 20:41:44 2012	(r309404)
+++ head/graphics/ecore-sdl/Makefile	Sat Dec 22 20:54:59 2012	(r309405)
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	sdl
-DISTVERSION=	1.1.0
+PORTVERSION=	1.7.4
 CATEGORIES=	graphics enlightenment
 MASTER_SITES=	http://download.enlightenment.org/releases/ \
-		http://files.roorback.net/e17/2011-12-02/base/

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

More information about the svn-ports-all mailing list