diff options
| author | John Marino <marino@FreeBSD.org> | 2016-03-28 20:53:56 +0000 |
|---|---|---|
| committer | John Marino <marino@FreeBSD.org> | 2016-03-28 20:53:56 +0000 |
| commit | 49aa2bf7eb53a78faf50696a33c97add4cd29a30 (patch) | |
| tree | d7a6b163c48876bab5bcadb325e9dfdf83f3a303 /Mk/Uses/iconv.mk | |
| parent | Patch calibre to correctly extract device info from the hal through (diff) | |
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)
Notes
Notes:
svn path=/head/; revision=412072
Diffstat (limited to 'Mk/Uses/iconv.mk')
| -rw-r--r-- | Mk/Uses/iconv.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk index 92ce67d4fa76..169890bf13ea 100644 --- a/Mk/Uses/iconv.mk +++ b/Mk/Uses/iconv.mk @@ -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 |