mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-20 00:21:35 +00:00
bcaf25a8c8
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) |
||
|---|---|---|
| .. | ||
| a2ps | ||
| ack | ||
| ajaxzip2-core | ||
| ajaxzip2-data | ||
| alias-fonts | ||
| another-htmllint | ||
| anthy | ||
| ASCIIdates98-fpw | ||
| awffull | ||
| bible_names-fpw | ||
| boiled-mozc | ||
| bookview | ||
| bugzilla44 | ||
| bugzilla50 | ||
| canna-lib | ||
| canna-server | ||
| cannadic | ||
| cdrom2 | ||
| celrw | ||
| CGdic-fpw | ||
| chasen-base | ||
| cmigemo | ||
| cmigemo-dict | ||
| cp5022x-el | ||
| csrd | ||
| ctags | ||
| dams | ||
| dbskkd-cdb | ||
| ddskk | ||
| devil-fpw | ||
| dvi2tty | ||
| e2ps | ||
| eb | ||
| ebd-fpw | ||
| eblook | ||
| ebnetd | ||
| ebview-gtk2 | ||
| edict | ||
| edict-fpw | ||
| edyvalue | ||
| eijiro-fpw | ||
| epwutil | ||
| esecanna | ||
| esecanna-module-vje25 | ||
| esecanna-module-vje30 | ||
| esecanna-module-wnn6 | ||
| eterm | ||
| fcitx5-anthy | ||
| fcitx-anthy | ||
| fcitx-mozc | ||
| fcitx-skk | ||
| flower-fpw | ||
| foldoc-fpw | ||
| font-aozoramincho | ||
| font-ayu18 | ||
| font-ayu20 | ||
| font-cica | ||
| font-elisa8 | ||
| font-elisa10 | ||
| font-firge | ||
| font-firge-nerd | ||
| font-genjyuugothic | ||
| font-genshingothic | ||
| font-hackgen | ||
| font-hackgen-nerd | ||
| font-ipa | ||
| font-ipa-uigothic | ||
| font-ipaex | ||
| font-ipamjm | ||
| font-jisx0213 | ||
| font-kaname12 | ||
| font-kanji18 | ||
| font-kanji26 | ||
| font-kappa20 | ||
| font-kochi | ||
| font-koruri | ||
| font-marumoji | ||
| font-mgenplus | ||
| font-migmix | ||
| font-migu | ||
| font-mikachan | ||
| font-mona | ||
| font-mona-ipa | ||
| font-mona-ttf | ||
| font-motoya-al | ||
| font-mplus-bitmap | ||
| font-mplus-ipa | ||
| font-mplus-outline | ||
| font-myrica | ||
| font-myricam | ||
| font-naga10 | ||
| font-nasu | ||
| font-plemoljp | ||
| font-plemoljp-hs | ||
| font-plemoljp-nf | ||
| font-ricty | ||
| font-ricty-discord | ||
| font-rounded-mgenplus | ||
| font-sazanami | ||
| font-shinonome | ||
| font-std | ||
| font-takao | ||
| font-ume | ||
| font-vlgothic | ||
| freepwing | ||
| FreeWnn-lib | ||
| FreeWnn-server | ||
| fumeikai-fpw | ||
| gawk | ||
| gd | ||
| gedy | ||
| groff | ||
| gskk | ||
| gsuica | ||
| hns | ||
| ibus-anthy | ||
| ibus-mozc | ||
| ibus-skk | ||
| icanna | ||
| im-ja | ||
| ipadic | ||
| jacode.pl | ||
| japana | ||
| japaneseAFM | ||
| jargon-fpw | ||
| jcode.pl | ||
| jed | ||
| jishyo | ||
| jls | ||
| jvim3 | ||
| kakasi | ||
| kasumi | ||
| kbanner | ||
| kcc | ||
| kcode | ||
| kdrill | ||
| kinput2 | ||
| kiten | ||
| kon2-14dot | ||
| kon2-16dot | ||
| kterm | ||
| latex-jlisting | ||
| leafrogue | ||
| less | ||
| libreoffice | ||
| libskk | ||
| libslang | ||
| libtomoe-gtk | ||
| lipsf | ||
| lookup | ||
| lsd-fpw | ||
| lynx | ||
| lynx-current | ||
| man | ||
| man-doc | ||
| mecab | ||
| mecab-ipadic | ||
| mecab-ipadic-eucjp | ||
| mecab-ipadic-sjis | ||
| mecab-ipadic-utf8 | ||
| mh | ||
| migemo | ||
| migemo.el | ||
| mime_pls | ||
| mozc-el | ||
| mozc-server | ||
| mozc-tool | ||
| mutt-devel | ||
| mypaedia-fpw-package | ||
| namazu | ||
| namazu2 | ||
| navi2ch | ||
| ne | ||
| nethack34 | ||
| newosaka | ||
| ng | ||
| ng-canna | ||
| ng-devel | ||
| ngraph-fonts | ||
| nkf | ||
| onew | ||
| p5-2chproxy | ||
| p5-Date-Japanese-Era | ||
| p5-Date-Japanese-Holiday | ||
| p5-DateTime-Calendar-Japanese-Era | ||
| p5-DateTime-Format-Japanese | ||
| p5-Encode-EUCJPASCII | ||
| p5-Encode-EUCJPMS | ||
| p5-Encode-ISO2022 | ||
| p5-Encode-JP-Emoji | ||
| p5-Encode-JP-Mobile | ||
| p5-HTML-MobileJp | ||
| p5-Jcode | ||
| p5-Lingua-JA-Kana | ||
| p5-Lingua-JA-Moji | ||
| p5-Lingua-JA-Numbers | ||
| p5-Lingua-JA-Regular-Unicode | ||
| p5-Lingua-JA-Romanize-Japanese | ||
| p5-Lingua-JA-Summarize-Extract | ||
| p5-MeCab | ||
| p5-nkf | ||
| p5-Number-Phone-JP | ||
| p5-PDFJ | ||
| p5-Text-ChaSen | ||
| p5-Text-Kakasi | ||
| p5-Text-MeCab | ||
| p5-Unicode-Japanese | ||
| p5-WWW-2ch | ||
| p5-WWW-MobileCarrierJP | ||
| pejv-fpw | ||
| plain2 | ||
| plan | ||
| prn | ||
| py-jaconv | ||
| qkc | ||
| qolibri | ||
| quit | ||
| R-cran-zipangu | ||
| roget-fpw | ||
| rogue_s | ||
| ruby-romkan | ||
| ruby-uconv | ||
| rubygem-jpmobile4 | ||
| rubygem-jpmobile-ipaddresses | ||
| rubygem-jpmobile-terminfo | ||
| rubygem-mail-iso-2022-jp | ||
| rubygem-myrurema | ||
| ryaku-fpw | ||
| scim-anthy | ||
| scim-canna | ||
| scim-honoka | ||
| scim-honoka-plugin-romkan | ||
| scim-honoka-plugin-wnn | ||
| scim-skk | ||
| scim-tables | ||
| scim-tomoe | ||
| scim-uim | ||
| seaside | ||
| sj3-lib | ||
| sj3-server | ||
| skk | ||
| skk-jisyo | ||
| skk-jisyo-cdb | ||
| skk-tools | ||
| skkinput | ||
| skkinput3 | ||
| skkserv | ||
| slimeforest | ||
| slrn | ||
| sourcehansans-otf | ||
| sourcehanserif-otf | ||
| spoqahansans-ttf | ||
| srd-fpw-package | ||
| suicavalue | ||
| tdiary | ||
| tegaki-zinnia-japanese | ||
| tex-ptex | ||
| tgif | ||
| tiarra | ||
| timidity++-slang | ||
| today | ||
| tomoe | ||
| uim-anthy | ||
| uim-mozc | ||
| uim-tomoe-gtk | ||
| vera-fpw | ||
| vftool | ||
| w3m | ||
| w3m-img | ||
| waeijiro-fpw | ||
| wdic-fpw | ||
| web1913-fpw | ||
| webalizer | ||
| wnn7egg | ||
| Wnn6-lib | ||
| Wnn7-lib | ||
| wordnet-fpw | ||
| wordpress | ||
| wwasw-fpw | ||
| xpdf | ||
| xshodou | ||
| xtr | ||
| xv | ||
| yc.el | ||
| zinnia | ||
| zinnia-tomoe | ||
| zipcodes | ||
| Makefile | ||
| Makefile.inc | ||