4 files changed, 49 insertions, 61 deletions

diff --git a/editors/cudatext/Makefile b/editors/cudatext/Makefile
index 48f7420683b4..aa713a0a412e 100644
--- a/editors/cudatext/Makefile
+++ b/editors/cudatext/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cudatext
-PORTVERSION=	1.92.0
-PORTREVISION=	1
+PORTVERSION=	1.99.0
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
@@ -18,12 +17,12 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	Alexey-T
 GH_PROJECT=	CudaText
 GH_TUPLE=	Alexey-T:Python-for-Lazarus:586eec1:python4lazarus/python4lazarus \
-		Alexey-T:ATFlatControls:ee25077:atflatcontrols/atflatcontrols  \
-		Alexey-T:ATSynEdit:3a2f413:atsynedit/atsynedit \
-		Alexey-T:Emmet-Pascal:0defe41:emmet/emmet \
-		Alexey-T:EControl:92b35f5:econtrol/econtrol \
-		Alexey-T:ATSynEdit_Ex:1ee4a75:atsyneditex/atsyneditex \
-		Alexey-T:ATSynEdit_Cmp:51a7103:atsyneditcmp/atsyneditcmp \
+		Alexey-T:ATFlatControls:968953e:atflatcontrols/atflatcontrols  \
+		Alexey-T:ATSynEdit:a07cb2e:atsynedit/atsynedit \
+		Alexey-T:Emmet-Pascal:52d11a7:emmet/emmet \
+		Alexey-T:EControl:0432319:econtrol/econtrol \
+		Alexey-T:ATSynEdit_Ex:6cce087:atsyneditex/atsyneditex \
+		Alexey-T:ATSynEdit_Cmp:bc1077a:atsyneditcmp/atsyneditcmp \
 		Alexey-T:ATBinHex-Lazarus:cad0408:atbinhex/atbinhex \
 		Alexey-T:UniqueInstance:753f823:uniqueinstance/uniqueinstance \
 		Alexey-T:EncConv:3eb181f:encconv/encconv
diff --git a/editors/cudatext/distinfo b/editors/cudatext/distinfo
index 08b34e2bae16..ea820943df11 100644
--- a/editors/cudatext/distinfo
+++ b/editors/cudatext/distinfo
@@ -1,20 +1,20 @@
-TIMESTAMP = 1577773011
-SHA256 (Alexey-T-CudaText-1.92.0_GH0.tar.gz) = f6fad774f6137321e8eb76a12e9a693eb2937da9d45fa3af2e5d55417c7f4279
-SIZE (Alexey-T-CudaText-1.92.0_GH0.tar.gz) = 5516570
+TIMESTAMP = 1589414243
+SHA256 (Alexey-T-CudaText-1.99.0_GH0.tar.gz) = c98c02470359ff3946156edeb9f138cf70dbb800002e90ba0dc95ff7e448a67c
+SIZE (Alexey-T-CudaText-1.99.0_GH0.tar.gz) = 5450293
 SHA256 (Alexey-T-Python-for-Lazarus-586eec1_GH0.tar.gz) = fe415fb9643b14ac043521b04da09840b5bd7cf7aeafcd8824d1b34e88a9885b
 SIZE (Alexey-T-Python-for-Lazarus-586eec1_GH0.tar.gz) = 1060877
