Attachment 164059 Details for Bug 205203 – editors_codelite.diff

[patch] editors_codelite.diff

editors_codelite.diff (text/plain), 14.21 KB, created by tkato432 on 2015-12-10 18:32:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-12-10 18:32:41 UTC

Size: 14.21 KB

patch

obsolete

>diff -urN /usr/ports/editors/codelite/Makefile editors/codelite/Makefile
>--- /usr/ports/editors/codelite/Makefile	2015-08-24 03:50:06.179559000 +0900
>+++ editors/codelite/Makefile	2015-12-11 00:00:00.000000000 +0900
>@@ -2,65 +2,96 @@
> # $FreeBSD: head/editors/codelite/Makefile 394320 2015-08-15 14:53:55Z bsam $
> 
> PORTNAME=	codelite
>-DISTVERSION=	8.1
>+PORTVERSION=	9.0
> CATEGORIES=	editors devel
>+MASTER_SITES=	GH
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Open Source IDE for C/C++
> 
>-LICENSE=	GPLv2
>+LICENSE=	GPLv2 # (or later)
> 
>-LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
> RUN_DEPENDS=	xterm:${PORTSDIR}/x11/xterm
> 
>-BROKEN_FreeBSD_8=	does not build on FreeBSD < 10.x
>-BROKEN_FreeBSD_9=	does not build on FreeBSD < 10.x
>-
>-OPTIONS_DEFINE=	CSCOPE CLANG NLS
>-CSCOPE_DESC=	CScope integration
>-CLANG_DESC=	Clang code-completion
>-OPTIONS_SUB=	yes
>-
> USE_GITHUB=	yes
> GH_ACCOUNT=	eranif
> 
>-USE_WX=		3.0
>-WX_UNICODE=	yes
>-USES=		gettext cmake:outsource dos2unix execinfo shebangfix
>+USES=		cmake:outsource compiler:c++11-lib dos2unix execinfo gettext \
>+		shebangfix
> DOS2UNIX_GLOB=	*.cpp *.txt
>-USE_LDCONFIG=	${PREFIX}/lib/codelite
>-SHEBANG_FILES=	Runtime/clg++ Runtime/clgcc Runtime/codelite_xterm
>+SHEBANG_FILES=	Runtime/codelite_xterm
> bash_CMD=	/bin/sh
>+USE_SQLITE=	3
>+USE_WX=		3.0
>+CMAKE_ARGS=	-DENABLE_LLDB:STRING=0 \
>+		-DPREFIX:STRING="${PREFIX}"
>+USE_LDCONFIG=	${PREFIX}/lib/codelite
> INSTALLS_ICONS=	yes
> 
>-CMAKE_ARGS+=	-DIS_FREEBSD=1 \
>-		-DENABLE_LLDB=0 \
>-		-DPREFIX=${PREFIX}
>+CXXFLAGS+=	${EXECINFO_CPPFLAGS}
>+LDFLAGS+=	${EXECINFO_LDFLAGS}
> 
>-.include <bsd.port.options.mk>
>+OPTIONS_DEFINE=		CSCOPE SFTP
>+OPTIONS_RADIO=		CLANG
>+OPTIONS_RADIO_CLANG=	CLANG34 CLANG35 CLANG36
>+OPTIONS_SUB=		yes
>+
>+CLANG_DESC=		Clang code-completion
>+CLANG34_DESC=		Clang 3.4.x
>+CLANG34_BUILD_DEPENDS=	clang34>0:${PORTSDIR}/lang/clang34
>+CLANG34_RUN_DEPENDS=	clang34>0:${PORTSDIR}/lang/clang34
>+CLANG35_DESC=		Clang 3.5.x
>+CLANG35_BUILD_DEPENDS=	clang35>0:${PORTSDIR}/lang/clang35
>+CLANG35_RUN_DEPENDS=	clang35>0:${PORTSDIR}/lang/clang35
>+CLANG36_DESC=		Clang 3.6.x
>+CLANG36_BUILD_DEPENDS=	clang36>0:${PORTSDIR}/lang/clang36
>+CLANG36_RUN_DEPENDS=	clang36>0:${PORTSDIR}/lang/clang36
>+CSCOPE_DESC=		CScope integration
>+CSCOPE_RUN_DEPENDS=	cscope:${PORTSDIR}/devel/cscope
>+SFTP_DESC=		Secure FTP support via libssh
>+SFTP_LIB_DEPENDS=	libssh.so:${PORTSDIR}/security/libssh
>+SFTP_CMAKE_OFF=		-DENABLE_SFTP:STRING=0
> 
>-.if ${PORT_OPTIONS:MCSCOPE}
>-RUN_DEPENDS+=	cscope:${PORTSDIR}/devel/cscope
>-.endif
>+.include <bsd.port.options.mk>
> 
>-.if ${PORT_OPTIONS:MCLANG}
>-BUILD_DEPENDS+=	${LOCALBASE}/llvm34/lib/libclang.so:${PORTSDIR}/lang/clang34
>-RUN_DEPENDS+=	${LOCALBASE}/llvm34/lib/libclang.so:${PORTSDIR}/lang/clang34
>-CMAKE_ARGS+=	-DENABLE_CLANG=1
>+.if ${PORT_OPTIONS:MCLANG34} || ${PORT_OPTIONS:MCLANG35} || ${PORT_OPTIONS:MCLANG36}
>+CMAKE_ARGS+=	-DENABLE_CLANG:STRING=1
> .else
>-CMAKE_ARGS+=	-DENABLE_CLANG=0
>+CMAKE_ARGS+=	-DENABLE_CLANG:STRING=0
> .endif
> 
> post-patch:
> #	Use the correct wx-config
>-	${REINPLACE_CMD} -e \
>-	    's|wx-config|${WX_CONFIG}|; \
>-	     s|%%LOCALBASE%%|${LOCALBASE}|g; \
>-	     s|%%PREFIX%%|${PREFIX}|g; \
>-	     /IS_FREEBSD/s|0|1|' \
>-	    ${WRKSRC}/CMakeLists.txt
>-	${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/LiteEditor/CMakeLists.txt
>-	${REINPLACE_CMD} -e 's|codelitegcc|codelite-cc|' \
>-	    ${WRKSRC}/Runtime/clgcc ${WRKSRC}/Runtime/clg++
>+	@${REINPLACE_CMD} -e \
>+		'/IS_FREEBSD/s|0|1| ; \
>+		 /CL_WX_CONFIG/s|wx-config|${WX_CONFIG:T}| ; \
>+		 /-O2/s|^|#| ; \
>+		 s|"-s"|""|' \
>+		${WRKSRC}/CMakeLists.txt
>+	@${REINPLACE_CMD} -e \
>+		's|"-lkvm"|"-lkvm -lutil"| ; \
>+		 s|share/man|man|' \
>+		${WRKSRC}/LiteEditor/CMakeLists.txt
>+	@${REINPLACE_CMD} -e \
>+		's|"-lutil"|"-lkvm -lutil"|' \
>+		${WRKSRC}/codelite_terminal/CMakeLists.txt
>+	@${REINPLACE_CMD} -e \
>+		'/ADDITIONAL_LIBRARIES/s|""|"-lexecinfo"|' \
>+		${WRKSRC}/sdk/codelite_cppcheck/CMakeLists.txt
>+
>+post-patch-CLANG34-on:
>+	@${REINPLACE_CMD} -e \
>+		's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm34/|' \
>+		${WRKSRC}/cmake/Modules/FindLibClang.cmake
>+
>+post-patch-CLANG35-on:
>+	@${REINPLACE_CMD} -e \
>+		's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm35/|' \
>+		${WRKSRC}/cmake/Modules/FindLibClang.cmake
>+
>+post-patch-CLANG36-on:
>+	@${REINPLACE_CMD} -e \
>+		's|/usr/lib/llvm-.*/|${LOCALBASE}/llvm36/|' \
>+		${WRKSRC}/cmake/Modules/FindLibClang.cmake
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/editors/codelite/distinfo editors/codelite/distinfo
>--- /usr/ports/editors/codelite/distinfo	2015-08-24 03:50:06.142489000 +0900
>+++ editors/codelite/distinfo	2015-12-11 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (eranif-codelite-8.1_GH0.tar.gz) = 3d43e5a5b504937d6137311417447eabdc8398dccaad4eef1ccba4080e920270
>-SIZE (eranif-codelite-8.1_GH0.tar.gz) = 72812631
>+SHA256 (eranif-codelite-9.0_GH0.tar.gz) = 401ce3c8394aaee661fcae01330e5934ddeb10f5e4abc671d77f06602db05398
>+SIZE (eranif-codelite-9.0_GH0.tar.gz) = 72878710
>diff -urN /usr/ports/editors/codelite/files/patch-CMakeLists.txt editors/codelite/files/patch-CMakeLists.txt
>--- /usr/ports/editors/codelite/files/patch-CMakeLists.txt	2015-08-24 03:50:06.168804000 +0900
>+++ editors/codelite/files/patch-CMakeLists.txt	1970-01-01 09:00:00.000000000 +0900
>@@ -1,24 +0,0 @@
>---- CMakeLists.txt.orig	2014-01-22 15:20:56.000000000 +0100
>-+++ CMakeLists.txt	2014-01-22 17:21:28.000000000 +0100
>-@@ -34,7 +34,7 @@
>- #############################################
>- project( "CodeLite" )
>- 
>--set( CL_PREFIX "/usr" )
>-+set( CL_PREFIX "%%PREFIX%%" )
>- if (CMAKE_CURRENT_LIST_DIR) # since cmake 2.8.3
>-     set( CL_SRC_ROOT ${CMAKE_CURRENT_LIST_DIR})
>- else()
>-@@ -42,10 +42,10 @@
>- endif()
>- 
>- set( USE_CLANG 1 )
>--set( IS_FREEBSD 0 )
>-+set( IS_FREEBSD 1 )
>- set( BUILD_WXC 0 )
>- set( CL_COPY_WX_LIBS 0 )
>--set( WITH_SFTP 1 )
>-+set( WITH_SFTP 0 )
>- 
>- if ( UNIX )
>-     execute_process(COMMAND pwd OUTPUT_VARIABLE BUILD_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE)
>diff -urN /usr/ports/editors/codelite/files/patch-LiteEditor_CMakeLists.txt editors/codelite/files/patch-LiteEditor_CMakeLists.txt
>--- /usr/ports/editors/codelite/files/patch-LiteEditor_CMakeLists.txt	2015-08-24 03:50:06.178239000 +0900
>+++ editors/codelite/files/patch-LiteEditor_CMakeLists.txt	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- LiteEditor/CMakeLists.txt.orig	2013-04-03 11:54:27.000000000 +0200
>-+++ LiteEditor/CMakeLists.txt	2013-04-03 11:54:07.000000000 +0200
>-@@ -69,7 +69,7 @@
>- 
>- if (UNIX)
>-     if ( IS_FREEBSD )
>--        set(ADDITIONAL_LIBRARIES "-lkvm")
>-+        set(ADDITIONAL_LIBRARIES "-lkvm -lutil")
>-     elseif ( UNIX AND NOT APPLE )
>-         set(ADDITIONAL_LIBRARIES "-ldl -lutil")
>-     else ( )
>diff -urN /usr/ports/editors/codelite/files/patch-Runtime_codelite_xterm editors/codelite/files/patch-Runtime_codelite_xterm
>--- /usr/ports/editors/codelite/files/patch-Runtime_codelite_xterm	2015-08-24 03:50:06.163776000 +0900
>+++ editors/codelite/files/patch-Runtime_codelite_xterm	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- Runtime/codelite_xterm.orig	2012-06-18 14:05:30.000000000 +0200
>-+++ Runtime/codelite_xterm	2012-06-18 14:05:45.000000000 +0200
>-@@ -17,7 +17,7 @@
>- 		## Run xterm without the bash wrapper
>- 		${terminal} -T "$program_title" -e $2 2> /dev/null
>- 	else
>--		${terminal} -T "$program_title" -e /bin/bash -c 'export LD_LIBRARY_PATH=$0;shift;$@' $LD_LIBRARY_PATH "$@" 2> /dev/null
>-+		${terminal} -T "$program_title" -e /bin/sh -c 'export LD_LIBRARY_PATH=$0;shift;$@' $LD_LIBRARY_PATH "$@" 2> /dev/null
>- 	fi
>- fi
>- 
>diff -urN /usr/ports/editors/codelite/files/patch-cmake_Modules_FindLibClang.cmake editors/codelite/files/patch-cmake_Modules_FindLibClang.cmake
>--- /usr/ports/editors/codelite/files/patch-cmake_Modules_FindLibClang.cmake	2015-08-24 03:50:06.178661000 +0900
>+++ editors/codelite/files/patch-cmake_Modules_FindLibClang.cmake	1970-01-01 09:00:00.000000000 +0900
>@@ -1,26 +0,0 @@
>---- cmake/Modules/FindLibClang.cmake.orig	2015-08-16 12:16:16.000000000 +0300
>-+++ cmake/Modules/FindLibClang.cmake	2015-08-16 12:18:08.000000000 +0300
>-@@ -12,6 +12,11 @@
>-                      # For fedora
>-                      /usr/lib/llvm
>-                      /usr/lib64/llvm
>-+                     # For FreeBSD
>-+                     /usr/local/llvm36/lib
>-+                     /usr/local/llvm35/lib
>-+                     /usr/local/llvm34/lib
>-+                     /usr/local/llvm33/lib
>-                      ${CMAKE_INSTALL_LIBDIR})
>- 
>-         find_path(LIBCLANG_INCLUDE_T NAMES clang-c/Index.h
>-@@ -28,6 +33,11 @@
>-                   /usr/local/include
>-                   # For fedora
>-                   /usr/include
>-+                  # For FreeBSD
>-+                  /usr/local/llvm36/include
>-+                  /usr/local/llvm35/include
>-+                  /usr/local/llvm34/include
>-+                  /usr/local/llvm33/include
>-                   )
>- 
>-         if ( LIBCLANG_T STREQUAL "LIBCLANG_T-NOTFOUND" OR LIBCLANG_INCLUDE_T STREQUAL "LIBCLANG_INCLUDE_T-NOTFOUND" )
>diff -urN /usr/ports/editors/codelite/files/patch-codelite_terminal_CMakeLists.txt editors/codelite/files/patch-codelite_terminal_CMakeLists.txt
>--- /usr/ports/editors/codelite/files/patch-codelite_terminal_CMakeLists.txt	2015-08-24 03:50:06.177725000 +0900
>+++ editors/codelite/files/patch-codelite_terminal_CMakeLists.txt	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- codelite_terminal/CMakeLists.txt.orig	2014-01-22 16:36:20.000000000 +0100
>-+++ codelite_terminal/CMakeLists.txt	2014-01-22 16:36:35.000000000 +0100
>-@@ -28,7 +28,7 @@
>- add_executable(codelite-terminal ${SRCS})
>- set ( UTIL_LIB "" )
>- if ( UNIX )
>--    set( UTIL_LIB "-lutil")
>-+    set( UTIL_LIB "-lutil -lkvm")
>- endif ( UNIX )
>- 
>- target_link_libraries(codelite-terminal ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} ${UTIL_LIB} )
>diff -urN /usr/ports/editors/codelite/files/patch-sdk_codelite_cppcheck_CMakeLists.txt editors/codelite/files/patch-sdk_codelite_cppcheck_CMakeLists.txt
>--- /usr/ports/editors/codelite/files/patch-sdk_codelite_cppcheck_CMakeLists.txt	2015-08-24 03:50:06.153924000 +0900
>+++ editors/codelite/files/patch-sdk_codelite_cppcheck_CMakeLists.txt	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- sdk/codelite_cppcheck/CMakeLists.txt.orig	2015-08-12 19:34:10.488143000 +0300
>-+++ sdk/codelite_cppcheck/CMakeLists.txt	2015-08-12 19:34:37.287109000 +0300
>-@@ -8,7 +8,7 @@
>- # Include paths
>- include_directories("${CL_SRC_ROOT}/sdk/codelite_cppcheck/lib" "${CL_SRC_ROOT}/sdk/codelite_cppcheck/cli")
>- 
>--set( ADDITIONAL_LIBRARIES "" )
>-+set( ADDITIONAL_LIBRARIES "-lexecinfo" )
>- 
>- if(WIN32)
>- set(ADDITIONAL_LIBRARIES "-lshlwapi")
>diff -urN /usr/ports/editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt
>--- /usr/ports/editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt	2015-08-24 03:50:06.149204000 +0900
>+++ editors/codelite/files/patch-sdk_codelite_indexer_CMakeLists.txt	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- sdk/codelite_indexer/CMakeLists.txt.orig
>-+++ sdk/codelite_indexer/CMakeLists.txt
>-@@ -33,7 +33,7 @@
>- 
>- # Define the output
>- add_executable(codelite_indexer ${SRCS})
>--target_link_libraries(codelite_indexer ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES})
>-+target_link_libraries(codelite_indexer ${LINKER_OPTIONS} ${wxWidgets_LIBRARIES} -pthread)
>- 
>- install(TARGETS codelite_indexer DESTINATION ${CL_PREFIX}/bin)
>- 
>diff -urN /usr/ports/editors/codelite/pkg-descr editors/codelite/pkg-descr
>--- /usr/ports/editors/codelite/pkg-descr	2015-08-24 03:50:06.147945000 +0900
>+++ editors/codelite/pkg-descr	2015-12-11 00:00:00.000000000 +0900
>@@ -1,5 +1,6 @@
> CodeLite is a powerful open-source, cross platform code editor for the
> C/C++ programming languages.
>+
> CodeLite uses a sophisticated, yet intuitive interface which allows
> user to easy create and build complex projects.
> 
>diff -urN /usr/ports/editors/codelite/pkg-plist editors/codelite/pkg-plist
>--- /usr/ports/editors/codelite/pkg-plist	2015-08-24 03:50:06.179104000 +0900
>+++ editors/codelite/pkg-plist	2015-12-11 00:00:00.000000000 +0900
>@@ -1,5 +1,3 @@
>-bin/clg++
>-bin/clgcc
> bin/codelite
> bin/codelite-cc
> bin/codelite-echo
>@@ -23,6 +21,7 @@
> lib/codelite/MemCheck.so
> lib/codelite/Outline.so
> lib/codelite/QMakePlugin.so
>+%%SFTP%%lib/codelite/SFTP.so
> lib/codelite/SnipWiz.so
> lib/codelite/SpellCheck.so
> lib/codelite/Subversion.so
>@@ -43,24 +42,11 @@
> lib/codelite/libplugin.so
> lib/codelite/libwxshapeframework.so
> lib/codelite/libwxsqlite3.so
>-lib/codelite/resources/abbrev.png
>-lib/codelite/resources/compfile.png
>-lib/codelite/resources/connect_no.png
>-lib/codelite/resources/cppcheck.png
>-lib/codelite/resources/qt16_new.png
>-lib/codelite/resources/qt16_preferences.png
>-lib/codelite/resources/qt24_new.png
>-lib/codelite/resources/qt24_preferences.png
>-lib/codelite/resources/svn_diff.png
>-lib/codelite/resources/svn_settings.png
>-lib/codelite/resources/svn_ssh.png
>-lib/codelite/resources/wxfb_conflict.png
>-lib/codelite/resources/wxfb_modified.png
>-lib/codelite/resources/wxfb_ok.png
> lib/codelite/wxFormBuilder.so
>-man/man1/codelite-make.1.gz
> man/man1/codelite.1.gz
>+man/man1/codelite-make.1.gz
> man/man1/codelite_fix_files.1.gz
>+share/applications/codelite.desktop
> %%DATADIR%%/LICENSE
> %%DATADIR%%/PHP.zip
> %%DATADIR%%/astyle.sample
>@@ -101,6 +87,20 @@
> %%DATADIR%%/javascript.zip
> %%DATADIR%%/lexers/lexers.json
> %%DATADIR%%/rc/menu.xrc
>+%%DATADIR%%/resources/abbrev.png
>+%%DATADIR%%/resources/compfile.png
>+%%DATADIR%%/resources/connect_no.png
>+%%DATADIR%%/resources/cppcheck.png
>+%%DATADIR%%/resources/qt16_new.png
>+%%DATADIR%%/resources/qt16_preferences.png
>+%%DATADIR%%/resources/qt24_new.png
>+%%DATADIR%%/resources/qt24_preferences.png
>+%%DATADIR%%/resources/svn_diff.png
>+%%DATADIR%%/resources/svn_settings.png
>+%%DATADIR%%/resources/svn_ssh.png
>+%%DATADIR%%/resources/wxfb_conflict.png
>+%%DATADIR%%/resources/wxfb_modified.png
>+%%DATADIR%%/resources/wxfb_ok.png
> %%DATADIR%%/templates/codedesigner/CDTemplate.cdp
> %%DATADIR%%/templates/codedesigner/HSCHTemplate.cdp
> %%DATADIR%%/templates/codedesigner/HSCHTemplateWithMain.cdp
>@@ -272,7 +272,6 @@
> %%DATADIR%%/templates/projects/wxWidgets_ConsoleApp/wxWidgets_ConsoleApp.project
> %%DATADIR%%/templates/qmake/qmake.project
> %%DATADIR%%/unittest++1.3.tar.gz
>-%%NLS%%share/locale/cs/LC_MESSAGES/codelite.mo
>-%%NLS%%share/locale/zh_CN/LC_MESSAGES/codelite.mo
>-share/applications/codelite.desktop
> share/icons/hicolor/32x32/apps/codelite.png
>+share/locale/cs/LC_MESSAGES/codelite.mo
>+share/locale/zh_CN/LC_MESSAGES/codelite.mo

Actions: View | Diff

Attachments on bug 205203: 164059