- Move to LOCALBASE

- Use new EFL framework
- Update all e17 ports to the lates stable cvs snapshot
- Add additional knobs/options to ports makefiles to control the
  feature set
- Add a bunch of new e17 applications/libraries
- Minor improvements/modification.

Approved by:	vanilla (old maintainer), sem (mentor)

3 files changed, 120 insertions, 43 deletions

diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile
index 59e23ddbe899..1d9841281237 100644
--- a/x11/ecore/Makefile
+++ b/x11/ecore/Makefile
@@ -6,27 +6,97 @@
 #
 
 PORTNAME=	ecore
-PORTVERSION=	0.9.9.032
-PORTREVISION=	1
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://enlightenment.freedesktop.org/files/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 
-MAINTAINER=	vanilla@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	A core event abstraction library
 
-LIB_DEPENDS=	evas.1:${PORTSDIR}/graphics/evas
-
-.if !exists(/usr/include/getopt.h)
-USE_GETOPT_LONG=	yes
-.endif
-
-USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
+USE_BZIP2=	yes
 USE_ICONV=	yes
 USE_GNOME=	gnomehack pkgconfig gnometarget
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS+=	--enable-pthreads
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+USE_EFL=	evas
+USE_LDCONFIG=	yes
+USE_GETOPT_LONG=yes
+
+CONFIGURE_ARGS=	--disable-ecore-dfb
+
+OPTIONS=	DBUS		"Enable DBUS support" off \
+		CURL		"Enable Curl support" on \
+		X11		"Enable X11 support" on \
+		EVAS		"Enable evas support" on \
+		EET		"Enable EET configs support" on
+#		OPENSSL		"Enable OpenSSL support" on \
+#		DIRECTFB	"Enable DirectFB support" off \
+
+.include <bsd.port.pre.mk>
+
+.if !defined(WITHOUT_X11)
+CONFIGURE_ARGS+=	--enable-ecore-x
+USE_XLIB=		yes
+PLIST_SUB+=		X11=""
+.else
+CONFIGURE_ARGS+=	--disable-ecore-x
+PLIST_SUB+=		X11="@comment "
+.endif
+
+.if !defined(WITHOUT_EVAS)
+CONFIGURE_ARGS+=	--enable-ecore-evas
+USE_EFL+=		evas
+PLIST_SUB+=		EVAS=""
+.else
+CONFIGURE_ARGS+=	--disable-ecore-evas
+PLIST_SUB+=		EVAS="@comment "
+.endif
+
+.if !defined(WITHOUT_CURL)
+CONFIGURE_ARGS+=	--enable-curl
+LIB_DEPENDS+=		curl.3:${PORTSDIR}/ftp/curl
+PLIST_SUB+=		CURL=""
+.else
+CONFIGURE_ARGS+=	--disable-curl
+PLIST_SUB+=		CURL="@comment "
+.endif
+
+#.if !defined(WITHOUT_OPENSSL)
+#CONFIGURE_ARGS+=	--enable-openssl
+#PLIST_SUB+=		OPENSSL=""
+#USE_OPENSSL=		yes
+#.else
+#CONFIGURE_ARGS+=	--disable-openssl
+#PLIST_SUB+=		OPENSSL="@comment "
+#.endif
+
+.if defined(WITH_DBUS)
+CONFIGURE_ARGS+=	--enable-ecore-dbus
+PLIST_SUB+=		DBUS=""
+LIB_DEPENDS+=		dbus-1.2:${PORTSDIR}/devel/dbus
+.else
+CONFIGURE_ARGS+=	--disable-ecore-dbus
+PLIST_SUB+=		DBUS="@comment "
+.endif
+
+#.if defined(WITH_DIRECTFB)
+#CONFIGURE_ARGS+=	--enable-ecore-dfb
+#PLIST_SUB+=		DIRECTFB=""
+#LIB_DEPENDS+=		directfb-0.9.16:${PORTSDIR}/devel/directfb
+#.else
+#CONFIGURE_ARGS+=	--disable-ecore-dfb
+#PLIST_SUB+=		DIRECTFB="@comment "
+#.endif
+
+.if !defined(WITHOUT_EET)
+CONFIGURE_ARGS+=	--enable-ecore-config
+USE_EFL+=		eet
+PLIST_SUB+=		EET=""
+.else
+CONFIGURE_ARGS+=	--disable-ecore-config
+PLIST_SUB+=		EET="@comment "
+.endif
 