-SHA256 (Alexey-T-ATFlatControls-ee25077_GH0.tar.gz) = e522a3880e451c585a157f0d9d3b7933c288e7e5bb1642ad8458502c9f86dc12
-SIZE (Alexey-T-ATFlatControls-ee25077_GH0.tar.gz) = 517286
-SHA256 (Alexey-T-ATSynEdit-3a2f413_GH0.tar.gz) = 62557fe599b5647ef2aa1a2258019eb74b6eab12c059682d9c5a24e724dd7b1b
-SIZE (Alexey-T-ATSynEdit-3a2f413_GH0.tar.gz) = 551356
-SHA256 (Alexey-T-Emmet-Pascal-0defe41_GH0.tar.gz) = 411b440b468f2b84ef0298dd9bacb765492ef81e1584a6e886c8de4ab5a05764
-SIZE (Alexey-T-Emmet-Pascal-0defe41_GH0.tar.gz) = 77917
-SHA256 (Alexey-T-EControl-92b35f5_GH0.tar.gz) = 23d688d3e7627e4f34ba076d41484866017859acb29c322256a964a3a7467e22
-SIZE (Alexey-T-EControl-92b35f5_GH0.tar.gz) = 52527
-SHA256 (Alexey-T-ATSynEdit_Ex-1ee4a75_GH0.tar.gz) = 3705f802b8b298cbe1b4e153f3083765f069b5c96ed4a08576898e02c361aae6
-SIZE (Alexey-T-ATSynEdit_Ex-1ee4a75_GH0.tar.gz) = 39688
-SHA256 (Alexey-T-ATSynEdit_Cmp-51a7103_GH0.tar.gz) = 774046b4c7c9108dae4032256977ce878ac60383982f67a3584c72cf3bdb46c0
-SIZE (Alexey-T-ATSynEdit_Cmp-51a7103_GH0.tar.gz) = 9159
+SHA256 (Alexey-T-ATFlatControls-968953e_GH0.tar.gz) = a602a6ccaeb0e739686a60e781feabc594734b5ee2f2259b97052a8699555820
+SIZE (Alexey-T-ATFlatControls-968953e_GH0.tar.gz) = 522210
+SHA256 (Alexey-T-ATSynEdit-a07cb2e_GH0.tar.gz) = 09aebac7bbc63cb7087c48675725d0e267b5bc3ef6033c1a5bf87703f4ea532f
+SIZE (Alexey-T-ATSynEdit-a07cb2e_GH0.tar.gz) = 561990
+SHA256 (Alexey-T-Emmet-Pascal-52d11a7_GH0.tar.gz) = 7135df02e815fdf72b354c107632960bb073382683c7b47a621b10a864ae3d61
+SIZE (Alexey-T-Emmet-Pascal-52d11a7_GH0.tar.gz) = 82430
+SHA256 (Alexey-T-EControl-0432319_GH0.tar.gz) = 8a5e5139dbce542c9755c120f528ddede8d1018f5a6fa4cf17ecb098a8f2e892
+SIZE (Alexey-T-EControl-0432319_GH0.tar.gz) = 56761
+SHA256 (Alexey-T-ATSynEdit_Ex-6cce087_GH0.tar.gz) = ced1d883cd90651dca1567893b91fd327150e8777ecad5458519042d5f47939f
+SIZE (Alexey-T-ATSynEdit_Ex-6cce087_GH0.tar.gz) = 39766
+SHA256 (Alexey-T-ATSynEdit_Cmp-bc1077a_GH0.tar.gz) = 55e7f3f11a6affc425379196b257aed7008cc7838869b07b37017109c2dcc9ea
+SIZE (Alexey-T-ATSynEdit_Cmp-bc1077a_GH0.tar.gz) = 9580
 SHA256 (Alexey-T-ATBinHex-Lazarus-cad0408_GH0.tar.gz) = 4ded3e28e6757260d7d663e1be2cec9db3a7ce8998e8bbbe1818238c8706202c
 SIZE (Alexey-T-ATBinHex-Lazarus-cad0408_GH0.tar.gz) = 148981
 SHA256 (Alexey-T-UniqueInstance-753f823_GH0.tar.gz) = 2af99af3ac2696d5e143b67bb5af82dd86649377bf81ac084bd205e77646b3d9
diff --git a/editors/cudatext/files/patch-app-proc_globdata.pas b/editors/cudatext/files/patch-app-proc_globdata.pas
index 0dfbf473540e..964052c714e3 100644
--- a/editors/cudatext/files/patch-app-proc_globdata.pas
+++ b/editors/cudatext/files/patch-app-proc_globdata.pas
@@ -1,16 +1,17 @@
---- app/proc_globdata.pas	2019-12-25 06:22:53.000000000 -0500
-+++ app/proc_globdata.pas	2019-12-31 02:48:45.328993000 -0500
-@@ -916,6 +916,9 @@
-   Result:=
-     {$ifdef linux} 
-     '/usr/share/cudatext'
-+    {$endif}
-+    {$ifdef freebsd}
-+    '%%DATADIR%%'
-     {$else} 
-       {$ifdef darwin} 
-       ExtractFileDir(OpDirExe)+'/Resources'
-@@ -986,6 +989,10 @@
+--- app/proc_globdata.pas	2020-05-11 23:45:28.000000000 -0500
++++ app/proc_globdata.pas	2020-05-13 18:40:54.377841000 -0500
+@@ -909,6 +909,10 @@
+   exit(ExtractFileDir(OpDirExe)+'/Resources');
+   {$endif}
+ 
++  {$ifdef freebsd}
++  exit('%%DATADIR%%');
++  {$endif}
++
+   Result:= '';
+ end;
+ 
+@@ -973,6 +977,10 @@
    OpDirLocal:= AppDir_Home+'Library/Application Support/CudaText';
    CreateDirUTF8(OpDirLocal);
    {$endif}
