nscde: Lots of changes

[Charlotte Koch <charlotte%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By:	cfkoch
Date:		Mon Apr 10 14:00:48 2023 -0700
Changeset:	969d7a6b30334c613719d865884f69dcc5c3b823

Modified Files:
	nscde/Makefile
	nscde/PLIST
	nscde/distinfo
Added Files:
	nscde/TODO

Log Message:
nscde: Lots of changes

- Spell out more runtime dependencies
- Fix the PLIST: the output of uname(1) is part of the installation path
  for some files
- Regen distinfo

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=969d7a6b30334c613719d865884f69dcc5c3b823

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 nscde/Makefile | 18 +++++++++++++-----
 nscde/PLIST    |  6 +++---
 nscde/TODO     |  4 ++++
 nscde/distinfo |  3 +--
 4 files changed, 21 insertions(+), 10 deletions(-)

diffs:
diff --git a/nscde/Makefile b/nscde/Makefile
index ae7ce7ec42..f55c8c27d7 100644
--- a/nscde/Makefile
+++ b/nscde/Makefile
@@ -1,13 +1,13 @@
 # $NetBSD$
 
 DISTNAME=	nscde-2.2
-CATEGORIES=	games
+CATEGORIES=	wm
 MASTER_SITES=	${MASTER_SITE_GITHUB:=NsCDE/}
 GITHUB_PROJECT=	NsCDE
 
 MAINTAINER=	charlotte%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/NsCDE/NsCDE
-COMMENT=	Not so Common Desktop Environment
+COMMENT=	Not So Common Desktop Environment
 LICENSE=	gnu-gpl-v3
 
 WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${PKGVERSION_NOREV}
@@ -15,10 +15,18 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	gsed
 
 DEPENDS+=	fvwm3-[0-9]*:../../wm/fvwm3
-#DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
+DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
+DEPENDS+=	ksh93-[0-9]*:../../shells/ksh93
+DEPENDS+=	stalonetray-[0-9]*:../../x11/stalonetray
 
-# XXX Not entirely sure which Pythons are necessary and sufficient
-#DEPENDS+=	python3.8-[0-9]*:../../lang/python38
+PYTHON_VERIONS_INCOMPATIBLE+=	27
+
+.include "../../lang/python/application.mk"
+CONFIGURE_ARGS+=	--with-python-shebang=${PYTHONBIN}
+
+UNAME_M!=		uname -m
+PLIST_SUBST+=		UNAME_M=${UNAME_M}
+PLIST_SUBST+=		OPSYS=${OPSYS}
 
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/nscde/PLIST b/nscde/PLIST
index 90632f2d29..30731178c3 100644
--- a/nscde/PLIST
+++ b/nscde/PLIST
@@ -2,7 +2,7 @@
 bin/nscde
 bin/nscde_fvwmclnt
 etc/xdg/menus/nscde-applications.menu
-lib/NsCDE/NetBSD_amd64/XOverrideFontCursor.so
+lib/NsCDE/${OPSYS}_${UNAME_M}/XOverrideFontCursor.so
 lib/NsCDE/fvwm-modules/FvwmScript
 lib/NsCDE/python/Globals.py
 lib/NsCDE/python/MiscFun.py
@@ -50,8 +50,8 @@ lib/NsCDE/scripts/WsPgMgr
 libexec/NsCDE/FvwmScripts/GWM
 libexec/NsCDE/FvwmScripts/Notifier
 libexec/NsCDE/FvwmScripts/Splash
-libexec/NsCDE/NetBSD_amd64/colorpicker
-libexec/NsCDE/NetBSD_amd64/fpclock
+libexec/NsCDE/${OPSYS}_${UNAME_M}/colorpicker
+libexec/NsCDE/${OPSYS}_${UNAME_M}/fpclock
 libexec/NsCDE/acpimgr
 libexec/NsCDE/appfinder
 libexec/NsCDE/backdropmgr
diff --git a/nscde/TODO b/nscde/TODO
new file mode 100644
index 0000000000..6267f75592
--- /dev/null
+++ b/nscde/TODO
@@ -0,0 +1,4 @@
+nscde TODO:
+
+- requires a whole bunch of runtime testing to make sure all the expected
+  things are installed 
diff --git a/nscde/distinfo b/nscde/distinfo
index e4c5548fa6..34e16fbaf0 100644
--- a/nscde/distinfo
+++ b/nscde/distinfo
@@ -1,6 +1,5 @@
 $NetBSD$
 
-SHA1 (nscde-2.2.tar.gz) = 779f462089e879c3dd1b12a978ab46971731f72c
-RMD160 (nscde-2.2.tar.gz) = 8595d109bba0896a2bb012f528c5c295ed26187e
+BLAKE2s (nscde-2.2.tar.gz) = 40100de227ba7212f20a3b59a1045d6d8a43705310489a3650014f1c75740297
 SHA512 (nscde-2.2.tar.gz) = b64440992a820741bc652ef3931162eb6cc2be75bd100647b219d98c49b7898ec78dac7095d07a86017758d6e15a7790becda38cd85bd6210a35a8b5b9f1ed00
 Size (nscde-2.2.tar.gz) = 29868677 bytes