- Update devel/courier-unicode to 2.1

- Convert to USES localbase
- Update mail/cone to 1.0 [1]
- Update mail/courier-imap to 5.0.0
- Add LICENSE
- Update mail/maildrop to 3.0.0
- Remove IDN option since it's now mandatory
- Update mail/sqwebmail to 6.0.0 [2]
- Update security/courier-authlib to 0.69.0
- Add note to UPDATING
- Silence some portlint warnings

PR:			231471 [1]
Submitted by:		me
Approved by:		Maintainer timeout [1],
			oliver@ [2]
Differential Revision:	https://reviews.freebsd.org/D17234

19 files changed, 111 insertions, 94 deletions

diff --git a/UPDATING b/UPDATING
index ae5487f1110e..626a31f7936e 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,21 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20181010:
+  AFFECTS: users of mail/courier-imap and other courier ports
+  AUTHOR: madpilot@FreeBSD.org
+
+  Courier-IMAP 5.0.0 added IMAP UTF8 support, and converted maildir
+  folders' names to Unicode.
+
+  Updating an existing system to Courier-IMAP 5.0, and later,
+  requires a manual one-time conversion of all existing maildirs
+  using the maildirmake command. See the maildirmake(1) manual page
+  for more information.
+
+  All other courier ports accessing maildirs also need to be updated
+  at the same time.
+
 20181009:
   AFFECTS: users of devel/pecl-xdebug*
   AUTHOR: pizzamig@FreeBSD.org
diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile
index b378e332bcc0..8e628efa8b34 100644
--- a/databases/courier-authlib-mysql/Makefile
+++ b/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
diff --git a/databases/courier-authlib-pgsql/Makefile b/databases/courier-authlib-pgsql/Makefile
index cd49c5448051..31a1fdbd9634 100644
--- a/databases/courier-authlib-pgsql/Makefile
+++ b/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
diff --git a/devel/courier-unicode/Makefile b/devel/courier-unicode/Makefile
index be4d55e30bb0..f4c89ded8b9f 100644
--- a/devel/courier-unicode/Makefile
+++ b/devel/courier-unicode/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	courier-unicode
-PORTVERSION=	2.0
-PORTREVISION=	1
+PORTVERSION=	2.1
 CATEGORIES=	devel mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
@@ -13,13 +12,12 @@ LICENSE=	GPLv3
 
 CONFLICTS=	libunicode-[0-9]*
 
-USES=		compiler:c++11-lang iconv libtool perl5 tar:bzip2
+USES=		compiler:c++11-lang iconv libtool localbase:ldflags \
+		perl5 tar:bzip2
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} 's/-liconv/${ICONV_LIB}/' ${WRKSRC}/configure
diff --git a/devel/courier-unicode/distinfo b/devel/courier-unicode/distinfo
index 82b2aab4d2de..cfdbd7359cd5 100644
--- a/devel/courier-unicode/distinfo
+++ b/devel/courier-unicode/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499009098
-SHA256 (courier-unicode-2.0.tar.bz2) = 6b46011d465918af7d0ed41fbf21d918449820bd3ef7e651dbc56eb2933a8711
-SIZE (courier-unicode-2.0.tar.bz2) = 446215
+TIMESTAMP = 1537269115
+SHA256 (courier-unicode-2.1.tar.bz2) = 684cba7fe722b084ae1ffb0a7f71999756409d5ad4c84bce0efeb8887943ea21
+SIZE (courier-unicode-2.1.tar.bz2) = 447917
diff --git a/devel/courier-unicode/pkg-plist b/devel/courier-unicode/pkg-plist
index 88f9368673f9..070933295687 100644
--- a/devel/courier-unicode/pkg-plist
+++ b/devel/courier-unicode/pkg-plist
@@ -4,7 +4,7 @@ include/courier-unicode.h
 lib/libcourier-unicode.a
 lib/libcourier-unicode.so
 lib/libcourier-unicode.so.4
