From owner-svn-ports-head@FreeBSD.ORG  Wed Jan  9 03:48:37 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id CA01C21B;
 Wed,  9 Jan 2013 03:48:37 +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 A39C1EA9;
 Wed,  9 Jan 2013 03:48:37 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r093mbvU020632;
 Wed, 9 Jan 2013 03:48:37 GMT (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r093mbGl020630;
 Wed, 9 Jan 2013 03:48:37 GMT (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201301090348.r093mbGl020630@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 9 Jan 2013 03:48:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r310120 - head/ports-mgmt/pkg
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: Wed, 09 Jan 2013 03:48:37 -0000

Author: bdrewery
Date: Wed Jan  9 03:48:37 2013
New Revision: 310120
URL: http://svnweb.freebsd.org/changeset/ports/310120

Log:
  - Only show conversion "seatbelt" notice if no
    pkgng packages have been installed yet. This fixes
    the notice showing after already running pkg2ng but
    having 1 or more packages fail to convert.
  
  Approved by:	bapt

Modified:
  head/ports-mgmt/pkg/Makefile

Modified: head/ports-mgmt/pkg/Makefile
==============================================================================
--- head/ports-mgmt/pkg/Makefile	Wed Jan  9 00:57:11 2013	(r310119)
+++ head/ports-mgmt/pkg/Makefile	Wed Jan  9 03:48:37 2013	(r310120)
@@ -59,7 +59,14 @@ MLINKS=	pkg-delete.8 pkg-remove.8 \
 .if defined(WITH_PKGNG)
 .if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info)
 NB_OLDPKGS!=	pkg_info 2>/dev/null | wc -l
-.if ${NB_OLDPKGS} > 0
+.if exists(${PKG_BIN})
+NB_NEWPKGS!=	${PKG_INFO} -aq | wc -l
+.else
+NB_NEWPKGS=	0
+.endif
+# Only show the pre-everything notice if they have not already
+# converted any packages
+.if ${NB_OLDPKGS} > 0 && ${NB_NEWPKGS} == 0
 
 pre-everything::
 	@${ECHO_CMD} "You are about to convert your system to pkgng while you have ports/packages"; \