27 files changed, 288 insertions, 108 deletions

diff --git a/databases/courier-authlib-mysql/Makefile b/databases/courier-authlib-mysql/Makefile
index ea2c8c5b15a5..aa014b385b5e 100644
--- a/databases/courier-authlib-mysql/Makefile
+++ b/databases/courier-authlib-mysql/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.52
+PORTVERSION=	0.53
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -32,6 +32,9 @@ USE_LIBLTDL=	yes
 # 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
 #
 
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
@@ -98,8 +101,24 @@ CONFIGURE_ARGS+=--without-authpam
 PLIST_SUB+=	PAMFLAG="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITHOUT_AUTHUSERDB)
+CONFIGURE_ARGS+=--without-authuserdb
+PLIST_SUB+=     AUTHUSERDBFLAG="@comment "
+.else
+PLIST_SUB+=     AUTHUSERDBFLAG=""
+.endif
+
+.if defined(WITH_MAILUSER)
+CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
+.endif
 
+.if defined(WITH_MAILGROUP)
+CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
+.endif
+
+
+.include <bsd.port.pre.mk>
+++ pkg-plist   Fri Feb  4 02:29:24 2005
 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 8441c7ca4ab1..ca08fd49f80a 100644
--- a/databases/courier-authlib-mysql/distinfo
+++ b/databases/courier-authlib-mysql/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc
-SIZE(courier-authlib-0.52.tar.bz2) = 1965591
+MD5 (courier-authlib-0.53.tar.bz2) = 72407b67050e740d5b834eac06d834df
+SIZE(courier-authlib-0.53.tar.bz2) = 1966836
diff --git a/databases/courier-authlib-mysql/pkg-plist b/databases/courier-authlib-mysql/pkg-plist
index 9f117cda3708..b2dd684012a3 100644
--- a/databases/courier-authlib-mysql/pkg-plist
+++ b/databases/courier-authlib-mysql/pkg-plist
@@ -22,8 +22,8 @@ lib/courier-authlib/libcourierauthsaslclient.a
 lib/courier-authlib/libcourierauthcommon.so.0
 lib/courier-authlib/libcourierauthcommon.so
 lib/courier-authlib/libcourierauthcommon.a
-lib/courier-authlib/libauthuserdb.so.0
-lib/courier-authlib/libauthuserdb.so
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so.0
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so
 %%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0
@@ -36,16 +36,17 @@ lib/courier-authlib/libauthuserdb.so
 %%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so
 libexec/courier-authlib/authsystem.passwd
 libexec/courier-authlib/authdaemond
-libexec/courier-authlib/makedatprog
+%%AUTHUSERDBFLAG%%libexec/courier-authlib/makedatprog
 sbin/authtest
 sbin/authdaemond
 sbin/authenumerate
 sbin/courierlogger
-sbin/makeuserdb
-sbin/userdb
-sbin/userdb-test-cram-md5
-sbin/userdbpw
-sbin/vchkpw2userdb
+%%AUTHUSERDBFLAG%%sbin/pw2userdb
+%%AUTHUSERDBFLAG%%sbin/makeuserdb
+%%AUTHUSERDBFLAG%%sbin/userdb
+%%AUTHUSERDBFLAG%%sbin/userdb-test-cram-md5
+%%AUTHUSERDBFLAG%%sbin/userdbpw
+%%AUTHUSERDBFLAG%%sbin/vchkpw2userdb
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/databases/courier-authlib-pgsql/Makefile b/databases/courier-authlib-pgsql/Makefile
index ea2c8c5b15a5..aa014b385b5e 100644
--- a/databases/courier-authlib-pgsql/Makefile
+++ b/databases/courier-authlib-pgsql/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.52
+PORTVERSION=	0.53
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -32,6 +32,9 @@ USE_LIBLTDL=	yes
 # 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
 #
 
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
@@ -98,8 +101,24 @@ CONFIGURE_ARGS+=--without-authpam
 PLIST_SUB+=	PAMFLAG="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITHOUT_AUTHUSERDB)
+CONFIGURE_ARGS+=--without-authuserdb
+PLIST_SUB+=     AUTHUSERDBFLAG="@comment "
+.else
+PLIST_SUB+=     AUTHUSERDBFLAG=""
+.endif
+
+.if defined(WITH_MAILUSER)
+CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
+.endif
 
