git: 52576eb19738 - main - japanese/jvim3: remove optional depedency on expired japanese/onew

The branch main has been updated by rene:

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

commit 52576eb197389e6886200a88127d7b1a817a4947
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2024-06-11 16:46:06 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2024-06-11 16:46:06 +0000

    japanese/jvim3: remove optional depedency on expired japanese/onew
    
    Fix an "if" while here
    
    Bump PORTREVISION
---
 japanese/jvim3/Makefile | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index 19f64e0b38b6..6b92b94e1ef6 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	jvim
 PORTVERSION=	3.0.j2.1b
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://ftp.vim.org/pub/vim/unix/ \
 		http://hp.vector.co.jp/authors/VA003457/vim/vim3/2.1b/
@@ -23,16 +23,12 @@ MAKE_ARGS=	FEPOPT='${FEPOPT}' \
 		LIBS="${LIBS}"
 
 OPTIONS_DEFINE=	X11 DOCS
-OPTIONS_DEFAULT=X11 FREEWNN_CANNA
+OPTIONS_DEFAULT=X11
 OPTIONS_RADIO=	FEP
-OPTIONS_RADIO_FEP=	FREEWNN_CANNA DIRECT_CANNA WNN6 WNN7
+OPTIONS_RADIO_FEP=	DIRECT_CANNA WNN6 WNN7
 FEP_DESC=	Japanese FrontEnd Processor
 DIRECT_CANNA_DESC=	Canna support (direct)
 DIRECT_CANNA_LIB_DEPENDS=	libcanna.so:japanese/canna-lib
-FREEWNN_CANNA_DESC=	Canna and FreeWnn support (via ONEW library)
-FREEWNN_CANNA_LIB_DEPENDS=	libjd.so:japanese/FreeWnn-lib \
-				libcanna.so:japanese/canna-lib
-FREEWNN_CANNA_BUILD_DEPENDS=	${LOCALBASE}/lib/libonew-canna+freewnn.a:japanese/onew
 WNN6_DESC=	Wnn6 support
 WNN6_LIB_DEPENDS=	libjd.so:japanese/FreeWnn-lib
 WNN6_BUILD_DEPENDS=	${LOCALBASE}/lib/libonew-wnn6.a:japanese/onew
@@ -54,7 +50,6 @@ X11_LIBS=	-lX11 -L${LOCALBASE}/lib
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDIRECT_CANNA} || \
-    ${PORT_OPTIONS:MFREEWNN_CANNA} || \
     ${PORT_OPTIONS:MWNN6} || \
     ${PORT_OPTIONS:MWNN7}
 FEPOPT+=	-DJP_DEF=\"EEE\" -DFEPCTRL
@@ -68,20 +63,14 @@ FEPOBJS=	fepcanna.o
 JVIM3RC=	"set fepctrl"
 .endif
 
-.if ${PORT_OPTIONS:MFREEWNN_CANNA} || \
-    ${PORT_OPTIONS:MWNN6} || \
+.if ${PORT_OPTIONS:MWNN6} || \
     ${PORT_OPTIONS:MWNN7} || \
-    ${PORT_OPTIONS:MCANNA}
+    ${PORT_OPTIONS:MDIRECT_CANNA}
 FEPOPT+=	-DONEW
 FEPOBJS=	feponew.o
 JVIM3RC=	"set fepctrl onewredraw"
 .endif
 
-# Connection by using ONEW library
-.if ${PORT_OPTIONS:MFREEWNN_CANNA}
-FEPLIBS+=	-lonew-canna+freewnn -lcanna -ljd -lcrypt
-.endif
-
 .if ${PORT_OPTIONS:MWNN6}
 FEPLIBS+=	-lonew-wnn6 -ljd -lcrypt
 .endif