From nobody Wed Aug 9 13:57:10 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RLWnz0Mthz4Tjm7; Wed, 9 Aug 2023 13:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RLWny6t4jz4SG5; Wed, 9 Aug 2023 13:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691589431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Gibc2W7A8Wizv4RMSPKf01t7NMy80O9P66WG6PkOsE=; b=vpZVvQtlo36DvIs98hP71q8Qt5hjfTgyH8P9C3HNIBTKypsSiyevSG8pdy+baM30puPuoc CVW5bxWp5nEyh8lJk2BJz4Lf460jVkI/2hy0xujcF8VznCfZxlKRJoPFkSh0tLdITfVkYt XmcgaPTL1cY/iyJ+DlBm9oDSM7vvlVqjx0s2e+6Qpamx06MwoVrm85eT5NNO9INH4RDV06 gACVDJumaCypqkMsgU9OaxgG6EOPGSmJYOGlGhVA0w4S9Sx35mGbuU36QwWEkwEcb6dqYE Y8hgko6GCLuRMqdSfuP+dH2v9/JSpzHet0zcHaWbxmcS3fUnyRnvGkSEmGQSkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691589431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2Gibc2W7A8Wizv4RMSPKf01t7NMy80O9P66WG6PkOsE=; b=nwPK+fPAcvJYrYyCNB6cpRprerT8T3VJwI42GCN5xFC+M6+cKob5khYeU/Wh6PsgnMVBZ6 pjQp5CayzSZCACDbbf+u74xT5NTzSAIw2TrXtvzHt7iqy4PAUFPIsdsTzpI75WsRkZgtVT fuwerh4MGs/1Mx0RWr4BPp7Up48f//zxCOSppUs6oz+N/zeXHd2hi7fEqzNrxDGUUelO5l dg5KkryjEhKxvJpyO99JX7ORNIZzfxgYToI/uoXJkuAXfNobYsirdzYM6RV4IuBagtbGo3 aRBArPhQzQe8BkwNdTOC/0klSt6SvH8JM3SASucHwG45WpqOex68vc2qM29l2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691589431; a=rsa-sha256; cv=none; b=pA8F+Np1/Xp5+U+4vGHoVPewX5enmivRnaH2qtmNuuZ74BFXQ9MT47XYyB33t+vbaO4H1X Sq2U+teFmHHRPWEbBTwd5m3bXEPGFStVY9b2Ouj4hr/h9bXW6FhRCIwC/ThSMH9py1cIpZ H77Gqaa3/GO8wsIa+gw8D8tcwuRO0kbOw+Rng5jMiCVKnRlGISLcZffGgoAoUA1U8eJii/ Q1kiz8YSY8LU5gfCvBu9DSjCKo2J1rFb2Rjm9qOkF78JzbghYVeytSUx3TCb352RaGKLcl 5EhL3gCsGaaffO9dZwGCweLvWHCgx4hoguQGosy23UgtpgiymW7WoqwRlb7KkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RLWny5wQxz3PX; Wed, 9 Aug 2023 13:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 379DvAuc076021; Wed, 9 Aug 2023 13:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 379DvAK0076018; Wed, 9 Aug 2023 13:57:10 GMT (envelope-from git) Date: Wed, 9 Aug 2023 13:57:10 GMT Message-Id: <202308091357.379DvAK0076018@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason W. Bacon" Subject: git: 577a373656a6 - main - sysutils/desktop-installer: Update to 0.8.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jwb X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 577a373656a6268f02f99721aceedb2026115abc Auto-Submitted: auto-generated The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=577a373656a6268f02f99721aceedb2026115abc commit 577a373656a6268f02f99721aceedb2026115abc Author: Jason W. Bacon AuthorDate: 2023-08-09 13:56:16 +0000 Commit: Jason W. Bacon CommitDate: 2023-08-09 13:56:16 +0000 sysutils/desktop-installer: Update to 0.8.2 Numerous basic improvements to nascent NetBSD support Add popup notifications and expanded notifications to battery-shutdown monitor script Run battery-shutdown from cron rather than as a daemon Add option to install freebsd-update-notify (popup notification for available updates) Changes: https://github.com/outpaddling/desktop-installer/releases --- sysutils/desktop-installer/Makefile | 14 ++++++-------- sysutils/desktop-installer/distinfo | 6 +++--- sysutils/desktop-installer/pkg-install | 10 ++++++++++ sysutils/desktop-installer/pkg-plist | 5 +---- 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/sysutils/desktop-installer/Makefile b/sysutils/desktop-installer/Makefile index 88965a1196f0..5315d617101c 100644 --- a/sysutils/desktop-installer/Makefile +++ b/sysutils/desktop-installer/Makefile @@ -1,6 +1,5 @@ PORTNAME= desktop-installer -DISTVERSION= 0.8.0-6 -DISTVERSIONSUFFIX= -gfaef6b0 +DISTVERSION= 0.8.2 CATEGORIES= sysutils MAINTAINER= jwb@FreeBSD.org @@ -10,7 +9,7 @@ WWW= https://acadix.biz/desktop-installer.php LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -RUN_DEPENDS= auto-admin>=0.7.15:sysutils/auto-admin +RUN_DEPENDS= auto-admin>=0.7.18.3:sysutils/auto-admin USES= desktop-file-utils tar:xz USE_GITHUB= yes @@ -21,13 +20,12 @@ NO_BUILD= yes NO_ARCH= yes do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/FreeBSD/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin ${INSTALL_SCRIPT} ${WRKSRC}/Scripts/battery-shutdown.sh ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/Doc/${PORTNAME}.man \ + ${INSTALL_MAN} ${WRKSRC}/FreeBSD/${PORTNAME}.man \ ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}.1 @${MKDIR} ${STAGEDIR}${DATADIR} - cd ${WRKSRC}/Data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} - @${MKDIR} ${STAGEDIR}${DATADIR}/Scripts - ${INSTALL_SCRIPT} ${WRKSRC}/Scripts/* ${STAGEDIR}${DATADIR}/Scripts + cd ${WRKSRC}/Common && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} + cd ${WRKSRC}/FreeBSD && ${COPYTREE_SHARE} XDM ${STAGEDIR}${DATADIR} .include diff --git a/sysutils/desktop-installer/distinfo b/sysutils/desktop-installer/distinfo index 482a5fe39080..ca112120ba5d 100644 --- a/sysutils/desktop-installer/distinfo +++ b/sysutils/desktop-installer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685839626 -SHA256 (outpaddling-desktop-installer-0.8.0-6-gfaef6b0_GH0.tar.gz) = 7873c23c9cdb62582f69e7a7ba636d4dcf3d1b18856b7e41c2f22c77b870675d -SIZE (outpaddling-desktop-installer-0.8.0-6-gfaef6b0_GH0.tar.gz) = 195316 +TIMESTAMP = 1691589166 +SHA256 (outpaddling-desktop-installer-0.8.2_GH0.tar.gz) = 6733ebd65cf703055653dcc09d0ed8dee9b381b252fd3130cc3a76c84c0e37bf +SIZE (outpaddling-desktop-installer-0.8.2_GH0.tar.gz) = 232716 diff --git a/sysutils/desktop-installer/pkg-install b/sysutils/desktop-installer/pkg-install new file mode 100644 index 000000000000..04988f978824 --- /dev/null +++ b/sysutils/desktop-installer/pkg-install @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ "$2" = "POST-INSTALL" ]; then + if fgrep -q battery-shutdown.sh /etc/rc.local; 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 + cp ${PKG_PREFIX}/share/desktop-installer/battery-shutdown.cron ${PKG_PREFIX}/etc/cron.d/battery-shutdown + fi +fi diff --git a/sysutils/desktop-installer/pkg-plist b/sysutils/desktop-installer/pkg-plist index 51f1020ad5dd..48bcc749123a 100644 --- a/sysutils/desktop-installer/pkg-plist +++ b/sysutils/desktop-installer/pkg-plist @@ -16,15 +16,12 @@ sbin/desktop-installer %%DATADIR%%/MATE/xinitrc %%DATADIR%%/OTHER/xinitrc %%DATADIR%%/SDDM/sddm.conf -%%DATADIR%%/Scripts/battery-shutdown.sh -%%DATADIR%%/Scripts/desktop-admin %%DATADIR%%/WMAKER/xinitrc %%DATADIR%%/XDM/GiveConsole %%DATADIR%%/XDM/Xsetup_0 -%%DATADIR%%/XDM/Xstartup %%DATADIR%%/XDM/beastie.xpm %%DATADIR%%/XDM/bsd_background.jpg %%DATADIR%%/XDM/xdmshutdown %%DATADIR%%/XFCE4/xinitrc %%DATADIR%%/Xdefaults-xterm -%%DATADIR%%/splash.bmp +%%DATADIR%%/battery-shutdown.cron