upadate to courier-authlib 0.52, courier-imap 4.0.1 and sqwebmail 5.0.0

Special thanks for testing and sugestions to:	Brian Candler <B.Candler@pobox.com>

4 files changed, 28 insertions, 7 deletions

diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile
index 6b5b5baa743c..fbea8f3245a3 100644
--- a/databases/courier-authlib-mysql/Makefile
+++ b/databases/courier-authlib-mysql/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.51
+PORTVERSION=	0.52
 CATEGORIES=	mail
-MASTER_SITES=	http://www.courier-mta.org/beta/courier-authlib/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	courier
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Authentication library used by courier ports
@@ -41,6 +42,7 @@ CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
 
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--without-authshadow \
+		--without-authcustom \
 		--enable-unicode \
 		--enable-ltdl-install=no
 
@@ -108,7 +110,10 @@ MAN3=		authlib.3 auth_generic.3 auth_login.3 auth_getuserinfo.3 \
 
 MAN8=		makeuserdb.8 userdb.8 userdbpw.8
 
-EXTRA_DOCS=	README INSTALL AUTHORS ChangeLog
+EXTRA_DOCS=	AUTHORS COPYING ChangeLog INSTALL NEWS README \
+		README.authdebug.html README.authmysql.html \
+		README.authmysql.myownquery README.authpostgres.html \
+		README.ldap README_authlib.html
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$VPOPMAILLIBS|& -lcrypt|g ; \
@@ -116,6 +121,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|%%INSTALL_MAN%%|${INSTALL_MAN}|' \
 		${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in \
 		${WRKSRC}/liblog/Makefile.in ${WRKSRC}/userdb/Makefile.in
+	@${REINPLACE_CMD} -e 's|DEFAULTOPTIONS=""|DEFAULTOPTIONS="wbnodsn=1"|' \
+		${WRKSRC}/authdaemonrc.in
 
 post-install:
 	${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
diff --git a/databases/courier-authlib-mysql/distinfo b/databases/courier-authlib-mysql/distinfo
index 7146db0d7dff..8441c7ca4ab1 100644
--- a/databases/courier-authlib-mysql/distinfo
+++ b/databases/courier-authlib-mysql/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.51.tar.bz2) = 89cb2db63b3f6d402e435331e391ef80
-SIZE(courier-authlib-0.51.tar.bz2) = 1964171
+MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc
+SIZE(courier-authlib-0.52.tar.bz2) = 1965591
diff --git a/databases/courier-authlib-mysql/files/courier-authdaemond.sh b/databases/courier-authlib-mysql/files/courier-authdaemond.sh
index b4af4c0b40fd..ef48f1629b24 100644
--- a/databases/courier-authlib-mysql/files/courier-authdaemond.sh
+++ b/databases/courier-authlib-mysql/files/courier-authdaemond.sh
@@ -24,6 +24,8 @@ command="%%PREFIX%%/sbin/authdaemond"
 start_cmd="authdaemond_cmd start"
 stop_cmd="authdaemond_cmd stop"
 restart_cmd="authdaemond_cmd stop && authdaemond_cmd start"
+pidfile="%%PREFIX%%/var/spool/authdaemon/pid"
+procname="%%PREFIX%%/sbin/courierlogger"
 
 load_rc_config $name
 
@@ -36,6 +38,12 @@ authdaemond_cmd () {
 	stop)
 		echo "Stopping ${name}."
 		${command} stop
+		if [ $? -eq 0 ] ; then
+			[ -f "$pidfile" ] && rm -f "$pidfile"
+			[ -f "$pidfile".lock ] && rm -f "$pidfile".lock
+			[ -S %%PREFIX%%/var/spool/authdaemon/socket ] && rm -f %%PREFIX%%/var/spool/authdaemon/socket
+			return 0
+		fi
 		;;
 	esac
 }
diff --git a/databases/courier-authlib-mysql/pkg-plist b/databases/courier-authlib-mysql/pkg-plist
index 196430c46515..c114541d6d19 100644
--- a/databases/courier-authlib-mysql/pkg-plist
+++ b/databases/courier-authlib-mysql/pkg-plist
@@ -21,8 +21,6 @@ lib/courier-authlib/libcourierauthsaslclient.a
 lib/courier-authlib/libcourierauthcommon.so.0
 lib/courier-authlib/libcourierauthcommon.so
 lib/courier-authlib/libcourierauthcommon.a
-lib/courier-authlib/libauthcustom.so.0
-lib/courier-authlib/libauthcustom.so
 lib/courier-authlib/libauthuserdb.so.0
 lib/courier-authlib/libauthuserdb.so
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
@@ -48,9 +46,17 @@ sbin/userdb-test-cram-md5
 sbin/userdbpw
 sbin/vchkpw2userdb
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.authdebug.html
+%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.html
+%%PORTDOCS%%%%DOCSDIR%%/README.authmysql.myownquery
+%%PORTDOCS%%%%DOCSDIR%%/README.authpostgres.html
+%%PORTDOCS%%%%DOCSDIR%%/README.ldap
+%%PORTDOCS%%%%DOCSDIR%%/README_authlib.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir %D/var/authdaemon 2>/dev/null || true
 @unexec rmdir %D/var 2>/dev/null || true