Date: Wed, 16 Jul 2008 14:39:40 +0800 (CST) From: Yi-Jheng Lin <yzlin@cs.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: tshadwick@oss-solutions.com Subject: ports/125671: [PATCH] sysutils/htop: update to 0.8 Message-ID: <200807160639.m6G6derG021660@stucgi.cs.nctu.edu.tw> Resent-Message-ID: <200807160650.m6G6o1da085913@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 125671
>Category: ports
>Synopsis: [PATCH] sysutils/htop: update to 0.8
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 16 06:50:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Yi-Jheng Lin
>Release: FreeBSD 7.0-RELEASE-p1 amd64
>Organization:
NCTU CS
>Environment:
System: FreeBSD stucgi 7.0-RELEASE-p1 FreeBSD 7.0-RELEASE-p1 #0: Thu Apr 17 15:56:39 CST 2008
>Description:
- Update to 0.8
- Add a new knob UNICODE, which uses libncursesw instead of libncurses to enable Unicode support.
- Disable "CPU affinity configuration", which uses some unsupported system calls in FreeBSD.
Added file(s):
- files/patch-Makefile.am
- files/patch-Process.c
- files/patch-Process.h
- files/patch-configure.ac
- files/patch-htop.c
Port maintainer (tshadwick@oss-solutions.com) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- htop-0.8.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/htop/Makefile /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/Makefile
--- /usr/ports/sysutils/htop/Makefile 2008-02-07 03:01:32.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/Makefile 2008-07-16 13:53:51.000000000 +0800
@@ -6,20 +6,35 @@
#
PORTNAME= htop
-PORTVERSION= 0.6.6
+PORTVERSION= 0.8
CATEGORIES= sysutils
MASTER_SITES= SF
MAINTAINER= tshadwick@oss-solutions.com
COMMENT= A better top(1) - interactive process viewer
+OPTIONS= UNICODE "Enable Unicode Support" OFF
+
NOT_FOR_ARCHS= sparc64
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-proc=/compat/linux/proc
+USE_AUTOTOOLS= autoconf:261 aclocal:19 automake:19
+ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
+
+USE_PYTHON_BUILD= yes
+
MAN1= htop.1
+.if defined(WITH_UNICODE)
+CONFIGURE_ARGS+= --enable-unicode
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's:/usr/bin/python:${LOCALBASE}/bin/python:' ${WRKSRC}/scripts/MakeHeader.py
+
pre-configure:
@[ -f /compat/linux/proc/stat ] || { ${CAT} ${PKGMESSAGE}; ${FALSE}; }
+ cd ${WRKSRC} && ${ACLOCAL}
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/sysutils/htop/distinfo /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/distinfo
--- /usr/ports/sysutils/htop/distinfo 2007-08-31 02:46:01.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/distinfo 2008-07-16 00:49:43.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (htop-0.6.6.tar.gz) = 12c8e6e97bd50a4e0a4730d23675fc7b
-SHA256 (htop-0.6.6.tar.gz) = b2e2ef39afc870c9ef7228959b53fbd38fab02be74bb0d3e91ebf4fdbaa752e0
-SIZE (htop-0.6.6.tar.gz) = 141140
+MD5 (htop-0.8.tar.gz) = b6955f8d75cdb5a3ccea83415cb18815
+SHA256 (htop-0.8.tar.gz) = eb0076376542b68d4ce37c7ba87c3cabc92ca85ca3d28607d6fcdf2ce20383d7
+SIZE (htop-0.8.tar.gz) = 412672
diff -ruN --exclude=CVS /usr/ports/sysutils/htop/files/patch-Makefile.am /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-Makefile.am
--- /usr/ports/sysutils/htop/files/patch-Makefile.am 1970-01-01 08:00:00.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-Makefile.am 2008-07-16 11:24:26.000000000 +0800
@@ -0,0 +1,18 @@
+--- Makefile.am.orig 2008-07-16 11:16:00.000000000 +0800
++++ Makefile.am 2008-07-16 11:16:14.000000000 +0800
+@@ -1,5 +1,5 @@
+
+-SUBDIRS = plpa-1.1
++SUBDIRS =
+
+ bin_PROGRAMS = htop
+ dist_man_MANS = htop.1
+@@ -34,7 +34,7 @@
+
+ BUILT_SOURCES = $(myhtopheaders)
+ htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h debug.h
+-htop_LDADD = $(top_builddir)/plpa-1.1/src/libplpa_included.la
++htop_LDADD =
+
+ profile:
+ $(MAKE) all CFLAGS="-pg -O2"
diff -ruN --exclude=CVS /usr/ports/sysutils/htop/files/patch-Process.c /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-Process.c
--- /usr/ports/sysutils/htop/files/patch-Process.c 1970-01-01 08:00:00.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-Process.c 2008-07-16 12:58:39.000000000 +0800
@@ -0,0 +1,28 @@
+--- Process.c.orig 2008-03-15 02:35:05.000000000 +0800
++++ Process.c 2008-07-16 12:51:24.000000000 +0800
+@@ -28,7 +28,9 @@
+ #include <pwd.h>
+ #include <sched.h>
+
++#if 0
+ #include <plpa.h>
++#endif
+
+ // This works only with glibc 2.1+. On earlier versions
+ // the behavior is similar to have a hardcoded page size.
+@@ -478,6 +480,7 @@
+ return (err == 0);
+ }
+
++#if 0
+ unsigned long Process_getAffinity(Process* this) {
+ unsigned long mask = 0;
+ plpa_sched_getaffinity(this->pid, sizeof(unsigned long), (plpa_cpu_set_t*) &mask);
+@@ -487,6 +490,7 @@
+ bool Process_setAffinity(Process* this, unsigned long mask) {
+ return (plpa_sched_setaffinity(this->pid, sizeof(unsigned long), (plpa_cpu_set_t*) &mask) == 0);
+ }
++#endif
+
+ void Process_sendSignal(Process* this, int signal) {
+ kill(this->pid, signal);
diff -ruN --exclude=CVS /usr/ports/sysutils/htop/files/patch-Process.h /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-Process.h
--- /usr/ports/sysutils/htop/files/patch-Process.h 1970-01-01 08:00:00.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-Process.h 2008-07-16 12:59:56.000000000 +0800
@@ -0,0 +1,24 @@
+--- Process.h.orig 2008-03-15 02:42:15.000000000 +0800
++++ Process.h 2008-07-16 12:52:37.000000000 +0800
+@@ -31,7 +31,9 @@
+ #include <pwd.h>
+ #include <sched.h>
+
++#if 0
+ #include <plpa.h>
++#endif
+
+ // This works only with glibc 2.1+. On earlier versions
+ // the behavior is similar to have a hardcoded page size.
+@@ -166,9 +168,11 @@
+
+ bool Process_setPriority(Process* this, int priority);
+
++#if 0
+ unsigned long Process_getAffinity(Process* this);
+
+ bool Process_setAffinity(Process* this, unsigned long mask);
++#endif
+
+ void Process_sendSignal(Process* this, int signal);
+
diff -ruN --exclude=CVS /usr/ports/sysutils/htop/files/patch-configure.ac /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-configure.ac
--- /usr/ports/sysutils/htop/files/patch-configure.ac 1970-01-01 08:00:00.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-configure.ac 2008-07-16 10:55:49.000000000 +0800
@@ -0,0 +1,14 @@
+--- configure.ac.orig 2008-07-16 10:48:24.000000000 +0800
++++ configure.ac 2008-07-16 10:48:36.000000000 +0800
+@@ -84,11 +84,5 @@
+ AC_CHECK_FILE($PROCDIR/stat,,AC_MSG_ERROR(Cannot find /proc/stat. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
+ AC_CHECK_FILE($PROCDIR/meminfo,,AC_MSG_ERROR(Cannot find /proc/meminfo. Make sure you have a Linux-compatible /proc filesystem mounted. See the file README for help.))
+
+-PLPA_INCLUDED(plpa-1.1)
+-PLPA_INIT(plpa_happy=yes, plpa_happy=no)
+-if test "x$plpa_happy" = xno; then
+- AC_MSG_ERROR([Failed to initialize PLPA.])
+-fi
+-
+ AC_CONFIG_FILES([Makefile])
+ AC_OUTPUT
diff -ruN --exclude=CVS /usr/ports/sysutils/htop/files/patch-htop.c /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-htop.c
--- /usr/ports/sysutils/htop/files/patch-htop.c 1970-01-01 08:00:00.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-htop.c 2008-07-16 13:02:02.000000000 +0800
@@ -0,0 +1,41 @@
+--- htop.c.orig 2008-04-27 13:56:38.000000000 +0800
++++ htop.c 2008-07-16 12:54:44.000000000 +0800
+@@ -110,9 +110,11 @@
+ mvaddstr(15, 0, " F9 k: kill process/tagged processes P: sort by CPU%");
+ mvaddstr(16, 0, " + [ F7: lower priority (+ nice) M: sort by MEM%");
+ mvaddstr(17, 0, " - ] F8: higher priority (root only) T: sort by TIME");
++#if 0
+ if (pl->processorCount > 1)
+ mvaddstr(18, 0, " a: set CPU affinity F4 I: invert sort order");
+ else
++#endif
+ mvaddstr(18, 0, " F4 I: invert sort order");
+ mvaddstr(19, 0, " F2 S: setup F6 >: select sort column");
+ mvaddstr(20, 0, " F1 h: show this help screen");
+@@ -129,8 +131,10 @@
+ mvaddstr(16, 0, " + [ F7"); mvaddstr(16,40, " M");
+ mvaddstr(17, 0, " - ] F8"); mvaddstr(17,40, " T");
+ mvaddstr(18,40, " F4 I");
++#if 0
+ if (pl->processorCount > 1)
+ mvaddstr(18, 0, " a:");
++#endif
+ mvaddstr(19, 0, " F2 S"); mvaddstr(19,40, " F6 >");
+ mvaddstr(20, 0, " F1 h");
+ mvaddstr(21, 0, " F10 q"); mvaddstr(21,40, " s");
+@@ -625,6 +629,7 @@
+ refreshTimeout = 0;
+ break;
+ }
++#if 0
+ case 'a':
+ {
+ if (pl->processorCount == 1)
+@@ -660,6 +665,7 @@
+ refreshTimeout = 0;
+ break;
+ }
++#endif
+ case KEY_F(10):
+ case 'q':
+ quit = 1;
--- htop-0.8.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807160639.m6G6derG021660>