update to 0.55

migrate to OPTIONS [1]
add WITH_SYSLOG_FACILITY knob [2]

PR:		78362 [1]
Submitted by:	Marcus Grando <marcus@corp.grupos.com.br> [1]
		Sascha Holzleiter <sascha@daemonground.de> [2]

18 files changed, 189 insertions, 144 deletions

diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile
index a033447050b8..836e9556543c 100644
--- a/databases/courier-authlib-mysql/Makefile
+++ b/databases/courier-authlib-mysql/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.54
-PORTREVISION=	2
+PORTVERSION=	0.55
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -27,17 +27,19 @@ USE_LIBLTDL=	yes
 #
 # options available:
 #
-# WITHOUT_PAM:			Don't build in PAM support
-# WITH_VPOPMAIL:		Build in vpopmail support
-# WITH_MYSQL:			Build in mysql support
-# WITH_POSTGRESQL:		Build in postgresql support
-# WITH_LDAP:			Build in ldap support with openldap
-# WITH_GDBM:			Use gdbm files instead of bdb
 # WITH_MAILUSER:		The user running authlib
 # WITH_MAILGROUP:		The group running authlib
-# WITHOUT_AUTHUSERDB:		Don't build in authuserdb
+# WITH_SYSLOG_FACILITY:		The syslogfacility to use
 #
 
+OPTIONS=	PAM		"Build with PAM support"		on \
+		VPOPMAIL	"Build in vpopmail support"		off \
+		MYSQL		"Build in mysql support"		off \
+		POSTGRESQL	"Build in postgresql support"		off \
+		LDAP		"Build in ldap support with openldap"	off \
+		GDBM		"Use gdbm files instead of bdb"		off \
+		AUTHUSERDB	"Build with authuserdb"			on
+
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
@@ -50,11 +52,17 @@ CONFIGURE_ARGS=	--without-authshadow \
 		--enable-unicode \
 		--enable-ltdl-install=no
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SYSLOG_FACILITY)
+CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
+.endif
+
 .if defined(WITH_GDBM)
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--with-db=gdbm
+CONFIGURE_ARGS+=--with-db=gdbm
 .else
-CONFIGURE_ARGS+=	--with-db=db
+CONFIGURE_ARGS+=--with-db=db
 .endif
 
 .if !defined(WITH_VPOPMAIL)
@@ -117,9 +125,6 @@ CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
 CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
 .endif
 
-
-.include <bsd.port.pre.mk>
-
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 MAN1=		courierlogger.1
diff --git a/databases/courier-authlib-mysql/distinfo b/databases/courier-authlib-mysql/distinfo
index 44ea145a49d5..f4e92b503fbb 100644
--- a/databases/courier-authlib-mysql/distinfo
+++ b/databases/courier-authlib-mysql/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.54.tar.bz2) = 8628379adb2e402628dc0a66f7c7c73e
-SIZE(courier-authlib-0.54.tar.bz2) = 1966155
+MD5 (courier-authlib-0.55.tar.bz2) = eb57aefb8460106709d560c40cccaa41
+SIZE(courier-authlib-0.55.tar.bz2) = 1972024
diff --git a/databases/courier-authlib-pgsql/Makefile b/databases/courier-authlib-pgsql/Makefile
index a033447050b8..836e9556543c 100644
--- a/databases/courier-authlib-pgsql/Makefile
+++ b/databases/courier-authlib-pgsql/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.54
-PORTREVISION=	2
+PORTVERSION=	0.55
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -27,17 +27,19 @@ USE_LIBLTDL=	yes
 #
 # options available:
 #
-# WITHOUT_PAM:			Don't build in PAM support
-# WITH_VPOPMAIL:		Build in vpopmail support
-# WITH_MYSQL:			Build in mysql support
-# WITH_POSTGRESQL:		Build in postgresql support
-# WITH_LDAP:			Build in ldap support with openldap
-# WITH_GDBM:			Use gdbm files instead of bdb
 # WITH_MAILUSER:		The user running authlib
 # WITH_MAILGROUP:		The group running authlib
-# WITHOUT_AUTHUSERDB:		Don't build in authuserdb
+# WITH_SYSLOG_FACILITY:		The syslogfacility to use
 #
 
