From owner-svn-ports-all@FreeBSD.ORG  Thu Apr 24 00:52:16 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BB74DC4;
 Thu, 24 Apr 2014 00:52:16 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A54351CF7;
 Thu, 24 Apr 2014 00:52:16 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3O0qGhA035032;
 Thu, 24 Apr 2014 00:52:16 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3O0qG80035031;
 Thu, 24 Apr 2014 00:52:16 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201404240052.s3O0qG80035031@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 24 Apr 2014 00:52:16 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r351980 - 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-all@freebsd.org
X-Mailman-Version: 2.1.17
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, 24 Apr 2014 00:52:16 -0000

Author: bdrewery
Date: Thu Apr 24 00:52:16 2014
New Revision: 351980
URL: http://svnweb.freebsd.org/changeset/ports/351980
QAT: https://qat.redports.org/buildarchive/r351980/

Log:
  - Fix regression from r315599: Allow pkg to install itself first
    if not yet installed and WITH_PKGNG is set. Just skip the
    vulnerabilities check as intended in r315599.
  
  With hat:	portmgr
  Reported by:	diizzy on EFNet
  Pointyhat to:	bdrewery (with interest)

Modified:
  head/Mk/bsd.port.mk

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Thu Apr 24 00:03:48 2014	(r351979)
+++ head/Mk/bsd.port.mk	Thu Apr 24 00:52:16 2014	(r351980)
@@ -3328,9 +3328,6 @@ check-vulnerable:
 				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}" \