4 files changed, 54 insertions, 41 deletions

diff --git a/editors/cudatext/Makefile b/editors/cudatext/Makefile
index 7c1647caea60..e5c46279ec53 100644
--- a/editors/cudatext/Makefile
+++ b/editors/cudatext/Makefile
@@ -1,38 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	cudatext
-PORTVERSION=	1.84.2
-PORTREVISION=	1
+PORTVERSION=	1.92.0
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Cross-platform text editor, written in Lazarus
 
-BROKEN=		unfetchable
-
 LICENSE=	MPL20
 
-USES=		desktop-file-utils dos2unix fpc gnome lazarus:flavors xorg
+USES=		desktop-file-utils dos2unix fpc gnome lazarus:flavors python xorg
 USE_FPC=	chm fcl-base fcl-image fcl-json fcl-stl fcl-xml pasjpeg rtl-objpas x11
 USE_XORG=	x11
 USE_GITHUB=	yes
 GH_ACCOUNT=	Alexey-T
 GH_PROJECT=	CudaText
 GH_TUPLE=	Alexey-T:Python-for-Lazarus:586eec1:python4lazarus/python4lazarus \
-		Alexey-T:ATFlatControls:34fd9d3:atflatcontrols/atflatcontrols  \
-		Alexey-T:ATSynEdit:3ff9ac0:atsynedit/atsynedit \
+		Alexey-T:ATFlatControls:ee25077:atflatcontrols/atflatcontrols  \
+		Alexey-T:ATSynEdit:3a2f413:atsynedit/atsynedit \
 		Alexey-T:Emmet-Pascal:0defe41:emmet/emmet \
-		Alexey-T:EControl_v1:3a20fbb:econtrol/econtrol \
-		Alexey-T:ATSynEdit_Ex_v1:6355c6f:atsyneditex/atsyneditex \
-		Alexey-T:ATSynEdit_Cmp:2e7ac8f:atsyneditcmp/atsyneditcmp \
+		Alexey-T:EControl:92b35f5:econtrol/econtrol \
+		Alexey-T:ATSynEdit_Ex:1ee4a75:atsyneditex/atsyneditex \
+		Alexey-T:ATSynEdit_Cmp:51a7103:atsyneditcmp/atsyneditcmp \
 		Alexey-T:ATBinHex-Lazarus:cad0408:atbinhex/atbinhex \
-		Alexey-T:UniqueInstance:753f823:uniqueinstance/uniqueinstance
+		Alexey-T:UniqueInstance:753f823:uniqueinstance/uniqueinstance \
+		Alexey-T:EncConv:3eb181f:encconv/encconv
 
 DOS2UNIX_FILES=	app/settings_default/default.json setup/debfiles/cudatext.desktop
 
 LAZARUS_PROJECT_FILES=	atflatcontrols/atflatcontrols/atflatcontrols_package.lpk
 LAZARUS_PROJECT_FILES+=	python4lazarus/python4lazarus/python4lazarus_package.lpk
+LAZARUS_PROJECT_FILES+= encconv/encconv/encconv_package.lpk
 LAZARUS_PROJECT_FILES+=	atsynedit/atsynedit/atsynedit_package.lpk
 LAZARUS_PROJECT_FILES+=	emmet/emmet/emmet_package.lpk
 LAZARUS_PROJECT_FILES+=	econtrol/econtrol/econtrol_package.lpk
diff --git a/editors/cudatext/distinfo b/editors/cudatext/distinfo
index b4bf2453b471..08b34e2bae16 100644
--- a/editors/cudatext/distinfo
+++ b/editors/cudatext/distinfo
@@ -1,21 +1,23 @@
-TIMESTAMP = 1563686081
-SHA256 (Alexey-T-CudaText-1.84.2_GH0.tar.gz) = b5a28f3d51f7608b8890bd776161869241e74bfee9f453e0c9b49c15afc9296b
-SIZE (Alexey-T-CudaText-1.84.2_GH0.tar.gz) = 6776795
+TIMESTAMP = 1577773011
+SHA256 (Alexey-T-CudaText-1.92.0_GH0.tar.gz) = f6fad774f6137321e8eb76a12e9a693eb2937da9d45fa3af2e5d55417c7f4279
+SIZE (Alexey-T-CudaText-1.92.0_GH0.tar.gz) = 5516570
 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-34fd9d3_GH0.tar.gz) = 7451fa44c659a65ab7f88ef2fe647b658018434bd753a2b4e2846892603f6e8e
