2009-03-08 18:04 UTC+0100 Viktor Szakats (harbour.01 syenar hu)

* INSTALL
    + Added short information for Darwin/MacPorts and contribs.

  * contrib/hbmysql/Makefile
  * contrib/gtalleg/Makefile
  * contrib/rddsql/sddmy/Makefile
  * contrib/rddsql/sddpg/Makefile
  * contrib/hbpgsql/Makefile
    + Enabled on Darwin (for MacPorts).

  * include/hbdefs.h
  * contrib/hbfimage/fi_wrp.c
  * contrib/hbfimage/Makefile
    + Enabled on Darwin (for MacPorts).
    + Added ugly hack to make it compile on Darwin.

  * contrib/hbtpathy/Makefile
    + Enabled on Darwin.

harbour/ChangeLog

@@ -8,6 +8,26 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-03-08 18:04 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
+  * INSTALL
+    + Added short information for Darwin/MacPorts and contribs.
+
+  * contrib/hbmysql/Makefile
+  * contrib/gtalleg/Makefile
+  * contrib/rddsql/sddmy/Makefile
+  * contrib/rddsql/sddpg/Makefile
+  * contrib/hbpgsql/Makefile
+    + Enabled on Darwin (for MacPorts).
+
+  * include/hbdefs.h
+  * contrib/hbfimage/fi_wrp.c
+  * contrib/hbfimage/Makefile
+    + Enabled on Darwin (for MacPorts).
+    + Added ugly hack to make it compile on Darwin.
+
+  * contrib/hbtpathy/Makefile
+    + Enabled on Darwin.
+
 2009-03-08 15:56 UTC+0100 Viktor Szakats (harbour.01 syenar hu)
   * utils/hbmk2/hbmk2.prg
     + Normalizing paths of cfg files.

harbour/INSTALL

@@ -152,6 +152,12 @@ HOW TO ENABLE OPTIONAL COMPONENTS BEFORE BUILD
           - Don't put the dir inside double quotes.
           - Use absolute paths.
 
+   Darwin (OS X)
+   -------------
+   1.) Install MacPorts, follow their instructions:
+       http://www.macports.org/
+   2.) sudo port install allegro freeimage gd2 mysql5-devel postgresql83
+
 
 SUPPORTED C COMPILERS UNDER DIFFERENT PLATFORMS
 ===============================================

harbour/contrib/gtalleg/Makefile

@@ -13,7 +13,7 @@ ifneq ($(HB_COMPILER),owatcom)
 
 ifeq ($(HB_INC_ALLEGRO),)
 ifeq ($(HB_XBUILD),)
-HB_INC_ALLEGRO = /usr/include
+HB_INC_ALLEGRO = /usr/include /opt/local/include
 endif
 endif
 

harbour/contrib/hbfimage/Makefile

@@ -12,7 +12,7 @@ ifneq ($(HB_ARCHITECTURE),dos)
 
 ifeq ($(HB_INC_FREEIMAGE),)
 ifeq ($(HB_XBUILD),)
-HB_INC_FREEIMAGE = /usr/include
+HB_INC_FREEIMAGE = /usr/include /opt/local/include
 endif
 endif
 

harbour/contrib/hbfimage/fi_wrp.c

@@ -52,6 +52,7 @@
 
 #define HB_DONT_DEFINE_BOOL
 #define HB_DONT_DEFINE_LONG
+#define HB_DONT_DEFINE_BYTE
 
 #if defined(WINNT) || defined(_Windows) || defined(__NT__) || defined(_WIN32) || defined(__WINDOWS_386__) || defined(__WIN32__) || defined(__CYGWIN__)
    #if !defined(_WINDOWS_) && ( defined(__GNUC__) || defined(__POCC__) || defined(__XCC__) ) || defined(__WATCOMC__)

harbour/contrib/hbmysql/Makefile

@@ -8,7 +8,7 @@ LIBNAME=hbmysql
 
 ifeq ($(HB_INC_MYSQL),)
 ifeq ($(HB_XBUILD),)
-HB_INC_MYSQL = /usr/include/mysql
+HB_INC_MYSQL = /usr/include/mysql /opt/local/include/mysql5/mysql
 endif
 endif
 

harbour/contrib/hbpgsql/Makefile

@@ -8,7 +8,7 @@ LIBNAME=hbpgsql
 
 ifeq ($(HB_INC_PGSQL),)
 ifeq ($(HB_XBUILD),)
-HB_INC_PGSQL = /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include
+HB_INC_PGSQL = /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql83
 endif
 endif
 

harbour/contrib/hbtpathy/Makefile

@@ -13,6 +13,12 @@ C_SOURCES=\
 	tplinux.c \
 	tpcommon.c \
 
+endif
+ifeq ($(HB_ARCHITECTURE),darwin)
+C_SOURCES=\
+	tplinux.c \
+	tpcommon.c \
+
 endif
 ifeq ($(HB_ARCHITECTURE),win)
 C_SOURCES=\

harbour/contrib/rddsql/sddmy/Makefile

@@ -8,7 +8,7 @@ LIBNAME=sddmy
 
 ifeq ($(HB_INC_MYSQL),)
 ifeq ($(HB_XBUILD),)
-HB_INC_MYSQL = /usr/include/mysql
+HB_INC_MYSQL = /usr/include/mysql /opt/local/include/mysql5/mysql
 endif
 endif
 

harbour/contrib/rddsql/sddpg/Makefile

@@ -8,7 +8,7 @@ LIBNAME=sddpg
 
 ifeq ($(HB_INC_PGSQL),)
 ifeq ($(HB_XBUILD),)
-HB_INC_PGSQL = /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include
+HB_INC_PGSQL = /usr/include /usr/local/pgsql/include /usr/local/pgsql/include/libpq /usr/include/pgsql /usr/include/postgresql /postgres/include /opt/local/include/postgresql83
 endif
 endif
 

harbour/include/hbdefs.h

@@ -206,8 +206,10 @@
    #undef UCHAR                           /* 1 byte unsigned */
    typedef unsigned char UCHAR;
 
-   #undef BYTE                            /* 1 byte unsigned */
-   typedef unsigned char BYTE;
+   #if ! defined( HB_DONT_DEFINE_BYTE )
+      #undef BYTE                            /* 1 byte unsigned */
+      typedef unsigned char BYTE;
+   #endif
 
    #undef SHORT                           /* 2 bytes signed */
    typedef short int SHORT;