x11/xlockmore: Update to 5.68

This update should fix CVE-2006-0061 if option "pam" is disabled.
OK from wiz@.

5.68
  Updated xscreensaver port for xscreensaver-6.02.
  Various NetBsd install issues fixed including config.cygport.
  pam vulnerabiliy patch added thanks to Elmar Hoffmann, elho AT elho.net.
    Card vulnerability may remain, see README.
  module fixes for deluxe, eyes, starfish, swirl, text3d2, module use is
    still experimental.
  biof mode removed again (though was not building by default).

5.67
  Fixing specified bound equals destination size warning in iostuff.c.
  Port updated for xscreensaver-6.01.  With help from EoflaOE ViceCity.
     Also removed some warnings.
  maze3d.c updated for VMS as CRTL now contains more standard functions,
    thanks to Jouk Jansen.

5.66
  GL mode atunnels, juggler3d, atlantis, lament, invert, solitaire, text3d,
    and text3d2 fixed up by EoflaOE ViceCity and myself to build in
    xscreensaver.
  bomb, helix, lightning, penrose, petal, scooter fixes for xscreensaver
    port (clear screen issue).  Clock fixed to run by changing a spot from
    "Clock" to "CLOCK".
  A few updates from xscreensaver-5.44/hacks/xlockmore.c for xscreensaver
    port.
  Duplicate resources and unloadable resources for xscreensaver port fixed
    by EoflaOE.
  Double free removed for xscreensaver port fixed by EoflaOE and myself.
  Removed some warnings in xscreensaver port in fzort, rubik, skewb, and
    sproingies.
  Xpm textures added to xscreensaver ports that need them.
  image, puzzle, decay, bat now work but use xscreensaver bitmap/pixmap
    in xscreensaver port.
  Bug fix in qix and toneclock for xscreensaver port, xlock was not
    affected by negative NRAND input.
  euler2d synced up with xscreensaver version.
  Change to fzort to use __asm__ instead of asm as its probably more
    likely to work.
  Fixed solitaire so deckPile changes just a little bit as it doles
    out cards.
  Updated bomb to use size 18 font when USE_MB is not set as it seems
    34 is not widely available anymore.
  pacman now has different colored ghosts (no green ghost) and also
    oscillating dress and eyes.  See README for a notice for this mode.
  Fixed some bad drawings in solitaire and pacman noticed on
    Windows side.
  Warnings removed for -Wstrict-prototypes -Wmissing-prototypes
    -Wdeclaration-after-statement

5.65
  Fix from Jan Kratochvil and Adrian Reber, adrian AT lisas.de for Fedora.
    xlock -startCmd true... would core on Fedora, exit() replaced with
    _exit().
  Update for magick.c to use strncpy thanks to Jouk Jansen.

5.64
  Fix for hyper mode from original author, for potential but not
    likely memory leak and free(NULL) issue John Heidemann, johnh
    AT isi.edu.
  More buffer gcc warnings removed for dclock.c, image.c, and
    scrnsave.c.
  ras.c/magick.c gcc 10 fix from Adrian Reber, adrian AT lisas.de .
    VMS already handles this in make.com.

5.63
  Lots of spelling errors fixed due to codespell
    https://manpages.debian.org/testing/codespell/codespell.1.en.html
  A few more gl modes (molecule, invert) fixed up by
    EoflaOE ViceCity to run in xscreensaver.
  Added additional changes to solitaire and invert.  invert will
    build in xscreensaver with some coaxing, see README in
    xscreensaver directory.
  Removed buffer gcc warning about nose.c.

5.62
  Fix from brett.diamond AT gmail.com to get "xlock -help" from
    crashing.
  As a Blake's 7 fan, I had to add the Liberator to star mode.

5.61
  Same fix from Jouk Jansen and Adrian Reber, adrian AT lisas.de
    for juggler3d.cc in previous release.
  Change from Denys Vlasenko (thanks to Adrian Reber for pointing out)
    https://bugzilla.redhat.com/show_bug.cgi?id=874484
    This helps xlock's parent process to know xlock crashed.
  ico mode added truncated octahedron.
  Another  gl mode, sierpinski3d, fixed up by EoflaOE ViceCity to run
    in xscreensaver.

5.60
  Updated references to website to https.  https://www.sillycycle.com
  A few more gl modes (incl. maze3d, pipe, sproingies) fixed up by
    EoflaOE ViceCity to run in xscreensaver.

