CVS commit: pkgsrc/devel/objfw

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

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Sep 10 15:56:43 UTC 2023

Modified Files:
        pkgsrc/devel/objfw: Makefile PLIST PLIST.framework
Added Files:
        pkgsrc/devel/objfw: PLIST.tls PLIST.tlsframework options.mk

Log Message:
devel/objfw: Add options to select TLS implementation


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/objfw/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/objfw/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/objfw/PLIST.framework
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/objfw/PLIST.tls \
    pkgsrc/devel/objfw/PLIST.tlsframework 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.8 pkgsrc/devel/objfw/Makefile:1.9
--- pkgsrc/devel/objfw/Makefile:1.8     Wed Aug 30 22:14:44 2023
+++ pkgsrc/devel/objfw/Makefile Sun Sep 10 15:56:43 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2023/08/30 22:14:44 js Exp $
+# $NetBSD: Makefile,v 1.9 2023/09/10 15:56:43 js Exp $
 
 DISTNAME=      objfw-1.0
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  https://objfw.nil.im/downloads/
 
@@ -12,6 +12,7 @@ LICENSE=      qpl-v1.0 OR gnu-gpl-v2 OR gnu-g
 
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         objc
+USE_TOOLS+=            pkg-config
 CONFIGURE_ARGS+=       OBJC=clang      # Clang has much better ObjC support
 CONFIGURE_ARGS+=       OBJCFLAGS=${CFLAGS:M*:Q}
 CONFIGURE_ARGS+=       LDFLAGS=${LDFLAGS:M*:Q}
@@ -37,6 +38,7 @@ PLIST_SRC+=   PLIST.ddp
 PLIST_SRC+=    PLIST.ipx
 .endif
 
+.include "options.mk"
+
 .include "../../lang/clang/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/objfw/PLIST
diff -u pkgsrc/devel/objfw/PLIST:1.4 pkgsrc/devel/objfw/PLIST:1.5
--- pkgsrc/devel/objfw/PLIST:1.4        Wed Aug 30 22:14:44 2023
+++ pkgsrc/devel/objfw/PLIST    Sun Sep 10 15:56:43 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2023/08/30 22:14:44 js Exp $
+@comment $NetBSD: PLIST,v 1.5 2023/09/10 15:56:43 js Exp $
 bin/objfw-compile
 bin/objfw-config
 bin/objfw-embed
@@ -220,13 +220,9 @@ include/ObjFW/platform/GCC4/OFAtomic.h
 include/ObjFW/platform/PowerPC/OFAtomic.h
 include/ObjFW/platform/macOS/OFAtomic.h
 include/ObjFW/platform/x86/OFAtomic.h
-include/ObjFWTLS/ObjFWTLS.h
 lib/libobjfw.so
 lib/libobjfw.so.1
 lib/libobjfw.so.1.0.0
-lib/libobjfwtls.so
-lib/libobjfwtls.so.1
-lib/libobjfwtls.so.1.0.0
 share/ofarc/localization/de.json
 share/ofarc/localization/localizations.json
 share/ofdns/localization/de.json

Index: pkgsrc/devel/objfw/PLIST.framework
diff -u pkgsrc/devel/objfw/PLIST.framework:1.1 pkgsrc/devel/objfw/PLIST.framework:1.2
--- pkgsrc/devel/objfw/PLIST.framework:1.1      Tue Aug 29 16:13:57 2023
+++ pkgsrc/devel/objfw/PLIST.framework  Sun Sep 10 15:56:43 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.framework,v 1.1 2023/08/29 16:13:57 js Exp $
+@comment $NetBSD: PLIST.framework,v 1.2 2023/09/10 15:56:43 js Exp $
 Library/Frameworks/ObjFW.framework/Headers/OFAcceptSocketFailedException.h
 Library/Frameworks/ObjFW.framework/Headers/OFAllocFailedException.h
 Library/Frameworks/ObjFW.framework/Headers/OFAlreadyOpenException.h
@@ -216,7 +216,3 @@ Library/Frameworks/ObjFW.framework/Info.
 Library/Frameworks/ObjFW.framework/Modules/module.modulemap
 Library/Frameworks/ObjFW.framework/ObjFW
 Library/Frameworks/ObjFW.framework/_CodeSignature/CodeResources
-Library/Frameworks/ObjFWTLS.framework/Headers/ObjFWTLS.h
-Library/Frameworks/ObjFWTLS.framework/Info.plist
-Library/Frameworks/ObjFWTLS.framework/ObjFWTLS
-Library/Frameworks/ObjFWTLS.framework/_CodeSignature/CodeResources

Added files:

Index: pkgsrc/devel/objfw/PLIST.tls
diff -u /dev/null pkgsrc/devel/objfw/PLIST.tls:1.1
--- /dev/null   Sun Sep 10 15:56:43 2023
+++ pkgsrc/devel/objfw/PLIST.tls        Sun Sep 10 15:56:43 2023
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.tls,v 1.1 2023/09/10 15:56:43 js Exp $
+include/ObjFWTLS/ObjFWTLS.h
+lib/libobjfwtls.so
+lib/libobjfwtls.so.1
+lib/libobjfwtls.so.1.0.0
Index: pkgsrc/devel/objfw/PLIST.tlsframework
diff -u /dev/null pkgsrc/devel/objfw/PLIST.tlsframework:1.1
--- /dev/null   Sun Sep 10 15:56:43 2023
+++ pkgsrc/devel/objfw/PLIST.tlsframework       Sun Sep 10 15:56:43 2023
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST.tlsframework,v 1.1 2023/09/10 15:56:43 js Exp $
+Library/Frameworks/ObjFWTLS.framework/Headers/ObjFWTLS.h
+Library/Frameworks/ObjFWTLS.framework/Info.plist
+Library/Frameworks/ObjFWTLS.framework/ObjFWTLS
+Library/Frameworks/ObjFWTLS.framework/_CodeSignature/CodeResources
Index: pkgsrc/devel/objfw/options.mk
diff -u /dev/null pkgsrc/devel/objfw/options.mk:1.1
--- /dev/null   Sun Sep 10 15:56:43 2023
+++ pkgsrc/devel/objfw/options.mk       Sun Sep 10 15:56:43 2023
@@ -0,0 +1,37 @@
+# $NetBSD: options.mk,v 1.1 2023/09/10 15:56:43 js Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.objfw
+PKG_OPTIONS_OPTIONAL_GROUPS=   tls
+PKG_OPTIONS_GROUP.tls=         openssl gnutls
+.if ${OPSYS} == "Darwin"
+PKG_OPTIONS_GROUP.tls+=                securetransport
+PKG_SUGGESTED_OPTIONS=         securetransport
+.else
+PKG_SUGGESTED_OPTIONS=         openssl
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mopenssl)
+.  include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-tls=openssl
+PLIST_SRC+=            PLIST.tls
+.  if ${OPSYS} == "Darwin"
+PLIST_SRC+=            PLIST.tlsframework
+.  endif
+.elif !empty(PKG_OPTIONS:Mgnutls)
+.  include "../../security/gnutls/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-tls=gnutls
+PLIST_SRC+=            PLIST.tls
+.  if ${OPSYS} == "Darwin"
+PLIST_SRC+=            PLIST.tlsframework
+.  endif
+.elif !empty(PKG_OPTIONS:Msecuretransport)
+CONFIGURE_ARGS+=       --with-tls=securetransport
+PLIST_SRC+=            PLIST.tls
+.  if ${OPSYS} == "Darwin"
+PLIST_SRC+=            PLIST.tlsframework
+.  endif
+.else
+CONFIGURE_ARGS+=       --without-tls
+.endif