dev-db/postgresql-server: Removed old digest files. Refactored pkg_config: It now asks the user to continue and the tests are much saner. Changed the default sockets directory from /tmp to /var/run/postgresql and added warning for it.

svn path=/experimental/; revision=355
author: Tiziano Müller <dev-zero@gentoo.org> 2008-04-07 14:43:08 +0000
committer: Tiziano Müller <dev-zero@gentoo.org> 2008-04-07 14:43:08 +0000
commit: c09c280cc2ec2ab3731342775b84afe2f06e6e72 (patch)
tree: 4e4cdcf904a1a8e4faa4d2fbc75fdc398bf94267 /dev-db
parent: dev-db/postgresql-base: Standard location for unix domain socket changed to /... (diff)
download: experimental-c09c280cc2ec2ab3731342775b84afe2f06e6e72.tar.gz
experimental-c09c280cc2ec2ab3731342775b84afe2f06e6e72.tar.bz2
experimental-c09c280cc2ec2ab3731342775b84afe2f06e6e72.zip
26 files changed, 734 insertions, 496 deletions
diff --git a/dev-db/postgresql-server/ChangeLog b/dev-db/postgresql-server/ChangeLog
index 6879890..c8da484 100644
--- a/dev-db/postgresql-server/ChangeLog
+++ b/dev-db/postgresql-server/ChangeLog
@@ -2,6 +2,20 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Apr 2008; Tiziano Müller <dev-zero@gentoo.org>
+  files/postgresql.conf-7.3, postgresql-server-7.3.21.ebuild,
+  files/postgresql-7.3-server.patch, files/postgresql.conf-7.4,
+  postgresql-server-7.4.19.ebuild, files/postgresql-7.4-server.patch,
+  files/postgresql.conf-8.0, postgresql-server-8.0.15.ebuild,
+  files/postgresql-8.0-server.patch, files/postgresql.conf-8.1,
+  postgresql-server-8.1.11.ebuild, files/postgresql-8.1-server.patch,
+  files/postgresql.conf-8.2, postgresql-server-8.2.7.ebuild,
+  files/postgresql-8.2-server.patch, files/postgresql.conf-8.3,
+  postgresql-server-8.3.1.ebuild, files/postgresql-8.3-server.patch:
+  Removed old digest files. Refactored pkg_config: It now asks the user to
+  continue and the tests are much saner. Changed the default sockets directory
+  from /tmp to /var/run/postgresql and added warning for it.
+
   30 Mar 2008; Tiziano Müller <dev-zero@gentoo.org>
   files/postgresql.init-7.3, files/postgresql.conf-7.3,
   files/postgresql.init-7.4, files/postgresql.conf-7.4,
diff --git a/dev-db/postgresql-server/Manifest b/dev-db/postgresql-server/Manifest
index 6be9c5f..8eeab07 100644
--- a/dev-db/postgresql-server/Manifest
+++ b/dev-db/postgresql-server/Manifest
@@ -1,25 +1,25 @@
 AUX postgresql-7.3-cubeparse.patch 1296 RMD160 9b9c0fcf4d58fb989ae77d9ada4588b1876400a6 SHA1 c128746e9938d7aaa4f2be6521530d07c7e207a8 SHA256 1844950b55509b83f38bfdd113350df7422f96ca4c773def6d38ca2f48fcfada
 AUX postgresql-7.3-regress.patch 3294 RMD160 babb74fa25f69bdc5b7a31fc590cc9b8c56b6cb8 SHA1 32be69b830f7fb93b39bba085a240a57b63ce16a SHA256 89f552ebe592677887c086b92c16104b7db47839ad889c3f91546191005d1016
-AUX postgresql-7.3-server.patch 2392 RMD160 39f3a2705d68fef1c58d615b47af87d17cde9eb9 SHA1 878478c8eac3949a217cce448eec418d93cda5ad SHA256 cd99a66fb34908edf3075a1f2d5afe682bb46fa86889160cd5ab3c249a116821
+AUX postgresql-7.3-server.patch 2773 RMD160 14db25b2a9f20b6f1e6c87b2aea1879b3c9873f9 SHA1 605a4efee3a05922a4387206f807c68c2625aa9c SHA256 b963985a5c6fadbb79b359549d482ebd108008eaf1755fbc29ff500bd9677b2f
 AUX postgresql-7.3.21-autoconf.patch 2141 RMD160 3bff01abeeeb094f04469960d4725c977657fb1c SHA1 aceb7ebafde14fde0efe6eefc68115fd8b4cb95a SHA256 9444af9ac2908f18fc69ef2db6fe78584384a46d28dd4c8af10740f9138796a8
 AUX postgresql-7.4-regress.patch 3337 RMD160 dcd1eef99595c5ae070a6778179a1b4611810ad8 SHA1 b58a22970ff3f6c489e55fa6fc1f2a5ba27f1aec SHA256 0679c01c80b0a789789cc5e4b0317e3d8e1ec4acdbe1bd42b63eab37097fa872
-AUX postgresql-7.4-server.patch 2320 RMD160 199b10f5ad2056d67245fe2d801d81bef04502c0 SHA1 353c3dc07081fb5e7d25065a93aaca0193567fee SHA256 67075f990fc4b9b0b67ed29bce06f1cf0a2197fc253f3678f32ea40d77513e30
+AUX postgresql-7.4-server.patch 2811 RMD160 07a11c84497d7ddeaac1266821d2dd4a75f2ea01 SHA1 3d09b0cdffdddd93de0b97b626fc91772342f640 SHA256 d31c37a7821421e289e0dcc57b743e219fe97745053a2750703647f4e2a4bd5c
 AUX postgresql-7.4-vacuum-delay.patch 8918 RMD160 dcd4fc4774277b0bf4a2158584c18bae2dc04232 SHA1 fe701fd6ca6cc9519417ab1053ef61a50ca51281 SHA256 7112ea61b84ce5c6974cd74687039f2ef871e0b4b25a34b4394225c2695fc123
 AUX postgresql-7.4.19-autoconf.patch 1870 RMD160 92e49d3bc82ebfce6c798b4d56008da5c8f46d33 SHA1 a42d03a9c4d7b5df7a69a3d23c9e527c6d901eba SHA256 dccd9553b9cfdc88ffe98e445e27d1714426b4f1e6f405af438243ba06b93b6e
 AUX postgresql-8.0-common.patch 2294 RMD160 4f0028f6b5e95d74328f2c3981aa558420739181 SHA1 be649bf09bd5082e6e2af58c44cc470456e37780 SHA256 eca25d56bd157a3a7883d4c4305e4e0b7d22b8dd0cbca93da88add24da28b681
-AUX postgresql-8.0-server.patch 6510 RMD160 d34a28d154a326b3407162f6227c2c03c4d65005 SHA1 b967366751958ad7502ce97da145d74e47e8cb36 SHA256 621a6f9f529b3318a8f7cc4e3cab7221185f4bd224f4387c13e386cf6b071ccc
+AUX postgresql-8.0-server.patch 6918 RMD160 de96cda82597098fbfb595fac5069164d7e4f30e SHA1 9f5b5e3bff058f75fe5e25e968e96c1c0147cc43 SHA256 5d8ff711ec83eb8660edc129519bd67ae76553fca22ced379439d31938173346
 AUX postgresql-8.1-common.patch 2290 RMD160 ba1f803b045a8d3f430231b0c22b8817e2eb8cf6 SHA1 facf27b2c396fe9f2347eb4cec3b2714a8587b70 SHA256 f80c8dd5a31b88df330c15de4331db1600ae078a789650ab28d61620f27056f5
-AUX postgresql-8.1-server.patch 6471 RMD160 6670d072e6ec4b536b9a5aa9cea8f6c02f20d196 SHA1 a944bf0717a8ea09c87562267057d3764ac4cfdd SHA256 a0f2c3ddc29b647321ce7ef3759c37423760a6f9edec7442bc9d0b9ad71ef090
+AUX postgresql-8.1-server.patch 6862 RMD160 94dc4c22f1f480bf5844f6e654d8a4e0534059eb SHA1 8fbf5d0b4d24b675f6812ff89465527263f51012 SHA256 97f3b3d889af08aeb92e6583dd970763cdc662621e34e13a5298fe9cd5ad4b4d
 AUX postgresql-8.2-common.patch 2640 RMD160 b25ba915d5d6ad9c12c1d51426363c196b830923 SHA1 7b946d57bfed34e2e7e1338c3ab3004341d7ab12 SHA256 36ca9cb4f26424c302fdd704b7c1a268e87612afa3006bf008d4594dabe080f8
-AUX postgresql-8.2-server.patch 4849 RMD160 a1f625e9d0d19acaae63e75084185e32623dbcf6 SHA1 a481e9500cc8484a1bc454820aae5b8603451ba2 SHA256 be4ccf88103e92c5adcb065d3aaf10b9e60fad1962993d255965a6260ea3f595
+AUX postgresql-8.2-server.patch 5319 RMD160 9aae5832defd2e43879246e773fd1aada0680716 SHA1 ea726704fc85118c27f511bfd9324b136ced3eb1 SHA256 2687fa5159a34da59e36af4c894f43b2136e8e88c965a682607cb48acb61d8ee
 AUX postgresql-8.3-common.patch 2641 RMD160 0822bf1512457e91d5f32f9d192de6f197db9c55 SHA1 e4bdbd5eee1023e8f0b42ef408b34b57495d1e2b SHA256 e416c26d9c3d266b306ddbc0a2b648054739b7ace35e2b4e449fbdaf094bc197
