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

[Bryan Drewery]

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