summaryrefslogtreecommitdiff
path: root/pkgtools/url2pkg
diff options
context:
space:
mode:
authorprlw1 <prlw1@pkgsrc.org>2019-10-07 09:28:09 +0000
committerprlw1 <prlw1@pkgsrc.org>2019-10-07 09:28:09 +0000
commit9db9a4a74a876e74b9b2560f93b535e2642492d6 (patch)
tree4a7b6f4f772ffb79d52d3aa6359f4b94a4d920a9 /pkgtools/url2pkg
parent51cf450be45a51f593eca7ef41c55c94ae28aebd (diff)
downloadpkgsrc-9db9a4a74a876e74b9b2560f93b535e2642492d6.tar.gz
Rename py-meson to meson.
The motivation is to consider meson as an application, so there is only one copy on the system, and as a python 3 program, it can build python 2 packages.
Diffstat (limited to 'pkgtools/url2pkg')
-rw-r--r--pkgtools/url2pkg/files/url2pkg.py4
-rw-r--r--pkgtools/url2pkg/files/url2pkg_test.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/url2pkg/files/url2pkg.py b/pkgtools/url2pkg/files/url2pkg.py
index 9de0bdbf70a..5660142f3a1 100644
--- a/pkgtools/url2pkg/files/url2pkg.py
+++ b/pkgtools/url2pkg/files/url2pkg.py
@@ -1,5 +1,5 @@
#! @PYTHONBIN@
-# $NetBSD: url2pkg.py,v 1.18 2019/10/06 12:50:23 rillig Exp $
+# $NetBSD: url2pkg.py,v 1.19 2019/10/07 09:28:13 prlw1 Exp $
# Copyright (c) 2019 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -651,7 +651,7 @@ class Adjuster:
def adjust_meson(self):
if self.wrksrc_isfile('meson.build'):
- self.includes.append('../../devel/py-meson/build.mk')
+ self.includes.append('../../devel/meson/build.mk')
def adjust_gconf2_schemas(self):
gconf2_files = self.wrksrc_find(r'\.schemas(\.in)*$')
diff --git a/pkgtools/url2pkg/files/url2pkg_test.py b/pkgtools/url2pkg/files/url2pkg_test.py
index 3c06fe8ee37..9cfc561a77f 100644
--- a/pkgtools/url2pkg/files/url2pkg_test.py
+++ b/pkgtools/url2pkg/files/url2pkg_test.py
@@ -1,4 +1,4 @@
-# $NetBSD: url2pkg_test.py,v 1.17 2019/10/06 12:50:23 rillig Exp $
+# $NetBSD: url2pkg_test.py,v 1.18 2019/10/07 09:28:13 prlw1 Exp $
import pytest
from url2pkg import *
@@ -959,7 +959,7 @@ def test_Adjuster_adjust_meson(tmp_path: Path):
adjuster.adjust_meson()
- assert adjuster.includes == ['../../devel/py-meson/build.mk']
+ assert adjuster.includes == ['../../devel/meson/build.mk']
def test_Adjuster_adjust_perl_module_Build_PL(tmp_path: Path):