diff options
| author | maya <maya@pkgsrc.org> | 2019-05-25 03:58:49 +0000 |
|---|---|---|
| committer | maya <maya@pkgsrc.org> | 2019-05-25 03:58:49 +0000 |
| commit | 62488479bcf6e5f435e429ab9f95b33c0925790b (patch) | |
| tree | a30a9a6902fd25f6e2b49b038b83088a89b740d4 | |
| parent | 79888ac924a58481ffcb32328a5bd9ffaf4fd1f5 (diff) | |
| download | pkgsrc-62488479bcf6e5f435e429ab9f95b33c0925790b.tar.gz | |
url2pkg 2.30:
- Support for creating much of the necessary makefile for a Rust Cargo package
Correct package license
| -rw-r--r-- | pkgtools/url2pkg/Makefile | 7 | ||||
| -rw-r--r-- | pkgtools/url2pkg/files/url2pkg.pl | 18 |
2 files changed, 20 insertions, 5 deletions
diff --git a/pkgtools/url2pkg/Makefile b/pkgtools/url2pkg/Makefile index 43c5f46eaf6..042b6b20482 100644 --- a/pkgtools/url2pkg/Makefile +++ b/pkgtools/url2pkg/Makefile @@ -1,13 +1,12 @@ -# $NetBSD: Makefile,v 1.90 2019/05/23 19:23:13 rillig Exp $ +# $NetBSD: Makefile,v 1.91 2019/05/25 03:58:49 maya Exp $ -PKGNAME= url2pkg-2.29 -PKGREVISION= 1 +PKGNAME= url2pkg-2.30 CATEGORIES= pkgtools MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.NetBSD.org/docs/pkgsrc/creating.html COMMENT= Tool to automate initial steps in building a package -LICENSE= original-bsd +LICENSE= 2-clause-bsd WRKSRC= ${WRKDIR} NO_CHECKSUM= yes diff --git a/pkgtools/url2pkg/files/url2pkg.pl b/pkgtools/url2pkg/files/url2pkg.pl index 79821ce880a..b7a8afe8e43 100644 --- a/pkgtools/url2pkg/files/url2pkg.pl +++ b/pkgtools/url2pkg/files/url2pkg.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: url2pkg.pl,v 1.38 2018/08/22 20:48:38 maya Exp $ +# $NetBSD: url2pkg.pl,v 1.39 2019/05/25 03:58:50 maya Exp $ # # Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -207,6 +207,21 @@ sub magic_perlmod() { $pkgname = "p5-\${DISTNAME}"; } +sub magic_cargo() { + open(CONF, "<", "${abs_wrksrc}/Cargo.lock") or return; + + while (defined(my $line = <CONF>)) { + # "checksum cargo-package-name cargo-package-version + if ($line =~ m/("checksum)\s(\S+)\s(\S+)/) { + push(@build_vars, ["CARGO_CRATE_DEPENDS", "$2-$3"]); + } + } + close(CONF); + + push(@includes, "../../lang/rust/cargo.mk"); +} + + sub magic_pkg_config() { my @pkg_config_files = grep { /\.pc\.in$/ && ! /-uninstalled\.pc\.in$/ } @wrksrc_files; if (@pkg_config_files) { @@ -449,6 +464,7 @@ sub adjust_package_from_extracted_distfiles() magic_gconf2_schemas(); magic_libtool(); magic_perlmod(); + magic_cargo(); magic_pkg_config(); magic_po(); magic_use_languages(); |