svn commit: r443499 - head/Mk/Uses

[Tijl Coosemans]

On Wed, 14 Jun 2017 11:15:12 +0200 Koop Mast <kwm at FreeBSD.org> wrote:
> On Tue, 2017-06-13 at 13:28 +0000, Tijl Coosemans wrote:
>> Author: tijl
>> Date: Tue Jun 13 13:28:49 2017
>> New Revision: 443499
>> URL: https://svnweb.freebsd.org/changeset/ports/443499
>> 
>> Log:
>>   Remove check for unsupported versions of FreeBSD and add some
>> comments.
>>   
>>   Submitted by:	John Hein <john.hein at microsemi.com>
>> 
>> Modified:
>>   head/Mk/Uses/iconv.mk
>> 
>> Modified: head/Mk/Uses/iconv.mk
>> =====================================================================
>> =========
>> --- head/Mk/Uses/iconv.mk	Tue Jun 13 10:44:52 2017	(r44
>> 3498)
>> +++ head/Mk/Uses/iconv.mk	Tue Jun 13 13:28:49 2017	(r44
>> 3499)
>> @@ -41,13 +41,12 @@ ICONV_CONFIGURE_BASE=
>>  ICONV_INCLUDE_PATH=	/usr/include
>>  ICONV_LIB_PATH=		/usr/lib/libc.so
>>  
>> -.if (${OPSYS} == FreeBSD && \
>> - (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069)) \
>> - || exists(${LOCALBASE}/include/iconv.h)
>> +.if exists(${LOCALBASE}/include/iconv.h)
>> +# Check that libiconv iconv.h is recent enough for LIBICONV_PLUG to
>> work.
>>  BUILD_DEPENDS+=	libiconv>=1.14_9:converters/libiconv
>> -ICONV_INCLUDE_PATH=	${LOCALBASE}/include
>>  .endif
>>  
>> +# LIBICONV_PLUG makes libiconv iconv.h act like libc iconv.h.
>>  CPPFLAGS+=	-DLIBICONV_PLUG
>>  CFLAGS+=	-DLIBICONV_PLUG
>>  CXXFLAGS+=	-DLIBICONV_PLUG
> 
> Was it intended to remove the OSSYS check also? That probably going to
> break dragonfly.

The OPSYS check was inside the parentheses.  It only applied to the
OSVERSION check.  The exists check has always applied to Dragonfly as
well.