aboutsummaryrefslogtreecommitdiff
path: root/databases/postgresql92-server
diff options
context:
space:
mode:
authorAndreas Klemm <andreas@FreeBSD.org>1997-10-05 21:00:49 +0000
committerAndreas Klemm <andreas@FreeBSD.org>1997-10-05 21:00:49 +0000
commita53f1f9a5eba357f0d06c10990f9c9de3521bce1 (patch)
tree89d03d4be89aa874637e26b5486ffaa2b703b4cb /databases/postgresql92-server
parentf18f44f97604014816471a9295c9fb1acac8b19b (diff)
downloadports-a53f1f9a5eba357f0d06c10990f9c9de3521bce1.tar.gz
ports-a53f1f9a5eba357f0d06c10990f9c9de3521bce1.zip
Notes
Diffstat (limited to 'databases/postgresql92-server')
-rw-r--r--databases/postgresql92-server/Makefile4
-rw-r--r--databases/postgresql92-server/files/pgsql.sh.tmpl12
2 files changed, 11 insertions, 5 deletions
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index e433f213cb3a..a5c3891e3166 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -3,7 +3,7 @@
# Date created: April 2, 1997
# Whom: Marc G. Fournier <scrappy@FreeBSD.ORG>
#
-# $Id: Makefile,v 1.16 1997/10/04 22:43:21 andreas Exp $
+# $Id: Makefile,v 1.17 1997/10/04 23:38:59 andreas Exp $
DISTNAME= postgresql-6.2
CATEGORIES= databases
@@ -77,6 +77,8 @@ post-install:
>> ${PREFIX}/pgsql/.profile; \
${ECHO} "PGLIB=${PREFIX}/pgsql/lib" \
>> ${PREFIX}/pgsql/.profile; \
+ ${ECHO} "# note: PGDATA overwrites the -D startup option" \
+ >> ${PREFIX}/pgsql/.profile; \
${ECHO} "PGDATA=${PREFIX}/pgsql/data" \
>> ${PREFIX}/pgsql/.profile; \
${ECHO} "DISPLAY=:0" \
diff --git a/databases/postgresql92-server/files/pgsql.sh.tmpl b/databases/postgresql92-server/files/pgsql.sh.tmpl
index 35fba3937698..9fd81e4ff367 100644
--- a/databases/postgresql92-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql92-server/files/pgsql.sh.tmpl
@@ -1,6 +1,6 @@
#!/bin/sh
-# $Id: pgsql.sh.tmpl,v 1.1 1997/10/03 14:13:35 andreas Exp $
+# $Id: pgsql.sh.tmpl,v 1.2 1997/10/03 18:26:54 andreas Exp $
# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested)
@@ -9,13 +9,17 @@
# - merged ldconfig start sequence from former postgrsql.sh script (andreas)
# - modified the postmaster startup sequence as suggested in the
# INSTALL file which was given as example for FreeBSD 2.2 (andreas)
-
+# - removed the commandline option
+# -D!!PREFIX!!/pgsql/data \
+# because the postmaster process, which starts up under the
+# environment of the pgsql user, sets this with the PGDATA
+# environment variable in !!PREFIX!!/pgsql/.profile
+#
[ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib
[ -x !!PREFIX!!/pgsql/bin/postmaster ] && {
su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster \
- -D!!PREFIX!!/pgsql/data \
- -S -o -F > !!PREFIX!!/pgsql/errlog' &
+ -S -o -F > !!PREFIX!!/pgsql/errlog'
echo -n ' pgsql'
}