[Midnightbsd-cvs] mports [16719] trunk/Mk/extensions/iconv.mk: default to iconv from ports

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Aug 30 10:31:09 EDT 2014


Revision: 16719
          http://svnweb.midnightbsd.org/mports/?rev=16719
Author:   laffer1
Date:     2014-08-30 10:31:08 -0400 (Sat, 30 Aug 2014)
Log Message:
-----------
default to iconv from ports

Modified Paths:
--------------
    trunk/Mk/extensions/iconv.mk

Modified: trunk/Mk/extensions/iconv.mk
===================================================================
--- trunk/Mk/extensions/iconv.mk	2014-08-30 12:57:24 UTC (rev 16718)
+++ trunk/Mk/extensions/iconv.mk	2014-08-30 14:31:08 UTC (rev 16719)
@@ -13,7 +13,7 @@
 
 iconv_ARGS:=	${iconv_ARGS:S/,/ /g}
 
-.if !exists(/usr/include/iconv.h) || ${iconv_ARGS:Mwchar_t} || ${iconv_ARGS:Mtranslit} || ${OSVERSION} < 6000 || defined(PACKAGE_BUILDING)
+.if ${iconv_ARGS:Mwchar_t} || ${iconv_ARGS:Mtranslit} || ${OSVERSION} < 6000 || defined(PACKAGE_BUILDING) || !exists(/usr/include/iconv.h)
 
 ICONV_CMD=	${LOCALBASE}/bin/iconv
 ICONV_LIB=	-liconv



More information about the Midnightbsd-cvs mailing list