pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/pkgtools/url2pkg
Module Name: pkgsrc
Committed By: rillig
Date: Sun Aug 18 11:26:33 UTC 2019
Modified Files:
pkgsrc/pkgtools/url2pkg: Makefile PLIST
pkgsrc/pkgtools/url2pkg/files: MakeMaker.pm url2pkg.pl
Added Files:
pkgsrc/pkgtools/url2pkg/files: setuptools.py
Log Message:
pkgtools/url2pkg: determine the dependencies of Python modules
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/pkgtools/url2pkg/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/pkgtools/url2pkg/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/pkgtools/url2pkg/files/MakeMaker.pm
cvs rdiff -u -r0 -r1.1 pkgsrc/pkgtools/url2pkg/files/setuptools.py
cvs rdiff -u -r1.55 -r1.56 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.93 pkgsrc/pkgtools/url2pkg/Makefile:1.94
--- pkgsrc/pkgtools/url2pkg/Makefile:1.93 Sun Aug 18 06:23:19 2019
+++ pkgsrc/pkgtools/url2pkg/Makefile Sun Aug 18 11:26:33 2019
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.93 2019/08/18 06:23:19 maya Exp $
+# $NetBSD: Makefile,v 1.94 2019/08/18 11:26:33 rillig Exp $
-PKGNAME= url2pkg-2.31
+PKGNAME= url2pkg-2.32
CATEGORIES= pkgtools
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -16,7 +16,7 @@ USE_TOOLS+= perl:run
AUTO_MKDIRS= yes
do-extract:
- cd ${FILESDIR} && cp *.pl *.pm ${WRKSRC}/
+ cd ${FILESDIR} && cp *.pl *.pm *.py ${WRKSRC}/
.include "../../mk/bsd.prefs.mk"
@@ -24,9 +24,8 @@ 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
-SUBST_SED.up+= -e 's,@PERL@,${PERL5},g'
-SUBST_SED.up+= -e 's,@PERLLIBDIR@,${PREFIX}/lib/url2pkg,g'
+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@,/usr/pkgsrc,g'
.else
@@ -37,5 +36,7 @@ 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"
Index: pkgsrc/pkgtools/url2pkg/PLIST
diff -u pkgsrc/pkgtools/url2pkg/PLIST:1.3 pkgsrc/pkgtools/url2pkg/PLIST:1.4
--- pkgsrc/pkgtools/url2pkg/PLIST:1.3 Sun Jun 14 18:11:03 2009
+++ pkgsrc/pkgtools/url2pkg/PLIST Sun Aug 18 11:26:33 2019
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:11:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/08/18 11:26:33 rillig Exp $
bin/url2pkg
lib/url2pkg/ExtUtils/MakeMaker.pm
+lib/url2pkg/setuptools.py
man/man8/url2pkg.8
Index: pkgsrc/pkgtools/url2pkg/files/MakeMaker.pm
diff -u pkgsrc/pkgtools/url2pkg/files/MakeMaker.pm:1.8 pkgsrc/pkgtools/url2pkg/files/MakeMaker.pm:1.9
--- pkgsrc/pkgtools/url2pkg/files/MakeMaker.pm:1.8 Sat Aug 17 13:12:00 2019
+++ pkgsrc/pkgtools/url2pkg/files/MakeMaker.pm Sun Aug 18 11:26:33 2019
@@ -81,7 +81,7 @@ sub writeDependency($$) {
my $category = find_category($pkgbase);
if (defined($category)) {
- printf("%s>=%s:../../%s/%s\n", $pkgbase, $ver, $category, $pkgbase);
+ printf("DEPENDS\t%s>=%s:../../%s/%s\n", $pkgbase, $ver, $category, $pkgbase);
return;
}
Index: pkgsrc/pkgtools/url2pkg/files/url2pkg.pl
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.55 pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.56
--- pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.55 Sun Aug 18 07:51:40 2019
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg.pl Sun Aug 18 11:26:33 2019
@@ -1,5 +1,5 @@
-#! @PERL@
-# $NetBSD: url2pkg.pl,v 1.55 2019/08/18 07:51:40 rillig Exp $
+#! @PERL5@
+# $NetBSD: url2pkg.pl,v 1.56 2019/08/18 11:26:33 rillig Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -38,7 +38,8 @@ use warnings;
#
my $make = '@MAKE@';
-my $perllibdir = '@PERLLIBDIR@';
+my $libdir = '@LIBDIR@';
+my $pythonbin = '@PYTHONBIN@';
use constant true => 1;
use constant false => 0;
@@ -103,6 +104,13 @@ sub write_lines($@) {
close(F) or die;
}
+sub find_package($) {
+ my ($pkgbase) = @_;
+
+ my @candidates = <../../*/$pkgbase>;
+ return scalar(@candidates) == 1 ? $candidates[0] : "";
+}
+
# The following adjust_* subroutines are called after the distfiles have
# been downloaded and extracted. They inspect the extracted files
# and adjust the variable definitions in the package Makefile.
@@ -135,6 +143,11 @@ my @wrksrc_dirs;
# "package>=version:../../category/package".
my @depends;
my @build_depends;
+my @test_depends;
+
+# .include, interleaved with BUILDLINK3_API_DEPENDS.
+# These lines are added at the bottom of the Makefile.
+my @bl3_lines;
# a list of pathnames relative to the package path.
# All these files will be included at the bottom of the Makefile.
@@ -155,10 +168,35 @@ my @todos;
# the package name, in case it differs from $distname.
my $pkgname = "";
+sub add_dependency($$$$) {
+ my ($type, $pkgbase, $constraint, $dep_dir) = @_;
+
+ if ($dep_dir ne "" && -f "$dep_dir/buildlink3.mk") {
+ # TODO: add type to bl3_lines (BUILDLINK_DEPENDS)
+ # TODO: add constraint to bl3_lines (BUILDLINK_API_DEPENDS)
+ push(@bl3_lines, ".include \"$dep_dir/buildlink3.mk\"");
+ return;
+ }
+
+ my $value = $dep_dir ne "" && -f "$dep_dir/Makefile"
+ ? "$pkgbase$constraint:$dep_dir"
+ : "# TODO: $pkgbase$constraint";
+
+ if ($type eq "DEPENDS") {
+ push(@depends, $value);
+ } elsif ($type eq "BUILD_DEPENDS") {
+ push(@build_depends, $value);
+ } elsif ($type eq "TEST_DEPENDS") {
+ push(@test_depends, $value);
+ } else {
+ push(@todos, "dependency $type $value");
+ }
+}
+
sub adjust_configure() {
my $gnu_configure = false;
- open(CONF, "<", "${abs_wrksrc}/configure") or return;
+ open(CONF, "<", "$abs_wrksrc/configure") or return;
while (defined(my $line = <CONF>)) {
if ($line =~ qr"autoconf|Free Software Foundation"i) {
$gnu_configure = true;
@@ -196,16 +234,17 @@ sub adjust_gconf2_schemas() {
}
sub adjust_libtool() {
- if (-f "${abs_wrksrc}/ltconfig" || -f "${abs_wrksrc}/ltmain.sh") {
+ if (-f "$abs_wrksrc/ltconfig" || -f "$abs_wrksrc/ltmain.sh") {
push(@build_vars, var("USE_LIBTOOL", "=", "yes"));
}
- if (-d "${abs_wrksrc}/libltdl") {
+ if (-d "$abs_wrksrc/libltdl") {
push(@includes, "../../devel/libltdl/convenience.mk");
}
}
-sub adjust_perlmod() {
- if (-f "${abs_wrksrc}/Build.PL") {
+sub adjust_perl_module() {
+
+ if (-f "$abs_wrksrc/Build.PL") {
# It's a Module::Build module. Dependencies cannot yet be
# extracted automatically.
@@ -213,18 +252,17 @@ sub adjust_perlmod() {
push(@build_vars, var("PERL5_MODULE_TYPE", "=", "Module::Build"));
- } elsif (-f "${abs_wrksrc}/Makefile.PL") {
+ } elsif (-f "$abs_wrksrc/Makefile.PL") {
# 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 {};
+ system("cd '$abs_wrksrc' && perl -I. Makefile.PL < /dev/null") or do {};
- open(DEPS, "cd ${abs_wrksrc} && perl -I${perllibdir} -I. Makefile.PL |") or die;
+ open(DEPS, "cd '$abs_wrksrc' && perl -I$libdir -I. Makefile.PL |") or die;
while (defined(my $dep = <DEPS>)) {
chomp($dep);
- if ($dep =~ qr"\.\./\.\./") {
- # Many Perl modules write other things to
- # stdout, so filter them out.
- push(@depends, $dep);
+
+ if ($dep =~ qr"^(\w+)\t(\S+)(>\S+|):(\.\./\.\./\S+)$") {
+ add_dependency($1, $2, $3, $4);
}
}
close(DEPS) or die;
@@ -233,16 +271,47 @@ sub adjust_perlmod() {
return;
}
- my $packlist = $distname;
- $packlist =~ s/-[0-9].*//;
- $packlist =~ s/-/\//g;
- push(@build_vars, var("PERL5_PACKLIST", "=", "auto/${packlist}/.packlist"));
+ 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}";
}
+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);
+ if ($line =~ qr"^(\w+)\t(\S+?)(>=.*|)$") {
+ push(@dep_lines, [$1, $2, $3]);
+ }
+ }
+ close(DEPS) or die;
+
+ foreach my $dep_line (@dep_lines) {
+ my ($type, $pkgbase, $constraint) = @$dep_line;
+ my $dep_dir = find_package("py-$pkgbase");
+ if ($dep_dir ne "") {
+ $pkgbase = "py-$pkgbase";
+ } else {
+ $dep_dir = find_package($pkgbase);
+ }
+
+ add_dependency($type, $pkgbase, $constraint, $dep_dir);
+
+ }
+}
+
sub adjust_cargo() {
- open(CONF, "<", "${abs_wrksrc}/Cargo.lock") or return;
+ open(CONF, "<", "$abs_wrksrc/Cargo.lock") or return;
while (defined(my $line = <CONF>)) {
# "checksum cargo-package-name cargo-package-version
@@ -317,20 +386,20 @@ sub generate_initial_package_Makefile_li
my ($site) = ($1);
if (index($url, $site) == 0) {
- if ($url =~ qr"^\Q${site}\E(.+)/([^/]+)$") {
+ if ($url =~ qr"^\Q$site\E(.+)/([^/]+)$") {
my $subdir = $1;
$distfile = $2;
- $master_sites = "\${${master_site}:=${subdir}/}";
+ $master_sites = "\${$master_site:=$subdir/}";
if ($master_site eq "MASTER_SITE_SOURCEFORGE") {
- $homepage = "http://${subdir}.sourceforge.net/";;
+ $homepage = "http://$subdir.sourceforge.net/";;
} elsif ($master_site eq "MASTER_SITE_GNU") {
- $homepage = "http://www.gnu.org/software/${subdir}/";;
+ $homepage = "http://www.gnu.org/software/$subdir/";;
} else {
$homepage = substr($url, 0, -length($distfile));
}
} else {
- $master_sites = "\${${master_site}}";
+ $master_sites = "\${$master_site}";
}
}
}
@@ -340,8 +409,8 @@ sub generate_initial_package_Makefile_li
if ($url =~ qr"^https://downloads\.sourceforge\.net/project/([^/?]+)/[^?]+/([^/?]+)(?:[?].*)?$") {
my ($project, $filename) = ($1, $2);
- $master_sites = "\${MASTER_SITE_SOURCEFORGE:=${project}/}";
- $homepage = "https://${project}.sourceforge.net/";;
+ $master_sites = "\${MASTER_SITE_SOURCEFORGE:=$project/}";
+ $homepage = "https://$project.sourceforge.net/";;
$distfile = $filename;
}
@@ -371,7 +440,7 @@ sub generate_initial_package_Makefile_li
$distfile = "$base$ext";
} else {
- print("$0: ERROR: Invalid GitHub URL: ${url}, handling as normal URL\n");
+ print("$0: ERROR: Invalid GitHub URL: $url, handling as normal URL\n");
}
}
@@ -381,7 +450,7 @@ sub generate_initial_package_Makefile_li
$distfile = $2;
$homepage = $master_sites;
} else {
- die("$0: ERROR: Invalid URL: ${url}\n");
+ die("$0: ERROR: Invalid URL: $url\n");
}
}
@@ -396,7 +465,7 @@ sub generate_initial_package_Makefile_li
rename("Makefile", "Makefile-url2pkg.bak") or do {};
`pwd` =~ qr".*/([^/]+)/[^/]+$" or die;
- $categories = $1;
+ $categories = $1 eq "wip" ? "# TODO" : $1;
if ($extract_sufx eq ".tar.gz" || $extract_sufx eq ".gem") {
$extract_sufx = "";
@@ -451,7 +520,7 @@ sub adjust_package_from_extracted_distfi
{
my ($seen_marker);
- chomp($abs_wrkdir = `${make} show-var VARNAME=WRKDIR`);
+ chomp($abs_wrkdir = `$make show-var VARNAME=WRKDIR`);
#
# Determine the value of WRKSRC.
@@ -473,22 +542,23 @@ sub adjust_package_from_extracted_distfi
if ($files[0] ne $distname) {
push(@build_vars, var("WRKSRC", "=", "\${WRKDIR}/$files[0]"));
}
- $abs_wrksrc = "${abs_wrkdir}/$files[0]";
+ $abs_wrksrc = "$abs_wrkdir/$files[0]";
} else {
push(@build_vars, var("WRKSRC", "=", "\${WRKDIR}" .
((@files > 1) ? " # More than one possibility -- please check manually." : "")));
$abs_wrksrc = $abs_wrkdir;
}
- chomp(@wrksrc_files = `cd "${abs_wrksrc}" && find * -type f`);
- chomp(@wrksrc_dirs = `cd "${abs_wrksrc}" && find * -type d`);
+ chomp(@wrksrc_files = `cd "$abs_wrksrc" && find * -type f`);
+ chomp(@wrksrc_dirs = `cd "$abs_wrksrc" && find * -type d`);
adjust_configure();
adjust_cmake();
adjust_meson();
adjust_gconf2_schemas();
adjust_libtool();
- adjust_perlmod();
+ adjust_perl_module();
+ adjust_python_module();
adjust_cargo();
adjust_pkg_config();
adjust_po();
@@ -523,20 +593,16 @@ sub adjust_package_from_extracted_distfi
}
my @depend_vars;
- foreach my $dep (@build_depends) {
- push(@depend_vars, var("BUILD_DEPENDS", "+=", $dep));
- }
- foreach my $dep (@depends) {
- push(@depend_vars, var("DEPENDS", "+=", $dep));
- }
+ push(@depend_vars, map { var("BUILD_DEPENDS", "+=", $_) } @build_depends);
+ push(@depend_vars, map { var("DEPENDS", "+=", $_) } @depends);
+ push(@depend_vars, map { var("TEST_DEPENDS", "+=", $_) } @test_depends);
add_section(\@lines, \@depend_vars);
add_section(\@lines, \@build_vars);
add_section(\@lines, \@extra_vars);
- foreach my $f (@includes) {
- push(@lines, ".include \"$f\"");
- }
+ push(@lines, @bl3_lines);
+ push(@lines, map { $_ = ".include \"$_\"" } @includes);
# Copy the rest of the user-edited part of the Makefile.
while (defined(my $line = <MF1>)) {
@@ -578,7 +644,7 @@ sub main() {
generate_initial_package($url);
} else {
- chomp($distname = `${make} show-var VARNAME=DISTNAME`);
+ chomp($distname = `$make show-var VARNAME=DISTNAME`);
}
adjust_package_from_extracted_distfiles();
Added files:
Index: pkgsrc/pkgtools/url2pkg/files/setuptools.py
diff -u /dev/null pkgsrc/pkgtools/url2pkg/files/setuptools.py:1.1
--- /dev/null Sun Aug 18 11:26:33 2019
+++ pkgsrc/pkgtools/url2pkg/files/setuptools.py Sun Aug 18 11:26:33 2019
@@ -0,0 +1,15 @@
+# $NetBSD: setuptools.py,v 1.1 2019/08/18 11:26:33 rillig Exp $
+
+def url2pkg_print_depends(keyword, depends):
+ for dep in depends:
+ if '>' not in dep:
+ 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 'tests_require' in kwargs:
+ url2pkg_print_depends('TEST_DEPENDS', kwargs['tests_require'])
Home |
Main Index |
Thread Index |
Old Index