Merge all changes from trunk

sys-process/htop/htop-1.0.2.bep

@@ -0,0 +1,19 @@
+DESCRIPTION="htop- an interactive process viewer for Linux" 
+HOMEPAGE="http://htop.sourceforge.net/" 
+SRC_URI="http://downloads.sourceforge.net/project/htop/htop/1.0.2/htop-1.0.2.tar.gz?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fhtop%2Ffiles%2Fhtop%2F1.0.2%2F&ts=1354198817&use_mirror=heanet"
+CHECKSUM_MD5="0d01cca8df3349c74569cefebbd9919e"
+REVISION="1"
+STATUS_HAIKU="broken"
+DEPEND=""
+BUILD {
+	cd htop-1.0.2
+	./configure --disable-unicode --prefix=`finddir B_COMMON_DIRECTORY`
+	make
+}
+
+INSTALL {
+	cd htop-1.0.2
+	make install
+}
+LICENSE="GNU GPL v2"
+COPYRIGHT="2004-2010 Hisham Muhammad"

sys-process/htop/patches/htop-1.0.2.patch

@@ -0,0 +1,47 @@
+diff -Naur htop-1.0.2/configure htop-1.0.2-haiku/configure
+--- htop-1.0.2/configure	2012-10-03 20:13:10.000000000 +0000
++++ htop-1.0.2-haiku/configure	2012-11-29 12:07:07.717750272 +0000
+@@ -11388,13 +11388,13 @@
+ 
+ 
+ # Checks for libraries.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ceil in -lm" >&5
+-$as_echo_n "checking for ceil in -lm... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ceil in $LIBM" >&5
++$as_echo_n "checking for ceil in $LIBM... " >&6; }
+ if test "${ac_cv_lib_m_ceil+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lm  $LIBS"
++LIBS="$LIBM  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -11429,7 +11429,7 @@
+ #define HAVE_LIBM 1
+ _ACEOF
+ 
+-  LIBS="-lm $LIBS"
++  LIBS="$LIBM $LIBS"
+ 
+ else
+   missing_libraries="$missing_libraries libm"
+diff -Naur htop-1.0.2/configure.ac htop-1.0.2-haiku/configure.ac
+--- htop-1.0.2/configure.ac	2012-08-29 13:24:31.023330816 +0000
++++ htop-1.0.2-haiku/configure.ac	2012-11-29 10:13:11.320602112 +0000
+@@ -1,3 +1,5 @@
++
++
+ #                                               -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+ 
+@@ -22,7 +24,7 @@
+ AC_PROG_LIBTOOL
+ 
+ # Checks for libraries.
+-AC_CHECK_LIB([m], [ceil], [], [missing_libraries="$missing_libraries libm"])
++AC_CHECK_LIB(m, cos, LIBM="$LIBM")
+ 
+ # Checks for header files.
+ AC_HEADER_DIRENT