-lib/libcourier-unicode.so.4.0.0
+lib/libcourier-unicode.so.4.1.0
 man/man3/unicode::iconvert::convert.3.gz
 man/man3/unicode::iconvert::convert_tocase.3.gz
 man/man3/unicode::iconvert::fromu.3.gz
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index 66ecb405735a..6c5813f76352 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cone
-PORTVERSION=	0.96.2
-PORTREVISION=	1
+PORTVERSION=	1.0
 CATEGORIES=	mail
 # This is for beta versions, leave it in please:
 #MASTER_SITES=	http://www.courier-mta.org/beta/${PORTNAME}/ \
@@ -18,14 +17,16 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING.GPL
 
 LIB_DEPENDS=	libaspell.so:textproc/aspell \
+		libidn.so:dns/libidn \
 		libcourier-unicode.so:devel/courier-unicode
 BUILD_DEPENDS=	gpgv:security/gnupg1
 RUN_DEPENDS=	gpgv:security/gnupg1
 
 USES=		compiler:c++11-lang fam gettext gmake iconv localbase:ldflags \
-		ncurses perl5 shebangfix ssl tar:bzip2
+		ncurses perl5 pkgconfig shebangfix ssl tar:bzip2
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX}
+CONFIGURE_ARGS=	--with-certdb=${PREFIX}/share/cone/rootcerts --exec-prefix=${PREFIX} \
+		--with-notice=unicode
 SHEBANG_FILES=	sysconftool
 USE_GNOME=	libxml2
 INSTALL_TARGET=	install-strip
diff --git a/mail/cone/distinfo b/mail/cone/distinfo
index 560d8ac9a1bf..893fb0778deb 100644
--- a/mail/cone/distinfo
+++ b/mail/cone/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512738199
-SHA256 (cone-0.96.2.tar.bz2) = c183dbd6e50922dd71f7cbbe2a39ea584e4b0d0d214d21c3667c84bff54392a5
-SIZE (cone-0.96.2.tar.bz2) = 3849926
+TIMESTAMP = 1537265861
+SHA256 (cone-1.0.tar.bz2) = cffb5ae0292bd461d3a8cdddd09dccf43855f752ea4f4ae8c2aeacf67b69f9e9
+SIZE (cone-1.0.tar.bz2) = 3793288
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index f66b954e7e5e..9663e85b593c 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	courier-imap
-PORTVERSION=	4.18.2
-PORTREVISION=	1
+PORTVERSION=	5.0.0
 PORTEPOCH=	2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	SF/courier/imap/${PORTVERSION}
@@ -11,18 +10,23 @@ MASTER_SITES=	SF/courier/imap/${PORTVERSION}
 MAINTAINER=	madpilot@FreeBSD.org
 COMMENT=	IMAP (and POP3) server that provides access to Maildir mailboxes
 
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 BUILD_DEPENDS=	courierauthconfig:security/courier-authlib-base
 RUN_DEPENDS=	courierauthconfig:security/courier-authlib-base \
 		${LOCALBASE}/share/sysconftool/sysconftool:devel/sysconftool
-LIB_DEPENDS=	libcourier-unicode.so:devel/courier-unicode
-
-CONFLICTS=	courier-[0-9]* imap-uw-[0-9]* panda-imap-[0-9]*
+LIB_DEPENDS=	libcourier-unicode.so:devel/courier-unicode \
+		libidn.so:dns/libidn
 
-USES=		compiler:c++11-lang gmake localbase:ldflags perl5 ssl tar:bzip2
-GNU_CONFIGURE=	yes
+USES=		compiler:c++11-lang gmake localbase:ldflags perl5 pkgconfig ssl \
+		tar:bzip2
 USE_RC_SUBR=	courier-imap-imapd courier-imap-imapd-ssl \
 		courier-imap-pop3d courier-imap-pop3d-ssl
 
