From owner-svn-ports-head@freebsd.org  Sat Feb 25 12:28:50 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 35E2DCECF0C;
 Sat, 25 Feb 2017 12:28:50 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 054DAD88;
 Sat, 25 Feb 2017 12:28:49 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1PCSnOT033060;
 Sat, 25 Feb 2017 12:28:49 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1PCSn5k033058;
 Sat, 25 Feb 2017 12:28:49 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201702251228.v1PCSn5k033058@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 25 Feb 2017 12:28:49 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r434798 - in head/ports-mgmt/pkg: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Feb 2017 12:28:50 -0000

Author: bapt
Date: Sat Feb 25 12:28:48 2017
New Revision: 434798
URL: https://svnweb.freebsd.org/changeset/ports/434798

Log:
  Allow per repo environment variable to be set for
  every kind of repositories
  
  Reported by:	kib
  Tested by:	kib

Added:
  head/ports-mgmt/pkg/files/patch-repo-env   (contents, props changed)
Modified:
  head/ports-mgmt/pkg/Makefile

Modified: head/ports-mgmt/pkg/Makefile
==============================================================================
--- head/ports-mgmt/pkg/Makefile	Sat Feb 25 11:34:53 2017	(r434797)
+++ head/ports-mgmt/pkg/Makefile	Sat Feb 25 12:28:48 2017	(r434798)
@@ -2,6 +2,7 @@
 
 PORTNAME=	pkg
 DISTVERSION=	1.10.0
+PORTREVISION=	1
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\

Added: head/ports-mgmt/pkg/files/patch-repo-env
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/pkg/files/patch-repo-env	Sat Feb 25 12:28:48 2017	(r434798)
@@ -0,0 +1,14 @@
+diff --git libpkg/fetch.c libpkg/fetch.c
+index 035842b7..fd520ed5 100644
+--- libpkg/fetch.c
++++ libpkg/fetch.c
+@@ -515,7 +515,9 @@ pkg_fetch_file_to_fd(struct pkg_repo *repo, const char *url, int dest,
+ 
+ 		url += strlen(URL_SCHEME_PREFIX);
+ 		pkg_url_scheme = true;
++	}
+ 
++	if (repo != NULL) {
+ 		LL_FOREACH(repo->env, kv) {
+ 			kvtmp = xcalloc(1, sizeof(*kvtmp));
+ 			kvtmp->key = xstrdup(kv->key);