CVS commit: pkgsrc/pkgtools/texlive2pkg

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Mon Aug 12 08:35:14 UTC 2019

Modified Files:
        pkgsrc/pkgtools/texlive2pkg: Makefile
        pkgsrc/pkgtools/texlive2pkg/files: texlive.pkg texlive.pkg.doc

Log Message:
texlive2pkg: update to 1.6

use https homepage
more license mappings


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/pkgtools/texlive2pkg/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg
cvs rdiff -u -r1.1 -r1.2 pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg.doc

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/texlive2pkg/Makefile
diff -u pkgsrc/pkgtools/texlive2pkg/Makefile:1.9 pkgsrc/pkgtools/texlive2pkg/Makefile:1.10
--- pkgsrc/pkgtools/texlive2pkg/Makefile:1.9    Sun Aug 11 13:22:37 2019
+++ pkgsrc/pkgtools/texlive2pkg/Makefile        Mon Aug 12 08:35:14 2019
@@ -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

Index: pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg
diff -u pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.6 pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.7
--- pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.6   Mon Jun  3 10:36:25 2019
+++ pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg       Mon Aug 12 08:35:14 2019
@@ -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 "
 $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 @@ PKGNAME=      tex-\${DISTNAME}-$version
 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

Index: pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg.doc
diff -u pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg.doc:1.1 pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg.doc:1.2
--- pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg.doc:1.1       Sun Jan 24 19:34:44 2016
+++ pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg.doc   Mon Aug 12 08:35:14 2019
@@ -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 @@ PKGNAME=      tex-\${DISTNAME:S/./-/}-$versio
 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