aboutsummaryrefslogtreecommitdiff
path: root/ports-mgmt
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2014-09-26 01:14:14 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2014-09-26 01:14:14 +0000
commit78a2c89be600ae80ffae49e305bc7746cca74e20 (patch)
tree9a9cd49dcf10e7e5bd8eb72f370b501b7ff19ad4 /ports-mgmt
parent6611d7feaf0be2d13c7daeb54d86bef2e1362fa7 (diff)
downloadports-78a2c89be600ae80ffae49e305bc7746cca74e20.tar.gz
ports-78a2c89be600ae80ffae49e305bc7746cca74e20.zip
Notes
Diffstat (limited to 'ports-mgmt')
-rw-r--r--ports-mgmt/pkg/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index ddf9daa7b763..0051ea6fa195 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -54,7 +54,7 @@ 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
+.if ${NB_OLDPKGS} > 0 && ${NB_NEWPKGS} == 0 && !defined(UPGRADEPKG)
pre-everything::
@${ECHO_CMD} "You are about to convert your system to pkg while you have ports/packages"; \
@@ -62,6 +62,7 @@ pre-everything::
${ECHO_CMD} ""; \
${ECHO_CMD} "To switch to pkg:"; \
${ECHO_CMD} " 1) Install ports-mgmt/pkg"; \
+ ${ECHO_CMD} " cd ports-mgmt/pkg && make UPGRADEPKG=1 install clean"; \
${ECHO_CMD} " 2) Convert your package database by running pkg2ng"; \
${ECHO_CMD} ""; \
exit 1