From owner-svn-ports-all@freebsd.org  Tue Jun 13 13:28:50 2017
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id D2F25BF47FB;
 Tue, 13 Jun 2017 13:28:50 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A1EAC7BD59;
 Tue, 13 Jun 2017 13:28:50 +0000 (UTC)
 (envelope-from tijl@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v5DDSnEw097666;
 Tue, 13 Jun 2017 13:28:49 GMT (envelope-from tijl@FreeBSD.org)
Received: (from tijl@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v5DDSnfs097665;
 Tue, 13 Jun 2017 13:28:49 GMT (envelope-from tijl@FreeBSD.org)
Message-Id: <201706131328.v5DDSnfs097665@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: tijl set sender to
 tijl@FreeBSD.org using -f
From: Tijl Coosemans <tijl@FreeBSD.org>
Date: Tue, 13 Jun 2017 13:28:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r443499 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Jun 2017 13:28:50 -0000

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@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	(r443498)
+++ head/Mk/Uses/iconv.mk	Tue Jun 13 13:28:49 2017	(r443499)
@@ -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