4 files changed, 25 insertions, 29 deletions

diff --git a/mail/drac/Makefile b/mail/drac/Makefile
index 4fe7bd1bf3c7..61e8d8c886d5 100644
--- a/mail/drac/Makefile
+++ b/mail/drac/Makefile
@@ -7,16 +7,17 @@
 
 PORTNAME=	drac
 PORTVERSION=	1.12
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cc.umanitoba.ca/src/ \
+		ftp://ftp.parodius.com/pub/umanitoba/ \
 		http://atreides.freenix.no/~anders/ \
 		ftp://totem.fix.no/pub/mirrors/misc/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Dynamic Relay Authorization Control, a pop-before-smtp implementation
+MAINTAINER=	koitsu@FreeBSD.org
+COMMENT=	Dynamic Relay Authorization Control, a POP-before-SMTP implementation
 
 .if defined(WITH_POSTFIX_DB3)
 LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
@@ -63,7 +64,4 @@ do-install:
 	@${INSTALL_MAN} ${WRKSRC}/rpc.dracd.1m ${PREFIX}/man/man1/rpc.dracd.1
 .endif
 
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
 .include <bsd.port.post.mk>
diff --git a/mail/drac/files/dracd.sh.in b/mail/drac/files/dracd.sh.in
index 9a8d3d6a1b99..341c90cf6aca 100644
--- a/mail/drac/files/dracd.sh.in
+++ b/mail/drac/files/dracd.sh.in
@@ -1,20 +1,17 @@
 #!/bin/sh
 # $FreeBSD$
-
+#
 # PROVIDE: dracd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
-
-# Define these dracd_* variables in one of these files:
-#       /etc/rc.conf
-#       /etc/rc.conf.local
-#       /etc/rc.conf.d/dracd
 #
-# DO NOT CHANGE THESE DEFAULT VALUES HERE
+# Add the following lines to /etc/rc.conf to enable postfix:
+# dracd_enable (bool):		Set it to "YES" to enable rpc.dracd.
+#				Default is "NO".
+# dracd_flags (str):		Set to "" by default.
+#                               Extra flags passed to rpc.dracd.
 #
-dracd_enable=${dracd_enable-"NO"}
-dracd_flags=${dracd_flags-""}
 
 . %%RC_SUBR%%
 
@@ -23,4 +20,10 @@ rcvar=`set_rcvar`
 command="%%PREFIX%%/sbin/rpc.dracd"
 
 load_rc_config $name
+
+: ${dracd_enable="NO"}
+: ${dracd_flags=""}
+
+required_files="%%PREFIX%%/etc/dracd.allow"
+
 run_rc_command "$1"
diff --git a/mail/drac/pkg-descr b/mail/drac/pkg-descr
index 91bbb459faac..b130738d70a9 100644
--- a/mail/drac/pkg-descr
+++ b/mail/drac/pkg-descr
@@ -1,12 +1,12 @@
 DRAC is a daemon that dynamically updates a relay authorization map for
-Sendmail, Postfix and other MTA's that supports it. It provides a way to allow
-legitimate users to relay mail through an SMTP server, while still preventing
-others from using it as a spam relay. User's IP addresses are added to the map
-immediately after they have authenticated to the POP or IMAP server. By
-default, map entries expire after 30 minutes, but can be renewed by additional
-authentication. Periodically checking mail on a POP server is sufficient to do
-this. The POP and SMTP servers can be on different hosts.
+Sendmail, Postfix and other MTAs that support it.  It provides a way for
+legitimate users to relay mail through an SMTP server, while preventing
+non-authorized users from using it as a spam relay. Authenticated users
+have their IP address added to the map immediately after they have
+authenticated via POP, IMAP, or any other daemon which supports the
+DRAC API. By default, map entries expire after 30 minutes, but can be
+renewed by additional authentication. Periodically checking mail on a
+POP server sufficiently does this. DRAC does not require that the
+POP/IMAP and SMTP server be on the same physical host.
 
 WWW: http://mail.cc.umanitoba.ca/drac/
-
-- Anders Nordby <anders@fix.no>
diff --git a/mail/drac/pkg-message b/mail/drac/pkg-message
deleted file mode 100644
index 91f4a296c1c4..000000000000
--- a/mail/drac/pkg-message
+++ /dev/null
@@ -1,5 +0,0 @@
-
-===>  COMPATIBILITY NOTE:
-      The "drac_flags" rc.conf(5) variable has been renamed to "dracd_flags".
-      Please be sure to update your rc.conf(5) if necessary.
-