diff options
| -rw-r--r-- | sysutils/htop/Makefile | 12 | ||||
| -rw-r--r-- | sysutils/htop/distinfo | 13 | ||||
| -rw-r--r-- | sysutils/htop/patches/patch-CRT.c | 36 | ||||
| -rw-r--r-- | sysutils/htop/patches/patch-CRT.h | 14 | ||||
| -rw-r--r-- | sysutils/htop/patches/patch-Makefile.am | 15 | ||||
| -rw-r--r-- | sysutils/htop/patches/patch-configure.ac | 12 | ||||
| -rw-r--r-- | sysutils/htop/patches/patch-htop.c | 13 |
7 files changed, 109 insertions, 6 deletions
diff --git a/sysutils/htop/Makefile b/sysutils/htop/Makefile index 3c671569ef5..0993c4c80e8 100644 --- a/sysutils/htop/Makefile +++ b/sysutils/htop/Makefile @@ -1,19 +1,27 @@ -# $NetBSD: Makefile,v 1.3 2008/07/14 12:56:12 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2011/08/06 16:36:41 cheusov Exp $ # -DISTNAME= htop-0.6.6 +DISTNAME= htop-0.9 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=htop/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://htop.sourceforge.net/ COMMENT= Enhanced version of top utility +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes USE_NCURSES= yes # uses ncurses mouse definitions +USE_TOOLS+= autoreconf autoconf automake +USE_LIBTOOL= yes + +pre-configure: + set -e; cd ${WRKSRC}; autoreconf --force --install + .include "../../devel/ncurses/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/htop/distinfo b/sysutils/htop/distinfo index 51ce19f546e..a31d57c2a16 100644 --- a/sysutils/htop/distinfo +++ b/sysutils/htop/distinfo @@ -1,5 +1,10 @@ -$NetBSD: distinfo,v 1.2 2007/06/03 12:53:59 xtraeme Exp $ +$NetBSD: distinfo,v 1.3 2011/08/06 16:36:41 cheusov Exp $ -SHA1 (htop-0.6.6.tar.gz) = d0bb46a815a5075777ceb557586f72f622c28919 -RMD160 (htop-0.6.6.tar.gz) = 5d91a086657aba75d467cadf3eac4a476814cb5b -Size (htop-0.6.6.tar.gz) = 141140 bytes +SHA1 (htop-0.9.tar.gz) = d755bff386c260c06162d50113794722e98e9200 +RMD160 (htop-0.9.tar.gz) = ac0ef275e8ad5a27e5f35fa03800b15ef0966cfe +Size (htop-0.9.tar.gz) = 418767 bytes +SHA1 (patch-CRT.c) = 6e5a1269a7b424a855bb2d801c80cad149d3f42e +SHA1 (patch-CRT.h) = fff1471f4292bee7c50098e9098339f11ebe9782 +SHA1 (patch-Makefile.am) = e5daf2fb4c54eb0c58e3cd2b3a6ecfbf4aa0c03d +SHA1 (patch-configure.ac) = cdd87caa668092c3f37037fef968a42a54098250 +SHA1 (patch-htop.c) = 4ae97a04a7d6661fc138b78cae98ea31d8c6fe01 diff --git a/sysutils/htop/patches/patch-CRT.c b/sysutils/htop/patches/patch-CRT.c new file mode 100644 index 00000000000..6d3d27d2cc0 --- /dev/null +++ b/sysutils/htop/patches/patch-CRT.c @@ -0,0 +1,36 @@ +$NetBSD: patch-CRT.c,v 1.1 2011/08/06 16:36:41 cheusov Exp $ + +--- CRT.c.orig 2010-11-23 15:56:32.000000000 +0000 ++++ CRT.c +@@ -11,7 +11,9 @@ in the source distribution for its full + #include <signal.h> + #include <stdlib.h> + #include <stdbool.h> ++#ifdef HAVE_EXECINFO_H + #include <execinfo.h> ++#endif + + #include "String.h" + +@@ -118,7 +120,9 @@ int CRT_colors[LAST_COLORELEMENT] = { 0 + + char* CRT_termType; + ++#ifdef HAVE_EXECINFO_H + void *backtraceArray[128]; ++#endif + + static void CRT_handleSIGSEGV(int sgn) { + (void) sgn; +@@ -128,9 +132,11 @@ static void CRT_handleSIGSEGV(int sgn) { + #else + fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n"); + #endif ++ #ifdef HAVE_EXECINFO_H + size_t size = backtrace(backtraceArray, sizeof(backtraceArray)); + fprintf(stderr, "Backtrace: \n"); + backtrace_symbols_fd(backtraceArray, size, 2); ++ #endif + abort(); + } + diff --git a/sysutils/htop/patches/patch-CRT.h b/sysutils/htop/patches/patch-CRT.h new file mode 100644 index 00000000000..88c19fa5905 --- /dev/null +++ b/sysutils/htop/patches/patch-CRT.h @@ -0,0 +1,14 @@ +$NetBSD: patch-CRT.h,v 1.1 2011/08/06 16:36:41 cheusov Exp $ + +--- CRT.h.orig 2010-11-23 15:56:32.000000000 +0000 ++++ CRT.h +@@ -14,7 +14,9 @@ in the source distribution for its full + #include <signal.h> + #include <stdlib.h> + #include <stdbool.h> ++#ifdef HAVE_EXECINFO_H + #include <execinfo.h> ++#endif + + #include "String.h" + diff --git a/sysutils/htop/patches/patch-Makefile.am b/sysutils/htop/patches/patch-Makefile.am new file mode 100644 index 00000000000..39fc64788b1 --- /dev/null +++ b/sysutils/htop/patches/patch-Makefile.am @@ -0,0 +1,15 @@ +$NetBSD: patch-Makefile.am,v 1.1 2011/08/06 16:36:41 cheusov Exp $ + +--- Makefile.am.orig 2010-11-23 15:56:32.000000000 +0000 ++++ Makefile.am +@@ -55,8 +55,8 @@ hardened-debug: + debuglite: + $(MAKE) all CFLAGS="-ggdb -DDEBUGLITE" + +-.c.h: +- scripts/MakeHeader.py $< ++#.c.h: ++# scripts/MakeHeader.py $< + + + diff --git a/sysutils/htop/patches/patch-configure.ac b/sysutils/htop/patches/patch-configure.ac new file mode 100644 index 00000000000..985c313ee5d --- /dev/null +++ b/sysutils/htop/patches/patch-configure.ac @@ -0,0 +1,12 @@ +$NetBSD: patch-configure.ac,v 1.1 2011/08/06 16:36:41 cheusov Exp $ + +--- configure.ac.orig 2010-11-23 15:56:32.000000000 +0000 ++++ configure.ac +@@ -25,6 +25,7 @@ AC_HEADER_STDC + AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[ + missing_headers="$missing_headers $ac_header" + ]) ++AC_CHECK_HEADERS([execinfo.h]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_HEADER_STDBOOL diff --git a/sysutils/htop/patches/patch-htop.c b/sysutils/htop/patches/patch-htop.c new file mode 100644 index 00000000000..ccf506c19b4 --- /dev/null +++ b/sysutils/htop/patches/patch-htop.c @@ -0,0 +1,13 @@ +$NetBSD: patch-htop.c,v 1.1 2011/08/06 16:36:41 cheusov Exp $ + +--- htop.c.orig 2010-11-24 18:45:38.000000000 +0000 ++++ htop.c +@@ -272,7 +272,7 @@ int main(int argc, char** argv) { + setlocale(LC_CTYPE, getenv("LC_ALL")); + + /* Parse arguments */ +- while ((opt = getopt_long_only(argc, argv, "hvCs:d:u:", long_opts, &opti))) { ++ while ((opt = getopt_long(argc, argv, "hvCs:d:u:", long_opts, &opti))) { + if (opt == EOF) break; + switch (opt) { + case 'h': |