-AUX postgresql-8.3-server.patch 6191 RMD160 d50a2fc599db9c9d8041e9366a9ffc75d5230490 SHA1 7f1c78854440fff2982dde51057055ba55772a2f SHA256 2af33956fc13949204f340aca6999a6adc999dcc1a9d3405b7c3503e2c95cf08
-AUX postgresql.conf-7.3 1629 RMD160 74fdc71ec9f31cb396ff2dcb80c28818e3f308ab SHA1 0a60a38ab10bac2bceb56b755f3317cac93585c5 SHA256 1fe4c6bc37007bfa76bf03acc274c29dc026c64f099794487eddffa99374633c
-AUX postgresql.conf-7.4 1629 RMD160 74fdc71ec9f31cb396ff2dcb80c28818e3f308ab SHA1 0a60a38ab10bac2bceb56b755f3317cac93585c5 SHA256 1fe4c6bc37007bfa76bf03acc274c29dc026c64f099794487eddffa99374633c
-AUX postgresql.conf-8.0 1629 RMD160 74fdc71ec9f31cb396ff2dcb80c28818e3f308ab SHA1 0a60a38ab10bac2bceb56b755f3317cac93585c5 SHA256 1fe4c6bc37007bfa76bf03acc274c29dc026c64f099794487eddffa99374633c
-AUX postgresql.conf-8.1 1629 RMD160 74fdc71ec9f31cb396ff2dcb80c28818e3f308ab SHA1 0a60a38ab10bac2bceb56b755f3317cac93585c5 SHA256 1fe4c6bc37007bfa76bf03acc274c29dc026c64f099794487eddffa99374633c
-AUX postgresql.conf-8.2 1629 RMD160 e978b4f2c2a8945cf1a83e462eacd5c6f414d1c0 SHA1 32637027c593108c3b69b00fb23904c0b7b1678f SHA256 2038167ee01aa4c62b3b87223745783d7cc4760722645c71d8e6f1ecfc2b3a21
-AUX postgresql.conf-8.3 1629 RMD160 0eaaad116c4d7e514500101ec616eb6f5653ad26 SHA1 370f1a915d284b5b41813acc8d19bfdeec644ebf SHA256 6d1e3e01d9e50ad6d3b7aa3afa1c5b45e3722eab002e668bb6d5f1fa36782c75
+AUX postgresql-8.3-server.patch 6683 RMD160 58fb842a74512a94b24a85a4268a61b095cfedf0 SHA1 5041fe54bfe00b29b9abeb4bc6cd6139ef247f00 SHA256 fd44afe3fdb3109bdd3c849543e2065efc9aef2511a80ba711961ab9e879a02f
+AUX postgresql.conf-7.3 1532 RMD160 fa088eb5742efbce852d6dcff1dba420857aa67e SHA1 22ac6f3632d6baa1a97017f27001951ccf6a224c SHA256 c0e2ae8c22895bde591302234735ceaddcf4c2a4b1e17ed8cee53b66dad32a24
+AUX postgresql.conf-7.4 1532 RMD160 8897005145112dc1782174fcac512531a32ce88a SHA1 f7e1e1c6cac39d1c7ecc371c9391214d6a8c8055 SHA256 4084c99ad0fff027876c82375c4d99d1669090398137ef5ed19c8e74cecb6e0c
+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.init-7.3 2155 RMD160 6878e838e8bca085a690afe475f7d804321ead01 SHA1 86bcacf81b9ac05e0e2527269fa998707673ed2e SHA256 78e7e2be5d2960cb43459c13b389642274eaeb1df79f8afb16e20d880acaefb8
 AUX postgresql.init-7.4 2155 RMD160 bc0a416070790a4a5cced9352b434ed2ecd97b0b SHA1 cd29ac99f9ca2fa28a347f83e2b02f1908145858 SHA256 d144d2522802132197c476f8512f496ced9aae6459775d6f2ca5884afbd6a222
 AUX postgresql.init-8.0 2155 RMD160 02ab6175a47e5d45ce8360e710b58eb9d82554e6 SHA1 af59f00792de35999fc68495822b94e86121371a SHA256 ca8602773dc390bc52aa8bac0c72d06b4c547de3b718d7e1428354760fd97dc8
@@ -32,11 +32,11 @@ DIST postgresql-8.0.15.tar.bz2 11253897 RMD160 6aff5c63dce73eea609f0b6e013cd043a
 DIST postgresql-8.1.11.tar.bz2 11735420 RMD160 9fb98eadc4f1015205970f26b31b68ea0378bda9 SHA1 73c0f09754fc8e3c7f8d7de49d70244b76927416 SHA256 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e
 DIST postgresql-8.2.7.tar.bz2 12576126 RMD160 96700e91c3b9e733c686b0fe377c7ba661710942 SHA1 0be0dbaa488810ebcba77ac7246180c5b2a9b669 SHA256 39528d1ba50f5abc51569e8b9bdeb47d0d4650d289a2c2e465621864b1ff3584
 DIST postgresql-8.3.1.tar.bz2 13995572 RMD160 075efb67126f2b308d2a5fe4f9097fdbfbe94c89 SHA1 7397e0d8fd3c420ee845d9ae4995ae347bfaea1d SHA256 7ccf1e5c987920e4d6eb98b8589939e29d3a361d285055d5af35ddd8e1a2d992
-EBUILD postgresql-server-7.3.21.ebuild 7841 RMD160 5fa170f04a318060f5edce49a794e35159c4b00f SHA1 198f25e6ae53c0adecfb8328708c3ce08b847f7c SHA256 2acc7e0173d4c42d8debdb613f66f351ca58fa6b94f4f13c262a63b211587dc6
-EBUILD postgresql-server-7.4.19.ebuild 7771 RMD160 b9d086687680e477256b39f1480973ee0ac3bff0 SHA1 604a708ec1bcce5763883a8c15bddb43cb56c94a SHA256 3b9a8f1903a1f7e7159348af8272f9922f607d9448d0e906fb3cebe83f35f49e
-EBUILD postgresql-server-8.0.15.ebuild 7967 RMD160 98623ab4e26874b90d2befec864f967387e821eb SHA1 d32df8948592b46345efde8d7285f4a3759160b9 SHA256 d941f29028c4f84ea8174bf05aa5b84fa72b46110d4d95f4d8c2c3231d4465c7
-EBUILD postgresql-server-8.1.11.ebuild 8088 RMD160 c81b49aba166f90faf87b5ae278763cd09fe30e6 SHA1 2f2b0d475775ee412cc72703f9c7841b443abc03 SHA256 83172e0cf272926ca9715511a0ca00301e738b643c4d50ea66d6d46c418146e0
-EBUILD postgresql-server-8.2.7.ebuild 8318 RMD160 e130264005bb0c8a0e17d8814e1de510b84908ad SHA1 a1519eebba917ca9b9e2b3e0ebfd2a2e3286f7a7 SHA256 fac930c548d777292622f6c0c663015eb15bcec9715bc31b62f37d9c540ffe5a
-EBUILD postgresql-server-8.3.1.ebuild 8405 RMD160 5464f4cef89fe6a3219b5ba32e814056d88283bc SHA1 a5d5047e6f1b44fd82a96d5a64e76c1f04f532ee SHA256 f82e485e5c095fcf9c12ad41eadad7d680260587b6e8f6cf7bd283fa2116febc
-MISC ChangeLog 4622 RMD160 dd183143956abfe6f2b0b7d894c0ca0a0ff2ec46 SHA1 a7ed6a964434133c7521bcf8f36517202097e902 SHA256 3d0b8cb39e5397c8ea84cf7209405ca85662eae95157faf8318b062e1c5496ab
+EBUILD postgresql-server-7.3.21.ebuild 8950 RMD160 45ef0b5075785bb3e5698e15f47028eab9bdfef4 SHA1 f6868066771106c691b43d456bfa2a032af19d6f SHA256 21fd96d0b2888c4580a5a2a12ae08ee13523d01f823e74c59fc169d9171cb18b
+EBUILD postgresql-server-7.4.19.ebuild 8880 RMD160 197c5aa134179814f83c1d66983435e52f23c9e6 SHA1 56dbbc9971e39f6b37387c2dca5a2316435d0e2f SHA256 9fc12557ba7e076bdda1eefbce8002f611244f3558e962c3da7f8ca0bb860399
+EBUILD postgresql-server-8.0.15.ebuild 9076 RMD160 84042bb5335ddd21ac5556c79b609d13f0648e1f SHA1 2bbece26ef378d078aa6abdbde1a64b63feab316 SHA256 b93aedc7300827363542d6caf7f0a62bc90accdd416b5060e7fdef106a5bec5d
+EBUILD postgresql-server-8.1.11.ebuild 9197 RMD160 a620bada30cf94c5a36cd2cdb18d312299cf6d84 SHA1 8265656f375a27d34221819e6565f62231e2441f SHA256 8a4123efaf42ea77845e265d58a75a0f6484ef80832e8360efedf8b56194864f
+EBUILD postgresql-server-8.2.7.ebuild 9427 RMD160 f46e6997f3f71652d7e2505e0d237fbfb1966b02 SHA1 21f3d76c309de58021bcc97eea2d6ffc3702434b SHA256 5e78d8ca135091d5da7b74fae4c933e0fe98aaa1c81f2edf0b375b1233bba406
+EBUILD postgresql-server-8.3.1.ebuild 9515 RMD160 4bb833f5196fcda9500571c3a053c9e850a732db SHA1 eb0137c0bd621d5f4038342d15556eb9983dfdb7 SHA256 74a35dda8d22b9fb704d3cf9b141dec5c2abf8c0ec0693228547cf4caecabbc5
+MISC ChangeLog 5477 RMD160 3cc743660189c3eee3116ed7e5eeeadec59b4e23 SHA1 3c5d24ee30ad3e6c85f3c05d50dd1d90a9dc7116 SHA256 46d934de66e54a879eee0ef80d9e545855d8c59496e4d146ca0296b8e5d11894
 MISC metadata.xml 164 RMD160 becfe652663bd65719dd11fa6ffb588b3d5b4ecc SHA1 f67b7ac1c5e6e65ef5a19a589d4759c84918f86c SHA256 7e8e8126bc8701c4a42c7dfed8bb755ac6040fe3d0e3f994d888f8b2b4fa7d8b
