x11/ly: update to 0.5.3, take maintainership

4 files changed, 29 insertions, 36 deletions

diff --git a/x11/ly/Makefile b/x11/ly/Makefile
index 7de3d5c8cbae..44e40581e47e 100644
--- a/x11/ly/Makefile
+++ b/x11/ly/Makefile
@@ -1,12 +1,11 @@
 PORTNAME=	ly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.2
-PORTREVISION=	2
+DISTVERSION=	0.5.3
 CATEGORIES=	x11
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	bapt@FreeBSD.org
 COMMENT=	TUI (ncurses-like) display manager for X and Wayland
-WWW=		https://github.com/cylgom/ly
+WWW=		https://github.com/fairyglade/ly
 
 LICENSE=	WTFPL
 LICENSE_FILE=	${WRKSRC}/license.md
@@ -15,13 +14,11 @@ BUILD_DEPENDS=	ginstall:sysutils/coreutils
 
 USES=		gmake localbase xorg
 USE_GITHUB=	yes
-GH_ACCOUNT=	cylgom
-GH_TUPLE=	cylgom:argoat:36c41f09ecc2a10c9acf35e4194e08b6fa10cf45:argoat/sub/argoat \
-		cylgom:testoasterror:71620b47872b5535f87c908883576d73153a6911:testoasterror/sub/argoat/sub/testoasterror \
-		cylgom:configator:8227b3a835bf4c7e50a57e4ad6aff620ba0dc349:configator/sub/configator \
-		cylgom:ctypes:5dd979d3644ab0c85ca14e72b61e6d3d238d432b:ctypes/sub/ctypes \
-		cylgom:dragonfail:6b40d1f8b7f6dda9746e688666af623dfbcceb94:dragonfail/sub/dragonfail \
-		cylgom:termbox_next:2312da153e44face7bb45aa2798ec284289c17ca:termbox_next/sub/termbox_next
+GH_ACCOUNT=	fairyglade
+GH_TUPLE=	nullgemm:argoat:36c41f09ecc2a10c9acf35e4194e08b6fa10cf45:argoat/sub/argoat \
+		nullgemm:configator:8227b3a835bf4c7e50a57e4ad6aff620ba0dc349:configator/sub/configator \
+		nullgemm:dragonfail:6b40d1f8b7f6dda9746e688666af623dfbcceb94:dragonfail/sub/dragonfail \
+		nullgemm:termbox_next:2312da153e44face7bb45aa2798ec284289c17ca:termbox_next/sub/termbox_next
 USE_XORG=	xcb
 
 MAKEFILE=	makefile
