Index: head/x11-wm/e-module-mem/Makefile =================================================================== --- head/x11-wm/e-module-mem/Makefile (revision 446056) +++ head/x11-wm/e-module-mem/Makefile (revision 446057) @@ -1,37 +1,29 @@ # Created by: Stanislav Sedov # $FreeBSD$ PORTNAME= e-module-mem PORTVERSION= 20140705 PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-wm enlightenment MASTER_SITES= LOCAL/gblach/enlightenment/ +DIST_SUBDIR= enlightenment MAINTAINER= enlightenment@FreeBSD.org COMMENT= Enlightenment memory monitoring module BUILD_DEPENDS= enlightenment:x11-wm/enlightenment RUN_DEPENDS= enlightenment:x11-wm/enlightenment -DIST_SUBDIR= enlightenment GNU_CONFIGURE= yes USES= gmake libtool pkgconfig tar:xz INSTALL_TARGET= install-strip .include "../enlightenment/Makefile.plist" OPTIONS_DEFINE= NLS - -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -CONFIGURE_ARGS+=--enable-nls -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +OPTIONS_SUB= yes +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls .include Index: head/x11-wm/e-module-mem/files/patch-src-e_mod_main.c =================================================================== --- head/x11-wm/e-module-mem/files/patch-src-e_mod_main.c (revision 446056) +++ head/x11-wm/e-module-mem/files/patch-src-e_mod_main.c (revision 446057) @@ -1,17 +1,16 @@ -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 @@ +--- src/e_mod_main.c.orig 2014-09-23 14:36:23 UTC ++++ src/e_mod_main.c +@@ -422,11 +422,9 @@ _mem_cb_check (void *data) 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 { Index: head/x11-wm/e-module-mem/files/patch-src-machdep_freebsd.c =================================================================== --- head/x11-wm/e-module-mem/files/patch-src-machdep_freebsd.c (revision 446056) +++ head/x11-wm/e-module-mem/files/patch-src-machdep_freebsd.c (revision 446057) @@ -1,51 +1,50 @@ -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 +--- src/machdep_freebsd.c.orig 2014-09-23 14:36:23 UTC ++++ src/machdep_freebsd.c @@ -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 @@ +@@ -32,7 +34,6 @@ getsysctl (char *name, void *ptr, size_t 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 @@ +@@ -61,8 +62,8 @@ swapinfo (int *total, int *used) 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 @@ +@@ -82,8 +83,6 @@ _mem_get_values (ci, phys_used, sw_used, { 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 @@ +@@ -102,8 +101,8 @@ _mem_get_values (ci, phys_used, sw_used, 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) { Index: head/x11-wm/e-module-mem/pkg-descr =================================================================== --- head/x11-wm/e-module-mem/pkg-descr (revision 446056) +++ head/x11-wm/e-module-mem/pkg-descr (revision 446057) @@ -1,5 +1,5 @@ An E17 module which monitors the RAM usage. It features the following: - display text and/or graph - display text in percentage or absolute -WWW: http://www.enlightenment.org +WWW: https://www.enlightenment.org/