Mon Sep 9 08:08:03 2019 UTC ()

url2pkg 2.33: fix cargo packaging typo.

We don't have a third match to the regex.


(maya)

diff -r1.95 -r1.96 pkgsrc/pkgtools/url2pkg/Makefile
diff -r1.63 -r1.64 pkgsrc/pkgtools/url2pkg/files/url2pkg.pl

--- pkgsrc/pkgtools/url2pkg/Makefile 2019/08/18 13:32:21 1.95
+++ pkgsrc/pkgtools/url2pkg/Makefile 2019/09/09 08:08:02 1.96

 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.95 2019/08/18 13:32:21 rillig Exp $
+# $NetBSD: Makefile,v 1.96 2019/09/09 08:08:02 maya Exp $
-PKGNAME=	url2pkg-2.32
+PKGNAME=	url2pkg-2.33
 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=	2-clause-bsd
 WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_BUILD=	yes
 USE_LANGUAGES=	# none
 USE_TOOLS+=	perl:run
 AUTO_MKDIRS=	yes

--- pkgsrc/pkgtools/url2pkg/files/Attic/url2pkg.pl 2019/08/18 21:04:37 1.63
+++ pkgsrc/pkgtools/url2pkg/files/Attic/url2pkg.pl 2019/09/09 08:08:02 1.64

	@@ -1,15 +1,15 @@			@@ -1,15 +1,15 @@
1	#! @PERL5@		1	#! @PERL5@
2	# $NetBSD: url2pkg.pl,v 1.63 2019/08/18 21:04:37 rillig Exp $		2	# $NetBSD: url2pkg.pl,v 1.64 2019/09/09 08:08:02 maya Exp $
3	#		3	#
4			4
5	# Copyright (c) 2010 The NetBSD Foundation, Inc.		5	# Copyright (c) 2010 The NetBSD Foundation, Inc.
6	# All rights reserved.		6	# All rights reserved.
7	#		7	#
8	# This code is derived from software contributed to The NetBSD Foundation		8	# This code is derived from software contributed to The NetBSD Foundation
9	# by Roland Illig.		9	# by Roland Illig.
10	#		10	#
11	# Redistribution and use in source and binary forms, with or without		11	# Redistribution and use in source and binary forms, with or without
12	# modification, are permitted provided that the following conditions		12	# modification, are permitted provided that the following conditions
13	# are met:		13	# are met:
14	# 1. Redistributions of source code must retain the above copyright		14	# 1. Redistributions of source code must retain the above copyright
15	# notice, this list of conditions and the following disclaimer.		15	# notice, this list of conditions and the following disclaimer.
	@@ -417,27 +417,27 @@ sub adjust_python_module() {			@@ -417,27 +417,27 @@ sub adjust_python_module() {
417	add_dependency($type, $pkgbase, $constraint, $dep_dir);		417	add_dependency($type, $pkgbase, $constraint, $dep_dir);
418	}		418	}
419			419
420	push(@categories, "python");		420	push(@categories, "python");
421	push(@includes, "../../lang/python/egg.mk");		421	push(@includes, "../../lang/python/egg.mk");
422	}		422	}
423			423
424	sub adjust_cargo() {		424	sub adjust_cargo() {
425	open(CONF, "<", "$abs_wrksrc/Cargo.lock") or return;		425	open(CONF, "<", "$abs_wrksrc/Cargo.lock") or return;
426			426
427	while (defined(my $line = <CONF>)) {		427	while (defined(my $line = <CONF>)) {
428	# "checksum cargo-package-name cargo-package-version		428	# "checksum cargo-package-name cargo-package-version
429	if ($line =~ qr"^\"checksum\s(\S+)\s(\S+)") {		429	if ($line =~ qr"^\"checksum\s(\S+)\s(\S+)") {
430	push(@build_vars, var("CARGO_CRATE_DEPENDS", "+=", "$2-$3"));		430	push(@build_vars, var("CARGO_CRATE_DEPENDS", "+=", "$1-$2"));
431	}		431	}
432	}		432	}
433	close(CONF);		433	close(CONF);
434			434
435	push(@includes, "../../lang/rust/cargo.mk");		435	push(@includes, "../../lang/rust/cargo.mk");
436	}		436	}
437			437
438			438
439	sub adjust_pkg_config() {		439	sub adjust_pkg_config() {
440	my @pkg_config_files = grep { /\.pc\.in$/ && ! /-uninstalled\.pc\.in$/ } @wrksrc_files;		440	my @pkg_config_files = grep { /\.pc\.in$/ && ! /-uninstalled\.pc\.in$/ } @wrksrc_files;
441	if (@pkg_config_files) {		441	if (@pkg_config_files) {
442	push(@build_vars, var("USE_TOOLS", "+=", "pkg-config"));		442	push(@build_vars, var("USE_TOOLS", "+=", "pkg-config"));
443	}		443	}