5.59
  Thanks to tobik, ohartmann AT walstatt.org, and Jason Helfman,
    jgh AT FreeBSD.org for xglock fixes for "failed due to signal" for
    clang.
  Syncing with xscreensaver and many modes modified, more than
    half working there.  pacman and puzzle run but need some
    obvious work, others run too fast or flash on the screen.
    Various fixes from Jouk Jansen and EoflaOE ViceCity.
    Updated GL modes also, inaddition to overlap: biof, skewb, and
    fire (needs images). See xscreensaver/README for new directions.
  Updated in linux to build with modules, must have broken somewhere
    down the line.  imake build fixed too.
  bomb mode fixed for xlock.

5.58
  Syncing with xscreensaver.  Much has changed since last time this
    was done and much left to do.  Nonglx "a"'s and some "b"'s done
    so far.  Automata modes like ant.c should use automata.c and
    automata.h supplied by xlockmore.
    ball bat not working right there yet.  Also bouboule to do right will
    require changes to xlockmore files from xscreensaver.
    See new xscreensaver/README for instructions.
  While testing uncovered old security bug in anenome mode and fixed.

5.57
  life updates to use a more standard notation for nontotalistic cellular
    automata.
  ax_pthread.m4 needed for autoconf, added back in, oops.
  Removed VMS caddr_t fix from matrix.c, cage.c, gears.c, glplanet.c,
    invert.c, juggler3d.c, lament.c, moebius.c, molecule.c, morph3d.c,
    noof.c, pipes.c, rubik.c, sierpinski3d.c, skewb.c, stairs.c,
    superquadrics.c as no longer needed.  Thanks to Jouk Jansen.
  boxed and maze3d modes added thanks mainly to Jouk Jansen.
  boxed added to xlock95.scr.  xlock95 Makefile now builds to 64 bit.

5.56
  Thanks to Jason Helfman, jgh AT FreeBSD.org for sound installation fixes.
  Thanks to Tobias Kortkamp, for his patch for glock compile issue with
     CLANG 6.0.0.
  Fixing warnings using clang for back.xpm, nose.c, passwd.c.
  Fixing errors using g++ for deluxe.c, also various casting added.
  Fixing potential some buffer overruns pointed out in mingw in
    apollonian.c and hyper.c.
  Fixing potential error of using null pointer thanks again to mingw in
    xlock.c.
  pyro2 was not showing anything on screen due to it not finding font,
    changed it to default to mode_font if can not find.

5.55
  Thanks to Dave Odell, dmo2118 AT gmail.com for his fzort mode update to
    use the functions in xshm.c and fixes crash when running X11 over network.
  Note from Dave Odell:
    <https://www.jwz.org/xscreensaver/xscreensaver-5.37.tar.gz>. MI_INIT() is
    defined and documented in hacks/xlockmore.h, with related functions
    defined in hacks/xlockmore.c.  MI_INIT() currently takes three parameters:
    the ModeInfo *, the state array, and a function pointer for the new free
    hook. FWIW, it could instead be just the first two parameters, with the
    free hook being set up like the other ModeHooks; this would be a bit
    nicer, I think. But I was going for something that could be applied
    incrementally to individual screenhacks in XScreenSaver, and could -- in
    theory -- be brought back to xlockmore with minimal impact.
  ant mode resync'd with xscreensaver...  Thanks to David Odell redoing my
    sad attempt.
  -sound configuration changed around so it should work on more machines,
    now uses DEF_PLAY and play.sh by default.
  Thanks to Stanislav Brabec, sbrabec AT suse.cz for his "hack" to fix for
    PAM with non-English locales.  He notes to fix properly a "Password"
    prompt list should be obtained at the initial phase of authentication.
    Added PAM_PASSWORD_PROMPT for using old way.
  Fixed leak in scooter thanks to Valgrind.

5.54
  Thanks to Dave Odell, dmo2118 AT gmail.com for his strange mode
    updates to include aligned_malloc.[ch], thread_util.[ch], xshm.[ch],
    and visual_pixmap_depth() from XScreenSaver.  Also updates for building
    macOS and Debian for crypt.  Made safe for VMS by Jouk Jansen.
  juggle fixed for multiscreens.

