X.org 7.2 ports merged into the FreeBSD Ports Tree

[Parv]

in message <4650BD2C.6060801 at FreeBSD.org>,
wrote Doug Barton thusly...
>
>  Parv wrote:
> 
> > I am using FreeBSD 6.  I haven't tried xorg 7.2 port(s) yet, but
> > recently did merge /usr/X11R6 to /usr/local (programs reinstalled,
> > made link to X11R6 to local, and such).  On a reboot after that,
> > scripts indeed ran twice
...
> Could you try restoring the default rc.conf entry, and apply the
> patch I posted to /etc/rc.subr? It would be nice to get testing
> from someone who was actually affected by the problem.

Doug, after commenting out $local_{periodic,startup} lines in
/etc/rc.conf, the patch posted in message
<464F8AAF.2010609 at FreeBSD.org> failed to stop double execution of
scripts.

I do not see how the statement on line 1490 ...


  1489  case "$local_rc" in
  1490  *[\ ]*${f}[\ ]*|*[\ ]*${f}) ;;
  1491  *) local_rc="${local_rc} $f" ;;
  1492  esac


... work without actually resolving the paths, at least in case of ...

  lrwxr-xr-x  1 root  wheel  11 May 16 16:30 /usr/X11R6@ -> /misc/local
  lrwxr-xr-x  1 root  wheel  11 Dec 21  2004 /usr/local@ -> /misc/local


... since 'X11R6' will always be different than 'local'.

Please look over the attached patch (where, at least in my case,
after resolving directories in $local_startup, already_seen function
calls can be omitted just before making file list).  The patch is
against this /etc/rc.subr version ...

  # $FreeBSD: src/etc/rc.subr,v 1.34.2.20 2007/03/16 15:34:09 yar Exp


  - Parv

-- 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: rc.subr-nodupes-4.diff
Type: text/x-diff
Size: 2082 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20070521/aa46391b/rc.subr-nodupes-4.bin