conflict check for upcoming merge

[[LoN]Kamikaze]

Doug Barton wrote:
> [LoN]Kamikaze wrote:
> 
>> Here is the output of the script from another machine. Lots of
>> qmake/qt conflicts, it seems:
> 
> FWIW, I ran this on my 6-stable box that still has the LOCAL/X11 split (list
> of ports attached), and got similar results. The qt stuff should be fairly
> easily solved, so that isn't too worrisome.

Yep, it's just documentation.

> If I could suggest some improvements for the script (awkward since I can't
> help code them atm) :)
> 
> 1. Ignore info/dir and man/whatis. They are non-issues.

I have decided to display all conflicts, because the intended merger script
will have to deal with them (i.e. by running makewhatis).

> 2. It would be useful (IMO) to flag files vs. directories. Files are more of
> a problem, since two ports could be installing different versions of a file
> with the same name and path. If we find that there are common directories
> that a lot of ports need, we can add them to the mtree files and remove them
> from the pkg-plists. There is a non-zero amount of work involved there of
> course, but it's a lot less difficult than the file problem.

At the moment I don't do any directory checking, since non empty directories
do not get deleted by the packaging system, it does not really matter to me,
which package a directory belongs to. I should add a check for different
permissions, though.

> Finally there is enough mime related stuff in the output of conflicts for me
> that it would seem the project that was suggested here a while back to
> create a unified mime port could probably bear a lot of fruit in the new
> world order, but once again, I'm in the awkward position of not being able
> to contribute work towards this goal, just "helpful" suggestions. :)
> 
> One place to start might be the division between
> *share/gnome/applications/mimeinfo.cache (interesting that gnome has it in
> both places itself) and *share/applications/mimeinfo.cache.

I am not up to date on that topic. The way I understand it the files can simply
be deleted and will be recreated if the need arises.

I do not like that applications write anywhere else but /home, but that
is another discussion.