From owner-svn-ports-all@freebsd.org Thu Oct 8 01:51:29 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0314D9D10B9; Thu, 8 Oct 2015 01:51:29 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A39841174; Thu, 8 Oct 2015 01:51:28 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t981pROi049709; Thu, 8 Oct 2015 01:51:27 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t981pR9w049706; Thu, 8 Oct 2015 01:51:27 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201510080151.t981pR9w049706@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 8 Oct 2015 01:51:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398792 - in head/mail/dma: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Oct 2015 01:51:29 -0000 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 -.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