Index: head/databases/courier-authlib-mysql/Makefile
===================================================================
--- head/databases/courier-authlib-mysql/Makefile
+++ head/databases/courier-authlib-mysql/Makefile
@@ -1,7 +1,7 @@
 # Created by: Yarema <yds@CoolRat.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-mysql
 
 COMMENT=	MySQL support for the Courier authentication library
Index: head/databases/courier-authlib-pgsql/Makefile
===================================================================
--- head/databases/courier-authlib-pgsql/Makefile
+++ head/databases/courier-authlib-pgsql/Makefile
@@ -1,7 +1,7 @@
 # Created by: Yarema <yds@CoolRat.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-pgsql
 
 COMMENT=	PostgreSQL support for the Courier authentication library
Index: head/databases/courier-authlib-userdb/Makefile
===================================================================
--- head/databases/courier-authlib-userdb/Makefile
+++ head/databases/courier-authlib-userdb/Makefile
@@ -1,7 +1,7 @@
 # Created by: Yarema <yds@CoolRat.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-userdb
 
 COMMENT=	Userdb support for the Courier authentication library
Index: head/databases/courier-authlib-usergdbm/Makefile
===================================================================
--- head/databases/courier-authlib-usergdbm/Makefile
+++ head/databases/courier-authlib-usergdbm/Makefile
@@ -1,7 +1,7 @@
 # Created by: Yarema <yds@CoolRat.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-usergdbm
 
 COMMENT=	Userdb support for the Courier authentication library
Index: head/devel/courier-unicode/Makefile
===================================================================
--- head/devel/courier-unicode/Makefile
+++ head/devel/courier-unicode/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	courier-unicode
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.2
 CATEGORIES=	devel mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
Index: head/devel/courier-unicode/distinfo
===================================================================
--- head/devel/courier-unicode/distinfo
+++ head/devel/courier-unicode/distinfo
@@ -1,2 +1,2 @@
-SHA256 (courier-unicode-1.1.tar.bz2) = a10e61d20f3bf25bebdec495dea54258948f333a29f29a7f155a31f9bfb3f56c
-SIZE (courier-unicode-1.1.tar.bz2) = 372684
+SHA256 (courier-unicode-1.2.tar.bz2) = 55017f49975dfece84f061e33f38361ff7d7e52ceda98346c9462bf036d9724f
+SIZE (courier-unicode-1.2.tar.bz2) = 390014
Index: head/devel/courier-unicode/pkg-plist
===================================================================
--- head/devel/courier-unicode/pkg-plist
+++ head/devel/courier-unicode/pkg-plist
@@ -1,8 +1,8 @@
-include/unicode.h
-lib/libunicode.a
-lib/libunicode.so
-lib/libunicode.so.1
-lib/libunicode.so.1.0.0
+include/courier-unicode.h
+lib/libcourier-unicode.a
+lib/libcourier-unicode.so
+lib/libcourier-unicode.so.1
+lib/libcourier-unicode.so.1.0.0
 man/man3/unicode::iconvert::convert.3.gz
 man/man3/unicode::iconvert::convert_tocase.3.gz
 man/man3/unicode::iconvert::fromu.3.gz
@@ -47,6 +47,7 @@
 man/man3/unicode_lbc_next_cnt.3.gz
 man/man3/unicode_lbc_set_opts.3.gz
 man/man3/unicode_lc.3.gz
+man/man3/unicode_script.3.gz
 man/man3/unicode_tc.3.gz
 man/man3/unicode_u_ucs2_native.3.gz
 man/man3/unicode_u_ucs4_native.3.gz
Index: head/mail/courier-authlib-vchkpw/Makefile
===================================================================
--- head/mail/courier-authlib-vchkpw/Makefile
+++ head/mail/courier-authlib-vchkpw/Makefile
@@ -1,7 +1,7 @@
 # Created by: Yarema <yds@CoolRat.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-vchkpw
 
 COMMENT=	Vpopmail/vchkpw support for the Courier authentication library
Index: head/mail/courier-imap/Makefile
===================================================================
--- head/mail/courier-imap/Makefile
+++ head/mail/courier-imap/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	courier-imap
-PORTVERSION=	4.15
-PORTREVISION=	2
+PORTVERSION=	4.16.1
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
@@ -12,7 +11,9 @@
 COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
 
 BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
-RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
+RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base \
+		${LOCALBASE}/share/sysconftool/sysconftool:${PORTSDIR}/devel/sysconftool
+LIB_DEPENDS=	libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
 
 USES=		gmake perl5 tar:bzip2
 GNU_CONFIGURE=	yes
@@ -24,6 +25,7 @@
 CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
 
 MAKE_ENV:=	${CONFIGURE_ENV}
+ALL_TARGET=	all makeimapaccess makedat
 
 #
 # options available:
@@ -122,6 +124,8 @@
 		${WRKSRC}/libs/imap/imapd-ssl.dist.in
 
 post-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/makeimapaccess ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKSRC}/makedat ${STAGEDIR}${PREFIX}/bin/
 .for i in imapd pop3d
 	${INSTALL_DATA} ${WRKSRC}/libs/imap/${i}.cnf ${STAGEDIR}${CONFDIR}/${i}.cnf.dist
 .endfor
@@ -130,9 +134,6 @@
 	${INSTALL_DATA} ${WRKSRC}/${a} ${STAGEDIR}${DOCSDIR}
 .endfor
 
-	cd ${WRKSRC} && ( ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} \
-		install-configure ; cd - )
-
 	@${ECHO_MSG} "In case you use authpam, you should put the following lines"
 	@${ECHO_MSG} "in your /etc/pam.d/imap"
 	@${ECHO_MSG} "auth    required    pam_unix.so         try_first_pass"
