From f8408b8bd28d68095a62ee8ee726e57ebd2bcd98 Mon Sep 17 00:00:00 2001 From: sheldonh Date: Thu, 12 Sep 2002 10:09:02 +0000 Subject: I agree with the Exim community that the exim-4.xx has reached production quality. Move exim to exim-old for folks who need exim-3.xx, because the configuration file for exim-4.xx is not backward compatible. Move exim-devel to exim, removing NO_LATEST_LINK: repo-copy exim -> exim-old copy over exim-devel -> exim retire exim-devel Slave ports are intended for use with the exim port, as before, so they now build and install for exim-4.xx. --- mail/exim/pkg-install | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'mail/exim/pkg-install') diff --git a/mail/exim/pkg-install b/mail/exim/pkg-install index 69539a8c560f..40ad765f2fcf 100644 --- a/mail/exim/pkg-install +++ b/mail/exim/pkg-install @@ -13,19 +13,16 @@ PKG_PREFIX=${PKG_PREFIX:=/usr/local} -uid=26 -gid=6 user=mailnull group=mail if [ "$2" = "PRE-INSTALL" ]; then - # uid=26(mailnull) gid=26(mailnull) groups=26(mailnull) - if ! /usr/bin/id ${uid} | /usr/bin/grep -q "uid=${uid}(${user})"; then - echo "Exim requires user ${user} (UID ${uid}). Please update your system." 1>&2 + if ! /usr/bin/id ${user} > /dev/null; then + echo "Exim requires user ${user}. Please update your system." 1>&2 exit 1 fi - if ! /usr/bin/grep -q "^${group}:[^:]*:${gid}:" < /etc/group; then - echo "Exim requires group ${group} (GID ${gid}). Please update your system." 1>&2 + if ! /usr/bin/grep -q "^${group}:" < /etc/group; then + echo "Exim requires group ${group}. Please update your system." 1>&2 exit 1 fi fi -- cgit