5.53
  Goofed on last VMS xmlock update.
  dclock fix for led bounce.  :)  Added to windows port but only graphical
    part.
  Windows port fixed petri black screen.  Added anemone and deluxe but turned
    off double buffering to get default black screen.

5.52
  Install changes for fortune. VMS xmlock build update.
  Thanks to Dave Odell, dmo2118 AT gmail.com for his strange mode
    updates.  New options -points N and -curve N .  Also now working
    for windows port (which led to bubble and ifs porting easily).

5.51
  life3d updates including a distinct 18 neighborhood using rhombic
    dodecahedrons (neighoborhood -18 as there is already 18
    neighborhood), and a 22 neighborhood using tetrahedrons, i.e. the
    tetrahedral part of alternated cubic honeycomb
  Less compile warnings and configure update.

5.50
  -messagefont was broken if USE_MB set (default from 5.42). E.g.:
    -mode dclock -messagefont "-*-times-*-*-*-*-18-*-*-*-*-*-*-*"
  Changed default message font to above.
  Should now compile with less warnings.
  spiral erase mode changed from 100 iterations to 8.

12 files changed, 101 insertions, 220 deletions

diff --git a/x11/xlockmore/Makefile b/x11/xlockmore/Makefile
index 6475ae1e910..8421c5b34ff 100644
--- a/x11/xlockmore/Makefile
+++ b/x11/xlockmore/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.156 2021/12/08 16:07:17 adam Exp $
+# $NetBSD: Makefile,v 1.157 2022/01/24 18:05:58 micha Exp $
 
-PKGREVISION= 34
+#PKGREVISION= 1
 .include "Makefile.common"
 
 COMMENT=	Like the XLock session-locker/screensaver, but with more
diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common
index 0721ebf5776..551c0213666 100644
--- a/x11/xlockmore/Makefile.common
+++ b/x11/xlockmore/Makefile.common
@@ -1,21 +1,22 @@
-# $NetBSD: Makefile.common,v 1.82 2021/03/22 17:46:06 wiz Exp $
+# $NetBSD: Makefile.common,v 1.83 2022/01/24 18:05:58 micha Exp $
 #
-# used by ../../x11/xlockmore/Makefile
-# used by ../../x11/xlockmore-lite/Makefile
+# used by x11/xlockmore/Makefile
+# used by x11/xlockmore-lite/Makefile
 
-DISTNAME=	xlockmore-5.46
+DISTNAME=	xlockmore-5.68
 CATEGORIES=	x11
 MASTER_SITES=	http://sillycycle.com/xlock/
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://sillycycle.com/xlockmore.html
+# Similar to BSD license, but uses different words (see xlockmore.spec)
+LICENSE=	2-clause-bsd
 
 DISTINFO_FILE?=		${.CURDIR}/../../x11/xlockmore/distinfo
 PATCHDIR?=		${.CURDIR}/../../x11/xlockmore/patches
 PLIST_SRC?=		${.CURDIR}/../../x11/xlockmore/PLIST
 FILESDIR?=		${.CURDIR}/../../x11/xlockmore/files
-MESSAGE_SRC?=		${.CURDIR}/../../x11/xlockmore/MESSAGE
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -33,9 +34,7 @@ PKG_OPTIONS_LEGACY_VARS+=	XLOCK_NO_DPMS:-xlockmore-dpms
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		xmkmf
 
-XLOCK_SOUNDDIR=		${PREFIX}/lib/X11/xlock/sounds
 XLOCK_MODULEDIR=	${PREFIX}/lib/X11/xlock/modules
-
 DEFINES+=		-DDEF_MODULEPATH="\"${XLOCK_MODULEDIR}\""
 CPPFLAGS+=		${DEFINES}
 CXXFLAGS+=		${DEFINES}
@@ -98,6 +97,7 @@ SPECIAL_PERMS+=	bin/xlock ${REAL_ROOT_USER} shadow 2511
 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
@@ -114,28 +114,35 @@ INSTALLATION_DIRS+=	${EGDIR}/pam.d
 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}
 