Index: head/mail/courier-imap/distinfo
===================================================================
--- head/mail/courier-imap/distinfo
+++ head/mail/courier-imap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (courier-imap-4.15.tar.bz2) = 6c34107e7ba9e5396d50b58fb414a495806335cab7135c96ad85a3816785b109
-SIZE (courier-imap-4.15.tar.bz2) = 3266353
+SHA256 (courier-imap-4.16.1.tar.bz2) = 51241784f78b7ce8342adf9d4741a2f8ae8ee0641fe7ead4751af8d4019d4204
+SIZE (courier-imap-4.16.1.tar.bz2) = 3026062
Index: head/mail/courier-imap/files/patch-Makefile.in
===================================================================
--- head/mail/courier-imap/files/patch-Makefile.in
+++ head/mail/courier-imap/files/patch-Makefile.in
@@ -1,15 +1,25 @@
---- Makefile.in.orig	2009-06-27 19:26:28.000000000 +0200
-+++ Makefile.in	2009-07-27 19:19:27.000000000 +0200
-@@ -307,7 +307,7 @@
- EXTRA_DIST = 00README.NOW.OR.SUFFER README README.cygwin COPYING.GPL \
- 	NEWS.html $(TEMPLFILES) pgpkeys.txt sysconftool
+--- Makefile.in.orig	2015-04-25 13:49:07 UTC
++++ Makefile.in
+@@ -395,8 +395,7 @@ sbin_SCRIPTS = sharedindexinstall shared
+ CLEANFILES = $(databin_SCRIPTS) $(man_MANS) $(sysconf_DATA) $(sbin_SCRIPTS)
+ databindir = $(datadir)
+ databin_SCRIPTS = mkimapdcert mkpop3dcert mkdhparams
+-binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw \
+-	makeimapaccess makedat
++binPROGRAMS = imapd pop3d maildirmake maildiracl deliverquota maildirkw
+ 
+ sbinPROGRAMS = imaplogin pop3login
+ libexecPROGRAMS = makedatprog couriertcpd
+@@ -412,7 +411,7 @@ man_MANS = couriertcpd.1 deliverquota.8 
+ EXTRA_DIST = README README.cygwin COPYING.GPL NEWS.html $(TEMPLFILES) \
+ 	pgpkeys.txt sysconftool
  sysconf_DATA = imapd.dist imapd-ssl.dist pop3d.dist pop3d-ssl.dist \
 -	imapd.cnf pop3d.cnf quotawarnmsg.example
 +	quotawarnmsg.example
  
  libexec_SCRIPTS = imapd.rc imapd-ssl.rc pop3d.rc pop3d-ssl.rc
  HTML2TXT = links -dump -no-numbering -no-references
-@@ -659,8 +659,8 @@
+@@ -793,8 +792,8 @@ install-man1: $(man_MANS)
  	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
  	while read files; do \
  	  test -z "$$files" || { \
@@ -20,7 +30,7 @@
  	done; }
  
  uninstall-man1:
