From nobody Tue Jan 04 07:54:36 2022 X-Original-To: dev-commits-ports-all@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 93BBA192B753; Tue, 4 Jan 2022 07:54:37 +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 4JSlJF1w7Bz3Fbn; Tue, 4 Jan 2022 07:54:37 +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 1DE7415453; Tue, 4 Jan 2022 07:54:37 +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 2047saLK009026; Tue, 4 Jan 2022 07:54:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2047saX3009025; Tue, 4 Jan 2022 07:54:36 GMT (envelope-from git) Date: Tue, 4 Jan 2022 07:54:36 GMT Message-Id: <202201040754.2047saX3009025@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Fernando Apestegu=C3=ADa?= Subject: git: 7b5b1d6ca19f - main - x11-wm/nscde: add xsession integration List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fernape X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b5b1d6ca19fdde4439921f343ef6932a9ed189a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641282877; 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=/odlhVw81FznQxOuZs8GSqKFAo0Vm0fbrLYrfdAi3IU=; b=g9qhd2XqL7pST+kymaxhlrHYUB9RI+P4nJHHEAlthWEj5ad51PIFBMDYDZvKN1n9tCMBdk zRTLqGYAu/ISvsaYk1Sx3aT9TDSgGvXP9b4owqOSw9VjrttzaLaoA5XohypE46RR9VCpXf LnHPpe5dLUtEg+qAylWbILDFmRSTezRAsInBWH7AazyWa6/DGspqzKXG7FxFYpqHFQ/ssp ZvF6roHbT6byodZcz0xnbSjDHarxUCWNwX6+zF6QI+Qs0P3c1B96qrlXEv9oIKRAaSRDWc Elcx37bijwd/eK3orWb58jn8XQ5s4RLbMOdkNApUULNa2UTZSDz8fRmlKETrfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641282877; a=rsa-sha256; cv=none; b=J0JohC9Jo+Ohf/lh+81mUDICUfrn53l9GYhFMB9JdZi6vDOAM5WxaZ7NYR4e2wDv7SC9q2 tU5tCFgspIDuDOuPUg8UJ5wWLMjIXm1kGCOb6lk73WY7gwuL/L1ms034dlDMJxd/1Ob0AD IeIq2Tm7kAPKuT+JUEBADAA8M7pg+hcSWCShmmzbR6jZFNxNHOdT9zqL+Bsy+6tQmk4w7T 1Drgu4tHzm8i7CFnJhNzQGYKr0k/W4e2X4yPdf0JxyC67Iz/EVYoBeGFaKIgi/9OOGmyLJ 3avk+nqYra+zCDazHLZCGiW4Ys9yJipzgE129WUg4E6IOdt6RpGGlCoJKqAkIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b5b1d6ca19fdde4439921f343ef6932a9ed189a commit 7b5b1d6ca19fdde4439921f343ef6932a9ed189a Author: Chris Moerz AuthorDate: 2022-01-03 08:34:17 +0000 Commit: Fernando Apesteguía CommitDate: 2022-01-04 07:53:08 +0000 x11-wm/nscde: add xsession integration Add missing files for xsessions integration. PR: 260720 Reported by: grahamperrin@gmail.com --- x11-wm/nscde/Makefile | 7 +++++-- x11-wm/nscde/pkg-message | 5 +++++ x11-wm/nscde/pkg-plist | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/x11-wm/nscde/Makefile b/x11-wm/nscde/Makefile index ccf3085ae193..52d3f92baad3 100644 --- a/x11-wm/nscde/Makefile +++ b/x11-wm/nscde/Makefile @@ -1,5 +1,6 @@ PORTNAME= nscde DISTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= x11-wm MAINTAINER= freebsd@ny-central.org @@ -14,6 +15,7 @@ BUILD_DEPENDS= docbook-xsl>0:textproc/docbook-xsl \ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xdg>0:devel/py-xdg@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \ + convert:graphics/ImageMagick${IMAGEMAGICK_DEFAULT} \ dunst:sysutils/dunst \ font-bh-lucidatypewriter-100dpi>0:x11-fonts/font-bh-lucidatypewriter-100dpi \ fvwm2:x11-wm/fvwm2 \ @@ -151,8 +153,7 @@ _LIBEXEC_SCRIPTS= NsCDE/config/NsCDE-Functions.conf \ NsCDE/config/NsCDE-Main.conf \ NsCDE/config/NsCDE-Menus.conf \ NsCDE/lib/scripts/ColorMgr \ - NsCDE/lib/scripts/ModifyColor \ - NsCDE/bin/fpclock + NsCDE/lib/scripts/ModifyColor _BLIBEXEC_SCRIPTS= NsCDE/lib/scripts/BackdropMgr \ NsCDE/lib/scripts/ColorMgr NsCDE/lib/scripts/FontMgr \ @@ -323,6 +324,8 @@ do-install: (cd ${WRKSRC}/NsCDE/lib && ${COPYTREE_SHARE} . ${STAGEDIR}/${PREFIX}/lib/nscde) NSCDE_ROOT="${STAGEDIR}/${PREFIX}" HAS_WINDOWNAME=1 SYSMODE=1 ${WRKSRC}/generate_subpanels > ${STAGEDIR}/${ETCDIR}/NsCDE-Subpanels.conf.sample ${FIND} ${STAGEDIR}/${ETCDIR} -type f -name '*.actions' -exec ${MV} {} {}.sample \; + ${MKDIR} ${STAGEDIR}/${PREFIX}/share/xsessions + ${CP} ${WRKSRC}/NsCDE/share/doc/examples/xsession-integration/nscde.desktop ${STAGEDIR}/${PREFIX}/share/xsessions/nscde.desktop do-install-DOCS-on: ${MKDIR} ${STAGEDIR}/${PREFIX}/share/doc/nscde diff --git a/x11-wm/nscde/pkg-message b/x11-wm/nscde/pkg-message index f3b4ac9c5f98..68e50783fd40 100644 --- a/x11-wm/nscde/pkg-message +++ b/x11-wm/nscde/pkg-message @@ -17,6 +17,11 @@ While NsCDE will generally run fine without those ports, there will be keyboard shortcuts and links in your initial setup, which will not work without them or without further configuration work on your end. + +NsCDE comes with a default xsessions configuration that is +managed by and integrated with fvwm; for further details on +how to integrate NsCDE xsessions with other session managers, +refer to the examples in /usr/local/share/examples/nscde/. EOM } ] diff --git a/x11-wm/nscde/pkg-plist b/x11-wm/nscde/pkg-plist index b6ea46ab995e..8b33ee0d47a5 100644 --- a/x11-wm/nscde/pkg-plist +++ b/x11-wm/nscde/pkg-plist @@ -393,6 +393,7 @@ share/applications/NsCDE-Volumectrl.desktop share/applications/NsCDE-WebBrowser.desktop share/applications/NsCDE-WsPgMgr.desktop share/applications/WatchErrors.desktop +share/xsessions/nscde.desktop %%PORTDOCS%%%%DOCSDIR%%/NsCDE.pdf %%PORTDOCS%%%%DOCSDIR%%/NsCDE.txt %%PORTDOCS%%%%DOCSDIR%%/help/GWM_Keybindings.help