Date: Mon, 30 Jun 2025 17:59:02 GMT From: MANTANI Nobutaka <nobutaka@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: da328cb32d55 - main - */*: Change dependency from japanese/anthy to japanese/anthy-unicode Message-ID: <202506301759.55UHx2Yd079878@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by nobutaka: URL: https://cgit.FreeBSD.org/ports/commit/?id=da328cb32d559ec75a2760043bbb83a393ec5672 commit da328cb32d559ec75a2760043bbb83a393ec5672 Author: MANTANI Nobutaka <nobutaka@FreeBSD.org> AuthorDate: 2025-06-30 17:46:43 +0000 Commit: MANTANI Nobutaka <nobutaka@FreeBSD.org> 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-ispellhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506301759.55UHx2Yd079878>