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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f4e47bd46ab2
branches:  trunk
changeset: 329214:f4e47bd46ab2
user:      markd <markd%pkgsrc.org@localhost>
date:      Sat Feb 02 01:55:52 2019 +0000

description:
texlive2pkg: update to 1.4

more license mappings

diffstat:

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

diffs (39 lines):

diff -r f354272192f2 -r f4e47bd46ab2 pkgtools/texlive2pkg/Makefile
--- a/pkgtools/texlive2pkg/Makefile     Sat Feb 02 01:48:53 2019 +0000
+++ b/pkgtools/texlive2pkg/Makefile     Sat Feb 02 01:55:52 2019 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2018/08/22 09:46:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2019/02/02 01:55:52 markd Exp $
 #
 
-PKGNAME=       texlive2pkg-1.3
-PKGREVISION=   1
+PKGNAME=       texlive2pkg-1.4
 CATEGORIES=    pkgtools
 
 MAINTAINER=    markd%NetBSD.org@localhost
diff -r f354272192f2 -r f4e47bd46ab2 pkgtools/texlive2pkg/files/texlive.pkg
--- a/pkgtools/texlive2pkg/files/texlive.pkg    Sat Feb 02 01:48:53 2019 +0000
+++ b/pkgtools/texlive2pkg/files/texlive.pkg    Sat Feb 02 01:55:52 2019 +0000
@@ -1,5 +1,5 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: texlive.pkg,v 1.4 2018/06/03 01:38:32 markd Exp $
+# $NetBSD: texlive.pkg,v 1.5 2019/02/02 01:55:52 markd Exp $
 
 $version = "2018";
 $pkgname = $shortdesc = $revision = $license = $longdesc = $depend = $homepage = "";
@@ -46,12 +46,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 "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 = "modified-bsd" if ($license eq "bsd");
 $license = "modified-bsd" if ($license eq "bsd3");
 $license = "2-clause-bsd" if ($license eq "bsd2");
 $license = "ofl-v1.1" if ($license eq "ofl");
+$license = "gfsl" if ($license eq "gfl");
 $license = "public-domain" if ($license eq "pd");
 
 $extras = "";