 @@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.96 2019/09/09 08:08:02 maya Exp $
+# $NetBSD: Makefile,v 1.97 2019/09/11 05:25:55 rillig Exp $
-PKGNAME=	url2pkg-2.33
+PKGNAME=	url2pkg-2.34
 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
 @@ -19,27 +19,23 @@ do-extract:
 	${RUN} cd ${FILESDIR} && cp *.* ${WRKSRC}/
 do-test:
 	${RUN} cd ${WRKSRC} && env PKGSRCDIR=${PKGSRCDIR} perl -I. url2pkg.t
 .include "../../mk/bsd.prefs.mk"
 SUBST_CLASSES+=		up
 SUBST_STAGE.up=		do-configure
 SUBST_MESSAGE.up=	Replacing variable placeholders
 SUBST_FILES.up=		url2pkg.pl MakeMaker.pm
 SUBST_VARS.up=		MAKE PERL5 PYTHONBIN
 SUBST_SED.up+=		-e 's,@LIBDIR@,${PREFIX}/lib/url2pkg,g'
-.if defined(BATCH)
+SUBST_SED.up+=		-e 's,@PKGSRCDIR@,${BATCH:D/usr/pkgsrc:U${PKGSRCDIR}},g'
 SUBST_SED.up+=		-e 's,@PKGSRCDIR@,/usr/pkgsrc,g'
 .else
 SUBST_VARS.up+=		PKGSRCDIR
 .endif
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/url2pkg.pl ${DESTDIR}${PREFIX}/bin/url2pkg
 	${INSTALL_MAN} ${FILESDIR}/url2pkg.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 	${INSTALL_DATA} ${WRKSRC}/MakeMaker.pm ${DESTDIR}${PREFIX}/lib/url2pkg/ExtUtils/
 	${INSTALL_DATA} ${WRKSRC}/setuptools.py ${DESTDIR}${PREFIX}/lib/url2pkg/
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -29,87 +29,86 @@
 # This is a drop-in replacement for the MakeMaker Perl module. Instead
 # of generating a Makefile, it extracts the dependency information for
 # other Perl modules. It is used to simplify the generation of pkgsrc
 # packages for Perl modules.
 package ExtUtils::MakeMaker;
 require 5.013002;
 use strict;
 use warnings;
-use constant conf_pkgsrcdir	=> '@PKGSRCDIR@';
+my $url2pkg_pkgsrcdir = '@PKGSRCDIR@';
 BEGIN {
 	use Exporter;
 	use vars qw(@ISA @EXPORT);
 	@ISA = qw(Exporter);
+}
 # From lib/perl5/5.18.0/ExtUtils/MakeMaker.pm
 our $VERSION = '6.66';
 our $Verbose	= 0;	# exported
 our @EXPORT	= qw(&WriteMakefile &prompt $Verbose $version);
 our @EXPORT_OK	= qw(&neatvalue &_sprintf562);
 # Finds and returns the category a given package lies in.
-# If the package does not exist, C<undef> is returned.
+# If the package does not exist, an empty string is returned.
 # If the package exists more than once, it is unspecified which
 # of the categories is returned.
