kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/x11-wm
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
..
afterstep Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
afterstep-stable Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
amiwm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
antiwm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
aphelia One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
awesome framework: Add new USES 'magick' for graphics/ImageMagick* 2021-12-11 14:50:53 +01:00
awesome-vicious Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
bbkeys Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
bbpager Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
berry x11-wm/berry: Update to 0.1.9 2021-09-19 22:55:02 +01:00
blackbox x11-wm/blackbox: fix build on powerpc 2021-06-20 13:14:20 +00:00
bspwm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
cage x11-toolkits/wlroots: update to 0.15.0 2021-12-17 11:30:04 +00:00
chamfer x11-wm/chamfer: update to s20210622 2021-09-08 23:56:41 +00:00
compiz graphics/mesa-libs: Bump reverse deps for libglvnd 2021-06-22 11:53:08 -07:00
compiz-plugins-extra graphics/mesa-libs: Bump reverse deps for libglvnd 2021-06-22 11:53:08 -07:00
compiz-plugins-main graphics/mesa-libs: Bump reverse deps for libglvnd 2021-06-22 11:53:08 -07:00
compiz-plugins-unsupported x11-wm/compiz-plugins-unsupported: minor fixes 2021-04-13 19:18:05 +03:00
compizconfig-backend-gconf Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
compton graphics/mesa-libs: Bump reverse deps for libglvnd 2021-06-22 11:53:08 -07:00
ctwm *: apply refactor.remove-consecutive-empty-lines 2021-10-19 10:36:47 +02:00
cwm One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
devilspie Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
durden One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
dwl x11-wm/dwl: unbreak on GCC architectures 2021-12-31 17:16:31 +00:00
dwm x11-wm/dwm: Add new option RUGAPS 2021-04-28 15:22:05 +02:00
e16 x11-wm/e16: update to 1.0.24 2021-11-16 10:36:48 +00:00
e16-docs Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
echinus Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
emerald INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
enlightenment x11-wm/enlightenment: Enable build of armv{6,7}. 2021-12-23 11:33:50 +03:00
epplets framework: Add new USES 'magick' for graphics/ImageMagick* 2021-12-11 14:50:53 +01:00
euclid-wm One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
evilwm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
fbcmd Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
fluxbox Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
fluxter Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
flwm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
fvwm2 */*: Remove redundant '-*' from CONFLICTS definitions 2021-11-25 22:40:11 +01:00
fvwm3 Fix CONFLICTS entries of multiple ports 2022-01-10 16:15:39 +01:00
gamescope x11-wm/gamescope: unbreak fetch due to repo growth 2021-12-28 17:25:36 +00:00
herbstluftwm One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
hikari x11-toolkits/wlroots: update to 0.15.0 2021-12-17 11:30:04 +00:00
hs-xmonad x11-wm/hs-xmonad: Update to 0.17.0 2021-10-29 20:05:34 +03:00
i3 x11-wm/i3: update to 4.20.1 2021-11-03 13:57:14 +01:00
i3-gaps x11-wm/i3-gaps: Update to 4.20.1 2021-11-25 08:45:02 +01:00
icewm x11-wm/icewm: update IceWM to version 2.9.4. 2021-12-31 05:01:42 +00:00
jewel Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
jwm */*: Fix ENOTIME: return my ports to the pool 2021-05-22 10:13:01 +08:00
kickshaw Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
kwinft x11-toolkits/wlroots: update to 0.15.0 2021-12-17 11:30:04 +00:00
labwc x11-wm/labwc: update to 0.4.0 2021-12-31 21:32:25 +00:00
larswm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
leftwm x11-wm/leftwm: Bring it even with upstream 2022-01-10 01:23:31 -03:00
libcompizconfig Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
libdockapp Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
libwraster framework: Add new USES 'magick' for graphics/ImageMagick* 2021-12-11 14:50:53 +01:00
lwm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
lxappearance-obconf Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
lxmed all: Remove all other $FreeBSD keywords. 2021-04-06 16:31:13 +02:00
lxqt */lxqt*: Update WWW 2021-11-16 12:24:44 +08:00
lxqt-panel */lxqt*: Update WWW 2021-11-16 12:24:44 +08:00
lxqt-session x11-wm/lxqt-session: Update to 1.0.0 2021-11-10 19:25:31 +01:00
lxsession Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
marco x11-wm/marco: Update to 1.26.0 2021-10-09 16:33:24 -07:00
mcwm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
metacity x11-wm/metacity: Update to 3.42.0 2021-11-06 17:23:12 -07:00
muffin graphics/mesa-libs: Bump reverse deps for libglvnd 2021-06-22 11:53:08 -07:00
mutter multimedia/pipewire: force rebuild consumers after 8691df3a51 2021-11-20 22:41:23 +00:00
nscde x11-wm/nscde: add xsession integration 2022-01-04 08:53:08 +01:00
obconf Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
obconf-qt x11-wm/obconf-qt: Update to 0.16.1 2021-05-08 18:51:58 +02:00
obpager Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
openbox Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
oroborus Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
pager Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
peksystray Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
pekwm x11-wm/pekwm: Update to 0.2.0 2021-11-08 16:26:23 +01:00
phluid Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
phoc x11-wm/phoc: explicitly depend on wayland-protocols 2021-12-31 09:53:01 +00:00
picom cleanup: drop support for EOL FreeBSD 11.X 2021-09-30 23:23:30 +02:00
piewm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
plasma5-kdecoration KDE: Update KDE Plasma Desktop to 5.23.5 2022-01-04 16:52:54 +01:00
plasma5-kwin KDE: Update KDE Plasma Desktop to 5.23.5 2022-01-04 16:52:54 +01:00
pwm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
qtile *: apply refactor.remove-consecutive-empty-lines 2021-10-19 10:36:47 +02:00
ratmen Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
ratpoison Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
river x11-wm/river: respect CPUTYPE instead of host CPU 2022-01-05 06:57:18 +00:00
rubygem-uh-layout One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
rubygem-uh-wm One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
sawfish x11-wm/sawfish: update to 1.13.0 2021-12-26 19:41:44 +01:00
sdorfehs x11-wm/sdorfehs: Update to 1.2 2021-11-20 12:10:36 -04:00
selectwm One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
skippy-xd Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
spectrwm *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
stumpwm */*: Bump PORTREVISION on *-sbcl ports after lang/sbcl upgrade. 2022-01-02 10:45:16 +01:00
subtle Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
sway x11-wm/sway: update to 1.7.r2 2022-01-09 12:14:22 +00:00
tinywm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
transset Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
treewm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
tvtwm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
twm x11-wm/twm: better attribute patches for WM Hints 2021-05-10 00:51:17 +02:00
vtwm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
w9wm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
wayfire x11-toolkits/wlroots: update to 0.15.0 2021-12-17 11:30:04 +00:00
wayfire-plugins-extra x11-wm/wayfire-plugins-extra: respect PREFIX after f081b8b768 2021-12-20 14:55:30 +00:00
windowmaker framework: Add new USES 'magick' for graphics/ImageMagick* 2021-12-11 14:50:53 +01:00
wm2 Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
wmakerconf Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
wmanager graphics/mesa-libs: Bump reverse deps for libglvnd 2021-06-22 11:53:08 -07:00
wmanager-addons Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
wmconfig Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
wmii */*: Remove redundant '-[0-9]*' from CONFLICTS 2021-10-29 11:50:18 +02:00
wmii-devel */*: Remove redundant '-[0-9]*' from CONFLICTS 2021-10-29 11:50:18 +02:00
wmname Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
wmx Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
xcompmgr Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
xfce4 Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
xfce4-desktop INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
xfce4-panel *: fix tab vs. space issues, and comments according to the guide. 2021-10-16 11:51:39 +02:00
xfce4-panel-profiles One more small cleanup, forgotten yesterday. 2021-04-07 10:09:01 +02:00
xfce4-session INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
xfce4-wm INSTALLS_ICONS: retire the macro and rework the related dependencies 2021-10-10 21:44:42 +02:00
yeahwm Remove # $FreeBSD$ from Makefiles. 2021-04-06 16:31:07 +02:00
Makefile x11-wm/dwl: add new port 2021-12-30 20:58:37 +00:00