diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -41,30 +41,6 @@ .if ${WITH_PKG} == devel IGNORE= WITH_PKG is defined to 'devel', this version is the stable one .endif -.if exists(${LOCALBASE}/sbin/pkg_info) || exists(/usr/sbin/pkg_info) -NB_OLDPKGS!= pkg_info 2>/dev/null | wc -l -.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 && !defined(UPGRADEPKG) - -pre-everything:: - @${ECHO_CMD} "You are about to convert your system to pkg while you have ports/packages"; \ - ${ECHO_CMD} "installed with the old pkg_install tools."; \ - ${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 - -.endif -.endif .endif #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :)