Merge branch 'PLD'

Conflicts:
	builder.sh

diff --cc builder.sh
index b23153c5c638ae1e4e43fafba33302aa55f9a94b,f5de8ba255dac5d25fde96ba2cfaccbe70f4b666..318b0af6fbdd68bd587e36ae65cdc39c8ce440b5
mode 100755,100644..100755
--- 1/builder.sh
--- 2/builder.sh
+++ b/builder.sh
@@@ -104,19 -106,19 +104,24 @@@ PACKAGE_VERSION="
  PACKAGE_NAME=""
  ASSUMED_NAME=""
  PROTOCOL="http"
+ 
+ # use lftp by default when available
+ USE_LFTP=
+ lftp --version > /dev/null 2>&1 && USE_LFTP=yes
+ 
  WGET_RETRIES=${MAX_WGET_RETRIES:-0}
  
 -CVS_COMMAND=${CVS_COMMAND:-cvs}
  CVS_FORCE=""
  CVSIGNORE_DF="yes"
 -CVS_RETRIES=${MAX_CVS_RETRIES:-1000}
 -CVS_SERVER="cvs.pld-linux.org"
  CVSTAG=""
 +GIT_SERVER="git://carme.pld-linux.org"
 +GIT_PUSH="draenog@carme.pld-linux.org"
 +PACKAGES_DIR="packages"
 +HEAD_DETACHED=""
 +DEPTH=""
 +ALL_BRANCHES=""
 +REMOTE_PLD="origin"
 +NEW_REPO=""
  
  RES_FILE=""