re-add the fcitx5 ports under fcitx-XX pkgpath and pkgnames, the less

expensive of two possible ways of handling the upgrade path from fcitx-4.xx

input from espie@, discussed with kevlo@
This commit is contained in:
sthen 2022-05-13 15:37:46 +00:00
parent 3d87553109
commit a6388766cd
62 changed files with 83 additions and 96 deletions

View File

@ -1,19 +1,19 @@
SUBDIR =
SUBDIR += anthy
SUBDIR += cellwriter
SUBDIR += fcitx5
SUBDIR += fcitx5-anthy
SUBDIR += fcitx5-chewing
SUBDIR += fcitx5-chinese-addons
SUBDIR += fcitx5-config-qt
SUBDIR += fcitx5-gtk
SUBDIR += fcitx5-hangul
SUBDIR += fcitx5-kkc
SUBDIR += fcitx5-lua
SUBDIR += fcitx5-m17n
SUBDIR += fcitx5-qt
SUBDIR += fcitx5-table-extra
SUBDIR += fcitx5-unikey
SUBDIR += fcitx
SUBDIR += fcitx-anthy
SUBDIR += fcitx-chewing
SUBDIR += fcitx-chinese-addons
SUBDIR += fcitx-config-qt
SUBDIR += fcitx-gtk
SUBDIR += fcitx-hangul
SUBDIR += fcitx-kkc
SUBDIR += fcitx-lua
SUBDIR += fcitx-m17n
SUBDIR += fcitx-qt
SUBDIR += fcitx-table-extra
SUBDIR += fcitx-unikey
SUBDIR += ibus
SUBDIR += ibus-anthy
SUBDIR += ibus-kkc

View File

@ -1,12 +1,12 @@
COMMENT = anthy wrapper for fcitx5
V = 5.0.10
PKGNAME = fcitx5-anthy-$V
PKGNAME = fcitx-anthy-$V
REVISION = 0
GH_ACCOUNT = fcitx
GH_PROJECT = fcitx5-anthy
GH_TAGNAME = $V
EXTRACT_SUFX = .tar.gz
CATEGORIES = inputmethods japanese
@ -20,20 +20,19 @@ WANTLIB += anthy anthydic m
# LGPL-2.1+
PERMIT_PACKAGE= Yes
COMPILER = base-clang ports-clang ports-gcc
MODULES = devel/kf5
EXTRACT_SUFX = .tar.gz
MODQT5_DEPS = No
BUILD_DEPENDS = devel/gettext,-tools \
inputmethods/fcitx5 \
inputmethods/fcitx \
devel/iso-codes
RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
x11/gtk+3,-guic
LIB_DEPENDS = inputmethods/fcitx5 \
LIB_DEPENDS = inputmethods/fcitx \
inputmethods/anthy
# ninja: error: unknown target 'test'

View File

@ -1,7 +1,8 @@
COMMENT = chewing wrapper for fcitx5
V = 5.0.10
PKGNAME = fcitx5-chewing-$V
PKGNAME = fcitx-chewing-$V
REVISION = 0
GH_ACCOUNT = fcitx
GH_PROJECT = fcitx5-chewing
@ -19,22 +20,19 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Utils
WANTLIB += chewing m
EXTRACT_SUFX = .tar.gz
COMPILER = base-clang ports-clang ports-gcc
MODULES = devel/kf5
EXTRACT_SUFX = .tar.gz
MODQT5_DEPS = No
BUILD_DEPENDS = devel/gettext,-tools \
inputmethods/fcitx5 \
inputmethods/fcitx \
devel/iso-codes
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic \
misc/shared-mime-info
LIB_DEPENDS = inputmethods/fcitx5 \
LIB_DEPENDS = inputmethods/fcitx \
chinese/libchewing
# ninja: error: unknown target 'test'

View File

