cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4519b9e814
freebsd-ports/lang
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
..
abcl
adacontrol
alchemist.el USES=emacs: Chase package name changes 2021-11-15 11:19:58 -04:00
algol68g
angelscript lang/angelscript: enable on riscv64 2021-12-17 14:36:21 +01:00
apache-commons-jelly
asis
asn1c
atlast
awka
bas2tap
basic256
bf2c
bsh Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
bwbasic
c
cbmbasic
ccl Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
ceylon
cfortran
chaiscript
chez-scheme lang/chez-scheme: Fix threads support on i386 platform 2021-12-11 09:15:52 +00:00
chibi-scheme
chicken5 lang/chicken5: update to 5.3.0 2021-11-25 14:34:14 +00:00
cim
cjs lang/cjs: switch 5df16891e1 to merged upstream version 2021-11-29 15:48:27 +00:00
cling Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
clips lang/clips: Update WWW 2021-11-16 11:28:06 +08:00
clisp
clojure
clojure-mode.el USES=emacs: Chase package name changes 2021-11-15 11:19:58 -04:00
clover
cmucl
cmucl-extra
cocor
coffeescript
cparser
crystal lang/crystal: update to 1.2.2 2021-12-28 18:43:02 +01:00
csharp-mode.el USES=emacs: Chase package name changes 2021-11-15 11:19:58 -04:00
cython Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
cython-devel Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
dlang-tools
dlv
duktape
duktape-lib
ecl
eisl lang/eisl: Update 2.34 -> 2.35 2021-12-29 21:15:50 -08:00
elixir Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
elixir-devel Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
elixir-mode.el USES=emacs: Chase package name changes 2021-11-15 11:19:58 -04:00
elk
elm Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
emacs-lisp-intro
erlang lang/erlang: Update to version 24.1.7 2021-11-22 20:11:01 +01:00
erlang-doc
erlang-java lang/erlang-java: Update to version 24.1.7 2021-11-22 20:11:01 +01:00
erlang-man
erlang-runtime21
erlang-runtime22 lang/erlang-runtime22: Update to version 22.3.4.24 2021-12-21 21:26:10 +01:00
erlang-runtime23 lang/erlang-runtime23: Update to version 23.3.4.10 2021-12-21 21:26:10 +01:00
erlang-runtime24 lang/erlang-runtime24: Update to version 24.1.7 2021-11-22 20:11:01 +01:00
erlang-wx lang/erlang-wx: Update to version 24.1.7 2021-11-22 20:11:01 +01:00
execline
expect
f2c
fasm Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
fennel lang/fennel: Update to 1.0.0 2021-12-21 11:36:02 -04:00
ferite
ficl
fpc
fpc-base
fpc-docs
fpc-lua
fpc-pastojs
fpc-rexx
fpc-rtl-console
fpc-rtl-extra
fpc-rtl-generics
fpc-rtl-objpas
fpc-rtl-unicode
fpc-source
fpc-units
fpc-utils
fsharp
fth
gambit-c lang/gambit-c: Update to version 4.9.4 2022-01-08 14:59:42 +01:00
gauche
gawk Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
gcc
gcc6-aux
gcc8
gcc9 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
gcc9-devel Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
gcc10 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
gcc10-devel Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
gcc11 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
gcc11-devel Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
gcc12-devel lang/gcc12-devel: Update to the 20220102 snapshot of GCC 12.0.0 2022-01-10 08:39:50 +00:00
gcc48
gcc-ecj45
gforth
ghc lang/ghc: add NO_CCACHE=yes 2021-11-17 23:48:27 +03:00
gjs lang/gjs: unbreak build with Meson 0.60.2 2021-11-27 23:35:02 +00:00
gleam lang/gleam: update to 0.18.2 2021-12-14 07:01:33 +00:00
gnat_util
gnatcross-binutils-aarch64
gnatcross-sysroot-aarch64
gnatdroid-binutils
gnatdroid-binutils-x86
gnatdroid-sysroot
gnatdroid-sysroot-x86
gnu-apl lang/gnu-apl: unbreak the build on recent -CURRENT (clang 13.0.0) 2021-11-26 18:47:16 +00:00
gnu-cobol
gnustep-base
go lang/go: Update to 1.17.6 2022-01-06 21:40:51 +00:00
go-devel lang/go-devel: Update to 1.18beta1 2021-12-14 19:47:59 -05:00
gomacro
gprolog
gravity
groovy
gscheme
guile */*: Remove redundant '-[0-9]*' from CONFLICTS_INSTALL 2021-11-23 23:11:40 +01:00
guile1 */*: Remove redundant '-[0-9]*' from CONFLICTS_INSTALL 2021-11-23 23:11:40 +01:00
guile2 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
halide
haskell-mode.el USES=emacs: Chase package name changes 2021-11-15 11:19:58 -04:00
hermes lang/hermes: Update 0.9.0 -> 0.10.0 2021-12-02 23:41:20 -08:00
hla
hs-brainfuck
hs-unlambda
huc
icc
intel-compute-runtime lang/intel-compute-runtime: update to 22.01.22131 2022-01-10 12:28:32 +00:00
intercal
io lang/io: Update WWW 2021-11-17 11:18:31 +08:00
io-devel
itcl
itcl4
J
janet lang/janet: Update to v1.19.2 2021-12-08 12:40:35 +01:00
jimtcl lang/jimtcl: update to 0.81 2021-12-01 08:50:47 +00:00
jpm
jruby
julia lang/julia: switch from p7zip to 7-Zip 2022-01-10 00:11:26 +03:00
jython
kawa
kf5-kross KDE: Update KDE Frameworks to 5.89.0 2021-12-16 18:27:16 +01:00
kotlin lang/kotlin: update to 1.6.10 2021-12-16 11:05:10 +03:00
kross-interpreters KDE: Update KDE Gear to 21.12.1 2022-01-06 16:38:38 +01:00
kturtle KDE: Update KDE Gear to 21.12.1 2022-01-06 16:38:38 +01:00
lafontaine
lci
ldc
lfe
libhx
libobjc2
librep
libstdc++_stldoc_4.2.2
linux-c7-tcl85
linux-dotnet10-runtime
linux-dotnet11-runtime
linux-dotnet11-sdk
linux-dotnet-cli
linux-dotnet-runtime
linux-dotnet-sdk
linux-j Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
lua51
lua52
lua53
lua54
lua-ada
luajit lang/luajit: link with pthread 2022-01-05 17:20:47 -05:00
luajit-devel lang/luajit-devel: update to the recent commit 2021-12-30 11:39:13 -05:00
luajit-openresty lang/luajit-openresty: 2.1-20210510 -> 2.1-20211210 2021-12-23 00:00:26 +01:00
malbolge
maude
mawk
mdk
mecrisp-stellaris lang/mecrisp-stellaris: update distinfo 2022-01-07 14:26:50 +01:00
micropython
mit-scheme
mixal
mlton
mmix
mono Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
mono5.10 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
mono5.20 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
mono6.8 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
mono-basic
mosh
mosml
mtasc
mujs lang/mujs: Update 1.1.3 -> 1.2.0 2021-12-23 13:17:35 -08:00
munger
myrddin
nawk
nbc
nbfc
neko
nesasm
newlisp
nhc98
nickle
nim lang/nim: Upgrade to 1.6.2 2021-12-23 01:00:11 +08:00
nqc
nwcc
nx
nyan
ocaml
ocaml-autoconf
ocaml-camlidl
ocaml-nox11
onyx
oo2c
opencoarrays
ott
owl-lisp
p5-Data-JavaScript
p5-ePerl
p5-Error
p5-Expect
p5-ExtUtils-F77
p5-Interpolation
p5-JavaScript-SpiderMonkey
p5-JavaScript-Squish
p5-JavaScript-Value-Escape
p5-JSAN
p5-List-MoreUtils
p5-List-MoreUtils-XS
p5-Marpa
p5-Marpa-PP
p5-Marpa-XS
p5-Modern-Perl
p5-Perl6-Subs
p5-Promises
p5-Pugs-Compiler-Rule
p5-Quantum-Superpositions
p5-Scalar-List-Utils
p5-signatures
p5-Switch
p5-Tcl
p5-Test-XPath
p5-Try-Catch
p5-Try-Tiny lang/p5-Try-Tiny: Update to 0.31 2021-12-22 02:47:37 +08:00
p5-Try-Tiny-Retry
p5-TryCatch
p5-v6
parrot
pbasic
pcc
perl5-devel
perl5.30
perl5.32
perl5.34
petite-chez */*: Remove redundant '-*' from CONFLICTS definitions 2021-11-25 22:40:11 +01:00
pfe
pharo
php73 Fix fetch for php* 2021-12-26 19:23:22 +01:00
php73-extensions Remove references to defunct php72 2021-12-27 20:38:30 -06:00
php74 Fix fetch for php* 2021-12-26 19:23:22 +01:00
php74-extensions Remove references to defunct php72 2021-12-27 20:38:30 -06:00
php80 lang/php80: Update version 8.0.13=>8.0.14 2021-12-27 20:32:09 -06:00
php80-extensions Remove references to defunct php72 2021-12-27 20:38:30 -06:00
php81 lang/php81: Fix some compile-time warning 2022-01-10 04:52:42 -06:00
php81-extensions Add php81 to the tree 2021-12-28 20:09:08 -06:00
php-mode.el lang/php-mode.el: Return to pool 2021-11-29 08:42:26 +09:00
picoc
plexil
pocl lang/pocl: drop pkg-message + minor style and whitespace fixes 2021-11-17 02:21:11 +00:00
polyml lang/polyml: Update to 5.9 2022-01-10 08:15:31 +08:00
ponyc lang/ponyc: unbreak clang 13 build, release maintainership 2021-11-23 10:14:45 -08:00
ptoc
purescript
py-hy
py-lupa
py-qt5-qml
py-textX
python
python2
python3
python27
python37 lang/python3(6|7|8|9|10|11): work around unwanted multiarch detection again 2021-11-26 19:48:57 +01:00
python38 lang/python3(6|7|8|9|10|11): work around unwanted multiarch detection again 2021-11-26 19:48:57 +01:00
python39 lang/python39: Update to 3.9.9 2021-12-06 09:05:24 +08:00
python310 lang/python310: Update COMMENT 2021-12-22 02:54:45 +08:00
python311 lang/python311: update to 3.11.0a3 2021-12-22 16:44:04 +03:00
python-doc-html lang/python-doc-html: Update distinfo for python310 2021-12-09 08:40:38 +08:00
python-doc-pdf-a4
python-doc-pdf-letter
python-doc-text
python-mode.el
python-tools
qmasm
qscheme
quickjs
racket
racket-minimal
ratfor
referenceassemblies-pcl
retro12
rexx-imc
rexx-regina
rexx-regutil
rexx-wrapper
rhino
ruby26 lang/ruby26: Update to 2.6.9 2021-12-09 08:21:44 +09:00
ruby27 lang/ruby27: Update to 2.7.5 2021-12-09 08:21:51 +09:00
ruby30 lang/ruby30: Fix unnecessary substitution in PLIST 2021-12-22 02:54:46 +08:00
ruby31 lang/ruby31: Update to 3.1.0 2021-12-26 09:32:11 +09:00
rubygem-ruby_language_server
runawk
rust lang/rust: Use backtrace noop backend on riscv64 too 2021-12-23 11:10:16 +01:00
rust-bootstrap lang/rust: Add riscv64 (riscv64gc-unknown-freebsd) support 2021-12-23 11:10:16 +01:00
rust-nightly lang/rust-nightly: Update to 1.59.0.20211221 2021-12-23 11:10:15 +01:00
sagittarius-scheme
sather-specification
sather-tutorial
sbcl lang/sbcl: Fix sha256 checksum for documentation file. 2022-01-02 10:49:20 +01:00
scala lang/scala: Update to 3.1.0 2021-11-22 06:10:28 -04:00
scala-docs
scheme48
scm
sdcc */*: Remove redundant '-[0-9]*' from CONFLICTS_INSTALL 2021-11-23 23:11:40 +01:00
see
seed7 lang/seed7: update to 05_20211225 2021-12-27 15:36:38 +00:00
silq lang/silq: Fix build failures due to llvm13 changes 2021-11-20 20:39:02 +01:00
siod
sisc
sketchy
slib
slib-guile
slib-guile1
slib-guile2
slisp
smalltalk
smlnj
snobol4 lang/snobol4: Update to 2.2.2 2021-12-21 18:17:17 +01:00
solidity lang/solidity: update to 0.8.11 release. 2021-12-20 17:49:57 +01:00
spidermonkey17 lang/spidermonkey*: Update WWW 2021-11-16 11:34:54 +08:00
spidermonkey60 lang/spidermonkey60: Use USE_GCC=yes over USE_GCC=9+ 2022-01-09 19:07:54 +00:00
spidermonkey78 lang/rust: Rebuild consumers for Rust 1.57.0 2021-12-05 13:35:42 +01:00
spl
squeak
squirrel
swi-pl
tauthon
tcbasic
tcc
tcl85
tcl86 lang/tcl86: fix build with non-default options (THREADS off) 2022-01-06 13:13:58 +00:00
tcl87
tcl-manual
tcl-wrapper
tclX
tolua
tolua++
tuareg-mode.el USES=emacs: Chase package name changes 2021-11-15 11:19:58 -04:00
twelf
ucc
urweb
v
v8 lang/v8: Update to 9.6.180.12 2021-11-22 02:19:08 +08:00
v8-beta lang/v8-beta: Update to 9.7.106.13 2021-12-22 02:46:25 +08:00
vala
visualworks
voc
yabasic
yap
yorick Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
ypsilon
zig lang/zig: update to 0.9.0 2022-01-04 09:19:25 +00:00
zig-devel lang/zig-devel: add test target 2021-12-21 23:44:45 +00:00
Makefile cleanup: Remove expired ports: 2021-12-31 14:40:03 +01:00