Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1613797717185080"
MIME-Version: 1.0
Date: Sat, 20 Feb 2021 05:08:37 +0000
From: "Mark Davies" <markd@netbsd.org>
Subject: CVS commit: pkgsrc/pkgtools/texlive2pkg
To: pkgsrc-changes@NetBSD.org
Reply-To: markd@netbsd.org
Message-Id: <20210220050837.B1F5AFA95@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1613797717185080
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	markd
Date:		Sat Feb 20 05:08:37 UTC 2021

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

Log Message:
texlive2pkg: update to 1.9

change default version to 2020

restructure license handling


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/pkgtools/texlive2pkg/Makefile
cvs rdiff -u -r1.7 -r1.8 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.


--_----------=_1613797717185080
Content-Disposition: inline
Content-Length: 4361
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/pkgtools/texlive2pkg/Makefile
diff -u pkgsrc/pkgtools/texlive2pkg/Makefile:1.14 pkgsrc/pkgtools/texlive2pkg/Makefile:1.15
--- pkgsrc/pkgtools/texlive2pkg/Makefile:1.14	Mon Aug 31 18:10:59 2020
+++ pkgsrc/pkgtools/texlive2pkg/Makefile	Sat Feb 20 05:08:37 2021
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.14 2020/08/31 18:10:59 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2021/02/20 05:08:37 markd Exp $
 #
 
-PKGNAME=	texlive2pkg-1.8
-PKGREVISION=	1
+PKGNAME=	texlive2pkg-1.9
 CATEGORIES=	pkgtools
 
 MAINTAINER=	markd@NetBSD.org

Index: pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg
diff -u pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.7 pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.8
--- pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.7	Mon Aug 12 08:35:14 2019
+++ pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg	Sat Feb 20 05:08:37 2021
@@ -1,7 +1,7 @@
 #!/usr/pkg/bin/perl
-# $NetBSD: texlive.pkg,v 1.7 2019/08/12 08:35:14 markd Exp $
+# $NetBSD: texlive.pkg,v 1.8 2021/02/20 05:08:37 markd Exp $
 
-$version = "2019";
+$version = "2020";
 $pkgname = $shortdesc = $revision = $license = $longdesc = $depend = $homepage = "";
 $plist = $other = $maps = "";
 
@@ -9,7 +9,7 @@ while (<>) {
       $pkgname = $1,next if (/^name (\S+)/);
       $shortdesc = $1,next if (/^shortdesc +(.+)/);
       $revision = $1,next if (/^revision (\S+)/);
-      $license = $1,next if (/^catalogue-license (\S+)/);
+      $license = " $1 ",next if (/^catalogue-license +(.+)/);
       $version = $1,next if (/^catalogue-version +(.+)/);
       $homepage = $1,next if (/^catalogue +(.+)/);
       next if (/^category /);
@@ -34,35 +34,30 @@ $shortdesc =~ s/\.$//;
 $version =~ s:/::g;
 $version =~ s: :_:g; # 5th edition
 $version =~ s:-::g;  # 2013-05-12
-$license = "apache-2.0" if ($license eq "apache2");
-$license = "cc-by-v4.0" if ($license eq "cc-by-4");
-$license = "gnu-fdl-v1.3" if ($license eq "fdl");
-$license = "gnu-lgpl-v2" if ($license eq "lgpl");
-$license = "gnu-gpl-v2" if ($license eq "gpl");
-$license = "gnu-gpl-v2" if ($license eq "gpl2");
-$license = "gnu-gpl-v3" if ($license eq "gpl3");
-$license = "lppl-1.0" if ($license eq "lppl1");
-$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 = "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");
-$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");
+$license =~ s: apache2 : apache-2.0 :;
+$license =~ s: cc-by-4 : cc-by-v4.0 :;
+$license =~ s: cc-by-sa-4 : cc-by-sa-v4.0 :;
+$license =~ s: fdl : gnu-fdl-v1.3 :;
+$license =~ s: lgpl : gnu-lgpl-v2 :;
+$license =~ s: gpl : gnu-gpl-v2 :;
+$license =~ s: gpl2 : gnu-gpl-v2 :;
+$license =~ s: gpl2+ : gnu-gpl-v2 :;
+$license =~ s: gpl3 : gnu-gpl-v3 :;
+$license =~ s: gpl3+ : gnu-gpl-v3 :;
+$license =~ s: lppl1 : lppl-1.0 :;
+$license =~ s: lppl1.2 : lppl-1.2 :;
+$license =~ s: lppl : lppl-1.3c :;
+$license =~ s: lppl1.3 : lppl-1.3c :;
+$license =~ s: lppl1.3c : lppl-1.3c :;
+$license =~ s: bsd : modified-bsd :;
+$license =~ s: bsd3 : modified-bsd :;
+$license =~ s: bsd2 : 2-clause-bsd :;
+$license =~ s: ofl : ofl-v1.1 :;
+$license =~ s: gfl : gfsl :;
+$license =~ s: pd : public-domain :;
+
+$license =~ s: (.*) :$1:;
+$license =~ s: +: AND :g;
 
 $extras = "";
 $extras .= "\n$depend" if ($depend);


--_----------=_1613797717185080--