Date: Thu, 30 Apr 2015 16:53:07 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385053 - head/Mk/Uses Message-ID: <201504301653.t3UGr79C028186@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Apr 30 16:53:06 2015 New Revision: 385053 URL: https://svnweb.freebsd.org/changeset/ports/385053 Log: Use base system iconv.h again on FreeBSD stable/10. Modified: head/Mk/Uses/iconv.mk Modified: head/Mk/Uses/iconv.mk ============================================================================== --- head/Mk/Uses/iconv.mk Thu Apr 30 15:34:28 2015 (r385052) +++ head/Mk/Uses/iconv.mk Thu Apr 30 16:53:06 2015 (r385053) @@ -37,7 +37,8 @@ ICONV_PREFIX= /usr ICONV_CONFIGURE_ARG= ICONV_CONFIGURE_BASE= -.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && ${OSVERSION} < 1100069) \ +.if ${OPSYS} == DragonFly || (${OPSYS} == FreeBSD && (${OSVERSION} < 1001514 \ + || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069))) \ || exists(${LOCALBASE}/include/iconv.h) BUILD_DEPENDS+= libiconv>=1.14_8:${PORTSDIR}/converters/libiconv CPPFLAGS+= -DLIBICONV_PLUG
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504301653.t3UGr79C028186>