Module Name:	pkgsrc
Committed By:	grant
Date:		Sun Jul  6 20:40:35 UTC 2003

Modified Files:
	pkgsrc/pkgtools/rc.subr: Makefile
	pkgsrc/pkgtools/rc.subr/files: rc.subr

Log Message:
update to 20030706. sync with -current:

----------------------------
revision 1.59
date: 2003/07/04 14:14:10;  author: lukem;  state: Exp;  lines: +1 -7
Revert previous; the "return" if rc.subr had already loaded had issues
in some circumstances where run_rc_script()'s sourcing of an rc.d file
which then sourced rc.subr, the `optimisation' in rc.subr to "return as
we're already loaded" would finish more than just the inner-most sourcing.
I haven't tracked down the exact issue, but removing the `optimisation'
fixes the problem I noticed in starting up certain rc.d scripts, and
may fix [bin/22053] as well.


To generate a diff of this commit:
cvs rdiff -r1.4 -r1.5 pkgsrc/pkgtools/rc.subr/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/pkgtools/rc.subr/files/rc.subr

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.