Change conf and init files for 8.3 for nicer startup/shutdown per 228639

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.21-gentoo-r1 i686

6 files changed, 32 insertions, 28 deletions

diff --git a/dev-db/postgresql-base/Manifest b/dev-db/postgresql-base/Manifest
index 48f9931af03d..f64c6c76b0f8 100644
--- a/dev-db/postgresql-base/Manifest
+++ b/dev-db/postgresql-base/Manifest
@@ -23,10 +23,7 @@ DIST postgresql-8.0.17.tar.bz2 11234855 RMD160 d22b26b38a91632b8840e9d0b1b96b4ad
 DIST postgresql-8.1.11.tar.bz2 11735420 RMD160 9fb98eadc4f1015205970f26b31b68ea0378bda9 SHA1 73c0f09754fc8e3c7f8d7de49d70244b76927416 SHA256 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e
 DIST postgresql-8.1.13.tar.bz2 11744780 RMD160 fe9fab1b70fa93b4dc0bd19f63a590f75511e79e SHA1 6d4b771aa4011fa3e8aed726f1521b77cd91772a SHA256 a537734da80f85c51ef72dd2d28bb2f64b73f63a727ef53a90211ccac2dcb1d1
 DIST postgresql-8.2.10.tar.bz2 12551773 RMD160 46c7a3e98705dfa0d68c2893773c40d4b73d5eca SHA1 2b4508ba70f18d350715d7113595e8529680e687 SHA256 3ae74e61bbedd3215fdc7e774e5d84346ddc621ff7c8c7f5455e84ecbbd47087
-DIST postgresql-8.2.7.tar.bz2 12576126 RMD160 96700e91c3b9e733c686b0fe377c7ba661710942 SHA1 0be0dbaa488810ebcba77ac7246180c5b2a9b669 SHA256 39528d1ba50f5abc51569e8b9bdeb47d0d4650d289a2c2e465621864b1ff3584
 DIST postgresql-8.2.9.tar.bz2 12558265 RMD160 00fe295d928e77a2dff136795ba846ae3ac08569 SHA1 aeaf0487d031c56518af002f76f779c23baf6391 SHA256 95ea81e0fa00184a63dae960007be95200343b24dec6cdea41bc809db29f22c2
-DIST postgresql-8.3.1.tar.bz2 13995572 RMD160 075efb67126f2b308d2a5fe4f9097fdbfbe94c89 SHA1 7397e0d8fd3c420ee845d9ae4995ae347bfaea1d SHA256 7ccf1e5c987920e4d6eb98b8589939e29d3a361d285055d5af35ddd8e1a2d992
-DIST postgresql-8.3.3.tar.bz2 14004538 RMD160 8cc31cae862e328c8372245c8f953a1773dcc1f8 SHA1 b933f26a70bef9a5971c0ff2f392e293eed138b2 SHA256 e9406b93794dc4fd15b21e10512d2b694236d79b018d29b9ca86311d5cca2437
 DIST postgresql-8.3.4.tar.bz2 14037366 RMD160 13cb20672b0dc6fe52346d7c906a0842e0c872ac SHA1 3e6fd905fd3fe9698b50e5376ed15b7d6e3bb602 SHA256 121956d3f77ccb33e542554f564e298b134f9185721cf8610535f96a4f756dcf
 EBUILD postgresql-base-7.3.21.ebuild 4218 RMD160 5631b29631c2cd60c1fdaad9bda2b0ed95adef66 SHA1 c41c008bc7e1f49d22e623d66a698251365d1052 SHA256 65928ffb6f1b2c1027a60ae11996ac585f133d9e586ec65986d2bd4b58f05c85
 EBUILD postgresql-base-7.4.19.ebuild 4407 RMD160 76525cdd0333394d0b1773b797503be3998b6e90 SHA1 3aab349310d844accfd793061cb4e563e1edda18 SHA256 da182b9ee44a4027fdfced6e2c62b2efa8116b75f9f6df1ad104e0d2aac87c0c
