Attachment #88831 for bug #125671

View | Details | Raw Unified | Return to bug 125671
Collapse All | Expand All

Lines 6-25 Link Here

(-)/amd/account/gcs/96/9655630/dev/ports/sysutils/htop/Makefile (-1 / +16 lines)
6	#	6	#
7		7
8	PORTNAME= htop	8	PORTNAME= htop
9	PORTVERSION= 0.6.6	9	PORTVERSION= 0.8
10	CATEGORIES= sysutils	10	CATEGORIES= sysutils
11	MASTER_SITES= SF	11	MASTER_SITES= SF
12		12
13	MAINTAINER= tshadwick@oss-solutions.com	13	MAINTAINER= tshadwick@oss-solutions.com
14	COMMENT= A better top(1) - interactive process viewer	14	COMMENT= A better top(1) - interactive process viewer
15		15
		16	OPTIONS= UNICODE "Enable Unicode Support" OFF
		17
16	NOT_FOR_ARCHS= sparc64	18	NOT_FOR_ARCHS= sparc64
17		19
18	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
19	CONFIGURE_ARGS= --with-proc=/compat/linux/proc	21	CONFIGURE_ARGS= --with-proc=/compat/linux/proc
		22	USE_AUTOTOOLS= autoconf:261 aclocal:19 automake:19
		23	ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
		24
		25	USE_PYTHON_BUILD= yes
		26
20	MAN1= htop.1	27	MAN1= htop.1
21		28
		29	.if defined(WITH_UNICODE)
		30	CONFIGURE_ARGS+= --enable-unicode
		31	.endif
		32
		33	post-patch:
		34	@${REINPLACE_CMD} -e 's:/usr/bin/python:${LOCALBASE}/bin/python:' ${WRKSRC}/scripts/MakeHeader.py
		35
22	pre-configure:	36	pre-configure:
23	@[ -f /compat/linux/proc/stat ] \|\| { ${CAT} ${PKGMESSAGE}; ${FALSE}; }	37	@[ -f /compat/linux/proc/stat ] \|\| { ${CAT} ${PKGMESSAGE}; ${FALSE}; }
		38	cd ${WRKSRC} && ${ACLOCAL}
24		39
25	.include <bsd.port.mk>	40	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)/amd/account/gcs/96/9655630/dev/ports/sysutils/htop/distinfo (-3 / +3 lines)
1	MD5 (htop-0.6.6.tar.gz) = 12c8e6e97bd50a4e0a4730d23675fc7b	1	MD5 (htop-0.8.tar.gz) = b6955f8d75cdb5a3ccea83415cb18815
2	SHA256 (htop-0.6.6.tar.gz) = b2e2ef39afc870c9ef7228959b53fbd38fab02be74bb0d3e91ebf4fdbaa752e0	2	SHA256 (htop-0.8.tar.gz) = eb0076376542b68d4ce37c7ba87c3cabc92ca85ca3d28607d6fcdf2ce20383d7
3	SIZE (htop-0.6.6.tar.gz) = 141140	3	SIZE (htop-0.8.tar.gz) = 412672




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




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




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




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

Line 0 Link Here

(-)/amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-htop.c (+41 lines)
	1	--- htop.c.orig 2008-04-27 13:56:38.000000000 +0800
	2	+++ htop.c 2008-07-16 12:54:44.000000000 +0800
	3	@@ -110,9 +110,11 @@
	4	mvaddstr(15, 0, " F9 k: kill process/tagged processes P: sort by CPU%");
	5	mvaddstr(16, 0, " + [ F7: lower priority (+ nice) M: sort by MEM%");
	6	mvaddstr(17, 0, " - ] F8: higher priority (root only) T: sort by TIME");
	7	+#if 0
	8	if (pl->processorCount > 1)
	9	mvaddstr(18, 0, " a: set CPU affinity F4 I: invert sort order");
	10	else
	11	+#endif
	12	mvaddstr(18, 0, " F4 I: invert sort order");
	13	mvaddstr(19, 0, " F2 S: setup F6 >: select sort column");
	14	mvaddstr(20, 0, " F1 h: show this help screen");
	15	@@ -129,8 +131,10 @@
	16	mvaddstr(16, 0, " + [ F7"); mvaddstr(16,40, " M");
	17	mvaddstr(17, 0, " - ] F8"); mvaddstr(17,40, " T");
	18	mvaddstr(18,40, " F4 I");
	19	+#if 0
	20	if (pl->processorCount > 1)
	21	mvaddstr(18, 0, " a:");
	22	+#endif
	23	mvaddstr(19, 0, " F2 S"); mvaddstr(19,40, " F6 >");
	24	mvaddstr(20, 0, " F1 h");
	25	mvaddstr(21, 0, " F10 q"); mvaddstr(21,40, " s");
	26	@@ -625,6 +629,7 @@
	27	refreshTimeout = 0;
	28	break;
	29	}
	30	+#if 0
	31	case 'a':
	32	{
	33	if (pl->processorCount == 1)
	34	@@ -660,6 +665,7 @@
	35	refreshTimeout = 0;
	36	break;
	37	}
	38	+#endif
	39	case KEY_F(10):
	40	case 'q':
	41	quit = 1;

