From nobody Tue Jun 11 16:48:07 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VzF3X0QkHz5MH2C; Tue, 11 Jun 2024 16:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VzF3W71Y4z45F2; Tue, 11 Jun 2024 16:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718124488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+6EtJ7ti0fV+M8d88nsopeeJLhno+8MfbNMNZcGDRW8=; b=ML2lxzQ6eTd1mvHj7Zwel2rPi4G1lZ2IqzVpZ49eoMp/flilr4r4Z731kyp9PpB4HCdBmu vhZSEu7Scvu4twMi5wLsXVIaUS7pmKUaN6BghZlxgb+QY2kVVXn3yZGbHaHRxHkLHkV/72 aznETW6muUz9qCTID+IpRJcgSubQtBwVqavytumLRNS7E2HamFP0sg4ba2/5HuLJycsAll IHOy3rDSDodvWHotoWzMlQ2/dO0JQGBz0nKK/FQ4TJ+k9C2A/83EJkFQYaJsmaERzzqJ90 e84f7OJQhRR5FxnT65JMs13IFEOnJcjt3tYRJKeqx0NEoAUpJR3s21N8B/GB1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718124488; a=rsa-sha256; cv=none; b=cDH3pw2NGfNqTmnNfVD0ZeFBJH4tywCDmEbwhUNyGAPuVeVFC8gi1gaKECwxX/G8nKzm6G X4/bkvc8Fzn5wcz1Yhndr7X1nVR1cZTU0w3XLCw8ooGAKtShpkpVN8EgoXvXNdBHkW3oMO nvX6y/MFK+JlWWOdLLXbpBIXxTi+VLq5M66bQbbAO02ELxuFzj/5m2Ojl2NkQu5vQ/FWHP r2NBk1bVQbkxGpFGYqt8cd2EAV3JtZ/3mRd1AyQJE5XMHq60StDdI0KB9NvYTPAySpSgTZ bQvblk4UIx6j1pPMiWtptflxot38LFHBO6rAD9GyAMl999m4j9W/mq19n+agoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718124488; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+6EtJ7ti0fV+M8d88nsopeeJLhno+8MfbNMNZcGDRW8=; b=Cd9RO3zoN+mqXWjzn8KtZ7utG8/DvjdayfJp5R+EIqxgJbZKDLpvRhR0TmCHkuekJ5LL0d nhsaiHCmJ9YITn6Dc8MIdS8TTljoqQZlzjdJOP0FfJQhp/YGn5gP2wMaq8DTjFnqhJpRfc ON2s0jpYCGfoaQcjbck8lV/MMq4+XkZExW+LhQ8v1AMi4cBEHhDbfUgrlF9wiM2wKRynAQ fL8c7kB1JNQSUpVNDdaMVHINK/1NV9ul0XlWw52SYso6m4Nc3txhxnkeAQbVo89Z3j11nn FKjizuaqSlS1tar3L81u4c+fTgRDVb2liRjAuY3o96Y0hXOk4CT7snHxKeQaCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VzF3W6S6QzHC6; Tue, 11 Jun 2024 16:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45BGm7nL016013; Tue, 11 Jun 2024 16:48:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45BGm77Q016010; Tue, 11 Jun 2024 16:48:07 GMT (envelope-from git) Date: Tue, 11 Jun 2024 16:48:07 GMT Message-Id: <202406111648.45BGm77Q016010@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 52576eb19738 - main - japanese/jvim3: remove optional depedency on expired japanese/onew List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 52576eb197389e6886200a88127d7b1a817a4947 Auto-Submitted: auto-generated The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=52576eb197389e6886200a88127d7b1a817a4947 commit 52576eb197389e6886200a88127d7b1a817a4947 Author: Rene Ladan AuthorDate: 2024-06-11 16:46:06 +0000 Commit: Rene Ladan 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 .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