+.if defined(WITH_MAILGROUP)
+CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
+.endif
+
+
+.include <bsd.port.pre.mk>
+++ pkg-plist   Fri Feb  4 02:29:24 2005
 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 8441c7ca4ab1..ca08fd49f80a 100644
--- a/databases/courier-authlib-pgsql/distinfo
+++ b/databases/courier-authlib-pgsql/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc
-SIZE(courier-authlib-0.52.tar.bz2) = 1965591
+MD5 (courier-authlib-0.53.tar.bz2) = 72407b67050e740d5b834eac06d834df
+SIZE(courier-authlib-0.53.tar.bz2) = 1966836
diff --git a/databases/courier-authlib-pgsql/pkg-plist b/databases/courier-authlib-pgsql/pkg-plist
index 9f117cda3708..b2dd684012a3 100644
--- a/databases/courier-authlib-pgsql/pkg-plist
+++ b/databases/courier-authlib-pgsql/pkg-plist
@@ -22,8 +22,8 @@ lib/courier-authlib/libcourierauthsaslclient.a
 lib/courier-authlib/libcourierauthcommon.so.0
 lib/courier-authlib/libcourierauthcommon.so
 lib/courier-authlib/libcourierauthcommon.a
-lib/courier-authlib/libauthuserdb.so.0
-lib/courier-authlib/libauthuserdb.so
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so.0
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so
 %%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0
@@ -36,16 +36,17 @@ lib/courier-authlib/libauthuserdb.so
 %%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so
 libexec/courier-authlib/authsystem.passwd
 libexec/courier-authlib/authdaemond
-libexec/courier-authlib/makedatprog
+%%AUTHUSERDBFLAG%%libexec/courier-authlib/makedatprog
 sbin/authtest
 sbin/authdaemond
 sbin/authenumerate
 sbin/courierlogger
-sbin/makeuserdb
-sbin/userdb
-sbin/userdb-test-cram-md5
-sbin/userdbpw
-sbin/vchkpw2userdb
+%%AUTHUSERDBFLAG%%sbin/pw2userdb
+%%AUTHUSERDBFLAG%%sbin/makeuserdb
+%%AUTHUSERDBFLAG%%sbin/userdb
+%%AUTHUSERDBFLAG%%sbin/userdb-test-cram-md5
+%%AUTHUSERDBFLAG%%sbin/userdbpw
+%%AUTHUSERDBFLAG%%sbin/vchkpw2userdb
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/databases/courier-authlib-userdb/Makefile b/databases/courier-authlib-userdb/Makefile
index ea2c8c5b15a5..aa014b385b5e 100644
--- a/databases/courier-authlib-userdb/Makefile
+++ b/databases/courier-authlib-userdb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.52
+PORTVERSION=	0.53
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -32,6 +32,9 @@ USE_LIBLTDL=	yes
 # 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
 #
 
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
@@ -98,8 +101,24 @@ CONFIGURE_ARGS+=--without-authpam
 PLIST_SUB+=	PAMFLAG="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITHOUT_AUTHUSERDB)
+CONFIGURE_ARGS+=--without-authuserdb
+PLIST_SUB+=     AUTHUSERDBFLAG="@comment "
+.else
+PLIST_SUB+=     AUTHUSERDBFLAG=""
+.endif
+
+.if defined(WITH_MAILUSER)
+CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
+.endif
 
+.if defined(WITH_MAILGROUP)
+CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
+.endif
+
+
+.include <bsd.port.pre.mk>
+++ pkg-plist   Fri Feb  4 02:29:24 2005
 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 8441c7ca4ab1..ca08fd49f80a 100644
--- a/databases/courier-authlib-userdb/distinfo
+++ b/databases/courier-authlib-userdb/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc
-SIZE(courier-authlib-0.52.tar.bz2) = 1965591
+MD5 (courier-authlib-0.53.tar.bz2) = 72407b67050e740d5b834eac06d834df
+SIZE(courier-authlib-0.53.tar.bz2) = 1966836
diff --git a/databases/courier-authlib-userdb/pkg-plist b/databases/courier-authlib-userdb/pkg-plist
index 9f117cda3708..b2dd684012a3 100644
--- a/databases/courier-authlib-userdb/pkg-plist
+++ b/databases/courier-authlib-userdb/pkg-plist
@@ -22,8 +22,8 @@ lib/courier-authlib/libcourierauthsaslclient.a
 lib/courier-authlib/libcourierauthcommon.so.0
 lib/courier-authlib/libcourierauthcommon.so
 lib/courier-authlib/libcourierauthcommon.a
