Received: by mail.netbsd.org (Postfix, from userid 605) id 5C72A855C4; Wed, 21 Jun 2017 14:05:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E1006855C0 for ; Wed, 21 Jun 2017 14:05:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id v1QvkJzS1Oqp for ; Wed, 21 Jun 2017 14:05:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 6F83C84CE3 for ; Wed, 21 Jun 2017 14:05:29 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6A577FAE8; Wed, 21 Jun 2017 14:05:29 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1498053929104900" MIME-Version: 1.0 Date: Wed, 21 Jun 2017 14:05:29 +0000 From: "Mark Davies" Subject: CVS commit: pkgsrc/pkgtools/texlive2pkg To: pkgsrc-changes@NetBSD.org Reply-To: markd@netbsd.org X-Mailer: log_accum Message-Id: <20170621140529.6A577FAE8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1498053929104900 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: markd Date: Wed Jun 21 14:05:29 UTC 2017 Modified Files: pkgsrc/pkgtools/texlive2pkg: Makefile pkgsrc/pkgtools/texlive2pkg/files: texlive.pkg Log Message: Update texlive2pkg to 1.2 Set default version to 2017 Teach about more license strings To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/texlive2pkg/Makefile cvs rdiff -u -r1.2 -r1.3 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. --_----------=_1498053929104900 Content-Disposition: inline Content-Length: 1804 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.3 pkgsrc/pkgtools/texlive2pkg/Makefile:1.4 --- pkgsrc/pkgtools/texlive2pkg/Makefile:1.3 Sat Jul 9 06:38:49 2016 +++ pkgsrc/pkgtools/texlive2pkg/Makefile Wed Jun 21 14:05:29 2017 @@ -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 Index: pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg diff -u pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.2 pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.3 --- pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg:1.2 Sat Jan 30 04:59:57 2016 +++ pkgsrc/pkgtools/texlive2pkg/files/texlive.pkg Wed Jun 21 14:05:29 2017 @@ -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.0" if ($license eq "l $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"); --_----------=_1498053929104900--