aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rees <crees@FreeBSD.org>2011-07-04 19:05:05 +0000
committerChris Rees <crees@FreeBSD.org>2011-07-04 19:05:05 +0000
commit35d361ad6386071a84754bc4cc79a433fa915a22 (patch)
tree3975d3217ffd70f01d9599be982ae95fdaa36593
parentb75f586d02741746e60563c913bd0d81224375b0 (diff)
downloadports-35d361ad6386071a84754bc4cc79a433fa915a22.tar.gz
ports-35d361ad6386071a84754bc4cc79a433fa915a22.zip
Notes
-rw-r--r--dns/rbldnsd/Makefile6
-rw-r--r--dns/rbldnsd/pkg-install30
2 files changed, 2 insertions, 34 deletions
diff --git a/dns/rbldnsd/Makefile b/dns/rbldnsd/Makefile
index 82d543ac20e9..2c5d452d1410 100644
--- a/dns/rbldnsd/Makefile
+++ b/dns/rbldnsd/Makefile
@@ -32,13 +32,11 @@ MAN8= rbldnsd.8
HAS_CONFIGURE= yes
USE_RC_SUBR= rbldnsd
+USERS= rbldns
+GROUPS= ${USERS}
PKGMESSAGE= ${WRKDIR}/pkg-message
SUB_FILES= pkg-message
-pre-install:
- @${ECHO} "==> Creating custom user to run rbldnsd..."
- @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
do-install:
@if [ ! -d ${ROOTDIR} ]; then \
${MKDIR} ${ROOTDIR}; \
diff --git a/dns/rbldnsd/pkg-install b/dns/rbldnsd/pkg-install
deleted file mode 100644
index a2a7943481e1..000000000000
--- a/dns/rbldnsd/pkg-install
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-if [ "$2" != "PRE-INSTALL" ]; then
- exit 0
-fi
-
-RBLDNSUSER=${RBLDNSUSER:-rbldns}
-RBLDNSGROUP=${RBLDNSGROUP:-rbldns}
-
-if ! pw groupshow "$RBLDNSGROUP" 2>/dev/null 1>&2; then
- if pw groupadd $RBLDNSGROUP; then
- echo "=> Added group \"$RBLDNSGROUP\"."
- else
- echo "=> Adding group \"$RBLDNSGROUP\" failed..."
- exit 1
- fi
-fi
-
-if ! pw usershow "$RBLDNSUSER" 2>/dev/null 1>&2; then
- if pw useradd $RBLDNSUSER -g $RBLDNSGROUP -h - \
- -s "/usr/sbin/nologin" -d "/nonexistent" \
- -c "rbldnsd pseudo-user"; \
- then
- echo "=> Added user \"$RBLDNSUSER\"."
- else
- echo "=> Adding user \"$RBLDNSUSER\" failed..."
- exit 1
- fi
-fi
-exit 0