CVS commit: pkgsrc/mail/imap-uw

["Jaromir Dolecek" <jdolecek%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jdolecek
Date:           Fri Feb 16 22:06:58 UTC 2018

Modified Files:
        pkgsrc/mail/imap-uw: Makefile options.mk

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 pkgsrc/mail/imap-uw/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/mail/imap-uw/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/imap-uw/Makefile
diff -u pkgsrc/mail/imap-uw/Makefile:1.144 pkgsrc/mail/imap-uw/Makefile:1.145
--- pkgsrc/mail/imap-uw/Makefile:1.144  Fri Jun  2 05:35:21 2017
+++ pkgsrc/mail/imap-uw/Makefile        Fri Feb 16 22:06:58 2018
@@ -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

Index: pkgsrc/mail/imap-uw/options.mk
diff -u pkgsrc/mail/imap-uw/options.mk:1.7 pkgsrc/mail/imap-uw/options.mk:1.8
--- pkgsrc/mail/imap-uw/options.mk:1.7  Tue May 26 11:32:22 2009
+++ pkgsrc/mail/imap-uw/options.mk      Fri Feb 16 22:06:58 2018
@@ -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}}