git: 13efc89f4e44 - main - package: stop creating the backward compatibility symlinks

The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/ports/commit/?id=13efc89f4e4423dca7734793349bc84c843b63e3

commit 13efc89f4e4423dca7734793349bc84c843b63e3
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2022-05-06 07:17:18 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
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.