4 files changed, 103 insertions, 28 deletions

diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 0e9d1af56f34..544b6f7753a4 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -22,6 +22,7 @@ DIST_SUBDIR=	qmail
     defined(SLAVE_MYSQL)
 BARRIER_MAILDIRQUOTA_PATCH=	yes
 BARRIER_BLOCKEXEC_PATCH=	yes
+BARRIER_QMAILQUEUE_PATCH=	yes
 .endif
 
 .if defined(SLAVE_LDAP) || \
@@ -30,6 +31,9 @@ BARRIER_DNS_PATCH=		yes
 BARRIER_BIG_CONCURRENCY_PATCH=	yes
 BARRIER_QMTPC_PATCH=		yes
 BARRIER_DISCBOUNCES_PATCH=	yes
+BARRIER_SENDMAIL_F_PATCH=	yes
+BARRIER_BIG_TODO_PATCH=		yes
+BARRIER_LOCALTIME_PATCH=	yes
 .endif
 
 .if defined(SLAVE_LDAP) || \
@@ -40,17 +44,6 @@ BARRIER_OUTGOINGIP_PATCH=	yes
 BARRIER_RFC2821_PATCH=		yes
 .endif
 
-.if defined(SLAVE_MYSQL) || \
-    defined(SLAVE_SPAMCONTROL)
-BARRIER_QMAILQUEUE_PATCH=	yes
-.endif
-
-.if defined(SLAVE_SPAMCONTROL)
-BARRIER_SENDMAIL_F_PATCH=	yes
-BARRIER_BIG_TODO_PATCH=		yes
-BARRIER_LOCALTIME_PATCH=	yes
-.endif
-
 .if defined(SLAVE_LDAP) || \
     defined(SLAVE_MYSQL) || \
     defined(SLAVE_SMTP_AUTH_TLS) || \
@@ -87,6 +80,7 @@ PATCHFILES+=	patch-qmail-1.03-rfc2821.diff:rfc2821
 .if defined(SLAVE_LDAP)
 PATCH_SITES+=	http://www.nrg4u.com/qmail/:ldap
 PATCHFILES+=	qmail-ldap-1.03-${LDAP_PATCH_DATE}.patch.gz:ldap
+PATCH_DIST_STRIP+=	-p1
 .elif defined(SLAVE_MYSQL)
 PATCH_SITES+=	http://iain.cx/unix/qmail/download/:mysql
 PATCHFILES+=	qmail-mysql-${MYSQL_PATCH_VERSION}.patch:mysql
@@ -169,7 +163,11 @@ OPTIONS+=	RELAYMAILFROM	"Open relay based on mailfrom" off \
 		MOREIPME	"Additional control files moreipme & notipme" off \
 		BIGTODO		"Bruce Guenter's BigToDo patch" off
 .endif
+.if !defined(SLAVE_LDAP)
 OPTIONS+=	RCDLINK "create rc.d/qmail.sh" on
+.else
+WITHOUT_RCDLINK=	yes
+.endif
 
 ALL_TARGET+=	default dot-qmail.5 qmail-control.5 qmail-getpw.8 \
 		qmail-limits.7 qmail-newmrh.8 qmail-newu.8 qmail-pw2u.8 \
@@ -202,9 +200,9 @@ PLIST_SUB+=	README_AUTH="@comment "
 
 .if defined(SLAVE_LDAP)
 PKGMESSAGE_SUFFIX=	-ldap
-PLIST_SUB+=	LDAP=""
+PLIST_SUB+=	LDAP="" NOT_LDAP="@comment "
 .else
-PLIST_SUB+=	LDAP="@comment "
+PLIST_SUB+=	LDAP="@comment " NOT_LDAP=""
 .endif
 
 .if defined(SLAVE_SMTP_AUTH_TLS)
@@ -254,7 +252,8 @@ DOCFILES+=	${WRKSRC}/BLURB ${WRKSRC}/BLURB2 ${WRKSRC}/BLURB3 \
 .if defined(SLAVE_LDAP)
 DOCFILES+=	${WRKSRC}/QLDAPINSTALL ${WRKSRC}/QLDAPNEWS \
 		${WRKSRC}/POPBEFORESMTP ${WRKSRC}/QLDAPTODO \
