- Update Enlightenment to 0.17.0

- Update EFL to 1.7.4
- Convert to OptionsNG

Approved by:	crees (mentor)

4 files changed, 78 insertions, 7 deletions

diff --git a/x11-wm/e17-module-mem/Makefile b/x11-wm/e17-module-mem/Makefile
index 5ea24d35455c..e4b0ba78b2dd 100644
--- a/x11-wm/e17-module-mem/Makefile
+++ b/x11-wm/e17-module-mem/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mem
-PORTVERSION=	20111128
+PORTVERSION=	20120918
 PORTEPOCH=	1
 CATEGORIES=	x11-wm enlightenment
 MASTER_SITES=	http://files.roorback.net/e17/modules/
@@ -15,17 +15,20 @@ BUILD_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 RUN_DEPENDS=	enlightenment:${PORTSDIR}/x11-wm/enlightenment
 
 DIST_SUBDIR=	e17
-GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
 USE_EFL=	edje libtool_hack modarch_hack
+USE_GNOME=	pkgconfig
+
+.include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--enable-nls
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS=	--disable-nls
+CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
diff --git a/x11-wm/e17-module-mem/distinfo b/x11-wm/e17-module-mem/distinfo
index f93b7b0a5145..7045fc0aad2c 100644
--- a/x11-wm/e17-module-mem/distinfo
+++ b/x11-wm/e17-module-mem/distinfo
@@ -1,2 +1,2 @@
-SHA256 (e17/mem-20111128.tar.bz2) = 840b7a203dfd9ad05e9fd5cde6fd41d95d6f2b91cc22e214b58ba8398a2b686d
-SIZE (e17/mem-20111128.tar.bz2) = 551004
+SHA256 (e17/mem-20120918.tar.bz2) = 829f80eed125d2acf6a099a61ffdec4143fe004be442cc8ac364aab571090823
+SIZE (e17/mem-20120918.tar.bz2) = 573164
diff --git a/x11-wm/e17-module-mem/files/patch-src-e_mod_main.c b/x11-wm/e17-module-mem/files/patch-src-e_mod_main.c
new file mode 100644
index 000000000000..277054f8ed5c
--- /dev/null
+++ b/x11-wm/e17-module-mem/files/patch-src-e_mod_main.c
@@ -0,0 +1,17 @@
+diff -ur src.old/e_mod_main.c src/e_mod_main.c
+--- src.old/e_mod_main.c	2010-11-13 17:56:21.000000000 +0200
++++ src/e_mod_main.c	2012-02-21 23:43:46.548797357 +0200
+@@ -424,11 +424,9 @@
+ 
+    if (!inst->ci->show_percent)
+      {
+-	snprintf (real_str, sizeof (real_str), "Real: %d/%d MB", (real / 1024),
+-		  (total_real / 1024));
++	snprintf (real_str, sizeof (real_str), "Real: %d/%d MB", real, total_real);
+ 	if ( total_swap )
+-	  snprintf (swap_str, sizeof (swap_str), "Swap: %d/%d MB", (swap / 1024),
+-		    (total_swap / 1024));
++	  snprintf (swap_str, sizeof (swap_str), "Swap: %d/%d MB", swap, total_swap);
+      }
+    else
+      {
diff --git a/x11-wm/e17-module-mem/files/patch-src-machdep_freebsd.c b/x11-wm/e17-module-mem/files/patch-src-machdep_freebsd.c
new file mode 100644
index 000000000000..5b14b15912c9
--- /dev/null
+++ b/x11-wm/e17-module-mem/files/patch-src-machdep_freebsd.c
@@ -0,0 +1,51 @@
+diff -ur src.old/machdep_freebsd.c src/machdep_freebsd.c
+--- src.old/machdep_freebsd.c	2010-11-13 17:56:21.000000000 +0200
++++ src/machdep_freebsd.c	2012-02-21 23:18:00.000000000 +0200
+@@ -12,6 +12,8 @@
+ 
+ #define GETSYSCTL(name, var)    getsysctl(name, &(var), sizeof (var))
+ 
++#define PAGES_PER_MEG ((1024 * 1024) / getpagesize())
++
+ static int
+ getsysctl (char *name, void *ptr, size_t len)
+ {
+@@ -32,7 +34,6 @@
+ static int
+ swapinfo (int *total, int *used)
+ {
+-  int pagesize = getpagesize ();
+   size_t mibsize, size;
+   struct xswdev xsw;
+   int mib[16], n;
+@@ -61,8 +62,8 @@
+ 	  return 1;
+ 	}
+ 
+-      tmp_total = (long long) xsw.xsw_nblks * pagesize;
+-      tmp_used = (long long) xsw.xsw_used * pagesize;
++      tmp_total = xsw.xsw_nblks / PAGES_PER_MEG;
++      tmp_used = xsw.xsw_used / PAGES_PER_MEG;
+       *total += tmp_total;
+       *used += tmp_used;
+     }
+@@ -82,8 +83,6 @@
+ {
+   int total_pages, inactive_pages, free_pages;
+ 
+-  int pagesize = getpagesize ();
+-
+   if (GETSYSCTL ("vm.stats.vm.v_page_count", total_pages))
+     {
+       warnx ("can't read sysctl \"vm.stats.vm.v_page_count\"");
+@@ -102,8 +101,8 @@
+       return;
+     }
+ 
+-  *phys_total = (total_pages * pagesize) >> 10;
+-  *phys_used = ((total_pages - free_pages - inactive_pages) * pagesize) >> 10;
++  *phys_total = total_pages / PAGES_PER_MEG;
++  *phys_used = (total_pages - free_pages - inactive_pages) / PAGES_PER_MEG;
+ 
+   if ((swapinfo (sw_total, sw_used)) != 0)
+     {