update bash replacements, move filextmanager as a patch instead. Don't pass -DIS_NETBSD=1 since we do that in configuration.

[vezhlys <vezhlys%netscape.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	vezhlys <vezhlys%netscape.net@localhost>
Pushed By:	vezhlys
Date:		Sat Mar 7 11:35:05 2020 +0200
Changeset:	9ac32c36d2564bcfaada2959c44e88461979cbf5

Modified Files:
	codelite/Makefile
	codelite/distinfo
Added Files:
	codelite/patches/patch-CodeLite_fileextmanager.cpp

Log Message:
update bash replacements, move filextmanager as a patch instead. Don't pass -DIS_NETBSD=1 since we do that in configuration.

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

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

diffstat:
 codelite/Makefile                                  | 30 ++++++++--------------
 codelite/distinfo                                  |  1 +
 codelite/patches/patch-CodeLite_fileextmanager.cpp | 23 +++++++++++++++++
 3 files changed, 35 insertions(+), 19 deletions(-)

diffs:
diff --git a/codelite/Makefile b/codelite/Makefile
index 9813991395..b76ad988f5 100644
--- a/codelite/Makefile
+++ b/codelite/Makefile
@@ -16,7 +16,6 @@ USE_TOOLS+=		pkg-config bash
 
 CMAKE_ARGS+=		-DPREFIX:STRING=${PREFIX}
 
-# For some reason CMAKE_ARGS.NetBSD+=-DIS_NETBSD:STRING=1 doesn't work for me
 .include "../../mk/bsd.prefs.mk"
 
 # Likely needed because pango's pkgconfig CFLAGS aren't being applied.
@@ -25,7 +24,6 @@ CXXFLAGS+=		-I${BUILDLINK_DIR}/include/harfbuzz
 CHECK_PORTABILITY_SKIP+=	sdk/wxsqlite3/configure
 
 .if ${OPSYS} == "NetBSD"
-CMAKE_ARGS+=			-DIS_NETBSD:STRING=1
 SUBST_CLASSES+=			ena-netbsd
 SUBST_STAGE.ena-netbsd=		pre-configure
 SUBST_MESSAGE.ena-netbsd=	Enable NetBSD
@@ -36,10 +34,17 @@ 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/fileextmanager.cpp
-SUBST_FILES.fix-bash+=		Runtime/codelite_xterm
-SUBST_FILES.fix-bash+=		cmake/Modules/OSXInstall.cmake
+SUBST_FILES.fix-bash+=		codelite_terminal/wxTerminalCtrl.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+=		Docker/clDockerDriver.cpp
+SUBST_FILES.fix-bash+=		Plugin/clRemoteBuilder.cpp
+SUBST_FILES.fix-bash+=		Plugin/custombuildrequest.cpp
+SUBST_FILES.fix-bash+=		Plugin/pipedprocess.cpp
+SUBST_FILES.fix-bash+=		Plugin/wxterminal.cpp
 SUBST_SED.fix-bash+=		-e 's,/bin/bash,${BASH},g'
 
 SUBST_CLASSES+=			fix-man-path
@@ -48,20 +53,7 @@ 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+=		Runtime/clg++
-REPLACE_BASH+=		Runtime/clgcc
-REPLACE_BASH+=		Runtime/codelite_xterm
-REPLACE_BASH+=		codelite-icons-dark/pack-icons.sh
-REPLACE_BASH+=		codelite-icons-fresh-farm/pack-icons.sh
-REPLACE_BASH+=		codelite-icons/pack-icons.sh
-REPLACE_BASH+=		codelitephp/resources/pack-resources.sh
 REPLACE_BASH+=		make-weekly
-REPLACE_BASH+=		svgs/code-completion/convert-svg-to-png.sh
-REPLACE_BASH+=		svgs/convert-single-file.sh
-REPLACE_BASH+=		svgs/convert-svg-to-png.sh
-REPLACE_BASH+=		svgs/create-logo-root.sh
-REPLACE_BASH+=		svgs/create-logo.sh
-REPLACE_BASH+=		svgs/find-bar/convert-svg-to-png.sh
 REPLACE_NODEJS+=	LanguageServer/codelite-lsp/codelite-lsp-helper
 REPLACE_PYTHON+=	codelite_open_helper.py
 
diff --git a/codelite/distinfo b/codelite/distinfo
index 0a3beafd51..a098d85f47 100644
--- a/codelite/distinfo
+++ b/codelite/distinfo
@@ -4,4 +4,5 @@ SHA1 (codelite-14.0.tar.gz) = 790b903016c628ad18e368aa3ec03a2240aa34ab
 RMD160 (codelite-14.0.tar.gz) = 34532c534d68c084aab0b4cdc326c0bf39ee9463
 SHA512 (codelite-14.0.tar.gz) = 6f8598deb206685ec1feb2923bfd00bf08a3f9a7e195049670b0b93c8405720dba58c02af7ab6de391d83f074bcac3f9b452b042956299e15ad21a9a0a98d967
 Size (codelite-14.0.tar.gz) = 63051086 bytes
+SHA1 (patch-CodeLite_fileextmanager.cpp) = 1eaf696d3bde907a635d767b3d022e1d92692087
 SHA1 (patch-sdk_codelite__indexer_network_np__connections__server.cpp) = 5906e4a1a295b260833ea9d499a3b42d5e8b04c3
diff --git a/codelite/patches/patch-CodeLite_fileextmanager.cpp b/codelite/patches/patch-CodeLite_fileextmanager.cpp
new file mode 100644
index 0000000000..91fc242967
--- /dev/null
+++ b/codelite/patches/patch-CodeLite_fileextmanager.cpp
@@ -0,0 +1,23 @@
+$NetBSD$
+
+Add NetBSD specific matchers
+
+--- CodeLite/fileextmanager.cpp.orig	2020-03-07 01:58:26.515745479 +0200
++++ CodeLite/fileextmanager.cpp
+@@ -171,13 +171,15 @@
+ 
+         // Initialize regexes:
+         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/bash", TypeScript));
+-        m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/bash", TypeScript));
++        m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/pkg/bin/bash", TypeScript));
+         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/sh", TypeScript));
+         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/bash", TypeScript));
+         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/python", TypePython));
+         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/python", TypePython));
++        m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/pkg/bin/python[2-3][.][0-9]+", TypePython));
+         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/node", TypeJS));
+         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/node", TypeJS));
++        m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/pkg/bin/node", TypeJS));
+         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/bin/nodejs", TypeJS));
+         m_matchers.push_back(Matcher("#[ \t]*![ \t]*/usr/bin/nodejs", TypeJS));
+         m_matchers.push_back(Matcher("<?xml", TypeXml, false));