# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1416760086 -3600
# Node ID 552ec1a3614c3909e7fca3dd841cdac461c7ff5e
# Parent  48c3ef68bd4f7ddf8d1857550aebfd19b45983d8
fix dropbox

diff -r 48c3ef68bd4f -r 552ec1a3614c dropbox
--- a/dropbox	Fri Nov 21 08:55:47 2014 +0100
+++ b/dropbox	Sun Nov 23 17:28:06 2014 +0100
@@ -4,10 +4,10 @@
 SUGGESTED="ntlmaps"
 PLATFORM="lnx.x86"	# or lnx.x86_64
 TARBALL=$PACKAGE-$PLATFORM.tar.gz
-URL="$WEB_SITE/download/?plat=$PLATFORM"
+WGET_URL="$WEB_SITE/download/?plat=$PLATFORM"
 
 # Download the file
-wget --no-check-certificate -O $TARBALL $URL 
+wget --no-check-certificate -O $TARBALL $WGET_URL 
 
 [ -f $TARBALL ] || abort_package "Could not download $TARBALL. Exiting."
 
@@ -22,13 +22,8 @@
 	$PACKAGE-$VERSION/fs/usr/share/pixmaps 
 
 mv $TMP_DIR/.dropbox-dist $PACKAGE-$VERSION/fs/usr/lib/dropbox
-
-# Custom Dropboxd
-cat > $PACKAGE-$VERSION/fs/usr/lib/dropbox/dropboxd << "EOT"
-#!/bin/sh
-PAR=/usr/lib/dropbox
-LD_LIBRARY_PATH=$PAR:$LD_LIBRARY_PATH exec $PAR/dropbox $@
-EOT
+mv -f $PACKAGE-$VERSION/fs/usr/lib/dropbox/dropbox-$PLATFORM*/* \
+	$PACKAGE-$VERSION/fs/usr/lib/dropbox
 
 # Desktop file
 cat > $PACKAGE-$VERSION/fs/usr/share/applications/dropbox.desktop << EOT
diff -r 48c3ef68bd4f -r 552ec1a3614c geogebra
--- a/geogebra	Fri Nov 21 08:55:47 2014 +0100
+++ b/geogebra	Sun Nov 23 17:28:06 2014 +0100
@@ -1,11 +1,11 @@
 WEB_SITE="http://www.geogebra.org/cms/en/"
 DEPENDS="bash java-jre ncurses"
-URL=http://www.geogebra.org/installers/deb.php
+WGET_URL=http://www.geogebra.org/installers/deb.php
 TARBALL=geogebra.deb
 
-wget -O $TARBALL $URL
+wget -O $TARBALL $WGET_URL
 
-[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $URL. Exiting."
+[ -f $TARBALL ] || abort_package "Could not download $TARBALL from $WGET_URL. Exiting."
 
 mkdir $PACKAGE
 dpkg-deb -e $TARBALL $PACKAGE/meta
diff -r 48c3ef68bd4f -r 552ec1a3614c speedtouch-firmware
--- a/speedtouch-firmware	Fri Nov 21 08:55:47 2014 +0100
+++ b/speedtouch-firmware	Sun Nov 23 17:28:06 2014 +0100
@@ -6,12 +6,12 @@
 SHORT_DESC="Firmware for SpeedTouch ADSL Modem."
 WEB_SITE="http://www.linux-usb.org/SpeedTouch/"
 #http://speedtouch.hysplace.co.uk/firmware.htm
-#URL="http://www.speedtouch.com/download/drivers/USB/$TARBALL"
+#WGET_URL="http://www.speedtouch.com/download/drivers/USB/$TARBALL"
 #from http://www.filewatcher.com/m/SpeedTouch330_firmware_3012.zip.769125-0.html
-URL="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/$TARBALL"
-wget $URL
+WGET_URL="ftp://ftp.netbsd.org/pub/pkgsrc/distfiles/$TARBALL"
+wget $WGET_URL
 [ $TARBALL ] || abort_package "Could not download $TARBALL. Exiting."
-unzip -n $(basename $URL)
+unzip -n $(basename $WGET_URL)
 wget http://www.linux-usb.org/SpeedTouch/firmware/firmware-extractor.tar.gz
 tar xzf firmware-extractor.tar.gz
 cd firmware-extractor/