diff options
306 files changed, 0 insertions, 1838 deletions
diff --git a/graphics-libs/mesalib/CONFLICTS b/graphics-libs/mesalib/CONFLICTS deleted file mode 100755 index b103793bd4..0000000000 --- a/graphics-libs/mesalib/CONFLICTS +++ /dev/null @@ -1,5 +0,0 @@ -conflicts xfree86 && -conflicts xfree86-libs && -conflicts xfree86-devel && -conflicts xfree86-4.3 && -conflicts xdirectfb diff --git a/x11/xcompmgr/CONFLICTS b/x11/xcompmgr/CONFLICTS deleted file mode 100755 index eb9d1c1cce..0000000000 --- a/x11/xcompmgr/CONFLICTS +++ /dev/null @@ -1,5 +0,0 @@ -conflicts xfree86 -conflicts xfree86-4.3 -conflicts xfree86-devel -conflicts xfree86-libs -conflicts xdirectfb diff --git a/xorg-app/appres/CONFLICTS b/xorg-app/appres/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/appres/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/bdftopcf/CONFLICTS b/xorg-app/bdftopcf/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/bdftopcf/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/beforelight/CONFLICTS b/xorg-app/beforelight/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/beforelight/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/bitmap/CONFLICTS b/xorg-app/bitmap/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/bitmap/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/compiz/CONFLICTS b/xorg-app/compiz/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/compiz/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/editres/CONFLICTS b/xorg-app/editres/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/editres/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/fonttosfnt/CONFLICTS b/xorg-app/fonttosfnt/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/fonttosfnt/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/fslsfonts/CONFLICTS b/xorg-app/fslsfonts/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/fslsfonts/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/fstobdf/CONFLICTS b/xorg-app/fstobdf/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/fstobdf/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/iceauth/CONFLICTS b/xorg-app/iceauth/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/iceauth/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/ico/CONFLICTS b/xorg-app/ico/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/ico/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/lbxproxy/CONFLICTS b/xorg-app/lbxproxy/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/lbxproxy/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/listres/CONFLICTS b/xorg-app/listres/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/listres/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/luit/CONFLICTS b/xorg-app/luit/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/luit/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/mkcfm/CONFLICTS b/xorg-app/mkcfm/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/mkcfm/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/mkcomposecache/CONFLICTS b/xorg-app/mkcomposecache/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/mkcomposecache/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/mkfontdir/CONFLICTS b/xorg-app/mkfontdir/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/mkfontdir/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/mkfontscale/CONFLICTS b/xorg-app/mkfontscale/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/mkfontscale/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/oclock/CONFLICTS b/xorg-app/oclock/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/oclock/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/proxymngr/CONFLICTS b/xorg-app/proxymngr/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/proxymngr/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/rendercheck/CONFLICTS b/xorg-app/rendercheck/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/rendercheck/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/rgb/CONFLICTS b/xorg-app/rgb/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/rgb/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/rstart/CONFLICTS b/xorg-app/rstart/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/rstart/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/scripts/CONFLICTS b/xorg-app/scripts/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/scripts/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/sessreg/CONFLICTS b/xorg-app/sessreg/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/sessreg/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/setxkbmap/CONFLICTS b/xorg-app/setxkbmap/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/setxkbmap/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/showfont/CONFLICTS b/xorg-app/showfont/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/showfont/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/smproxy/CONFLICTS b/xorg-app/smproxy/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/smproxy/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/twm/CONFLICTS b/xorg-app/twm/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/twm/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/viewres/CONFLICTS b/xorg-app/viewres/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/viewres/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/x11perf/CONFLICTS b/xorg-app/x11perf/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/x11perf/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xauth/CONFLICTS b/xorg-app/xauth/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xauth/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xbiff/CONFLICTS b/xorg-app/xbiff/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xbiff/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xcalc/CONFLICTS b/xorg-app/xcalc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xcalc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xclipboard/CONFLICTS b/xorg-app/xclipboard/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xclipboard/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xclock/CONFLICTS b/xorg-app/xclock/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xclock/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xcmsdb/CONFLICTS b/xorg-app/xcmsdb/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xcmsdb/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xconsole/CONFLICTS b/xorg-app/xconsole/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xconsole/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xcursorgen/CONFLICTS b/xorg-app/xcursorgen/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xcursorgen/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xdbedizzy/CONFLICTS b/xorg-app/xdbedizzy/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xdbedizzy/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xditview/CONFLICTS b/xorg-app/xditview/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xditview/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xdm/CONFLICTS b/xorg-app/xdm/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xdm/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xdpyinfo/CONFLICTS b/xorg-app/xdpyinfo/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xdpyinfo/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xdriinfo/CONFLICTS b/xorg-app/xdriinfo/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xdriinfo/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xedit/CONFLICTS b/xorg-app/xedit/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xedit/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xev/CONFLICTS b/xorg-app/xev/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xev/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xeyes/CONFLICTS b/xorg-app/xeyes/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xeyes/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xf86dga/CONFLICTS b/xorg-app/xf86dga/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xf86dga/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xfd/CONFLICTS b/xorg-app/xfd/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xfd/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xfindproxy/CONFLICTS b/xorg-app/xfindproxy/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xfindproxy/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xfontsel/CONFLICTS b/xorg-app/xfontsel/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xfontsel/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xfs/CONFLICTS b/xorg-app/xfs/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xfs/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xfsinfo/CONFLICTS b/xorg-app/xfsinfo/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xfsinfo/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xfwp/CONFLICTS b/xorg-app/xfwp/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xfwp/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xgamma/CONFLICTS b/xorg-app/xgamma/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xgamma/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xgc/CONFLICTS b/xorg-app/xgc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xgc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xhost/CONFLICTS b/xorg-app/xhost/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xhost/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xkbcomp/CONFLICTS b/xorg-app/xkbcomp/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xkbcomp/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xkbevd/CONFLICTS b/xorg-app/xkbevd/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xkbevd/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xkbprint/CONFLICTS b/xorg-app/xkbprint/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xkbprint/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xkbutils/CONFLICTS b/xorg-app/xkbutils/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xkbutils/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xkill/CONFLICTS b/xorg-app/xkill/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xkill/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xload/CONFLICTS b/xorg-app/xload/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xload/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xlogo/CONFLICTS b/xorg-app/xlogo/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xlogo/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xlsatoms/CONFLICTS b/xorg-app/xlsatoms/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xlsatoms/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xlsclients/CONFLICTS b/xorg-app/xlsclients/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xlsclients/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xlsfonts/CONFLICTS b/xorg-app/xlsfonts/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xlsfonts/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xmag/CONFLICTS b/xorg-app/xmag/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xmag/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xman/CONFLICTS b/xorg-app/xman/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xman/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xmessage/CONFLICTS b/xorg-app/xmessage/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xmessage/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xmh/CONFLICTS b/xorg-app/xmh/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xmh/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xmodmap/CONFLICTS b/xorg-app/xmodmap/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xmodmap/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xmore/CONFLICTS b/xorg-app/xmore/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xmore/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xphelloworld/CONFLICTS b/xorg-app/xphelloworld/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xphelloworld/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xplsprinters/CONFLICTS b/xorg-app/xplsprinters/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xplsprinters/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xpr/CONFLICTS b/xorg-app/xpr/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xpr/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xprehashprinterlist/CONFLICTS b/xorg-app/xprehashprinterlist/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xprehashprinterlist/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xprop/CONFLICTS b/xorg-app/xprop/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xprop/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xrandr/CONFLICTS b/xorg-app/xrandr/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xrandr/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xrdb/CONFLICTS b/xorg-app/xrdb/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xrdb/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xrefresh/CONFLICTS b/xorg-app/xrefresh/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xrefresh/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xrx/CONFLICTS b/xorg-app/xrx/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xrx/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xset/CONFLICTS b/xorg-app/xset/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xset/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xsetmode/CONFLICTS b/xorg-app/xsetmode/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xsetmode/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xsetpointer/CONFLICTS b/xorg-app/xsetpointer/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xsetpointer/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xsetroot/CONFLICTS b/xorg-app/xsetroot/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xsetroot/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xsm/CONFLICTS b/xorg-app/xsm/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xsm/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xstdcmap/CONFLICTS b/xorg-app/xstdcmap/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xstdcmap/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xtrap/CONFLICTS b/xorg-app/xtrap/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xtrap/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xvidtune/CONFLICTS b/xorg-app/xvidtune/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xvidtune/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xvinfo/CONFLICTS b/xorg-app/xvinfo/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xvinfo/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xwd/CONFLICTS b/xorg-app/xwd/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xwd/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xwininfo/CONFLICTS b/xorg-app/xwininfo/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xwininfo/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-app/xwud/CONFLICTS b/xorg-app/xwud/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-app/xwud/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-data/xbitmaps/CONFLICTS b/xorg-data/xbitmaps/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-data/xbitmaps/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-data/xcursor-themes/CONFLICTS b/xorg-data/xcursor-themes/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-data/xcursor-themes/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-data/xkbdata/CONFLICTS b/xorg-data/xkbdata/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-data/xkbdata/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-data/xkeyboard-config/CONFLICTS b/xorg-data/xkeyboard-config/CONFLICTS deleted file mode 100755 index bafbc0b7d6..0000000000 --- a/xorg-data/xkeyboard-config/CONFLICTS +++ /dev/null @@ -1,7 +0,0 @@ -conflicts xkbdata -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-data/xorg-data-profile/CONFLICTS b/xorg-data/xorg-data-profile/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-data/xorg-data-profile/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-doc/xorg-docs/CONFLICTS b/xorg-doc/xorg-docs/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-doc/xorg-docs/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-doc/xorg-sgml-doctools/CONFLICTS b/xorg-doc/xorg-sgml-doctools/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-doc/xorg-sgml-doctools/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/linuxwacom/CONFLICTS b/xorg-driver/linuxwacom/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/linuxwacom/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-acecad/CONFLICTS b/xorg-driver/xf86-input-acecad/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-acecad/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-aiptek/CONFLICTS b/xorg-driver/xf86-input-aiptek/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-aiptek/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-calcomp/CONFLICTS b/xorg-driver/xf86-input-calcomp/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-calcomp/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-citron/CONFLICTS b/xorg-driver/xf86-input-citron/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-citron/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-digitaledge/CONFLICTS b/xorg-driver/xf86-input-digitaledge/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-digitaledge/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-dmc/CONFLICTS b/xorg-driver/xf86-input-dmc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-dmc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-dynapro/CONFLICTS b/xorg-driver/xf86-input-dynapro/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-dynapro/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-elo2300/CONFLICTS b/xorg-driver/xf86-input-elo2300/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-elo2300/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-elographics/CONFLICTS b/xorg-driver/xf86-input-elographics/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-elographics/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-evdev/CONFLICTS b/xorg-driver/xf86-input-evdev/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-evdev/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-fpit/CONFLICTS b/xorg-driver/xf86-input-fpit/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-fpit/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-hyperpen/CONFLICTS b/xorg-driver/xf86-input-hyperpen/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-hyperpen/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-jamstudio/CONFLICTS b/xorg-driver/xf86-input-jamstudio/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-jamstudio/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-joystick/CONFLICTS b/xorg-driver/xf86-input-joystick/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-joystick/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-keyboard/CONFLICTS b/xorg-driver/xf86-input-keyboard/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-keyboard/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-magellan/CONFLICTS b/xorg-driver/xf86-input-magellan/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-magellan/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-magictouch/CONFLICTS b/xorg-driver/xf86-input-magictouch/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-magictouch/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-microtouch/CONFLICTS b/xorg-driver/xf86-input-microtouch/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-microtouch/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-mouse/CONFLICTS b/xorg-driver/xf86-input-mouse/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-mouse/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-mutouch/CONFLICTS b/xorg-driver/xf86-input-mutouch/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-mutouch/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-palmax/CONFLICTS b/xorg-driver/xf86-input-palmax/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-palmax/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-penmount/CONFLICTS b/xorg-driver/xf86-input-penmount/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-penmount/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-spaceorb/CONFLICTS b/xorg-driver/xf86-input-spaceorb/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-spaceorb/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-summa/CONFLICTS b/xorg-driver/xf86-input-summa/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-summa/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-tek4957/CONFLICTS b/xorg-driver/xf86-input-tek4957/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-tek4957/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-ur98/CONFLICTS b/xorg-driver/xf86-input-ur98/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-ur98/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-vmmouse/CONFLICTS b/xorg-driver/xf86-input-vmmouse/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-vmmouse/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-input-void/CONFLICTS b/xorg-driver/xf86-input-void/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-input-void/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-apm/CONFLICTS b/xorg-driver/xf86-video-apm/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-apm/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-ark/CONFLICTS b/xorg-driver/xf86-video-ark/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-ark/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-ast/CONFLICTS b/xorg-driver/xf86-video-ast/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-ast/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-ati/CONFLICTS b/xorg-driver/xf86-video-ati/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-ati/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-chips/CONFLICTS b/xorg-driver/xf86-video-chips/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-chips/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-cirrus/CONFLICTS b/xorg-driver/xf86-video-cirrus/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-cirrus/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-cyrix/CONFLICTS b/xorg-driver/xf86-video-cyrix/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-cyrix/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-dummy/CONFLICTS b/xorg-driver/xf86-video-dummy/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-dummy/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-fbdev/CONFLICTS b/xorg-driver/xf86-video-fbdev/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-fbdev/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-glint/CONFLICTS b/xorg-driver/xf86-video-glint/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-glint/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-i128/CONFLICTS b/xorg-driver/xf86-video-i128/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-i128/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-i740/CONFLICTS b/xorg-driver/xf86-video-i740/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-i740/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-i810/CONFLICTS b/xorg-driver/xf86-video-i810/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-i810/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-impact/CONFLICTS b/xorg-driver/xf86-video-impact/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-impact/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-imstt/CONFLICTS b/xorg-driver/xf86-video-imstt/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-imstt/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-intel/CONFLICTS b/xorg-driver/xf86-video-intel/CONFLICTS deleted file mode 100755 index 0ae6b76234..0000000000 --- a/xorg-driver/xf86-video-intel/CONFLICTS +++ /dev/null @@ -1,7 +0,0 @@ -conflicts xf86-video-i810 y -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-mach64/CONFLICTS b/xorg-driver/xf86-video-mach64/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-mach64/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-mga/CONFLICTS b/xorg-driver/xf86-video-mga/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-mga/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-neomagic/CONFLICTS b/xorg-driver/xf86-video-neomagic/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-neomagic/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-newport/CONFLICTS b/xorg-driver/xf86-video-newport/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-newport/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-nouveau/CONFLICTS b/xorg-driver/xf86-video-nouveau/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-nouveau/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-nsc/CONFLICTS b/xorg-driver/xf86-video-nsc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-nsc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-nv/CONFLICTS b/xorg-driver/xf86-video-nv/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-nv/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-openchrome/CONFLICTS b/xorg-driver/xf86-video-openchrome/CONFLICTS deleted file mode 100755 index 41af7e645c..0000000000 --- a/xorg-driver/xf86-video-openchrome/CONFLICTS +++ /dev/null @@ -1,7 +0,0 @@ -conflicts xf86-video-via -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-r128/CONFLICTS b/xorg-driver/xf86-video-r128/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-r128/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-radeonhd/CONFLICTS b/xorg-driver/xf86-video-radeonhd/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-radeonhd/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-rendition/CONFLICTS b/xorg-driver/xf86-video-rendition/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-rendition/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-s3/CONFLICTS b/xorg-driver/xf86-video-s3/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-s3/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-s3virge/CONFLICTS b/xorg-driver/xf86-video-s3virge/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-s3virge/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-savage/CONFLICTS b/xorg-driver/xf86-video-savage/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-savage/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-siliconmotion/CONFLICTS b/xorg-driver/xf86-video-siliconmotion/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-siliconmotion/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-sis/CONFLICTS b/xorg-driver/xf86-video-sis/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-sis/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-sisusb/CONFLICTS b/xorg-driver/xf86-video-sisusb/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-sisusb/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-sunbw2/CONFLICTS b/xorg-driver/xf86-video-sunbw2/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-sunbw2/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-suncg14/CONFLICTS b/xorg-driver/xf86-video-suncg14/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-suncg14/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-suncg3/CONFLICTS b/xorg-driver/xf86-video-suncg3/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-suncg3/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-suncg6/CONFLICTS b/xorg-driver/xf86-video-suncg6/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-suncg6/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-sunffb/CONFLICTS b/xorg-driver/xf86-video-sunffb/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-sunffb/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-sunleo/CONFLICTS b/xorg-driver/xf86-video-sunleo/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-sunleo/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-suntcx/CONFLICTS b/xorg-driver/xf86-video-suntcx/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-suntcx/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-tdfx/CONFLICTS b/xorg-driver/xf86-video-tdfx/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-tdfx/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-tga/CONFLICTS b/xorg-driver/xf86-video-tga/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-tga/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-trident/CONFLICTS b/xorg-driver/xf86-video-trident/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-trident/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-tseng/CONFLICTS b/xorg-driver/xf86-video-tseng/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-tseng/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-v4l/CONFLICTS b/xorg-driver/xf86-video-v4l/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-v4l/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-vesa/CONFLICTS b/xorg-driver/xf86-video-vesa/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-vesa/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-vga/CONFLICTS b/xorg-driver/xf86-video-vga/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-vga/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-via/CONFLICTS b/xorg-driver/xf86-video-via/CONFLICTS deleted file mode 100755 index a9a5ea61c0..0000000000 --- a/xorg-driver/xf86-video-via/CONFLICTS +++ /dev/null @@ -1,7 +0,0 @@ -conflicts xf86-video-openchrome -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-vmware/CONFLICTS b/xorg-driver/xf86-video-vmware/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-vmware/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-voodoo/CONFLICTS b/xorg-driver/xf86-video-voodoo/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-voodoo/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-driver/xf86-video-wsfb/CONFLICTS b/xorg-driver/xf86-video-wsfb/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-driver/xf86-video-wsfb/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-extras/libpthread-stubs/CONFLICTS b/xorg-extras/libpthread-stubs/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-extras/libpthread-stubs/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-extras/xterm/CONFLICTS b/xorg-extras/xterm/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-extras/xterm/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/encodings/CONFLICTS b/xorg-font/encodings/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/encodings/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-adobe-100dpi/CONFLICTS b/xorg-font/font-adobe-100dpi/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-adobe-100dpi/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-adobe-75dpi/CONFLICTS b/xorg-font/font-adobe-75dpi/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-adobe-75dpi/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-adobe-utopia-100dpi/CONFLICTS b/xorg-font/font-adobe-utopia-100dpi/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-adobe-utopia-100dpi/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-adobe-utopia-75dpi/CONFLICTS b/xorg-font/font-adobe-utopia-75dpi/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-adobe-utopia-75dpi/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-adobe-utopia-type1/CONFLICTS b/xorg-font/font-adobe-utopia-type1/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-adobe-utopia-type1/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-alias/CONFLICTS b/xorg-font/font-alias/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-alias/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-arabic-misc/CONFLICTS b/xorg-font/font-arabic-misc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-arabic-misc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-bh-100dpi/CONFLICTS b/xorg-font/font-bh-100dpi/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-bh-100dpi/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-bh-75dpi/CONFLICTS b/xorg-font/font-bh-75dpi/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-bh-75dpi/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-bh-lucidatypewriter-100dpi/CONFLICTS b/xorg-font/font-bh-lucidatypewriter-100dpi/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-bh-lucidatypewriter-100dpi/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-bh-lucidatypewriter-75dpi/CONFLICTS b/xorg-font/font-bh-lucidatypewriter-75dpi/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-bh-lucidatypewriter-75dpi/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-bh-ttf/CONFLICTS b/xorg-font/font-bh-ttf/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-bh-ttf/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-bh-type1/CONFLICTS b/xorg-font/font-bh-type1/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-bh-type1/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-bitstream-100dpi/CONFLICTS b/xorg-font/font-bitstream-100dpi/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-bitstream-100dpi/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-bitstream-75dpi/CONFLICTS b/xorg-font/font-bitstream-75dpi/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-bitstream-75dpi/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-bitstream-speedo/CONFLICTS b/xorg-font/font-bitstream-speedo/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-bitstream-speedo/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-bitstream-type1/CONFLICTS b/xorg-font/font-bitstream-type1/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-bitstream-type1/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-cronyx-cyrillic/CONFLICTS b/xorg-font/font-cronyx-cyrillic/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-cronyx-cyrillic/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-cursor-misc/CONFLICTS b/xorg-font/font-cursor-misc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-cursor-misc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-daewoo-misc/CONFLICTS b/xorg-font/font-daewoo-misc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-daewoo-misc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-dec-misc/CONFLICTS b/xorg-font/font-dec-misc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-dec-misc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-ibm-type1/CONFLICTS b/xorg-font/font-ibm-type1/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-ibm-type1/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-isas-misc/CONFLICTS b/xorg-font/font-isas-misc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-isas-misc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-jis-misc/CONFLICTS b/xorg-font/font-jis-misc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-jis-misc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-micro-misc/CONFLICTS b/xorg-font/font-micro-misc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-micro-misc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-misc-cyrillic/CONFLICTS b/xorg-font/font-misc-cyrillic/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-misc-cyrillic/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-misc-ethiopic/CONFLICTS b/xorg-font/font-misc-ethiopic/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-misc-ethiopic/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-misc-meltho/CONFLICTS b/xorg-font/font-misc-meltho/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-misc-meltho/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-misc-misc/CONFLICTS b/xorg-font/font-misc-misc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-misc-misc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-mutt-misc/CONFLICTS b/xorg-font/font-mutt-misc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-mutt-misc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-schumacher-misc/CONFLICTS b/xorg-font/font-schumacher-misc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-schumacher-misc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-screen-cyrillic/CONFLICTS b/xorg-font/font-screen-cyrillic/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-screen-cyrillic/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-sony-misc/CONFLICTS b/xorg-font/font-sony-misc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-sony-misc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-sun-misc/CONFLICTS b/xorg-font/font-sun-misc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-sun-misc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-util/CONFLICTS b/xorg-font/font-util/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-util/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-winitzki-cyrillic/CONFLICTS b/xorg-font/font-winitzki-cyrillic/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-winitzki-cyrillic/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-font/font-xfree86-type1/CONFLICTS b/xorg-font/font-xfree86-type1/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-font/font-xfree86-type1/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libdmx/CONFLICTS b/xorg-lib/libdmx/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libdmx/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libfontenc/CONFLICTS b/xorg-lib/libfontenc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libfontenc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libfs/CONFLICTS b/xorg-lib/libfs/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libfs/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libice/CONFLICTS b/xorg-lib/libice/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libice/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/liblbxutil/CONFLICTS b/xorg-lib/liblbxutil/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/liblbxutil/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/liboldx/CONFLICTS b/xorg-lib/liboldx/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/liboldx/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libsm/CONFLICTS b/xorg-lib/libsm/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libsm/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libx11/CONFLICTS b/xorg-lib/libx11/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libx11/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxau/CONFLICTS b/xorg-lib/libxau/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxau/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxaw/CONFLICTS b/xorg-lib/libxaw/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxaw/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxcb/CONFLICTS b/xorg-lib/libxcb/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxcb/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxcomposite/CONFLICTS b/xorg-lib/libxcomposite/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxcomposite/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxcursor/CONFLICTS b/xorg-lib/libxcursor/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxcursor/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxdamage/CONFLICTS b/xorg-lib/libxdamage/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxdamage/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxdmcp/CONFLICTS b/xorg-lib/libxdmcp/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxdmcp/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxevie/CONFLICTS b/xorg-lib/libxevie/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxevie/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxext/CONFLICTS b/xorg-lib/libxext/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxext/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxfixes/CONFLICTS b/xorg-lib/libxfixes/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxfixes/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxfont/CONFLICTS b/xorg-lib/libxfont/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxfont/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxfontcache/CONFLICTS b/xorg-lib/libxfontcache/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxfontcache/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxft/CONFLICTS b/xorg-lib/libxft/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxft/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxi/CONFLICTS b/xorg-lib/libxi/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxi/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxinerama/CONFLICTS b/xorg-lib/libxinerama/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxinerama/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxkbfile/CONFLICTS b/xorg-lib/libxkbfile/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxkbfile/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxkbui/CONFLICTS b/xorg-lib/libxkbui/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxkbui/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxmu/CONFLICTS b/xorg-lib/libxmu/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxmu/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxp/CONFLICTS b/xorg-lib/libxp/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxp/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxpm/CONFLICTS b/xorg-lib/libxpm/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxpm/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxprintapputil/CONFLICTS b/xorg-lib/libxprintapputil/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxprintapputil/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxprintutil/CONFLICTS b/xorg-lib/libxprintutil/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxprintutil/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxrandr/CONFLICTS b/xorg-lib/libxrandr/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxrandr/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxrender/CONFLICTS b/xorg-lib/libxrender/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxrender/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxres/CONFLICTS b/xorg-lib/libxres/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxres/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxscrnsaver/CONFLICTS b/xorg-lib/libxscrnsaver/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxscrnsaver/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxtrap/CONFLICTS b/xorg-lib/libxtrap/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxtrap/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxtst/CONFLICTS b/xorg-lib/libxtst/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxtst/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxv/CONFLICTS b/xorg-lib/libxv/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxv/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxvmc/CONFLICTS b/xorg-lib/libxvmc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxvmc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxxf86dga/CONFLICTS b/xorg-lib/libxxf86dga/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxxf86dga/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxxf86misc/CONFLICTS b/xorg-lib/libxxf86misc/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxxf86misc/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/libxxf86vm/CONFLICTS b/xorg-lib/libxxf86vm/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/libxxf86vm/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/pixman/CONFLICTS b/xorg-lib/pixman/CONFLICTS index 2539de0a5a..4c92f96157 100755 --- a/xorg-lib/pixman/CONFLICTS +++ b/xorg-lib/pixman/CONFLICTS @@ -1,7 +1 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y conflicts libpixman y diff --git a/xorg-lib/xorg-libs/CONFLICTS b/xorg-lib/xorg-libs/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/xorg-libs/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-lib/xtrans/CONFLICTS b/xorg-lib/xtrans/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-lib/xtrans/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/applewmproto/CONFLICTS b/xorg-proto/applewmproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/applewmproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/bigreqsproto/CONFLICTS b/xorg-proto/bigreqsproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/bigreqsproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/compositeproto/CONFLICTS b/xorg-proto/compositeproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/compositeproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/damageproto/CONFLICTS b/xorg-proto/damageproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/damageproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/dmxproto/CONFLICTS b/xorg-proto/dmxproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/dmxproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/evieext/CONFLICTS b/xorg-proto/evieext/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/evieext/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/fixesproto/CONFLICTS b/xorg-proto/fixesproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/fixesproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/fontcacheproto/CONFLICTS b/xorg-proto/fontcacheproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/fontcacheproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/fontsproto/CONFLICTS b/xorg-proto/fontsproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/fontsproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/glproto/CONFLICTS b/xorg-proto/glproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/glproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/inputproto/CONFLICTS b/xorg-proto/inputproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/inputproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/kbproto/CONFLICTS b/xorg-proto/kbproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/kbproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/printproto/CONFLICTS b/xorg-proto/printproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/printproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/randrproto/CONFLICTS b/xorg-proto/randrproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/randrproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/recordproto/CONFLICTS b/xorg-proto/recordproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/recordproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/renderproto/CONFLICTS b/xorg-proto/renderproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/renderproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/resourceproto/CONFLICTS b/xorg-proto/resourceproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/resourceproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/scrnsaverproto/CONFLICTS b/xorg-proto/scrnsaverproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/scrnsaverproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/trapproto/CONFLICTS b/xorg-proto/trapproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/trapproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/videoproto/CONFLICTS b/xorg-proto/videoproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/videoproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/windowswmproto/CONFLICTS b/xorg-proto/windowswmproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/windowswmproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/xcb-proto/CONFLICTS b/xorg-proto/xcb-proto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/xcb-proto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/xcmiscproto/CONFLICTS b/xorg-proto/xcmiscproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/xcmiscproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/xextproto/CONFLICTS b/xorg-proto/xextproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/xextproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/xf86bigfontproto/CONFLICTS b/xorg-proto/xf86bigfontproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/xf86bigfontproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/xf86dgaproto/CONFLICTS b/xorg-proto/xf86dgaproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/xf86dgaproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/xf86driproto/CONFLICTS b/xorg-proto/xf86driproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/xf86driproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/xf86miscproto/CONFLICTS b/xorg-proto/xf86miscproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/xf86miscproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/xf86rushproto/CONFLICTS b/xorg-proto/xf86rushproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/xf86rushproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/xf86vidmodeproto/CONFLICTS b/xorg-proto/xf86vidmodeproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/xf86vidmodeproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/xineramaproto/CONFLICTS b/xorg-proto/xineramaproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/xineramaproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/xproto/CONFLICTS b/xorg-proto/xproto/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/xproto/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-proto/xproxymanagementprotocol/CONFLICTS b/xorg-proto/xproxymanagementprotocol/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-proto/xproxymanagementprotocol/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-util/gccmakedep/CONFLICTS b/xorg-util/gccmakedep/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-util/gccmakedep/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-util/imake/CONFLICTS b/xorg-util/imake/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-util/imake/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-util/lndir/CONFLICTS b/xorg-util/lndir/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-util/lndir/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-util/makedepend/CONFLICTS b/xorg-util/makedepend/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-util/makedepend/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-util/xorg-cf-files/CONFLICTS b/xorg-util/xorg-cf-files/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-util/xorg-cf-files/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y diff --git a/xorg-util/xorg-utils/CONFLICTS b/xorg-util/xorg-utils/CONFLICTS deleted file mode 100755 index 8007c92eb4..0000000000 --- a/xorg-util/xorg-utils/CONFLICTS +++ /dev/null @@ -1,6 +0,0 @@ -conflicts xdirectfb y -conflicts xfree86-devel y -conflicts xfree86-libs y -conflicts xfree86-4.3 y -conflicts xfree86 y -conflicts xorg y |