CVS commit: pkgsrc/mail/exim

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Sep 29 14:56:34 UTC 2025

Modified Files:
        pkgsrc/mail/exim: options.mk

Log Message:
mail/exim: Add more options to enable the recent specs

* Add ARC, EAI and gsasl options.
* Fix DMARC support.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/mail/exim/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/exim/options.mk
diff -u pkgsrc/mail/exim/options.mk:1.26 pkgsrc/mail/exim/options.mk:1.27
--- pkgsrc/mail/exim/options.mk:1.26    Mon Jul 11 10:52:29 2022
+++ pkgsrc/mail/exim/options.mk Mon Sep 29 14:56:34 2025
@@ -1,14 +1,16 @@
-# $NetBSD: options.mk,v 1.26 2022/07/11 10:52:29 abs Exp $
+# $NetBSD: options.mk,v 1.27 2025/09/29 14:56:34 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.exim
-PKG_SUPPORTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
+PKG_SUPPORTED_OPTIONS= exim-arc
+PKG_SUPPORTED_OPTIONS+=        exim-appendfile-maildir exim-appendfile-mailstore
 PKG_SUPPORTED_OPTIONS+=        exim-appendfile-mbx exim-auth-dovecot exim-build-eximon
-PKG_SUPPORTED_OPTIONS+=        exim-content-scan exim-lookup-cdb exim-lookup-dnsdb
+PKG_SUPPORTED_OPTIONS+=        exim-content-scan exim-eai
+PKG_SUPPORTED_OPTIONS+=        exim-lookup-cdb exim-lookup-dnsdb
 PKG_SUPPORTED_OPTIONS+=        exim-lookup-dsearch exim-lookup-ldap exim-lookup-mysql
 PKG_SUPPORTED_OPTIONS+=        exim-lookup-pgsql exim-lookup-redis exim-lookup-sqlite
 PKG_SUPPORTED_OPTIONS+=        exim-lookup-whoson exim-old-demime exim-router-iplookup
 PKG_SUPPORTED_OPTIONS+=        exim-tcp-wrappers exim-tls exim-transport-lmtp gdbm
-PKG_SUPPORTED_OPTIONS+=        inet6 opendmarc saslauthd spf readline
+PKG_SUPPORTED_OPTIONS+=        gsasl inet6 opendmarc saslauthd spf readline
 
 PKG_SUGGESTED_OPTIONS= exim-appendfile-maildir exim-appendfile-mailstore
 PKG_SUGGESTED_OPTIONS+=        exim-appendfile-mbx exim-content-scan
@@ -17,6 +19,10 @@ PKG_SUGGESTED_OPTIONS+=      exim-tls inet6
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Mexim-arc)
+LOCAL_MAKEFILE_OPTIONS+=       EXPERIMENTAL_ARC=yes
+.endif
+
 .if !empty(PKG_OPTIONS:Mexim-appendfile-maildir)
 LOCAL_MAKEFILE_OPTIONS+=       SUPPORT_MAILDIR=yes
 .endif
@@ -44,6 +50,15 @@ PLIST_SRC+=${PKGDIR}/PLIST.eximon
 LOCAL_MAKEFILE_OPTIONS+=       WITH_CONTENT_SCAN=YES
 .endif
 
+.if !empty(PKG_OPTIONS:Mexim-eai)
+LOCAL_MAKEFILE_OPTIONS+=       SUPPORT_I18N=yes
+LOOKUP_LIBS+=          -lidn
+.  include "../../devel/libidn/buildlink3.mk"
+LOCAL_MAKEFILE_OPTIONS+=       SUPPORT_I18N_2008=yes
+LOOKUP_LIBS+=          -lidn2
+.  include "../../devel/libidn2/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Mexim-lookup-cdb)
 LOCAL_MAKEFILE_OPTIONS+= LOOKUP_CDB=YES
 DEPENDS+=      cdb-[0-9]*:../../databases/cdb
@@ -126,7 +141,7 @@ LOCAL_MAKEFILE_OPTIONS+=    HAVE_IPV6=NO
 .endif
 
 .if !empty(PKG_OPTIONS:Mopendmarc)
-LOCAL_MAKEFILE_OPTIONS+=EXPERIMENTAL_DMARC=yes
+LOCAL_MAKEFILE_OPTIONS+=SUPPORT_DMARC=yes
 LOOKUP_LIBS+=          -lopendmarc
 .  include "../../mail/opendmarc/buildlink3.mk"
 .endif
@@ -144,6 +159,13 @@ EXIM_DBMLIB=               DBMLIB=${LDFLAGS} ${BDB_LI
 EXIM_INCLUDE=          -I${PREFIX}/${BUILDLINK_INCDIRS.${BDB_TYPE}}
 .endif
 
+.if !empty(PKG_OPTIONS:Mgsasl)
+USE_TOOLS+=    pkg-config
+LOCAL_MAKEFILE_OPTIONS+=AUTH_GSASL=yes
+LOCAL_MAKEFILE_OPTIONS+=AUTH_GSASL_PC=libgsasl
+.  include "../../security/gsasl/buildlink3.mk"
+.endif
+
 .if !empty(PKG_OPTIONS:Msaslauthd)
 LOCAL_MAKEFILE_OPTIONS+=AUTH_CYRUS_SASL=YES
 LOCAL_MAKEFILE_OPTIONS+=CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux