Date: Tue, 21 Jan 2014 16:18:52 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340617 - in head/editors/codelite: . files Message-ID: <201401211618.s0LGIqlE043113@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Tue Jan 21 16:18:52 2014 New Revision: 340617 URL: http://svnweb.freebsd.org/changeset/ports/340617 QAT: https://qat.redports.org/buildarchive/r340617/ Log: - Fix llvm-devel include paths (broken after r332935 [1] [MFH] - Fix build on modern compilers [MFH] - STAGE-clean - Convert to new LIB_DEPENDS format - Convert to USES=dos2unix Reported by: John J. Rushford <jjr@alisa.org> Added: head/editors/codelite/files/patch-CodeLite_cpptoken.h (contents, props changed) Modified: head/editors/codelite/Makefile head/editors/codelite/files/patch-CMakeLists.txt Modified: head/editors/codelite/Makefile ============================================================================== --- head/editors/codelite/Makefile Tue Jan 21 15:54:33 2014 (r340616) +++ head/editors/codelite/Makefile Tue Jan 21 16:18:52 2014 (r340617) @@ -12,7 +12,7 @@ COMMENT= An Open Source IDE for C/C++ LICENSE= GPLv2 -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl RUN_DEPENDS= xterm:${PORTSDIR}/x11/xterm OPTIONS_DEFINE= CSCOPE CLANG @@ -22,9 +22,8 @@ CLANG_DESC= Clang code-completion USE_WX= 2.9 WX_UNICODE= yes -USE_DOS2UNIX= *.cpp -USES= gettext cmake:outsource -USE_LDCONFIG= lib/codelite +USES= gettext cmake:outsource dos2unix +USE_LDCONFIG= ${PREFIX}/lib/codelite CMAKE_ARGS+= -DIS_FREEBSD=1 \ -DPREFIX=${PREFIX} @@ -32,7 +31,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVER SVN_REVISION= 6213 -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MCSCOPE} @@ -40,8 +38,8 @@ RUN_DEPENDS+= cscope:${PORTSDIR}/devel/c .endif .if ${PORT_OPTIONS:MCLANG} -BUILD_DEPENDS+= ${LOCALBASE}/lib/libclang.so:${PORTSDIR}/lang/clang-devel -RUN_DEPENDS+= ${LOCALBASE}/lib/libclang.so:${PORTSDIR}/lang/clang-devel +BUILD_DEPENDS+= ${LOCALBASE}/llvm-devel/lib/libclang.so:${PORTSDIR}/lang/clang-devel +RUN_DEPENDS+= ${LOCALBASE}/llvm-devel/lib/libclang.so:${PORTSDIR}/lang/clang-devel PLIST_SUB+= CLANG="" CMAKE_ARGS+= -DENABLE_CLANG=1 .else Modified: head/editors/codelite/files/patch-CMakeLists.txt ============================================================================== --- head/editors/codelite/files/patch-CMakeLists.txt Tue Jan 21 15:54:33 2014 (r340616) +++ head/editors/codelite/files/patch-CMakeLists.txt Tue Jan 21 16:18:52 2014 (r340617) @@ -7,9 +7,9 @@ - set( CLANG_INCLUDE "${CL_SRC_ROOT}/sdk/clang/Linux/${ARCH_NAME}/include" ) - set( CLANG_LIBRARY "-L${CL_SRC_ROOT}/sdk/clang/Linux/${ARCH_NAME}/lib -lclang" ) - set( CLANG_BINARY "${CL_SRC_ROOT}/sdk/clang/Linux/${ARCH_NAME}/lib/libclang.so") -+ set( CLANG_INCLUDE "%%LOCALBASE%%/include" ) -+ set( CLANG_LIBRARY "-L%%LOCALBASE%%/lib/ -lclang" ) -+ set( CLANG_BINARY "%%LOCALBASE%%/lib/libclang.so") ++ set( CLANG_INCLUDE "%%LOCALBASE%%/llvm-devel/include" ) ++ set( CLANG_LIBRARY "-L%%LOCALBASE%%/llvm-devel/lib/ -lclang" ) ++ set( CLANG_BINARY "%%LOCALBASE%%/llvm-devel/lib/libclang.so") endif() message( "-- clang link line ${CLANG_LIBRARY} ") Added: head/editors/codelite/files/patch-CodeLite_cpptoken.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/codelite/files/patch-CodeLite_cpptoken.h Tue Jan 21 16:18:52 2014 (r340617) @@ -0,0 +1,11 @@ +--- CodeLite/cpptoken.h.orig 2014-01-21 10:05:01.000000000 +0100 ++++ CodeLite/cpptoken.h 2014-01-21 10:05:10.000000000 +0100 +@@ -87,7 +87,7 @@ + void print(); + + // Provide lower-than operator so we can use std::list::sort method +- bool operator < (const CppToken& rhs) { ++ bool operator < (const CppToken& rhs) const { + return filename < rhs.filename; + } + };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401211618.s0LGIqlE043113>