From 205966be42d54581354618dac72a045b9267a6c4 Mon Sep 17 00:00:00 2001
From: abs <abs@pkgsrc.org>
Date: Wed, 16 Jul 2003 10:35:15 +0000
Subject: Update to postgresql-server-7.3.3nb1 	In rc.d/pgsql call
 pgsql_initdb directly for initial database 	setup, rather than trying to
 determine the script location 	from $0 and calling '$rcd_dir/pgsql initdb'.
 The previous 	form broke when called from /etc/rc.

---
 databases/postgresql-server/Makefile       | 4 ++--
 databases/postgresql-server/files/pgsql.sh | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'databases/postgresql-server')

diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile
index 3cba307c81b..5b8515732ae 100644
--- a/databases/postgresql-server/Makefile
+++ b/databases/postgresql-server/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2003/03/25 15:13:48 cjep Exp $
+# $NetBSD: Makefile,v 1.32 2003/07/16 10:35:15 abs Exp $
 
 PKGNAME=		postgresql-server-${BASE_VERS}
 SVR4_PKGNAME=		pstgs
-#PKGREVISION=		1
+PKGREVISION=		1
 COMMENT=		PostgreSQL database server programs
 
 DEPENDS+=		postgresql-client>=${BASE_VERS}:../../databases/postgresql-client
diff --git a/databases/postgresql-server/files/pgsql.sh b/databases/postgresql-server/files/pgsql.sh
index c970149feca..269b0aaf367 100644
--- a/databases/postgresql-server/files/pgsql.sh
+++ b/databases/postgresql-server/files/pgsql.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: pgsql.sh,v 1.18 2002/10/19 22:26:35 jlam Exp $
+# $NetBSD: pgsql.sh,v 1.19 2003/07/16 10:35:15 abs Exp $
 #
 # PostgreSQL database rc.d control script
 #
@@ -25,8 +25,6 @@ if [ -f /etc/rc.subr ]; then
 	. /etc/rc.subr
 fi
 
-rcd_dir=`@DIRNAME@ $0`
-
 name="pgsql"
 rcvar=$name
 pgsql_user="@PGUSER@"
@@ -57,7 +55,7 @@ stop_cmd="pgsql_doit stop"
 pgsql_precmd()
 {
 	if [ ! -f ${pgsql_home}/data/base/1/PG_VERSION ]; then
-		$rcd_dir/pgsql initdb
+		pgsql_initdb
 	fi
 }
 
-- 
cgit v1.2.3