[Lunar-commits] r24727 - in moonbase/trunk/xorg7: mesa-glu mesa-lib x11-apps/appres x11-apps/bdftopcf x11-apps/beforelight x11-apps/bitmap x11-apps/editres x11-apps/fonttosfnt x11-apps/fslsfonts x11-apps/fstobdf x11-apps/iceauth x11-apps/ico x11-apps/listres x11-apps/luit x11-apps/mkfontdir x11-apps/mkfontscale x11-apps/rgb x11-apps/rstart x11-apps/sessreg x11-apps/setxkbmap x11-apps/smproxy x11-apps/twm x11-apps/x11perf x11-apps/xauth x11-apps/xcalc x11-apps/xclock x11-apps/xcmsdb x11-apps/xconsole x11-apps/xcursorgen x11-apps/xdbedizzy x11-apps/xdm x11-apps/xdpyinfo x11-apps/xdriinfo x11-apps/xedit x11-apps/xev x11-apps/xeyes x11-apps/xfs x11-apps/xgamma x11-apps/xhost x11-apps/xinit x11-apps/xkbcomp x11-apps/xkbevd x11-apps/xkbutils x11-apps/xkill x11-apps/xlsatoms x11-apps/xlsfonts x11-apps/xman x11-apps/xmessage x11-apps/xmh x11-apps/xmodmap x11-apps/xmore x11-apps/xplsprinters x11-apps/xpr x11-apps/xprop x11-apps/xrandr x11-apps/xrdb x11-apps/xrefresh x11-apps/xset x11-apps/xsetroot x11-apps/xvinfo x11-apps/xwd x11-apps/xwininfo x11-apps/xwud x11-apps/xxvidtune x11-data/xbitmaps x11-data/xcursor-themes x11-data/xkbdata x11-data/xkeyboard-config x11-drivers/xf86-input-acecad x11-drivers/xf86-input-aiptek x11-drivers/xf86-input-calcomp x11-drivers/xf86-input-citron x11-drivers/xf86-input-digitaledge x11-drivers/xf86-input-dmc x11-drivers/xf86-input-dynapro x11-drivers/xf86-input-elo2300 x11-drivers/xf86-input-elographics x11-drivers/xf86-input-evdev x11-drivers/xf86-input-fpit x11-drivers/xf86-input-hyperpen x11-drivers/xf86-input-jamstudio x11-drivers/xf86-input-joystick x11-drivers/xf86-input-keyboard x11-drivers/xf86-input-magellan x11-drivers/xf86-input-magictouch x11-drivers/xf86-input-microtouch x11-drivers/xf86-input-mouse x11-drivers/xf86-input-mutouch x11-drivers/xf86-input-palmax x11-drivers/xf86-input-penmount x11-drivers/xf86-input-spaceorb x11-drivers/xf86-input-summa x11-drivers/xf86-input-tek4957 x11-drivers/xf86-input-ur98 x11-drivers/xf86-input-vmmouse x11-drivers/xf86-input-void x11-drivers/xf86-video-apm x11-drivers/xf86-video-ark x11-drivers/xf86-video-ast x11-drivers/xf86-video-ati x11-drivers/xf86-video-chips x11-drivers/xf86-video-cirrus x11-drivers/xf86-video-cyrix x11-drivers/xf86-video-dummy x11-drivers/xf86-video-fbdev x11-drivers/xf86-video-glint x11-drivers/xf86-video-i128 x11-drivers/xf86-video-i740 x11-drivers/xf86-video-i810 x11-drivers/xf86-video-imstt x11-drivers/xf86-video-intel x11-drivers/xf86-video-intel-git x11-drivers/xf86-video-mga x11-drivers/xf86-video-neomagic x11-drivers/xf86-video-newport x11-drivers/xf86-video-nsc x11-drivers/xf86-video-nv x11-drivers/xf86-video-rendition x11-drivers/xf86-video-s3 x11-drivers/xf86-video-s3virge x11-drivers/xf86-video-savage x11-drivers/xf86-video-siliconmotion x11-drivers/xf86-video-sis x11-drivers/xf86-video-sisusb x11-drivers/xf86-video-trident x11-drivers/xf86-video-v4l x11-drivers/xf86-video-vesa x11-drivers/xf86-video-vga x11-drivers/xf86-video-via x11-drivers/xf86-video-vmware x11-drivers/xf86-video-voodoo x11-extras/libdrm x11-extras/libxcb x11-extras/xcb-proto x11-extras/xf86dga x11-extras/xterm x11-font/encodings x11-font/font-adobe-100dpi x11-font/font-adobe-75dpi x11-font/font-adobe-utopia-100dpi x11-font/font-adobe-utopia-75dpi x11-font/font-adobe-utopia-type1 x11-font/font-alias x11-font/font-arabic-misc x11-font/font-bh-100dpi x11-font/font-bh-75dpi x11-font/font-bh-lucidatypewriter-100dpi x11-font/font-bh-lucidatypewriter-75dpi x11-font/font-bh-ttf x11-font/font-bh-type1 x11-font/font-bitstream-100dpi x11-font/font-bitstream-75dpi x11-font/font-bitstream-speedo x11-font/font-bitstream-type1 x11-font/font-cronyx-cyrillic x11-font/font-cursor-misc x11-font/font-daewoo-misc x11-font/font-dec-misc x11-font/font-ibm-type1 x11-font/font-isas-misc x11-font/font-jis-misc x11-font/font-micro-misc x11-font/font-misc-cyrillic x11-font/font-misc-ethiopic x11-font/font-misc-meltho x11-font/font-misc-misc x11-font/font-mutt-misc x11-font/font-schumacher-misc x11-font/font-screen-cyrillic x11-font/font-sony-misc x11-font/font-sun-misc x11-font/font-util x11-font/font-winitzki-cyrillic x11-font/font-xfree86-type1 x11-libs/libFS x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXTrap x11-libs/libXau x11-libs/libXaw x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXevie x11-libs/libXext x11-libs/libXfixes x11-libs/libXfont x11-libs/libXfontcache x11-libs/libXft x11-libs/libXi x11-libs/libXinerama x11-libs/libXmu x11-libs/libXp x11-libs/libXpm x11-libs/libXprintAppUtil x11-libs/libXprintUtil x11-libs/libXrandr x11-libs/libXrender x11-libs/libXres x11-libs/libXt x11-libs/libXtst x11-libs/libXv x11-libs/libXvMC x11-libs/libXxf86dga x11-libs/libXxf86misc x11-libs/libXxf86vm x11-libs/libdmx x11-libs/libfontenc x11-libs/liblbxutil x11-libs/liboldX x11-libs/libxkbfile x11-libs/libxkbui x11-libs/xtrans x11-profiles/XOrg7 x11-proto/applewmproto x11-proto/bigreqsproto x11-proto/compositeproto x11-proto/damageproto x11-proto/dmxproto x11-proto/evieext x11-proto/fixesproto x11-proto/fontcacheproto x11-proto/fontsproto x11-proto/glproto x11-proto/inputproto x11-proto/kbproto x11-proto/printproto x11-proto/randrproto x11-proto/recordproto x11-proto/renderproto x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/trapproto x11-proto/videoproto x11-proto/xcmiscproto x11-proto/xextproto x11-proto/xf86bigfontproto x11-proto/xf86dgaproto x11-proto/xf86driproto x11-proto/xf86miscproto x11-proto/xf86rushproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto x11-proto/xproto x11-proto/xproxymanagementprotocol x11-util/gccmakedep x11-util/imake x11-util/makedepend x11-util/rman x11-util/util-macros x11-util/xorg-cf-files

