git: bfacd10e3309 - main - mail/dma: Fix cronjob install location

From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Wed, 02 Mar 2022 13:29:01 UTC
The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bfacd10e33090f9b779ec7333d981aac0d70dc15

commit bfacd10e33090f9b779ec7333d981aac0d70dc15
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2022-03-02 13:23:29 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
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 <daniel@roe.ch>
 
 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 <bsd.port.mk>
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