Attachment 171641 Details for Bug 208302 – Previous patch + liniting fixes + Mathieu's point applied WITHOUT Whitespace edits

[patch] Previous patch + liniting fixes + Mathieu's point applied WITHOUT Whitespace edits

patch-editors_codelite.diff (text/plain), 3.23 KB, created by Mahdi Mokhtari on 2016-06-21 10:21:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mahdi Mokhtari

Created: 2016-06-21 10:21:34 UTC

Size: 3.23 KB

patch

obsolete

>Index: editors/codelite/Makefile
>===================================================================
>--- editors/codelite/Makefile	(revision 416509)
>+++ editors/codelite/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	codelite
> PORTVERSION=	9.1
>+PORTREVISION=	1
> CATEGORIES=	editors devel
> 
> MAINTAINER=	mokhi64@gmail.com
>@@ -16,12 +17,12 @@
> GH_ACCOUNT=	eranif
> 
> USES=		cmake:outsource compiler:c++11-lib dos2unix execinfo gettext \
>-		shebangfix sqlite
>+		pathfix shebangfix sqlite
> DOS2UNIX_GLOB=	*.cpp *.txt
> SHEBANG_FILES=	Runtime/codelite_xterm
> bash_CMD=	/bin/sh
> USE_WX=		3.0
>-CMAKE_ARGS=	-DENABLE_LLDB:STRING=0 \
>+CMAKE_ARGS=	-DPREFIX:STRING="${PREFIX}" \
> 		-DPREFIX:STRING="${PREFIX}" \
> 		-DIS_FREEBSD:STRING=1 \
> 		-DCL_WX_CONFIG:STRING="${WX_CONFIG:T}"
>@@ -33,7 +34,7 @@
> 
> OPTIONS_DEFINE=		CSCOPE SFTP
> OPTIONS_RADIO=		CLANG
>-OPTIONS_RADIO_CLANG=	CLANG34 CLANG35 CLANG36 CLANG37
>+OPTIONS_RADIO_CLANG=	CLANG34 CLANG35 CLANG36 CLANG37 CLANG38
> OPTIONS_SUB=		yes
> 
> CLANG_DESC=		Clang code-completion
>@@ -49,6 +50,9 @@
> CLANG37_DESC=		Clang 3.7.x
> CLANG37_BUILD_DEPENDS=	clang37>0:lang/clang37
> CLANG37_RUN_DEPENDS=	clang37>0:lang/clang37
>+CLANG38_DESC=		Clang 3.8.x
>+CLANG38_BUILD_DEPENDS=	clang38>0:lang/clang38
>+CLANG38_RUN_DEPENDS=	clang38>0:lang/clang38
> CSCOPE_DESC=		CScope integration
> CSCOPE_RUN_DEPENDS=	cscope:devel/cscope
> SFTP_DESC=		Secure FTP support via libssh
>@@ -58,10 +62,10 @@
> 
> .include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MCLANG34} || ${PORT_OPTIONS:MCLANG35} || ${PORT_OPTIONS:MCLANG36}
>-CMAKE_ARGS+=	-DENABLE_CLANG:STRING=1
>+.if ${PORT_OPTIONS:MCLANG34} || ${PORT_OPTIONS:MCLANG35} || ${PORT_OPTIONS:MCLANG36} || ${PORT_OPTIONS:MCLANG37} || ${PORT_OPTIONS:MCLANG38}
>+CMAKE_ARGS+=	-DENABLE_LLDB:STRING=1 -DENABLE_CLANG:STRING=1
> .else
>-CMAKE_ARGS+=	-DENABLE_CLANG:STRING=0
>+CMAKE_ARGS+=	-DENABLE_LLDB:STRING=0 -DENABLE_CLANG:STRING=0
> .endif
> 
> post-patch:
>@@ -83,20 +87,40 @@
> 	@${REINPLACE_CMD} -e \
> 		'/ADDITIONAL_LIBRARIES/s|""|"-lexecinfo"|' \
> 		${WRKSRC}/sdk/codelite_cppcheck/CMakeLists.txt
>+	@${REINPLACE_CMD} -e \
>+		's|/bin/grep|/usr/bin/grep|' \
>+		${WRKSRC}/cmake/Modules/FindLibClang.cmake
> 
> post-patch-CLANG34-on:
> 	@${REINPLACE_CMD} -e \
> 		's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm34/|' \
>-		${WRKSRC}/cmake/Modules/FindLibClang.cmake
>+		${WRKSRC}/cmake/Modules/FindLibClang.cmake \
>+		${WRKSRC}/cmake/Modules/FindLibLLDB.cmake
> 
> post-patch-CLANG35-on:
> 	@${REINPLACE_CMD} -e \
> 		's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm35/|' \
>-		${WRKSRC}/cmake/Modules/FindLibClang.cmake
>+		${WRKSRC}/cmake/Modules/FindLibClang.cmake \
>+		${WRKSRC}/cmake/Modules/FindLibLLDB.cmake
> 
> post-patch-CLANG36-on:
> 	@${REINPLACE_CMD} -e \
> 		's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm36/|' \
>+		${WRKSRC}/cmake/Modules/FindLibClang.cmake \
>+		${WRKSRC}/cmake/Modules/FindLibLLDB.cmake
>+
>+post-patch-CLANG37-on:
>+	@${REINPLACE_CMD} -e \
>+		's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm37/|' \
> 		${WRKSRC}/cmake/Modules/FindLibClang.cmake
>+	@${REINPLACE_CMD} -e \
>+		's|#/usr/lib/llvm-.*/|${LOCALBASE}/llvm37/|' \
>+		${WRKSRC}/cmake/Modules/FindLibLLDB.cmake
> 
>+post-patch-CLANG38-on:
>+	@${REINPLACE_CMD} -e \
>+		's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm38/|' \
>+		${WRKSRC}/cmake/Modules/FindLibClang.cmake \
>+		${WRKSRC}/cmake/Modules/FindLibLLDB.cmake
>+
> .include <bsd.port.mk>

Flags:

mmokhi: maintainer-approval+

Actions: View | Diff

Attachments on bug 208302: 168644 | 170851 | 171464 | 171638 | 171641 | 171649