diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 55baddd58e..ee88ebc719 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,17 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-01-22 10:15 UTC+0100 Lorenzo Fiorini (lorenzo.fiorini/at/gmail.com)
+  * bin/hb-func.sh
+    * fix darwin detection 
+  * make_gnu.sh
+    * fix darwin detection
+	 * added ncurses detection logic like slang one
+  * contrib/hbtip/ftpcln.prg
+    * fixed wrong changes from nil to .f.
+	 * someone in the past has done a mass change of the return values
+	 * without checking the results
+
 2009-01-22 09:30 UTC+0100 Lorenzo Fiorini (lorenzo.fiorini/at/gmail.com)
   * bin/hb-mkslib.sh
     * fix name of dylibs 
diff --git a/harbour/bin/hb-func.sh b/harbour/bin/hb-func.sh
index 50d410bf1f..de70d71911 100755
--- a/harbour/bin/hb-func.sh
+++ b/harbour/bin/hb-func.sh
@@ -122,7 +122,7 @@ mk_hbtools()
     elif [ "${HB_ARCHITECTURE}" = "w32" ]; then
         hb_tool="$1/${hb_pref}-build"
         hb_path_separator=":"
-        if [ "${HB_MK_STATIC}" != "no" ]; then
+        if [ "${HB_MK_STATIC}" = "yes" ]; then
             hb_static="yes"
             hb_static_default=" (default)"
         else
@@ -133,7 +133,7 @@ mk_hbtools()
     elif [ "${HB_ARCHITECTURE}" = "darwin" ]; then
         hb_tool="$1/${hb_pref}-build"
         hb_path_separator=":"
-        if [ "${HB_MK_STATIC}" != "no" ]; then
+        if [ "${HB_MK_STATIC}" = "yes" ]; then
             hb_static="yes"
             hb_static_default=" (default)"
         else
diff --git a/harbour/contrib/hbtip/ftpcln.prg b/harbour/contrib/hbtip/ftpcln.prg
index ccf25e2c63..0411cb3063 100644
--- a/harbour/contrib/hbtip/ftpcln.prg
+++ b/harbour/contrib/hbtip/ftpcln.prg
@@ -407,13 +407,13 @@ METHOD List( cSpec ) CLASS tIPClientFTP
    IF ::bUsePasv
       IF .not. ::Pasv()
          //::bUsePasv := .F.
-         RETURN .F.
+         RETURN NIL
       ENDIF
    ENDIF
 
    IF .not. ::bUsePasv
       IF .not. ::Port()
-         RETURN .F.
+         RETURN NIL
       ENDIF
    ENDIF
 
@@ -535,7 +535,7 @@ METHOD Read( nLen ) CLASS tIPClientFTP
          IF .not. ::CWD( ::oUrl:cPath )
 
             ::bEof := .T.  // no data for this transaction
-            RETURN .F.
+            RETURN NIL
 
          ENDIF
 
@@ -550,7 +550,7 @@ METHOD Read( nLen ) CLASS tIPClientFTP
       IF .not. ::Retr( ::oUrl:cFile )
 
          ::bEof := .T.  // no data for this transaction
-         RETURN .F.
+         RETURN NIL
 
       ENDIF
 
diff --git a/harbour/make_gnu.sh b/harbour/make_gnu.sh
index f42e0779be..255a48bd04 100755
--- a/harbour/make_gnu.sh
+++ b/harbour/make_gnu.sh
@@ -25,6 +25,7 @@ if [ -z "$HB_ARCHITECTURE" ]; then
             *os/2*)                    hb_arch="os2" ;;
             *dos)                      hb_arch="dos" ;;
             *bsd)                      hb_arch="bsd" ;;
+            *darwin)                   hb_arch="darwin" ;;
         esac
     fi
     export HB_ARCHITECTURE="$hb_arch"
@@ -65,6 +66,22 @@ if [ -z "${HB_WITHOUT_GTSLN}" ]; then
     export HB_WITHOUT_GTSLN
 fi
 
+if [ -z "${HB_WITHOUT_GTCRS}" ]; then
+    HB_WITHOUT_GTCRS=yes
+    case "$HB_ARCHITECTURE" in
+        linux|bsd|darwin|hpux|sunos)
+            for dir in /usr /usr/local /sw /opt/local
+            do
+                if [ -f ${dir}/include/ncurses.h ] || \
+                   [ -f ${dir}/include/ncurses/ncurses.h ]; then
+                    HB_WITHOUT_GTCRS=no
+                fi
+            done
+            ;;
+    esac
+    export HB_WITHOUT_GTCRS
+fi
+
 if [ -z "$HB_COMMERCE" ]; then export HB_COMMERCE=no; fi
 
 if [ "$HB_COMMERCE" = yes ]