-lib/courier-authlib/libauthuserdb.so.0
-lib/courier-authlib/libauthuserdb.so
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so.0
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so
 %%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0
@@ -36,16 +36,17 @@ lib/courier-authlib/libauthuserdb.so
 %%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so
 libexec/courier-authlib/authsystem.passwd
 libexec/courier-authlib/authdaemond
-libexec/courier-authlib/makedatprog
+%%AUTHUSERDBFLAG%%libexec/courier-authlib/makedatprog
 sbin/authtest
 sbin/authdaemond
 sbin/authenumerate
 sbin/courierlogger
-sbin/makeuserdb
-sbin/userdb
-sbin/userdb-test-cram-md5
-sbin/userdbpw
-sbin/vchkpw2userdb
+%%AUTHUSERDBFLAG%%sbin/pw2userdb
+%%AUTHUSERDBFLAG%%sbin/makeuserdb
+%%AUTHUSERDBFLAG%%sbin/userdb
+%%AUTHUSERDBFLAG%%sbin/userdb-test-cram-md5
+%%AUTHUSERDBFLAG%%sbin/userdbpw
+%%AUTHUSERDBFLAG%%sbin/vchkpw2userdb
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/databases/courier-authlib-usergdbm/Makefile b/databases/courier-authlib-usergdbm/Makefile
index ea2c8c5b15a5..aa014b385b5e 100644
--- a/databases/courier-authlib-usergdbm/Makefile
+++ b/databases/courier-authlib-usergdbm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.52
+PORTVERSION=	0.53
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -32,6 +32,9 @@ USE_LIBLTDL=	yes
 # 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
 #
 
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
@@ -98,8 +101,24 @@ CONFIGURE_ARGS+=--without-authpam
 PLIST_SUB+=	PAMFLAG="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITHOUT_AUTHUSERDB)
+CONFIGURE_ARGS+=--without-authuserdb
+PLIST_SUB+=     AUTHUSERDBFLAG="@comment "
+.else
+PLIST_SUB+=     AUTHUSERDBFLAG=""
+.endif
+
+.if defined(WITH_MAILUSER)
+CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
+.endif
 
+.if defined(WITH_MAILGROUP)
+CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
+.endif
+
+
+.include <bsd.port.pre.mk>
+++ pkg-plist   Fri Feb  4 02:29:24 2005
 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 8441c7ca4ab1..ca08fd49f80a 100644
--- a/databases/courier-authlib-usergdbm/distinfo
+++ b/databases/courier-authlib-usergdbm/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc
-SIZE(courier-authlib-0.52.tar.bz2) = 1965591
+MD5 (courier-authlib-0.53.tar.bz2) = 72407b67050e740d5b834eac06d834df
+SIZE(courier-authlib-0.53.tar.bz2) = 1966836
diff --git a/databases/courier-authlib-usergdbm/pkg-plist b/databases/courier-authlib-usergdbm/pkg-plist
index 9f117cda3708..b2dd684012a3 100644
--- a/databases/courier-authlib-usergdbm/pkg-plist
+++ b/databases/courier-authlib-usergdbm/pkg-plist
@@ -22,8 +22,8 @@ lib/courier-authlib/libcourierauthsaslclient.a
 lib/courier-authlib/libcourierauthcommon.so.0
 lib/courier-authlib/libcourierauthcommon.so
 lib/courier-authlib/libcourierauthcommon.a
-lib/courier-authlib/libauthuserdb.so.0
-lib/courier-authlib/libauthuserdb.so
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so.0
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so
 %%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0
@@ -36,16 +36,17 @@ lib/courier-authlib/libauthuserdb.so
 %%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so
 libexec/courier-authlib/authsystem.passwd
 libexec/courier-authlib/authdaemond
-libexec/courier-authlib/makedatprog
+%%AUTHUSERDBFLAG%%libexec/courier-authlib/makedatprog
 sbin/authtest
 sbin/authdaemond
 sbin/authenumerate
 sbin/courierlogger
