From nobody Fri May 31 20:55:19 2024 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 4Vrb3r1dzXz5LMPw; Fri, 31 May 2024 20:55:20 +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 4Vrb3r16hkz4XcK; Fri, 31 May 2024 20:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717188920; 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=Pr1xVvef3wZdnTIcPAWIVEaigk5X1y6t2v5izHobAc8=; b=yjJOn+D3CKDBVfpctoeQpK1jkj/GrNy8ziJBtswm3YnYmSyLnJa+lZUnok214nlnJc8QPT 0NTgQ10hQCkpCosezt7HZnqyKRKX3wVcbuBZER0K9EKAGJcBLnNiLtuJjiKeYTjctUKWoD 7Ao1udM6sm0wPx3JvraAswJ0ZDAvS8GZ97Gwf16p+wJ2+bOv3eOmv9/C3INfn3VBehPyBq FVP9a0KV+MVfNzHNR1gX2PZlehL4EgwRa3iNFUYXilQIbM45KsXE7N2zrnjuOP9jA+b89/ rDCnqL8B3tgVumfA5Oo4jSmDJzZrdQpkxiKVLsy9fzOY3VUxnxOVaOjEnIx6kg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1717188920; a=rsa-sha256; cv=none; b=dxlXHcLOPgaC3qZBLhb1AYcl1io8eEsmtZb3tnk/MbisRiDu+C6KsyyHHnfzfjMF9mQt1T R06zFvp9HjNprodeIGC7lslVyW0n3UnxGR1h+9kHXeskx9Yds5/CyP3n8wZcCYjy5rXkhL kiJNFRDLKxpJ78JNKoCLKGBX20itDoRkaVmALVuR8mq6ac+FeGVBWPBXKyt6/3zOiJjgCg qhsJ+pT8fUxhB+49EpRoI+mICKrVznJXfp5uCAp65UENBORcVvx+s/cm+2UCLeik3F3KU8 1wEbrv+ryBmy17HK7iAoWS4ivUQENlQXhTZ2P0caeu8Z+OmrTH1gTYB+EXsFWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1717188920; 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=Pr1xVvef3wZdnTIcPAWIVEaigk5X1y6t2v5izHobAc8=; b=jNFJd69qepwhCsf6vbWGYKFW2FPN6fwnhd07BdU27drarjPgBmC0Dfx3KJ5UekJzbamY5W IYJP58TEibWIkCzU20HTj1cVQhwFgj7urZ+iqDfESUDNt2ItI+3znSEyUHWvwhxwiLh5rp SLPfFkt96YqfpFWJnzEFO1JiG8cbgr90S4E5fc7cwReYubR3BWNCYvOggom4Trkz9307tN W/vSNK75SbFZTXqpxK6pe0iDgddQnRXcy2857nkFDzNOl7zpvQhnF7mw2Snd0EiIMGKPyb Ss7WIHeRUu0yN3J/Qz5sx+FU3CUbQ/uzQ9iIhrt91VZ1RVwKL4OzCGfqoqOw1g== 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 4Vrb3r0bT8zfQS; Fri, 31 May 2024 20:55:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44VKtJha002836; Fri, 31 May 2024 20:55:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44VKtJcF002833; Fri, 31 May 2024 20:55:19 GMT (envelope-from git) Date: Fri, 31 May 2024 20:55:19 GMT Message-Id: <202405312055.44VKtJcF002833@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: fac24aae03e0 - main - */tex*: Fix poudriere qa 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fac24aae03e04c15d50bbb02d4ebc230dc1ff859 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=fac24aae03e04c15d50bbb02d4ebc230dc1ff859 commit fac24aae03e04c15d50bbb02d4ebc230dc1ff859 Author: Muhammad Moinur Rahman AuthorDate: 2024-05-31 20:54:17 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-05-31 20:55:11 +0000 */tex*: Fix poudriere qa During my last commit on tex* somehow I built the ports without -t causing poudriere to skip some qa check. These are fixed in this commit. Reported by: jhale Sponsored by: Nepustil --- devel/tex-synctex/files/patch-Makefile.in | 17 +++-- devel/tex-synctex/files/patch-man_Makefile.in | 6 +- devel/tex-web2c/pkg-plist | 4 ++ japanese/tex-ptex/Makefile | 20 ++---- japanese/tex-ptex/files/patch-Makefile.in | 9 +++ print/tex-basic-engines/files/patch-Makefile.in | 9 +++ print/tex-luatex/Makefile | 7 +- print/tex-luatex/files/patch-Makefile.in | 34 ++++++++- print/tex-ptexenc/pkg-plist | 2 + print/tex-xetex/files/patch-Makefile.in | 11 ++- print/texlive-base/Makefile | 9 ++- .../patch-texk_texlive_linked__scripts_Makefile.in | 65 ++++++++++++++--- print/texlive-docs/Makefile | 82 +++------------------- print/texlive-texmf/Makefile | 28 ++++---- 14 files changed, 175 insertions(+), 128 deletions(-) diff --git a/devel/tex-synctex/files/patch-Makefile.in b/devel/tex-synctex/files/patch-Makefile.in index 76462cf87b25..e97da37b1fe0 100644 --- a/devel/tex-synctex/files/patch-Makefile.in +++ b/devel/tex-synctex/files/patch-Makefile.in @@ -1,4 +1,4 @@ ---- Makefile.in.orig 2024-05-11 23:58:42 UTC +--- Makefile.in.orig 2024-05-31 12:03:03 UTC +++ Makefile.in @@ -102,9 +102,7 @@ EXTRA_PROGRAMS = $(am__EXEEXT_1) tex$(EXEEXT) mf$(EXEE luajittex$(EXEEXT) luahbtex$(EXEEXT) luajithbtex$(EXEEXT) \ @@ -35,6 +35,15 @@ $(am__append_49) $(am__append_54) $(am__append_67) \ - upbibtex$(EXEEXT):pbibtex updvitype$(EXEEXT):pdvitype \ - uppltotf$(EXEEXT):ppltotf uptftopl$(EXEEXT):ptftopl \ - $(am__append_78) $(am__append_79) $(am__append_80) \ - $(am__append_94) $(am__append_99) $(am__append_104) \ - $(am__append_109) + $(am__append_78) $(am__append_79) $(am__append_80) \ + $(am__append_94) $(am__append_99) $(am__append_104) \ + $(am__append_109) +@@ -3833,7 +3829,7 @@ nodist_twill_SOURCES = twill.c twill.h + nodist_vptovf_SOURCES = vptovf.c vptovf.h + nodist_weave_SOURCES = weave.c weave.h + nodist_twill_SOURCES = twill.c twill.h +-dist_bin_SCRIPTS = cwebdir/ctwill-proofsort cwebdir/twill-refsort ++dist_bin_SCRIPTS = + nodist_ctie_SOURCES = ctie.c + nodist_cweave_SOURCES = cweave.c cweb.c + nodist_ctwill_SOURCES = ctwill.c cweb.c diff --git a/devel/tex-synctex/files/patch-man_Makefile.in b/devel/tex-synctex/files/patch-man_Makefile.in index 1650d55a5f10..902099525a2f 100644 --- a/devel/tex-synctex/files/patch-man_Makefile.in +++ b/devel/tex-synctex/files/patch-man_Makefile.in @@ -1,4 +1,4 @@ ---- man/Makefile.in.orig 2024-05-12 00:07:34 UTC +--- man/Makefile.in.orig 2024-05-31 12:03:03 UTC +++ man/Makefile.in @@ -173,11 +173,11 @@ am__v_GEN_0 = @echo " GEN " $@; AM_V_GEN = $(am__v_GEN_@AM_V@) @@ -25,8 +25,8 @@ -man1_links = cweb:ctangle cweb:cweave ctwill:ctwill-proofsort \ - ctwill:ctwill-refsort ctwill:ctwill-twinx $(am__append_2) \ +man1_links = $(am__append_2) \ - $(am__append_4) $(am__append_6) $(am__append_7) \ - $(am__append_11) $(am__append_13) $(am__append_15) \ + $(am__append_4) $(am__append_6) $(am__append_7) \ + $(am__append_11) $(am__append_13) $(am__append_15) \ - $(am__append_18) latex-dev:pdflatex-dev latex-dev:xelatex-dev \ - latex-dev:lualatex-dev latex-dev:dvilualatex-dev \ - latex-dev:platex-dev latex-dev:uplatex-dev diff --git a/devel/tex-web2c/pkg-plist b/devel/tex-web2c/pkg-plist index d1ea66e3f3be..1be9a606afc8 100644 --- a/devel/tex-web2c/pkg-plist +++ b/devel/tex-web2c/pkg-plist @@ -2,6 +2,7 @@ bin/bibtex bin/ctangle bin/ctie bin/ctwill +bin/ctwill-proofsort bin/ctwill-refsort bin/ctwill-twinx bin/cweave @@ -35,6 +36,7 @@ bin/tangle bin/tftopl bin/tie bin/twill +bin/twill-refsort bin/updvitomp bin/upmpost bin/vftovp @@ -43,6 +45,7 @@ bin/weave share/man/man1/bibtex.1.gz share/man/man1/ctangle.1.gz share/man/man1/ctie.1.gz +share/man/man1/ctwill-proofsort.1.gz share/man/man1/ctwill-refsort.1.gz share/man/man1/ctwill-twinx.1.gz share/man/man1/ctwill.1.gz @@ -72,6 +75,7 @@ share/man/man1/tangle.1.gz share/man/man1/tftopl.1.gz share/man/man1/tie.1.gz share/man/man1/twill.1.gz +share/man/man1/twill-refsort.1.gz share/man/man1/uplatex-dev.1.gz share/man/man1/vftovp.1.gz share/man/man1/vptovf.1.gz diff --git a/japanese/tex-ptex/Makefile b/japanese/tex-ptex/Makefile index ae03b0325bac..184fd3216dfa 100644 --- a/japanese/tex-ptex/Makefile +++ b/japanese/tex-ptex/Makefile @@ -52,6 +52,9 @@ pre-install: ${TAR} -Jxf ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf-japanese_tex-ptex-freebsd${EXTRACT_SUFX} \ -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner + ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \ + ${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/umkcidvf.pl \ + ${STAGEDIR}${PREFIX}/share/texmf-dist/source/fonts/japanese-otf/script/umkcidtfm.pl post-install: ${FIND} -s ${STAGEDIR}${PREFIX}/share -not -type d | ${SORT} | \ @@ -80,23 +83,12 @@ _maintainer-extract: @${FIND} ${WRKDIR} -name '*.orig' -delete _maintainer-patch: _maintainer-extract - ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \ - ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/mkjvf \ - ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkcidvf.pl \ - ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkjp04tfmvf.pl \ - ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkmlcidvf.pl \ - ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mktfm.pl \ - ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mktfm_sp.pl \ - ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkutf32list.pl \ - ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkutfvf.pl \ - ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/mkutfvf_sp.pl \ - ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/umkvpkana.pl \ - ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/script/umkpkana.pl \ - ${WRKDIR}/${_EXTRACT_TARGETDIR}/texmf-dist/source/fonts/japanese-otf/umkjvf + ${FIND} ${WRKSRC} -type f | \ + ${XARGS} ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' _maintainer-dist: _maintainer-patch ${TAR} --options xz:compression-level=9 -Jcvf \ - ${WRKDIR}/${_EXTRACT_TARGETDIR}${EXTRACT_SUFX} \ + ${WRKDIR}/${_EXTRACT_TARGETDIR}${EXTRACT_SUFX}1 \ -C ${WRKDIR} ${_EXTRACT_TARGETDIR} scp ${WRKDIR}/${_EXTRACT_TARGETDIR}${EXTRACT_SUFX} \ bofh@freefall.freebsd.org://home/tex/public_distfiles/ diff --git a/japanese/tex-ptex/files/patch-Makefile.in b/japanese/tex-ptex/files/patch-Makefile.in index 59be79cc2291..1cfc9430280f 100644 --- a/japanese/tex-ptex/files/patch-Makefile.in +++ b/japanese/tex-ptex/files/patch-Makefile.in @@ -55,6 +55,15 @@ install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \ $(am__append_39) $(am__append_47) $(am__append_52) \ $(am__append_92) $(am__append_97) $(am__append_102) \ +@@ -3833,7 +3816,7 @@ nodist_twill_SOURCES = twill.c twill.h + nodist_vptovf_SOURCES = vptovf.c vptovf.h + nodist_weave_SOURCES = weave.c weave.h + nodist_twill_SOURCES = twill.c twill.h +-dist_bin_SCRIPTS = cwebdir/ctwill-proofsort cwebdir/twill-refsort ++dist_bin_SCRIPTS = + nodist_ctie_SOURCES = ctie.c + nodist_cweave_SOURCES = cweave.c cweb.c + nodist_ctwill_SOURCES = ctwill.c cweb.c @@ -4622,8 +4605,7 @@ euptex_tests = \ # At the moment, these are the only man pages handled in the # conglomerated web2c/Makefile[.am]. (All the others are in man/.) diff --git a/print/tex-basic-engines/files/patch-Makefile.in b/print/tex-basic-engines/files/patch-Makefile.in index cf32d8eeeca3..1afcd215ea82 100644 --- a/print/tex-basic-engines/files/patch-Makefile.in +++ b/print/tex-basic-engines/files/patch-Makefile.in @@ -38,3 +38,12 @@ $(am__append_78) $(am__append_79) $(am__append_80) \ $(am__append_94) $(am__append_99) $(am__append_104) \ $(am__append_109) +@@ -3833,7 +3829,7 @@ nodist_twill_SOURCES = twill.c twill.h + nodist_vptovf_SOURCES = vptovf.c vptovf.h + nodist_weave_SOURCES = weave.c weave.h + nodist_twill_SOURCES = twill.c twill.h +-dist_bin_SCRIPTS = cwebdir/ctwill-proofsort cwebdir/twill-refsort ++dist_bin_SCRIPTS = + nodist_ctie_SOURCES = ctie.c + nodist_cweave_SOURCES = cweave.c cweb.c + nodist_ctwill_SOURCES = ctwill.c cweb.c diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile index 287fe6391ded..721205133504 100644 --- a/print/tex-luatex/Makefile +++ b/print/tex-luatex/Makefile @@ -21,7 +21,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libTECkit.so:textproc/teckit \ libzzip.so:devel/zziplib -USES= gnome libtool localbase pkgconfig tar:xz tex xorg +USES= gnome libtool localbase pkgconfig python:env tar:xz tex xorg USE_GNOME= cairo USE_LDCONFIG= yes USE_TEX= fmtutil formats kpathsea texlua texluajit web2c @@ -89,7 +89,10 @@ pre-install: ${CAT} ${DISTDIR}/${DIST_SUBDIR}/texlive-${TEXLIVE_VERSION}-texmf${EXTRACT_SUFX} \ ${EXTRACT_AFTER_ARGS_TEXMF} ${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|' \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/lualatex/wallcalendar/doc/examples/diff-cal.sh + ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/lualatex/wallcalendar/doc/examples/diff-cal.sh \ + ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/luatex/opbible/examples/make-all + ${REINPLACE_CMD} -i '' -e 's|/usr/bin/python3|${PYTHON_CMD}|' \ + ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/luatex/opbible/txs-gen/maketxs.py post-install: ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \ diff --git a/print/tex-luatex/files/patch-Makefile.in b/print/tex-luatex/files/patch-Makefile.in index 8b32438e6f29..2e96447ff4d1 100644 --- a/print/tex-luatex/files/patch-Makefile.in +++ b/print/tex-luatex/files/patch-Makefile.in @@ -62,10 +62,19 @@ proglib = lib/lib.a #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a +@@ -3146,7 +3138,7 @@ lib_LTLIBRARIES = $(am__append_127) + EXTRA_LTLIBRARIES = libsynctex.la + lib_LIBRARIES = $(am__append_128) + lib_LTLIBRARIES = $(am__append_127) +-dist_man_MANS = synctexdir/man1/synctex.1 synctexdir/man5/synctex.5 ++dist_man_MANS = + nodist_man_MANS = + TEST_EXTENSIONS = .pl .test + # @@ -3652,14 +3644,7 @@ TRIPTRAP = $(am__append_7) $(am__append_17) $(am__appe $(am__append_35) $(am__append_43) $(am__append_59) \ $(am__append_63) $(am__append_69) $(am__append_74) \ - $(am__append_82) + $(am__append_82) -bin_links = $(am__append_5) $(am__append_14) $(am__append_15) \ - $(am__append_24) $(am__append_33) $(am__append_41) \ - $(am__append_49) $(am__append_54) $(am__append_67) \ @@ -77,8 +86,27 @@ +bin_links = $(am__append_75) $(am__append_81) install_exe_links = $(am__append_12) $(am__append_22) $(am__append_31) \ $(am__append_39) $(am__append_47) $(am__append_52) \ - $(am__append_92) $(am__append_97) $(am__append_102) \ -@@ -21452,9 +21437,6 @@ $(proglib): $(proglib_sources) + $(am__append_92) $(am__append_97) $(am__append_102) \ +@@ -3833,7 +3818,7 @@ nodist_twill_SOURCES = twill.c twill.h + nodist_vptovf_SOURCES = vptovf.c vptovf.h + nodist_weave_SOURCES = weave.c weave.h + nodist_twill_SOURCES = twill.c twill.h +-dist_bin_SCRIPTS = cwebdir/ctwill-proofsort cwebdir/twill-refsort ++dist_bin_SCRIPTS = + nodist_ctie_SOURCES = ctie.c + nodist_cweave_SOURCES = cweave.c cweb.c + nodist_ctwill_SOURCES = ctwill.c cweb.c +@@ -4622,8 +4607,7 @@ euptex_tests = \ + # At the moment, these are the only man pages handled in the + # conglomerated web2c/Makefile[.am]. (All the others are in man/.) + # If that changes, have to set at top level and use +=. +-@HITEX_TRUE@man1_MANS = hitexdir/man/hishrink.man hitexdir/man/histretch.man \ +-@HITEX_TRUE@ hitexdir/man/hitex.man ++@HITEX_TRUE@man1_MANS = + + hitex_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_INCLUDES) -I$(srcdir)/libmd5 \ + -DINIT -DSTAT -DWEB2CVERSION="\"${WEB2CVERSION}\"" +@@ -21452,9 +21436,6 @@ $(proglib): $(proglib_sources) @KPATHSEA_RULE@ @PTEXENC_RULE@ @ZLIB_RULE@ diff --git a/print/tex-ptexenc/pkg-plist b/print/tex-ptexenc/pkg-plist index a3ac9c367d35..f71aa1d50fa1 100644 --- a/print/tex-ptexenc/pkg-plist +++ b/print/tex-ptexenc/pkg-plist @@ -1,3 +1,4 @@ +bin/ptekf include/ptexenc/ptexenc.h include/ptexenc/unicode-jp.h include/ptexenc/unicode.h @@ -6,3 +7,4 @@ lib/libptexenc.so lib/libptexenc.so.1 lib/libptexenc.so.%%VERSION%% libdata/pkgconfig/ptexenc.pc +share/man/man1/ptekf.1.gz diff --git a/print/tex-xetex/files/patch-Makefile.in b/print/tex-xetex/files/patch-Makefile.in index 81f59109b014..17b60c21c972 100644 --- a/print/tex-xetex/files/patch-Makefile.in +++ b/print/tex-xetex/files/patch-Makefile.in @@ -39,6 +39,15 @@ proglib = lib/lib.a #EXTRA_LIBRARIES += libluasocket.a liblua53socket.a libluajitsocket.a +@@ -3833,7 +3823,7 @@ nodist_twill_SOURCES = twill.c twill.h + nodist_vptovf_SOURCES = vptovf.c vptovf.h + nodist_weave_SOURCES = weave.c weave.h + nodist_twill_SOURCES = twill.c twill.h +-dist_bin_SCRIPTS = cwebdir/ctwill-proofsort cwebdir/twill-refsort ++dist_bin_SCRIPTS = + nodist_ctie_SOURCES = ctie.c + nodist_cweave_SOURCES = cweave.c cweb.c + nodist_ctwill_SOURCES = ctwill.c cweb.c @@ -19689,7 +19679,7 @@ install-am: all-am uninstall: uninstall-recursive @@ -50,7 +59,7 @@ install-strip: @@ -20621,7 +20611,6 @@ install-exec-am: install-binPROGRAMS install-dist_binS install-exec-am: install-binPROGRAMS install-dist_binSCRIPTS \ - install-libLIBRARIES install-libLTLIBRARIES + install-libLIBRARIES install-libLTLIBRARIES @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-exec-hook install-html: install-html-recursive diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile index 3f4e36f8e886..6c79fbe7e1dd 100644 --- a/print/texlive-base/Makefile +++ b/print/texlive-base/Makefile @@ -133,7 +133,12 @@ EXCLUDE_FILES= ${DISTNAME}/texk/web2c \ ${DISTNAME}/texk/dvipdfm-x \ ${DISTNAME}/texk/dvipsk \ ${DISTNAME}/utils/t1utils \ - ${DISTNAME}/utils/xpdfopen + ${DISTNAME}/utils/xpdfopen \ + ${DISTNAME}/texk/texlive/linked_scripts/eolang/eolang.pl \ + ${DISTNAME}/texk/texlive/linked_scripts/memoize/memoize-clean.pl \ + ${DISTNAME}/texk/texlive/linked_scripts/memoize/memoize-clean.py \ + ${DISTNAME}/texk/texlive/linked_scripts/memoize/memoize-extract.py \ + ${DISTNAME}/texk/texlive/linked_scripts/runtexshebang/runtexshebang.lua post-extract: @${FIND} ${WRKSRC} -name '*.orig' -delete @@ -147,8 +152,6 @@ post-patch: ${WRKSRC}/texk/texlive/linked_scripts/texlive/fmtutil-sys.sh ${REINPLACE_CMD} -e 's|exec updmap|exec ${PREFIX}/bin/updmap|' \ ${WRKSRC}/texk/texlive/linked_scripts/texlive/updmap-sys.sh - ${REINPLACE_CMD} -e '/tlmgr/d' \ - ${WRKSRC}/texk/texlive/linked_scripts/Makefile.in post-install-fmtutil: for D in ${TEXHASHDIRS}; do \ diff --git a/print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in b/print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in index d107819d3406..a0c617fc5ba6 100644 --- a/print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in +++ b/print/texlive-base/files/patch-texk_texlive_linked__scripts_Makefile.in @@ -9,15 +9,64 @@ texlive-extra/ps2frag.sh \ texlive-extra/pslatex.sh \ texlive-extra/rubibtex.sh \ -@@ -459,7 +457,6 @@ texmf_other_scripts = \ - texlive/mktexpk \ - texlive/mktextfm \ - texlive/rungs.lua \ +@@ -329,7 +327,6 @@ texmf_other_scripts = \ + bib2gls/bib2gls.sh \ + bib2gls/convertgls2bib.sh \ + bibcop/bibcop.pl \ +- bibtexperllibs/ltx2unitxt \ + bundledoc/arlatex \ + bundledoc/bundledoc \ + cachepic/cachepic.tlu \ +@@ -356,9 +353,7 @@ texmf_other_scripts = \ + dosepsbin/dosepsbin.pl \ + dviasm/dviasm.py \ + dviinfox/dviinfox.pl \ +- easydtx/edtx2dtx.pl \ + ebong/ebong.py \ +- eolang/eolang.pl \ + epspdf/epspdf.tlu \ + epspdf/epspdftk.tcl \ + epstopdf/epstopdf.pl \ +@@ -402,10 +397,6 @@ texmf_other_scripts = \ + make4ht/make4ht \ + match_parens/match_parens \ + mathspic/mathspic.pl \ +- memoize/memoize-clean.pl \ +- memoize/memoize-clean.py \ +- memoize/memoize-extract.pl \ +- memoize/memoize-extract.py \ + mf2pt1/mf2pt1.pl \ + mkgrkindex/mkgrkindex \ + mkjobtexmf/mkjobtexmf.pl \ +@@ -436,19 +427,16 @@ texmf_other_scripts = \ + pythontex/depythontex.py \ + pythontex/pythontex.py \ + rubik/rubikrotation.pl \ +- runtexshebang/runtexshebang.lua \ + spix/spix.py \ + splitindex/splitindex.pl \ + srcredact/srcredact.pl \ + sty2dtx/sty2dtx.pl \ + svn-multi/svn-multi.pl \ + tex4ebook/tex4ebook \ +- texblend/texblend \ + texcount/texcount.pl \ + texdef/texdef.pl \ + texdiff/texdiff \ + texdirflatten/texdirflatten \ +- texfindpkg/texfindpkg.lua \ + texdoc/texdoc.tlu \ + texfot/texfot.pl \ + texlive/fmtutil-sys.sh \ +@@ -459,7 +447,6 @@ texmf_other_scripts = \ + texlive/mktexpk \ + texlive/mktextfm \ + texlive/rungs.lua \ - texlive/tlmgr.pl \ - texlive/updmap-sys.sh \ - texlive/updmap-user.sh \ - texlive/updmap.pl \ -@@ -489,8 +486,6 @@ bin_links = \ + texlive/updmap-sys.sh \ + texlive/updmap-user.sh \ + texlive/updmap.pl \ +@@ -489,8 +476,6 @@ bin_links = \ cluttex:cllualatex \ epstopdf:repstopdf \ fmtutil:mktexfmt \ diff --git a/print/texlive-docs/Makefile b/print/texlive-docs/Makefile index f02cab4662f4..eb924ecf0a2b 100644 --- a/print/texlive-docs/Makefile +++ b/print/texlive-docs/Makefile @@ -10,7 +10,7 @@ MAINTAINER= tex@FreeBSD.org COMMENT= TeX Live Typesetting System, documentation WWW= https://tug.org/texlive/ -USES= perl5 tar:xz tex +USES= perl5 python:env tar:xz tex EXTRACT_AFTER_ARGS= | ${TAR} xf - \ ${EXCLUDE_FILES:S,^,--exclude ${DISTNAME}/,} @@ -36,79 +36,13 @@ do-install: ${EXTRACT_AFTER_ARGS} -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner \ ${DISTNAME}/texmf-dist/doc - ${REINPLACE_CMD} -i '' -e 's|/usr/bin/fontforge|${PREFIX}/bin/fontforge|g' \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/aesupp/genfonts.pe \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/berenisadf/ff-ybd.pe \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/report/kernclasses.py \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/metafont/bulk_eps_import.py - ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl -w|${PERL}|g' \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/aesupp/ggen.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/abs2rel.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html1.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html2.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html3.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/txt2qq.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ucs/makeunidef.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/ctan-o-mat/lib/md2ltx.pl - ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl -T|${PERL}|g' \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ucs/discovermacro.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ucs/latexout.pl - ${REINPLACE_CMD} -i '' -e 's|/usr/bin/perl|${PERL}|g' \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/dad/dad-to-utf8.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/dad/utf8-to-dad.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/KerningNumerals.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/mes-list-expand.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/MES-Conformance/CheckConformance.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/phaistos/getglyphs \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/generic/pst-mirror/createEPS/scripts/filtre.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/gridslides/compile.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/latex-web-companion/ch7/sgmlspl.pl \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ucs/unsupported/u2ps \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/gustprog/porzadki.pl - ${REINPLACE_CMD} -i '' -E -e '1s|/usr/bin/env python[23]?|${python_CMD}|' \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/utility/hex_range.py \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/xcharter/altone.py \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/aramaic-serto/serto.py \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/scanpages/replicate.py \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/songproj/song2tex.py - ${REINPLACE_CMD} -i '' -e 's|/usr/bin/python|${PYTHO_CMD}|g' \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/unicode_joining.py \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/arabic_test.py \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/gnu-freefont/tools/test/ranges/Arabic/generate_arabic_shaping.py - ${REINPLACE_CMD} -i '' -e 's|/usr/bin/texlua|${PREFIX}/bin/texlua|g' \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/generic/m-tx/buildmtxdoc.lua - ${REINPLACE_CMD} -i '' -e 's|/bin/bash|${PREFIX}/bin/bash|g' \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/cstex/cspsfonts-gen/mkfc \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/cstex/cspsfonts-gen/mkf \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/fonts/drm/allfonts.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/generic/e-french/bin/linux/makefrindex \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/bardiag/example/compile.all \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/beamerappendixnote/build.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/biblatex-abnt/test.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/biblatex-software/mkbiblatexstubs.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/chinesechess/build.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/circledtext/build.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/codebox/build.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/ctable/inst \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/gamebooklib/gamebooklib_countpagesperseed.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hepnames/mkmacrotables \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hvfloat/runAll.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/hvfloat/runEXA.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pascaltriangle/build.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pdfreview/pdfreview.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/pdfreview/pdfshrink.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/seminar/run.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shdoc/shreformat.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/shipunov/scripts/biokey2html.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/termsim/build.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/tlc-article/bin/deploy \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/latex/uspace/uspace-ctanify.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/COMPILE.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/laproof.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/metapost/featpost/bash/makehtmlindex.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/plain/transparent-io/TrIO.org \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/chklref/release.sh \ - ${STAGEDIR}${PREFIX}/share/texmf-dist/doc/support/latexdiff/contrib/latexdiff-wrap + ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type f | \ + ${XARGS} ${REINPLACE_CMD} -i '' -E -e \ + 's|/usr/bin/fontforge|${PREFIX}/bin/fontforge|g; \ + s|/bin/bash|${PREFIX}/bin/bash|g; \ + s|/usr/bin/perl|${PERL}|g; \ + s|/usr/bin/texlua|${PREFIX}/bin/texlua|g; \ + s|/usr/bin/[env |python3?]+[python3?]?|${PYTHON_CMD}|' ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \ diff --git a/print/texlive-texmf/Makefile b/print/texlive-texmf/Makefile index 01e9be77278e..7a2a3c44c9b1 100644 --- a/print/texlive-texmf/Makefile +++ b/print/texlive-texmf/Makefile @@ -28,6 +28,10 @@ do-install: ${TAR} -Jxf ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} \ -C ${STAGEDIR}${PREFIX}/share \ --strip-components 1 --no-same-permission --no-same-owner + @${REINPLACE_CMD} -i '' -E -e '1s|/bin/python3|${python_CMD}|' \ + ${STAGEDIR}${PREFIX}/share/texmf-dist/tex/latex/prettytok/prettytok-decode-8bit.py + ${REINPLACE_CMD} -i '' -e '1s|/usr/bin/perl|${perl_CMD}|' \ + ${STAGEDIR}${PREFIX}/share/texmf-dist/scripts/eolang/eolang.pl ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${PREFIX}/share/texmf-dist -type d -empty | ${SORT} -r | \ @@ -107,22 +111,14 @@ _maintainer-patch: _maintainer-extract ${REINPLACE_CMD} -i '' \ 's/\\def\\magyar@sugg@ie@low#1#2#3/\\def\\magyar@sugg@ie@low\\protect #1#2#3/' \ ${WRKSRC}/texmf-dist/tex/generic/babel-hungarian/magyar.ldf - ${REINPLACE_CMD} -i '' -e '1s|/bin/bash|${bash_CMD}|' \ - ${WRKSRC}/texmf-dist/scripts/logicpuzzle/createlpsudoku \ - ${WRKSRC}/texmf-dist/scripts/logicpuzzle/lpsmag - ${REINPLACE_CMD} -i '' -e '1s|/usr/bin/perl|${perl_CMD}|' \ - ${WRKSRC}/texmf-dist/scripts/mycv/mycv_split_contents.pl - @${REINPLACE_CMD} -i '' -E -e '1s|/usr/bin/env python[23]?|${python_CMD}|; \ - 1s|/usr/bin/python|${python_CMD}|;' \ - ${WRKSRC}/texmf-dist/asymptote/GUI/*.py \ - ${WRKSRC}/texmf-dist/scripts/webquiz/webquiz \ - ${WRKSRC}/texmf-dist/scripts/*/*.py \ - ${WRKSRC}/texmf-dist/tex/latex/wargame/*.py - @${REINPLACE_CMD} -i '' -E -e '/ec\.tex/d' \ - ${WRKSRC}/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-zh-latn-pinyin.tex \ - ${WRKSRC}/texmf-dist/tex/generic/hyph-utf8/loadhyph/loadhyph-la-x-liturgic.tex - @${REINPLACE_CMD} -i '' -e '1s|/usr/bin/luatex|${LOCALBASE}/bin/luatex|' \ - ${WRKSRC}/texmf-dist/tex/generic/pgfplots/lua/*.lua + ${FIND} ${WRKSRC} -type f | \ + ${XARGS} ${REINPLACE_CMD} -i '' -E -e '1s|/bin/bash|${bash_CMD}|; \ + 1s|/usr/bin/perl|${perl_CMD}|; \ + 1s|/usr/bin/env python[23]?|${python_CMD}|; \ + 1s|/usr/bin/python|${python_CMD}|; \ + 1s|/bin/python3|${python_CMD}|; \ + /ec\.tex/d; \ + 1s|/usr/bin/luatex|${LOCALBASE}/bin/luatex|' _maintainer-dist: _maintainer-patch ${TAR} --options xz:compression-level=9 -Jcvf \