Date: Sun, 6 Aug 2006 16:21:25 -0400 From: "michael johnson" <ahze@ahze.net> To: "[LoN]Kamikaze" <LoN_Kamikaze@gmx.de> Cc: freebsd-ports@freebsd.org Subject: Re: conflict check for upcoming merge Message-ID: <b2203fed0608061321s7fa26048se343da71bd279dda@mail.gmail.com> In-Reply-To: <44D64D33.8040002@gmx.de> References: <44D64D33.8040002@gmx.de>
next in thread | previous in thread | raw e-mail | index | archive | help
On 8/6/06, [LoN]Kamikaze <LoN_Kamikaze@gmx.de> wrote: > > I have written a small script that checks for conflicts that would > occur if /usr/X11R6 and /usr/local were merged. Whoever is interested > should mail me. This is the output on my system. > > ==> Conflict man/man3/Object.3.gz > /usr/X11R6/man/man3/Object.3.gz: x11-toolkits/open-motif > /usr/local/man/man3/Object.3.gz: lang/tcl84 > > ==> Conflict man/whatis > /usr/X11R6/man/whatis: Does not belong to a package. > /usr/local/man/whatis: Does not belong to a package. > > ==> Conflict bin/showfont > /usr/X11R6/bin/showfont: x11/xorg-clients > /usr/local/bin/showfont: graphics/sdl_ttf > > ==> Conflict share/locale/locale.alias > /usr/X11R6/share/locale/locale.alias: multimedia/vlc > /usr/local/share/locale/locale.alias: devel/gettext > > ==> 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. > > > I'm working on a script that moves all the files from /usr/X11R6 to > /usr/local > and only leave a symlink /usr/X11R6 -> /usr/local behind. > Afterwards it is supposed to update /var/db/pkg . Thanks for the work, all the .cache files and info/dir files are safe for the merge since they are auto-generated. The kde/gnome conflicts we're working on resolving. _______________________________________________ > freebsd-ports@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?b2203fed0608061321s7fa26048se343da71bd279dda>