# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1398341305 -7200
# Node ID 429355d87af598ca5fe02353d4f247d31e2c9fe5
# Parent  f8e9bf4989d3fea60c0ada14e3510506d0cec86f
Add dhid dyn IP daemon + add to ARM python-psutil and fix htop icon in /usr/share

diff -r f8e9bf4989d3 -r 429355d87af5 dhid/receipt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dhid/receipt	Thu Apr 24 14:08:25 2014 +0200
@@ -0,0 +1,38 @@
+# SliTaz package receipt.
+
+PACKAGE="dhid"
+VERSION="5.5"
+CATEGORY="network"
+SHORT_DESC="Open source Dynamic IP Updater."
+MAINTAINER="pankso@slitaz.org"
+LICENSE="BSD"
+TARBALL="$PACKAGE-$VERSION.tar.gz"
+WEB_SITE="http://dhis.org"
+WGET_URL="ftp://ftp.dhis.org/pub/dhis/$TARBALL"
+CONFIG_FILES="/etc/dhid.conf"
+HOST_ARCH="i486 arm"
+
+DEPENDS="gmp"
+BUILD_DEPENDS="gmp-dev"
+
+# Handle cross comilation
+case "$ARCH" in
+	arm) ARCH_FLAGS=" LFLAGS=-L/cross/$ARCH/sysroot/usr/lib" ;;
+esac
+	
+# Rules to configure and make the package.
+compile_rules()
+{
+	make CC=${HOST_SYSTEM}-gcc ${ARCH_FLAGS}
+}
+
+# Rules to gen a SliTaz package suitable for Tazpkg.
+genpkg_rules()
+{
+	mkdir -p $fs/usr/sbin $fs/etc $fs/usr/share/doc/dhid
+	cp ${src}/dhid.conf.sample ${fs}/etc/dhid.conf
+	cp ${src}/README ${fs}/usr/share/doc/dhid
+	cp -a ${src}/dhid ${fs}/usr/sbin
+	cp -a ${stuff}/init.d ${fs}/etc
+}
+
diff -r f8e9bf4989d3 -r 429355d87af5 dhid/stuff/init.d/dhid
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dhid/stuff/init.d/dhid	Thu Apr 24 14:08:25 2014 +0200
@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# /etc/init.d/dhid: Start, stop and restart dhis daemon on SliTaz
+#
+. /lib/libtaz.sh
+#. /etc/daemons.conf
+
+NAME=DHID
+DESC="dyn ip"
+DAEMON=/usr/sbin/dhid
+PIDFILE=/run/dhid.pid
+OPTIONS="-P $PIDFILE"
+
+case "$1" in
+		start)
+		if active_pidfile $PIDFILE dhid; then
+			echo "$NAME already running."; §exit 1
+		fi
+		echo -n "Starting $DESC: $NAME... "
+		$DAEMON $OPTIONS 
+		status ;;
+	
+	stop)
+		if ! active_pidfile $PIDFILE dhid; then
+			echo "$NAME is not running."; exit 1
+		fi
+		echo -n "Stopping $DESC: $NAME... "
+		kill $(cat $PIDFILE)
+		rm $PIDFILE
+		status ;;
+	
+	restart)
+		if ! active_pidfile $PIDFILE dhid; then
+			echo "$NAME is not running."; exit 1
+		fi
+		echo -n "Restarting $DESC: $NAME... "
+		kill $(cat $PIDFILE)
+		rm $PIDFILE
+		sleep 2
+		$DAEMON $OPTIONS
+		status ;;
+	
+	*) 
+		echo "Usage: /etc/init.d/$(basename $0) [start|stop|restart]"
+		exit 1 ;;
+esac
+
+exit 0
diff -r f8e9bf4989d3 -r 429355d87af5 htop/receipt
--- a/htop/receipt	Thu Apr 24 03:51:21 2014 +0200
+++ b/htop/receipt	Thu Apr 24 14:08:25 2014 +0200
@@ -14,6 +14,8 @@
 
 DEPENDS="ncursesw"
 BUILD_DEPENDS="ncursesw-dev"
+
+# Handle cross comilation
 case "$ARCH" in
 	arm) CROSS_ARGS="--enable-native_affinity=no" ;;
 esac
@@ -21,7 +23,6 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--enable-unicode \
 		$CONFIGURE_ARGS $CROSS_ARGS &&
@@ -33,5 +34,4 @@
 {
 	mkdir -p $fs/usr/bin
 	cp -a $install/usr/bin/* $fs/usr/bin
-	cp -a $install/usr/share/pixmaps $fs/usr/share
 }
diff -r f8e9bf4989d3 -r 429355d87af5 python-psutil/receipt
--- a/python-psutil/receipt	Thu Apr 24 03:51:21 2014 +0200
+++ b/python-psutil/receipt	Thu Apr 24 14:08:25 2014 +0200
@@ -10,6 +10,7 @@
 TARBALL="$SOURCE-$VERSION.tar.gz"
 WEB_SITE="http://code.google.com/p/psutil/"
 WGET_URL="http://psutil.googlecode.com/files/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="python"
 BUILD_DEPENDS="python-dev setuptools"
@@ -17,8 +18,19 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
+	# Cross compilation hack
+	case "$ARCH" in
+		arm*)
+			mv /usr/bin/i486-slitaz-linux-gcc /tmp &&
+			ln -s /cross/${ARCH}/tools/bin/arm-slitaz-linux-gnueabi-gcc \
+				/usr/bin/i486-slitaz-linux-gcc ;;
+	esac &&
 	python setup.py install --root=$DESTDIR
+	case "$ARCH" in
+		arm*) 
+			rm /usr/bin/i486-slitaz-linux-gcc &&
+			mv /tmp/i486-slitaz-linux-gcc /usr/bin ;;
+	esac
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r f8e9bf4989d3 -r 429355d87af5 python-rpi-pyglow/receipt
--- a/python-rpi-pyglow/receipt	Thu Apr 24 03:51:21 2014 +0200
+++ b/python-rpi-pyglow/receipt	Thu Apr 24 14:08:25 2014 +0200
@@ -12,7 +12,7 @@
 TAGS="raspberrypi rpi"
 HOST_ARCH="arm"
 
-DEPENDS="python python-smbus python-rpi-gpio"
+DEPENDS="python python-smbus python-psutil python-rpi-gpio"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()