diff --git a/x11/ly/distinfo b/x11/ly/distinfo
index bb5ca9bd4a31..9f37c73a38ed 100644
--- a/x11/ly/distinfo
+++ b/x11/ly/distinfo
@@ -1,15 +1,11 @@
-TIMESTAMP = 1617989260
-SHA256 (cylgom-ly-v0.5.2_GH0.tar.gz) = 3460c2c8015add2946f9ff5d3e4bf051d7c07005698fe61279cedacd1283e010
-SIZE (cylgom-ly-v0.5.2_GH0.tar.gz) = 22535
-SHA256 (cylgom-argoat-36c41f09ecc2a10c9acf35e4194e08b6fa10cf45_GH0.tar.gz) = 5c284cae748b1cec4eef311845f53ad673f91996ec425c6e323f0c40e829e77f
-SIZE (cylgom-argoat-36c41f09ecc2a10c9acf35e4194e08b6fa10cf45_GH0.tar.gz) = 5497
-SHA256 (cylgom-testoasterror-71620b47872b5535f87c908883576d73153a6911_GH0.tar.gz) = bffa1100ffbb7d541a16a9a543e216748fe6f6264fd2b9137738cebcf68d3e8c
-SIZE (cylgom-testoasterror-71620b47872b5535f87c908883576d73153a6911_GH0.tar.gz) = 3360
-SHA256 (cylgom-configator-8227b3a835bf4c7e50a57e4ad6aff620ba0dc349_GH0.tar.gz) = bde1826acb80092bd551985082dc872c7f3e48e03132c377f0e5cdd2f9f331e3
-SIZE (cylgom-configator-8227b3a835bf4c7e50a57e4ad6aff620ba0dc349_GH0.tar.gz) = 4501
-SHA256 (cylgom-ctypes-5dd979d3644ab0c85ca14e72b61e6d3d238d432b_GH0.tar.gz) = 778189ee022a0ad97073372681fb92a7b2a1ecc5a242e99b1f23745f084ee3e1
-SIZE (cylgom-ctypes-5dd979d3644ab0c85ca14e72b61e6d3d238d432b_GH0.tar.gz) = 1242
-SHA256 (cylgom-dragonfail-6b40d1f8b7f6dda9746e688666af623dfbcceb94_GH0.tar.gz) = c185f739e392313c08b0d5fd27e93891b89c36b7b49b83570b601b9cbfbddae1
-SIZE (cylgom-dragonfail-6b40d1f8b7f6dda9746e688666af623dfbcceb94_GH0.tar.gz) = 3348
-SHA256 (cylgom-termbox_next-2312da153e44face7bb45aa2798ec284289c17ca_GH0.tar.gz) = b788c86e1454c32cd218d0478a87def0a4d1322fef407885359d1ed0c343b045
-SIZE (cylgom-termbox_next-2312da153e44face7bb45aa2798ec284289c17ca_GH0.tar.gz) = 23558
+TIMESTAMP = 1680865749
+SHA256 (fairyglade-ly-v0.5.3_GH0.tar.gz) = ddbd8bd6d7a00867d269154c564d0c059f2d5b0df111e1995b4abfbb89f683d5
+SIZE (fairyglade-ly-v0.5.3_GH0.tar.gz) = 22464
+SHA256 (nullgemm-argoat-36c41f09ecc2a10c9acf35e4194e08b6fa10cf45_GH0.tar.gz) = 5c284cae748b1cec4eef311845f53ad673f91996ec425c6e323f0c40e829e77f
+SIZE (nullgemm-argoat-36c41f09ecc2a10c9acf35e4194e08b6fa10cf45_GH0.tar.gz) = 5497
+SHA256 (nullgemm-configator-8227b3a835bf4c7e50a57e4ad6aff620ba0dc349_GH0.tar.gz) = bde1826acb80092bd551985082dc872c7f3e48e03132c377f0e5cdd2f9f331e3
+SIZE (nullgemm-configator-8227b3a835bf4c7e50a57e4ad6aff620ba0dc349_GH0.tar.gz) = 4501
+SHA256 (nullgemm-dragonfail-6b40d1f8b7f6dda9746e688666af623dfbcceb94_GH0.tar.gz) = c185f739e392313c08b0d5fd27e93891b89c36b7b49b83570b601b9cbfbddae1
+SIZE (nullgemm-dragonfail-6b40d1f8b7f6dda9746e688666af623dfbcceb94_GH0.tar.gz) = 3348
+SHA256 (nullgemm-termbox_next-2312da153e44face7bb45aa2798ec284289c17ca_GH0.tar.gz) = b788c86e1454c32cd218d0478a87def0a4d1322fef407885359d1ed0c343b045
+SIZE (nullgemm-termbox_next-2312da153e44face7bb45aa2798ec284289c17ca_GH0.tar.gz) = 23558
diff --git a/x11/ly/files/patch-src_config.c b/x11/ly/files/patch-src_config.c
index 4476d8704f41..7d84e59f76bd 100644
--- a/x11/ly/files/patch-src_config.c
+++ b/x11/ly/files/patch-src_config.c
@@ -1,6 +1,6 @@
---- src/config.c.orig	2020-02-02 23:51:05.000000000 -0800
-+++ src/config.c	2021-02-02 19:41:09.071495000 -0800
-@@ -9,8 +9,8 @@
+--- src/config.c.orig	2021-10-07 13:58:27 UTC
++++ src/config.c
+@@ -11,8 +11,8 @@
  #include <unistd.h>
  
  #ifndef DEBUG
@@ -11,7 +11,7 @@
  #else
  	#define INI_LANG "../res/lang/%s.ini"
  	#define INI_CONFIG "../res/config.ini"
-@@ -183,6 +183,7 @@
+@@ -185,6 +185,7 @@ void config_load(const char *cfg_path)
  		{"shutdown_cmd", &config.shutdown_cmd, config_handle_str},
  		{"term_reset_cmd", &config.term_reset_cmd, config_handle_str},
  		{"tty", &config.tty, config_handle_u8},
@@ -19,7 +19,7 @@
  		{"wayland_cmd", &config.wayland_cmd, config_handle_str},
  		{"wayland_specifier", &config.wayland_specifier, config_handle_bool},
  		{"waylandsessions", &config.waylandsessions, config_handle_str},
-@@ -192,7 +193,7 @@
+@@ -194,7 +195,7 @@ void config_load(const char *cfg_path)
  		{"xsessions", &config.xsessions, config_handle_str},
  	};
  
@@ -28,7 +28,7 @@
  	struct configator_param* map[] =
  	{
  		map_no_section,
-@@ -289,6 +290,7 @@
+@@ -291,6 +292,7 @@ void config_defaults()
  	config.shutdown_cmd = strdup("/sbin/shutdown -a now");
  	config.term_reset_cmd = strdup("/usr/bin/tput reset");
  	config.tty = 2;
diff --git a/x11/ly/files/patch-src_config.h b/x11/ly/files/patch-src_config.h
index da9e735340b9..9a76c1abc875 100644
--- a/x11/ly/files/patch-src_config.h
+++ b/x11/ly/files/patch-src_config.h
@@ -1,10 +1,10 @@
---- src/config.h.orig	2020-02-03 07:51:05 UTC
+--- src/config.h.orig	2021-10-07 13:58:27 UTC
 +++ src/config.h
-@@ -88,6 +88,7 @@ struct config
+@@ -89,6 +89,7 @@ struct config
  	char* shutdown_cmd;
  	char* term_reset_cmd;
- 	u8 tty;
-+	u8 vt;
+ 	uint8_t tty;
++	uint8_t vt;
  	char* wayland_cmd;
  	bool wayland_specifier;
  	char* waylandsessions;