Date: Mon, 06 Apr 2026 21:46:11 +0000 From: Kousuke Kannagi <mce@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4225bc17ad80 - main - japanese/navi2ch: Switch RUN_DEPENDS from p5-2chproxy to proxy2ch Message-ID: <69d429a3.42310.b11b88a@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mce: URL: https://cgit.FreeBSD.org/ports/commit/?id=4225bc17ad80415f0d57ae19a38c6dda36ea7cbf commit 4225bc17ad80415f0d57ae19a38c6dda36ea7cbf Author: Kousuke Kannagi <mce@FreeBSD.org> AuthorDate: 2026-04-05 00:35:20 +0000 Commit: Kousuke Kannagi <mce@FreeBSD.org> CommitDate: 2026-04-06 21:44:31 +0000 japanese/navi2ch: Switch RUN_DEPENDS from p5-2chproxy to proxy2ch Update GH_TAGNAME from faebfd1 to 7811dba. Add NO_ARCH=yes. Add a patch to accommodate the url change. Update pkg-descr. Changelog: https://github.com/naota/navi2ch/compare/faebfd1...7811dba PR: 291381 Approved by: hrs (maintainer timeout) Approved by: osa (mentor) --- japanese/navi2ch/Makefile | 6 +++-- japanese/navi2ch/distinfo | 6 ++--- japanese/navi2ch/files/patch-navi2ch-article.el | 15 +++++++++++++ japanese/navi2ch/files/patch-navi2ch-list.el | 28 ++++++++++++++++++++++++ japanese/navi2ch/files/patch-navi2ch-multibbs.el | 20 +++++++++++++++++ japanese/navi2ch/files/patch-navi2ch-vars.el | 15 ++++++++++--- japanese/navi2ch/pkg-descr | 4 +++- japanese/navi2ch/pkg-message | 8 +++---- 8 files changed, 89 insertions(+), 13 deletions(-) diff --git a/japanese/navi2ch/Makefile b/japanese/navi2ch/Makefile index 4ea8811b7142..e4e8c9eff3dd 100644 --- a/japanese/navi2ch/Makefile +++ b/japanese/navi2ch/Makefile @@ -12,12 +12,12 @@ WWW= https://navi2ch.sourceforge.net LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -RUN_DEPENDS= ${LOCALBASE}/sbin/2chproxy.pl:japanese/p5-2chproxy +RUN_DEPENDS= proxy2ch:japanese/proxy2ch USES= emacs USE_GITHUB= yes GH_ACCOUNT= naota -GH_TAGNAME= faebfd1 +GH_TAGNAME= 7811dba GNU_CONFIGURE= yes CONFIGURE_ENV= EMACS="${EMACS_CMD}" @@ -25,6 +25,8 @@ CONFIGURE_ARGS= --with-lispdir=${PREFIX}/${LISPDIR}/${PORTNAME} PLIST_SUB= LISPDIR=${LISPDIR} PORTDOCS= ${PORTDOC_FILES} contrib +NO_ARCH= yes + INFO= navi2ch PORTDOC_FILES= ChangeLog README TODO diff --git a/japanese/navi2ch/distinfo b/japanese/navi2ch/distinfo index 577e15a5c449..f1ff1fa1d7c6 100644 --- a/japanese/navi2ch/distinfo +++ b/japanese/navi2ch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1479256991 -SHA256 (naota-navi2ch-2.0.0.d-faebfd1_GH0.tar.gz) = e5da75c6aee6005349a4c8e830a0737cc58536c4c526aba7843e9f990da62966 -SIZE (naota-navi2ch-2.0.0.d-faebfd1_GH0.tar.gz) = 512558 +TIMESTAMP = 1711519396 +SHA256 (naota-navi2ch-2.0.0.d-7811dba_GH0.tar.gz) = 7d37aafd8bc3da62e1d5e703b9e3da989748d16e3523e36bcbd05194ad9e483b +SIZE (naota-navi2ch-2.0.0.d-7811dba_GH0.tar.gz) = 504693 diff --git a/japanese/navi2ch/files/patch-navi2ch-article.el b/japanese/navi2ch/files/patch-navi2ch-article.el new file mode 100644 index 000000000000..1dab51f3d239 --- /dev/null +++ b/japanese/navi2ch/files/patch-navi2ch-article.el @@ -0,0 +1,15 @@ +--- navi2ch-article.el.orig 2024-03-27 06:04:56 UTC ++++ navi2ch-article.el +@@ -289,9 +289,9 @@ last $B$,:G8e$+$i$$$/$DI=<($9$k$+!#(B + (substring artid 0 3) + "/" artid ".dat.gz")) + ((= length 10) +- (concat url "kako/" +- (substring artid 0 4) "/" (substring artid 0 5) +- "/" artid ".dat.gz")) ++ (concat url "oyster/" ++ (substring artid 0 4) ++ "/" artid ".dat")) + (t + nil)))) + diff --git a/japanese/navi2ch/files/patch-navi2ch-list.el b/japanese/navi2ch/files/patch-navi2ch-list.el new file mode 100644 index 000000000000..bca4d1972c13 --- /dev/null +++ b/japanese/navi2ch/files/patch-navi2ch-list.el @@ -0,0 +1,28 @@ +--- navi2ch-list.el.orig 2020-01-30 00:36:58 UTC ++++ navi2ch-list.el +@@ -94,7 +94,7 @@ + (nil " " navi2ch-list-board-name-face)))) + + (defconst navi2ch-list-bbstable-default-url +- "http://menu.2ch.net/bbsmenu.html") ++ "http://menu.5ch.net/bbsmenu.html") + + ;; add hook + (add-hook 'navi2ch-save-status-hook 'navi2ch-list-save-info) +@@ -591,7 +591,7 @@ changed-list $B$O(B '((board-id old-board new-board) + (let (url board-id id u) + (when (and (not ignore) + (string-match "href=\\(.+/\\([^/]+\\)/\\)" attr)) +- (setq url (match-string 1 attr)) ++ (setq url (string-replace "https" "http" (match-string 1 attr))) + (setq url (or (cdr (assoc + url + navi2ch-list-moved-board-alist)) +@@ -624,6 +624,7 @@ changed-list $B$O(B '((board-id old-board new-board) + + (defun navi2ch-list-valid-board (uri) + (save-match-data ++ (setq uri (string-replace "https" "http" uri)) + (when (string-match "http://\\([^/]+\\)/\\([^/]+\\)/" uri) + (let ((host (match-string 1 uri))) + (and (not (string-match navi2ch-list-invalid-host-regexp host)) diff --git a/japanese/navi2ch/files/patch-navi2ch-multibbs.el b/japanese/navi2ch/files/patch-navi2ch-multibbs.el new file mode 100644 index 000000000000..8bcde9b2c795 --- /dev/null +++ b/japanese/navi2ch/files/patch-navi2ch-multibbs.el @@ -0,0 +1,20 @@ +--- navi2ch-multibbs.el.orig 2024-03-27 06:06:19 UTC ++++ navi2ch-multibbs.el +@@ -393,6 +393,8 @@ START $B$,(B non-nil $B$J$i$P%l%9HV9f(B START $B$ + ((or (string-match + "http://\\(.+\\)/\\([^/]+\\)/kako/[0-9]+/" url) + (string-match ++ "http://\\(.+\\)/\\([^/]+\\)/oyster/[0-9]+/" url) ++ (string-match + "http://\\(.+\\)/\\([^/]+\\)/i/" url) + (string-match + "http://\\(.+\\)/\\([^/]+\\)" url)) +@@ -421,6 +423,8 @@ START $B$,(B non-nil $B$J$i$P%l%9HV9f(B START $B$ + ;; "http://pc.2ch.net/unix/kako/1009/10093/1009340234.html" $B$H$+!#(B + ((or (string-match + "http://.+/kako/[0-9]+/\\([0-9]+\\)\\.\\(dat\\|html\\)" url) ++ (string-match ++ "http://.+/oyster/[0-9]+/\\([0-9]+\\)\\.dat" url) + (string-match + "http://.+/kako/[0-9]+/[0-9]+/\\([0-9]+\\)\\.\\(dat\\|html\\)" url)) + (setq artid (match-string 1 url)) diff --git a/japanese/navi2ch/files/patch-navi2ch-vars.el b/japanese/navi2ch/files/patch-navi2ch-vars.el index 592eef342516..cc360a8ef9e7 100644 --- a/japanese/navi2ch/files/patch-navi2ch-vars.el +++ b/japanese/navi2ch/files/patch-navi2ch-vars.el @@ -1,13 +1,22 @@ ---- navi2ch-vars.el.orig 2015-03-30 02:16:24 UTC +--- navi2ch-vars.el.orig 2020-01-30 00:36:58 UTC +++ navi2ch-vars.el -@@ -2009,8 +2009,8 @@ Navi2ch$B%+%F%4%j$K!VAw?.95$(!WHD$,<+F0 +@@ -255,7 +255,7 @@ nil $B$J$i$P<jF0$G99?7$7$J$$$+$.$j<h$j$K$$$+$J$$!#(B + + (defcustom navi2ch-list-valid-host-regexp + (concat "\\(" +- (regexp-opt '(".2ch.net" ".bbspink.com" ".machibbs.com" ".machi.to")) ++ (regexp-opt '(".5ch.io" ".5ch.net" ".bbspink.com" ".2ch.net" ".2ch.sc")) + "\\)\\'") + "*$B#2$A$c$s$M$k$NHD$H$_$J$9%[%9%H$N@55,I=8=!#(B" + :type 'regexp +@@ -2009,8 +2009,8 @@ Navi2ch$B%+%F%4%j$K!VAw?.95$(!WHD$,<+F0E*$KDI2C$5$l$^ ;; net variables (defcustom navi2ch-net-http-proxy - (if (string= (getenv "HTTP_PROXY") "") - nil + (if (string= (or (getenv "HTTP_PROXY") "") "") -+ "127.0.0.1:8080" ++ "127.0.0.1:9080" (getenv "HTTP_PROXY")) "*HTTP $B%W%m%-%7$N(B URL$B!#(B" :type '(choice (string :tag "$B%W%m%-%7$r;XDj(B") diff --git a/japanese/navi2ch/pkg-descr b/japanese/navi2ch/pkg-descr index 5660843e6208..1cf74548f943 100644 --- a/japanese/navi2ch/pkg-descr +++ b/japanese/navi2ch/pkg-descr @@ -1 +1,3 @@ -Navi2ch, a 2ch.net and 2ch-like BBS navigator for Emacsen. +Navi2ch, a 2channel (now 5channel) and 2ch-like BBS navigator for +Emacsen. This was created to reduce the server load while providing a +more comfortable browsing experience on message boards. diff --git a/japanese/navi2ch/pkg-message b/japanese/navi2ch/pkg-message index 5712aff8ae80..0fd9578b42d3 100644 --- a/japanese/navi2ch/pkg-message +++ b/japanese/navi2ch/pkg-message @@ -1,14 +1,14 @@ [ { type: install message: <<EOM -navi2ch now requires ja-p5-2chproxy(japanese/p5-2chproxy) to access 2ch.net. +navi2ch now requires ja-proxy2ch(japanese/proxy2ch) to access 5ch.io. Before using navi2ch, put the following line into /etc/rc.conf: - twochproxy_enable="YES" + proxy2ch_enable="YES" -and start twochproxy service: +and start proxy2ch service: - # service twochproxy start + # service proxy2ch start EOM } ]home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69d429a3.42310.b11b88a>