Sun Jun 6 23:32:41 2021 UTC ()
texlive2pkg: update to 1.10

bump default to 2021
fixup some license matches


(markd)
diff -r1.16 -r1.17 pkgsrc/pkgtools/texlive2pkg/Makefile
diff -r1.8 -r1.9 pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg
cvs diff -r1.16 -r1.17 pkgsrc/pkgtools/texlive2pkg/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/texlive2pkg/Makefile 2021/05/24 19:53:43 1.16
+++ pkgsrc/pkgtools/texlive2pkg/Makefile 2021/06/06 23:32:40 1.17
@@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
1# $NetBSD: Makefile,v 1.16 2021/05/24 19:53:43 wiz Exp $ 1# $NetBSD: Makefile,v 1.17 2021/06/06 23:32:40 markd Exp $
2# 2#
3 3
4PKGNAME= texlive2pkg-1.9 4PKGNAME= texlive2pkg-1.10
5PKGREVISION= 1 
6CATEGORIES= pkgtools 5CATEGORIES= pkgtools
7 6
8MAINTAINER= markd@NetBSD.org 7MAINTAINER= markd@NetBSD.org
9HOMEPAGE= # none 8HOMEPAGE= # none
10COMMENT= Tool to automate initial steps in building a texlive package 9COMMENT= Tool to automate initial steps in building a texlive package
11LICENSE= modified-bsd 10LICENSE= modified-bsd
12 11
13WRKSRC= ${WRKDIR} 12WRKSRC= ${WRKDIR}
14NO_CHECKSUM= yes 13NO_CHECKSUM= yes
15NO_BUILD= yes 14NO_BUILD= yes
16USE_LANGUAGES= # none 15USE_LANGUAGES= # none
17USE_TOOLS+= ftp:run perl:run xzcat:run 16USE_TOOLS+= ftp:run perl:run xzcat:run
18AUTO_MKDIRS= yes 17AUTO_MKDIRS= yes
cvs diff -r1.8 -r1.9 pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg (expand / switch to unified diff)

--- pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg 2021/02/20 05:08:37 1.8
+++ pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg 2021/06/06 23:32:40 1.9
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1#!/usr/pkg/bin/perl 1#!/usr/pkg/bin/perl
2# $NetBSD: texlive.pkg,v 1.8 2021/02/20 05:08:37 markd Exp $ 2# $NetBSD: texlive.pkg,v 1.9 2021/06/06 23:32:40 markd Exp $
3 3
4$version = "2020"; 4$version = "2021";
5$pkgname = $shortdesc = $revision = $license = $longdesc = $depend = $homepage = ""; 5$pkgname = $shortdesc = $revision = $license = $longdesc = $depend = $homepage = "";
6$plist = $other = $maps = ""; 6$plist = $other = $maps = "";
7 7
8while (<>) { 8while (<>) {
9 $pkgname = $1,next if (/^name (\S+)/); 9 $pkgname = $1,next if (/^name (\S+)/);
10 $shortdesc = $1,next if (/^shortdesc +(.+)/); 10 $shortdesc = $1,next if (/^shortdesc +(.+)/);
11 $revision = $1,next if (/^revision (\S+)/); 11 $revision = $1,next if (/^revision (\S+)/);
12 $license = " $1 ",next if (/^catalogue-license +(.+)/); 12 $license = " $1 ",next if (/^catalogue-license +(.+)/);
13 $version = $1,next if (/^catalogue-version +(.+)/); 13 $version = $1,next if (/^catalogue-version +(.+)/);
14 $homepage = $1,next if (/^catalogue +(.+)/); 14 $homepage = $1,next if (/^catalogue +(.+)/);
15 next if (/^category /); 15 next if (/^category /);
16 next if (/^catalogue-also /); 16 next if (/^catalogue-also /);
17 next if (/^catalogue-ctan /); 17 next if (/^catalogue-ctan /);
@@ -25,35 +25,36 @@ while (<>) { @@ -25,35 +25,36 @@ while (<>) {
25 $maps .= "TEX_MIXEDMAP_FILES+=\t$1\n",next if (/^execute addMixedMap (.+)/); 25 $maps .= "TEX_MIXEDMAP_FILES+=\t$1\n",next if (/^execute addMixedMap (.+)/);
26  26
27 $plist .= "share/texmf-dist$1\n", next if (/^ RELOC(.+)/); 27 $plist .= "share/texmf-dist$1\n", next if (/^ RELOC(.+)/);
28 $plist .= "share/$1\n",next if (/^ (.+)/); 28 $plist .= "share/$1\n",next if (/^ (.+)/);
29 29
30 $other .= "# " . $_; 30 $other .= "# " . $_;
31} 31}
32 32
33$shortdesc =~ s/\.$//; 33$shortdesc =~ s/\.$//;
34$version =~ s:/::g; 34$version =~ s:/::g;
35$version =~ s: :_:g; # 5th edition 35$version =~ s: :_:g; # 5th edition
36$version =~ s:-::g; # 2013-05-12 36$version =~ s:-::g; # 2013-05-12
37$license =~ s: apache2 : apache-2.0 :; 37$license =~ s: apache2 : apache-2.0 :;
 38$license =~ s: cc0 : cc0-1.0-universal :;
38$license =~ s: cc-by-4 : cc-by-v4.0 :; 39$license =~ s: cc-by-4 : cc-by-v4.0 :;
39$license =~ s: cc-by-sa-4 : cc-by-sa-v4.0 :; 40$license =~ s: cc-by-sa-4 : cc-by-sa-v4.0 :;
40$license =~ s: fdl : gnu-fdl-v1.3 :; 41$license =~ s: fdl : gnu-fdl-v1.3 :;
41$license =~ s: lgpl : gnu-lgpl-v2 :; 42$license =~ s: lgpl : gnu-lgpl-v2 :;
42$license =~ s: gpl : gnu-gpl-v2 :; 43$license =~ s: gpl : gnu-gpl-v2 :;
43$license =~ s: gpl2 : gnu-gpl-v2 :; 44$license =~ s: gpl2 : gnu-gpl-v2 :;
44$license =~ s: gpl2+ : gnu-gpl-v2 :; 45$license =~ s: gpl2\+ : gnu-gpl-v2 :;
45$license =~ s: gpl3 : gnu-gpl-v3 :; 46$license =~ s: gpl3 : gnu-gpl-v3 :;
46$license =~ s: gpl3+ : gnu-gpl-v3 :; 47$license =~ s: gpl3\+ : gnu-gpl-v3 :;
47$license =~ s: lppl1 : lppl-1.0 :; 48$license =~ s: lppl1 : lppl-1.0 :;
48$license =~ s: lppl1.2 : lppl-1.2 :; 49$license =~ s: lppl1.2 : lppl-1.2 :;
49$license =~ s: lppl : lppl-1.3c :; 50$license =~ s: lppl : lppl-1.3c :;
50$license =~ s: lppl1.3 : lppl-1.3c :; 51$license =~ s: lppl1.3 : lppl-1.3c :;
51$license =~ s: lppl1.3c : lppl-1.3c :; 52$license =~ s: lppl1.3c : lppl-1.3c :;
52$license =~ s: bsd : modified-bsd :; 53$license =~ s: bsd : modified-bsd :;
53$license =~ s: bsd3 : modified-bsd :; 54$license =~ s: bsd3 : modified-bsd :;
54$license =~ s: bsd2 : 2-clause-bsd :; 55$license =~ s: bsd2 : 2-clause-bsd :;
55$license =~ s: ofl : ofl-v1.1 :; 56$license =~ s: ofl : ofl-v1.1 :;
56$license =~ s: gfl : gfsl :; 57$license =~ s: gfl : gfsl :;
57$license =~ s: pd : public-domain :; 58$license =~ s: pd : public-domain :;
58 59
59$license =~ s: (.*) :$1:; 60$license =~ s: (.*) :$1:;