diff --git a/dev-db/postgresql-server/files/digest-postgresql-server-7.3.21 b/dev-db/postgresql-server/files/digest-postgresql-server-7.3.21
deleted file mode 100644
index acc9f8c..0000000
--- a/dev-db/postgresql-server/files/digest-postgresql-server-7.3.21
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e0068d0de0540a2d7247749ea830833f postgresql-7.3.21.tar.bz2 9284558
-RMD160 f9de4676b4fbe3d96e6d1462b8bc3c05600d6525 postgresql-7.3.21.tar.bz2 9284558
-SHA256 bf44e0ac259e9f6e14ac102f2977496b6996ecea2fd227fbdcea5fa70e342888 postgresql-7.3.21.tar.bz2 9284558
diff --git a/dev-db/postgresql-server/files/digest-postgresql-server-7.4.19 b/dev-db/postgresql-server/files/digest-postgresql-server-7.4.19
deleted file mode 100644
index fb3a431..0000000
--- a/dev-db/postgresql-server/files/digest-postgresql-server-7.4.19
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0be8c193fb73113930d043c60200598b postgresql-7.4.19.tar.bz2 10307396
-RMD160 c9a1c7dc8e7bf9ce93c3b4f061af0563b1cc2627 postgresql-7.4.19.tar.bz2 10307396
-SHA256 447ac7070aa0a547f17a307e842734fc27e2716cb4a251fa9a810b178d44c389 postgresql-7.4.19.tar.bz2 10307396
diff --git a/dev-db/postgresql-server/files/digest-postgresql-server-8.0.15 b/dev-db/postgresql-server/files/digest-postgresql-server-8.0.15
deleted file mode 100644
index e7881b8..0000000
--- a/dev-db/postgresql-server/files/digest-postgresql-server-8.0.15
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 3ee548b3643e0a0a4b76493e81b336f3 postgresql-8.0.15.tar.bz2 11253897
-RMD160 6aff5c63dce73eea609f0b6e013cd043ae8b7a37 postgresql-8.0.15.tar.bz2 11253897
-SHA256 59408a00db1c73e638a11af10438a827507b7a72b53916d58f2d44c477718714 postgresql-8.0.15.tar.bz2 11253897
diff --git a/dev-db/postgresql-server/files/digest-postgresql-server-8.1.11 b/dev-db/postgresql-server/files/digest-postgresql-server-8.1.11
deleted file mode 100644
index 86701fa..0000000
--- a/dev-db/postgresql-server/files/digest-postgresql-server-8.1.11
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 48922512bcf683d5ea22a99df5eaaecd postgresql-8.1.11.tar.bz2 11735420
-RMD160 9fb98eadc4f1015205970f26b31b68ea0378bda9 postgresql-8.1.11.tar.bz2 11735420
-SHA256 3e91cdfc1353fa9c6416d9fc8ae9d6ab3171565f00aeb6c882214c2f08a03e2e postgresql-8.1.11.tar.bz2 11735420
diff --git a/dev-db/postgresql-server/files/digest-postgresql-server-8.2.6 b/dev-db/postgresql-server/files/digest-postgresql-server-8.2.6
deleted file mode 100644
index eb9626c..0000000
--- a/dev-db/postgresql-server/files/digest-postgresql-server-8.2.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 17b9049b4fcad42ee95410833c1db228 postgresql-8.2.6.tar.bz2 12559117
-RMD160 fa12ce310919cb52be3558d38a7e329bc73bbe33 postgresql-8.2.6.tar.bz2 12559117
-SHA256 ee41327e821f933de2894d6e0c319edc4b63e80cb902e673b490b7eaf4ead114 postgresql-8.2.6.tar.bz2 12559117
diff --git a/dev-db/postgresql-server/files/digest-postgresql-server-8.3_rc1 b/dev-db/postgresql-server/files/digest-postgresql-server-8.3_rc1
deleted file mode 100644
index 9e44c24..0000000
--- a/dev-db/postgresql-server/files/digest-postgresql-server-8.3_rc1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c0994ab0d16aa7410d05102344f819fe postgresql-8.3RC1.tar.bz2 13801207
-RMD160 5be543b40dcac92ad1153bb5527b0b069c98d246 postgresql-8.3RC1.tar.bz2 13801207
-SHA256 a05953dffa0e62288364cc17e96e0be351106ada128dc76a8b0c54e16c730a0a postgresql-8.3RC1.tar.bz2 13801207
diff --git a/dev-db/postgresql-server/files/postgresql-7.3-server.patch b/dev-db/postgresql-server/files/postgresql-7.3-server.patch
index 6650ec6..5d2e0fb 100644
--- a/dev-db/postgresql-server/files/postgresql-7.3-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-7.3-server.patch
@@ -1,8 +1,8 @@
-diff --git a/GNUmakefile.in b/GNUmakefile.in
-index 2b17d47..d8f967d 100644
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -23,7 +23,6 @@ installdirs uninstall distprep:
+=== GNUmakefile.in
+==================================================================
+--- GNUmakefile.in	(revision 14)
++++ GNUmakefile.in	(local)
+@@ -23,7 +23,6 @@
  	$(MAKE) -C src $@
  
  install-all-headers:
@@ -10,11 +10,11 @@ index 2b17d47..d8f967d 100644
  
  # clean, distclean, etc should apply to contrib too, even though
  # it's not built by default
-diff --git a/contrib/Makefile b/contrib/Makefile
-index 66753e8..6066a33 100644
---- a/contrib/Makefile
-+++ b/contrib/Makefile
-@@ -14,7 +14,6 @@ WANTED_DIRS = \
+=== contrib/Makefile
+==================================================================
+--- contrib/Makefile	(revision 14)
++++ contrib/Makefile	(local)
+@@ -14,7 +14,6 @@
  		dbmirror	\
  		dbsize		\
  		earthdistance	\
@@ -22,7 +22,7 @@ index 66753e8..6066a33 100644
  		fulltextindex	\
  		fuzzystrmatch	\
  		intagg		\
-@@ -24,10 +23,7 @@ WANTED_DIRS = \
+@@ -24,10 +23,7 @@
  		ltree		\
  		miscutil	\
  		noupdate	\
@@ -33,7 +33,7 @@ index 66753e8..6066a33 100644
  		pgcrypto	\
  		pgstattuple	\
  		rserv		\
-@@ -38,8 +34,7 @@ WANTED_DIRS = \
+@@ -38,8 +34,7 @@
  		tablefunc	\
  		tips		\
  		tsearch		\
@@ -43,11 +43,11 @@ index 66753e8..6066a33 100644
  
  # Missing:
  #		ipc_check	\ (does not have a makefile)
-diff --git a/src/Makefile b/src/Makefile
-index cd6e5e6..49672db 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -17,13 +17,10 @@ all install installdirs uninstall dep depend distprep:
+=== src/Makefile
+==================================================================
+--- src/Makefile	(revision 14)
++++ src/Makefile	(local)
+@@ -17,13 +17,10 @@
  	$(MAKE) -C port $@
  	$(MAKE) -C backend $@
  	$(MAKE) -C backend/utils/mb/conversion_procs $@
@@ -61,11 +61,11 @@ index cd6e5e6..49672db 100644
  
  clean:
  	$(MAKE) -C port $@
-diff --git a/src/Makefile.global.in b/src/Makefile.global.in
-index e0fd91d..f8a3430 100644
---- a/src/Makefile.global.in
-+++ b/src/Makefile.global.in
-@@ -286,10 +286,10 @@ libpq_builddir = $(top_builddir)/src/interfaces/libpq
+=== src/Makefile.global.in
+==================================================================
+--- src/Makefile.global.in	(revision 14)
++++ src/Makefile.global.in	(local)
+@@ -286,10 +286,10 @@
  libpq = -L$(libpq_builddir) -lpq
  
  submake-libpq:
@@ -78,11 +78,11 @@ index e0fd91d..f8a3430 100644
  
  .PHONY: submake-libpq submake-libpgport
  
-diff --git a/src/bin/Makefile b/src/bin/Makefile
-index 3035f61..90b357d 100644
---- a/src/bin/Makefile
-+++ b/src/bin/Makefile
-@@ -13,9 +13,8 @@ subdir = src/bin
+=== src/bin/Makefile
+==================================================================
+--- src/bin/Makefile	(revision 14)
++++ src/bin/Makefile	(local)
+@@ -13,9 +13,8 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
  
@@ -94,3 +94,16 @@ index 3035f61..90b357d 100644
  
  ifeq ($(with_tcl), yes)
  	DIRS += pgtclsh
