aboutsummaryrefslogtreecommitdiff
path: root/net/avahi-app
diff options
context:
space:
mode:
Diffstat (limited to 'net/avahi-app')
-rw-r--r--net/avahi-app/Makefile6
-rw-r--r--net/avahi-app/pkg-install36
2 files changed, 3 insertions, 39 deletions
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 7e3d2047265f..311a9a70cc8d 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -23,6 +23,9 @@ LIB_DEPENDS?= expat.6:${PORTSDIR}/textproc/expat2 \
gdbm.4:${PORTSDIR}/databases/gdbm
RUN_DEPENDS?= g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+USERS?= ${PORTNAME}
+GROUPS?= ${USERS}
+
USE_GNOME?= gnomehack ltverhack glib20 intltool
USE_GETTEXT= yes
USE_GNOME_SUBR= yes
@@ -170,8 +173,5 @@ avahi-post-install:
${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \
${LOCALBASE}/share/dbus-1/system-services
.endif
-.if !defined(PACKAGE_BUILDING) && (${AVAHI_SLAVE}=="no" || ${AVAHI_SLAVE}=="autoipd")
- @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
.include <bsd.port.post.mk>
diff --git a/net/avahi-app/pkg-install b/net/avahi-app/pkg-install
deleted file mode 100644
index 9bbd14bce237..000000000000
--- a/net/avahi-app/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
- USER=avahi
- GROUP=${USER}
- UID=558
- 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 Daemon User"
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- exit 1
- fi
- fi
- exit 0
- ;;
-esac