diff options
| author | jlam <jlam@pkgsrc.org> | 2001-11-26 20:38:31 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2001-11-26 20:38:31 +0000 |
| commit | 678c0f86f876a6627f87f5035ca03d672e715ae2 (patch) | |
| tree | 72e7c5f0163f0edf167281176b0a2f60b193d72b /databases | |
| parent | 22d02d6b3ee441bb598f813d6f7a5421dca6335f (diff) | |
| download | pkgsrc-678c0f86f876a6627f87f5035ca03d672e715ae2.tar.gz | |
Use PKG_{USERS,GROUPS} instead of PKG_{USER,GROUP}.
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/postgresql-server/Makefile | 11 | ||||
| -rw-r--r-- | databases/postgresql-server/files/pgsql.sh | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/databases/postgresql-server/Makefile b/databases/postgresql-server/Makefile index c60506f8b46..117ab1970c8 100644 --- a/databases/postgresql-server/Makefile +++ b/databases/postgresql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2001/11/21 15:44:22 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2001/11/26 20:38:31 jlam Exp $ .include "../../databases/postgresql/Makefile.common" .include "../../databases/postgresql/Makefile.ssl" @@ -27,13 +27,12 @@ DIRS_TO_BUILD= src/backend PGUSER?= pgsql PGGROUP?= pgsql PGHOME?= ${PREFIX}/${PGUSER} +FILES_SUBST+= PGUSER=${PGUSER} +FILES_SUBST+= PGHOME=${PGHOME} BUILD_DEFS= PGUSER PGROUP PGHOME -PKG_USER= ${PGUSER} -PKG_USER_DESCR= PostgreSQL database administrator -PKG_USER_HOME= ${PGHOME} -PKG_USER_SHELL= ${SH} -PKG_GROUP= ${PGGROUP} +PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\\ database\\ administrator:${PGHOME}:${SH} +PKG_GROUPS= ${PGGROUP} RCD_SCRIPTS= pgsql OWN_DIRS_PERMS= ${PGHOME} ${PGUSER} ${PGGROUP} 0755 diff --git a/databases/postgresql-server/files/pgsql.sh b/databases/postgresql-server/files/pgsql.sh index c3a19767ed2..be054a1eb0c 100644 --- a/databases/postgresql-server/files/pgsql.sh +++ b/databases/postgresql-server/files/pgsql.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: pgsql.sh,v 1.5 2001/11/19 16:23:08 jlam Exp $ +# $NetBSD: pgsql.sh,v 1.6 2001/11/26 20:38:31 jlam Exp $ # # PostgreSQL database rc.d control script # @@ -8,11 +8,11 @@ # REQUIRE: DAEMON # KEYWORD: shutdown -PGHOME=@PKG_USER_HOME@ +PGHOME="@PGHOME@" name="pgsql" rcvar=$name -pgsql_user="@PKG_USER@" +pgsql_user="@PGUSER@" command="@PREFIX@/bin/pg_ctl" command_args="-s -D ${PGHOME}/data -l ${PGHOME}/errlog" |