+OPTIONS=	PAM		"Build with PAM support"		on \
+		VPOPMAIL	"Build in vpopmail support"		off \
+		MYSQL		"Build in mysql support"		off \
+		POSTGRESQL	"Build in postgresql support"		off \
+		LDAP		"Build in ldap support with openldap"	off \
+		GDBM		"Use gdbm files instead of bdb"		off \
+		AUTHUSERDB	"Build with authuserdb"			on
+
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
@@ -50,11 +52,17 @@ CONFIGURE_ARGS=	--without-authshadow \
 		--enable-unicode \
 		--enable-ltdl-install=no
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SYSLOG_FACILITY)
+CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
+.endif
+
 .if defined(WITH_GDBM)
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--with-db=gdbm
+CONFIGURE_ARGS+=--with-db=gdbm
 .else
-CONFIGURE_ARGS+=	--with-db=db
+CONFIGURE_ARGS+=--with-db=db
 .endif
 
 .if !defined(WITH_VPOPMAIL)
@@ -117,9 +125,6 @@ CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
 CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
 .endif
 
-
-.include <bsd.port.pre.mk>
-
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 MAN1=		courierlogger.1
diff --git a/databases/courier-authlib-pgsql/distinfo b/databases/courier-authlib-pgsql/distinfo
index 44ea145a49d5..f4e92b503fbb 100644
--- a/databases/courier-authlib-pgsql/distinfo
+++ b/databases/courier-authlib-pgsql/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.54.tar.bz2) = 8628379adb2e402628dc0a66f7c7c73e
-SIZE(courier-authlib-0.54.tar.bz2) = 1966155
+MD5 (courier-authlib-0.55.tar.bz2) = eb57aefb8460106709d560c40cccaa41
+SIZE(courier-authlib-0.55.tar.bz2) = 1972024
diff --git a/databases/courier-authlib-userdb/Makefile b/databases/courier-authlib-userdb/Makefile
index a033447050b8..836e9556543c 100644
--- a/databases/courier-authlib-userdb/Makefile
+++ b/databases/courier-authlib-userdb/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.54
-PORTREVISION=	2
+PORTVERSION=	0.55
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -27,17 +27,19 @@ USE_LIBLTDL=	yes
 #
 # options available:
 #
-# WITHOUT_PAM:			Don't build in PAM support
-# WITH_VPOPMAIL:		Build in vpopmail support
-# WITH_MYSQL:			Build in mysql support
-# WITH_POSTGRESQL:		Build in postgresql support
-# WITH_LDAP:			Build in ldap support with openldap
-# WITH_GDBM:			Use gdbm files instead of bdb
 # WITH_MAILUSER:		The user running authlib
 # WITH_MAILGROUP:		The group running authlib
-# WITHOUT_AUTHUSERDB:		Don't build in authuserdb
+# WITH_SYSLOG_FACILITY:		The syslogfacility to use
 #
 
+OPTIONS=	PAM		"Build with PAM support"		on \
+		VPOPMAIL	"Build in vpopmail support"		off \
+		MYSQL		"Build in mysql support"		off \
+		POSTGRESQL	"Build in postgresql support"		off \
+		LDAP		"Build in ldap support with openldap"	off \
+		GDBM		"Use gdbm files instead of bdb"		off \
+		AUTHUSERDB	"Build with authuserdb"			on
+
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
@@ -50,11 +52,17 @@ CONFIGURE_ARGS=	--without-authshadow \
 		--enable-unicode \
 		--enable-ltdl-install=no
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SYSLOG_FACILITY)
+CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
+.endif
+
 .if defined(WITH_GDBM)
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--with-db=gdbm
+CONFIGURE_ARGS+=--with-db=gdbm
 .else
-CONFIGURE_ARGS+=	--with-db=db
+CONFIGURE_ARGS+=--with-db=db
 .endif
 
 .if !defined(WITH_VPOPMAIL)
@@ -117,9 +125,6 @@ CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
 CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
 .endif
 