+CONFLICTS=	courier-[0-9]* imap-uw-[0-9]* panda-imap-[0-9]*
+
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	REHASH=${SCRIPTDIR}/c_rehash
 
 MAKE_ENV:=	${CONFIGURE_ENV}
@@ -61,6 +65,7 @@ CONFIGURE_ARGS=	--sysconfdir=${CONFDIR} \
 		--enable-unicode \
 		--disable-root-check \
 		--with-locking-method=fcntl \
+		--with-notice=unicode \
 		COURIERAUTHCONFIG=${PREFIX}/bin/courierauthconfig
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls \
diff --git a/mail/courier-imap/distinfo b/mail/courier-imap/distinfo
index a20b2d0fe420..bc61cc8ea0cc 100644
--- a/mail/courier-imap/distinfo
+++ b/mail/courier-imap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1507193939
-SHA256 (courier-imap-4.18.2.tar.bz2) = f66ceda3e5aa853e13f417302dfb83b312709e95f1bbcdafcd6214d76a94e79a
-SIZE (courier-imap-4.18.2.tar.bz2) = 3205230
+TIMESTAMP = 1537255135
+SHA256 (courier-imap-5.0.0.tar.bz2) = 25fb45ca2a8d27bedb1c4b3f5809ed528fa0e40b70242f74bda9d2d56a58f8ff
+SIZE (courier-imap-5.0.0.tar.bz2) = 3281138
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 906e1907d745..6ba54b56869f 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -16,8 +16,7 @@
 # MAILDROP_MBOX_DIR=<dir>	Specify DEFAULT mailbox location
 
 PORTNAME=	maildrop
-PORTVERSION=	2.9.3
-PORTREVISION=	1
+PORTVERSION=	3.0.0
 CATEGORIES=	mail
 MASTER_SITES=	SF/courier/${PORTNAME}/${PORTVERSION}
 
@@ -27,9 +26,11 @@ COMMENT=	Mail delivery agent (MDA) with filtering abilities
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
-		libcourier-unicode.so:devel/courier-unicode
+		libcourier-unicode.so:devel/courier-unicode \
+		libidn.so:dns/libidn
 
-USES=		compiler:c++11-lang iconv localbase:ldflags perl5 tar:bzip2
+USES=		compiler:c++11-lang iconv localbase:ldflags perl5 pkgconfig \
+		tar:bzip2
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-syslog=1 \
@@ -63,7 +64,7 @@ OPTIONS_MULTI=		AUTHLIB
 AUTHLIB_DESC=		Courier Auth Library support
 .endif
 
-OPTIONS_DEFINE+=	DOVECOTAUTH FAM GDBM IDN MAILWRAPPER DOCS
+OPTIONS_DEFINE+=	DOVECOTAUTH FAM GDBM MAILWRAPPER DOCS
 
 DOVECOTAUTH_DESC=	Dovecot Authentication support
 MAILWRAPPER_DESC=	Let configure guess which sendmail binary to use
@@ -72,8 +73,6 @@ OPTIONS_SUB=		yes
 GDBM_CONFIGURE_ON=	--with-db=gdbm
 GDBM_CONFIGURE_OFF=	--with-db=db
 GDBM_LIB_DEPENDS=	libgdbm.so:databases/gdbm
-IDN_CONFIGURE_WITH=	libidn
-IDN_LIB_DEPENDS=	libidn.so:dns/libidn
 MAILWRAPPER_CONFIGURE_OFF=	--enable-sendmail=/usr/sbin/sendmail
 DOVECOTAUTH_CONFIGURE_ENABLE=	dovecotauth
 
