diff options
| author | vg <vg@FreeBSD.org> | 2013-10-17 21:50:52 +0800 |
|---|---|---|
| committer | vg <vg@FreeBSD.org> | 2013-10-17 21:50:52 +0800 |
| commit | f00c480e699bc45cda032f60cc11a98d47db0281 (patch) | |
| tree | a8fe67b4ca6b5d375a939168c62e5e4a4817ecd3 /textproc/ctpp2 | |
| parent | 3ab7d508e0a5d43a3534821f7035f42ec73d8526 (diff) | |
| download | freebsd-ports-gnome-f00c480e699bc45cda032f60cc11a98d47db0281.tar.gz freebsd-ports-gnome-f00c480e699bc45cda032f60cc11a98d47db0281.tar.zst freebsd-ports-gnome-f00c480e699bc45cda032f60cc11a98d47db0281.zip | |
- Added depends by gcc because clang doesn't build
- Fixed find libiconv on 10.x
Approved by: eadler, osa, rm (mentros, implicit)
Diffstat (limited to 'textproc/ctpp2')
| -rw-r--r-- | textproc/ctpp2/Makefile | 3 | ||||
| -rw-r--r-- | textproc/ctpp2/files/patch-CMakeLists.txt | 19 |
2 files changed, 16 insertions, 6 deletions
diff --git a/textproc/ctpp2/Makefile b/textproc/ctpp2/Makefile index e6d8891ddee5..c7d62d72b470 100644 --- a/textproc/ctpp2/Makefile +++ b/textproc/ctpp2/Makefile @@ -9,8 +9,9 @@ MASTER_SITES= http://ctpp.havoc.ru/download/ MAINTAINER= vg@FreeBSD.org COMMENT= C++ library to use templates in C/C++ projects, version 2 -USES= cmake gettext iconv +USES= cmake gettext iconv:build USE_LDCONFIG= yes +USE_GCC= yes PLIST_SUB+= PORTVERSION=${PORTVERSION} diff --git a/textproc/ctpp2/files/patch-CMakeLists.txt b/textproc/ctpp2/files/patch-CMakeLists.txt index d93205a7ad81..6bb3ec0df3f6 100644 --- a/textproc/ctpp2/files/patch-CMakeLists.txt +++ b/textproc/ctpp2/files/patch-CMakeLists.txt @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2012-07-13 16:53:18.000000000 +0400 -+++ CMakeLists.txt 2012-08-13 15:53:30.167118048 +0400 +--- CMakeLists.txt.orig 2012-11-10 20:45:57.000000000 +0000 ++++ CMakeLists.txt 2013-10-17 11:18:51.783970185 +0000 @@ -21,6 +21,7 @@ OPTION(ICONV_DISCARD_ILSEQ "Discard illegal sequence and continue (iconv) [default: ON]" ON) @@ -8,7 +8,16 @@ # Build optimized code for following CPU (default i386) #SET(CPU_TUNE "i686") -@@ -656,6 +657,8 @@ +@@ -272,7 +273,7 @@ + INCLUDE_DIRECTORIES(${ICONV_INCLUDE}) + + IF (NOT "${SKIP_ICONV_LIRARY}" MATCHES "ON") +- FIND_LIBRARY(ICONV_LIBRARY NAMES iconv PATHS /lib ++ FIND_LIBRARY(ICONV_LIBRARY NAMES iconv libiconv c PATHS /lib + /opt/lib + /usr/lib + /usr/local/lib +@@ -660,6 +661,8 @@ SET_TESTS_PROPERTIES(Calls_D PROPERTIES DEPENDS Calls_R) ENDIF (DIFF_EXECUTABLE) @@ -17,7 +26,7 @@ FIND_PROGRAM(RST2HTML_EXECUTABLE "rst2html" /usr/local/bin /usr/bin) IF (RST2HTML_EXECUTABLE) ADD_CUSTOM_COMMAND( -@@ -665,6 +668,7 @@ +@@ -669,6 +672,7 @@ ) ADD_CUSTOM_TARGET(doc ALL DEPENDS template_language.html) ENDIF (RST2HTML_EXECUTABLE) @@ -25,7 +34,7 @@ # Install Headers INSTALL(FILES include/CDT.hpp -@@ -810,13 +814,15 @@ +@@ -814,13 +818,15 @@ GROUP_READ WORLD_READ) |