# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1395178500 -3600
# Node ID 1a0b3262dccff4ad2e672c176a7ec792415a3c17
# Parent  bdce2e1088dff4f648d0ed3b5a4394a4795898d8
ARM: add dwm, dmenu, mpc, nmpc

diff -r bdce2e1088df -r 1a0b3262dccf dmenu/receipt
--- a/dmenu/receipt	Tue Mar 18 20:06:52 2014 +0000
+++ b/dmenu/receipt	Tue Mar 18 22:35:00 2014 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="dmenu"
-VERSION="4.1.1"
+VERSION="4.5"
 CATEGORY="misc"
 SHORT_DESC="dynamic menu lauch bar"
 MAINTAINER="jozee@slitaz.org"
@@ -10,6 +10,7 @@
 WEB_SITE="http://tools.suckless.org/dmenu/"
 WGET_URL="http://dl.suckless.org/tools/$TARBALL"
 TAGS="launchbar"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXinerama"
 BUILD_DEPENDS="xorg-libX11-dev xorg-libXinerama-dev"
@@ -17,8 +18,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-    cd $src
-    make &&
+    make CC=${HOST_SYSTEM}-gcc &&
     make DESTDIR=$DESTDIR install
 }
 
diff -r bdce2e1088df -r 1a0b3262dccf dwm/receipt
--- a/dwm/receipt	Tue Mar 18 20:06:52 2014 +0000
+++ b/dwm/receipt	Tue Mar 18 22:35:00 2014 +0100
@@ -7,9 +7,10 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="http://www.suckless.org/dwm/"
+WEB_SITE="http://dwm.suckless.org/"
 WGET_URL="http://dl.suckless.org/dwm/$TARBALL"
 TAGS="wm window-manager"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libX11 xorg-xsetroot"
 BUILD_DEPENDS="xorg-libX11-dev xorg-xproto xorg-xineramaproto \
@@ -18,9 +19,8 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	# From blue to brown and have lighter grey
-	sed -i s/'#0066ff'/'#754800'/g config.def.h
+	# From blue to grey and have lighter grey
+	sed -i s/'#0066ff'/'#222222'/g config.def.h
 	sed -i s/'#cccccc'/'#f1efeb'/g config.def.h
 	# 6 tag-mask
 	sed -i s/', "7", "8", "9"'// config.def.h
@@ -28,7 +28,7 @@
 	sed -i s/'1 << 8,'/'0,     '/ config.def.h
 	# [Shift]+[Alt]+[Enter]
 	sed -i s/uxterm/xterm/ config.def.h
-	make
+	make CC=${HOST_SYSTEM}-gcc
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -37,7 +37,6 @@
 	mkdir -p $fs/usr/bin
 	cp -a $src/dwm $fs/usr/bin
 	cp -a $stuff/dwm-session $fs/usr/bin