-sbin/makeuserdb
-sbin/userdb
-sbin/userdb-test-cram-md5
-sbin/userdbpw
-sbin/vchkpw2userdb
+%%AUTHUSERDBFLAG%%sbin/pw2userdb
+%%AUTHUSERDBFLAG%%sbin/makeuserdb
+%%AUTHUSERDBFLAG%%sbin/userdb
+%%AUTHUSERDBFLAG%%sbin/userdb-test-cram-md5
+%%AUTHUSERDBFLAG%%sbin/userdbpw
+%%AUTHUSERDBFLAG%%sbin/vchkpw2userdb
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/mail/courier-authlib-vchkpw/Makefile b/mail/courier-authlib-vchkpw/Makefile
index ea2c8c5b15a5..aa014b385b5e 100644
--- a/mail/courier-authlib-vchkpw/Makefile
+++ b/mail/courier-authlib-vchkpw/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.52
+PORTVERSION=	0.53
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -32,6 +32,9 @@ USE_LIBLTDL=	yes
 # 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
 #
 
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
@@ -98,8 +101,24 @@ CONFIGURE_ARGS+=--without-authpam
 PLIST_SUB+=	PAMFLAG="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITHOUT_AUTHUSERDB)
+CONFIGURE_ARGS+=--without-authuserdb
+PLIST_SUB+=     AUTHUSERDBFLAG="@comment "
+.else
+PLIST_SUB+=     AUTHUSERDBFLAG=""
+.endif
+
+.if defined(WITH_MAILUSER)
+CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
+.endif
 
+.if defined(WITH_MAILGROUP)
+CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
+.endif
+
+
+.include <bsd.port.pre.mk>
+++ pkg-plist   Fri Feb  4 02:29:24 2005
 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 8441c7ca4ab1..ca08fd49f80a 100644
--- a/mail/courier-authlib-vchkpw/distinfo
+++ b/mail/courier-authlib-vchkpw/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc
-SIZE(courier-authlib-0.52.tar.bz2) = 1965591
+MD5 (courier-authlib-0.53.tar.bz2) = 72407b67050e740d5b834eac06d834df
+SIZE(courier-authlib-0.53.tar.bz2) = 1966836
diff --git a/mail/courier-authlib-vchkpw/pkg-plist b/mail/courier-authlib-vchkpw/pkg-plist
index 9f117cda3708..b2dd684012a3 100644
--- a/mail/courier-authlib-vchkpw/pkg-plist
+++ b/mail/courier-authlib-vchkpw/pkg-plist
@@ -22,8 +22,8 @@ lib/courier-authlib/libcourierauthsaslclient.a
 lib/courier-authlib/libcourierauthcommon.so.0
 lib/courier-authlib/libcourierauthcommon.so
 lib/courier-authlib/libcourierauthcommon.a
-lib/courier-authlib/libauthuserdb.so.0
-lib/courier-authlib/libauthuserdb.so
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so.0
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so
 %%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0
@@ -36,16 +36,17 @@ lib/courier-authlib/libauthuserdb.so
 %%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so
 libexec/courier-authlib/authsystem.passwd
 libexec/courier-authlib/authdaemond
-libexec/courier-authlib/makedatprog
+%%AUTHUSERDBFLAG%%libexec/courier-authlib/makedatprog
 sbin/authtest
 sbin/authdaemond
 sbin/authenumerate
 sbin/courierlogger
-sbin/makeuserdb
-sbin/userdb
-sbin/userdb-test-cram-md5
-sbin/userdbpw
-sbin/vchkpw2userdb
+%%AUTHUSERDBFLAG%%sbin/pw2userdb
+%%AUTHUSERDBFLAG%%sbin/makeuserdb
+%%AUTHUSERDBFLAG%%sbin/userdb
+%%AUTHUSERDBFLAG%%sbin/userdb-test-cram-md5
+%%AUTHUSERDBFLAG%%sbin/userdbpw
+%%AUTHUSERDBFLAG%%sbin/vchkpw2userdb
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/mail/courier-authlib/Makefile b/mail/courier-authlib/Makefile
index ea2c8c5b15a5..aa014b385b5e 100644
--- a/mail/courier-authlib/Makefile
+++ b/mail/courier-authlib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.52
+PORTVERSION=	0.53
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -32,6 +32,9 @@ USE_LIBLTDL=	yes
 # 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
 #
 
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
@@ -98,8 +101,24 @@ CONFIGURE_ARGS+=--without-authpam
 PLIST_SUB+=	PAMFLAG="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITHOUT_AUTHUSERDB)