-sub find_category($) {
+sub url2pkg_find_category($) {
 	my ($pkg) = @_;
 	my ($retval, $pkgsrcdir);
-	opendir(D, conf_pkgsrcdir) or die;
+	opendir(D, $url2pkg_pkgsrcdir) or die;
-	foreach my $cat (readdir(D)) {
+	my @categories = readdir(D);
-		next if ($cat =~ qr"^\.");
+	closedir(D) or die;
 	foreach my $cat (@categories) {
 		next if $cat =~ qr"^\.";
-		if (-f (conf_pkgsrcdir."/${cat}/${pkg}/Makefile")) {
+		if (-f "$url2pkg_pkgsrcdir/$cat/$pkg/Makefile") {
-			$retval = $cat;
+			return $cat;
+		}
+	}
-	closedir(D) or die;
+	return "";
 	return $retval;
+}
-sub writeDependency($$) {
+sub url2pkg_write_dependency($$) {
 	my ($dep, $ver) = @_;
-	my $pkgbase = "p5-" . ($dep =~ s/::/-/gr);
+	my $pkgbase = "p5-$dep" =~ s/::/-/gr;
-	my $category = find_category($pkgbase);
+	my $category = url2pkg_find_category($pkgbase);
-	if (defined($category)) {
+	if ($category ne "") {
 		printf("DEPENDS\t%s>=%s:../../%s/%s\n", $pkgbase, $ver, $category, $pkgbase);
 		return;
+	}
-	# If the package does not exist but the Perl module can be
+	# If the package does not exist but the Perl module can be loaded, assume
-	# loaded, assume that no extra dependency is needed.
+	# that it is a built-in module and no dependency declaration is needed.
 	return if eval("use $dep $ver; 1;");
-	die("$0: ERROR: No pkgsrc package found for dependency ${dep}>=${ver}.\n$@\n");
+	die("$0: ERROR: No pkgsrc package found for dependency $dep>=$ver.\n$@\n");
+}
 sub WriteMakefile(%) {
 	my (%options) = @_;
-	if (exists($options{"PREREQ_PM"})) {
+	my $deps = $options{"PREREQ_PM"} || {};
-		my $deps = $options{"PREREQ_PM"};
+	foreach my $dep (sort(keys(%$deps))) {
-		foreach my $dep (sort(keys(%{$deps}))) {
+		url2pkg_write_dependency($dep, $deps->{$dep});
 			writeDependency($dep, $deps->{$dep});
+	}
+}
 sub prompt(@) {
 	my ($message, $default) = @_;
 	return $default || "";
+}
 sub neatvalue {
 	return;
+}

 @@ -1,15 +1,15 @@
 #! @PERL5@
-# $NetBSD: url2pkg.pl,v 1.64 2019/09/09 08:08:02 maya Exp $
+# $NetBSD: url2pkg.pl,v 1.65 2019/09/11 05:25:55 rillig Exp $
+#
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Roland Illig.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 @@ -343,59 +343,72 @@ sub adjust_gconf2_schemas() {
 sub adjust_libtool() {
 	if (-f "$abs_wrksrc/ltconfig" || -f "$abs_wrksrc/ltmain.sh") {
 		push(@build_vars, var("USE_LIBTOOL", "=", "yes"));
+	}
 	if (-d "$abs_wrksrc/libltdl") {
 		push(@includes, "../../devel/libltdl/convenience.mk");
+	}
+}
 sub adjust_perl_module() {
 	if (-f "$abs_wrksrc/Build.PL") {
 		# Example packages:
 		# devel/p5-Algorithm-CheckDigits
 		# It's a Module::Build module. Dependencies cannot yet be
 		# extracted automatically.
+		#
 		# TODO: Implement this similarly to the Makefile.PL mock below.
 		push(@todos, "Look for the dependencies in Build.PL.");
 		push(@build_vars, var("PERL5_MODULE_TYPE", "=", "Module::Build"));
 	} elsif (-f "$abs_wrksrc/Makefile.PL") {
 		# Example packages:
 		# devel/p5-Algorithm-Diff (no dependencies)
 		# devel/p5-Carp-Assert-More (dependencies without version numbers)
 		# www/p5-HTML-Quoted (dependency with version number)
 		# To avoid fix_up_makefile error for p5-HTML-Quoted, generate Makefile first.
 		system("cd '$abs_wrksrc' && perl -I. Makefile.PL < /dev/null") or do {};
 		open(DEPS, "cd '$abs_wrksrc' && perl -I$libdir -I. Makefile.PL |") or die;
 		while (defined(my $dep = <DEPS>)) {
 			chomp($dep);
 			if ($dep =~ qr"^(\w+)\t(\S+)(>\S+|):(\.\./\.\./\S+)$") {
 				add_dependency($1, $2, $3, $4);
+			}
+		}
 		close(DEPS) or die;
 	} else {
 		return;
+	}
 	my $packlist = $distname =~ s/-[0-9].*//r =~ s/-/\//gr;
 	push(@build_vars, var("PERL5_PACKLIST", "=", "auto/$packlist/.packlist"));
 	push(@includes, "../../lang/perl5/module.mk");
 	$pkgname = "p5-\${DISTNAME}";
 	push(@categories, "perl5");
 	unlink("PLIST") or do {};
+}
 # Example packages:
+#
 # devel/py-ZopeComponent (dependencies, test dependencies)
 sub adjust_python_module() {
 	return unless -f "$abs_wrksrc/setup.py";
 	my %old_env = %ENV;
 	$ENV{"PYTHONDONTWRITEBYTECODE"} = "x";
 	$ENV{"PYTHONPATH"} = $libdir;
 	my @dep_lines;
 	open(DEPS, "cd '$abs_wrksrc' && $pythonbin setup.py build |") or die;
 	%ENV = %old_env;
 	while (defined(my $line = <DEPS>)) {
 		chomp($line);
 @@ -616,47 +629,49 @@ sub generate_initial_package($) {
 	write_lines("DESCR", ());
 	run_editor("Makefile", 5);
 	make("distinfo");
 	make("extract");
+}
 sub adjust_lines_python_module($$) {
 	my ($lines, $url) = @_;
 	my @initial_lines = generate_initial_package_Makefile_lines($url);
 	my @current_lines = read_lines("Makefile");
 	# don't risk to overwrite any changes made by the package developer.
 	if (join('\n', @current_lines) ne join('\n', @initial_lines)) {
 		splice(@$lines, -2, 0, "# TODO: Migrate MASTER_SITES to PYPI");
 		return;
 	my %old;
 	foreach my $line (@initial_lines) {
 		if ($line =~ qr"^(\w+)(\+?=)([ \t]+)([^#\\]*?)(\s*)(#.*|)$") {
 			my ($varname, $op, $indent, $value, $space_after_value, $comment) = ($1, $2, $3, $4, $5, $6);
 			if ($op eq "=") {
 				$old{$varname} = $value;
+			}
+		}
+	}
 	return unless $old{"CATEGORIES"} =~ qr"python";
 	my $pkgbase = $old{"GITHUB_PROJECT"};
 	return unless defined($pkgbase);
 	my $pkgbase1 = substr($pkgbase, 0, 1);
 	my $pkgversion_norev = $old{"DISTNAME"} =~ s/^v//r;
 	# don't risk to overwrite any changes made by the package developer.
 	if (join('\n', @current_lines) ne join('\n', @initial_lines)) {
 		splice(@$lines, -2, 0, "# TODO: Migrate MASTER_SITES to PYPI");
 		return;
+	}
 	my @lines = @$lines;
 	if (lines_remove(\@lines, "GITHUB_PROJECT")
 		&& lines_set(\@lines, "DISTNAME", "$pkgbase-$pkgversion_norev")
 		&& lines_set(\@lines, "PKGNAME", "\${PYPKGPREFIX}-\${DISTNAME}")
 		&& lines_set(\@lines, "MASTER_SITES", "\${MASTER_SITE_PYPI:=$pkgbase1/$pkgbase/}")
 		&& lines_remove(\@lines, "DIST_SUBDIR")
 		&& (lines_remove_if(\@lines, "EXTRACT_SUFX", ".zip") || true)) {
 		@$lines = @lines;
 		$regenerate_distinfo = true
+	}
+}

 @@ -1,15 +1,15 @@
-# $NetBSD: setuptools.py,v 1.1 2019/08/18 11:26:33 rillig Exp $
+# $NetBSD: setuptools.py,v 1.2 2019/09/11 05:25:55 rillig Exp $
 def url2pkg_print_depends(keyword, depends):
-	for dep in depends:
+    for dep in depends:
-		if '>' not in dep:
+        print('%s\t%s%s' % (keyword, dep.replace(' ', ''), '' if '>' in dep else '>=0'))
 			dep = dep + '>=0'
 		print('%s\t%s' % (keyword, dep))
 def setup(**kwargs):
     if 'install_requires' in kwargs:
         url2pkg_print_depends('DEPENDS', kwargs['install_requires'])
-	if 'install_requires' in kwargs:
+    if 'tests_require' in kwargs:
-		url2pkg_print_depends('DEPENDS', kwargs['install_requires'])
+        url2pkg_print_depends('TEST_DEPENDS', kwargs['tests_require'])
-	if 'tests_require' in kwargs:
+def find_packages(where='.', exclude=(), include=('*',)):
-		url2pkg_print_depends('TEST_DEPENDS', kwargs['tests_require'])
+    return []