diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2015-04-15 08:20:27 +0000 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2015-04-15 08:20:27 +0000 |
| commit | 074ea5282a00d556c73d86231bec5444990597dc (patch) | |
| tree | eec3d608e84e79f0187985e5a1e29cd4f04f13eb /mail/libvmime | |
| parent | 522c152d1c7b0c92982e310110fa6d59f915ffeb (diff) | |
Notes
Diffstat (limited to 'mail/libvmime')
| -rw-r--r-- | mail/libvmime/Makefile | 2 | ||||
| -rw-r--r-- | mail/libvmime/files/patch-cmake__FindIconv.cmake | 42 |
2 files changed, 34 insertions, 10 deletions
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile index 20beedc29e29..af0410e1b4ff 100644 --- a/mail/libvmime/Makefile +++ b/mail/libvmime/Makefile @@ -3,7 +3,7 @@ PORTNAME= libvmime PORTVERSION= 0.9.2.s20140721 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MAINTAINER= delphij@FreeBSD.org diff --git a/mail/libvmime/files/patch-cmake__FindIconv.cmake b/mail/libvmime/files/patch-cmake__FindIconv.cmake index 280eb3ae293e..9b35d3ffafa7 100644 --- a/mail/libvmime/files/patch-cmake__FindIconv.cmake +++ b/mail/libvmime/files/patch-cmake__FindIconv.cmake @@ -1,11 +1,35 @@ ---- cmake/FindIconv.cmake.orig 2014-06-30 22:48:42.000000000 +0200 -+++ cmake/FindIconv.cmake 2014-07-22 12:50:55.000000000 +0200 -@@ -18,7 +18,7 @@ - IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c HINTS "/opt/local/lib") - ELSE() +--- cmake/FindIconv.cmake.orig 2014-06-30 20:48:42 UTC ++++ cmake/FindIconv.cmake +@@ -7,6 +7,7 @@ + # ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const + # + include(CheckCXXSourceCompiles) ++include(CheckFunctionExists) + + IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) + # Already in cache, be silent +@@ -15,15 +16,15 @@ ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRA + + FIND_PATH(ICONV_INCLUDE_DIR iconv.h) + +-IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +- FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c HINTS "/opt/local/lib") +-ELSE() - FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c) -+ FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv c libiconv libiconv-2) - ENDIF() +-ENDIF() +- +-IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) +- SET(ICONV_FOUND TRUE) +-ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) ++IF(ICONV_INCLUDE_DIR) ++ CHECK_FUNCTION_EXISTS(iconv ICONV_FOUND) ++ IF(NOT ICONV_FOUND) ++ FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2) ++ IF(ICONV_LIBRARIES) ++ SET(ICONV_FOUND TRUE) ++ ENDIF(ICONV_LIBRARIES) ++ ENDIF(NOT ICONV_FOUND) ++ENDIF(ICONV_INCLUDE_DIR) - IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) + set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) + set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) |