CVS commit: pkgsrc/pkgtools/texlive2pkg

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

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Feb  2 01:55:52 UTC 2019

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

Log Message:
texlive2pkg: update to 1.4

more license mappings


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/pkgtools/texlive2pkg/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg

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.6 pkgsrc/pkgtools/texlive2pkg/Makefile:1.7
--- pkgsrc/pkgtools/texlive2pkg/Makefile:1.6    Wed Aug 22 09:46:12 2018
+++ pkgsrc/pkgtools/texlive2pkg/Makefile        Sat Feb  2 01:55:52 2019
@@ -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

Index: pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg
diff -u pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.4 pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.5
--- pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.4   Sun Jun  3 01:38:32 2018
+++ pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg       Sat Feb  2 01:55:52 2019
@@ -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 "
 $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 = "";