-
-.include <bsd.port.pre.mk>
-
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 MAN1=		courierlogger.1
diff --git a/databases/courier-authlib-userdb/distinfo b/databases/courier-authlib-userdb/distinfo
index 44ea145a49d5..f4e92b503fbb 100644
--- a/databases/courier-authlib-userdb/distinfo
+++ b/databases/courier-authlib-userdb/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.54.tar.bz2) = 8628379adb2e402628dc0a66f7c7c73e
-SIZE(courier-authlib-0.54.tar.bz2) = 1966155
+MD5 (courier-authlib-0.55.tar.bz2) = eb57aefb8460106709d560c40cccaa41
+SIZE(courier-authlib-0.55.tar.bz2) = 1972024
diff --git a/databases/courier-authlib-usergdbm/Makefile b/databases/courier-authlib-usergdbm/Makefile
index a033447050b8..836e9556543c 100644
--- a/databases/courier-authlib-usergdbm/Makefile
+++ b/databases/courier-authlib-usergdbm/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.54
-PORTREVISION=	2
+PORTVERSION=	0.55
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -27,17 +27,19 @@ USE_LIBLTDL=	yes
 #
 # options available:
 #
-# WITHOUT_PAM:			Don't build in PAM support
-# WITH_VPOPMAIL:		Build in vpopmail support
-# WITH_MYSQL:			Build in mysql support
-# WITH_POSTGRESQL:		Build in postgresql support
-# WITH_LDAP:			Build in ldap support with openldap
-# WITH_GDBM:			Use gdbm files instead of bdb
 # WITH_MAILUSER:		The user running authlib
 # WITH_MAILGROUP:		The group running authlib
-# WITHOUT_AUTHUSERDB:		Don't build in authuserdb
+# WITH_SYSLOG_FACILITY:		The syslogfacility to use
 #
 
+OPTIONS=	PAM		"Build with PAM support"		on \
+		VPOPMAIL	"Build in vpopmail support"		off \
+		MYSQL		"Build in mysql support"		off \
+		POSTGRESQL	"Build in postgresql support"		off \
+		LDAP		"Build in ldap support with openldap"	off \
+		GDBM		"Use gdbm files instead of bdb"		off \
+		AUTHUSERDB	"Build with authuserdb"			on
+
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
@@ -50,11 +52,17 @@ CONFIGURE_ARGS=	--without-authshadow \
 		--enable-unicode \
 		--enable-ltdl-install=no
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SYSLOG_FACILITY)
+CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
+.endif
+
 .if defined(WITH_GDBM)
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--with-db=gdbm
+CONFIGURE_ARGS+=--with-db=gdbm
 .else
-CONFIGURE_ARGS+=	--with-db=db
+CONFIGURE_ARGS+=--with-db=db
 .endif
 
 .if !defined(WITH_VPOPMAIL)
@@ -117,9 +125,6 @@ CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
 CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
 .endif
 
-
-.include <bsd.port.pre.mk>
-
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 MAN1=		courierlogger.1
diff --git a/databases/courier-authlib-usergdbm/distinfo b/databases/courier-authlib-usergdbm/distinfo
index 44ea145a49d5..f4e92b503fbb 100644
--- a/databases/courier-authlib-usergdbm/distinfo
+++ b/databases/courier-authlib-usergdbm/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.54.tar.bz2) = 8628379adb2e402628dc0a66f7c7c73e
-SIZE(courier-authlib-0.54.tar.bz2) = 1966155
+MD5 (courier-authlib-0.55.tar.bz2) = eb57aefb8460106709d560c40cccaa41
+SIZE(courier-authlib-0.55.tar.bz2) = 1972024
diff --git a/mail/courier-authlib-vchkpw/Makefile b/mail/courier-authlib-vchkpw/Makefile
index a033447050b8..836e9556543c 100644
--- a/mail/courier-authlib-vchkpw/Makefile
+++ b/mail/courier-authlib-vchkpw/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.54
-PORTREVISION=	2
+PORTVERSION=	0.55
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -27,17 +27,19 @@ USE_LIBLTDL=	yes
 #
 # options available:
 #
-# WITHOUT_PAM:			Don't build in PAM support
-# WITH_VPOPMAIL:		Build in vpopmail support
-# WITH_MYSQL:			Build in mysql support
-# WITH_POSTGRESQL:		Build in postgresql support
-# WITH_LDAP:			Build in ldap support with openldap
-# WITH_GDBM:			Use gdbm files instead of bdb
 # WITH_MAILUSER:		The user running authlib
 # WITH_MAILGROUP:		The group running authlib
-# WITHOUT_AUTHUSERDB:		Don't build in authuserdb
+# WITH_SYSLOG_FACILITY:		The syslogfacility to use
 #
 
