pkg/28960: pkgsrc/mk/bsd.pkg.mk broken

[neil.hoggarth%physiol.ox.ac.uk@localhost]

>Number:         28960
>Category:       pkg
>Synopsis:       pkgsrc/mk/bsd.pkg.mk broken
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Jan 14 11:42:00 +0000 2005
>Originator:     Neil Hoggarth
>Release:        Solaris 9
>Organization:
University of Oxford
>Environment:
SunOS saros 5.9 Generic_112233-11 sun4u sparc SUNW,Ultra-30

>Description:
I'm using a /usr/pkgsrc tree, updated from CVS HEAD branch at about
09:30GMT this morning, on a SPARC Solaris 9 system.

Any attempt to use bmake in /usr/pkgsrc currently gives the following
errors:

bmake: "../../mk/../../mk/bsd.pkg.mk" line 2272: Malformed conditional 
(!empty(CONFIG_GUESS_OVERRIDE))
bmake: "../../mk/../../mk/bsd.pkg.mk" line 2283: if-less endif
bmake: "../../mk/../../mk/bsd.pkg.mk" line 2283: Need an operator
bmake: "../../mk/../../mk/bsd.pkg.mk" line 2284: Malformed conditional 
(!empty(CONFIG_SUB_OVERRIDE))
bmake: "../../mk/../../mk/bsd.pkg.mk" line 2295: if-less endif
bmake: "../../mk/../../mk/bsd.pkg.mk" line 2295: Need an operator
bmake: "../../mk/../../mk/bsd.pkg.mk" line 2296: Malformed conditional 
(!empty(CONFIG_RPATH_OVERRIDE))
bmake: "../../mk/../../mk/bsd.pkg.mk" line 2307: if-less endif
bmake: "../../mk/../../mk/bsd.pkg.mk" line 2307: Need an operator
bmake: Fatal errors encountered -- cannot continue

The problem seems to have been introduced in CVS checkin 1.1559
of the mk/bsd.pkg.mk file. Reverting the mk/bsd.pkg.mk file to r1.1558
allows bmake to work in pkgsrc again.

I don't have any other platforms to test at the moment, and I don't
know if the problem is specific to builds on Solaris or more general.

>How-To-Repeat:
"bmake clean" in any pkgsrc directory should do it.

>Fix: