diff options
| author | Palle Girgensohn <girgen@FreeBSD.org> | 2011-05-02 21:37:31 +0000 |
|---|---|---|
| committer | Palle Girgensohn <girgen@FreeBSD.org> | 2011-05-02 21:37:31 +0000 |
| commit | 6bbab5e1ef6165b675bdc669999b8cc9b78e0194 (patch) | |
| tree | 74656a5cf75cd97fb22e25535e26fefa0376af2c /databases/postgresql90-server | |
| parent | - Limit brokedness status to amd64 arch (diff) | |
Fix a problem with creating the postgresql user when using a package.
Notes
Notes:
svn path=/head/; revision=273491
Diffstat (limited to 'databases/postgresql90-server')
| -rw-r--r-- | databases/postgresql90-server/Makefile | 13 | ||||
| -rw-r--r-- | databases/postgresql90-server/files/pkg-install-server.in (renamed from databases/postgresql90-server/files/pkg-install-server) | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index b57b1f10d7e2..f38e097c3fe0 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -7,7 +7,7 @@ PORTNAME?= postgresql DISTVERSION?= 9.0.4 -PORTREVISION= 1 +PORTREVISION?= 2 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -287,7 +287,7 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 ALTER_DATABASE.7 \ .if defined(SERVER_ONLY) pre-everything:: - @${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX} ${PORTNAME} BACKUPWARNING + @${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in ${PORTNAME} BACKUPWARNING .endif .if !defined(NO_BUILD) @@ -309,20 +309,19 @@ do-build: SUB_FILES+= pkg-message${PKGNAMESUFFIX} PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif -. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}) +. if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) +SUB_FILES+= pkg-install${PKGNAMESUFFIX} SUB_LIST= PG_GROUP=$(PG_GROUP) \ PG_USER=$(PG_USER) \ PG_UID=$(PG_UID) PLIST_SUB+= PG_USER=$(PG_USER) -PKGINSTALL= ${FILESDIR}/pkg-install${PKGNAMESUFFIX} +PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} . endif .endif .if defined(SERVER_ONLY) pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} PG_USER=$(PG_USER) PG_GROUP=$(PG_GROUP) \ - PG_UID=$(PG_UID) \ - ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL + @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) diff --git a/databases/postgresql90-server/files/pkg-install-server b/databases/postgresql90-server/files/pkg-install-server.in index 17788b085041..da85c73b7e4c 100644 --- a/databases/postgresql90-server/files/pkg-install-server +++ b/databases/postgresql90-server/files/pkg-install-server.in @@ -1,9 +1,13 @@ #! /bin/sh -# $FreeBSD: /tmp/pcvs/ports/databases/postgresql90-server/files/Attic/pkg-install-server,v 1.1 2011-04-27 13:28:50 girgen Exp $ +# $FreeBSD$ PATH=/bin:/usr/bin:/usr/sbin +PG_USER=%%PG_USER%% +PG_GROUP=%%PG_GROUP%% +PG_UID=%%PG_UID%% + backupwarning() { echo " =========== BACKUP YOUR DATA! ============= @@ -23,13 +27,11 @@ case $2 in PRE-INSTALL) backupwarning DB_DIR=${PKG_PREFIX}/${PG_USER} - UID=${PG_UID} - GID=${PG_UID} if pw group show "${PG_GROUP}" 2>/dev/null; then echo "You already have a group \"${PG_GROUP}\", so I will use it." else - if pw groupadd ${PG_GROUP} -g ${GID}; then + if pw groupadd ${PG_GROUP} -g ${PG_UID}; then echo "Added group \"${PG_GROUP}\"." else echo "Adding group \"${PG_GROUP}\" failed..." @@ -40,7 +42,7 @@ PRE-INSTALL) if pw user show "${PG_USER}" 2>/dev/null; then echo "You already have a user \"${PG_USER}\", so I will use it." else - if pw useradd ${PG_USER} -u ${UID} -g ${PG_GROUP} -h - \ + if pw useradd ${PG_USER} -u ${PG_UID} -g ${PG_GROUP} -h - \ -d ${DB_DIR} -c "PostgreSQL Daemon" then echo "Added user \"${PG_USER}\"." |