From nobody Mon Jan 17 21:18:43 2022 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 05B4A1954130; Mon, 17 Jan 2022 21:18:46 +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 4Jd4X42DJJz3LMm; Mon, 17 Jan 2022 21:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642454325; 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=OcB2l6imSQEdhWDLOJy97sisw+pTR5uxAJtG67BbtPo=; b=rdJat5hUjWvAcRgdKiceF0qWKLX2sd5MZyXFYdmRBX20IwDc7x0+kaVqdfJmMTzIv5Q6aQ ftWs6XpGtYrBwUjp1D8LNr/bdX9XoqzlaS1oXoYRRlCf2ivVE7QCuKU9Ch/80Y+FtHCz6l NgpNP9a2rXluvm6s1E2Bqyi/pGCarKs1pU3DoQ9GVifeSStS6mo3MpQS0wN3GofrFKplD+ SYxFrNtIrtAlhl7xQwVd5TCToptRcGrZXig1NfPierlCOxcqa9bzttX3ms86Su1SNWK1Mf lmRpTcIk1V92QU5GuINC+Lv5smCgm6HRbYyrHoDR+myLpBDM51/x0TLGdCcsFA== 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 82C8315301; Mon, 17 Jan 2022 21:18:43 +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 20HLIh2V007707; Mon, 17 Jan 2022 21:18:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20HLIhSE007706; Mon, 17 Jan 2022 21:18:43 GMT (envelope-from git) Date: Mon, 17 Jan 2022 21:18:43 GMT Message-Id: <202201172118.20HLIhSE007706@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rainer Hurling Subject: git: d6a68d239233 - 2022Q1 - print/texlive-base: Fix pdfjam regex issue 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: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q1 X-Git-Reftype: branch X-Git-Commit: d6a68d239233231a7f0d5c8b40bf52d6610f342c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642454325; 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=OcB2l6imSQEdhWDLOJy97sisw+pTR5uxAJtG67BbtPo=; b=ACxb4BSPKVgWK0KdVLFgufgTxh/Ef6EODKtATxmG/W4Tj9lj83clQqzxBNhc+wabHngvWC PTdbvwB4KNuJ1pNL1biw4F5ylFsHtTHz/OoTwuAO0ANKbxADtpGWkWMQQmhQaR5QxuE9S9 XK8AdXoj+zk6xYVRXYU6u93RDiI6KwNl2OxDiCa+F3451BpVZK+RoHqZZ1BZf6asNBHB5C x97XgrkjmhQhjsAP/U0pzP0GjtJFoMHRbArsQmkLsaHYlPbqkxTQtSwUUpwwbwMRgOuMJf rz4qg/4pkVPi/+4ltFBOJTSMnWYJKsEHj7yLyz3VzcsZbGWQbq0lda0KLXW6ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642454325; a=rsa-sha256; cv=none; b=U10dF1NzRXO9cyA30Qw+NSSYJD7Y59KhHavYedwBKnKeUIBazG7ehbRV/2QwTkNQ8UzblG Uj1DxmpZ9+cbp4ShIZGfjlSGOuJxEwVhdwm+ezt9X7rdE9z8LhycWEoKePDNgEUZYmjHyd qeRBQZJnZ3OWNRowpBxIrHsMNeUi3JBZa3K90GeOL31qBj78lBuottqlKVPuVPW4Y3hb/m Uf7AtxqCk8WxQmTSK8PWf4u6pDygxu92IR37QcjrB0hcojinpEmpk/Rx8zmiHji7EmeU0C v41aGiORsr3TtBS3JfE8LxBArkp+UFjC3b9trSRiC8OT6onq7FxNtZR2vx6kDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=d6a68d239233231a7f0d5c8b40bf52d6610f342c commit d6a68d239233231a7f0d5c8b40bf52d6610f342c Author: Rainer Hurling AuthorDate: 2022-01-17 21:00:34 +0000 Commit: Rainer Hurling CommitDate: 2022-01-17 21:18:38 +0000 print/texlive-base: Fix pdfjam regex issue On FreeBSD >= 13.0 the pdfjam script throws an error: pdfjam "input.pdf" 1-20 -o output.pdf sed: 1: "/\\\usepackage{hyperref}/d": RE error: trailing backslash (\) sed: 1: "/\\\hypersetup.*/d": RE error: trailing backslash (\) sed: 1: "/\\\usepackage.*{geomet ...": RE error: trailing backslash (\) sed: 1: "/\\\usepackage.*{color}/d": RE error: trailing backslash (\) While here, pet portfmt. PR: 255232 Reported by: Gordon MFH: 2022Q1 Approved by: Hiroki Sato (maintainer timeout) (cherry picked from commit 56f9e4aaa7c55c7dae44e35c1f836ba10659dab5) --- print/texlive-base/Makefile | 8 ++++--- ...atch-texk_texlive_linked__scripts_pdfjam_pdfjam | 26 ++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile index 46a24ebd725f..72a3f9e5774b 100644 --- a/print/texlive-base/Makefile +++ b/print/texlive-base/Makefile @@ -1,6 +1,6 @@ PORTNAME= texlive PORTVERSION= 20150521 -PORTREVISION= 76 +PORTREVISION= 77 CATEGORIES= print MASTER_SITES= TEX_CTAN/systems/texlive/Source/ PKGNAMESUFFIX= -base @@ -66,8 +66,6 @@ SHEBANG_FILES= texk/texlive/linked_scripts/accfonts/mkt1font \ texk/texlive/linked_scripts/urlbst/urlbst \ texk/texlive/linked_scripts/yplan/yplan -BINARY_ALIAS= freetype-config=true - # during build phase gnu configure is run a lot GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-native-texlive-build \ @@ -104,8 +102,12 @@ CONFIGURE_ARGS+=--with-system-$L \ MAKE_ENV= CONFIG_SITE=${CONFIG_SITE} INSTALL_TARGET= install-strip + CONFLICTS_INSTALL= ps2eps texlive-texmf-201[234]* + +BINARY_ALIAS= freetype-config=true EXTRACT_AFTER_ARGS= ${EXCLUDE_FILES:S,^,--exclude ,} + INFO= dvipng tlbuild PLIST_SUB= INSTALL_DATA="${INSTALL_DATA}" diff --git a/print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam b/print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam new file mode 100644 index 000000000000..660f3f2daf4e --- /dev/null +++ b/print/texlive-base/files/patch-texk_texlive_linked__scripts_pdfjam_pdfjam @@ -0,0 +1,26 @@ +--- texk/texlive/linked_scripts/pdfjam/pdfjam.orig 2013-03-12 00:01:41 UTC ++++ texk/texlive/linked_scripts/pdfjam/pdfjam +@@ -1143,19 +1143,19 @@ EndTemplate + ) > $texFile + if test "$hyperref" = false; then ## we don't need hyperref + cp $texFile $tempFile +- sed '/\\\usepackage{hyperref}/d' $tempFile | \ +- sed '/\\\hypersetup.*/d' > "${texFile}" ++ sed '/\\usepackage{hyperref}/d' $tempFile | \ ++ sed '/\\hypersetup.*/d' > "${texFile}" + rm $tempFile + fi + if test -z "$geometry" ; then geometry=false ; fi + if test "$geometry" = false; then ## geometry package is not to be used + cp $texFile $tempFile +- cat $tempFile | sed '/\\\usepackage.*{geometry}/d' > $texFile ++ cat $tempFile | sed '/\\usepackage.*{geometry}/d' > $texFile + rm $tempFile + fi + if test -z "$pagecolor"; then ## color package is not needed + cp $texFile $tempFile +- cat $tempFile | sed '/\\\usepackage.*{color}/d' > $texFile ++ cat $tempFile | sed '/\\usepackage.*{color}/d' > $texFile + rm $tempFile + fi + ##