-		${WRKSRC}/QLDAPPICTURE
+		${WRKSRC}/QLDAPPICTURE ${WRKSRC}/QLDAPGROUP \
+		${WRKSRC}/EXTTODO ${WRKSRC}/qmail.schema
 .elif defined(SLAVE_SMTP_AUTH_TLS)
 DOCFILES+=	${WRKDIR}/SMTP_AUTH+TLS.readme \
 		${WRKSRC}/README.auth
@@ -281,8 +280,10 @@ SCRIPTS+=	qmail-alias2recipients qmail-pwd2recipients \
 		qmail-users2recipients qmail-vpopmail2recipients
 .endif
 
+.if !defined(SLAVE_LDAP)
 BOOTFILES=	home home+df proc proc+df binm1 binm1+df \
 		binm2 binm2+df binm3 binm3+df maildir
+.endif
 
 CONFIGUREPROGS=	${WRKSRC}/install ${WRKSRC}/dnsfq ${WRKSRC}/hostname \
 		${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr
@@ -297,6 +298,15 @@ USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
 
+.if defined(SLAVE_LDAP)
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}2
+
+.if !defined(WITHOUT_TLS)
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-with_tls
+USE_OPENSSL=	yes
+.endif
+.endif
+
 .if (defined(WITH_OUTGOINGIP_PATCH) && !defined(BARRIER_OUTGOINGIP_PATCH)) &&\
     (defined(WITH_QMTPC_PATCH)      && !defined(BARRIER_QMTPC_PATCH))
 BROKEN=	"OUTGOINGIP and QMTPC conflicts! Please, make your choice"
@@ -465,7 +475,7 @@ post-patch:
 			   s|LDAPINCLUDES=-I/usr/local/include|LDAPINCLUDES=-I${LOCALBASE}/include|" \
 		${WRKSRC}/Makefile
 .if !defined(WITHOUT_TLS)
-	@${REINPLACE_CMD} "s|#TLSON=|TLSON=|; \
+	@${REINPLACE_CMD} "s|#TLS=|TLS=|; \
 			   s|#TLSINCLUDES=-I/usr/local/include|TLSINCLUDES=-I${OPENSSLBASE}/include|; \
 			   s|#TLSLIBS=-L/usr/local/lib|TLSLIBS=-L${OPENSSLBASE}/lib|; \
 			   s|#OPENSSLBIN=/usr/local/bin/openssl|OPENSSLBIN=${OPENSSLBASE}/bin/openssl|" \