-.include <bsd.port.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11/ecore/distinfo b/x11/ecore/distinfo
index 170182e8d1df..e7e0a4cadff5 100644
--- a/x11/ecore/distinfo
+++ b/x11/ecore/distinfo
@@ -1,3 +1,3 @@
-MD5 (ecore-0.9.9.032.tar.gz) = 275ceadfd5537383dd2f331e02f5ce72
-SHA256 (ecore-0.9.9.032.tar.gz) = cef6a90c1fd0d3d7224b8ca1d7c925fb6cd2520191de9deba10a6af749b41929
-SIZE (ecore-0.9.9.032.tar.gz) = 1209574
+MD5 (ecore-20060926.tar.bz2) = d714613d6c8d51e8c841c65d520e0047
+SHA256 (ecore-20060926.tar.bz2) = eb1f75c70146efa5470faf00d23b4da27dd43b9862fabcd6914c05de9c616e91
+SIZE (ecore-20060926.tar.bz2) = 4162746
diff --git a/x11/ecore/pkg-plist b/x11/ecore/pkg-plist
index bb7ac89e0672..3b4fbcc50e74 100644
--- a/x11/ecore/pkg-plist
+++ b/x11/ecore/pkg-plist
@@ -1,21 +1,24 @@
 bin/ecore-config
-bin/ecore_config
+%%EET%%bin/ecore_config
+bin/ecore_dbus_hal_test
+bin/ecore_dbus_receiver_test
 bin/ecore_dbus_test
-bin/ecore_evas_test
-bin/ecore_test
+%%EVAS%%bin/ecore_evas_test
+%%EVAS%%bin/ecore_test
 include/Ecore.h
 include/Ecore_Con.h
-include/Ecore_Config.h
-include/Ecore_DBus.h
+%%EET%%include/Ecore_Config.h
+%%DBUS%%include/Ecore_DBus.h
 include/Ecore_Data.h
-include/Ecore_Evas.h
+include/Ecore_Desktop.h
+%%EVAS%%include/Ecore_Evas.h
 include/Ecore_File.h
 include/Ecore_Ipc.h
 include/Ecore_Job.h
 include/Ecore_Txt.h
-include/Ecore_X.h
-include/Ecore_X_Atoms.h
-include/Ecore_X_Cursor.h
+%%X11%%include/Ecore_X.h
+%%X11%%include/Ecore_X_Atoms.h
+%%X11%%include/Ecore_X_Cursor.h
 lib/libecore.a
 lib/libecore.la
 lib/libecore.so
@@ -24,18 +27,22 @@ lib/libecore_con.a
 lib/libecore_con.la
 lib/libecore_con.so
 lib/libecore_con.so.1
-lib/libecore_config.a
-lib/libecore_config.la
-lib/libecore_config.so
-lib/libecore_config.so.1
-lib/libecore_dbus.a
-lib/libecore_dbus.la
-lib/libecore_dbus.so
-lib/libecore_dbus.so.1
-lib/libecore_evas.a
-lib/libecore_evas.la
-lib/libecore_evas.so
-lib/libecore_evas.so.1
+%%EET%%lib/libecore_config.a
+%%EET%%lib/libecore_config.la
+%%EET%%lib/libecore_config.so
+%%EET%%lib/libecore_config.so.1
+%%DBUS%%lib/libecore_dbus.a
+%%DBUS%%lib/libecore_dbus.la
+%%DBUS%%lib/libecore_dbus.so
+%%DBUS%%lib/libecore_dbus.so.1
+lib/libecore_desktop.a
+lib/libecore_desktop.la
+lib/libecore_desktop.so
+lib/libecore_desktop.so.1
+%%EVAS%%lib/libecore_evas.a
+%%EVAS%%lib/libecore_evas.la
+%%EVAS%%lib/libecore_evas.so
+%%EVAS%%lib/libecore_evas.so.1
 lib/libecore_file.a
 lib/libecore_file.la
 lib/libecore_file.so
@@ -53,9 +60,9 @@ lib/libecore_txt.la
 lib/libecore_txt.so
 lib/libecore_txt.so.1
 lib/libecore_x.a
-lib/libecore_x.la
-lib/libecore_x.so
-lib/libecore_x.so.1
+%%X11%%lib/libecore_x.la
+%%X11%%lib/libecore_x.so
+%%X11%%lib/libecore_x.so.1
 libdata/pkgconfig/ecore.pc
 share/aclocal/ecore.m4
 %%DATADIR%%/fonts/Vera.ttf