@@ -21,10 +22,10 @@
  
    AppDir_Settings:= OpDirLocal+DirectorySeparator+'settings';
    CreateDirUTF8(AppDir_Settings);
-@@ -1001,6 +1008,15 @@
-           '/usr/share/cudatext/data',
-           '/usr/share/cudatext/settings_default'
-           ], S);
+@@ -1000,6 +1008,15 @@
+         OpDirPrecopy+'/',
+         OpDirLocal
+         ], S);
 +  {$endif}
 +  {$ifdef freebsd}
 +    RunCommand('cp', ['-R',
@@ -35,5 +36,5 @@
 +        OpDirLocal
 +         ], S);
    {$endif}
-   {$ifdef darwin}
-   if IsDistroUpdateNeeded then
+ 
+   AppDir_Py:= OpDirLocal+DirectorySeparator+'py';
diff --git a/editors/cudatext/pkg-plist b/editors/cudatext/pkg-plist
index 729c2a7337fa..57449314d6a2 100644
--- a/editors/cudatext/pkg-plist
+++ b/editors/cudatext/pkg-plist
@@ -7,11 +7,8 @@ share/applications/cudatext.desktop
 %%DATADIR%%/data/autocomplete/JavaScript.acp
 %%DATADIR%%/data/autocomplete/Lua.acp
 %%DATADIR%%/data/autocomplete/PHP_.acp
-%%DATADIR%%/data/autocomplete/Pascal.acp
-%%DATADIR%%/data/autocomplete/PowerShell.acp
 %%DATADIR%%/data/autocomplete/Python.acp
 %%DATADIR%%/data/autocomplete/Resource script.acp
-%%DATADIR%%/data/autocomplete/Ruby.acp
 %%DATADIR%%/data/autocomplete/SQL.acp
 %%DATADIR%%/data/autocomplete/VBScript.acp
 %%DATADIR%%/data/autocompletespec/css_list.ini
@@ -359,8 +356,6 @@ share/applications/cudatext.desktop
 %%DATADIR%%/data/lexlib/C.lcf
 %%DATADIR%%/data/lexlib/CSS.cuda-lexmap
 %%DATADIR%%/data/lexlib/CSS.lcf
-%%DATADIR%%/data/lexlib/Diff.cuda-lexmap
-%%DATADIR%%/data/lexlib/Diff.lcf
 %%DATADIR%%/data/lexlib/HTML.cuda-lexmap
 %%DATADIR%%/data/lexlib/HTML.lcf
 %%DATADIR%%/data/lexlib/Ini files.cuda-lexmap
@@ -373,24 +368,14 @@ share/applications/cudatext.desktop
 %%DATADIR%%/data/lexlib/JavaScript.lcf
 %%DATADIR%%/data/lexlib/Lua.cuda-lexmap
 %%DATADIR%%/data/lexlib/Lua.lcf
-%%DATADIR%%/data/lexlib/Makefile.cuda-lexmap
-%%DATADIR%%/data/lexlib/Makefile.lcf
 %%DATADIR%%/data/lexlib/Markdown.cuda-lexmap
 %%DATADIR%%/data/lexlib/Markdown.lcf
 %%DATADIR%%/data/lexlib/PHP.cuda-lexmap
 %%DATADIR%%/data/lexlib/PHP.lcf
 %%DATADIR%%/data/lexlib/PHP_.cuda-lexmap
 %%DATADIR%%/data/lexlib/PHP_.lcf
-%%DATADIR%%/data/lexlib/Pascal.cuda-lexmap
-%%DATADIR%%/data/lexlib/Pascal.lcf
-%%DATADIR%%/data/lexlib/PowerShell.cuda-lexmap
-%%DATADIR%%/data/lexlib/PowerShell.lcf
-%%DATADIR%%/data/lexlib/Properties.cuda-lexmap
-%%DATADIR%%/data/lexlib/Properties.lcf
 %%DATADIR%%/data/lexlib/Python.cuda-lexmap
 %%DATADIR%%/data/lexlib/Python.lcf
