# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1394858036 -3600
# Node ID 5613d51e1fdf94af3bb42716a57c63feb3069110
# Parent  236ff5a1c6f03da148e92c57dee915a799885ba0
ARM: add more *usb* support and unixODBC

diff -r 236ff5a1c6f0 -r 5613d51e1fdf libunixODBC/receipt
--- a/libunixODBC/receipt	Sat Mar 15 03:41:10 2014 +0100
+++ b/libunixODBC/receipt	Sat Mar 15 05:33:56 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.unixodbc.org/"
 WANTED="unixODBC"
+HOST_ARCH="i486 arm"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 236ff5a1c6f0 -r 5613d51e1fdf libusb-compat-dev/receipt
--- a/libusb-compat-dev/receipt	Sat Mar 15 03:41:10 2014 +0100
+++ b/libusb-compat-dev/receipt	Sat Mar 15 05:33:56 2014 +0100
@@ -8,8 +8,9 @@
 LICENSE="LGPL2.1"
 WANTED="libusb-compat"
 WEB_SITE="http://libusb.sourceforge.net/"
+HOST_ARCH="i486 arm"
 
-DEPENDS="pkg-config"
+DEPENDS="libusb-compat"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 236ff5a1c6f0 -r 5613d51e1fdf libusb-compat/receipt
--- a/libusb-compat/receipt	Sat Mar 15 03:41:10 2014 +0100
+++ b/libusb-compat/receipt	Sat Mar 15 05:33:56 2014 +0100
@@ -9,6 +9,7 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://libusb.sourceforge.net/"
 WGET_URL="$SF_MIRROR/libusb/$TARBALL"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libusb"
 BUILD_DEPENDS="libusb-dev"
diff -r 236ff5a1c6f0 -r 5613d51e1fdf libusb-dev/receipt
--- a/libusb-dev/receipt	Sat Mar 15 03:41:10 2014 +0100
+++ b/libusb-dev/receipt	Sat Mar 15 05:33:56 2014 +0100
@@ -8,8 +8,9 @@
 LICENSE="LGPL2.1"
 WANTED="libusb"
 WEB_SITE="http://libusb.sourceforge.net/"
+HOST_ARCH="i486 arm"
 
-DEPENDS="libusb libusb-compat-dev pkg-config"
+DEPENDS="libusb libusb-compat-dev"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
diff -r 236ff5a1c6f0 -r 5613d51e1fdf libusb/receipt
--- a/libusb/receipt	Sat Mar 15 03:41:10 2014 +0100
+++ b/libusb/receipt	Sat Mar 15 05:33:56 2014 +0100
@@ -9,16 +9,13 @@
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
 WEB_SITE="http://libusb.sourceforge.net/"
 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL"
+HOST_ARCH="i486 arm"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	./configure \
-		--prefix=/usr \
-		$CONFIGURE_ARGS &&
-	make &&
-	make DESTDIR=$DESTDIR install
+	./configure $CONFIGURE_ARGS &&
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 236ff5a1c6f0 -r 5613d51e1fdf nano/receipt
--- a/nano/receipt	Sat Mar 15 03:41:10 2014 +0100
+++ b/nano/receipt	Sat Mar 15 05:33:56 2014 +0100
@@ -19,7 +19,13 @@
 SUGGESTED="gpm"
 BUILD_DEPENDS="ncursesw-dev"
 
-export LDFLAGS="-L/usr/cross/arm/lib -L/usr/cross/arm/usr/lib"
+# Handle cross compilation
+case "$ARCH" in
+	arm)
+		export LDFLAGS="-L/usr/cross/arm/lib -L/usr/cross/arm/usr/lib" 
+		BUILD_DEPENDS="ncurses-dev";;
+	i?86) ARCH_ARGS="--enable-utf8" ;;
+esac
 
 # Rules to configure and make the package.
 compile_rules()
@@ -27,10 +33,8 @@
 	./configure \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--enable-utf8 \
-		$CONFIGURE_ARGS &&
-	make &&
-	make install
+		$CONFIGURE_ARGS $ARCH_ARGS &&
+	make && make install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r 236ff5a1c6f0 -r 5613d51e1fdf php/receipt
--- a/php/receipt	Sat Mar 15 03:41:10 2014 +0100
+++ b/php/receipt	Sat Mar 15 05:33:56 2014 +0100
@@ -10,6 +10,7 @@
 WEB_SITE="http://www.php.net/"
 WGET_URL="http://www.php.net/distributions/$TARBALL"
 PROVIDE="php:lighttpd"