-# Set the complete paths to the sound files and set the default xlock
-# mode/screensaver.
-#
+# 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'
+
+# 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}|'
+
+# 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:
-	cd ${WRKSRC}/xlock;						\
-	${MV} -f XLock.ad XLock.ad.presed;				\
-	${SED}	-e "s|/usr/lib/|${PREFIX}/lib/|g"			\
-		XLock.ad.presed > XLock.ad;				\
-	${RM} -f XLock.ad.presed
-.if defined(XLOCK_DEFAULT_MODE) && !empty(XLOCK_DEFAULT_MODE)
-	cd ${WRKSRC}/xlock;						\
-	${MV} -f XLock.ad XLock.ad.presed;				\
-	${SED} -e "s|^\(XLock.mode:[ 	]*\).*|\1${XLOCK_DEFAULT_MODE}|" \
-		XLock.ad.presed > XLock.ad;				\
-	${RM} -f XLock.ad.presed
-.endif
+	${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
 
 post-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${XLOCK_SOUNDDIR}
-	cd ${WRKSRC}/sounds;						\
-	for file in *.au; do						\
-		${INSTALL_DATA} $$file ${DESTDIR}${XLOCK_SOUNDDIR};	\
-	done
 	${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/x11/xlockmore/PLIST b/x11/xlockmore/PLIST
index 0e6f78d36a2..2aa1b2bf5fd 100644
--- a/x11/xlockmore/PLIST
+++ b/x11/xlockmore/PLIST
@@ -1,11 +1,13 @@
-@comment $NetBSD: PLIST,v 1.10 2021/03/22 17:46:06 wiz Exp $
+@comment $NetBSD: PLIST,v 1.11 2022/01/24 18:05:58 micha Exp $
+bin/play.sh
 ${LITE}bin/xglock
 bin/xlock
-lib/X11/xlock/sounds/complete.au
-lib/X11/xlock/sounds/identify-please.au
-lib/X11/xlock/sounds/not-programmed.au
-lib/X11/xlock/sounds/thank-you.au
 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/x11/xlockmore/distinfo b/x11/xlockmore/distinfo
index e8904de5120..a10936dde96 100644
--- a/x11/xlockmore/distinfo
+++ b/x11/xlockmore/distinfo
@@ -1,11 +1,8 @@
-$NetBSD: distinfo,v 1.58 2021/10/26 11:34:51 nia Exp $
+$NetBSD: distinfo,v 1.59 2022/01/24 18:05:58 micha Exp $
 
-BLAKE2s (xlockmore-5.46.tar.xz) = ed9e61d105a888823680689ee011c33ea6626faf7ded865d23572409090ed61a
-SHA512 (xlockmore-5.46.tar.xz) = 4be4c70f72f9a820e26204fbd8450f2f920b6ed1583d413ba3983c4ced778c9d4e6dfa40a4c7919557b3fa7ecccba08e1a0bb0403924fa84770401d6758c7d9c
-Size (xlockmore-5.46.tar.xz) = 1610356 bytes
-SHA1 (patch-aa) = a8af264d041df95d0773cbe27984f9461e865722
-SHA1 (patch-ab) = 918be6904fb2a1b616dfbf7ac3d9759cc39d1608
-SHA1 (patch-ad) = 619c3413ae4bfdb420c77867062670dce336f5d8
-SHA1 (patch-config.cygport) = c120f9b9f9ca6a9ba60f8e46e9c2dd23225079d9
-SHA1 (patch-modes_Makefile.in) = bb32f1394224f44adbe2c2f4a17e084aa5aa5143
-SHA1 (patch-xglock_Makefile.in) = 697182ddac24cc624b82420c5f6e3d66fd6b0679
+BLAKE2s (xlockmore-5.68.tar.xz) = f202cfb7dc5c427d60c53705e881646e304b61280ee5619d97528d9e13dade2c
+SHA512 (xlockmore-5.68.tar.xz) = e884ac8395bfee21eedecbe0652eaa8bcae10e8f56896d7f3f5e970d40a87f002b7fb248caa0d981ea815e0fcfda6a1e8529c618c8c073b7f0b44b58abde17d4
+Size (xlockmore-5.68.tar.xz) = 1998852 bytes
+SHA1 (patch-configure) = eb2706b4de9d6212ab183ddf4faeaac6f598ca86
+SHA1 (patch-modes_Makefile.in) = 256c762e3bb02600da0bc14bc16b06604eb41eaa
+SHA1 (patch-xlock_XLock.ad) = f4754850a171530465be1949b0ea4f49b359bb3a
diff --git a/x11/xlockmore/MESSAGE b/x11/xlockmore/files/INSTALL.pkgsrc
index 89cffe636b7..8ea2ec6b840 100644
--- a/x11/xlockmore/MESSAGE
+++ b/x11/xlockmore/files/INSTALL.pkgsrc
@@ -1,18 +1,18 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2012/03/28 20:21:46 drochner Exp $
-
 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
+
+    @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
+
+    @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/x11/xlockmore/patches/patch-aa b/x11/xlockmore/patches/patch-aa
deleted file mode 100644
index 0586973e1e9..00000000000
--- a/x11/xlockmore/patches/patch-aa
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2015/04/15 07:31:15 spz Exp $
-
---- xlock/XLock.ad.orig	2015-03-12 13:34:33.000000000 +0000
-+++ xlock/XLock.ad
-@@ -46,10 +46,10 @@ XLock.icongeometry: 64x64
- !XLock.icongeometry: 256x256
- 
- ! For sound
--XLock.locksound: /usr/lib/X11/xlock/sounds/complete.au
--XLock.infosound: /usr/lib/X11/xlock/sounds/identify-please.au
--XLock.validsound: /usr/lib/X11/xlock/sounds/thank-you.au
--XLock.invalidsound: /usr/lib/X11/xlock/sounds/not-programmed.au
-+XLock.locksound: /usr/pkg/lib/X11/xlock/sounds/complete.au
-+XLock.infosound: /usr/pkg/lib/X11/xlock/sounds/identify-please.au
-+XLock.validsound: /usr/pkg/lib/X11/xlock/sounds/thank-you.au
-+XLock.invalidsound: /usr/pkg/lib/X11/xlock/sounds/not-programmed.au
- !XLock.locksound: complete.au
- !XLock.infosound: identify-please.au
- !XLock.validsound: thank-you.au
-@@ -63,12 +63,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
-@@ -81,7 +81,7 @@ XLock.messagefont: *8x16*
- ! For modes with images
- !XLock.*.bitmap: bitmaps/m-xlock.xbm
- !XLock.*.bitmap: pixmaps/m-xlock.xpm
--!XLock.*.bitmap: /usr/lib/X11/xlock/bitmaps
-+!XLock.*.bitmap: /usr/pkg/lib/X11/xlock/bitmaps
- 
- ! For mailbox check application
- !XLock.mailCmd: /usr/ucb/mail -e
-@@ -847,9 +847,9 @@ XLock.text3d.delay: 100000
- !XLock.text3d.cycles: 1
- !XLock.text3d.size: 1
- XLock.text3d.saturation: 1.0
--!XLock.text3d.ttfont: /usr/lib/X11/xlock/fonts/arial.ttf
-+!XLock.text3d.ttfont: /usr/pkg/lib/X11/xlock/fonts/arial.ttf
- ! Directory of only *.ttf fonts. symbol.ttf and wingding.ttf should be excluded
--!XLock.text3d.ttfont: /usr/lib/X11/xlock/fonts/
-+!XLock.text3d.ttfont: /usr/pkg/lib/X11/xlock/fonts/
- XLock.text3d.extrusion: 25.0
- XLock.text3d.rot_amplitude: 1.0
- XLock.text3d.rot_frequency: 0.001
diff --git a/x11/xlockmore/patches/patch-ad b/x11/xlockmore/patches/patch-ad
deleted file mode 100644
index 573ff7c8123..00000000000
--- a/x11/xlockmore/patches/patch-ad
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ad,v 1.9 2015/04/15 07:31:15 spz Exp $
-
---- xmlock/Makefile.in.orig	2010-04-19 13:33:29.000000000 +0000
-+++ xmlock/Makefile.in
-@@ -119,14 +119,14 @@ install_xmlock : install-program install
- 	@ $(ECHO) ""
- 
- install-program : xmlock
--	$(top_srcdir)/mkinstalldirs $(bindir)
--	$(INSTALL_PROGRAM) xmlock$(E) $(bindir)
-+	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
-+	$(INSTALL_PROGRAM) xmlock$(E) ${DESTDIR}$(bindir)
- 
- install-man :
- 
- install-ad :
--	$(top_srcdir)/mkinstalldirs $(xapploaddir)
--	$(INSTALL_DATA) $(top_srcdir)/xmlock/XmLock.ad $(xapploaddir)/XmLock
-+	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(xapploaddir)
-+	$(INSTALL_DATA) $(top_srcdir)/xmlock/XmLock.ad ${DESTDIR}$(xapploaddir)/XmLock
- 
- uninstall : @UNINSTALL_XMLOCK@
- 
diff --git a/x11/xlockmore/patches/patch-config.cygport b/x11/xlockmore/patches/patch-config.cygport
deleted file mode 100644
index 5b54ed27770..00000000000
--- a/x11/xlockmore/patches/patch-config.cygport
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-config.cygport,v 1.1 2015/04/15 07:31:15 spz Exp $
-
---- config.cygport.orig	2015-02-18 04:10:55.000000000 +0000
-+++ config.cygport
-@@ -4,12 +4,12 @@ PWD=`pwd`
- #NAME=${DIR}
- NAME=xlockmore
- GROUP=${NAME}
--if test "$1" == ""; then
-+if test "$1" = ""; then
- 	VERSION=`sed 's/^.*"\(.*\)"/\1/' ./version.h`
- 	RELEASE=1
- else
- 	VERSION=$1
--	if test "$2" == ""; then
-+	if test "$2" = ""; then
- 		RELEASE=1
- 	else
- 		RELEASE=$2
diff --git a/x11/xlockmore/patches/patch-ab b/x11/xlockmore/patches/patch-configure
index 3b30a392a0c..2076903394f 100644
--- a/x11/xlockmore/patches/patch-ab
+++ b/x11/xlockmore/patches/patch-configure
@@ -1,8 +1,11 @@
-$NetBSD: patch-ab,v 1.25 2015/04/15 07:31:15 spz Exp $
+$NetBSD: patch-configure,v 1.1 2022/01/24 18:05:58 micha Exp $
 
---- configure.orig	2015-03-03 01:05:29.000000000 +0000
+Modify handling of LDFLAGS.
+Rejected by upstream.
+
+--- configure.orig	2020-06-04 14:43:47.000000000 +0000
 +++ configure
-@@ -9508,10 +9508,10 @@ $as_echo "#define LESS_THAN_AIX3_2 1" >>
+@@ -10833,10 +10833,10 @@ $as_echo "#define LESS_THAN_AIX3_2 1" >>
          dirname=`which gcc`
          dirname=`dirname $dirname`
          dirname=`dirname $dirname`/lib
@@ -15,9 +18,9 @@ $NetBSD: patch-ab,v 1.25 2015/04/15 07:31:15 spz Exp $
 +#	    XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
 +#	fi
      fi
-     XLOCKLDFLAGS="-Wl,-R${XLOCK_LDFLAGS}"
-     XMLOCKLDFLAGS="-Wl,-R${XMLOCK_LDFLAGS}"
-@@ -9566,6 +9566,8 @@ _ACEOF
+     case "${canonical}" in
+       *-*-freebsd* )
+@@ -10896,6 +10896,8 @@ _ACEOF
  if test "x$ac_cv_header_elf_h" = xyes; then :
  
  $as_echo "#define HAVE_SHADOW 1" >>confdefs.h
@@ -26,7 +29,7 @@ $NetBSD: patch-ab,v 1.25 2015/04/15 07:31:15 spz Exp $
  
  fi
  
-@@ -9673,10 +9675,10 @@ $as_echo "#define SVR4 1" >>confdefs.h
+@@ -11006,10 +11008,10 @@ $as_echo "#define SVR4 1" >>confdefs.h
          dirname=`which gcc`
          dirname=`dirname $dirname`
          dirname=`dirname $dirname`/lib
diff --git a/x11/xlockmore/patches/patch-modes_Makefile.in b/x11/xlockmore/patches/patch-modes_Makefile.in
index 102c94d8a1a..45d8d367f0f 100644
--- a/x11/xlockmore/patches/patch-modes_Makefile.in
+++ b/x11/xlockmore/patches/patch-modes_Makefile.in
@@ -1,39 +1,21 @@
-$NetBSD: patch-modes_Makefile.in,v 1.2 2021/03/22 17:46:06 wiz Exp $
+$NetBSD: patch-modes_Makefile.in,v 1.3 2022/01/24 18:05:58 micha Exp $
 
-Honour LDFLAGS.
 Use INSTALL properly.
+First part was rejected by upstream.
+Second part is not suitable for upstream.
 
---- modes/Makefile.in.orig	2015-02-13 04:24:37.000000000 +0000
+--- modes/Makefile.in.orig	2021-12-17 04:47:25.000000000 +0000
 +++ modes/Makefile.in
-@@ -334,7 +334,7 @@ CFLAGS = @CFLAGS@
- CXXFLAGS = @CXXFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
--XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG)
-+XLOCKLDFLAGS = @XLOCKLDFLAGS@ $(CHECKLDFLAG) @LDFLAGS@
- XLIBS = @XLIBS@
- XLOCKLIBS = $(MODULELIB) @XLOCKLIBS@ -lcrypt
- 
-@@ -600,21 +600,22 @@ install : install-program install-man in
- 	@ $(ECHO) ""
+@@ -633,7 +633,7 @@ install : install-program install-man in
  
  install-program : xlock