-SIZE (Alexey-T-ATFlatControls-34fd9d3_GH0.tar.gz) = 237966
-SHA256 (Alexey-T-ATSynEdit-3ff9ac0_GH0.tar.gz) = a29ef61c2fa1c7336a1a151dfc52277d451df71601e3d8f9c190b69277a6aa33
-SIZE (Alexey-T-ATSynEdit-3ff9ac0_GH0.tar.gz) = 545908
+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_v1-3a20fbb_GH0.tar.gz) = 7db5329cc76cfe8ef77cd662491ca27ac86a52323cac09319bbf4a6555626bce
-SIZE (Alexey-T-EControl_v1-3a20fbb_GH0.tar.gz) = 51358
-SHA256 (Alexey-T-ATSynEdit_Ex_v1-6355c6f_GH0.tar.gz) = 71cb0aa1dfee6bfcecef678c4588d7d5972b8ae6cc48e84249bca66a431bf7ef
-SIZE (Alexey-T-ATSynEdit_Ex_v1-6355c6f_GH0.tar.gz) = 38897
-SHA256 (Alexey-T-ATSynEdit_Cmp-2e7ac8f_GH0.tar.gz) = 1f53cf09db16b38a5411b16222c237ae1c88e84e487d979c1eee7e22c6f7847b
-SIZE (Alexey-T-ATSynEdit_Cmp-2e7ac8f_GH0.tar.gz) = 8849
+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-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
 SIZE (Alexey-T-UniqueInstance-753f823_GH0.tar.gz) = 8328
+SHA256 (Alexey-T-EncConv-3eb181f_GH0.tar.gz) = aa26c96b622b82650ac669bb2ea092e2be92ae4f3e0b13725f7749558fab68ad
+SIZE (Alexey-T-EncConv-3eb181f_GH0.tar.gz) = 637785
diff --git a/editors/cudatext/files/patch-app-proc_globdata.pas b/editors/cudatext/files/patch-app-proc_globdata.pas
index 04b19a3b6072..0dfbf473540e 100644
--- a/editors/cudatext/files/patch-app-proc_globdata.pas
+++ b/editors/cudatext/files/patch-app-proc_globdata.pas
@@ -1,6 +1,6 @@
---- app/proc_globdata.pas	2019-07-18 15:40:29.000000000 -0500
-+++ app/proc_globdata.pas	2019-07-20 23:37:23.078548000 -0500
-@@ -857,6 +857,9 @@
+--- 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'
@@ -10,19 +10,30 @@
      {$else} 
        {$ifdef darwin} 
        ExtractFileDir(OpDirExe)+'/Resources'
-@@ -1032,6 +1035,15 @@
-         '/usr/share/cudatext/data',
-         '/usr/share/cudatext/readme',
-         '/usr/share/cudatext/settings_default'
-+        ], S);
-+      {$endif}
-+      {$ifdef freebsd}
-+      RunCommand('cp', ['-R',
+@@ -986,6 +989,10 @@
+   OpDirLocal:= AppDir_Home+'Library/Application Support/CudaText';
+   CreateDirUTF8(OpDirLocal);
+   {$endif}
++  {$ifdef freebsd}
++  OpDirLocal:= AppDir_Home + '.config/' + 'cudatext';
++  CreateDirUTF8(OpDirLocal);
++  {$endif}
+ 
+   AppDir_Settings:= OpDirLocal+DirectorySeparator+'settings';
+   CreateDirUTF8(AppDir_Settings);
+@@ -1001,6 +1008,15 @@
+           '/usr/share/cudatext/data',
+           '/usr/share/cudatext/settings_default'
+           ], S);
++  {$endif}
++  {$ifdef freebsd}
++    RunCommand('cp', ['-R',
 +        '%%DATADIR%%/py',
 +        '%%DATADIR%%/data',
 +        '%%DATADIR%%/readme',
 +        '%%DATADIR%%/settings_default',
 +        OpDirLocal
-         ], S);
-       {$endif}
-       {$ifdef darwin}
++         ], S);
+   {$endif}
+   {$ifdef darwin}
+   if IsDistroUpdateNeeded then
diff --git a/editors/cudatext/pkg-plist b/editors/cudatext/pkg-plist
index e02172283296..729c2a7337fa 100644
--- a/editors/cudatext/pkg-plist
+++ b/editors/cudatext/pkg-plist
@@ -689,11 +689,9 @@ share/applications/cudatext.desktop
 %%DATADIR%%/py/cuda_palette/lang/ru_RU/LC_MESSAGES/cuda_palette.po
 %%DATADIR%%/py/cuda_project_man/__init__.py
 %%DATADIR%%/py/cuda_project_man/install.inf
