[pkgsrc/trunk]: pkgsrc/pkgtools/url2pkg url2pkg 2.31:

[maya <maya%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e6932c5e9b21
branches:  trunk
changeset: 338069:e6932c5e9b21
user:      maya <maya%pkgsrc.org@localhost>
date:      Sun Aug 18 06:23:19 2019 +0000

description:
url2pkg 2.31:

maya:
detect meson

rillig:
refactor generation of Makefiles
rename local variables to match pkgsrc counterparts
make print_section simpler to use
run editor with line number only if supported
refactoring to make Makefile generation testable
make dist_subdir a local variable
initialize dist_subdir early
fix indentation
fix for p5-HTML-Quoted
fix parsing of mk/fetch/sites.mk

diffstat:

 pkgtools/url2pkg/Makefile         |   5 ++---
 pkgtools/url2pkg/files/url2pkg.pl |  10 +++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diffs (45 lines):

diff -r a5b352555aae -r e6932c5e9b21 pkgtools/url2pkg/Makefile
--- a/pkgtools/url2pkg/Makefile Sun Aug 18 06:10:38 2019 +0000
+++ b/pkgtools/url2pkg/Makefile Sun Aug 18 06:23:19 2019 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.92 2019/08/11 13:22:37 wiz Exp $
+# $NetBSD: Makefile,v 1.93 2019/08/18 06:23:19 maya Exp $
 
-PKGNAME=       url2pkg-2.30
-PKGREVISION=   1
+PKGNAME=       url2pkg-2.31
 CATEGORIES=    pkgtools
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r a5b352555aae -r e6932c5e9b21 pkgtools/url2pkg/files/url2pkg.pl
--- a/pkgtools/url2pkg/files/url2pkg.pl Sun Aug 18 06:10:38 2019 +0000
+++ b/pkgtools/url2pkg/files/url2pkg.pl Sun Aug 18 06:23:19 2019 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: url2pkg.pl,v 1.49 2019/08/18 06:10:38 rillig Exp $
+# $NetBSD: url2pkg.pl,v 1.50 2019/08/18 06:23:19 maya Exp $
 #
 
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -154,6 +154,13 @@
        push(@build_vars, ["USE_CMAKE", "yes"]);
 }
 
+sub magic_meson() {
+       open(CONF, "<", "${abs_wrksrc}/meson.build") or return;
+       close(CONF);
+
+       push(@includes, "../../devel/py-meson/build.mk");
+}
+
 sub magic_gconf2_schemas() {
        my @gconf2_files = grep(/schemas(?:\.in.*)$/, @wrksrc_files);
        if (@gconf2_files) {
@@ -465,6 +472,7 @@
 
        magic_configure();
        magic_cmake();
+       magic_meson();
        magic_gconf2_schemas();
        magic_libtool();
        magic_perlmod();