CVS commit: pkgsrc/pkgtools/texlive2pkg

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

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Jun  3 01:38:32 UTC 2018

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

Log Message:
texlive2pkg: update version to 1.3

Add some more licenses, bump default version to 2018.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/pkgtools/texlive2pkg/Makefile
cvs rdiff -u -r1.3 -r1.4 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.4 pkgsrc/pkgtools/texlive2pkg/Makefile:1.5
--- pkgsrc/pkgtools/texlive2pkg/Makefile:1.4    Wed Jun 21 14:05:29 2017
+++ pkgsrc/pkgtools/texlive2pkg/Makefile        Sun Jun  3 01:38:32 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2017/06/21 14:05:29 markd Exp $
+# $NetBSD: Makefile,v 1.5 2018/06/03 01:38:32 markd Exp $
 #
 
-PKGNAME=       texlive2pkg-1.2
+PKGNAME=       texlive2pkg-1.3
 CATEGORIES=    pkgtools
 
 MAINTAINER=    markd%NetBSD.org@localhost

Index: pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg
diff -u pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.3 pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.4
--- pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.3   Wed Jun 21 14:05:29 2017
+++ pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg       Sun Jun  3 01:38:32 2018
@@ -1,7 +1,7 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: texlive.pkg,v 1.3 2017/06/21 14:05:29 markd Exp $
+# $NetBSD: texlive.pkg,v 1.4 2018/06/03 01:38:32 markd Exp $
 
-$version = "2017";
+$version = "2018";
 $pkgname = $shortdesc = $revision = $license = $longdesc = $depend = $homepage = "";
 $plist = $other = $maps = "";
 
@@ -47,8 +47,10 @@ $license = "lppl-1.3c" if ($license eq "
 $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 = "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 = "public-domain" if ($license eq "pd");