CVS commit: pkgsrc/devel/objfw

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Thu Jan 22 19:34:10 UTC 2026

Modified Files:
        pkgsrc/devel/objfw: Makefile options.mk

Log Message:
devel/objfw: Support selecting Mbed TLS version


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/devel/objfw/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/objfw/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/devel/objfw/Makefile
diff -u pkgsrc/devel/objfw/Makefile:1.58 pkgsrc/devel/objfw/Makefile:1.59
--- pkgsrc/devel/objfw/Makefile:1.58    Wed Jan  7 08:46:43 2026
+++ pkgsrc/devel/objfw/Makefile Thu Jan 22 19:34:10 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.58 2026/01/07 08:46:43 wiz Exp $
+# $NetBSD: Makefile,v 1.59 2026/01/22 19:34:10 js Exp $
 
 DISTNAME=      objfw-1.4.3
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  https://objfw.nil.im/downloads/
 

Index: pkgsrc/devel/objfw/options.mk
diff -u pkgsrc/devel/objfw/options.mk:1.4 pkgsrc/devel/objfw/options.mk:1.5
--- pkgsrc/devel/objfw/options.mk:1.4   Fri Oct 24 21:23:08 2025
+++ pkgsrc/devel/objfw/options.mk       Thu Jan 22 19:34:10 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2025/10/24 21:23:08 js Exp $
+# $NetBSD: options.mk,v 1.5 2026/01/22 19:34:10 js Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.objfw
 .if ${MACHINE_ARCH} != "alpha" && \
@@ -15,8 +15,11 @@ PKG_SUPPORTED_OPTIONS=               clang
 PKG_SUGGESTED_OPTIONS+=                clang
 .endif
 PKG_OPTIONS_OPTIONAL_GROUPS=   tls
-PKG_OPTIONS_GROUP.tls=         openssl gnutls mbedtls
+PKG_OPTIONS_GROUP.tls=         openssl gnutls mbedtls mbedtls3
+# Will only be supported in next release
+#PKG_OPTIONS_GROUP.tls+=               mbedtls4
 .if ${OPSYS} == "Darwin"
+# Will be removed in the next release
 PKG_OPTIONS_GROUP.tls+=                securetransport
 PKG_SUGGESTED_OPTIONS+=                securetransport
 .else
@@ -59,12 +62,26 @@ PLIST_SRC+=         PLIST.tls
 PLIST_SRC+=            PLIST.tlsframework
 .  endif
 .elif !empty(PKG_OPTIONS:Mmbedtls)
+.  include "../../security/mbedtls/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-tls=mbedtls
+PLIST_SRC+=            PLIST.tls
+.  if ${OPSYS} == "Darwin"
+PLIST_SRC+=            PLIST.tlsframework
+.  endif
+.elif !empty(PKG_OPTIONS:Mmbedtls3)
 .  include "../../security/mbedtls3/buildlink3.mk"
 CONFIGURE_ARGS+=       --with-tls=mbedtls
 PLIST_SRC+=            PLIST.tls
 .  if ${OPSYS} == "Darwin"
 PLIST_SRC+=            PLIST.tlsframework
 .  endif
+.elif !empty(PKG_OPTIONS:Mmbedtls4)
+.  include "../../security/mbedtls4/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-tls=mbedtls
+PLIST_SRC+=            PLIST.tls
+.  if ${OPSYS} == "Darwin"
+PLIST_SRC+=            PLIST.tlsframework
+.  endif
 .else
 CONFIGURE_ARGS+=       --without-tls
 .endif