Date: Wed, 2 Jun 2021 02:19:16 GMT From: Guangyuan Yang <ygy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 585e00a411c0 - main - databases/emacsql: New port: High-level Emacs Lisp RDBMS front-end Message-ID: <202106020219.1522JGNe007682@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by ygy: URL: https://cgit.FreeBSD.org/ports/commit/?id=585e00a411c08024816bcf8e787014cdd5aa10b7 commit 585e00a411c08024816bcf8e787014cdd5aa10b7 Author: Yasuhiro Kimura <yasu@utahime.org> AuthorDate: 2021-06-02 02:18:54 +0000 Commit: Guangyuan Yang <ygy@FreeBSD.org> CommitDate: 2021-06-02 02:18:54 +0000 databases/emacsql: New port: High-level Emacs Lisp RDBMS front-end PR: 255958 Approved by: lwhsu (mentor) --- databases/Makefile | 1 + databases/emacsql/Makefile | 45 +++++++++++++++++++++++++ databases/emacsql/distinfo | 3 ++ databases/emacsql/files/patch-Makefile | 12 +++++++ databases/emacsql/files/patch-emacsql-sqlite.el | 38 +++++++++++++++++++++ databases/emacsql/files/patch-sqlite_Makefile | 22 ++++++++++++ databases/emacsql/files/patch-sqlite_emacsql.c | 11 ++++++ databases/emacsql/pkg-descr | 14 ++++++++ databases/emacsql/pkg-plist | 13 +++++++ 9 files changed, 159 insertions(+) diff --git a/databases/Makefile b/databases/Makefile index f0fc592b26dc..fee0c32a13b2 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -65,6 +65,7 @@ SUBDIR += elixir-mongo SUBDIR += elixir-postgrex SUBDIR += elixir-timex_ecto + SUBDIR += emacsql SUBDIR += erlang-couchbeam SUBDIR += erlang-epgsql SUBDIR += erlang-eredis diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile new file mode 100644 index 000000000000..cbc836e55e49 --- /dev/null +++ b/databases/emacsql/Makefile @@ -0,0 +1,45 @@ +PORTNAME= emacsql +DISTVERSION= 3.0.0 +CATEGORIES= databases elisp +PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} + +MAINTAINER= yasu@utahime.org +COMMENT= High-level Emacs Lisp RDBMS front-end + +LICENSE= UNLICENSE +LICENSE_FILE= ${WRKSRC}/UNLICENSE + +BUILD_DEPENDS= pg.el${EMACS_PKGNAMESUFFIX}>=0.13:databases/pg.el@${EMACS_FLAVOR} +LIB_DEPENDS= libsqlite3.so:databases/sqlite3 +RUN_DEPENDS= pg.el${EMACS_PKGNAMESUFFIX}>=0.13:databases/pg.el@${EMACS_FLAVOR} + +USES= emacs localbase:ldflags + +USE_GITHUB= yes +GH_ACCOUNT= skeeto + +MAKE_ENV+= LOAD_PATH="-L ${PREFIX}/${EMACS_SITE_LISPDIR} -L ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}" +ALL_TARGET= binary compile +TEST_TARGET= check + +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 new file mode 100644 index 000000000000..6322881961df --- /dev/null +++ b/databases/emacsql/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1621390677 +SHA256 (skeeto-emacsql-3.0.0_GH0.tar.gz) = 9d94be00518591c68cb0ed1de9dab885e35079f581fb0ae52af5af139a0f1088 +SIZE (skeeto-emacsql-3.0.0_GH0.tar.gz) = 2055251 diff --git a/databases/emacsql/files/patch-Makefile b/databases/emacsql/files/patch-Makefile new file mode 100644 index 000000000000..f3ffc1349e85 --- /dev/null +++ b/databases/emacsql/files/patch-Makefile @@ -0,0 +1,12 @@ +--- Makefile.orig 2021-05-17 18:22:23 UTC ++++ Makefile +@@ -7,8 +7,7 @@ + .POSIX: + .SUFFIXES: .el .elc + EMACS = emacs +-LDFLAGS = -L ../pg +-BATCH = $(EMACS) -batch -Q -L . -L tests $(LDFLAGS) ++BATCH = $(EMACS) -batch -Q -L . -L tests $(LOAD_PATH) + + EL = emacsql-compiler.el \ + emacsql.el \ diff --git a/databases/emacsql/files/patch-emacsql-sqlite.el b/databases/emacsql/files/patch-emacsql-sqlite.el new file mode 100644 index 000000000000..9c5d57f9e324 --- /dev/null +++ b/databases/emacsql/files/patch-emacsql-sqlite.el @@ -0,0 +1,38 @@ +--- emacsql-sqlite.el.orig 2018-10-31 17:50:07 UTC ++++ emacsql-sqlite.el +@@ -27,11 +27,7 @@ + (file-name-directory (or load-file-name buffer-file-name)) + "Directory where EmacSQL is installed.") + +-(defvar emacsql-sqlite-executable +- (expand-file-name (if (memq system-type '(windows-nt cygwin ms-dos)) +- "sqlite/emacsql-sqlite.exe" +- "sqlite/emacsql-sqlite") +- emacsql-sqlite-data-root) ++(defvar emacsql-sqlite-executable "%%PREFIX%%/bin/emacsql-sqlite" + "Path to the EmacSQL backend (this is not the sqlite3 shell).") + + (defvar emacsql-sqlite-reserved +@@ -82,6 +78,7 @@ http://www.sqlite.org/lang_keywords.html") + (emacsql-wait connection) + (emacsql connection [:pragma (= busy-timeout $s1)] + (/ (* emacsql-global-timeout 1000) 2)) ++ (emacsql connection [:pragma (= foreign_keys 1)]) + (emacsql-register connection))) + + (cl-defun emacsql-sqlite (file &key debug) +@@ -143,11 +140,11 @@ If called with non-nil ASYNC the return value is meani + (let* ((cc (executable-find "cc")) + (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 (if (memq system-type '(windows-nt berkeley-unix)) +- (list "-lm") +- (list "-lm" "-ldl"))) ++ (list "-lm" "-lsqlite3") ++ (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 new file mode 100644 index 000000000000..463df817ee70 --- /dev/null +++ b/databases/emacsql/files/patch-sqlite_Makefile @@ -0,0 +1,22 @@ +--- sqlite/Makefile.orig 2020-07-14 00:28:59 UTC ++++ sqlite/Makefile +@@ -1,6 +1,6 @@ + .POSIX: +-LDLIBS = -ldl -lm +-CFLAGS = -O2 -Wall -Wextra \ ++LDLIBS = -lsqlite3 ++CFLAGS += \ + -DSQLITE_THREADSAFE=0 \ + -DSQLITE_DEFAULT_FOREIGN_KEYS=1 \ + -DSQLITE_ENABLE_FTS5 \ +@@ -10,8 +10,8 @@ CFLAGS = -O2 -Wall -Wextra \ + -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 new file mode 100644 index 000000000000..24590656df22 --- /dev/null +++ b/databases/emacsql/files/patch-sqlite_emacsql.c @@ -0,0 +1,11 @@ +--- 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-descr b/databases/emacsql/pkg-descr new file mode 100644 index 000000000000..a5076f716a34 --- /dev/null +++ b/databases/emacsql/pkg-descr @@ -0,0 +1,14 @@ +EmacSQL is a high-level Emacs Lisp front-end for SQLite (primarily), +PostgreSQL, MySQL, and potentially other SQL databases. + +It works by maintaining a inferior process running (a "connection") +for interacting with the back-end database. Connections are +automatically cleaned up if they are garbage collected. All requests +are synchronous. + +Any readable lisp value can be stored as a value in EmacSQL, including +numbers, strings, symbols, lists, vectors, and closures. EmacSQL has +no concept of "TEXT" values; it's all just lisp objects. The lisp +object nil corresponds 1:1 with NULL in the database. + +WWW: https://github.com/skeeto/emacsql diff --git a/databases/emacsql/pkg-plist b/databases/emacsql/pkg-plist new file mode 100644 index 000000000000..c80325c828a1 --- /dev/null +++ b/databases/emacsql/pkg-plist @@ -0,0 +1,13 @@ +bin/emacsql-sqlite +%%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.el +%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql-sqlite.elc +%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.el +%%EMACS_VERSION_SITE_LISPDIR%%/emacsql/emacsql.elc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106020219.1522JGNe007682>