aboutsummaryrefslogtreecommitdiffstats
path: root/ports-mgmt
diff options
context:
space:
mode:
authorbdrewery <bdrewery@FreeBSD.org>2014-09-26 09:14:14 +0800
committerbdrewery <bdrewery@FreeBSD.org>2014-09-26 09:14:14 +0800
commit38100cd602df99d8f40932db6e5435fa614ee33e (patch)
tree9a9cd49dcf10e7e5bd8eb72f370b501b7ff19ad4 /ports-mgmt
parente995cec19c6515df65a7dbc93af7163788d26711 (diff)
downloadfreebsd-ports-gnome-38100cd602df99d8f40932db6e5435fa614ee33e.tar.gz
freebsd-ports-gnome-38100cd602df99d8f40932db6e5435fa614ee33e.tar.zst
freebsd-ports-gnome-38100cd602df99d8f40932db6e5435fa614ee33e.zip
Add a way to work around the pkg2ng gate for now.
With hat: portmgr
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