svn commit: r369323 - in head/ports-mgmt/pkg: . files

[Baptiste Daroussin]

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");