From a54c5e3003b104ef861f5a08bcfbda4c0be30870 Mon Sep 17 00:00:00 2001
From: appelflap <albertdrenth@gmail.com>
Date: Sun, 6 Jan 2013 19:48:30 +0100
Subject: [PATCH 1/2] use Postgis Version variable

---
 settings/settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/settings.php b/settings/settings.php
index 6f6f843b..26b48551 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -13,7 +13,7 @@
 
 	// Paths
 	@define('CONST_Path_Postgresql_Contrib', '/usr/share/postgresql/'.CONST_Postgresql_Version.'/contrib');
-	@define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-1.5');
+	@define('CONST_Path_Postgresql_Postgis', CONST_Path_Postgresql_Contrib.'/postgis-'.CONST_Postgis_Version);
 	@define('CONST_Osm2pgsql_Binary', CONST_BasePath.'/osm2pgsql/osm2pgsql');
 	@define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
 

From 20a852b55440005cfce5afd7917ca4ed2570e467 Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 14 Jan 2013 22:48:52 +0100
Subject: [PATCH 2/2] support custom psql port in setup.php

patch by b3nn0 (see http://trac.openstreetmap.org/ticket/4736)
---
 utils/setup.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/utils/setup.php b/utils/setup.php
index ff890af9..473d0cb0 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -95,7 +95,7 @@
 		{
 			fail('database already exists ('.CONST_Database_DSN.')');
 		}
-		passthruCheckReturn('createdb -E UTF-8 '.$aDSNInfo['database']);
+		passthruCheckReturn('createdb -E UTF-8 -p '.$aDSNInfo['port'].' '.$aDSNInfo['database']);
 	}
 
 	if ($aCMDResult['setup-db'] || $aCMDResult['all'])
@@ -114,7 +114,7 @@
 			exit;
 		}
 
-		passthru('createlang plpgsql '.$aDSNInfo['database']);
+		passthru('createlang plpgsql -p '.$aDSNInfo['port'].' '.$aDSNInfo['database']);
 		$pgver = (float) CONST_Postgresql_Version;
 		if ($pgver < 9.1) {
 			pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql');
@@ -156,6 +156,7 @@
 		}
 		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
 		$osm2pgsql .= ' -C '.$iCacheMemory;
+		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
 		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
 		passthruCheckReturn($osm2pgsql);
 
@@ -536,7 +537,7 @@
 		$bDidSomething = true;
 		$sOutputFile = '';
 		if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];
-		$sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$iInstances.$sOutputFile;
+		$sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'].' -t '.$iInstances.$sOutputFile;
 		passthruCheckReturn($sBaseCmd.' -R 4');
 		if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
 		passthruCheckReturn($sBaseCmd.' -r 5 -R 25');