-%%DATADIR%%/py/cuda_project_man/pathlib.py
 %%DATADIR%%/py/cuda_project_man/projman_dlg.py
 %%DATADIR%%/py/cuda_project_man/readme/history.txt
 %%DATADIR%%/py/cuda_project_man/readme/license.txt
-%%DATADIR%%/py/cuda_project_man/readme/license_pathlib.txt
 %%DATADIR%%/py/cuda_project_man/readme/readme.txt
 %%DATADIR%%/py/cuda_show_unsaved/__init__.py
 %%DATADIR%%/py/cuda_show_unsaved/install.inf
@@ -729,6 +727,7 @@ share/applications/cudatext.desktop
 %%DATADIR%%/py/cuda_tabs_list/readme/readme.txt
 %%DATADIR%%/py/cuda_testing_dlg_proc/__init__.py
 %%DATADIR%%/py/cuda_testing_dlg_proc/install.inf
+%%DATADIR%%/py/cuda_testing_dlg_proc/repro_labels.py
 %%DATADIR%%/py/cuda_testing_dlg_proc/testcall.py
 %%DATADIR%%/py/cuda_testing_gaps/__init__.py
 %%DATADIR%%/py/cuda_testing_gaps/install.inf
@@ -817,6 +816,7 @@ share/applications/cudatext.desktop
 %%DATADIR%%/py/sys/urllib3/connection.py
 %%DATADIR%%/py/sys/urllib3/connectionpool.py
 %%DATADIR%%/py/sys/urllib3/contrib/__init__.py
+%%DATADIR%%/py/sys/urllib3/contrib/_appengine_environ.py
 %%DATADIR%%/py/sys/urllib3/contrib/_securetransport/__init__.py
 %%DATADIR%%/py/sys/urllib3/contrib/_securetransport/bindings.py
 %%DATADIR%%/py/sys/urllib3/contrib/_securetransport/low_level.py
@@ -831,7 +831,6 @@ share/applications/cudatext.desktop
 %%DATADIR%%/py/sys/urllib3/packages/__init__.py
 %%DATADIR%%/py/sys/urllib3/packages/backports/__init__.py
 %%DATADIR%%/py/sys/urllib3/packages/backports/makefile.py
-%%DATADIR%%/py/sys/urllib3/packages/ordered_dict.py
 %%DATADIR%%/py/sys/urllib3/packages/six.py
 %%DATADIR%%/py/sys/urllib3/packages/ssl_match_hostname/__init__.py
 %%DATADIR%%/py/sys/urllib3/packages/ssl_match_hostname/_implementation.py
@@ -881,12 +880,14 @@ share/applications/cudatext.desktop
 %%DATADIR%%/readme/wiki/synwrite-lexer-editor.png
 %%DATADIR%%/settings_default/default.json
 %%DATADIR%%/settings_default/lexer Assembly.json
+%%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
+%%DATADIR%%/settings_default/lexer PHP.json
 %%DATADIR%%/settings_default/lexer Pascal.json
 %%DATADIR%%/settings_default/lexer Python.json
 %%DATADIR%%/settings_default/lexer Ruby.json