xlockmore: Update to 5.84

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: xlockmore: Update to 5.84
From: Michael Baeuerle (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Fri, 11 Jul 2025 08:23:10 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Jul 11 10:22:31 2025 +0200
Changeset:	85f044da7aba2f29cd63ecadbc0ddceb8f0ecd2f

Modified Files:
	Makefile
Added Files:
	xlockmore/COMMIT_MSG
	xlockmore/DESCR
	xlockmore/Makefile
	xlockmore/Makefile.common
	xlockmore/PLIST
	xlockmore/distinfo
	xlockmore/files/INSTALL.pkgsrc
	xlockmore/files/pam-xlock-NetBSD
	xlockmore/patches/patch-configure.ac
	xlockmore/patches/patch-modes_Makefile.in
	xlockmore/patches/patch-xlock_XLock.ad

Log Message:
xlockmore: Update to 5.84

5.84
  New automata mode paterson added from same article as spirolateral.
    Initial investigation by Paterson, Conway, and Beeler.

5.83
  spirolateral mode added thanks to Martin Gardner's book "Knotted
    Donuts" chapter on "Worm Paths".  This generates simple and
    complex spirolaterals.
  Fixing -delay issue on VMS for x86-64.
  Removed a warning in snprintf for Windows.

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

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

diffstat:
 Makefile                                  |   1 +
 xlockmore/COMMIT_MSG                      |  12 +++
 xlockmore/DESCR                           |  12 +++
 xlockmore/Makefile                        |  34 +++++++
 xlockmore/Makefile.common                 | 160 ++++++++++++++++++++++++++++++
 xlockmore/PLIST                           |  13 +++
 xlockmore/distinfo                        |   8 ++
 xlockmore/files/INSTALL.pkgsrc            |  18 ++++
 xlockmore/files/pam-xlock-NetBSD          |  17 ++++
 xlockmore/patches/patch-configure.ac      |  53 ++++++++++
 xlockmore/patches/patch-modes_Makefile.in |  30 ++++++
 xlockmore/patches/patch-xlock_XLock.ad    |  22 ++++
 12 files changed, 380 insertions(+)

diffs:
diff --git a/Makefile b/Makefile
index 18e6a904bd..76265f4b23 100644
--- a/Makefile
+++ b/Makefile
@@ -6041,6 +6041,7 @@ SUBDIR+=	xinetd
 SUBDIR+=	xinput_calibrator
 SUBDIR+=	xinvaders3d
 SUBDIR+=	xiphos
+SUBDIR+=	xlockmore
 SUBDIR+=	xlossage-git
 SUBDIR+=	xmail
 SUBDIR+=	xmatchview
diff --git a/xlockmore/COMMIT_MSG b/xlockmore/COMMIT_MSG
new file mode 100644
index 0000000000..fa56a5d670
--- /dev/null
+++ b/xlockmore/COMMIT_MSG
@@ -0,0 +1,12 @@
+x11/xlockmore: Update to 5.84
+
+5.84
+  New automata mode paterson added from same article as spirolateral.
+    Initial investigation by Paterson, Conway, and Beeler.
+
+5.83
+  spirolateral mode added thanks to Martin Gardner's book "Knotted
+    Donuts" chapter on "Worm Paths".  This generates simple and
+    complex spirolaterals.
+  Fixing -delay issue on VMS for x86-64.
+  Removed a warning in snprintf for Windows.
diff --git a/xlockmore/DESCR b/xlockmore/DESCR
new file mode 100644
index 0000000000..ade1fff0ff
--- /dev/null
+++ b/xlockmore/DESCR
@@ -0,0 +1,12 @@
+xlock locks the X server until the user enters their password at the
+keyboard.  While xlock is running, all new server connections are
+refused. The screen saver is disabled.  The mouse cursor is turned
+off. The screen is blanked and a changing pattern is put on the
+screen.  If a key or a mouse button is pressed then the user is
+prompted for the password of the user who started xlock.
+
+If the correct password is typed, then the screen is unlocked and the
+X server is restored.  When typing the password, Control-U and
+Control-H are active as kill and erase respectively.  To return to the
+locked screen, click in the small icon version of the changing
+pattern.
diff --git a/xlockmore/Makefile b/xlockmore/Makefile
new file mode 100644
index 0000000000..4542845f60
--- /dev/null
+++ b/xlockmore/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.197 2025/05/07 11:52:09 micha Exp $
+
+.include "Makefile.common"
+
+COMMENT=	Like the XLock session-locker/screensaver, but with more
+
+CONFLICTS+=	xlockmore-lite-[0-9]*
+
+CONFIGURE_ARGS+=	--with-opengl
+CONFIGURE_ARGS+=	--with-mesa
+CONFIGURE_ARGS+=	--without-ftgl
+CONFIGURE_ARGS+=	--without-ttf
+XPM_ENV=		no_xpm= xpm_includes=${BUILDLINK_PREFIX.libXpm}/include xpm_libraries=${BUILDLINK_PREFIX.libXpm}/lib
+CONFIGURE_ENV+=		ac_cv_path_xpm=${XPM_ENV:Q}
+OPENGL_ENV=		no_opengl= ac_opengl_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_opengl_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
+CONFIGURE_ENV+=		ac_cv_path_opengl=${OPENGL_ENV:Q}
+MESA_ENV=		no_mesa= ac_mesa_includes=${BUILDLINK_PREFIX.MesaLib}/include ac_mesa_libraries=${BUILDLINK_PREFIX.MesaLib}/lib
+CONFIGURE_ENV+=		ac_cv_path_mesa=${MESA_ENV:Q}
+#BUILDLINK_TRANSFORM+=	l:MesaGL:GL
+#BUILDLINK_TRANSFORM+=	l:MesaGLU:GLU
+XEXT_ENV=		no_ext= ac_ext_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_ext_libraries=${BUILDLINK_PREFIX.libXext}/lib
+CONFIGURE_ENV+=		ac_cv_path_ext=${XEXT_ENV:Q}
+
+PLIST_SUBST+=	LITE=""
+
+USE_TOOLS+=	pkg-config
+
+.include "../../graphics/ImageMagick/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
+.include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/xlockmore/Makefile.common b/xlockmore/Makefile.common
new file mode 100644
index 0000000000..4c3962513f
--- /dev/null
+++ b/xlockmore/Makefile.common
@@ -0,0 +1,160 @@
+# $NetBSD: Makefile.common,v 1.94 2025/05/07 11:52:09 micha Exp $
+#
+# used by x11/xlockmore/Makefile
+# used by x11/xlockmore-lite/Makefile
+
+DISTNAME=	xlockmore-5.84
+CATEGORIES=	x11
+MASTER_SITES=	http://sillycycle.com/xlock/
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://sillycycle.com/xlockmore.html
+# Similar to BSD license, but uses different words (see xlockmore.spec)
+LICENSE=	2-clause-bsd
+
+.include "../../mk/bsd.prefs.mk"
+
+# The curl User-Agent is blocked with code 406
+.if ${FETCH_USING} == "curl"
+MASTER_SITES=	${MASTER_SITE_BACKUP}
+.endif
+
+DISTINFO_FILE?=		${.CURDIR}/../../x11/xlockmore/distinfo
+PATCHDIR?=		${.CURDIR}/../../x11/xlockmore/patches
+PLIST_SRC?=		${.CURDIR}/../../x11/xlockmore/PLIST
+FILESDIR?=		${.CURDIR}/../../x11/xlockmore/files
+
+PKG_OPTIONS_VAR=		PKG_OPTIONS.xlockmore
+PKG_SUPPORTED_OPTIONS=		xlockmore-allow-root xlockmore-dpms pam
+.if ${OPSYS} == "NetBSD"
+PKG_SUPPORTED_OPTIONS+=		oss
+.endif
+PKG_SUGGESTED_OPTIONS=		xlockmore-allow-root xlockmore-dpms
+PKG_OPTIONS_LEGACY_VARS+=	XLOCK_DISABLE_ALLOW_ROOT:-xlockmore-allow-root
+PKG_OPTIONS_LEGACY_VARS+=	XLOCK_NO_DPMS:-xlockmore-dpms
+
+.include "../../mk/bsd.options.mk"
+
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		autoconf autoreconf bash xmkmf
+
+XLOCK_MODULEDIR=	${PREFIX}/lib/X11/xlock/modules
+DEFINES+=		-DDEF_MODULEPATH="\"${XLOCK_MODULEDIR}\""
+CPPFLAGS+=		${DEFINES}
+CXXFLAGS+=		${DEFINES}
+
+# Variable RANDOM is used (a POSIX shell is not sufficient)
+CONFIG_SHELL=		bash
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--without-motif
+CONFIGURE_ARGS+=	--without-editres
+CONFIGURE_ARGS+=	--without-dtsaver
+CONFIGURE_ARGS+=	--without-rplay
+CONFIGURE_ARGS+=	--without-nas
+CONFIGURE_ARGS+=	--without-gtk
+CONFIGURE_ARGS+=	--without-esound
+CONFIGURE_ARGS+=	--enable-appdefaultdir=${PREFIX}/lib/X11/app-defaults
+CONFIGURE_ENV+=		ac_cv_x_app_defaults=${PREFIX}/lib/X11/app-defaults/XLock
+
+OWN_DIRS+=		${PREFIX}/lib/X11/app-defaults
+CONF_FILES+=		${EGDIR}/app-defaults/XLock ${PREFIX}/lib/X11/app-defaults/XLock
+
+.if ${OPSYS} == "NetBSD"
+XLOCK_AUDIOPLAY?=	/usr/bin/audioplay
+CONFIGURE_ARGS+=	--enable-def-play=${XLOCK_AUDIOPLAY:Q}
+.endif
+
+.if empty(PKG_OPTIONS:Mxlockmore-dpms)
+CONFIGURE_ARGS+=	--without-dpms
+.else
+.  if ${X11_TYPE} != "native" || !exists(${X11BASE}/lib${LIBABISUFFIX}/libXdpms.a)
+BUILDLINK_TRANSFORM+=	l:Xdpms:Xext
+.  endif
+DPMS_ENV=		no_dpms= ac_dpms_includes=${BUILDLINK_PREFIX.xorgproto}/include ac_dpms_libraries=${BUILDLINK_PREFIX.libXext}/lib
+CONFIGURE_ENV+=		ac_cv_path_dpms=${DPMS_ENV:Q}
+.endif
+
+.if empty(PKG_OPTIONS:Mxlockmore-allow-root)
+CONFIGURE_ARGS+=	--disable-allow-root
+.endif
+
+.if !empty(PKG_OPTIONS:Mpam)
+.  include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-pam --enable-bad-pam
+.  if ${OPSYS} == "NetBSD"
+# needed to read shadow passwords
+DEPENDS+=       pam-pwauth_suid-[0-9]*:../../security/pam-pwauth_suid
+.  endif
+.else
+CONFIGURE_ARGS+=	--disable-pam
+
+#
+# Special permissions of bin/xlock if any.
+#
+.  if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || \
+      ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "SunOS"
+SPECIAL_PERMS+=	bin/xlock ${SETUID_ROOT_PERMS}
+.  elif ${OPSYS} == "Linux"
+# setgid shadow should be enough for modern Linux
+SPECIAL_PERMS+=	bin/xlock ${REAL_ROOT_USER} shadow 2511
+.  endif
+.endif
+
+EGDIR=			${PREFIX}/share/examples/xlock
+MESSAGE_SUBST+=		EGDIR=${EGDIR:Q}
+INSTALLATION_DIRS+=	${EGDIR}/pam.d
+INSTALLATION_DIRS+=	share/doc/xlockmore
+
+# XXX framework bug: while we don't need it, this would kill
+# the inherited full dependency
+#BUILDLINK_DEPMETHOD.libXt?=	build
+
+.include "../../x11/libICE/buildlink3.mk"
+.include "../../x11/libSM/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/xorgproto/buildlink3.mk"
+
+XINERAMA_ENV=	no_xenerama= ac_xinerama_includes=${BUILDLINK_PREFIX.libXinerama}/include ac_xinerama_libraries=${BUILDLINK_PREFIX.libXinerama}/lib
+CONFIGURE_ENV+=	ac_cv_path_xinerama=${XINERAMA_ENV:Q}
+
+# Modify paths in application defaults
+SUBST_CLASSES+=		adef
+SUBST_STAGE.adef=	pre-configure
+SUBST_MESSAGE.adef=	Preparing paths in xlock/XLock.ad file ...
+SUBST_FILES.adef=	xlock/XLock.ad
+SUBST_SED.adef=		-e 's|/usr/lib/|${PREFIX}/lib/|g'
+SUBST_SED.adef+=	-e 's|/usr/local/share/|${PREFIX}/share/|g'
+
+.if defined(XLOCK_DEFAULT_MODE) && !empty(XLOCK_DEFAULT_MODE) && ${XLOCK_DEFAULT_MODE} != "random"
+# 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}|'
+.endif
+
+# Configure INSTALL.pkgsrc (formerly displayed as MESSAGE)
+SUBST_CLASSES+=		install
+SUBST_STAGE.install=	post-configure
+SUBST_MESSAGE.install=	Preparing INSTALL.pkgsrc file ...
+SUBST_FILES.install=	${WRKDIR}/INSTALL.pkgsrc
+SUBST_VARS.install=	PREFIX
+SUBST_VARS.install+=	EGDIR
+
+post-patch:
+	${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
+
+pre-configure:
+	cd ${WRKSRC} && autoreconf -vif
+
+post-install:
+	${INSTALL_DATA} ${FILESDIR}/pam-xlock-NetBSD \
+	    ${DESTDIR}${EGDIR}/pam.d/xlock-NetBSD
+	${INSTALL_DATA} ${WRKDIR}/INSTALL.pkgsrc \
+	    ${DESTDIR}${PREFIX}/share/doc/xlockmore/INSTALL.pkgsrc
diff --git a/xlockmore/PLIST b/xlockmore/PLIST
new file mode 100644
index 0000000000..2aa1b2bf5f
--- /dev/null
+++ b/xlockmore/PLIST
@@ -0,0 +1,13 @@
+@comment $NetBSD: PLIST,v 1.11 2022/01/24 18:05:58 micha Exp $
+bin/play.sh
+${LITE}bin/xglock
+bin/xlock
+man/man1/xlock.1
+share/doc/xlockmore/INSTALL.pkgsrc
+share/examples/xlock/app-defaults/XLock
+share/examples/xlock/pam.d/xlock-NetBSD
+share/xlock/sounds/complete.au
+share/xlock/sounds/identify-please.au
+share/xlock/sounds/not-programmed.au
+share/xlock/sounds/thank-you.au
+${LITE}share/xlock/xglockrc
diff --git a/xlockmore/distinfo b/xlockmore/distinfo
new file mode 100644
index 0000000000..0c85c8664d
--- /dev/null
+++ b/xlockmore/distinfo
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.67 2025/05/07 11:52:09 micha Exp $
+
+BLAKE2s (xlockmore-5.82.tar.xz) = 8ef9091af8d2d51a1646c3547ea3e0c014038fa9cf74b46a7e930e64d26833a4
+SHA512 (xlockmore-5.82.tar.xz) = 14356e083b43742c2c45d4d95008748e26e8dfc39e4f75d5227d691b0607ae9b328d8e3ff6e7991a901cb532d8307f356dc5242a27289f73c8b420658859bc24
+Size (xlockmore-5.82.tar.xz) = 2063608 bytes
+SHA1 (patch-configure.ac) = 9bb4e744a493d8a30933d8a1d37d73f8de03ea0f
+SHA1 (patch-modes_Makefile.in) = 256c762e3bb02600da0bc14bc16b06604eb41eaa
+SHA1 (patch-xlock_XLock.ad) = f4754850a171530465be1949b0ea4f49b359bb3a
diff --git a/xlockmore/files/INSTALL.pkgsrc b/xlockmore/files/INSTALL.pkgsrc
new file mode 100644
index 0000000000..8ea2ec6b84
--- /dev/null
+++ b/xlockmore/files/INSTALL.pkgsrc
@@ -0,0 +1,18 @@
+If xlockmore is built with the "pam" option:
+In order to make unlocking work, you need to add an
+xlock file to your pam configuration directory (usually
+/etc/pam.d).  You can find a sample file in:
+
+    @EGDIR@/pam.d/xlock-NetBSD
+
+On  NetBSD, the "pam_pwauth_suid.so" module can be used to authenticate
+against a shadow password database. Note that use of this module might
+allow programs with your privileges to get a copy of your plaintext
+password as typed in for unlocking. The advantage is that with that
+module, the suid bit of the
+
+    @PREFIX@/bin/xlock
+
+executable can be removed.
+Per default, xlockmore is installed setuid root. Since this is a
+relatively complex program, there is the risk of other exploits.
diff --git a/xlockmore/files/pam-xlock-NetBSD b/xlockmore/files/pam-xlock-NetBSD
new file mode 100644
index 0000000000..ca11097144
--- /dev/null
+++ b/xlockmore/files/pam-xlock-NetBSD
@@ -0,0 +1,17 @@
+# $NetBSD: pam-xlock-NetBSD,v 1.1 2012/03/28 20:21:46 drochner Exp $
+#
+# PAM configuration for the "xlock" service
+#
+
+# auth
+#auth		sufficient	pam_pwauth_suid.so
+auth		include		system
+
+# account
+account		include		system
+
+# session
+session		include		system
+
+# password
+password	include		system
diff --git a/xlockmore/patches/patch-configure.ac b/xlockmore/patches/patch-configure.ac
new file mode 100644
index 0000000000..3b160e1b54
--- /dev/null
+++ b/xlockmore/patches/patch-configure.ac
@@ -0,0 +1,53 @@
+$NetBSD: patch-configure.ac,v 1.1 2023/07/14 10:43:34 micha Exp $
+
+Upstream expects a specific compiler/linker for a specific OS.
+pkgsrc is not limited to such configurations.
+Use COMPILER_RPATH_FLAG to set runtime library search path.
+
+--- configure.ac.orig	2023-07-06 02:10:20.000000000 +0000
++++ configure.ac
+@@ -5040,18 +5040,18 @@ case "${canonical}" in
+         dirname=`which gcc`
+         dirname=`dirname $dirname`
+         dirname=`dirname $dirname`/lib
+-	if test "$dirname" != "/lib"; then
+-  	    XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
+-  	    XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
+-	fi
++#	if test "$dirname" != "/lib"; then
++#  	    XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
++#  	    XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
++#	fi
+     fi
+     case "${canonical}" in
+       *-*-freebsd* )
+         FORTUNE_PATH="/usr/bin/fortune"
+       ;;
+     esac
+-    XLOCKLDFLAGS="-Wl,-R${XLOCK_LDFLAGS}"
+-    XMLOCKLDFLAGS="-Wl,-R${XMLOCK_LDFLAGS}"
++    XLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XLOCK_LDFLAGS}"
++    XMLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XMLOCK_LDFLAGS}"
+   ;;
+ 
+   *-*-dgux5* )
+@@ -5169,13 +5169,13 @@ dnl    XLOCKLIBS="${XLOCKLIBS} -lsocket 
+         dirname=`which gcc`
+         dirname=`dirname $dirname`
+         dirname=`dirname $dirname`/lib
+-	if test "$dirname" != "/lib"; then
+-  	    XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
+-  	    XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
+-	fi
++#	if test "$dirname" != "/lib"; then
++#  	    XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
++#  	    XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
++#	fi
+     fi
+-    XLOCKLDFLAGS="-R${XLOCK_LDFLAGS}"
+-    XMLOCKLDFLAGS="-R${XMLOCK_LDFLAGS}"
++    XLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XLOCK_LDFLAGS}"
++    XMLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XMLOCK_LDFLAGS}"
+   ;;
+ 
+   *-*-sunos4* )
diff --git a/xlockmore/patches/patch-modes_Makefile.in b/xlockmore/patches/patch-modes_Makefile.in
new file mode 100644
index 0000000000..45d8d367f0
--- /dev/null
+++ b/xlockmore/patches/patch-modes_Makefile.in
@@ -0,0 +1,30 @@
+$NetBSD: patch-modes_Makefile.in,v 1.3 2022/01/24 18:05:58 micha Exp $
+
+Use INSTALL properly.
+First part was rejected by upstream.
+Second part is not suitable for upstream.
+
+--- modes/Makefile.in.orig	2021-12-17 04:47:25.000000000 +0000
++++ modes/Makefile.in
+@@ -633,7 +633,7 @@ install : install-program install-man in
+ 
+ install-program : xlock
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+-	$(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(DESTDIR)$(bindir)
++	$(INSTALL_PROGRAM) $(UTILOBJDIR)xlock$(E) $(DESTDIR)$(bindir)
+ 	@MODULES@mkdir -p $(DESTDIR)$(DEF_MODULEPATH)
+ 	@MODULES@cp *.xlk $(DESTDIR)$(DEF_MODULEPATH)
+ 	@MODULES@cp glx/*.xlk $(DESTDIR)$(DEF_MODULEPATH)
+@@ -644,9 +644,10 @@ install-man :
+ 
+ install-ad :
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(xapploaddir)
+-	$(INSTALL_DATA) $(UTILDIR)XLock.ad $(DESTDIR)$(xapploaddir)/XLock
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)${datarootdir}/examples/xlock/app-defaults
++	$(INSTALL_DATA) $(UTILDIR)XLock.ad $(DESTDIR)${datarootdir}/examples/xlock/app-defaults/XLock
+ 	@FORTUNE@sed 's;^XLock.program: fortune;XLock.program: $(FORTUNE);' $(UTILDIR)XLock.ad > $(UTILOBJDIR)XLock.ad.tmp 
+-	@FORTUNE@$(INSTALL_DATA) $(UTILOBJDIR)XLock.ad.tmp $(DESTDIR)$(xapploaddir)/XLock
++	@FORTUNE@$(INSTALL_DATA) $(UTILOBJDIR)XLock.ad.tmp $(DESTDIR)${datarootdir}/examples/xlock/app-defaults/XLock
+ 	@FORTUNE@rm -f $(UTILOBJDIR)XLock.ad.tmp
+ 
+ install-sound :
diff --git a/xlockmore/patches/patch-xlock_XLock.ad b/xlockmore/patches/patch-xlock_XLock.ad
new file mode 100644
index 0000000000..4681368f73
--- /dev/null
+++ b/xlockmore/patches/patch-xlock_XLock.ad
@@ -0,0 +1,22 @@
+$NetBSD: patch-xlock_XLock.ad,v 1.1 2022/01/24 18:05:58 micha Exp $
+
+Modify path for fortune.
+Not suitable for upstream.
+
+--- xlock/XLock.ad.orig	2019-05-30 01:30:03.000000000 +0000
++++ xlock/XLock.ad
+@@ -67,12 +67,12 @@ XLock.left3d: Red
+ XLock.both3d: Magenta
+ 
+ ! For marquee & nose modes
+-XLock.program: fortune -s
++!XLock.program: fortune -s
+ !XLock.program: fortune -o
+ !XLock.program: fortune -s
+ !XLock.program: fortune
+ !XLock.program: /usr/games/fortune -o
+-!XLock.program: /usr/games/fortune -s
++XLock.program: /usr/games/fortune -s
+ !XLock.program: /usr/games/fortune
+ !XLock.program: finger
+ !XLock.messagesfile: fortune.dat
Prev by Date: gnat-glade: remove package moved to main tree
Next by Date: finish changing the name
Previous by Thread: gnat-glade: remove package moved to main tree
Next by Thread: finish changing the name
Indexes:
Home | Main Index | Thread Index | Old Index