• Previous message: [Lunar-commits] r24726 - moonbase/trunk
• Next message: [Lunar-commits] r24728 - moonbase/trunk/libs/fltk
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Author: elangelo
Date: 2007-06-07 10:54:49 +0200 (Thu, 07 Jun 2007)
New Revision: 24727

Modified:
   moonbase/trunk/xorg7/mesa-glu/CONFLICTS
   moonbase/trunk/xorg7/mesa-lib/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/appres/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/bdftopcf/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/beforelight/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/bitmap/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/editres/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/fonttosfnt/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/fslsfonts/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/fstobdf/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/iceauth/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/ico/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/listres/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/luit/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/mkfontdir/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/mkfontscale/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/rgb/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/rstart/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/sessreg/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/setxkbmap/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/smproxy/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/twm/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/x11perf/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xauth/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xcalc/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xclock/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xcmsdb/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xconsole/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xcursorgen/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xdbedizzy/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xdm/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xdpyinfo/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xdriinfo/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xedit/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xev/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xeyes/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xfs/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xgamma/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xhost/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xinit/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xkbcomp/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xkbevd/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xkbutils/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xkill/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xlsatoms/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xlsfonts/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xman/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xmessage/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xmh/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xmodmap/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xmore/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xplsprinters/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xpr/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xprop/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xrandr/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xrdb/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xrefresh/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xset/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xsetroot/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xvinfo/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xwd/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xwininfo/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xwud/CONFLICTS
   moonbase/trunk/xorg7/x11-apps/xxvidtune/CONFLICTS
   moonbase/trunk/xorg7/x11-data/xbitmaps/CONFLICTS
   moonbase/trunk/xorg7/x11-data/xcursor-themes/CONFLICTS
   moonbase/trunk/xorg7/x11-data/xkbdata/CONFLICTS
   moonbase/trunk/xorg7/x11-data/xkeyboard-config/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-acecad/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-aiptek/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-calcomp/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-citron/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-digitaledge/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-dmc/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-dynapro/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-elo2300/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-elographics/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-evdev/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-fpit/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-hyperpen/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-jamstudio/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-joystick/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-keyboard/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-magellan/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-magictouch/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-microtouch/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-mouse/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-mutouch/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-palmax/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-penmount/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-spaceorb/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-summa/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-tek4957/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-ur98/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-vmmouse/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-input-void/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-apm/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-ark/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-ast/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-ati/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-chips/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-cirrus/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-cyrix/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-dummy/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-fbdev/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-glint/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-i128/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-i740/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-i810/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-imstt/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-intel-git/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-intel/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-mga/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-neomagic/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-newport/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-nsc/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-nv/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-rendition/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-s3/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-s3virge/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-savage/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-siliconmotion/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-sis/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-sisusb/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-trident/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-v4l/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-vesa/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-vga/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-via/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-vmware/CONFLICTS
   moonbase/trunk/xorg7/x11-drivers/xf86-video-voodoo/CONFLICTS
   moonbase/trunk/xorg7/x11-extras/libdrm/CONFLICTS
   moonbase/trunk/xorg7/x11-extras/libxcb/CONFLICTS
   moonbase/trunk/xorg7/x11-extras/xcb-proto/CONFLICTS
   moonbase/trunk/xorg7/x11-extras/xf86dga/CONFLICTS
   moonbase/trunk/xorg7/x11-extras/xterm/CONFLICTS
   moonbase/trunk/xorg7/x11-font/encodings/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-adobe-100dpi/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-adobe-75dpi/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-adobe-utopia-100dpi/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-adobe-utopia-75dpi/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-adobe-utopia-type1/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-alias/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-arabic-misc/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-bh-100dpi/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-bh-75dpi/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-bh-lucidatypewriter-100dpi/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-bh-lucidatypewriter-75dpi/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-bh-ttf/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-bh-type1/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-bitstream-100dpi/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-bitstream-75dpi/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-bitstream-speedo/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-bitstream-type1/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-cronyx-cyrillic/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-cursor-misc/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-daewoo-misc/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-dec-misc/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-ibm-type1/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-isas-misc/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-jis-misc/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-micro-misc/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-misc-cyrillic/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-misc-ethiopic/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-misc-meltho/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-misc-misc/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-mutt-misc/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-schumacher-misc/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-screen-cyrillic/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-sony-misc/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-sun-misc/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-util/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-winitzki-cyrillic/CONFLICTS
   moonbase/trunk/xorg7/x11-font/font-xfree86-type1/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libFS/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libICE/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libSM/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libX11/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXScrnSaver/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXTrap/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXau/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXaw/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXcomposite/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXcursor/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXdamage/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXdmcp/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXevie/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXext/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXfixes/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXfont/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXfontcache/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXft/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXi/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXinerama/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXmu/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXp/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXpm/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXprintAppUtil/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXprintUtil/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXrandr/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXrender/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXres/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXt/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXtst/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXv/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXvMC/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXxf86dga/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXxf86misc/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libXxf86vm/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libdmx/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libfontenc/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/liblbxutil/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/liboldX/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libxkbfile/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/libxkbui/CONFLICTS
   moonbase/trunk/xorg7/x11-libs/xtrans/CONFLICTS
   moonbase/trunk/xorg7/x11-profiles/XOrg7/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/applewmproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/bigreqsproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/compositeproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/damageproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/dmxproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/evieext/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/fixesproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/fontcacheproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/fontsproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/glproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/inputproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/kbproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/printproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/randrproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/recordproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/renderproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/resourceproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/scrnsaverproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/trapproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/videoproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/xcmiscproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/xextproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/xf86bigfontproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/xf86dgaproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/xf86driproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/xf86miscproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/xf86rushproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/xf86vidmodeproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/xineramaproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/xproto/CONFLICTS
   moonbase/trunk/xorg7/x11-proto/xproxymanagementprotocol/CONFLICTS
   moonbase/trunk/xorg7/x11-util/gccmakedep/CONFLICTS
   moonbase/trunk/xorg7/x11-util/imake/CONFLICTS
   moonbase/trunk/xorg7/x11-util/makedepend/CONFLICTS
   moonbase/trunk/xorg7/x11-util/rman/CONFLICTS
   moonbase/trunk/xorg7/x11-util/util-macros/CONFLICTS
   moonbase/trunk/xorg7/x11-util/xorg-cf-files/CONFLICTS
