1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-20 00:21:35 +00:00
freebsd-ports/cad
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
..
abc One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
admesh Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
adms Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
alliance framework: Add new USES 'magick' for graphics/ImageMagick* 2021-12-11 14:50:53 +01:00
appcsxcad cad/appcsxcad: New port: Minimal GUI Application using the QCSXCAD library 2021-08-19 01:46:12 -07:00
archimedes One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
astk-client Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
astk-serveur cleanup: drop support for EOL FreeBSD 11.X 2021-09-30 23:23:30 +02:00
atlc Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
basicdsp x11-toolkits/wxgtk31: Update 3.1.4 -> 3.1.5 2021-04-16 00:52:45 -07:00
brlcad cad/brlcad: Add CPE information 2021-08-31 12:06:59 +00:00
calculix cad/calculix{-ccx}: Update to version 2.18 2021-10-21 23:43:59 -05:00
calculix-ccx cad/calculix{-ccx}: Update to version 2.18 2021-10-21 23:43:59 -05:00
caneda One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
cascade Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
cascade-compiler Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
chipvault Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
csxcad math/cgal: Update to 5.3 2021-09-02 20:47:50 +02:00
cura One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
cura-engine devel/protobuf: Update to 3.17.3 2021-07-22 02:11:52 +08:00
cvc cad/cvc: New port: Circuit Validity Checker 2021-12-28 23:37:20 -08:00
digital cad/digital: Install icons and desktop file provided by the project 2021-05-27 18:37:40 -07:00
dinotrace Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
ecpprog One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
electric Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
electric-ng cad/electric-ng: Drop maintainership 2021-05-19 20:56:24 +01:00
fasm Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
fdm_materials One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
feappv Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
fidocadj all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
freecad math/vtk9: Update 9.0.3 -> 9.1.0 2021-11-22 01:40:34 -08:00
freehdl */*: Replace USE_GCC=any with USE_GCC=yes 2021-06-04 05:53:21 +00:00
fritzing INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
gds3d cad/gds3d: fix build on powerpc 2021-11-16 12:03:45 +00:00
gdsreader One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
gdt One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
geda */*: Remove redundant '-[0-9]*' from CONFLICTS 2021-10-29 11:50:18 +02:00
gerbv INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
ghdl Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
gmsh cad/gmsh: Update to 4.9.2 2021-12-26 12:10:15 +08:00
gnucap Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
gplcver Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
graywolf math/gsl: update to 2.7 2021-06-16 21:31:27 +02:00
gspiceui Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
gtkwave INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
horizon-eda */*: bump ports depending on libgit2 2021-12-04 13:07:30 +01:00
ifcopenshell One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
impact all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
irsim cad/irsim: Drop maintainership 2021-05-19 20:56:23 +01:00
iverilog Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jspice3 */*: Remove redundant '-[0-9]*' from CONFLICTS 2021-10-29 11:50:18 +02:00
k40-whisperer cad/k40-whisperer: Update to 0.58 2021-04-26 16:23:53 +02:00
kicad cad/kicad: update to 5.1.12 2021-11-09 22:11:54 +01:00
kicad-devel cad/kicad-devel: Update 2021-12-20 18:44:56 +01:00
kicad-doc cad/kicad: update to 5.1.12 2021-11-09 22:11:54 +01:00
kicad-library-footprints cad/kicad: update to 5.1.12 2021-11-09 22:11:54 +01:00
kicad-library-footprints-devel cad/kicad-devel: Update kicad-*-devel 2021-12-20 18:56:01 +01:00
kicad-library-packages3d cad/kicad: update to 5.1.12 2021-11-09 22:11:54 +01:00
kicad-library-packages3d-devel cad/kicad-devel: Update kicad-*-devel 2021-12-20 18:56:01 +01:00
kicad-library-symbols cad/kicad: update to 5.1.12 2021-11-09 22:11:54 +01:00
kicad-library-symbols-devel cad/kicad-devel: Update kicad-*-devel 2021-12-20 18:56:01 +01:00
kicad-library-templates cad/kicad: update to 5.1.12 2021-11-09 22:11:54 +01:00
kicad-library-templates-devel cad/kicad-devel: Update kicad-*-devel 2021-12-20 18:56:01 +01:00
klayout cad/klayout: Unbreak build 2021-12-25 23:05:50 -08:00
ktechlab not-KDE Applications: chase doctools 2021-04-22 09:25:15 +02:00
ldraw cad/ldraw: Update 20190628 -> 20201229 2021-06-08 02:34:06 -07:00
ldview cad/ldview: Update 4.4_Beta5 -> 4.4 2021-07-09 10:01:29 -07:00
leocad cad/leocad: Add CPE information 2021-08-31 12:07:27 +00:00
lepton-eda cad/lepton-eda: Update to 1.9.17 2021-12-29 17:07:55 -05:00
libopencad cad/libopencad: Add CPE information 2021-10-14 12:31:57 +02:00
librecad cad/librecad: Add CPE information 2021-09-10 21:18:18 +00:00
libredwg cad/libredwg: Add CPE information 2021-09-25 20:28:39 +00:00
librepcb cad/librepcb: Fix translations 2021-11-19 13:33:20 -08:00
linux-eagle5 Deorbit RESTRICTED && NO_CDROM, part one. 2021-05-06 13:47:41 +02:00
logisim One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
magic cad/magic: Maintainer reset, take maintainership 2021-12-28 10:17:28 -08:00
meshdev Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
meshlab cad/meshlab: fix build on powerpc 2021-07-11 22:31:31 +00:00
NASTRAN-95 Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
netgen cad/netgen: don't set -march=native 2021-12-23 22:18:10 +00:00
netgen-lvs cad/netgen-lvs: Update 1.5.210 -> 1.5.211 2021-12-22 18:56:24 -08:00
ngspice_rework cad/ngspice_rework: fix build for shlib flavor 2022-01-05 11:39:23 +09:00
nvc cad/nvc: Update 1.5.2 -> 1.5.3 2021-11-16 13:51:14 -08:00
opencascade math/vtk9: Update 9.0.3 -> 9.1.0 2021-11-22 01:40:34 -08:00
openctm graphics/mesa-libs: Bump reverse deps for libglvnd 2021-06-22 11:53:08 -07:00
openfpgaloader cad/openfpgaloader: Update 0.6.1 -> 0.7.0 2022-01-07 00:34:44 -08:00
openroad cad/openroad: Fix PORTSCOUT tag. 2021-09-26 12:57:12 -07:00
openscad *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
openscad-devel *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
opentimer cad/opentimer: mark broken on powerpc 2021-10-06 20:52:26 +00:00
openvsp cad/openvsp: update to 3.26.1 2022-01-07 18:22:09 +01:00
oregano INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
p5-GDS2 cad/p5-GDS2: update to 3.35 2021-08-29 06:40:33 +09:00
p5-Verilog-Perl cad/p5-Verilog-Perl: update to 3.478 2021-12-23 19:33:28 +09:00
padring cad/padring: New port: Padring generator for ASICs 2021-12-29 22:15:37 -08:00
pcb */*: Remove redundant '-[0-9]*' from CONFLICTS 2021-10-29 11:50:18 +02:00
pdnmesh graphics/mesa-libs: Bump reverse deps for libglvnd 2021-06-22 11:53:08 -07:00
PrusaSlicer devel/onetbb: Update to 2021.5.0 2022-01-05 17:43:54 +01:00
py-cadquery Cleanup: for ports under c* categories, drop redundant GH_{ACCOUNT,PROJECT}. 2021-08-29 12:09:44 +00:00
py-cq-editor One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
py-ezdxf Cleanup: for ports under c* categories, drop redundant GH_{ACCOUNT,PROJECT}. 2021-08-29 12:09:44 +00:00
py-gdspy cad/py-gds: update to 1.6.8 2021-08-29 06:31:33 +09:00
py-lcapy math/py-matplotlib: chase minimum Python version in dependent ports 2021-05-10 22:13:20 +02:00
py-ocp cad/py-ocp: Revert update to 7.5.2 to unbreak the ports tree 2021-10-29 18:21:42 +00:00
py-phidl One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
py-pyfda math/py-matplotlib: chase minimum Python version in dependent ports 2021-05-10 22:13:20 +02:00
py-pymtl cad/py-pymtl: Update 3.1.6 -> 3.1.7 2022-01-08 21:13:50 -08:00
python-gdsii *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
qcad *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
qcsxcad cad/qcsxcad: New port: Qt-GUI for CSXCAD 2021-08-19 01:46:11 -07:00
qelectrotech *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
qflow cad/qflow: Update 1.4.97 -> 1.4.98 2021-10-07 11:43:14 -07:00
qmls Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
qrouter cad/qrouter: Update 1.4.84 -> 1.4.85 2021-11-14 21:18:52 -08:00
repsnapper INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
rubygem-gdsii One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
scotch Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
solvespace INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
sp2sp One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
spice all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
stepcode cleanup: drop support for EOL FreeBSD 11.X 2021-09-30 23:23:30 +02:00
stm32flash One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
sumo graphics/mesa-libs: Bump reverse deps for libglvnd 2021-06-22 11:53:08 -07:00
surelog cad/surelog: Update 0.0.3924 .> 0.0.3950 2022-01-01 15:03:59 -08:00
sweethome3d cad/sweethome3d: update Sweet Home 3D to version 6.6.4. 2021-12-13 13:17:30 +00:00
tkgate Clean up some things 2021-05-01 19:55:55 +02:00
tochnog Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
uhdm cad/uhdm: New port: Universal Hardware Data Model 2021-12-27 09:29:43 -08:00
uranium One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
verilator cad/verilator: Update 4.214 -> 4.216 2021-12-12 13:52:38 -08:00
verilog-mode.el USES=emacs: Chase package name changes 2021-11-15 11:19:58 -04:00
veroroute cad/veroroute: Update 2.14 -> 2.15 2021-06-30 18:07:40 -07:00
xcircuit cad/xcircuit: Update 3.10.29 -> 3.10.30 2021-04-28 10:50:44 -07:00
yosys cad/yosys: Update 0.11 -> 0.12 2021-12-04 01:21:05 -08:00
z88 graphics/mesa-libs: Bump reverse deps for libglvnd 2021-06-22 11:53:08 -07:00
zcad editors/lazarus[-qt5]: bump some ports dependants of lazarus 2021-07-31 21:26:39 -05:00
Makefile cad/padring: New port: Padring generator for ASICs 2021-12-29 22:15:37 -08:00