CVS commit: pkgsrc/x11/xlockmore

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

Module Name:    pkgsrc
Committed By:   micha
Date:           Fri Jul 14 10:43:34 UTC 2023

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

Log Message:
x11/xlockmore: Update to 5.72

5.72
  Update for OpenVMS for x86_64, small change to xshm.h and new make.com
    to work with clang and xmlock/xawlock thanks to Jouk Jansen.  I hear
    its now possible to get a virtual OpenVMS on your Linux machine. :)
  Update for xscreensaver-6.06 port to use grabclient instead of
    grabscreen.
  configure now configures xmlock for Athena if you do not want Motif.
    Should work with most popular versions of Athena.  You may want
    to change the name from xmlock to xawlock if you are using Athena.
    xawlock directory removed and was not meant to be distributed.


To generate a diff of this commit:
cvs rdiff -u -r1.86 -r1.87 pkgsrc/x11/xlockmore/Makefile.common
cvs rdiff -u -r1.62 -r1.63 pkgsrc/x11/xlockmore/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xlockmore/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xlockmore/patches/patch-configure.ac

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.86 pkgsrc/x11/xlockmore/Makefile.common:1.87
--- pkgsrc/x11/xlockmore/Makefile.common:1.86   Fri Aug 19 10:11:09 2022
+++ pkgsrc/x11/xlockmore/Makefile.common        Fri Jul 14 10:43:33 2023
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.86 2022/08/19 10:11:09 micha Exp $
+# $NetBSD: Makefile.common,v 1.87 2023/07/14 10:43:33 micha Exp $
 #
 # used by x11/xlockmore/Makefile
 # used by x11/xlockmore-lite/Makefile
 
-DISTNAME=      xlockmore-5.71
+DISTNAME=      xlockmore-5.72
 CATEGORIES=    x11
 MASTER_SITES=  http://sillycycle.com/xlock/
 EXTRACT_SUFX=  .tar.xz
@@ -32,13 +32,15 @@ PKG_OPTIONS_LEGACY_VARS+=   XLOCK_NO_DPMS:
 .include "../../mk/bsd.options.mk"
 
 USE_LANGUAGES=         c c++
-USE_TOOLS+=            xmkmf
+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
@@ -141,6 +143,9 @@ 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

Index: pkgsrc/x11/xlockmore/distinfo
diff -u pkgsrc/x11/xlockmore/distinfo:1.62 pkgsrc/x11/xlockmore/distinfo:1.63
--- pkgsrc/x11/xlockmore/distinfo:1.62  Fri Aug 19 10:11:09 2022
+++ pkgsrc/x11/xlockmore/distinfo       Fri Jul 14 10:43:33 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.62 2022/08/19 10:11:09 micha Exp $
+$NetBSD: distinfo,v 1.63 2023/07/14 10:43:33 micha Exp $
 
-BLAKE2s (xlockmore-5.71.tar.xz) = 09bc1954d769ed2ebd18e1438abc6d8d17f530e9cbb0d6a6d509c58f733119bd
-SHA512 (xlockmore-5.71.tar.xz) = d09cd28dbca37db5e8fa7a388f4d797369b82a856b509414dd6dca5b586506c466b0fb112947a6a0c71e8c8de7cc125ef19c0fa358edc2a521ad38c255946e58
-Size (xlockmore-5.71.tar.xz) = 2048496 bytes
-SHA1 (patch-configure) = 2a98e34e2c5fc81da5f5c362195033f9d73bd275
+BLAKE2s (xlockmore-5.72.tar.xz) = a699f3f5ec1b6c87761636961c5af85a60e44bcecea9a609b7a885a5deee76e4
+SHA512 (xlockmore-5.72.tar.xz) = d6e59a4e37cb4867d045bb8c907682b35924c3c6f6b2387d5b810fbebcda7ab6591a16cfe59fe142f0ae29e000b5cbc5e6a86d03198e24d72bb5b2063767ccd7
+Size (xlockmore-5.72.tar.xz) = 2024132 bytes
+SHA1 (patch-configure.ac) = 9bb4e744a493d8a30933d8a1d37d73f8de03ea0f
 SHA1 (patch-modes_Makefile.in) = 256c762e3bb02600da0bc14bc16b06604eb41eaa
 SHA1 (patch-xlock_XLock.ad) = f4754850a171530465be1949b0ea4f49b359bb3a

Added files:

Index: pkgsrc/x11/xlockmore/patches/patch-configure.ac
diff -u /dev/null pkgsrc/x11/xlockmore/patches/patch-configure.ac:1.1
--- /dev/null   Fri Jul 14 10:43:34 2023
+++ pkgsrc/x11/xlockmore/patches/patch-configure.ac     Fri Jul 14 10:43:34 2023
@@ -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* )