- update courier to 0.42.2

- fix BROKEN
- reset MAINTAINER to ports. Original maintainer doesn't respond to mails
   over a long time period

PR:		ports/55427
Submitted by:	Shizuka Kudo <shizukakudo_99@yahoo.com>

8 files changed, 209 insertions, 120 deletions

diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index d03f63668148..7dfd310775f0 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -6,16 +6,14 @@
 #
 
 PORTNAME=	courier
-PORTVERSION=	0.39.3
+PORTVERSION=	0.42.2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
 
-MAINTAINER=	yds@CoolRat.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Courier SMTP IMAP POP3 HTTP mail server suite
 
-BROKEN=		"Changes ownership/permission of manpages, broken pkg-plist"
-
 RUN_DEPENDS=	${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/CIDR.pm:${PORTSDIR}/net/p5-Net-CIDR
 
@@ -50,14 +48,15 @@ CACHEDIR=	/var/spool/webmail
 CALENDIR=	/var/spool/calendar
 MIMETYPES=	${LOCALBASE}/etc/apache/mime.types:${LOCALBASE}/etc/apache2/mime.types
 
+USE_BZIP2=	yes
 USE_SUBMAKE=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE=	yes
 USE_LIBTOOL=	yes
 USE_OPENSSL=	yes
-USE_AUTOMAKE_VER=14
-USE_AUTOCONF_VER=213
+USE_AUTOMAKE_VER=15
+CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
 CONFIGURE_ARGS=	--disable-root-check --with-db=db \
 		--enable-syslog=1 --enable-use-flock \
 		--with-mailuser=${MAILOWN} \
@@ -78,8 +77,6 @@ CONFIGURE_ARGS=	--disable-root-check --with-db=db \
 		--with-default-maildrop=${MAILDROPDEFAULT} \
 		--enable-workarounds-for-imap-client-bugs
 
-PATH:=${PATH}:${SCRIPTDIR}
-
 # Respect the make.conf(5) NOUUCP setting
 WITH_TRANSPORT=	local esmtp dsn
 .if defined(NOUUCP)
@@ -147,15 +144,12 @@ pre-configure:
 # patch around a bug in autoconf where the INSTALL macro does
 # not get set properly in directories more than one level deep
 post-build:
-	@${PERL} -pi -e 's:^INSTALL = \.\./:INSTALL = ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}:;' \
-		`${GREP} -rl '^INSTALL = \.\./' ${WRKSRC}/* | ${GREP} '/Makefile$$'`
-	@${PERL} -pi -e 's:^TAR = gtar$$:TAR = ${TAR}:g;' \
-		`${GREP} -rl '^TAR = gtar$$' ${WRKSRC}/* | ${GREP} '/Makefile$$'`
 	@${PERL} -pi -e 's:^(auth)\s+(required).*:$$1\t\t$$2\tpam_unix.so\ttry_first_pass:g; \
 			s:^(account)\s+(required).*:$$1 \t$$2\tpam_unix.so:g; \
 			s:^(session)\s+(required).*:$$1 \t$$2\tpam_permit.so:g;' \
 		${WRKSRC}/*/*.authpam* \
 		${WRKSRC}/*/*/*.authpam*
+	@${PERL} -pi -e 's:^transform = .*freebsd.*:transform = s,x,x:;' ${WRKSRC}/Makefile ${WRKSRC}/*/Makefile ${WRKSRC}/*/*/Makefile
 	@${LN} ${WRKSRC}/gpglib/README.html	${WRKSRC}/gpglib/README.gpglib.html
 	@${LN} ${WRKSRC}/imap/FAQ		${WRKSRC}/imap/FAQ.imap
 	@${LN} ${WRKSRC}/imap/FAQ.html		${WRKSRC}/imap/FAQ.imap.html
diff --git a/mail/courier/Makefile.man b/mail/courier/Makefile.man
index fcdc2e30c7f4..70c9e853373e 100644
--- a/mail/courier/Makefile.man
+++ b/mail/courier/Makefile.man
@@ -4,7 +4,7 @@ MAN1=	\
 	couriertcpd.1 \
 	couriertls.1 \
 	dot-forward.1 \
-	dotlock.1 \
+	lockmail.1 \
 	mailbot.1 \
 	maildirmake.1 \
 	maildrop.1 \
@@ -19,6 +19,7 @@ MAN1=	\
 	testmxlookup.1
 MAN5=	\
 	dot-courier.5 \
+	maildir.5 \
 	maildropex.5 \
 	maildropfilter.5 \
 	maildropgdbm.5
diff --git a/mail/courier/Makefile.own b/mail/courier/Makefile.own
index c4e30ef8fcfe..0c6ee2f623d9 100644
--- a/mail/courier/Makefile.own
+++ b/mail/courier/Makefile.own
@@ -3,8 +3,8 @@ OWNER0=	bin/courier-config \
 	bin/couriertls \
 	bin/deliverquota \
 	bin/dotforward \
-	bin/dotlock \
 	bin/imapd \
+	bin/lockmail \
 	bin/mailbot \
 	bin/maildirmake \
 	bin/makemime \
diff --git a/mail/courier/distinfo b/mail/courier/distinfo
index 4de0cf1d9655..273f05cd4c44 100644
--- a/mail/courier/distinfo
+++ b/mail/courier/distinfo
@@ -1 +1 @@
-MD5 (courier-0.39.3.tar.gz) = 14a6e8d4ebb9053f2b7920d36bc5d3f9
+MD5 (courier-0.42.2.tar.bz2) = f607cbd949dd0fe7f138cf3b65d702f4
diff --git a/mail/courier/files/patch-courier::configure.in b/mail/courier/files/patch-courier::configure.in
new file mode 100644
index 000000000000..abd0dc0df4a6
--- /dev/null
+++ b/mail/courier/files/patch-courier::configure.in
@@ -0,0 +1,21 @@
+--- courier/configure.in.orig	Sun Mar 16 17:35:34 2003
++++ courier/configure.in	Sat Aug  9 16:36:22 2003
+@@ -465,12 +465,12 @@
+ 
+ # Automake stupidity
+ 
+-if test "$testmode" = "0"
+-then
+-	INSTALL_PROGRAM='${INSTALL} -m 700'
+-	INSTALL_SCRIPT='${INSTALL} -m 700'
+-	INSTALL_DATA='${INSTALL} -m 600'
+-fi
++#if test "$testmode" = "0"
++#then
++#	INSTALL_PROGRAM='${INSTALL} -m 700'
++#	INSTALL_SCRIPT='${INSTALL} -m 700'
++#	INSTALL_DATA='${INSTALL} -m 600'
++#fi
+ 
+ AC_LANG_CPLUSPLUS
+ AC_CACHE_CHECK([if the C++ compiler needs -fhandle-exceptions],
diff --git a/mail/courier/files/patch-courier::doc::Makefile.in b/mail/courier/files/patch-courier::doc::Makefile.in
new file mode 100644
index 000000000000..244fdc51a5f9
--- /dev/null
+++ b/mail/courier/files/patch-courier::doc::Makefile.in
@@ -0,0 +1,71 @@
+--- courier/doc/Makefile.in.orig	Wed Apr 23 01:46:13 2003
++++ courier/doc/Makefile.in	Sat Aug  9 21:59:26 2003
+@@ -985,18 +985,18 @@
+ 	$(MAKE) do-man-install
+ 
+ do-man-install:
+-	for f in $(mandir) $(man1dir) $(man7dir) $(man8dir) ; do test -d $(DESTDIR)$$f && chmod 755 $(DESTDIR)$$f ; done ; exit 0
++#	for f in $(mandir) $(man1dir) $(man7dir) $(man8dir) ; do test -d $(DESTDIR)$$f && chmod 755 $(DESTDIR)$$f ; done ; exit 0
+ 	for f in $(man1) ; do test -f $(DESTDIR)$(man1dir)/$$f && chmod 644 $(DESTDIR)$(man1dir)/$$f ; done ; exit 0
+ 	for f in $(man5) ; do test -f $(DESTDIR)$(man5dir)/$$f && chmod 644 $(DESTDIR)$(man5dir)/$$f ; done ; exit 0
+ 	for f in $(man7) ; do test -f $(DESTDIR)$(man7dir)/$$f && chmod 644 $(DESTDIR)$(man7dir)/$$f ; done ; exit 0
+ 	for f in $(man8) ; do test -f $(DESTDIR)$(man8dir)/$$f && chmod 644 $(DESTDIR)$(man8dir)/$$f ; done ; exit 0
+-	test -w /etc || exit 0 ; for f in $(mandir) $(man1dir) $(man5dir) $(man7dir) $(man8dir) ; do test -d $(DESTDIR)$$f && chown bin $(DESTDIR)$$f && chgrp bin $(DESTDIR)$$f ; done ; exit 0
+-	test -w /etc || exit 0 ; for f in $(man1) ; do test -f $(DESTDIR)$(man1dir)/$$f && chown bin $(DESTDIR)$(man1dir)/$$f && chgrp bin $(DESTDIR)$(man1dir)/$$f ; done ; exit 0
+-	test -w /etc || exit 0 ; for f in $(man5) ; do test -f $(DESTDIR)$(man5dir)/$$f && chown bin $(DESTDIR)$(man5dir)/$$f && chgrp bin $(DESTDIR)$(man5dir)/$$f ; done ; exit 0
+-	test -w /etc || exit 0 ; for f in $(man7) ; do test -f $(DESTDIR)$(man7dir)/$$f && chown bin $(DESTDIR)$(man7dir)/$$f && chgrp bin $(DESTDIR)$(man7dir)/$$f ; done ; exit 0
+-	test -w /etc || exit 0 ; for f in $(man8) ; do test -f $(DESTDIR)$(man8dir)/$$f && chown bin $(DESTDIR)$(man8dir)/$$f && chgrp bin $(DESTDIR)$(man8dir)/$$f ; done ; exit 0
++#	test -w /etc || exit 0 ; for f in $(mandir) $(man1dir) $(man5dir) $(man7dir) $(man8dir) ; do test -d $(DESTDIR)$$f && chown bin $(DESTDIR)$$f && chgrp bin $(DESTDIR)$$f ; done ; exit 0
++#	test -w /etc || exit 0 ; for f in $(man1) ; do test -f $(DESTDIR)$(man1dir)/$$f && chown bin $(DESTDIR)$(man1dir)/$$f && chgrp bin $(DESTDIR)$(man1dir)/$$f ; done ; exit 0
++#	test -w /etc || exit 0 ; for f in $(man5) ; do test -f $(DESTDIR)$(man5dir)/$$f && chown bin $(DESTDIR)$(man5dir)/$$f && chgrp bin $(DESTDIR)$(man5dir)/$$f ; done ; exit 0
++#	test -w /etc || exit 0 ; for f in $(man7) ; do test -f $(DESTDIR)$(man7dir)/$$f && chown bin $(DESTDIR)$(man7dir)/$$f && chgrp bin $(DESTDIR)$(man7dir)/$$f ; done ; exit 0
++#	test -w /etc || exit 0 ; for f in $(man8) ; do test -f $(DESTDIR)$(man8dir)/$$f && chown bin $(DESTDIR)$(man8dir)/$$f && chgrp bin $(DESTDIR)$(man8dir)/$$f ; done ; exit 0
+ 	for f in $(htmldoc_DATA) ; do chmod 444 $(DESTDIR)$(htmldocdir)/$$f ; done
+-	test -w /etc || exit 0; for f in $(htmldoc_DATA) ; do chown bin $(DESTDIR)$(htmldocdir)/$$f ; chgrp bin $(DESTDIR)$(htmldocdir)/$$f ; done
++#	test -w /etc || exit 0; for f in $(htmldoc_DATA) ; do chown bin $(DESTDIR)$(htmldocdir)/$$f ; chgrp bin $(DESTDIR)$(htmldocdir)/$$f ; done
+ 
+ status.html: config.status
+ 
+@@ -1009,24 +1009,24 @@
+ 	@SUBDIRS="$(SUBDIRS)" ; for f in $$SUBDIRS ; do ( cd $$f && $(MAKE) $(AM_MAKEFLAGS) install-perms ) ; cat /dev/null >>$$f/permissions.dat ; cat $$f/permissions.dat >>permissions.dat ; done
+ 
+ install-perms-local:
+-	@echo @mandir@ 755 bin bin >>permissions.dat
+-	@echo $(man1dir) 755 bin bin >>permissions.dat
+-	@echo $(man5dir) 755 bin bin >>permissions.dat
+-	@echo $(man7dir) 755 bin bin >>permissions.dat
+-	@echo $(man8dir) 755 bin bin >>permissions.dat
+-	@for f in $(man1) ; do	\
+-	echo $(man1dir)/$$f 644 bin bin man >>permissions.dat ; done
+-	@for f in $(man5) ; do	\
+-	echo $(man5dir)/$$f 644 bin bin man >>permissions.dat ; done
+-	@for f in $(man7) ; do	\
+-	echo $(man7dir)/$$f 644 bin bin man >>permissions.dat ; done
+-	@for f in $(man8) ; do	\
+-	echo $(man8dir)/$$f 644 bin bin man >>permissions.dat ; done
+-	@for f in $(man_LINKS) ; do	\
+-	echo $$f 644 bin bin man >>permissions.dat ; done
+-	@echo $(htmldocdir) 755 bin bin >>permissions.dat
+-	@for f in $(htmldoc_DATA) ; do \
+-	echo $(htmldocdir)/$$f 444 bin bin doc >>permissions.dat ; done
++#	@echo @mandir@ 755 bin bin >>permissions.dat
++#	@echo $(man1dir) 755 bin bin >>permissions.dat
++#	@echo $(man5dir) 755 bin bin >>permissions.dat
++#	@echo $(man7dir) 755 bin bin >>permissions.dat
++#	@echo $(man8dir) 755 bin bin >>permissions.dat
++#	@for f in $(man1) ; do	\
++#	echo $(man1dir)/$$f 644 bin bin man >>permissions.dat ; done
++#	@for f in $(man5) ; do	\
++#	echo $(man5dir)/$$f 644 bin bin man >>permissions.dat ; done
++#	@for f in $(man7) ; do	\
++#	echo $(man7dir)/$$f 644 bin bin man >>permissions.dat ; done
++#	@for f in $(man8) ; do	\
++#	echo $(man8dir)/$$f 644 bin bin man >>permissions.dat ; done
++#	@for f in $(man_LINKS) ; do	\
++#	echo $$f 644 bin bin man >>permissions.dat ; done
++#	@echo $(htmldocdir) 755 bin bin >>permissions.dat
++#	@for f in $(htmldoc_DATA) ; do \
++#	echo $(htmldocdir)/$$f 444 bin bin doc >>permissions.dat ; done
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/mail/courier/pkg-plist b/mail/courier/pkg-plist
index 7a703c689a52..9b3056643ede 100644
--- a/mail/courier/pkg-plist
+++ b/mail/courier/pkg-plist
@@ -27,14 +27,15 @@
 %%SUB_LDAP%%@unexec cmp -s %D/etc/courier/ldapaliasrc %D/etc/courier/ldapaliasrc.dist && rm -f %D/etc/courier/ldapaliasrc 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/pop3d-ssl %D/etc/courier/pop3d-ssl.dist && rm -f %D/etc/courier/pop3d-ssl 2>/dev/null || true
 @unexec cmp -s %D/etc/courier/pop3d %D/etc/courier/pop3d.dist && rm -f %D/etc/courier/pop3d 2>/dev/null || true
+bin/addcr
 bin/cancelmsg
 bin/courier-config
 bin/couriermlm
 bin/couriertls
 bin/deliverquota
 bin/dotforward
-bin/dotlock
 bin/imapd
+bin/lockmail
 bin/mailbot
 bin/maildirmake
 bin/maildrop
@@ -591,106 +592,107 @@ share/courier/sqwebmail/webgpg
 @dirrm share/courier/sqwebmail
 share/courier/userdb
 share/courier/vchkpw2userdb
-share/courier/webgpg
 @dirrm share/courier
-%%PORTDOCS%%share/doc/courier/AUTHORS
-%%PORTDOCS%%share/doc/courier/BENCHMARKS
-%%PORTDOCS%%share/doc/courier/BUGS.webmail
-%%PORTDOCS%%share/doc/courier/BUGS.webmail.html
-%%PORTDOCS%%share/doc/courier/FAQ.imap
-%%PORTDOCS%%share/doc/courier/FAQ.imap.html
-%%PORTDOCS%%share/doc/courier/INSTALL
-%%PORTDOCS%%share/doc/courier/NEWS
-%%PORTDOCS%%share/doc/courier/README
-%%PORTDOCS%%share/doc/courier/README.authmysql.html
-%%PORTDOCS%%share/doc/courier/README.couriertls
-%%PORTDOCS%%share/doc/courier/README.gpglib.html
-%%PORTDOCS%%share/doc/courier/README.imap
-%%PORTDOCS%%share/doc/courier/README.imap.html
-%%PORTDOCS%%share/doc/courier/README.ldap
-%%PORTDOCS%%share/doc/courier/README.maildirfilter.html
-%%PORTDOCS%%share/doc/courier/README.maildirquota.html
-%%PORTDOCS%%share/doc/courier/README.maildirquota.txt
-%%PORTDOCS%%share/doc/courier/README.maildrop.html
-%%PORTDOCS%%share/doc/courier/README.pcp.html
-%%PORTDOCS%%share/doc/courier/README.sharedfolders.html
-%%PORTDOCS%%share/doc/courier/README.sharedfolders.txt
-%%PORTDOCS%%share/doc/courier/SECURITY.webmail
-%%PORTDOCS%%share/doc/courier/SECURITY.webmail.html
-%%PORTDOCS%%share/doc/courier/html/FAQ.html
-%%PORTDOCS%%share/doc/courier/html/aliases.html
-%%PORTDOCS%%share/doc/courier/html/authlib.html
-%%PORTDOCS%%share/doc/courier/html/cancelmsg.html
-%%PORTDOCS%%share/doc/courier/html/courier.html
-%%PORTDOCS%%share/doc/courier/html/courierd.html
-%%PORTDOCS%%share/doc/courier/html/courierdsn.html
-%%SUB_FAX%%%%PORTDOCS%%share/doc/courier/html/courierfax.html
-%%PORTDOCS%%share/doc/courier/html/courierfilter.html
-%%PORTDOCS%%share/doc/courier/html/courierldapaliasd.html
-%%PORTDOCS%%share/doc/courier/html/couriermlm.html
-%%PORTDOCS%%share/doc/courier/html/courierperlfilter.html
-%%PORTDOCS%%share/doc/courier/html/courierpop3d.html
-%%PORTDOCS%%share/doc/courier/html/couriertcpd.html
-%%PORTDOCS%%share/doc/courier/html/couriertls.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
-%%PORTDOCS%%share/doc/courier/html/dotlock.html
-%%PORTDOCS%%share/doc/courier/html/draft-varshavchik-exdata-smtpext.txt
-%%PORTDOCS%%share/doc/courier/html/draft-varshavchik-security-smtpext.txt
-%%PORTDOCS%%share/doc/courier/html/draft-varshavchik-verp-smtpext.txt
-%%PORTDOCS%%share/doc/courier/html/dupfilter.html
-%%PORTDOCS%%share/doc/courier/html/esmtp.html
-%%PORTDOCS%%share/doc/courier/html/esmtpd.html
-%%PORTDOCS%%share/doc/courier/html/history.html
-%%PORTDOCS%%share/doc/courier/html/icon.gif
-%%PORTDOCS%%share/doc/courier/html/imapd.html
-%%PORTDOCS%%share/doc/courier/html/index.html
-%%PORTDOCS%%share/doc/courier/html/install.html
-%%PORTDOCS%%share/doc/courier/html/intro.html
-%%PORTDOCS%%share/doc/courier/html/layout.html
-%%PORTDOCS%%share/doc/courier/html/links.html
-%%PORTDOCS%%share/doc/courier/html/local.html
-%%PORTDOCS%%share/doc/courier/html/localmailfilter.html
-%%PORTDOCS%%share/doc/courier/html/mailbot.html
-%%PORTDOCS%%share/doc/courier/html/maildirmake.html
-%%PORTDOCS%%share/doc/courier/html/maildirquota.html
-%%PORTDOCS%%share/doc/courier/html/maildrop.README.html
-%%PORTDOCS%%share/doc/courier/html/maildrop.html
-%%PORTDOCS%%share/doc/courier/html/maildropex.html
-%%PORTDOCS%%share/doc/courier/html/maildropfilter.html
-%%PORTDOCS%%share/doc/courier/html/maildropgdbm.html
-%%PORTDOCS%%share/doc/courier/html/maildroptips.html
-%%PORTDOCS%%share/doc/courier/html/mailq.html
-%%PORTDOCS%%share/doc/courier/html/makeacceptmailfor.html
-%%PORTDOCS%%share/doc/courier/html/makealiases.html
-%%PORTDOCS%%share/doc/courier/html/makedat.html
-%%PORTDOCS%%share/doc/courier/html/makehosteddomains.html
-%%PORTDOCS%%share/doc/courier/html/makemime.html
-%%PORTDOCS%%share/doc/courier/html/makepercentrelay.html
-%%PORTDOCS%%share/doc/courier/html/makesmtpaccess.html
-%%PORTDOCS%%share/doc/courier/html/makeuserdb.html
-%%PORTDOCS%%share/doc/courier/html/mimegpg.html
-%%PORTDOCS%%share/doc/courier/html/mkesmtpdcert.html
-%%PORTDOCS%%share/doc/courier/html/mkimapdcert.html
-%%PORTDOCS%%share/doc/courier/html/mkpop3dcert.html
-%%PORTDOCS%%share/doc/courier/html/modules.html
-%%PORTDOCS%%share/doc/courier/html/pcp_README.html
-%%PORTDOCS%%share/doc/courier/html/pop3d.html
-%%PORTDOCS%%share/doc/courier/html/preline.html
-%%PORTDOCS%%share/doc/courier/html/queue.html
-%%PORTDOCS%%share/doc/courier/html/reformail.html
-%%PORTDOCS%%share/doc/courier/html/reformime.html
-%%PORTDOCS%%share/doc/courier/html/sendmail.html
-%%PORTDOCS%%share/doc/courier/html/status.html
-%%PORTDOCS%%share/doc/courier/html/structures.html
-%%PORTDOCS%%share/doc/courier/html/submit.html
-%%PORTDOCS%%share/doc/courier/html/testmxlookup.html
-%%PORTDOCS%%share/doc/courier/html/userdb.html
-%%PORTDOCS%%share/doc/courier/html/userdbpw.html
-%%PORTDOCS%%@dirrm share/doc/courier/html
-%%PORTDOCS%%@dirrm share/doc/courier
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/BENCHMARKS
+%%PORTDOCS%%%%DOCSDIR%%/BUGS.webmail
+%%PORTDOCS%%%%DOCSDIR%%/BUGS.webmail.html
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.imap
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.imap.html
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html
+%%PORTDOCS%%%%DOCSDIR%%/README.couriertls
+%%PORTDOCS%%%%DOCSDIR%%/README.gpglib.html
+%%PORTDOCS%%%%DOCSDIR%%/README.imap
+%%PORTDOCS%%%%DOCSDIR%%/README.imap.html
+%%PORTDOCS%%%%DOCSDIR%%/README.ldap
+%%PORTDOCS%%%%DOCSDIR%%/README.maildirfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.html
+%%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.maildrop.html
+%%PORTDOCS%%%%DOCSDIR%%/README.pcp.html
+%%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.html
+%%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
+%%PORTDOCS%%%%DOCSDIR%%/SECURITY.webmail
+%%PORTDOCS%%%%DOCSDIR%%/SECURITY.webmail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/FAQ.html
+%%PORTDOCS%%%%DOCSDIR%%/html/aliases.html
+%%PORTDOCS%%%%DOCSDIR%%/html/authlib.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cancelmsg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courier.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courierd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courierdsn.html
+%%SUB_FAX%%%%PORTDOCS%%%%DOCSDIR%%/html/courierfax.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courierfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courierldapaliasd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/couriermlm.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courierperlfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/courierpop3d.html
+%%PORTDOCS%%%%DOCSDIR%%/html/couriertcpd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/couriertls.html
+%%PORTDOCS%%%%SUB_UUCP%%%%DOCSDIR%%/html/courieruucp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/deliverquota.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dot-courier.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dot-forward.html
+%%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-exdata-smtpext.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-security-smtpext.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/draft-varshavchik-verp-smtpext.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/dupfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/esmtp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/esmtpd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/history.html
+%%PORTDOCS%%%%DOCSDIR%%/html/icon.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/imapd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/install.html
+%%PORTDOCS%%%%DOCSDIR%%/html/intro.html
+%%PORTDOCS%%%%DOCSDIR%%/html/layout.html
+%%PORTDOCS%%%%DOCSDIR%%/html/links.html
+%%PORTDOCS%%%%DOCSDIR%%/html/local.html
+%%PORTDOCS%%%%DOCSDIR%%/html/localmailfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/lockmail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mailbot.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildir.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildirmake.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildirquota.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildrop.README.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildrop.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildropex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildropfilter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildropgdbm.html
+%%PORTDOCS%%%%DOCSDIR%%/html/maildroptips.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mailq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makeacceptmailfor.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makealiases.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makedat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makehosteddomains.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makemime.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makepercentrelay.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makesmtpaccess.html
+%%PORTDOCS%%%%DOCSDIR%%/html/makeuserdb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/manpage.css
+%%PORTDOCS%%%%DOCSDIR%%/html/mimegpg.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mkesmtpdcert.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mkimapdcert.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mkpop3dcert.html
+%%PORTDOCS%%%%DOCSDIR%%/html/modules.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pcp_README.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pop3d.html
+%%PORTDOCS%%%%DOCSDIR%%/html/preline.html
+%%PORTDOCS%%%%DOCSDIR%%/html/queue.html
+%%PORTDOCS%%%%DOCSDIR%%/html/reformail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/reformime.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sendmail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/status.html
+%%PORTDOCS%%%%DOCSDIR%%/html/structures.html
+%%PORTDOCS%%%%DOCSDIR%%/html/submit.html
+%%PORTDOCS%%%%DOCSDIR%%/html/testmxlookup.html
+%%PORTDOCS%%%%DOCSDIR%%/html/userdb.html
+%%PORTDOCS%%%%DOCSDIR%%/html/userdbpw.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @exec chown %%MAILOWN%%:%%MAILGRP%% %D/bin/cancelmsg
 @exec chown %%BINOWN%%:mail %D/bin/maildrop
 @exec chown %%BINOWN%%:%%MAILGRP%% %D/bin/mailq
diff --git a/mail/courier/scripts/configure.courier b/mail/courier/scripts/configure.courier
index cb033392761b..2d1b2b398cb4 100644
--- a/mail/courier/scripts/configure.courier
+++ b/mail/courier/scripts/configure.courier
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/mail/courier/scripts/Attic/configure.courier,v 1.6 2003-02-24 02:56:32 edwin Exp $
+# $FreeBSD: /tmp/pcvs/ports/mail/courier/scripts/Attic/configure.courier,v 1.7 2003-08-09 22:40:32 oliver Exp $
 
 [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ] && exit
 
@@ -72,13 +72,13 @@ else
 		SET_LDAP2="OFF"
 	fi
 	if [ ":${WITH_MYSQL}" = ':yes' \
-	  -o -f ${LOCALBASE}/lib/mysql/libmysqlclient.so.10 ]; then
+	  -o -f ${LOCALBASE}/lib/mysql/libmysqlclient.so.12 ]; then
 		SET_MYSQL="ON"
 	else
 		SET_MYSQL="OFF"
 	fi
 	if [ ":${WITH_PGSQL}" = ':yes' \
-	  -o -f ${PGSQLBASE}/lib/libpq.so.2 ]; then
+	  -o -f ${PGSQLBASE}/lib/libpq.so.3 ]; then
 		SET_PGSQL="ON"
 	else
 		SET_PGSQL="OFF"
@@ -210,7 +210,7 @@ while [ "$1" ]; do
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			fi
-			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
+			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap21"
 			CPPFLAGS="${CPPFLAGS} -I\${LOCALBASE}/include"
 			LDFLAGS="${LDFLAGS} -L\${LOCALBASE}/lib"
 			WITH_LDAP="--with-authldap"
@@ -225,7 +225,7 @@ while [ "$1" ]; do
 				rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
 				exit 1
 			else
-				echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
+				echo "LIB_DEPENDS+=	mysqlclient.12:\${PORTSDIR}/databases/mysql40-client"
 				WITH_MYSQL="--with-authmysql"
 				WITH_MYSQL="${WITH_MYSQL} --with-mysql-libs=\${LOCALBASE}/lib/mysql"
 				WITH_MYSQL="${WITH_MYSQL} --with-mysql-includes=\${LOCALBASE}/include/mysql"