diff options
-rw-r--r-- | mail/postfix/Makefile | 7 | ||||
-rw-r--r-- | mail/postfix/Makefile.common | 4 | ||||
-rw-r--r-- | mail/postfix/PLIST | 17 |
3 files changed, 10 insertions, 18 deletions
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 45ae3a4017b..d06c97e6cc0 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.315 2020/01/18 21:49:53 jperkin Exp $ +# $NetBSD: Makefile,v 1.316 2020/01/28 08:16:51 triaxx Exp $ -PKGREVISION= 1 +PKGREVISION= 2 .include "../../mail/postfix/Makefile.common" COMMENT= Fast, easy to administer, and secure mail transfer agent @@ -76,5 +76,8 @@ do-install: ${DESTDIR}${PREFIX}/sbin/qshape ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 \ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 +.for dir in ${POSTFIX_QUEUE_SUBDIR} + ${RMDIR} ${DESTDIR}${POSTFIX_QUEUE_DIR}/${dir} +.endfor .include "../../mk/bsd.pkg.mk" diff --git a/mail/postfix/Makefile.common b/mail/postfix/Makefile.common index 62bc5eccfbf..e9f8507e2a1 100644 --- a/mail/postfix/Makefile.common +++ b/mail/postfix/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.22 2019/12/09 08:45:14 triaxx Exp $ +# $NetBSD: Makefile.common,v 1.23 2020/01/28 08:16:51 triaxx Exp $ # used by mail/postfix/Makefile # used by mail/postfix/Makefile.module @@ -30,6 +30,8 @@ MAILDROP_GROUP?= maildrop # POSTFIX_DATA_DIR?= ${VARBASE}/db/postfix POSTFIX_QUEUE_DIR?= ${VARBASE}/spool/postfix +POSTFIX_QUEUE_SUBDIR= active bounce corrupt defer deferred flush hold \ + incoming maildrop pid private public saved trace BUILD_DEFS+= VARBASE POSTFIX_DATA_DIR POSTFIX_QUEUE_DIR # CCARGS is a list of options to pass to the preprocessor/compiler. diff --git a/mail/postfix/PLIST b/mail/postfix/PLIST index 6a99dde5ad6..aba7fd5b249 100644 --- a/mail/postfix/PLIST +++ b/mail/postfix/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.31 2019/07/17 13:33:00 triaxx Exp $ +@comment $NetBSD: PLIST,v 1.32 2020/01/28 08:16:51 triaxx Exp $ bin/mailq bin/newaliases lib/postfix/libpostfix-dns.so @@ -203,20 +203,7 @@ share/examples/postfix/relocated ${PLIST.csasl}share/examples/postfix/smtpd.conf share/examples/postfix/transport share/examples/postfix/virtual -@pkgdir var/spool/postfix/trace -@pkgdir var/spool/postfix/saved -@pkgdir var/spool/postfix/public -@pkgdir var/spool/postfix/private -@pkgdir var/spool/postfix/pid -@pkgdir var/spool/postfix/maildrop -@pkgdir var/spool/postfix/incoming -@pkgdir var/spool/postfix/hold -@pkgdir var/spool/postfix/flush -@pkgdir var/spool/postfix/deferred -@pkgdir var/spool/postfix/defer -@pkgdir var/spool/postfix/corrupt -@pkgdir var/spool/postfix/bounce -@pkgdir var/spool/postfix/active +@pkgdir var/spool/postfix @pkgdir var/db/postfix @pkgdir libexec/postfix/postfix-files.d @pkgdir libexec/postfix/dynamicmaps.cf.d |