add a WITHOUT_AUTHDAEMON knob

4 files changed, 50 insertions, 23 deletions

diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 0efb59fcf563..b3fa3cc0f2ad 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -26,6 +26,7 @@ USE_GMAKE=	YES
 #
 # WITHOUT_OPENSSL:		Don't build in TLS support
 # WITHOUT_PAM:			Don't build in PAM support
+# WITHOUT_AUTHDAEMON		Don't build the authdaemon
 # WITH_CRAM:			Build in CRAM-MD5 authentication support
 # WITH_VPOPMAIL:		Build in vpopmail support
 # WITH_MYSQL:			Build in mysql support
@@ -68,10 +69,10 @@ CONFIGURE_ARGS=	--without-authshadow \
 		--with-locking-method=fcntl
 
 .if !defined(WITH_VPOPMAIL)
-CONFIGURE_ARGS+= --without-authvchkpw
+CONFIGURE_ARGS+=--without-authvchkpw
 PLIST_SUB+=	VPOPMAILFLAG="@comment "
 .else
-CONFIGURE_ARGS+= --with-authvchkpw
+CONFIGURE_ARGS+=--with-authvchkpw
 BUILD_DEPENDS+=	${VPOPMAILDIR}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
 PLIST_SUB+=	VPOPMAILFLAG=""
 .endif
@@ -81,10 +82,10 @@ WITH_LDAP21=	yes
 .endif
 
 .if !defined(WITH_LDAP1) && !defined(WITH_LDAP20) && !defined(WITH_LDAP21)
-CONFIGURE_ARGS+= --without-authldap
+CONFIGURE_ARGS+=--without-authldap
 PLIST_SUB+=	LDAPFLAG="@comment "
 .else
-CONFIGURE_ARGS+= --with-authldap
+CONFIGURE_ARGS+=--with-authldap
 PLIST_SUB+=	LDAPFLAG=""
 
 .if defined(WITH_LDAP21)
@@ -100,7 +101,7 @@ LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap12 \
 .endif
 
 .if !defined(WITH_MYSQL)
-CONFIGURE_ARGS+= --without-authmysql
+CONFIGURE_ARGS+=--without-authmysql
 PLIST_SUB+=	MYSQLFLAG="@comment "
 .else
 CONFIGURE_ARGS+=--with-authmysql \
@@ -111,7 +112,7 @@ PLIST_SUB+=	MYSQLFLAG=""
 .endif
 
 .if !defined(WITH_POSTGRESQL)
-CONFIGURE_ARGS+= --without-authpgsql
+CONFIGURE_ARGS+=--without-authpgsql
 PLIST_SUB+=	PGSQLFLAG="@comment "
 .else
 POSTGRESQL_PORT?=	databases/postgresql7
@@ -119,16 +120,24 @@ LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 PLIST_SUB+=	PGSQLFLAG=""
 .endif
 
+.if !defined(WITHOUT_AUTHDAEMON)
+CONFIGURE_ARGS+=--with-authdaemon
+PLIST_SUB+=	AUTHDFLAG=""
+.else
+CONFIGURE_ARGS+=--without-authdaemon
+PLIST_SUB+=	AUTHDFLAG="@comment "
+.endif
+
 .if !defined(WITHOUT_PAM)
-CONFIGURE_ARGS+= --with-authpam
+CONFIGURE_ARGS+=--with-authpam
 .else
-CONFIGURE_ARGS+= --without-authpam
+CONFIGURE_ARGS+=--without-authpam
 .endif
 
 .if !defined(WITH_CRAM)
-CONFIGURE_ARGS+= --without-authcram
+CONFIGURE_ARGS+=--without-authcram
 .else
-CONFIGURE_ARGS+= --with-authcram
+CONFIGURE_ARGS+=--with-authcram
 .endif
 
 .if defined(WITH_FAM)
diff --git a/mail/courier-imap/pkg-plist b/mail/courier-imap/pkg-plist
index 0f4a5796a6eb..7f9c8e8bb640 100644
--- a/mail/courier-imap/pkg-plist
+++ b/mail/courier-imap/pkg-plist
@@ -4,7 +4,7 @@ bin/deliverquota
 bin/imapd
 bin/maildirmake
 bin/pop3d
-%%CONFDIR%%/authdaemonrc.dist
+%%AUTHDFLAG%%%%CONFDIR%%/authdaemonrc.dist
 %%LDAPFLAG%%%%CONFDIR%%/authldaprc.dist
 %%MYSQLFLAG%%%%CONFDIR%%/authmysqlrc.dist
 %%PGSQLFLAG%%%%CONFDIR%%/authpgsqlrc.dist
@@ -20,12 +20,12 @@ bin/pop3d
 %%RCDIR%%/courier-imap-pop3d.sh.sample
 %%RCDIR%%/courier-imap-pop3d-ssl.sh.sample
 %%LIBEXECDIR%%/authlib/authcustom
-%%LIBEXECDIR%%/authlib/authdaemon
-%%LIBEXECDIR%%/authlib/authdaemond
+%%AUTHDFLAG%%%%LIBEXECDIR%%/authlib/authdaemon
+%%AUTHDFLAG%%%%LIBEXECDIR%%/authlib/authdaemond
 %%LDAPFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.ldap
 %%MYSQLFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.mysql
 %%PGSQLFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.pgsql
