 @@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.120 2021/11/14 08:57:15 rillig Exp $
+# $NetBSD: Makefile,v 1.121 2021/11/14 09:20:15 rillig Exp $
-PKGNAME=	url2pkg-21.1.0
+PKGNAME=	url2pkg-21.3.0
 PKGREVISION=	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

 @@ -1,15 +1,15 @@
 #! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.32 2021/05/25 17:56:24 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.33 2021/11/14 09:20:15 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
 @@ -421,30 +421,38 @@ class Generator:
             (.+)/               # org
             (.+)/archive/       # proj
             ((?:.+/)?           # tag
                      (.+))      # distname
             (\.tar\.gz|\.zip)   # ext
+            $
             '''
         m = re.search(pattern, self.url)
         if not m:
             return
         org, proj, tag, distname, ext = m.groups()
         self.github_project = proj
         self.github_tag = tag
         self.master_sites = f'${{MASTER_SITE_GITHUB:={org}/}}'
         self.homepage = f'https://github.com/{org}/{proj}/'
         m = re.search(r'^refs/tags/v(\d[\d.]*)$', tag)
         if m:
             version = m.group(1)
             self.distfile = f'{proj}-{version}{ext}'
             self.github_tag = f'refs/tags/v${{PKGVERSION_NOREV}}'
             return
         self.github_project = proj
         self.github_tag = tag
         if proj not in tag:
             self.pkgname_prefix = '${GITHUB_PROJECT}-'
             self.dist_subdir = '${GITHUB_PROJECT}'
         self.distfile = distname + ext
     def adjust_site_GitHub_release(self):
         pattern = r'''(?x)
             ^https://github\.com/
             (.+)/               # org
             (.+)/               # proj
             releases/download/
             (.+)/               # tag
             (.+)                # base

 @@ -1,14 +1,14 @@
-# $NetBSD: url2pkg_test.py,v 1.32 2021/11/14 08:57:15 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.33 2021/11/14 09:20:15 rillig Exp $
 import pytest
 from url2pkg import *
 from textwrap import dedent
 mkcvsid = '# $''NetBSD$'
 g: Globals
 prev_dir = Path.cwd()
 def setup_function(_):
     global g
 @@ -446,44 +446,37 @@ def test_Generator_adjust_site_GitHub_ar
         'MASTER_SITES=   ${MASTER_SITE_GITHUB:=org/}',
         'DIST_SUBDIR=    ${GITHUB_PROJECT}',
         '',
         'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users@NetBSD.org',
         'HOMEPAGE=       https://github.com/org/proj/',
         '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\"",
+    ]
 # TODO: There is a simpler package definition for this scenario, see
 # wip/netmask.  That package only defines:
 #	DISTNAME=proj-version
 #	GITHUB_TAG=v${PKGVERSION_NOREV}
 def test_Generator_adjust_site_GitHub_archive__tag_v():
     url = 'https://github.com/org/proj/archive/refs/tags/v1.0.0.tar.gz'
     lines = Generator(url).generate_Makefile()
     assert detab(lines) == [
         mkcvsid,
         '',
-        'GITHUB_PROJECT= proj',
+        'GITHUB_TAG=     refs/tags/v${PKGVERSION_NOREV}',
-        'GITHUB_TAG=     refs/tags/v1.0.0',
+        'DISTNAME=       proj-1.0.0',
         'DISTNAME=       v1.0.0',
         'PKGNAME=        ${GITHUB_PROJECT}-${DISTNAME:S,^v,,}',
         'CATEGORIES=     pkgtools',
         'MASTER_SITES=   ${MASTER_SITE_GITHUB:=org/}',
         'DIST_SUBDIR=    ${GITHUB_PROJECT}',
         '',
         'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users@NetBSD.org',
         'HOMEPAGE=       https://github.com/org/proj/',
         '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_GitHub_release__containing_project_name():
     url = 'https://github.com/org/proj/releases/download/1.0.0/proj.zip'