Index: x11/ly/Makefile =================================================================== --- x11/ly/Makefile +++ x11/ly/Makefile @@ -2,7 +2,7 @@ PORTNAME= ly DISTVERSIONPREFIX= v -DISTVERSION= 0.4.0 +DISTVERSION= 0.5.0 CATEGORIES= x11 MAINTAINER= 0mp@FreeBSD.org @@ -21,7 +21,7 @@ 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 + cylgom:termbox_next:7b85905531bf9e5908c67276dac55d3241361f20:termbox_next/sub/termbox_next USE_XORG= xcb MAKEFILE= makefile Index: x11/ly/distinfo =================================================================== --- x11/ly/distinfo +++ x11/ly/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1573652164 -SHA256 (cylgom-ly-v0.4.0_GH0.tar.gz) = c4e505be200d54679f27929cffb1f4625c20ab51e8b6ffe7c06b3bccff5fb40d -SIZE (cylgom-ly-v0.4.0_GH0.tar.gz) = 18807 +TIMESTAMP = 1580806291 +SHA256 (cylgom-ly-v0.5.0_GH0.tar.gz) = 5311d77a1f9e5e827adc26e7bdf4a6dadb5ada0fa7d85b451b35231cb6d84b6d +SIZE (cylgom-ly-v0.5.0_GH0.tar.gz) = 20355 SHA256 (cylgom-argoat-36c41f09ecc2a10c9acf35e4194e08b6fa10cf45_GH0.tar.gz) = 5c284cae748b1cec4eef311845f53ad673f91996ec425c6e323f0c40e829e77f SIZE (cylgom-argoat-36c41f09ecc2a10c9acf35e4194e08b6fa10cf45_GH0.tar.gz) = 5497 SHA256 (cylgom-testoasterror-71620b47872b5535f87c908883576d73153a6911_GH0.tar.gz) = bffa1100ffbb7d541a16a9a543e216748fe6f6264fd2b9137738cebcf68d3e8c @@ -11,5 +11,5 @@ 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 +SHA256 (cylgom-termbox_next-7b85905531bf9e5908c67276dac55d3241361f20_GH0.tar.gz) = 3b1b0d93352706f85aecb1c9145662950f4ee3f0aea567932038462cb829cfc2 +SIZE (cylgom-termbox_next-7b85905531bf9e5908c67276dac55d3241361f20_GH0.tar.gz) = 23538 Index: x11/ly/files/patch-makefile =================================================================== --- x11/ly/files/patch-makefile +++ x11/ly/files/patch-makefile @@ -1,11 +1,8 @@ ---- makefile.orig 2019-09-21 16:00:16 UTC +--- makefile.orig 2020-02-03 07:51:05 UTC +++ makefile -@@ -1,9 +1,9 @@ - NAME = ly - CC = gcc +@@ -3,7 +3,7 @@ CC = gcc FLAGS = -std=c99 -pedantic -g --FLAGS+= -Wall -Wno-unused-parameter -Wextra -Werror=vla -Werror -+FLAGS+= -Wall -Wno-unused-parameter -Wextra -Werror=vla + FLAGS+= -Wall -Wextra -Werror=vla -Wno-unused-parameter #FLAGS+= -DDEBUG -FLAGS+= -DGIT_VERSION_STRING=\"$(shell git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')\" +FLAGS+= -DGIT_VERSION_STRING=\"${DISTVERSIONFULL}\" @@ -23,17 +20,17 @@ BIND = bin OBJD = obj -@@ -68,14 +72,13 @@ leakgrind: $(BIND)/$(NAME) +@@ -71,14 +75,13 @@ leakgrind: $(BIND)/$(NAME) install: $(BIND)/$(NAME) @echo "installing" - @install -dZ ${DESTDIR}/etc/ly - @install -DZ $(BIND)/$(NAME) -t ${DESTDIR}/usr/bin -- @install -DZ $(RESD)/xsetup.sh -t ${DESTDIR}/etc/ly -- @install -DZ $(RESD)/wsetup.sh -t ${DESTDIR}/etc/ly - @install -DZ $(RESD)/config.ini -t ${DESTDIR}/etc/ly -- @install -dZ ${DESTDIR}/etc/ly/lang -- @install -DZ $(RESD)/lang/* -t ${DESTDIR}/etc/ly/lang +- @install -DZ $(RESD)/xsetup.sh -t $(DATADIR) +- @install -DZ $(RESD)/wsetup.sh -t $(DATADIR) +- @install -dZ $(DATADIR)/lang +- @install -DZ $(RESD)/lang/* -t $(DATADIR)/lang - @install -DZ $(RESD)/ly.service -t ${DESTDIR}/usr/lib/systemd/system + @install -dZ ${DESTDIR}${PREFIX}/etc/ly + @install -DZ $(BIND)/$(NAME) -t ${DESTDIR}${PREFIX}/bin @@ -43,5 +40,5 @@ + @install -dZ ${DESTDIR}${PREFIX}/etc/ly/lang + @install -DZ $(RESD)/lang/* -t ${DESTDIR}${PREFIX}/etc/ly/lang - uninstall: - @echo "uninstalling" + installnoconf: $(BIND)/$(NAME) + @echo "installing without the configuration file" Index: x11/ly/files/patch-res_config.ini =================================================================== --- x11/ly/files/patch-res_config.ini +++ x11/ly/files/patch-res_config.ini @@ -1,4 +1,4 @@ ---- res/config.ini.orig 2019-06-26 21:11:33 UTC +--- res/config.ini.orig 2020-02-03 07:51:05 UTC +++ res/config.ini @@ -1,3 +1,5 @@ +# This is a FreeBSD-ready patched version of the upstream configuration file. @@ -17,8 +17,8 @@ #min_refresh_delta = 5 # default path - #path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/env -+path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/usr/bin/env + #path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/bin ++path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin # command executed when pressing F2 #restart_cmd = /sbin/shutdown -r now @@ -37,7 +37,7 @@ # terminal reset command (tput is faster) #term_reset_cmd = /usr/bin/tput reset -@@ -80,20 +87,29 @@ +@@ -80,23 +87,32 @@ # tty in use #tty = 2 @@ -47,6 +47,9 @@ # wayland setup command #wayland_cmd = /etc/ly/wsetup.sh +wayland_cmd = %%ETCDIR%%/wsetup.sh + + # add wayland specifier to session names + #wayland_specifier = false # wayland desktop environments #waylandsessions = /usr/share/wayland-sessions Index: x11/ly/files/patch-src_config.h =================================================================== --- x11/ly/files/patch-src_config.h +++ x11/ly/files/patch-src_config.h @@ -1,10 +1,10 @@ ---- src/config.h.orig 2019-11-12 22:29:26 UTC +--- src/config.h.orig 2020-02-03 07:51:05 UTC +++ src/config.h -@@ -82,6 +82,7 @@ struct config +@@ -88,6 +88,7 @@ struct config char* shutdown_cmd; char* term_reset_cmd; u8 tty; + u8 vt; char* wayland_cmd; + bool wayland_specifier; char* waylandsessions; - char* x_cmd; Index: x11/ly/files/patch-src_config.c =================================================================== --- x11/ly/files/patch-src_config.c +++ x11/ly/files/patch-src_config.c @@ -1,25 +1,23 @@ ---- src/config.c.orig 2019-06-26 21:11:33 UTC +--- src/config.c.orig 2020-02-03 07:51:05 UTC +++ src/config.c -@@ -9,8 +9,8 @@ - #include +@@ -10,7 +10,7 @@ #ifndef DEBUG -- #define INI_LANG "/etc/ly/lang/%s.ini" + #define INI_LANG DATADIR "/lang/%s.ini" - #define INI_CONFIG "/etc/ly/config.ini" -+ #define INI_LANG "%%ETCDIR%%/lang/%s.ini" + #define INI_CONFIG "%%ETCDIR%%/config.ini" #else #define INI_LANG "../res/lang/%s.ini" #define INI_CONFIG "../res/config.ini" -@@ -179,6 +179,7 @@ void config_load() +@@ -183,6 +183,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}, + {"vt", &config.vt, config_handle_u8}, {"wayland_cmd", &config.wayland_cmd, config_handle_str}, + {"wayland_specifier", &config.wayland_specifier, config_handle_bool}, {"waylandsessions", &config.waylandsessions, config_handle_str}, - {"x_cmd", &config.x_cmd, config_handle_str}, -@@ -187,7 +188,7 @@ void config_load() +@@ -192,7 +193,7 @@ void config_load(const char *cfg_path) {"xsessions", &config.xsessions, config_handle_str}, }; @@ -28,11 +26,11 @@ struct configator_param* map[] = { map_no_section, -@@ -284,6 +285,7 @@ void config_defaults() +@@ -289,6 +290,7 @@ void config_defaults() config.shutdown_cmd = strdup("/sbin/shutdown -a now"); config.term_reset_cmd = strdup("/usr/bin/tput reset"); config.tty = 2; + config.vt = 9; - config.wayland_cmd = strdup("/etc/ly/wsetup.sh"); + config.wayland_cmd = strdup(DATADIR "/wsetup.sh"); + config.wayland_specifier = false; config.waylandsessions = strdup("/usr/share/wayland-sessions"); - config.x_cmd = strdup("/usr/bin/X"); Index: x11/ly/files/patch-src_login.c =================================================================== --- x11/ly/files/patch-src_login.c +++ x11/ly/files/patch-src_login.c @@ -1,6 +1,6 @@ ---- src/login.c.orig 2019-09-21 16:00:16 UTC +--- src/login.c.orig 2020-02-03 07:51:05 UTC +++ src/login.c -@@ -239,9 +239,15 @@ void env_init(struct passwd* pwd, const char* display_ +@@ -243,9 +247,15 @@ void env_init(struct passwd* pwd) void env_xdg(const char* tty_id, const enum display_server display_server) { @@ -19,12 +19,12 @@ setenv("XDG_SESSION_CLASS", "user", 0); setenv("XDG_SEAT", "seat0", 0); setenv("XDG_VTNR", tty_id, 0); -@@ -553,7 +559,7 @@ void auth( +@@ -581,7 +591,7 @@ void auth( + char vt[5]; - snprintf(display_name, 3, ":%d", display_id); snprintf(tty_id, 3, "%d", config.tty); - snprintf(vt, 5, "vt%d", config.tty); + snprintf(vt, 5, "vt%d", config.vt); // set env - env_init(pwd, display_name); + env_init(pwd);