diff options
author | jdolecek <jdolecek@pkgsrc.org> | 2018-02-16 22:06:58 +0000 |
---|---|---|
committer | jdolecek <jdolecek@pkgsrc.org> | 2018-02-16 22:06:58 +0000 |
commit | 4f8bc2b77fb2327c4b75a003ad2a1b578d17c8ae (patch) | |
tree | ded5ff4b6eb6699fae7bbb019bc1a76804216b54 /mail | |
parent | d662510201fc1e19dbe3c64a0cd1da8ff142d414 (diff) | |
download | pkgsrc-4f8bc2b77fb2327c4b75a003ad2a1b578d17c8ae.tar.gz |
fix compilation on Darwin with kerberos
when EXTRAAUTHENTICATORS is passed as MAKE_FLAGS, it ends up being
doubled, mkauths then generates auths.c with doubled auth_gss.c and
auth_mit.c twice, triggering duplicate definition errors with clang
9.0.0; pass via MAKE_ENV instead
bump PKGREVISION
Diffstat (limited to 'mail')
-rw-r--r-- | mail/imap-uw/Makefile | 4 | ||||
-rw-r--r-- | mail/imap-uw/options.mk | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index 47c8ef45528..06cae9fca01 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.144 2017/06/02 05:35:21 taca Exp $ +# $NetBSD: Makefile,v 1.145 2018/02/16 22:06:58 jdolecek Exp $ # # ATTENTION: # The Kerberos support in this software is known to be problematic. If you @@ -11,7 +11,7 @@ DISTNAME= imap-2007f PKGNAME= ${DISTNAME:S/-/-uw-/} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= mail MASTER_SITES= ftp://ftp.cac.washington.edu/imap/ EXTRACT_SUFX= .tar.Z diff --git a/mail/imap-uw/options.mk b/mail/imap-uw/options.mk index 6049dc68a7d..c77816de2e0 100644 --- a/mail/imap-uw/options.mk +++ b/mail/imap-uw/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2009/05/26 11:32:22 obache Exp $ +# $NetBSD: options.mk,v 1.8 2018/02/16 22:06:58 jdolecek Exp $ .include "../../mk/bsd.prefs.mk" @@ -37,7 +37,7 @@ MAKE_FLAGS+= IP=4 .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" MAKE_ENV+= KRB5_TYPE=${KRB5_TYPE} -MAKE_FLAGS+= EXTRAAUTHENTICATORS=gss +MAKE_ENV+= EXTRAAUTHENTICATORS=gss EXTRASPECIALS+= GSSDIR=${KRB5BASE} CFLAGS.heimdal= -DHEIMDAL_KRB5 CFLAGS+= ${CFLAGS.${KRB5_TYPE}} |