svn commit: r334593 - in head/dns: bind96 bind96/files bind98 bind98/files bind99 bind99/files

John Marino freebsd.contact at marino.st
Tue Nov 26 07:47:29 UTC 2013


On 11/26/2013 04:53, Alexey Dokuchaev wrote:
> On Sun, Nov 24, 2013 at 10:37:01AM +0100, John Marino wrote:
>> I have attached a diff with the proposed changes covering all three
>> ports.  It's pretty straight-forward.
>>  
>>  .if ${PORT_OPTIONS:MREPLACE_BASE}
>> -.if ${OSVERSION} >= 1000500
>> +.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000500
> 
> Given that OSVERSION is used extensively in the tree, I'm worrying that
> adding these extra "${OPSYS} == FreeBSD" checks will our makefiles less
> readable.  Wouldn't it make more sense to place this check somewhere in
> single place, and define whatever OSVERSION that looks reasonable when
> OPSYS == FreeBSD instead of patching every port?

There is a "discussion" about this on the portmgr list.  Well, it's not
really a discussion.  I started it, bapt answered it once, and the
portmgr stopped talking about it.

As far as "less readable", that really should not be a concern at all.
It is simply invalid to use OSVERSION without OPSYS since it's OPSYS
specific.

However:
1) There are OSVERSION in use that can easily be replaced by existence check
2) Most OSVERSION checks could be moved to a separate, automatically
included makefile called "Makefile.FreeBSD".  This functionality exists
today.  Only FreeBSD platforms include Makefile.FreeBSD
3) Any remaining OSVERSION use in Makefiles should have a sweep to add
OPSYS with it.

I would encourage further discussion on portmgr@ list though, that's
where it has moved (well, at least attempted to be moved).

John


More information about the svn-ports-all mailing list