Date: Wed, 9 Aug 2023 13:57:10 GMT From: "Jason W. Bacon" <jwb@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 577a373656a6 - main - sysutils/desktop-installer: Update to 0.8.2 Message-ID: <202308091357.379DvAK0076018@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jwb: URL: https://cgit.FreeBSD.org/ports/commit/?id=577a373656a6268f02f99721aceedb2026115abc commit 577a373656a6268f02f99721aceedb2026115abc Author: Jason W. Bacon <jwb@FreeBSD.org> AuthorDate: 2023-08-09 13:56:16 +0000 Commit: Jason W. Bacon <jwb@FreeBSD.org> 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 <bsd.port.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308091357.379DvAK0076018>