From nobody Tue Mar 21 17:19:18 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PgyyH04skz40Y5M; Tue, 21 Mar 2023 17:19:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PgyyG5fvhz3tSV; Tue, 21 Mar 2023 17:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679419158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8WnHoscKd/90m7H3ZfRUa/w1zgbU+qPiqso3Y6Rf/Q=; b=UKabLtSkl3s8f139ldlu+uYnNzyL7L+j3oFuXkEKpv0r6QXPmlm7fIpDFe4GYWvO9edkV0 VHs4ynC8/j2jxdvzdw+x6Mb1bY2GOBo6ki3tR29Uov6AhG7fxTBwIuvtmGB27a7GVjjmzn DNh8NGhZyUlrzHpsuTHvo8pdTU/v3B80KtYJPTJirLTn97eG+Y+NhajS2kRtxv15lUaLKr ZYW8mLq6VyWUdezSqOVp6/TQdNDHo2wS2qEBFjBjzTwlz2lJHzMBq0TEVR8CLNM3vAS5+6 W5LwLoGuszp66ViOsj3U3cIHFHKovlqFxbvPYgN4FeAjq7LJadjRF0YX2LD6kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679419158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=C8WnHoscKd/90m7H3ZfRUa/w1zgbU+qPiqso3Y6Rf/Q=; b=ed6DH8lre4jWm/jQSXh6WZAUYcjRpXzBkuZ6VInXC7KBWFAeoJtmh5otOB0YU3i3nF7bHW tpCqM0xRDZ/fRFxKlFPgP51ZBDFj55rOlVhIaTUtXa4y0+AR096CLQjHTsilGMvx7l+0gW iIvBtgj+q2qj4PJBx/1bTh+LPNCiiRjKLtGNkpUL6AZLUPynDyNfsJxxcrK2hmF5jv3wFk /tPWpUGJe0czuuM8CkTfmZLjg8geMeWktWUMifGL1a5E8y9Dn4QNuo+31orItWOzoFLE91 A2M56ABqhF6lEm88o1YivVtRCsAUJBTXqulVeAR6Oas5FHOOg2iQIpnSQVmY0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679419158; a=rsa-sha256; cv=none; b=maabJKGbd7o9pyEsZxlGm9NY0Sat+CvVhO1C1sz6TZ1MDaaCVgYTHM6f0WNIlBkmaKAXlg Nim2A0K2nojMF8irCBpK3lSuYdPlCZU8cgTsaWC+GSVUBnFw5KoSTrckKvE5ONCMEFDUMX c9Ksf8qnkGnf8kWmPWhR8XfswUOLSN1X0oox1r+bOmqvS+6Li3cME1Y/OoxUcayCfmnGTz f5Exfv3P8NXWV/BMC7QDSQ6Ag+ZOlpDzOw9i/9faQ2uat/YUChKagFLfvegv4pGUJM5d6j ONTtTsnN/tjLH3J4B/H2l2vZtA83ehXwIb1l+tqc1cE1B1CAa8MpevGnvxO+OQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PgyyG4T6QzLLc; Tue, 21 Mar 2023 17:19:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32LHJISj007630; Tue, 21 Mar 2023 17:19:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LHJISn007629; Tue, 21 Mar 2023 17:19:18 GMT (envelope-from git) Date: Tue, 21 Mar 2023 17:19:18 GMT Message-Id: <202303211719.32LHJISn007629@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: e65518f713e1 - main - print/texlive-base: latexmk -- fix command line passed to ps List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e65518f713e111fcb8ae9ecb43b7006a1776d2cf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=e65518f713e111fcb8ae9ecb43b7006a1776d2cf commit e65518f713e111fcb8ae9ecb43b7006a1776d2cf Author: Tobias C. Berner AuthorDate: 2023-03-20 14:49:30 +0000 Commit: Tobias C. Berner CommitDate: 2023-03-21 17:16:54 +0000 print/texlive-base: latexmk -- fix command line passed to ps Linux ps supports -u userlist Select by effective user ID (EUID) or name. This selects the processes whose effective user name or ID is in userlist. whereas FreeBSD ps uses -U Display the processes belonging to the specified usernames. This fixes the error message seen when running latexmk: > latexmk foo.tex [...] ps: illegal argument: Tobias usage: ps [-aCcdefHhjlmrSTuvwXxZ] [-O fmt | -o fmt] [-G gid[,gid...]] [-J jid[,jid...]] [-M core] [-N system] [-p pid[,pid...]] [-t tty[,tty...]] [-U user[,user...]] ps [-L] [...] --- print/texlive-base/Makefile | 2 +- ...texk_texlive_linked__scripts_latexmk_latexmk.pl | 41 ++++++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile index 5b59023d575f..c58292d67f7e 100644 --- a/print/texlive-base/Makefile +++ b/print/texlive-base/Makefile @@ -1,6 +1,6 @@ PORTNAME= texlive PORTVERSION= ${TEXLIVE_VERSION} -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/${TEXLIVE_YEAR} PKGNAMESUFFIX= -base diff --git a/print/texlive-base/files/patch-texk_texlive_linked__scripts_latexmk_latexmk.pl b/print/texlive-base/files/patch-texk_texlive_linked__scripts_latexmk_latexmk.pl new file mode 100644 index 000000000000..c850adce6115 --- /dev/null +++ b/print/texlive-base/files/patch-texk_texlive_linked__scripts_latexmk_latexmk.pl @@ -0,0 +1,41 @@ +--- texk/texlive/linked_scripts/latexmk/latexmk.pl.orig 2023-03-20 14:47:33 UTC ++++ texk/texlive/linked_scripts/latexmk/latexmk.pl +@@ -1107,17 +1107,17 @@ else { + # + # The following works on Solaris, LINUX, HP-UX, IRIX + # Use -f to get full listing, including command line arguments. +- # Use -u $ENV{USER} to get all processes started by current user (not just ++ # Use -U $ENV{USER} to get all processes started by current user (not just + # those associated with current terminal), but none of other users' + # processes. + # However, the USER environment variable may not exist. Windows uses + # USERNAME instead. (And this propagates to a situation of + # unix-emulation software running under Windows.) + if ( exists $ENV{USER} ) { +- $pscmd = "ps -f -u $ENV{USER}"; ++ $pscmd = "ps -f -U $ENV{USER}"; + } + elsif ( exists $ENV{USERNAME} ) { +- $pscmd = "ps -f -u $ENV{USERNAME}"; ++ $pscmd = "ps -f -U $ENV{USERNAME}"; + } + else { + $pscmd = "ps -f"; +@@ -1134,7 +1134,7 @@ else { + # But (19 Aug 2010), the truncation doesn't happen on RHEL4 and 5, + # unless the output is written to a terminal. So the --width + # option is now unnecessary +- # $pscmd = "ps --width 200 -f -u $ENV{USER}"; ++ # $pscmd = "ps --width 200 -f -U $ENV{USER}"; + } + elsif ( $^O eq "darwin" ) { + # OS-X on Macintosh +@@ -1155,7 +1155,7 @@ else { + $ps_previewer = $ps_previewer_landscape = 'NONE'; + # Others + $lpr_pdf = 'lpr %O %S'; +- $pscmd = "ps -ww -u $ENV{USER}"; ++ $pscmd = "ps -ww -U $ENV{USER}"; + } + } +