git: 7b5b1d6ca19f - main - x11-wm/nscde: add xsession integration

The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7b5b1d6ca19fdde4439921f343ef6932a9ed189a

commit 7b5b1d6ca19fdde4439921f343ef6932a9ed189a
Author:     Chris Moerz <freebsd@ny-central.org>
AuthorDate: 2022-01-03 08:34:17 +0000
Commit:     Fernando Apesteguía <fernape@FreeBSD.org>
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