From owner-svn-ports-all@FreeBSD.ORG  Thu Oct 31 20:48:48 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 ESMTP id 695BAEAE;
 Thu, 31 Oct 2013 20:48:48 +0000 (UTC) (envelope-from vg@FreeBSD.org)
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))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 571EA2169;
 Thu, 31 Oct 2013 20:48:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9VKmmS4052979;
 Thu, 31 Oct 2013 20:48:48 GMT (envelope-from vg@svn.freebsd.org)
Received: (from vg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9VKmmgj052977;
 Thu, 31 Oct 2013 20:48:48 GMT (envelope-from vg@svn.freebsd.org)
Message-Id: <201310312048.r9VKmmgj052977@svn.freebsd.org>
From: Veniamin Gvozdikov <vg@FreeBSD.org>
Date: Thu, 31 Oct 2013 20:48:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332285 - in head/sysutils/py-salt: . 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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, 31 Oct 2013 20:48:48 -0000

Author: vg
Date: Thu Oct 31 20:48:47 2013
New Revision: 332285
URL: http://svnweb.freebsd.org/changeset/ports/332285

Log:
  - Fixed pkgng support with custom path to db
  
  PR:		ports/183492
  Submitted by:	myself
  Approved by:	eadler, osa, rm (mentors, implicit), Christer Edwards <christer.edwards@gmail.com> (maintainer)

Added:
  head/sysutils/py-salt/files/patch-salt__modules__reebsdpkg.py   (contents, props changed)
Modified:
  head/sysutils/py-salt/Makefile

Modified: head/sysutils/py-salt/Makefile
==============================================================================
--- head/sysutils/py-salt/Makefile	Thu Oct 31 20:13:54 2013	(r332284)
+++ head/sysutils/py-salt/Makefile	Thu Oct 31 20:48:47 2013	(r332285)
@@ -3,6 +3,7 @@
 
 PORTNAME=	salt
 PORTVERSION=	0.17.1
+PORTREVISION=	1
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Added: head/sysutils/py-salt/files/patch-salt__modules__reebsdpkg.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/py-salt/files/patch-salt__modules__reebsdpkg.py	Thu Oct 31 20:48:47 2013	(r332285)
@@ -0,0 +1,11 @@
+--- salt/modules/freebsdpkg.py.orig	2013-10-30 16:16:31.850225522 +0000
++++ salt/modules/freebsdpkg.py	2013-10-30 16:16:47.868224728 +0000
+@@ -27,7 +27,7 @@
+     '''
+     Looks to see if pkgng is being used by checking if database exists
+     '''
+-    return os.path.isfile('/var/db/pkg/local.sqlite')
++    return os.path.isfile('/usr/local/etc/pkg.conf')
+ 
+ 
+ @decorators.memoize