From owner-svn-ports-all@freebsd.org Sun Apr 29 21:51:54 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B2B62FBA71D; Sun, 29 Apr 2018 21:51:54 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 624047D0BB; Sun, 29 Apr 2018 21:51:54 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5CCF61F55; Sun, 29 Apr 2018 21:51:54 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3TLpswr029974; Sun, 29 Apr 2018 21:51:54 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3TLpsAY029971; Sun, 29 Apr 2018 21:51:54 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <201804292151.w3TLpsAY029971@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 29 Apr 2018 21:51:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r468661 - in head/x11/xinit: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/x11/xinit: . files X-SVN-Commit-Revision: 468661 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Apr 2018 21:51:54 -0000 Author: yuri Date: Sun Apr 29 21:51:53 2018 New Revision: 468661 URL: https://svnweb.freebsd.org/changeset/ports/468661 Log: x11/xinit: Update 1.3.4 -> 1.4.0 Also add LICENSE_FILE. PR: 227075 Submitted by: Dmitri Goutnik Approved by: maintainer's timeout (x11@FreeBSD.org; 31 days) Modified: head/x11/xinit/Makefile head/x11/xinit/distinfo head/x11/xinit/files/patch-startx.cpp Modified: head/x11/xinit/Makefile ============================================================================== --- head/x11/xinit/Makefile Sun Apr 29 21:44:16 2018 (r468660) +++ head/x11/xinit/Makefile Sun Apr 29 21:51:53 2018 (r468661) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xinit -PORTVERSION= 1.3.4 -PORTREVISION= 1 +PORTVERSION= 1.4.0 PORTEPOCH= 1 CATEGORIES= x11 @@ -10,6 +9,7 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X Window System initializer LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING XORG_CAT= app USE_XORG= x11 Modified: head/x11/xinit/distinfo ============================================================================== --- head/x11/xinit/distinfo Sun Apr 29 21:44:16 2018 (r468660) +++ head/x11/xinit/distinfo Sun Apr 29 21:51:53 2018 (r468661) @@ -1,2 +1,3 @@ -SHA256 (xorg/app/xinit-1.3.4.tar.bz2) = 75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3 -SIZE (xorg/app/xinit-1.3.4.tar.bz2) = 165881 +TIMESTAMP = 1522340675 +SHA256 (xorg/app/xinit-1.4.0.tar.bz2) = 230835eef2f5978a1e1344928168119373f6df1d0a32c09515e545721ee582ef +SIZE (xorg/app/xinit-1.4.0.tar.bz2) = 174491 Modified: head/x11/xinit/files/patch-startx.cpp ============================================================================== --- head/x11/xinit/files/patch-startx.cpp Sun Apr 29 21:44:16 2018 (r468660) +++ head/x11/xinit/files/patch-startx.cpp Sun Apr 29 21:51:53 2018 (r468661) @@ -4,42 +4,31 @@ # # generate displayname as dictated in the xauth manpage # ---- startx.cpp.orig 2014-09-11 17:31:42 UTC +--- startx.cpp.orig 2018-03-10 01:46:03 UTC +++ startx.cpp -@@ -154,7 +154,7 @@ while [ x"$1" != x ]; do +@@ -166,7 +166,7 @@ while [ x"$1" != x ]; do else XCOMM display must be the FIRST server argument if [ x"$serverargs" = x ] && @@ - expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then -+ expr \( "$1" \) : ':[0-9][0-9]*$' > /dev/null 2>&1; then ++ expr \( "$1" \) : ':[0-9][0-9]*$' > /dev/null 2>&1; then display="$1" else serverargs="$serverargs $1" -@@ -193,7 +193,7 @@ if [ x"$server" = x ]; then - XCOMM the startx session being seen as inactive: - XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491" - tty=$(tty) -- if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then -+ if expr "$tty" : '/dev/tty[0-9][0-9]*$' > /dev/null; then - tty_num=$(echo "$tty" | grep -oE '[0-9]+$') - vtarg="vt$tty_num" - fi -@@ -217,7 +217,7 @@ fi +@@ -229,7 +229,7 @@ fi XCOMM if no vt is specified add vtarg (which may be empty) have_vtarg="no" for i in $serverargs; do -- if expr match "$i" '^vt[0-9]\+$' > /dev/null; then +- if expr "$i" : 'vt[0-9][0-9]*$' > /dev/null; then + if expr \( "$i" \) : 'vt[0-9][0-9]*$' > /dev/null; then have_vtarg="yes" fi done -@@ -283,10 +283,10 @@ EOF - +@@ -296,9 +296,9 @@ EOF XCOMM now add the same credentials to the client authority file XCOMM if '$displayname' already exists do not overwrite it as another -- XCOMM server man need it. Add them to the '$xserverauthfile' instead. + XCOMM server may need it. Add them to the '$xserverauthfile' instead. - for displayname in $authdisplay $hostname$authdisplay; do -+ XCOMM server may need it. Add them to the '$xserverauthfile' instead. + for displayname in $authdisplay $hostname/unix$authdisplay; do authcookie=`XAUTH list "$displayname" @@ - | sed -n "s/.*$displayname[[:space:]*].*[[:space:]*]//p"` 2>/dev/null;