 @@ -1,14 +1,14 @@
-.\"	$NetBSD: url2pkg.8,v 1.15 2022/01/01 14:04:11 rillig Exp $
+.\"	$NetBSD: url2pkg.8,v 1.16 2022/01/01 15:29:14 rillig Exp $
 .\"
 .\" Copyright (c) 2001, 2019 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" This code is derived from software contributed to The NetBSD Foundation
 .\" by Emmanuel Dreyfus and 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
 @@ -26,27 +26,27 @@
 .\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .Dd January 1, 2022
 .Dt URL2PKG 8
 .Os
 .Sh NAME
 .Nm url2pkg
 .Nd Automatic pkgsrc package generator
 .Sh SYNOPSIS
 .Nm
 .Op Fl v|--verbose
-.Op Ar URL
+.Ar URL
 .Sh DESCRIPTION
 .Nm
 takes the
 .Ar URL
 to a package's distfile that should be turned into a package.
 It fetches the distfile, extracts it, and by looking at the extracted files,
 fills in some variables in the package
 .Pa Makefile .
 .Pp
 .Nm
 helps creating a package;
 it is not intended to fly on autopilot, though.
 .Pp

 @@ -1,15 +1,15 @@
 #! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.34 2022/01/01 14:04:11 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.35 2022/01/01 15:29:14 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
 @@ -402,26 +402,48 @@ class Generator:
             ([^/?]+)        # filename
             (?:\?.*)?       # query parameters
+            $
             '''
         m = re.search(pattern, self.url)
         if not m:
             return
         project, subdir, filename = m.groups()
         self.master_sites = f'${{MASTER_SITE_SOURCEFORGE:={project}/{subdir}}}'
         self.homepage = f'https://{project}.sourceforge.net/'
         self.distfile = filename
     def adjust_site_PyPI(self):
         pattern = r'''(?x)
+            ^
             https://files\.pythonhosted\.org/packages/
             ../../.{60}/  # hash
             (             # distfile
             (.*)          #     project
             -[0-9].*      #     version
             \.tar\.gz
+            )
+            $
             '''
         m = re.search(pattern, self.url)
         if not m:
             return
         filename, project = m.groups()
         self.master_sites = f'${{MASTER_SITE_PYPI:={project[0]}/{project}/}}'
         self.homepage = f'https://pypi.org/project/{project}/'
         self.distfile = filename
     def adjust_site_GitHub_archive(self):
         pattern = r'''(?x)
+            ^
             https://github\.com/
             (.+)/               # org
             (.+)/archive/       # proj
             ((?:.+/)?           # tag
                      (.+))      # distname
             (\.tar\.gz|\.zip)   # ext
+            $
             '''
         m = re.search(pattern, self.url)
         if not m:
 @@ -535,26 +557,27 @@ class Generator:
             Var('#LICENSE', '=', '# TODO: (see mk/license.mk)'),
+        )
         lines.add('# url2pkg-marker (please do not remove this line.)')
         lines.add('.include "../../mk/bsd.pkg.mk"')
         return lines
     def generate_Makefile(self) -> Lines:
         self.adjust_site_SourceForge()
         self.adjust_site_GitHub_archive()
         self.adjust_site_GitHub_release()
         self.foreach_site_from_sites_mk(self.adjust_site_from_sites_mk)
         self.adjust_site_PyPI()
         self.adjust_site_other()
         self.adjust_everything_else()
         return self.generate_lines()
     def generate_package(self, g: Globals) -> Lines:
         pkgdir = g.pkgdir
         makefile = pkgdir / 'Makefile'
         plist = pkgdir / 'PLIST'
         initial_lines = self.generate_Makefile()
         try:
             makefile.replace(f'{makefile}.url2pkg~')
 @@ -1171,27 +1194,27 @@ class Adjuster:
         self.adjust_pkg_config()
         self.adjust_po()
         self.adjust_use_languages()
         self.generate_lines().write_to(self.g.pkgdir / 'Makefile')
         descr = (self.g.pkgdir / 'DESCR')
         descr.is_file() or Lines(*self.descr_lines).write_to(descr)
         if self.regenerate_distinfo:
             self.g.bmake('distinfo')
 def usage():
-    sys.exit(f'usage: {sys.argv[0]} [-v|--verbose] [URL]')
+    sys.exit(f'usage: {sys.argv[0]} [-v|--verbose] URL')
 def main(argv: List[str], g: Globals):
     if not os.path.isfile('../../mk/bsd.pkg.mk'):
         sys.exit(f'{argv[0]}: must be run from a package directory '
                  f'(.../pkgsrc/category/package)')
     try:
         opts, args = getopt.getopt(argv[1:], 'v', ['verbose'])
         for (opt, _) in opts:
             if opt in ('-v', '--verbose'):
                 g.verbose = True
     except getopt.GetoptError:

 @@ -1,14 +1,14 @@
-# $NetBSD: url2pkg_test.py,v 1.35 2022/01/01 15:04:58 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.36 2022/01/01 15:29:14 rillig Exp $
 import pytest
 from url2pkg import *
 from textwrap import dedent
 mkcvsid = '# $''NetBSD$'
 g: Globals
 prev_dir = Path.cwd()
 def setup_function(_):
     global g
 @@ -603,34 +603,30 @@ def test_Generator_adjust_site_from_site
 def test_Generator_adjust_site_from_sites_mk__PyPI():
     url = ('https://files.pythonhosted.org/'
            + 'packages/da/8b/218264f5ce91df1ad27ce8021d51b747ef287627338fe05d170565358546/'
            + 'apprise-0.9.6.tar.gz')
     generator = Generator(url)
     lines = generator.generate_Makefile()
     assert detab(lines) == [
         mkcvsid,
         '',
         'DISTNAME=       apprise-0.9.6',
         'CATEGORIES=     pkgtools',
-        # TODO: ${MASTER_SITE_PYPI:=a/apprise/}
+        'MASTER_SITES=   ${MASTER_SITE_PYPI:=a/apprise/}',
         'MASTER_SITES=   https://files.pythonhosted.org/packages/da/8b/'
         + '218264f5ce91df1ad27ce8021d51b747ef287627338fe05d170565358546/',
         '',
         'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users@NetBSD.org',
-        # TODO: https://pypi.org/project/apprise/
+        'HOMEPAGE=       https://pypi.org/project/apprise/',
         'HOMEPAGE=       https://files.pythonhosted.org/packages/da/8b/'
         + '218264f5ce91df1ad27ce8021d51b747ef287627338fe05d170565358546/',
         'COMMENT=        TODO: Short description of the package',
         '#LICENSE=       # TODO: (see mk/license.mk)',
         '',
         '# url2pkg-marker (please do not remove this line.)',
         '.include "../../mk/bsd.pkg.mk"',
+    ]
 def test_Generator_adjust_site_from_sites_mk__R(tmp_path: Path):
     g.pkgdir = tmp_path
     url = 'http://cran.r-project.org/src/contrib/forecast_8.7.tar.gz'
     generator = Generator(url)

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.122 2022/01/01 14:04:11 rillig Exp $
+# $NetBSD: Makefile,v 1.123 2022/01/01 15:29:14 rillig Exp $
-PKGNAME=	url2pkg-21.4.0
+PKGNAME=	url2pkg-21.4.1
 CATEGORIES=	pkgtools
 MAINTAINER=	rillig@NetBSD.org
 HOMEPAGE=	https://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