-	cp -a $stuff/dwmbox $fs/usr/bin
 	chown 0.0 $fs/usr/bin/*
 }
 
diff -r bdce2e1088df -r 1a0b3262dccf dwm/stuff/dwmbox
--- a/dwm/stuff/dwmbox	Tue Mar 18 20:06:52 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-#!/bin/sh
-#
-# Tiny GTKdialog box to help stating and usinf dwm.
-# (c) 2009 SliTaz GNU/Linux project - GNU gpl v3
-#
-
-export CONFIG_DIR="~/.config/dwm"
-export AUTOSTART_SCRIPT="${CONFIG_DIR}/autostart.sh"
-
-box()
-{
-	export BOX='
-<window title="dwm" icon-name="video-display">
-<vbox>
-	<vbox>
-		<text>
-			<label>
-"
-Dynamic Window Manager: [Shift+Alt+ENTER] to open a terminal.
-"
-			</label>
-		</text>
-	</vbox>
-	<hbox>
-		<entry>
-			<variable>RUN</variable>
-		</entry>
-		<button>
-			<label>Run</label>
-			<input file icon="forward"></input>
-			<action>$RUN &</action>
-		</button>
-	</hbox>
-	<hbox>
-		<button>
-			<label>Terminal</label>
-			<input file icon="xterm"></input>
-			<action>xterm &</action>
-		</button>
-		<button>
-			<label>Autostarted apps</label>
-			<input file icon="gtk-edit"></input>
-			<action>xterm -e "nano $AUTOSTART_SCRIPT" &</action>
-		</button>
-		<button>
-			<label>Close box</label>
-			<input file icon="gtk-close"></input>	
-			<action type="exit">exit</action>
-		</button>
-		<button>
-			<label>Exit dwm</label>
-			<input file icon="gtk-quit"></input>	
-			<action>killall dwm</action>
-		</button>
-	</hbox>
-</vbox>
-</window>'
-	gtkdialog --center --program=BOX
-}
-
-case $1 in
-	*_*)
-		# Exec all function called by args (must have an underscore).
-		$1 ;;
-	*)
-		sleep 1
-		box ;;
-esac
-
-exit 0
diff -r bdce2e1088df -r 1a0b3262dccf libmpdclient-dev/receipt
--- a/libmpdclient-dev/receipt	Tue Mar 18 20:06:52 2014 +0000
+++ b/libmpdclient-dev/receipt	Tue Mar 18 22:35:00 2014 +0100
@@ -1,13 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="libmpdclient-dev"
-VERSION="2.4"
+VERSION="2.6"
 CATEGORY="development"
 SHORT_DESC="libmpdclient dev files."
 MAINTAINER="erjo@slitaz.org"
 LICENSE="BSD"
 WEB_SITE="http://mpd.wikia.com/wiki/ClientLib:libmpdclient"
 WANTED="libmpdclient"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libmpdclient pkg-config"
 
diff -r bdce2e1088df -r 1a0b3262dccf libmpdclient/receipt
--- a/libmpdclient/receipt	Tue Mar 18 20:06:52 2014 +0000
+++ b/libmpdclient/receipt	Tue Mar 18 22:35:00 2014 +0100
@@ -1,14 +1,15 @@
 # SliTaz package receipt.
 
 PACKAGE="libmpdclient"
-VERSION="2.4"
+VERSION="2.6"
 CATEGORY="system-tools"
 SHORT_DESC="C & C++ API library for MPD."
 MAINTAINER="erjo@slitaz.org"
 LICENSE="BSD"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://mpd.wikia.com/wiki/ClientLib:libmpdclient"
-WGET_URL="$SF_MIRROR/musicpd/$VERSION/$TARBALL"
+WGET_URL="http://www.musicpd.org/download/$PACKAGE/2/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS=""
 
@@ -17,11 +18,8 @@
 {
 	cd $src
 	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
 		$CONFIGURE_ARGS &&
-	make && make DESTDIR=$DESTDIR install
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r bdce2e1088df -r 1a0b3262dccf mpc/receipt
--- a/mpc/receipt	Tue Mar 18 20:06:52 2014 +0000
+++ b/mpc/receipt	Tue Mar 18 22:35:00 2014 +0100
@@ -1,25 +1,23 @@
 # SliTaz package receipt.
 
 PACKAGE="mpc"
-VERSION="0.20"
+VERSION="0.25"
 CATEGORY="multimedia"
 SHORT_DESC="A command line tool to interface MPD."
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.musicpd.org/mpc.shtml"
-WGET_URL="$SF_MIRROR/musicpd/$PACKAGE/$VERSION/$TARBALL"
+TARBALL="$PACKAGE-$VERSION.tar.xz"
+WEB_SITE="http://www.musicpd.org/clients/mpc/"
+WGET_URL="http://www.musicpd.org/download/mpc/0/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="mpd libmpdclient"
 BUILD_DEPENDS="libmpdclient-dev"
 
 compile_rules()
 {
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--mandir=/usr/share/man $CONFIGURE_ARGS
-	make
-	make DESTDIR=$DESTDIR install
+	./configure $CONFIGURE_ARGS
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
@@ -27,6 +25,4 @@
 {
 	mkdir -p $fs/usr/share/mpc
 	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/doc/$PACKAGE $fs/usr/share
 }
-
diff -r bdce2e1088df -r 1a0b3262dccf ncmpc/receipt
--- a/ncmpc/receipt	Tue Mar 18 20:06:52 2014 +0000
+++ b/ncmpc/receipt	Tue Mar 18 22:35:00 2014 +0100
@@ -1,25 +1,25 @@
 # SliTaz package receipt.
 
 PACKAGE="ncmpc"
-VERSION="0.19"
+VERSION="0.21"
 CATEGORY="multimedia"
 SHORT_DESC="A ncurses MPD client."
 MAINTAINER="paul@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://hem.bredband.net/kaw/ncmpc/index.html"
-WGET_URL="$SF_MIRROR/musicpd/$PACKAGE/$VERSION/$TARBALL"
+WEB_SITE="http://www.musicpd.org/clients/ncmpc/"
+WGET_URL="http://www.musicpd.org/download/ncmpc/0/$TARBALL"
 TAGS="music player"
+HOST_ARCH="i486 arm"
 
 DEPENDS="mpd glib ncurses libmpdclient"
-BUILD_DEPENDS="pkg-config gtk+-dev ncurses-dev libmpdclient-dev"
+BUILD_DEPENDS="glib-dev ncurses-dev libmpdclient-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
-	$CONFIGURE_ARGS &&
+		$CONFIGURE_ARGS &&
 	make && make install
 }
 
@@ -28,6 +28,5 @@
 {
 	mkdir -p $fs/usr/share/ncmpc
 	cp -a $install/usr/bin $fs/usr
-	cp -a $install/usr/share/doc/$PACKAGE $fs/usr/share
 }
 
diff -r bdce2e1088df -r 1a0b3262dccf pango/receipt
--- a/pango/receipt	Tue Mar 18 20:06:52 2014 +0000
+++ b/pango/receipt	Tue Mar 18 22:35:00 2014 +0100
@@ -19,14 +19,10 @@
 
 # Handle cross compilation
 case "$ARCH" in
+	i?86) BUILD_DEPENDS="$BUILD_DEPENDS gobject-introspection-dev" ;;
 	arm*) export LDFLAGS="-L/cross/$ARCH/sysroot/usr/lib" ;;
 esac
 
-# Handle cross compilation
-case "$ARCH" in
-	i?86) BUILD_DEPENDS="$BUILD_DEPENDS gobject-introspection-dev" ;;
-esac
-
 # Rules to configure and make the package.
 compile_rules()
 {
diff -r bdce2e1088df -r 1a0b3262dccf slim/receipt
--- a/slim/receipt	Tue Mar 18 20:06:52 2014 +0000
+++ b/slim/receipt	Tue Mar 18 22:35:00 2014 +0100
@@ -10,12 +10,16 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WGET_URL="http://download.berlios.de/slim/$TARBALL"
 CONFIG_FILES="/etc/slim.conf"
+HOST_ARCH="i486 arm"
 
+RELATED="slim-pam slim-theme-default" # don't forget to upgrade them too
+SUGGESTED="slim-theme-default slitaz-configs"
 DEPENDS="gcc-lib-base libjpeg libpng xorg-libXft xorg-libXmu"
-SUGGESTED="slim-theme-default slitaz-configs"
-BUILD_DEPENDS="cmake freetype-dev jpeg-dev libpng-dev xorg-libXft-dev \
-xorg-libXmu-dev"
-RELATED="slim-pam slim-theme-default" # don't forget to upgrade them too
+BUILD_DEPENDS="freetype-dev jpeg-dev libpng-dev xorg-libXft-dev xorg-libXmu-dev"
+
+case "$ARCH" in
+	i?86) BUILD_DEPENDS="$BUILD_DEPENDS cmake" ;;
+esac
 
 # Rules to configure and make the package.
 compile_rules()
diff -r bdce2e1088df -r 1a0b3262dccf xorg-libXinerama-dev/receipt
--- a/xorg-libXinerama-dev/receipt	Tue Mar 18 20:06:52 2014 +0000
+++ b/xorg-libXinerama-dev/receipt	Tue Mar 18 22:35:00 2014 +0100
@@ -9,8 +9,9 @@
 WANTED="xorg-libXinerama"
 SOURCE="libXinerama"
 WEB_SITE="http://www.x.org/"
+HOST_ARCH="i486 arm"
 
-DEPENDS="xorg-libXinerama xorg-libXext-dev xorg-xineramaproto pkg-config"
+DEPENDS="xorg-libXinerama xorg-libXext-dev xorg-xineramaproto"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r bdce2e1088df -r 1a0b3262dccf xorg-libXinerama/receipt
--- a/xorg-libXinerama/receipt	Tue Mar 18 20:06:52 2014 +0000
+++ b/xorg-libXinerama/receipt	Tue Mar 18 22:35:00 2014 +0100
@@ -10,7 +10,7 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
-#HOST_ARCH="i486 arm"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libXext"
 BUILD_DEPENDS="xorg-libXext-dev xorg-xineramaproto"