summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2017-06-21 14:05:29 +0000
committermarkd <markd@pkgsrc.org>2017-06-21 14:05:29 +0000
commitf412e9df50c5e04d6d1f85130bb14c0e5eadcc13 (patch)
tree1bf38aebc52eddb33373b4c74031d8cb8f3ef853 /pkgtools
parent8e8e6ace1797ab7005ae993c5e903d5191c61956 (diff)
downloadpkgsrc-f412e9df50c5e04d6d1f85130bb14c0e5eadcc13.tar.gz
Update texlive2pkg to 1.2
Set default version to 2017 Teach about more license strings
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/texlive2pkg/Makefile5
-rwxr-xr-xpkgtools/texlive2pkg/files/texlive.pkg8
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgtools/texlive2pkg/Makefile b/pkgtools/texlive2pkg/Makefile
index e8a25040889..bfd43f38d98 100644
--- a/pkgtools/texlive2pkg/Makefile
+++ b/pkgtools/texlive2pkg/Makefile
@@ -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
diff --git a/pkgtools/texlive2pkg/files/texlive.pkg b/pkgtools/texlive2pkg/files/texlive.pkg
index 45a229c0f1e..39713026702 100755
--- a/pkgtools/texlive2pkg/files/texlive.pkg
+++ b/pkgtools/texlive2pkg/files/texlive.pkg
@@ -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 "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 = "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");