Skip to content

Commit

Permalink
x11/ly: Update to 0.5.2
Browse files Browse the repository at this point in the history
  • Loading branch information
neelchauhan committed Apr 9, 2021
1 parent 59bc8a4 commit d34cc23
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 16 deletions.
2 changes: 1 addition & 1 deletion x11/ly/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ly
DISTVERSIONPREFIX= v
DISTVERSION= 0.5.0
DISTVERSION= 0.5.2
CATEGORIES= x11

MAINTAINER= nc@FreeBSD.org
Expand Down
6 changes: 3 additions & 3 deletions x11/ly/distinfo
@@ -1,6 +1,6 @@
TIMESTAMP = 1612242690
SHA256 (cylgom-ly-v0.5.0_GH0.tar.gz) = 5311d77a1f9e5e827adc26e7bdf4a6dadb5ada0fa7d85b451b35231cb6d84b6d
SIZE (cylgom-ly-v0.5.0_GH0.tar.gz) = 20355
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
Expand Down
8 changes: 5 additions & 3 deletions x11/ly/files/patch-makefile
@@ -1,4 +1,4 @@
--- makefile.orig 2020-02-03 07:51:05 UTC
--- makefile.orig 2020-07-28 15:35:08 UTC
+++ makefile
@@ -1,9 +1,9 @@
NAME = ly
Expand All @@ -23,7 +23,7 @@

BIND = bin
OBJD = obj
@@ -71,14 +75,13 @@ leakgrind: $(BIND)/$(NAME)
@@ -71,15 +75,14 @@ leakgrind: $(BIND)/$(NAME)

install: $(BIND)/$(NAME)
@echo "installing"
Expand All @@ -34,14 +34,16 @@
- @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 $(RESD)/ly.service -m 644 -t ${DESTDIR}/usr/lib/systemd/system
- @install -DZ $(RESD)/pam.d/ly -m 644 -t ${DESTDIR}/etc/pam.d
+ @install -dZ ${DESTDIR}${PREFIX}/etc/ly
+ @install -DZ $(BIND)/$(NAME) -t ${DESTDIR}${PREFIX}/bin
+ @install -DZ $(RESD)/config.ini -t ${DESTDIR}${PREFIX}/etc/ly
+ @install -DZ $(RESD)/xsetup.sh -t ${DESTDIR}${PREFIX}/etc/ly
+ @install -DZ $(RESD)/wsetup.sh -t ${DESTDIR}${PREFIX}/etc/ly
+ @install -dZ ${DESTDIR}${PREFIX}/etc/ly/lang
+ @install -DZ $(RESD)/lang/* -t ${DESTDIR}${PREFIX}/etc/ly/lang
+ @install -DZ $(RESD)/pam.d/ly -m 644 -t ${DESTDIR}${PREFIX}/etc/pam.d

installnoconf: $(BIND)/$(NAME)
@echo "installing without the configuration file"
17 changes: 9 additions & 8 deletions x11/ly/files/patch-res_config.ini
@@ -1,12 +1,12 @@
--- res/config.ini.orig 2020-02-02 23:51:05.000000000 -0800
+++ res/config.ini 2021-02-02 19:37:58.212398000 -0800
--- res/config.ini.orig 2020-07-28 15:35:08 UTC
+++ res/config.ini
@@ -1,3 +1,5 @@
+# This is a FreeBSD-ready patched version of the upstream configuration file.
+
# animation enabled
#animate = false
#animate = true
@@ -52,12 +54,14 @@
@@ -53,12 +55,14 @@

# cookie generator
#mcookie_cmd = /usr/bin/mcookie
Expand All @@ -16,27 +16,27 @@
#min_refresh_delta = 5

# default path
#path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/bin
#path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin
+path = /sbin:/bin:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin:/usr/sbin:/usr/bin:/usr/bin/env

# command executed when pressing F2
#restart_cmd = /sbin/shutdown -r now
@@ -67,12 +71,14 @@
@@ -68,12 +72,14 @@

# file in which to save and load the default desktop and login
#save_file = /etc/ly/save
+save_file = %%ETCDIR%%/save

# service name (pam needs this set to login)
#service_name = login
# service name (set to ly to use the provided pam config file)
#service_name = ly

# command executed when pressing F1
#shutdown_cmd = /sbin/shutdown -a now
+shutdown_cmd = /sbin/shutdown -p now

# terminal reset command (tput is faster)
#term_reset_cmd = /usr/bin/tput reset
@@ -80,23 +86,32 @@
@@ -81,8 +87,12 @@
# tty in use
#tty = 2

Expand All @@ -49,6 +49,7 @@

# add wayland specifier to session names
#wayland_specifier = false
@@ -90,15 +100,20 @@

# wayland desktop environments
#waylandsessions = /usr/share/wayland-sessions
Expand Down
7 changes: 6 additions & 1 deletion x11/ly/pkg-plist
@@ -1,7 +1,12 @@
bin/ly
@sample %%ETCDIR%%/config.ini.sample
@dir %%ETCDIR%%/lang
%%ETCDIR%%/lang/en.ini
%%ETCDIR%%/lang/es.ini
%%ETCDIR%%/lang/fr.ini
%%ETCDIR%%/lang/pt.ini
%%ETCDIR%%/lang/ro.ini
%%ETCDIR%%/lang/ru.ini
@sample %%ETCDIR%%/config.ini.sample
@sample %%ETCDIR%%/wsetup.sh.sample
@sample %%ETCDIR%%/xsetup.sh.sample
etc/pam.d/ly

0 comments on commit d34cc23

Please sign in to comment.