--- mail/alpine/Makefile	2019-07-15 17:45:06.811632000 +0200
+++ mail/alpine/Makefile	2019-07-15 17:23:37.310948000 +0200
@@ -1,8 +1,7 @@
 # $FreeBSD: head/mail/alpine/Makefile 473512 2018-06-28 20:59:10Z swills $
 
 PORTNAME?=	alpine
-DISTVERSION=	2.21.9999
-PORTREVISION?=	0
+DISTVERSION=	2.21.99999
 CATEGORIES?=	mail news ipv6
 MASTER_SITES=	http://repo.or.cz/alpine.git/snapshot/${GIT_COMMIT}${EXTRACT_SUFX}?dummy=/
 
@@ -30,8 +29,8 @@
 MAKE_ARGS+=		CC="${CC}" CXX="${CXX}" GCCCFLAGS="${CFLAGS}"
 # When you update please double check that the commit corresponds to
 # the actual version you've set in PORTVERSION.
-GIT_COMMIT=		d3e6f3932f2af9deca8eed09e30a55e9bd524362
-GIT_COMMIT_SHORT=	d3e6f39
+GIT_COMMIT=		abeb2c25935ef8c75f1e5deef0f81276754dc975
+GIT_COMMIT_SHORT=	abeb2c2
 WRKSRC=			${WRKDIR}/alpine-${GIT_COMMIT_SHORT}
 
 OPTIONS_DEFINE=		ASPELL CONS25 DOCS IPV6 LDAP MAILDIR MOUSE NLS NTLM PASSFILE THREADS
@@ -41,6 +40,7 @@
 .endif
 
 CONS25_DESC=	Add a patch to support color for default console
+MAILDIR_DESC=	Add a patch to support maildir
 NTLM_DESC=	Support for Windows NT Lan Manager authentication
 PASSFILE_DESC=	Support for a stored password file
 
@@ -59,10 +59,11 @@
 # Option LDAP
 LDAP_USE=			openldap=yes
 LDAP_CONFIGURE_WITH=		ldap
-LDAP_CONFIGURE_ON=		--with-ldap-dir=${LOCALBASE}
+LDAP_CFLAGS=			-I${LOCALBASE}/include
+LDAP_LDFLAGS=			-L${LOCALBASE}/lib
 
 # Option MAILDIR
-MAILDIR_PATCH_SITES=		http://alpine.x10host.com/alpine/patches/alpine-2.21/
+MAILDIR_PATCH_SITES=		http://alpine.x10host.com/alpine/alpha/patches/alpine-2.21.99999/
 MAILDIR_PATCHFILES+=		maildir.patch.gz:-p1
 
 # Option MOUSE

--- mail/alpine/distinfo	2019-07-15 17:45:06.836650000 +0200
+++ mail/alpine/distinfo	2019-07-15 17:28:02.302455000 +0200
@@ -1,5 +1,5 @@
-TIMESTAMP = 1530021204
-SHA256 (alpine-2.21.9999.tar.gz) = bc0c0e09e67c8746f6eb01aef8b235db2865fc0238bef1454e22f6e696f79870
-SIZE (alpine-2.21.9999.tar.gz) = 15004250
-SHA256 (maildir.patch.gz) = 1229ea9ec4e150dda1d2da866730a777148874e4667c54cd2c488101b5db8099
-SIZE (maildir.patch.gz) = 33789
+TIMESTAMP = 1563204482
+SHA256 (alpine-2.21.99999.tar.gz) = 983f04e1c5f1beba767877303c682d3c995e0cd93ad6888f2d9933ef4236c25f
+SIZE (alpine-2.21.99999.tar.gz) = 15160895
+SHA256 (maildir.patch.gz) = ac68a8421c68e18d0acba9086ca595b961799b4b47b5c12a1bf430f973dc0dbd
+SIZE (maildir.patch.gz) = 34018