@ -1,7 +1,9 @@
COMMENT = Addons related to Chinese with IME bundled inside fcitx4
COMMENT = addons related to Chinese with IME bundled inside fcitx
V = 5.0.12
DISTNAME = fcitx5-chinese-addons-$V
PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
REVISION = 0
CATEGORIES = inputmethods chinese
@ -19,27 +21,26 @@ WANTLIB += boost_iostreams-mt boost_regex-mt c m opencc
MASTER_SITES = https://download.fcitx-im.org/fcitx5/fcitx5-chinese-addons/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_SUFX = .tar.xz
EXTRACT_SUFX = .tar.xz
DIST_SUBDIR = fcitx
MASTER_SITES0 = https://download.fcitx-im.org/data/
DISTFILES += py_table-20121124.tar.gz:0
DISTFILES += py_stroke-20121124.tar.gz:0
COMPILER = base-clang ports-clang ports-gcc
MODULES = devel/kf5
BUILD_DEPENDS = devel/gettext,-tools \
inputmethods/fcitx5-lua \
inputmethods/fcitx-lua \
devel/iso-codes
RUN_DEPENDS = devel/desktop-file-utils \
inputmethods/fcitx5-lua \
inputmethods/fcitx-lua \
x11/gtk+3,-guic \
misc/shared-mime-info
LIB_DEPENDS = inputmethods/fcitx5 \
inputmethods/fcitx5-qt \
LIB_DEPENDS = inputmethods/fcitx \
inputmethods/fcitx-qt \
inputmethods/libime \
devel/boost,-main \
converters/opencc
@ -48,9 +49,9 @@ CONFIGURE_ARGS = -DENABLE_BROWSER=OFF \
-DENABLE_CLOUDPINYIN=OFF
post-patch:
cp ${FULLDISTDIR}/py_table-20121124.tar.gz \
${WRKSRC}/modules/pinyinhelper/
cp ${FULLDISTDIR}/py_stroke-20121124.tar.gz \
${WRKSRC}/modules/pinyinhelper/
cp ${FULLDISTDIR}/py_table-20121124.tar.gz \
${WRKSRC}/modules/pinyinhelper/
cp ${FULLDISTDIR}/py_stroke-20121124.tar.gz \
${WRKSRC}/modules/pinyinhelper/
.include <bsd.port.mk>

View File

@ -2,7 +2,8 @@ COMMENT = GUI configure tool for fcitx5
V = 5.0.12
DISTNAME = fcitx5-configtool-$V
PKGNAME = fcitx5-configtool-qt-$V
PKGNAME = fcitx-configtool-qt-$V
REVISION = 0
CATEGORIES = inputmethods
@ -20,11 +21,9 @@ WANTLIB += KF5WidgetsAddons Qt5Qml Qt5QmlModels Qt5Quick Qt5X11Extras
WANTLIB += X11 c m xkbcommon xkbfile
MASTER_SITES = https://download.fcitx-im.org/fcitx5/fcitx5-configtool/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_SUFX = .tar.xz
EXTRACT_SUFX = .tar.xz
DIST_SUBDIR = fcitx
COMPILER = base-clang ports-clang ports-gcc
MODULES = devel/kf5
BUILD_DEPENDS = devel/gettext,-tools \
@ -37,7 +36,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
devel/kf5/kirigami2 \
misc/shared-mime-info
LIB_DEPENDS = inputmethods/fcitx5-qt \
LIB_DEPENDS = inputmethods/fcitx-qt \
x11/qt5/qtx11extras \
devel/kf5/kdeclarative \
devel/kf5/ki18n \

View File

@ -1,6 +1,8 @@
COMMENT = GTK IM module for fcitx5
DISTNAME = fcitx5-gtk-5.0.13
PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
REVISION = 0
SHARED_LIBS = Fcitx5GClient 0.0 # 0.0
@ -18,21 +20,18 @@ WANTLIB += X11 cairo cairo-gobject harfbuzz pango-1.0 pangocairo-1.0
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 intl m
MASTER_SITES = https://download.fcitx-im.org/fcitx5/fcitx5-gtk/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_SUFX = .tar.xz
COMPILER = base-clang ports-clang ports-gcc
MODULES = devel/kf5
MODQT5_DEPS = No
BUILD_DEPENDS = devel/gettext,-tools \
inputmethods/fcitx5 \
inputmethods/fcitx \
devel/gobject-introspection \
devel/iso-codes
RUN_DEPENDS = devel/desktop-file-utils \
inputmethods/fcitx5 \
inputmethods/fcitx \
misc/shared-mime-info
LIB_DEPENDS = devel/harfbuzz,-main \

View File

@ -1,7 +1,8 @@
COMMENT = Hangul wrapper for fcitx5
V = 5.0.8
PKGNAME = fcitx5-hangul-$V
PKGNAME = fcitx-hangul-$V
REVISION = 0
GH_ACCOUNT = fcitx
GH_PROJECT = fcitx5-hangul
@ -19,22 +20,19 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Utils
WANTLIB += hangul iconv intl m
EXTRACT_SUFX = .tar.gz
COMPILER = base-clang ports-clang ports-gcc
MODULES = devel/kf5
EXTRACT_SUFX = .tar.gz
MODQT5_DEPS = No
BUILD_DEPENDS = devel/gettext,-tools \
inputmethods/fcitx5 \
inputmethods/fcitx \
devel/iso-codes
RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic \
misc/shared-mime-info
LIB_DEPENDS = inputmethods/fcitx5 \
LIB_DEPENDS = inputmethods/fcitx \
korean/libhangul
.include <bsd.port.mk>

