portupgrade bug: -M no longer works after v2.1.0

[Atanas]

Recent portupgrade versions no longer obey the -M command line switch, 
i.e. any optional arguments to be prepended to each make command.

How to reproduce:

# portinstall -M "APACHE_HARD_SERVER_LIMIT=1024" www/apache13
...
===> src/ap
cc -c  -I../os/unix -I../include -I/usr/local/include  -funsigned-char 
-O2 -fno-strict-aliasing -pipe 
-DDOCUMENT_LOCATION=\"/usr/local/www/data\" 
-DDEFAULT_PATH=\"/bin:/usr/bin:/usr/local/bin\" -DHARD_SERVER_LIMIT=512 
`../apaci` ap_cpystrn.c
...

Note the -DHARD_SERVER_LIMIT=512 above.

The stock version shipped with 6.1-RELEASE (2.0.1_1) seems to work as 
expected.

I tried all CVS versions after that (with portdowngrade) and found that 
the breakage has happened somewhere between 2.1.0 and 2.1.1 (2006/06/02 
- 2006/06/04).

Regards,
Atanas