Merge branch 'master' of git+ssh://openadk.org/git/openadk

mk/mirrors.mk

@@ -42,7 +42,6 @@ MASTER_SITE_GNU?=	\
   	ftp://ftp.sunet.se/pub/gnu/ \
 
 MASTER_SITE_SOURCEFORGE?=	\
-	http://easynews.dl.sourceforge.net/sourceforge/ \
 	http://puzzle.dl.sourceforge.net/sourceforge/ \
 	http://optusnet.dl.sourceforge.net/sourceforge/ \
 	http://heanet.dl.sourceforge.net/sourceforge/ \
@@ -55,6 +54,7 @@ MASTER_SITE_SOURCEFORGE?=	\
 	http://ovh.dl.sourceforge.net/sourceforge/ \
 	http://surfnet.dl.sourceforge.net/sourceforge/ \
 	http://ufpr.dl.sourceforge.net/sourceforge/ \
+	http://easynews.dl.sourceforge.net/sourceforge/ \
 
 MASTER_SITE_MYSQL?=		\
 	ftp://ftp.fu-berlin.de/unix/databases/mysql/ \

package/htop/Makefile

@@ -0,0 +1,28 @@
+# 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:=		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}/}
+
+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
+
+htop-install:
+	$(INSTALL_DIR) $(IDIR_HTOP)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/htop $(IDIR_HTOP)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk

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

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 <signal.h>
+ #include <stdlib.h>
+ #include <stdbool.h>
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#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();
+ }
+ 

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 <signal.h>
+ #include <stdlib.h>
+ #include <stdbool.h>
++#ifdef HAVE_EXECINFO_H
+ #include <execinfo.h>
++#endif
+ 
+ #include "String.h"
+