@@ -36,10 +33,7 @@ EBUILD postgresql-base-8.0.17.ebuild 4473 RMD160 fd5e01758fbb03b6f0051356ecad955
 EBUILD postgresql-base-8.1.11.ebuild 4491 RMD160 2ccab3e960b5443cc4a8af666175cd4a65a5f1af SHA1 2b3ef3029490aaadc47c6d18890b41456cf86f1c SHA256 c50f5c34972a0b010857ecc6477c3f0ea891d9dc277056f8ff63862ad1635422
 EBUILD postgresql-base-8.1.13.ebuild 4473 RMD160 57e5a28eddfccad47129ce1dec83c66106ef41de SHA1 7435404400924ebf802a960333bfea754fded414 SHA256 9d7ed6811b28dc58409a774e05e0efac951f327a06b7c5a0096973f16eb1e5e0
 EBUILD postgresql-base-8.2.10.ebuild 4580 RMD160 bd7605b050e0d3e1042c3dbec0a3074d5c20c952 SHA1 cf3d885aca879e02708083a0a0b75c2606b98610 SHA256 85d5e8ac9957391aebe2deb714d67348a924bd6c04a80ea225799320693ac110
-EBUILD postgresql-base-8.2.7.ebuild 4600 RMD160 328a974cd40dec73b19c8be57b6f256e60b150e7 SHA1 53205c6e26497109a03ae6a20a0aec129fc6fa00 SHA256 6f360a81032a291037236056b43e849501f97435a22a16383d87fc4c96a55cbc
 EBUILD postgresql-base-8.2.9.ebuild 4582 RMD160 82ff71c78e53fd4c9dc5a39ae0ddfc0323ecc3bd SHA1 725c299784b74f5ecc6b6b34358cd37d850682c8 SHA256 f404a3d6b8d2873f52820fae6c1a0fc0a987487a0c5b2479adb8a228267309f8
-EBUILD postgresql-base-8.3.1.ebuild 4707 RMD160 18e5251bb1654d95dd440992fcaa3e51d39754b6 SHA1 14058c9560ed207db001dd3d6496296ebeddf4f6 SHA256 34b97372b5de92b92cae2dfc09d5d5d0d87ae60b4e770c4f73e27f36ea09901f
-EBUILD postgresql-base-8.3.3.ebuild 4689 RMD160 dad2725dfafb1219c94c34912ad0dbb7c5e9c2e5 SHA1 cb3abc993c812e547cc572421e2d37e2c282dd12 SHA256 95e762fe07399dcad37343647187f1998f7152966dc543c07608d0d673dc5e61
 EBUILD postgresql-base-8.3.4.ebuild 4664 RMD160 4e70a3ea4d5b53fc6f53f391ac9f10bb29223db7 SHA1 f4f4619f77df57735783703a71d61c3afad8ea61 SHA256 82793ede650d74d6d0cb4a41d987f9309fd7a12872faed21c383fe4c80df845f
-MISC ChangeLog 9155 RMD160 3086766e023764edf04317f8a778532a95d56c84 SHA1 b9c4745caef6b94e91e087748c651bd011b7ef0b SHA256 590a81b027641502723f763e9f572893c0b794f3ab21231c9f32b2210350e0dc
+MISC ChangeLog 9322 RMD160 ab736e98e7bde96175ca825d2d18ace4affc494d SHA1 bfbe163fd597dd788b1b7757c2857385e5f54fe8 SHA256 ac5b701e8c432bcfe8f67ec1944412a1af78dc259e0ac836f37b2819f3758503
 MISC metadata.xml 329 RMD160 3b8f9c5e1c05696380c649d2f4f6eb3f1d3b688b SHA1 d7d9e8fbd6a509c5016fc764ccc4239af8feb5b8 SHA256 d9eed0f3b1f204ace8472c343d526d6c949124b5fe5ab8174b2e555712b3e831
