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 /textproc/simplexml | |
| parent | 522c152d1c7b0c92982e310110fa6d59f915ffeb (diff) | |
Notes
Diffstat (limited to 'textproc/simplexml')
| -rw-r--r-- | textproc/simplexml/Makefile | 4 | ||||
| -rw-r--r-- | textproc/simplexml/files/patch-cmake__FindIconv.cmake | 61 |
2 files changed, 57 insertions, 8 deletions
diff --git a/textproc/simplexml/Makefile b/textproc/simplexml/Makefile index 2a7eb66fa516..dba29260a152 100644 --- a/textproc/simplexml/Makefile +++ b/textproc/simplexml/Makefile @@ -3,6 +3,7 @@ PORTNAME= simplexml PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= http://bitbucket.org/klepa/simplexml/get/ DISTNAME= ${PORTVERSION} @@ -24,7 +25,6 @@ CMAKE_ARGS+= -DDEBUG_MODE:BOOL=ON post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|; \ - /set.*CMAKE_BUILD_TYPE/d' ${WRKSRC}/CMakeLists.txt \ - ${WRKSRC}/cmake/FindIconv.cmake + /set.*CMAKE_BUILD_TYPE/d' ${WRKSRC}/CMakeLists.txt .include <bsd.port.mk> diff --git a/textproc/simplexml/files/patch-cmake__FindIconv.cmake b/textproc/simplexml/files/patch-cmake__FindIconv.cmake index a7d1db0ad0db..b52dadbd0a2f 100644 --- a/textproc/simplexml/files/patch-cmake__FindIconv.cmake +++ b/textproc/simplexml/files/patch-cmake__FindIconv.cmake @@ -1,11 +1,60 @@ ---- cmake/FindIconv.cmake.orig 2014-09-03 02:19:35 UTC +--- cmake/FindIconv.cmake.orig 2010-08-17 10:55:45 UTC +++ cmake/FindIconv.cmake -@@ -40,7 +40,7 @@ +@@ -30,45 +30,29 @@ + # also defined, but not for general use are + # Iconv_LIBRARY, where to find the Iconv library. + ++include(CheckFunctionExists) ++ + set(ICONV_H iconv.h) + + + find_path(ICONV_INCLUDE_DIR ${ICONV_H} +- PATHS /usr/local/include +- /usr/include +- NO_DEFAULT_PATH DOC "Path to the ${ICONV_H} file" ) -find_library(Iconv_LIBRARY NAMES iconv -+find_library(Iconv_LIBRARY NAMES iconv c - PATHS /usr/local/lib - /usr/lib - NO_DEFAULT_PATH +- PATHS /usr/local/lib +- /usr/lib +- NO_DEFAULT_PATH +- DOC "Library for character set conversion" +-) +- +-if(ICONV_INCLUDE_DIR AND Iconv_LIBRARY) +- set(Iconv_FOUND TRUE) +-else(ICONV_INCLUDE_DIR AND Iconv_LIBRARY) +- set(Iconv_FOUND FALSE) +-endif(ICONV_INCLUDE_DIR AND Iconv_LIBRARY) ++if(ICONV_INCLUDE_DIR) ++ check_function_exists(iconv Iconv_FOUND) ++ if(NOT Iconv_FOUND) ++ find_library(Iconv_LIBRARY NAMES iconv libiconv libiconv-2) ++ if(Iconv_LIBRARY) ++ set(Iconv_FOUND TRUE) ++ endif(Iconv_LIBRARY) ++ endif(NOT Iconv_FOUND) ++endif(ICONV_INCLUDE_DIR) + + if(Iconv_FOUND) + if(NOT Iconv_FIND_QUIETLY) +- message(STATUS "Found Iconv: ${Iconv_LIBARY}") ++ message(STATUS "Found Iconv: ${Iconv_LIBRARY}") + endif(NOT Iconv_FIND_QUIETLY) +-else(Iconv_FOUND) +- if("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD") +- if(NOT Iconv_FIND_QUIETLY) +- if(Iconv_FIND_REQUIRED) +- message(FATAL_ERROR "Could not find the Iconv Library") +- else(Iconv_FIND_REQUIRED) +- message(STATUS "Could not find the Iconv Library") +- endif(Iconv_FIND_REQUIRED) +- endif(NOT Iconv_FIND_QUIETLY) +- else("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD") +- set(Iconv_LIBRARY "") +- endif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD") + endif(Iconv_FOUND) + + mark_as_advanced(ICONV_INCLUDE_DIR Iconv_LIBRARY) |