cvs commit: src/share/mk

Matthew Dillon dillon at
Fri May 6 09:29:43 PDT 2005

:>   Another-bug-from: Erik P. Skaalerud <erik at xxxxxxxxxxxx>
:>   Revision  Changes    Path
:>   1.33      +1 -1      src/share/mk/
:Looks like this fix didnt introduce any new problems, and it solved 
:mine. Matt, can you please MFC this?
:- Erik

    It looks like there are several commits to that file since the
    release (which is as of rev 1.29 of this file).

    We don't want to MFC 1.32.  What about 1.31 and 1.30 ?

					Matthew Dillon 
					<dillon at xxxxxxxxxxxxx>

revision 1.33
date: 2005-05-03 07:16:04 -0700;  author: joerg;  state: Exp;  lines: +1 -1
Refine USE_RC_SUBR / USE_RCORDER handling. The install-rc-script target
should not be defined for, since some ports define the
variables after it.

Another-bug-from: Erik P. Skaalerud <erik at xxxxxxxxxxxx>
revision 1.32
date: 2005-04-20 14:58:13 -0700;  author: okumoto;  state: Exp;  lines: +0 -1
Stop exporting OSVERSION variable to enviornment via .makeenv.
This quiets a the warning that OSVERSION is from the commandline
when ports calls make recursively.

OSVERSION is only used by the make infrastructure, so anything that
references that variable would get it from make's global scope, or
would get it from a recursively called make which would have put
it into the env since it is in MAKEFLAGS.

Variables set in the command line and MAKEFLAGS are readonly, those
variables are also exported into the enviornment of make.  Nothing
in the makefiles are able to modified thier values. (POSIX)

This is compatible with .makeenv (soon to be .EXPORT:)
     o if variable does not exist create it and
       export it to the enviornment, as empty string.
     o if variable exists, export it to the enviornment
       with its value.
     o if variable that is exported is set after being
       exported, export its new value.

     o if variable is from command line or MAKEFLAGS
       do net change is value, or modify the enviornment.
       Emit a warning.
revision 1.31
date: 2005-04-19 10:17:03 -0700;  author: joerg;  state: Exp;  lines: +1 -0
Provide correct PLIST_SUB value for batch scripts.
revision 1.30
date: 2005-04-08 09:38:31 -0700;  author: joerg;  state: Exp;  lines: +42 -1
Don't just undefine USE_RC_SUBR, because it does define the list
of rc scripts if it is defined and not YES. We didn't undefine USE_RCORDER,
which pulled the rc_subr port in.

Fix this by:
(a) save the old value or USE_RCORDER and USE_RC_SUBR to _DF_*.
(b) include the install-rc-script target from ports/Mk/,
but use _DF_* for the variables in the actual code.
(c) add _DF_* to the SUB_FILES list and add RC_SUBR to SUB_LIST.
(d) undefine USE_RC_SUBR and USE_RCORDER afterwards.

Problem-reported-by: Erik P. Skaalerud <erik at xxxxxxxxxxxx>

More information about the Commits mailing list