+OPTIONS=	PAM		"Build with PAM support"		on \
+		VPOPMAIL	"Build in vpopmail support"		off \
+		MYSQL		"Build in mysql support"		off \
+		POSTGRESQL	"Build in postgresql support"		off \
+		LDAP		"Build in ldap support with openldap"	off \
+		GDBM		"Use gdbm files instead of bdb"		off \
+		AUTHUSERDB	"Build with authuserdb"			on
+
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
@@ -50,11 +52,17 @@ CONFIGURE_ARGS=	--without-authshadow \
 		--enable-unicode \
 		--enable-ltdl-install=no
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SYSLOG_FACILITY)
+CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
+.endif
+
 .if defined(WITH_GDBM)
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--with-db=gdbm
+CONFIGURE_ARGS+=--with-db=gdbm
 .else
-CONFIGURE_ARGS+=	--with-db=db
+CONFIGURE_ARGS+=--with-db=db
 .endif
 
 .if !defined(WITH_VPOPMAIL)
@@ -117,9 +125,6 @@ CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
 CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
 .endif
 
-
-.include <bsd.port.pre.mk>
-
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 MAN1=		courierlogger.1
diff --git a/mail/courier-authlib-vchkpw/distinfo b/mail/courier-authlib-vchkpw/distinfo
index 44ea145a49d5..f4e92b503fbb 100644
--- a/mail/courier-authlib-vchkpw/distinfo
+++ b/mail/courier-authlib-vchkpw/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.54.tar.bz2) = 8628379adb2e402628dc0a66f7c7c73e
-SIZE(courier-authlib-0.54.tar.bz2) = 1966155
+MD5 (courier-authlib-0.55.tar.bz2) = eb57aefb8460106709d560c40cccaa41
+SIZE(courier-authlib-0.55.tar.bz2) = 1972024
diff --git a/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile
index a033447050b8..836e9556543c 100644
--- a/mail/courier-authlib/Makefile
+++ b/mail/courier-authlib/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.54
-PORTREVISION=	2
+PORTVERSION=	0.55
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -27,17 +27,19 @@ USE_LIBLTDL=	yes
 #
 # options available:
 #
-# WITHOUT_PAM:			Don't build in PAM support
-# WITH_VPOPMAIL:		Build in vpopmail support
-# WITH_MYSQL:			Build in mysql support
-# WITH_POSTGRESQL:		Build in postgresql support
-# WITH_LDAP:			Build in ldap support with openldap
-# WITH_GDBM:			Use gdbm files instead of bdb
 # WITH_MAILUSER:		The user running authlib
 # WITH_MAILGROUP:		The group running authlib
-# WITHOUT_AUTHUSERDB:		Don't build in authuserdb
+# WITH_SYSLOG_FACILITY:		The syslogfacility to use
 #
 
+OPTIONS=	PAM		"Build with PAM support"		on \
+		VPOPMAIL	"Build in vpopmail support"		off \
+		MYSQL		"Build in mysql support"		off \
+		POSTGRESQL	"Build in postgresql support"		off \
+		LDAP		"Build in ldap support with openldap"	off \
+		GDBM		"Use gdbm files instead of bdb"		off \
+		AUTHUSERDB	"Build with authuserdb"			on
+
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
@@ -50,11 +52,17 @@ CONFIGURE_ARGS=	--without-authshadow \
 		--enable-unicode \
 		--enable-ltdl-install=no
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SYSLOG_FACILITY)
+CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
+.endif
+
 .if defined(WITH_GDBM)
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--with-db=gdbm
+CONFIGURE_ARGS+=--with-db=gdbm
 .else
-CONFIGURE_ARGS+=	--with-db=db
+CONFIGURE_ARGS+=--with-db=db
 .endif
 
 .if !defined(WITH_VPOPMAIL)
@@ -117,9 +125,6 @@ CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
 CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
 .endif
 
-
-.include <bsd.port.pre.mk>
-
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 MAN1=		courierlogger.1
diff --git a/mail/courier-authlib/distinfo b/mail/courier-authlib/distinfo
index 44ea145a49d5..f4e92b503fbb 100644
--- a/mail/courier-authlib/distinfo
+++ b/mail/courier-authlib/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.54.tar.bz2) = 8628379adb2e402628dc0a66f7c7c73e
-SIZE(courier-authlib-0.54.tar.bz2) = 1966155
+MD5 (courier-authlib-0.55.tar.bz2) = eb57aefb8460106709d560c40cccaa41
+SIZE(courier-authlib-0.55.tar.bz2) = 1972024
diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile
index a033447050b8..836e9556543c 100644
--- a/net/courier-authlib-ldap/Makefile
+++ b/net/courier-authlib-ldap/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.54
-PORTREVISION=	2
+PORTVERSION=	0.55
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -27,17 +27,19 @@ USE_LIBLTDL=	yes
 #
 # options available:
 #