--	$(top_srcdir)/mkinstalldirs $(bindir)
--	$(INSTALL_PROGRAM) $(INSTPGMFLAGS) $(UTILOBJDIR)xlock$(E) $(bindir)
--	@MODULES@mkdir -p $(DEF_MODULEPATH)
--	@MODULES@cp *.xlk $(DEF_MODULEPATH)
--	@MODULES@cp glx/*.xlk $(DEF_MODULEPATH)
-+	$(top_srcdir)/mkinstalldirs ${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)
- 
- install-man :
--	$(top_srcdir)/mkinstalldirs $(mandir)
--	$(INSTALL_DATA) $(UTILDIR)xlock.man $(mandir)/xlock.1
-+	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(mandir)
-+	$(INSTALL_DATA) $(UTILDIR)xlock.man ${DESTDIR}$(mandir)/xlock.1
+ 	$(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)
@@ -45,4 +27,4 @@ Use INSTALL properly.
 +	@FORTUNE@$(INSTALL_DATA) $(UTILOBJDIR)XLock.ad.tmp $(DESTDIR)${datarootdir}/examples/xlock/app-defaults/XLock
  	@FORTUNE@rm -f $(UTILOBJDIR)XLock.ad.tmp
  
- uninstall : uninstall-program uninstall-man uninstall-ad
+ install-sound :
diff --git a/x11/xlockmore/patches/patch-xglock_Makefile.in b/x11/xlockmore/patches/patch-xglock_Makefile.in
deleted file mode 100644
index 10a1291c5a4..00000000000
--- a/x11/xlockmore/patches/patch-xglock_Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-xglock_Makefile.in,v 1.2 2021/03/22 17:46:06 wiz Exp $
-
-Honour LDFLAGS.
-Use INSTALL properly.
-
---- xglock/Makefile.in.orig	2010-04-19 13:34:35.000000000 +0000
-+++ xglock/Makefile.in
-@@ -92,7 +92,7 @@ XGLOCKINC = @XGLOCKINC@ -I.. -I$(top_src
- CFLAGS = @GTK_CFLAGS@ @CFLAGS@
- #CFLAGS = -O
- #CFLAGS = -g
--XGLOCKLDFLAGS = @XGLOCKLDFLAGS@
-+XGLOCKLDFLAGS = @XGLOCKLDFLAGS@ @LDFLAGS@
- XLIBS = @XLIBS@
- XGLOCKLIBS = @XGLOCKLIBS@
- #If you have purify, and want to use it, uncomment this definition or
-@@ -117,14 +117,14 @@ install_xglock : install-program install
- 	@ $(ECHO) ""
- 
- install-program : xglock
--	$(top_srcdir)/mkinstalldirs $(bindir)
--	$(INSTALL_PROGRAM) xglock$(E) $(bindir)
-+	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(bindir)
-+	$(INSTALL_PROGRAM) xglock$(E) ${DESTDIR}$(bindir)
- 
- install-man :
- 
- install-ad :
--	$(top_srcdir)/mkinstalldirs $(datadir)/xlock
--	$(INSTALL_PROGRAM) $(top_srcdir)/xglock/xglockrc $(datadir)/xlock/xglockrc
-+	$(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir)/xlock
-+	$(INSTALL_DATA) $(top_srcdir)/xglock/xglockrc ${DESTDIR}$(datadir)/xlock/xglockrc
- 
- uninstall : @UNINSTALL_XGLOCK@
- 
diff --git a/x11/xlockmore/patches/patch-xlock_XLock.ad b/x11/xlockmore/patches/patch-xlock_XLock.ad
new file mode 100644
index 00000000000..4681368f731
--- /dev/null
+++ b/x11/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