Index: head/mail/dma/Makefile
===================================================================
--- head/mail/dma/Makefile	(revision 398791)
+++ head/mail/dma/Makefile	(revision 398792)
@@ -1,68 +1,69 @@
 # Created by: Daniel Roethlisberger <daniel@roe.ch>
 # $FreeBSD$
 
 PORTNAME=	dma
 PORTVERSION=	v0.9
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	mail ipv6
 EXTRACT_SUFX=
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DragonFly Mail Agent, a small MTA for local/outbound mail
 
 LICENSE=	BSD3CLAUSE
 
 USE_OPENSSL=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	corecode
 GH_TAGNAME=	2bb8bcb
 
 CFLAGS+=	-I${OPENSSLINC} \
 		-DCONF_PATH='\"${PREFIX}/etc/dma\"' \
 		-DDMA_ROOT_USER='\"mailnull\"' \
 		-DDMA_GROUP='\"mail\"'
 LDFLAGS+=	-L${OPENSSLLIB}
 
 MAKE_ENV=	__MAKE_CONF=/dev/null SRCCONF=/dev/null NO_WERROR=defined
 
 USE_RC_SUBR=	dma_flushq
 SUB_FILES=	pkg-message
 
 # Allow subports to extend.
 CONFFILES+=	dma.conf auth.conf
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 900000
-EXTRA_PATCHES=	${FILESDIR}/extrapatch-8-spool.c
+# 11.x has dma imported into base and /var/spool/dma added to mtree
+.if ${OSVERSION} < 1100009
+PLIST_SUB+=	VARDIR=""
 .else
-EXTRA_PATCHES=	${FILESDIR}/extrapatch-else-spool.c
+PLIST_SUB+=	VARDIR="@comment "
 .endif
 
 pre-patch:
 	@${MKDIR} ${WRKSRC}/dma ${WRKSRC}/dma-mbox-create
 	@${MV} ${WRKSRC}/Makefile ${WRKSRC}/Makefile.dist
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,/etc/dma,${PREFIX}/etc/dma,g' \
 		${WRKSRC}/dma.8
 	@${REINPLACE_CMD} -e 's, /etc/dma, ${PREFIX}/etc/dma,g' \
 		${WRKSRC}/dma.conf
 .if ${OSVERSION} < 1000013
 	@${REINPLACE_CMD} -e 's,^YFLAGS.*,,' ${WRKSRC}/dma/Makefile
 .endif
 
 do-install:
 	${INSTALL_PROGRAM}  ${WRKSRC}/dma/dma ${STAGEDIR}/${PREFIX}/libexec
 	${INSTALL_PROGRAM} \
 		${WRKSRC}/dma-mbox-create/dma-mbox-create ${STAGEDIR}/${PREFIX}/libexec
 	${INSTALL_MAN} ${WRKSRC}/dma.8 ${STAGEDIR}/${PREFIX}/man/man8/
 	${MKDIR} ${STAGEDIR}/${PREFIX}/etc/dma
 .for i in ${CONFFILES}
 	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}/${PREFIX}/etc/dma/${i}.sample
 .endfor
 	${MKDIR} ${STAGEDIR}/var/spool/dma
 
 .include <bsd.port.post.mk>
Index: head/mail/dma/files/extrapatch-8-spool.c
===================================================================
--- head/mail/dma/files/extrapatch-8-spool.c	(revision 398791)
+++ head/mail/dma/files/extrapatch-8-spool.c	(nonexistent)
@@ -1,19 +0,0 @@
---- spool.c	2013-06-03 14:03:15.000000000 +0000
-+++ spool.c.8	2014-05-17 18:14:45.000000000 +0000
-@@ -36,6 +36,7 @@
- 
- #include <sys/file.h>
- #include <sys/stat.h>
-+#include <sys/time.h>
- 
- #include <ctype.h>
- #include <dirent.h>
-@@ -415,7 +416,7 @@
- 		return (0);
- 
- 	/* Did the flush file get touched within the last period seconds? */
--	if (st.st_mtim.tv_sec + period >= now.tv_sec)
-+	if (st.st_mtime + (int)period >= now.tv_sec)
- 		return (1);
- 	else
- 		return (0);

Property changes on: head/mail/dma/files/extrapatch-8-spool.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/dma/files/extrapatch-else-spool.c
===================================================================
--- head/mail/dma/files/extrapatch-else-spool.c	(revision 398791)
+++ head/mail/dma/files/extrapatch-else-spool.c	(nonexistent)
@@ -1,11 +0,0 @@
---- spool.c.orig	2013-06-03 14:03:15.000000000 +0000
-+++ spool.c	2013-08-22 11:07:47.000000000 +0000
-@@ -415,7 +415,7 @@ flushqueue_since(unsigned int period)
- 		return (0);
- 
- 	/* Did the flush file get touched within the last period seconds? */
--	if (st.st_mtim.tv_sec + period >= now.tv_sec)
-+	if (st.st_mtim.tv_sec + (int)period >= now.tv_sec)
- 		return (1);
- 	else
- 		return (0);

Property changes on: head/mail/dma/files/extrapatch-else-spool.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/mail/dma/files/patch-spool.c
===================================================================
--- head/mail/dma/files/patch-spool.c	(nonexistent)
+++ head/mail/dma/files/patch-spool.c	(revision 398792)
@@ -0,0 +1,11 @@
+--- spool.c.orig	2013-06-03 14:03:15.000000000 +0000
++++ spool.c	2013-08-22 11:07:47.000000000 +0000
+@@ -415,7 +415,7 @@ flushqueue_since(unsigned int period)
+ 		return (0);
+ 
+ 	/* Did the flush file get touched within the last period seconds? */
+-	if (st.st_mtim.tv_sec + period >= now.tv_sec)
++	if (st.st_mtim.tv_sec + (int)period >= now.tv_sec)
+ 		return (1);
+ 	else
+ 		return (0);

Property changes on: head/mail/dma/files/patch-spool.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/mail/dma/pkg-plist
===================================================================
--- head/mail/dma/pkg-plist	(revision 398791)
+++ head/mail/dma/pkg-plist	(revision 398792)
@@ -1,6 +1,6 @@
 @(,mail,2555) libexec/dma
 @(root,mail,4555) libexec/dma-mbox-create
 @sample(root,mail,0644) etc/dma/dma.conf.sample
 @sample(root,mail,0640) etc/dma/auth.conf.sample
 man/man8/dma.8.gz
-@dir(root,mail,770) /var/spool/dma
+%%VARDIR%%@dir(root,mail,770) /var/spool/dma