+CONFIGURE_ARGS+=--without-authuserdb
+PLIST_SUB+=     AUTHUSERDBFLAG="@comment "
+.else
+PLIST_SUB+=     AUTHUSERDBFLAG=""
+.endif
+
+.if defined(WITH_MAILUSER)
+CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
+.endif
 
+.if defined(WITH_MAILGROUP)
+CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
+.endif
+
+
+.include <bsd.port.pre.mk>
+++ pkg-plist   Fri Feb  4 02:29:24 2005
 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 8441c7ca4ab1..ca08fd49f80a 100644
--- a/mail/courier-authlib/distinfo
+++ b/mail/courier-authlib/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc
-SIZE(courier-authlib-0.52.tar.bz2) = 1965591
+MD5 (courier-authlib-0.53.tar.bz2) = 72407b67050e740d5b834eac06d834df
+SIZE(courier-authlib-0.53.tar.bz2) = 1966836
diff --git a/mail/courier-authlib/pkg-plist b/mail/courier-authlib/pkg-plist
index 9f117cda3708..b2dd684012a3 100644
--- a/mail/courier-authlib/pkg-plist
+++ b/mail/courier-authlib/pkg-plist
@@ -22,8 +22,8 @@ lib/courier-authlib/libcourierauthsaslclient.a
 lib/courier-authlib/libcourierauthcommon.so.0
 lib/courier-authlib/libcourierauthcommon.so
 lib/courier-authlib/libcourierauthcommon.a
-lib/courier-authlib/libauthuserdb.so.0
-lib/courier-authlib/libauthuserdb.so
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so.0
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so
 %%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0
@@ -36,16 +36,17 @@ lib/courier-authlib/libauthuserdb.so
 %%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so
 libexec/courier-authlib/authsystem.passwd
 libexec/courier-authlib/authdaemond
-libexec/courier-authlib/makedatprog
+%%AUTHUSERDBFLAG%%libexec/courier-authlib/makedatprog
 sbin/authtest
 sbin/authdaemond
 sbin/authenumerate
 sbin/courierlogger
-sbin/makeuserdb
-sbin/userdb
-sbin/userdb-test-cram-md5
-sbin/userdbpw
-sbin/vchkpw2userdb
+%%AUTHUSERDBFLAG%%sbin/pw2userdb
+%%AUTHUSERDBFLAG%%sbin/makeuserdb
+%%AUTHUSERDBFLAG%%sbin/userdb
+%%AUTHUSERDBFLAG%%sbin/userdb-test-cram-md5
+%%AUTHUSERDBFLAG%%sbin/userdbpw
+%%AUTHUSERDBFLAG%%sbin/vchkpw2userdb
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile
index ea2c8c5b15a5..aa014b385b5e 100644
--- a/net/courier-authlib-ldap/Makefile
+++ b/net/courier-authlib-ldap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.52
+PORTVERSION=	0.53
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -32,6 +32,9 @@ USE_LIBLTDL=	yes
 # 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
 #
 
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
@@ -98,8 +101,24 @@ CONFIGURE_ARGS+=--without-authpam
 PLIST_SUB+=	PAMFLAG="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITHOUT_AUTHUSERDB)
+CONFIGURE_ARGS+=--without-authuserdb
+PLIST_SUB+=     AUTHUSERDBFLAG="@comment "
+.else
+PLIST_SUB+=     AUTHUSERDBFLAG=""
+.endif
+
+.if defined(WITH_MAILUSER)
+CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
+.endif
 
+.if defined(WITH_MAILGROUP)
+CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
+.endif
+
+
+.include <bsd.port.pre.mk>
+++ pkg-plist   Fri Feb  4 02:29:24 2005
 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 8441c7ca4ab1..ca08fd49f80a 100644
--- a/net/courier-authlib-ldap/distinfo
+++ b/net/courier-authlib-ldap/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc
-SIZE(courier-authlib-0.52.tar.bz2) = 1965591
+MD5 (courier-authlib-0.53.tar.bz2) = 72407b67050e740d5b834eac06d834df
+SIZE(courier-authlib-0.53.tar.bz2) = 1966836
diff --git a/net/courier-authlib-ldap/pkg-plist b/net/courier-authlib-ldap/pkg-plist
index 9f117cda3708..b2dd684012a3 100644
--- a/net/courier-authlib-ldap/pkg-plist
+++ b/net/courier-authlib-ldap/pkg-plist
@@ -22,8 +22,8 @@ lib/courier-authlib/libcourierauthsaslclient.a
 lib/courier-authlib/libcourierauthcommon.so.0
 lib/courier-authlib/libcourierauthcommon.so
 lib/courier-authlib/libcourierauthcommon.a
