--- mail/alpine/Makefile	2019-07-16 19:49:11.872694000 +0200
+++ mail/alpine/Makefile	2019-07-15 17:23:37.310948000 +0200
@@ -1,4 +1,4 @@ 
-# $FreeBSD: head/mail/alpine/Makefile 506767 2019-07-16 16:55:19Z swills $
+# $FreeBSD: head/mail/alpine/Makefile 473512 2018-06-28 20:59:10Z swills $
 
 PORTNAME?=	alpine
 DISTVERSION=	2.21.99999
@@ -30,16 +30,17 @@ 
 # When you update please double check that the commit corresponds to
 # the actual version you've set in PORTVERSION.
 GIT_COMMIT=		abeb2c25935ef8c75f1e5deef0f81276754dc975
-GIT_COMMIT_SHORT=	${GIT_COMMIT:C/^(.......).*/\1/}
+GIT_COMMIT_SHORT=	abeb2c2
 WRKSRC=			${WRKDIR}/alpine-${GIT_COMMIT_SHORT}
 
-OPTIONS_DEFINE=		ASPELL CONS25 DOCS IPV6 LDAP MOUSE NLS NTLM PASSFILE THREADS
+OPTIONS_DEFINE=		ASPELL CONS25 DOCS IPV6 LDAP MAILDIR MOUSE NLS NTLM PASSFILE THREADS
 OPTIONS_DEFAULT=	ASPELL MOUSE THREADS
 .if defined(PICO_ALPINE_SLAVE)
 OPTIONS_EXCLUDE=	CONS25 IPV6 LDAP PASSFILE
 .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
 
@@ -58,7 +59,12 @@ 
 # 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/alpha/patches/alpine-2.21.99999/
+MAILDIR_PATCHFILES+=		maildir.patch.gz:-p1
 
 # Option MOUSE
 MOUSE_CONFIGURE_ENABLE=		mouse
--- mail/alpine/distinfo	2019-07-16 19:49:11.437594000 +0200
+++ mail/alpine/distinfo	2019-07-15 17:28:02.302455000 +0200
@@ -1,3 +1,5 @@ 
-TIMESTAMP = 1563014517
+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