From owner-svn-ports-all@freebsd.org  Mon Mar 28 20:53:57 2016
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 74CF1AE0A3D;
 Mon, 28 Mar 2016 20:53:57 +0000 (UTC)
 (envelope-from marino@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 45A721E84;
 Mon, 28 Mar 2016 20:53:57 +0000 (UTC)
 (envelope-from marino@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2SKrusY015406;
 Mon, 28 Mar 2016 20:53:56 GMT (envelope-from marino@FreeBSD.org)
Received: (from marino@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2SKrukW015405;
 Mon, 28 Mar 2016 20:53:56 GMT (envelope-from marino@FreeBSD.org)
Message-Id: <201603282053.u2SKrukW015405@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: marino set sender to
 marino@FreeBSD.org using -f
From: John Marino <marino@FreeBSD.org>
Date: Mon, 28 Mar 2016 20:53:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r412072 - 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.21
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: Mon, 28 Mar 2016 20:53:57 -0000

Author: marino
Date: Mon Mar 28 20:53:56 2016
New Revision: 412072
URL: https://svnweb.freebsd.org/changeset/ports/412072

Log:
  Mk/Iconv.mk: Remove DragonFly exception
  
  This file has been locally patched in dports for over a year.  The
  exception hasn't been valid since DragonFly 4.0.
  
  Approved by:	erwin@ (portmgr)

Modified:
  head/Mk/Uses/iconv.mk

Modified: head/Mk/Uses/iconv.mk
==============================================================================
--- head/Mk/Uses/iconv.mk	Mon Mar 28 20:18:50 2016	(r412071)
+++ head/Mk/Uses/iconv.mk	Mon Mar 28 20:53:56 2016	(r412072)
@@ -41,7 +41,7 @@ ICONV_CONFIGURE_BASE=
 ICONV_INCLUDE_PATH=	/usr/include
 ICONV_LIB_PATH=		/usr/lib/libc.so
 
-.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \
+.if (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \
  || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \
  || exists(${LOCALBASE}/include/iconv.h)
 BUILD_DEPENDS+=	libiconv>=1.14_9:converters/libiconv