diff options
| author | crees <crees@FreeBSD.org> | 2011-06-28 01:44:37 +0800 |
|---|---|---|
| committer | crees <crees@FreeBSD.org> | 2011-06-28 01:44:37 +0800 |
| commit | 53cd42e4cde8810a49fae1955d62ff432a5b14a5 (patch) | |
| tree | 4d7ee43ed5a50795b09e567ca043344aa6c5de58 /databases | |
| parent | 241ec994a36c4108a3ad51935c82bbe0b9a1c093 (diff) | |
| download | freebsd-ports-gnome-53cd42e4cde8810a49fae1955d62ff432a5b14a5.tar.gz freebsd-ports-gnome-53cd42e4cde8810a49fae1955d62ff432a5b14a5.tar.zst freebsd-ports-gnome-53cd42e4cde8810a49fae1955d62ff432a5b14a5.zip | |
- Use USERS and GROUPS
PR: ports/157547
Submitted by: Chris Rees (utisoft@gmail.com)
Approved by: tabthorpe (co-mentor)
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/couchdb/Makefile | 5 | ||||
| -rw-r--r-- | databases/couchdb/pkg-install | 32 |
2 files changed, 2 insertions, 35 deletions
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile index 1d9a04df4e11..479a8d68c0f1 100644 --- a/databases/couchdb/Makefile +++ b/databases/couchdb/Makefile @@ -29,6 +29,8 @@ COUCH_LOGDIR?= ${COUCH_VARDIR}/log/couchdb COUCH_LIBDIR?= ${COUCH_VARDIR}/lib/couchdb COUCH_USER?= couchdb +USERS= ${COUCH_USER} +GROUPS= ${USERS} USE_RC_SUBR= couchdb USE_GMAKE= yes USE_AUTOTOOLS= libtool @@ -54,9 +56,6 @@ post-patch: @${REINPLACE_CMD} -e 's/install-data-am$$//' ${WRKSRC}/Makefile.in .endif -pre-install: - @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL - post-install: @${CAT} ${PKGMESSAGE} ${MKDIR} ${COUCH_DBDIR} diff --git a/databases/couchdb/pkg-install b/databases/couchdb/pkg-install deleted file mode 100644 index 7fe4328dbf37..000000000000 --- a/databases/couchdb/pkg-install +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/sbin - -USER=couchdb -GROUP=couchdb -UID=919 -GID=919 - -case $2 in - PRE-INSTALL) - if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", 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 - if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ - -s /usr/sbin/nologin -L daemon -d /var/empty -c "CouchDB Account" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - ;; -esac |