Fri Jul 14 10:43:34 2023 UTC ()
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.


(micha)
diff -r1.86 -r1.87 pkgsrc/x11/xlockmore/Makefile.common
diff -r1.62 -r1.63 pkgsrc/x11/xlockmore/distinfo
diff -r1.2 -r0 pkgsrc/x11/xlockmore/patches/patch-configure
diff -r0 -r1.1 pkgsrc/x11/xlockmore/patches/patch-configure.ac
Fri Jul 14 19:43:34 2023
Mon Jun 26 19:41:30 2023
pkgsrc/x11/xlockmore/patches/patch-configure,v
anoncvs not yet been updated
cvs diff -r1.86 -r1.87 pkgsrc/x11/xlockmore/Makefile.common (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore/Makefile.common 2022/08/19 10:11:09 1.86
+++ pkgsrc/x11/xlockmore/Makefile.common 2023/07/14 10:43:33 1.87
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile.common,v 1.86 2022/08/19 10:11:09 micha Exp $ 1# $NetBSD: Makefile.common,v 1.87 2023/07/14 10:43:33 micha Exp $
2# 2#
3# used by x11/xlockmore/Makefile 3# used by x11/xlockmore/Makefile
4# used by x11/xlockmore-lite/Makefile 4# used by x11/xlockmore-lite/Makefile
5 5
6DISTNAME= xlockmore-5.71 6DISTNAME= xlockmore-5.72
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= http://sillycycle.com/xlock/ 8MASTER_SITES= http://sillycycle.com/xlock/
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://sillycycle.com/xlockmore.html 12HOMEPAGE= https://sillycycle.com/xlockmore.html
13# Similar to BSD license, but uses different words (see xlockmore.spec) 13# Similar to BSD license, but uses different words (see xlockmore.spec)
14LICENSE= 2-clause-bsd 14LICENSE= 2-clause-bsd
15 15
16DISTINFO_FILE?= ${.CURDIR}/../../x11/xlockmore/distinfo 16DISTINFO_FILE?= ${.CURDIR}/../../x11/xlockmore/distinfo
17PATCHDIR?= ${.CURDIR}/../../x11/xlockmore/patches 17PATCHDIR?= ${.CURDIR}/../../x11/xlockmore/patches
18PLIST_SRC?= ${.CURDIR}/../../x11/xlockmore/PLIST 18PLIST_SRC?= ${.CURDIR}/../../x11/xlockmore/PLIST
19FILESDIR?= ${.CURDIR}/../../x11/xlockmore/files 19FILESDIR?= ${.CURDIR}/../../x11/xlockmore/files
@@ -22,33 +22,35 @@ FILESDIR?= ${.CURDIR}/../../x11/xlockmo @@ -22,33 +22,35 @@ FILESDIR?= ${.CURDIR}/../../x11/xlockmo
22 22
23PKG_OPTIONS_VAR= PKG_OPTIONS.xlockmore 23PKG_OPTIONS_VAR= PKG_OPTIONS.xlockmore
24PKG_SUPPORTED_OPTIONS= xlockmore-allow-root xlockmore-dpms pam 24PKG_SUPPORTED_OPTIONS= xlockmore-allow-root xlockmore-dpms pam
25.if ${OPSYS} == "NetBSD" 25.if ${OPSYS} == "NetBSD"
26PKG_SUPPORTED_OPTIONS+= oss 26PKG_SUPPORTED_OPTIONS+= oss
27.endif 27.endif
28PKG_SUGGESTED_OPTIONS= xlockmore-allow-root xlockmore-dpms 28PKG_SUGGESTED_OPTIONS= xlockmore-allow-root xlockmore-dpms
29PKG_OPTIONS_LEGACY_VARS+= XLOCK_DISABLE_ALLOW_ROOT:-xlockmore-allow-root 29PKG_OPTIONS_LEGACY_VARS+= XLOCK_DISABLE_ALLOW_ROOT:-xlockmore-allow-root
30PKG_OPTIONS_LEGACY_VARS+= XLOCK_NO_DPMS:-xlockmore-dpms 30PKG_OPTIONS_LEGACY_VARS+= XLOCK_NO_DPMS:-xlockmore-dpms
31 31
32.include "../../mk/bsd.options.mk" 32.include "../../mk/bsd.options.mk"
33 33
34USE_LANGUAGES= c c++ 34USE_LANGUAGES= c c++
35USE_TOOLS+= xmkmf 35USE_TOOLS+= autoconf autoreconf bash xmkmf
36 36
37XLOCK_MODULEDIR= ${PREFIX}/lib/X11/xlock/modules 37XLOCK_MODULEDIR= ${PREFIX}/lib/X11/xlock/modules
38DEFINES+= -DDEF_MODULEPATH="\"${XLOCK_MODULEDIR}\"" 38DEFINES+= -DDEF_MODULEPATH="\"${XLOCK_MODULEDIR}\""
39CPPFLAGS+= ${DEFINES} 39CPPFLAGS+= ${DEFINES}
40CXXFLAGS+= ${DEFINES} 40CXXFLAGS+= ${DEFINES}
41 41
 42# Variable RANDOM is used (a POSIX shell is not sufficient)
 43CONFIG_SHELL= bash
42GNU_CONFIGURE= YES 44GNU_CONFIGURE= YES
43CONFIGURE_ARGS+= --without-motif 45CONFIGURE_ARGS+= --without-motif
44CONFIGURE_ARGS+= --without-editres 46CONFIGURE_ARGS+= --without-editres
45CONFIGURE_ARGS+= --without-dtsaver 47CONFIGURE_ARGS+= --without-dtsaver
46CONFIGURE_ARGS+= --without-rplay 48CONFIGURE_ARGS+= --without-rplay
47CONFIGURE_ARGS+= --without-nas 49CONFIGURE_ARGS+= --without-nas
48CONFIGURE_ARGS+= --without-gtk 50CONFIGURE_ARGS+= --without-gtk
49CONFIGURE_ARGS+= --without-esound 51CONFIGURE_ARGS+= --without-esound
50CONFIGURE_ARGS+= --enable-appdefaultdir=${PREFIX}/lib/X11/app-defaults 52CONFIGURE_ARGS+= --enable-appdefaultdir=${PREFIX}/lib/X11/app-defaults
51CONFIGURE_ENV+= ac_cv_x_app_defaults=${PREFIX}/lib/X11/app-defaults/XLock 53CONFIGURE_ENV+= ac_cv_x_app_defaults=${PREFIX}/lib/X11/app-defaults/XLock
52 54
53OWN_DIRS+= ${PREFIX}/lib/X11/app-defaults 55OWN_DIRS+= ${PREFIX}/lib/X11/app-defaults
54CONF_FILES+= ${EGDIR}/app-defaults/XLock ${PREFIX}/lib/X11/app-defaults/XLock 56CONF_FILES+= ${EGDIR}/app-defaults/XLock ${PREFIX}/lib/X11/app-defaults/XLock
@@ -131,18 +133,21 @@ SUBST_FILES.mode= xlock/XLock.ad @@ -131,18 +133,21 @@ SUBST_FILES.mode= xlock/XLock.ad
131SUBST_SED.mode= -e 's|^\(XLock.mode:[ ]*\).*|\1${XLOCK_DEFAULT_MODE}|' 133SUBST_SED.mode= -e 's|^\(XLock.mode:[ ]*\).*|\1${XLOCK_DEFAULT_MODE}|'
132 134
133# Configure INSTALL.pkgsrc (formerly displayed as MESSAGE) 135# Configure INSTALL.pkgsrc (formerly displayed as MESSAGE)
134SUBST_CLASSES+= install 136SUBST_CLASSES+= install
135SUBST_STAGE.install= post-configure 137SUBST_STAGE.install= post-configure
136SUBST_MESSAGE.install= Preparing INSTALL.pkgsrc file ... 138SUBST_MESSAGE.install= Preparing INSTALL.pkgsrc file ...
137SUBST_FILES.install= ${WRKDIR}/INSTALL.pkgsrc 139SUBST_FILES.install= ${WRKDIR}/INSTALL.pkgsrc
138SUBST_VARS.install= PREFIX 140SUBST_VARS.install= PREFIX
139SUBST_VARS.install+= EGDIR 141SUBST_VARS.install+= EGDIR
140 142
141post-patch: 143post-patch:
142 ${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR} 144 ${CP} ${FILESDIR}/INSTALL.pkgsrc ${WRKDIR}
143 145
 146pre-configure:
 147 cd ${WRKSRC} && autoreconf -vif
 148
144post-install: 149post-install:
145 ${INSTALL_DATA} ${FILESDIR}/pam-xlock-NetBSD \ 150 ${INSTALL_DATA} ${FILESDIR}/pam-xlock-NetBSD \
146 ${DESTDIR}${EGDIR}/pam.d/xlock-NetBSD 151 ${DESTDIR}${EGDIR}/pam.d/xlock-NetBSD
147 ${INSTALL_DATA} ${WRKDIR}/INSTALL.pkgsrc \ 152 ${INSTALL_DATA} ${WRKDIR}/INSTALL.pkgsrc \
148 ${DESTDIR}${PREFIX}/share/doc/xlockmore/INSTALL.pkgsrc 153 ${DESTDIR}${PREFIX}/share/doc/xlockmore/INSTALL.pkgsrc
cvs diff -r1.62 -r1.63 pkgsrc/x11/xlockmore/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xlockmore/distinfo 2022/08/19 10:11:09 1.62
+++ pkgsrc/x11/xlockmore/distinfo 2023/07/14 10:43:33 1.63
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.62 2022/08/19 10:11:09 micha Exp $ 1$NetBSD: distinfo,v 1.63 2023/07/14 10:43:33 micha Exp $
2 2
3BLAKE2s (xlockmore-5.71.tar.xz) = 09bc1954d769ed2ebd18e1438abc6d8d17f530e9cbb0d6a6d509c58f733119bd 3BLAKE2s (xlockmore-5.72.tar.xz) = a699f3f5ec1b6c87761636961c5af85a60e44bcecea9a609b7a885a5deee76e4
4SHA512 (xlockmore-5.71.tar.xz) = d09cd28dbca37db5e8fa7a388f4d797369b82a856b509414dd6dca5b586506c466b0fb112947a6a0c71e8c8de7cc125ef19c0fa358edc2a521ad38c255946e58 4SHA512 (xlockmore-5.72.tar.xz) = d6e59a4e37cb4867d045bb8c907682b35924c3c6f6b2387d5b810fbebcda7ab6591a16cfe59fe142f0ae29e000b5cbc5e6a86d03198e24d72bb5b2063767ccd7
5Size (xlockmore-5.71.tar.xz) = 2048496 bytes 5Size (xlockmore-5.72.tar.xz) = 2024132 bytes
6SHA1 (patch-configure) = 2a98e34e2c5fc81da5f5c362195033f9d73bd275 6SHA1 (patch-configure.ac) = 9bb4e744a493d8a30933d8a1d37d73f8de03ea0f
7SHA1 (patch-modes_Makefile.in) = 256c762e3bb02600da0bc14bc16b06604eb41eaa 7SHA1 (patch-modes_Makefile.in) = 256c762e3bb02600da0bc14bc16b06604eb41eaa
8SHA1 (patch-xlock_XLock.ad) = f4754850a171530465be1949b0ea4f49b359bb3a 8SHA1 (patch-xlock_XLock.ad) = f4754850a171530465be1949b0ea4f49b359bb3a
File Deleted: pkgsrc/x11/xlockmore/patches/patch-configure
File Added: pkgsrc/x11/xlockmore/patches/patch-configure.ac
$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* )