4 files changed, 33 insertions, 24 deletions
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 90c5f6f2695b..53908f79338d 100644
--- a/mail/courier-imap/Makefile
+++ b/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 @@ MAINTAINER=	oliver@FreeBSD.org
 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 @@ LDFLAGS+=	-L${LOCALBASE}/lib -L${PREFIX}/lib
 CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
 
 MAKE_ENV:=	${CONFIGURE_ENV}
+ALL_TARGET=	all makeimapaccess makedat
 
 #
 # options available:
@@ -122,6 +124,8 @@ post-patch:
 		${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 @@ post-install:
 	${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"
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index a368c99189e0..bc8c29e77857 100644
--- a/mail/courier-imap/distinfo
+++ b/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
diff --git a/mail/courier-imap/files/patch-Makefile.in b/mail/courier-imap/files/patch-Makefile.in
index d5e6c2cf6650..0415259661c8 100644
--- a/mail/courier-imap/files/patch-Makefile.in
+++ b/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 \
diff --git a/mail/courier-imap/pkg-plist b/mail/courier-imap/pkg-plist
index c0a69db0a985..1354fc0dc183 100644
--- a/mail/courier-imap/pkg-plist
+++ b/mail/courier-imap/pkg-plist
@@ -4,6 +4,8 @@ bin/imapd
 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/deliverquota.8.gz
 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 @@ share/courier-imap/mkpop3dcert
 %%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