diff options
| -rw-r--r-- | mail/dma/Makefile | 7 | ||||
| -rw-r--r-- | mail/dma/files/extrapatch-8-spool.c | 19 | ||||
| -rw-r--r-- | mail/dma/files/patch-spool.c (renamed from mail/dma/files/extrapatch-else-spool.c) | 0 | ||||
| -rw-r--r-- | mail/dma/pkg-plist | 2 |
4 files changed, 5 insertions, 23 deletions
diff --git a/mail/dma/Makefile b/mail/dma/Makefile index 06b63cf389bc..eda24798fe46 100644 --- a/mail/dma/Makefile +++ b/mail/dma/Makefile @@ -35,10 +35,11 @@ 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: diff --git a/mail/dma/files/extrapatch-8-spool.c b/mail/dma/files/extrapatch-8-spool.c deleted file mode 100644 index 99ec78847572..000000000000 --- a/mail/dma/files/extrapatch-8-spool.c +++ /dev/null @@ -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); diff --git a/mail/dma/files/extrapatch-else-spool.c b/mail/dma/files/patch-spool.c index 0ebbfa10fca2..0ebbfa10fca2 100644 --- a/mail/dma/files/extrapatch-else-spool.c +++ b/mail/dma/files/patch-spool.c diff --git a/mail/dma/pkg-plist b/mail/dma/pkg-plist index 9fc26581dcb7..90e3d42800c5 100644 --- a/mail/dma/pkg-plist +++ b/mail/dma/pkg-plist @@ -3,4 +3,4 @@ @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 |