[pkgsrc/trunk]: pkgsrc/pkgtools/texlive2pkg Update texlive2pkg to 1.2

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/321c58a56bde
branches:  trunk
changeset: 364170:321c58a56bde
user:      markd <markd%pkgsrc.org@localhost>
date:      Wed Jun 21 14:05:29 2017 +0000

description:
Update texlive2pkg to 1.2

 Set default version to 2017
 Teach about more license strings

diffstat:

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

diffs (39 lines):

diff -r 0020f3a15aca -r 321c58a56bde pkgtools/texlive2pkg/Makefile
--- a/pkgtools/texlive2pkg/Makefile     Wed Jun 21 14:00:04 2017 +0000
+++ b/pkgtools/texlive2pkg/Makefile     Wed Jun 21 14:05:29 2017 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2016/07/09 06:38:49 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2017/06/21 14:05:29 markd Exp $
 #
 
-PKGNAME=       texlive2pkg-1.1
-PKGREVISION=   1
+PKGNAME=       texlive2pkg-1.2
 CATEGORIES=    pkgtools
 
 MAINTAINER=    markd%NetBSD.org@localhost
diff -r 0020f3a15aca -r 321c58a56bde pkgtools/texlive2pkg/files/texlive.pkg
--- a/pkgtools/texlive2pkg/files/texlive.pkg    Wed Jun 21 14:00:04 2017 +0000
+++ b/pkgtools/texlive2pkg/files/texlive.pkg    Wed Jun 21 14:05:29 2017 +0000
@@ -1,7 +1,7 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: texlive.pkg,v 1.2 2016/01/30 04:59:57 markd Exp $
+# $NetBSD: texlive.pkg,v 1.3 2017/06/21 14:05:29 markd Exp $
 
-$version = "2015";
+$version = "2017";
 $pkgname = $shortdesc = $revision = $license = $longdesc = $depend = $homepage = "";
 $plist = $other = $maps = "";
 
@@ -44,7 +44,11 @@
 $license = "lppl-1.2" if ($license eq "lppl1.2");
 $license = "lppl-1.3c" if ($license eq "lppl");
 $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 = "gnu-gpl-v2 AND ofl-v1.1 AND lppl-1.3c" if ($license eq "gplofllppl");
 $license = "modified-bsd" if ($license eq "bsd");
+$license = "modified-bsd" if ($license eq "bsd3");
 $license = "ofl-v1.1" if ($license eq "ofl");
 $license = "public-domain" if ($license eq "pd");