pkg/45061: pkgtools/bootstrap-mk-files bootstrap.sh not processing ${OPSYS}.bsd.own.mk.in

[tcort%minix3.org@localhost]

>Number:         45061
>Category:       pkg
>Synopsis:       pkgtools/bootstrap-mk-files bootstrap.sh not processing 
>${OPSYS}.bsd.own.mk.in
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Jun 14 14:20:00 +0000 2011
>Originator:     Thomas Cort
>Release:        N/A
>Organization:
Minix3
>Environment:
Minix 192.168.122.201 3.2.0 i686
>Description:
OS specific makefiles in files/mods, if they exist, 
get installed instead of the default makefiles in 
files/. In files/bootstrap.sh there is a special case
for handling bsd.own.mk.in. It looks for
mods/${OPSYS}.own.mk.in, but it should really look for
mods/${OPSYS}.bsd.own.mk.in. mods/IRIX.bsd.own.mk.in 
and mods/OpenBSD.bsd.own.mk.in exist, but are never
be processed. There are no files matching
mods/${OPSYS}.own.mk.in.

We discovered this issue when porting pkgsrc to Minix 
because Minix has it's own mods/Minix.bsd.own.mk.in file.

This patch was moved from pkg/45045 so that the PR would
only deal with one problem.
>How-To-Repeat:
On an IRIX or OpenBSD system, or a Minix system with the
minix pkgsrc repository, run the following commands...

cd /usr/pkgsrc/pkgtools/bootstrap-mk-files
bmake replace

If you look at the bsd.own.mk file it will be the default,
not the platform specific makefile.
>Fix:
diff --git a/pkgtools/bootstrap-mk-files/files/bootstrap.sh 
b/pkgtools/bootstrap-mk-files/files/bootstrap.sh
index 1084f656..b27bacf 100755
--- a/pkgtools/bootstrap-mk-files/files/bootstrap.sh
+++ b/pkgtools/bootstrap-mk-files/files/bootstrap.sh
@@ -25,8 +25,8 @@ done
 
 
subst_pattern='s|@ROOT_GROUP@|'${ROOT_GROUP}'|g;s|@ROOT_USER@|'${ROOT_USER}'|g;s|@SYSCONFDIR@|'${SYSCONFDIR}'|g'
 
-if [ -f mods/${OPSYS}.own.mk.in ]; then
-       ${SED} -e "${subst_pattern}" mods/${OPSYS}.own.mk.in > 
${MK_DST}/bsd.own.mk
+if [ -f mods/${OPSYS}.bsd.own.mk.in ]; then
+       ${SED} -e "${subst_pattern}" mods/${OPSYS}.bsd.own.mk.in > 
${MK_DST}/bsd.own.mk
 else
        ${SED} -e "${subst_pattern}" mods/bsd.own.mk.in > ${MK_DST}/bsd.own.mk
 fi