-@@ -690,15 +690,15 @@
+@@ -829,15 +828,15 @@ install-man8: $(man_MANS)
  	sed 'N;N;s,\n, ,g' | { \
  	list=; while read file base inst; do \
  	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
Index: head/mail/courier-imap/pkg-plist
===================================================================
--- head/mail/courier-imap/pkg-plist
+++ head/mail/courier-imap/pkg-plist
@@ -4,6 +4,8 @@
 bin/maildiracl
 bin/maildirkw
 bin/maildirmake
+bin/makedat
+bin/makeimapaccess
 bin/pop3d
 @unexec if cmp -s %D/%%CONFDIR%%/imapd-ssl.dist %D/%%CONFDIR%%/imapd-ssl; then rm -f %D/%%CONFDIR%%/imapd-ssl; fi
 %%CONFDIR%%/imapd-ssl.dist
@@ -36,6 +38,7 @@
 man/man8/imapd.8.gz
 man/man8/mkdhparams.8.gz
 man/man8/mkimapdcert.8.gz
+man/man8/makeimapaccess.8.gz
 man/man8/mkpop3dcert.8.gz
 sbin/imaplogin
 sbin/mkdhparams
@@ -58,12 +61,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/README.maildirquota.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.couriertls
-@exec mkdir -p -m 755 %D/%%CONFDIR%%/shared %D/%%CONFDIR%%/shared
-@exec mkdir -p -m 755 %D/%%CONFDIR%%/shared %D/%%CONFDIR%%/shared.tmp
-@dirrmtry var
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/courier-imap
-@dirrm %%LIBEXECDIR%%
-@dirrm %%CONFDIR%%/shared
-@dirrm %%CONFDIR%%/shared.tmp
-@dirrmtry %%CONFDIR%%
+@dir %%ETCDIR%%/imapaccess
+@dir var
+@dir %%CONFDIR%%/shared
+@dir %%CONFDIR%%/shared.tmp
Index: head/mail/maildrop/Makefile
===================================================================
--- head/mail/maildrop/Makefile
+++ head/mail/maildrop/Makefile
@@ -15,7 +15,7 @@
 # MAILDROP_LOG_COLUMNS	lenght of 'File:' line in log - 8; default: 72
 
 PORTNAME=	maildrop
-PORTVERSION=	2.8.1
+PORTVERSION=	2.8.2
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
@@ -38,7 +38,7 @@
 CONFLICTS=	courier-0.65* libunicode-[0-9]*
 
 LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libunicode.so:${PORTSDIR}/devel/courier-unicode
+		libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
 
 MAILDROP_LOG_COLUMNS?=	72	# lenght of 'File:' line in log
 
@@ -48,7 +48,7 @@
 		libs/maildir/maildirquota.7 libs/maildrop/mailbot.1 \
 		libs/maildrop/maildrop.1.in libs/maildrop/maildropex.7 \
 		libs/maildrop/maildropfilter.7.in libs/maildrop/maildropgdbm.7 \
-		libs/maildrop/makedat.1 libs/maildrop/reformail.1 \
+		libs/maildrop/reformail.1 \
 		libs/rfc2045/makemime.1 libs/rfc2045/reformime.1 \
 		libs/rfc2045/rfc2045.3 libs/rfc822/rfc822.3
 
Index: head/mail/maildrop/distinfo
===================================================================
--- head/mail/maildrop/distinfo
+++ head/mail/maildrop/distinfo
@@ -1,2 +1,2 @@
-SHA256 (maildrop-2.8.1.tar.bz2) = e1dbdc83ca92c614b05feea837dbae6d275e11b9a35728f68c2d4b8042153b64
-SIZE (maildrop-2.8.1.tar.bz2) = 1989926
+SHA256 (maildrop-2.8.2.tar.bz2) = ab505c4c75ec5566f0626ae477c21ca3069ac37f8f31c41b318025d4ee549654
+SIZE (maildrop-2.8.2.tar.bz2) = 1989913
Index: head/mail/maildrop/files/patch-Makefile.in
===================================================================
--- head/mail/maildrop/files/patch-Makefile.in
+++ head/mail/maildrop/files/patch-Makefile.in
@@ -1,6 +1,21 @@
---- Makefile.in.orig	2014-09-01 14:50:09.000000000 +0200
-+++ Makefile.in	2014-09-02 00:46:38.638094906 +0200
-@@ -376,7 +376,7 @@
+--- Makefile.in.orig	2015-04-25 13:56:37 UTC
++++ Makefile.in
+@@ -83,10 +83,10 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-@HAVE_DBLIBRARY_TRUE@am__append_1 = makedat.html
+-@HAVE_DBLIBRARY_TRUE@am__append_2 = makedat.1
+-@HAVE_DBLIBRARY_FALSE@am__append_3 = makedat.html
+-@HAVE_DBLIBRARY_FALSE@am__append_4 = makedat.1
++@HAVE_DBLIBRARY_TRUE@am__append_1 = 
++@HAVE_DBLIBRARY_TRUE@am__append_2 = 
++@HAVE_DBLIBRARY_FALSE@am__append_3 = 
++@HAVE_DBLIBRARY_FALSE@am__append_4 = 
+ subdir = .
+ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ 	$(top_srcdir)/configure $(am__configure_deps) \
+@@ -376,7 +376,7 @@ host_alias = @host_alias@
  host_cpu = @host_cpu@
  host_os = @host_os@
  host_vendor = @host_vendor@
@@ -9,7 +24,7 @@
  includedir = @includedir@
  infodir = @infodir@
  install_sh = @install_sh@
-@@ -411,15 +411,15 @@
+@@ -412,15 +412,15 @@ EXTRA_DIST = README.html INSTALL.html UP
  	maildroptips.txt COPYING.GPL manpage.css $(HTMLWWW)
  
  scriptdir = $(pkgdatadir)/scripts
@@ -29,7 +44,7 @@
  	maildropex.7 maildir.5 maildropfilter.7 maildropgdbm.7 \
  	makemime.1 reformail.1 reformime.1 $(am__append_2)
  EXTRA_LTLIBRARIES = librfc822.la librfc2045.la
-@@ -1257,21 +1257,21 @@
+@@ -1265,21 +1265,21 @@ uninstall-man: uninstall-man1 uninstall-
  
  install-deliverquota:
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -57,7 +72,7 @@
  
  #  In maildrop 0.74, maildirmake was installed as bindir/maildrop.maildirmake
  #  and a soft link was created from maildirmake to maildrop.maildirmake
-@@ -1289,7 +1289,7 @@
+@@ -1297,18 +1297,18 @@ install-maildrop:
  		$(INSTALL_PROGRAM) libs/maildrop/$$f $(DESTDIR)$(bindir)/$$f ; \
  	done
  	$(INSTALL_PROGRAM) libs/liblock/lockmail $(DESTDIR)$(bindir)/lockmail
@@ -65,8 +80,15 @@
 +	$(INSTALL_PROGRAM) libs/maildir/maildirmake $(DESTDIR)$(bindir)/maildrop-maildirmake
  	$(INSTALL_PROGRAM) libs/rfc2045/reformime $(DESTDIR)$(bindir)/reformime
  	$(INSTALL_PROGRAM) libs/rfc2045/makemime $(DESTDIR)$(bindir)/makemime
- 	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
-@@ -1300,7 +1300,7 @@
+-	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
+-		$(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
+-	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
+-		$(INSTALL_SCRIPT)  libs/makedat/makedat     $(DESTDIR)$(bindir)/makedat
++#	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
++#		$(INSTALL_PROGRAM) libs/makedat/makedatprog $(DESTDIR)$(bindir)/makedatprog
++#	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
++#		$(INSTALL_SCRIPT)  libs/makedat/makedat     $(DESTDIR)$(bindir)/makedat
+ 	. libs/maildrop/uidgid ; test -z "$$gid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chgrp $$gid maildrop lockmail
  	. libs/maildrop/uidgid ; test -z "$$uid" && exit 0; test -w /etc || exit 0; cd $(DESTDIR)$(bindir) && chown $$uid maildrop lockmail && chmod 755 maildrop lockmail
  
  uninstall-maildrop:
@@ -75,7 +97,7 @@
  		rm -f $(DESTDIR)$(bindir)/$$f ; \
  	done
  	test "@USE_DB@@USE_GDBM@" = "00" && exit 0; \
-@@ -1354,11 +1354,11 @@
+@@ -1362,11 +1362,11 @@ maildiracl.html: libs/maildir/maildiracl
  maildirkw.html: libs/maildir/maildirkw.html
  	cp -f $(srcdir)/libs/maildir/maildirkw.html maildirkw.html
  
Index: head/mail/maildrop/files/patch-filelock.C
===================================================================
--- head/mail/maildrop/files/patch-filelock.C
+++ head/mail/maildrop/files/patch-filelock.C
@@ -1,11 +0,0 @@
---- libs/maildrop/filelock.C.orig	2013-08-25 20:54:20.000000000 +0200
-+++ libs/maildrop/filelock.C	2013-10-01 17:26:36.724456433 +0200
-@@ -63,7 +63,7 @@
- 		// you're writing to a device file, you know what you're doing.
- 
- 		if (fstat(fd, &stat_buf) >= 0 && (
--			S_ISREG(stat_buf.st_mode) || S_ISDIR(stat_buf.st_mode)))
-+			S_ISCHR(stat_buf.st_mode) || S_ISBLK(stat_buf.st_mode)))
- 		{
- 			return;
- 		}
Index: head/mail/maildrop/files/patch-libs_maildrop_filelock.C
===================================================================
--- head/mail/maildrop/files/patch-libs_maildrop_filelock.C
+++ head/mail/maildrop/files/patch-libs_maildrop_filelock.C
@@ -0,0 +1,11 @@
+--- libs/maildrop/filelock.C.orig	2013-08-25 18:54:20 UTC
++++ libs/maildrop/filelock.C
+@@ -63,7 +63,7 @@ int	flockrc;
+ 		// you're writing to a device file, you know what you're doing.
+ 
+ 		if (fstat(fd, &stat_buf) >= 0 && (
+-			S_ISREG(stat_buf.st_mode) || S_ISDIR(stat_buf.st_mode)))
++			S_ISCHR(stat_buf.st_mode) || S_ISBLK(stat_buf.st_mode)))
+ 		{
+ 			return;
+ 		}
Index: head/mail/maildrop/pkg-plist
===================================================================
--- head/mail/maildrop/pkg-plist
+++ head/mail/maildrop/pkg-plist
@@ -9,8 +9,6 @@
 bin/maildrop-deliverquota
 bin/mailbot
 bin/maildrop-maildirmake
-bin/makedat
-bin/makedatprog
 bin/makemime
 bin/reformail
 bin/reformime
@@ -19,7 +17,6 @@
 man/man1/mailbot.1.gz
 man/man1/maildrop-maildirmake.1.gz
 man/man1/maildrop.1.gz
-man/man1/makedat.1.gz
 man/man1/makemime.1.gz
 man/man1/reformail.1.gz
 man/man1/reformime.1.gz
@@ -56,7 +53,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/maildropfilter.html
 %%PORTDOCS%%%%DOCSDIR%%/maildropgdbm.html
 %%PORTDOCS%%%%DOCSDIR%%/maildroptips.txt
-%%PORTDOCS%%%%DOCSDIR%%/makedat.html
 %%PORTDOCS%%%%DOCSDIR%%/makemime.html
 %%PORTDOCS%%%%DOCSDIR%%/manpage.css
 %%PORTDOCS%%%%DOCSDIR%%/reformail.html