diff --git a/dev-db/postgresql-docs/Manifest b/dev-db/postgresql-docs/Manifest
index 1adfddf56721..fb90ba8f17b0 100644
--- a/dev-db/postgresql-docs/Manifest
+++ b/dev-db/postgresql-docs/Manifest
@@ -6,10 +6,7 @@ DIST postgresql-8.0.17.tar.bz2 11234855 RMD160 d22b26b38a91632b8840e9d0b1b96b4ad
 DIST postgresql-8.1.11.tar.bz2 11735420 RMD160 9fb98eadc4f1015205970f26b31b68ea0378bda9 SHA1 73c0f09754fc8e3c7f8d7de49d70244b76927416 SHA256 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e
 DIST postgresql-8.1.13.tar.bz2 11744780 RMD160 fe9fab1b70fa93b4dc0bd19f63a590f75511e79e SHA1 6d4b771aa4011fa3e8aed726f1521b77cd91772a SHA256 a537734da80f85c51ef72dd2d28bb2f64b73f63a727ef53a90211ccac2dcb1d1
 DIST postgresql-8.2.10.tar.bz2 12551773 RMD160 46c7a3e98705dfa0d68c2893773c40d4b73d5eca SHA1 2b4508ba70f18d350715d7113595e8529680e687 SHA256 3ae74e61bbedd3215fdc7e774e5d84346ddc621ff7c8c7f5455e84ecbbd47087
-DIST postgresql-8.2.7.tar.bz2 12576126 RMD160 96700e91c3b9e733c686b0fe377c7ba661710942 SHA1 0be0dbaa488810ebcba77ac7246180c5b2a9b669 SHA256 39528d1ba50f5abc51569e8b9bdeb47d0d4650d289a2c2e465621864b1ff3584
 DIST postgresql-8.2.9.tar.bz2 12558265 RMD160 00fe295d928e77a2dff136795ba846ae3ac08569 SHA1 aeaf0487d031c56518af002f76f779c23baf6391 SHA256 95ea81e0fa00184a63dae960007be95200343b24dec6cdea41bc809db29f22c2
-DIST postgresql-8.3.1.tar.bz2 13995572 RMD160 075efb67126f2b308d2a5fe4f9097fdbfbe94c89 SHA1 7397e0d8fd3c420ee845d9ae4995ae347bfaea1d SHA256 7ccf1e5c987920e4d6eb98b8589939e29d3a361d285055d5af35ddd8e1a2d992
-DIST postgresql-8.3.3.tar.bz2 14004538 RMD160 8cc31cae862e328c8372245c8f953a1773dcc1f8 SHA1 b933f26a70bef9a5971c0ff2f392e293eed138b2 SHA256 e9406b93794dc4fd15b21e10512d2b694236d79b018d29b9ca86311d5cca2437
 DIST postgresql-8.3.4.tar.bz2 14037366 RMD160 13cb20672b0dc6fe52346d7c906a0842e0c872ac SHA1 3e6fd905fd3fe9698b50e5376ed15b7d6e3bb602 SHA256 121956d3f77ccb33e542554f564e298b134f9185721cf8610535f96a4f756dcf
 EBUILD postgresql-docs-7.3.21.ebuild 1028 RMD160 b44177e8db004354584cafdd6985b3335277f04d SHA1 f789962d0a1fe4885f43f339616c9d2142021cd9 SHA256 e038a1433a54f681de70abbfd19198491b1aaa9e8cadb22051fe5334c8b8c7c8
 EBUILD postgresql-docs-7.4.19.ebuild 1028 RMD160 51d491c9e0018624181e00ec0542099b44c38b2f SHA1 99aa105996d528d8bfd69440e4ec5118d795cc90 SHA256 3296c13be95f4b5bfa3726cc88123225fc0e38b6caa0648072907d963e245630
