diff options
| author | Chris Rees <crees@FreeBSD.org> | 2011-08-12 09:51:20 +0000 |
|---|---|---|
| committer | Chris Rees <crees@FreeBSD.org> | 2011-08-12 09:51:20 +0000 |
| commit | c7d059d51ef3d6d0b2b13cce84cb430400c0969a (patch) | |
| tree | dbf4cb4e567aab63985ba166487a5676b87cb82f /databases/postgresql82-server | |
| parent | - Use USERS and GROUPS (diff) | |
Use USERS and GROUPS
PR: ports/157559
Submitted by: me
Approved by: maintainer timeout (girgen, 9 weeks)
Notes
Notes:
svn path=/head/; revision=279537
Diffstat (limited to 'databases/postgresql82-server')
| -rw-r--r-- | databases/postgresql82-server/Makefile | 8 | ||||
| -rw-r--r-- | databases/postgresql82-server/pkg-install-server | 39 |
2 files changed, 2 insertions, 45 deletions
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile index ab69ca9e7555..9b2ef2b88abd 100644 --- a/databases/postgresql82-server/Makefile +++ b/databases/postgresql82-server/Makefile @@ -60,6 +60,8 @@ USE_RC_SUBR= postgresql SUB_FILES+= dot.cshrc dot.profile USE_PGSQL= yes WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +USERS= pgsql +GROUPS= ${USERS} .endif .if !defined(SLAVE_ONLY) @@ -241,12 +243,6 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif .endif -.if defined(SERVER_ONLY) -pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} \ - ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL -.endif - .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in diff --git a/databases/postgresql82-server/pkg-install-server b/databases/postgresql82-server/pkg-install-server index c3db75540ffa..bb5c69a88bed 100644 --- a/databases/postgresql82-server/pkg-install-server +++ b/databases/postgresql82-server/pkg-install-server @@ -3,8 +3,6 @@ # $FreeBSD$ PATH=/bin:/usr/sbin -PGUSER=pgsql -DB_DIR=${PKG_PREFIX}/${PGUSER} backupwarning() { echo " @@ -22,43 +20,6 @@ backupwarning() { echo " } case $2 in -PRE-INSTALL) - backupwarning - USER=${PGUSER} - GROUP=${USER} - UID=70 - GID=${UID} - - if pw group show "${GROUP}" 2>/dev/null; then - echo "You already have a group \"${GROUP}\", so I will use it." - else - if pw groupadd ${GROUP} -g ${GID}; then - echo "Added group \"${GROUP}\"." - else - echo "Adding group \"${GROUP}\" failed..." - exit 1 - fi - fi - - if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." - else - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -d ${DB_DIR} -c "PostgreSQL Daemon" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - - if ! [ -x ~${PGUSER} ] ; then - mkdir -p ${DB_DIR} - chown pgsql:pgsql ${DB_DIR} - fi - ;; - BACKUPWARNING) backupwarning ;; |