diff options
author | andreas <andreas@FreeBSD.org> | 2000-05-25 09:35:25 +0000 |
---|---|---|
committer | andreas <andreas@FreeBSD.org> | 2000-05-25 09:35:25 +0000 |
commit | 103d998a1cafce1a09ec3a7ec68edb3b8f443975 (patch) | |
tree | f1c51749540307bb56929ad8dd480e84e1c9af92 | |
parent | e13591589356ab1ec04f5cda5715cb41419e1456 (diff) | |
download | FreeBSD-ports-103d998a1cafce1a09ec3a7ec68edb3b8f443975.zip FreeBSD-ports-103d998a1cafce1a09ec3a7ec68edb3b8f443975.tar.gz |
make startup script work (start/stop)
Obtained from: Palle Girgensohn <girgen@partitur.se>
42 files changed, 364 insertions, 280 deletions
diff --git a/databases/postgresql-devel-server/Makefile b/databases/postgresql-devel-server/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql-devel-server/Makefile +++ b/databases/postgresql-devel-server/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql-devel-server/files/patch-bc b/databases/postgresql-devel-server/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql-devel-server/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql-devel-server/files/pgsql.sh.tmpl b/databases/postgresql-devel-server/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql-devel-server/files/pgsql.sh.tmpl +++ b/databases/postgresql-devel-server/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql-devel/Makefile +++ b/databases/postgresql-devel/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql-devel/files/patch-bc b/databases/postgresql-devel/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql-devel/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql-devel/files/pgsql.sh.tmpl b/databases/postgresql-devel/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql-devel/files/pgsql.sh.tmpl +++ b/databases/postgresql-devel/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql7/Makefile b/databases/postgresql7/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql7/Makefile +++ b/databases/postgresql7/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql7/files/patch-bc b/databases/postgresql7/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql7/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql7/files/pgsql.sh.tmpl b/databases/postgresql7/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql7/files/pgsql.sh.tmpl +++ b/databases/postgresql7/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql73-server/files/patch-bc b/databases/postgresql73-server/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql73-server/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql73-server/files/pgsql.sh.tmpl b/databases/postgresql73-server/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql73-server/files/pgsql.sh.tmpl +++ b/databases/postgresql73-server/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql73/Makefile b/databases/postgresql73/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql73/Makefile +++ b/databases/postgresql73/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql73/files/patch-bc b/databases/postgresql73/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql73/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql73/files/pgsql.sh.tmpl b/databases/postgresql73/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql73/files/pgsql.sh.tmpl +++ b/databases/postgresql73/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql74-server/files/patch-bc b/databases/postgresql74-server/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql74-server/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql74-server/files/pgsql.sh.tmpl b/databases/postgresql74-server/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql74-server/files/pgsql.sh.tmpl +++ b/databases/postgresql74-server/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql80-server/files/patch-bc b/databases/postgresql80-server/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql80-server/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql80-server/files/pgsql.sh.tmpl b/databases/postgresql80-server/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql80-server/files/pgsql.sh.tmpl +++ b/databases/postgresql80-server/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql81-server/files/patch-bc b/databases/postgresql81-server/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql81-server/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql81-server/files/pgsql.sh.tmpl b/databases/postgresql81-server/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql81-server/files/pgsql.sh.tmpl +++ b/databases/postgresql81-server/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql82-server/files/patch-bc b/databases/postgresql82-server/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql82-server/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql82-server/files/pgsql.sh.tmpl b/databases/postgresql82-server/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql82-server/files/pgsql.sh.tmpl +++ b/databases/postgresql82-server/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql83-server/files/patch-bc b/databases/postgresql83-server/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql83-server/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql83-server/files/pgsql.sh.tmpl b/databases/postgresql83-server/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql83-server/files/pgsql.sh.tmpl +++ b/databases/postgresql83-server/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql84-server/files/patch-bc b/databases/postgresql84-server/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql84-server/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql84-server/files/pgsql.sh.tmpl b/databases/postgresql84-server/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql84-server/files/pgsql.sh.tmpl +++ b/databases/postgresql84-server/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql90-server/files/patch-bc b/databases/postgresql90-server/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql90-server/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql90-server/files/pgsql.sh.tmpl b/databases/postgresql90-server/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql90-server/files/pgsql.sh.tmpl +++ b/databases/postgresql90-server/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql91-server/files/patch-bc b/databases/postgresql91-server/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql91-server/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql91-server/files/pgsql.sh.tmpl b/databases/postgresql91-server/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql91-server/files/pgsql.sh.tmpl +++ b/databases/postgresql91-server/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 180af73..0d4f2a2 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -182,6 +182,9 @@ post-install: @ ${ECHO_MSG} "Putting postgresql.jar in" @ ${ECHO_MSG} "${PREFIX}/share/java/classes/postgresql.jar" @ ${ECHO_MSG} "Add this to your CLASSPATH!" + @ ${ECHO_MSG} "ALSO NOTE: path inside jar file modified from 6.5.x:" + @ ${ECHO_MSG} " 'postgresql.*' -> 'org.postgresql.*'!" + @ ${ECHO_MSG} "You will need to modify you applications' props files." @ ${ECHO_MSG} "---------------------------------------------------------" @ ${CAT} ${PKGDIR}/PLIST.jdbc >> ${TMPPLIST} .if !defined(NOPORTDOCS) diff --git a/databases/postgresql92-server/files/patch-bc b/databases/postgresql92-server/files/patch-bc new file mode 100644 index 0000000..ff747fb --- /dev/null +++ b/databases/postgresql92-server/files/patch-bc @@ -0,0 +1,5 @@ +--- bin/pg_ctl/postmaster.opts.default.sample~ Mon Apr 17 05:45:17 2000 ++++ bin/pg_ctl/postmaster.opts.default.sample Tue May 23 02:46:30 2000 +@@ -1 +1 @@ +- ++-i -o "-F" diff --git a/databases/postgresql92-server/files/pgsql.sh.tmpl b/databases/postgresql92-server/files/pgsql.sh.tmpl index 4f3575c..e1673b4 100644 --- a/databases/postgresql92-server/files/pgsql.sh.tmpl +++ b/databases/postgresql92-server/files/pgsql.sh.tmpl @@ -1,36 +1,34 @@ #!/bin/sh # $FreeBSD$ - -# pgsql.sh - postgresql startup file for FreeBSD and possibly *BSD (untested) - -# Changes: -# - renamed startup script to be in sync with INSTALL file -# - 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 -# - added (ugly) support for shutting down (girgen) -# - moved 2>&1 to end of line, so it'll actually work [if -S is removed] (girgen) +# +# For postmaster startup options, edit $PGDATA/postmaster.opts.default +# Preinstalled options are -i -o "-F" case $1 in start) [ -d !!PREFIX!!/pgsql/lib ] && /sbin/ldconfig -m !!PREFIX!!/pgsql/lib - [ -x !!PREFIX!!/pgsql/bin/postmaster ] && { - su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/postmaster -i -S -o -F \ - > !!PREFIX!!/pgsql/errlog 2>&1' + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c \ + 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w start > !!PREFIX!!/pgsql/errlog 2>&1' echo -n ' pgsql' } ;; + stop) - /usr/bin/killall postgres + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl -w -m fast stop' + } ;; + +status) + [ -x !!PREFIX!!/pgsql/bin/pg_ctl ] && { + su -l pgsql -c 'exec !!PREFIX!!/pgsql/bin/pg_ctl status' + } + ;; + *) - echo "usage: `basename $0` {start|stop}" >&2 + echo "usage: `basename $0` {start|stop|status}" >&2 exit 64 ;; esac |