Log:
and on the x'th day we created XOrg6
gr,S.


Modified: moonbase/trunk/xorg7/mesa-glu/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/mesa-glu/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/mesa-glu/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,3 +1,3 @@
-conflicts XOrg       &&
+conflicts XOrg6       &&
 conflicts XOrg-test  &&
 conflicts mesa-lib

Modified: moonbase/trunk/xorg7/mesa-lib/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/mesa-lib/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/mesa-lib/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg &&
+conflicts XOrg6 &&
 conflicts XOrg-test &&
 conflicts NVIDIA &&
 conflicts NVIDIA-old &&

Modified: moonbase/trunk/xorg7/x11-apps/appres/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/appres/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/appres/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/bdftopcf/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/bdftopcf/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/bdftopcf/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/beforelight/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/beforelight/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/beforelight/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/bitmap/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/bitmap/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/bitmap/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/editres/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/editres/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/editres/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/fonttosfnt/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/fonttosfnt/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/fonttosfnt/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/fslsfonts/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/fslsfonts/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/fslsfonts/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/fstobdf/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/fstobdf/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/fstobdf/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/iceauth/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/iceauth/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/iceauth/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/ico/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/ico/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/ico/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/listres/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/listres/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/listres/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/luit/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/luit/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/luit/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/mkfontdir/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/mkfontdir/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/mkfontdir/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/mkfontscale/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/mkfontscale/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/mkfontscale/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/rgb/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/rgb/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/rgb/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/rstart/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/rstart/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/rstart/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/sessreg/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/sessreg/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/sessreg/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/setxkbmap/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/setxkbmap/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/setxkbmap/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/smproxy/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/smproxy/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/smproxy/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/twm/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/twm/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/twm/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/x11perf/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/x11perf/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/x11perf/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xauth/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xauth/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xauth/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xcalc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xcalc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xcalc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xclock/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xclock/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xclock/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xcmsdb/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xcmsdb/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xcmsdb/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xconsole/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xconsole/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xconsole/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xcursorgen/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xcursorgen/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xcursorgen/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xdbedizzy/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xdbedizzy/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xdbedizzy/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xdm/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xdm/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xdm/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xdpyinfo/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xdpyinfo/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xdpyinfo/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xdriinfo/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xdriinfo/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xdriinfo/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xedit/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xedit/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xedit/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xev/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xev/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xev/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xeyes/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xeyes/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xeyes/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xfs/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xfs/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xfs/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xgamma/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xgamma/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xgamma/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xhost/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xhost/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xhost/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xinit/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xinit/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xinit/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xkbcomp/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xkbcomp/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xkbcomp/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xkbevd/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xkbevd/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xkbevd/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xkbutils/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xkbutils/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xkbutils/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xkill/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xkill/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xkill/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xlsatoms/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xlsatoms/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xlsatoms/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xlsfonts/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xlsfonts/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xlsfonts/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xman/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xman/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xman/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xmessage/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xmessage/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xmessage/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xmh/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xmh/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xmh/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xmodmap/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xmodmap/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xmodmap/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xmore/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xmore/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xmore/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xplsprinters/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xplsprinters/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xplsprinters/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xpr/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xpr/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xpr/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xprop/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xprop/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xprop/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xrandr/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xrandr/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xrandr/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xrdb/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xrdb/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xrdb/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xrefresh/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xrefresh/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xrefresh/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xset/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xset/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xset/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xsetroot/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xsetroot/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xsetroot/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xvinfo/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xvinfo/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xvinfo/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xwd/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xwd/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xwd/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xwininfo/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xwininfo/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xwininfo/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xwud/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xwud/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xwud/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-apps/xxvidtune/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-apps/xxvidtune/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-apps/xxvidtune/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-data/xbitmaps/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-data/xbitmaps/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-data/xbitmaps/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-data/xcursor-themes/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-data/xcursor-themes/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-data/xcursor-themes/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-data/xkbdata/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-data/xkbdata/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-data/xkbdata/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-data/xkeyboard-config/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-data/xkeyboard-config/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-data/xkeyboard-config/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-acecad/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-acecad/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-acecad/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-aiptek/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-aiptek/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-aiptek/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-calcomp/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-calcomp/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-calcomp/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-citron/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-citron/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-citron/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-digitaledge/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-digitaledge/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-digitaledge/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-dmc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-dmc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-dmc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-dynapro/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-dynapro/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-dynapro/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-elo2300/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-elo2300/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-elo2300/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-elographics/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-elographics/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-elographics/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-evdev/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-evdev/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-evdev/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-fpit/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-fpit/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-fpit/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-hyperpen/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-hyperpen/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-hyperpen/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-jamstudio/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-jamstudio/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-jamstudio/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-joystick/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-joystick/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-joystick/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-keyboard/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-keyboard/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-keyboard/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-magellan/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-magellan/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-magellan/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-magictouch/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-magictouch/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-magictouch/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-microtouch/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-microtouch/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-microtouch/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-mouse/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-mouse/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-mouse/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-mutouch/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-mutouch/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-mutouch/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-palmax/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-palmax/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-palmax/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-penmount/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-penmount/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-penmount/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-spaceorb/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-spaceorb/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-spaceorb/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-summa/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-summa/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-summa/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-tek4957/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-tek4957/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-tek4957/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-ur98/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-ur98/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-ur98/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-vmmouse/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-vmmouse/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-vmmouse/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-input-void/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-input-void/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-input-void/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-apm/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-apm/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-apm/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-ark/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-ark/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-ark/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-ast/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-ast/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-ast/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-ati/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-ati/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-ati/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-chips/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-chips/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-chips/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-cirrus/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-cirrus/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-cirrus/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-cyrix/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-cyrix/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-cyrix/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-dummy/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-dummy/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-dummy/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-fbdev/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-fbdev/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-fbdev/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-glint/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-glint/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-glint/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-i128/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-i128/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-i128/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-i740/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-i740/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-i740/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-i810/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-i810/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-i810/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-imstt/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-imstt/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-imstt/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-intel/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-intel/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-intel/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-intel-git/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-intel-git/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-intel-git/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-mga/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-mga/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-mga/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-neomagic/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-neomagic/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-neomagic/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-newport/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-newport/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-newport/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-nsc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-nsc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-nsc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-nv/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-nv/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-nv/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-rendition/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-rendition/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-rendition/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-s3/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-s3/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-s3/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-s3virge/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-s3virge/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-s3virge/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-savage/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-savage/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-savage/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-siliconmotion/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-siliconmotion/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-siliconmotion/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-sis/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-sis/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-sis/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-sisusb/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-sisusb/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-sisusb/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-trident/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-trident/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-trident/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-v4l/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-v4l/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-v4l/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-vesa/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-vesa/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-vesa/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-vga/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-vga/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-vga/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-via/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-via/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-via/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-vmware/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-vmware/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-vmware/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-drivers/xf86-video-voodoo/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-drivers/xf86-video-voodoo/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-drivers/xf86-video-voodoo/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-extras/libdrm/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-extras/libdrm/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-extras/libdrm/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-extras/libxcb/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-extras/libxcb/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-extras/libxcb/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-extras/xcb-proto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-extras/xcb-proto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-extras/xcb-proto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-extras/xf86dga/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-extras/xf86dga/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-extras/xf86dga/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-extras/xterm/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-extras/xterm/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-extras/xterm/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/encodings/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/encodings/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/encodings/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-adobe-100dpi/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-adobe-100dpi/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-adobe-100dpi/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-adobe-75dpi/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-adobe-75dpi/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-adobe-75dpi/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-adobe-utopia-100dpi/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-adobe-utopia-100dpi/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-adobe-utopia-100dpi/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-adobe-utopia-75dpi/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-adobe-utopia-75dpi/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-adobe-utopia-75dpi/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-adobe-utopia-type1/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-adobe-utopia-type1/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-adobe-utopia-type1/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-alias/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-alias/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-alias/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-arabic-misc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-arabic-misc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-arabic-misc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-bh-100dpi/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-bh-100dpi/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-bh-100dpi/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-bh-75dpi/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-bh-75dpi/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-bh-75dpi/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-bh-lucidatypewriter-100dpi/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-bh-lucidatypewriter-100dpi/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-bh-lucidatypewriter-100dpi/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-bh-lucidatypewriter-75dpi/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-bh-lucidatypewriter-75dpi/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-bh-lucidatypewriter-75dpi/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-bh-ttf/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-bh-ttf/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-bh-ttf/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-bh-type1/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-bh-type1/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-bh-type1/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-bitstream-100dpi/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-bitstream-100dpi/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-bitstream-100dpi/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-bitstream-75dpi/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-bitstream-75dpi/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-bitstream-75dpi/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-bitstream-speedo/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-bitstream-speedo/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-bitstream-speedo/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-bitstream-type1/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-bitstream-type1/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-bitstream-type1/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-cronyx-cyrillic/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-cronyx-cyrillic/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-cronyx-cyrillic/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-cursor-misc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-cursor-misc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-cursor-misc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-daewoo-misc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-daewoo-misc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-daewoo-misc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-dec-misc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-dec-misc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-dec-misc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-ibm-type1/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-ibm-type1/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-ibm-type1/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-isas-misc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-isas-misc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-isas-misc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-jis-misc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-jis-misc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-jis-misc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-micro-misc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-micro-misc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-micro-misc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-misc-cyrillic/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-misc-cyrillic/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-misc-cyrillic/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-misc-ethiopic/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-misc-ethiopic/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-misc-ethiopic/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-misc-meltho/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-misc-meltho/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-misc-meltho/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-misc-misc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-misc-misc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-misc-misc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-mutt-misc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-mutt-misc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-mutt-misc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-schumacher-misc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-schumacher-misc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-schumacher-misc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-screen-cyrillic/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-screen-cyrillic/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-screen-cyrillic/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-sony-misc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-sony-misc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-sony-misc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-sun-misc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-sun-misc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-sun-misc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-util/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-util/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-util/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-winitzki-cyrillic/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-winitzki-cyrillic/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-winitzki-cyrillic/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-font/font-xfree86-type1/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-font/font-xfree86-type1/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-font/font-xfree86-type1/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libFS/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libFS/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libFS/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libICE/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libICE/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libICE/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libSM/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libSM/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libSM/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libX11/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libX11/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libX11/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXScrnSaver/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXScrnSaver/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXScrnSaver/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXTrap/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXTrap/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXTrap/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXau/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXau/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXau/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXaw/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXaw/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXaw/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXcomposite/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXcomposite/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXcomposite/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXcursor/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXcursor/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXcursor/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXdamage/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXdamage/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXdamage/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXdmcp/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXdmcp/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXdmcp/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXevie/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXevie/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXevie/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXext/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXext/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXext/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXfixes/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXfixes/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXfixes/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXfont/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXfont/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXfont/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXfontcache/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXfontcache/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXfontcache/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXft/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXft/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXft/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXi/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXi/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXi/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXinerama/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXinerama/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXinerama/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXmu/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXmu/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXmu/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXp/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXp/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXp/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXpm/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXpm/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXpm/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXprintAppUtil/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXprintAppUtil/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXprintAppUtil/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXprintUtil/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXprintUtil/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXprintUtil/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXrandr/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXrandr/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXrandr/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXrender/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXrender/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXrender/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXres/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXres/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXres/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXt/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXt/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXt/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXtst/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXtst/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXtst/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXv/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXv/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXv/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXvMC/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXvMC/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXvMC/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXxf86dga/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXxf86dga/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXxf86dga/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXxf86misc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXxf86misc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXxf86misc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libXxf86vm/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libXxf86vm/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libXxf86vm/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libdmx/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libdmx/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libdmx/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libfontenc/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libfontenc/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libfontenc/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/liblbxutil/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/liblbxutil/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/liblbxutil/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/liboldX/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/liboldX/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/liboldX/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libxkbfile/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libxkbfile/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libxkbfile/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/libxkbui/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/libxkbui/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/libxkbui/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-libs/xtrans/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-libs/xtrans/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-libs/xtrans/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-profiles/XOrg7/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-profiles/XOrg7/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-profiles/XOrg7/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/applewmproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/applewmproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/applewmproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/bigreqsproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/bigreqsproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/bigreqsproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/compositeproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/compositeproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/compositeproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/damageproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/damageproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/damageproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/dmxproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/dmxproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/dmxproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/evieext/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/evieext/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/evieext/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/fixesproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/fixesproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/fixesproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/fontcacheproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/fontcacheproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/fontcacheproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/fontsproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/fontsproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/fontsproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/glproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/glproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/glproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/inputproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/inputproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/inputproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/kbproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/kbproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/kbproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/printproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/printproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/printproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/randrproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/randrproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/randrproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/recordproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/recordproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/recordproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/renderproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/renderproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/renderproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/resourceproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/resourceproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/resourceproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/scrnsaverproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/scrnsaverproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/scrnsaverproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/trapproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/trapproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/trapproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/videoproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/videoproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/videoproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/xcmiscproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/xcmiscproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/xcmiscproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/xextproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/xextproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/xextproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/xf86bigfontproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/xf86bigfontproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/xf86bigfontproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/xf86dgaproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/xf86dgaproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/xf86dgaproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/xf86driproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/xf86driproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/xf86driproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/xf86miscproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/xf86miscproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/xf86miscproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/xf86rushproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/xf86rushproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/xf86rushproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/xf86vidmodeproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/xf86vidmodeproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/xf86vidmodeproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/xineramaproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/xineramaproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/xineramaproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/xproto/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/xproto/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/xproto/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-proto/xproxymanagementprotocol/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-proto/xproxymanagementprotocol/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-proto/xproxymanagementprotocol/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-util/gccmakedep/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-util/gccmakedep/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-util/gccmakedep/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-util/imake/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-util/imake/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-util/imake/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-util/makedepend/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-util/makedepend/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-util/makedepend/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-util/rman/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-util/rman/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-util/rman/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-util/util-macros/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-util/util-macros/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-util/util-macros/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

Modified: moonbase/trunk/xorg7/x11-util/xorg-cf-files/CONFLICTS
===================================================================
--- moonbase/trunk/xorg7/x11-util/xorg-cf-files/CONFLICTS	2007-06-07 08:54:01 UTC (rev 24726)
+++ moonbase/trunk/xorg7/x11-util/xorg-cf-files/CONFLICTS	2007-06-07 08:54:49 UTC (rev 24727)
@@ -1,4 +1,4 @@
-conflicts XOrg  &&
+conflicts XOrg6  &&
 conflicts XOrg-test &&
 conflicts XOrg-fonts-base &&
 conflicts XOrg-fonts-extra &&

• Previous message: [Lunar-commits] r24726 - moonbase/trunk
• Next message: [Lunar-commits] r24728 - moonbase/trunk/libs/fltk
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]