From nobody Tue Apr 23 08:37:43 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VNwVH6zCVz5JlCk; Tue, 23 Apr 2024 08:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VNwVH5KBNz463r; Tue, 23 Apr 2024 08:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713861463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OSTJ9m7+T33t0ik8qWrn+keSOoLgKcki25OhXVz5y5g=; b=SVvx3Yx3pvG4/w+sE4O42F12qh0/CaYxHo1Tfu6ed5cF749kJQF/KbuM7VYCBpxXNn5pti rImLT36geHQmvFyoeCsAkCYLEECHamJq9Iwg13utvEfEknhrJ0ZmHPypEhx/PP+87BpGkN XnaaQqPFKQ+LaynmPQFmGd1jfQsRvkHxRa9Ut/s6O6ybR8DkznRnYS7Nt39tYIIa1+llkO gquM3RPFZ2etRqWA/k95VTx5WCDgvzAsb73Nmevn2s9GI26RJgoxrFzuAWsj69leG5kOG3 QbvnihXI5qd29dte9u+qpw0v4tok5wuP/NAYVSuLXVwGZpKFXDbGUgucaWBU1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713861463; a=rsa-sha256; cv=none; b=ELzdEt6Pwq2yZMi/xNryCMr/FMqRqvbMUonhenwHnvdLVdVG2B3teO/vpyx9E5VJ8lMbdq OJ3oS5Bn0RyrLPJOuL/25rJi2prj3TSrb+Sb+A61meGoU9Hc4CxLaLM+GvdD88xpFfchGu p6jwJISogNExyDfch5X+ZcRLBNFQUXM+VtP0sm7VMQsQ2iQ40sePy+VurAU8OPNuNPbzBj 5dL75k8mfKi8g+THxnGh6WQJEu9iFPz7kbMBpGg5QMSbkH40m+jGzhn829nomjfbczTiWq QWXPBWuQC02rVuymKDx8xw4vAXg9W6b64mP+fdtaw1bRgBWBHBYqaBSN7c7s4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713861463; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OSTJ9m7+T33t0ik8qWrn+keSOoLgKcki25OhXVz5y5g=; b=CEdse5NHJ0hdTgXyqBD927dM6Mc5n2a35zyqXoliaEnINCKSQHKq2plEooisjg7Srt1pBp 3vj433aw96bsJU34xS+nyUcXCYGSKXj133jdYw7v45aE/EKDVWF6U4aaXHE2bBVjBTSHRK 2e16ce+QGb0a6WXM6/irOH5zGaMAAiSsMdiYp46oFyfP7NBxpvbk6zB0X2hn0pauLrrxNi 5wGh/M85jmDXGseuYC0aJlejweUokoFak+LqIw0JuqVvWGbKOWzIQcwKDOTEszIjvhnuKe tw+AYSmUbu9cVrcQ0U462XYNNK7Xjvl3bpzs5TWXzdfwqpXtm0iUwjH9hSiLgA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VNwVH4PZ1zPY9; Tue, 23 Apr 2024 08:37:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43N8bhND038251; Tue, 23 Apr 2024 08:37:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43N8bhkC038248; Tue, 23 Apr 2024 08:37:43 GMT (envelope-from git) Date: Tue, 23 Apr 2024 08:37:43 GMT Message-Id: <202404230837.43N8bhkC038248@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: 215a14b79ce2 - main - ports-mgmt/pkg: Remove pre-everything target List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 215a14b79ce22003a98d5f0351d26a1e4a585a47 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=215a14b79ce22003a98d5f0351d26a1e4a585a47 commit 215a14b79ce22003a98d5f0351d26a1e4a585a47 Author: Yasuhiro Kimura AuthorDate: 2024-04-22 11:34:21 +0000 Commit: Yasuhiro Kimura 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 :)