pkg/42423: pkgsrc bootstrap puts --mk-fragment in mk.conf.example not mk.conf

[duck%shangtai.net@localhost]

>Number:         42423
>Category:       pkg
>Synopsis:       pkgsrc bootstrap puts --mk-fragment in mk.conf.example not 
>mk.conf
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Dec 07 17:30:00 +0000 2009
>Originator:     duck%shangtai.net@localhost
>Release:        pkgsrc-2009Q3
>Organization:
>Environment:
System: IRIX64 halo 6.5 6.5.29m 01090133 IP30
Architecture: mipseb
Machine: mipseb
>Description:
The bootstrap program puts the fragment supplied by --mk-fragment into the
example mk.conf, but not the generated mk.conf it uses to build bmake et al.

Is this a bug? In my opinion, it makes more sense to append the fragment to
both files; any tweak you apply is quite likely to be needed everywhere. In
any event you have the possibility of editing (indeed it is recommended as far
as I know) the installed example.
>How-To-Repeat:
Attempt to bootstrap on a system that requires mk.conf tweaks
>Fix:
Append the mk_fragment to both files

--- bootstrap.orig      Mon Dec  7 19:24:39 2009
+++ bootstrap   Mon Dec  7 19:25:07 2009
@@ -1017,6 +1017,8 @@
 echo "" >> ${TARGET_MKCONF}
 echo "" >> ${BOOTSTRAP_MKCONF}
 if test -n "${mk_fragment}"; then
+       cat "${mk_fragment}" >> ${BOOTSTRAP_MKCONF}
+       echo "" >> ${BOOTSTRAP_MKCONF}
        cat "${mk_fragment}" >> ${TARGET_MKCONF}
        echo "" >> ${TARGET_MKCONF}
 fi