First cut at packaging the MTA and mailing list components of

courier-0.53.1 as mail/courier-mta.

The Courier mail transfer agent (MTA) is a modular multiprotocol mail
server that's designed to strike a balance between reasonable performance,
flexibility and features.

This package differs from traditional courier-mta packages in that
the webmail, imap/pop3, and maildrop components are not included
because they are supplied by the mail/sqwebmail, mail/courier-imap,
and mail/maildrop packages, respectively.  When Courier-MTA is installed
together with Courier-IMAP and SqWebMail, they form an integrated
mail/groupware server suite that provides ESMTP, IMAP, POP3, webmail,
and mailing list services within a single, consistent, framework.  A
web-based administration and configuration tool is included for
comprehensive configuration of the entire Courier software suite.

Many thanks to Yarema <yds@CoolRat.org> whose Courier port for FreeBSD
was an invaluable reference.

11 files changed, 493 insertions, 0 deletions

diff --git a/mail/courier-mta/patches/patch-aa b/mail/courier-mta/patches/patch-aa
new file mode 100644
index 00000000000..2b90850127e
--- /dev/null
+++ b/mail/courier-mta/patches/patch-aa
@@ -0,0 +1,98 @@
+$NetBSD: patch-aa,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+
+--- courier/Makefile.in.orig	2006-02-25 12:28:53.000000000 -0500
++++ courier/Makefile.in
+@@ -52,16 +52,16 @@ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+ pkglibexec_PROGRAMS = aliasexp$(EXEEXT) aliascombine$(EXEEXT) \
+-	aliascreate$(EXEEXT) sqwebmaild$(EXEEXT) submit$(EXEEXT) \
+-	@EXTRAPKGLIB@ $(am__empty)
+-webmail_PROGRAMS = webmail$(EXEEXT)
++	aliascreate$(EXEEXT) submit$(EXEEXT) \
++	$(am__empty)
++webmail_PROGRAMS = 
+ EXTRA_PROGRAMS = courierldapaliasd$(EXEEXT)
+ bin_PROGRAMS = cancelmsg$(EXEEXT) mailq$(EXEEXT) sendmail$(EXEEXT) \
+ 	testmxlookup$(EXEEXT) dotforward$(EXEEXT) couriermlm$(EXEEXT) \
+-	courier-config$(EXEEXT) @couriertls@ @EXTRABIN@
++	courier-config$(EXEEXT)
+ sbin_PROGRAMS = courier$(EXEEXT) showconfig$(EXEEXT) \
+-	showmodules$(EXEEXT) @COURIERLDAPALIASD@ @EXTRASBIN@
+-cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT) @EXTRACMDLIB@
++	showmodules$(EXEEXT) @COURIERLDAPALIASD@
++cmdlib_PROGRAMS = submitmkdir$(EXEEXT) courierd$(EXEEXT)
+ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
+ 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+ 	$(srcdir)/courier.h.in $(srcdir)/courierctl.start.in \
+@@ -397,7 +397,7 @@ RFCERRTXTIN = rfcerrheader.txt
+ RFCERRTXTNOIN = rfcerr2045.txt rfcerr2046.txt rfcerr2047.txt
+ extrapkglib = makedatprog courierpop3login pcpd
+ pkglibexecdir = $(libexecdir)/courier
+-webmaildir = $(libexecdir)/courier/webmail
++webmaildir = $(pkglibexecdir)/cgi-bin
+ webmail_SOURCES = 
+ sqwebmaild_SOURCES = 
+ 
+@@ -408,16 +408,14 @@ extrabin = maildrop lockmail reformail r
+ 
+ extrasbin = couriertcpd$(EXEEXT)
+ sbinscripts = sharedindexsplit sharedindexinstall webmaild
+-sbin_SCRIPTS = @SBINSCRIPTS@
++sbin_SCRIPTS = 
+ EXTRA_SCRIPTS = 
+-sysconf_DATA = pop3d.authpam imapd.authpam webmail.authpam imapd.cnf pop3d.cnf \
++sysconf_DATA = \
+ 	courierd.dist @LDAPALIASRC@ \
+-	imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
+-	quotawarnmsg.example $(RFCERRTXTNOIN) $(RFCERRTXTIN)
++	$(RFCERRTXTNOIN) $(RFCERRTXTIN)
+ 
+ databindir = $(datadir)
+-databin_SCRIPTS = courierctl.start makedat makealiases makehosteddomains \
+-	pop3d pop3d-ssl	mkimapdcert mkpop3dcert
++databin_SCRIPTS = courierctl.start makealiases makehosteddomains
+ 
+ mlmdatadir = $(datadir)/couriermlm
+ mlmdata_DATA = adminrequest.tmpl confsubj.tmpl digestsubj.tmpl fetch.tmpl \
+@@ -1657,27 +1655,10 @@ install-exec-hook:
+ 		$(localstatedir)/track\
+ 		$(localstatedir)/msgs $(localstatedir)/msgq ; do \
+ 			$(mkinstalldirs) $(DESTDIR)$$d || :; done
+-	$(INSTALL_SCRIPT) imapd.rc $(DESTDIR)$(datadir)/imapd
+-	$(INSTALL_SCRIPT) imapd-ssl.rc $(DESTDIR)$(datadir)/imapd-ssl
+-	rm -f $(DESTDIR)$(sbindir)/imapd
+-	$(LN_S) $(datadir)/imapd $(DESTDIR)$(sbindir)/imapd
+-	rm -f $(DESTDIR)$(sbindir)/imapd-ssl
+-	$(LN_S) $(datadir)/imapd-ssl $(DESTDIR)$(sbindir)/imapd-ssl
+-	rm -f $(DESTDIR)$(sbindir)/mkimapdcert
+-	$(LN_S) $(datadir)/mkimapdcert $(DESTDIR)$(sbindir)/mkimapdcert
+-	rm -f $(DESTDIR)$(sbindir)/mkpop3dcert
+-	$(LN_S) $(datadir)/mkpop3dcert $(DESTDIR)$(sbindir)/mkpop3dcert
+-	rm -f $(DESTDIR)$(bindir)/makedat
+-	$(LN_S) $(datadir)/makedat $(DESTDIR)$(bindir)/makedat
+-	for f in makealiases makehosteddomains pop3d pop3d-ssl \
++	for f in makealiases makehosteddomains \
+ 		; do rm -f $(DESTDIR)$(sbindir)/$$f ; \
+ 		$(LN_S) $(datadir)/$$f $(DESTDIR)$(sbindir)/$$f ; done
+-	rm -f $(DESTDIR)$(sbindir)/webgpg ; $(LN_S) $(datadir)/sqwebmail/webgpg $(DESTDIR)$(sbindir)/webgpg
+-	$(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/webadmin
+-	mkdir -p $(DESTDIR)$(sysconfdir)/shared
+-	chmod 755 $(DESTDIR)$(sysconfdir)/shared
+-	mkdir -p $(DESTDIR)$(sysconfdir)/shared.tmp
+-	chmod 755 $(DESTDIR)$(sysconfdir)/shared.tmp
++	$(INSTALL_PROGRAM) ../webadmin/webadmin $(DESTDIR)$(webmaildir)/courierwebadmin
+ 
+ install-data-hook:
+ 	-$(mkinstalldirs) $(DESTDIR)$(sysconfdir)/aliases
+@@ -1695,10 +1676,6 @@ install-data-hook:
+ 	rm -f $(DESTDIR)$(bindir)/rmail
+ 	$(LN_S) sendmail $(DESTDIR)$(bindir)/rmail
+ 	-$(mkinstalldirs) $(DESTDIR)@mandir@/man8
+-	-$(mkinstalldirs) $(DESTDIR)$(webmailimagedir)
+-	for f in `cat ../webmail/images/filelist` ; do \
+-		$(INSTALL_DATA) $(srcdir)/../webmail/images/$$f \
+-			$(DESTDIR)$(webmailimagedir) ; done
+ 
+ install-permissions: perms.sh
+ 	@chmod +x perms.sh setperms.sh
diff --git a/mail/courier-mta/patches/patch-ab b/mail/courier-mta/patches/patch-ab
new file mode 100644
index 00000000000..82e2eb8d810
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+
+--- courier/configure.orig	2006-02-25 12:28:52.000000000 -0500
++++ courier/configure
+@@ -22684,9 +22684,9 @@ done
+ 
+ if test "$testmode" = "0"
+ then
+-	INSTALL_PROGRAM='${INSTALL} -m 700'
+-	INSTALL_SCRIPT='${INSTALL} -m 700'
+-	INSTALL_DATA='${INSTALL} -m 600'
++	INSTALL_PROGRAM='${BSD_INSTALL_PROGRAM}'
++	INSTALL_SCRIPT='${BSD_INSTALL_SCRIPT}'
++	INSTALL_DATA='${BSD_INSTALL_DATA}'
+ fi
+ 
+ ac_ext=cc
diff --git a/mail/courier-mta/patches/patch-ac b/mail/courier-mta/patches/patch-ac
new file mode 100644
index 00000000000..b92e73a5e89
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ac
@@ -0,0 +1,108 @@
+$NetBSD: patch-ac,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+
+--- courier/doc/Makefile.in.orig	2006-01-29 12:33:49.000000000 -0500
++++ courier/doc/Makefile.in
+@@ -141,7 +141,7 @@ target_alias = @target_alias@
+ version = @version@
+ htmldocdir = @datadir@/htmldoc
+ CLEANFILES = permissions.dat
+-miscfiles = japanese_flag.png bg.gif icon.gif manpage.css \
++miscfiles = japanese_flag.png bg.gif icon.gif \
+ 		draft-varshavchik-exdata-smtpext.txt \
+ 		draft-varshavchik-verp-smtpext.txt \
+ 		draft-varshavchik-security-smtpext.txt \
+@@ -178,65 +178,37 @@ htmlin = \
+ 		courier.html \
+ 		courierldapaliasd.html \
+ 		couriermlm.html \
+-		courierpop3d.html \
+-		couriertcpd.html \
+-		couriertls.html \
+-		deliverquota.html \
+ 		dot-courier.html \
+ 		dot-forward.html \
+ 		esmtpd.html \
+-		imapd.html \
+ 		localmailfilter.html \
+-		lockmail.html \
+-		mailbot.html \
+-		maildiracl.html \
+-		maildir.html \
+-		maildirkw.html \
+-		maildirmake.html \
+-		maildirquota.html \
+-		maildropex.html \
+-		maildropfilter.html \
+-		maildropgdbm.html \
+-		maildrop.html \
+-		maildrop.README.html \
+-		maildroptips.html \
+ 		mailq.html \
+ 		makeacceptmailfor.html \
+ 		makealiases.html \
+-		makedat.html \
+ 		makehosteddomains.html \
+-		makemime.html \
+ 		makepercentrelay.html \
+ 		makesmtpaccess.html \
+-		mimegpg.html \
+ 		mkesmtpdcert.html \
+-		mkimapdcert.html \
+-		mkpop3dcert.html \
+-		pcp_README.html \
+ 		pop3d.html \
+ 		preline.html \
+-		reformail.html \
+-		reformime.html \
+ 		sendmail.html \
+ 		submit.html \
+ 		testmxlookup.html
+ 
+ htmldoc_DATA = $(nohtmlin) $(htmlin)
+-man1 = sendmail.1 preline.1 maildirmake.1 cancelmsg.1 lockmail.1 maildrop.1 \
+-	mailq.1 mailbot.1 makemime.1 mimegpg.1 maildiracl.1 \
+-	makedat.1 reformail.1 reformime.1 couriermlm.1 testmxlookup.1 \
+-	dot-forward.1 couriertls.1 couriertcpd.1 maildirkw.1
+-
+-man5 = dot-courier.5 maildir.5
+-man7 = localmailfilter.7 maildirquota.7 maildropgdbm.7 maildropfilter.7 \
+-	maildropex.7
++man1 = sendmail.1 preline.1 cancelmsg.1 \
++	mailq.1 \
++	couriermlm.1 testmxlookup.1 \
++	dot-forward.1
+ 
+-man8 = courier.8 courierldapaliasd.8 courierpop3d.8 \
+-	deliverquota.8 \
++man5 = dot-courier.5
++man7 = localmailfilter.7
++
++man8 = courier.8 courierldapaliasd.8 \
+ 	esmtpd.8 makeacceptmailfor.8 makehosteddomains.8\
+-	mkesmtpdcert.8 mkimapdcert.8 mkpop3dcert.8 \
++	mkesmtpdcert.8 \
+ 	makealiases.8 makepercentrelay.8 makesmtpaccess.8 \
+-	pop3d.8 submit.8 imapd.8
++	pop3d.8 submit.8
+ 
+ BUILT_SOURCES = \
+ 	cancelmsg.html cancelmsg.1 \
+@@ -261,7 +233,7 @@ BUILT_SOURCES = \
+ 	testmxlookup.html testmxlookup.1
+ 
+ EXTRA_DIST = $(nohtmlin) $(BUILT_SOURCES)
+-man_LINKS = $(man8dir)/courierpop3login.8 \
++man_LINKS = \
+ 	$(man1dir)/rmail.1 $(man1dir)/dotforward.1 \
+ 	$(man8dir)/makesmtpaccess-msa.8 \
+ 	$(man8dir)/esmtpd-msa.8
+@@ -1117,8 +1089,7 @@ preline.1: preline.1.in
+ 
+ install-man-extra:
+ 	cd $(DESTDIR)$(man8dir) ; \
+-		rm -f courierpop3login.8 makesmtpaccess-msa.8 esmtpd-msa.8; \
+-		$(LN_S) courierpop3d.8 courierpop3login.8; \
++		rm -f makesmtpaccess-msa.8 esmtpd-msa.8; \
+ 		$(LN_S) makesmtpaccess.8 makesmtpaccess-msa.8 ; \
+ 		$(LN_S) esmtpd.8 esmtpd-msa.8
+ 	cd $(DESTDIR)$(man1dir) ; rm -f rmail.1 dotforward.1 \
diff --git a/mail/courier-mta/patches/patch-ad b/mail/courier-mta/patches/patch-ad
new file mode 100644
index 00000000000..d8fcaea4963
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+
+--- courier/filters/Makefile.in.orig	2006-01-29 12:33:24.000000000 -0500
++++ courier/filters/Makefile.in
+@@ -234,7 +234,7 @@ htmldocdir = @datadir@/htmldoc
+ htmldoc_DATA = courierfilter.html courierperlfilter.html dupfilter.html
+ databindir = $(datadir)
+ databin_SCRIPTS = filterctl
+-filterbindir = $(libexecdir)/filters
++filterbindir = $(libexecdir)/courier/filters
+ filtersocketdir = $(localstatedir)/filters
+ allfiltersocketdir = $(localstatedir)/allfilters
+ filterconfdir = $(sysconfdir)/filters
diff --git a/mail/courier-mta/patches/patch-ae b/mail/courier-mta/patches/patch-ae
new file mode 100644
index 00000000000..ea6fdda4c19
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+
+--- courier/filters/filterctl.in.orig	2004-01-31 23:46:27.000000000 -0500
++++ courier/filters/filterctl.in
+@@ -12,7 +12,7 @@ sysconfdir="@sysconfdir@"
+ localstatedir="@localstatedir@"
+ piddir="@piddir@"
+ 
+-filterbindir="${libexecdir}/filters"
++filterbindir="${libexecdir}/courier/filters"
+ filteractivedir="${sysconfdir}/filters/active"
+ pidfile="${piddir}/courierfilter.pid"
+ 
diff --git a/mail/courier-mta/patches/patch-af b/mail/courier-mta/patches/patch-af
new file mode 100644
index 00000000000..295e5ba4117
--- /dev/null
+++ b/mail/courier-mta/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+
+--- courier/filters/perlfilter/Makefile.in.orig	2006-02-05 19:35:20.000000000 -0500
++++ courier/filters/perlfilter/Makefile.in
+@@ -206,7 +206,7 @@ target_alias = @target_alias@
+ EXTRA_DIST = perlfilter-wrapper.pl perlfilter-example.pl
+ BUILT_SOURCES = filtersocketdir.h wrapperpl.h xsinit.c
+ CLEANFILES = $(BUILT_SOURCES) permissions.dat
+-filterbindir = $(libexecdir)/filters
++filterbindir = $(libexecdir)/courier/filters
+ scriptdir = $(datadir)
+ script_SCRIPTS = perlfilter-wrapper.pl perlfilter-example.pl
+ filtersocketdir = $(localstatedir)/filters
diff --git a/mail/courier-mta/patches/patch-ag b/mail/courier-mta/patches/patch-ag
new file mode 100644
index 00000000000..fcd352e70fb
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+
+--- courier/module.esmtp/mkesmtpdcert.in.orig	2000-09-18 13:24:01.000000000 -0400
++++ courier/module.esmtp/mkesmtpdcert.in
+@@ -17,6 +17,7 @@ then
+ 	exit 1
+ fi
+ 
++umask 077
+ cp /dev/null @datadir@/esmtpd.pem
+ chmod 600 @datadir@/esmtpd.pem
+ chown @mailuser@ @datadir@/esmtpd.pem
diff --git a/mail/courier-mta/patches/patch-ah b/mail/courier-mta/patches/patch-ah
new file mode 100644
index 00000000000..3b674239007
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ah
@@ -0,0 +1,24 @@
+$NetBSD: patch-ah,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+
+--- courier/module.local/deliver.c.orig	2005-02-03 21:44:59.000000000 -0500
++++ courier/module.local/deliver.c
+@@ -633,7 +633,7 @@ static int docommand(const char *extensi
+ 		const char *defaultmail,
+ 		int recursion_level)
+ {
+-char	*envs[19];
++char	*envs[20];
+ const char *p;
+ const char *hostp;
+ pid_t	pid;
+@@ -725,7 +725,9 @@ const char *shell=getenv("SHELL");
+ 	envs[17]=courier_malloc(strlen(shell)
+ 				+sizeof("SHELL="));
+ 	strcat(strcpy(envs[17], "SHELL="), shell);
+-	envs[18]=0;
++	envs[18]=courier_malloc(sizeof("COURIER_MTA="));
++	strcpy(envs[18], "COURIER_MTA=");
++	envs[19]=0;
+ 
+ 	if (*command == '|')
+ 	{
diff --git a/mail/courier-mta/patches/patch-ai b/mail/courier-mta/patches/patch-ai
new file mode 100644
index 00000000000..d22b37c8744
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+
+--- courier/module.local/local.c.orig	2004-10-23 22:02:38.000000000 -0400
++++ courier/module.local/local.c
+@@ -731,6 +731,8 @@ const char *quota;
+ 					strlen(argv[7])), "SENDER="),
+ 					argv[7]));
+ 
++		putenv(strcpy(courier_malloc(sizeof("COURIER_MTA=")),
++			"COURIER_MTA="));
+ 		putenv(strcat(strcpy(courier_malloc(sizeof("HOME=")+
+ 			strlen(homedir)), "HOME="), homedir));
+ 		putenv(strcat(strcpy(courier_malloc(sizeof("DEFAULT=")+
diff --git a/mail/courier-mta/patches/patch-aj b/mail/courier-mta/patches/patch-aj
new file mode 100644
index 00000000000..0492f35f867
--- /dev/null
+++ b/mail/courier-mta/patches/patch-aj
@@ -0,0 +1,169 @@
+$NetBSD: patch-aj,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+
+--- courier/perms.sh.in.orig	2005-01-27 21:53:58.000000000 -0500
++++ courier/perms.sh.in
+@@ -10,114 +10,44 @@ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ 
+ PERMS="
+-.			755
+-
+ @localstatedir@		755	x	bin	bin
+ @localstatedir@/tmp	770
+ @localstatedir@/msgs	750
+ @localstatedir@/msgq	750
+ @localstatedir@/track	755
+ 
+-@sysconfdir@		755	x
+-@sysconfdir@/aliasdir	755
+-@sysconfdir@/aliases	750
+-@sysconfdir@/enablefiltering	644	config
+-@sysconfdir@/maildrop	644	config
+-@sysconfdir@/smtpaccess	755
+-@sysconfdir@/shared	755
+-@sysconfdir@/shared.tmp	755
+-@sysconfdir@/smtpaccess/default	644	config
+-@sysconfdir@/courierd.dist	644	config
+-@sysconfdir@/aliases/system	640	config
+-@sysconfdir@/pop3d.dist	644	config
+-@sysconfdir@/pop3d-ssl.dist	644	config
+-@sysconfdir@/pop3d.authpam	644	config
+-@sysconfdir@/pop3d.cnf		600	config
+-@sysconfdir@/imapd.dist	644	config
+-@sysconfdir@/imapd-ssl.dist	644	config
+-@sysconfdir@/imapd.authpam	644	config
+-@sysconfdir@/imapd.cnf		600	config
+-@sysconfdir@/sqwebmaild.dist	644	config
+-@sysconfdir@/webmail.authpam	644	config
+-@sysconfdir@/quotawarnmsg.example	444
+-@sysconfdir@/rfcerrheader.txt	444	config
+-@sysconfdir@/rfcerr2045.txt	444	config
+-@sysconfdir@/rfcerr2046.txt	444	config
+-@sysconfdir@/rfcerr2047.txt	444	config
+-
+-@libexecdir@		755	x	bin	bin
+ @libexecdir@/courier	755	x	bin	bin
+ @libexecdir@/courier/modules	755	x	bin	bin
+ @libexecdir@/courier/submitmkdir	4550
+ @libexecdir@/courier/courierd	550
+-@libexecdir@/courier/courierpop3d	555
+-@libexecdir@/courier/courierpop3login	555
+ @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	555	x	root	bin
+-@libexecdir@/courier/sqwebmaild		555
+-@libexecdir@/courier/sqwebpasswd	2755
+-@libexecdir@/courier/webmail/webadmin	4555	x	root	bin
++@libexecdir@/courier/cgi-bin		700	x	root	bin
++@libexecdir@/courier/cgi-bin/courierwebadmin	4555	x	root	bin
+ 
+-@sbindir@			755	x	bin	bin
+ @sbindir@/courier		555
+ @sbindir@/showconfig		555
+ @sbindir@/showmodules		550
+-@sbindir@/couriertcpd		555
+-@sbindir@/imapd			555
+-@sbindir@/imapd-ssl		555
+-@sbindir@/sharedindexsplit	555
+-@sbindir@/sharedindexinstall	555
+-@sbindir@/webmaild		555
+-@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@/maildiracl		555
+-@bindir@/maildirkw		555
+ @bindir@/sendmail		4511	x	root
+ @bindir@/rmail			4511	x	root
+-@bindir@/lockmail		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
+-@sbindir@/webgpg		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
+@@ -167,11 +97,20 @@ do
+ 	if test "$USER" = ""
+ 	then
+ 		USER="@mailuser@"
++	elif test "$USER" = "root"
++	then
++		USER="@ROOT_USER@"
++	elif test "$USER" = "bin"
++	then
++		USER="@ROOT_USER@"
+ 	fi
+ 
+ 	if test "$GROUP" = ""
+ 	then
+ 		GROUP="@mailgroup@"
++	elif test "$GROUP" = "bin"
++	then
++		GROUP="@ROOT_GROUP@"
+ 	fi
+ 
+ 	case $FILE in
+@@ -192,26 +131,7 @@ do
+ 	echo $FILE $MODE $USER $GROUP $SPECIAL
+ done
+ 
+-. ../tcpd/couriertls.config
+-
+-if test "$couriertls" != ""
+-then
+-   echo @bindir@/couriertls 555 bin bin
+-fi
+-
+ if test "@HAVE_LDAP@" != 0
+ then
+-	echo @sysconfdir@/ldapaliasrc.dist 640 @mailuser@ @mailgroup@ config
+ 	echo @sbindir@/courierldapaliasd 700 @mailuser@ @mailgroup@
+ fi
+-
+-echo @datadir@/sqwebmail/images 755 @mailuser@ @mailgroup@
+-
+-for f in `cat ../webmail/images/filelist 2>/dev/null`
+-do
+-	echo @datadir@/sqwebmail/images/$f 444 @mailuser@ @mailgroup@
+-done
+-
+-. ../maildrop/uidgid
+-
+-echo @bindir@/maildrop 4511 $uid @mailgroup@
diff --git a/mail/courier-mta/patches/patch-ak b/mail/courier-mta/patches/patch-ak
new file mode 100644
index 00000000000..3d1525e5292
--- /dev/null
+++ b/mail/courier-mta/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.1.1.1 2006/04/28 18:10:21 jlam Exp $
+
+--- courier/webadmin/admin-47webmail.pl.orig	2005-02-15 21:43:31.000000000 -0500
++++ courier/webadmin/admin-47webmail.pl
+@@ -123,7 +123,7 @@ if ($cgi->param("submit"))
+     {
+ 	DeleteConfigFile("calendarmode");
+     }
+-    changed("test -x ${libexecdir}/courier/pcpd || exit 0; ${sbindir}/webmaild stop; ${sbindir}/webmaild start");
++    changed("test -x ${libexecdir}/courier/pcpd || exit 0; ${sbindir}/sqwebmaild stop; ${sbindir}/sqwebmaild start");
+     $errmsg="\@SAVED\@";
+ }
+