- 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)

4 files changed, 24 insertions, 32 deletions

diff --git a/x11-wm/e17-module-moon/Makefile b/x11-wm/e17-module-moon/Makefile
index aaeb04b9a162..f442da8955c6 100644
--- a/x11-wm/e17-module-moon/Makefile
+++ b/x11-wm/e17-module-moon/Makefile
@@ -6,27 +6,25 @@
 #
 
 PORTNAME=	moon
-PORTVERSION=	23062006
-PORTREVISION=	2
+PORTVERSION=	20060926
+PORTREVISION=	0
+PORTEPOCH=	1
 CATEGORIES=	x11
-MASTER_SITES=	http://mbsd.msk.ru/dist/
+MASTER_SITES=	http://sunner.elcomnet.ru/~stas/
 PKGNAMEPREFIX=	e17-module-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ssedov@mbsd.msk.ru
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	An e17 Moon Clock module
 
-BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment-devel
-RUN_DEPENDS=	${BUILD_DEPENDS}
+BUILD_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
+RUN_DEPENDS=	enlightenment-config:${PORTSDIR}/x11-wm/enlightenment-devel
 
+GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
-PLIST_SUB+=	MODULE_ARCH=freebsd${OSREL}-${ARCH}
+USE_GNOME=	gnometarget pkgconfig
+USE_EFL=	edje
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -36,4 +34,6 @@ CONFIGURE_ARGS=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "../../x11-wm/enlightenment-devel/bsd.efl.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-wm/e17-module-moon/distinfo b/x11-wm/e17-module-moon/distinfo
index 8a1a8789bb68..872df226239c 100644
--- a/x11-wm/e17-module-moon/distinfo
+++ b/x11-wm/e17-module-moon/distinfo
@@ -1,3 +1,3 @@
-MD5 (moon-23062006.tar.bz2) = 6db65094f895971195fb1a1e5c792cf1
-SHA256 (moon-23062006.tar.bz2) = 83a7a52e60e9a603b53a1eef0c5798e1953a13951188a2a9691c9026c931c78b
-SIZE (moon-23062006.tar.bz2) = 646800
+MD5 (moon-20060926.tar.bz2) = f967701d2f031631d3b0a63b58df76c3
+SHA256 (moon-20060926.tar.bz2) = 3319d37fcd7fdfe0bf65aeb5d9016e3660e730263a97d18538e397ea5e2d50c0
+SIZE (moon-20060926.tar.bz2) = 672466
diff --git a/x11-wm/e17-module-moon/files/patch-src__e_mod_main.c b/x11-wm/e17-module-moon/files/patch-src__e_mod_main.c
deleted file mode 100644
index 1b64751d1dbd..000000000000
--- a/x11-wm/e17-module-moon/files/patch-src__e_mod_main.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/e_mod_main.c.orig	Sat Jun  3 12:35:27 2006
-+++ src/e_mod_main.c	Thu Jul  6 23:01:10 2006
-@@ -124,7 +124,7 @@
- 
-    snprintf(title, sizeof(title), "%s %s", D_("Moon Clock Module"), 
- 	 PACKAGE_VERSION);
--   e_module_dialog_show(title, 
-+   e_module_dialog_show(module, title, 
- 	 D_("Display current phase of the moon ala e16 E-MoonClock")); 
-    return 1;
- }
diff --git a/x11-wm/e17-module-moon/pkg-plist b/x11-wm/e17-module-moon/pkg-plist
index 3c1c40aadf35..9e45a173c835 100644
--- a/x11-wm/e17-module-moon/pkg-plist
+++ b/x11-wm/e17-module-moon/pkg-plist
@@ -1,11 +1,14 @@
-lib/enlightenment/modules/moon/%%MODULE_ARCH%%/module.a
-lib/enlightenment/modules/moon/module.eap
-lib/enlightenment/modules/moon/%%MODULE_ARCH%%/module.la
-lib/enlightenment/modules/moon/%%MODULE_ARCH%%/module.so
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.a
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.la
+lib/enlightenment/modules/moon/%%E17_ARCH%%/module.so
+lib/enlightenment/modules/moon/module.desktop
+lib/enlightenment/modules/moon/module.edj
 lib/enlightenment/modules/moon/moon.edj
 %%NLS%%share/locale/eo/LC_MESSAGES/moon.mo
 %%NLS%%share/locale/it/LC_MESSAGES/moon.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/moon.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/moon.mo
-@dirrm lib/enlightenment/modules/moon/%%MODULE_ARCH%%
+@dirrm lib/enlightenment/modules/moon/%%E17_ARCH%%
 @dirrm lib/enlightenment/modules/moon
+@dirrmtry lib/enlightenment/modules
+@dirrmtry lib/enlightenment