svn commit: r330643 - in head/textproc/ctpp2: . files

[Veniamin Gvozdikov]

Author: vg
Date: Thu Oct 17 13:50:52 2013
New Revision: 330643
URL: http://svnweb.freebsd.org/changeset/ports/330643

Log:
  - Added depends by gcc because clang doesn't build
  - Fixed find libiconv on 10.x
  
  Approved by:	eadler, osa, rm (mentros, implicit)

Modified:
  head/textproc/ctpp2/Makefile
  head/textproc/ctpp2/files/patch-CMakeLists.txt

Modified: head/textproc/ctpp2/Makefile
==============================================================================
--- head/textproc/ctpp2/Makefile	Thu Oct 17 13:50:20 2013	(r330642)
+++ head/textproc/ctpp2/Makefile	Thu Oct 17 13:50:52 2013	(r330643)
@@ -9,8 +9,9 @@ MASTER_SITES=	http://ctpp.havoc.ru/downl
 MAINTAINER=	vg at 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}
 

Modified: head/textproc/ctpp2/files/patch-CMakeLists.txt
==============================================================================
--- head/textproc/ctpp2/files/patch-CMakeLists.txt	Thu Oct 17 13:50:20 2013	(r330642)
+++ head/textproc/ctpp2/files/patch-CMakeLists.txt	Thu Oct 17 13:50:52 2013	(r330643)
@@ -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)