- Update to 1.84.2

4 files changed, 77 insertions, 82 deletions

diff --git a/editors/cudatext/Makefile b/editors/cudatext/Makefile
index e3c9ebb1b893..1d659313d36b 100644
--- a/editors/cudatext/Makefile
+++ b/editors/cudatext/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cudatext
-PORTVERSION=	1.76.0
+PORTVERSION=	1.84.2
 CATEGORIES=	editors
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
@@ -10,27 +10,31 @@ COMMENT=	Cross-platform text editor, written in Lazarus
 
 LICENSE=	MPL20
 
-USES=		dos2unix fpc lazarus:flavors
+USES=		desktop-file-utils dos2unix fpc lazarus:flavors
 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:ea64ab6:atflatcontrols/atflatcontrols  \
-		Alexey-T:ATSynEdit:fbfd8c9:atsynedit/atsynedit \
-		Alexey-T:EControl:3d97544:econtrol/econtrol \
-		Alexey-T:ATSynEdit_Ex:d9e1120:atsyneditex/atsyneditex \
+		Alexey-T:ATFlatControls:34fd9d3:atflatcontrols/atflatcontrols  \
+		Alexey-T:ATSynEdit:3ff9ac0: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:ATBinHex-Lazarus:cad0408:atbinhex/atbinhex \
 		Alexey-T:UniqueInstance:753f823:uniqueinstance/uniqueinstance
 
-DOS2UNIX_FILES=	app/settings_default/default.json
+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+=	atsynedit/atsynedit/atsynedit_package.lpk
+LAZARUS_PROJECT_FILES+=	emmet/emmet/emmet_package.lpk
 LAZARUS_PROJECT_FILES+=	econtrol/econtrol/econtrol_package.lpk
 LAZARUS_PROJECT_FILES+=	atsyneditex/atsynedit_ex/atsynedit_ex_package.lpk
+LAZARUS_PROJECT_FILES+=	atsyneditcmp/atsynedit_cmp/atsynedit_cmp_package.lpk
 LAZARUS_PROJECT_FILES+=	atbinhex/atbinhex/atbinhex_package.lpk
 LAZARUS_PROJECT_FILES+= uniqueinstance/uniqueinstance/uniqueinstance_package.lpk
 LAZARUS_PROJECT_FILES+=	app/cudatext.lpi
@@ -47,11 +51,16 @@ USE_FPC+=	${USE_FPC_${FLAVOR}}
 USE_GNOME+=	${USE_GNOME_${FLAVOR}}
 
 post-patch:
+	${REINPLACE_CMD} 's|-512||g' ${WRKSRC}/setup/debfiles/${PORTNAME}.desktop
 	${REINPLACE_CMD} 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/app/proc_globdata.pas
+	${REINPLACE_CMD} 's|TEncoding.UTF8|True|g' ${WRKSRC}/app/formmain_py_pluginwork.inc
 	${REINPLACE_CMD} '636d' ${WRKSRC}/app/proc_miscutils.pas
 
-do-install:
+do-install:	
 	${INSTALL_PROGRAM} ${WRKSRC}/app/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/setup/debfiles/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps
+	${INSTALL_DATA} ${WRKSRC}/setup/debfiles/${PORTNAME}-512.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/512x512/apps/${PORTNAME}.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/app && ${COPYTREE_SHARE} "data py readme settings_default" ${STAGEDIR}${DATADIR}
 
diff --git a/editors/cudatext/distinfo b/editors/cudatext/distinfo
index b79a3c202826..b4bf2453b471 100644
--- a/editors/cudatext/distinfo
+++ b/editors/cudatext/distinfo
@@ -1,16 +1,20 @@
-TIMESTAMP = 1551883608
-SHA256 (Alexey-T-CudaText-1.76.0_GH0.tar.gz) = 39181e897d1dbe23ed2e92de0114788b3d5ec758535a06b1b9d58bfb91105445
-SIZE (Alexey-T-CudaText-1.76.0_GH0.tar.gz) = 6698112
+TIMESTAMP = 1563686081
+SHA256 (Alexey-T-CudaText-1.84.2_GH0.tar.gz) = b5a28f3d51f7608b8890bd776161869241e74bfee9f453e0c9b49c15afc9296b
+SIZE (Alexey-T-CudaText-1.84.2_GH0.tar.gz) = 6776795
 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-ea64ab6_GH0.tar.gz) = 10cbec23636a412c416426c73b521b338b7cfe6b8348f8cbf692f752a21ed673
