From nobody Fri May 06 07:21:46 2022 X-Original-To: dev-commits-ports-all@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 37F1B1AD23A4; Fri, 6 May 2022 07:21:47 +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 4Kvhp2713sz3vhQ; Fri, 6 May 2022 07:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651821707; 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=3SWQOTpCHEThQB2dx1Xq/qgRkwcu6A2LCGC4nxvqsR8=; b=frW0eQsOvdmIiuzaVmG/1DdptFf4S7xcvyBl6f4RLue+VCkZpju+MxAAillyAcXPyNSqJJ T3k5g3lPlEof6EqZDP9TgMxeAEnjkUz9xHt5yZoGgVo5E0srCfA61Uo5TKnzt0lN78cVQA Wp22blB7EVFcfGDSZRzpkOrbuuA0UXH1cn+LERJVQ6UCcVWH89Lmd2hnKZ4OOYoVq3T+8U i7G+lJbeqUezSsq1i+x+73XHGvVTIeTUS0o5S+1U0Yt7s93lgjW7jOcz0hsH3HZgGFYKeo wnGYjhX3TcLo6uQvzJF8rf8Y9jqi+Vu7E+6hEROYZypeVbFb2KGvNzsbJEHnEQ== 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 D084317737; Fri, 6 May 2022 07:21:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2467LkON072077; Fri, 6 May 2022 07:21:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2467Lkpr072076; Fri, 6 May 2022 07:21:46 GMT (envelope-from git) Date: Fri, 6 May 2022 07:21:46 GMT Message-Id: <202205060721.2467Lkpr072076@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 13efc89f4e44 - main - package: stop creating the backward compatibility symlinks List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13efc89f4e4423dca7734793349bc84c843b63e3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651821707; 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=3SWQOTpCHEThQB2dx1Xq/qgRkwcu6A2LCGC4nxvqsR8=; b=mH3q/TyKmy5yxL/RtRaTWxl1kyDx506tu/PV7N444VLtIqEvTtE1/77MbKt4M+OFUAAmMy J/6MwwOF2cQZIe8zS1AMLyBQRrCUvE0WI3ZP3hr+ZYxXxiRM020CYNyJKf7l6Mcsy6tKde 9kr/k8Ih4jhIsBJeiA6A1+hwJ3hH7QiHbVgJzp7iJEpkJiU6sMFtONCO1ATfVuj4rFEq/c 8W3DYXqJasKvbTNqmyJwrQ/YmwoMAgc3hKkr5oSO39k6276dWIcc70ZWz+TfB/I+yevSQx BQNhQ/Bk6kTNC8K33AdN+q3RqUf2vce8LNmPBdv9G1/R1PbSDXp+cN/umpHy5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651821707; a=rsa-sha256; cv=none; b=Fh68xfFl7+E0HcALbIPXFUs/aVN2Xv5l80jVtbWCUEpd+siLCp9gktHjqTkEIlCfXuGB+v Todh/tsmHkO2/J3vIXJe+5J955qF0s1/GXFrSBpqyc5CsAhqxxnM0OFP7R+LBV1frEfNyn S0pAihLvBHNB+NTZ4zVIsu2230yJQuCJ/McWl8zhIVFmtQ51hr8UOn8eVNn0VpPumWfkkQ ZvbISbpo2QHtPXjO5sto5sHYSfLlMBU5O0G9EpJQUTFvzHy2cdxWeuzvhW6gkDtbNUHriZ m/Yex6439dyfoMda98fu8ssArs8YL3PdEi0TUAmJ5CgJW5IsUZauII9VnALBGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=13efc89f4e4423dca7734793349bc84c843b63e3 commit 13efc89f4e4423dca7734793349bc84c843b63e3 Author: Baptiste Daroussin AuthorDate: 2022-05-06 07:17:18 +0000 Commit: Baptiste Daroussin CommitDate: 2022-05-06 07:21:40 +0000 package: stop creating the backward compatibility symlinks Stop creating the "transitionning" backward compatibility symlink for packages, 9 month passed since we switched to .pkg Only create the backward compatible symlinks for the bootstrap and its signature when the compression format is txz. The old bootstrap may only be looking for those. This should be removed once 13.0-RELEASE is EOLed --- Mk/bsd.port.mk | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index c2760881ac04..2c35474eab1a 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -2610,7 +2610,6 @@ PKGREPOSITORY?= ${PACKAGES}/${PKGREPOSITORYSUBDIR} PACKAGES:= ${PACKAGES:S/:/\:/g} _HAVE_PACKAGES= yes PKGFILE?= ${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX} -PKGOLDFILE?= ${PKGREPOSITORY}/${PKGNAME}.${PKG_COMPRESSION_FORMAT} . else PKGFILE?= ${.CURDIR}/${PKGNAME}${PKG_SUFX} . endif @@ -2620,10 +2619,12 @@ WRKDIR_PKGFILE= ${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX} PKGLATESTREPOSITORY?= ${PACKAGES}/Latest PKGBASE?= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} PKGLATESTFILE= ${PKGLATESTREPOSITORY}/${PKGBASE}${PKG_SUFX} +.if ${PKG_COMPRESSION_FORMAT} != txz PKGOLDLATESTFILE= ${PKGLATESTREPOSITORY}/${PKGBASE}.${PKG_COMPRESSION_FORMAT} # Temporary workaround to be deleted once every supported version of FreeBSD # have a bootstrap which handles the pkg extension. PKGOLDSIGFILE= ${PKGLATESTREPOSITORY}/${PKGBASE}.${PKG_COMPRESSION_FORMAT}.sig +.endif CONFIGURE_SCRIPT?= configure CONFIGURE_CMD?= ./${CONFIGURE_SCRIPT} @@ -3383,12 +3384,6 @@ ${PKGFILE}: ${WRKDIR_PKGFILE} ${PKGREPOSITORY} @${LN} -f ${WRKDIR_PKGFILE} ${PKGFILE} 2>/dev/null \ || ${CP} -f ${WRKDIR_PKGFILE} ${PKGFILE} -. if !defined(_PKG_TRANSITIONING_TO_NEW_EXT) -_EXTRA_PACKAGE_TARGET_DEP+= ${PKGOLDFILE} -${PKGOLDFILE}: ${PKGFILE} - ${INSTALL} -l rs ${PKGFILE} ${PKGOLDFILE} -. endif - . if ${PKGORIGIN} == "ports-mgmt/pkg" || ${PKGORIGIN} == "ports-mgmt/pkg-devel" _EXTRA_PACKAGE_TARGET_DEP+= ${PKGLATESTREPOSITORY} _PORTS_DIRECTORIES+= ${PKGLATESTREPOSITORY} @@ -3398,11 +3393,11 @@ _EXTRA_PACKAGE_TARGET_DEP+= ${PKGLATESTFILE} ${PKGLATESTFILE}: ${PKGFILE} ${PKGLATESTREPOSITORY} ${INSTALL} -l rs ${PKGFILE} ${PKGLATESTFILE} -. if !defined(_PKG_TRANSITIONING_TO_NEW_EXT) +. if !defined(_PKG_TRANSITIONING_TO_NEW_EXT) && ${PKG_COMPRESSION_FORMAT} == txz _EXTRA_PACKAGE_TARGET_DEP+= ${PKGOLDLATESTFILE} ${PKGOLDSIGFILE} -${PKGOLDLATESTFILE}: ${PKGOLDFILE} ${PKGLATESTREPOSITORY} - ${INSTALL} -l rs ${PKGOLDFILE} ${PKGOLDLATESTFILE} +${PKGOLDLATESTFILE}: ${PKGFILE} ${PKGLATESTREPOSITORY} + ${INSTALL} -l rs ${PKGFILE} ${PKGOLDLATESTFILE} # Temporary workaround to be deleted once every supported version of FreeBSD # have a bootstrap which handles the pkg extension.