-lib/courier-authlib/libauthuserdb.so.0
-lib/courier-authlib/libauthuserdb.so
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so.0
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so
 %%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0
@@ -36,16 +36,17 @@ lib/courier-authlib/libauthuserdb.so
 %%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so
 libexec/courier-authlib/authsystem.passwd
 libexec/courier-authlib/authdaemond
-libexec/courier-authlib/makedatprog
+%%AUTHUSERDBFLAG%%libexec/courier-authlib/makedatprog
 sbin/authtest
 sbin/authdaemond
 sbin/authenumerate
 sbin/courierlogger
-sbin/makeuserdb
-sbin/userdb
-sbin/userdb-test-cram-md5
-sbin/userdbpw
-sbin/vchkpw2userdb
+%%AUTHUSERDBFLAG%%sbin/pw2userdb
+%%AUTHUSERDBFLAG%%sbin/makeuserdb
+%%AUTHUSERDBFLAG%%sbin/userdb
+%%AUTHUSERDBFLAG%%sbin/userdb-test-cram-md5
+%%AUTHUSERDBFLAG%%sbin/userdbpw
+%%AUTHUSERDBFLAG%%sbin/vchkpw2userdb
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/security/courier-authlib-base/Makefile b/security/courier-authlib-base/Makefile
index ea2c8c5b15a5..aa014b385b5e 100644
--- a/security/courier-authlib-base/Makefile
+++ b/security/courier-authlib-base/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.52
+PORTVERSION=	0.53
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -32,6 +32,9 @@ USE_LIBLTDL=	yes
 # 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
 #
 
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
@@ -98,8 +101,24 @@ CONFIGURE_ARGS+=--without-authpam
 PLIST_SUB+=	PAMFLAG="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITHOUT_AUTHUSERDB)
+CONFIGURE_ARGS+=--without-authuserdb
+PLIST_SUB+=     AUTHUSERDBFLAG="@comment "
+.else
+PLIST_SUB+=     AUTHUSERDBFLAG=""
+.endif
+
+.if defined(WITH_MAILUSER)
+CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
+.endif
 
+.if defined(WITH_MAILGROUP)
+CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
+.endif
+
+
+.include <bsd.port.pre.mk>
+++ pkg-plist   Fri Feb  4 02:29:24 2005
 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 8441c7ca4ab1..ca08fd49f80a 100644
--- a/security/courier-authlib-base/distinfo
+++ b/security/courier-authlib-base/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc
-SIZE(courier-authlib-0.52.tar.bz2) = 1965591
+MD5 (courier-authlib-0.53.tar.bz2) = 72407b67050e740d5b834eac06d834df
+SIZE(courier-authlib-0.53.tar.bz2) = 1966836
diff --git a/security/courier-authlib-base/pkg-plist b/security/courier-authlib-base/pkg-plist
index 9f117cda3708..b2dd684012a3 100644
--- a/security/courier-authlib-base/pkg-plist
+++ b/security/courier-authlib-base/pkg-plist
@@ -22,8 +22,8 @@ lib/courier-authlib/libcourierauthsaslclient.a
 lib/courier-authlib/libcourierauthcommon.so.0
 lib/courier-authlib/libcourierauthcommon.so
 lib/courier-authlib/libcourierauthcommon.a
-lib/courier-authlib/libauthuserdb.so.0
-lib/courier-authlib/libauthuserdb.so
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so.0
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so
 %%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0
@@ -36,16 +36,17 @@ lib/courier-authlib/libauthuserdb.so
 %%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so
 libexec/courier-authlib/authsystem.passwd
 libexec/courier-authlib/authdaemond
-libexec/courier-authlib/makedatprog
+%%AUTHUSERDBFLAG%%libexec/courier-authlib/makedatprog
 sbin/authtest
 sbin/authdaemond
 sbin/authenumerate
 sbin/courierlogger
