-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

"Christopher W. Richardson" <cwr@nexthop.com> writes:

> "Christopher W. Richardson" <cwr@nexthop.com> writes:
>
>> "Adrian Portelli" <adrianp@stindustries.net> writes:
>>
>>> ...
>>>> So, maybe we don't need to worry about treating pear separately
>>>> anymore?
>>>
>>> I've updated the package to 5.1.4nb1.  Please update your
>>> sources and try installing the package again.
>>
>> Works for me.
>
> Alas, I spoke too soon (sort of).  Building php5, natively,
> does, in fact, now work for me.  But that change seems to not
> have been propagated to www/ap-php.  I'll try and poke around
> through the Makefile logic later this evening if no one else
> gets to it -- but if someone else gets to it first, that'd be
> great :)

OK, no one else got to it, so, here's the problem:

/usr/pkgsrc/lang/php5
cwr@ns#grep DIST_SUBDIR *
Makefile:DIST_SUBDIR=           ${PKGNAME}
Makefile.common:DIST_SUBDIR=            ${DISTNAME}
cwr@ns#make show-var VARNAME=DISTNAME
php-5.1.4
cwr@ns#make show-var VARNAME=PKGNAME
php-5.1.4nb1

So, when building php5 as a stand-alone package, everything works
fine, but when building ap-php it gets confused by including
Makefile.common which causes it to look in php-5.1.4 when the
files are really in php-5.1.4nb1.

I'm just not sure on what the Right thing to do is -- change it
so the native package uses DISTNAME, or do something in
Makefile.common to append nb[patch] to the (calculated)
DIST_SUBDIR.

Is there an agreed standard?

Cheers,
Chris
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (NetBSD)
Comment: Processed by Mailcrypt 3.5.8 <http://mailcrypt.sourceforge.net/>

iD8DBQFEao7sP65RBOOHTzERApj2AJ9LHsTuoPkA2TYtV1Ga6uBrAkEfxgCdGKZw
LK/0mRB1b/Tiqz+uE8AMG78=
=oQK7
-----END PGP SIGNATURE-----