View File

@ -1,7 +1,8 @@
COMMENT = libkkc wrapper for fcitx5
V = 5.0.8
PKGNAME = fcitx5-kkc-$V
PKGNAME = fcitx-kkc-$V
REVISION = 0
GH_ACCOUNT = fcitx
GH_PROJECT = fcitx5-kkc
@ -20,12 +21,11 @@ WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Qt5WidgetsAddons
WANTLIB += Fcitx5Utils Qt5Core Qt5Gui Qt5Widgets gee-0.8 gio-2.0
WANTLIB += glib-2.0 gobject-2.0 intl json-glib-1.0 kkc m
MODULES = devel/kf5
EXTRACT_SUFX = .tar.gz
MODULES = devel/kf5
BUILD_DEPENDS = devel/gettext,-tools \
inputmethods/fcitx5 \
inputmethods/fcitx \
devel/iso-codes
RUN_DEPENDS = devel/desktop-file-utils \
@ -33,12 +33,10 @@ RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
x11/gtk+3,-guic
LIB_DEPENDS = inputmethods/fcitx5 \
inputmethods/fcitx5-qt \
LIB_DEPENDS = inputmethods/fcitx \
inputmethods/fcitx-qt \
inputmethods/libkkc
COMPILER = base-clang ports-clang
# ninja: error: unknown target 'test'
NO_TEST = Yes

View File

@ -1,6 +1,8 @@
COMMENT = Lua support for fcitx5
DISTNAME = fcitx5-lua-5.0.5
PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
REVISION = 0
CATEGORIES = inputmethods
@ -12,14 +14,11 @@ MAINTAINER = Yifei Zhan <openbsd@zhan.science>
PERMIT_PACKAGE= Yes
MASTER_SITES = https://download.fcitx-im.org/fcitx5/fcitx5-lua/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_SUFX = .tar.xz
WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Utils
WANTLIB += m
COMPILER = base-clang ports-clang ports-gcc
MODULES = devel/kf5
MODQT5_DEPS = No
@ -31,6 +30,6 @@ RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
lang/lua/5.3
LIB_DEPENDS = inputmethods/fcitx5
LIB_DEPENDS = inputmethods/fcitx
.include <bsd.port.mk>

View File

@ -1,7 +1,8 @@
COMMENT = m17n wrapper for fcitx5
V = 5.0.8
PKGNAME = fcitx5-m17n-$V
PKGNAME = fcitx-m17n-$V
REVISION = 0
GH_ACCOUNT = fcitx
GH_PROJECT = fcitx5-m17n
@ -19,21 +20,18 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Utils
WANTLIB += m m17n m17n-core m17n-gui
EXTRACT_SUFX = .tar.gz
COMPILER = base-clang ports-clang ports-gcc
MODULES = devel/kf5
EXTRACT_SUFX = .tar.gz
MODQT5_DEPS = No
BUILD_DEPENDS = devel/gettext,-tools \
inputmethods/fcitx5 \
inputmethods/fcitx \
devel/iso-codes
RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
LIB_DEPENDS = inputmethods/fcitx5 \
LIB_DEPENDS = inputmethods/fcitx \
misc/m17n/lib
.include <bsd.port.mk>

View File

@ -1,6 +1,8 @@
COMMENT = Qt library and IM module for fcitx5
DISTNAME = fcitx5-qt-5.0.9
PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
REVISION = 0
SHARED_LIBS += Fcitx5Qt5WidgetsAddons 0.0 # 0.0
SHARED_LIBS += Fcitx5Qt5DBusAddons 0.0 # 0.0
@ -19,22 +21,20 @@ WANTLIB += ${COMPILER_LIBCXX} Fcitx5Utils Qt5Concurrent Qt5Core
WANTLIB += Qt5DBus Qt5Gui Qt5Widgets c m xcb xkbcommon
MASTER_SITES = https://download.fcitx-im.org/fcitx5/fcitx5-qt/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_SUFX = .tar.xz
COMPILER = base-clang ports-clang ports-gcc
MODULES = devel/kf5
BUILD_DEPENDS = devel/gettext,-tools \
inputmethods/fcitx5 \
inputmethods/fcitx \
devel/iso-codes \
devel/fmt
RUN_DEPENDS = devel/desktop-file-utils \
inputmethods/fcitx5 \
inputmethods/fcitx \
misc/shared-mime-info
LIB_DEPENDS = inputmethods/fcitx5
LIB_DEPENDS = inputmethods/fcitx
CONFIGURE_ARGS = -DENABLE_QT4=OFF