+=== src/include/pg_config.h.in
+==================================================================
+--- src/include/pg_config.h.in	(revision 14)
++++ src/include/pg_config.h.in	(local)
+@@ -244,7 +244,7 @@
+  * just hate the idea of sockets in /tmp, here's where to twiddle it.
+  * You can also override this at runtime with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
+ 
+ 
+ /*
diff --git a/dev-db/postgresql-server/files/postgresql-7.4-server.patch b/dev-db/postgresql-server/files/postgresql-7.4-server.patch
index 972dce8..22878dc 100644
--- a/dev-db/postgresql-server/files/postgresql-7.4-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-7.4-server.patch
@@ -93,3 +93,16 @@
  
  ifeq ($(with_tcl), yes)
  	DIRS += pgtclsh
+=== src/include/pg_config_manual.h
+==================================================================
+--- src/include/pg_config_manual.h	(revision 12)
++++ src/include/pg_config_manual.h	(local)
+@@ -165,7 +165,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
+ 
+ /*
+  * Defining this will make float4 and float8 operations faster by
diff --git a/dev-db/postgresql-server/files/postgresql-8.0-server.patch b/dev-db/postgresql-server/files/postgresql-8.0-server.patch
index adf00fa..e45330a 100644
--- a/dev-db/postgresql-server/files/postgresql-8.0-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.0-server.patch
@@ -1,8 +1,8 @@
-diff --git a/GNUmakefile.in b/GNUmakefile.in
-index c451bd6..a048ce7 100644
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -11,19 +11,16 @@ include $(top_builddir)/src/Makefile.global
+=== GNUmakefile.in
+==================================================================
+--- GNUmakefile.in	(revision 14)
++++ GNUmakefile.in	(local)
+@@ -11,19 +11,16 @@
  all:
  	$(MAKE) -C doc all
  	$(MAKE) -C src all
@@ -22,11 +22,11 @@ index c451bd6..a048ce7 100644
  
  # clean, distclean, etc should apply to contrib too, even though
  # it's not built by default
-diff --git a/contrib/Makefile b/contrib/Makefile
-index 166ed86..c0705a7 100644
---- a/contrib/Makefile
-+++ b/contrib/Makefile
-@@ -13,7 +13,6 @@ WANTED_DIRS = \
+=== contrib/Makefile
+==================================================================
+--- contrib/Makefile	(revision 14)
++++ contrib/Makefile	(local)
+@@ -13,7 +13,6 @@
  		dbmirror	\
  		dbsize		\
  		earthdistance	\
@@ -34,7 +34,7 @@ index 166ed86..c0705a7 100644
  		fulltextindex	\
  		fuzzystrmatch	\
  		intagg		\
-@@ -22,13 +21,8 @@ WANTED_DIRS = \
+@@ -22,13 +21,8 @@
  		lo		\
  		ltree		\
  		miscutil	\
@@ -48,7 +48,7 @@ index 166ed86..c0705a7 100644
  		pgcrypto	\
  		pgstattuple	\
  		rtree_gist	\
-@@ -39,8 +33,7 @@ WANTED_DIRS = \
+@@ -39,8 +33,7 @@
  		tips		\
  		tsearch		\
  		tsearch2	\
@@ -58,11 +58,11 @@ index 166ed86..c0705a7 100644
  
  # Missing:
  #		adddepend	\ (does not have a makefile)
-diff --git a/src/Makefile b/src/Makefile
-index 0963f88..5a7bb45 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -18,14 +18,10 @@ all install installdirs uninstall dep depend distprep:
+=== src/Makefile
+==================================================================
+--- src/Makefile	(revision 14)
++++ src/Makefile	(local)
+@@ -18,14 +18,10 @@
  	$(MAKE) -C timezone $@
  	$(MAKE) -C backend $@
  	$(MAKE) -C backend/utils/mb/conversion_procs $@
@@ -78,11 +78,11 @@ index 0963f88..5a7bb45 100644
  
  install-local: installdirs-local
  	$(INSTALL_DATA) Makefile.global $(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global
-diff --git a/src/Makefile.global.in b/src/Makefile.global.in
-index e57265e..e081618 100644
---- a/src/Makefile.global.in
-+++ b/src/Makefile.global.in
-@@ -336,10 +336,10 @@ endif
+=== src/Makefile.global.in
+==================================================================
+--- src/Makefile.global.in	(revision 14)
++++ src/Makefile.global.in	(local)
+@@ -336,10 +336,10 @@
  
  
  submake-libpq:
@@ -95,11 +95,11 @@ index e57265e..e081618 100644
  
  .PHONY: submake-libpq submake-libpgport
  
-diff --git a/src/bin/Makefile b/src/bin/Makefile
-index 8309db1..0d620d0 100644
---- a/src/bin/Makefile
-+++ b/src/bin/Makefile
-@@ -13,8 +13,8 @@ subdir = src/bin
+=== src/bin/Makefile
+==================================================================
+--- src/bin/Makefile	(revision 14)
++++ src/bin/Makefile	(local)
+@@ -13,8 +13,8 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
  
@@ -110,11 +110,24 @@ index 8309db1..0d620d0 100644
  ifeq ($(PORTNAME), win32)
  DIRS+=pgevent
  endif
-diff --git a/src/port/Makefile b/src/port/Makefile
-index de686e7..3bddb0e 100644
---- a/src/port/Makefile
-+++ b/src/port/Makefile
-@@ -29,11 +29,10 @@ LIBS += $(PTHREAD_LIBS)
+=== src/include/pg_config_manual.h
+==================================================================
+--- src/include/pg_config_manual.h	(revision 14)
++++ src/include/pg_config_manual.h	(local)
+@@ -160,7 +160,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
+ 
+ /*
+  * The random() function is expected to yield values between 0 and
+=== src/port/Makefile
+==================================================================
+--- src/port/Makefile	(revision 14)
++++ src/port/Makefile	(local)
+@@ -29,11 +29,10 @@
  # Replace all object files so they use FRONTEND define
  LIBOBJS_SRV := $(LIBOBJS:%.o=%_srv.o)
  
@@ -128,11 +141,11 @@ index de686e7..3bddb0e 100644
  
  uninstall:
  	$(RM) $(DESTDIR)$(libdir)/libpgport.a
-diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
-index 822147b..f45ddee 100644
---- a/src/test/regress/GNUmakefile
-+++ b/src/test/regress/GNUmakefile
-@@ -138,7 +138,7 @@ all-spi:
+=== src/test/regress/GNUmakefile
+==================================================================
+--- src/test/regress/GNUmakefile	(revision 14)
++++ src/test/regress/GNUmakefile	(local)
+@@ -138,7 +138,7 @@
  check: all
  	-rm -rf ./testtablespace
  	mkdir ./testtablespace
@@ -141,11 +154,11 @@ index 822147b..f45ddee 100644
  
  installcheck: all
  	-rm -rf ./testtablespace
-diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh
-index d62afdd..e41319c 100644
---- a/src/test/regress/pg_regress.sh
-+++ b/src/test/regress/pg_regress.sh
-@@ -89,6 +89,8 @@ host_platform='@host_tuple@'
+=== src/test/regress/pg_regress.sh
+==================================================================
+--- src/test/regress/pg_regress.sh	(revision 14)
++++ src/test/regress/pg_regress.sh	(local)
+@@ -89,6 +89,8 @@
  enable_shared='@enable_shared@'
  GCC=@GCC@
  
@@ -154,7 +167,7 @@ index d62afdd..e41319c 100644
  if [ "$GCC" = yes ]; then
      compiler=gcc
  else
-@@ -446,7 +448,7 @@ then
+@@ -446,7 +448,7 @@
      # wait forever, however.
      i=0
      max=60
@@ -163,7 +176,7 @@ index d62afdd..e41319c 100644
      do
          i=`expr $i + 1`
          if [ $i -ge $max ]
-@@ -503,7 +505,7 @@ else # not temp-install
+@@ -503,7 +505,7 @@
      fi
  
      message "dropping database \"$dbname\""
@@ -172,7 +185,7 @@ index d62afdd..e41319c 100644
      # errors can be ignored
  fi
  
-@@ -512,7 +514,7 @@ fi
+@@ -512,7 +514,7 @@
  # Set up SQL shell for the test.
  # ----------
  
@@ -181,7 +194,7 @@ index d62afdd..e41319c 100644
  
  
  # ----------
-@@ -546,13 +548,13 @@ fi
+@@ -546,13 +548,13 @@
  # ----------
  
  message "creating database \"$dbname\""
@@ -197,7 +210,7 @@ index d62afdd..e41319c 100644
  checkpoint;
  alter database \"$dbname\" set lc_messages to 'C';
  alter database \"$dbname\" set lc_monetary to 'C';
-@@ -569,7 +571,7 @@ fi
+@@ -569,7 +571,7 @@
  # ----------
  
  message "dropping regression test user accounts"
@@ -206,7 +219,7 @@ index d62afdd..e41319c 100644
  if [ $? -eq 2 ]; then
      echo "$me: could not drop user accounts"
      (exit 2); exit
-@@ -582,7 +584,7 @@ fi
+@@ -582,7 +584,7 @@
  
  if [ "$enable_shared" = yes ]; then
          message "installing PL/pgSQL"
diff --git a/dev-db/postgresql-server/files/postgresql-8.1-server.patch b/dev-db/postgresql-server/files/postgresql-8.1-server.patch
index 9ec3869..c68fcff 100644
--- a/dev-db/postgresql-server/files/postgresql-8.1-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.1-server.patch
@@ -1,8 +1,8 @@
-diff --git a/GNUmakefile.in b/GNUmakefile.in
-index 0216527..7ed3520 100644
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -11,19 +11,16 @@ include $(top_builddir)/src/Makefile.global
+=== GNUmakefile.in
+==================================================================
+--- GNUmakefile.in	(revision 14)
++++ GNUmakefile.in	(local)
+@@ -11,19 +11,16 @@
  all:
  	$(MAKE) -C doc all
  	$(MAKE) -C src all
@@ -22,11 +22,11 @@ index 0216527..7ed3520 100644
  
  # clean, distclean, etc should apply to contrib too, even though
  # it's not built by default
-diff --git a/contrib/Makefile b/contrib/Makefile
-index 7367163..2740bb9 100644
---- a/contrib/Makefile
-+++ b/contrib/Makefile
-@@ -19,10 +19,8 @@ WANTED_DIRS = \
+=== contrib/Makefile
+==================================================================
+--- contrib/Makefile	(revision 14)
++++ contrib/Makefile	(local)
+@@ -19,10 +19,8 @@
  		isbn_issn	\
  		lo		\
  		ltree		\
@@ -37,7 +37,7 @@ index 7367163..2740bb9 100644
  		pgcrypto	\
  		pgstattuple	\
  		seg		\
-@@ -30,8 +28,7 @@ WANTED_DIRS = \
+@@ -30,8 +28,7 @@
  		tablefunc	\
  		tips		\
  		tsearch2	\
@@ -47,11 +47,11 @@ index 7367163..2740bb9 100644
  
  # Missing:
  #		adddepend	\ (does not have a makefile)
-diff --git a/src/Makefile b/src/Makefile
-index 0963f88..5a7bb45 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -18,14 +18,10 @@ all install installdirs uninstall dep depend distprep:
+=== src/Makefile
+==================================================================
+--- src/Makefile	(revision 14)
++++ src/Makefile	(local)
+@@ -18,14 +18,10 @@
  	$(MAKE) -C timezone $@
  	$(MAKE) -C backend $@
  	$(MAKE) -C backend/utils/mb/conversion_procs $@
@@ -67,11 +67,11 @@ index 0963f88..5a7bb45 100644
  
  install-local: installdirs-local
  	$(INSTALL_DATA) Makefile.global $(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global
-diff --git a/src/Makefile.global.in b/src/Makefile.global.in
-index 20d7a1d..12533a2 100644
---- a/src/Makefile.global.in
-+++ b/src/Makefile.global.in
-@@ -360,10 +360,10 @@ endif
+=== src/Makefile.global.in
+==================================================================
+--- src/Makefile.global.in	(revision 14)
++++ src/Makefile.global.in	(local)
+@@ -360,10 +360,10 @@
  
  
  submake-libpq:
@@ -84,11 +84,11 @@ index 20d7a1d..12533a2 100644
  
  .PHONY: submake-libpq submake-libpgport
  
-diff --git a/src/bin/Makefile b/src/bin/Makefile
-index 8309db1..0d620d0 100644
---- a/src/bin/Makefile
-+++ b/src/bin/Makefile
-@@ -13,8 +13,8 @@ subdir = src/bin
+=== src/bin/Makefile
+==================================================================
+--- src/bin/Makefile	(revision 14)
++++ src/bin/Makefile	(local)
+@@ -13,8 +13,8 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
  
@@ -99,11 +99,24 @@ index 8309db1..0d620d0 100644
  ifeq ($(PORTNAME), win32)
  DIRS+=pgevent
  endif
-diff --git a/src/port/Makefile b/src/port/Makefile
-index 8ca565e..dad5bb3 100644
---- a/src/port/Makefile
-+++ b/src/port/Makefile
-@@ -29,11 +29,10 @@ LIBS += $(PTHREAD_LIBS)
+=== src/include/pg_config_manual.h
+==================================================================
+--- src/include/pg_config_manual.h	(revision 14)
++++ src/include/pg_config_manual.h	(local)
+@@ -175,7 +175,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
+ 
+ /*
+  * The random() function is expected to yield values between 0 and
+=== src/port/Makefile
+==================================================================
+--- src/port/Makefile	(revision 14)
++++ src/port/Makefile	(local)
+@@ -29,11 +29,10 @@
  # Replace all object files so they use FRONTEND define
  LIBOBJS_SRV := $(LIBOBJS:%.o=%_srv.o)
  
@@ -117,11 +130,11 @@ index 8ca565e..dad5bb3 100644
  
  uninstall:
  	$(RM) $(DESTDIR)$(libdir)/libpgport.a
-diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
-index a384254..22f69f1 100644
---- a/src/test/regress/GNUmakefile
-+++ b/src/test/regress/GNUmakefile
-@@ -137,7 +137,7 @@ all-spi:
+=== src/test/regress/GNUmakefile
+==================================================================
+--- src/test/regress/GNUmakefile	(revision 14)
++++ src/test/regress/GNUmakefile	(local)
+@@ -137,7 +137,7 @@
  check: all
  	-rm -rf ./testtablespace
  	mkdir ./testtablespace
@@ -130,11 +143,11 @@ index a384254..22f69f1 100644
  
  installcheck: all
  	-rm -rf ./testtablespace
-diff --git a/src/test/regress/pg_regress.sh b/src/test/regress/pg_regress.sh
-index 5bb31f7..0223328 100644
---- a/src/test/regress/pg_regress.sh
-+++ b/src/test/regress/pg_regress.sh
-@@ -91,6 +91,8 @@ host_platform='@host_tuple@'
+=== src/test/regress/pg_regress.sh
+==================================================================
+--- src/test/regress/pg_regress.sh	(revision 14)
++++ src/test/regress/pg_regress.sh	(local)
+@@ -91,6 +91,8 @@
  enable_shared='@enable_shared@'
  GCC=@GCC@
  
@@ -143,7 +156,7 @@ index 5bb31f7..0223328 100644
  if [ "$GCC" = yes ]; then
      compiler=gcc
  else
-@@ -441,7 +443,7 @@ then
+@@ -441,7 +443,7 @@
      # wait forever, however.
      i=0
      max=60
@@ -152,7 +165,7 @@ index 5bb31f7..0223328 100644
      do
          i=`expr $i + 1`
          if [ $i -ge $max ]
-@@ -498,7 +500,7 @@ else # not temp-install
+@@ -498,7 +500,7 @@
      fi
  
      message "dropping database \"$dbname\""
@@ -161,7 +174,7 @@ index 5bb31f7..0223328 100644
      # errors can be ignored
  fi
  
-@@ -507,7 +509,7 @@ fi
+@@ -507,7 +509,7 @@
  # Set up SQL shell for the test.
  # ----------
  
@@ -170,7 +183,7 @@ index 5bb31f7..0223328 100644
  
  
  # ----------
-@@ -538,13 +540,13 @@ fi
+@@ -538,13 +540,13 @@
  # ----------
  
  message "creating database \"$dbname\""
@@ -186,7 +199,7 @@ index 5bb31f7..0223328 100644
  alter database \"$dbname\" set lc_messages to 'C';
  alter database \"$dbname\" set lc_monetary to 'C';
  alter database \"$dbname\" set lc_numeric to 'C';
-@@ -560,7 +562,7 @@ fi
+@@ -560,7 +562,7 @@
  # ----------
  
  message "dropping regression test user accounts"
@@ -195,7 +208,7 @@ index 5bb31f7..0223328 100644
  if [ $? -eq 2 ]; then
      echo "$me: could not drop user accounts"
      (exit 2); exit
-@@ -575,7 +577,7 @@ if [ "$enable_shared" = yes ]; then
+@@ -575,7 +577,7 @@
      for lang in xyzzy $load_langs ; do    
          if [ "$lang" != "xyzzy" ]; then
              message "installing $lang"
diff --git a/dev-db/postgresql-server/files/postgresql-8.2-server.patch b/dev-db/postgresql-server/files/postgresql-8.2-server.patch
index 92e9d36..9e23f6a 100644
--- a/dev-db/postgresql-server/files/postgresql-8.2-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.2-server.patch
@@ -1,8 +1,8 @@
-diff --git a/GNUmakefile.in b/GNUmakefile.in
-index 16f9057..0f6cee7 100644
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -11,19 +11,16 @@ include $(top_builddir)/src/Makefile.global
+=== GNUmakefile.in
+==================================================================
+--- GNUmakefile.in	(revision 14)
++++ GNUmakefile.in	(local)
+@@ -11,19 +11,16 @@
  all:
  	$(MAKE) -C doc all
  	$(MAKE) -C src all
@@ -22,11 +22,11 @@ index 16f9057..0f6cee7 100644
  
  distprep:
  	$(MAKE) -C doc $@
-diff --git a/contrib/Makefile b/contrib/Makefile
-index 1787a1b..6b4104d 100644
---- a/contrib/Makefile
-+++ b/contrib/Makefile
-@@ -18,19 +18,16 @@ WANTED_DIRS = \
+=== contrib/Makefile
+==================================================================
+--- contrib/Makefile	(revision 14)
++++ contrib/Makefile	(local)
+@@ -18,19 +18,16 @@
  		isn		\
  		lo		\
  		ltree		\
@@ -47,10 +47,10 @@ index 1787a1b..6b4104d 100644
  
  ifeq ($(with_openssl),yes)
  WANTED_DIRS += sslinfo
-diff --git a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
-index ba864c1..1e2e96e 100644
---- a/contrib/adminpack/Makefile
-+++ b/contrib/adminpack/Makefile
+=== contrib/adminpack/Makefile
+==================================================================
+--- contrib/adminpack/Makefile	(revision 14)
++++ contrib/adminpack/Makefile	(local)
 @@ -1,5 +1,5 @@
  MODULE_big = adminpack
 -PG_CPPFLAGS = -I$(libpq_srcdir)
@@ -58,11 +58,11 @@ index ba864c1..1e2e96e 100644
  DATA_built = adminpack.sql
  DATA = uninstall_adminpack.sql
  DOCS = README.adminpack
-diff --git a/src/Makefile b/src/Makefile
-index 6d9043a..ccf7ae7 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -18,14 +18,11 @@ all install installdirs uninstall dep depend distprep:
+=== src/Makefile
+==================================================================
+--- src/Makefile	(revision 14)
++++ src/Makefile	(local)
+@@ -18,14 +18,11 @@
  	$(MAKE) -C timezone $@
  	$(MAKE) -C backend $@
  	$(MAKE) -C backend/utils/mb/conversion_procs $@
@@ -78,11 +78,11 @@ index 6d9043a..ccf7ae7 100644
  
  install-local: installdirs-local
  	$(INSTALL_DATA) Makefile.global '$(DESTDIR)$(pgxsdir)/$(subdir)/Makefile.global'
-diff --git a/src/Makefile.global.in b/src/Makefile.global.in
-index 820dfd5..2619acd 100644
---- a/src/Makefile.global.in
-+++ b/src/Makefile.global.in
-@@ -365,10 +365,10 @@ endif
+=== src/Makefile.global.in
+==================================================================
+--- src/Makefile.global.in	(revision 14)
++++ src/Makefile.global.in	(local)
+@@ -365,10 +365,10 @@
  
  
  submake-libpq:
@@ -95,11 +95,11 @@ index 820dfd5..2619acd 100644
  
  .PHONY: submake-libpq submake-libpgport
  
-diff --git a/src/bin/Makefile b/src/bin/Makefile
-index 0d86213..2779a41 100644
---- a/src/bin/Makefile
-+++ b/src/bin/Makefile
-@@ -13,8 +13,8 @@ subdir = src/bin
+=== src/bin/Makefile
+==================================================================
+--- src/bin/Makefile	(revision 14)
++++ src/bin/Makefile	(local)
+@@ -13,8 +13,8 @@
  top_builddir = ../..
  include $(top_builddir)/src/Makefile.global
  
@@ -110,11 +110,24 @@ index 0d86213..2779a41 100644
  ifeq ($(PORTNAME), win32)
  DIRS+=pgevent
  endif
-diff --git a/src/port/Makefile b/src/port/Makefile
-index 1742eb8..21fd79f 100644
---- a/src/port/Makefile
-+++ b/src/port/Makefile
-@@ -29,11 +29,10 @@ LIBS += $(PTHREAD_LIBS)
+=== src/include/pg_config_manual.h
+==================================================================
+--- src/include/pg_config_manual.h	(revision 14)
++++ src/include/pg_config_manual.h	(local)
+@@ -175,7 +175,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
+ 
+ /*
+  * The random() function is expected to yield values between 0 and
+=== src/port/Makefile
+==================================================================
+--- src/port/Makefile	(revision 14)
++++ src/port/Makefile	(local)
+@@ -29,11 +29,10 @@
  # Replace all object files so they use FRONTEND define
  LIBOBJS_SRV := $(LIBOBJS:%.o=%_srv.o)
  
@@ -128,11 +141,11 @@ index 1742eb8..21fd79f 100644
  
  installdirs:
  	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
-diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
-index f2319d2..85aac4f 100644
---- a/src/test/regress/GNUmakefile
-+++ b/src/test/regress/GNUmakefile
-@@ -148,7 +148,7 @@ all-spi:
+=== src/test/regress/GNUmakefile
+==================================================================
+--- src/test/regress/GNUmakefile	(revision 14)
++++ src/test/regress/GNUmakefile	(local)
+@@ -148,7 +148,7 @@
  check: all
  	-rm -rf ./testtablespace
  	mkdir ./testtablespace
@@ -141,11 +154,11 @@ index f2319d2..85aac4f 100644
  
  installcheck: all
  	-rm -rf ./testtablespace
-diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
-index 5daf28a..0d2a0a3 100644
---- a/src/test/regress/pg_regress.c
-+++ b/src/test/regress/pg_regress.c
-@@ -502,7 +502,7 @@ initialize_environment(void)
+=== src/test/regress/pg_regress.c
+==================================================================
+--- src/test/regress/pg_regress.c	(revision 14)
++++ src/test/regress/pg_regress.c	(local)
+@@ -502,7 +502,7 @@
  		datadir = tmp;
  
  		/* psql will be installed into temp-install bindir */