-sbin/makeuserdb
-sbin/userdb
-sbin/userdb-test-cram-md5
-sbin/userdbpw
-sbin/vchkpw2userdb
+%%AUTHUSERDBFLAG%%sbin/pw2userdb
+%%AUTHUSERDBFLAG%%sbin/makeuserdb
+%%AUTHUSERDBFLAG%%sbin/userdb
+%%AUTHUSERDBFLAG%%sbin/userdb-test-cram-md5
+%%AUTHUSERDBFLAG%%sbin/userdbpw
+%%AUTHUSERDBFLAG%%sbin/vchkpw2userdb
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index ea2c8c5b15a5..aa014b385b5e 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	courier-authlib
-PORTVERSION=	0.52
+PORTVERSION=	0.53
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	courier
@@ -32,6 +32,9 @@ USE_LIBLTDL=	yes
 # 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
 #
 
 VPOPMAILDIR?=	${LOCALBASE}/vpopmail
@@ -98,8 +101,24 @@ CONFIGURE_ARGS+=--without-authpam
 PLIST_SUB+=	PAMFLAG="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
+.if defined(WITHOUT_AUTHUSERDB)
+CONFIGURE_ARGS+=--without-authuserdb
+PLIST_SUB+=     AUTHUSERDBFLAG="@comment "
+.else
+PLIST_SUB+=     AUTHUSERDBFLAG=""
+.endif
+
+.if defined(WITH_MAILUSER)
+CONFIGURE_ARGS+=--with-mailuser=${WITH_MAILUSER}
+.endif
 
+.if defined(WITH_MAILGROUP)
+CONFIGURE_ARGS+=--with-mailgroup=${WITH_MAILGROUP}
+.endif
+
+
+.include <bsd.port.pre.mk>
+++ pkg-plist   Fri Feb  4 02:29:24 2005
 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 8441c7ca4ab1..ca08fd49f80a 100644
--- a/security/courier-authlib/distinfo
+++ b/security/courier-authlib/distinfo
@@ -1,2 +1,2 @@
-MD5 (courier-authlib-0.52.tar.bz2) = 2ad6837c1eec7582f8634c320f45b2dc
-SIZE(courier-authlib-0.52.tar.bz2) = 1965591
+MD5 (courier-authlib-0.53.tar.bz2) = 72407b67050e740d5b834eac06d834df
+SIZE(courier-authlib-0.53.tar.bz2) = 1966836
diff --git a/security/courier-authlib/pkg-plist b/security/courier-authlib/pkg-plist
index 9f117cda3708..b2dd684012a3 100644
--- a/security/courier-authlib/pkg-plist
+++ b/security/courier-authlib/pkg-plist
@@ -22,8 +22,8 @@ lib/courier-authlib/libcourierauthsaslclient.a
 lib/courier-authlib/libcourierauthcommon.so.0
 lib/courier-authlib/libcourierauthcommon.so
 lib/courier-authlib/libcourierauthcommon.a
-lib/courier-authlib/libauthuserdb.so.0
-lib/courier-authlib/libauthuserdb.so
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so.0
+%%AUTHUSERDBFLAG%%lib/courier-authlib/libauthuserdb.so
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so.0
 %%PAMFLAG%%lib/courier-authlib/libauthpam.so
 %%MYSQLFLAG%%lib/courier-authlib/libauthmysql.so.0
@@ -36,16 +36,17 @@ lib/courier-authlib/libauthuserdb.so
 %%VPOPMAILFLAG%%lib/courier-authlib/libauthvchkpw.so
 libexec/courier-authlib/authsystem.passwd
 libexec/courier-authlib/authdaemond
-libexec/courier-authlib/makedatprog
+%%AUTHUSERDBFLAG%%libexec/courier-authlib/makedatprog
 sbin/authtest
 sbin/authdaemond
 sbin/authenumerate
 sbin/courierlogger
-sbin/makeuserdb
-sbin/userdb
-sbin/userdb-test-cram-md5
-sbin/userdbpw
-sbin/vchkpw2userdb
+%%AUTHUSERDBFLAG%%sbin/pw2userdb
+%%AUTHUSERDBFLAG%%sbin/makeuserdb
+%%AUTHUSERDBFLAG%%sbin/userdb
+%%AUTHUSERDBFLAG%%sbin/userdb-test-cram-md5
+%%AUTHUSERDBFLAG%%sbin/userdbpw
+%%AUTHUSERDBFLAG%%sbin/vchkpw2userdb
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog