startup scripts executed twice after X11R6 and local merge

[[LoN]Kamikaze]

Doug Barton wrote:
> [LoN]Kamikaze wrote:
>> Maybe the suggestion to add
>>
>> local_startup="/usr/local/etc/rc.d"
>>
>> to /etc/rc.conf after the merge should be added to /usr/ports/UPDATING.
> 
> The mergebase script does that for you (and periodic too).
> 
> Doug
> 

Too bad that I merged by hand. Maybe this should be added to the list of things
the script does, so that other hand-mergers know what they have to do.