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,51 +1,43 @@
 PORTNAME=	emacsql
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.0.3
+DISTVERSION=	4.1.0
 DISTVERSIONSUFFIX=
-PORTREVISION=	1
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	-devel${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	High-level Emacs Lisp RDBMS front-end (Development Version)
 WWW=		https://github.com/magit/emacsql
 
 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
 
 MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	test
 
 CONFLICTS_INSTALL=	emacsql emacsql-emacs_*
 
 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}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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 <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include "sqlite3.h"
-+#include <sqlite3.h>
- 
- #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,20 +1,19 @@
-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
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-mysql.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-mysql.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-pg.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-pg.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-psql.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-psql.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-builtin.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-builtin.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-common.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-common.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-module.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-module.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.elc
diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile
index 9a73b60a5b3e..83a9b8b69e6d 100644
--- a/databases/emacsql/Makefile
+++ b/databases/emacsql/Makefile
@@ -1,50 +1,42 @@
 PORTNAME=	emacsql
 DISTVERSIONPREFIX=	v
-DISTVERSION=	4.0.3
-PORTREVISION=	1
+DISTVERSION=	4.1.0
 CATEGORIES=	databases elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	High-level Emacs Lisp RDBMS front-end
 WWW=		https://github.com/magit/emacsql
 
 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
 
 MAKE_ENV+=	LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}"
 MAKE_JOBS_UNSAFE=	yes
 TEST_TARGET=	test
 
 CONFLICTS_INSTALL=	emacsql emacsql-devel* emacsql-emacs_*
 
 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}
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
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 <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include "sqlite3.h"
-+#include <sqlite3.h>
- 
- #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,20 +1,19 @@
-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
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-mysql.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-mysql.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-pg.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-pg.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-psql.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-psql.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-builtin.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-builtin.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-common.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-common.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-module.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite-module.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.elc
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.el
 %%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.elc