Hi,
Naddy noticed that texlive_mktexlsr, when installed alone (without the rest of
texlive), doesn't work. In turn this breaks the mktexlsr-local @tag.
The reason: although texlive_mktexlsr installs ${PREFIX}/bin/mktexlsr, it's a
symlink to a shell script provided by texlive_buildset (which texlive_mktexlsr
doesn't depend upon).
(It's likely that ${PREFIX}/bin/mktexlsr wasn't always a symlink, because this
must have worked when espie@ created texlive_mktexlsr and added the @tag for
it)
Solution: move the shell script into texlive_mktexlsr.
I've tested it, and tested `pkg_add -u` works too (glad I did, because I got
the conflict markers wrong first time round).
OK?
P.S. I do have most of a texlive 2023 update prepared. More on this soon
hopefully.
Index: base/Makefile
===================================================================
RCS file: /cvs/ports/print/texlive/base/Makefile,v
retrieving revision 1.123
diff -u -p -r1.123 Makefile
--- base/Makefile 20 May 2023 11:19:46 -0000 1.123
+++ base/Makefile 8 Aug 2023 18:11:14 -0000
@@ -3,6 +3,7 @@ COMMENT-mktexlsr = mktexlsr for TeXLive
COMMENT-synctex = synctex for TeXLive typesetting distribution
REVISION-main = 0
+REVISION-mktexlsr = 0
DISTNAME = texlive-${DIST_V}-source
PKGNAME = texlive_base-${V}
@@ -14,7 +15,10 @@ PKGNAME-main = ${PKGNAME}
PKGNAME-synctex = texlive_synctex-${V}
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
- texlive-${DIST_V}-extra${EXTRACT_SUFX}
+ texlive-${DIST_V}-extra${EXTRACT_SUFX} \
+ mktexlsr-2022.gz:0
+
+MASTER_SITES0 = https://theunixzoo.co.uk/distfiles/
SHARED_LIBS = kpathsea 9.0 # 9.2
SHARED_LIBS += ptexenc 6.0 # 5.0
@@ -174,6 +178,15 @@ post-install: tl-symlinks-buildset
${PREFIX}/libdata/perl5/site_perl/TeXLive/
${INSTALL} ${EXTRA_ROOT}/tlpkg/TeXLive/TLConfig.pm \
${PREFIX}/libdata/perl5/site_perl/TeXLive/
+
+ # the `-mktexlsr` sub-package must stand alone without a texmf tree so
+ # that other ports can use it outside of texlive. Unfortunately
+ # `bin/mktexlsr` is a symlink to a shell script in the texmf tree.
+ # Rather than add the texmf distfile here (which would slow down the
+ # build a lot), I've hosted that one script, which we install now.
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/texmf-dist/scripts/texlive
+ ${INSTALL_SCRIPT} ${WRKDIR}/mktexlsr-${V} \
+ ${PREFIX}/share/texmf-dist/scripts/texlive/mktexlsr
.include <bsd.port.mk>
Index: base/distinfo
===================================================================
RCS file: /cvs/ports/print/texlive/base/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- base/distinfo 24 Nov 2022 20:01:14 -0000 1.16
+++ base/distinfo 7 Aug 2023 20:48:33 -0000
@@ -1,4 +1,6 @@
+SHA256 (mktexlsr-2022.gz) = ASQ3bVYUH2ggaM7YOnF8+KwrNdmVs5NA/ylCuWiG6Ro=
SHA256 (texlive-20220321-extra.tar.xz) =
AoTPNolHvozHvs1hyBZDKn0wHbPB5oLdwKGAvTttkpY=
SHA256 (texlive-20220321-source.tar.xz) =
X/o0heUessRJBJZFD8abnXvXy55TNX2S20vNT9YXm1Y=
+SIZE (mktexlsr-2022.gz) = 3586
SIZE (texlive-20220321-extra.tar.xz) = 1805372
SIZE (texlive-20220321-source.tar.xz) = 67975836
Index: base/pkg/PLIST-mktexlsr
===================================================================
RCS file: /cvs/ports/print/texlive/base/pkg/PLIST-mktexlsr,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-mktexlsr
--- base/pkg/PLIST-mktexlsr 24 Nov 2022 20:01:16 -0000 1.8
+++ base/pkg/PLIST-mktexlsr 8 Aug 2023 18:40:49 -0000
@@ -3,6 +3,7 @@
@conflict ht-<2
@conflict texlive_texmf-buildset-<2022
@conflict texlive_base-<2022
+@conflict texlive_texmf-buildset-<2022p0
@define-tag mktexlsr at-end %D/bin/mktexlsr >/dev/null 2>&1
@define-tag mktexlsr-local at-end %D/bin/mktexlsr %D/share/texmf-local
>/dev/null 2>&1
@define-tag mktexlsr supersedes mktexlsr-local
@@ -62,3 +63,6 @@ include/kpathsea/win32lib.h
lib/libkpathsea.la
@lib lib/libkpathsea.so.${LIBkpathsea_VERSION}
lib/pkgconfig/kpathsea.pc
+share/texmf-dist/scripts/
+share/texmf-dist/scripts/texlive/
+share/texmf-dist/scripts/texlive/mktexlsr
Index: texmf/Makefile
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- texmf/Makefile 31 May 2023 15:21:52 -0000 1.67
+++ texmf/Makefile 8 Aug 2023 18:28:29 -0000
@@ -25,6 +25,7 @@ PKGNAME-context = texlive_texmf-context-
PKGNAME-buildset = texlive_texmf-buildset-${V}
REVISION-context = 0
+REVISION-buildset = 0
NO_BUILD = Yes
NO_TEST = Yes
@@ -52,7 +53,7 @@ RUN_DEPENDS-context += ${FULLPKGNAME-ful
${MODRUBY_RUN_DEPENDS}
RUN_DEPENDS-docs += texlive_base->=${V}:print/texlive/base,-main \
x11/p5-Tk
-RUN_DEPENDS-buildset +=
texlive_mktexlsr->=${V}:print/texlive/base,-mktexlsr
+RUN_DEPENDS-buildset +=
texlive_mktexlsr->=${V}p0:print/texlive/base,-mktexlsr
MULTI_PACKAGES = -context -docs -full -main -buildset
Index: texmf/files/update_plist_hints.py
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/files/update_plist_hints.py,v
retrieving revision 1.6
diff -u -p -r1.6 update_plist_hints.py
--- texmf/files/update_plist_hints.py 11 Mar 2022 19:51:09 -0000 1.6
+++ texmf/files/update_plist_hints.py 7 Aug 2023 21:46:39 -0000
@@ -281,7 +281,9 @@ def should_comment_file(f, commented_fil
# TeX live installer, we never want
("tlmgr" in f and "doc/texlive" not in f) or
# We don't need build instructions in our binary packages
- f.endswith("/tlbuild.info")
+ f.endswith("/tlbuild.info") or
+ # mktexlsr is provided by texlive_base,-mktexlsr
+ f == "share/texmf-dist/scripts/texlive/mktexlsr"
)
Index: texmf/files/write_plists.py
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/files/write_plists.py,v
retrieving revision 1.7
diff -u -p -r1.7 write_plists.py
--- texmf/files/write_plists.py 24 Nov 2022 20:01:19 -0000 1.7
+++ texmf/files/write_plists.py 8 Aug 2023 18:31:15 -0000
@@ -29,6 +29,7 @@ TOP_MATTER = {
"@conflict texlive_texmf-minimal-<%s" % YEAR,
"@conflict texlive_texmf-full-<%s" % YEAR,
"@conflict texlive_texmf-context-<%s" % YEAR,
+ "@conflict texlive_base,-mktexlsr-<%sp0" % YEAR,
"@pkgpath print/texlive/texmf-minimal",
"@pkgpath print/teTeX/texmf",
# Scaffold a dir for ports wishing to install extra tex macros.
Index: texmf/pkg/PLIST-buildset
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/pkg/PLIST-buildset,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST-buildset
--- texmf/pkg/PLIST-buildset 24 Nov 2022 20:01:21 -0000 1.17
+++ texmf/pkg/PLIST-buildset 8 Aug 2023 18:31:26 -0000
@@ -4,6 +4,7 @@
@conflict texlive_texmf-minimal-<2022
@conflict texlive_texmf-full-<2022
@conflict texlive_texmf-context-<2022
+@conflict texlive_base,-mktexlsr-<2022p0
@pkgpath print/texlive/texmf-minimal
@pkgpath print/teTeX/texmf
share/texmf-local/
@@ -5851,7 +5852,6 @@ share/texmf-dist/scripts/texlive/
share/texmf-dist/scripts/texlive/fmtutil-sys.sh
share/texmf-dist/scripts/texlive/fmtutil-user.sh
share/texmf-dist/scripts/texlive/fmtutil.pl
-share/texmf-dist/scripts/texlive/mktexlsr
share/texmf-dist/scripts/texlive/mktexlsr.pl
share/texmf-dist/scripts/texlive/mktexmf
share/texmf-dist/scripts/texlive/mktexpk
--
Best Regards
Edd Barrett
https://www.theunixzoo.co.uk
