summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasatomo Nakano <nakano@gentoo.org>2004-07-18 08:42:36 +0000
committerMasatomo Nakano <nakano@gentoo.org>2004-07-18 08:42:36 +0000
commit5e5ba0de58e3c4a3d85e8e75391005d487ac103a (patch)
tree7621558aa40fdf2d44579efa976a9928f398f864 /dev-db/postgresql/files
parentFixed RDEPEND. Removed old ebuild. (diff)
downloadhistorical-5e5ba0de58e3c4a3d85e8e75391005d487ac103a.tar.gz
historical-5e5ba0de58e3c4a3d85e8e75391005d487ac103a.tar.bz2
historical-5e5ba0de58e3c4a3d85e8e75391005d487ac103a.zip
Replaced sudo with su. Removed old ebuilds.
Diffstat (limited to 'dev-db/postgresql/files')
-rw-r--r--dev-db/postgresql/files/digest-postgresql-7.3.6-r2 (renamed from dev-db/postgresql/files/digest-postgresql-7.3.6)0
-rw-r--r--dev-db/postgresql/files/digest-postgresql-7.4.2-r14
-rw-r--r--dev-db/postgresql/files/digest-postgresql-7.4.2-r24
-rw-r--r--dev-db/postgresql/files/digest-postgresql-7.4.3-r14
-rw-r--r--dev-db/postgresql/files/pg_autovacuum.conf-7.4.214
-rw-r--r--dev-db/postgresql/files/pg_autovacuum.init-7.4.233
-rw-r--r--dev-db/postgresql/files/postgresql-7.4.1-hppa-testandset.patch52
-rw-r--r--dev-db/postgresql/files/postgresql-7.4.2-gentoo.patch16
-rw-r--r--dev-db/postgresql/files/postgresql-7.4.2-hppa-testandset.patch52
-rw-r--r--dev-db/postgresql/files/postgresql-7.4.2-vacuum-delay.patch284
-rw-r--r--dev-db/postgresql/files/postgresql.conf-7.4.214
-rw-r--r--dev-db/postgresql/files/postgresql.init-7.4.263
12 files changed, 4 insertions, 536 deletions
diff --git a/dev-db/postgresql/files/digest-postgresql-7.3.6 b/dev-db/postgresql/files/digest-postgresql-7.3.6-r2
index 2e476ab072c6..2e476ab072c6 100644
--- a/dev-db/postgresql/files/digest-postgresql-7.3.6
+++ b/dev-db/postgresql/files/digest-postgresql-7.3.6-r2
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.2-r1 b/dev-db/postgresql/files/digest-postgresql-7.4.2-r1
deleted file mode 100644
index 0e6877d2d619..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.2-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 1e397e48237aae3948266fe97807e885 postgresql-base-7.4.2.tar.bz2 6480665
-MD5 9eb004120328def9d938c63d4a8afa64 postgresql-opt-7.4.2.tar.bz2 330741
-MD5 a2ba1247b26f7cd638d280d5552e75a0 postgresql-docs-7.4.2.tar.bz2 2388008
-MD5 b4532952a464943229f6a35f41d91d33 hier-Pg7.4-0.5.1.tar.gz 32107
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.2-r2 b/dev-db/postgresql/files/digest-postgresql-7.4.2-r2
deleted file mode 100644
index 60b8a670a3dc..000000000000
--- a/dev-db/postgresql/files/digest-postgresql-7.4.2-r2
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 1e397e48237aae3948266fe97807e885 postgresql-base-7.4.2.tar.bz2 6480665
-MD5 9eb004120328def9d938c63d4a8afa64 postgresql-opt-7.4.2.tar.bz2 330741
-MD5 a2ba1247b26f7cd638d280d5552e75a0 postgresql-docs-7.4.2.tar.bz2 2388008
-MD5 438721e9c5d6ef4df9b4023f0e579ff4 hier-Pg7.4-0.5.2.tar.gz 34747
diff --git a/dev-db/postgresql/files/digest-postgresql-7.4.3-r1 b/dev-db/postgresql/files/digest-postgresql-7.4.3-r1
new file mode 100644
index 000000000000..cf2422827237
--- /dev/null
+++ b/dev-db/postgresql/files/digest-postgresql-7.4.3-r1
@@ -0,0 +1,4 @@
+MD5 647b7d76f93acf12c0a7c11d302a1663 postgresql-base-7.4.3.tar.bz2 6486437
+MD5 f3446bdfc33f6d26d637aa15f6fd1084 postgresql-opt-7.4.3.tar.bz2 331745
+MD5 5f7d235553ae47946439d4b24f8d1ab2 postgresql-docs-7.4.3.tar.bz2 2407307
+MD5 438721e9c5d6ef4df9b4023f0e579ff4 hier-Pg7.4-0.5.2.tar.gz 34747
diff --git a/dev-db/postgresql/files/pg_autovacuum.conf-7.4.2 b/dev-db/postgresql/files/pg_autovacuum.conf-7.4.2
deleted file mode 100644
index f342ebfd2a47..000000000000
--- a/dev-db/postgresql/files/pg_autovacuum.conf-7.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-# The PostgreSQL user is:
-PGUSER=postgres
-
-# LOG file is:
-PG_AUTOVACUUM_LOG=/var/lib/postgresql/data/pg_autovacuum.log
-
-# See the pg_autovacuum documentation for the details of how these
-# parameters affect pg_autovacuum's aggressiveness.
-
-VACUUM_BASE=1000
-VACUUM_SCALE=2
-
-SLEEP_BASE=300
-SLEEP_SCALE=2
diff --git a/dev-db/postgresql/files/pg_autovacuum.init-7.4.2 b/dev-db/postgresql/files/pg_autovacuum.init-7.4.2
deleted file mode 100644
index 92fdcafcd54a..000000000000
--- a/dev-db/postgresql/files/pg_autovacuum.init-7.4.2
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/pg_autovacuum.init-7.4.2,v 1.3 2004/07/14 21:42:29 agriffis Exp $
-
-depend() {
- need postgresql logger
-}
-
-start() {
- ebegin "Starting pg_autovacuum"
- start-stop-daemon --chuid $PGUSER --start --quiet --exec /usr/bin/pg_autovacuum -- -D -v $VACUUM_BASE -V $VACUUM_SCALE -s $SLEEP_BASE -S $SLEEP_SCALE -L $PG_AUTOVACUUM_LOG
- sleep 1
- pidof /usr/bin/pg_autovacuum > /dev/null
- if [ $? -eq 0 ]; then
- eend 0
- else
- eerror "Please see log file: $PG_AUTOVACUUM_LOG"
- eerror "You may need to add following lines in /var/lib/postgresql/data/postgresql.conf and restart PostgreSQL."
- eerror " stats_start_collector = true"
- eerror " stats_row_level = true"
-
- eerror "Please read ___DOCDIR___/contrib/README.pg_autovacuum for details."
- eend 1
- fi
-}
-
-stop() {
- ebegin "Stopping pg_autovacuum"
- start-stop-daemon --stop --quiet --exec /usr/bin/pg_autovacuum
- result=$?
- eend $result
-}
diff --git a/dev-db/postgresql/files/postgresql-7.4.1-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4.1-hppa-testandset.patch
deleted file mode 100644
index 010a42a4088e..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.1-hppa-testandset.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -urN postgresql-7.4.1.orig/src/include/port/linux.h postgresql-7.4.1/src/include/port/linux.h
---- postgresql-7.4.1.orig/src/include/port/linux.h 2003-10-26 01:41:10.000000000 +0000
-+++ postgresql-7.4.1/src/include/port/linux.h 2004-01-09 20:22:50.000000000 +0000
-@@ -3,6 +3,11 @@
-
- #define HAS_TEST_AND_SET
-
-+#elif defined(__hppa__)
-+typedef struct { int sema[4]; } slock_t;
-+
-+#define HAS_TEST_AND_SET
-+
- #elif defined(__sparc__)
- typedef unsigned char slock_t;
-
-diff -urN postgresql-7.4.1.orig/src/include/storage/s_lock.h postgresql-7.4.1/src/include/storage/s_lock.h
---- postgresql-7.4.1.orig/src/include/storage/s_lock.h 2003-11-04 09:43:56.000000000 +0000
-+++ postgresql-7.4.1/src/include/storage/s_lock.h 2004-01-09 20:12:15.000000000 +0000
-@@ -112,6 +112,33 @@
-
- #endif /* __i386__ || __x86_64__ */
-
-+#if defined(__hppa__) || defined(__hppa)
-+#define TAS(lock) tas(lock)
-+
-+#define __ldcw(a) ({ \
-+ unsigned int __ret; \
-+ __asm__ __volatile__("ldcw 0(%2),%0" \
-+ : "=r" (__ret), "=m" (*(a)) : "r" (a)); \
-+ __ret; \
-+})
-+
-+#define __PA_LDCW_ALIGNMENT 16
-+#define __ldcw_align(a) ({ \
-+ volatile unsigned int __ret = (unsigned int) a; \
-+ if ((__ret & ~(__PA_LDCW_ALIGNMENT - 1)) < (unsigned int) a) \
-+ __ret = (__ret & ~(__PA_LDCW_ALIGNMENT - 1)) + __PA_LDCW_ALIGNMENT; \
-+ (unsigned int *) __ret; \
-+})
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+ volatile unsigned int *a = __ldcw_align (lock);
-+ return (__ldcw(a) == 0);
-+}
-+
-+#endif /* __hppa__ || __hppa */
-+
-
- /* Intel Itanium */
- #if defined(__ia64__) || defined(__ia64)
diff --git a/dev-db/postgresql/files/postgresql-7.4.2-gentoo.patch b/dev-db/postgresql/files/postgresql-7.4.2-gentoo.patch
deleted file mode 100644
index 463cad392ce6..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.2-gentoo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Naru postgresql-7.4.2/src/bin/initdb/initdb.sh postgresql-7.4.2.new/src/bin/initdb/initdb.sh
---- postgresql-7.4.2/src/bin/initdb/initdb.sh 2003-10-13 22:06:44.000000000 +0100
-+++ postgresql-7.4.2.new/src/bin/initdb/initdb.sh 2003-12-25 01:08:12.000000000 +0000
-@@ -1145,11 +1145,7 @@
- echo
- echo "Success. You can now start the database server using:"
- echo ""
--echo " $PGPATH/postmaster -D $PGDATA"
--echo "or"
--# (Advertise -l option here, otherwise we have a background
--# process writing to the terminal.)
--echo " $PGPATH/pg_ctl -D $PGDATA -l logfile start"
-+echo " /etc/init.d/postgresql start"
- echo
-
- exit 0
diff --git a/dev-db/postgresql/files/postgresql-7.4.2-hppa-testandset.patch b/dev-db/postgresql/files/postgresql-7.4.2-hppa-testandset.patch
deleted file mode 100644
index 010a42a4088e..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.2-hppa-testandset.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -urN postgresql-7.4.1.orig/src/include/port/linux.h postgresql-7.4.1/src/include/port/linux.h
---- postgresql-7.4.1.orig/src/include/port/linux.h 2003-10-26 01:41:10.000000000 +0000
-+++ postgresql-7.4.1/src/include/port/linux.h 2004-01-09 20:22:50.000000000 +0000
-@@ -3,6 +3,11 @@
-
- #define HAS_TEST_AND_SET
-
-+#elif defined(__hppa__)
-+typedef struct { int sema[4]; } slock_t;
-+
-+#define HAS_TEST_AND_SET
-+
- #elif defined(__sparc__)
- typedef unsigned char slock_t;
-
-diff -urN postgresql-7.4.1.orig/src/include/storage/s_lock.h postgresql-7.4.1/src/include/storage/s_lock.h
---- postgresql-7.4.1.orig/src/include/storage/s_lock.h 2003-11-04 09:43:56.000000000 +0000
-+++ postgresql-7.4.1/src/include/storage/s_lock.h 2004-01-09 20:12:15.000000000 +0000
-@@ -112,6 +112,33 @@
-
- #endif /* __i386__ || __x86_64__ */
-
-+#if defined(__hppa__) || defined(__hppa)
-+#define TAS(lock) tas(lock)
-+
-+#define __ldcw(a) ({ \
-+ unsigned int __ret; \
-+ __asm__ __volatile__("ldcw 0(%2),%0" \
-+ : "=r" (__ret), "=m" (*(a)) : "r" (a)); \
-+ __ret; \
-+})
-+
-+#define __PA_LDCW_ALIGNMENT 16
-+#define __ldcw_align(a) ({ \
-+ volatile unsigned int __ret = (unsigned int) a; \
-+ if ((__ret & ~(__PA_LDCW_ALIGNMENT - 1)) < (unsigned int) a) \
-+ __ret = (__ret & ~(__PA_LDCW_ALIGNMENT - 1)) + __PA_LDCW_ALIGNMENT; \
-+ (unsigned int *) __ret; \
-+})
-+
-+static __inline__ int
-+tas(volatile slock_t *lock)
-+{
-+ volatile unsigned int *a = __ldcw_align (lock);
-+ return (__ldcw(a) == 0);
-+}
-+
-+#endif /* __hppa__ || __hppa */
-+
-
- /* Intel Itanium */
- #if defined(__ia64__) || defined(__ia64)
diff --git a/dev-db/postgresql/files/postgresql-7.4.2-vacuum-delay.patch b/dev-db/postgresql/files/postgresql-7.4.2-vacuum-delay.patch
deleted file mode 100644
index e0f499859009..000000000000
--- a/dev-db/postgresql/files/postgresql-7.4.2-vacuum-delay.patch
+++ /dev/null
@@ -1,284 +0,0 @@
- * From: Jan Wieck <JanWieck ( at ) Yahoo ( dot ) com>
- * To: "Matthew T. O'Connor" <matthew ( at ) zeut ( dot ) net>
- * Subject: Re: Performance features the 4th
- * Date: Sun, 09 Nov 2003 18:42:53 -0500
-
-Matthew T. O'Connor wrote:
-
- ----- Original Message ----- From: "Jan Wieck" <JanWieck ( at ) Yahoo ( dot ) com>
-
-Tom Lane wrote:
-> Gaetano and a couple of other people did experiments that seemed to show
-> it was useful. I think we'd want to change the shape of the knob per
-> later suggestions (sleep 10 ms every N blocks, instead of N ms every
-> block) but it did seem that there was useful bang for little buck there.
-
-
- I thought it was "sleep N ms every M blocks".
-
-Have we seen any numbers? Anything at all? Something that gives us a
-clue by what factor one has to multiply the total time a "VACUUM
-ANALYZE" takes, to get what effect in return?
-
-
-I have some time on sunday to do some testing. Is there a patch that I can
-apply that implements either of the two options? (sleep 10ms every M blocks
-or sleep N ms every M blocks).
-
-
-I know Tom posted the original patch that sleept N ms every 1 block (where N
-is > 10 due to OS limitations). Jan can you post a patch that has just the
-sleep code in it? Or should it be easy enough for me to cull out of the
-larger patch you posted?
-
-
-Sorry for the delay, had to finish some other concept yesterday (will be published soon).
-
-The attached patch adds
-
- vacuum_group_delay_size = 10 (range 1-1000)
- vacuum_group_delay_msec = 0 (range 0-1000)
-
-
-and does the sleeping via select(2). It does it only at the same places where Tom had done the usleep() in his hack, so I guess there is still some more to do besides the documentation, before it can be added to 7.4.1. But it should be enough to get some testing done.
-
-
-Jan
-
---
-#======================================================================#
-# It's easier to get forgiveness for being wrong than for being right. #
-# Let's break this rule - forgive me. #
-#================================================== JanWieck ( at ) Yahoo ( dot ) com #
-
-Index: src/backend/access/nbtree/nbtree.c
-===================================================================
-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/access/nbtree/nbtree.c,v
-retrieving revision 1.106
-diff -c -b -r1.106 nbtree.c
-*** src/backend/access/nbtree/nbtree.c 2003/09/29 23:40:26 1.106
---- src/backend/access/nbtree/nbtree.c 2003/11/09 23:39:36
-***************
-*** 27,32 ****
---- 27,40 ----
- #include "storage/smgr.h"
-
-
-+ /*
-+ * Variables for vacuum_group_delay option (in commands/vacuumlazy.c)
-+ */
-+ extern int vacuum_group_delay_size; /* vacuum N pages */
-+ extern int vacuum_group_delay_msec; /* then sleep M msec */
-+ extern int vacuum_group_delay_count;
-+
-+
- /* Working state for btbuild and its callback */
- typedef struct
- {
-***************
-*** 610,615 ****
---- 618,632 ----
-
- CHECK_FOR_INTERRUPTS();
-
-+ if (vacuum_group_delay_msec > 0)
-+ {
-+ if (++vacuum_group_delay_count >= vacuum_group_delay_size)
-+ {
-+ PG_DELAY(vacuum_group_delay_msec);
-+ vacuum_group_delay_count = 0;
-+ }
-+ }
-+
- ndeletable = 0;
- page = BufferGetPage(buf);
- opaque = (BTPageOpaque) PageGetSpecialPointer(page);
-***************
-*** 736,741 ****
---- 753,769 ----
- Buffer buf;
- Page page;
- BTPageOpaque opaque;
-+
-+ CHECK_FOR_INTERRUPTS();
-+
-+ if (vacuum_group_delay_msec > 0)
-+ {
-+ if (++vacuum_group_delay_count >= vacuum_group_delay_size)
-+ {
-+ PG_DELAY(vacuum_group_delay_msec);
-+ vacuum_group_delay_count = 0;
-+ }
-+ }
-
- buf = _bt_getbuf(rel, blkno, BT_READ);
- page = BufferGetPage(buf);
-Index: src/backend/commands/vacuumlazy.c
-===================================================================
-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/commands/vacuumlazy.c,v
-retrieving revision 1.32
-diff -c -b -r1.32 vacuumlazy.c
-*** src/backend/commands/vacuumlazy.c 2003/09/25 06:57:59 1.32
---- src/backend/commands/vacuumlazy.c 2003/11/09 23:40:13
-***************
-*** 88,93 ****
---- 88,100 ----
- static TransactionId OldestXmin;
- static TransactionId FreezeLimit;
-
-+ /*
-+ * Variables for vacuum_group_delay option (in commands/vacuumlazy.c)
-+ */
-+ int vacuum_group_delay_size = 10; /* vacuum N pages */
-+ int vacuum_group_delay_msec = 0; /* then sleep M msec */
-+ int vacuum_group_delay_count = 0;
-+
-
- /* non-export function prototypes */
- static void lazy_scan_heap(Relation onerel, LVRelStats *vacrelstats,
-***************
-*** 228,233 ****
---- 235,249 ----
-
- CHECK_FOR_INTERRUPTS();
-
-+ if (vacuum_group_delay_msec > 0)
-+ {
-+ if (++vacuum_group_delay_count >= vacuum_group_delay_size)
-+ {
-+ PG_DELAY(vacuum_group_delay_msec);
-+ vacuum_group_delay_count = 0;
-+ }
-+ }
-+
- /*
- * If we are close to overrunning the available space for
- * dead-tuple TIDs, pause and do a cycle of vacuuming before we
-***************
-*** 469,474 ****
---- 485,499 ----
-
- CHECK_FOR_INTERRUPTS();
-
-+ if (vacuum_group_delay_msec > 0)
-+ {
-+ if (++vacuum_group_delay_count >= vacuum_group_delay_size)
-+ {
-+ PG_DELAY(vacuum_group_delay_msec);
-+ vacuum_group_delay_count = 0;
-+ }
-+ }
-+
- tblk = ItemPointerGetBlockNumber(&vacrelstats->dead_tuples[tupindex]);
- buf = ReadBuffer(onerel, tblk);
- LockBufferForCleanup(buf);
-***************
-*** 799,804 ****
---- 824,838 ----
- hastup;
-
- CHECK_FOR_INTERRUPTS();
-+
-+ if (vacuum_group_delay_msec > 0)
-+ {
-+ if (++vacuum_group_delay_count >= vacuum_group_delay_size)
-+ {
-+ PG_DELAY(vacuum_group_delay_msec);
-+ vacuum_group_delay_count = 0;
-+ }
-+ }
-
- blkno--;
-
-Index: src/backend/utils/misc/guc.c
-===================================================================
-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/utils/misc/guc.c,v
-retrieving revision 1.164.2.1
-diff -c -b -r1.164.2.1 guc.c
-*** src/backend/utils/misc/guc.c 2003/11/07 21:27:50 1.164.2.1
---- src/backend/utils/misc/guc.c 2003/11/09 23:27:49
-***************
-*** 73,78 ****
---- 73,80 ----
- extern int CommitDelay;
- extern int CommitSiblings;
- extern char *preload_libraries_string;
-+ extern int vacuum_group_delay_size;
-+ extern int vacuum_group_delay_msec;
-
- #ifdef HAVE_SYSLOG
- extern char *Syslog_facility;
-***************
-*** 1188,1193 ****
---- 1190,1213 ----
- },
- &log_min_duration_statement,
- -1, -1, INT_MAX / 1000, NULL, NULL
-+ },
-+
-+ {
-+ {"vacuum_group_delay_msec", PGC_USERSET, RESOURCES,
-+ gettext_noop("Sets VACUUM's delay in milliseconds between processing groups of pages."),
-+ NULL
-+ },
-+ &vacuum_group_delay_msec,
-+ 0, 0, 1000, NULL, NULL
-+ },
-+
-+ {
-+ {"vacuum_group_delay_size", PGC_USERSET, RESOURCES,
-+ gettext_noop("Sets VACUUM's group size for the vacuum_group_delay_msec option."),
-+ NULL
-+ },
-+ &vacuum_group_delay_size,
-+ 10, 1, 1000, NULL, NULL
- },
-
- /* End-of-list marker */
-Index: src/backend/utils/misc/postgresql.conf.sample
-===================================================================
-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/backend/utils/misc/postgresql.conf.sample,v
-retrieving revision 1.92
-diff -c -b -r1.92 postgresql.conf.sample
-*** src/backend/utils/misc/postgresql.conf.sample 2003/10/08 03:49:38 1.92
---- src/backend/utils/misc/postgresql.conf.sample 2003/11/09 23:04:21
-***************
-*** 69,74 ****
---- 69,79 ----
- #max_files_per_process = 1000 # min 25
- #preload_libraries = ''
-
-+ # - Vacuum napping -
-+
-+ #vacuum_group_delay_size = 10 # range 1-1000 pages ; vacuum this many pages
-+ #vacuum_group_delay_msec = 0 # range 0-1000 msec ; then nap this long
-+
-
- #---------------------------------------------------------------------------
- # WRITE AHEAD LOG
-Index: src/include/miscadmin.h
-===================================================================
-RCS file: /home/pgsql/CvsRoot/pgsql-server/src/include/miscadmin.h,v
-retrieving revision 1.134
-diff -c -b -r1.134 miscadmin.h
-*** src/include/miscadmin.h 2003/09/24 18:54:01 1.134
---- src/include/miscadmin.h 2003/11/09 23:02:03
-***************
-*** 96,101 ****
---- 96,111 ----
- CritSectionCount--; \
- } while(0)
-
-+ /*
-+ * Macro using select(2) to nap for milliseconds
-+ */
-+ #define PG_DELAY(_msec) \
-+ { \
-+ struct timeval _delay; \
-+ _delay.tv_sec = (_msec) / 1000; \
-+ _delay.tv_usec = ((_msec) % 1000) * 1000; \
-+ (void) select(0, NULL, NULL, NULL, &_delay);\
-+ }
-
- /*****************************************************************************
- * globals.h -- *
diff --git a/dev-db/postgresql/files/postgresql.conf-7.4.2 b/dev-db/postgresql/files/postgresql.conf-7.4.2
deleted file mode 100644
index e8dab3e4c827..000000000000
--- a/dev-db/postgresql/files/postgresql.conf-7.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-# PostgreSQL's Database Directory
-PGDATA=/var/lib/postgresql/data
-
-# Logfile path: (NOTE: This must be uid/gid owned by the value of $PGUSER!)
-PGLOG=/var/lib/postgresql/data/postgresql.log
-
-# Run the PostgreSQL user as:
-PGUSER=postgres
-
-# Extra options to run postmaster with.
-# If you want to enable TCP/IP for PostgreSQL, add -i to the following:
-# PGOPTS="-N 1024 -B 2048 -i"
-PGOPTS=""
-
diff --git a/dev-db/postgresql/files/postgresql.init-7.4.2 b/dev-db/postgresql/files/postgresql.init-7.4.2
deleted file mode 100644
index b53d265b6b91..000000000000
--- a/dev-db/postgresql/files/postgresql.init-7.4.2
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/postgresql/files/postgresql.init-7.4.2,v 1.2 2004/07/14 21:42:29 agriffis Exp $
-
-opts="${opts} reload"
-
-depend() {
- use net
-}
-
-checkconfig() {
- if [ ! -d $PGDATA ]; then
- eerror "directory not found: $PGDATA"
- eerror "You should create PGDATA directory first."
- return 1
- fi
-}
-
-start() {
- checkconfig || return 1
-
- ebegin "Starting PostgreSQL"
- if [ -f $PGDATA/postmaster.pid ]; then
- rm $PGDATA/postmaster.pid
- fi
- su - $PGUSER -c "/usr/bin/pg_ctl start -D '$PGDATA' -s -l '$PGLOG' -o '$PGOPTS'"
-
- while :
- do
- cnt=$(($cnt + 1))
- if [ -f "$PGDATA/postmaster.pid" ]; then
- ret=0
- break
- fi
-
- if [ $cnt -eq 30 ]; then
- eerror "Please see log file: $PGLOG"
- ret=1
- break
- fi
- sleep 1
- done
- eend $ret
-}
-
-stop() {
- ebegin "Stopping PostgreSQL"
- su - $PGUSER -c "/usr/bin/pg_ctl stop -D '$PGDATA' -s -m fast"
- eend $?
-}
-
-svc_restart() {
- ebegin "Restarting PostgreSQL"
- su - $PGUSER -c "/usr/bin/pg_ctl restart -D '$PGDATA' -s -m fast -l '$PGLOG' -o '$PGOPTS'"
- eend $?
-}
-
-reload() {
- ebegin "Reloading PostgreSQL configuration"
- su - $PGUSER -c "/usr/bin/pg_ctl reload -D '$PGDATA' -s"
- eend $?
-}