@@ -510,6 +520,9 @@ do-configure:
 		${FILESDIR}/pkg-install.in > ${WRKDIR}/pkg-install
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${CSH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 	@${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
+.if defined(SLAVE_LDAP)
+	@${REINPLACE_CMD} 's|^cc |cc -lcrypt |' ${WRKSRC}/conf-ld ${WRKSRC}/conf-cc
+.endif
 	@${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-qmail
 .if defined(WITH_BIG_CONCURRENCY_PATCH) \
 	&& !defined(BARRIER_BIG_CONCURRENCY_PATCH) \
diff --git a/mail/qmail/distinfo b/mail/qmail/distinfo
index 6ff3caf865e8..5b5aa270715a 100644
--- a/mail/qmail/distinfo
+++ b/mail/qmail/distinfo
@@ -4,8 +4,8 @@ MD5 (qmail/qmail-103.patch) = 9140ad2b03017145cd7963c84bb24f16
 SIZE (qmail/qmail-103.patch) = 2104
 MD5 (qmail/qmail-1.03-starttls-smtp-auth.patch) = f42d6f2e58b7031ceb491820e85ddd16
 SIZE (qmail/qmail-1.03-starttls-smtp-auth.patch) = 41786
-MD5 (qmail/qmail-ldap-1.03-20020901.patch.gz) = 48d2761e9ae44bb4d2812a19634f1a5b
-SIZE (qmail/qmail-ldap-1.03-20020901.patch.gz) = 130655
+MD5 (qmail/qmail-ldap-1.03-20050401a.patch.gz) = 077254d5034ee966ab5dd111f05ebbf1
+SIZE (qmail/qmail-ldap-1.03-20050401a.patch.gz) = 267930
 MD5 (qmail/qmail-mysql-1.1.11.patch) = 3cb291ae92fd1cbab5f5ff9c6e84f2b6
 SIZE (qmail/qmail-mysql-1.1.11.patch) = 59185
 MD5 (qmail/qmail-1.03-tls-20021228.patch) = 7c3b59746340eed7875ccb68da252946
diff --git a/mail/qmail/files/pkg-message-ldap.in b/mail/qmail/files/pkg-message-ldap.in
index 68cb3911f745..56272ff24640 100644
--- a/mail/qmail/files/pkg-message-ldap.in
+++ b/mail/qmail/files/pkg-message-ldap.in
@@ -11,6 +11,9 @@ Do not forget to read %%PREFIX%%/doc/QLDAPINSTALL. After all,
 this is NOT our old stock qmail. And, %%PREFIX%%/doc/ANTISPAM
 for some antispam control measures.
 
+The qmail.schema file was copied to %%DOCSDIR%%. Remember
+to copy it to ldap's schema directory
+
 You can enable qmail as your default mailer executing:
 > %%PREFIX%%/scripts/enable-qmail
 
diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist
index 507104aa4a23..41de3358e794 100644
--- a/mail/qmail/pkg-plist
+++ b/mail/qmail/pkg-plist
@@ -2,8 +2,10 @@
 %%RCDLINK%%@unexec rm -f %%LOCALBASE%%/etc/rc.d/qmail.sh
 %%LDAP%%bin/auth_imap
 %%LDAP%%bin/auth_pop
+%%LDAP%%bin/auth_smtp
 bin/bouncesaying
 bin/condredirect
+%%LDAP%%bin/condwrite
 bin/datemail
 %%LDAP%%bin/digest
 bin/elq
@@ -23,8 +25,11 @@ bin/qail
 bin/qbiff
 %%SPAMCONTROL%%bin/qmail-badloadertypes
 %%SPAMCONTROL%%bin/qmail-badmimetypes
+%%LDAP%%bin/qmail-cdb
 bin/qmail-clean
+%%LDAP%%bin/qmail-forward
 bin/qmail-getpw
+%%LDAP%%bin/qmail-group
 bin/qmail-inject
 %%LDAP%%bin/qmail-ldaplookup
 bin/qmail-local
@@ -45,28 +50,46 @@ bin/qmail-queue
 bin/qmail-remote
 %%LDAP%%bin/qmail-reply
 bin/qmail-rspawn
+%%LDAP%%bin/qmail-secretary
 bin/qmail-send
 bin/qmail-showctl
 bin/qmail-smtpd
 bin/qmail-start
 bin/qmail-tcpok
 bin/qmail-tcpto
+%%LDAP%%bin/qmail-verify
 bin/qreceipt
 bin/qsmhook
 bin/sendmail
 bin/splogger
 bin/tcp-env
-boot/binm1
-boot/binm1+df
-boot/binm2
-boot/binm2+df
-boot/binm3
-boot/binm3+df
-boot/home
-boot/home+df
-boot/maildir
-boot/proc
-boot/proc+df
+%%NOT_LDAP%%boot/binm1
+%%NOT_LDAP%%boot/binm1+df
+%%NOT_LDAP%%boot/binm2
+%%NOT_LDAP%%boot/binm2+df
+%%NOT_LDAP%%boot/binm3
+%%NOT_LDAP%%boot/binm3+df
+%%NOT_LDAP%%boot/home
+%%NOT_LDAP%%boot/home+df
+%%NOT_LDAP%%boot/maildir
+%%NOT_LDAP%%boot/proc
+%%NOT_LDAP%%boot/proc+df
+%%LDAP%%boot/qmail/log/run
+%%LDAP%%boot/qmail/run
+%%LDAP%%boot/qmail-smtpd/log/run
+%%LDAP%%boot/qmail-smtpd/run
+%%LDAP%%boot/qmail-qmqpd/log/run
+%%LDAP%%boot/qmail-qmqpd/run
+%%LDAP%%boot/qmail-pop3d/log/run
+%%LDAP%%boot/qmail-pop3d/run
+%%LDAP%%boot/qmail-imapd/log/run
+%%LDAP%%boot/qmail-imapd/run
+%%LDAP%%boot/qmail-pop3d-ssl/log/run
+%%LDAP%%boot/qmail-pop3d-ssl/run
+%%LDAP%%boot/qmail-imapd-ssl/log/run
+%%LDAP%%boot/qmail-imapd-ssl/run
+%%LDAP%%boot/qmail-pbsdbd/log/run
+%%LDAP%%boot/qmail-pbsdbd/run
 @comment This port installs the following manually (ie. not through qmail-hier)
 configure/config
 configure/config-fast
@@ -86,6 +109,7 @@ scripts/mkaliasdir
 %%PORTDOCS%%%%DOCSDIR%%/BLURB2
 %%PORTDOCS%%%%DOCSDIR%%/BLURB3
 %%PORTDOCS%%%%DOCSDIR%%/BLURB4
+%%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/EXTTODO
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/FILES.spamcontrol
 %%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/HISTORY.spamcontrol
@@ -113,6 +137,7 @@ scripts/mkaliasdir
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/POPBEFORESMTP
 %%PORTDOCS%%%%DOCSDIR%%/PORT_NOTES
 %%PORTDOCS%%%%DOCSDIR%%/PORT_NOTES_FreeBSD_40-RELEASE
+%%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/QLDAPGROUP
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/QLDAPINSTALL
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/QLDAPNEWS
 %%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/QLDAPPICTURE
@@ -151,9 +176,43 @@ scripts/mkaliasdir
 %%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/conf-spamcontrol
 %%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/install_spamcontrol.sh
 %%PORTDOCS%%%%DOCSDIR%%/mailer.conf.sample
+%%LDAP%%%%PORTDOCS%%%%DOCSDIR%%/qmail.schema
 %%SPAMCONTROL%%%%PORTDOCS%%%%DOCSDIR%%/tarpitcount
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm bin
+%%LDAP%%@dirrm boot/qmail/env
+%%LDAP%%@dirrm boot/qmail/log
+%%LDAP%%@dirrm boot/qmail-smtpd/env
+%%LDAP%%@dirrm boot/qmail-smtpd/log
+%%LDAP%%@dirrm boot/qmail-smtpd
+%%LDAP%%@dirrm boot/qmail-qmqpd/env
+%%LDAP%%@dirrm boot/qmail-qmqpd/log
+%%LDAP%%@dirrm boot/qmail-qmqpd
+%%LDAP%%@dirrm boot/qmail-pop3d/env
+%%LDAP%%@dirrm boot/qmail-pop3d/log
+%%LDAP%%@dirrm boot/qmail-pop3d
+%%LDAP%%@dirrm boot/qmail-imapd/env
+%%LDAP%%@dirrm boot/qmail-imapd/log
+%%LDAP%%@dirrm boot/qmail-imapd
+%%LDAP%%@dirrm boot/qmail-pop3d-ssl/env
+%%LDAP%%@dirrm boot/qmail-pop3d-ssl/log
+%%LDAP%%@dirrm boot/qmail-pop3d-ssl
+%%LDAP%%@dirrm boot/qmail-imapd-ssl/env
+%%LDAP%%@dirrm boot/qmail-imapd-ssl/log
+%%LDAP%%@dirrm boot/qmail-imapd-ssl
+%%LDAP%%@dirrm boot/qmail-pbsdbd/env
+%%LDAP%%@dirrm boot/qmail-pbsdbd/log
+%%LDAP%%@dirrm boot/qmail-pbsdbd
+%%LDAP%%@dirrm boot/qmail
+%%LDAP%%@dirrm log/qmail
+%%LDAP%%@dirrm log/qmail-smtpd
+%%LDAP%%@dirrm log/qmail-qmqpd
+%%LDAP%%@dirrm log/qmail-pop3d
+%%LDAP%%@dirrm log/qmail-imapd
+%%LDAP%%@dirrm log/qmail-pop3d-ssl
+%%LDAP%%@dirrm log/qmail-imapd-ssl
+%%LDAP%%@dirrm log/qmail-pbsdbd
+%%LDAP%%@dirrm log
 @dirrm boot
 @dirrm configure
 @dirrm scripts