Wed Mar 18 17:56:09 2020 UTC ()
Make sure ${TAR} is present


(joerg)
diff -r1.117 -r1.118 pkgsrc/mail/qmail/Makefile
cvs diff -r1.117 -r1.118 pkgsrc/mail/qmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmail/Makefile 2020/02/03 04:51:27 1.117
+++ pkgsrc/mail/qmail/Makefile 2020/03/18 17:56:09 1.118
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.117 2020/02/03 04:51:27 schmonz Exp $ 1# $NetBSD: Makefile,v 1.118 2020/03/18 17:56:09 joerg Exp $
2# 2#
3 3
4DISTNAME= notqmail-1.07 4DISTNAME= notqmail-1.07
5PKGNAME= qmail-1.03 5PKGNAME= qmail-1.03
6PKGREVISION= 48 6PKGREVISION= 48
7CATEGORIES= mail 7CATEGORIES= mail
8MASTER_SITES= ${MASTER_SITE_GITHUB:=notqmail/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=notqmail/}
9GITHUB_PROJECT= notqmail 9GITHUB_PROJECT= notqmail
10GITHUB_RELEASE= ${DISTNAME} 10GITHUB_RELEASE= ${DISTNAME}
11 11
12MAINTAINER= schmonz@NetBSD.org 12MAINTAINER= schmonz@NetBSD.org
13HOMEPAGE= https://notqmail.org/ 13HOMEPAGE= https://notqmail.org/
14COMMENT= Secure, reliable, efficient, simple, and fast MTA 14COMMENT= Secure, reliable, efficient, simple, and fast MTA
@@ -70,26 +70,28 @@ INSTALLATION_DIRS+= ${EGDIR}/users @@ -70,26 +70,28 @@ INSTALLATION_DIRS+= ${EGDIR}/users
70 70
71.include "../../mk/bsd.prefs.mk" 71.include "../../mk/bsd.prefs.mk"
72 72
73BUILD_DEFS+= QMAILDIR QMAILPATCHES QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA 73BUILD_DEFS+= QMAILDIR QMAILPATCHES QMAIL_QUEUE_DIR QMAIL_QUEUE_EXTRA
74BUILD_DEFS+= QMAIL_ALIAS_USER QMAIL_DAEMON_USER QMAIL_LOG_USER 74BUILD_DEFS+= QMAIL_ALIAS_USER QMAIL_DAEMON_USER QMAIL_LOG_USER
75BUILD_DEFS+= QMAIL_ROOT_USER QMAIL_PASSWD_USER QMAIL_QUEUE_USER 75BUILD_DEFS+= QMAIL_ROOT_USER QMAIL_PASSWD_USER QMAIL_QUEUE_USER
76BUILD_DEFS+= QMAIL_REMOTE_USER QMAIL_SEND_USER 76BUILD_DEFS+= QMAIL_REMOTE_USER QMAIL_SEND_USER
77BUILD_DEFS+= QMAIL_QMAIL_GROUP QMAIL_NOFILES_GROUP 77BUILD_DEFS+= QMAIL_QMAIL_GROUP QMAIL_NOFILES_GROUP
78 78
79.if !empty(QMAIL_QUEUE_DIR:M${QMAILDIR}/*) 79.if !empty(QMAIL_QUEUE_DIR:M${QMAILDIR}/*)
80PKG_FAIL_REASON+= "QMAIL_QUEUE_DIR must not be under ${QMAILDIR}" 80PKG_FAIL_REASON+= "QMAIL_QUEUE_DIR must not be under ${QMAILDIR}"
81.endif 81.endif
82 82
 83USE_TOOLS+= tar
 84
83.if !empty(QMAIL_QUEUE_EXTRA) 85.if !empty(QMAIL_QUEUE_EXTRA)
84USE_TOOLS+= expr 86USE_TOOLS+= expr
85QUEUE_EXTRA= "T${QMAIL_QUEUE_EXTRA}\\0" 87QUEUE_EXTRA= "T${QMAIL_QUEUE_EXTRA}\\0"
86QUEUE_EXTRALEN_cmd= ${EXPR} `${ECHO_N} ${QMAIL_QUEUE_EXTRA} | ${WC} -c` + 2 88QUEUE_EXTRALEN_cmd= ${EXPR} `${ECHO_N} ${QMAIL_QUEUE_EXTRA} | ${WC} -c` + 2
87SUBST_CLASSES+= logging 89SUBST_CLASSES+= logging
88SUBST_STAGE.logging= do-configure 90SUBST_STAGE.logging= do-configure
89SUBST_FILES.logging= extra.h 91SUBST_FILES.logging= extra.h
90SUBST_SED.logging= -e 's|0|${QUEUE_EXTRALEN_cmd:sh}|g' 92SUBST_SED.logging= -e 's|0|${QUEUE_EXTRALEN_cmd:sh}|g'
91SUBST_SED.logging+= -e 's|""|${QUEUE_EXTRA}|g' 93SUBST_SED.logging+= -e 's|""|${QUEUE_EXTRA}|g'
92SUBST_MESSAGE.logging= Setting QUEUE_EXTRA. 94SUBST_MESSAGE.logging= Setting QUEUE_EXTRA.
93.endif 95.endif
94 96
95SUBST_CLASSES+= catpages 97SUBST_CLASSES+= catpages