pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/pkgtools/url2pkg/files



Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu Jan 23 05:53:08 UTC 2025

Modified Files:
        pkgsrc/pkgtools/url2pkg/files: url2pkg.py url2pkg_test.py

Log Message:
url2pkg: fix order of standard package variables

Previously, pkglint warned that the GitHub variables were in the wrong
order.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 pkgsrc/pkgtools/url2pkg/files/url2pkg.py
cvs rdiff -u -r1.55 -r1.56 pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/url2pkg/files/url2pkg.py
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.62 pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.63
--- pkgsrc/pkgtools/url2pkg/files/url2pkg.py:1.62       Thu Jan 23 05:49:53 2025
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg.py    Thu Jan 23 05:53:08 2025
@@ -1,5 +1,5 @@
 #! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.62 2025/01/23 05:49:53 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.63 2025/01/23 05:53:08 rillig Exp $
 
 # Copyright (c) 2019 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -613,12 +613,12 @@ class Generator:
         lines.add('')
 
         lines.add_vars(
-            Var('GITHUB_PROJECT', '=', vars.github_project),
-            Var('GITHUB_TAG', '=', vars.github_tag),
             Var('DISTNAME', '=', vars.distname),
             Var('PKGNAME', '=', vars.pkgname),
             Var('CATEGORIES', '=', vars.categories),
             Var('MASTER_SITES', '=', vars.master_sites),
+            Var('GITHUB_PROJECT', '=', vars.github_project),
+            Var('GITHUB_TAG', '=', vars.github_tag),
             Var('GITHUB_RELEASE', '=', vars.github_release),
             Var('EXTRACT_SUFX', '=', vars.extract_sufx),
             Var('DIST_SUBDIR', '=', vars.dist_subdir),

Index: pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.55 pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.56
--- pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py:1.55  Thu Jan 23 05:49:53 2025
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg_test.py       Thu Jan 23 05:53:08 2025
@@ -1,4 +1,4 @@
-# $NetBSD: url2pkg_test.py,v 1.55 2025/01/23 05:49:53 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.56 2025/01/23 05:53:08 rillig Exp $
 
 # URLs for manual testing:
 #
@@ -398,17 +398,17 @@ def test_PackageVars_adjust_site_SourceF
 
     lines = Generator(url).generate_Makefile()
 
-    assert lines.lines == [
+    assert detab(lines) == [
         mkcvsid,
         '',
-        'DISTNAME=\tcascade-1.4',
-        'CATEGORIES=\tpkgtools',
-        'MASTER_SITES=\t${MASTER_SITE_SOURCEFORGE:=rfcascade/}',
-        '',
-        'MAINTAINER=\tINSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users%NetBSD.org@localhost',
-        'HOMEPAGE=\thttps://rfcascade.sourceforge.net/',
-        'COMMENT=\tTODO: Short description of the package',
-        '#LICENSE=\t# TODO: (see mk/license.mk)',
+        'DISTNAME=       cascade-1.4',
+        'CATEGORIES=     pkgtools',
+        'MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=rfcascade/}',
+        '',
+        'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users%NetBSD.org@localhost',
+        'HOMEPAGE=       https://rfcascade.sourceforge.net/',
+        '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\"",
@@ -422,12 +422,12 @@ def test_PackageVars_adjust_site_GitHub_
     assert detab(lines) == [
         mkcvsid,
         '',
-        'GITHUB_PROJECT= proj',
-        'GITHUB_TAG=     v1.0.0',
         'DISTNAME=       v1.0.0',
         'PKGNAME=        ${GITHUB_PROJECT}-${DISTNAME:S,^v,,}',
         'CATEGORIES=     pkgtools',
         'MASTER_SITES=   ${MASTER_SITE_GITHUB:=org/}',
+        'GITHUB_PROJECT= proj',
+        'GITHUB_TAG=     v1.0.0',
         'DIST_SUBDIR=    ${GITHUB_PROJECT}',
         '',
         'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users%NetBSD.org@localhost',
@@ -447,12 +447,12 @@ def test_PackageVars_adjust_site_GitHub_
     assert detab(lines) == [
         mkcvsid,
         '',
-        'GITHUB_PROJECT= proj',
-        'GITHUB_TAG=     refs/tags/1.0.0',
         'DISTNAME=       1.0.0',
         'PKGNAME=        ${GITHUB_PROJECT}-${DISTNAME}',
         'CATEGORIES=     pkgtools',
         'MASTER_SITES=   ${MASTER_SITE_GITHUB:=org/}',
+        'GITHUB_PROJECT= proj',
+        'GITHUB_TAG=     refs/tags/1.0.0',
         'DIST_SUBDIR=    ${GITHUB_PROJECT}',
         '',
         'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users%NetBSD.org@localhost',
@@ -472,10 +472,10 @@ def test_PackageVars_adjust_site_GitHub_
     assert detab(lines) == [
         mkcvsid,
         '',
-        'GITHUB_TAG=     refs/tags/v${PKGVERSION_NOREV}',
         'DISTNAME=       proj-1.0.0',
         'CATEGORIES=     pkgtools',
         'MASTER_SITES=   ${MASTER_SITE_GITHUB:=org/}',
+        'GITHUB_TAG=     refs/tags/v${PKGVERSION_NOREV}',
         '',
         'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users%NetBSD.org@localhost',
         'HOMEPAGE=       https://github.com/org/proj/',
@@ -497,10 +497,10 @@ def test_PackageVars_adjust_site_GitHub_
     assert detab(lines) == [
         mkcvsid,
         '',
-        'GITHUB_PROJECT= proj',
         'DISTNAME=       proj',
         'CATEGORIES=     pkgtools',
         'MASTER_SITES=   ${MASTER_SITE_GITHUB:=org/}',
+        'GITHUB_PROJECT= proj',
         'GITHUB_RELEASE= 1.0.0',
         'EXTRACT_SUFX=   .zip',
         '',
@@ -522,10 +522,10 @@ def test_PackageVars_adjust_site_GitHub_
     assert detab(lines) == [
         mkcvsid,
         '',
-        'GITHUB_PROJECT= proj',
         'DISTNAME=       data',
         'CATEGORIES=     pkgtools',
         'MASTER_SITES=   ${MASTER_SITE_GITHUB:=org/}',
+        'GITHUB_PROJECT= proj',
         'GITHUB_RELEASE= 1.0.0',
         'EXTRACT_SUFX=   .zip',
         'DIST_SUBDIR=    ${GITHUB_PROJECT}',
@@ -1584,12 +1584,12 @@ def test_Adjuster_adjust_lines_python_mo
     assert detab(adjuster.makefile_lines) == [
         mkcvsid,
         '',
-        'GITHUB_PROJECT= esptool',
-        'GITHUB_TAG=     v2.7',
         'DISTNAME=       v2.7',
         'PKGNAME=        ${GITHUB_PROJECT}-${DISTNAME:S,^v,,}',
         'CATEGORIES=     pkgtools python',
         'MASTER_SITES=   ${MASTER_SITE_GITHUB:=espressif/}',
+        'GITHUB_PROJECT= esptool',
+        'GITHUB_TAG=     v2.7',
         'DIST_SUBDIR=    ${GITHUB_PROJECT}',
         '',
         'MAINTAINER=     INSERT_YOUR_MAIL_ADDRESS_HERE # or use pkgsrc-users%NetBSD.org@localhost',



Home | Main Index | Thread Index | Old Index