git: 3848a33818f4 - main - japanese/lookup: Fix wrong type argument: obarrayp error
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 09 Sep 2026 07:30:59 UTC
The branch main has been updated by mce:
URL: https://cgit.FreeBSD.org/ports/commit/?id=3848a33818f43bea2ee4be3e728b5e9b4dc9203e
commit 3848a33818f43bea2ee4be3e728b5e9b4dc9203e
Author: Kousuke Kannagi <mce@FreeBSD.org>
AuthorDate: 2026-09-07 12:00:51 +0000
Commit: Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-09-09 07:30:01 +0000
japanese/lookup: Fix wrong type argument: obarrayp error
Update to 1.99.96.20200725.
Take maintainership.
Add the missing RUN_DEPENDS.
Changelog:
https://github.com/lookup2/lookup2/compare/c4f4986...06f827d
PR: 298276
Approved by: fluffy (mentor)
---
japanese/lookup/Makefile | 9 +++++----
japanese/lookup/distinfo | 6 +++---
japanese/lookup/files/patch-lisp_lookup-types.el | 20 ++++++++++++++++++++
japanese/lookup/files/patch-lisp_lookup.el | 11 +++++++++++
japanese/lookup/files/patch-lisp_ndjitsuu.el | 11 +++++++++++
japanese/lookup/files/patch-lisp_ndpdic.el | 11 +++++++++++
6 files changed, 61 insertions(+), 7 deletions(-)
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index 2915c3c2094b..262242045ca4 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -1,19 +1,20 @@
PORTNAME= lookup
-PORTVERSION= 1.99.96.20180209
-PORTREVISION= 22
+DISTVERSION= 1.99.96.20200725
CATEGORIES= japanese elisp
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= mce@FreeBSD.org
COMMENT= Emacs search interface for CD-ROM books, etc
WWW= https://lookup2.github.io/
LICENSE= GPLv2+
+RUN_DEPENDS= ja-eblook>0:japanese/eblook
+
USES= autoreconf emacs:build makeinfo
USE_GITHUB= yes
GH_ACCOUNT= lookup2
GH_PROJECT= lookup2
-GH_TAGNAME= c4f4986
+GH_TAGNAME= 06f827d92d59cf679e7340247d9eeaa23ec0ffe5
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \
--with-lispdir=${PREFIX}/${EMACS_SITE_LISPDIR}
diff --git a/japanese/lookup/distinfo b/japanese/lookup/distinfo
index 2c62c8c872a3..8faf9d3cf499 100644
--- a/japanese/lookup/distinfo
+++ b/japanese/lookup/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518180623
-SHA256 (lookup2-lookup2-1.99.96.20180209-c4f4986_GH0.tar.gz) = e6731ef1168e009238d9faedaba8d20980759ece45e42e95732c350bdfcaffc4
-SIZE (lookup2-lookup2-1.99.96.20180209-c4f4986_GH0.tar.gz) = 220757
+TIMESTAMP = 1788765505
+SHA256 (lookup2-lookup2-1.99.96.20200725-06f827d92d59cf679e7340247d9eeaa23ec0ffe5_GH0.tar.gz) = 5e39cce3f92966cce28d4042ec2e7cc1dc6a28252a9a3dba42779826e069719e
+SIZE (lookup2-lookup2-1.99.96.20200725-06f827d92d59cf679e7340247d9eeaa23ec0ffe5_GH0.tar.gz) = 220830
diff --git a/japanese/lookup/files/patch-lisp_lookup-types.el b/japanese/lookup/files/patch-lisp_lookup-types.el
new file mode 100644
index 000000000000..90d8ccaaf5f6
--- /dev/null
+++ b/japanese/lookup/files/patch-lisp_lookup-types.el
@@ -0,0 +1,20 @@
+--- lisp/lookup-types.el.orig 2026-09-07 07:18:56 UTC
++++ lisp/lookup-types.el
+@@ -471,7 +471,7 @@ Each DICT-SPEC consists of (dict-id :option val ....).
+ (defun lookup-regular-search (dictionary query)
+ (lookup-dictionary-command dictionary :search query))
+
+-(defconst lookup-obarray (make-vector 1511 nil))
++(defconst lookup-obarray (obarray-make 1511))
+
+ (defun lookup-dictionary-search-cache-get (dictionary query)
+ (let ((method (lookup-query-method query))
+@@ -757,7 +757,7 @@ the present circumstances. TYPE is a symbol like `xbm'
+ ;; gaiji table
+
+ (defun lookup-make-gaiji-table ()
+- (make-vector 377 0))
++ (obarray-make 377))
+
+ (defsubst lookup-gaiji-table-set (table code gaiji)
+ (set (intern code table) gaiji))
diff --git a/japanese/lookup/files/patch-lisp_lookup.el b/japanese/lookup/files/patch-lisp_lookup.el
new file mode 100644
index 000000000000..b147a3a7a4f6
--- /dev/null
+++ b/japanese/lookup/files/patch-lisp_lookup.el
@@ -0,0 +1,11 @@
+--- lisp/lookup.el.orig 2026-09-07 07:19:31 UTC
++++ lisp/lookup.el
+@@ -721,7 +721,7 @@ If there is no session, default module will be returne
+
+ (defun lookup-put-entry (entry)
+ (unless lookup-entry-table
+- (setq lookup-entry-table (make-vector 377 0)))
++ (setq lookup-entry-table (obarray-make 377)))
+ (set (intern (lookup-entry-id entry) lookup-entry-table) entry))
+
+ (defun lookup-get-entry (id)
diff --git a/japanese/lookup/files/patch-lisp_ndjitsuu.el b/japanese/lookup/files/patch-lisp_ndjitsuu.el
new file mode 100644
index 000000000000..154e29a90869
--- /dev/null
+++ b/japanese/lookup/files/patch-lisp_ndjitsuu.el
@@ -0,0 +1,11 @@
+--- lisp/ndjitsuu.el.orig 2026-09-07 07:19:54 UTC
++++ lisp/ndjitsuu.el
+@@ -432,7 +432,7 @@
+ (decode-coding-string
+ (string-make-unibyte
+ (ccl-execute-on-string
+- 'ndjitsuu-decode (make-vector 9 nil)
++ 'ndjitsuu-decode (obarray-make 9)
+ (ndjitsuu-file-contents-literally
+ file from length))) 'cp932)))
+
diff --git a/japanese/lookup/files/patch-lisp_ndpdic.el b/japanese/lookup/files/patch-lisp_ndpdic.el
new file mode 100644
index 000000000000..6cc95d17c03d
--- /dev/null
+++ b/japanese/lookup/files/patch-lisp_ndpdic.el
@@ -0,0 +1,11 @@
+--- lisp/ndpdic.el.orig 2026-09-07 07:24:09 UTC
++++ lisp/ndpdic.el
+@@ -214,7 +214,7 @@
+ (setf (ndpdic-derefid o) (char 8))
+ (setf (ndpdic-dummy o) (char 24))
+ ;;
+- (setf (ndpdic-block-index o) (make-vector (ndpdic-nindex2 o) nil))
++ (setf (ndpdic-block-index o) (obarray-make (ndpdic-nindex2 o)))
+ (setf (ndpdic-block-entries-hash o) (make-hash-table :test 'equal))
+ )
+ (with-temp-buffer