 @@ -1,15 +1,15 @@
 #! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.24 2019/10/27 19:19:55 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.25 2019/10/28 20:17:24 rillig Exp $
 # Copyright (c) 2019 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Roland Illig.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 @@ -106,46 +106,94 @@ class Globals:
         if len(candidates) != 1:
             return ''
         return str(candidates[0]).replace(str(self.pkgsrcdir), '../..')
     def bmake(self, *args: str) -> None:
         self.debug('running bmake {0} in {1}', args, str(self.pkgdir))
         subprocess.check_call([self.make, *args], cwd=self.pkgdir)
     def show_var(self, varname: str) -> str:
         output = subprocess.check_output((self.make, 'show-var', 'VARNAME=' + varname))
         return output.decode('utf-8').strip()
     def pkgsrc_license(self, license_name: str) -> str:
         comment = ''
         def suffix(suf: str, comm: str):
             nonlocal license_name, comment
             if comment == '' and license_name.endswith(suf):
                 comment = f'\t# {comm}'
                 license_name = license_name[:-len(suf)].rstrip()
         suffix('| file LICENSE', 'OR file LICENSE')
         suffix('+ file LICENSE', '+ file LICENSE')
         known_licenses = (
-            ('',
+            ('2-clause-bsd', 'BSD-2', 'bsd2', 'BSD_2_clause'),
-             'Apache Software License',  # too unspecific; needs a version number
+            # ('2-clause-bsd OR modified-bsd OR original-bsd', 'BSD'),  # XXX: questionable
-             'BSD'),  # too unspecific, may be 2-clause, 3-clause, 4-clause
+            ('acm-license', 'ACM'),
-            ('${PERL5_LICENSE}', 'perl'),
+            ('apache-1.1 OR apache-2.0', 'APACHE'),
-            ('apache-2.0', 'Apache 2', 'Apache 2.0'),
+            ('apache-2.0', 'Apache 2', 'Apache 2.0', 'apache2',
              'Apache Software License', 'Apache License 2.0',
              'Apache License (== 2.0)'),
             ('apache-2.0 AND lppl-1.3c', 'apache2lppl', 'apache2lppl1.3c',
              'lppl1.3capache2'),
             ('artistic OR artistic-2.0', 'ARTISTIC'),
             ('artistic-2.0', 'artistic_2'),
-            ('gnu-gpl-v3', 'GNU Lesser General Public License (LGPL), Version 3'),
+            ('boost-license', 'BSL-1.0'),
-            ('gnu-lgpl-v2', 'LGPL'),
+            ('cc-by-v4.0', 'cc-by-4'),
             ('cc0-1.0-universal', 'CC0'),
             ('gfsl', 'gfl'),
             ('gnu-fdl-v1.3', 'fdl'),
             ('gnu-gpl-v1', 'GPL-1'),
             ('gnu-gpl-v1 OR gnu-gpl-v2 OR gnu-gpl-v3', 'GPL'),
             ('gnu-gpl-v2', 'gpl', 'gpl2', 'GPL-2'),
             ('gnu-gpl-v2 AND cc-by-sa-v4.0', 'gpl3+cc-by-sa-4'),
             ('gnu-gpl-v2 AND lppl-1.3c', 'lpplgpl', 'gpl2lppl'),
             ('gnu-gpl-v2 AND ofl-v1.1 AND lppl-1.3c', 'gplofllppl'),
             ('gnu-gpl-v2 OR gnu-gpl-v3', 'GPL-2 | GPL-3', 'GPL (>= 2)', 'GPL (>= 2.0)'),
             ('gnu-gpl-v3', 'gpl3', 'GPL-3',
              'GNU Lesser General Public License (LGPL), Version 3'),
             ('gnu-gpl-v3', 'GPL (>= 3)'),
             ('gnu-lgpl-v2', 'LGPL', 'LGPL-2'),
             ('gnu-lgpl-v2 OR gnu-lgpl-v2.1 OR gnu-lgpl-v3', 'LGPL'),
             ('gnu-lgpl-v2.1', 'LGPL-2.1'),
             ('gnu-lgpl-v3', 'LGPL-3'),
             ('gnu-lgpl-v2 OR gnu-lgpl-v3', 'LGPL-2 | LGPL-3'),
             ('gnu-lgpl-v2 OR gnu-lgpl-v2.1 OR gnu-lgpl-v3', 'LGPL (>= 2)'),
             ('lppl-1.0', 'lppl1'),
             ('lppl-1.2', 'lppl1.2'),
             ('lppl-1.3c', 'lppl', 'lppl1.3', 'lppl1.3c'),
             ('lucent', 'LUCENT', 'Lucent Public License'),
             ('mit', 'MIT', 'MIT License'),
-            ('python-software-foundation',
+            ('mit\t# + file LICENSE OR unlimited', 'MIT + file LICENSE | Unlimited'),
-             'PSF', 'PSF license', 'Python Software Foundation License'),
+            ('mit AND lppl-1.3c', 'mitlppl'),
             ('modified-bsd', 'bsd3', 'BSD 3 clause', 'BSD_3_clause'),
             ('ofl-v1.1', 'ofl'),
             ('ofl-v1.1 AND lppl-1.3c', 'ofllppl1.3', 'ofllppl1.3c', 'ofllppl'),
             ('${PERL5_LICENSE}', 'perl'),
             ('postgresql-license', 'POSTGRESQL'),
             ('public-domain', 'pd'),
             ('python-software-foundation', 'PSF', 'PSF license',
              'Python Software Foundation License'),
             ('zpl-2.1', 'ZPL 2.1'),
+        )
-        for known_license in known_licenses:
+        lower = license_name.lower()
-            if license_name in known_license:
+        for group in known_licenses:
-                return known_license[0]
+            if lower in map(str.lower, group):
-        if (self.pkgsrcdir / 'licenses' / license_name).is_file():
+                return group[0] + comment
-            return license_name
+        if (self.pkgsrcdir / 'licenses' / lower).is_file():
             return lower + comment
         return ''
 class Lines:
     """
     A list of lines (typically from a Makefile, but other file types work as
     well) with high-level methods for manipulating variable assignments.
     """
     lines: List[str]
     def __init__(self, *lines: str) -> None:
         self.lines = []
         for line in lines:

 @@ -1,14 +1,14 @@
