# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1398210984 -7200
# Node ID 1170c748b1ab31790c86fbb3972fed10d5b84172
# Parent  7d672a2330b8f6fda6e21ea35cd8fa9d4b436890
Up xpaint + libXaw3dXft and add to ARM (would be nice to have a small paint tool in next R-Pi release

diff -r 7d672a2330b8 -r 1170c748b1ab ed/receipt
--- a/ed/receipt	Wed Apr 23 01:06:05 2014 +0200
+++ b/ed/receipt	Wed Apr 23 01:56:24 2014 +0200
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 WEB_SITE="http://www.gnu.org/software/ed/"
 WGET_URL="$GNU_MIRROR/$PACKAGE/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS=""
 BUILD_DEPENDS=""
@@ -16,7 +17,8 @@
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure --prefix=/usr && make && make install
+	./configure --prefix=/usr && 
+	make CC=${HOST_SYSTEM}-gcc && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 7d672a2330b8 -r 1170c748b1ab libXaw3dXft-dev/receipt
--- a/libXaw3dXft-dev/receipt	Wed Apr 23 01:06:05 2014 +0200
+++ b/libXaw3dXft-dev/receipt	Wed Apr 23 01:56:24 2014 +0200
@@ -1,13 +1,14 @@
 # SliTaz package receipt.
 
 PACKAGE="libXaw3dXft-dev"
-VERSION="1.6.2"
+VERSION="1.6.2c"
 CATEGORY="development"
 SHORT_DESC="Xpaint module devel files."
 MAINTAINER="pascal.bellard@slitaz.org"
 LICENSE="MIT"
 WANTED="libXaw3dXft"
 WEB_SITE="http://sourceforge.net/projects/sf-xpaint/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libXaw3dXft xorg-libXmu-dev pkg-config"
 
diff -r 7d672a2330b8 -r 1170c748b1ab libXaw3dXft/receipt
--- a/libXaw3dXft/receipt	Wed Apr 23 01:06:05 2014 +0200
+++ b/libXaw3dXft/receipt	Wed Apr 23 01:56:24 2014 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="libXaw3dXft"
-VERSION="1.6.2"
+VERSION="1.6.2c"
 CATEGORY="x-window"
 SHORT_DESC="Xpaint module"
 MAINTAINER="pascal.bellard@slitaz.org"
@@ -9,6 +9,7 @@
 WEB_SITE="http://sourceforge.net/projects/sf-xpaint/"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/sf-xpaint/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libXmu fontconfig xorg-libXrender xorg-libXft lzlib"
 BUILD_DEPENDS="xorg-libXmu-dev util-linux-uuid-dev expat-dev libxml2-dev"
diff -r 7d672a2330b8 -r 1170c748b1ab ntpclient/receipt
--- a/ntpclient/receipt	Wed Apr 23 01:06:05 2014 +0200
+++ b/ntpclient/receipt	Wed Apr 23 01:56:24 2014 +0200
@@ -11,15 +11,11 @@
 WGET_URL="http://doolittle.icarus.com/ntpclient/$TARBALL"
 HOST_ARCH="i486 arm"
 
-DEPENDS=""
-
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	
 	# disable debug
-	sed -i 's/\(^CFLAGS += -DENABLE_DEBUG\)/#\1/' Makefile
+	sed -i 's/\(^CFLAGS += -DENABLE_DEBUG\)/#\1/' Makefile && 
 	make 
 }
 
diff -r 7d672a2330b8 -r 1170c748b1ab xorg-libXaw3d-dev/receipt
--- a/xorg-libXaw3d-dev/receipt	Wed Apr 23 01:06:05 2014 +0200
+++ b/xorg-libXaw3d-dev/receipt	Wed Apr 23 01:56:24 2014 +0200
@@ -9,6 +9,7 @@
 WANTED="xorg-libXaw3d"
 SOURCE="libXaw3d"
 WEB_SITE="http://www.x.org/"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libXaw3d xorg-libXmu-dev xorg-libXpm-dev pkg-config"
 
diff -r 7d672a2330b8 -r 1170c748b1ab xorg-libXaw3d/receipt
--- a/xorg-libXaw3d/receipt	Wed Apr 23 01:06:05 2014 +0200
+++ b/xorg-libXaw3d/receipt	Wed Apr 23 01:56:24 2014 +0200
@@ -10,6 +10,7 @@
 TARBALL="$SOURCE-$VERSION.tar.bz2"
 WEB_SITE="http://www.x.org/"
 WGET_URL="$XORG_MIRROR/lib/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="xorg-libXmu"
 BUILD_DEPENDS="xorg-libXmu-dev util-linux-uuid-dev"
diff -r 7d672a2330b8 -r 1170c748b1ab xpaint/receipt
--- a/xpaint/receipt	Wed Apr 23 01:06:05 2014 +0200
+++ b/xpaint/receipt	Wed Apr 23 01:56:24 2014 +0200
@@ -1,23 +1,29 @@
 # SliTaz package receipt.
 
 PACKAGE="xpaint"
-VERSION="2.9.9.1"
+VERSION="2.9.10.2"
 CATEGORY="graphics"
 SHORT_DESC="Simple paint program for X"
 MAINTAINER="mojo@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="http://sourceforge.net/projects/sf-xpaint/"
+WEB_SITE="http://sf-xpaint.sourceforge.net/"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WGET_URL="$SF_MIRROR/sf-$PACKAGE/$TARBALL"
+HOST_ARCH="i486 arm"
 
-DEPENDS="openjpeg libXaw3dXft"
+DEPENDS="openjpeg libXaw3dXft xorg-libXaw3d"
 BUILD_DEPENDS="openjpeg-dev libXaw3dXft-dev libpng-dev jpeg-dev tiff-dev \
-expat-dev libxml2-dev util-linux-uuid-dev"
+expat-dev libxml2-dev util-linux-uuid-dev xorg-libXaw3d-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	./configure $CONFIGURE_ARGS && make -j 1 && make install
+	[ "$ARCH" == "i486" ] && LIBTOOL=libtool
+	./configure $CONFIGURE_ARGS &&
+	# Fix cross compilation
+	sed -i s'/$(CC) substads.c/gcc substads.c/' Makefile &&
+	sed -i s'/$(CC) preproc.c/gcc preproc.c/' Makefile &&
+	make -j 1 LIBTOOL=${HOST_SYSTEM}-libtool && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.