svn commit: r331388 - in head: Mk/Uses converters/libiconv

[Ulrich Spoerlein]

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