pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

htop: remove, used for updating sysutils/htop



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Fri May 6 11:04:42 2016 +0200
Changeset:	84ef4e64850aba23c60e969b93d1eeb461a8b733

Modified Files:
	Makefile
Removed Files:
	htop/DESCR
	htop/Makefile
	htop/PLIST
	htop/TODO
	htop/distinfo
	htop/patches/patch-configure.ac
	htop/patches/patch-linux_LinuxProcess.c

Log Message:
htop: remove, used for updating sysutils/htop

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=84ef4e64850aba23c60e969b93d1eeb461a8b733

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                |  1 -
 htop/DESCR                              | 18 ---------------
 htop/Makefile                           | 40 ---------------------------------
 htop/PLIST                              |  5 -----
 htop/TODO                               |  5 -----
 htop/distinfo                           |  8 -------
 htop/patches/patch-configure.ac         | 33 ---------------------------
 htop/patches/patch-linux_LinuxProcess.c | 26 ---------------------
 8 files changed, 136 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index bc26bed..bfd5a6a 100644
--- a/Makefile
+++ b/Makefile
@@ -1292,7 +1292,6 @@ SUBDIR+=	hs-yaml
 SUBDIR+=	hs-zip-archive
 SUBDIR+=	ht2html
 SUBDIR+=	html2latex
-SUBDIR+=	htop
 SUBDIR+=	htslib
 SUBDIR+=	httrack
 SUBDIR+=	hu-go
