summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>1997-10-08 09:05:38 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>1997-10-08 09:05:38 +0000
commitdf857c712dfaaa8996653603bcc30ecc3a6c6a81 (patch)
treef701bc609aa8a3644fe4db2abe50b471cf5e1408 /mail
parent"${MKDIR} -p" -> "${MKDIR}". (diff)
Remove NO_PACKAGE and add pkg/REQ instead
Notes
Notes: svn path=/head/; revision=8179
Diffstat (limited to 'mail')
-rw-r--r--mail/popper/Makefile4
-rw-r--r--mail/popper/pkg-req12
-rw-r--r--mail/popper/scripts/pre-install4
-rw-r--r--mail/qpopper/Makefile4
-rw-r--r--mail/qpopper/pkg-req12
-rw-r--r--mail/qpopper/scripts/pre-install4
6 files changed, 30 insertions, 10 deletions
diff --git a/mail/popper/Makefile b/mail/popper/Makefile
index 55bb95303394..6949dbf279e1 100644
--- a/mail/popper/Makefile
+++ b/mail/popper/Makefile
@@ -3,7 +3,7 @@
# Date created: 1 April 1995
# Whom: pst
#
-# $Id: Makefile,v 1.16 1997/10/07 20:37:15 ache Exp $
+# $Id: Makefile,v 1.17 1997/10/07 20:55:49 ache Exp $
#
DISTNAME= qpopper2.4b2
@@ -19,8 +19,6 @@ MAINTAINER= pst@freebsd.org
# with APOP authentification only
#
-NO_PACKAGE= "Needs POP UID"
-
O_DEFS= -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \
-DAPOP='\"'${PREFIX}'/etc/popper/pop.auth\"' \
-DPOPUID='\"pop\"' \
diff --git a/mail/popper/pkg-req b/mail/popper/pkg-req
new file mode 100644
index 000000000000..62e0f233117f
--- /dev/null
+++ b/mail/popper/pkg-req
@@ -0,0 +1,12 @@
+if [ "$2" != "INSTALL" ]; then
+ exit 0
+fi
+if ! id -u pop > /dev/null 2>&1; then
+ echo "You need an account \"pop\" to install this package."
+ echo "Please add it by hand (try \"man vipw\") and try again."
+ echo ""
+ echo "An example passwd entry is:"
+ echo "pop:*:68:6::0:0:Post Office Owner:/nonexistent:/nonexistent"
+ echo ""
+ exit 1
+fi
diff --git a/mail/popper/scripts/pre-install b/mail/popper/scripts/pre-install
index b6cb9cfe0763..d3e1fef66350 100644
--- a/mail/popper/scripts/pre-install
+++ b/mail/popper/scripts/pre-install
@@ -3,8 +3,8 @@ if ! id -u pop > /dev/null 2>&1; then
echo "You need an account \"pop\" to install this package."
echo "Please add it by hand (try \"man vipw\") and try again."
echo ""
- echo "An example passwd entry (assuming uid 68 is available) is;"
- echo "pop:*:68:1::0:0:Post Office Owner:/nonexistent:/nonexistent"
+ echo "An example passwd entry is:"
+ echo "pop:*:68:6::0:0:Post Office Owner:/nonexistent:/nonexistent"
echo ""
exit 1
fi
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 55bb95303394..6949dbf279e1 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -3,7 +3,7 @@
# Date created: 1 April 1995
# Whom: pst
#
-# $Id: Makefile,v 1.16 1997/10/07 20:37:15 ache Exp $
+# $Id: Makefile,v 1.17 1997/10/07 20:55:49 ache Exp $
#
DISTNAME= qpopper2.4b2
@@ -19,8 +19,6 @@ MAINTAINER= pst@freebsd.org
# with APOP authentification only
#
-NO_PACKAGE= "Needs POP UID"
-
O_DEFS= -DSETPROCTITLE -DKEEP_TEMP_DROP -DBSD44_DBM -DBIND43 \
-DAPOP='\"'${PREFIX}'/etc/popper/pop.auth\"' \
-DPOPUID='\"pop\"' \
diff --git a/mail/qpopper/pkg-req b/mail/qpopper/pkg-req
new file mode 100644
index 000000000000..62e0f233117f
--- /dev/null
+++ b/mail/qpopper/pkg-req
@@ -0,0 +1,12 @@
+if [ "$2" != "INSTALL" ]; then
+ exit 0
+fi
+if ! id -u pop > /dev/null 2>&1; then
+ echo "You need an account \"pop\" to install this package."
+ echo "Please add it by hand (try \"man vipw\") and try again."
+ echo ""
+ echo "An example passwd entry is:"
+ echo "pop:*:68:6::0:0:Post Office Owner:/nonexistent:/nonexistent"
+ echo ""
+ exit 1
+fi
diff --git a/mail/qpopper/scripts/pre-install b/mail/qpopper/scripts/pre-install
index b6cb9cfe0763..d3e1fef66350 100644
--- a/mail/qpopper/scripts/pre-install
+++ b/mail/qpopper/scripts/pre-install
@@ -3,8 +3,8 @@ if ! id -u pop > /dev/null 2>&1; then
echo "You need an account \"pop\" to install this package."
echo "Please add it by hand (try \"man vipw\") and try again."
echo ""
- echo "An example passwd entry (assuming uid 68 is available) is;"
- echo "pop:*:68:1::0:0:Post Office Owner:/nonexistent:/nonexistent"
+ echo "An example passwd entry is:"
+ echo "pop:*:68:6::0:0:Post Office Owner:/nonexistent:/nonexistent"
echo ""
exit 1
fi