@@ -154,7 +167,7 @@ index 5daf28a..0d2a0a3 100644
  
  		/*
  		 * Set up shared library paths to include the temp install.
-@@ -1535,7 +1535,7 @@ main(int argc, char *argv[])
+@@ -1535,7 +1535,7 @@
  		 */
  		snprintf(buf, sizeof(buf),
  				 SYSTEMQUOTE "\"%s/psql\" -X postgres <%s 2>%s" SYSTEMQUOTE,
diff --git a/dev-db/postgresql-server/files/postgresql-8.3-server.patch b/dev-db/postgresql-server/files/postgresql-8.3-server.patch
index 061c81e..756127c 100644
--- a/dev-db/postgresql-server/files/postgresql-8.3-server.patch
+++ b/dev-db/postgresql-server/files/postgresql-8.3-server.patch
@@ -148,6 +148,19 @@
  
  OBJS=	initdb.o encnames.o pqsignal.o $(WIN32RES)
  
+=== src/include/pg_config_manual.h
+==================================================================
+--- src/include/pg_config_manual.h	(revision 12)
++++ src/include/pg_config_manual.h	(local)
+@@ -184,7 +184,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/var/run/postgresql"
+ 
+ /*
+  * The random() function is expected to yield values between 0 and
 === src/port/Makefile
 ==================================================================
 --- src/port/Makefile	(revision 12)
diff --git a/dev-db/postgresql-server/files/postgresql.conf-7.3 b/dev-db/postgresql-server/files/postgresql.conf-7.3
index e4b1c55..4e06ea0 100644
--- a/dev-db/postgresql-server/files/postgresql.conf-7.3
+++ b/dev-db/postgresql-server/files/postgresql.conf-7.3
@@ -1,5 +1,5 @@
 # PostgreSQL's Database Directory
-PGDATA="/var/lib/postgresql/8.1/data"
+PGDATA="/var/lib/postgresql/7.3/data"
 
 # PostgreSQL User
 PGUSER="postgres"
@@ -26,14 +26,14 @@ PGGROUP="postgres"
 #  Tell the server to forcefully disconnect all clients.
 #  Terminating a client results in a rollback of the open transactions for this client.
 #  Use WAIT_FOR_CLEANUP to determine how much time the server has
-#  for cleanup. (Set it to "forever" if you want to wait forever.)
+#  for cleanup.
 # 3. SIGQUIT
 #  This will terminate the server immediately and results in a recovery run for the next start.
 
-# Wait for clients to disconnect (seconds or "forever")
+# Wait for clients to disconnect
 WAIT_FOR_DISCONNECT=30
 
-# Time the server has to clean up (seconds or "forever")
+# Time the server has to clean up
 WAIT_FOR_CLEANUP=60
 
 # Time the server has to quit (with a recover-run on next startup)
diff --git a/dev-db/postgresql-server/files/postgresql.conf-7.4 b/dev-db/postgresql-server/files/postgresql.conf-7.4
index e4b1c55..d59ac96 100644
--- a/dev-db/postgresql-server/files/postgresql.conf-7.4
+++ b/dev-db/postgresql-server/files/postgresql.conf-7.4
@@ -1,5 +1,5 @@
 # PostgreSQL's Database Directory
-PGDATA="/var/lib/postgresql/8.1/data"
+PGDATA="/var/lib/postgresql/7.4/data"
 
 # PostgreSQL User
 PGUSER="postgres"
@@ -26,14 +26,14 @@ PGGROUP="postgres"
 #  Tell the server to forcefully disconnect all clients.
 #  Terminating a client results in a rollback of the open transactions for this client.
 #  Use WAIT_FOR_CLEANUP to determine how much time the server has
-#  for cleanup. (Set it to "forever" if you want to wait forever.)
+#  for cleanup.
 # 3. SIGQUIT
 #  This will terminate the server immediately and results in a recovery run for the next start.
 
-# Wait for clients to disconnect (seconds or "forever")
+# Wait for clients to disconnect
 WAIT_FOR_DISCONNECT=30
 
-# Time the server has to clean up (seconds or "forever")
+# Time the server has to clean up
 WAIT_FOR_CLEANUP=60
 
 # Time the server has to quit (with a recover-run on next startup)
diff --git a/dev-db/postgresql-server/files/postgresql.conf-8.0 b/dev-db/postgresql-server/files/postgresql.conf-8.0
index e4b1c55..2e00577 100644
--- a/dev-db/postgresql-server/files/postgresql.conf-8.0
+++ b/dev-db/postgresql-server/files/postgresql.conf-8.0
@@ -1,5 +1,5 @@
 # PostgreSQL's Database Directory
-PGDATA="/var/lib/postgresql/8.1/data"
+PGDATA="/var/lib/postgresql/8.0/data"
 
 # PostgreSQL User
 PGUSER="postgres"
@@ -26,14 +26,14 @@ PGGROUP="postgres"
 #  Tell the server to forcefully disconnect all clients.
 #  Terminating a client results in a rollback of the open transactions for this client.
 #  Use WAIT_FOR_CLEANUP to determine how much time the server has
-#  for cleanup. (Set it to "forever" if you want to wait forever.)
+#  for cleanup.
 # 3. SIGQUIT
 #  This will terminate the server immediately and results in a recovery run for the next start.
 
-# Wait for clients to disconnect (seconds or "forever")
+# Wait for clients to disconnect
 WAIT_FOR_DISCONNECT=30
 
-# Time the server has to clean up (seconds or "forever")
+# Time the server has to clean up
 WAIT_FOR_CLEANUP=60
 
 # Time the server has to quit (with a recover-run on next startup)
diff --git a/dev-db/postgresql-server/files/postgresql.conf-8.1 b/dev-db/postgresql-server/files/postgresql.conf-8.1
index e4b1c55..a8fb854 100644
--- a/dev-db/postgresql-server/files/postgresql.conf-8.1
+++ b/dev-db/postgresql-server/files/postgresql.conf-8.1
@@ -26,14 +26,14 @@ PGGROUP="postgres"
 #  Tell the server to forcefully disconnect all clients.
 #  Terminating a client results in a rollback of the open transactions for this client.
 #  Use WAIT_FOR_CLEANUP to determine how much time the server has
-#  for cleanup. (Set it to "forever" if you want to wait forever.)
+#  for cleanup.
 # 3. SIGQUIT
 #  This will terminate the server immediately and results in a recovery run for the next start.
 
-# Wait for clients to disconnect (seconds or "forever")
+# Wait for clients to disconnect
 WAIT_FOR_DISCONNECT=30
 
-# Time the server has to clean up (seconds or "forever")
+# Time the server has to clean up
 WAIT_FOR_CLEANUP=60
 
 # Time the server has to quit (with a recover-run on next startup)
diff --git a/dev-db/postgresql-server/files/postgresql.conf-8.2 b/dev-db/postgresql-server/files/postgresql.conf-8.2
index 7c13834..2cf9258 100644
--- a/dev-db/postgresql-server/files/postgresql.conf-8.2
+++ b/dev-db/postgresql-server/files/postgresql.conf-8.2
@@ -26,14 +26,14 @@ PGGROUP="postgres"
 #  Tell the server to forcefully disconnect all clients.
 #  Terminating a client results in a rollback of the open transactions for this client.
 #  Use WAIT_FOR_CLEANUP to determine how much time the server has
-#  for cleanup. (Set it to "forever" if you want to wait forever.)
+#  for cleanup.
 # 3. SIGQUIT
 #  This will terminate the server immediately and results in a recovery run for the next start.
 
-# Wait for clients to disconnect (seconds or "forever")
+# Wait for clients to disconnect
 WAIT_FOR_DISCONNECT=30
 
-# Time the server has to clean up (seconds or "forever")
+# Time the server has to clean up
 WAIT_FOR_CLEANUP=60
 
 # Time the server has to quit (with a recover-run on next startup)
diff --git a/dev-db/postgresql-server/files/postgresql.conf-8.3 b/dev-db/postgresql-server/files/postgresql.conf-8.3
index b3447b4..01e42f5 100644
--- a/dev-db/postgresql-server/files/postgresql.conf-8.3
+++ b/dev-db/postgresql-server/files/postgresql.conf-8.3
@@ -26,14 +26,14 @@ PGGROUP="postgres"
 #  Tell the server to forcefully disconnect all clients.
 #  Terminating a client results in a rollback of the open transactions for this client.
 #  Use WAIT_FOR_CLEANUP to determine how much time the server has
-#  for cleanup. (Set it to "forever" if you want to wait forever.)
+#  for cleanup.
 # 3. SIGQUIT
 #  This will terminate the server immediately and results in a recovery run for the next start.
 
-# Wait for clients to disconnect (seconds or "forever")
+# Wait for clients to disconnect
 WAIT_FOR_DISCONNECT=30
 
-# Time the server has to clean up (seconds or "forever")
+# Time the server has to clean up
 WAIT_FOR_CLEANUP=60
 
 # Time the server has to quit (with a recover-run on next startup)
diff --git a/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild b/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild
index d01056c..d77ac07 100644
--- a/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-7.3.21.ebuild
@@ -39,7 +39,6 @@ PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
 [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
 
 S="${WORKDIR}/postgresql-${PV}"
 
@@ -119,12 +118,25 @@ src_install() {
 
 	newinitd "${FILESDIR}/postgresql.init-${SLOT}" postgresql-${SLOT} || die "Inserting init.d-file failed"
 	newconfd "${FILESDIR}/postgresql.conf-${SLOT}" postgresql-${SLOT} || die "Inserting conf.d-file failed"
+
+	keepdir /var/run/postgresql
+	fperms 0770 /var/run/postgresql
+	fowners postgres:postgres /var/run/postgresql
 }
 
 pkg_postinst() {
 	eselect postgresql update
 	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
 	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
+	ewarn "Please note that the standard location of the socket has changed from /tmp"
+	ewarn "to /var/run/postgresql and you have to be in the 'postgres' group to access"
+	ewarn "the socket."
+	ewarn "This can break applications which have the standard location hard-coded."
+	ewarn "If such an application links against the libpq, please re-emerge it,"
+	ewarn "if that doesn't help or the application accesses the socket without using libpq,"
+	ewarn "please file a bug-report."
+	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the original location."
+
 	elog "Execute the following command to setup the initial database environment:"
 	elog
 	elog "emerge --config =${CATEGORY}/${PF}"
@@ -136,58 +148,73 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
 	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
 		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
 		eerror "You must remove your entire database directory to continue."
 		eerror "(database directory = ${PGDATA})."
 		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!"
-				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-			fi
-			su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata ${PGDATA} ${PG_INITDB_OPTS}"
-
-			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-				ewarn "Restoring the SEMMNI value to the previous value."
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEMMNI_MIN}:"
-				ewarn
-				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-				ewarn
-			fi
+	fi
 
-			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then
-				eerror "The current value of SHMMAX is too low for postgresql to run."
-				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:"
-				eerror
-				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-				eerror
-			fi
-		else
-			su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata ${PGDATA} ${PG_INITDB_OPTS}"
-		fi
+	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
+	einfo "More information can be found here:"
+	einfo "  http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+
+	einfo "PG_INITDB_OPTS is currently set to \"${PG_INITDB_OPTS}\""
+	einfo "Are you ready to continue? (Y/n)"
+	read answer
+	[ -z $answer ] && answer=Y
+	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
 
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
+	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		SKIP_SYSTEM_TESTS=yes
+		einfo "  Tests not supported on this OS (yet)"
 	fi
+
+	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
+		einfo "Assuming that you want at least ${PG_MAX_CONNECTIONS} connections"
+
+		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+		local SHMMAX=$(sysctl -n kernel.shmmax)
+
+		local SEMMSL_MIN=17
+		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
+				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+				eerror "You have now several options:"
+				eerror "  - Change the mentioned system parameter."
+				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
+				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test"
+				eerror "More information can be found here:"
+				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+				die "system test failed"
+			fi
+		done
+		einfo "Passed."
+	else
+		einfo "Skipped."
+	fi
+
+	einfo "Creating the data directory ..."
+	mkdir -p "${PGDATA}"
+	chown -Rf postgres:postgres "${PGDATA}"
+	chmod 0700 "${PGDATA}"
+
+	einfo "Initializing the database ..."
+
+	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
+
+	einfo
+	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."
+	einfo
 }
 
 src_test() {
diff --git a/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild b/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild
index ed130ba..2689294 100644
--- a/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-7.4.19.ebuild
@@ -39,7 +39,6 @@ PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
 [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
 
 S="${WORKDIR}/postgresql-${PV}"
 
@@ -119,12 +118,25 @@ src_install() {
 
 	newinitd "${FILESDIR}/postgresql.init-${SLOT}" postgresql-${SLOT} || die "Inserting init.d-file failed"
 	newconfd "${FILESDIR}/postgresql.conf-${SLOT}" postgresql-${SLOT} || die "Inserting conf.d-file failed"
+
+	keepdir /var/run/postgresql
+	fperms 0770 /var/run/postgresql
+	fowners postgres:postgres /var/run/postgresql
 }
 
 pkg_postinst() {
 	eselect postgresql update
 	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
 	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
+	ewarn "Please note that the standard location of the socket has changed from /tmp"
+	ewarn "to /var/run/postgresql and you have to be in the 'postgres' group to access"
+	ewarn "the socket."
+	ewarn "This can break applications which have the standard location hard-coded."
+	ewarn "If such an application links against the libpq, please re-emerge it,"
+	ewarn "if that doesn't help or the application accesses the socket without using libpq,"
+	ewarn "please file a bug-report."
+	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the original location."
+
 	elog "Execute the following command to setup the initial database environment:"
 	elog
 	elog "emerge --config =${CATEGORY}/${PF}"
@@ -136,58 +148,73 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
 	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
 		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
 		eerror "You must remove your entire database directory to continue."
 		eerror "(database directory = ${PGDATA})."
 		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!"
-				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-			fi
-			su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata ${PGDATA} ${PG_INITDB_OPTS}"
-
-			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-				ewarn "Restoring the SEMMNI value to the previous value."
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEMMNI_MIN}:"
-				ewarn
-				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-				ewarn
-			fi
+	fi
 
-			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then
-				eerror "The current value of SHMMAX is too low for postgresql to run."
-				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:"
-				eerror
-				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-				eerror
-			fi
-		else
-			su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata ${PGDATA} ${PG_INITDB_OPTS}"
-		fi
+	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
+	einfo "More information can be found here:"
+	einfo "  http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+
+	einfo "PG_INITDB_OPTS is currently set to \"${PG_INITDB_OPTS}\""
+	einfo "Are you ready to continue? (Y/n)"
+	read answer
+	[ -z $answer ] && answer=Y
+	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
 
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
+	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		SKIP_SYSTEM_TESTS=yes
+		einfo "  Tests not supported on this OS (yet)"
 	fi
+
+	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
+		einfo "Assuming that you want at least ${PG_MAX_CONNECTIONS} connections"
+
+		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+		local SHMMAX=$(sysctl -n kernel.shmmax)
+
+		local SEMMSL_MIN=17
+		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
+				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+				eerror "You have now several options:"
+				eerror "  - Change the mentioned system parameter."
+				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
+				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test"
+				eerror "More information can be found here:"
+				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+				die "system test failed"
+			fi
+		done
+		einfo "Passed."
+	else
+		einfo "Skipped."
+	fi
+
+	einfo "Creating the data directory ..."
+	mkdir -p "${PGDATA}"
+	chown -Rf postgres:postgres "${PGDATA}"
+	chmod 0700 "${PGDATA}"
+
+	einfo "Initializing the database ..."
+
+	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
+
+	einfo
+	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."
+	einfo
 }
 
 src_test() {
diff --git a/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild b/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
index a9c5ad6..16e3961 100644
--- a/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.0.15.ebuild
@@ -40,7 +40,6 @@ PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
 [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
 
 S="${WORKDIR}/postgresql-${PV}"
 
@@ -120,12 +119,25 @@ src_install() {
 
 	newinitd "${FILESDIR}/postgresql.init-${SLOT}" postgresql-${SLOT} || die "Inserting init.d-file failed"
 	newconfd "${FILESDIR}/postgresql.conf-${SLOT}" postgresql-${SLOT} || die "Inserting conf.d-file failed"
+
+	keepdir /var/run/postgresql
+	fperms 0770 /var/run/postgresql
+	fowners postgres:postgres /var/run/postgresql
 }
 
 pkg_postinst() {
 	eselect postgresql update
 	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
 	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
+	ewarn "Please note that the standard location of the socket has changed from /tmp"
+	ewarn "to /var/run/postgresql and you have to be in the 'postgres' group to access"
+	ewarn "the socket."
+	ewarn "This can break applications which have the standard location hard-coded."
+	ewarn "If such an application links against the libpq, please re-emerge it,"
+	ewarn "if that doesn't help or the application accesses the socket without using libpq,"
+	ewarn "please file a bug-report."
+	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the original location."
+
 	elog "Execute the following command to setup the initial database environment:"
 	elog
 	elog "emerge --config =${CATEGORY}/${PF}"
@@ -137,58 +149,73 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
 	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
 		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
 		eerror "You must remove your entire database directory to continue."
 		eerror "(database directory = ${PGDATA})."
 		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!"
-				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-			fi
-			su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata ${PGDATA} ${PG_INITDB_OPTS}"
-
-			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-				ewarn "Restoring the SEMMNI value to the previous value."
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEMMNI_MIN}:"
-				ewarn
-				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-				ewarn
-			fi
+	fi
 
-			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then
-				eerror "The current value of SHMMAX is too low for postgresql to run."
-				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:"
-				eerror
-				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-				eerror
-			fi
-		else
-			su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata ${PGDATA} ${PG_INITDB_OPTS}"
-		fi
+	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
+	einfo "More information can be found here:"
+	einfo "  http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+
+	einfo "PG_INITDB_OPTS is currently set to \"${PG_INITDB_OPTS}\""
+	einfo "Are you ready to continue? (Y/n)"
+	read answer
+	[ -z $answer ] && answer=Y
+	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
 
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
+	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		SKIP_SYSTEM_TESTS=yes
+		einfo "  Tests not supported on this OS (yet)"
 	fi
+
+	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
+		einfo "Assuming that you want at least ${PG_MAX_CONNECTIONS} connections"
+
+		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+		local SHMMAX=$(sysctl -n kernel.shmmax)
+
+		local SEMMSL_MIN=17
+		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
+				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+				eerror "You have now several options:"
+				eerror "  - Change the mentioned system parameter."
+				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
+				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test"
+				eerror "More information can be found here:"
+				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+				die "system test failed"
+			fi
+		done
+		einfo "Passed."
+	else
+		einfo "Skipped."
+	fi
+
+	einfo "Creating the data directory ..."
+	mkdir -p "${PGDATA}"
+	chown -Rf postgres:postgres "${PGDATA}"
+	chmod 0700 "${PGDATA}"
+
+	einfo "Initializing the database ..."
+
+	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
+
+	einfo
+	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."
+	einfo
 }
 
 src_test() {
diff --git a/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild b/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild
index 5dda3ea..02e9bbb 100644
--- a/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.1.11.ebuild
@@ -40,7 +40,6 @@ PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
 [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
 
 S="${WORKDIR}/postgresql-${PV}"
 
@@ -120,12 +119,25 @@ src_install() {
 
 	newinitd "${FILESDIR}/postgresql.init-${SLOT}" postgresql-${SLOT} || die "Inserting init.d-file failed"
 	newconfd "${FILESDIR}/postgresql.conf-${SLOT}" postgresql-${SLOT} || die "Inserting conf.d-file failed"
+
+	keepdir /var/run/postgresql
+	fperms 0770 /var/run/postgresql
+	fowners postgres:postgres /var/run/postgresql
 }
 
 pkg_postinst() {
 	eselect postgresql update
 	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
 	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
+	ewarn "Please note that the standard location of the socket has changed from /tmp"
+	ewarn "to /var/run/postgresql and you have to be in the 'postgres' group to access"
+	ewarn "the socket."
+	ewarn "This can break applications which have the standard location hard-coded."
+	ewarn "If such an application links against the libpq, please re-emerge it,"
+	ewarn "if that doesn't help or the application accesses the socket without using libpq,"
+	ewarn "please file a bug-report."
+	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the original location."
+
 	elog "Execute the following command to setup the initial database environment:"
 	elog
 	elog "emerge --config =${CATEGORY}/${PF}"
@@ -140,58 +152,73 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
 	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
 		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
 		eerror "You must remove your entire database directory to continue."
 		eerror "(database directory = ${PGDATA})."
 		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!"
-				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-			fi
-			su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata ${PGDATA} ${PG_INITDB_OPTS}"
-
-			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-				ewarn "Restoring the SEMMNI value to the previous value."
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEMMNI_MIN}:"
-				ewarn
-				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-				ewarn
-			fi
+	fi
 
-			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then
-				eerror "The current value of SHMMAX is too low for postgresql to run."
-				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:"
-				eerror
-				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-				eerror
-			fi
-		else
-			su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata ${PGDATA} ${PG_INITDB_OPTS}"
-		fi
+	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
+	einfo "More information can be found here:"
+	einfo "  http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
+
+	einfo "PG_INITDB_OPTS is currently set to \"${PG_INITDB_OPTS}\""
+	einfo "Are you ready to continue? (Y/n)"
+	read answer
+	[ -z $answer ] && answer=Y
+	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
 
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
+	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		SKIP_SYSTEM_TESTS=yes
+		einfo "  Tests not supported on this OS (yet)"
 	fi
+
+	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
+		einfo "Assuming that you want at least ${PG_MAX_CONNECTIONS} connections"
+
+		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+		local SHMMAX=$(sysctl -n kernel.shmmax)
+
+		local SEMMSL_MIN=17
+		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
+				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+				eerror "You have now several options:"
+				eerror "  - Change the mentioned system parameter."
+				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
+				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test"
+				eerror "More information can be found here:"
+				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+				die "system test failed"
+			fi
+		done
+		einfo "Passed."
+	else
+		einfo "Skipped."
+	fi
+
+	einfo "Creating the data directory ..."
+	mkdir -p "${PGDATA}"
+	chown -Rf postgres:postgres "${PGDATA}"
+	chmod 0700 "${PGDATA}"
+
+	einfo "Initializing the database ..."
+
+	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
+
+	einfo
+	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."
+	einfo
 }
 
 src_test() {
diff --git a/dev-db/postgresql-server/postgresql-server-8.2.7.ebuild b/dev-db/postgresql-server/postgresql-server-8.2.7.ebuild
index 4998e22..83ae3d0 100644
--- a/dev-db/postgresql-server/postgresql-server-8.2.7.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.2.7.ebuild
@@ -40,7 +40,6 @@ PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
 [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
 
 S="${WORKDIR}/postgresql-${PV}"
 
@@ -89,7 +88,7 @@ src_compile() {
 		"$(built_with_use ~dev-db/postgresql-base-${PV} nls && use_enable nls nls "$(wanted_languages)")" \
 		|| die "configure failed"
 
-	for bd in . contrib $(use xml && echo contrib/xml2) ; do
+	for bd in . contrib $(use xml && echo contrib/xml2); do
 		PATH="/usr/$(get_libdir)/postgresql-${SLOT}/bin:${PATH}" \
 			emake -C $bd -j1 LD="$(tc-getLD) $(get_abi_LDFLAGS)" \
 				PGXS=$(/usr/$(get_libdir)/postgresql-${SLOT}/bin/pg_config --pgxs) \
@@ -125,12 +124,26 @@ src_install() {
 
 	newinitd "${FILESDIR}/postgresql.init-${SLOT}" postgresql-${SLOT} || die "Inserting init.d-file failed"
 	newconfd "${FILESDIR}/postgresql.conf-${SLOT}" postgresql-${SLOT} || die "Inserting conf.d-file failed"
+
+	keepdir /var/run/postgresql
+	fperms 0770 /var/run/postgresql
+	fowners postgres:postgres /var/run/postgresql
 }
 
 pkg_postinst() {
 	eselect postgresql update
 	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
 	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
+
+	ewarn "Please note that the standard location of the socket has changed from /tmp"
+	ewarn "to /var/run/postgresql and you have to be in the 'postgres' group to access"
+	ewarn "the socket."
+	ewarn "This can break applications which have the standard location hard-coded."
+	ewarn "If such an application links against the libpq, please re-emerge it,"
+	ewarn "if that doesn't help or the application accesses the socket without using libpq,"
+	ewarn "please file a bug-report."
+	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the original location."
+
 	elog "Execute the following command to setup the initial database environment:"
 	elog
 	elog "emerge --config =${CATEGORY}/${PF}"
@@ -145,58 +158,73 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
 	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
 		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
 		eerror "You must remove your entire database directory to continue."
 		eerror "(database directory = ${PGDATA})."
 		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!"
-				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-			fi
-			su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata ${PGDATA} ${PG_INITDB_OPTS}"
-
-			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-				ewarn "Restoring the SEMMNI value to the previous value."
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEMMNI_MIN}:"
-				ewarn
-				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-				ewarn
-			fi
+	fi
 
-			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then
-				eerror "The current value of SHMMAX is too low for postgresql to run."
-				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:"
-				eerror
-				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-				eerror
-			fi
-		else
-			su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata ${PGDATA} ${PG_INITDB_OPTS}"
-		fi
+	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
+	einfo "More information can be found here:"
+	einfo "  http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
 
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
+	einfo "PG_INITDB_OPTS is currently set to \"${PG_INITDB_OPTS}\""
+	einfo "Are you ready to continue? (Y/n)"
+	read answer
+	[ -z $answer ] && answer=Y
+	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
+
+	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		SKIP_SYSTEM_TESTS=yes
+		einfo "  Tests not supported on this OS (yet)"
+	fi
+
+	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
+		einfo "Assuming that you want at least ${PG_MAX_CONNECTIONS} connections"
+
+		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+		local SHMMAX=$(sysctl -n kernel.shmmax)
+
+		local SEMMSL_MIN=17
+		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
+				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+				eerror "You have now several options:"
+				eerror "  - Change the mentioned system parameter."
+				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
+				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test"
+				eerror "More information can be found here:"
+				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+				die "system test failed"
+			fi
+		done
+		einfo "Passed."
+	else
+		einfo "Skipped."
 	fi
+
+	einfo "Creating the data directory ..."
+	mkdir -p "${PGDATA}"
+	chown -Rf postgres:postgres "${PGDATA}"
+	chmod 0700 "${PGDATA}"
+
+	einfo "Initializing the database ..."
+
+	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
+
+	einfo
+	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."
+	einfo
 }
 
 src_test() {
diff --git a/dev-db/postgresql-server/postgresql-server-8.3.1.ebuild b/dev-db/postgresql-server/postgresql-server-8.3.1.ebuild
index 1d4a7f2..a322605 100644
--- a/dev-db/postgresql-server/postgresql-server-8.3.1.ebuild
+++ b/dev-db/postgresql-server/postgresql-server-8.3.1.ebuild
@@ -41,7 +41,6 @@ PDEPEND="doc? ( dev-db/postgresql-docs:${SLOT} )"
 
 [[ -r /etc/conf.d/postgresql-${SLOT} ]] && source /etc/conf.d/postgresql-${SLOT}
 [[ -z "${PGDATA}" ]] && PGDATA="/var/lib/postgresql/${SLOT}/data"
-[[ -z "${PG_MAX_CONNECTIONS}" ]] && PG_MAX_CONNECTIONS="512"
 
 S="${WORKDIR}/postgresql-${PV}"
 
@@ -130,12 +129,26 @@ src_install() {
 
 	newinitd "${FILESDIR}/postgresql.init-${SLOT}" postgresql-${SLOT} || die "Inserting init.d-file failed"
 	newconfd "${FILESDIR}/postgresql.conf-${SLOT}" postgresql-${SLOT} || die "Inserting conf.d-file failed"
+
+	keepdir /var/run/postgresql
+	fperms 0770 /var/run/postgresql
+	fowners postgres:postgres /var/run/postgresql
 }
 
 pkg_postinst() {
 	eselect postgresql update
 	[[ "$(eselect postgresql show)" = "(none)" ]] && eselect postgresql set ${SLOT}
 	[[ "$(eselect postgresql show-service)" = "(none)" ]] && eselect postgresql set-service ${SLOT}
+
+	ewarn "Please note that the standard location of the socket has changed from /tmp"
+	ewarn "to /var/run/postgresql and you have to be in the 'postgres' group to access"
+	ewarn "the socket."
+	ewarn "This can break applications which have the standard location hard-coded."
+	ewarn "If such an application links against the libpq, please re-emerge it,"
+	ewarn "if that doesn't help or the application accesses the socket without using libpq,"
+	ewarn "please file a bug-report."
+	ewarn "You can set PGOPTS='-k /tmp' in /etc/conf.d/postgresql-${SLOT} to restore the original location."
+
 	elog "Execute the following command to setup the initial database environment:"
 	elog
 	elog "emerge --config =${CATEGORY}/${PF}"
@@ -150,58 +163,73 @@ pkg_postrm() {
 }
 
 pkg_config() {
-	einfo "Creating the data directory ..."
-	mkdir -p "${PGDATA}"
-	chown -Rf postgres:postgres "${PGDATA}"
-	chmod 0700 "${PGDATA}"
-
-	einfo "Initializing the database ..."
 	if [[ -f "${PGDATA}/PG_VERSION" ]] ; then
 		eerror "PostgreSQL ${PV} cannot upgrade your existing databases."
 		eerror "You must remove your entire database directory to continue."
 		eerror "(database directory = ${PGDATA})."
 		die "Remove your database directory to continue"
-	else
-		if use kernel_linux ; then
-			local SEM=`sysctl -n kernel.sem | cut -f-3`
-			local SEMMNI=`sysctl -n kernel.sem | cut -f4`
-			local SEMMNI_MIN=`expr \( ${PG_MAX_CONNECTIONS} + 15 \) / 16`
-			local SHMMAX=`sysctl -n kernel.shmmax`
-			local SHMMAX_MIN=`expr 500000 + 30600 \* ${PG_MAX_CONNECTIONS}`
-
-			if [ ${SEMMNI} -lt ${SEMMNI_MIN} ] ; then
-				eerror "The current value of SEMMNI is too low"
-				eerror "for PostgreSQL to run ${PG_MAX_CONNECTIONS} connections!"
-				eerror "Temporary setting this value to ${SEMMNI_MIN} while creating the initial database."
-				echo ${SEM} ${SEMMNI_MIN} > /proc/sys/kernel/sem
-			fi
-			su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata ${PGDATA} ${PG_INITDB_OPTS}"
-
-			if [ ! `sysctl -n kernel.sem | cut -f4` -eq ${SEMMNI} ] ; then
-				echo ${SEM} ${SEMMNI} > /proc/sys/kernel/sem
-				ewarn "Restoring the SEMMNI value to the previous value."
-				ewarn "Please edit the last value of kernel.sem in /etc/sysctl.conf"
-				ewarn "and set it to at least ${SEMMNI_MIN}:"
-				ewarn
-				ewarn "  kernel.sem = ${SEM} ${SEMMNI_MIN}"
-				ewarn
-			fi
+	fi
 
-			if [ ${SHMMAX} -lt ${SHMMAX_MIN} ] ; then
-				eerror "The current value of SHMMAX is too low for postgresql to run."
-				eerror "Please edit /etc/sysctl.conf and set this value to at least ${SHMMAX_MIN}:"
-				eerror
-				eerror "  kernel.shmmax = ${SHMMAX_MIN}"
-				eerror
-			fi
-		else
-			su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata ${PGDATA} ${PG_INITDB_OPTS}"
-		fi
+	einfo "You can pass options to initdb by setting the PG_INITDB_OPTS variable."
+	einfo "More information can be found here:"
+	einfo "  http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html"
 
-		einfo
-		einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."
-		einfo
+	einfo "PG_INITDB_OPTS is currently set to \"${PG_INITDB_OPTS}\""
+	einfo "Are you ready to continue? (Y/n)"
+	read answer
+	[ -z $answer ] && answer=Y
+	[ "$answer" == "Y" ] || [ "$answer" == "y" ] || die "aborted"
+
+	[ -z "${PG_MAX_CONNECTIONS}" ] && PG_MAX_CONNECTIONS="128"
+	einfo "Checking system parameters..."
+
+	if ! use kernel_linux ; then
+		SKIP_SYSTEM_TESTS=yes
+		einfo "  Tests not supported on this OS (yet)"
+	fi
+
+	if [ -z ${SKIP_SYSTEM_TESTS} ] ; then
+		einfo "Assuming that you want at least ${PG_MAX_CONNECTIONS} connections"
+
+		local SEMMSL=$(sysctl -n kernel.sem | cut -f1)
+		local SEMMNS=$(sysctl -n kernel.sem | cut -f2)
+		local SEMMNI=$(sysctl -n kernel.sem | cut -f4)
+		local SHMMAX=$(sysctl -n kernel.shmmax)
+
+		local SEMMSL_MIN=17
+		local SEMMNS_MIN=$(( ( ${PG_MAX_CONNECTIONS}/16 ) * 17 ))
+		local SEMMNI_MIN=$(( ( ${PG_MAX_CONNECTIONS}+15 ) / 16 ))
+		local SHMMAX_MIN=$(( 500000 + ( 30600 * ${PG_MAX_CONNECTIONS} ) ))
+
+		for p in SEMMSL SEMMNS SEMMNI SHMMAX ; do
+			if [ $(eval echo \$$p) -lt $(eval echo \$${p}_MIN) ] ; then
+				eerror "The value for ${p} $(eval echo \$$p) is below the recommended value $(eval echo \$${p}_MIN)"
+				eerror "You have now several options:"
+				eerror "  - Change the mentioned system parameter."
+				eerror "  - Lower the number of max.connections by setting PG_MAX_CONNECTIONS to a value lower than ${PG_MAX_CONNECTIONS}"
+				eerror "  - Set SKIP_SYSTEM_TESTS in case you want to ignore this test"
+				eerror "More information can be found here:"
+				eerror "  http://www.postgresql.org/docs/${SLOT}/static/kernel-resources.html"
+				die "system test failed"
+			fi
+		done
+		einfo "Passed."
+	else
+		einfo "Skipped."
 	fi
+
+	einfo "Creating the data directory ..."
+	mkdir -p "${PGDATA}"
+	chown -Rf postgres:postgres "${PGDATA}"
+	chmod 0700 "${PGDATA}"
+
+	einfo "Initializing the database ..."
+
+	su postgres -c "/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb --pgdata \"${PGDATA}\" ${PG_INITDB_OPTS}"
+
+	einfo
+	einfo "You can use the '${ROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL instead of 'pg_ctl'."
+	einfo
 }
 
 src_test() {
author	Tiziano Müller <dev-zero@gentoo.org>	2008-04-07 14:43:08 +0000
committer	Tiziano Müller <dev-zero@gentoo.org>	2008-04-07 14:43:08 +0000
commit	c09c280cc2ec2ab3731342775b84afe2f06e6e72 (patch)
tree	4e4cdcf904a1a8e4faa4d2fbc75fdc398bf94267 /dev-db
parent	dev-db/postgresql-base: Standard location for unix domain socket changed to /... (diff)
download	experimental-c09c280cc2ec2ab3731342775b84afe2f06e6e72.tar.gz experimental-c09c280cc2ec2ab3731342775b84afe2f06e6e72.tar.bz2 experimental-c09c280cc2ec2ab3731342775b84afe2f06e6e72.zip