The ports as imported don't handle getting things updated to fcitx5 for
existing users.

While this can be handled by adding @pkgpath markers to pkg/PLIST files
(and maybe @conflict if there are any files which exist in the old fcitx4
ports) and entries in devel/quirks to handle renaming of each package,
I think the best method to do this is to remove inputmethods/fcitx5*
ports and re-add them without '5' in the directories and package names.

I understand they are under the name fcitx5 upstream, but previously
the fcitx4 ports were just named 'fcitx' and it makes more sense to
continue with that, this is part of what I meant with my earlier
comment about https://marc.info/?l=openbsd-ports&m=164146994903789&w=2
- as there's no need for the two to coexist in the tree, there's no
need to rename the stem / directories.

I've attached a tar of the set of ports attached modified for this,
I included are a couple of other small tweaks (mostly: drop COMPILER as
this is already setup by the kf5 module), then otherwise it will need
cvs rm -Rf fcitx5* and the following diff (I didn't bump REVISION
for scim-fcitx because it would have already failed packaging as
the previous commit didn't have a bump either).

My build is still running, I'll followup when it is done

Index: Makefile
===================================================================
RCS file: /cvs/ports/inputmethods/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile    13 May 2022 01:52:02 -0000      1.27
+++ Makefile    13 May 2022 14:26:00 -0000
@@ -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
Index: scim-fcitx/pkg/PLIST
===================================================================
RCS file: /cvs/ports/inputmethods/scim-fcitx/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- scim-fcitx/pkg/PLIST        13 May 2022 01:52:03 -0000      1.4
+++ scim-fcitx/pkg/PLIST        13 May 2022 14:26:00 -0000
@@ -1,4 +1,4 @@
-@conflict fcitx5-*
+@conflict fcitx-*
 @bin bin/createPYMB
 @bin bin/mb2txt
 @bin bin/txt2mb

Attachment: fcitx.tgz
Description: application/tar-gz

Reply via email to