summaryrefslogtreecommitdiff
path: root/pkgtools/texlive2pkg
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2019-06-03 10:36:25 +0000
committermarkd <markd@pkgsrc.org>2019-06-03 10:36:25 +0000
commit5cadd758c18be43ccb4feb0732c0e1ed103f8798 (patch)
treed7a85b9f090f3bdd40dd06292568aa3748533fb7 /pkgtools/texlive2pkg
parent2a2d02221e649192ad04784fcf95cf76cf091be5 (diff)
downloadpkgsrc-5cadd758c18be43ccb4feb0732c0e1ed103f8798.tar.gz
texlive2pkg: update to 1.5
change default version to 2019 add more license mappings.
Diffstat (limited to 'pkgtools/texlive2pkg')
-rw-r--r--pkgtools/texlive2pkg/Makefile4
-rwxr-xr-xpkgtools/texlive2pkg/files/texlive.pkg8
2 files changed, 8 insertions, 4 deletions
diff --git a/pkgtools/texlive2pkg/Makefile b/pkgtools/texlive2pkg/Makefile
index 00d17ef78ae..7dd97997e26 100644
--- a/pkgtools/texlive2pkg/Makefile
+++ b/pkgtools/texlive2pkg/Makefile
@@ -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
diff --git a/pkgtools/texlive2pkg/files/texlive.pkg b/pkgtools/texlive2pkg/files/texlive.pkg
index fae2382415d..b56ace4788b 100755
--- a/pkgtools/texlive2pkg/files/texlive.pkg
+++ b/pkgtools/texlive2pkg/files/texlive.pkg
@@ -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;
$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 "ofllppl1.3");
$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");