diff options
| author | schmonz <schmonz@pkgsrc.org> | 2014-11-23 19:08:22 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2014-11-23 19:08:22 +0000 |
| commit | de6c30b1460556b7fc3317ab7758b68fc3ccd044 (patch) | |
| tree | 474a0e8058f1bc413a9e4e746c688cba51c8e356 /mail/qmail | |
| parent | 4df5d7f78e45783161a1a615929f914baa4902a4 (diff) | |
| download | pkgsrc-de6c30b1460556b7fc3317ab7758b68fc3ccd044.tar.gz | |
Quell pkglint, mostly:
- Pluralize QMAIL_ROOT_ONLY_{READABLE,EVERYTHING}S
- Declare the viruscan targets .PHONY
Diffstat (limited to 'mail/qmail')
| -rw-r--r-- | mail/qmail/Makefile | 16 | ||||
| -rw-r--r-- | mail/qmail/options.mk | 3 |
2 files changed, 10 insertions, 9 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 8f9553aacc5..f3cf3c3d1ed 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2014/10/09 14:06:40 wiz Exp $ +# $NetBSD: Makefile,v 1.72 2014/11/23 19:08:22 schmonz Exp $ # DISTNAME= ${PKGNAME_NOREV} @@ -120,16 +120,16 @@ PKG_HOME.${user}= ${QMAILDIR} .endfor PKG_HOME.alias= ${QMAILDIR}/alias -QMAIL_ROOT_ONLY_READABLE= qmail-clean qmail-getpw qmail-local qmail-popup -QMAIL_ROOT_ONLY_READABLE+= qmail-pw2u qmail-remote qmail-rspawn qmail-send -QMAIL_ROOT_ONLY_READABLE+= splogger -QMAIL_ROOT_ONLY_EVERYTHING= qmail-lspawn qmail-newmrh qmail-newu qmail-start +QMAIL_ROOT_ONLY_READABLES= qmail-clean qmail-getpw qmail-local qmail-popup +QMAIL_ROOT_ONLY_READABLES+= qmail-pw2u qmail-remote qmail-rspawn qmail-send +QMAIL_ROOT_ONLY_READABLES+= splogger +QMAIL_ROOT_ONLY_EVERYTHINGS= qmail-lspawn qmail-newmrh qmail-newu qmail-start SPECIAL_PERMS+= ${PREFIX}/bin/qmail-queue qmailq qmail 4555 -.for f in ${QMAIL_ROOT_ONLY_READABLE} +.for f in ${QMAIL_ROOT_ONLY_READABLES} SPECIAL_PERMS+= ${PREFIX}/bin/${f} root qmail 0711 .endfor -.for f in ${QMAIL_ROOT_ONLY_EVERYTHING} +.for f in ${QMAIL_ROOT_ONLY_EVERYTHINGS} SPECIAL_PERMS+= ${PREFIX}/bin/${f} root qmail 0700 .endfor @@ -165,7 +165,7 @@ pre-install: post-install: post-install-viruscan # allow packaging as non-root, fix at install time with SPECIAL_PERMS ${CHMOD} 0755 ${DESTDIR}${PREFIX}/bin/qmail-queue -. for f in ${QMAIL_ROOT_ONLY_READABLE} ${QMAIL_ROOT_ONLY_EVERYTHING} +. for f in ${QMAIL_ROOT_ONLY_READABLES} ${QMAIL_ROOT_ONLY_EVERYTHINGS} ${CHMOD} 0755 ${DESTDIR}${PREFIX}/bin/${f} . endfor # qmail's installer sets strange permissions, set them back diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk index 606d4715984..1cdbc4853df 100644 --- a/mail/qmail/options.mk +++ b/mail/qmail/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.35 2014/07/04 03:34:43 schmonz Exp $ +# $NetBSD: options.mk,v 1.36 2014/11/23 19:08:22 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qmail PKG_OPTIONS_OPTIONAL_GROUPS= rcpt @@ -85,6 +85,7 @@ SUBST_MESSAGE.load= Setting linker flags for syncdir. .endif PLIST_VARS+= viruscan +.PHONY: post-extract-viruscan post-install-viruscan .if !empty(PKG_OPTIONS:Mqmail-viruscan) VIRUSCAN_PATCH= qmail-smtpd-viruscan-1.3.patch VIRUSCAN_LOG_PATCH= qmail-smtpd-viruscan-logging.patch |