aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt/pkg/Makefile
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2013-01-09 03:48:37 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2013-01-09 03:48:37 +0000
commita571a5e59233da20bd448921ef89e1e536c9cd42 (patch)
tree056de6a2e36f1e0b9dd12747b2aa5ce2acb0a550 /ports-mgmt/pkg/Makefile
parented1ba2843fe2bfb412d24164bc84a81aa4f02caf (diff)
downloadports-a571a5e59233da20bd448921ef89e1e536c9cd42.tar.gz
ports-a571a5e59233da20bd448921ef89e1e536c9cd42.zip
Notes
Diffstat (limited to 'ports-mgmt/pkg/Makefile')
-rw-r--r--ports-mgmt/pkg/Makefile9
1 files changed, 8 insertions, 1 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index 97288a209c4a..718eefbc5ced 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -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"; \