Import of pkgsrc-2016Q3

This commit is contained in:
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions

View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.80 2015/07/15 19:01:44 wiz Exp $
# $NetBSD: Makefile,v 1.86 2016/09/27 17:10:09 wiz Exp $
PKGNAME= url2pkg-2.24
PKGNAME= url2pkg-2.28
CATEGORIES= pkgtools
MAINTAINER= pkgsrc-users@NetBSD.org
@@ -9,6 +9,7 @@ COMMENT= Tool to automate initial steps in building a package
LICENSE= original-bsd
WRKSRC= ${WRKDIR}
NO_CHECKSUM= yes
NO_BUILD= yes
USE_LANGUAGES= # none
USE_TOOLS+= perl:run

View File

@@ -1,5 +1,5 @@
#! @PERL@
# $NetBSD: url2pkg.pl,v 1.30 2015/07/15 19:01:44 wiz Exp $
# $NetBSD: url2pkg.pl,v 1.34 2016/09/27 17:10:09 wiz Exp $
#
# Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -307,7 +307,7 @@ sub generate_initial_package($) {
if ($url =~ qr"^https?://github\.com/") {
if ($url =~ qr"^https?://github\.com/(.*)/(.*)/archive/(.*)(\.tar\.gz|\.zip)$") {
$master_sites = "\${MASTER_SITE_GITHUB:=$1/}";
$homepage = "\${MASTER_SITE_GITHUB:=$1/$2/}";
$homepage = "https://github.com/$1/$2/";
$gh_project = $2;
$gh_tag = $3;
if (index($gh_tag, $gh_project) == -1 ) {
@@ -318,7 +318,7 @@ sub generate_initial_package($) {
$found = true;
} elsif ($url =~ qr"^https?://github\.com/(.*)/(.*)/releases/download/(.*)/(.*)(\.tar\.gz|\.zip)$") {
$master_sites = "\${MASTER_SITE_GITHUB:=$1/}";
$homepage = "\${MASTER_SITE_GITHUB:=$1/$2/}";
$homepage = "https://github.com/$1/$2/";
if (index($4, $2) == -1) {
$gh_project = $2;
$dist_subdir = '${GITHUB_PROJECT}';
@@ -507,14 +507,13 @@ sub adjust_package_from_extracted_distfiles()
unlink("Makefile-url2pkg.new");
die("$0: ERROR: didn't find the url2pkg marker in the file.\n");
}
}
sub main() {
my $url;
if (!-f "../../mk/bsd.pkg.mk") {
die("$0 must be run from a package directory (.../pkgsrc/category/package).");
die("ERROR: $0 must be run from a package directory (.../pkgsrc/category/package).\n");
}
my @extract_cookie = <w*/.extract_done>;