Hi,
I know it is getting very close to lock now, but I think I have
identified a couple of weaknesses in the texlive update process. I am
looking for people to check that what I am proposing is sane.
See the below diff.
* The change to PLIST-buildset ensures that the texmf gets hashed if
the user updates only the buildset (and not the other tex packages).
Laurence Tratt did this a few days ago and ended up with broken ls-Rs.
Note that we can only rehash if texlive_base (and thus mktexlsr) is
installed.
* When I moved stuff (fonts) from texlive_texmf-minimal to
texlive_texmf-buildset (in an earlier commit), I bumped REVISION in all
texmf packages involved. This is not strong enough. I should have also
added a stronger RUN_DEPENDS to texlive_texmf-minimal to ensure that
texlive_texmf-buildset and texlive_texmf-minimal are always updated
together.
Does this look right, OK?
Index: texmf/Makefile
===================================================================
RCS file: /home/edd/cvsync/cvs/ports/print/texlive/texmf/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- texmf/Makefile 20 Jan 2014 21:34:44 -0000 1.38
+++ texmf/Makefile 5 Feb 2014 21:30:38 -0000
@@ -6,10 +6,8 @@ COMMENT-full = texlive texmf for extra
COMMENT-main = texlive texmf for basic functionality
COMMENT-buildset = smallest texlive texmf for building ports
-# Also bump print/texlive/base if you change the contents of the buildset.
-# This ensures correct hashing in an update situation.
-REVISION-buildset = 1
-REVISION-main = 0
+REVISION-buildset = 2
+REVISION-main = 1
DISTNAME = texlive-${DIST_V}-texmf
MASTER_SITES0 = http://spacehopper.org/mirrors/ \
@@ -40,6 +38,10 @@ MODPY_BUILDDEP = No
MODPY_RUNDEP = No
RUN_DEPENDS-main = texlive_base-${V}:print/texlive/base
+# Some fonts moved from PLIST-main to PLIST-buildset.
+RUN_DEPENDS-main +=
texlive_texmf-buildset->=${V}p2:print/texlive/texmf,-buildset
+
+
RUN_DEPENDS-full = texlive_texmf-minimal-${V}:print/texlive/texmf,-main \
lang/python/${MODPY_VERSION}
RUN_DEPENDS-context += texlive_texmf-full-${V}:print/texlive/texmf,-full \
Index: texmf/pkg/PLIST-buildset
===================================================================
RCS file: /home/edd/cvsync/cvs/ports/print/texlive/texmf/pkg/PLIST-buildset,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST-buildset
--- texmf/pkg/PLIST-buildset 14 Jan 2014 14:42:00 -0000 1.2
+++ texmf/pkg/PLIST-buildset 5 Feb 2014 21:23:24 -0000
@@ -5668,3 +5668,4 @@ share/texmf-var/web2c/xetex/
share/texmf-var/web2c/xetex/cont-en.fmt
share/texmf-var/web2c/xetex/xelatex.fmt
share/texmf-var/web2c/xetex/xetex.fmt
+@exec-update if [ -e "%D/bin/mktexlsr" ]; then %D/bin/mktexlsr > /dev/null
2>&1; fi
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
