From f3f6653a48b877613cb940c87cab54cd66870018 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Fri, 18 Sep 2009 22:20:54 +0000
Subject: [PATCH] 2009-09-19 00:20 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/source/common/hbgete.c   *
 harbour/source/common/hbprintf.c     ! fixed OpenBSD builds

  * harbour/config/detect.mk
    * added /usr/local/include to scanned paths

  * harbour/contrib/xhb/hboutdbg.c
    * formatting
---
 harbour/ChangeLog                | 11 +++++++++++
 harbour/config/detect.mk         |  8 ++++----
 harbour/contrib/xhb/hboutdbg.c   |  2 +-
 harbour/source/common/hbgete.c   |  3 +++
 harbour/source/common/hbprintf.c |  3 ++-
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3003be5373..13d6ca7fe1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,17 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-19 00:20 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/common/hbgete.c
+  * harbour/source/common/hbprintf.c
+    ! fixed OpenBSD builds
+
+  * harbour/config/detect.mk
+    * added /usr/local/include to scanned paths
+
+  * harbour/contrib/xhb/hboutdbg.c
+    * formatting
+
 2009-09-18 16:55 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed to add windows system libs in mingw -shared mode.
diff --git a/harbour/config/detect.mk b/harbour/config/detect.mk
index 8ac2c4d138..7d142df056 100644
--- a/harbour/config/detect.mk
+++ b/harbour/config/detect.mk
@@ -47,7 +47,7 @@ _DET_VAR_INC_ := HB_INC_ZLIB
 _DET_VAR_HAS_ := HB_HAS_ZLIB
 _DET_FLT_PLAT :=
 _DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include /boot/develop/headers/3rdparty
+_DET_INC_DEFP := /usr/include /usr/local/include /boot/develop/headers/3rdparty
 _DET_INC_LOCL := $(realpath $(TOP)$(ROOT)external/zlib)
 _DET_INC_HEAD := /zlib.h
 
@@ -60,7 +60,7 @@ _DET_VAR_INC_ := HB_INC_PCRE
 _DET_VAR_HAS_ := HB_HAS_PCRE
 _DET_FLT_PLAT :=
 _DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include /opt/local/include
+_DET_INC_DEFP := /usr/include /usr/local/include /opt/local/include
 _DET_INC_LOCL := $(realpath $(TOP)$(ROOT)external/pcre)
 _DET_INC_HEAD := /pcre.h
 
@@ -73,7 +73,7 @@ _DET_VAR_INC_ := HB_INC_OPENSSL
 _DET_VAR_HAS_ := HB_HAS_OPENSSL
 _DET_FLT_PLAT :=
 _DET_FLT_COMP := !watcom
-_DET_INC_DEFP := /usr/include /usr/local/ssl/include /boot/common/include
+_DET_INC_DEFP := /usr/include /usr/local/include /usr/local/ssl/include /boot/common/include
 _DET_INC_HEAD := /openssl/ssl.h
 
 include $(TOP)$(ROOT)config/detfun.mk
@@ -130,7 +130,7 @@ _DET_VAR_INC_ := HB_INC_X11
 _DET_VAR_HAS_ := HB_HAS_X11
 _DET_FLT_PLAT :=
 _DET_FLT_COMP :=
-_DET_INC_DEFP := /usr/include
+_DET_INC_DEFP := /usr/include /usr/local/include /usr/X11R6/include
 _DET_INC_HEAD := /X11/Xlib.h
 
 include $(TOP)$(ROOT)config/detfun.mk
diff --git a/harbour/contrib/xhb/hboutdbg.c b/harbour/contrib/xhb/hboutdbg.c
index d0391b71b7..3b212b7604 100644
--- a/harbour/contrib/xhb/hboutdbg.c
+++ b/harbour/contrib/xhb/hboutdbg.c
@@ -117,7 +117,7 @@ static void debugInit( void )
          if( iFifoResult != EEXIST )
          {
             s_iXtermPid = execlp( "xterm", "xterm", "-T", szDebugTitle, "-e",
-               "cat", szDebugName, NULL );
+                                  "cat", szDebugName, NULL );
 
             if( s_iXtermPid <= 0 )
             {
diff --git a/harbour/source/common/hbgete.c b/harbour/source/common/hbgete.c
index 74a47cdf17..0dd01093b3 100644
--- a/harbour/source/common/hbgete.c
+++ b/harbour/source/common/hbgete.c
@@ -174,6 +174,9 @@ BOOL hb_setenv( const char * szName, const char * szValue )
          return setenv( szName, "", 1 ) == 0;
       else
          return TRUE;
+#  elif defined( __OpenBSD__ )
+      unsetenv( szName );
+      return TRUE;
 #  else
       return unsetenv( szName ) == 0;
 #  endif
diff --git a/harbour/source/common/hbprintf.c b/harbour/source/common/hbprintf.c
index 351c8b5704..9f8fdb9d8e 100644
--- a/harbour/source/common/hbprintf.c
+++ b/harbour/source/common/hbprintf.c
@@ -283,7 +283,8 @@ optimized.
 #  else
 #     define _x_long_dbl      long double
 #     if defined( __WATCOMC__ ) || defined( __MINGW32CE__ ) || defined( __CYGWIN__ ) || \
-         ( defined( HB_OS_WIN_CE ) && defined( __POCC__ ) ) || defined( HB_OS_BEOS )
+         defined( HB_OS_BEOS ) || defined( __OpenBSD__ ) || \
+         ( defined( HB_OS_WIN_CE ) && defined( __POCC__ ) )
 #        define _HB_WRAP_MODFL_
 #        define _MODFD( x, p )   _hb_modfl( x, p )
 #     else