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 - 1.114
+++ base/Makefile 31 Aug 2020 15:15:42 -
@@ -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 - 1.7
+++ base/pkg/PLIST-main 31 Aug 2020 15:12:32 -
@@ -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 - 1.59
+++ texmf/Makefile 31 Aug 2020 15:29:13 -
@@ -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 - 1.4
+++ texmf/files/update_plist_hints.py 31 Aug 2020 14:34:15 -
@@ -95,8
