From nobody Wed Mar 02 13:29:01 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id DDCF819E8265; Wed, 2 Mar 2022 13:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K7w1n5rSBz4y6G; Wed, 2 Mar 2022 13:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646227741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hAKALE0lYDtw2jyP2dxa0vOTLcYzSDJUmA1b9MYP5gU=; b=NG1ij+KQCDfU+Iu+NoOfSoTCcwIsQBVlv9sOGK5hcW4Fc8AHHD6rkXU+jE2rwxLQYh5PN7 FWVCzBGe21s5EZP1wkuxQlQgDEKZIts7WFOWQ2FDF1+XLTVrBqrxEP9h1f/mNStaaHvOlW Z6R2t3641CFDULGgDqgj0LB0DRiTTIBq8QQT3oeGzp8SIOtsgbQ4FEnwNu0fN9eVENh9PD nv4n4majEeeAgS41Jy/JKETG22b+4K/bDZ8nFmmaCd4pxoAcv0DhRovrule1VK4JUF9lQ9 K/O7AwSv0gA1rtLbOou2CgJdWZg+ImRXuZwiN2ApvC5pUL8Co1E3VVQXExi6bg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4D1F243C1; Wed, 2 Mar 2022 13:29:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 222DT1PJ080996; Wed, 2 Mar 2022 13:29:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 222DT1eU080995; Wed, 2 Mar 2022 13:29:01 GMT (envelope-from git) Date: Wed, 2 Mar 2022 13:29:01 GMT Message-Id: <202203021329.222DT1eU080995@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: bfacd10e3309 - main - mail/dma: Fix cronjob install location List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfacd10e33090f9b779ec7333d981aac0d70dc15 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646227741; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hAKALE0lYDtw2jyP2dxa0vOTLcYzSDJUmA1b9MYP5gU=; b=Iu6/J0x9SRAkvfJQQ2PNwgYsjMbAZJvLVqJfGVeSezeWqV7y3/MRvvpZ17B9FXVFAicvj/ AnsRz9ASH9Jep+VH7aPwEhZz81QXqKa6IaLBzv/tbNDNlw2UjlFbbP5dtvN7oBdWDZPh1Q mYKNM7YEFCy1mq9g6gTfnZYse2XCDxx/RjvjdDkbm/u99naawmsgjEpSQld3m+bVM8o59z +5iBcBGG9s9ijbcFzB/HG/YhO15WV0/WesX0vuxOtNK+k8wXr2im7QLe1uGMrefTClasY1 yuo/nynnRMuQJFrHZOGzCvysHfeiAFXffymvhAahy7FjGyoEP4ZO4KGmm3Ce6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646227741; a=rsa-sha256; cv=none; b=BT2+AMlobPh1wmW3uo5Bno8ouR/H3s/wD6aWJcR0zNNXzDqWn7oAqofsAEWSDuAGAiBI3R ZoiSyAtL2+CEa2lTgLxKnWUzeT1rFoifGfECQI/kdyrC8AeTg57UJPfEB0MTwg0amscak3 LGSw09TgZy42sL88vA48mc/GIzpDX62Hx/hONdwPnM9E+8BEsJi6OotOGbiylKTlWiNmiZ BTI640cHxOL4tfdLatnkN5giKyt7kwoT4sDmR+ygmXoR34J9WtYGRvYO0jnF0LayRqb+Qa xOGXTO/3DqzX5PmtXo/M8ui0yaOeFhzaf9Pa+Sw9IU2wSd7//51ClIm9qlbNAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=bfacd10e33090f9b779ec7333d981aac0d70dc15 commit bfacd10e33090f9b779ec7333d981aac0d70dc15 Author: Guido Falsi AuthorDate: 2022-03-02 13:23:29 +0000 Commit: Guido Falsi CommitDate: 2022-03-02 13:28:57 +0000 mail/dma: Fix cronjob install location - Install the cronjob file in the correct location, so it is automatically picked up by cron - While here, use ETCDIR expansion in plist in place of static path where appropriate PR: 262294 Approved by: garga (maintainer) Fixes: f3c2313c5893 mail/dma: Implement cronjob to flush emails --- mail/dma/Makefile | 6 ++++-- mail/dma/pkg-plist | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mail/dma/Makefile b/mail/dma/Makefile index 7697ad23e985..097f66fbdded 100644 --- a/mail/dma/Makefile +++ b/mail/dma/Makefile @@ -1,6 +1,7 @@ # Created by: Daniel Roethlisberger PORTNAME= dma +PORTREVISION= 1 DISTVERSIONPREFIX= v DISTVERSION= 0.13.20220128 PORTEPOCH= 1 @@ -43,13 +44,14 @@ post-patch: ${WRKSRC}/bsd/dma-mbox-create/Makefile post-install: - ${MKDIR} ${STAGEDIR}${ETCDIR}/cron.d + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/cron.d + ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}/var/spool/dma ${INSTALL_DATA} ${WRKSRC}/dma.conf \ ${STAGEDIR}${ETCDIR}/dma.conf.sample ${INSTALL_DATA} ${WRKSRC}/auth.conf \ ${STAGEDIR}${ETCDIR}/auth.conf.sample ${INSTALL_DATA} ${WRKDIR}/dma_cron \ - ${STAGEDIR}${ETCDIR}/cron.d/dma + ${STAGEDIR}${PREFIX}/etc/cron.d/dma .include diff --git a/mail/dma/pkg-plist b/mail/dma/pkg-plist index 0f3dd105a0c8..d2078210b5b7 100644 --- a/mail/dma/pkg-plist +++ b/mail/dma/pkg-plist @@ -1,6 +1,6 @@ -%%ETCDIR%%/cron.d/dma +etc/cron.d/dma @(root,mail,2555) libexec/dma @(root,mail,4554) libexec/dma-mbox-create -@sample(root,mail,0644) etc/dma/dma.conf.sample -@sample(root,mail,0640) etc/dma/auth.conf.sample +@sample(root,mail,0644) %%ETCDIR%%/dma.conf.sample +@sample(root,mail,0640) %%ETCDIR%%/auth.conf.sample share/man/man8/dma.8.gz