From bf57242f87c72f728624473a51cc349479612458 Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 20 Apr 2006 03:48:10 +0000
Subject: [PATCH] adding db port to build/install process

git-svn-id: svn://svn.open-ils.org/ILS/trunk@3759 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 config.sh            | 7 ++++++-
 install.conf.default | 1 +
 install.sh           | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config.sh b/config.sh
index fb29b3c746..83b8947947 100755
--- a/config.sh
+++ b/config.sh
@@ -89,6 +89,9 @@ function buildConfig {
 	prompt "Bootstrapping Database Host [$DBHOST] "
 	read X; if [ ! -z "$X" ]; then DBHOST="$X"; fi;
 
+	prompt "Bootstrapping Database Port [$DBPORT] "
+	read X; if [ ! -z "$X" ]; then DBPORT="$X"; fi;
+
 	prompt "Bootstrapping Database Name [$DBNAME] "
 	read X; if [ ! -z "$X" ]; then DBNAME="$X"; fi;
 
@@ -156,6 +159,7 @@ function writeConfig {
 	# db vars
 	_write "DBDRVR=\"$DBDRVR\"";
 	_write "DBHOST=\"$DBHOST\"";
+	_write "DBPORT=\"$DBPORT\"";
 	_write "DBNAME=\"$DBNAME\"";
 	_write "DBUSER=\"$DBUSER\"";
 	_write "DBPW=\"$DBPW\"";
@@ -170,7 +174,8 @@ function writeConfig {
 	STR='$main::config{dsn} =';
 		STR="$STR 'dbi:${DBDRVR}:host=";
 		STR="${STR}${DBHOST};dbname=";
-		STR="${STR}${DBNAME}';";
+		STR="${STR}${DBNAME};port=";
+		STR="${STR}${DBPORT}';";
 	_write "$STR"
 
 	STR='$main::config{usr} =';
diff --git a/install.conf.default b/install.conf.default
index b08c890508..02c40a4188 100644
--- a/install.conf.default
+++ b/install.conf.default
@@ -112,6 +112,7 @@ EVERGREENDIR="Evergreen/";
 # --------------------------------------------------------------------
 DBDRVR="Pg";
 DBHOST="127.0.0.1";
+DBPORT="5432";
 DBNAME="demo-dev";
 DBUSER="postgres";
 DBPW="";
diff --git a/install.sh b/install.sh
index 9c7f77438a..9d741f6c3c 100755
--- a/install.sh
+++ b/install.sh
@@ -117,7 +117,7 @@ function runInstall {
 		echo ""
 
 		MAKE="make $verbose APXS2=$APXS2 PREFIX=$PREFIX TMP=$TMP APR_HEADERS=$APR_HEADERS \
-			APACHE2_HEADERS=$APACHE2_HEADERS LIBXML2_HEADERS=$LIBXML2_HEADERS \
+			APACHE2_HEADERS=$APACHE2_HEADERS LIBXML2_HEADERS=$LIBXML2_HEADERS DBPORT=$DBPORT\
 			BINDIR=$BINDIR LIBDIR=$LIBDIR PERLDIR=$PERLDIR INCLUDEDIR=$INCLUDEDIR \
 			WEBDIR=$WEBDIR TEMPLATEDIR=$TEMPLATEDIR ETCDIR=$ETCDIR REPORTERDIR=$REPORTERDIR\
 			OPENSRFDIR=$OPENSRFDIR OPENILSDIR=$OPENILSDIR EVERGREENDIR=$EVERGREENDIR \
-- 
2.43.2