git: 613bcfe053d3 - main - sysutils/desktop-installer: Update to 1.1.1.4
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 21 Sep 2025 14:19:54 UTC
The branch main has been updated by jwb:
URL: https://cgit.FreeBSD.org/ports/commit/?id=613bcfe053d34b2708cf632c25fdb66e4b160c34
commit 613bcfe053d34b2708cf632c25fdb66e4b160c34
Author: Jason W. Bacon <jwb@FreeBSD.org>
AuthorDate: 2025-09-21 14:18:06 +0000
Commit: Jason W. Bacon <jwb@FreeBSD.org>
CommitDate: 2025-09-21 14:18:06 +0000
sysutils/desktop-installer: Update to 1.1.1.4
Fix generated xsession file to check for VBoxClient before trying
to run it. This unbreaks XDM logins on VMs where guest additions
are not installed. Guest additions do not currently work on 15.0.
---
sysutils/desktop-installer/Makefile | 6 +++---
sysutils/desktop-installer/distinfo | 6 +++---
sysutils/desktop-installer/pkg-install | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sysutils/desktop-installer/Makefile b/sysutils/desktop-installer/Makefile
index 1059509647ee..20f96224ab54 100644
--- a/sysutils/desktop-installer/Makefile
+++ b/sysutils/desktop-installer/Makefile
@@ -1,6 +1,6 @@
PORTNAME= desktop-installer
-DISTVERSION= 1.1.1-3
-DISTVERSIONSUFFIX= -g765d897
+DISTVERSION= 1.1.1-4
+DISTVERSIONSUFFIX= -gd169ed0
CATEGORIES= sysutils
MAINTAINER= jwb@FreeBSD.org
@@ -10,7 +10,7 @@ WWW= https://github.com/outpaddling/desktop-installer
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= auto-admin>=0.8.1:sysutils/auto-admin
+RUN_DEPENDS= auto-admin>=0.8.3.27:sysutils/auto-admin
USES= desktop-file-utils
USE_GITHUB= yes
diff --git a/sysutils/desktop-installer/distinfo b/sysutils/desktop-installer/distinfo
index 1bdeaa80c99c..fc0db02d1af6 100644
--- a/sysutils/desktop-installer/distinfo
+++ b/sysutils/desktop-installer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1757462129
-SHA256 (outpaddling-desktop-installer-1.1.1-3-g765d897_GH0.tar.gz) = afe58b07bae1662d0c5be6b4d825d8a74049659f046281a54193f7ac93f70e8b
-SIZE (outpaddling-desktop-installer-1.1.1-3-g765d897_GH0.tar.gz) = 1749607
+TIMESTAMP = 1758458368
+SHA256 (outpaddling-desktop-installer-1.1.1-4-gd169ed0_GH0.tar.gz) = fc59f95817679701c0ad96e97cd9270f099495fa2fd3fc7c1ad7971b80159d90
+SIZE (outpaddling-desktop-installer-1.1.1-4-gd169ed0_GH0.tar.gz) = 1749625
diff --git a/sysutils/desktop-installer/pkg-install b/sysutils/desktop-installer/pkg-install
index 04988f978824..5a1fd45e38bf 100644
--- a/sysutils/desktop-installer/pkg-install
+++ b/sysutils/desktop-installer/pkg-install
@@ -1,7 +1,7 @@
#!/bin/sh
if [ "$2" = "POST-INSTALL" ]; then
- if fgrep -q battery-shutdown.sh /etc/rc.local; then
+ if fgrep -q battery-shutdown.sh /etc/rc.local 2> /dev/null; then
printf "Converting battery-shutdown service to cron job...\n"
sed -i '' -e 's|^/.*battery-shutdown.sh|# &|' /etc/rc.local
mkdir -p ${PKG_PREFIX}/etc/cron.d