diff options
| author | Palle Girgensohn <girgen@FreeBSD.org> | 2006-12-07 14:28:41 +0000 |
|---|---|---|
| committer | Palle Girgensohn <girgen@FreeBSD.org> | 2006-12-07 14:28:41 +0000 |
| commit | ac681feb0cb58da546a6e61a101b7d3e9c4df307 (patch) | |
| tree | 97d1c63fb014793b80074bcd07d53147d83c8530 | |
| parent | 38e287f7700eed67986087d37598fa57e751ffa1 (diff) | |
| download | ports-ac681feb0cb58da546a6e61a101b7d3e9c4df307.tar.gz ports-ac681feb0cb58da546a6e61a101b7d3e9c4df307.zip | |
Fix build problems when using WITH_THREADSAFE
Notes
Notes:
svn path=/head/; revision=179118
12 files changed, 6 insertions, 84 deletions
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index ec3722ca98c1..a53327a9c48c 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -181,9 +181,8 @@ CONFIGURE_ARGS+=--with-krb5 . endif . endif -. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum) +. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum) DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} -EXTRA_PATCHES= ${FILESDIR}/regresspatch-src-test-regress-pgregress-sh . endif . if defined(WITH_THREADSAFE) diff --git a/databases/postgresql82-server/files/regresspatch-src-test-regress-pgregress-sh b/databases/postgresql82-server/files/regresspatch-src-test-regress-pgregress-sh deleted file mode 100644 index f2ebbf5cb96e..000000000000 --- a/databases/postgresql82-server/files/regresspatch-src-test-regress-pgregress-sh +++ /dev/null @@ -1,12 +0,0 @@ ---- src/test/regress/pg_regress.sh~ Sun Dec 12 16:34:15 2004 -+++ src/test/regress/pg_regress.sh Sat Jan 8 05:12:46 2005 -@@ -410,6 +410,9 @@ - (exit 2); exit - fi - -+ # make rest of this script happy -+ echo "log_destination = 'stderr'" >> $PGDATA/postgresql.conf -+ echo "silent_mode = false" >> $PGDATA/postgresql.conf - - # ---------- - # Start postmaster diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index ec3722ca98c1..a53327a9c48c 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -181,9 +181,8 @@ CONFIGURE_ARGS+=--with-krb5 . endif . endif -. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum) +. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum) DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} -EXTRA_PATCHES= ${FILESDIR}/regresspatch-src-test-regress-pgregress-sh . endif . if defined(WITH_THREADSAFE) diff --git a/databases/postgresql83-server/files/regresspatch-src-test-regress-pgregress-sh b/databases/postgresql83-server/files/regresspatch-src-test-regress-pgregress-sh deleted file mode 100644 index f2ebbf5cb96e..000000000000 --- a/databases/postgresql83-server/files/regresspatch-src-test-regress-pgregress-sh +++ /dev/null @@ -1,12 +0,0 @@ ---- src/test/regress/pg_regress.sh~ Sun Dec 12 16:34:15 2004 -+++ src/test/regress/pg_regress.sh Sat Jan 8 05:12:46 2005 -@@ -410,6 +410,9 @@ - (exit 2); exit - fi - -+ # make rest of this script happy -+ echo "log_destination = 'stderr'" >> $PGDATA/postgresql.conf -+ echo "silent_mode = false" >> $PGDATA/postgresql.conf - - # ---------- - # Start postmaster diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index ec3722ca98c1..a53327a9c48c 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -181,9 +181,8 @@ CONFIGURE_ARGS+=--with-krb5 . endif . endif -. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum) +. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum) DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} -EXTRA_PATCHES= ${FILESDIR}/regresspatch-src-test-regress-pgregress-sh . endif . if defined(WITH_THREADSAFE) diff --git a/databases/postgresql84-server/files/regresspatch-src-test-regress-pgregress-sh b/databases/postgresql84-server/files/regresspatch-src-test-regress-pgregress-sh deleted file mode 100644 index f2ebbf5cb96e..000000000000 --- a/databases/postgresql84-server/files/regresspatch-src-test-regress-pgregress-sh +++ /dev/null @@ -1,12 +0,0 @@ ---- src/test/regress/pg_regress.sh~ Sun Dec 12 16:34:15 2004 -+++ src/test/regress/pg_regress.sh Sat Jan 8 05:12:46 2005 -@@ -410,6 +410,9 @@ - (exit 2); exit - fi - -+ # make rest of this script happy -+ echo "log_destination = 'stderr'" >> $PGDATA/postgresql.conf -+ echo "silent_mode = false" >> $PGDATA/postgresql.conf - - # ---------- - # Start postmaster diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index ec3722ca98c1..a53327a9c48c 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -181,9 +181,8 @@ CONFIGURE_ARGS+=--with-krb5 . endif . endif -. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum) +. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum) DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} -EXTRA_PATCHES= ${FILESDIR}/regresspatch-src-test-regress-pgregress-sh . endif . if defined(WITH_THREADSAFE) diff --git a/databases/postgresql90-server/files/regresspatch-src-test-regress-pgregress-sh b/databases/postgresql90-server/files/regresspatch-src-test-regress-pgregress-sh deleted file mode 100644 index f2ebbf5cb96e..000000000000 --- a/databases/postgresql90-server/files/regresspatch-src-test-regress-pgregress-sh +++ /dev/null @@ -1,12 +0,0 @@ ---- src/test/regress/pg_regress.sh~ Sun Dec 12 16:34:15 2004 -+++ src/test/regress/pg_regress.sh Sat Jan 8 05:12:46 2005 -@@ -410,6 +410,9 @@ - (exit 2); exit - fi - -+ # make rest of this script happy -+ echo "log_destination = 'stderr'" >> $PGDATA/postgresql.conf -+ echo "silent_mode = false" >> $PGDATA/postgresql.conf - - # ---------- - # Start postmaster diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index ec3722ca98c1..a53327a9c48c 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -181,9 +181,8 @@ CONFIGURE_ARGS+=--with-krb5 . endif . endif -. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum) +. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum) DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} -EXTRA_PATCHES= ${FILESDIR}/regresspatch-src-test-regress-pgregress-sh . endif . if defined(WITH_THREADSAFE) diff --git a/databases/postgresql91-server/files/regresspatch-src-test-regress-pgregress-sh b/databases/postgresql91-server/files/regresspatch-src-test-regress-pgregress-sh deleted file mode 100644 index f2ebbf5cb96e..000000000000 --- a/databases/postgresql91-server/files/regresspatch-src-test-regress-pgregress-sh +++ /dev/null @@ -1,12 +0,0 @@ ---- src/test/regress/pg_regress.sh~ Sun Dec 12 16:34:15 2004 -+++ src/test/regress/pg_regress.sh Sat Jan 8 05:12:46 2005 -@@ -410,6 +410,9 @@ - (exit 2); exit - fi - -+ # make rest of this script happy -+ echo "log_destination = 'stderr'" >> $PGDATA/postgresql.conf -+ echo "silent_mode = false" >> $PGDATA/postgresql.conf - - # ---------- - # Start postmaster diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index ec3722ca98c1..a53327a9c48c 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -181,9 +181,8 @@ CONFIGURE_ARGS+=--with-krb5 . endif . endif -. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || make(makesum) +. if (defined(SERVER_ONLY) && defined(WITH_TESTS)) || defined(WITH_THREADSAFE) || make(makesum) DISTFILES+= postgresql-test-${PORTVERSION}${EXTRACT_SUFX} -EXTRA_PATCHES= ${FILESDIR}/regresspatch-src-test-regress-pgregress-sh . endif . if defined(WITH_THREADSAFE) diff --git a/databases/postgresql92-server/files/regresspatch-src-test-regress-pgregress-sh b/databases/postgresql92-server/files/regresspatch-src-test-regress-pgregress-sh deleted file mode 100644 index f2ebbf5cb96e..000000000000 --- a/databases/postgresql92-server/files/regresspatch-src-test-regress-pgregress-sh +++ /dev/null @@ -1,12 +0,0 @@ ---- src/test/regress/pg_regress.sh~ Sun Dec 12 16:34:15 2004 -+++ src/test/regress/pg_regress.sh Sat Jan 8 05:12:46 2005 -@@ -410,6 +410,9 @@ - (exit 2); exit - fi - -+ # make rest of this script happy -+ echo "log_destination = 'stderr'" >> $PGDATA/postgresql.conf -+ echo "silent_mode = false" >> $PGDATA/postgresql.conf - - # ---------- - # Start postmaster |