diff --git a/mail/maildrop/distinfo b/mail/maildrop/distinfo
index 6b5caad5bc29..367136b792b8 100644
--- a/mail/maildrop/distinfo
+++ b/mail/maildrop/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1512335312
-SHA256 (maildrop-2.9.3.tar.bz2) = fceae3b85dd9caf4d769d76e5d1179c4065b7f3af88623008ad44f9e08299794
-SIZE (maildrop-2.9.3.tar.bz2) = 2079784
+TIMESTAMP = 1537255240
+SHA256 (maildrop-3.0.0.tar.bz2) = 48e91a4a101e276a131fbd3afb94e98401a0cece751961c6d9c2e422d661413c
+SIZE (maildrop-3.0.0.tar.bz2) = 2091018
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 1fd24e9ef374..0bea100b7a17 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sqwebmail
-PORTVERSION=	5.9.3
+PORTVERSION=	6.0.0
 CATEGORIES=	mail www
 MASTER_SITES=	SF/courier/webmail/${PORTVERSION}
 
@@ -71,7 +71,8 @@ CONFIGURE_ARGS=	--enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
 		${ICONV_CONFIGURE_ARG} \
 		--cache-file=${WRKDIR}/sqwebmail.cache \
 		--with-mailuser=${MAILOWN} \
-		--with-mailgroup=${MAILGRP}
+		--with-mailgroup=${MAILGRP} \
+		--with-notice=unicode
 
 PLIST_SUB+=	CGIBINDIR=${CGIBINDIR} \
 		CGIBINSUBDIR=${CGIBINSUBDIR} \
diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo
index f640eb4905be..6ff7baf69528 100644
--- a/mail/sqwebmail/distinfo
+++ b/mail/sqwebmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535224670
-SHA256 (sqwebmail-5.9.3.tar.bz2) = 2cb9a61e5436d31174ecf5072fe6a7c3654dbb5dd4ec8621600e65a2459252de
-SIZE (sqwebmail-5.9.3.tar.bz2) = 3603260
+TIMESTAMP = 1537265399
+SHA256 (sqwebmail-6.0.0.tar.bz2) = 137745444cd9223ec8837db57324f3304086a511aed678da600d61d0d1b4cf7e
+SIZE (sqwebmail-6.0.0.tar.bz2) = 3613704
diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile
index 3bce294e5334..989261c60d3c 100644
--- a/net/courier-authlib-ldap/Makefile
+++ b/net/courier-authlib-ldap/Makefile
@@ -1,7 +1,7 @@
 # Created by: Yarema <yds@CoolRat.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	0
 PKGNAMESUFFIX=	-ldap
 
 COMMENT=	LDAP support for the Courier authentication library
diff --git a/security/courier-authlib-base/Makefile b/security/courier-authlib-base/Makefile
index fe16d501d955..dcd485fea456 100644
--- a/security/courier-authlib-base/Makefile
+++ b/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
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 95c47f4e9a31..6cba12874899 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.68.0
-PORTREVISION?=	1
+PORTVERSION=	0.69.0
+PORTREVISION?=	0
 CATEGORIES?=	security mail
 .if defined(PKGNAMESUFFIX)
 MASTER_SITES=	SF/courier/authlib/${PORTVERSION}
diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo
index 4b4dba279fd8..67552c37f5ac 100644
--- a/security/courier-authlib/distinfo
+++ b/security/courier-authlib/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499032525
-SHA256 (courier-authlib-0.68.0.tar.bz2) = 9096118823ababfac8f46a1a7393765a414ea3628c9413bfba39af5d70fd3e2e
-SIZE (courier-authlib-0.68.0.tar.bz2) = 2194982
+TIMESTAMP = 1537254940
+SHA256 (courier-authlib-0.69.0.tar.bz2) = fbbec283e620b3e5aab3bdeb0ec781df3c656d511168bfa23ec69f21af44b689
+SIZE (courier-authlib-0.69.0.tar.bz2) = 2197718
diff --git a/security/courier-authlib/files/patch-Makefile.in b/security/courier-authlib/files/patch-Makefile.in
index 137cc6ed3a35..8220c2314a7c 100644
--- a/security/courier-authlib/files/patch-Makefile.in
+++ b/security/courier-authlib/files/patch-Makefile.in
@@ -1,4 +1,4 @@
---- Makefile.in.orig	2017-07-02 14:41:39 UTC
+--- Makefile.in.orig	2018-09-13 23:11:36 UTC
 +++ Makefile.in
 @@ -95,11 +95,10 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -16,7 +16,7 @@
  subdir = .
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-@@ -219,6 +218,13 @@ libcourierauth_la_DEPENDENCIES = libs/libhmac/libhmac.
+@@ -219,6 +218,12 @@ libcourierauth_la_DEPENDENCIES = libs/libhmac/libhmac.
  	libs/md5/libmd5.la libs/sha1/libsha1.la \
  	libs/numlib/libnumlib.la libs/random128/librandom128.la \
  	libs/rfc822/libencode.la
