CVS commit: pkgsrc/mail/qmail

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jun 28 19:18:26 UTC 2019

Modified Files:
        pkgsrc/mail/qmail: Makefile options.mk

Log Message:
Use CPPFLAGS, not CFLAGS, for consistency with ucspi-tcp6 and djbdns.


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 pkgsrc/mail/qmail/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/mail/qmail/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/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.110 pkgsrc/mail/qmail/Makefile:1.111
--- pkgsrc/mail/qmail/Makefile:1.110    Wed Apr 10 22:24:57 2019
+++ pkgsrc/mail/qmail/Makefile  Fri Jun 28 19:18:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2019/04/10 22:24:57 schmonz Exp $
+# $NetBSD: Makefile,v 1.111 2019/06/28 19:18:25 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.06
@@ -39,7 +39,7 @@ DJB_BUILD_TARGETS=    man
 INSTALL_TARGET=                setup
 DJB_RESTRICTED=                no
 
-CFLAGS.Darwin+=                -DBIND_8_COMPAT=1
+CPPFLAGS.Darwin+=      -DBIND_8_COMPAT=1
 
 PKG_SYSCONFSUBDIR=     qmail
 OWN_DIRS+=             ${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias

Index: pkgsrc/mail/qmail/options.mk
diff -u pkgsrc/mail/qmail/options.mk:1.64 pkgsrc/mail/qmail/options.mk:1.65
--- pkgsrc/mail/qmail/options.mk:1.64   Wed Jun 19 17:46:39 2019
+++ pkgsrc/mail/qmail/options.mk        Fri Jun 28 19:18:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.64 2019/06/19 17:46:39 schmonz Exp $
+# $NetBSD: options.mk,v 1.65 2019/06/28 19:18:25 schmonz Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=                eai inet6 pam syncdir tai-system-clock tls
@@ -14,7 +14,7 @@ QMAILPATCHES+=                        eai:${EAI_PATCH}
 EAI_PATCH=                     netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch
 PATCHFILES+=                   ${EAI_PATCH}
 SITES.${EAI_PATCH}=            https://schmonz.com/qmail/eai/
-CFLAGS+=                       -DEHLO=1
+CPPFLAGS+=                     -DEHLO=1
 .endif
 
 .if !empty(PKG_OPTIONS:Mpam)
@@ -96,7 +96,7 @@ PLIST_VARS+=                  tls
 .if !empty(PKG_OPTIONS:Mtls)
 PLIST.tls=                     yes
 .  include "../../security/openssl/buildlink3.mk"
-CFLAGS+=                       -DTLS=20190408  # NOTE: match what's _in_ the patch
+CPPFLAGS+=                     -DTLS=20190408  # NOTE: match what's _in_ the patch
 USE_TOOLS+=                    openssl
 SUBST_CLASSES+=                        tmprsadh
 SUBST_STAGE.tmprsadh=          do-configure