Date: Tue, 23 Apr 2024 08:37:43 GMT From: Yasuhiro Kimura <yasu@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 215a14b79ce2 - main - ports-mgmt/pkg: Remove pre-everything target Message-ID: <202404230837.43N8bhkC038248@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=215a14b79ce22003a98d5f0351d26a1e4a585a47 commit 215a14b79ce22003a98d5f0351d26a1e4a585a47 Author: Yasuhiro Kimura <yasu@FreeBSD.org> AuthorDate: 2024-04-22 11:34:21 +0000 Commit: Yasuhiro Kimura <yasu@FreeBSD.org> CommitDate: 2024-04-23 08:36:31 +0000 ports-mgmt/pkg: Remove pre-everything target It displays messages related to conversion from ancient pkg_* tools to pkg. But support of the former ended with FreeBSD 9 and ports framework doesn't support them either. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D44902 --- ports-mgmt/pkg/Makefile | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index bb603044883d..a10feb5745c5 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -41,30 +41,6 @@ MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" .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 :)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404230837.43N8bhkC038248>