Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1712020162275290"
MIME-Version: 1.0
Date: Tue, 2 Apr 2024 01:09:22 +0000
From: "Jonathan Schleifer" <js@netbsd.org>
Subject: CVS commit: pkgsrc/devel/fossil
To: pkgsrc-changes@NetBSD.org
Reply-To: js@netbsd.org
Message-Id: <20240402010922.3D549FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1712020162275290
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	js
Date:		Tue Apr  2 01:09:22 UTC 2024

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

Log Message:
devel/fossil: Add option to disable OpenSSL

This is useful for QNX, as OpenSSL dropped QNX support in OpenSSL 3.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 pkgsrc/devel/fossil/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/fossil/options.mk

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


--_----------=_1712020162275290
Content-Disposition: inline
Content-Length: 2139
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/fossil/Makefile
diff -u pkgsrc/devel/fossil/Makefile:1.85 pkgsrc/devel/fossil/Makefile:1.86
--- pkgsrc/devel/fossil/Makefile:1.85	Thu Jan  4 18:26:29 2024
+++ pkgsrc/devel/fossil/Makefile	Tue Apr  2 01:09:22 2024
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.85 2024/01/04 18:26:29 js Exp $
+# $NetBSD: Makefile,v 1.86 2024/04/02 01:09:22 js Exp $
 
 DISTNAME=	fossil-src-2.23
 PKGNAME=	${DISTNAME:S/-src//}
+PKGREVISION=	1
 CATEGORIES=	devel scm
 MASTER_SITES=	https://fossil-scm.org/home/tarball/version-${PKGVERSION_NOREV}/
 
@@ -11,7 +12,6 @@ COMMENT=	High-reliability, distributed s
 LICENSE=	2-clause-bsd
 
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl:Q}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib:Q}
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1 share/doc/${PKGBASE}
@@ -37,7 +37,6 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/extsrc/linenoise.h \
 		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
-.include "../../security/openssl/buildlink3.mk"
 .if ${OPSYS} == "Darwin"
 .include "../../converters/libiconv/buildlink3.mk"
 .endif

Index: pkgsrc/devel/fossil/options.mk
diff -u pkgsrc/devel/fossil/options.mk:1.1 pkgsrc/devel/fossil/options.mk:1.2
--- pkgsrc/devel/fossil/options.mk:1.1	Sat Dec 23 21:11:32 2017
+++ pkgsrc/devel/fossil/options.mk	Tue Apr  2 01:09:22 2024
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.1 2017/12/23 21:11:32 wiz Exp $
+# $NetBSD: options.mk,v 1.2 2024/04/02 01:09:22 js Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fossil
-PKG_SUPPORTED_OPTIONS=	fossil-system-sqlite fossil-th1-hooks json tcl
+PKG_SUPPORTED_OPTIONS=	fossil-system-sqlite fossil-th1-hooks json openssl tcl
+PKG_SUGGESTED_OPTIONS=	openssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -19,6 +20,13 @@ CONFIGURE_ARGS+=	--with-th1-hooks
 CONFIGURE_ARGS+=	--json
 .endif
 
+.if !empty(PKG_OPTIONS:Mopenssl)
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl:Q}
+.include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--with-openssl=none
+.endif
+
 .if !empty(PKG_OPTIONS:Mtcl)
 CONFIGURE_ARGS+=	--with-tcl
 CONFIGURE_ARGS+=	--with-tcl-private-stubs


--_----------=_1712020162275290--