From owner-svn-ports-head@freebsd.org Mon Jul 17 09:01:00 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A0830D14A44; Mon, 17 Jul 2017 09:01:00 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 791877D206; Mon, 17 Jul 2017 09:01:00 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v6H90xMl053147; Mon, 17 Jul 2017 09:00:59 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v6H90xO3053143; Mon, 17 Jul 2017 09:00:59 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201707170900.v6H90xO3053143@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 17 Jul 2017 09:00:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r446057 - in head/x11-wm/e-module-mem: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/x11-wm/e-module-mem: . files X-SVN-Commit-Revision: 446057 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Jul 2017 09:01:00 -0000 Author: amdmi3 Date: Mon Jul 17 09:00:59 2017 New Revision: 446057 URL: https://svnweb.freebsd.org/changeset/ports/446057 Log: - Pet portlint - Switch to options helpers - Regenerate patches - Update WWW Approved by: portmgr blanket Modified: head/x11-wm/e-module-mem/Makefile head/x11-wm/e-module-mem/files/patch-src-e_mod_main.c head/x11-wm/e-module-mem/files/patch-src-machdep_freebsd.c head/x11-wm/e-module-mem/pkg-descr Modified: head/x11-wm/e-module-mem/Makefile ============================================================================== --- head/x11-wm/e-module-mem/Makefile Mon Jul 17 08:42:00 2017 (r446056) +++ head/x11-wm/e-module-mem/Makefile Mon Jul 17 09:00:59 2017 (r446057) @@ -7,6 +7,7 @@ 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 @@ -14,7 +15,6 @@ 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 @@ -22,16 +22,8 @@ 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 Modified: 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 Mon Jul 17 08:42:00 2017 (r446056) +++ head/x11-wm/e-module-mem/files/patch-src-e_mod_main.c Mon Jul 17 09:00:59 2017 (r446057) @@ -1,7 +1,6 @@ -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) { Modified: head/x11-wm/e-module-mem/files/patch-src-machdep_freebsd.c ============================================================================== --- head/x11-wm/e-module-mem/files/patch-src-machdep_freebsd.c Mon Jul 17 08:42:00 2017 (r446056) +++ head/x11-wm/e-module-mem/files/patch-src-machdep_freebsd.c Mon Jul 17 09:00:59 2017 (r446057) @@ -1,6 +1,5 @@ -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)) @@ -10,7 +9,7 @@ diff -ur src.old/machdep_freebsd.c src/machdep_freebsd 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) { @@ -18,7 +17,7 @@ diff -ur src.old/machdep_freebsd.c src/machdep_freebsd 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; } @@ -29,7 +28,7 @@ diff -ur src.old/machdep_freebsd.c src/machdep_freebsd *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; @@ -38,7 +37,7 @@ diff -ur src.old/machdep_freebsd.c src/machdep_freebsd 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; } Modified: head/x11-wm/e-module-mem/pkg-descr ============================================================================== --- head/x11-wm/e-module-mem/pkg-descr Mon Jul 17 08:42:00 2017 (r446056) +++ head/x11-wm/e-module-mem/pkg-descr Mon Jul 17 09:00:59 2017 (r446057) @@ -2,4 +2,4 @@ An E17 module which monitors the RAM usage. It feature - display text and/or graph - display text in percentage or absolute -WWW: http://www.enlightenment.org +WWW: https://www.enlightenment.org/