CVS commit: pkgsrc/x11/xlockmore

["Michael Baeuerle" <micha%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Apr 12 14:28:44 UTC 2024

Modified Files:
        pkgsrc/x11/xlockmore: Makefile Makefile.common distinfo

Log Message:
x11/xlockmore: Update to 5.77

Reenable fetch for anything except curl.

5.77
  Added period 2 edge turning to pyraminx.
  pyraminx and oct mode extended to size 5 also some hardcoding of size
    removed.

5.76
  oct mode added.  Sizes 2-4.  Period 3 (face turning) and Period 4
    (corner turning) implemented also a "sticky" mode is implemented
    for both where the middle pieces turn together.
  pyraminx code was reorganized and now scale the size of puzzle.

5.75
  pyraminx mode added.  Sizes 2-4.  With a "sticky" mode where its
    a size 4 but only certain turns are permitted.  So far only the
    normal Period 3 turning is permitted (i.e. faces or corners turn
    but not edges).  Taken from xpyraminx and dino and rubik modes.

5.74
  dino mode center fix (probably never see error).
  bevel mode added.  Better known as the Helicopter Cube.  Currently,
    it only supports the 180 degree turns.  The ~71 degree turns would
    be very challenging to simulate.  Taken from an xbevel puzzle and
    the skewb mode.

5.73
  dino mode added, mostly built from xdino and skewb mode.
  fiberlamp mode fixed for multiscreen.
  boxed mode report that it may be trapped in an infinite loop, I could
    not reproduce but added a hack so this will not happen.


To generate a diff of this commit:
cvs rdiff -u -r1.177 -r1.178 pkgsrc/x11/xlockmore/Makefile
cvs rdiff -u -r1.88 -r1.89 pkgsrc/x11/xlockmore/Makefile.common
cvs rdiff -u -r1.63 -r1.64 pkgsrc/x11/xlockmore/distinfo

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

Modified files:

Index: pkgsrc/x11/xlockmore/Makefile
diff -u pkgsrc/x11/xlockmore/Makefile:1.177 pkgsrc/x11/xlockmore/Makefile:1.178
--- pkgsrc/x11/xlockmore/Makefile:1.177 Sun Apr  7 07:35:32 2024
+++ pkgsrc/x11/xlockmore/Makefile       Fri Apr 12 14:28:44 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.177 2024/04/07 07:35:32 wiz Exp $
+# $NetBSD: Makefile,v 1.178 2024/04/12 14:28:44 micha Exp $
 
 #PKGREVISION= 1
-PKGREVISION= 8
 .include "Makefile.common"
 
 COMMENT=       Like the XLock session-locker/screensaver, but with more

Index: pkgsrc/x11/xlockmore/Makefile.common
diff -u pkgsrc/x11/xlockmore/Makefile.common:1.88 pkgsrc/x11/xlockmore/Makefile.common:1.89
--- pkgsrc/x11/xlockmore/Makefile.common:1.88   Wed Jul 19 08:42:57 2023
+++ pkgsrc/x11/xlockmore/Makefile.common        Fri Apr 12 14:28:44 2024
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile.common,v 1.88 2023/07/19 08:42:57 tnn Exp $
+# $NetBSD: Makefile.common,v 1.89 2024/04/12 14:28:44 micha Exp $
 #
 # used by x11/xlockmore/Makefile
 # used by x11/xlockmore-lite/Makefile
 
-DISTNAME=      xlockmore-5.72
+DISTNAME=      xlockmore-5.77
 CATEGORIES=    x11
-# the curl User-Agent is blocked with code 406
-#MASTER_SITES= http://sillycycle.com/xlock/
+MASTER_SITES=  http://sillycycle.com/xlock/
 EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -14,13 +13,18 @@ HOMEPAGE=   https://sillycycle.com/xlockmo
 # 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"
+FETCH_USING=   manual
+.endif
+
 DISTINFO_FILE?=                ${.CURDIR}/../../x11/xlockmore/distinfo
 PATCHDIR?=             ${.CURDIR}/../../x11/xlockmore/patches
 PLIST_SRC?=            ${.CURDIR}/../../x11/xlockmore/PLIST
 FILESDIR?=             ${.CURDIR}/../../x11/xlockmore/files
 
-.include "../../mk/bsd.prefs.mk"
-
 PKG_OPTIONS_VAR=               PKG_OPTIONS.xlockmore
 PKG_SUPPORTED_OPTIONS=         xlockmore-allow-root xlockmore-dpms pam
 .if ${OPSYS} == "NetBSD"

Index: pkgsrc/x11/xlockmore/distinfo
diff -u pkgsrc/x11/xlockmore/distinfo:1.63 pkgsrc/x11/xlockmore/distinfo:1.64
--- pkgsrc/x11/xlockmore/distinfo:1.63  Fri Jul 14 10:43:33 2023
+++ pkgsrc/x11/xlockmore/distinfo       Fri Apr 12 14:28:44 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.63 2023/07/14 10:43:33 micha Exp $
+$NetBSD: distinfo,v 1.64 2024/04/12 14:28:44 micha Exp $
 
-BLAKE2s (xlockmore-5.72.tar.xz) = a699f3f5ec1b6c87761636961c5af85a60e44bcecea9a609b7a885a5deee76e4
-SHA512 (xlockmore-5.72.tar.xz) = d6e59a4e37cb4867d045bb8c907682b35924c3c6f6b2387d5b810fbebcda7ab6591a16cfe59fe142f0ae29e000b5cbc5e6a86d03198e24d72bb5b2063767ccd7
-Size (xlockmore-5.72.tar.xz) = 2024132 bytes
+BLAKE2s (xlockmore-5.77.tar.xz) = c120acc1299523c85f6a002ca297663c41ee2f1d0ba1af3055f7866bdc9be07d
+SHA512 (xlockmore-5.77.tar.xz) = 468d03f829c2b169295b33b3b3fd3747249fbe6306d99bd731e4f117d0c79e8edda8b871cbc06aba7a718578b56301bd358d756d786294e53bd333e57925cb87
+Size (xlockmore-5.77.tar.xz) = 2069348 bytes
 SHA1 (patch-configure.ac) = 9bb4e744a493d8a30933d8a1d37d73f8de03ea0f
 SHA1 (patch-modes_Makefile.in) = 256c762e3bb02600da0bc14bc16b06604eb41eaa
 SHA1 (patch-xlock_XLock.ad) = f4754850a171530465be1949b0ea4f49b359bb3a