freebsd-ports/misc
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
..
aclgen
actiona
adios2 misc/adios2: mark broken on powerpc 2021-11-16 12:03:32 +00:00
amanda-client
amanda-perl-wrapper
amanda-server */*: Remove redundant '-*' from CONFLICTS definitions 2021-11-25 22:40:11 +01:00
ansiweather
apparix
artikulate KDE: Update KDE Gear to 21.12.1 2022-01-06 16:38:38 +01:00
asbutton
asr-manpages all: return fjoe's ports to the pool 2021-12-06 13:36:27 +01:00
bb misc/bb: fix building on non-x86 2021-10-22 11:42:44 +00:00
bbjd
bdelta Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
bestfit
bible-kjv
biblesync
bibletime
biblical-curse
binclock
biosfont-demos
birthday
bogosort
bottlerocket
box2d
boxes
broot misc/broot: Update to 1.9.1 2022-01-07 20:56:12 +00:00
bsod
buffer
cheat misc/cheat: Update 4.2.2 -> 4.2.3 2022-01-03 14:26:43 -08:00
chef */*: Remove redundant '-*' from CONFLICTS definitions 2021-11-25 22:40:11 +01:00
chmlib
chrono
cinnamon-translations
cldr-emoji-annotation
clex
clifm misc/clifm: update CliFM to version 1.3. 2021-12-07 06:44:45 +00:00
cloc
clpbar Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
colortail
colwide
compat4x *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
compat5x
compat6x
compat7x
compat8x
compat9x
compat10x
compat11x
compat12x
concourse Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
countrycodes
cpuid Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
crosti
cryptoballot
cs
cstream
ctm
cxxmatrix
dahdi all: return fjoe's ports to the pool 2021-12-06 13:36:27 +01:00
dahdi-kmod */*: Remove redundant '-*' from CONFLICTS definitions 2021-11-25 22:40:11 +01:00
dahdi-kmod26 */*: Remove redundant '-*' from CONFLICTS definitions 2021-11-25 22:40:11 +01:00
darknet
dartsim multimedia/assimp: Update 5.0.1 -> 5.1.0 2021-11-15 20:42:29 -08:00
ddate
deco Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
dejagnu
delay
diction
digitemp
dive
dnetc
dtach
dvorak7min
dynomite
e2fsprogs-libblkid
e2fsprogs-libuuid
edflib misc/edflib: Update 1.19 -> 1.20 2021-11-14 16:27:20 -08:00
elixir-mime
elixir-uuid
elki
elscreen USES=emacs: Chase package name changes 2021-11-15 11:19:58 -04:00
erlang-mimerl
erlang-mimetypes
estic
excel-writer
exercism
explosions
ezc3d
far2l misc/far2l: update to the latest tagged snapshot (v2021-12-04_alpha) 2021-12-06 18:14:57 +00:00
felis
figlet
figlet-fonts
findutils
firestring
flag
fortune-mod-bible
fortune-mod-bofh
fortune-mod-epictetus
fortune-mod-freebsd-classic
fortune-mod-futurama
fortune-mod-psalms
fortuneit
fpc-chm
fq misc/fq: new port had been added (+) 2021-12-25 10:43:08 +00:00
free42 misc/free42: Update 3.0.8 -> 3.0.9 2022-01-02 09:44:35 -08:00
freebsd-doc-all misc/freebsd-doc-*: Update to 63971d4 revision from the FreeBSD docset 2021-10-29 21:30:11 +02:00
freebsd-doc-bn misc/freebsd-doc-*: Update to 63971d4 revision from the FreeBSD docset 2021-10-29 21:30:11 +02:00
freebsd-doc-da
freebsd-doc-de
freebsd-doc-el
freebsd-doc-en misc/freebsd-doc-*: Update to 63971d4 revision from the FreeBSD docset 2021-10-29 21:30:11 +02:00
freebsd-doc-es
freebsd-doc-fr
freebsd-doc-hu
freebsd-doc-it
freebsd-doc-ja
freebsd-doc-ko
freebsd-doc-mn
freebsd-doc-nl
freebsd-doc-pl
freebsd-doc-pt
freebsd-doc-ru
freebsd-doc-tr
freebsd-doc-zh_cn
freebsd-doc-zh_tw
freebsd-release-manifests misc/freebsd-release-manifests: 12.3: prune RC1/RC2, add RELEASE 2021-12-07 15:57:02 -05:00
freeguide
frugally-deep misc/frugally-deep: Update 0.15.11-p0 -> 0.15.13-p0 2021-11-29 09:25:47 -08:00
ftdi-eeprom
fxload
g810-led misc/g810-led: Add port: Led controller for Logitech G- Keyboards 2021-12-04 10:16:38 +00:00
gedkeeper misc/gedkeeper: update GEDKeeper to version 2.19.1. 2021-11-22 17:15:53 +00:00
geekcode
getopt
gimp-help-en
gkrellm-gamma
gkrellm-xkb
gkrellmbgchg2
gkrellmlaunch2
gkrellshoot2 framework: Add new USES 'magick' for graphics/ImageMagick* 2021-12-11 14:50:53 +01:00
gkx86info2
glow
gnome-devel-docs misc/gnome-devel-docs: Update to 40.3 2021-10-15 10:07:21 -07:00
gnome-getting-started-docs misc/gnome-getting-started-docs: Update to 3.38.1 2021-10-15 10:07:21 -07:00
gnome-icon-theme
gnome-icon-theme-extras
gnome-mime-data
gnome-user-docs misc/gnome-user-docs: Update to 41.1 2021-12-08 13:44:22 -08:00
gnu-watch
gnuls
gobuster
gone
gplink Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
gpsim
granulate
grc
gwhich
hashdb
hello
help2man
heyu2 */*: Remove redundant '-[0-9]*' from CONFLICTS 2021-10-29 11:50:18 +02:00
hicolor-icon-theme
histring
hotkeys
hs-hascard
hulgalugha
hwdata misc/hwdata: update to 0.355 2022-01-04 17:35:55 +01:00
hxtools Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
ignition-fuel-tools devel/jsoncpp: Update to 1.9.4 -> 1.9.5 2021-11-05 12:09:19 -07:00
iio-oscilloscope
imerge
img2xterm framework: Add new USES 'magick' for graphics/ImageMagick* 2021-12-11 14:50:53 +01:00
ini_file_manager
inplace
ipa_conv
ipbt
ironscanner
iselect
iso-codes misc/iso-codes: Update to 4.7 2021-11-16 19:03:16 +03:00
jargon
jbidwatcher
jojodiff Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
kbdscan
kcd
kde-thumbnailer-chm
kde-thumbnailer-epub
kde-thumbnailer-fb2
kdeedu
kdeedu-data KDE: Update KDE Gear to 21.12.1 2022-01-06 16:38:38 +01:00
kdeutils
kenny */*: Remove redundant '-*' from CONFLICTS definitions 2021-11-25 22:40:11 +01:00
kf5-purpose KDE: Update KDE Frameworks to 5.89.0 2021-12-16 18:27:16 +01:00
kgeography KDE: Update KDE Gear to 21.12.1 2022-01-06 16:38:38 +01:00
klettres KDE: Update KDE Gear to 21.12.1 2022-01-06 16:38:38 +01:00
kookbook
ktouch KDE: Update KDE Gear to 21.12.1 2022-01-06 16:38:38 +01:00
kwordquiz KDE: Update KDE Gear to 21.12.1 2022-01-06 16:38:38 +01:00
lastools misc/lastools: Update g20181019 -> 2.0.0 2022-01-09 09:28:40 -08:00
latex-mk
lazyread
lc
lesspipe
lf misc/lf: Update 24 -> 26 2021-11-14 21:18:53 -08:00
libad9361-iio
libcomps misc/libcomps: Add CPE information 2021-10-19 13:14:36 +02:00
libeatmydata
libemos
libiio misc/libiio: Update 0.21 -> 0.23 2022-01-05 11:55:00 -08:00
libkeduvocdocument KDE: Update KDE Gear to 21.12.1 2022-01-06 16:38:38 +01:00
liblxi
libmetalink
libmodulemd misc/libmodulemd: drop unused Meson options after 8e0304d612 2021-10-13 16:52:54 +00:00
libpostal *: apply refactor.remove-consecutive-empty-lines 2021-10-19 10:36:47 +02:00
libpredict
libpri all: return fjoe's ports to the pool 2021-12-06 13:36:27 +01:00
librepo misc/librepo: Add CPE information 2021-10-19 13:14:37 +02:00
libsolv misc/libsolv: Add CPE information 2021-10-19 13:14:37 +02:00
libsupertone all: return fjoe's ports to the pool 2021-12-06 13:36:27 +01:00
libsweep-lidar
libutf
libxdf
lifelines Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
lingoteach
locale-en_DK
localedata
logsurfer
lv
lxde-common
lxi-tools
magicpoint
man.el
mate-user-guide
mbuffer misc/mbuffer: Update to 20211018 2021-11-29 01:54:56 +00:00
mc */*: Remove redundant '-[0-9]*' from CONFLICTS_INSTALL 2021-11-23 23:11:40 +01:00
mc-nox11
mdp
metalink-checker
metalink-tools
mime-support
minidnn
mirmon
mmdnn
mmv
mnn
molequeue
morse
mtx
mxnet misc/{,py-}mxnet: Update 1.8.0 -> 1.9.0 2021-12-23 13:17:34 -08:00
najitool
ncnn misc/ncnn: Update 20210720 -> 20211208 2021-12-24 08:44:20 -08:00
netron
ngraph devel/onetbb: Update to 2021.5.0 2022-01-05 17:43:54 +01:00
nms
nn-insight
nnn misc/nnn: Update to 4.4 2022-01-04 09:46:55 -05:00
nsf
numchar
nut
ompl
ondir
opencyc
openhab misc/openhab,+addons: update to 3.2.0 2021-12-21 09:03:03 +01:00
openhab2
openhab2-addons
openhab-addons misc/openhab,+addons: update to 3.2.0 2021-12-21 09:03:03 +01:00
openhantek misc/openhantek: Update 3.2.4 -> 3.2.5 2021-12-23 17:54:58 -08:00
openhmd
openmvg misc/openmvg: enable on armv7 2021-12-01 12:48:42 +00:00
opennn
openr2 all: return fjoe's ports to the pool 2021-12-06 13:36:27 +01:00
openvdb devel/onetbb: Update to 2021.5.0 2022-01-05 17:43:54 +01:00
orange3 misc/orange3: use webkit on architectures where webengine doesn't work 2021-11-01 02:40:29 +00:00
orion
orville-write
osinfo-db misc/osinfo-db: update to 20211216 2021-12-17 19:46:00 +04:00
ossp-uuid
otter
owrep
p5-Acme-ButFirst
p5-Array-Compare
p5-Array-Diff
p5-Array-FileReader
p5-Array-IntSpan
p5-Array-LineReader
p5-Array-PrintCols
p5-Array-RefElem
p5-Array-Utils
p5-Asterisk-FastAGI
p5-asterisk-perl
p5-Bot-Training
p5-Bot-Training-MegaHAL
p5-Bot-Training-StarCraft
p5-Business-EDI
p5-Business-Hours
p5-Business-ISBN
p5-Business-ISBN-Data
p5-Business-ISIN
p5-Business-ISMN
p5-Business-ISSN
p5-Business-UPS
p5-Chatbot-Eliza
p5-Data-Buffer
p5-File-CounterFile
p5-File-Sort
p5-Geo-Address-Formatter
p5-Geo-Cache
p5-Geo-Coder-Bing
p5-Geo-Coder-Google
p5-Geo-Coder-Googlev3
p5-Geo-Coder-Mapquest
p5-Geo-Coder-Multimap
p5-Geo-Coder-Multiple
p5-Geo-Coder-Navteq
p5-Geo-Coder-OpenCage
p5-Geo-Coder-OSM
p5-Geo-Coder-Ovi
p5-Geo-Coder-PlaceFinder
p5-Geo-Coder-TomTom
p5-Geo-GeoNames
p5-Geo-Postcodes
p5-Geo-Postcodes-DK
p5-Geo-Postcodes-NO
p5-Geo-Weather
p5-Geography-Countries
p5-I18N-Charset
p5-I18N-LangTags
p5-LEGO-RCX
p5-List-Compare
p5-List-Util-WeightedRoundRobin
p5-Locale-Codes
p5-Locale-Geocode
p5-Locale-Msgcat
p5-Locale-SubCountry misc/p5-Locale-SubCountry: Update to 2.07 2021-11-06 03:15:54 +08:00
p5-Locale-US
p5-Net-vCard
p5-OSSP-uuid
p5-Software-License
p5-Software-License-CCpack
p5-Test-Dir
p5-Text-FIGlet
p5-Tie-DxHash
p5-Zen-Koans
parley KDE: Update KDE Gear to 21.12.1 2022-01-06 16:38:38 +01:00
pastebinit
patchutils
pauker
pciids misc/pciids: Update to 20211124 2021-12-22 02:46:31 +08:00
pdmenu misc/pdmenu: update to 1.3.6 2021-10-28 00:53:38 +09:00
pear-Services_Weather
pear-Text_Figlet
pecl-timezonedb
perkeep
pfm
php73-calendar *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
php74-calendar *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
php80-calendar *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
php81-calendar Add php81 to the tree 2021-12-28 20:09:08 -06:00
pinfo
pipe
posixtestsuite
proxyper
pspresent
ptsort
pubs
py-alive-progress misc/py-alive-progress: Update to 2.1.0 2021-10-20 09:35:41 -07:00
py-cinder */*: Remove redundant '-*' from CONFLICTS definitions 2021-11-25 22:40:11 +01:00
py-colorbrewer
py-colored misc/py-colored: Update to 1.4.3 2022-01-06 07:37:47 +00:00
py-crudini
py-dictdiffer
py-eemeter
py-emoji misc/py-emoji: update to 1.6.1 2021-10-18 10:51:54 +03:00
py-fast-histogram
py-fleep
py-fuzzy
py-gluoncv
py-gluonnlp
py-halo
py-huepy
py-kartograph
py-log_symbols
py-mffpy
py-molequeue
py-mxnet misc/{,py-}mxnet: Update 1.8.0 -> 1.9.0 2021-12-23 13:17:34 -08:00
py-onnx misc/py-onnx: Update 1.10.1 -> 1.10.2 2021-11-08 01:05:23 -08:00
py-onnx-tf
py-orange3-associate
py-orange3-datafusion
py-orange3-educational
py-orange3-network
py-orange3-timeseries
py-palettable
py-pexpect
py-powerline-status
py-progressbar
py-progressbar2 misc/py-progressbar2: update to 3.55.0 2021-11-06 00:17:43 +03:00
py-pyEDFlib misc/py-pyEDFlib: Update 0.1.22 -> 0.1.23 2021-11-14 16:27:21 -08:00
py-pyfiglet
py-pykml
py-pyprind
py-python-geohash
py-python-utils misc/py-python-utils: update to 2.7.1 2022-01-03 18:37:21 +03:00
py-PyUserInput
py-QSpectrumAnalyzer
py-qt5-demo
py-scikit-fusion
py-serverfiles
py-SimpleSoapy
py-soapy_power
py-SoapySDR
py-spdx
py-spdx-lookup
py-spdx-tools */*: Remove redundant '-*' from CONFLICTS definitions 2021-11-25 22:40:11 +01:00
py-spinners
py-tflearn
py-tflite
py-tflite-support
py-toil
py-tqdm misc/py-tqdm: Cosmetic change 2021-10-25 23:57:33 +08:00
py-tvm
py-wurlitzer
py-xgboost misc/{,py-}xgboost: Update 1.5.0 -> 1.5.1 2021-11-25 11:50:28 -08:00
pyobd framework: Add new USES 'magick' for graphics/ImageMagick* 2021-12-11 14:50:53 +01:00
qbrew
qlas
qt5-doc Qt: Switch Qt5 to use KDE's Qt patch collection 2022-01-02 09:47:54 +01:00
qt5-examples Qt: Switch Qt5 to use KDE's Qt patch collection 2022-01-02 09:47:54 +01:00
qt5-l10n Qt: Switch Qt5 to use KDE's Qt patch collection 2022-01-02 09:47:54 +01:00
qt5ct
quantum++ misc/quantum++: Change to c++17 2021-10-13 11:17:01 -07:00
R-cran-mime
R-cran-xfun misc/R-cran-xfun: Update to 0.29 2021-12-18 14:20:32 +00:00
raspberrypi-gpioshutdown
raspberrypi-userland
raspbsd-led
ree
rfc
ringtonetools
rname
rpl
rtfm
rubygem-dotenv Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
rubygem-dotenv-rails-rails4
rubygem-dotenv-rails-rails5
rubygem-dotenv-rails-rails50
rubygem-haversine_distance
rubygem-iesd
rubygem-mime-types
rubygem-mime-types-data
rubygem-mimemagic misc/rubygem-mimemagic: Sort RUN_DEPENDS 2021-10-25 23:57:57 +08:00
rubygem-octicons misc/rubygem-octicons: Update to 16.1.1 2021-11-01 21:42:19 +08:00
rubygem-rabbit misc/rubygem-rabbit: Update to 3.0.1 2021-10-16 11:19:01 +00:00
rubygem-vpim
rump
ruut lang/rust: Rebuild consumers for Rust 1.57.0 2021-12-05 13:35:42 +01:00
schilytools
sdformat
seabios
sent
seq2
sfm misc/sfm: port of a simple file manager for Unix-like systems. 2021-11-12 03:57:18 +00:00
shared-mime-info devel/meson: update to 0.60.1 2021-11-14 20:12:17 +00:00
shc
shuffle
shuffle-db
since
skyutils
slides
sloccount
sls
smssend
snakemake misc/snakemake: Update 6.11.1 -> 6.12.1 2021-12-02 23:41:20 -08:00
soapysdr
solarized
sshbuddy
sssnips
susv2
susv3
susv4
sword devel/icu: update to 70.1 2021-10-28 16:37:30 +00:00
table.el
talkfilters */*: Remove redundant '-*' from CONFLICTS definitions 2021-11-25 22:40:11 +01:00
tdfiglet
team
tellico misc/tellico: update to 3.4.3, latest upstream 2022-01-05 23:25:09 +01:00
tempcontrol
termatrix
terminfo-db
teseq
thefuck misc/thefuck: Update to 3.32 2022-01-03 21:34:32 +00:00
thrill misc/thrill: not for all 32-bit archs 2021-11-16 12:03:59 +00:00
timetrace misc/timetrace: Update to 0.14.2 2021-11-01 09:56:35 -07:00
timezonemap
tkcron *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
tkinfo
tkregexp
tkrunit
tlci
toilet
translate
ttyrec
tudu
tvbrowser misc/tvbrowser: Update to 4.2.4 2021-12-22 16:26:00 +01:00
tvm
tzdiff
uk-phone
uk-postcodes
umodunpack
unclutter
unclutter-xfixes
unicode-emoji
upclient
urbit misc/urbit: drop unused Meson keyword 2021-11-03 18:03:43 +00:00
urh
usbids misc/usbids: Update to 20211024 2021-11-01 21:41:25 +08:00
usbrh-libusb
usd misc/usd: Chase extra FreeBSD patches; Add NOT_FOR_ARCHS line; Add the test target 2021-12-06 19:51:43 -08:00
utftools
utouch-kmod
valentina
vdmfec
veles
vera
vifm
visp
viz
vxl
whichman
window
with
wmcalendar
wmforecast
wmjulia
wmpal
wmScoreBoard
wmtunlo
wmweather+
wmwork
xd-rust lang/rust: Rebuild consumers for Rust 1.57.0 2021-12-05 13:35:42 +01:00
xdelta
xdelta3
xfce4-appfinder
xfce4-weather-plugin
xfce4-wm-themes
xgas
xgboost misc/{,py-}xgboost: Update 1.5.0 -> 1.5.1 2021-11-25 11:50:28 -08:00
xiphos devel/icu: update to 70.1 2021-10-28 16:37:30 +00:00
xless
xosd
xplr misc/xplr: fix patch 2022-01-04 18:21:16 +00:00
xtail
xtar
ytree
zoneinfo misc/zoneinfo: Update to version 2021e 2021-10-22 20:24:04 +00:00
Makefile Add php81 to the tree 2021-12-28 20:09:08 -06:00