pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

codelite: replace bash and python path to pkg path in Makefile.



Module Name:	pkgsrc-wip
Committed By:	Andrius Varanavicius <vezhlys%netscape.net@localhost>
Pushed By:	vezhlys
Date:		Sat Oct 15 15:13:02 2022 +0300
Changeset:	c523b25a098962f890ce68e8323a20de9055e7c3

Modified Files:
	codelite/Makefile
	codelite/distinfo
Removed Files:
	codelite/patches/patch-Runtime_codelite-remote

Log Message:
codelite: replace bash and python path to pkg path in Makefile.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c523b25a098962f890ce68e8323a20de9055e7c3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 codelite/Makefile                              | 13 +++++++++++--
 codelite/distinfo                              |  1 -
 codelite/patches/patch-Runtime_codelite-remote | 16 ----------------
 3 files changed, 11 insertions(+), 19 deletions(-)

diffs:
diff --git a/codelite/Makefile b/codelite/Makefile
index 9320a9a6c5..74312de6f5 100644
--- a/codelite/Makefile
+++ b/codelite/Makefile
@@ -38,11 +38,18 @@ SUBST_SED.ena-netbsd+=		-e 's,IS_NETBSD 0,IS_NETBSD 1,g'
 SUBST_CLASSES+=			fix-bash
 SUBST_STAGE.fix-bash=		pre-configure
 SUBST_MESSAGE.fix-bash=		Fix bash path
+SUBST_FILES.fix-bash+=		CodeLite/TerminalEmulator.cpp
 SUBST_FILES.fix-bash+=		CodeLite/clConsoleBash.cpp
 SUBST_FILES.fix-bash+=		CodeLite/clConsoleGnomeTerminal.cpp
 SUBST_FILES.fix-bash+=		CodeLite/clConsoleRXVTerminal.cpp
-SUBST_FILES.fix-bash+=		CodeLite/TerminalEmulator.cpp
 SUBST_FILES.fix-bash+=		CodeLite/fileutils.cpp
+SUBST_FILES.fix-bash+=		Plugin/custombuildrequest.cpp
+SUBST_FILES.fix-bash+=		Plugin/pipedprocess.cpp
+SUBST_FILES.fix-bash+=		Plugin/wxterminal.cpp
+SUBST_FILES.fix-bash+=		Remoty/RemotyWorkspace.cpp
+SUBST_FILES.fix-bash+=		cmake/Modules/UtilsHelper.cmake
+SUBST_FILES.fix-bash+=		codelite_terminal/wxTerminalCtrl.cpp
+SUBST_FILES.fix-bash+=		ctagsd/lib/Settings.cpp
 SUBST_SED.fix-bash+=		-e 's,/bin/bash,${BASH},g'
 
 SUBST_CLASSES+=			fix-man-path
@@ -51,10 +58,13 @@ SUBST_MESSAGE.fix-man-path=	Fix man path
 SUBST_FILES.fix-man-path=	LiteEditor/CMakeLists.txt
 SUBST_SED.fix-man-path+=	-e 's,${CL_PREFIX}/share/man,${CL_PREFIX}/${PKGMANDIR},g'
 
+REPLACE_BASH+=		docs/docs/deploy.sh
 REPLACE_BASH+=		make-weekly
 REPLACE_NODEJS+=	LanguageServer/codelite-lsp/codelite-lsp-helper
+REPLACE_PYTHON+=	Runtime/codelite-remote
 REPLACE_PYTHON+=	codelite_open_helper.py
 
+
 LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/codelite
 
 BUILDLINK_TRANSFORM+=	opt:-std=c++11:-std=gnu++11 # alloca
@@ -68,7 +78,6 @@ BUILDLINK_TRANSFORM+=	opt:-std=c++11:-std=gnu++11 # alloca
 .include "../../net/libcares/buildlink3.mk"
 .include "../../textproc/hunspell/buildlink3.mk"
 .include "../../textproc//uchardet/buildlink3.mk"
-.include "../../devel/pcre2/buildlink3.mk"
 .include "../../security/libssh/buildlink3.mk"
 .include "../../x11/wxGTK31/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/codelite/distinfo b/codelite/distinfo
index 349a6a15fc..5269977e00 100644
--- a/codelite/distinfo
+++ b/codelite/distinfo
@@ -6,7 +6,6 @@ Size (codelite-16.0.tar.gz) = 89755705 bytes
 SHA1 (patch-CodeLite_tags_storage_sqlite3.h) = 89ba11011c33a4de82f246c1ba198ab61f478d8d
 SHA1 (patch-LanguageServer_UI.h) = 8a40c5cc65bb210bb5f7e6b198580694503a4d95
 SHA1 (patch-Plugin_DiffSideBySidePanel.h) = a62fd170d51bc6ba650d5d7862d5c9633d5dcedb
-SHA1 (patch-Runtime_codelite-remote) = a77124761f844ace5a25c327ebf5bf2e7e4ed80b
 SHA1 (patch-ctagsd_CMakeLists.txt) = 4b7f216ae9384f4e4293463a3dbbd588d1e907f1
 SHA1 (patch-sdk_asio-1.12.1_asio_detail_impl_kqueue__reactor.ipp) = bdbcf78c6198da9ceb123373fd6b99419ae94896
 SHA1 (patch-svgs_svgs-dark_create-logo.sh) = d794ca7bb16a248a7aead3ca30e6c9f16073e1a3
diff --git a/codelite/patches/patch-Runtime_codelite-remote b/codelite/patches/patch-Runtime_codelite-remote
deleted file mode 100644
index 9a64568d77..0000000000
--- a/codelite/patches/patch-Runtime_codelite-remote
+++ /dev/null
@@ -1,16 +0,0 @@
-
---- Runtime/codelite-remote.orig	2022-10-15 00:18:53.677326014 +0300
-+++ Runtime/codelite-remote
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#@PYTHONBIN@
- import sys
- import os
- import json
-@@ -435,4 +435,4 @@ def main():
-     main_loop()
- 
- if __name__ == "__main__":
--    main()
-\ No newline at end of file
-+    main()


Home | Main Index | Thread Index | Old Index