@@ -19,10 +16,7 @@ EBUILD postgresql-docs-8.0.17.ebuild 1028 RMD160 e1405a64cf14fd41c1753abaf038589
 EBUILD postgresql-docs-8.1.11.ebuild 1028 RMD160 946bb084f002bed4d7a13aa85968b4e4c7425a41 SHA1 83bcb8be10652c3e031b05fb82bba8788ecedf7e SHA256 ce04365d1c19b47b145af9e2795fad57e9e3fd63647b8e0e2134f60a8c932b79
 EBUILD postgresql-docs-8.1.13.ebuild 1028 RMD160 1a1c82728f0f411bd862acfd0e39c77cfbface75 SHA1 3dc409877f57ab269e90abd1ff7381df24019912 SHA256 fa7565e739dd1f272b6715b96fcb6d8c20cd09e79e53017275b305486233d4f7
 EBUILD postgresql-docs-8.2.10.ebuild 1025 RMD160 1962c265ccd96e55f47fea8bc5b7fdc2e01427f9 SHA1 c87550e1dcdbe4c541df1dd5bbe0db82b4f9ea9c SHA256 5207e1e3b8c3632964727bce332bf8f6172a184d41f18ef421132fa71032ebf3
-EBUILD postgresql-docs-8.2.7.ebuild 1027 RMD160 cbef470b79907678aa6e8e8f26fbd2c23ca05b9b SHA1 6f1d6fc9803e6566770967ca0952bfda8f667b21 SHA256 8649e1d63eea020ccc4fde2e50390c7fcce5c2431c462fc3e162dfaa7872388b
 EBUILD postgresql-docs-8.2.9.ebuild 1027 RMD160 c82ad76a867ca506685422c1a0aec317e4cd2715 SHA1 e7be5c511e17da5fb2fc6a233d209f1b90f64f5b SHA256 4a77bdf5adb50d378194ed8e80486dca065fdd85ef1d5b652a21948b17d8df87
-EBUILD postgresql-docs-8.3.1.ebuild 1102 RMD160 1bdcf7bb87daf350aa75d0c334ab29f08e85ea6e SHA1 843c056de78f7e9be0394de5dc0cceea05101537 SHA256 a16c926af9dc4c6c567d329ed81de24220f3c9614ec41b17b03a565fc20b0f69
-EBUILD postgresql-docs-8.3.3.ebuild 1102 RMD160 ffd8d5a6c50a677789ae4d05f6aa77587008b1dd SHA1 3e45a08c435fc7b7d5f9199175db59be84db6d01 SHA256 3259cefc69dde28609ed9bcfc42424d4b7f7fb765c31566beee18a39fc9ebdd6
 EBUILD postgresql-docs-8.3.4.ebuild 1150 RMD160 b5f5b137b83e68f4be2aa94f374b636f91c98714 SHA1 83df7a84679b380a2bcf51ee5e27fb9fb2bc8074 SHA256 2affd64c9bbf40b45ec8f1fcf871a723240d347f606a20f330f05ceb8e04278b