-# WITHOUT_PAM:			Don't build in PAM support
-# WITH_VPOPMAIL:		Build in vpopmail support
-# WITH_MYSQL:			Build in mysql support
-# WITH_POSTGRESQL:		Build in postgresql support
-# WITH_LDAP:			Build in ldap support with openldap
-# WITH_GDBM:			Use gdbm files instead of bdb
 # WITH_MAILUSER:		The user running authlib
 # WITH_MAILGROUP:		The group running authlib
-# WITHOUT_AUTHUSERDB:		Don't build in authuserdb
+# WITH_SYSLOG_FACILITY:		The syslogfacility to use
 #
 
+OPTIONS=	PAM		"Build with PAM support"		on \
+		VPOPMAIL	"Build in vpopmail support"		off \
+		MYSQL		"Build in mysql support"		off \
+		POSTGRESQL	"Build in postgresql support"		off \
+		LDAP		"Build in ldap support with openldap"	off \
+		GDBM		"Use gdbm files instead of bdb"		off \
+		AUTHUSERDB	"Build with authuserdb"			on
+
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
@@ -50,11 +52,17 @@ CONFIGURE_ARGS=	--without-authshadow \
 		--enable-unicode \
 		--enable-ltdl-install=no
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SYSLOG_FACILITY)
+CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
+.endif
+
 .if defined(WITH_GDBM)
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--with-db=gdbm
+CONFIGURE_ARGS+=--with-db=gdbm
 .else
-CONFIGURE_ARGS+=	--with-db=db
+CONFIGURE_ARGS+=--with-db=db
 .endif
 
 .if !defined(WITH_VPOPMAIL)
@@ -117,9 +125,6 @@ CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
 CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
 .endif
 
-
-.include <bsd.port.pre.mk>
-
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 MAN1=		courierlogger.1
diff --git a/net/courier-authlib-ldap/distinfo b/net/courier-authlib-ldap/distinfo
index 44ea145a49d5..f4e92b503fbb 100644
--- a/net/courier-authlib-ldap/distinfo
+++ b/net/courier-authlib-ldap/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.54.tar.bz2) = 8628379adb2e402628dc0a66f7c7c73e
-SIZE(courier-authlib-0.54.tar.bz2) = 1966155
+MD5 (courier-authlib-0.55.tar.bz2) = eb57aefb8460106709d560c40cccaa41
+SIZE(courier-authlib-0.55.tar.bz2) = 1972024
diff --git a/security/courier-authlib-base/Makefile b/security/courier-authlib-base/Makefile
index a033447050b8..836e9556543c 100644
--- a/security/courier-authlib-base/Makefile
+++ b/security/courier-authlib-base/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.54
-PORTREVISION=	2
+PORTVERSION=	0.55
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -27,17 +27,19 @@ USE_LIBLTDL=	yes
 #
 # options available:
 #
-# WITHOUT_PAM:			Don't build in PAM support
-# WITH_VPOPMAIL:		Build in vpopmail support
-# WITH_MYSQL:			Build in mysql support
-# WITH_POSTGRESQL:		Build in postgresql support
-# WITH_LDAP:			Build in ldap support with openldap
-# WITH_GDBM:			Use gdbm files instead of bdb
 # WITH_MAILUSER:		The user running authlib
 # WITH_MAILGROUP:		The group running authlib
-# WITHOUT_AUTHUSERDB:		Don't build in authuserdb
+# WITH_SYSLOG_FACILITY:		The syslogfacility to use
 #
 
+OPTIONS=	PAM		"Build with PAM support"		on \
+		VPOPMAIL	"Build in vpopmail support"		off \
+		MYSQL		"Build in mysql support"		off \
+		POSTGRESQL	"Build in postgresql support"		off \
+		LDAP		"Build in ldap support with openldap"	off \
+		GDBM		"Use gdbm files instead of bdb"		off \
+		AUTHUSERDB	"Build with authuserdb"			on
+
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
@@ -50,11 +52,17 @@ CONFIGURE_ARGS=	--without-authshadow \
 		--enable-unicode \
 		--enable-ltdl-install=no
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SYSLOG_FACILITY)
+CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
+.endif
+
 .if defined(WITH_GDBM)
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--with-db=gdbm
+CONFIGURE_ARGS+=--with-db=gdbm
 .else