Return to bug 125671

Line 0 Link Here

(-)/amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-Makefile.am (+18 lines)
	1	--- Makefile.am.orig 2008-07-16 11:16:00.000000000 +0800
	2	+++ Makefile.am 2008-07-16 11:16:14.000000000 +0800
	3	@@ -1,5 +1,5 @@
	4
	5	-SUBDIRS = plpa-1.1
	6	+SUBDIRS =
	7
	8	bin_PROGRAMS = htop
	9	dist_man_MANS = htop.1
	10	@@ -34,7 +34,7 @@
	11
	12	BUILT_SOURCES = $(myhtopheaders)
	13	htop_SOURCES = $(myhtopheaders) $(myhtopsources) config.h debug.h
	14	-htop_LDADD = $(top_builddir)/plpa-1.1/src/libplpa_included.la
	15	+htop_LDADD =
	16
	17	profile:
	18	$(MAKE) all CFLAGS="-pg -O2"

Line 0 Link Here

(-)/amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-Process.c (+28 lines)
	1	--- Process.c.orig 2008-03-15 02:35:05.000000000 +0800
	2	+++ Process.c 2008-07-16 12:51:24.000000000 +0800
	3	@@ -28,7 +28,9 @@
	4	#include <pwd.h>
	5	#include <sched.h>
	6
	7	+#if 0
	8	#include <plpa.h>
	9	+#endif
	10
	11	// This works only with glibc 2.1+. On earlier versions
	12	// the behavior is similar to have a hardcoded page size.
	13	@@ -478,6 +480,7 @@
	14	return (err == 0);
	15	}
	16
	17	+#if 0
	18	unsigned long Process_getAffinity(Process* this) {
	19	unsigned long mask = 0;
	20	plpa_sched_getaffinity(this->pid, sizeof(unsigned long), (plpa_cpu_set_t*) &mask);
	21	@@ -487,6 +490,7 @@
	22	bool Process_setAffinity(Process* this, unsigned long mask) {
	23	return (plpa_sched_setaffinity(this->pid, sizeof(unsigned long), (plpa_cpu_set_t*) &mask) == 0);
	24	}
	25	+#endif
	26
	27	void Process_sendSignal(Process* this, int signal) {
	28	kill(this->pid, signal);

Line 0 Link Here

(-)/amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-Process.h (+24 lines)
	1	--- Process.h.orig 2008-03-15 02:42:15.000000000 +0800
	2	+++ Process.h 2008-07-16 12:52:37.000000000 +0800
	3	@@ -31,7 +31,9 @@
	4	#include <pwd.h>
	5	#include <sched.h>
	6
	7	+#if 0
	8	#include <plpa.h>
	9	+#endif
	10
	11	// This works only with glibc 2.1+. On earlier versions
	12	// the behavior is similar to have a hardcoded page size.
	13	@@ -166,9 +168,11 @@
	14
	15	bool Process_setPriority(Process* this, int priority);
	16
	17	+#if 0
	18	unsigned long Process_getAffinity(Process* this);
	19
	20	bool Process_setAffinity(Process* this, unsigned long mask);
	21	+#endif
	22
	23	void Process_sendSignal(Process* this, int signal);
	24

Line 0 Link Here

(-)/amd/account/gcs/96/9655630/dev/ports/sysutils/htop/files/patch-configure.ac (+14 lines)
	1	--- configure.ac.orig 2008-07-16 10:48:24.000000000 +0800
	2	+++ configure.ac 2008-07-16 10:48:36.000000000 +0800
	3	@@ -84,11 +84,5 @@
	4	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.))
	5	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.))
	6
	7	-PLPA_INCLUDED(plpa-1.1)
	8	-PLPA_INIT(plpa_happy=yes, plpa_happy=no)
	9	-if test "x$plpa_happy" = xno; then
	10	- AC_MSG_ERROR([Failed to initialize PLPA.])
	11	-fi
	12	-
	13	AC_CONFIG_FILES([Makefile])
	14	AC_OUTPUT