diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2012-05-20 16:47:37 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2012-05-20 16:47:37 +0000 |
| commit | abcad0b093d03b8cacdde69592df1fc7bfa4c0ea (patch) | |
| tree | b880915a6f4703c0e88c3b745cdcc48cb890e534 /net/avahi-autoipd | |
| parent | b427b0d25135344fa7b1f679baade8298f63cf87 (diff) | |
| download | ports-abcad0b093d03b8cacdde69592df1fc7bfa4c0ea.tar.gz ports-abcad0b093d03b8cacdde69592df1fc7bfa4c0ea.zip | |
Switch from old way to new way by using USERS.
PR: ports/164187
Submitted by: crees
Notes
Notes:
svn path=/head/; revision=297049
Diffstat (limited to 'net/avahi-autoipd')
| -rw-r--r-- | net/avahi-autoipd/Makefile | 4 | ||||
| -rw-r--r-- | net/avahi-autoipd/pkg-install | 36 |
2 files changed, 3 insertions, 37 deletions
diff --git a/net/avahi-autoipd/Makefile b/net/avahi-autoipd/Makefile index 2f937e955c3d..058b3c008eff 100644 --- a/net/avahi-autoipd/Makefile +++ b/net/avahi-autoipd/Makefile @@ -15,6 +15,9 @@ COMMENT= IPv4LL network address configuration daemon LIB_DEPENDS= avahi-common.3:${PORTSDIR}/net/avahi-app +USERS= avahi-autoipd +GROUPS= ${USERS} + MASTERDIR= ${.CURDIR}/../avahi-app BUILD_WRKSRC= ${WRKSRC}/avahi-autoipd INSTALL_WRKSRC= ${BUILD_WRKSRC} @@ -25,6 +28,5 @@ AVAHI_SLAVE= autoipd MAN8= avahi-autoipd.8 USE_GNOME= gnomehack ltverhack intltool -PKGINSTALL= ${.CURDIR}/pkg-install .include "${MASTERDIR}/Makefile" diff --git a/net/avahi-autoipd/pkg-install b/net/avahi-autoipd/pkg-install deleted file mode 100644 index bcc892b76356..000000000000 --- a/net/avahi-autoipd/pkg-install +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -case $2 in -POST-INSTALL) - USER=avahi-autoipd - GROUP=${USER} - UID=588 - GID=${UID} - PW=/usr/sbin/pw - - 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 "/nonexistent" -s /sbin/nologin -c "Avahi Autoipd Daemon User" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi - exit 0 - ;; -esac |