View File

@ -1,7 +1,9 @@
COMMENT = fcitx5-table-extra provides extra table for Fcitx5
COMMENT = extra table for Fcitx5
V = 5.0.9
DISTNAME = fcitx5-table-extra-$V
PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
REVISION = 0
CATEGORIES = inputmethods chinese
@ -13,11 +15,9 @@ MAINTAINER = Yifei Zhan <openbsd@zhan.science>
PERMIT_PACKAGE= Yes
MASTER_SITES = https://download.fcitx-im.org/fcitx5/fcitx5-table-extra/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
EXTRACT_SUFX = .tar.xz
EXTRACT_SUFX = .tar.xz
DIST_SUBDIR = fcitx
COMPILER = base-clang ports-clang ports-gcc
MODULES = devel/kf5
BUILD_DEPENDS = devel/gettext,-tools \
@ -27,8 +27,8 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic \
misc/shared-mime-info
LIB_DEPENDS = inputmethods/fcitx5 \
inputmethods/fcitx5-chinese-addons \
LIB_DEPENDS = inputmethods/fcitx \
inputmethods/fcitx-chinese-addons \
devel/boost,-main \
converters/opencc

View File

@ -1,7 +1,8 @@
COMMENT = unikey Vietnamese support for fcitx5
V = 5.0.9
PKGNAME = fcitx5-unikey-$V
PKGNAME = fcitx-unikey-$V
REVISION = 0
GH_ACCOUNT = fcitx
GH_PROJECT = fcitx5-unikey
@ -19,11 +20,8 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${COMPILER_LIBCXX} Fcitx5Config Fcitx5Core Fcitx5Utils
WANTLIB += Fcitx5Qt5WidgetsAddons Qt5Core Qt5Gui Qt5Widgets m
EXTRACT_SUFX = .tar.gz
COMPILER = base-clang ports-clang
MODULES = devel/kf5
EXTRACT_SUFX = .tar.gz
MODQT5_DEPS = No
BUILD_DEPENDS = devel/gettext,-tools \
@ -33,7 +31,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/gtk+3,-guic \
misc/shared-mime-info
LIB_DEPENDS = inputmethods/fcitx5 \
inputmethods/fcitx5-qt
LIB_DEPENDS = inputmethods/fcitx \
inputmethods/fcitx-qt
.include <bsd.port.mk>

View File

@ -1,6 +1,8 @@
COMMENT = flexible input method framework
DISTNAME = fcitx5-5.0.15
PKGNAME = ${DISTNAME:S/fcitx5/fcitx/}
REVISION = 0
SHARED_LIBS += Fcitx5Config 0.0 # 0.0
SHARED_LIBS += Fcitx5Core 0.0 # 0.0
@ -28,11 +30,8 @@ MASTER_SITES0 = https://download.fcitx-im.org/data/
DISTFILES += ${DISTNAME}${EXTRACT_SUFX} \
en_dict-20121020.tar.gz:0
EXTRACT_SUFX = .tar.xz
DIST_SUBDIR = fcitx
COMPILER = base-clang ports-clang ports-gcc
MODULES = devel/kf5
MODQT5_DEPS = No

View File

@ -1,6 +1,7 @@
COMMENT = library to support generic input method implementation
DISTNAME = libime-1.0.11
REVISION = 0
SHARED_LIBS += IMECore 0.0 # 0.0
SHARED_LIBS += IMEPinyin 0.0 # 0.0
@ -41,7 +42,7 @@ BUILD_DEPENDS = devel/gettext,-tools \
RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info
LIB_DEPENDS = inputmethods/fcitx5 \
LIB_DEPENDS = inputmethods/fcitx \
devel/boost
post-patch:
@cp ${FULLDISTDIR}/dict.utf8-20211021.tar.xz \

View File

@ -1,4 +1,4 @@
@conflict fcitx5-*
@conflict fcitx-*
@bin bin/createPYMB
@bin bin/mb2txt
@bin bin/txt2mb