aboutsummaryrefslogtreecommitdiffstats
path: root/news
diff options
context:
space:
mode:
authorfjoe <fjoe@FreeBSD.org>2009-10-22 23:28:31 +0800
committerfjoe <fjoe@FreeBSD.org>2009-10-22 23:28:31 +0800
commit3893956b76b4ba2c7b8bf4f47b19eec706efc06e (patch)
treee5b34a3c4e26f95c2754303b31d024af1aa80e15 /news
parent896da03944c6027ca01492ed721d58181cd0632f (diff)
downloadfreebsd-ports-3893956b76b4ba2c7b8bf4f47b19eec706efc06e.tar.gz
freebsd-ports-3893956b76b4ba2c7b8bf4f47b19eec706efc06e.tar.zst
freebsd-ports-3893956b76b4ba2c7b8bf4f47b19eec706efc06e.zip
Use USERS and GROUPS.
Diffstat (limited to 'news')
-rw-r--r--news/husky-base/Makefile4
-rw-r--r--news/husky-base/pkg-install71
2 files changed, 2 insertions, 73 deletions
diff --git a/news/husky-base/Makefile b/news/husky-base/Makefile
index d291c8d82271..1fb11c3c6518 100644
--- a/news/husky-base/Makefile
+++ b/news/husky-base/Makefile
@@ -20,8 +20,8 @@ CONFLICTS= husky-base-devel-[0-9]*
WRKSRC= ${WRKDIR}/huskybse
NO_BUILD= yes
-pre-install:
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL
+USERS= fido
+GROUPS= fido
do-install:
@${MKDIR} ${PREFIX}/etc/fido ${PREFIX}/share/doc/husky
diff --git a/news/husky-base/pkg-install b/news/husky-base/pkg-install
deleted file mode 100644
index e929b1314a40..000000000000
--- a/news/husky-base/pkg-install
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/news/husky-base/Attic/pkg-install,v 1.2 2003-01-21 10:14:47 fjoe Exp $
-#
-
-PKG_PREFIX=${PKG_PREFIX:=/usr/local}
-BATCH=${BATCH:=no}
-
-ask() {
- local question default answer
-
- question=$1
- default=$2
- if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then
- read -p "${question} [${default}]? " answer
- fi
- if [ x${answer} = x ]; then
- answer=${default}
- fi
- echo ${answer}
-}
-
-yesno() {
- local question default answer
-
- question=$1
- default=$2
- while :; do
- answer=$(ask "${question}" "${default}")
- case "${answer}" in
- [Yy]*) return 0;;
- [Nn]*) return 1;;
- esac
- echo "Please answer yes or no."
- done
-}
-
-if [ x"$2" = xPRE-INSTALL ]; then
- USER=fido
- GROUP=fido
- UID=111
- GID=111
-
- if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then
- echo "You already have a group \"${GROUP}\", so I will use it."
- else
- if /usr/sbin/pw groupadd ${GROUP} -g ${GID}
- then
- echo "Added group \"${GROUP}\"."
- else
- echo "Adding group \"${GROUP}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-
- if /usr/sbin/pw user show "${USER}" 2>/dev/null; then
- echo "You already have a user \"${USER}\", so I will use it."
- else
- if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
- -d ${PKG_PREFIX}/fido \
- -c "Fido System"
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- echo "Please create it, and try again."
- exit 1
- fi
- fi
-fi