Date: Tue, 08 Aug 2006 12:44:16 +0200 From: "[LoN]Kamikaze" <LoN_Kamikaze@gmx.de> To: freebsd-ports@freebsd.org Subject: Re: conflict check for upcoming merge Message-ID: <44D86B00.80908@gmx.de> In-Reply-To: <44D64D33.8040002@gmx.de> References: <44D64D33.8040002@gmx.de>
next in thread | previous in thread | raw e-mail | index | archive | help
[LoN]Kamikaze wrote: > I have written a small script that checks for conflicts that would > occur if /usr/X11R6 and /usr/local were merged. The script is now available: http://www.familie-ost.info/~pj/FreeBSD/conflict.html My thanks go to Philipp Ost for hosting it. Here is the output of the script from another machine. Lots of qmake/qt conflicts, it seems: ==> Conflict share/locale/locale.alias /usr/X11R6/share/locale/locale.alias: multimedia/vlc /usr/local/share/locale/locale.alias: devel/gettext ==> Conflict share/doc/qt/html/qmake-manual-1.html /usr/X11R6/share/doc/qt/html/qmake-manual-1.html: x11-toolkits/qt33 /usr/local/share/doc/qt/html/qmake-manual-1.html: devel/qmake ==> Conflict share/doc/qt/html/qmake-manual-2.html /usr/X11R6/share/doc/qt/html/qmake-manual-2.html: x11-toolkits/qt33 /usr/local/share/doc/qt/html/qmake-manual-2.html: devel/qmake ==> Conflict share/doc/qt/html/qmake-manual-3.html /usr/X11R6/share/doc/qt/html/qmake-manual-3.html: x11-toolkits/qt33 /usr/local/share/doc/qt/html/qmake-manual-3.html: devel/qmake ==> Conflict share/doc/qt/html/qmake-manual-4.html /usr/X11R6/share/doc/qt/html/qmake-manual-4.html: x11-toolkits/qt33 /usr/local/share/doc/qt/html/qmake-manual-4.html: devel/qmake ==> Conflict share/doc/qt/html/qmake-manual-5.html /usr/X11R6/share/doc/qt/html/qmake-manual-5.html: x11-toolkits/qt33 /usr/local/share/doc/qt/html/qmake-manual-5.html: devel/qmake ==> Conflict share/doc/qt/html/qmake-manual-6.html /usr/X11R6/share/doc/qt/html/qmake-manual-6.html: x11-toolkits/qt33 /usr/local/share/doc/qt/html/qmake-manual-6.html: devel/qmake ==> Conflict share/doc/qt/html/qmake-manual-7.html /usr/X11R6/share/doc/qt/html/qmake-manual-7.html: x11-toolkits/qt33 /usr/local/share/doc/qt/html/qmake-manual-7.html: devel/qmake ==> Conflict share/doc/qt/html/qmake-manual-8.html /usr/X11R6/share/doc/qt/html/qmake-manual-8.html: x11-toolkits/qt33 /usr/local/share/doc/qt/html/qmake-manual-8.html: devel/qmake ==> Conflict share/doc/qt/html/qmake-manual.html /usr/X11R6/share/doc/qt/html/qmake-manual.html: x11-toolkits/qt33 /usr/local/share/doc/qt/html/qmake-manual.html: devel/qmake ==> Conflict share/doc/qt/html/qmake.dcf /usr/X11R6/share/doc/qt/html/qmake.dcf: x11-toolkits/qt33 /usr/local/share/doc/qt/html/qmake.dcf: devel/qmake ==> Conflict share/mime/subclasses /usr/X11R6/share/mime/subclasses: Does not belong to a package. /usr/local/share/mime/subclasses: Does not belong to a package. ==> Conflict share/mime/globs /usr/X11R6/share/mime/globs: Does not belong to a package. /usr/local/share/mime/globs: Does not belong to a package. ==> Conflict share/mime/magic /usr/X11R6/share/mime/magic: Does not belong to a package. /usr/local/share/mime/magic: Does not belong to a package. ==> Conflict share/mime/XMLnamespaces /usr/X11R6/share/mime/XMLnamespaces: Does not belong to a package. /usr/local/share/mime/XMLnamespaces: Does not belong to a package. ==> Conflict share/mime/aliases /usr/X11R6/share/mime/aliases: Does not belong to a package. /usr/local/share/mime/aliases: Does not belong to a package. ==> Conflict share/mime/mime.cache /usr/X11R6/share/mime/mime.cache: Does not belong to a package. /usr/local/share/mime/mime.cache: Does not belong to a package. ==> Conflict share/icons/hicolor/index.theme /usr/X11R6/share/icons/hicolor/index.theme: misc/hicolor-icon-theme /usr/local/share/icons/hicolor/index.theme: x11/kdelibs3 ==> Conflict share/gnome/applications/mimeinfo.cache /usr/X11R6/share/gnome/applications/mimeinfo.cache: Does not belong to a package. /usr/local/share/gnome/applications/mimeinfo.cache: Does not belong to a package. ==> Conflict share/applications/mimeinfo.cache /usr/X11R6/share/applications/mimeinfo.cache: Does not belong to a package. /usr/local/share/applications/mimeinfo.cache: Does not belong to a package. ==> Conflict info/dir /usr/X11R6/info/dir: Does not belong to a package. /usr/local/info/dir: Does not belong to a package. ==> Conflict man/whatis /usr/X11R6/man/whatis: Does not belong to a package. /usr/local/man/whatis: Does not belong to a package.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?44D86B00.80908>