diff options
| -rw-r--r-- | Mk/Uses/iconv.mk | 2 | ||||
| -rw-r--r-- | converters/libiconv/Makefile | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk index 06f1e5620394..7a12a843ece2 100644 --- a/Mk/Uses/iconv.mk +++ b/Mk/Uses/iconv.mk @@ -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 diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index 1543549aa316..857e42820175 100644 --- a/converters/libiconv/Makefile +++ b/converters/libiconv/Makefile @@ -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 |