From owner-dev-commits-ports-all@freebsd.org Wed Aug 25 23:08:19 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 1D5E665D1E7; Wed, 25 Aug 2021 23:08:19 +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 4Gw1qR085zz3kHh; Wed, 25 Aug 2021 23:08:19 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E06D12506F; Wed, 25 Aug 2021 23:08:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17PN8IkR024386; Wed, 25 Aug 2021 23:08:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17PN8IVJ024385; Wed, 25 Aug 2021 23:08:18 GMT (envelope-from git) Date: Wed, 25 Aug 2021 23:08:18 GMT Message-Id: <202108252308.17PN8IVJ024385@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ben Woods Subject: git: bfa13bfc5255 - main - x11/lightdm-gtk-greeter: and x11/slick-greeter: auto-set greeter-session MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: woodsb02 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bfa13bfc525586bc7823f2d5b082a88fdce06213 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Aug 2021 23:08:19 -0000 The branch main has been updated by woodsb02: URL: https://cgit.FreeBSD.org/ports/commit/?id=bfa13bfc525586bc7823f2d5b082a88fdce06213 commit bfa13bfc525586bc7823f2d5b082a88fdce06213 Author: Ben Woods AuthorDate: 2021-08-22 02:48:26 +0000 Commit: Ben Woods CommitDate: 2021-08-25 23:06:22 +0000 x11/lightdm-gtk-greeter: and x11/slick-greeter: auto-set greeter-session Add pkg-install and pkg-deinstall scripts to automatically configure the greeter-session variable in lightdm.conf if it has not been manually changed from the default value. This reduces the steps for a fresh FreeBSD install to get to a graphical environment to the following simple steps (excluding graphics drivers): $ pkg install $ service lightdm enable $ service ligthdm start Approved by: ericbsd (maintainer x11/slick-greeter) Approved by: madpilot (maintainer x11/lightdm-gtk-greeter) Differential Revision: https://reviews.freebsd.org/D31632 --- x11/lightdm-gtk-greeter/Makefile | 3 ++- x11/lightdm-gtk-greeter/files/pkg-deinstall.in | 19 +++++++++++++++++++ x11/lightdm-gtk-greeter/files/pkg-install.in | 18 ++++++++++++++++++ x11/slick-greeter/Makefile | 3 ++- x11/slick-greeter/files/pkg-deinstall.in | 19 +++++++++++++++++++ x11/slick-greeter/files/pkg-install.in | 18 ++++++++++++++++++ 6 files changed, 78 insertions(+), 2 deletions(-) diff --git a/x11/lightdm-gtk-greeter/Makefile b/x11/lightdm-gtk-greeter/Makefile index b61ab57e96a9..ff096fe22301 100644 --- a/x11/lightdm-gtk-greeter/Makefile +++ b/x11/lightdm-gtk-greeter/Makefile @@ -2,7 +2,7 @@ PORTNAME= lightdm-gtk-greeter PORTVERSION= 2.0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= https://github.com/Xubuntu/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/ @@ -23,6 +23,7 @@ USE_XORG= x11 GNU_CONFIGURE= yes INSTALLS_ICONS= yes +SUB_FILES= pkg-deinstall pkg-install CONFIGURE_ARGS+=--disable-indicator-services-command \ --enable-at-spi-command=${LOCALBASE}/libexec/at-spi-bus-launcher diff --git a/x11/lightdm-gtk-greeter/files/pkg-deinstall.in b/x11/lightdm-gtk-greeter/files/pkg-deinstall.in new file mode 100644 index 000000000000..0e8837b4c464 --- /dev/null +++ b/x11/lightdm-gtk-greeter/files/pkg-deinstall.in @@ -0,0 +1,19 @@ +#!/bin/sh + +PREFIX=${PKG_PREFIX-/usr/local} + +case $2 in +DEINSTALL) + if grep -Fxq "greeter-session=lightdm-gtk-greeter" ${PREFIX}/etc/lightdm/lightdm.conf + then + echo ":: Removing greeter configuration in ${PREFIX}/etc/lightdm/lightdm.conf" + echo ":: Configure another greeter if you plan to keep using lightdm." + /usr/bin/sed -i ".bak" "s/^greeter-session=lightdm-gtk-greeter$/#greeter-session=example-gtk-gnome/g" \ + ${PREFIX}/etc/lightdm/lightdm.conf + else + echo ":: lightdm-gtk-greeter is not the configured greeter in ${PREFIX}/etc/lightdm/lightdm.conf" + echo ":: Leaving the lightdm greeter configuration unchanged." + fi + echo ":: $(grep greeter-session= ${PREFIX}/etc/lightdm/lightdm.conf)" + ;; +esac diff --git a/x11/lightdm-gtk-greeter/files/pkg-install.in b/x11/lightdm-gtk-greeter/files/pkg-install.in new file mode 100644 index 000000000000..b015bae0dd27 --- /dev/null +++ b/x11/lightdm-gtk-greeter/files/pkg-install.in @@ -0,0 +1,18 @@ +#!/bin/sh + +PREFIX=${PKG_PREFIX-/usr/local} + +case $2 in +POST-INSTALL) + if grep -Fxq "#greeter-session=example-gtk-gnome" ${PREFIX}/etc/lightdm/lightdm.conf + then + echo ":: Setting lightdm-gtk-greeter as greeter session in ${PREFIX}/etc/lightdm/lightdm.conf" + /usr/bin/sed -i ".bak" "s/^#greeter-session=example-gtk-gnome$/greeter-session=lightdm-gtk-greeter/g" \ + ${PREFIX}/etc/lightdm/lightdm.conf + else + echo ":: A greeter has already been configured in ${PREFIX}/etc/lightdm/lightdm.conf" + echo ":: Leaving the lightdm greeter configuration unchanged." + fi + echo ":: $(grep greeter-session= ${PREFIX}/etc/lightdm/lightdm.conf)" + ;; +esac diff --git a/x11/slick-greeter/Makefile b/x11/slick-greeter/Makefile index f3f33ebb97cd..157e914fcfa3 100644 --- a/x11/slick-greeter/Makefile +++ b/x11/slick-greeter/Makefile @@ -3,7 +3,7 @@ PORTNAME= slick-greeter PORTVERSION= 1.5.3 CATEGORIES= x11 -PORTREVISION= 1 +PORTREVISION= 2 MAINTAINER= ericbsd@FreeBSD.org COMMENT= Slick-looking LightDM greeter @@ -34,6 +34,7 @@ SHEBANG_FILES= files/usr/bin/slick-greeter-check-hidpi \ makepot bash_OLD_CMD= /usr/bin/bash bash_CMD= /bin/sh +SUB_FILES= pkg-deinstall pkg-install GLIB_SCHEMAS= x.dm.slick-greeter.gschema.xml diff --git a/x11/slick-greeter/files/pkg-deinstall.in b/x11/slick-greeter/files/pkg-deinstall.in new file mode 100644 index 000000000000..38be3ef52c3f --- /dev/null +++ b/x11/slick-greeter/files/pkg-deinstall.in @@ -0,0 +1,19 @@ +#!/bin/sh + +PREFIX=${PKG_PREFIX-/usr/local} + +case $2 in +DEINSTALL) + if grep -Fxq "greeter-session=slick-greeter" ${PREFIX}/etc/lightdm/lightdm.conf + then + echo ":: Removing greeter configuration in ${PREFIX}/etc/lightdm/lightdm.conf" + echo ":: Configure another greeter if you plan to keep using lightdm." + /usr/bin/sed -i ".bak" "s/^greeter-session=slick-greeter$/#greeter-session=example-gtk-gnome/g" \ + ${PREFIX}/etc/lightdm/lightdm.conf + else + echo ":: slick-greeter is not the configured greeter in ${PREFIX}/etc/lightdm/lightdm.conf" + echo ":: Leaving the lightdm greeter configuration unchanged." + fi + echo ":: $(grep greeter-session= ${PREFIX}/etc/lightdm/lightdm.conf)" + ;; +esac diff --git a/x11/slick-greeter/files/pkg-install.in b/x11/slick-greeter/files/pkg-install.in new file mode 100644 index 000000000000..f6d24a6ce8e8 --- /dev/null +++ b/x11/slick-greeter/files/pkg-install.in @@ -0,0 +1,18 @@ +#!/bin/sh + +PREFIX=${PKG_PREFIX-/usr/local} + +case $2 in +POST-INSTALL) + if grep -Fxq "#greeter-session=example-gtk-gnome" ${PREFIX}/etc/lightdm/lightdm.conf + then + echo ":: Setting slick-greeter as greeter session in ${PREFIX}/etc/lightdm/lightdm.conf" + /usr/bin/sed -i ".bak" "s/^#greeter-session=example-gtk-gnome$/greeter-session=slick-greeter/g" \ + ${PREFIX}/etc/lightdm/lightdm.conf + else + echo ":: A greeter has already been configured in ${PREFIX}/etc/lightdm/lightdm.conf" + echo ":: Leaving the lightdm greeter configuration unchanged." + fi + echo ":: $(grep greeter-session= ${PREFIX}/etc/lightdm/lightdm.conf)" + ;; +esac