CVS commit: pkgsrc/pkgtools/url2pkg

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Sat May 25 03:58:50 UTC 2019

Modified Files:
        pkgsrc/pkgtools/url2pkg: Makefile
        pkgsrc/pkgtools/url2pkg/files: url2pkg.pl

Log Message:
url2pkg 2.30:
- Support for creating much of the necessary makefile for a Rust Cargo package

Correct package license


To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 pkgsrc/pkgtools/url2pkg/Makefile
cvs rdiff -u -r1.38 -r1.39 pkgsrc/pkgtools/url2pkg/files/url2pkg.pl

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/Makefile
diff -u pkgsrc/pkgtools/url2pkg/Makefile:1.90 pkgsrc/pkgtools/url2pkg/Makefile:1.91
--- pkgsrc/pkgtools/url2pkg/Makefile:1.90       Thu May 23 19:23:13 2019
+++ pkgsrc/pkgtools/url2pkg/Makefile    Sat May 25 03:58:49 2019
@@ -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@localhost
 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

Index: pkgsrc/pkgtools/url2pkg/files/url2pkg.pl
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.38 pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.39
--- pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.38       Wed Aug 22 20:48:38 2018
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg.pl    Sat May 25 03:58:50 2019
@@ -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_distfi
        magic_gconf2_schemas();
        magic_libtool();
        magic_perlmod();
+       magic_cargo();
        magic_pkg_config();
        magic_po();
        magic_use_languages();