-CONFIGURE_ARGS+=	--with-db=db
+CONFIGURE_ARGS+=--with-db=db
 .endif
 
 .if !defined(WITH_VPOPMAIL)
@@ -117,9 +125,6 @@ CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
 CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
 .endif
 
-
-.include <bsd.port.pre.mk>
-
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 MAN1=		courierlogger.1
diff --git a/security/courier-authlib-base/distinfo b/security/courier-authlib-base/distinfo
index 44ea145a49d5..f4e92b503fbb 100644
--- a/security/courier-authlib-base/distinfo
+++ b/security/courier-authlib-base/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.54.tar.bz2) = 8628379adb2e402628dc0a66f7c7c73e
-SIZE(courier-authlib-0.54.tar.bz2) = 1966155
+MD5 (courier-authlib-0.55.tar.bz2) = eb57aefb8460106709d560c40cccaa41
+SIZE(courier-authlib-0.55.tar.bz2) = 1972024
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index a033447050b8..836e9556543c 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.54
-PORTREVISION=	2
+PORTVERSION=	0.55
+PORTREVISION=	0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -27,17 +27,19 @@ USE_LIBLTDL=	yes
 #
 # options available:
 #
-# WITHOUT_PAM:			Don't build in PAM support
-# WITH_VPOPMAIL:		Build in vpopmail support
-# WITH_MYSQL:			Build in mysql support
-# WITH_POSTGRESQL:		Build in postgresql support
-# WITH_LDAP:			Build in ldap support with openldap
-# WITH_GDBM:			Use gdbm files instead of bdb
 # WITH_MAILUSER:		The user running authlib
 # WITH_MAILGROUP:		The group running authlib
-# WITHOUT_AUTHUSERDB:		Don't build in authuserdb
+# WITH_SYSLOG_FACILITY:		The syslogfacility to use
 #
 
+OPTIONS=	PAM		"Build with PAM support"		on \
+		VPOPMAIL	"Build in vpopmail support"		off \
+		MYSQL		"Build in mysql support"		off \
+		POSTGRESQL	"Build in postgresql support"		off \
+		LDAP		"Build in ldap support with openldap"	off \
+		GDBM		"Use gdbm files instead of bdb"		off \
+		AUTHUSERDB	"Build with authuserdb"			on
+
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
 
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
@@ -50,11 +52,17 @@ CONFIGURE_ARGS=	--without-authshadow \
 		--enable-unicode \
 		--enable-ltdl-install=no
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_SYSLOG_FACILITY)
+CONFIGURE_ARGS+=--with-syslog=${WITH_SYSLOG_FACILITY}
+.endif
+
 .if defined(WITH_GDBM)
 LIB_DEPENDS+=	gdbm.3:${PORTSDIR}/databases/gdbm
-CONFIGURE_ARGS+=	--with-db=gdbm
+CONFIGURE_ARGS+=--with-db=gdbm
 .else
-CONFIGURE_ARGS+=	--with-db=db
+CONFIGURE_ARGS+=--with-db=db
 .endif
 
 .if !defined(WITH_VPOPMAIL)
@@ -117,9 +125,6 @@ CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
 CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
 .endif
 
-
-.include <bsd.port.pre.mk>
-
 RC_SCRIPTS_SUB=PREFIX=${PREFIX} RC_SUBR=${RC_SUBR}
 
 MAN1=		courierlogger.1
diff --git a/security/courier-authlib/distinfo b/security/courier-authlib/distinfo
index 44ea145a49d5..f4e92b503fbb 100644
--- a/security/courier-authlib/distinfo
+++ b/security/courier-authlib/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.54.tar.bz2) = 8628379adb2e402628dc0a66f7c7c73e
-SIZE(courier-authlib-0.54.tar.bz2) = 1966155
+MD5 (courier-authlib-0.55.tar.bz2) = eb57aefb8460106709d560c40cccaa41
+SIZE(courier-authlib-0.55.tar.bz2) = 1972024