[pkgsrc/trunk]: pkgsrc/pkgtools/texlive2pkg texlive2pkg: update to 1.5

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/85852c669229
branches:  trunk
changeset: 396552:85852c669229
user:      markd <markd%pkgsrc.org@localhost>
date:      Mon Jun 03 10:36:25 2019 +0000

description:
texlive2pkg: update to 1.5

change default version to 2019
add more license mappings.

diffstat:

 pkgtools/texlive2pkg/Makefile          |  4 ++--
 pkgtools/texlive2pkg/files/texlive.pkg |  8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (44 lines):

diff -r 7ef9cfe6ae20 -r 85852c669229 pkgtools/texlive2pkg/Makefile
--- a/pkgtools/texlive2pkg/Makefile     Mon Jun 03 09:58:39 2019 +0000
+++ b/pkgtools/texlive2pkg/Makefile     Mon Jun 03 10:36:25 2019 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2019/02/02 01:55:52 markd Exp $
+# $NetBSD: Makefile,v 1.8 2019/06/03 10:36:25 markd Exp $
 #
 
-PKGNAME=       texlive2pkg-1.4
+PKGNAME=       texlive2pkg-1.5
 CATEGORIES=    pkgtools
 
 MAINTAINER=    markd%NetBSD.org@localhost
diff -r 7ef9cfe6ae20 -r 85852c669229 pkgtools/texlive2pkg/files/texlive.pkg
--- a/pkgtools/texlive2pkg/files/texlive.pkg    Mon Jun 03 09:58:39 2019 +0000
+++ b/pkgtools/texlive2pkg/files/texlive.pkg    Mon Jun 03 10:36:25 2019 +0000
@@ -1,7 +1,7 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: texlive.pkg,v 1.5 2019/02/02 01:55:52 markd Exp $
+# $NetBSD: texlive.pkg,v 1.6 2019/06/03 10:36:25 markd Exp $
 
-$version = "2018";
+$version = "2019";
 $pkgname = $shortdesc = $revision = $license = $longdesc = $depend = $homepage = "";
 $plist = $other = $maps = "";
 
@@ -35,6 +35,7 @@
 $version =~ s: :_:g; # 5th edition
 $version =~ s:-::g;  # 2013-05-12
 $license = "apache-2.0" if ($license eq "apache2");
+$license = "cc-by-v4.0" if ($license eq "cc-by-4");
 $license = "gnu-fdl-v1.3" if ($license eq "fdl");
 $license = "gnu-lgpl-v2" if ($license eq "lgpl");
 $license = "gnu-gpl-v2" if ($license eq "gpl");
@@ -49,6 +50,9 @@
 $license = "ofl-v1.1 AND lppl-1.3c" if ($license eq "ofllppl");
 $license = "gnu-gpl-v2 AND ofl-v1.1 AND lppl-1.3c" if ($license eq "gplofllppl");
 $license = "gnu-gpl-v2 AND lppl-1.3c" if ($license eq "lpplgpl");
+$license = "apache-2.0 AND lppl-1.3c" if ($license eq "apache2lppl");
+$license = "mit AND lppl-1.3c" if ($license eq "mitlppl");
+$license = "gnu-gpl-v2 AND cc-by-sa-v4.0" if ($license eq "gpl3+cc-by-sa-4");
 $license = "modified-bsd" if ($license eq "bsd");
 $license = "modified-bsd" if ($license eq "bsd3");
 $license = "2-clause-bsd" if ($license eq "bsd2");