From owner-svn-ports-all@FreeBSD.ORG Thu Oct 17 13:50:53 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 884129E3; Thu, 17 Oct 2013 13:50:53 +0000 (UTC) (envelope-from vg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5D7D3219A; Thu, 17 Oct 2013 13:50:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9HDorXI011673; Thu, 17 Oct 2013 13:50:53 GMT (envelope-from vg@svn.freebsd.org) Received: (from vg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9HDor19011667; Thu, 17 Oct 2013 13:50:53 GMT (envelope-from vg@svn.freebsd.org) Message-Id: <201310171350.r9HDor19011667@svn.freebsd.org> From: Veniamin Gvozdikov Date: Thu, 17 Oct 2013 13:50:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330643 - in head/textproc/ctpp2: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Oct 2013 13:50:53 -0000 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@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)