From owner-svn-ports-head@FreeBSD.ORG  Sat Mar 30 05:31:30 2013
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])
 by hub.freebsd.org (Postfix) with ESMTP id 54BE3AC5;
 Sat, 30 Mar 2013 05:31:30 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 463BC1F8;
 Sat, 30 Mar 2013 05:31:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2U5VUlN095262;
 Sat, 30 Mar 2013 05:31:30 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2U5VU7D095261;
 Sat, 30 Mar 2013 05:31:30 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201303300531.r2U5VU7D095261@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Sat, 30 Mar 2013 05:31:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r315599 - head/Mk
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.14
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: Sat, 30 Mar 2013 05:31:30 -0000

Author: bdrewery
Date: Sat Mar 30 05:31:29 2013
New Revision: 315599
URL: http://svnweb.freebsd.org/changeset/ports/315599

Log:
  - Fix check-vulnerable failing when pkg(8) is not installed
    and WITH_PKGNG is set. This can happen when deinstall and
    reinstalling ports-mgmt/pkg in some cases
  
  With hat:	portmgr

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Sat Mar 30 05:13:30 2013	(r315598)
+++ head/Mk/bsd.port.mk	Sat Mar 30 05:31:29 2013	(r315599)
@@ -3424,7 +3424,14 @@ check-vulnerable:
 .if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING)
 	@if [ -f "${AUDITFILE}" ]; then \
 		if [ -n "${WITH_PKGNG}" ]; then \
-			vlist=`${PKG_BIN} audit "${PKGNAME}"`; \
+			if [ -x "${PKG_BIN}" ]; then \
+				vlist=`${PKG_BIN} audit "${PKGNAME}"`; \
+			elif [ "${PORTNAME}" = "pkg" ]; then \
+				vlist=""; \
+			else \
+				${ECHO_MSG} "===> Unable to check vuln database as pkg(8) is missing"; \
+				exit 1; \
+			fi; \
 		elif [ -x "${LOCALBASE}/sbin/portaudit" ]; then \
 			vlist=`${LOCALBASE}/sbin/portaudit -X 14 "${PKGNAME}" \
 				2>&1 | grep -vE '^[0-9]+ problem\(s\) found.' \