Date: Mon, 17 Jan 2022 21:06:59 GMT From: Rainer Hurling <rhurlin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 56f9e4aaa7c5 - main - print/texlive-base: Fix pdfjam regex issue Message-ID: <202201172106.20HL6x7Q093307@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=56f9e4aaa7c55c7dae44e35c1f836ba10659dab5 commit 56f9e4aaa7c55c7dae44e35c1f836ba10659dab5 Author: Rainer Hurling <rhurlin@FreeBSD.org> AuthorDate: 2022-01-17 21:00:34 +0000 Commit: Rainer Hurling <rhurlin@FreeBSD.org> CommitDate: 2022-01-17 21:05:23 +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 <gordon.friedman@hotmail.com> MFH: 2022Q1 Approved by: Hiroki Sato <hrs@FreeBSD.org> (maintainer timeout) --- print/texlive-base/Makefile | 7 +++--- ...atch-texk_texlive_linked__scripts_pdfjam_pdfjam | 26 ++++++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile index 1b91353c5116..2942ce15d023 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 \ @@ -105,7 +103,10 @@ MAKE_ENV= CONFIG_SITE=${CONFIG_SITE} INSTALL_TARGET= install-strip CONFLICTS_INSTALL= detex dvi2tty ps2eps texlive-texmf + +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 + ##
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201172106.20HL6x7Q093307>