From f3a22910b7aa163c2a53f50bc25f4df44458a82a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 1 Oct 2014 17:20:37 +0100
Subject: [PATCH] setup.sh - Fix support mysqld on alternative ports

---
 bin/setup.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/bin/setup.sh b/bin/setup.sh
index b44f455c0f..45bffaed47 100755
--- a/bin/setup.sh
+++ b/bin/setup.sh
@@ -51,7 +51,12 @@ fi
 # checkout, not packaged code
 if [ -d "$CALLEDPATH/../xml" ]; then
   cd "$CALLEDPATH/../xml"
-  "$PHP5PATH"php -d mysql.default_host=$DBHOST -d mysql.default_user=$DBUSER -d mysql.default_password=$DBPASS GenCode.php $SCHEMA '' $GENCODE_CMS
+  if [ -z "$DBPORT" ]; then
+    PHP_MYSQL_HOSTPORT="$DBHOST"
+  else
+    PHP_MYSQL_HOSTPORT="$DBHOST:$DBPORT"
+  fi
+  "$PHP5PATH"php -d mysql.default_host="$PHP_MYSQL_HOSTPORT" -d mysql.default_user=$DBUSER -d mysql.default_password=$DBPASS GenCode.php $SCHEMA '' $GENCODE_CMS
 fi
 
 # someone might want to use empty password for development,
-- 
2.25.1