Date: Thu, 8 Oct 2015 01:51:27 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398792 - in head/mail/dma: . files Message-ID: <201510080151.t981pR9w049706@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Oct 8 01:51:27 2015 New Revision: 398792 URL: https://svnweb.freebsd.org/changeset/ports/398792 Log: - Drop 8.x support - Fix staging on 11.x Approved by: portmgr blanket Added: head/mail/dma/files/patch-spool.c - copied unchanged from r390640, head/mail/dma/files/extrapatch-else-spool.c Deleted: head/mail/dma/files/extrapatch-8-spool.c head/mail/dma/files/extrapatch-else-spool.c Modified: head/mail/dma/Makefile head/mail/dma/pkg-plist Modified: head/mail/dma/Makefile ============================================================================== --- head/mail/dma/Makefile Thu Oct 8 01:51:27 2015 (r398791) +++ head/mail/dma/Makefile Thu Oct 8 01:51:27 2015 (r398792) @@ -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: Copied: head/mail/dma/files/patch-spool.c (from r390640, head/mail/dma/files/extrapatch-else-spool.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/dma/files/patch-spool.c Thu Oct 8 01:51:27 2015 (r398792, copy of r390640, head/mail/dma/files/extrapatch-else-spool.c) @@ -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); Modified: head/mail/dma/pkg-plist ============================================================================== --- head/mail/dma/pkg-plist Thu Oct 8 01:51:27 2015 (r398791) +++ head/mail/dma/pkg-plist Thu Oct 8 01:51:27 2015 (r398792) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510080151.t981pR9w049706>