mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity
0b3c20aaf1
freebsd-ports/chinese
History
Stefan Eßer bcaf25a8c8 Fix CONFLICTS entries of multiple ports 
There have been lots of missing CONFLICTS_INSTALL entries, either
because conflicting ports were added without updating existing ports,
due to name changes of generated packages, due to mis-understanding
the format and semantics of the conflicts entries, or just due to
typoes in package names.

This patch is the result of a comparison of all files contained in
the official packages with each other. This comparison was based on
packages built with default options and may therefore have missed
further conflicts with optionally installed files.

Where possible, version numbers in conflicts entries have been
generalized, some times taking advantage of the fact that a port
cannot conflict with itself (due to logic in bsd.port.mk that
supresses the pattern match result in that case).

A few ports that set the conflicts variables depending on complex
conditions (e.g. port options), have been left unmodified, despite
probably containing outdated package names.

These changes should only affect the installation of locally built
ports, not the package building with poudriere. They should give an
early indication of the install conflict in cases where currently
the pkg command aborts an installation when it detects that an
existing file would be overwritten,

Approved by:	portmgr (implicit)
2022-01-10 16:15:39 +01:00
..
arphicttf Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
aterm Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
auto-cn-l10n Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
auto-tw-l10n Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
autoconvert Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
big5width Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
bitchx Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
brise One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
bsdconv-opencc Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
bug5 Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
c2t chinese/c2t: fix "error: address of register variable requested" 2021-10-02 13:19:56 +02:00
cconv Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
celvis Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
chiconv Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
CJKUnifonts Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
cless Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
cnprint Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
CNS11643-font Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
dictd-database Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
enscript Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
eterm Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
fandol Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
fcitx Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
fcitx5-chewing chinese/fcitx5-chewing: Update to 5.0.7 2021-11-30 05:38:34 -05:00
fcitx5-chinese-addons chinese/fcitx5-chinese-addons: Update to 5.0.8 2021-11-30 05:38:34 -05:00
fcitx5-rime chinese/fcitx5-rime: Update to 5.0.8 2021-11-30 05:38:34 -05:00
fcitx5-table-extra chinese/fcitx5-table-extra: Update to 5.0.6 2021-11-30 05:38:34 -05:00
fcitx5-table-other chinese/fcitx5-table-other: Update to 5.0.6 2021-11-30 05:38:34 -05:00
fcitx-chewing INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
fcitx-cloudpinyin Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
fcitx-configtool Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
fcitx-libpinyin chinese/fcitx-libpinyin: only enable QT5 where webengine builds 2021-11-01 02:40:28 +00:00
fcitx-rime INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
fcitx-table-extra INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
fcitx-ui-light Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
fireflyttf */*: Remove redundant '-*' from CONFLICTS definitions 2021-11-25 22:40:11 +01:00
font-std Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
fortunetw Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
FreeWnn-lib Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
FreeWnn-server Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
gb2jis Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
gb2ps Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
gcin INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
gcin-gtk3 Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
gcin-qt5 Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
gydict Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
hc Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
ibus-cangjie INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
ibus-chewing Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
ibus-libpinyin cleanup: drop support for EOL FreeBSD 11.X 2021-09-30 23:23:30 +02:00
ibus-pinyin Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
ibus-rime *: apply refactor.remove-consecutive-empty-lines 2021-10-19 10:36:47 +02:00
ibus-table-chinese chinese/ibus-table-chinese: mark BROKEN (does not build) 2021-05-17 20:40:06 +03:00
jis2gb Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
kcfonts Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
libcangjie chinese/{ibus-,lib,py}cangjie: miscellaneous cleanups and improvements 2021-08-29 11:10:44 +00:00
libchewing Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
libime chinese/libime: Refresh distinfo 2021-12-01 20:32:10 -05:00
libime-jyutping chinese/libime-jyutping: Update to 1.0.3 2021-11-30 05:38:34 -05:00
libpinyin cleanup: drop support for EOL FreeBSD 11.X 2021-09-30 23:23:30 +02:00
libreoffice-zh_CN Please welcome LibreOffice suite 7.2.5 release! (+) 2022-01-06 16:07:48 +03:00
libreoffice-zh_TW Please welcome LibreOffice suite 7.2.5 release! (+) 2022-01-06 16:07:48 +03:00
librime chinese/librime: Update to 1.7.3 2021-11-30 05:38:34 -05:00
libtabe Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
linux-wps-office-zh_CN *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
lunar Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
moettf Deorbit RESTRICTED && NO_CDROM, part two. 2021-05-06 13:47:48 +02:00
muni Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
oicq Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
opencc Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
opendesktop-fonts */*: Remove redundant '-[0-9]*' from CONFLICTS 2021-10-29 11:50:18 +02:00
oto Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Date-Chinese Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Encode-CNMap Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Encode-HanConvert Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Encode-HanExtra Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Lingua-Han-PinYin Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Lingua-Han-Utils Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Lingua-ZH-HanDetect Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Lingua-ZH-Keywords Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Lingua-ZH-Numbers Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Lingua-ZH-Romanize-Pinyin One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
p5-Lingua-ZH-Segment Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Lingua-ZH-Summarize Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Lingua-ZH-TaBE Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Lingua-ZH-Toke Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Lingua-ZH-WordSegmenter Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Lingua-ZH-Wrap Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
p5-Text-Greeking-zh_TW Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
pcmanx Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
php-opencc Mark ports to IGNORE with new php81 2022-01-10 07:30:00 -06:00
phpbb3-tw Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
phpbb-tw */*: Remove redundant '-[0-9]*' from CONFLICTS 2021-10-29 11:50:18 +02:00
pycangjie chinese/{ibus-,lib,py}cangjie: miscellaneous cleanups and improvements 2021-08-29 11:10:44 +00:00
pyzy Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
qe Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rime-array chinese/rime-array: Update to snapshot 20210824 2021-11-30 05:38:35 -05:00
rime-bopomofo Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rime-cangjie Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rime-cantonese chinese/rime-cantonese: Update to snapshot 20211029 2021-11-30 05:38:35 -05:00
rime-combo-pinyin chinese/rime-combo-pinyin: Update to snapshot 20211108 2021-11-30 05:38:35 -05:00
rime-data-full chinese/rime-data-full: Add MAINTAINER 2021-11-30 17:45:09 -05:00
rime-double-pinyin Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rime-emoji chinese/rime-emoji: Update to snapshot 20211129 2021-11-30 05:38:35 -05:00
rime-essay chinese/rime-essay: Update to snapshot 20210805 2021-11-30 05:38:35 -05:00
rime-ipa Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rime-jyutping Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rime-luna-pinyin chinese/rime-luna-pinyin: Update to snapshot 20210805 2021-11-30 05:38:35 -05:00
rime-middle-chinese chinese/rime-middle-chinese: Update to snapshot 20210926 2021-11-30 05:38:35 -05:00
rime-pinyin-simp chinese/rime-middle-chinese: Update to snapshot 20210627 2021-11-30 05:38:36 -05:00
rime-prelude chinese/rime-prelude: Update to snapshot 20211023 2021-11-30 05:38:36 -05:00
rime-quick Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rime-scj Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rime-soutzoe Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rime-stenotype Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rime-stroke Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rime-terra-pinyin chinese/rime-prelude: Update to snapshot 20210805 2021-11-30 05:38:36 -05:00
rime-wubi Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
rime-wugniu Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
scim-fcitx Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
scim-pinyin */scim*: Update WWW 2021-11-16 12:10:25 +08:00
scim-tables */scim*: Update WWW 2021-11-16 12:10:25 +08:00
sourcehansans-sc-otf One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
sourcehansans-tc-otf One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
sourcehanserif-sc-otf One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
sourcehanserif-tc-otf One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
taipeisanstc One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
tin Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
tintin++ Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
ttf2pt1 Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
ttfm chinese/ttfm: prepare for freetype2 update 2021-08-06 11:48:47 +02:00
ve Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
wenju Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
wordpress-zh_CN */wordpress*: Update to 5.8.2 2022-01-05 22:25:32 -08:00
wordpress-zh_TW */wordpress*: Update to 5.8.2 2022-01-05 22:25:32 -08:00
Makefile */*: Remove expired ports: 2021-06-26 20:31:20 +02:00
Makefile.inc Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00