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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f1187787bcce
branches:  trunk
changeset: 337787:f1187787bcce
user:      markd <markd%pkgsrc.org@localhost>
date:      Mon Aug 12 08:35:14 2019 +0000

description:
texlive2pkg: update to 1.6

use https homepage
more license mappings

diffstat:

 pkgtools/texlive2pkg/Makefile              |  5 ++---
 pkgtools/texlive2pkg/files/texlive.pkg     |  8 ++++++--
 pkgtools/texlive2pkg/files/texlive.pkg.doc |  4 ++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diffs (67 lines):

diff -r e6cf7546a4b1 -r f1187787bcce pkgtools/texlive2pkg/Makefile
--- a/pkgtools/texlive2pkg/Makefile     Mon Aug 12 07:45:40 2019 +0000
+++ b/pkgtools/texlive2pkg/Makefile     Mon Aug 12 08:35:14 2019 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2019/08/11 13:22:37 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/08/12 08:35:14 markd Exp $
 #
 
-PKGNAME=       texlive2pkg-1.5
-PKGREVISION=   1
+PKGNAME=       texlive2pkg-1.6
 CATEGORIES=    pkgtools
 
 MAINTAINER=    markd%NetBSD.org@localhost
diff -r e6cf7546a4b1 -r f1187787bcce pkgtools/texlive2pkg/files/texlive.pkg
--- a/pkgtools/texlive2pkg/files/texlive.pkg    Mon Aug 12 07:45:40 2019 +0000
+++ b/pkgtools/texlive2pkg/files/texlive.pkg    Mon Aug 12 08:35:14 2019 +0000
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: texlive.pkg,v 1.6 2019/06/03 10:36:25 markd Exp $
+# $NetBSD: texlive.pkg,v 1.7 2019/08/12 08:35:14 markd Exp $
 
 $version = "2019";
 $pkgname = $shortdesc = $revision = $license = $longdesc = $depend = $homepage = "";
@@ -47,10 +47,14 @@
 $license = "lppl-1.3c" if ($license eq "lppl1.3");
 $license = "lppl-1.3c" if ($license eq "lppl1.3c");
 $license = "ofl-v1.1 AND lppl-1.3c" if ($license eq "ofllppl1.3");
+$license = "ofl-v1.1 AND lppl-1.3c" if ($license eq "ofllppl1.3c");
 $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 = "gnu-gpl-v2 AND lppl-1.3c" if ($license eq "gpl2lppl");
 $license = "apache-2.0 AND lppl-1.3c" if ($license eq "apache2lppl");
+$license = "apache-2.0 AND lppl-1.3c" if ($license eq "apache2lppl1.3c");
+$license = "apache-2.0 AND lppl-1.3c" if ($license eq "lppl1.3capache2");
 $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");
@@ -88,7 +92,7 @@
 TEXLIVE_REV=   $revision
 
 MAINTAINER=    pkgsrc-users\@NetBSD.org
-HOMEPAGE=      http://ctan.org/pkg/$homepage
+HOMEPAGE=      https://ctan.org/pkg/$homepage
 COMMENT=       $shortdesc
 LICENSE=       $license
 $extras
diff -r e6cf7546a4b1 -r f1187787bcce pkgtools/texlive2pkg/files/texlive.pkg.doc
--- a/pkgtools/texlive2pkg/files/texlive.pkg.doc        Mon Aug 12 07:45:40 2019 +0000
+++ b/pkgtools/texlive2pkg/files/texlive.pkg.doc        Mon Aug 12 08:35:14 2019 +0000
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: texlive.pkg.doc,v 1.1 2016/01/24 19:34:44 markd Exp $
+# $NetBSD: texlive.pkg.doc,v 1.2 2019/08/12 08:35:14 markd Exp $
 
 $pkgname = $ARGV[0];
 $revision= $ARGV[1];
@@ -53,7 +53,7 @@
 TEXLIVE_REV=   $revision
 
 MAINTAINER=    pkgsrc-users\@NetBSD.org
-HOMEPAGE=      http://ctan.org/pkg/$homepage
+HOMEPAGE=      https://ctan.org/pkg/$homepage
 COMMENT=       Documentation for tex-${pkgname}
 LICENSE=       $license