CVS commit: pkgsrc/x11/xinit

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Dec  4 15:35:27 UTC 2022

Modified Files:
        pkgsrc/x11/xinit: Makefile builtin.mk distinfo

Log Message:
xinit: update to 1.4.2.

Alan Coopersmith (6):
      Fix spelling/wording issues
      gitlab CI: add a basic build test
      Build xz tarballs instead of bzip2
      gitlab CI: stop requiring Signed-off-by in commits
      man page: Update remote display example from rsh to ssh
      xinit 1.4.2

Arthur Williams (2):
      Remove non-portable grep usage from startx
      Don't wait for X to finish starting if it has died

Dominik 'Rathann' Mierzejewski (1):
      stop unsetting DBUS_SESSION_BUS_ADDRESS variable

Jeremy Huddleston Sequoia (4):
      darwin: Drop support for macOS 10.7 and earlier
      darwin: Ensure we launch the user startx from $HOME
      darwin: Specify +extension GLX when the user requests IGLX support
      darwin: Wait for font_cache to complete to avoid a race with `xset fb=`

Matt Turner (1):
      man: Restore non-SCO UNIX bits of the man page

Rickie Schroeder (1):
      startx: use uname -n instead of hostname

Tim Egenton (1):
      startx: Source XINITRC and XSERVERRC variables

nia (1):
      startx: don't attempt to catch SIGKILL


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/xinit/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xinit/builtin.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/x11/xinit/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/xinit/Makefile
diff -u pkgsrc/x11/xinit/Makefile:1.31 pkgsrc/x11/xinit/Makefile:1.32
--- pkgsrc/x11/xinit/Makefile:1.31      Wed Nov  9 13:14:29 2022
+++ pkgsrc/x11/xinit/Makefile   Sun Dec  4 15:35:27 2022
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2022/11/09 13:14:29 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2022/12/04 15:35:27 wiz Exp $
 
-DISTNAME=              xinit-1.4.1
+DISTNAME=              xinit-1.4.2
 CATEGORIES=            x11
 MASTER_SITES=          ${MASTER_SITE_XORG:=app/}
-EXTRACT_SUFX=          .tar.bz2
+EXTRACT_SUFX=          .tar.xz
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              https://xorg.freedesktop.org/

Index: pkgsrc/x11/xinit/builtin.mk
diff -u pkgsrc/x11/xinit/builtin.mk:1.1 pkgsrc/x11/xinit/builtin.mk:1.2
--- pkgsrc/x11/xinit/builtin.mk:1.1     Fri Dec  3 13:03:01 2021
+++ pkgsrc/x11/xinit/builtin.mk Sun Dec  4 15:35:27 2022
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2021/12/03 13:03:01 nia Exp $
+# $NetBSD: builtin.mk,v 1.2 2022/12/04 15:35:27 wiz Exp $
 
 BUILTIN_PKG:=  xinit
 
@@ -25,7 +25,7 @@ MAKEVARS+=            IS_BUILTIN.xinit
 ### a package name to represent the built-in package.
 ###
 .if !defined(BUILTIN_PKG.xinit) && \
-    !empty(IS_BUILTIN.xinit:M[yY][eE][sS]) && \
+    ${IS_BUILTIN.xinit:tl} == yes && \
     empty(XINIT:M__nonexistent__)
 
 # we're more worried about existence, rather than actual version
@@ -45,10 +45,10 @@ USE_BUILTIN.xinit=  no
 .  else
 USE_BUILTIN.xinit=     ${IS_BUILTIN.xinit}
 .    if defined(BUILTIN_PKG.xinit) && \
-        !empty(IS_BUILTIN.xinit:M[yY][eE][sS])
+        ${IS_BUILTIN.xinit:tl} == yes
 USE_BUILTIN.xinit=     yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.xinit}
-.        if !empty(USE_BUILTIN.xinit:M[yY][eE][sS])
+.        if ${USE_BUILTIN.xinit:tl} == yes
 USE_BUILTIN.xinit!=                                                    \
        if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.xinit:Q}; then \
                ${ECHO} yes;                                            \
@@ -62,7 +62,7 @@ USE_BUILTIN.xinit!=                                                   \
 .endif
 
 # Now set up the appropriate prefix for xinit
-.if !empty(USE_BUILTIN.xinit:M[yY][eE][sS])
+.if ${USE_BUILTIN.xinit:tl} == yes
 XINITBASE=             ${X11BASE}
 .else
 XINITBASE=             ${PREFIX}

Index: pkgsrc/x11/xinit/distinfo
diff -u pkgsrc/x11/xinit/distinfo:1.18 pkgsrc/x11/xinit/distinfo:1.19
--- pkgsrc/x11/xinit/distinfo:1.18      Tue Oct 26 11:34:49 2021
+++ pkgsrc/x11/xinit/distinfo   Sun Dec  4 15:35:27 2022
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 11:34:49 nia Exp $
+$NetBSD: distinfo,v 1.19 2022/12/04 15:35:27 wiz Exp $
 
-BLAKE2s (xinit-1.4.1.tar.bz2) = 72c99fcf601489503689354da77a9ad648e3ca2b24da6ed596a9cd47f8986468
-SHA512 (xinit-1.4.1.tar.bz2) = 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340
-Size (xinit-1.4.1.tar.bz2) = 176206 bytes
+BLAKE2s (xinit-1.4.2.tar.xz) = 051aeec8d83c6df25a553752c5adfb543a3badba44fdc340ea44080538a83b49
+SHA512 (xinit-1.4.2.tar.xz) = 4b62c2edd97b40133577cbba88b3f31b36c5634b4eb667ef0c302e8358dc1c55a255abe42aaadc910d8aa9ea0e3add157a12a301382f1cdbe091df4e1215fae0
+Size (xinit-1.4.2.tar.xz) = 156728 bytes