-# $NetBSD: url2pkg_test.py,v 1.23 2019/10/27 19:19:55 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.24 2019/10/28 20:17:24 rillig Exp $
 import pytest
 from url2pkg import *
 mkcvsid = '# $''NetBSD$'
 g: Globals
 prev_dir = Path.cwd()
 def setup_function(_):
     global g
     g = Globals()
 @@ -84,33 +84,36 @@ def test_Global_debug():
 def test_Global_bmake():
     g.verbose = True
     g.make = 'echo'
     g.bmake('hello', 'world')
     assert g.err.written() == [
         'url2pkg: running bmake (\'hello\', \'world\') in \'.\'',
+    ]
 def test_Global_pkgsrc_license():
-    assert g.pkgsrc_license('BSD') == ''
+    assert g.pkgsrc_license('BSD') == ''  # too unspecific
     assert g.pkgsrc_license('apache-2.0') == 'apache-2.0'
     assert g.pkgsrc_license('Apache 2') == 'apache-2.0'
     # Not explicitly in the list, looked up from PKGSRCDIR.
     assert g.pkgsrc_license('skype21-license') == 'skype21-license'
     assert g.pkgsrc_license('mit + file LICENSE') == 'mit\t# + file LICENSE'
     assert g.pkgsrc_license('MIT | file LICENSE') == 'mit\t# OR file LICENSE'
     # Neither in the list nor in PKGSRCDIR/licenses.
     assert g.pkgsrc_license('unknown') == ''
 def test_Lines__write_and_read(tmp_path: Path):
     example = tmp_path / 'example'
     lines = Lines('1', '2', '3')
     lines.write_to(example)
     assert example.read_text() == '1\n2\n3\n'

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.107 2019/10/27 19:19:54 rillig Exp $
+# $NetBSD: Makefile,v 1.108 2019/10/28 20:17:24 rillig Exp $
-PKGNAME=	url2pkg-19.3.4
+PKGNAME=	url2pkg-19.3.5
 CATEGORIES=	pkgtools
 MAINTAINER=	rillig@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/docs/pkgsrc/creating.html
 COMMENT=	Tool to automate initial steps in building a package
 LICENSE=	2-clause-bsd
 WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_BUILD=	yes
 USE_LANGUAGES=	# none
 USE_TOOLS+=	perl:run
 AUTO_MKDIRS=	yes