-MISC ChangeLog 2336 RMD160 2ccf6c09e8f47e2797e11e3f95def03395f373c7 SHA1 1b76fa2dfa7f66fdef8676a02faeee25d019e93b SHA256 053da1a02c6016ff0cb30c2a4496a626942e7918d78fe0e68b785726c911691f
+MISC ChangeLog 2503 RMD160 7f9a4fc17578669e114c121e2848f7da5f2c75b5 SHA1 3335c42cef74eb4dfedeaf05af043485b1028db5 SHA256 7bdf7e793a76367df25549c01f8dbf88a1f0037a6cfd49786bccfa995d19cc48
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index 38545d884e9d..8ce6ee0144c8 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/postgresql-server
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.11 2008/09/25 08:07:52 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/ChangeLog,v 1.12 2008/09/28 22:53:01 caleb Exp $
+
+  28 Sep 2008; Caleb Tennis <caleb@gentoo.org> files/postgresql.conf-8.3,
+  files/postgresql.init-8.3:
+  Change conf and init files for 8.3 for a little nicer startup/shutdown
+  with options.
+
+  This is per 228639 and thanks to a patch from Jeff Frost
+  (jeff@frostconsultingllc.com)
 
   25 Sep 2008; Robin H. Johnson <robbat2@gentoo.org> Manifest:
   Caleb's last commit broke the Manifest for 7.4.19, fix it up.
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 14378aff42c3..22ed6a450808 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -22,15 +22,15 @@ AUX postgresql.conf-7.4 1532 RMD160 8897005145112dc1782174fcac512531a32ce88a SHA
 AUX postgresql.conf-8.0 1532 RMD160 de03805c18ac079b830bcc412c838eb67cbf4f2b SHA1 a7e288d80b0fd24ddf55bdd560f1e8b216b1f540 SHA256 471cd40a0f9100789d238722e5e5efb923dd4f526b564341a5401b3df236721a
 AUX postgresql.conf-8.1 1532 RMD160 69ce81cb490d73b1c6fd373ff6d4f76abbaec4f9 SHA1 6120fcbc61cce8da2b02eb5608def3e65a6ff04d SHA256 e28635d2abb43a30fe58d0d35c7266e40cb323c94797b8a98a0b7f2a4caf507d
 AUX postgresql.conf-8.2 1532 RMD160 8712059a8898ff65aff6d8dd6287726ebfc7719f SHA1 ca6547ac197a81a84b3de5c6f41d1b824fa6cef4 SHA256 775d1aa953c1d5a82f16e013249c6c29c4907f810536bfc4852eca72a2228780
-AUX postgresql.conf-8.3 1532 RMD160 90f201a80549b663fccb3dd90fd507845b27a958 SHA1 7c4f44369064e81b5092491b5327254022e12492 SHA256 7d9814b4bc11c3ca50c0891ac8c57b0793d92d5eb9814d43ef0ef31d0d2eee46
+AUX postgresql.conf-8.3 1725 RMD160 5bdd027b82013feddcba5d68c09e4122e219ecd2 SHA1 c1bc9ba72623efa12bfad55a0e12a57350955409 SHA256 15cb0f8052d0ecc1bced449777f76875c06ab088f67c1f7f3148b84e97082233
 AUX postgresql.init-7.3 3030 RMD160 9d1415fb380e98ceee0f98787eb4382b098bd026 SHA1 921001624a4bf1078e47353bcec455c6f373e143 SHA256 5b68d9efeebf580fc73dc66e67c02e492333862ae461c88318f3a53ac3c83f27
 AUX postgresql.init-7.4 3030 RMD160 cd3bc7d664c7915c2aff26f85bed21229ab08257 SHA1 4008e04a96d6b5428a34317e3226d00f7205b7a8 SHA256 24352a912932ba1f2cc986a1bea5057ee81afe1b24b72d1590cd75ccd266029d
 AUX postgresql.init-8.0 2985 RMD160 b8de6ed3eea1257208db3547ddc517f1c4ba6741 SHA1 7a13f40bc5d48503d82339ba292001b007b1a6a2 SHA256 15a03eaf147523b93623e42a63ef9497778087776932c1b83cf32da562774002
 AUX postgresql.init-8.1 2985 RMD160 7b5de722b8d8cefab543de1c22465135bb2c8014 SHA1 6717f2efffd5ec9c8b702879a1f08843860d8ef5 SHA256 80547d814c9342f06bf2db1f7d4e1b97ee703bc5d2d3457187817840e4885786
 AUX postgresql.init-8.2 2985 RMD160 2da04989bf124326a34a7fd718f06bf9fd9beae9 SHA1 eb8e87fa7174563191f2789a2e8bd0147164b75f SHA256 008083715fa7237ae5d87bf05603b8d597d1cfe3c5e34d6995ac67cfe9964924
