ap2-perl build failure

Hi,

I'm rebuilding Perl-related packages after the recent upgrade to Perl
5.16 but ap2-perl fails:

cc -I/usr/pkgsrc/www/ap2-perl/work/mod_perl-2.0.5/src/modules/perl 
-I/usr/pkgsrc/www/ap2-perl/work/mod_perl-2.0.5/xs -I/usr/pkg/include/apr-1 
-I/usr/pkg/include/apr-1 -I/usr/X11R7/include -I/usr/pkg/include/httpd -O2 
-pthread -I/usr/include -fno-strict-aliasing -pipe -fstack-protector 
-I/usr/pkg/include -I/usr/pkg/lib/perl5/5.16.0/i386-netbsd-thread-multi/CORE 
-DMOD_PERL -DMP_COMPAT_1X -DNETBSD -O2  -pthread  -I/usr/include -DPIC -fPIC  
-c mod_perl.c &&  mod_perl.o mod_perl.lo
mod_perl.o: not found
*** Error code 127

Stop.

Looks like a command (mv?) is missing after &&.

After some research, MODPERL_MV is indeed missing:

mod_perl-2.0.5/lib/Apache2/BuildConfig.pm:'MODPERL_MV' => '',
mod_perl-2.0.5/src/modules/perl/Makefile:MODPERL_MV = 

After modifying mod_perl-2.0.5/src/modules/perl/Makefile that
way:

MODPERL_MV = mv

the compilation goes a little farther but sill fails:

cc -I/usr/pkgsrc/www/ap2-perl/work/mod_perl-2.0.5/src/modules/perl 
-I/usr/pkgsrc/www/ap2-perl/work/mod_perl-2.0.5/xs -I/usr/pkg/include/apr-1 
-I/usr/pkg/include/apr-1 -I/usr/X11R7/include -I/usr/pkg/include/httpd -O2 
-pthread -I/usr/include -fno-strict-aliasing -pipe -fstack-protector 
-I/usr/pkg/include -I/usr/pkg/lib/perl5/5.16.0/i386-netbsd-thread-multi/CORE 
-DMOD_PERL -DMP_COMPAT_1X -DNETBSD -O2  -pthread  -I/usr/include -DPIC -fPIC  
-c modperl_perl.c && mv modperl_perl.o modperl_perl.lo
modperl_perl.c: In function 'modperl_perl_init_ids':
modperl_perl.c:99: error: 'PL_uid' undeclared (first use in this
function)
modperl_perl.c:99: error: (Each undeclared identifier is reported
only once
modperl_perl.c:99: error: for each function it appears in.)
modperl_perl.c:100: error: 'PL_euid' undeclared (first use in
this function)
modperl_perl.c:101: error: 'PL_gid' undeclared (first use in this
function)
modperl_perl.c:102: error: 'PL_egid' undeclared (first use in
this function)
*** Error code 1

Stop.

I don't know if this is related to the Perl upgrade or if this is
just a coincidence...

BTW, I'm using a fresh pkgsrc (updated this morning) on
NetBSD/i386 5.1.2.