From owner-svn-ports-all@FreeBSD.ORG  Thu Aug 23 22:09:54 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 49959106566B;
	Thu, 23 Aug 2012 22:09:54 +0000 (UTC)
	(envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 34AED8FC08;
	Thu, 23 Aug 2012 22:09:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7NM9s5E003396;
	Thu, 23 Aug 2012 22:09:54 GMT
	(envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7NM9rrv003393;
	Thu, 23 Aug 2012 22:09:54 GMT
	(envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201208232209.q7NM9rrv003393@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 23 Aug 2012 22:09:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303041 - in head/ports-mgmt/pkg: . files
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 23 Aug 2012 22:09:54 -0000

Author: bdrewery
Date: Thu Aug 23 22:09:53 2012
New Revision: 303041
URL: http://svn.freebsd.org/changeset/ports/303041

Log:
  - Fix crash when no PACKAGESITE is defined in pkg.conf
  
  Approved by:	bapt (mentor, maintainer)

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

Modified: head/ports-mgmt/pkg/Makefile
==============================================================================
--- head/ports-mgmt/pkg/Makefile	Thu Aug 23 21:04:16 2012	(r303040)
+++ head/ports-mgmt/pkg/Makefile	Thu Aug 23 22:09:53 2012	(r303041)
@@ -7,6 +7,7 @@
 
 PORTNAME=	pkg
 DISTVERSION=	1.0-rc6
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/portmgr \
 		http://files.etoilebsd.net/pkg/

Added: head/ports-mgmt/pkg/files/patch-libpkg_pkg_config.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/pkg/files/patch-libpkg_pkg_config.c	Thu Aug 23 22:09:53 2012	(r303041)
@@ -0,0 +1,11 @@
+--- libpkg/pkg_config.c
++++ libpkg/pkg_config.c
+@@ -268,7 +268,7 @@ subst_packagesite(void)
+ 
+ 	oldval = c[PKG_CONFIG_REPO].val;
+ 
+-	if ((variable_string = strstr(oldval, ABI_VAR_STRING)) == NULL)
++	if (oldval == NULL || (variable_string = strstr(oldval, ABI_VAR_STRING)) == NULL)
+ 		return;
+ 
+ 	newval = sbuf_new_auto();