-AUX postgresql.init-8.3 2985 RMD160 62548136f7c06a419927eeaff2d991f9a1aa6528 SHA1 f1fc6f0dd69fa1fc327197856dde28a813ded024 SHA256 99cf6469c0175713252c4de19ade86deb860062fa91c4c74f9397aedb7851c88
+AUX postgresql.init-8.3 3036 RMD160 9a6e0eab7413b82ccf4bfaf6494b3eaa1abf3c4c SHA1 8896cd60d669bdbc5b76649ee26bb23e2c5c9654 SHA256 0685e2e5ff9b97ff22cdbf590fed0c76cb13b4c087bb961a751fdb4e03fb3dea
 DIST postgresql-7.3.21.tar.bz2 9284558 RMD160 f9de4676b4fbe3d96e6d1462b8bc3c05600d6525 SHA1 bdfa3bddc483c6642cc2ee271d076bfaa4c20c92 SHA256 bf44e0ac259e9f6e14ac102f2977496b6996ecea2fd227fbdcea5fa70e342888
-DIST postgresql-7.4.19.tar.bz2 10307396 RMD160 c9a1c7dc8e7bf9ce93c3b4f061af0563b1cc2627 SHA1 19c563d47b0d5deeef03b5ca7707c9f1917853ce SHA256 447ac7070aa0a547f17a307e842734fc27e2716cb4a251fa9a810b178d44c389
+DIST postgresql-7.4.19.tar.bz2 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 DIST postgresql-7.4.21.tar.bz2 10282778 RMD160 b4868ac2664353b8cef4c67d59770f357293c865 SHA1 813895863832b5512838b90b2ea2300b74b856f5 SHA256 2c62d112a7addd4333d14101e508d2222a639e1698b8e4958ce1b05138f76932
 DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 SHA1 66a6fef7749afb91471200005511c04fc1ac2706 SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714
 DIST postgresql-8.0.17.tar.bz2 11234855 RMD160 d22b26b38a91632b8840e9d0b1b96b4ad80eafed SHA1 d1c4530323a81b00a31003dea695875a8f87ff4f SHA256 e425602f60c034ecfd6ffe9b403d863cd99ff6fbc0891a8d59da33258a21a93b
@@ -55,5 +55,5 @@ EBUILD postgresql-server-8.2.9.ebuild 9505 RMD160 55374d201f8f7fcd5c856652216ca5
 EBUILD postgresql-server-8.3.1.ebuild 9729 RMD160 6d1ea7e0702abe3a950c99e12484d5dc8bbcb3d1 SHA1 2fc164f77f34b025c6be78c051c0579ce5722603 SHA256 a04c163a4418c827b29b4c610d407c1bea2eab0dfa58bf6c56e6c52a0db4bdf8
 EBUILD postgresql-server-8.3.3.ebuild 9665 RMD160 c11b3e133aa3f2262eaea9be32523190dc1cd41e SHA1 c81a6700027050723f8be5e4eb7bc36bb9342ed6 SHA256 715dc883693612605971bffff7b3bee607d8b66d8919e972546183e21851e270
 EBUILD postgresql-server-8.3.4.ebuild 9662 RMD160 d79af1cd88f91dbd897f5771bc23ce5a2b88c148 SHA1 a2db20ac623c018cf84c1d3e684fa68bf3b64b48 SHA256 10a0319ac20512a5c45824007738bb9b76112bbf684b840e596bbb46c46e90be
