From owner-dev-commits-ports-main@freebsd.org Wed Apr 7 06:59:37 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 68BDD5CD271; Wed, 7 Apr 2021 06:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFZyK2XMBz4XTg; Wed, 7 Apr 2021 06:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 49FC91AD71; Wed, 7 Apr 2021 06:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1376xbk6027815; Wed, 7 Apr 2021 06:59:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1376xbAu027814; Wed, 7 Apr 2021 06:59:37 GMT (envelope-from git) Date: Wed, 7 Apr 2021 06:59:37 GMT Message-Id: <202104070659.1376xbAu027814@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Pietro Cerutti Subject: git: 8b369328cf41 - main - devel/fossil: always use bundled SQLite MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gahr X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8b369328cf41ef7f9b74b95688fd0834567cf224 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2021 06:59:37 -0000 The branch main has been updated by gahr: URL: https://cgit.FreeBSD.org/ports/commit/?id=8b369328cf41ef7f9b74b95688fd0834567cf224 commit 8b369328cf41ef7f9b74b95688fd0834567cf224 Author: Pietro Cerutti AuthorDate: 2021-04-07 06:57:49 +0000 Commit: Pietro Cerutti CommitDate: 2021-04-07 06:59:32 +0000 devel/fossil: always use bundled SQLite Let's use whatever the fossil developers think it's best. See aso https://fossil-scm.org/forum/forumpost/fc348ef04f --- devel/fossil/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/devel/fossil/Makefile b/devel/fossil/Makefile index 9054c8d55a4e..19b541ded41f 100644 --- a/devel/fossil/Makefile +++ b/devel/fossil/Makefile @@ -1,8 +1,9 @@ +# $FreeBSD: head/devel/fossil/Makefile 569550 2021-03-30 11:47:01Z gahr $ PORTNAME= fossil PORTVERSION= 2.15 DISTVERSIONPREFIX= src- -#PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel www MASTER_SITES= http://fossil-scm.org/index.html/uv/ @@ -24,16 +25,14 @@ MAKE_JOBS_UNSAFE=yes PLIST_FILES= bin/fossil man/man1/fossil.1.gz -OPTIONS_DEFINE= JSON FUSE SQLITE STATIC TH1HOOKS TCL +OPTIONS_DEFINE= JSON FUSE STATIC TH1HOOKS TCL OPTIONS_DEFAULT=JSON JSON_DESC= JSON API support FUSE_DESC= Enable fossil fusefs command -SQLITE_DESC= Use sqlite3 from ports TH1HOOKS_DESC= Enable TH1 command and web page hooks TCL_DESC= Enable Tcl integration JSON_CONFIGURE_ON= --json -SQLITE_CONFIGURE_ON= --disable-internal-sqlite STATIC_CONFIGURE_ON= --static STATIC_LDFLAGS= -pthread FUSE_CONFIGURE_OFF= --disable-fusefs @@ -42,7 +41,6 @@ TCL_CONFIGURE_ON= --with-tcl-stubs --with-tcl=${TCL_LIBDIR} TCL_USES= tcl TCL_CFLAGS= -DTCL_LIBRARY_NAME=\\\"libtcl${TCL_SHLIB_VER}.so\\\" \ -DTCL_MINOR_OFFSET=7 -SQLITE_USES= sqlite localbase:ldflags FUSE_LIB_DEPENDS= libfuse.so:sysutils/fusefs-libs FUSE_USES= localbase:ldflags