CVS commit: pkgsrc/x11/xlockmore

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

Module Name:    pkgsrc
Committed By:   micha
Date:           Wed Jul 13 17:26:34 UTC 2022

Modified Files:
        pkgsrc/x11/xlockmore: Makefile.common distinfo
        pkgsrc/x11/xlockmore/patches: patch-configure

Log Message:
x11/xlockmore: Update to 5.70

Patch for configure script adapted.

5.70
  Patch for Cannabidiol and Fentanyl from Richard Narron, richard AT
    aaazen.com.
  I was able to get DtScreen to work on Linux with CDE with slight
    modification to Makefile (documented in README) with help from Per
    Backman, 229pele AT tufftuff.net.
  xmlock updates for Athena.  In generated Makefile will have to change
    HAVE_MOTIF to HAVE_ATHENA and change -lXm to -lXaw or -lXaw3d.  Just
    bare bones right now.
  t3d.c: following recommendated change for configure "warning: Update your
    code to rely only on HAVE_SYS_TIME_H".  Also other assorted changes
    in configure.ac when I ran autoupdate (did not accept everything as
    it seemed to go wrong).


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/x11/xlockmore/Makefile.common
cvs rdiff -u -r1.60 -r1.61 pkgsrc/x11/xlockmore/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xlockmore/patches/patch-configure

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.common
diff -u pkgsrc/x11/xlockmore/Makefile.common:1.84 pkgsrc/x11/xlockmore/Makefile.common:1.85
--- pkgsrc/x11/xlockmore/Makefile.common:1.84   Fri Mar 11 11:18:20 2022
+++ pkgsrc/x11/xlockmore/Makefile.common        Wed Jul 13 17:26:34 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.84 2022/03/11 11:18:20 micha Exp $
+# $NetBSD: Makefile.common,v 1.85 2022/07/13 17:26:34 micha Exp $
 #
 # used by x11/xlockmore/Makefile
 # used by x11/xlockmore-lite/Makefile
 
-DISTNAME=      xlockmore-5.69
+DISTNAME=      xlockmore-5.70
 CATEGORIES=    x11
 MASTER_SITES=  http://sillycycle.com/xlock/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/x11/xlockmore/distinfo
diff -u pkgsrc/x11/xlockmore/distinfo:1.60 pkgsrc/x11/xlockmore/distinfo:1.61
--- pkgsrc/x11/xlockmore/distinfo:1.60  Fri Mar 11 11:18:20 2022
+++ pkgsrc/x11/xlockmore/distinfo       Wed Jul 13 17:26:34 2022
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.60 2022/03/11 11:18:20 micha Exp $
+$NetBSD: distinfo,v 1.61 2022/07/13 17:26:34 micha Exp $
 
-BLAKE2s (xlockmore-5.69.tar.xz) = e691283e300e635a24aa0e3f64d970b334f77a616a322ae389d34b4b9679f9a3
-SHA512 (xlockmore-5.69.tar.xz) = 03c5938a7442665a2743894c0daa45f3b38569f2b3c3cf395f0d0f5758f6f873e0ef703936d0846d0210babe52357a398a885f919257efe9a2038c8e06be40b9
-Size (xlockmore-5.69.tar.xz) = 2008396 bytes
-SHA1 (patch-configure) = eb2706b4de9d6212ab183ddf4faeaac6f598ca86
+BLAKE2s (xlockmore-5.70.tar.xz) = 7295b82c27a0fdbf4cabf1ecf869ab1c4563a42da11124f13bdb3ab655fcf780
+SHA512 (xlockmore-5.70.tar.xz) = 4409f3f49e68c6aa630391db62dc80c79dba777f0fbe311d7d6dcf01f3df6b3d041bc44376258cadca15e12b0bb0846adc5fe5ae0aaf87cec190bc09721b8464
+Size (xlockmore-5.70.tar.xz) = 2043732 bytes
+SHA1 (patch-configure) = 2a98e34e2c5fc81da5f5c362195033f9d73bd275
 SHA1 (patch-modes_Makefile.in) = 256c762e3bb02600da0bc14bc16b06604eb41eaa
 SHA1 (patch-xlock_XLock.ad) = f4754850a171530465be1949b0ea4f49b359bb3a

Index: pkgsrc/x11/xlockmore/patches/patch-configure
diff -u pkgsrc/x11/xlockmore/patches/patch-configure:1.1 pkgsrc/x11/xlockmore/patches/patch-configure:1.2
--- pkgsrc/x11/xlockmore/patches/patch-configure:1.1    Mon Jan 24 18:05:58 2022
+++ pkgsrc/x11/xlockmore/patches/patch-configure        Wed Jul 13 17:26:34 2022
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.1 2022/01/24 18:05:58 micha Exp $
+$NetBSD: patch-configure,v 1.2 2022/07/13 17:26:34 micha Exp $
 
 Modify handling of LDFLAGS.
 Rejected by upstream.
 
---- configure.orig     2020-06-04 14:43:47.000000000 +0000
+--- configure.orig     2022-07-11 01:00:43.000000000 +0000
 +++ configure
-@@ -10833,10 +10833,10 @@ $as_echo "#define LESS_THAN_AIX3_2 1" >>
+@@ -11764,10 +11764,10 @@ printf "%s\n" "#define LESS_THAN_AIX3_2 
          dirname=`which gcc`
          dirname=`dirname $dirname`
          dirname=`dirname $dirname`/lib
@@ -20,16 +20,16 @@ Rejected by upstream.
      fi
      case "${canonical}" in
        *-*-freebsd* )
-@@ -10896,6 +10896,8 @@ _ACEOF
- if test "x$ac_cv_header_elf_h" = xyes; then :
+@@ -11822,6 +11822,8 @@ if test "x$ac_cv_header_elf_h" = xyes
+ then :
  
- $as_echo "#define HAVE_SHADOW 1" >>confdefs.h
+ printf "%s\n" "#define HAVE_SHADOW 1" >>confdefs.h
 +XLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XLOCK_LDFLAGS}"
 +XMLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XMLOCK_LDFLAGS}"
  
  fi
  
-@@ -11006,10 +11008,10 @@ $as_echo "#define SVR4 1" >>confdefs.h
+@@ -11931,10 +11933,10 @@ printf "%s\n" "#define SVR4 1" >>confdef
          dirname=`which gcc`
          dirname=`dirname $dirname`
          dirname=`dirname $dirname`/lib