svn commit: r316469 - head/databases/slony1v2

[Chris Rees]

On 24 April 2013 20:37, Jung-uk Kim <jkim at freebsd.org> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 2013-04-24 15:30:57 -0400, Chris Rees wrote:
>> On 24 April 2013 20:21, Jung-uk Kim <jkim at freebsd.org> wrote:
>>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
>>>
>>> On 2013-04-24 15:08:00 -0400, Jimmy Olgeni wrote:
>>>>
>>>> On Wed, 24 Apr 2013, Jung-uk Kim wrote:
>>>>
>>>>> On 2013-04-24 14:50:57 -0400, Jimmy Olgeni wrote:
>>>>>> Author: olgeni Date: Wed Apr 24 18:50:57 2013 New
>>>>>> Revision: 316469 URL:
>>>>>> http://svnweb.freebsd.org/changeset/ports/316469
>>>>>>
>>>>>> Log: - Use bsd.port.options.mk. - PORTDOCS should not be
>>>>>> conditional. - Whitespace fix.
>>>>> ...
>>>>>
>>>>> bsd.port.mk says "(PORTDOCS) should not be set when no
>>>>> documentation files are installed" and I believe it is
>>>>> actually correct.
>>>>
>>>> I found this on the Porter's Handbook:
>>>>
>>>> If a directory is listed in PORTDOCS or matched by a glob
>>>> pattern from this variable, the entire subtree of contained
>>>> files and directories will be registered in the final packing
>>>> list. If the DOCS option has been unset then files and
>>>> directories listed in PORTDOCS would not be installed or added
>>>> to port packing list.
>>>>
>>>> It seems to behave correctly, at least in the PORTDOCS=* case.
>>>
>>> It may work for now because bsd.options.mk has backward compat
>>> shim, i.e.,
>>>
>>> ## Now some compatibility .if empty(PORT_OPTIONS:MDOCS)
>>> NOPORTDOCS=     yes .endif
>>>
>>> It won't work when we deprecate the compat shims.
>>
>> Yes, bsd.port.mk needs fixing there.
>
> Agreed.
>
> We should refrain from blindly making PORTDOCS unconditional until we
> resolve the issue, IMHO.

Huh?

It's not an issue at all, it's just that bsd.port.mk relies on a compat shim.

Removing the compat shim would cause an issue, but we're not there
yet, and it's a trivial fix.  Including PORTDOCS conditionally has
always been wrong.

Chris