On Wed, Apr 19, 2017 at 01:22:18PM +0100, Stuart Henderson wrote:
> CVS will rewrite the $OpenBSD$ strings when committed. The simplest way
> to avoid that is probably by splitting them in two.
Good call. That's probably what happened in the first place!
How's this instead (tested):
Index: files/mk_plists.py
===================================================================
RCS file: /home/edd/cvsync/ports/print/texlive/texmf/files/mk_plists.py,v
retrieving revision 1.4
diff -u -p -r1.4 mk_plists.py
--- files/mk_plists.py 1 Jun 2016 12:47:31 -0000 1.4
+++ files/mk_plists.py 19 Apr 2017 12:29:28 -0000
@@ -285,7 +285,7 @@ buildset_pkgs = [
print(">>> texlive_texmf-buildset")
buildset_specs = runspecs(buildset_pkgs) # note, no manuals
buildset_top_matter = [
- "@comment $OpenBSD: mk_plists.py,v 1.4 2016/06/01 12:47:31 edd Exp $",
+ "@comment $" "OpenBSD$",
"@conflict teTeX_texmf-*",
"@conflict texlive_base-<%s" % YEAR,
"@conflict texlive_texmf-docs-<%s" % YEAR,
@@ -357,7 +357,7 @@ context_pkgs = [
print(">>> PLIST-context")
context_top_matter = [
- "@comment $OpenBSD: mk_plists.py,v 1.4 2016/06/01 12:47:31 edd Exp $",
+ "@comment $" "OpenBSD$",
"@conflict teTeX_texmf-*",
"@conflict texlive_base-<%s" % YEAR,
"@conflict texlive_texmf-docs-<%s" % YEAR,
@@ -387,7 +387,7 @@ print("\n\n")
print(">>> texlive_texmf-minimal")
minimal_pkgs = ["scheme-tetex"]
minimal_top_matter = [
- "@comment $OpenBSD: mk_plists.py,v 1.4 2016/06/01 12:47:31 edd Exp $",
+ "@comment $" "OpenBSD$",
"@conflict teTeX_texmf-*",
"@conflict texlive_base-<%s" % YEAR,
"@conflict texlive_texmf-docs-<%s" % YEAR,
@@ -418,7 +418,7 @@ print("\n\n")
print(">>> texlive_texmf-full")
full_pkgs = ["scheme-full"]
full_top_matter = [
- "@comment $OpenBSD: mk_plists.py,v 1.4 2016/06/01 12:47:31 edd Exp $",
+ "@comment $" "OpenBSD$",
"@conflict teTeX_texmf-*",
"@conflict texlive_base-<%s" % YEAR,
"@conflict texlive_texmf-docs-<%s" % YEAR,
@@ -453,7 +453,7 @@ NO_MAN_INFO_PDFMAN_REGEX = \
print(">>> texlive_texmf-docs")
doc_specs = ["scheme-tetex:doc"]
doc_top_matter = [
- "@comment $OpenBSD: mk_plists.py,v 1.4 2016/06/01 12:47:31 edd Exp $",
+ "@comment $" "OpenBSD$",
"@conflict teTeX_texmf-doc-*",
"@conflict texlive_base-<%s" % YEAR,
"@conflict texlive_texmf-minimal-<%s" % YEAR,
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
