git: e91fdcb888ce - main - japanese/jvim3: Fix simd(7) issue

The branch main has been updated by mce:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e91fdcb888ce5808ce9ff52cc4f00023136f522f

commit e91fdcb888ce5808ce9ff52cc4f00023136f522f
Author:     Kousuke Kannagi <mce@FreeBSD.org>
AuthorDate: 2026-09-17 07:58:02 +0000
Commit:     Kousuke Kannagi <mce@FreeBSD.org>
CommitDate: 2026-09-17 15:54:00 +0000

    japanese/jvim3: Fix simd(7) issue
    
    Update MASTER_SITES.
    Take maintainership.
    Remove cygwin.txt, vim-jp.htm and vim32.ini from PORTDOCS.
    Change the option name of DIRECT_CANNNA to CANNA.
    Add XORG=xorgproto.
    Add patch file for simd(7) issue.
    
    PR:             276459
    Approved by:    fluffy (mentor)
---
 japanese/jvim3/Makefile              | 21 +++++++++++----------
 japanese/jvim3/files/patch-src_vim.h | 13 +++++++++++++
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index 940c91b86ed8..2a5184453d39 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -1,12 +1,13 @@
 PORTNAME=	jvim
 PORTVERSION=	3.0.j2.1b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese editors
 MASTER_SITES=	https://ftp.st.ryukoku.ac.jp/pub/editor/vim/unix/:vim \
-		https://ftp.st.ryukoku.ac.jp/pub/editor/jvim/jvim3/2.1b/:jvim
+		https://ftp.st.ryukoku.ac.jp/pub/editor/jvim/jvim3/2.1b/:jvim \
+		http://ftp.fwnet.jp/:vim http://ftp.fwnet.jp/:jvim
 DISTFILES=	vim-3.0.tar.gz:vim jvim.2.1b.tar.gz:jvim
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mce@FreeBSD.org
 COMMENT=	Japanized Vim-3.0
 WWW=		https://ftp.st.ryukoku.ac.jp/pub/editor/jvim/jvim3/vim.html
 
@@ -22,25 +23,25 @@ MAKE_ARGS=	FEPOPT='${FEPOPT}' \
 		FEPOBJS="${FEPOBJS}" \
 		LIBS="${LIBS}"
 
-OPTIONS_DEFINE=	DIRECT_CANNA DOCS X11
+OPTIONS_DEFINE=	CANNA DOCS X11
 OPTIONS_DEFAULT=X11
-DIRECT_CANNA_DESC=	Canna support (direct)
-DIRECT_CANNA_LIB_DEPENDS=	libcanna.so:japanese/canna-lib
+CANNA_DESC=		Canna support
+CANNA_LIB_DEPENDS=	libcanna.so:japanese/canna-lib
 
-PORTDOCS=	cygwin.txt differen.doc fepctrl.doc readme.doc \
-		termcap.dos uganda.jp vim-jp.htm vim32.ini tutor.j
+PORTDOCS=	differen.doc fepctrl.doc readme.doc termcap.dos uganda.jp \
+		tutor.j
 
 CPPFLAGS+=	-DBSD_UNIX -DUSE_LOCALE
 LIBS+=		-ltermlib -L${LOCALBASE}/lib
 
 X11_USES=	xorg
-X11_USE=	XORG=x11
+X11_USE=	XORG=x11,xorgproto
 X11_CPPFLAGS=	-DUSE_X11 -I${LOCALBASE}/include
 X11_LIBS=	-lX11 -L${LOCALBASE}/lib
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDIRECT_CANNA}
+.if ${PORT_OPTIONS:MCANNA}
 FEPOPT=		-DJP_DEF=\"EEE\" -DFEPCTRL -DCANNA
 FEPLIBS=	-lcanna -L${LOCALBASE}/lib
 FEPOBJS=	fepcanna.o
diff --git a/japanese/jvim3/files/patch-src_vim.h b/japanese/jvim3/files/patch-src_vim.h
new file mode 100644
index 000000000000..25f763984d04
--- /dev/null
+++ b/japanese/jvim3/files/patch-src_vim.h
@@ -0,0 +1,13 @@
+--- src/vim.h.orig	2024-07-10 18:45:46 UTC
++++ src/vim.h
+@@ -322,8 +322,8 @@ typedef unsigned long	long_u;
+ #define STRCHR(s, c)		(char_u *)strchr((char *)(s), c)
+ #define STRRCHR(s, c)		(char_u *)strrchr((char *)(s), c)
+ #define STRLEN(s)			strlen((char *)(s))
+-#define STRCPY(d, s)		strcpy((char *)(d), (char *)(s))
+-#define STRNCPY(d, s, n)	strncpy((char *)(d), (char *)(s), n)
++#define STRCPY(d, s)		(memmove((char *)(d), (char *)(s), strlen((char *)(s)) + 1))
++#define STRNCPY(d, s, n)	(memmove((char *)(d), (char *)(s), n))
+ #define STRCMP(d, s)		strcmp((char *)(d), (char *)(s))
+ #define STRNCMP(d, s, n)	strncmp((char *)(d), (char *)(s), n)
+ #define STRCAT(d, s)		strcat((char *)(d), (char *)(s))