diff -urN vpopmail.old/Makefile vpopmail/Makefile
--- vpopmail.old/Makefile	Thu May 27 08:58:36 2004
+++ vpopmail/Makefile	Thu Jun  3 15:42:55 2004
@@ -127,6 +127,18 @@
 SPAM_THRESHOLD?=15
 LOGLEVEL?=	y
 
+.if defined(WITH_LDAP)
+USE_OPENLDAP_VER=	21
+.if defined(WITH_LDAP_SASL)
+WANT_OPENLDAP_SASL=	yes
+.endif
+CONFIGURE_ARGS+=	--enable-auth-module=ldap
+LDAP_FILES=		${WRKSRC}/README.ldap \
+			${WRKSRC}/ldap/qmailUser.schema \
+			${WRKSRC}/ldap/slapd.conf \
+			${WRKSRC}/ldap/vpopmail.ldif
+.endif
+
 .if defined(WITH_MYSQL)
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--enable-auth-module=mysql \
@@ -323,6 +335,12 @@
 .endif
 	${MKDIR} ${VCFGDIR}
 
+.if defined(WITH_LDAP)
+PLIST:=		${WRKDIR}/PLIST
+pre-install:
+	@${CAT} ${PKGDIR}/pkg-plist.ldap ${PKGDIR}/pkg-plist > ${PLIST}
+.endif
+
 post-install:
 	${MKDIR} ${PREFIX}/vpopmail/etc
 	if [ ! -e "${PREFIX}/vpopmail/etc/tcp.smtp" ]; then \
@@ -347,6 +365,10 @@
 	${ECHO_CMD} "Now you should add the following options to your spamd.sh startup file:"
 	${ECHO_CMD} "-v -u vpopmail"
 	${ECHO_CMD} "***********************************************************************"
+.endif
+.if defined(WITH_LDAP)
+	${MKDIR} ${PREFIX}/vpopmail/ldap
+	${INSTALL_DATA} ${LDAP_FILES} ${PREFIX}/vpopmail/ldap
 .endif
 
 .include <bsd.port.post.mk>
diff -urN vpopmail.old/files/patch-ldap-configure vpopmail/files/patch-ldap-configure
--- vpopmail.old/files/patch-ldap-configure	Thu Jan  1 09:00:00 1970
+++ vpopmail/files/patch-ldap-configure	Thu Jun  3 15:07:58 2004
@@ -0,0 +1,11 @@
+--- configure.orig	Thu Jun  3 15:06:53 2004
++++ configure	Thu Jun  3 15:07:48 2004
+@@ -5985,7 +5985,7 @@
+ #define USE_LDAP $USE_LDAP
+ _ACEOF
+ 
+-    auth_libs="-L/usr/local/lib -lldap -llber -lresolv"
++    auth_libs="-L/usr/local/lib -lldap -llber"
+ 
+     auth_inc="-I/usr/local/include"
+ 
diff -urN vpopmail.old/pkg-plist.ldap vpopmail/pkg-plist.ldap
--- vpopmail.old/pkg-plist.ldap	Thu Jan  1 09:00:00 1970
+++ vpopmail/pkg-plist.ldap	Thu Jun  3 15:31:44 2004
@@ -0,0 +1,5 @@
+vpopmail/ldap/README.ldap
+vpopmail/ldap/qmailUser.schema
+vpopmail/ldap/slapd.conf
+vpopmail/ldap/vpopmail.ldif
+@dirrm vpopmail/ldap