- remove the ampersand, postmaster process automatically goes into

  background because of the -S option.
- remove the -D datadir option, it's meaningless, because the pgsql
  user environment overwrites it with the PGDATA env variable.
  Since this is important and might cause some headache, I mentioned
  this in ~pgsql/.profile and the startup script.
Submitted by:	John Fiber

2 files changed, 11 insertions, 5 deletions

diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile
index e433f21..a5c3891 100644
--- a/databases/postgresql74-server/Makefile
+++ b/databases/postgresql74-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/postgresql74-server/files/pgsql.sh.tmpl b/databases/postgresql74-server/files/pgsql.sh.tmpl
index 35fba39..9fd81e4 100644
--- a/databases/postgresql74-server/files/pgsql.sh.tmpl
+++ b/databases/postgresql74-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' 
 }