Hi,
On Mon, Aug 31, 2020 at 04:17:34AM -0600, Anthony J. Bentley wrote:
> The PLIST includes a conflict against texlive. I think they should be
> removed from texlive completely, and texlive should run-depend on this
> port instead. Edd, how do you feel about it?
I agree.
The diff below should be close. We have to kill lcdf-typetools in both
texlive_base *and* in the texmf.
Also fixed a bug in my scripting, hence the Python changes.
Further, also noticed that I forgot to bump the conflict markers with
the texlive 2020 update, so this includes a fix for that too.
In your lcdf-typetools port, the conflict markers need to be:
@conflict texlive_base-<2020p0
@conflict texlive_texmf-full-<2020p0
I'm going to do a mini-bulk to check I didn't break anything and then
I'll re-test a package upgrade to be doubly sure.
Index: base/Makefile
===================================================================
RCS file: /cvs/ports/print/texlive/base/Makefile,v
retrieving revision 1.114
diff -u -p -r1.114 Makefile
--- base/Makefile 18 Aug 2020 18:40:14 -0000 1.114
+++ base/Makefile 31 Aug 2020 15:15:42 -0000
@@ -5,6 +5,7 @@ COMMENT-mktexlsr = mktexlsr for TeXLive
COMMENT-synctex = synctex for TeXLive typesetting distribution
DISTNAME = texlive-${DIST_V}-source
+REVISION = 0
PKGNAME = texlive_base-${V}
WRKDIST = ${WRKDIR}/texlive-${DIST_V}-source
@@ -36,6 +37,7 @@ WANTLIB-synctex += c m z
RUN_DEPENDS-main = print/ghostscript/gnu \
print/detex \
print/dvi2tty \
+ print/lcdf-typetools \
print/ps2eps \
print/psutils \
print/t1utils \
@@ -131,7 +133,8 @@ CONFIGURE_ARGS += --mandir=${PREFIX}/man
--with-system-harfbuzz \
--with-system-graphite2 \
--with-system-libpaper \
- --with-system-zziplib
+ --with-system-zziplib \
+ --disable-lcdf-typetools
SUBST_VARS += TRUEPREFIX LOCALBASE
Index: base/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/texlive/base/pkg/PLIST-main,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST-main
--- base/pkg/PLIST-main 18 Aug 2020 18:40:16 -0000 1.7
+++ base/pkg/PLIST-main 31 Aug 2020 15:12:32 -0000
@@ -50,7 +50,6 @@ bin/cefpdflatex
@bin bin/cefsconv
bin/cefslatex
bin/cefspdflatex
-@bin bin/cfftot1
bin/checkcites
bin/checklistings
@bin bin/chkdvifont
@@ -224,8 +223,6 @@ bin/mktexfmt
bin/mktexmf
bin/mktexpk
bin/mktextfm
-@bin bin/mmafm
-@bin bin/mmpfb
@bin bin/mpost
bin/mptopdf
@bin bin/msxlint
@@ -241,8 +238,6 @@ bin/ofm2opl
bin/opl2ofm
bin/ot2kpx
@bin bin/otangle
-@bin bin/otfinfo
-@bin bin/otftotfm
@bin bin/otp2ocp
@bin bin/outocp
bin/ovf2ovp
@@ -312,11 +307,6 @@ bin/splitindex
bin/srcredact
bin/sty2dtx
bin/svn-multi
-@bin bin/t1dotlessj
-@bin bin/t1lint
-@bin bin/t1rawafm
-@bin bin/t1reencode
-@bin bin/t1testpage
@bin bin/t4ht
@bin bin/tangle
@bin bin/teckit_compile
@@ -357,7 +347,6 @@ bin/ttf2kotexfont
@bin bin/ttf2pk
@bin bin/ttf2tfm
@bin bin/ttfdump
-@bin bin/ttftotype42
bin/typeoutfileinfo
bin/ulqda
@bin bin/upbibtex
Index: texmf/Makefile
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- texmf/Makefile 18 Aug 2020 18:40:17 -0000 1.59
+++ texmf/Makefile 31 Aug 2020 15:29:13 -0000
@@ -13,6 +13,12 @@ COMMENT-buildset = smallest texlive texm
# * Add a more restrictive RUN_DEPEND upon the buildset.
DISTNAME = texlive-${DIST_V}-texmf
+REVISION-context = 0
+REVISION-docs = 0
+REVISION-full = 0
+REVISION-main = 0
+REVISION-buildset = 0
+
MASTER_SITES0 = http://theunixzoo.co.uk/distfiles/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
texlive-${DIST_V}-extra${EXTRACT_SUFX} \
@@ -42,7 +48,7 @@ MODPY_RUNDEP = No
.include "adj.mk"
-RUN_DEPENDS-main += texlive_base->=${V}:print/texlive/base,-main \
+RUN_DEPENDS-main += texlive_base->=${V}p0:print/texlive/base,-main \
${FULLPKGNAME-buildset}:print/texlive/texmf,-buildset
RUN_DEPENDS-full = ${FULLPKGNAME-main}:print/texlive/texmf,-main \
${MODPY_RUN_DEPENDS} \
Index: texmf/files/update_plist_hints.py
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/files/update_plist_hints.py,v
retrieving revision 1.4
diff -u -p -r1.4 update_plist_hints.py
--- texmf/files/update_plist_hints.py 18 Aug 2020 18:40:19 -0000 1.4
+++ texmf/files/update_plist_hints.py 31 Aug 2020 14:34:15 -0000
@@ -95,8 +95,8 @@ def build_subset_file_lists(tlpdb):
return [PkgPartSpec(pkg, FileKind.RUN, include_deps)
for pkg in pkg_list]
- def allspecs(pkg_list):
- return [PkgPartSpec(pkg, kind)
+ def allspecs(pkg_list, include_deps=True):
+ return [PkgPartSpec(pkg, kind, include_deps=include_deps)
for pkg in pkg_list
for kind in FileKind.all_kinds()]
@@ -105,9 +105,9 @@ def build_subset_file_lists(tlpdb):
# CONFLICTING PACKAGES
# Whole packages that are ported elsewhere.
conflict_pkgs = ["asymptote", "latexmk", "texworks", "t1utils",
- "dvi2tty", "detex", "texinfo"]
+ "dvi2tty", "detex", "texinfo", "lcdftypetools"]
conflict_pkg_files, conflict_symlinks = \
- collect_files(allspecs(conflict_pkgs), db)
+ collect_files(allspecs(conflict_pkgs, include_deps=False), db)
# BUILDSET
# The smallest subset for building ports.
Index: texmf/files/write_plists.py
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/files/write_plists.py,v
retrieving revision 1.2
diff -u -p -r1.2 write_plists.py
--- texmf/files/write_plists.py 11 Nov 2019 22:54:17 -0000 1.2
+++ texmf/files/write_plists.py 31 Aug 2020 15:26:20 -0000
@@ -11,7 +11,7 @@ import os
import sys
import re
-YEAR = 2019
+YEAR = 2020
THIS_DIR = os.path.abspath(os.path.dirname(__file__))
PLIST_DIR = os.path.abspath(os.path.join(THIS_DIR, "..", "pkg"))
PLISTS = "-buildset", "-main", "-context", "-full", "-docs"
@@ -39,7 +39,7 @@ TOP_MATTER = {
"-main": [
"@comment $" "OpenBSD$",
"@conflict teTeX_texmf-*",
- "@conflict texlive_base-<%s" % YEAR,
+ "@conflict texlive_base-<%sp0" % YEAR,
"@conflict texlive_texmf-docs-<%s" % YEAR,
"@conflict texlive_texmf-full-<%s" % YEAR,
"@conflict texlive_texmf-buildset-<%s" % YEAR,
Index: texmf/pkg/PLIST-buildset
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/pkg/PLIST-buildset,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST-buildset
--- texmf/pkg/PLIST-buildset 18 Aug 2020 18:40:22 -0000 1.13
+++ texmf/pkg/PLIST-buildset 31 Aug 2020 15:26:36 -0000
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST-buildset,v 1.13 2020/08/18 18:40:22 edd Exp $
+@comment $OpenBSD$
@conflict teTeX_texmf-*
-@conflict texlive_base-<2019
-@conflict texlive_texmf-docs-<2019
-@conflict texlive_texmf-minimal-<2019
-@conflict texlive_texmf-full-<2019
-@conflict texlive_texmf-context-<2019
+@conflict texlive_base-<2020
+@conflict texlive_texmf-docs-<2020
+@conflict texlive_texmf-minimal-<2020
+@conflict texlive_texmf-full-<2020
+@conflict texlive_texmf-context-<2020
@pkgpath print/texlive/texmf-minimal
@pkgpath print/teTeX/texmf
share/texmf-local/
Index: texmf/pkg/PLIST-context
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/pkg/PLIST-context,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST-context
--- texmf/pkg/PLIST-context 18 Aug 2020 18:40:23 -0000 1.14
+++ texmf/pkg/PLIST-context 31 Aug 2020 15:26:37 -0000
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST-context,v 1.14 2020/08/18 18:40:23 edd Exp $
+@comment $OpenBSD$
@conflict teTeX_texmf-*
-@conflict texlive_base-<2019
-@conflict texlive_texmf-docs-<2019
-@conflict texlive_texmf-full-<2019
-@conflict texlive_texmf-buildset-<2019
-@conflict texlive_texmf-minimal-<2019
+@conflict texlive_base-<2020
+@conflict texlive_texmf-docs-<2020
+@conflict texlive_texmf-full-<2020
+@conflict texlive_texmf-buildset-<2020
+@conflict texlive_texmf-minimal-<2020
@man man/man1/context.1
@man man/man1/luatools.1
@man man/man1/mtx-babel.1
Index: texmf/pkg/PLIST-docs
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/pkg/PLIST-docs,v
retrieving revision 1.23
diff -u -p -r1.23 PLIST-docs
--- texmf/pkg/PLIST-docs 18 Aug 2020 18:47:59 -0000 1.23
+++ texmf/pkg/PLIST-docs 31 Aug 2020 15:26:38 -0000
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST-docs,v 1.23 2020/08/18 18:47:59 edd Exp $
+@comment $OpenBSD$
@conflict teTeX_texmf-doc-*
-@conflict texlive_base-<2019
-@conflict texlive_texmf-minimal-<2019
-@conflict texlive_texmf-full-<2019
-@conflict texlive_texmf-buildset-<2019
-@conflict texlive_texmf-context-<2019
+@conflict texlive_base-<2020
+@conflict texlive_texmf-minimal-<2020
+@conflict texlive_texmf-full-<2020
+@conflict texlive_texmf-buildset-<2020
+@conflict texlive_texmf-context-<2020
@pkgpath print/texlive/texmf-docs
@pkgpath print/teTeX_texmf,-doc
share/texmf-dist/
Index: texmf/pkg/PLIST-full
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/pkg/PLIST-full,v
retrieving revision 1.27
diff -u -p -r1.27 PLIST-full
--- texmf/pkg/PLIST-full 18 Aug 2020 18:47:59 -0000 1.27
+++ texmf/pkg/PLIST-full 31 Aug 2020 15:26:38 -0000
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST-full,v 1.27 2020/08/18 18:47:59 edd Exp $
+@comment $OpenBSD$
@conflict teTeX_texmf-*
-@conflict texlive_base-<2019
-@conflict texlive_texmf-docs-<2019
-@conflict texlive_texmf-minimal-<2019
-@conflict texlive_texmf-buildset-<2019
-@conflict texlive_texmf-context-<2019
+@conflict texlive_base-<2020
+@conflict texlive_texmf-docs-<2020
+@conflict texlive_texmf-minimal-<2020
+@conflict texlive_texmf-buildset-<2020
+@conflict texlive_texmf-context-<2020
@pkgpath print/texlive/texmf-full
@pkgpath print/teTeX/texmf
bin/
Index: texmf/pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/print/texlive/texmf/pkg/PLIST-main,v
retrieving revision 1.28
diff -u -p -r1.28 PLIST-main
--- texmf/pkg/PLIST-main 18 Aug 2020 18:48:01 -0000 1.28
+++ texmf/pkg/PLIST-main 31 Aug 2020 15:26:37 -0000
@@ -1,10 +1,10 @@
-@comment $OpenBSD: PLIST-main,v 1.28 2020/08/18 18:48:01 edd Exp $
+@comment $OpenBSD$
@conflict teTeX_texmf-*
-@conflict texlive_base-<2019
-@conflict texlive_texmf-docs-<2019
-@conflict texlive_texmf-full-<2019
-@conflict texlive_texmf-buildset-<2019
-@conflict texlive_texmf-context-<2019
+@conflict texlive_base-<2020p0
+@conflict texlive_texmf-docs-<2020
+@conflict texlive_texmf-full-<2020
+@conflict texlive_texmf-buildset-<2020
+@conflict texlive_texmf-context-<2020
@pkgpath print/teTeX/texmf
bin/
bin/amstex
@@ -52,7 +52,6 @@ bin/xmltex
@man man/man1/cef5conv.1
@man man/man1/cefconv.1
@man man/man1/cefsconv.1
-@man man/man1/cfftot1.1
@man man/man1/cslatex.1
@man man/man1/ctangle.1
@man man/man1/ctie.1
@@ -125,8 +124,6 @@ bin/xmltex
@man man/man1/mktexmf.1
@man man/man1/mktexpk.1
@man man/man1/mktextfm.1
-@man man/man1/mmafm.1
-@man man/man1/mmpfb.1
@man man/man1/mpost.1
@man man/man1/mptopdf.1
@man man/man1/odvicopy.1
@@ -135,8 +132,6 @@ bin/xmltex
@man man/man1/opl2ofm.1
@man man/man1/ot2kpx.1
@man man/man1/otangle.1
-@man man/man1/otfinfo.1
-@man man/man1/otftotfm.1
@man man/man1/otp2ocp.1
@man man/man1/outocp.1
@man man/man1/ovf2ovp.1
@@ -161,11 +156,6 @@ bin/xmltex
@man man/man1/rubibtex.1
@man man/man1/rumakeindex.1
@man man/man1/sjisconv.1
-@man man/man1/t1dotlessj.1
-@man man/man1/t1lint.1
-@man man/man1/t1rawafm.1
-@man man/man1/t1reencode.1
-@man man/man1/t1testpage.1
@man man/man1/tangle.1
@man man/man1/tex.1
@man man/man1/texhash.1
@@ -179,7 +169,6 @@ bin/xmltex
@man man/man1/ttf2pk.1
@man man/man1/ttf2tfm.1
@man man/man1/ttfdump.1
-@man man/man1/ttftotype42.1
@man man/man1/updmap-sys.1
@man man/man1/updmap-user.1
@man man/man1/updmap.1
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