@@ -26,11 +26,10 @@
 +libauthvchkpw_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 +	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 +	$(libauthvchkpw_la_LDFLAGS) $(LDFLAGS) -o $@
-+
  am_libcourierauth_la_OBJECTS = authdaemon.lo authdaemonlib.lo \
  	preauthdaemon.lo authmoduser2.lo authmoduser3.lo debug.lo \
  	authoption.lo
-@@ -350,6 +356,7 @@ SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la
+@@ -350,6 +355,7 @@ SOURCES = $(libauthcustom_la_SOURCES) $(libauthldap_la
  	$(libauthpgsql_la_SOURCES) $(libauthpipe_la_SOURCES) \
  	$(libauthpwd_la_SOURCES) $(libauthshadow_la_SOURCES) \
  	$(libauthsqlite_la_SOURCES) $(libauthuserdb_la_SOURCES) \
@@ -38,7 +37,7 @@
  	$(libcourierauth_la_SOURCES) \
  	$(libcourierauthcommon_la_SOURCES) \
  	$(libcourierauthsasl_la_SOURCES) \
-@@ -532,6 +539,7 @@ LIBAUTHPWD = @LIBAUTHPWD@
+@@ -532,6 +538,7 @@ LIBAUTHPWD = @LIBAUTHPWD@
  LIBAUTHSHADOW = @LIBAUTHSHADOW@
  LIBAUTHSQLITE = @LIBAUTHSQLITE@
  LIBAUTHUSERDB = @LIBAUTHUSERDB@
@@ -46,15 +45,15 @@
  LIBDB = @LIBDB@
  LIBDL = @LIBDL@
  LIBGDBM = @LIBGDBM@
-@@ -657,21 +665,27 @@ top_builddir = @top_builddir@
+@@ -657,21 +664,26 @@ 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/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
++@HAVE_USERDB_TRUE@SUBDIRS += libs/makedat userdb
 +SUBDIRS += libs/rfc822 libs/random128
-+@HAVE_BASE_TRUE@SUBDIRS+= libs/liblock liblog
++@HAVE_BASE_TRUE@ SUBDIRS += libs/liblock liblog
  AM_CPPFLAGS = -I liblock $(LTDLINCL)
  modules = @LIBAUTHUSERDB@ \
  	@LIBAUTHPAM@ @LIBAUTHPWD@ @LIBAUTHSHADOW@ \
@@ -64,14 +63,13 @@
  
  pkglibexec_SCRIPTS = authsystem.passwd
 -pkglib_LTLIBRARIES = libcourierauth.la \
--	libcourierauthsasl.la libcourierauthsaslclient.la \
--	libcourierauthcommon.la $(modules)
+-	libcourierauthcommon.la libcourierauthsasl.la libcourierauthsaslclient.la \
+-	$(modules)
 +@HAVE_BASE_TRUE@pkglib_LTLIBRARIES = libcourierauth.la \
-+@HAVE_BASE_TRUE@	libcourierauthsasl.la libcourierauthsaslclient.la \
-+@HAVE_BASE_TRUE@	libcourierauthcommon.la $(modules)
- 
++@HAVE_BASE_TRUE@	libcourierauthcommon.la libcourierauthsasl.la libcourierauthsaslclient.la \
++@HAVE_BASE_TRUE@	$(modules)
 +@HAVE_BASE_FALSE@pkglib_LTLIBRARIES = $(modules)
-+
+ 
  sbin_SCRIPTS = authdaemond
  EXTRA_LTLIBRARIES = libauthuserdb.la \
  	libauthpam.la libauthpwd.la libauthshadow.la \
@@ -79,7 +77,7 @@
  	libauthpgsql.la \
  	libauthldap.la \
  	libauthmysql.la \
-@@ -746,6 +760,13 @@ libauthshadow_la_DEPENDENCIES = $(commonlibdep)
+@@ -746,6 +758,13 @@ libauthshadow_la_DEPENDENCIES = $(commonlibdep)
  libauthshadow_la_LIBADD = $(commonlibadd) $(libauthshadow_t)
  libauthshadow_la_LDFLAGS = $(commonldflags)
  
@@ -87,13 +85,13 @@
 +libauthvchkpw_t = @VPOPMAILLIBS@ @LIBM@
 +libauthvchkpw_la_SOURCES = authvchkpw.c authvchkpwlib.c preauthvchkpw.c
 +libauthvchkpw_la_DEPENDENCIES = $(commonlibdep)
-+libauthvchkpw_la_LIBADD = $(commonlibadd)
-+libauthvchkpw_la_LDFLAGS = $(commonldflags) $(libauthvchkpw_t)
++libauthvchkpw_la_LIBADD = $(commonlibadd) $(libauthvchkpw_t)
++libauthvchkpw_la_LDFLAGS = $(commonldflags)
 +
  # The authpgsql module
  libauthpgsql_t = @PGSQL_LIBS@ @LIBM@ @NETLIBS@
  libauthpgsql_la_SOURCES = authpgsql.c authpgsqllib.cpp authpgsql.h
-@@ -827,8 +848,8 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc
+@@ -827,8 +846,8 @@ libcourierauthsaslclient_la_SOURCES = courierauthsaslc
  
  libcourierauthsaslclient_la_LIBADD = libcourierauth.la
  libcourierauthsaslclient_la_LDFLAGS = -export-symbols-regex '^auth_sasl_client$$' -avoid-version
@@ -104,7 +102,7 @@
  
  courierauthconfig_SOURCES = authinfo.c
  authpasswd_SOURCES = authpasswd.c
-@@ -869,7 +890,7 @@ authmksock_LDADD = @NETLIBS@
+@@ -870,7 +889,7 @@ authmksock_LDADD = @NETLIBS@
  man3 = authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 auth_mkhomedir.3 \
  	auth_enumerate.3 auth_passwd.3 auth_getoption.3 auth_sasl.3
  
@@ -113,7 +111,7 @@
  man_MANS = $(man1) $(man3) auth_sasl_ex.3
  BUILT1 = authlib.html authldaprc.h authmysqlrc.h authpgsqlrc.h authpiperc.h \
  	authdaemonrc.h packageversion.h \
-@@ -1027,6 +1048,9 @@ libauthsqlite.la: $(libauthsqlite_la_OBJECTS) $(libaut
+@@ -1028,6 +1047,9 @@ libauthsqlite.la: $(libauthsqlite_la_OBJECTS) $(libaut
  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 +121,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)
  
-@@ -1297,6 +1321,8 @@ distclean-compile:
+@@ -1298,6 +1320,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 +130,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@
-@@ -1312,6 +1338,7 @@ distclean-compile:
+@@ -1313,6 +1337,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/preauthshadow.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 +138,7 @@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -1836,18 +1863,26 @@ info: info-recursive
+@@ -1837,18 +1862,26 @@ info: info-recursive
  
  info-am:
  
@@ -154,15 +152,6 @@
 +@HAVE_BASE_FALSE@install-data-am:
 +@HAVE_BASE_FALSE@	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 +
-+@HAVE_BASE_TRUE@install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \
-+@HAVE_BASE_TRUE@	install-pkglibexecSCRIPTS install-sbinPROGRAMS \
-+@HAVE_BASE_TRUE@	install-sbinSCRIPTS
-+@HAVE_BASE_TRUE@	@$(NORMAL_INSTALL)
-+@HAVE_BASE_TRUE@	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-+
-+@HAVE_BASE_FALSE@install-exec-am: install-pkglibLTLIBRARIES
-+@HAVE_BASE_FALSE@	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-+
  install-dvi: install-dvi-recursive
  
  install-dvi-am:
@@ -172,16 +161,25 @@
 -	install-sbinSCRIPTS
 -	@$(NORMAL_INSTALL)
 -	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
++@HAVE_BASE_TRUE@install-exec-am: install-binPROGRAMS install-pkglibLTLIBRARIES \
++@HAVE_BASE_TRUE@	install-pkglibexecSCRIPTS install-sbinPROGRAMS \
++@HAVE_BASE_TRUE@	install-sbinSCRIPTS
++@HAVE_BASE_TRUE@	@$(NORMAL_INSTALL)
++@HAVE_BASE_TRUE@	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
++
++@HAVE_BASE_FALSE@install-exec-am: install-pkglibLTLIBRARIES
++@HAVE_BASE_FALSE@	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
++
  install-html: install-html-recursive
  
  install-html-am:
-@@ -1929,12 +1964,16 @@ uninstall-man: uninstall-man1 uninstall-man3
- .PRECIOUS: Makefile
+@@ -1929,13 +1962,16 @@ uninstall-man: uninstall-man1 uninstall-man3
  
+ .PRECIOUS: Makefile
  
 +authvchkpw.lo: authvchkpw.c vpopmail_config.h
 +preauthvchkpw.lo: preauthvchkpw.c vpopmail_config.h
-+
+ 
 +vpopmail_config.h:
 +	echo '#include "@vpopmail_home@/include/config.h"' >vpopmail_config.h
 +
@@ -194,7 +192,7 @@
  
  @HAVE_AUTHPGSQL_TRUE@uninstall-authpgsqlrc:
  @HAVE_AUTHPGSQL_TRUE@	rm -f $(DESTDIR)@authpgsqlrc@.dist
-@@ -1952,8 +1991,6 @@ authpgsqlrc.h:
+@@ -1953,8 +1989,6 @@ authpgsqlrc.h:
  @HAVE_LDAP_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authldaprc@` || :
  @HAVE_LDAP_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authldaprc \
  @HAVE_LDAP_TRUE@		$(DESTDIR)@authldaprc@.dist
@@ -203,14 +201,14 @@
  
  @HAVE_LDAP_TRUE@uninstall-authldaprc:
  @HAVE_LDAP_TRUE@	rm -f $(DESTDIR)@authldaprc@.dist
-@@ -1964,6 +2001,18 @@ authpgsqlrc.h:
+@@ -1965,6 +1999,18 @@ authpgsqlrc.h:
  @HAVE_LDAP_FALSE@uninstall-authldaprc:
  @HAVE_LDAP_FALSE@	@:
  
 +@HAVE_LDAP_TRUE@install-ldapschema:
 +@HAVE_LDAP_TRUE@	$(mkinstalldirs) ${DESTDIR}${sysconfdir}/openldap/schema
 +@HAVE_LDAP_TRUE@	$(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \
-+@HAVE_LDAP_TRUE@		${DESTDIR}${sysconfdir}/openldap/schema/authldap.schema.dist
++@HAVE_LDAP_TRUE@	${DESTDIR}${sysconfdir}/openldap/schema/authldap.schema.dist
 +@HAVE_LDAP_TRUE@#	if test ! -f ${sysconfdir}/openldap/schema/authldap.schema ; then \
 +@HAVE_LDAP_TRUE@#		$(INSTALL_DATA) -m 0444 $(srcdir)/authldap.schema \
 +@HAVE_LDAP_TRUE@#			${sysconfdir}/openldap/schema/authldap.schema ; \
@@ -222,7 +220,7 @@
  authldaprc.h:
  	echo "#define AUTHLDAPRC \"@authldaprc@\"" >authldaprc.h
  
-@@ -1971,8 +2020,6 @@ authldaprc.h:
+@@ -1972,8 +2018,6 @@ authldaprc.h:
  @HAVE_AUTHMYSQL_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authmysqlrc@` || :
  @HAVE_AUTHMYSQL_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authmysqlrc \
  @HAVE_AUTHMYSQL_TRUE@		$(DESTDIR)@authmysqlrc@.dist
@@ -231,7 +229,7 @@
  
  @HAVE_AUTHMYSQL_TRUE@uninstall-authmysqlrc:
  @HAVE_AUTHMYSQL_TRUE@	rm -f $(DESTDIR)@authmysqlrc@.dist
-@@ -1990,8 +2037,6 @@ authmysqlrc.h:
+@@ -1991,8 +2035,6 @@ authmysqlrc.h:
  @HAVE_AUTHSQLITE_TRUE@	$(mkinstalldirs) $(DESTDIR)`dirname @authsqliterc@` || :
  @HAVE_AUTHSQLITE_TRUE@	$(INSTALL_DATA) -m 660 $(srcdir)/authsqliterc \
  @HAVE_AUTHSQLITE_TRUE@		$(DESTDIR)@authsqliterc@.dist
@@ -240,7 +238,7 @@
  
  @HAVE_AUTHSQLITE_TRUE@uninstall-authsqliterc:
  @HAVE_AUTHSQLITE_TRUE@	rm -f $(DESTDIR)@authsqliterc@.dist
-@@ -2010,17 +2055,21 @@ authpipelib.lo: authpipelib.c authpipelib.h authpiperc
+@@ -2011,17 +2053,21 @@ authpipelib.lo: authpipelib.c authpipelib.h authpiperc
  authpiperc.h:
  	echo "#define PIPE_PROGRAM \"@authProg@\"" >authpiperc.h
  
@@ -271,7 +269,7 @@
  authdaemonrc.h:
  	echo "#define AUTHDAEMONRC \"@authdaemonrc@\"" >authdaemonrc.h
  	echo "#define AUTHDAEMONVAR \"@authdaemonvar@\"" >>authdaemonrc.h
-@@ -2066,24 +2115,24 @@ dist-hook:
+@@ -2067,24 +2113,24 @@ dist-hook:
  # automake still a bit stupid...
  
  install-data-hook: install-authdaemonrc install-authpgsqlrc \
@@ -308,7 +306,7 @@
  		$(INSTALL_SCRIPT) userdb/pw2userdb \
  				$(DESTDIR)$(sbindir)/pw2userdb ; \
  		$(INSTALL_SCRIPT) userdb/makeuserdb \
-@@ -2096,9 +2145,10 @@ install-exec-hook:
+@@ -2097,9 +2143,10 @@ install-exec-hook:
  				$(DESTDIR)$(sbindir)/userdb-test-cram-md5
  
  uninstall-hook: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc uninstall-authsqliterc
@@ -320,7 +318,7 @@
  				$(DESTDIR)$(sbindir)/pw2userdb \
  				$(DESTDIR)$(sbindir)/makeuserdb \
  				$(DESTDIR)$(sbindir)/userdb \
-@@ -2109,7 +2159,7 @@ authlib.html: authlib.html.in
+@@ -2110,7 +2157,7 @@ authlib.html: authlib.html.in
  	$(SHELL) ./config.status --file=authlib.html
  
  authlib.3: authlib.3.in