From 4b55b83e9310d1c2d3d949b4231f22994cce0905 Mon Sep 17 00:00:00 2001 From: Tobias Breckle Date: Tue, 31 May 2011 15:21:19 +0200 Subject: added new package htop Signed-off-by: Tobias Breckle --- package/htop/Makefile | 37 +++++++++++++++++++++++++++++++++ package/htop/patches/patch-configure_ac | 10 +++++++++ package/htop/patches/patch-crt_c | 30 ++++++++++++++++++++++++++ package/htop/patches/patch-crt_h | 12 +++++++++++ 4 files changed, 89 insertions(+) create mode 100644 package/htop/Makefile create mode 100644 package/htop/patches/patch-configure_ac create mode 100644 package/htop/patches/patch-crt_c create mode 100644 package/htop/patches/patch-crt_h (limited to 'package') diff --git a/package/htop/Makefile b/package/htop/Makefile new file mode 100644 index 000000000..77e534200 --- /dev/null +++ b/package/htop/Makefile @@ -0,0 +1,37 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(TOPDIR)/rules.mk + +PKG_NAME:= htop +PKG_VERSION:= 0.9 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 7c5507f35f363f3f40183a2ba3c561f8 +PKG_DESCR:= grafical process manager +PKG_SECTION:= utils +PKG_DEPENDS:= libncurses +PKG_BUILDDEP:= ncurses +PKG_URL:= http://sourceforge.net/projects/htop +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=htop/${PKG_VERSION}/} + +PKG_FLAVOURS_HTOP:= MAN +PKGFD_MAN:= Install man files + +include $(TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,HTOP,htop,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) + +CONFIGURE_ARGS += ac_cv_file__proc_stat=yes \ + ac_cv_file__proc_meminfo=yes \ + ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_func_realloc_0_nonnull=yes + +htop-install: + $(INSTALL_DIR) $(IDIR_HTOP)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/htop $(IDIR_HTOP)/usr/bin +ifeq (${ADK_PACKAGE_HTOP_MAN},y) + ${INSTALL_DIR} ${IDIR_HTOP}/usr/share/man + ${CP} ${WRKINST}/usr/share/man/* ${IDIR_HTOP}/usr/share/man +endif + +include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/htop/patches/patch-configure_ac b/package/htop/patches/patch-configure_ac new file mode 100644 index 000000000..642939235 --- /dev/null +++ b/package/htop/patches/patch-configure_ac @@ -0,0 +1,10 @@ +--- htop-0.9.orig/configure.ac 2011-05-31 14:26:38.000000000 +0200 ++++ htop-0.9/configure.ac 2011-05-31 14:27:56.000000000 +0200 +@@ -25,6 +25,7 @@ + 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/package/htop/patches/patch-crt_c b/package/htop/patches/patch-crt_c new file mode 100644 index 000000000..b88d2a1de --- /dev/null +++ b/package/htop/patches/patch-crt_c @@ -0,0 +1,30 @@ +--- htop-0.9.orig/CRT.c 2010-11-23 16:56:32.000000000 +0100 ++++ htop-0.9/CRT.c 2011-05-31 14:30:06.000000000 +0200 +@@ -11,7 +11,9 @@ + #include + #include + #include ++#ifdef HAVE_EXECINFO_H + #include ++#endif + + #include "String.h" + +@@ -125,12 +127,14 @@ + CRT_done(); + #if __linux + fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://htop.sf.net\n"); +- #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 ++ #else ++ fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n"); ++ #endif + abort(); + } + diff --git a/package/htop/patches/patch-crt_h b/package/htop/patches/patch-crt_h new file mode 100644 index 000000000..17968fb69 --- /dev/null +++ b/package/htop/patches/patch-crt_h @@ -0,0 +1,12 @@ +--- htop-0.9.orig/CRT.h 2010-11-23 16:56:32.000000000 +0100 ++++ htop-0.9/CRT.h 2011-05-31 14:30:32.000000000 +0200 +@@ -14,7 +14,9 @@ + #include + #include + #include ++#ifdef HAVE_EXECINFO_H + #include ++#endif + + #include "String.h" + -- cgit v1.2.3 From 8381f7c4ca8cc9894ddd152e90a8333a7e6635d9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 15 Jun 2011 06:09:44 +0200 Subject: remove manpage flavour, should be done in a global context, when required, minor cleanup --- package/htop/Makefile | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'package') diff --git a/package/htop/Makefile b/package/htop/Makefile index 77e534200..aa9bbfce3 100644 --- a/package/htop/Makefile +++ b/package/htop/Makefile @@ -7,31 +7,22 @@ PKG_NAME:= htop PKG_VERSION:= 0.9 PKG_RELEASE:= 1 PKG_MD5SUM:= 7c5507f35f363f3f40183a2ba3c561f8 -PKG_DESCR:= grafical process manager +PKG_DESCR:= graphical process manager PKG_SECTION:= utils PKG_DEPENDS:= libncurses PKG_BUILDDEP:= ncurses PKG_URL:= http://sourceforge.net/projects/htop PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=htop/${PKG_VERSION}/} -PKG_FLAVOURS_HTOP:= MAN -PKGFD_MAN:= Install man files - include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,HTOP,htop,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_ARGS += ac_cv_file__proc_stat=yes \ - ac_cv_file__proc_meminfo=yes \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes + ac_cv_file__proc_meminfo=yes htop-install: $(INSTALL_DIR) $(IDIR_HTOP)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/htop $(IDIR_HTOP)/usr/bin -ifeq (${ADK_PACKAGE_HTOP_MAN},y) - ${INSTALL_DIR} ${IDIR_HTOP}/usr/share/man - ${CP} ${WRKINST}/usr/share/man/* ${IDIR_HTOP}/usr/share/man -endif include ${TOPDIR}/mk/pkg-bottom.mk -- cgit v1.2.3