From nobody Mon Dec 02 09:18:54 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y1yrv4bV4z5fwGG; Mon, 02 Dec 2024 09:18:55 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y1yrv0ZFBz4HZN; Mon, 2 Dec 2024 09:18:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733131135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GW3FpAzXHzE8RFALx55XLEk7jDW79so8TJalyx94kbE=; b=HTUO7AvKR18pPIkEiCBy36KTiJDEGhIM+0JE0gZrmh02lbMRTF9IQzlIlwumU5wnJHHIeB GcHFeMuWSny/GZTCTuWOYAggLY6YHbzB6mP5mBMbDl5nAWldIvbXk3CJPzyR7/3WCSFgcy SaHiR38EXWvVfLeiBTeSPvI+UPf+p+S5ezwSbjb6uWXfTUKAjCc1OqMQYVGA5univF27SS oGT+6fr4WOv3d98ZqPhYE/ppPWhucRdm/y2B1vXOXsqkWh0e8PVnTO71IQ4dHMxhnLZwsG DrTzD9tWkrp/gpTKlC94yWI+nDY6+RW9uCVYi/c56plKFYH2dyygamN97T//HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733131135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GW3FpAzXHzE8RFALx55XLEk7jDW79so8TJalyx94kbE=; b=aDSkfQBA+CoZH7iS72pXalPdUmJgUebiGhT1OoGT2u3EwhwqnMmxUyOIXK78eaHsqGHH2u JxG9W2x+kQNr4kjKV8ZptpiFCqsDx48dIuZ2fnmtUmGFzzrBYqV7qc/5Z1vy6UDb5kYzud jOSIXG42TqhzQzJX/8kNXyOJuju2gjeNo+fIkRVVbxuRy2+QypnVXbuXqCcRPRC77Fztdu qALTsPz/l6GEinyINM6y7VNAdCGoT0eDN5X1AD8cg6FVp8zkw8cx4fyRenmyvK+95n2urr OTIxp4jmmsVuZIsG+FFqltN7taavxkvlc0HtJ96NsA/Mdl6fm2IxIcQYlnCd0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733131135; a=rsa-sha256; cv=none; b=hkmS+sSzegrstW8DmJosXV05dCUxNWvClvarEzfUnhUCcvXZ7pEb6y87HL9Kvq604+414w oLrml3LbeOECcsIqwgub1T5y+uI+0h//wnxYPkFrMO/QAQ2pGHj1lhy8EVmQqhKMgxDLxR P5tImsGQQ1sANb2nq+MAWoogQCwi1qJSnH1Af3qtSr+IHkopk7BFaJ017azEOus02h+04Z Ou/EpN02OabEppQ7uQLB1QgP8i1FOPx8M7vI+Cus3C3WskV/ZHAkoPq7qFzo2vSYbHu/Li LJTXfXlkk5WHsffZNPmAOgjlbMW82KInGyDOH2e+24ge4JqbfXClZWbOe6iMLQ== 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 4Y1yrv00jSzXly; Mon, 2 Dec 2024 09:18:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B29IsoQ067493; Mon, 2 Dec 2024 09:18:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B29IsCA067490; Mon, 2 Dec 2024 09:18:54 GMT (envelope-from git) Date: Mon, 2 Dec 2024 09:18:54 GMT Message-Id: <202412020918.4B29IsCA067490@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 31bdadbd4e3e - main - databases/emacsql*: Update to 4.1.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 31bdadbd4e3ec7b41f045d2597d273b63d4afe80 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=31bdadbd4e3ec7b41f045d2597d273b63d4afe80 commit 31bdadbd4e3ec7b41f045d2597d273b63d4afe80 Author: Yasuhiro Kimura AuthorDate: 2024-12-02 08:39:39 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-12-02 09:17:11 +0000 databases/emacsql*: Update to 4.1.0 Changes: https://github.com/magit/emacsql/compare/v4.0.3...v4.1.0 --- databases/emacsql-devel/Makefile | 12 ++------ databases/emacsql-devel/distinfo | 6 ++-- .../emacsql-devel/files/patch-emacsql-sqlite.el | 36 ---------------------- .../emacsql-devel/files/patch-sqlite_Makefile | 24 --------------- .../emacsql-devel/files/patch-sqlite_emacsql.c | 11 ------- databases/emacsql-devel/pkg-plist | 1 - databases/emacsql/Makefile | 12 ++------ databases/emacsql/distinfo | 6 ++-- databases/emacsql/files/patch-emacsql-sqlite.el | 36 ---------------------- databases/emacsql/files/patch-sqlite_Makefile | 24 --------------- databases/emacsql/files/patch-sqlite_emacsql.c | 11 ------- databases/emacsql/pkg-plist | 1 - 12 files changed, 10 insertions(+), 170 deletions(-) diff --git a/databases/emacsql-devel/Makefile b/databases/emacsql-devel/Makefile index aefb14140ef4..15e47d39c95c 100644 --- a/databases/emacsql-devel/Makefile +++ b/databases/emacsql-devel/Makefile @@ -1,8 +1,7 @@ PORTNAME= emacsql DISTVERSIONPREFIX= v -DISTVERSION= 4.0.3 +DISTVERSION= 4.1.0 DISTVERSIONSUFFIX= -PORTREVISION= 1 CATEGORIES= databases elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} @@ -14,10 +13,9 @@ LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/UNLICENSE BUILD_DEPENDS= pg.el${EMACS_PKGNAMESUFFIX}>=0.39:databases/pg.el@${EMACS_FLAVOR} -LIB_DEPENDS= libsqlite3.so:databases/sqlite3 RUN_DEPENDS= pg.el${EMACS_PKGNAMESUFFIX}>=0.39:databases/pg.el@${EMACS_FLAVOR} -USES= emacs gmake localbase:ldflags +USES= emacs gmake USE_GITHUB= yes GH_ACCOUNT= magit @@ -32,15 +30,9 @@ PORTDOCS= README.md OPTIONS_DEFINE= DOCS -post-patch: - ${RM} ${WRKSRC}/sqlite/sqlite3.[ch] - ${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/emacsql-sqlite.el - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/bin \ ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} - ${INSTALL_PROGRAM} ${WRKSRC}/sqlite/emacsql-sqlite \ - ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \ ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} diff --git a/databases/emacsql-devel/distinfo b/databases/emacsql-devel/distinfo index 9c30803b5de0..14d61f1d1bf8 100644 --- a/databases/emacsql-devel/distinfo +++ b/databases/emacsql-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725949045 -SHA256 (magit-emacsql-v4.0.3_GH0.tar.gz) = 8ff4ad04f433f6f55278822685e5c7a21e291d25e4502f6990c5b6c8e341009e -SIZE (magit-emacsql-v4.0.3_GH0.tar.gz) = 2398435 +TIMESTAMP = 1733128681 +SHA256 (magit-emacsql-v4.1.0_GH0.tar.gz) = 6e50cd36a21b690b04432be2eea4b8c6556223f2931f0e89f80ef3e511bfdcd0 +SIZE (magit-emacsql-v4.1.0_GH0.tar.gz) = 32308 diff --git a/databases/emacsql-devel/files/patch-emacsql-sqlite.el b/databases/emacsql-devel/files/patch-emacsql-sqlite.el deleted file mode 100644 index 4416fed2bae9..000000000000 --- a/databases/emacsql-devel/files/patch-emacsql-sqlite.el +++ /dev/null @@ -1,36 +0,0 @@ ---- emacsql-sqlite.el.orig 2024-09-06 13:42:34 UTC -+++ emacsql-sqlite.el -@@ -35,16 +35,7 @@ - "sqlite/emacsql-sqlite") - "Relative path to emacsql executable.") - --(defvar emacsql-sqlite-executable -- (expand-file-name emacsql-sqlite-executable-path -- (if (or (file-writable-p emacsql-sqlite-data-root) -- (file-exists-p (expand-file-name -- emacsql-sqlite-executable-path -- emacsql-sqlite-data-root))) -- emacsql-sqlite-data-root -- (expand-file-name -- (concat "emacsql/" emacsql-version) -- user-emacs-directory))) -+(defvar emacsql-sqlite-executable "%%PREFIX%%/bin/emacsql-sqlite" - "Path to the EmacSQL backend (this is not the sqlite3 shell).") - - (defvar emacsql-sqlite-c-compilers '("cc" "gcc" "clang") -@@ -131,12 +122,12 @@ If called with non-nil ERROR, signal an error on failu - if path return it)) - (src (expand-file-name "sqlite" emacsql-sqlite-data-root)) - (files (mapcar (lambda (f) (expand-file-name f src)) -- '("sqlite3.c" "emacsql.c"))) -+ '("emacsql.c"))) - (cflags (list (format "-I%s" src) (format "-O%d" (or o-level 2)))) - (ldlibs (cl-case system-type - (windows-nt (list)) -- (berkeley-unix (list "-lm")) -- (otherwise (list "-lm" "-ldl")))) -+ (berkeley-unix (list "-lm" "-lsqlite3")) -+ (otherwise (list "-lm" "-ldl" "-lsqlite3")))) - (options (emacsql-sqlite-compile-switches)) - (output (list "-o" emacsql-sqlite-executable)) - (arguments (nconc cflags options files ldlibs output))) diff --git a/databases/emacsql-devel/files/patch-sqlite_Makefile b/databases/emacsql-devel/files/patch-sqlite_Makefile deleted file mode 100644 index 7408786dead2..000000000000 --- a/databases/emacsql-devel/files/patch-sqlite_Makefile +++ /dev/null @@ -1,24 +0,0 @@ ---- sqlite/Makefile.orig 2022-10-11 15:22:51 UTC -+++ sqlite/Makefile -@@ -1,8 +1,8 @@ - -include ../.config.mk - - .POSIX: --LDLIBS = -ldl -lm --CFLAGS = -O2 -Wall -Wextra -Wno-implicit-fallthrough \ -+LDLIBS = -lsqlite3 -+CFLAGS += \ - -DSQLITE_THREADSAFE=0 \ - -DSQLITE_DEFAULT_FOREIGN_KEYS=1 \ - -DSQLITE_ENABLE_FTS5 \ -@@ -12,8 +12,8 @@ CFLAGS = -O2 -Wall -Wextra -Wno-implicit-fallthrough \ - -DSQLITE_ENABLE_JSON1 \ - -DSQLITE_SOUNDEX - --emacsql-sqlite: emacsql.c sqlite3.c -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ emacsql.c sqlite3.c $(LDLIBS) -+emacsql-sqlite: emacsql.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ emacsql.c $(LDLIBS) - - clean: - rm -f emacsql-sqlite diff --git a/databases/emacsql-devel/files/patch-sqlite_emacsql.c b/databases/emacsql-devel/files/patch-sqlite_emacsql.c deleted file mode 100644 index 24590656df22..000000000000 --- a/databases/emacsql-devel/files/patch-sqlite_emacsql.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sqlite/emacsql.c.orig 2020-07-14 00:28:59 UTC -+++ sqlite/emacsql.c -@@ -1,7 +1,7 @@ - #include - #include - #include --#include "sqlite3.h" -+#include - - #define TRUE 1 - #define FALSE 0 diff --git a/databases/emacsql-devel/pkg-plist b/databases/emacsql-devel/pkg-plist index 034968dd773c..bacffb908291 100644 --- a/databases/emacsql-devel/pkg-plist +++ b/databases/emacsql-devel/pkg-plist @@ -1,4 +1,3 @@ -bin/emacsql-sqlite %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-autoloads.el %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.el %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.elc diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile index 9a73b60a5b3e..83a9b8b69e6d 100644 --- a/databases/emacsql/Makefile +++ b/databases/emacsql/Makefile @@ -1,7 +1,6 @@ PORTNAME= emacsql DISTVERSIONPREFIX= v -DISTVERSION= 4.0.3 -PORTREVISION= 1 +DISTVERSION= 4.1.0 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} @@ -13,10 +12,9 @@ LICENSE= UNLICENSE LICENSE_FILE= ${WRKSRC}/UNLICENSE BUILD_DEPENDS= pg.el${EMACS_PKGNAMESUFFIX}>=0.39:databases/pg.el@${EMACS_FLAVOR} -LIB_DEPENDS= libsqlite3.so:databases/sqlite3 RUN_DEPENDS= pg.el${EMACS_PKGNAMESUFFIX}>=0.39:databases/pg.el@${EMACS_FLAVOR} -USES= emacs gmake localbase:ldflags +USES= emacs gmake USE_GITHUB= yes GH_ACCOUNT= magit @@ -31,15 +29,9 @@ PORTDOCS= README.md OPTIONS_DEFINE= DOCS -post-patch: - ${RM} ${WRKSRC}/sqlite/sqlite3.[ch] - ${REINPLACE_CMD} 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/emacsql-sqlite.el - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/bin \ ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} - ${INSTALL_PROGRAM} ${WRKSRC}/sqlite/emacsql-sqlite \ - ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/*.el ${WRKSRC}/*.elc \ ${STAGEDIR}${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME} diff --git a/databases/emacsql/distinfo b/databases/emacsql/distinfo index 6a74856e6c48..cd46de2cea19 100644 --- a/databases/emacsql/distinfo +++ b/databases/emacsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1725948648 -SHA256 (magit-emacsql-v4.0.3_GH0.tar.gz) = 8ff4ad04f433f6f55278822685e5c7a21e291d25e4502f6990c5b6c8e341009e -SIZE (magit-emacsql-v4.0.3_GH0.tar.gz) = 2398435 +TIMESTAMP = 1733128142 +SHA256 (magit-emacsql-v4.1.0_GH0.tar.gz) = 6e50cd36a21b690b04432be2eea4b8c6556223f2931f0e89f80ef3e511bfdcd0 +SIZE (magit-emacsql-v4.1.0_GH0.tar.gz) = 32308 diff --git a/databases/emacsql/files/patch-emacsql-sqlite.el b/databases/emacsql/files/patch-emacsql-sqlite.el deleted file mode 100644 index 4416fed2bae9..000000000000 --- a/databases/emacsql/files/patch-emacsql-sqlite.el +++ /dev/null @@ -1,36 +0,0 @@ ---- emacsql-sqlite.el.orig 2024-09-06 13:42:34 UTC -+++ emacsql-sqlite.el -@@ -35,16 +35,7 @@ - "sqlite/emacsql-sqlite") - "Relative path to emacsql executable.") - --(defvar emacsql-sqlite-executable -- (expand-file-name emacsql-sqlite-executable-path -- (if (or (file-writable-p emacsql-sqlite-data-root) -- (file-exists-p (expand-file-name -- emacsql-sqlite-executable-path -- emacsql-sqlite-data-root))) -- emacsql-sqlite-data-root -- (expand-file-name -- (concat "emacsql/" emacsql-version) -- user-emacs-directory))) -+(defvar emacsql-sqlite-executable "%%PREFIX%%/bin/emacsql-sqlite" - "Path to the EmacSQL backend (this is not the sqlite3 shell).") - - (defvar emacsql-sqlite-c-compilers '("cc" "gcc" "clang") -@@ -131,12 +122,12 @@ If called with non-nil ERROR, signal an error on failu - if path return it)) - (src (expand-file-name "sqlite" emacsql-sqlite-data-root)) - (files (mapcar (lambda (f) (expand-file-name f src)) -- '("sqlite3.c" "emacsql.c"))) -+ '("emacsql.c"))) - (cflags (list (format "-I%s" src) (format "-O%d" (or o-level 2)))) - (ldlibs (cl-case system-type - (windows-nt (list)) -- (berkeley-unix (list "-lm")) -- (otherwise (list "-lm" "-ldl")))) -+ (berkeley-unix (list "-lm" "-lsqlite3")) -+ (otherwise (list "-lm" "-ldl" "-lsqlite3")))) - (options (emacsql-sqlite-compile-switches)) - (output (list "-o" emacsql-sqlite-executable)) - (arguments (nconc cflags options files ldlibs output))) diff --git a/databases/emacsql/files/patch-sqlite_Makefile b/databases/emacsql/files/patch-sqlite_Makefile deleted file mode 100644 index 7408786dead2..000000000000 --- a/databases/emacsql/files/patch-sqlite_Makefile +++ /dev/null @@ -1,24 +0,0 @@ ---- sqlite/Makefile.orig 2022-10-11 15:22:51 UTC -+++ sqlite/Makefile -@@ -1,8 +1,8 @@ - -include ../.config.mk - - .POSIX: --LDLIBS = -ldl -lm --CFLAGS = -O2 -Wall -Wextra -Wno-implicit-fallthrough \ -+LDLIBS = -lsqlite3 -+CFLAGS += \ - -DSQLITE_THREADSAFE=0 \ - -DSQLITE_DEFAULT_FOREIGN_KEYS=1 \ - -DSQLITE_ENABLE_FTS5 \ -@@ -12,8 +12,8 @@ CFLAGS = -O2 -Wall -Wextra -Wno-implicit-fallthrough \ - -DSQLITE_ENABLE_JSON1 \ - -DSQLITE_SOUNDEX - --emacsql-sqlite: emacsql.c sqlite3.c -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ emacsql.c sqlite3.c $(LDLIBS) -+emacsql-sqlite: emacsql.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ emacsql.c $(LDLIBS) - - clean: - rm -f emacsql-sqlite diff --git a/databases/emacsql/files/patch-sqlite_emacsql.c b/databases/emacsql/files/patch-sqlite_emacsql.c deleted file mode 100644 index 24590656df22..000000000000 --- a/databases/emacsql/files/patch-sqlite_emacsql.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sqlite/emacsql.c.orig 2020-07-14 00:28:59 UTC -+++ sqlite/emacsql.c -@@ -1,7 +1,7 @@ - #include - #include - #include --#include "sqlite3.h" -+#include - - #define TRUE 1 - #define FALSE 0 diff --git a/databases/emacsql/pkg-plist b/databases/emacsql/pkg-plist index 034968dd773c..bacffb908291 100644 --- a/databases/emacsql/pkg-plist +++ b/databases/emacsql/pkg-plist @@ -1,4 +1,3 @@ -bin/emacsql-sqlite %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-autoloads.el %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.el %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-compiler.elc