-MISC ChangeLog 11395 RMD160 61ba5dc34711e554539050d5d957f5bf2a577146 SHA1 95db8d19c7cd3d5189f58cbed6591f3d7b1b19b9 SHA256 bc93c730b8bce2c47bc4f7513210f07b688d246133f15e559bf191c0ad6aaf28
+MISC ChangeLog 11678 RMD160 fa4e0614a88ff7bf4263e342c5de57cd82155391 SHA1 21a5dfcc347bece64a7d53b3dd27a0e4c3424600 SHA256 d5ff7510318332cecb759165ec8a29b1bc977897df77af8b42b98047e9141313
 MISC metadata.xml 278 RMD160 70d8f6a6bc3d6619380cee3c0bc2179cf6a5bf28 SHA1 ca266604cf761d9ea76b5ec298ac553156c1c21e SHA256 0ec3e7bdc08e61c19df6ef7f5a1a5a2d2aeabb001c2efca4bdfe947e71a450b0
diff --git a/dev-db/postgresql-server/files/postgresql.conf-8.3 b/dev-db/postgresql-server/files/postgresql.conf-8.3
index 01e42f51d2b4..56561b0c40c5 100644
--- a/dev-db/postgresql-server/files/postgresql.conf-8.3
+++ b/dev-db/postgresql-server/files/postgresql.conf-8.3
@@ -40,6 +40,10 @@ WAIT_FOR_CLEANUP=60
 # Set to 0 to deactivate it
 WAIT_FOR_QUIT=60
 
+# Comment this out if you don't want to wait for the server to
+# startup before continuing.  For example, if this server is a 
+# PITR log shipping based replication standby
+WAIT_FOR_START="-w"
 
 # If you have to export environment variables for the database process,
 # this can be done here.
diff --git a/dev-db/postgresql-server/files/postgresql.init-8.3 b/dev-db/postgresql-server/files/postgresql.init-8.3
index d68911b40783..84cc312243c6 100644
--- a/dev-db/postgresql-server/files/postgresql.init-8.3
+++ b/dev-db/postgresql-server/files/postgresql.init-8.3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3,v 1.3 2008/05/13 07:00:36 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql-server/files/postgresql.init-8.3,v 1.4 2008/09/28 22:53:02 caleb Exp $
 
 opts="${opts} reload"
 
@@ -34,7 +34,7 @@ start() {
 	local retval
 
 	su -l ${PGUSER} \
-		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.3/bin/pg_ctl start -w -o '--silent-mode=true ${PGOPTS}'"
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.3/bin/pg_ctl start ${WAIT_FOR_START} -o '--silent-mode=true ${PGOPTS}'"
 	retval=$?
 	[ $retval -ne 0 ] && eend $retval && return $retval
 
@@ -58,16 +58,18 @@ stop() {
 
 	local retval
 
-	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
-		--retry -TERM/${WAIT_FOR_DISCONNECT}
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.3/bin/pg_ctl stop -t ${WAIT_FOR_DISCONNECT} -m smart"
+
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
 
 	ewarn "Some clients did not disconnect within ${WAIT_FOR_DISCONNECT} seconds."
 	ewarn "Going to shutdown the server anyway."
 
-	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
-		--retry -INT/${WAIT_FOR_CLEANUP}
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.3/bin/pg_ctl stop -m fast"
+
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
 
@@ -80,8 +82,9 @@ stop() {
 	ewarn "Shutting down the server gracefully failed."
 	ewarn "Forcing it to shutdown which leads to a recover-run on next startup."
 
-	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" \
-		--retry -QUIT/${WAIT_FOR_QUIT}
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.3/bin/pg_ctl stop -m immediate"
+
 	retval=$?
 	[ $retval -eq 0 ] && eend $retval && return $retval
 
@@ -91,6 +94,7 @@ stop() {
 
 reload() {
 	ebegin "Reloading PostgreSQL configuration"
-	start-stop-daemon --stop --pidfile "${PGDATA}/postmaster.pid" --signal HUP --oknodo
+	su -l ${PGUSER} \
+		-c "env PGDATA=\"${PGDATA}\" /usr/lib/postgresql-8.3/bin/pg_ctl reload"	
 	eend $?
 }