+#HOST_ARCH="i486 arm"
 
 DEPENDS="php-common lighttpd zlib libxml2 sqlite libssl"
 BUILD_DEPENDS="sqlite-dev libxml2-dev zlib-dev libmysqlclient mysql-dev \
@@ -18,56 +19,85 @@
 libldap apr-dev libmcrypt-dev curl-dev cyrus-sasl-dev perl pkg-config \
 jpeg-dev net-snmp-dev libvpx-dev apache coreutils-conditions sed re2c"
 
+case "$ARCH" in
+	i?86)
+		ARCH_ARGS="\
+			--prefix=/usr \
+			--sysconfdir=/etc \
+			--infodir=/usr/share/info \
+			--mandir=/usr/share/man \
+			--enable-mbstring \
+			--enable-sockets \
+			--enable-ftp \
+			--enable-zip \
+			--enable-calendar \
+			--enable-exif \
+			--config-cache \
+			--enable-dba=shared \
+			--with-config-file-path=/etc \
+			--with-zlib \
+			--with-gettext \
+			--with-mcrypt=shared,/usr \
+			--with-mysql=shared,/usr \
+			--with-mysqli=shared \
+			--with-mysql-sock=/var/mysql/mysql.sock \
+			--with-pdo-sqlite=shared,/usr \
+			--with-pgsql=shared,/usr \
+			--with-snmp=shared,/usr \
+			--enable-soap=shared,/usr \
+			--with-ldap=shared \
+			--with-imap=shared \
+			--with-imap-ssl \
+			--with-mhash \
+			--with-gd=shared \
+			--with-jpeg-dir=/usr \
+			--with-png-dir=/usr \
+			--with-vpx-dir=/usr \
+			--with-openssl=shared \
+			--with-unixODBC=shared,/usr \
+			--with-pear=/usr/share/php \
+			--with-pdo-mysql=shared \
+			--with-pdo-pgsql=shared \
+			--with-curl=shared \
+			--enable-sqlite-utf8 \
+			--with-sqlite3=shared,/usr \
+			--with-sqlite=shared \
+			--enable-maintainer-zts" ;;
+	arm*)
+		BUILD_DEPENDS="sqlite-dev libxml2-dev zlib-dev curl-dev"
+		ARCH_ARGS="\
+			--prefix=/usr \
+			--sysconfdir=/etc \
+			--infodir=/usr/share/info \
+			--mandir=/usr/share/man \
+			--config-cache \
+			--enable-mbstring \
+			--enable-sockets \
+			--enable-ftp \
+			--enable-zip \
+			--enable-calendar \
+			--enable-exif \
+			--enable-dba=shared \
+			--enable-sqlite-utf8 \
+			--with-mhash \
+			--with-sqlite=shared \
+			--with-config-file-path=/etc \
+			--with-zlib \
+			--with-gettext \
+			--with-curl=shared \
+			--with-openssl=shared \
+			--with-jpeg-dir=/usr \
+			--with-png-dir=/usr \
+			--with-apxs2=/usr/bin/apxs" ;;
+esac
+
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	COMMON_ARGS="\
---prefix=/usr \
---sysconfdir=/etc \
---infodir=/usr/share/info \
---mandir=/usr/share/man \
---enable-mbstring \
---enable-sockets \
---enable-ftp \
---enable-zip \
---enable-calendar \
---enable-exif \
---config-cache \
---enable-dba=shared \
---with-config-file-path=/etc \
---with-zlib \
---with-gettext \
---with-mcrypt=shared,/usr \
---with-mysql=shared,/usr \
---with-mysqli=shared \
---with-mysql-sock=/var/mysql/mysql.sock \
---with-pdo-sqlite=shared,/usr \
---with-pgsql=shared,/usr \
---with-snmp=shared,/usr \
---enable-soap=shared,/usr \
---with-ldap=shared \
---with-imap=shared --with-imap-ssl \
---with-mhash \
---with-gd=shared \
---with-jpeg-dir=/usr \
---with-png-dir=/usr \
---with-vpx-dir=/usr \
---with-openssl=shared \
---with-unixODBC=shared,/usr \
---with-pear=/usr/share/php \
---with-pdo-mysql=shared \
---with-pdo-pgsql=shared \
---with-curl=shared \
---enable-sqlite-utf8 \
---with-sqlite3=shared,/usr \
---with-sqlite=shared \
---enable-maintainer-zts \
-"
 	sed -i 's/pam_start/pam_nostart/' configure
 	./configure $COMMON_ARGS $CONFIGURE_ARGS && \
 	make $MAKEFLAGS && make -j1 INSTALL_ROOT=$DESTDIR install
