svn commit: r310120 - head/ports-mgmt/pkg

[Bryan Drewery]

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"; \