Index: head/mail/sqwebmail/Makefile
===================================================================
--- head/mail/sqwebmail/Makefile
+++ head/mail/sqwebmail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sqwebmail
-PORTVERSION=	5.8.1
+PORTVERSION=	5.8.2
 CATEGORIES=	mail www
 MASTER_SITES=	SF/courier/webmail/${PORTVERSION}
 
@@ -12,7 +12,7 @@
 BUILD_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
 RUN_DEPENDS=	courierauthconfig:${PORTSDIR}/security/courier-authlib-base
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libunicode.so:${PORTSDIR}/devel/courier-unicode
+		libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
 
 CFLAGS:=	-I${LOCALBASE}/include -L${LOCALBASE}/lib ${CFLAGS:S/^[:space:]*//}
 CXXFLAGS:=	-I${LOCALBASE}/include ${CXXFLAGS:S/^[:space:]*//}
@@ -40,6 +40,8 @@
 RCDIR?=		${PREFIX}/etc/rc.d
 CACHEDIR?=	/var/sqwebmail/cache
 CACHEOWNER?=	bin
+MAILOWN?=	courier
+MAILGRP?=	courier
 
 # set WITH_TIMEOUTHARD to something other than 7200 seconds (2hr)
 # set WITH_TIMEOUTSOFT to something other than 1200 seconds (20m)
@@ -65,20 +67,24 @@
 		--with-locking-method=fcntl \
 		--with-libintl-prefix=${LOCALBASE} \
 		${ICONV_CONFIGURE_ARG} \
-		--cache-file=${WRKDIR}/sqwebmail.cache
+		--cache-file=${WRKDIR}/sqwebmail.cache \
+		--with-mailuser=${MAILOWN} \
+		--with-mailgroup=${MAILGRP}
 
 PLIST_SUB+=	CGIBINDIR=${CGIBINDIR} \
 		CGIBINSUBDIR=${CGIBINSUBDIR} \
 		WEBDATADIR=${WEBDATADIR} \
-		WEBDATASUBDIR=${WEBDATASUBDIR}
+		WEBDATASUBDIR=${WEBDATASUBDIR} \
+		MAILOWN=${MAILOWN} \
+		MAILGRP=${MAILGRP} \
+		CACHEDIR=${CACHEDIR} \
+		CACHEOWN=${CACHEOWNER}
 
 EXTRA_DOCS=	README README.logindomainlist.html README.pam \
 		libs/sqwebmail/ChangeLog \
 		libs/maildir/README.maildirquota.txt \
 		libs/maildir/README.sharedfolders.txt
 
-INSTALL_TARGET=	install-strip install-configure
-
 .include <bsd.port.pre.mk>
 
 .if exists(${.CURDIR}/../../security/courier-authlib/Makefile.dep)
@@ -196,4 +202,8 @@
 	@${ECHO_MSG} "0 * * * * ${CACHEOWNER} ${PREFIX}/share/sqwebmail/cleancache.pl"
 	@${ECHO_MSG} ""
 
+post-install:
+	@${MV} ${STAGEDIR}/${ETCDIR}/ldapaddressbook.dist ${STAGEDIR}/${ETCDIR}/ldapaddressbook.sample
+	@${MV} ${STAGEDIR}/${ETCDIR}/sqwebmaild.dist ${STAGEDIR}/${ETCDIR}/sqwebmaild.sample
+
 .include <bsd.port.post.mk>
Index: head/mail/sqwebmail/distinfo
===================================================================
--- head/mail/sqwebmail/distinfo
+++ head/mail/sqwebmail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sqwebmail-5.8.1.tar.bz2) = 490bd1f3aac5c99965c8d0e7f35814304eedd10db5a42976ad3ecc9dde15dd76
-SIZE (sqwebmail-5.8.1.tar.bz2) = 3512211
+SHA256 (sqwebmail-5.8.2.tar.bz2) = 5a0a722a8e09b2ab318c91e3a09888564826616d26635799c52b4c545dfde7d9
+SIZE (sqwebmail-5.8.2.tar.bz2) = 3514846
Index: head/mail/sqwebmail/pkg-plist
===================================================================
--- head/mail/sqwebmail/pkg-plist
+++ head/mail/sqwebmail/pkg-plist
@@ -1,9 +1,5 @@
-@unexec if cmp %D/%%ETCDIR%%/ldapaddressbook %D/%%ETCDIR%%/ldapaddressbook.dist ; then rm -vf %D/%%ETCDIR%%/ldapaddressbook ; fi
-%%ETCDIR%%/ldapaddressbook.dist
-@exec [ -f %D/%%ETCDIR%%/ldapaddressbook ] || cp -v %D/%%ETCDIR%%/ldapaddressbook.dist %D/%%ETCDIR%%/ldapaddressbook
-@unexec if cmp %D/%%ETCDIR%%/sqwebmaild %D/%%ETCDIR%%/sqwebmaild.dist ; then rm -vf %D/%%ETCDIR%%/sqwebmaild ; fi
-%%ETCDIR%%/sqwebmaild.dist
-@exec [ -f %D/%%ETCDIR%%/sqwebmaild ] || cp -v %D/%%ETCDIR%%/sqwebmaild.dist %D/%%ETCDIR%%/sqwebmaild
+@sample %%ETCDIR%%/ldapaddressbook.sample
+@sample %%ETCDIR%%/sqwebmaild.sample
 @unexec [ -f /var/sqwebmail/run/sqwebmail.pid ] && %D/etc/rc.d/sqwebmail-sqwebmaild stop || true
 libexec/sqwebmail/deliverquota
 libexec/sqwebmail/maildirmake
@@ -11,7 +7,7 @@
 libexec/sqwebmail/pcpd
 libexec/sqwebmail/reformime
 libexec/sqwebmail/sqwebmaild
-libexec/sqwebmail/sqwebpasswd
+@(%%MAILOWN%%,%%MAILGRP%%,2755) libexec/sqwebmail/sqwebpasswd
 libexec/sqwebmaild.rc
 man/man1/maildirmake.1.gz
 man/man8/deliverquota.8.gz
@@ -81,7 +77,7 @@
 %%PORTDOCS%%%%DOCSDIR%%/README.sharedfolders.txt
 %%PORTDOCS%%@dir %%DOCSDIR%%
 @dir etc/sqwebmail
-%%CACHE%%@dir /var/sqwebmail/cache
+%%CACHE%%@dir(%%CACHEOWN%%,,) %%CACHEDIR%%
 @dir /var/sqwebmail/calendar/public
 @dir /var/sqwebmail/calendar/private
 @dir /var/sqwebmail/calendar/localcache
Index: head/net/courier-authlib-ldap/Makefile
===================================================================
--- head/net/courier-authlib-ldap/Makefile
+++ head/net/courier-authlib-ldap/Makefile
@@ -1,7 +1,7 @@
 # Created by: Yarema <yds@CoolRat.org>
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	0
 PKGNAMESUFFIX=	-ldap
 
 COMMENT=	LDAP support for the Courier authentication library
Index: head/security/courier-authlib-base/Makefile
===================================================================
--- head/security/courier-authlib-base/Makefile
+++ head/security/courier-authlib-base/Makefile
@@ -1,7 +1,7 @@
 # Created by: Oliver Lehmann <oliver@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	0
 PKGNAMESUFFIX=	-base
 
 COMMENT=	Courier authentication library base
Index: head/security/courier-authlib/Makefile
===================================================================
--- head/security/courier-authlib/Makefile
+++ head/security/courier-authlib/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.66.1
+PORTVERSION=	0.66.2
 PORTREVISION?=	0
 CATEGORIES?=	security mail
 .if defined(PKGNAMESUFFIX)
@@ -31,7 +31,8 @@
 
 .else	# !defined(PKGNAMESUFFIX)
 
-LIB_DEPENDS+=	libltdl.so:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS+=	libltdl.so:${PORTSDIR}/devel/libltdl \
+		libcourier-unicode.so:${PORTSDIR}/devel/courier-unicode
 
 USES=		iconv gmake libtool perl5 tar:bzip2
 GNU_CONFIGURE=	yes
@@ -167,7 +168,8 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g;  \
-		s|mysql_connect|mysql_real_connect|g' \
+		s|mysql_connect|mysql_real_connect|g; \
+		s|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/*/configure \
 		${WRKSRC}/configure
 .for subdir in ${REMOVE_SUBDIRS}
@@ -186,10 +188,12 @@
 	fi
 
 post-install:
+.if !empty(DOCS)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
+.endif
 
 .endif	# !defined(PKGNAMESUFFIX)
 
Index: head/security/courier-authlib/distinfo
===================================================================
--- head/security/courier-authlib/distinfo
+++ head/security/courier-authlib/distinfo
@@ -1,2 +1,2 @@
-SHA256 (courier-authlib-0.66.1.tar.bz2) = 8f89166f57c8e59f445fe0135da92b95f1c4417896d01eda5e2e94d8ff878fe8
-SIZE (courier-authlib-0.66.1.tar.bz2) = 2299965
+SHA256 (courier-authlib-0.66.2.tar.bz2) = ed104562b6bc6a2c6212d73b647f5526da68cf262e0c1d2c1ee478182b8f87a9
+SIZE (courier-authlib-0.66.2.tar.bz2) = 2081381
Index: head/security/courier-authlib/files/patch-Makefile.in
===================================================================
--- head/security/courier-authlib/files/patch-Makefile.in
+++ head/security/courier-authlib/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2013-11-11 19:58:27.000000000 +0100
-+++ Makefile.in	2013-12-30 11:45:33.000000000 +0100
-@@ -85,11 +85,10 @@
+--- Makefile.in.orig	2015-04-25 14:07:07 UTC
++++ Makefile.in
+@@ -85,11 +85,10 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
  build_triplet = @build@
  host_triplet = @host@
@@ -13,10 +13,10 @@
 +@HAVE_BASE_TRUE@bin_PROGRAMS = courierauthconfig$(EXEEXT)
 +@HAVE_BASE_TRUE@noinst_PROGRAMS = authdaemontest$(EXEEXT) authmksock$(EXEEXT) \
 +@HAVE_BASE_TRUE@	authdaemondprog$(EXEEXT)
+ @HAVE_SGML_TRUE@am__append_1 = $(GITFILES)
  subdir = .
- DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- 	$(top_srcdir)/configure $(am__configure_deps) \
-@@ -218,6 +217,12 @@
+ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+@@ -220,6 +219,13 @@ libauthuserdb_la_LINK = $(LIBTOOL) $(AM_
  	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
  	$(AM_CFLAGS) $(CFLAGS) $(libauthuserdb_la_LDFLAGS) $(LDFLAGS) \
  	-o $@
@@ -26,10 +26,11 @@
 +libauthvchkpw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 +	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +	$(libauthvchkpw_la_LDFLAGS) $(LDFLAGS) -o $@
++
  libcourierauth_la_DEPENDENCIES = libs/libhmac/libhmac.la \
  	libs/md5/libmd5.la libs/sha1/libsha1.la \
  	libs/numlib/libnumlib.la libs/random128/librandom128.la \
-@@ -334,6 +339,8 @@
+@@ -336,6 +342,8 @@ SOURCES = $(libauthcustom_la_SOURCES) $(
  	$(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \
  	$(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \
  	$(libauthsqlite_la_SOURCES) $(libauthuserdb_la_SOURCES) \
@@ -38,7 +39,7 @@
  	$(libcourierauth_la_SOURCES) \
  	$(libcourierauthcommon_la_SOURCES) \
  	$(libcourierauthsasl_la_SOURCES) \
-@@ -501,6 +508,7 @@
+@@ -503,6 +511,7 @@ LIBAUTHPWD = @LIBAUTHPWD@
  LIBAUTHSHADOW = @LIBAUTHSHADOW@
  LIBAUTHSQLITE = @LIBAUTHSQLITE@
  LIBAUTHUSERDB = @LIBAUTHUSERDB@
@@ -46,14 +47,14 @@
  LIBDB = @LIBDB@
  LIBDL = @LIBDL@
  LIBGDBM = @LIBGDBM@
-@@ -623,21 +631,27 @@
+@@ -625,21 +634,27 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  userdb = @userdb@
  AUTOMAKE_OPTIONS = dist-bzip2
--SUBDIRS = libs/gdbmobj libs/bdbobj libs/md5 libs/sha1 libs/libhmac libs/numlib libs/makedat userdb libs/unicode libs/rfc822 libs/random128 libs/liblock liblog
+-SUBDIRS = libs/gdbmobj libs/bdbobj libs/md5 libs/sha1 libs/libhmac libs/numlib libs/makedat userdb libs/rfc822 libs/random128 libs/liblock liblog
 +SUBDIRS = libs/gdbmobj libs/bdbobj libs/md5 libs/sha1 libs/libhmac libs/numlib
 +@HAVE_USERDB_TRUE@SUBDIRS+= libs/makedat userdb
-+SUBDIRS += libs/unicode libs/rfc822 libs/random128
++SUBDIRS += libs/rfc822 libs/random128
 +@HAVE_BASE_TRUE@SUBDIRS+= libs/liblock liblog
  AM_CPPFLAGS = -I liblock $(LTDLINCL)
  modules = @LIBAUTHUSERDB@ \
@@ -79,7 +80,7 @@
  	libauthpgsql.la \
  	libauthldap.la \
  	libauthmysql.la \
-@@ -711,6 +725,13 @@
+@@ -713,6 +728,13 @@ libauthshadow_la_DEPENDENCIES = $(common
  libauthshadow_la_LIBADD = $(commonlibadd) $(libauthshadow_t)
  libauthshadow_la_LDFLAGS = $(commonldflags)
  
@@ -93,7 +94,7 @@
  # The authpgsql module
  libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@
  libauthpgsql_la_SOURCES = authpgsql.c preauthpgsql.c authpgsqllib.c authpgsql.h
-@@ -790,8 +811,8 @@
+@@ -792,8 +814,8 @@ libcourierauthsaslclient_la_SOURCES = co
  
  libcourierauthsaslclient_la_LIBADD = libcourierauth.la
  libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version
@@ -104,7 +105,7 @@
  
  courierauthconfig_SOURCES = authinfo.c
  authpasswd_SOURCES = authpasswd.c
-@@ -832,7 +853,7 @@
+@@ -834,7 +856,7 @@ authmksock_LDADD = @NETLIBS@
  man3 = authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \
  	auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3
  
@@ -113,7 +114,7 @@
  man_MANS = $(man1) $(man3) auth_sasl_ex.3
  BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \
  	authdaemonrc.h packageversion.h \
-@@ -989,6 +1010,9 @@
+@@ -993,6 +1015,9 @@ libauthsqlite.la: $(libauthsqlite_la_OBJ
  libauthuserdb.la: $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_DEPENDENCIES) $(EXTRA_libauthuserdb_la_DEPENDENCIES) 
  	$(AM_V_CCLD)$(libauthuserdb_la_LINK)  $(libauthuserdb_la_OBJECTS) $(libauthuserdb_la_LIBADD) $(LIBS)
  
@@ -123,7 +124,7 @@
  libcourierauth.la: $(libcourierauth_la_OBJECTS) $(libcourierauth_la_DEPENDENCIES) $(EXTRA_libcourierauth_la_DEPENDENCIES) 
  	$(AM_V_CCLD)$(libcourierauth_la_LINK) -rpath $(pkglibdir) $(libcourierauth_la_OBJECTS) $(libcourierauth_la_LIBADD) $(LIBS)
  
-@@ -1258,6 +1282,8 @@
+@@ -1262,6 +1287,8 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authtest.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdb.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/authuserdbpwd.Plo@am__quote@
@@ -132,7 +133,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpassword.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordmd5.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checkpasswordsha1.Plo@am__quote@
-@@ -1275,6 +1301,7 @@
+@@ -1279,6 +1306,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthsqlite.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdb.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthuserdbcommon.Plo@am__quote@
@@ -140,7 +141,7 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -1771,18 +1798,26 @@
+@@ -1782,18 +1810,26 @@ info: info-recursive
  
  info-am:
  
@@ -175,7 +176,7 @@
  install-html: install-html-recursive
  
  install-html-am:
-@@ -1862,14 +1897,20 @@
+@@ -1873,14 +1909,18 @@ uninstall-man: uninstall-man1 uninstall-
  	uninstall-sbinPROGRAMS uninstall-sbinSCRIPTS
  
  
@@ -194,12 +195,10 @@
 -@HAVE_AUTHPGSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authpgsqlrc@.dist
 -@HAVE_AUTHPGSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.dist
 +@HAVE_AUTHPGSQL_TRUE@		$(DESTDIR)@authpgsqlrc@.sample
-+@HAVE_AUTHPGSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authpgsqlrc@.sample
-+@HAVE_AUTHPGSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authpgsqlrc@.sample
  
  @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc:
  @HAVE_AUTHPGSQL_TRUE@	rm -f $(DESTDIR)@authpgsqlrc@.dist
-@@ -1888,9 +1929,9 @@
+@@ -1899,9 +1939,7 @@ authldaplib.lo: authldaplib.c authldaprc
  @HAVE_LDAP_TRUE@install-authldaprc:
  @HAVE_LDAP_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :
  @HAVE_LDAP_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \
@@ -207,12 +206,10 @@
 -@HAVE_LDAP_TRUE@	-chown @mailuser@ $(DESTDIR)@authldaprc@.dist
 -@HAVE_LDAP_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authldaprc@.dist
 +@HAVE_LDAP_TRUE@		$(DESTDIR)@authldaprc@.sample
-+@HAVE_LDAP_TRUE@	-chown @mailuser@ $(DESTDIR)@authldaprc@.sample
-+@HAVE_LDAP_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authldaprc@.sample
  
  @HAVE_LDAP_TRUE@uninstall-authldaprc:
  @HAVE_LDAP_TRUE@	rm -f $(DESTDIR)@authldaprc@.dist
-@@ -1901,6 +1942,19 @@
+@@ -1912,6 +1950,18 @@ authldaplib.lo: authldaplib.c authldaprc
  @HAVE_LDAP_FALSE@uninstall-authldaprc:
  @HAVE_LDAP_FALSE@	@:
  
@@ -227,12 +224,11 @@
 +
 +@HAVE_LDAP_FALSE@install-ldapschema:
 +@HAVE_LDAP_FALSE@	@:
-+		
 +
  authldaprc.h:
  	echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
  
-@@ -1909,9 +1963,9 @@
+@@ -1920,9 +1970,7 @@ authmysqllib.lo: authmysqllib.c authmysq
  @HAVE_AUTHMYSQL_TRUE@install-authmysqlrc:
  @HAVE_AUTHMYSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :
  @HAVE_AUTHMYSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \
@@ -240,12 +236,10 @@
 -@HAVE_AUTHMYSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authmysqlrc@.dist
 -@HAVE_AUTHMYSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.dist
 +@HAVE_AUTHMYSQL_TRUE@		$(DESTDIR)@authmysqlrc@.sample
-+@HAVE_AUTHMYSQL_TRUE@	-chown @mailuser@ $(DESTDIR)@authmysqlrc@.sample
-+@HAVE_AUTHMYSQL_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authmysqlrc@.sample
  
  @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc:
  @HAVE_AUTHMYSQL_TRUE@	rm -f $(DESTDIR)@authmysqlrc@.dist
-@@ -1930,9 +1984,9 @@
+@@ -1941,9 +1989,7 @@ authsqlitelib.lo: authsqlitelib.c authsq
  @HAVE_AUTHSQLITE_TRUE@install-authsqliterc:
  @HAVE_AUTHSQLITE_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || :
  @HAVE_AUTHSQLITE_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authsqliterc \
@@ -253,12 +247,10 @@
 -@HAVE_AUTHSQLITE_TRUE@	-chown @mailuser@ $(DESTDIR)@authsqliterc@.dist
 -@HAVE_AUTHSQLITE_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authsqliterc@.dist
 +@HAVE_AUTHSQLITE_TRUE@		$(DESTDIR)@authsqliterc@.sample
-+@HAVE_AUTHSQLITE_TRUE@	-chown @mailuser@ $(DESTDIR)@authsqliterc@.sample
-+@HAVE_AUTHSQLITE_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authsqliterc@.sample
  
  @HAVE_AUTHSQLITE_TRUE@uninstall-authsqliterc:
  @HAVE_AUTHSQLITE_TRUE@	rm -f $(DESTDIR)@authsqliterc@.dist
-@@ -1951,16 +2005,22 @@
+@@ -1962,16 +2008,20 @@ authpipelib.lo: authpipelib.c authpipeli
  authpiperc.h:
  	echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h
  
@@ -270,12 +262,10 @@
 -	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.dist
 -	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.dist
 +@HAVE_BASE_TRUE@install-authdaemonrc:
-+@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@`
++@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authdaemonrc@` || :
 +@HAVE_BASE_TRUE@	sed 's/@ALLMODULES@/$(modules:lib%.la=%)/' <authdaemonrc >authdaemonrc.tmp
 +@HAVE_BASE_TRUE@	$(INSTALL_DATA) -m 660 authdaemonrc.tmp $(DESTDIR)@authdaemonrc@.sample
 +@HAVE_BASE_TRUE@	rm -f authdaemonrc.tmp
-+@HAVE_BASE_TRUE@	-chown @mailuser@ $(DESTDIR)@authdaemonrc@.sample
-+@HAVE_BASE_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authdaemonrc@.sample
  
 -uninstall-authdaemonrc:
 -	rm -f $(DESTDIR)@authdaemonrc@.dist
@@ -290,7 +280,7 @@
  
  authdaemonrc.h:
  	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h
-@@ -2003,24 +2063,30 @@
+@@ -2014,24 +2064,24 @@ dist-hook:
  # automake still a bit stupid...
  
  install-data-hook: install-authdaemonrc install-authpgsqlrc \
@@ -314,17 +304,11 @@
 +@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)$(sbindir) || :
 +@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
 +@HAVE_BASE_TRUE@	chmod 755 $(DESTDIR)$(pkglibexecdir)
-+@HAVE_BASE_TRUE@	-chown @mailuser@ $(DESTDIR)$(pkglibexecdir)
-+@HAVE_BASE_TRUE@	-chgrp @mailgroup@ $(DESTDIR)$(pkglibexecdir)
 +@HAVE_USERDB_TRUE@	$(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) || :
 +@HAVE_USERDB_TRUE@	chmod 755 $(DESTDIR)$(pkglibexecdir)
-+@HAVE_USERDB_TRUE@	-chown @mailuser@ $(DESTDIR)$(pkglibexecdir)
-+@HAVE_USERDB_TRUE@	-chgrp @mailgroup@ $(DESTDIR)$(pkglibexecdir)
 +@HAVE_BASE_TRUE@	$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) authdaemondprog $(DESTDIR)$(pkglibexecdir)/authdaemond
 +@HAVE_BASE_TRUE@	$(mkinstalldirs) $(DESTDIR)@authdaemonvar@ || :
 +@HAVE_BASE_TRUE@	chmod 750 $(DESTDIR)@authdaemonvar@
-+@HAVE_BASE_TRUE@	-chown @mailuser@ $(DESTDIR)@authdaemonvar@
-+@HAVE_BASE_TRUE@	-chgrp @mailgroup@ $(DESTDIR)@authdaemonvar@
  	test "@LIBAUTHUSERDB@" = "" && exit 0 ;\
  		$(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) libs/makedat/makedatprog \
  				$(DESTDIR)$(pkglibexecdir)/makedatprog ; \
@@ -333,7 +317,7 @@
  		$(INSTALL_SCRIPT) userdb/pw2userdb \
  				$(DESTDIR)$(sbindir)/pw2userdb ; \
  		$(INSTALL_SCRIPT) userdb/makeuserdb \
-@@ -2033,9 +2099,10 @@
+@@ -2044,9 +2094,10 @@ install-exec-hook:
  				$(DESTDIR)$(sbindir)/userdb-test-cram-md5
  
  uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc uninstall-authsqliterc
@@ -345,12 +329,12 @@
  				$(DESTDIR)$(sbindir)/pw2userdb \
  				$(DESTDIR)$(sbindir)/makeuserdb \
  				$(DESTDIR)$(sbindir)/userdb \
-@@ -2046,7 +2113,7 @@
+@@ -2057,7 +2108,7 @@ authlib.html: authlib.html.in
  	$(SHELL) ./config.status --file=authlib.html
  
  authlib.3: authlib.3.in
 -	$(SHELL) ./config.status --file=authlib.3
 +@HAVE_BASE_TRUE@	$(SHELL) ./config.status --file=authlib.3
  
- @HAVE_SGML_TRUE@authpasswd.html: authpasswd.sgml libs/docbook/sgml2html
- @HAVE_SGML_TRUE@	libs/docbook/sgml2html authpasswd.sgml authpasswd.html 
+ @HAVE_SGML_TRUE@$(GITFILES): %: %.git
+ @HAVE_SGML_TRUE@	perl -p -e 's/\$$Id:[^\$$]*/\$$Id: '"`git log --pretty=format:\"%H\" -n 1 -- $<`-`date +%Y%m%d%H%M%S`/" <$< >$@.tmp
Index: head/security/courier-authlib/files/patch-configure
===================================================================
--- head/security/courier-authlib/files/patch-configure
+++ head/security/courier-authlib/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2012-10-14 12:45:02.000000000 +0200
-+++ configure	2012-10-14 12:46:15.000000000 +0200
-@@ -622,6 +622,10 @@
+--- configure.orig	2015-04-25 14:07:07 UTC
++++ configure
+@@ -642,6 +642,10 @@ ltdl_LIBOBJS
  am__EXEEXT_FALSE
  am__EXEEXT_TRUE
  LTLIBOBJS
@@ -11,7 +11,7 @@
  LIBOBJS
  HAVE_SGML_FALSE
  HAVE_SGML_TRUE
-@@ -656,6 +660,9 @@
+@@ -676,6 +680,9 @@ LIBAUTHPGSQL
  PGSQL_LIBS
  PG_CONFIG
  authpgsqlrc
@@ -21,7 +21,7 @@
  LIBAUTHPWD
  LIBAUTHSHADOW
  SHADOWLIBS
-@@ -1519,6 +1526,7 @@
+@@ -1546,6 +1553,7 @@ Optional Packages:
   --with-authldaprc=filename         Expect to find authldaprc here
   --without-authpwd                  Do not include the authpwd module
   --without-authshadow               Do not include the authshadow module
@@ -29,7 +29,7 @@
   --with-authpgsqlrc=filename        Expect to find authpgsql here
   --without-authpgsql               Do not include the authpgsql module
   --with-pgsql-libs=DIR		Look for pgsql libs in this dir
-@@ -2755,7 +2763,7 @@
+@@ -2795,7 +2803,7 @@ else
  fi
  
  fi
@@ -38,7 +38,16 @@
  
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
  $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-@@ -13532,8 +13540,12 @@
+@@ -13456,7 +13464,7 @@ LIBS="$saveLIBS"
+ 
+ 
+ save_LIBS="$LIBS"
+-LIBS="-lcourier-unicode"
++LIBS="-L%%LOCALBASE%%/lib -lcourier-unicode"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -13749,8 +13757,12 @@ fi
  
  if test "$doauthuserdb" = "no"
  then
@@ -51,7 +60,7 @@
  	AUTHUSERDB="authuserdb"
  	LIBAUTHUSERDB="libauthuserdb.la"
  
-@@ -13991,6 +14003,20 @@
+@@ -14208,6 +14220,20 @@ else
  fi
  
  
@@ -72,7 +81,7 @@
  
   if test "$HAVE_LDAP" = 1; then
    HAVE_LDAP_TRUE=
-@@ -14209,6 +14235,256 @@
+@@ -14426,6 +14452,256 @@ fi
  
  
  
Index: head/security/courier-authlib/files/patch-liblock__locktest.c
===================================================================
--- head/security/courier-authlib/files/patch-liblock__locktest.c
+++ head/security/courier-authlib/files/patch-liblock__locktest.c
@@ -1,81 +0,0 @@
---- libs/liblock/locktest.c.orig	Mon Dec  6 14:18:55 1999
-+++ libs/liblock/locktest.c	Sun May 15 08:00:42 2005
-@@ -5,6 +5,7 @@
- 
- /* $Id */
- 
-+#include	<paths.h>
- #include	"liblock.h"
- #if	USE_FCNTL
- #include	"lockfcntl.c"
-@@ -20,11 +21,23 @@
- 
- int main()
- {
-+#define FILENAME	"courier-authlib.locktest.XXXXX"
- int	fd[2];
- pid_t	p;
- int	s;
- int	f;
- 
-+	char *name;
-+	const char *tmpdir;
-+	if ((tmpdir = (char *)getenv("TMPDIR")) == NULL)
-+		tmpdir = _PATH_TMP;
-+	(void)asprintf(&name, "%s%s%s", tmpdir,
-+		(tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME);
-+	if (name == NULL) {
-+		perror("get filename");
-+		exit(1);
-+	}
-+
- 	signal(SIGCHLD, SIG_DFL);
- 	if (pipe(fd))
- 	{
-@@ -32,6 +45,12 @@
- 		return (1);
- 	}
- 
-+	if ((f=mkstemp(name)) < 0)
-+	{
-+		perror("open");
-+		exit(1);
-+	}
-+
- 	if ((p=fork()) == (pid_t)-1)
- 	{
- 		perror("fork");
-@@ -46,7 +65,7 @@
- 		read(fd[0], &c, 1);
- 		close(fd[0]);
- 
--		if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
-+		if ((f=open(name, O_RDWR)) < 0)
- 		{
- 			perror("open");
- 			exit(1);
-@@ -56,22 +75,18 @@
- 		if (ll_lockfd(f, ll_writelock, 0, 0))
- 		{
- 			close(f);
-+			unlink(name);
- 			exit(0);
- 		}
- 		close(f);
- 		exit(1);
- 	}
--	
--	if ((f=open("conftest.lock", O_RDWR|O_CREAT, 0644)) < 0)
--	{
--		perror("open");
--		exit(1);
--	}
- 
- 	if (ll_lockfd(f, ll_writelock, 0, 0))
- 	{
- 		perror("lock");
- 		close(f);
-+		unlink(name);
- 		exit(1);
- 	}
- 	close(fd[1]);
Index: head/security/courier-authlib/files/patch-libs_liblock_locktest.c
===================================================================
--- head/security/courier-authlib/files/patch-libs_liblock_locktest.c
+++ head/security/courier-authlib/files/patch-libs_liblock_locktest.c
@@ -0,0 +1,38 @@
+--- libs/liblock/locktest.c.orig	2014-07-13 13:58:08 UTC
++++ libs/liblock/locktest.c
+@@ -3,6 +3,7 @@
+ ** distribution information.
+ */
+ 
++#include	<paths.h>
+ #include	"liblock.h"
+ #if	USE_FCNTL
+ #include	"lockfcntl.c"
+@@ -20,7 +21,7 @@
+ 
+ int main()
+ {
+-#define FILENAME	"courier-imap.locktest.XXXXXXXXXX"
++#define FILENAME	"courier-authlib.locktest.XXXXXXXXXX"
+ int	fd[2];
+ pid_t	p;
+ int	s;
+@@ -29,7 +30,7 @@ int	f;
+ 	char *name;
+ 	const char *tmpdir;
+ 	if ((tmpdir = (char *)getenv("TMPDIR")) == NULL || !*tmpdir)
+-		tmpdir = "/tmp";
++		tmpdir = _PATH_TMP;
+ 
+ 	if ((name=malloc(strlen(tmpdir)+sizeof(FILENAME)+1)) == NULL)
+ 	{
+@@ -37,7 +38,8 @@ int	f;
+ 		exit(1);
+ 	}
+ 
+-	(void)sprintf(name, "%s/%s", tmpdir, FILENAME);
++	(void)sprintf(name, "%s%s%s", tmpdir,
++		(tmpdir[strlen(tmpdir) - 1] == '/') ? "" : "/", FILENAME);
+ 
+ 	signal(SIGCHLD, SIG_DFL);
+ 	if (pipe(fd))
Index: head/security/courier-authlib/pkg-descr
===================================================================
--- head/security/courier-authlib/pkg-descr
+++ head/security/courier-authlib/pkg-descr
@@ -6,4 +6,4 @@
 2. Read an account name, and a password. If valid, determine the
    account's home directory, system userid, and groupid.
 
-WWW:	http://www.Courier-MTA.org/authlib/
+WWW: http://www.Courier-MTA.org/authlib/
Index: head/security/courier-authlib/pkg-plist-base
===================================================================
--- head/security/courier-authlib/pkg-plist-base
+++ head/security/courier-authlib/pkg-plist-base
@@ -15,7 +15,7 @@
 libexec/courier-authlib/authdaemond
 libexec/courier-authlib/authsystem.passwd
 man/man1/authtest.1.gz
-man/man1/%%MAILOWN%%logger.1.gz
+man/man1/courierlogger.1.gz
 man/man3/auth_enumerate.3.gz
 man/man3/auth_generic.3.gz
 man/man3/auth_getoption.3.gz