-	./configure $COMMON_ARGS $CONFIGURE_ARGS --with-apxs2=/usr/bin/apxs && \
+	./configure $ARCH_ARGS $CONFIGURE_ARGS --with-apxs2=/usr/bin/apxs && \
 	make $MAKEFLAGS && {
 		mkdir -p $DESTDIR/etc/apache
 		cp /etc/apache/httpd.conf $DESTDIR/etc/apache/httpd.conf
diff -r 236ff5a1c6f0 -r 5613d51e1fdf unixODBC-dev/receipt
--- a/unixODBC-dev/receipt	Sat Mar 15 03:41:10 2014 +0100
+++ b/unixODBC-dev/receipt	Sat Mar 15 05:33:56 2014 +0100
@@ -8,6 +8,7 @@
 LICENSE="LGPL2.1"
 WEB_SITE="http://www.unixodbc.org/"
 WANTED="unixODBC"
+HOST_ARCH="i486 arm"
 
 DEPENDS="unixODBC"
 
diff -r 236ff5a1c6f0 -r 5613d51e1fdf unixODBC/receipt
--- a/unixODBC/receipt	Sat Mar 15 03:41:10 2014 +0100
+++ b/unixODBC/receipt	Sat Mar 15 05:33:56 2014 +0100
@@ -10,16 +10,18 @@
 WEB_SITE="http://www.unixodbc.org/"
 WGET_URL="${WEB_SITE}$TARBALL"
 TAGS="database"
+HOST_ARCH="i486 arm"
 
 DEPENDS="libunixODBC readline"
+DEPENDS="readline-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
-	./configure --prefix=/usr --infodir=/usr/share/info \
-	--disable-gui --sysconfdir=/etc \
-	--mandir=/usr/share/man $CONFIGURE_ARGS &&
+	./configure \
+		--sysconfdir=/etc \
+		--disable-gui \
+		$CONFIGURE_ARGS &&
 	make $MAKEFLAGS &&
 	make DESTDIR=$DESTDIR install
 }
diff -r 236ff5a1c6f0 -r 5613d51e1fdf usbids/receipt
--- a/usbids/receipt	Sat Mar 15 03:41:10 2014 +0100
+++ b/usbids/receipt	Sat Mar 15 05:33:56 2014 +0100
@@ -1,24 +1,21 @@
 # SliTaz package receipt.
 
 PACKAGE="usbids"
-VERSION="20130310"
+VERSION="20140315"
 CATEGORY="misc"
 SHORT_DESC="usb.ids file"
 MAINTAINER="slaxemulator@gmail.com"
 LICENSE="PublicDomain"
-DEPENDS=""
 TARBALL="usb-$VERSION.ids"
 WEB_SITE="http://www.linux-usb.org/"
 WGET_URL="${WEB_SITE}usb.ids"
+HOST_ARCH="i486 arm"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
 genpkg_rules()
 {
 	mkdir -p $fs/usr/share/misc
 	cp -a $src/usb-$VERSION.ids $fs/usr/share/misc/usb.ids
-	gzip $fs/usr/share/misc/usb.ids
-        # lsusb from usbutils needs this symlink to find usb.ids  
-        cd $fs/usr/share
-        ln -s /usr/share/misc/usb.ids.gz  
+	gzip $fs/usr/share/misc/usb.ids 
 }
 
diff -r 236ff5a1c6f0 -r 5613d51e1fdf usbutils/receipt
--- a/usbutils/receipt	Sat Mar 15 03:41:10 2014 +0100
+++ b/usbutils/receipt	Sat Mar 15 05:33:56 2014 +0100
@@ -10,15 +10,15 @@
 WEB_SITE="http://linux-usb.sourceforge.net/"
 #WGET_URL="http://www.kernel.org/pub/linux/utils/usb/$PACKAGE/$TARBALL"
 WGET_URL="http://sourceware.mirrors.tds.net/pub/kernel.org/linux/utils/usb/$PACKAGE/$TARBALL"
+HOST_ARCH="i486 arm"
+
 TAGS="usb"
-
 DEPENDS="glibc-base libusb libusb-compat zlib usbids"
 BUILD_DEPENDS="libusb-dev pkg-config zlib-dev"
 
 # Rules to configure and make the package.
 compile_rules()
 {
-	cd $src
 	./configure \
 		--prefix=/usr \
 		--libdir=/usr/lib \
@@ -43,8 +43,6 @@
 #
 pre_install()
 {
-	local root
-	root=$1
 	echo "Processing pre-install commands..."
 	echo -n "Removing Busybox lsusb... "
 	rm -f $root/usr/bin/lsusb