-SIZE (Alexey-T-ATFlatControls-ea64ab6_GH0.tar.gz) = 169360
-SHA256 (Alexey-T-ATSynEdit-fbfd8c9_GH0.tar.gz) = 254d1ebb36b86fcedd98d484e0d5c95f95e813da2ddde7d175f00677e10150d8
-SIZE (Alexey-T-ATSynEdit-fbfd8c9_GH0.tar.gz) = 535052
-SHA256 (Alexey-T-EControl-3d97544_GH0.tar.gz) = 6274312142442daad9fa08e538f840e217e1faf0a8f739c2ac7f610ecc2575ed
-SIZE (Alexey-T-EControl-3d97544_GH0.tar.gz) = 50665
-SHA256 (Alexey-T-ATSynEdit_Ex-d9e1120_GH0.tar.gz) = 78099dd1a61e50b65a538ef7aa40eb41df0dd883cbc08448062cc96cf437d4f6
-SIZE (Alexey-T-ATSynEdit_Ex-d9e1120_GH0.tar.gz) = 51226
+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-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-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 432b1d7d71e5..04b19a3b6072 100644
--- a/editors/cudatext/files/patch-app-proc_globdata.pas
+++ b/editors/cudatext/files/patch-app-proc_globdata.pas
@@ -1,18 +1,21 @@
---- app/proc_globdata.pas	2018-04-19 12:59:47.000000000 -0500
-+++ app/proc_globdata.pas	2018-04-25 21:26:43.609078000 -0500
-@@ -745,7 +745,7 @@
+--- 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 @@
    Result:=
-   {$ifdef windows} '' {$endif}
-   {$ifdef linux} '/usr/share/cudatext' {$endif}
--  {$ifdef freebsd} '' {$endif}
-+  {$ifdef freebsd} '%%DATADIR%%' {$endif}
-   {$ifdef darwin} ExtractFileDir(OpDirExe)+'/Resources' {$endif}
- end;
- 
-@@ -895,6 +895,15 @@
+     {$ifdef linux} 
+     '/usr/share/cudatext'
++    {$endif}
++    {$ifdef freebsd}
++    '%%DATADIR%%'
+     {$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}
++        ], S);
++      {$endif}
 +      {$ifdef freebsd}
 +      RunCommand('cp', ['-R',
 +        '%%DATADIR%%/py',
@@ -20,8 +23,6 @@
 +        '%%DATADIR%%/readme',
 +        '%%DATADIR%%/settings_default',
 +        OpDirLocal
-+        ], S);
-+      {$endif}
+         ], S);
+       {$endif}
        {$ifdef darwin}
-       //see rsync help. need options:
-       // -u (update)
diff --git a/editors/cudatext/pkg-plist b/editors/cudatext/pkg-plist
index 45c20baffcc9..e02172283296 100644
--- a/editors/cudatext/pkg-plist
+++ b/editors/cudatext/pkg-plist
@@ -1,4 +1,5 @@
 bin/cudatext
+share/applications/cudatext.desktop
 %%DATADIR%%/data/autocomplete/Bash script.acp
 %%DATADIR%%/data/autocomplete/Batch files.acp
 %%DATADIR%%/data/autocomplete/C++.acp
@@ -14,6 +15,8 @@ bin/cudatext
 %%DATADIR%%/data/autocomplete/SQL.acp
 %%DATADIR%%/data/autocomplete/VBScript.acp
 %%DATADIR%%/data/autocompletespec/css_list.ini
+%%DATADIR%%/data/autocompletespec/emmet_lorem.txt
+%%DATADIR%%/data/autocompletespec/emmet_snippets.ini
 %%DATADIR%%/data/autocompletespec/html_list.ini
 %%DATADIR%%/data/codetreeicons/default_16x16/ar1.png
 %%DATADIR%%/data/codetreeicons/default_16x16/ar2.png
