From 04b55fc4a4d07818ecf6323fea04ba56dd44a1e8 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Sat, 21 Sep 1996 06:24:41 +0000
Subject: [PATCH] Patches to make POSTPORT changes in scripts
Originally submitted by: ernst.molitor@uni-bonn.de
resubmitted by: D'Arcy Cain
---
src/Makefile.global | 7 +++++--
src/bin/createdb/createdb.sh | 4 ++--
src/bin/createuser/createuser.sh | 4 ++--
src/bin/destroydb/destroydb.sh | 4 ++--
src/bin/destroyuser/destroyuser.sh | 4 ++--
src/bin/initdb/initdb.sh | 4 ++--
6 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/Makefile.global b/src/Makefile.global
index 0491aef000b..bb04db453f1 100644
--- a/src/Makefile.global
+++ b/src/Makefile.global
@@ -7,7 +7,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.30 1996/09/16 06:32:25 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.31 1996/09/21 06:23:57 scrappy Exp $
#
# NOTES
# This is seen by any Makefiles that include mk/postgres.mk. To
@@ -104,6 +104,9 @@ POSTDOCDIR= $(POSTGRESDIR)/doc
# Where the header files necessary to build frontend programs get installed.
HEADERDIR= $(POSTGRESDIR)/include
+# The port to run the postmaster on
+POSTPORT= 5432
+
# NAMEDATALEN is the max length for system identifiers (e.g. table names,
# attribute names, function names, etc.)
#
@@ -278,7 +281,7 @@ CFLAGS+= -DPORTNAME_$(PORTNAME) -D$(PORTNAME)
CFLAGS += -I../../backend/port/$(PORTNAME)
# Globally pass the default TCP port for postmaster(1).
-CFLAGS+= -DPOSTPORT='"6543"'
+CFLAGS+= -DPOSTPORT='"$(POSTPORT)"'
# include flags from mk/port/postgres.mk.$(PORTNAME)
CFLAGS+= $(CFLAGS_BE)
diff --git a/src/bin/createdb/createdb.sh b/src/bin/createdb/createdb.sh
index db41e1d0277..819cb54891e 100644
--- a/src/bin/createdb/createdb.sh
+++ b/src/bin/createdb/createdb.sh
@@ -11,7 +11,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/createdb/Attic/createdb.sh,v 1.3 1996/07/27 02:19:00 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/bin/createdb/Attic/createdb.sh,v 1.4 1996/09/21 06:24:07 scrappy Exp $
#
#-------------------------------------------------------------------------
@@ -23,7 +23,7 @@
# PGDATA, PGHOST, and PGPORT
#
# ----------------
-[ -z "$PGPORT" ] && PGPORT=5432
+[ -z "$PGPORT" ] && PGPORT=_fUnKy_POSTPORT_sTuFf_
[ -z "$PGHOST" ] && PGHOST=localhost
BINDIR=_fUnKy_BINDIR_sTuFf_
PATH=$BINDIR:$PATH
diff --git a/src/bin/createuser/createuser.sh b/src/bin/createuser/createuser.sh
index 56dfb53ed49..4312a555dce 100644
--- a/src/bin/createuser/createuser.sh
+++ b/src/bin/createuser/createuser.sh
@@ -8,7 +8,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/createuser.sh,v 1.3 1996/07/27 02:19:06 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/createuser.sh,v 1.4 1996/09/21 06:24:19 scrappy Exp $
#
# Note - this should NOT be setuid.
#
@@ -22,7 +22,7 @@
# PGDATA, PGHOST, and PGPORT
#
# ----------------
-[ -z "$PGPORT" ] && PGPORT=5432
+[ -z "$PGPORT" ] && PGPORT=_fUnKy_POSTPORT_sTuFf_
[ -z "$PGHOST" ] && PGHOST=localhost
BINDIR=_fUnKy_BINDIR_sTuFf_
PATH=$BINDIR:$PATH
diff --git a/src/bin/destroydb/destroydb.sh b/src/bin/destroydb/destroydb.sh
index 5c069779818..cddd2d96700 100644
--- a/src/bin/destroydb/destroydb.sh
+++ b/src/bin/destroydb/destroydb.sh
@@ -11,7 +11,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/destroydb.sh,v 1.3 1996/07/27 02:19:12 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/bin/destroydb/Attic/destroydb.sh,v 1.4 1996/09/21 06:24:24 scrappy Exp $
#
#-------------------------------------------------------------------------
@@ -23,7 +23,7 @@
# PGDATA, PGHOST, and PGPORT
#
# ----------------
-[ -z "$PGPORT" ] && PGPORT=5432
+[ -z "$PGPORT" ] && PGPORT=_fUnKy_POSTPORT_sTuFf_
[ -z "$PGHOST" ] && PGHOST=localhost
BINDIR=_fUnKy_BINDIR_sTuFf_
PATH=$BINDIR:$PATH
diff --git a/src/bin/destroyuser/destroyuser.sh b/src/bin/destroyuser/destroyuser.sh
index 4e361cb2168..8f6afc1ee73 100644
--- a/src/bin/destroyuser/destroyuser.sh
+++ b/src/bin/destroyuser/destroyuser.sh
@@ -8,7 +8,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/destroyuser.sh,v 1.3 1996/07/27 02:19:18 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/destroyuser.sh,v 1.4 1996/09/21 06:24:31 scrappy Exp $
#
# Note - this should NOT be setuid.
#
@@ -22,7 +22,7 @@
# PGDATA, PGHOST, and PGPORT
#
# ----------------
-[ -z "$PGPORT" ] && PGPORT=5432
+[ -z "$PGPORT" ] && PGPORT=_fUnKy_POSTPORT_sTuFf_
[ -z "$PGHOST" ] && PGHOST=localhost
BINDIR=_fUnKy_BINDIR_sTuFf_
PATH=$BINDIR:$PATH
diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index dfdcc608626..1e22e99b029 100644
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -12,7 +12,7 @@
#
#
# IDENTIFICATION
-# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.4 1996/07/23 03:03:19 scrappy Exp $
+# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.5 1996/09/21 06:24:41 scrappy Exp $
#
#-------------------------------------------------------------------------
@@ -25,7 +25,7 @@
#
# ----------------
[ -z "$PGDATA" ] && { PGDATA=_fUnKy_DATADIR_sTuFf_; export PGDATA; }
-[ -z "$PGPORT" ] && { PGPORT=5432; export PGPORT; }
+[ -z "$PGPORT" ] && { PGPORT=_fUnKy_POSTPORT_sTuFf_; export PGPORT; }
[ -z "$PGHOST" ] && { PGHOST=localhost; export PGHOST; }
POSTGRESDIR=_fUnKy_POSTGRESDIR_sTuFf_
BINDIR=_fUnKy_BINDIR_sTuFf_
--
GitLab