From owner-svn-ports-all@FreeBSD.ORG  Wed Oct 23 15:05:04 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id C8FE6F01;
 Wed, 23 Oct 2013 15:05:04 +0000 (UTC) (envelope-from uqs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id B5FB6264B;
 Wed, 23 Oct 2013 15:05:04 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NF54JC020358;
 Wed, 23 Oct 2013 15:05:04 GMT (envelope-from uqs@svn.freebsd.org)
Received: (from uqs@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NF542J020356;
 Wed, 23 Oct 2013 15:05:04 GMT (envelope-from uqs@svn.freebsd.org)
Message-Id: <201310231505.r9NF542J020356@svn.freebsd.org>
From: Ulrich Spoerlein <uqs@FreeBSD.org>
Date: Wed, 23 Oct 2013 15:05:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r331388 - in head: Mk/Uses converters/libiconv
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Oct 2013 15:05:04 -0000

Author: uqs
Date: Wed Oct 23 15:05:04 2013
New Revision: 331388
URL: http://svnweb.freebsd.org/changeset/ports/331388

Log:
  Allow users to install converters/libiconv on 10.x systems if they
  decided to build world with WITHOUT_ICONV set. There's no need for
  this check to be based on OSVERSION.
  
  Some users (i.e. me), report subtle application breakages with the
  iconv-from-src that disappear when iconv-from-ports is installed.
  Allow for a bridge till these issues are sorted out.
  
  Approved by:	portmgr (bdrewery)

Modified:
  head/Mk/Uses/iconv.mk
  head/converters/libiconv/Makefile

Modified: head/Mk/Uses/iconv.mk
==============================================================================
--- head/Mk/Uses/iconv.mk	Wed Oct 23 14:00:31 2013	(r331387)
+++ head/Mk/Uses/iconv.mk	Wed Oct 23 15:05:04 2013	(r331388)
@@ -16,7 +16,7 @@ _INCLUDE_USES_ICONV_MK=	yes
 iconv_ARGS=     lib
 .endif
 
-.if !exists(/usr/include/iconv.h) && ${OSVERSION} < 1000043
+.if !exists(/usr/include/iconv.h)
 
 ICONV_CMD=	${LOCALBASE}/bin/iconv
 ICONV_LIB=	-liconv

Modified: head/converters/libiconv/Makefile
==============================================================================
--- head/converters/libiconv/Makefile	Wed Oct 23 14:00:31 2013	(r331387)
+++ head/converters/libiconv/Makefile	Wed Oct 23 15:05:04 2013	(r331388)
@@ -52,8 +52,8 @@ post-patch:
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 1000043
-IGNORE=		converters/libiconv should not be used with OSVERSION > 1000043. \
+.if exists(/usr/include/iconv.h)
+IGNORE=		converters/libiconv should not be used with iconv from base. \
 Please fix the port which tries to use it
 .endif