diff options
| author | maya <maya@pkgsrc.org> | 2019-08-18 06:23:19 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2019-08-18 06:23:19 +0000 |
| commit | d770facd88804a9b9db970ea48d6d058d737118a (patch) | |
| tree | d65da462ba20a8bad9ae0e7892a84acf59c8ddc8 /pkgtools | |
| parent | 4f1c51eb9080c5322bf2cd1277060502d166b24c (diff) | |
| download | pkgsrc-d770facd88804a9b9db970ea48d6d058d737118a.tar.gz | |
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 (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/url2pkg/Makefile | 5 | ||||
| -rw-r--r-- | pkgtools/url2pkg/files/url2pkg.pl | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile index 1c103142cde..e4262bb6ad7 100644 --- a/pkgtools/url2pkg/Makefile +++ b/pkgtools/url2pkg/Makefile @@ -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 diff --git a/pkgtools/url2pkg/files/url2pkg.pl b/pkgtools/url2pkg/files/url2pkg.pl index e4b2b2c0e8f..5cbb977e112 100644 --- a/pkgtools/url2pkg/files/url2pkg.pl +++ b/pkgtools/url2pkg/files/url2pkg.pl @@ -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 @@ sub magic_cmake() { 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 @@ sub adjust_package_from_extracted_distfiles() magic_configure(); magic_cmake(); + magic_meson(); magic_gconf2_schemas(); magic_libtool(); magic_perlmod(); |