9 files changed, 293 insertions, 452 deletions

diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index c9066c4cff9d..3fa1bd7e80e6 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	courier
-PORTVERSION=	0.37.2
-PORTREVISION=	0
+PORTVERSION=	0.37.2.20020125
 CATEGORIES=	mail ipv6
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	http://www.courier-mta.org/beta/%SUBDIR%/ \
+		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
 
 MAINTAINER=	yds@CoolRat.org
 
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
+RUN_DEPENDS=	${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
 
 #
 # User-serviceable variables
@@ -22,16 +23,16 @@ RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/CIDR.pm:${PORTSDIR
 # [ There's no need to add trailing ``/''s ]
 #
 # set IMAGEURL to where on the web server URL the images are found
-# set CACHEOWNER to who you'd like to own the cache files
+# set CACHEOWN to who you'd like to own the cache files
 # set MAILDROPDEFAULT to what you'd like the $DEFAULT in maildrop to be
 #     recomended values are: /var/mail, ./Mailbox or ./Maildir
 #
 IMAGEURL?=	/webmail
-CACHEOWNER?=	pop
+CACHEOWN?=	pop
 MAILDROPDEFAULT?=./Maildir
 # End of user-serviceable variables
-MAILUSER=	courier
-MAILGROUP=	courier
+MAILOWN=	courier
+MAILGRP=	courier
 MAILUID=	62
 MAILGID=	62
 ETCDIR=		${PREFIX}/etc
@@ -47,6 +48,7 @@ MIMETYPES=	${LOCALBASE}/etc/apache/mime.types
 IS_INTERACTIVE=	yes
 .endif
 
+USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
 USE_LIBTOOL=	yes
@@ -55,8 +57,8 @@ USE_AUTOMAKE_VER=14
 USE_AUTOCONF_VER=213
 CONFIGURE_ARGS=	--disable-root-check --with-db=db \
 		--enable-syslog=1 --enable-use-flock \
-		--with-mailuser=${MAILUSER} \
-		--with-mailgroup=${MAILGROUP} \
+		--with-mailuser=${MAILOWN} \
+		--with-mailgroup=${MAILGRP} \
 		--with-mailuid=${MAILUID} \
 		--with-mailgid=${MAILGID} \
  		--with-etcdir=${ETCDIR} \
@@ -68,7 +70,7 @@ CONFIGURE_ARGS=	--disable-root-check --with-db=db \
 		--enable-mimetypes=${MIMETYPES} \
 		--enable-imageurl=${IMAGEURL} \
 		--with-cachedir=${CACHEDIR} \
-		--with-cacheowner=${CACHEOWNER} \
+		--with-cacheowner=${CACHEOWN} \
 		--with-calendardir=${CALENDIR} \
 		--with-default-maildrop=${MAILDROPDEFAULT} \
 		--enable-workarounds-for-imap-client-bugs
@@ -86,7 +88,10 @@ PKGMESSAGE=	${WRKDIR}/.PKGMESSAGE
 
 INSTALL_TARGET=	install-strip install-perms
 
-PLIST_SUB+=	CACHEOWNER="${CACHEOWNER}"
+PLIST_SUB+=	BINOWN="${BINOWN}" BINGRP="${BINGRP}" \
+		MAILOWN="${MAILOWN}" MAILGRP="${MAILGRP}" \
+		MAILUID="${MAILUID}" MAILGID="${MAILGID}" \
+		CACHEOWN="${CACHEOWN}"
 
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 		TOUCH="${TOUCH}" \
@@ -94,9 +99,10 @@ SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
 
 .include "${.CURDIR}/Makefile.man"
 .include "${.CURDIR}/Makefile.doc"
+.include "${.CURDIR}/Makefile.own"
 
 pre-everything::
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.courier
+	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.${PORTNAME}
 
 .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
 .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
@@ -109,7 +115,7 @@ post-patch:
 	@${PERL} -pi -e 's:^(TLS_CERTFILE=)\@datadir\@:$$1\@sysconfdir\@:g;' \
 		${WRKSRC}/*/*.dist.in \
 		${WRKSRC}/*/*/*.dist.in
-	@${PERL} -pi -e 's:^(RANDFILE = )\@datadir\@:$$1\@sysconfdir\@:g;' \
+	@${PERL} -pi -e 's:^(RANDFILE = )\@datadir\@\S+:$$1\@sysconfdir\@/random.tmp:g;' \
 		${WRKSRC}/*/*.cnf.in \
 		${WRKSRC}/*/*/*.cnf.in
 
@@ -155,12 +161,15 @@ post-install:
 	@${INSTALL_DATA} /dev/null ${SYSCONFDIR}/locallowercase
 	@${INSTALL_SCRIPT} ${FILESDIR}/courier.sh ${PREFIX}/etc/rc.d
 	@${INSTALL_DATA} ${WRKDIR}/crontab ${PREFIX}/etc/courier/
+.for file in ${OWNER0}
+	@${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/${file}
+.endfor
 	@${GREP} '^@exec ' ${TMPPLIST} \
 		| ${SED} -e 's:^@exec ::' -e 's:%D:${PREFIX}:g' \
 		> ${WRKDIR}/.PLIST.exec \
 		&& ${SH} ${WRKDIR}/.PLIST.exec
 .if !defined(NOPORTDOCS)
-	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} ${DOCSDIR}/html
+	@${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} ${DOCSDIR}/html
 	@${INSTALL_DATA} ${DATADIR}/htmldoc/* ${DOCSDIR}/html
 .for file in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
@@ -170,8 +179,8 @@ post-install:
 	@for F in ${MANPREFIX}/man/man[1-9ln]/*; \
 		do ${CHMOD} ${MANMODE} $$F; \
 	done
-	@${CHOWN} -R ${MANOWN}:${MANGRP} ${MANPREFIX}/man/man[1-9ln]
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
+	@${CHOWN} -Rh ${MANOWN}:${MANGRP} ${MANPREFIX}/man/man[1-9ln]
+	@${CHOWN} -Rh ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 	@${CHMOD} -R a-w ${DATADIR}
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/mail/courier/Makefile.own b/mail/courier/Makefile.own
new file mode 100644
index 000000000000..faf3268d9d37
--- /dev/null
+++ b/mail/courier/Makefile.own
@@ -0,0 +1,128 @@
+OWNER0=	bin/courier-config \
+	bin/couriermlm \
+	bin/couriertls \
+	bin/deliverquota \
+	bin/dotforward \
+	bin/dotlock \
+	bin/imapd \
+	bin/mailbot \
+	bin/maildirmake \
+	bin/makemime \
+	bin/mimegpg \
+	bin/preline \
+	bin/reformail \
+	bin/reformime \
+	bin/sendmail \
+	bin/testmxlookup \
+	etc/courier/courierd.dist \
+	etc/courier/enablefiltering \
+	etc/courier/esmtp.authpam \
+	etc/courier/esmtpd-msa.dist \
+	etc/courier/esmtpd-ssl.dist \
+	etc/courier/esmtpd.cnf \
+	etc/courier/esmtpd.dist \
+	etc/courier/imapd-ssl.dist \
+	etc/courier/imapd.authpam \
+	etc/courier/imapd.cnf \
+	etc/courier/imapd.dist \
+	etc/courier/ldapaddressbook.dist \
+	etc/courier/locallowercase \
+	etc/courier/maildrop \
+	etc/courier/maildropfilter \
+	etc/courier/pop3d-ssl.dist \
+	etc/courier/pop3d.authpam \
+	etc/courier/pop3d.cnf \
+	etc/courier/pop3d.dist \
+	etc/courier/quotawarnmsg.example \
+	etc/courier/rfcerr2045.txt \
+	etc/courier/rfcerr2046.txt \
+	etc/courier/rfcerr2047.txt \
+	etc/courier/rfcerrheader.txt \
+	etc/courier/smtpaccess/default \
+	etc/courier/webmail.authpam \
+	libexec/authlib/authdaemon \
+	libexec/authlib/authdaemond \
+	libexec/authlib/authdaemond.plain \
+	libexec/authlib/changepwd/authdaemon.passwd \
+	libexec/courier/courierpop3d \
+	libexec/courier/courierpop3login \
+	libexec/courier/imaplogin \
+	libexec/courier/makedatprog \
+	libexec/courier/modules/esmtp/authend \
+	libexec/courier/modules/local/courierdeliver \
+	libexec/courier/modules/local/courierlocal \
+	libexec/courier/modules/modules.ctl \
+	libexec/courier/pcpd \
+	libexec/courier/webmail/webadmin \
+	libexec/courier/webmail/webmail \
+	libexec/filters/dupfilter \
+	libexec/filters/perlfilter \
+	sbin/courier \
+	sbin/couriertcpd \
+	sbin/logger \
+	sbin/showconfig \
+	sbin/userdbpw
+OWNER0=	bin/courier-config \
+	bin/couriermlm \
+	bin/couriertls \
+	bin/deliverquota \
+	bin/dotforward \
+	bin/dotlock \
+	bin/imapd \
+	bin/mailbot \
+	bin/maildirmake \
+	bin/makemime \
+	bin/mimegpg \
+	bin/preline \
+	bin/reformail \
+	bin/reformime \
+	bin/sendmail \
+	bin/testmxlookup \
+	etc/courier/courierd.dist \
+	etc/courier/enablefiltering \
+	etc/courier/esmtp.authpam \
+	etc/courier/esmtpd-msa.dist \
+	etc/courier/esmtpd-ssl.dist \
+	etc/courier/esmtpd.cnf \
+	etc/courier/esmtpd.dist \
+	etc/courier/imapd-ssl.dist \
+	etc/courier/imapd.authpam \
+	etc/courier/imapd.cnf \
+	etc/courier/imapd.dist \
+	etc/courier/ldapaddressbook.dist \
+	etc/courier/locallowercase \
+	etc/courier/maildrop \
+	etc/courier/maildropfilter \
+	etc/courier/pop3d-ssl.dist \
+	etc/courier/pop3d.authpam \
+	etc/courier/pop3d.cnf \
+	etc/courier/pop3d.dist \
+	etc/courier/quotawarnmsg.example \
+	etc/courier/rfcerr2045.txt \
+	etc/courier/rfcerr2046.txt \
+	etc/courier/rfcerr2047.txt \
+	etc/courier/rfcerrheader.txt \
+	etc/courier/smtpaccess/default \
+	etc/courier/webmail.authpam \
+	libexec/authlib/authdaemon \
+	libexec/authlib/authdaemond \
+	libexec/authlib/authdaemond.plain \
+	libexec/authlib/changepwd/authdaemon.passwd \
+	libexec/courier/courierpop3d \
+	libexec/courier/courierpop3login \
+	libexec/courier/imaplogin \
+	libexec/courier/makedatprog \
+	libexec/courier/modules/esmtp/authend \
+	libexec/courier/modules/local/courierdeliver \
+	libexec/courier/modules/local/courierlocal \
+	libexec/courier/modules/modules.ctl \
+	libexec/courier/pcpd \
+	libexec/courier/webmail/webadmin \
+	libexec/courier/webmail/webmail \
+	libexec/filters/dupfilter \
+	libexec/filters/perlfilter \
+	sbin/courier \
+	sbin/couriertcpd \
+	sbin/logger \
+	sbin/showconfig \
+	sbin/userdbpw
diff --git a/mail/courier/distinfo b/mail/courier/distinfo
index 36510f0ef01e..6f6a52f8edbd 100644
--- a/mail/courier/distinfo
+++ b/mail/courier/distinfo
@@ -1 +1 @@
-MD5 (courier-0.37.2.tar.gz) = f7935e8152477a9f4625f982533e15ec
+MD5 (courier-0.37.2.20020125.tar.gz) = 5b53d96297648570883137ddff31da7c
diff --git a/mail/courier/files/courier.sh b/mail/courier/files/courier.sh
index 042be9f3891d..fe9339f99765 100644
--- a/mail/courier/files/courier.sh
+++ b/mail/courier/files/courier.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/courier/files/Attic/courier.sh,v 1.1 2002-01-15 06:17:27 dwhite Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/courier/files/Attic/courier.sh,v 1.2 2002-01-30 03:56:09 pat Exp $
 #
 # This is the ${PREFIX}/etc/rc.d file for Courier SMTP, IMAP and POP3 servers
 #
@@ -124,6 +124,19 @@ start)	# First time after install create aliases.dat and makesmtpaccess.dat
 		esac
 	fi
 
+	ESMTPDSSLSTART=""
+	if [ -f ${sysconfdir}/esmtpd-ssl ]; then
+		. ${sysconfdir}/esmtpd-ssl
+		case $ESMTPDSSLSTART in
+		[Yy]*)
+			if [ -x $COURIERTLS \
+			  -a -x ${sbindir}/esmtpd-ssl ]; then
+				${sbindir}/esmtpd-ssl start && echo -n " esmtpd-ssl"
+			fi
+			;;
+		esac
+	fi
+
 	IMAPDSTART=""
 	if [ -f ${sysconfdir}/imapd ]; then
 		. ${sysconfdir}/imapd
@@ -203,10 +216,14 @@ stop)	# kill courier services in the reverse order of starting them
 		${sbindir}/imapd stop && echo -n " imapd"
 	fi
 
+	if [ -x ${sbindir}/esmtpd-ssl ]; then
+		${sbindir}/esmtpd-ssl stop && echo -n " esmtpd-ssl"
+	fi
+
 	if [ -x ${sbindir}/esmtpd-msa ]; then
 		${sbindir}/esmtpd-msa stop && echo -n " esmtpd-msa"
 	fi
-	
+
 	if [ -x ${sbindir}/esmtpd ]; then
 		${sbindir}/esmtpd stop && echo -n " esmtpd"
 	fi
diff --git a/mail/courier/files/patch-courier_perms.sh.in b/mail/courier/files/patch-courier_perms.sh.in
index 5ac440504092..fd757b9c8db5 100644
--- a/mail/courier/files/patch-courier_perms.sh.in
+++ b/mail/courier/files/patch-courier_perms.sh.in
@@ -1,302 +1,36 @@
 --- courier/perms.sh.in.orig	Fri Dec  7 08:37:35 2001
-+++ courier/perms.sh.in	Mon Jan 21 18:46:38 2002
-@@ -10,9 +10,7 @@
++++ courier/perms.sh.in	Sun Jan 27 23:12:48 2002
+@@ -10,9 +10,6 @@
  exec_prefix="@exec_prefix@"
  
  PERMS="
 -.			755
 -
 -@localstatedir@		755	x	bin	bin
-+@localstatedir@		755	x	root	wheel
  @localstatedir@/tmp	770
  @localstatedir@/msgs	750
  @localstatedir@/msgq	750
-@@ -41,120 +39,125 @@
+@@ -41,7 +38,6 @@
  @sysconfdir@/rfcerr2046.txt	444	config
  @sysconfdir@/rfcerr2047.txt	444	config
  
 -@libexecdir@		755	x	bin	bin
--@libexecdir@/authlib	755	x	bin	bin
--@libexecdir@/courier	755	x	bin	bin
--@libexecdir@/courier/modules	755	x	bin	bin
--@libexecdir@/courier/modules/modules.ctl	444	x	bin	bin
-+@libexecdir@/authlib			755	x	root	wheel
-+@libexecdir@/courier			755	x	root	wheel
-+@libexecdir@/courier/modules		755	x	root	wheel
-+@libexecdir@/courier/modules/dsn	755	x	root	wheel
-+@libexecdir@/courier/modules/esmtp	755	x	root	wheel
-+@libexecdir@/courier/modules/esmtp/authend 555	x	root	wheel
-+@libexecdir@/courier/modules/local	755	x	root	wheel
-+@libexecdir@/courier/modules/local/courierdeliver 555 x	root	wheel
-+@libexecdir@/courier/modules/local/courierlocal 555 x	root	wheel
-+@libexecdir@/courier/modules/modules.ctl 444	x	root	wheel
- @libexecdir@/courier/submitmkdir	4550
--@libexecdir@/courier/courierd	550
--@libexecdir@/courier/courierpop3d	555
--@libexecdir@/courier/courierpop3login	555
-+@libexecdir@/courier/courierd		550
-+@libexecdir@/courier/courierpop3d	555	x	root	wheel
-+@libexecdir@/courier/courierpop3login	555	x	root	wheel
- @libexecdir@/courier/aliasexp		550
- @libexecdir@/courier/aliascombine	550
- @libexecdir@/courier/aliascreate	550
- @libexecdir@/courier/submit		550
--@libexecdir@/courier/makedatprog	555
--@libexecdir@/courier/imaplogin		555	x	bin	bin
--@libexecdir@/courier/pcpd		555	x	bin	bin
--@libexecdir@/courier/webmail		700	x	root	bin
--@libexecdir@/courier/webmail/webmail	4555	x	root	bin
--@libexecdir@/courier/webmail/webadmin	4555	x	root	bin
--
+ @libexecdir@/authlib	755	x	bin	bin
+ @libexecdir@/courier	755	x	bin	bin
+ @libexecdir@/courier/modules	755	x	bin	bin
+@@ -61,7 +57,6 @@
+ @libexecdir@/courier/webmail/webmail	4555	x	root	bin
+ @libexecdir@/courier/webmail/webadmin	4555	x	root	bin
+ 
 -@sbindir@			755	x	bin	bin
--@sbindir@/courier		555
--@sbindir@/showconfig		555
-+@libexecdir@/courier/makedatprog	555	x	root	wheel
-+@libexecdir@/courier/imaplogin		555	x	root	wheel
-+@libexecdir@/courier/pcpd		555	x	root	wheel
-+@libexecdir@/courier/webmail		700	x	root	wheel
-+@libexecdir@/courier/webmail/webmail	4555	x	root	wheel
-+@libexecdir@/courier/webmail/webadmin	4555	x	root	wheel
-+@libexecdir@/filters			755	x	root	wheel
-+@libexecdir@/filters/dupfilter		555	x	root	wheel
-+@libexecdir@/filters/perlfilter		555	x	root	wheel
-+
-+@sbindir@/courier		555	x	root	wheel
-+@sbindir@/showconfig		555	x	root	wheel
+ @sbindir@/courier		555
+ @sbindir@/showconfig		555
  @sbindir@/showmodules		550
--@sbindir@/userdbpw		555
--@sbindir@/couriertcpd		555
--@sbindir@/logger		555
--@sbindir@/imapd			555
--@sbindir@/imapd-ssl		555
--@datadir@/imapd			555	x	bin	bin
--@datadir@/imapd-ssl		555	x	bin	bin
-+@sbindir@/userdbpw		555	x	root	wheel
-+@sbindir@/couriertcpd		555	x	root	wheel
-+@sbindir@/logger		555	x	root	wheel
-+@sbindir@/imapd			555	x	root	wheel
-+@sbindir@/imapd-ssl		555	x	root	wheel
-+@datadir@/imapd			555	x	root	wheel
-+@datadir@/imapd-ssl		555	x	root	wheel
+@@ -73,7 +68,6 @@
+ @datadir@/imapd			555	x	bin	bin
+ @datadir@/imapd-ssl		555	x	bin	bin
  
 -@bindir@			755	x	bin	bin
  @bindir@/cancelmsg		6555
--@bindir@/courier-config		555
--@bindir@/mailq			2555
--@bindir@/maildirmake		555
--@bindir@/sendmail		4511	x	root
--@bindir@/rmail			4511	x	root
--@bindir@/dotlock		555
--@bindir@/deliverquota		555
--@bindir@/mailbot		555
--@bindir@/makemime		555
--@bindir@/reformail		555
--@bindir@/reformime		555
--@bindir@/mimegpg		555
--@bindir@/couriermlm		555
--@bindir@/dotforward		555
--
--@datadir@/makedat		555	x	bin	bin
--@bindir@/makedat		555
--@bindir@/testmxlookup		555
--@bindir@/imapd			555
--@datadir@/makealiases		550
--@sbindir@/makealiases		550
--@datadir@/makehosteddomains	555
--@sbindir@/makehosteddomains	555
--@datadir@/pop3d			755
--@sbindir@/pop3d			755
--@datadir@/pop3d-ssl		755
--@sbindir@/pop3d-ssl		755
--@datadir@/makeuserdb		555
--@sbindir@/makeuserdb		555
--@datadir@/webgpg		555
--@sbindir@/webgpg		555
--@datadir@/userdb		555
--@sbindir@/userdb		555
--@datadir@/pw2userdb		555
--@sbindir@/pw2userdb		555
--@datadir@/vchkpw2userdb		555
--@sbindir@/vchkpw2userdb		555
--
--@datadir@			755	x	bin	bin
--@datadir@/courierctl.start	555
--
--@datadir@/mkimapdcert		755
--@sbindir@/mkimapdcert		755
--@datadir@/mkpop3dcert		755
--@sbindir@/mkpop3dcert		755
--@datadir@/couriermlm		755
--
--@datadir@/couriermlm/adminrequest.tmpl	644
--@datadir@/couriermlm/confsubj.tmpl	644
--@datadir@/couriermlm/digestsubj.tmpl	644
--@datadir@/couriermlm/fetch.tmpl	644
--@datadir@/couriermlm/fetchsubj.tmpl	644
--@datadir@/couriermlm/help.tmpl	644
--@datadir@/couriermlm/idxsubject.tmpl	644
--@datadir@/couriermlm/idxheaderhtml.tmpl	644
--@datadir@/couriermlm/idxheader2html.tmpl 644
--@datadir@/couriermlm/idxheadertxt.tmpl	644
--@datadir@/couriermlm/modrejbody.tmpl	644
--@datadir@/couriermlm/modreject.tmpl	644
--@datadir@/couriermlm/modrejheader.tmpl	644
--@datadir@/couriermlm/modsubject.tmpl	644
--@datadir@/couriermlm/modtext.tmpl	644
--@datadir@/couriermlm/modtext2.tmpl	644
--@datadir@/couriermlm/sub.tmpl	644
--@datadir@/couriermlm/sub2.tmpl	644
--@datadir@/couriermlm/sub3.tmpl	644
--@datadir@/couriermlm/sub4.tmpl	644
--@datadir@/couriermlm/sub5.tmpl	644
--@datadir@/couriermlm/subreportfooter.tmpl	644
--@datadir@/couriermlm/subreporthdr.tmpl 644
--@datadir@/couriermlm/subreporthdr1.tmpl 644
--@datadir@/couriermlm/subreporthdr2.tmpl 644
--@datadir@/couriermlm/subreporthdr3.tmpl 644
--@datadir@/couriermlm/unsub.tmpl	644
--@datadir@/couriermlm/unsub2.tmpl	644
--@datadir@/couriermlm/unsub3.tmpl	644
--@datadir@/couriermlm/warn1headers.tmpl	644
--@datadir@/couriermlm/warn1text.tmpl	644
--@datadir@/couriermlm/warn1text2.tmpl	644
--@datadir@/couriermlm/warn2msg.tmpl	644
-+@bindir@/courier-config		555	x	root	wheel
-+@bindir@/mailq			2555	x	root
-+@bindir@/maildirmake		555	x	root	wheel
-+@bindir@/sendmail		4511	x	root	wheel
-+@bindir@/rmail			4511	x	root	wheel
-+@bindir@/dotlock		555	x	root	wheel
-+@bindir@/deliverquota		555	x	root	wheel
-+@bindir@/mailbot		555	x	root	wheel
-+@bindir@/makemime		555	x	root	wheel
-+@bindir@/reformail		555	x	root	wheel
-+@bindir@/reformime		555	x	root	wheel
-+@bindir@/mimegpg		555	x	root	wheel
-+@bindir@/couriermlm		555	x	root	wheel
-+@bindir@/dotforward		555	x	root	wheel
-+
-+@datadir@/makedat		555	x	root	wheel
-+@bindir@/makedat		555	x	root	wheel
-+@bindir@/testmxlookup		555	x	root	wheel
-+@bindir@/imapd			555	x	root	wheel
-+@datadir@/makealiases		555	x	root	wheel
-+@sbindir@/makealiases		555	x	root	wheel
-+@datadir@/makehosteddomains	555	x	root	wheel
-+@sbindir@/makehosteddomains	555	x	root	wheel
-+@datadir@/pop3d			555	x	root	wheel
-+@sbindir@/pop3d			555	x	root	wheel
-+@datadir@/pop3d-ssl		555	x	root	wheel
-+@sbindir@/pop3d-ssl		555	x	root	wheel
-+@datadir@/makeuserdb		555	x	root	wheel
-+@sbindir@/makeuserdb		555	x	root	wheel
-+@datadir@/webgpg		555	x	root	wheel
-+@sbindir@/webgpg		555	x	root	wheel
-+@datadir@/userdb		555	x	root	wheel
-+@sbindir@/userdb		555	x	root	wheel
-+@datadir@/pw2userdb		555	x	root	wheel
-+@sbindir@/pw2userdb		555	x	root	wheel
-+@datadir@/vchkpw2userdb		555	x	root	wheel
-+@sbindir@/vchkpw2userdb		555	x	root	wheel
-+
-+@datadir@/courierctl.start	555	x	root	wheel
-+
-+@datadir@/mkimapdcert		555	x	root	wheel
-+@sbindir@/mkimapdcert		555	x	root	wheel
-+@datadir@/mkpop3dcert		555	x	root	wheel
-+@sbindir@/mkpop3dcert		555	x	root	wheel
-+@datadir@/couriermlm		555	x	root	wheel
-+
-+@datadir@/couriermlm/adminrequest.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/confsubj.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/digestsubj.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/fetch.tmpl		444	x	root	wheel
-+@datadir@/couriermlm/fetchsubj.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/help.tmpl		444	x	root	wheel
-+@datadir@/couriermlm/idxsubject.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/idxheaderhtml.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/idxheader2html.tmpl 444	x	root	wheel
-+@datadir@/couriermlm/idxheadertxt.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/modrejbody.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/modreject.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/modrejheader.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/modsubject.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/modtext.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/modtext2.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/sub.tmpl		444	x	root	wheel
-+@datadir@/couriermlm/sub2.tmpl		444	x	root	wheel
-+@datadir@/couriermlm/sub3.tmpl		444	x	root	wheel
-+@datadir@/couriermlm/sub4.tmpl		444	x	root	wheel
-+@datadir@/couriermlm/sub5.tmpl		444	x	root	wheel
-+@datadir@/couriermlm/subreportfooter.tmpl 444	x	root	wheel
-+@datadir@/couriermlm/subreporthdr.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/subreporthdr1.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/subreporthdr2.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/subreporthdr3.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/unsub.tmpl		444	x	root	wheel
-+@datadir@/couriermlm/unsub2.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/unsub3.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/warn1headers.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/warn1text.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/warn1text2.tmpl	444	x	root	wheel
-+@datadir@/couriermlm/warn2msg.tmpl	444	x	root	wheel
- "
- 
- echo "$PERMS" | while read FILE MODE SPECIAL USER GROUP
-@@ -198,7 +201,7 @@
- 
- if test "$couriertls" != ""
- then
--   echo @bindir@/couriertls 555 bin bin
-+   echo @bindir@/couriertls 555 root wheel
- fi
- 
- if test "@HAVE_LDAP@" != 0
-@@ -207,23 +210,23 @@
- 	echo @sbindir@/courierldapaliasd 700 @mailuser@ @mailgroup@
- fi
- 
--echo @datadir@/sqwebmail/images 755 @mailuser@ @mailgroup@
-+echo @datadir@/sqwebmail/images 755 root wheel
- 
- for f in `cat ../webmail/images/filelist 2>/dev/null`
- do
--	echo @datadir@/sqwebmail/images/$f 444 @mailuser@ @mailgroup@
-+	echo @datadir@/sqwebmail/images/$f 444 root wheel
- done
- 
- . ../maildrop/uidgid
- 
--echo @bindir@/maildrop 4511 $uid @mailgroup@
-+echo @bindir@/maildrop 4511 $uid mail
- 
- sed 's:^:'@sysconfdir@/':;s/$/ 660 @mailuser@ @mailgroup@ config/' <../authlib/authconfiglist
- 
- for f in `cat ../authlib/installlist ../authlib/installlist.sh`
- do
- 	test -z "$f" && continue
--	echo @libexecdir@/authlib/$f 755 bin bin
-+	echo @libexecdir@/authlib/$f 555 root wheel
- done
- 
- . ../authlib/authdaemonrc
-@@ -240,16 +243,16 @@
- 
- . ../authlib/authpwdprogs
- 
--echo "@authchangepwdir@ 755 @mailuser@ @mailgroup@"
-+echo "@authchangepwdir@ 755 root wheel"
- for f in `echo $PWPROGS dummy`
- do
- 	test "$f" = "dummy" && continue
--	echo "@authchangepwdir@/$f 4555 root bin"
-+	echo "@authchangepwdir@/$f 4555 root wheel"
- done
- 
- for f in `echo $PWSCRIPTS dummy`
- do
- 	test "$f" = "dummy" && continue
- 	echo "@authchangepwdir@/$f 555 @mailuser@ @mailgroup@"
--	echo "@datadir@/$f 555 @mailuser@ @mailgroup@"
-+	echo "@datadir@/$f 555 root wheel"
- done
+ @bindir@/courier-config		555
+ @bindir@/mailq			2555
diff --git a/mail/courier/files/patch-courier_submit2.C b/mail/courier/files/patch-courier_submit2.C
deleted file mode 100644
index b1f049d253ba..000000000000
--- a/mail/courier/files/patch-courier_submit2.C
+++ /dev/null
@@ -1,26 +0,0 @@
---- courier/submit2.C.orig	Tue Jan 15 17:44:37 2002
-+++ courier/submit2.C	Mon Jan 21 15:38:40 2002
-@@ -777,6 +777,8 @@
- {
- int	is8bit=0, dorewrite=0, rwmode=0;
- const	char *mime=getenv("MIME");
-+const	char *q=getenv("BOFHACCEPT8BIT");
-+const	int accept8bit=(q && *q == '1' ? 1 : 0);
- unsigned	n;
- struct	stat	stat_buf;
- const char *rfcerr=NULL;
-@@ -800,12 +802,12 @@
- 		return (1);
- 	}
- 
--	if (rwrfcptr->rfcviolation & RFC2045_ERR8BITHEADER)
-+	if (!accept8bit && (rwrfcptr->rfcviolation & RFC2045_ERR8BITHEADER))
- 	{
- 		rfcerr= SYSCONFDIR "/rfcerr2047.txt";
- 		dorewrite=1;
-         }
--	else if (rwrfcptr->rfcviolation & RFC2045_ERR8BITCONTENT)
-+	else if (!accept8bit && (rwrfcptr->rfcviolation & RFC2045_ERR8BITCONTENT))
- 	{
- 		rfcerr= SYSCONFDIR "/rfcerr2045.txt";
- 		dorewrite=1;
diff --git a/mail/courier/pkg-install b/mail/courier/pkg-install
index 0e162f498b3a..3696864dd0bc 100644
--- a/mail/courier/pkg-install
+++ b/mail/courier/pkg-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/mail/courier/Attic/pkg-install,v 1.1 2002-01-15 06:17:26 dwhite Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/courier/Attic/pkg-install,v 1.2 2002-01-30 03:56:07 pat Exp $
 #
 
 PKG_PREFIX=${PKG_PREFIX:=/usr/local}
@@ -34,6 +34,20 @@ yesno() {
     done
 }
 
+replace() {
+    local orig repl
+    
+    orig=$1
+    repl=$2
+    if [ -e ${orig} ]; then
+        mv -f ${orig} ${orig}.OFF
+        chmod 0 ${orig}.OFF
+    fi
+    if [ -e ${repl} ]; then
+        ln -s ${repl} ${orig}
+    fi
+}
+
 if [ x"$2" = xPRE-INSTALL ]; then
     USER=courier;	UID=62
     GROUP=courier;	GID=62
@@ -68,20 +82,6 @@ if [ x"$2" = xPRE-INSTALL ]; then
     fi
 fi
 
-replace() {
-    local orig repl
-    
-    orig=$1
-    repl=$2
-    if [ -e ${orig} ]; then
-        mv -f ${orig} ${orig}.OFF
-        chmod 0 ${orig}.OFF
-    fi
-    if [ -e ${repl} ]; then
-        ln -s ${repl} ${orig}
-    fi
-}
-
 if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then
     if [ -x /sbin/sysctl ]; then
         OSVERSION=`/sbin/sysctl -n kern.osreldate`
diff --git a/mail/courier/pkg-message b/mail/courier/pkg-message
index c5fda3947ac9..09709bb4b30e 100644
--- a/mail/courier/pkg-message
+++ b/mail/courier/pkg-message
@@ -1,6 +1,5 @@
-			ATTENTION.........ATTENTION
 
-		RTFM before configuring and runnig Courier!!!
+		RTFM before configuring and running Courier!!!
 
 	Check and/or modify the following configuration files to
 	suit your needs:
@@ -12,6 +11,7 @@
 		%%PREFIX%%/etc/courier/courierd
 		%%PREFIX%%/etc/courier/esmtpd
 		%%PREFIX%%/etc/courier/esmtpd-msa
+		%%PREFIX%%/etc/courier/esmtpd-ssl
 		%%PREFIX%%/etc/courier/imapd
 		%%PREFIX%%/etc/courier/imapd-ssl
 		%%PREFIX%%/etc/courier/ldapaddressbook
diff --git a/mail/courier/pkg-plist b/mail/courier/pkg-plist
index c1e1e75a9d24..4097f506cfb2 100644
--- a/mail/courier/pkg-plist
+++ b/mail/courier/pkg-plist
@@ -1,14 +1,13 @@
-@exec pw groupshow courier || pw groupadd courier -g 62 -h -
-@exec pw user show courier || pw useradd courier -u 62 -g 62 -h - -d /var/spool/courier -s /sbin/nologin -c "Courier Mail System"
-@exec install -d -o courier -g courier -m 0755 %D/etc/courier/aliasdir
-@exec install -d -o courier -g courier -m 0750 %D/etc/courier/aliases
-@exec install -d -o root -g wheel -m 0755 %D/etc/courier/esmtpacceptmailfor.dir
-@exec install -d -o root -g wheel -m 0755 %D/etc/courier/esmtppercentrelay.dir
-@exec install -d -o courier -g courier -m 0750 %D/etc/courier/filters/active
-@exec install -d -o courier -g courier -m 0755 %D/etc/courier/smtpaccess
-@exec install -d -o courier -g courier -m 0700 %D/etc/courier/webadmin
-@exec install -d -o courier -g courier -m 0755 %D/etc/courier/webadmin/added
-@exec install -d -o courier -g courier -m 0755 %D/etc/courier/webadmin/removed
+@exec pw groupshow %%MAILGRP%% || pw groupadd %%MAILGRP%% -g %%MAILUID%% -h -
+@exec pw user show %%MAILOWN%% || pw useradd %%MAILOWN%% -u %%MAILUID%% -g %%MAILGID%% -h - -d /var/spool/courier -s /sbin/nologin -c "Courier Mail System"
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 %D/etc/courier/aliasdir
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 %D/etc/courier/aliases
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 %D/etc/courier/esmtpacceptmailfor.dir
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 %D/etc/courier/esmtppercentrelay.dir
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 %D/etc/courier/filters/active
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0755 %D/etc/courier/smtpaccess
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0700 %D/etc/courier/webadmin/added
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0700 %D/etc/courier/webadmin/removed
 @unexec %D/etc/rc.d/courier.sh stop 2>/dev/null || true
 @unexec rm -f %D/etc/courier/*.dat 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/authdaemonrc %D/etc/courier/authdaemonrc.dist && rm -f %D/etc/courier/authdaemonrc 2>/dev/null || true
@@ -17,6 +16,7 @@
 %%SUB_PGSQL%%@unexec cmp -s %D/etc/courier/authpgsqlrc %D/etc/courier/authpgsqlrc.dist && rm -f %D/etc/courier/authpgsqlrc 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/courierd %D/etc/courier/courierd.dist && rm -f %D/etc/courier/courierd 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/esmtpd-msa %D/etc/courier/esmtpd-msa.dist && rm -f %D/etc/courier/esmtpd-msa 2>/dev/null || true
+@unexec cmp -s %D/etc/courier/esmtpd-ssl %D/etc/courier/esmtpd-ssl.dist && rm -f %D/etc/courier/esmtpd-ssl 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/esmtpd %D/etc/courier/esmtpd.dist && rm -f %D/etc/courier/esmtpd 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/imapd-ssl %D/etc/courier/imapd-ssl.dist && rm -f %D/etc/courier/imapd-ssl 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/imapd %D/etc/courier/imapd.dist && rm -f %D/etc/courier/imapd 2>/dev/null || true
@@ -65,6 +65,7 @@ etc/courier/enablefiltering
 etc/courier/esmtp.authpam
 etc/courier/esmtpauthclient
 etc/courier/esmtpd-msa.dist
+etc/courier/esmtpd-ssl.dist
 etc/courier/esmtpd.cnf
 etc/courier/esmtpd.dist
 etc/courier/imapd-ssl.dist
@@ -92,19 +93,20 @@ etc/courier/rfcerrheader.txt
 etc/courier/smtpaccess/default
 etc/courier/webmail.authpam
 @exec [ -e /etc/aliases ] && ln -sf /etc/aliases %D/etc/courier/aliases/system
-@exec [ -f %D/etc/courier/authdaemonrc ] || cp -p %D/etc/courier/authdaemonrc.dist %D/etc/courier/authdaemonrc
-%%SUB_LDAP%%@exec [ -f %D/etc/courier/authldaprc ] || cp -p %D/etc/courier/authldaprc.dist %D/etc/courier/authldaprc
-%%SUB_MYSQL%%@exec [ -f %D/etc/courier/authmysqlrc ] || cp -p %D/etc/courier/authmysqlrc.dist %D/etc/courier/authmysqlrc
-%%SUB_PGSQL%%@exec [ -f %D/etc/courier/authpgsqlrc ] || cp -p %D/etc/courier/authpgsqlrc.dist %D/etc/courier/authpgsqlrc
-@exec [ -f %D/etc/courier/courierd ] || cp -p %D/etc/courier/courierd.dist %D/etc/courier/courierd
-@exec [ -f %D/etc/courier/esmtpd-msa ] || cp -p %D/etc/courier/esmtpd-msa.dist %D/etc/courier/esmtpd-msa
-@exec [ -f %D/etc/courier/esmtpd ] || cp -p %D/etc/courier/esmtpd.dist %D/etc/courier/esmtpd
-@exec [ -f %D/etc/courier/imapd-ssl ] || cp -p %D/etc/courier/imapd-ssl.dist %D/etc/courier/imapd-ssl
-@exec [ -f %D/etc/courier/imapd ] || cp -p %D/etc/courier/imapd.dist %D/etc/courier/imapd
-@exec [ -f %D/etc/courier/ldapaddressbook ] || cp -p %D/etc/courier/ldapaddressbook.dist %D/etc/courier/ldapaddressbook
-%%SUB_LDAP%%@exec [ -f %D/etc/courier/ldapaliasrc ] || cp -p %D/etc/courier/ldapaliasrc.dist %D/etc/courier/ldapaliasrc
-@exec [ -f %D/etc/courier/pop3d-ssl ] || cp -p %D/etc/courier/pop3d-ssl.dist %D/etc/courier/pop3d-ssl
-@exec [ -f %D/etc/courier/pop3d ] || cp -p %D/etc/courier/pop3d.dist %D/etc/courier/pop3d
+@exec [ -f %D/etc/courier/authdaemonrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/authdaemonrc.dist
+%%SUB_LDAP%%@exec [ -f %D/etc/courier/authldaprc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/authldaprc.dist
+%%SUB_MYSQL%%@exec [ -f %D/etc/courier/authmysqlrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/authmysqlrc.dist
+%%SUB_PGSQL%%@exec [ -f %D/etc/courier/authpgsqlrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/authpgsqlrc.dist
+@exec [ -f %D/etc/courier/courierd.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/courierd.dist
+@exec [ -f %D/etc/courier/esmtpd-msa.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/esmtpd-msa.dist
+@exec [ -f %D/etc/courier/esmtpd-ssl.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/esmtpd-ssl.dist
+@exec [ -f %D/etc/courier/esmtpd.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/esmtpd.dist
+@exec [ -f %D/etc/courier/imapd-ssl.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/imapd-ssl.dist
+@exec [ -f %D/etc/courier/imapd.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/imapd.dist
+@exec [ -f %D/etc/courier/ldapaddressbook.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/ldapaddressbook.dist
+%%SUB_LDAP%%@exec [ -f %D/etc/courier/ldapaliasrc.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/ldapaliasrc.dist
+@exec [ -f %D/etc/courier/pop3d-ssl.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/pop3d-ssl.dist
+@exec [ -f %D/etc/courier/pop3d.dist ] && %D/share/sysconftool/sysconftool %D/etc/courier/pop3d.dist
 @unexec rmdir %D/etc/courier/aliasdir 2>/dev/null || true
 @unexec rmdir %D/etc/courier/aliases 2>/dev/null || true
 @unexec rmdir %D/etc/courier/esmtpacceptmailfor.dir 2>/dev/null || true
@@ -167,6 +169,7 @@ sbin/courierfilter
 sbin/couriertcpd
 sbin/esmtpd
 sbin/esmtpd-msa
+sbin/esmtpd-ssl
 sbin/filterctl
 sbin/imapd
 sbin/imapd-ssl
@@ -268,6 +271,7 @@ share/courier/courierwebadmin/webadmin.pl
 share/courier/courierwebadmin/webadmin.pm
 @dirrm share/courier/courierwebadmin
 share/courier/esmtpd
+share/courier/esmtpd-ssl
 share/courier/filterctl
 share/courier/imapd
 share/courier/imapd-ssl
@@ -498,7 +502,7 @@ share/courier/webgpg
 %%PORTDOCS%%share/doc/courier/html/courierpop3d.html
 %%PORTDOCS%%share/doc/courier/html/couriertcpd.html
 %%PORTDOCS%%share/doc/courier/html/couriertls.html
-%%SUB_UUCP%%%%PORTDOCS%%share/doc/courier/html/courieruucp.html
+%%PORTDOCS%%%%SUB_UUCP%%share/doc/courier/html/courieruucp.html
 %%PORTDOCS%%share/doc/courier/html/deliverquota.html
 %%PORTDOCS%%share/doc/courier/html/dot-courier.html
 %%PORTDOCS%%share/doc/courier/html/dot-forward.html
@@ -557,93 +561,68 @@ share/courier/webgpg
 %%PORTDOCS%%share/doc/courier/html/userdbpw.html
 %%PORTDOCS%%@dirrm share/doc/courier/html
 %%PORTDOCS%%@dirrm share/doc/courier
-@exec chown courier:courier %D/bin/cancelmsg
-@exec chown root:mail %D/bin/maildrop
-@exec chown root:courier %D/bin/mailq
-@exec chown courier:courier %D/etc/courier
-@exec chown -Rh courier:courier %D/etc/courier/aliases
-@exec chown courier:courier %D/etc/courier/authdaemonrc.dist
-%%SUB_LDAP%%@exec chown root:wheel %D/etc/courier/authldaprc.dist
-@exec chown courier:courier %D/etc/courier/authmodulelist
-%%SUB_MYSQL%%@exec chown root:wheel %D/etc/courier/authmysqlrc.dist
-%%SUB_PGSQL%%@exec chown root:wheel %D/etc/courier/authpgsqlrc.dist
-@exec chown root:wheel %D/etc/courier/courierd.dist
-@exec chown courier:courier %D/etc/courier/dsndelayed.txt
-@exec chown courier:courier %D/etc/courier/dsndelivered.txt
-@exec chown courier:courier %D/etc/courier/dsnfailed.txt
-@exec chown courier:courier %D/etc/courier/dsnfooter.txt
-@exec chown courier:courier %D/etc/courier/dsnheader.txt
-@exec chown courier:courier %D/etc/courier/dsnrelayed.txt
-@exec chown courier:courier %D/etc/courier/dsnsubjectnotice.txt
-@exec chown courier:courier %D/etc/courier/dsnsubjectwarn.txt
-@exec chown root:wheel %D/etc/courier/enablefiltering
-@exec chown root:wheel %D/etc/courier/esmtp.authpam
-@exec chown courier:courier %D/etc/courier/esmtpauthclient
-@exec chown root:wheel %D/etc/courier/esmtpd-msa.dist
-@exec chown root:wheel %D/etc/courier/esmtpd.cnf
-@exec chown root:wheel %D/etc/courier/esmtpd.dist
-@exec chown root:wheel %D/etc/courier/imapd-ssl.dist
-@exec chown root:wheel %D/etc/courier/imapd.authpam
-@exec chown root:wheel %D/etc/courier/imapd.cnf
-@exec chown root:wheel %D/etc/courier/imapd.dist
-@exec chown root:wheel %D/etc/courier/ldapaddressbook.dist
-@exec chown root:wheel %D/etc/courier/locallowercase
-@exec chown root:wheel %D/etc/courier/maildrop
-@exec chown root:wheel %D/etc/courier/maildropfilter
-@exec chown courier:courier %D/etc/courier/module.dsn
-@exec chown courier:courier %D/etc/courier/module.esmtp
-@exec chown courier:courier %D/etc/courier/module.local
-%%SUB_UUCP%%@exec chown courier:courier %D/etc/courier/module.uucp
-@exec chown root:wheel %D/etc/courier/pop3d-ssl.dist
-@exec chown root:wheel %D/etc/courier/pop3d.authpam
-@exec chown root:wheel %D/etc/courier/pop3d.cnf
-@exec chown root:wheel %D/etc/courier/pop3d.dist
-@exec chown root:wheel %D/etc/courier/quotawarnmsg.example
-@exec chown root:wheel %D/etc/courier/rfcerr2045.txt
-@exec chown root:wheel %D/etc/courier/rfcerr2046.txt
-@exec chown root:wheel %D/etc/courier/rfcerr2047.txt
-@exec chown root:wheel %D/etc/courier/rfcerrheader.txt
-@exec chown root:wheel %D/etc/courier/smtpaccess/default
-@exec chown root:wheel %D/etc/courier/webmail.authpam     		
-@exec chown courier:courier %D/libexec/courier/aliascombine
-@exec chown courier:courier %D/libexec/courier/aliascreate
-@exec chown courier:courier %D/libexec/courier/aliasexp
-@exec chown courier:courier %D/libexec/courier/courierd
-@exec chown courier:courier %D/libexec/courier/modules/dsn/courierdsn
-@exec chown courier:courier %D/libexec/courier/modules/esmtp/addcr
-@exec chown root:wheel %D/libexec/courier/modules/esmtp/authend
-@exec chown root:courier %D/libexec/courier/modules/esmtp/authstart
-@exec chown courier:courier %D/libexec/courier/modules/esmtp/courieresmtp
-@exec chown courier:courier %D/libexec/courier/modules/esmtp/courieresmtpd
-%%SUB_UUCP%%@exec chown courier:courier %D/libexec/courier/modules/uucp/courieruucp
-@exec chown courier:courier %D/libexec/courier/submit
-@exec chown courier:courier %D/libexec/courier/submitmkdir
-@exec chown courier:courier %D/sbin/showmodules
-@exec install -d -o root -g wheel -m 0755 /var/spool/calendar
-@exec install -d -o %%CACHEOWNER%% -g courier -m 0700 /var/spool/calendar/localcache
-@exec install -d -o root -g courier -m 0750 /var/spool/calendar/private
-@exec install -d -o root -g courier -m 0755 /var/spool/calendar/public
-@exec install -d -o root -g wheel -m 0755 /var/spool/courier
-@exec install -d -o courier -g courier -m 0750 /var/spool/courier/allfilters
-@exec install -d -o courier -g courier -m 0770 /var/spool/courier/authdaemon
-@exec install -d -o courier -g courier -m 0750 /var/spool/courier/filters
-@exec install -d -o courier -g courier -m 0750 /var/spool/courier/msgq
-@exec install -d -o courier -g courier -m 0750 /var/spool/courier/msgs
-@exec install -d -o courier -g courier -m 0770 /var/spool/courier/tmp
-@exec install -d -o root -g wheel -m 0755 /var/spool/courier/tmp/broken
-@exec install -d -o %%CACHEOWNER%% -g mail -m 0700 /var/spool/webmail
-@exec crontab -u %%CACHEOWNER%% %D/etc/courier/crontab 2>/dev/null || true
-@unexec crontab -u %%CACHEOWNER%% -l 2>/dev/null || true
-@unexec crontab -u %%CACHEOWNER%% -r || true
-@unexec [ -d /var/spool/courier ] && chown -R courier:courier /var/spool/courier
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/bin/cancelmsg
+@exec chown %%BINOWN%%:mail %D/bin/maildrop
+@exec chown %%BINOWN%%:%%MAILGRP%% %D/bin/mailq
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier
+@exec chown -Rh %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/aliases
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/authdaemonrc.dist
+%%SUB_LDAP%%@exec chown %%BINOWN%%:%%BINGRP%% %D/etc/courier/authldaprc.dist
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/authmodulelist
+%%SUB_MYSQL%%@exec chown %%BINOWN%%:%%BINGRP%% %D/etc/courier/authmysqlrc.dist
+%%SUB_PGSQL%%@exec chown %%BINOWN%%:%%BINGRP%% %D/etc/courier/authpgsqlrc.dist
+@exec chown %%BINOWN%%:%%BINGRP%% %D/etc/courier/courierd.dist
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsndelayed.txt
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsndelivered.txt
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnfailed.txt
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnfooter.txt
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnheader.txt
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnrelayed.txt
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnsubjectnotice.txt
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/dsnsubjectwarn.txt
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/esmtpauthclient
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.dsn
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.esmtp
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.local
+%%SUB_UUCP%%@exec chown %%MAILOWN%%:%%MAILGRP%% %D/etc/courier/module.uucp
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliascombine
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliascreate
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/aliasexp
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/courierd
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/dsn/courierdsn
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/addcr
+@exec chown %%BINOWN%%:%%BINGRP%% %D/libexec/courier/modules/esmtp/authend
+@exec chown %%BINOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/authstart
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/courieresmtp
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/esmtp/courieresmtpd
+%%SUB_UUCP%%@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/modules/uucp/courieruucp
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/submit
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/libexec/courier/submitmkdir
+@exec chown %%MAILOWN%%:%%MAILGRP%% %D/sbin/showmodules
+@exec install -d -o %%BINOWN%% -g %%BINGRP%% -m 0755 /var/spool/calendar
+@exec install -d -o %%CACHEOWN%% -g %%MAILGRP%% -m 0700 /var/spool/calendar/localcache
+@exec install -d -o %%CACHEOWN%% -g %%MAILGRP%% -m 0750 /var/spool/calendar/private
+@exec install -d -o %%CACHEOWN%% -g %%MAILGRP%% -m 0755 /var/spool/calendar/public
+@exec install -d -o %%BINOWN%% -g %%BINGRP%% -m 0755 /var/spool/courier
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/allfilters
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0770 /var/spool/courier/authdaemon
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/filters
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/msgq
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0750 /var/spool/courier/msgs
+@exec install -d -o %%MAILOWN%% -g %%MAILGRP%% -m 0770 /var/spool/courier/tmp
+@exec install -c -o %%MAILOWN%% -g %%MAILGRP%% -m 0400 /dev/null /var/spool/courier/.noident
+@exec install -d -o %%CACHEOWN%% -g mail -m 0700 /var/spool/webmail
+@exec crontab -u %%CACHEOWN%% %D/etc/courier/crontab 2>/dev/null || true
+@unexec crontab -u %%CACHEOWN%% -l 2>/dev/null || true
+@unexec crontab -u %%CACHEOWN%% -r || true
+@unexec [ -d /var/spool/courier ] && chown -Rh %%MAILOWN%%:%%MAILGRP%% /var/spool/courier
 @unexec echo ""
 @unexec echo "Warning: Removing user courier will also delete any"
 @unexec echo "	 undelivered mail in the mail queue directories!!!"
 @unexec echo "	 Do not do it if you're upgrading and would like"
 @unexec echo "	 courier to continue trying to deliver this mail."
 @unexec echo ""
-@unexec rmuser courier 2>/dev/null || true
+@unexec rmuser %%MAILOWN%% 2>/dev/null || true
 @unexec [ -d /var/spool/courier ] && chown 0:0 /var/spool/courier 2>/dev/null || true
-@unexec [ -d /var/spool/courier/tmp/broken ] && chown 0:0 /var/spool/courier/tmp/broken 2>/dev/null || true
 @unexec rm -rf /var/spool/calendar 2>/dev/null || true
 @unexec rm -rf /var/spool/webmail 2>/dev/null || true