diff --git a/htop/DESCR b/htop/DESCR
deleted file mode 100644
index e9e4d80..0000000
--- a/htop/DESCR
+++ /dev/null
@@ -1,18 +0,0 @@
-This is htop, an interactive process viewer.
-
-Comparison between 'htop' and 'top'
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
- * In 'htop' you can scroll the list vertically and horizontally
-   to see all processes and full command lines.
- * In 'top' you are subject to a delay for each unassigned
-   key you press (especially annoying when multi-key escape
-   sequences are triggered by accident).
- * 'htop' starts faster ('top' seems to collect data for a while
-   before displaying anything).
- * In 'htop' you don't need to type the process number to
-   kill a process, in 'top' you do.
- * In 'htop' you don't need to type the process number or
-   the priority value to renice a process, in 'top' you do.
- * In 'htop' you can kill multiple processes at once.
- * 'top' is older, hence, more tested.
diff --git a/htop/Makefile b/htop/Makefile
deleted file mode 100644
index daf8903..0000000
--- a/htop/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# $NetBSD: Makefile,v 1.10 2015/08/20 13:38:25 jperkin Exp $
-#
-
-DISTNAME=	htop-2.0.0
-CATEGORIES=	sysutils
-MASTER_SITES=	http://hisham.hm/htop/releases/2.0.0/
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://hisham.hm/htop/
-COMMENT=	Enhanced version of top utility
-LICENSE=	gnu-gpl-v2
-
-USE_TOOLS+=	automake aclocal autoheader autoconf
-GNU_CONFIGURE=	yes
-USE_NCURSES=	yes # uses ncurses mouse definitions
-
-USE_LIBTOOL=	yes
-
-#ONLY_FOR_PLATFORM=     Linux-*-* FreeBSD-*-* NetBSD-*-*
-
-pre-configure:
-	set -e; cd ${WRKSRC}; \
-	aclocal; \
-	autoconf; \
-	automake
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS" && exists(/system/lxproc)
-ONLY_FOR_PLATFORM+=	SunOS-*-*
-CONFIGURE_ARGS+=	--with-proc=/system/lxproc
-.endif
-
-REPLACE_PYTHON+=	scripts/MakeHeader.py
-CONFIGURE_ENV+=		ac_cv_file__proc_stat=yes ac_cv_file__proc_meminfo=yes
-
-.include "../../lang/python/application.mk"
-.include "../../devel/ncursesw/buildlink3.mk"
-.include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/htop/PLIST b/htop/PLIST
deleted file mode 100644
index 752d881..0000000
--- a/htop/PLIST
+++ /dev/null
@@ -1,5 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/05/25 19:30:21 agc Exp $
-bin/htop
-man/man1/htop.1
-share/applications/htop.desktop
-share/pixmaps/htop.png
diff --git a/htop/TODO b/htop/TODO
deleted file mode 100644
index e9d468d..0000000
--- a/htop/TODO
+++ /dev/null
@@ -1,5 +0,0 @@
-resident and shared memory still broken as in prev versions.
-figure out why, it merely reads /proc/<pid>/statm etc.
-in function LinuxProcessList_readStatmFile in file linux/LinuxProcessList.c
-
-some patches are redundant, most pre-configure stage stuff too
diff --git a/htop/distinfo b/htop/distinfo
deleted file mode 100644
index ca316ac..0000000
--- a/htop/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 01:32:17 agc Exp $
-
-SHA1 (htop-2.0.0.tar.gz) = 73bf8b97d4ee74066c75c0f9e0c1eacbaff11ba0
-RMD160 (htop-2.0.0.tar.gz) = 2d5e812fcabde1922b9fdd35413795200f306eb8
-SHA512 (htop-2.0.0.tar.gz) = 2df1b96e4c07a1de360dc7b7b20db0e663d7fa2c9a8a9dcc3d7dc1ce5e5b59f72d927e8e7ae919631cf0e950a82450b45116a1f8d788f63c5762bd73332ec32c
-Size (htop-2.0.0.tar.gz) = 473765 bytes
-SHA1 (patch-configure.ac) = 7f76263003cd0ec76aa40fa47131122e38f254b4
-SHA1 (patch-linux_LinuxProcess.c) = 64f1a0c67928cae375d807b8a74772c72b808147
diff --git a/htop/patches/patch-configure.ac b/htop/patches/patch-configure.ac
deleted file mode 100644
index 0e17015..0000000
--- a/htop/patches/patch-configure.ac
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
---- configure.ac.orig	2016-02-02 14:59:55.000000000 +0000
-+++ configure.ac
-@@ -39,6 +39,9 @@ case "$target" in
- *darwin*)
-    my_htop_platform=darwin
-    ;;
-+*netbsd*)
-+   my_htop_platform=linux
-+   ;;
- *)
-    my_htop_platform=unsupported
-    ;;
-@@ -211,6 +214,10 @@ if test "$my_htop_platform" = "openbsd";
-    AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"])
- fi
- 
-+if test "$my_htop_platform" = "netbsd"; then
-+   AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"])
-+fi
-+
- AC_ARG_ENABLE(native_affinity, [AC_HELP_STRING([--enable-native-affinity], [enable native sched_setaffinity and sched_getaffinity for affinity support, disables hwloc])], ,enable_native_affinity="yes")
- if test "x$enable_native_affinity" = xyes -a "x$cross_compiling" = xno; then
-    AC_MSG_CHECKING([for usable sched_setaffinity])
-@@ -256,6 +263,7 @@ AM_CONDITIONAL([HTOP_LINUX], [test "$my_
- AM_CONDITIONAL([HTOP_FREEBSD], [test "$my_htop_platform" = freebsd])
- AM_CONDITIONAL([HTOP_OPENBSD], [test "$my_htop_platform" = openbsd])
- AM_CONDITIONAL([HTOP_DARWIN], [test "$my_htop_platform" = darwin])
-+AM_CONDITIONAL([HTOP_NETBSD], [test "$my_htop_platform" = netbsd])
- AM_CONDITIONAL([HTOP_UNSUPPORTED], [test "$my_htop_platform" = unsupported])
- AC_SUBST(my_htop_platform)
- AC_CONFIG_FILES([Makefile htop.1])
diff --git a/htop/patches/patch-linux_LinuxProcess.c b/htop/patches/patch-linux_LinuxProcess.c
deleted file mode 100644
index ed391f5..0000000
--- a/htop/patches/patch-linux_LinuxProcess.c
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD$
-
---- linux/LinuxProcess.c.orig	2016-02-02 15:30:44.000000000 +0000
-+++ linux/LinuxProcess.c
-@@ -268,13 +268,20 @@ io_priority = (cpu_nice + 20) / 5. -- Fr
- #define LinuxProcess_effectiveIOPriority(p_) (IOPriority_class(p_->ioPriority) == IOPRIO_CLASS_NONE ? IOPriority_tuple(IOPRIO_CLASS_BE, (p_->super.nice + 20) / 5) : p_->ioPriority)
- 
- IOPriority LinuxProcess_updateIOPriority(LinuxProcess* this) {
--   IOPriority ioprio = syscall(SYS_ioprio_get, IOPRIO_WHO_PROCESS, this->super.pid);
-+   IOPriority ioprio = 0;
-+// Other OSes masquerading as Linux (NetBSD?) don't have this syscall 
-+#ifdef SYS_ioprio_get
-+   ioprio = syscall(SYS_ioprio_get, IOPRIO_WHO_PROCESS, this->super.pid);
-+#endif
-    this->ioPriority = ioprio;
-    return ioprio;
- }
- 
- bool LinuxProcess_setIOPriority(LinuxProcess* this, IOPriority ioprio) {
-+// Other OSes masquerading as Linux (NetBSD?) don't have this syscall
-+#ifdef SYS_ioprio_get
-    syscall(SYS_ioprio_set, IOPRIO_WHO_PROCESS, this->super.pid, ioprio);
-+#endif
-    return (LinuxProcess_updateIOPriority(this) == ioprio);
- }
- 


Home | Main Index | Thread Index | Old Index