-%%LIBEXECDIR%%/authlib/authdaemond.plain
+%%AUTHDFLAG%%%%LIBEXECDIR%%/authlib/authdaemond.plain
 %%LIBEXECDIR%%/authlib/authpam
 %%LIBEXECDIR%%/authlib/authuserdb
 %%VPOPMAILFLAG%%%%LIBEXECDIR%%/authlib/authvchkpw
@@ -55,7 +55,7 @@ share/courier-imap/vchkpw2userdb
 %%DOCSDIR%%/ChangeLog
 %%DOCSDIR%%/INSTALL
 %%DOCSDIR%%/README
-@dirrm var/authdaemon
+%%AUTHDFLAG%%@dirrm var/authdaemon
 @dirrm var
 @dirrm %%DOCSDIR%%
 @dirrm share/courier-imap
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index cf328349bd48..7917305881fb 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= courier
 
-MAINTAINER=	oliver@freebsd.org
+MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	CGI Webmail client for Maildirs
 
 #
@@ -34,6 +34,7 @@ IMAGEURL?=	${WEBDATASUBDIR}
 
 #
 # set WITHOUT_CACHEDIR to disable the cache dir (can't set it with WITH_LDAP)
+# set WITHOUT_AUTHDAEMON to disable the usage of authdaemond
 # set CACHEOWNER to who you'd like to own the cache files
 # set CACHEDIR to where you'd like your cache directory to be
 # set WITH_LDAP for LDAP authentication and addressbook support
@@ -58,9 +59,10 @@ VCHKPWLOC?=	${LOCALBASE}/vpopmail
 
 # End of user variables
 
-USE_PERL5=	yes
+USE_PERL5=	YES
 HAS_CONFIGURE=	YES
 USE_BZIP2=	YES
+USE_REINPLACE=	YES
 
 CONFIGURE_ARGS= \
 	--enable-cgibindir=${CGIBINDIR}/${CGIBINSUBDIR} \
@@ -80,6 +82,14 @@ CONFIGURE_ARGS+=	--without-cachedir
 PLIST_SUB+=		CACHE=""
 CONFIGURE_ARGS+=	--with-cachedir=${CACHEDIR} \
 			--with-cacheowner=${CACHEOWNER}
+
+.endif
+.if !defined(WITHOUT_AUTHDAEMON)
+CONFIGURE_ARGS+=	--with-authdaemon
+PLIST_SUB+=		AUTHDFLAG=""
+.else
+CONFIGURE_ARGS+=	--without-authdaemon
+PLIST_SUB+=		AUTHDFLAG="@comment "
 .endif
 
 .if defined(WITH_LDAP)
@@ -183,4 +193,8 @@ MLINKS=		authlib.7 authcram.7 \
 
 CONFIGURE_ARGS+=	${CONFIGURE_TARGET}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|^@INSTALLAUTHMODULES@$$|& @AUTHMODULES@|' \
+		${WRKSRC}/authlib/installlist.in
+
 .include <bsd.port.mk>
diff --git a/mail/sqwebmail/pkg-plist b/mail/sqwebmail/pkg-plist
index fb838863a5cb..741f54fff6b7 100644
--- a/mail/sqwebmail/pkg-plist
+++ b/mail/sqwebmail/pkg-plist
@@ -1,10 +1,14 @@
-libexec/sqwebmail/authlib/authdaemon
-libexec/sqwebmail/authlib/authdaemon.passwd
-libexec/sqwebmail/authlib/authdaemond
+libexec/sqwebmail/authlib/authcram
+libexec/sqwebmail/authlib/authcustom
+%%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemon
+%%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemon.passwd
+%%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemond
 %%PGSQLFLAG%%libexec/sqwebmail/authlib/authdaemond.pgsql
-libexec/sqwebmail/authlib/authdaemond.plain
+%%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemond.plain
 %%MYSQLFLAG%%libexec/sqwebmail/authlib/authdaemond.mysql
+libexec/sqwebmail/authlib/authpam
 libexec/sqwebmail/authlib/authsystem.passwd
+libexec/sqwebmail/authlib/authuserdb
 libexec/sqwebmail/sqwebmail/deliverquota
 libexec/sqwebmail/sqwebmail/maildirmake
 libexec/sqwebmail/sqwebmail/makedatprog
@@ -12,7 +16,7 @@ libexec/sqwebmail/sqwebmail/makemime
 libexec/sqwebmail/sqwebmail/mimegpg
 libexec/sqwebmail/sqwebmail/pcpd
 libexec/sqwebmail/sqwebmail/reformime
-share/sqwebmail/authdaemonrc.dist
+%%AUTHDFLAG%%share/sqwebmail/authdaemonrc.dist
 share/sqwebmail/authmodulelist
 %%MYSQLFLAG%%share/sqwebmail/authmysqlrc.dist
 %%PGSQLFLAG%%share/sqwebmail/authpgsqlrc.dist
@@ -81,7 +85,7 @@ share/sqwebmail/webgpg
 @dirrm share/sqwebmail/var/calendar/private
 @dirrm share/sqwebmail/var/calendar/localcache
 @dirrm share/sqwebmail/var/calendar
-@dirrm share/sqwebmail/var/authdaemon
+%%AUTHDFLAG%%@dirrm share/sqwebmail/var/authdaemon
 @dirrm share/sqwebmail/var
 @dirrm share/sqwebmail/share/locale
 @dirrm share/sqwebmail/share