From owner-svn-ports-head@FreeBSD.ORG  Fri Sep 26 13:14:22 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EFDD56B0;
 Fri, 26 Sep 2014 13:14:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 DABE69F7;
 Fri, 26 Sep 2014 13:14:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8QDELis063860;
 Fri, 26 Sep 2014 13:14:21 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8QDELDs063858;
 Fri, 26 Sep 2014 13:14:21 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201409261314.s8QDELDs063858@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Fri, 26 Sep 2014 13:14:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r369323 - 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.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Sep 2014 13:14:22 -0000

Author: bapt
Date: Fri Sep 26 13:14:20 2014
New Revision: 369323
URL: http://svnweb.freebsd.org/changeset/ports/369323
QAT: https://qat.redports.org/buildarchive/r369323/

Log:
  Fix an important regresion preventing pkg2ng to work properly
  
  Reported by:	roberto
  Tested by:	roberto

Added:
  head/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c   (contents, props changed)
Modified:
  head/ports-mgmt/pkg/Makefile

Modified: head/ports-mgmt/pkg/Makefile
==============================================================================
--- head/ports-mgmt/pkg/Makefile	Fri Sep 26 12:27:38 2014	(r369322)
+++ head/ports-mgmt/pkg/Makefile	Fri Sep 26 13:14:20 2014	(r369323)
@@ -2,7 +2,7 @@
 
 PORTNAME=	pkg
 DISTVERSION=	1.3.8
-PORTREVISION=	1
+PORTREVISION=	2
 _PKG_VERSION=	${DISTVERSION}
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\

Added: head/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/pkg/files/patch-libpkg__pkg_ports.c	Fri Sep 26 13:14:20 2014	(r369323)
@@ -0,0 +1,14 @@
+diff --git libpkg/pkg_ports.c libpkg/pkg_ports.c
+index 744ad4a..4308196 100644
+--- libpkg/pkg_ports.c
++++ libpkg/pkg_ports.c
+@@ -1056,7 +1056,8 @@ plist_new(struct pkg *pkg, const char *stage)
+ 
+ 	p->pkg = pkg;
+ 	pkg_get(pkg, PKG_PREFIX, &prefix);
+-	strlcpy(p->prefix, prefix, sizeof(p->prefix));
++	if (prefix != NULL)
++		strlcpy(p->prefix, prefix, sizeof(p->prefix));
+ 	p->slash = p->prefix[strlen(p->prefix) - 1] == '/' ? "" : "/";
+ 	p->stage = stage;
+ 	p->uname = strdup("root");