-%%DATADIR%%/data/lexlib/Ruby.cuda-lexmap
-%%DATADIR%%/data/lexlib/Ruby.lcf
 %%DATADIR%%/data/lexlib/Search results.cuda-lexmap
 %%DATADIR%%/data/lexlib/Search results.lcf
 %%DATADIR%%/data/lexlib/VBScript.cuda-lexmap
@@ -414,9 +399,7 @@ share/applications/cudatext.desktop
 %%DATADIR%%/data/newdoc/default.css
 %%DATADIR%%/data/newdoc/default.js
 %%DATADIR%%/data/newdoc/default.php
-%%DATADIR%%/data/newdoc/default.pl
 %%DATADIR%%/data/newdoc/default.py
-%%DATADIR%%/data/newdoc/default.rb
 %%DATADIR%%/data/newdoc/default.vbs
 %%DATADIR%%/data/newdoc/default.xml
 %%DATADIR%%/data/newdoc/html.htm
@@ -624,6 +607,7 @@ share/applications/cudatext.desktop
 %%DATADIR%%/data/themes/navy.cuda-theme-ui
 %%DATADIR%%/data/themes/sub.cuda-theme-syntax
 %%DATADIR%%/data/themes/sub.cuda-theme-ui
+%%DATADIR%%/data/themes/white.cuda-theme-syntax
 %%DATADIR%%/data/themes/white.cuda-theme-ui
 %%DATADIR%%/data/themes/zeus.cuda-theme-syntax
 %%DATADIR%%/data/themes/zeus.cuda-theme-ui
@@ -659,6 +643,7 @@ share/applications/cudatext.desktop
 %%DATADIR%%/py/cuda_comments/install.inf
 %%DATADIR%%/py/cuda_emmet/__init__.py
 %%DATADIR%%/py/cuda_emmet/content.css
+%%DATADIR%%/py/cuda_emmet/dlg_emmet.py
 %%DATADIR%%/py/cuda_emmet/help.html
 %%DATADIR%%/py/cuda_emmet/install.inf
 %%DATADIR%%/py/cuda_emmet/proc_snip_insert.py
@@ -666,6 +651,10 @@ share/applications/cudatext.desktop
 %%DATADIR%%/py/cuda_insert_time/__init__.py
 %%DATADIR%%/py/cuda_insert_time/cuda_insert_time.ini
 %%DATADIR%%/py/cuda_insert_time/install.inf
+%%DATADIR%%/py/cuda_lexer_detecter/__init__.py
+%%DATADIR%%/py/cuda_lexer_detecter/cuda_gen_types.py
+%%DATADIR%%/py/cuda_lexer_detecter/install.inf
+%%DATADIR%%/py/cuda_lexer_detecter/lexertypes.py
 %%DATADIR%%/py/cuda_make_plugin/__init__.py
 %%DATADIR%%/py/cuda_make_plugin/dlg.py
 %%DATADIR%%/py/cuda_make_plugin/events.py
@@ -690,6 +679,7 @@ share/applications/cudatext.desktop
 %%DATADIR%%/py/cuda_project_man/__init__.py
 %%DATADIR%%/py/cuda_project_man/install.inf
 %%DATADIR%%/py/cuda_project_man/projman_dlg.py
+%%DATADIR%%/py/cuda_project_man/projman_glob.py
 %%DATADIR%%/py/cuda_project_man/readme/history.txt
 %%DATADIR%%/py/cuda_project_man/readme/license.txt
 %%DATADIR%%/py/cuda_project_man/readme/readme.txt
@@ -735,7 +725,6 @@ share/applications/cudatext.desktop
 %%DATADIR%%/py/cuda_tree_markdown/install.inf
 %%DATADIR%%/py/cudatext.py
 %%DATADIR%%/py/cudatext_cmd.py
-%%DATADIR%%/py/cudatext_init.py
 %%DATADIR%%/py/cudatext_keys.py
 %%DATADIR%%/py/cudatext_reset_plugins.py
 %%DATADIR%%/py/cudax_lib.py
@@ -883,7 +872,6 @@ share/applications/cudatext.desktop
 %%DATADIR%%/settings_default/lexer Bash script.json
 %%DATADIR%%/settings_default/lexer C++.json
 %%DATADIR%%/settings_default/lexer C.json
-%%DATADIR%%/settings_default/lexer CSS.json
 %%DATADIR%%/settings_default/lexer JSON.json
 %%DATADIR%%/settings_default/lexer JavaScript.json
 %%DATADIR%%/settings_default/lexer Lua.json