@@ -606,50 +609,6 @@ bin/cudatext
 %%DATADIR%%/data/snippets/Std.HtmlTags/var.synw-snippet
 %%DATADIR%%/data/snippets/Std.HtmlTags/video.synw-snippet
 %%DATADIR%%/data/snippets/Std.HtmlTags/wbr.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/$_cookie.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/$_env.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/$_files.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/$_get.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/$_post.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/$_request.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/$_server.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/$_session.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/$globals.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/class.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/constructor.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/define.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/defined.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/do-while.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/docblock.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/echo.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/elseif.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/for.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/foreach.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/function.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/if-a-b.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/if-else.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/if.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/include-once.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/include.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/new-array.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/php-echo-_.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/php-echo-htmlentities.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/php-echo-this.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/php-else.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/php-foreach.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/php-if-else-endif.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/php-if-endif.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/php-this.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/php.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/require-once.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/require.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/return-false.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/return-true.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/return.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/switch-case.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/switch.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/throw.synw-snippet
-%%DATADIR%%/data/snippets/Std.Php/while.synw-snippet
 %%DATADIR%%/data/themes/Zeus-CudaText.license.txt
 %%DATADIR%%/data/themes/amy.cuda-theme-syntax
 %%DATADIR%%/data/themes/amy.cuda-theme-ui
@@ -680,6 +639,7 @@ bin/cudatext
 %%DATADIR%%/data/toolbaricons/default_24x24/f_save.png
 %%DATADIR%%/data/toolbaricons/default_24x24/indent.png
 %%DATADIR%%/data/toolbaricons/default_24x24/map.png
+%%DATADIR%%/data/toolbaricons/default_24x24/opt.png
 %%DATADIR%%/data/toolbaricons/default_24x24/sort.png
 %%DATADIR%%/data/toolbaricons/default_24x24/unindent.png
 %%DATADIR%%/data/toolbaricons/default_24x24/unpri.png
@@ -690,14 +650,19 @@ bin/cudatext
 %%DATADIR%%/py/cuda_addonman/work_cudatext_updates__sourceforge.py
 %%DATADIR%%/py/cuda_addonman/work_dlg_config.py
 %%DATADIR%%/py/cuda_addonman/work_github.py
+%%DATADIR%%/py/cuda_addonman/work_install_helper.py
 %%DATADIR%%/py/cuda_addonman/work_local.py
 %%DATADIR%%/py/cuda_addonman/work_remote.py
 %%DATADIR%%/py/cuda_comments/__init__.py
 %%DATADIR%%/py/cuda_comments/cd_comments.py
 %%DATADIR%%/py/cuda_comments/cd_plug_lib.py
 %%DATADIR%%/py/cuda_comments/install.inf
-%%DATADIR%%/py/cuda_comments/readme/history.txt
-%%DATADIR%%/py/cuda_comments/readme/readme.txt
+%%DATADIR%%/py/cuda_emmet/__init__.py
+%%DATADIR%%/py/cuda_emmet/content.css
+%%DATADIR%%/py/cuda_emmet/help.html
+%%DATADIR%%/py/cuda_emmet/install.inf
+%%DATADIR%%/py/cuda_emmet/proc_snip_insert.py
+%%DATADIR%%/py/cuda_emmet/profiles_list.py
 %%DATADIR%%/py/cuda_insert_time/__init__.py
 %%DATADIR%%/py/cuda_insert_time/cuda_insert_time.ini
 %%DATADIR%%/py/cuda_insert_time/install.inf
@@ -767,6 +732,8 @@ bin/cudatext
 %%DATADIR%%/py/cuda_testing_dlg_proc/testcall.py
 %%DATADIR%%/py/cuda_testing_gaps/__init__.py
 %%DATADIR%%/py/cuda_testing_gaps/install.inf
+%%DATADIR%%/py/cuda_tree_markdown/__init__.py
+%%DATADIR%%/py/cuda_tree_markdown/install.inf
 %%DATADIR%%/py/cudatext.py
 %%DATADIR%%/py/cudatext_cmd.py
 %%DATADIR%%/py/cudatext_init.py
@@ -913,3 +880,17 @@ bin/cudatext
 %%DATADIR%%/readme/wiki/cudatext_snippets_menu.png
 %%DATADIR%%/readme/wiki/synwrite-lexer-editor.png
 %%DATADIR%%/settings_default/default.json
+%%DATADIR%%/settings_default/lexer Assembly.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 Pascal.json
+%%DATADIR%%/settings_default/lexer Python.json
+%%DATADIR%%/settings_default/lexer Ruby.json
+%%DATADIR%%/settings_default/lexer TypeScript.json
+%%DATADIR%%/settings_default/lexer VBScript.json
+%%DATADIR%%/settings_default/lexer YAML.json
+share/icons/hicolor/512x512/apps/cudatext.png