From 8cd7e901cf255758e1e8a925aed1f8a38c40f45b Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 14 Apr 2009 08:53:34 +0000
Subject: [PATCH] 2009-04-14 10:52 UTC+0200 Viktor Szakats (harbour.01 syenar
 hu)   * contrib/hbmysql/tmysql.prg     + Added 4th port parameter to
 TMySqlServer():New() method.

  * contrib/hbcurl/hbcurls/Makefile
    * Cleanup.
---
 harbour/ChangeLog                       |  7 +++++++
 harbour/contrib/hbcurl/hbcurls/Makefile | 19 +++----------------
 harbour/contrib/hbmysql/tmysql.prg      |  4 ++--
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3b8f8187f9..f11b91f177 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,13 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-14 10:52 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * contrib/hbmysql/tmysql.prg
+    + Added 4th port parameter to TMySqlServer():New() method.
+
+  * contrib/hbcurl/hbcurls/Makefile
+    * Cleanup.
+
 2009-04-14 00:54 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * harbour/contrib/gtqtc/gtqtc.cpp
   * harbour/contrib/gtqtc/moc_gtqtc.cpp
diff --git a/harbour/contrib/hbcurl/hbcurls/Makefile b/harbour/contrib/hbcurl/hbcurls/Makefile
index 869c1eb076..8f2ab155d6 100644
--- a/harbour/contrib/hbcurl/hbcurls/Makefile
+++ b/harbour/contrib/hbcurl/hbcurls/Makefile
@@ -8,25 +8,12 @@ ROOT = ../../../
 
 LIBNAME=hbcurls
 
-# always export symbols
-HB_USER_CFLAGS += -DCURL_STATICLIB
-
-HB_INC_CURL_OK =
-
-ifneq ($(HB_ARCHITECTURE),dos)
-
-ifeq ($(HB_INC_CURL),)
-ifeq ($(HB_XBUILD),)
-HB_INC_CURL = /usr/include
-endif
-endif
-
-HB_INC_CURL_OK += $(foreach d, $(HB_INC_CURL), $(if $(wildcard $(d)/curl/curl.h),$(d),))
-
-endif
+HB_INC_CURL_OK = $(foreach d, $(HB_INC_CURL), $(if $(wildcard $(d)/curl/curl.h),$(d),))
 
 ifneq ($(strip $(HB_INC_CURL_OK)),)
 
+# always export symbols
+HB_USER_CFLAGS += -DCURL_STATICLIB
 HB_USER_CFLAGS += $(foreach d, $(HB_INC_CURL_OK), -I$(d))
 
 C_SOURCES=\
diff --git a/harbour/contrib/hbmysql/tmysql.prg b/harbour/contrib/hbmysql/tmysql.prg
index 7fd29a2642..e31091757d 100644
--- a/harbour/contrib/hbmysql/tmysql.prg
+++ b/harbour/contrib/hbmysql/tmysql.prg
@@ -1356,12 +1356,12 @@ CREATE CLASS TMySQLServer
 ENDCLASS
 
 
-METHOD New( cServer, cUser, cPassword ) CLASS TMySQLServer
+METHOD New( cServer, cUser, cPassword, nPort ) CLASS TMySQLServer
 
    ::cServer := cServer
    ::cUser := cUser
    ::cPassword := cPassword
-   ::nSocket := mysql_real_connect( cServer, cUser, cPassword )
+   ::nSocket := mysql_real_connect( cServer, cUser, cPassword, nPort )
    ::lError := .F.
 
    IF Empty( ::nSocket )