pkg/59039: x11/xlockmore: xlock fails when ran without any arguments

[schaecsn%gmx.net@localhost]

>Number:         59039
>Category:       pkg
>Synopsis:       x11/xlockmore: xlock fails when ran without any arguments
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Jan 30 03:20:00 +0000 2025
>Originator:     Stefan Schaeckeler
>Release:        pkgsrc-2024Q4
>Organization:
>Environment:
NetBSD xxxx 10.1 NetBSD 10.1 (GENERIC) #0: Sat Jan 18 11:07:43 PST 2025  root@xxxx:/usr/obj/sys/arch/amd64/compile/GENERIC amd64
>Description:
without explicitly setting the mode with -mode <mode>, xlock (from x11/xlockmore) fails:

$ xlock 
xlock:  bad command line option "-ncolors argument must be between 2 and 200."

The reason is this line in /usr/pkg/lib/X11/app-defaults/XLock

- - - snip - - -
XLock.mode:
- - - snip - - -


If I change that to an actual mode like random, then xlock works without any further arguments.

- - - snip - - -
XLock.mode: random
- - - snip - - -


This Makefile.common snippet is wrong:

- - - snip - - -
# Set the default xlock mode/screensaver.
# XLOCK_DEFAULT_MODE can be defined by the user in mk.conf
SUBST_CLASSES+=		mode
SUBST_STAGE.mode=	pre-configure
SUBST_MESSAGE.mode=	Preparing default mode in xlock/XLock.ad file ...
SUBST_FILES.mode=	xlock/XLock.ad
SUBST_SED.mode=		-e 's|^\(XLock.mode:[ 	]*\).*|\1${XLOCK_DEFAULT_MODE}|'
- - - snip - - -

A) When I set XLOCK_DEFAULT_MODE=random in mk.conf the config phase fails.

   WARNING: [subst.mk:mode] Nothing changed in "xlock/XLock.ad".
   ERROR: [subst.mk:mode] The filename pattern "xlock/XLock.ad" has no effect.
   *** Error code 1


B) Without setting XLOCK_DEFAULT_MODE in mk.conf, XLock.mode should keep its original value.

>How-To-Repeat:
Start xlock
>Fix:
Some sed magic in Makefile.common.