From nobody Mon Jun 30 17:59:02 2025 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 4bWDS64tfZz60kTw; Mon, 30 Jun 2025 17:59:02 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bWDS63yzLz3VXt; Mon, 30 Jun 2025 17:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751306342; 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=hQn5Xe0gMXRhQ7pG0hz8LcDrEy798KpxRVZ6ZW/Lj/w=; b=tGb3+Bl95F/PDtjctpbolUyDT5cHAnGyEdhA534cqBURrslqEHRca8YleJfiRNpREGhV0F P7+peFYBY8o7PgIW6UVvoTIIQiT8CtUN/fmxtbrD6uPkSDfCm5AR+YE08FPR28pKdPGNu+ Q526ay/TTyqVWlHxVW4rFI7nWWG5mNNqDva1GPjc17eNpLhBUz9KVRZh3EF1Vdf1ZvD+PS HzoJTVKwYh/hTSmbJ21sPDm1AfgPQP3hn+X1voLqxTc5lES1PTwcP0ARA+0f0eAAfMHwel Uc7caP4Ivmfj5gP85Ts28aSGlNEjt/Dopo1jUIw1TtVW4H9SmHAv3PPpUSspDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751306342; 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=hQn5Xe0gMXRhQ7pG0hz8LcDrEy798KpxRVZ6ZW/Lj/w=; b=meeyoZLaGACMJ9EHzWHhuiL0GlV/Rx7xm3huB0q7yIvFbKu4UzUpmoOm9J9ma2jN2SsoPX GyaW0K+HuJYICngH33vBQo4sAKhppw8kvz4k3hqKJ5B1W+tuBXI0XWU8ZKSoh2s09BvVrl QkR7LgMpZSvwJ46g5b1ReW40nFE4107UQhtRY5lAMpfvffKowPnSsUAPlXTNqX2gDY0ljo aDM5zNyrsk1ujqzJYRZH977MmmqAfruMS58XK3Tbeo2LxgJP/yGJf1yQAO+hX4nncskFWD 8lNDmWd6H+tScAF8YJ+9kraKPEn9L2O0IgwrWcnYOAw7vsmk5jcLjJXaSkH5dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751306342; a=rsa-sha256; cv=none; b=u7ywRC0Zrf8EDUG+Lyzr5L9AHoNw2LM39G6J/kiEW7Y0PcMo6XyLuLjzOlW3p0v5kdwOv+ eloL4IhglmcAtnd5PVlSchm2mmky29UVFV5Ht5lKJ7Rh2g/tJdTDKxEeXazSi2XX8FePvH 3xUcZSEAhhm0Snw5++6TrTiWAEnwQln6HZhLZAV/iB8Pk48RO8BXbn/zHRGtcl0CMdIvrV A1Gjni3CqOp+KtlptgBP8CHyFsADbrohOHEmo0aJOh6jZ/T0lpo/2xCTwb2KkISDFs+5y2 NCuR4bhN/yAmFXBLh3BGVjzGc0cAyMhEAV6P3V6+892DAInBy01Zo60XIZ+E/w== 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 4bWDS633wPz1DGZ; Mon, 30 Jun 2025 17:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55UHx2dA079881; Mon, 30 Jun 2025 17:59:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55UHx2Yd079878; Mon, 30 Jun 2025 17:59:02 GMT (envelope-from git) Date: Mon, 30 Jun 2025 17:59:02 GMT Message-Id: <202506301759.55UHx2Yd079878@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: MANTANI Nobutaka Subject: git: da328cb32d55 - main - */*: Change dependency from japanese/anthy to japanese/anthy-unicode 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: nobutaka X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da328cb32d559ec75a2760043bbb83a393ec5672 Auto-Submitted: auto-generated The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=da328cb32d559ec75a2760043bbb83a393ec5672 commit da328cb32d559ec75a2760043bbb83a393ec5672 Author: MANTANI Nobutaka AuthorDate: 2025-06-30 17:46:43 +0000 Commit: MANTANI Nobutaka CommitDate: 2025-06-30 17:57:49 +0000 */*: Change dependency from japanese/anthy to japanese/anthy-unicode It should have been done at the removal of japanese/anthy. Reported by: thierry --- chinese/gcin/Makefile | 7 ++++--- chinese/gcin/files/patch-configure | 9 +++++++++ chinese/gcin/files/patch-modules__Makefile | 18 ++++++++++++++++++ deskutils/maliit-keyboard/Makefile | 3 ++- devel/m17n-lib/Makefile | 2 +- 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile index 34ff78f478ec..19956ccc6f0c 100644 --- a/chinese/gcin/Makefile +++ b/chinese/gcin/Makefile @@ -1,6 +1,6 @@ PORTNAME= gcin PORTVERSION= 2.9.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= chinese textproc gnome MASTER_SITES= http://hyperrate.com/gcin-source/ EXTRACT_ONLY= gcin-${PORTVERSION}.tar.xz @@ -26,9 +26,10 @@ OPTIONS_DEFINE= ANTHY OPTIONS_SUB= yes ANTHY_DESC= Japanese anthy IM module -ANTHY_BUILD_DEPENDS= ${LOCALBASE}/include/anthy/anthy.h:japanese/anthy -ANTHY_LIB_DEPENDS= libanthy.so:japanese/anthy +ANTHY_BUILD_DEPENDS= ${LOCALBASE}/include/anthy-unicode-1.0/anthy/anthy.h:japanese/anthy-unicode +ANTHY_LIB_DEPENDS= libanthy-unicode.so:japanese/anthy-unicode ANTHY_CONFIGURE_OFF= --use_anthy=N +ANTHY_MAKE_ENV= ANTHY_CFLAGS=-I${LOCALBASE}/include/anthy-unicode-1.0 post-patch: @${REINPLACE_CMD} -e 's,&,,; 1 s,##!/bin/bash,#!/bin/sh,; \ diff --git a/chinese/gcin/files/patch-configure b/chinese/gcin/files/patch-configure index 7f53aeac8d32..b695f7f0a88a 100644 --- a/chinese/gcin/files/patch-configure +++ b/chinese/gcin/files/patch-configure @@ -15,6 +15,15 @@ exit fi +@@ -172,7 +172,7 @@ echo -n ".... Testing anthy : " + fi + + echo -n ".... Testing anthy : " +-USE_ANTHY=`pkg-config --libs anthy` ++USE_ANTHY=`pkg-config --libs anthy-unicode` + if [ $? != 0 ]; then + USE_ANTHY=N + echo "Not found. It's ok if you don't want anthy support." @@ -232,7 +232,7 @@ QT4_IM='N' diff --git a/chinese/gcin/files/patch-modules__Makefile b/chinese/gcin/files/patch-modules__Makefile index 3c8125ece097..e4192fc04dc4 100644 --- a/chinese/gcin/files/patch-modules__Makefile +++ b/chinese/gcin/files/patch-modules__Makefile @@ -1,5 +1,23 @@ --- modules/Makefile.orig 2013-10-05 03:31:52 UTC +++ modules/Makefile +@@ -6,7 +6,7 @@ GCIN_MODULE+=anthy-module.so + + ifeq ($(USE_ANTHY),Y) + GCIN_MODULE+=anthy-module.so +-CFLAGS+=-DGCIN_MODULE=1 ++CFLAGS+=-DGCIN_MODULE=1 $(ANTHY_CFLAGS) + endif + + ifeq ($(USE_CHEWING),Y) +@@ -19,7 +19,7 @@ anthy-module.so: $(anthy_module_so) + + anthy_module_so = anthy.pico + anthy-module.so: $(anthy_module_so) +- $(CCLD) $(SO_FLAGS) -o $@ $(anthy_module_so) $(LDFLAGS) -lanthy ++ $(CCLD) $(SO_FLAGS) -o $@ $(anthy_module_so) $(LDFLAGS) -lanthy-unicode + + intcode_module_so = intcode.pico win-int.pico + intcode-module.so: $(intcode_module_so) @@ -38,4 +38,4 @@ clean: .depend: $(CCX) $(CFLAGS) -MM *.cpp > $@ diff --git a/deskutils/maliit-keyboard/Makefile b/deskutils/maliit-keyboard/Makefile index b680083dad91..298821e4cddd 100644 --- a/deskutils/maliit-keyboard/Makefile +++ b/deskutils/maliit-keyboard/Makefile @@ -1,5 +1,6 @@ PORTNAME= keyboard DISTVERSION= 2.3.1 +PORTREVISION= 1 CATEGORIES= deskutils kde PKGNAMEPREFIX= maliit- @@ -30,7 +31,7 @@ ANTHY_DESC= Japanese language support CHEWING_DESC= Chinese language support via chewing PINYIN_DESC= Chinese language support via pinyin -ANTHY_LIB_DEPENDS= libanthy.so:japanese/anthy +ANTHY_LIB_DEPENDS= libanthy-unicode.so:japanese/anthy-unicode ANTHY_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Anthy CHEWING_LIB_DEPENDS= libchewing.so:chinese/libchewing CHEWING_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_Chewing diff --git a/devel/m17n-lib/Makefile b/devel/m17n-lib/Makefile index 74584830f5bd..c82b40fbc303 100644 --- a/devel/m17n-lib/Makefile +++ b/devel/m17n-lib/Makefile @@ -43,7 +43,7 @@ OPTIONS_DEFAULT=NLS ANTHY_DESC= Kana-Kanji conversion support via Anthy THAI_DESC= Thai language support via libThai -ANTHY_LIB_DEPENDS= libanthy.so:japanese/anthy +ANTHY_LIB_DEPENDS= libanthy-unicode.so:japanese/anthy-unicode ANTHY_CONFIGURE_OFF= --without-anthy ISPELL_BUILD_DEPENDS= ispell:textproc/aspell-ispell