diff options
| author | schmonz <schmonz@pkgsrc.org> | 2018-08-01 07:10:27 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2018-08-01 07:10:27 +0000 |
| commit | 4ded3e24e39903a2fd1337a6496f831084e30576 (patch) | |
| tree | 6f6052cc2af334689eb509409e7af7fb2a6b8731 /mail/qmail | |
| parent | ca79b8bd2fbb297031ef9c66f8faebfb82701dd4 (diff) | |
| download | pkgsrc-4ded3e24e39903a2fd1337a6496f831084e30576.tar.gz | |
Depend on new enough sysutils/checkpassword{,-pam} such that qmail-run
can (by itself depending on pkgtools/pkg_alternatives) expect to find
"nbcheckpassword".
Remove 'qmail-rejectutils' option, which will become an unconditional
dependency in qmail-run.
Bump PKGREVISION.
Diffstat (limited to 'mail/qmail')
| -rw-r--r-- | mail/qmail/Makefile | 4 | ||||
| -rw-r--r-- | mail/qmail/options.mk | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index b96dc3aea4b..0da3202eff6 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.96 2018/07/29 23:26:44 schmonz Exp $ +# $NetBSD: Makefile,v 1.97 2018/08/01 07:10:27 schmonz Exp $ # DISTNAME= netqmail-1.06 PKGNAME= qmail-1.03 -PKGREVISION= 35 +PKGREVISION= 36 CATEGORIES= mail MASTER_SITES= http://qmail.org/ diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk index abd1df2e51f..9ec023150f7 100644 --- a/mail/qmail/options.mk +++ b/mail/qmail/options.mk @@ -1,10 +1,10 @@ -# $NetBSD: options.mk,v 1.50 2018/07/29 23:26:44 schmonz Exp $ +# $NetBSD: options.mk,v 1.51 2018/08/01 07:10:27 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qmail PKG_SUPPORTED_OPTIONS+= eai inet6 pam sasl syncdir tls -PKG_SUPPORTED_OPTIONS+= qmail-customerror qmail-rejectutils qmail-srs +PKG_SUPPORTED_OPTIONS+= qmail-customerror qmail-srs PKG_SUGGESTED_OPTIONS+= eai sasl syncdir tls -PKG_SUGGESTED_OPTIONS+= qmail-customerror qmail-rejectutils qmail-srs +PKG_SUGGESTED_OPTIONS+= qmail-customerror qmail-srs # Formerly optional patches, now unconditionally applied: QMAILPATCHES= netqmail:${DEFAULT_DISTFILES} @@ -66,9 +66,9 @@ PATCH_DIST_STRIP.${EAI_PATCH}= -p1 .endif .if !empty(PKG_OPTIONS:Mpam) -DEPENDS+= checkpassword-pam-[0-9]*:../../sysutils/checkpassword-pam +DEPENDS+= checkpassword-pam>=0.99nb1:../../sysutils/checkpassword-pam .else -DEPENDS+= checkpassword-[0-9]*:../../sysutils/checkpassword +DEPENDS+= checkpassword>=0.90nb1:../../sysutils/checkpassword .endif .if !empty(PKG_OPTIONS:Mqmail-customerror) @@ -79,10 +79,6 @@ SITES.${CUSTOMERROR_PATCH}= https://notes.sagredo.eu/files/qmail/patches/ PATCH_DIST_STRIP.${CUSTOMERROR_PATCH}=-p1 .endif -.if !empty(PKG_OPTIONS:Mqmail-rejectutils) -DEPENDS+= qmail-rejectutils-[0-9]*:../../mail/qmail-rejectutils -.endif - PLIST_VARS+= srs .if !empty(PKG_OPTIONS:Mqmail-srs) . include "../../mail/libsrs2/buildlink3.mk" |