diff options
| author | andreas <andreas@FreeBSD.org> | 1997-10-06 05:00:49 +0800 |
|---|---|---|
| committer | andreas <andreas@FreeBSD.org> | 1997-10-06 05:00:49 +0800 |
| commit | 82949069c3b76438d864828262277e3d58526c08 (patch) | |
| tree | 90f40123e60f83d45a20af535139a5efbb0baa7f /databases | |
| parent | d84f4164950498d8a3df15ab017bb31efa927869 (diff) | |
| download | freebsd-ports-gnome-82949069c3b76438d864828262277e3d58526c08.tar.gz freebsd-ports-gnome-82949069c3b76438d864828262277e3d58526c08.tar.zst freebsd-ports-gnome-82949069c3b76438d864828262277e3d58526c08.zip | |
- 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
Diffstat (limited to 'databases')
28 files changed, 154 insertions, 70 deletions
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile index e433f213cb3a..a5c3891e3166 100644 --- a/databases/postgresql-devel-server/Makefile +++ b/databases/postgresql-devel-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/postgresql-devel-server/files/pgsql.sh.tmpl b/databases/postgresql-devel-server/files/pgsql.sh.tmpl index 35fba3937698..9fd81e4ff367 100644 --- a/databases/postgresql-devel-server/files/pgsql.sh.tmpl +++ b/databases/postgresql-devel-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' } diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile index e433f213cb3a..a5c3891e3166 100644 --- a/databases/postgresql-devel/Makefile +++ b/databases/postgresql-devel/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/postgresql-devel/files/pgsql.sh.tmpl b/databases/postgresql-devel/files/pgsql.sh.tmpl index 35fba3937698..9fd81e4ff367 100644 --- a/databases/postgresql-devel/files/pgsql.sh.tmpl +++ b/databases/postgresql-devel/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' } diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile index e433f213cb3a..a5c3891e3166 100644 --- a/databases/postgresql7/Makefile +++ b/databases/postgresql7/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/postgresql7/files/pgsql.sh.tmpl b/databases/postgresql7/files/pgsql.sh.tmpl index 35fba3937698..9fd81e4ff367 100644 --- a/databases/postgresql7/files/pgsql.sh.tmpl +++ b/databases/postgresql7/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' } diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index e433f213cb3a..a5c3891e3166 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-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/postgresql73-server/files/pgsql.sh.tmpl b/databases/postgresql73-server/files/pgsql.sh.tmpl index 35fba3937698..9fd81e4ff367 100644 --- a/databases/postgresql73-server/files/pgsql.sh.tmpl +++ b/databases/postgresql73-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' } diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile index e433f213cb3a..a5c3891e3166 100644 --- a/databases/postgresql73/Makefile +++ b/databases/postgresql73/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/postgresql73/files/pgsql.sh.tmpl b/databases/postgresql73/files/pgsql.sh.tmpl index 35fba3937698..9fd81e4ff367 100644 --- a/databases/postgresql73/files/pgsql.sh.tmpl +++ b/databases/postgresql73/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' } diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index e433f213cb3a..a5c3891e3166 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 35fba3937698..9fd81e4ff367 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' } diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index e433f213cb3a..a5c3891e3166 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-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/postgresql80-server/files/pgsql.sh.tmpl b/databases/postgresql80-server/files/pgsql.sh.tmpl index 35fba3937698..9fd81e4ff367 100644 --- a/databases/postgresql80-server/files/pgsql.sh.tmpl +++ b/databases/postgresql80-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' } diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index e433f213cb3a..a5c3891e3166 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-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/postgresql81-server/files/pgsql.sh.tmpl b/databases/postgresql81-server/files/pgsql.sh.tmpl index 35fba3937698..9fd81e4ff367 100644 --- a/databases/postgresql81-server/files/pgsql.sh.tmpl +++ b/databases/postgresql81-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' } diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index e433f213cb3a..a5c3891e3166 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-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/postgresql82-server/files/pgsql.sh.tmpl b/databases/postgresql82-server/files/pgsql.sh.tmpl index 35fba3937698..9fd81e4ff367 100644 --- a/databases/postgresql82-server/files/pgsql.sh.tmpl +++ b/databases/postgresql82-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' } diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index e433f213cb3a..a5c3891e3166 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-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/postgresql83-server/files/pgsql.sh.tmpl b/databases/postgresql83-server/files/pgsql.sh.tmpl index 35fba3937698..9fd81e4ff367 100644 --- a/databases/postgresql83-server/files/pgsql.sh.tmpl +++ b/databases/postgresql83-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' } diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index e433f213cb3a..a5c3891e3166 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-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/postgresql84-server/files/pgsql.sh.tmpl b/databases/postgresql84-server/files/pgsql.sh.tmpl index 35fba3937698..9fd81e4ff367 100644 --- a/databases/postgresql84-server/files/pgsql.sh.tmpl +++ b/databases/postgresql84-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' } diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index e433f213cb3a..a5c3891e3166 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-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/postgresql90-server/files/pgsql.sh.tmpl b/databases/postgresql90-server/files/pgsql.sh.tmpl index 35fba3937698..9fd81e4ff367 100644 --- a/databases/postgresql90-server/files/pgsql.sh.tmpl +++ b/databases/postgresql90-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' } diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index e433f213cb3a..a5c3891e3166 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-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/postgresql91-server/files/pgsql.sh.tmpl b/databases/postgresql91-server/files/pgsql.sh.tmpl index 35fba3937698..9fd81e4ff367 100644 --- a/databases/postgresql91-server/files/pgsql.sh.tmpl +++ b/databases/postgresql91-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' } 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' } |