update to 1.16.99.3:

The main big change is the switch of the package extension to .pkg
This is done so we can change compression format without having to
modify the tools each time to adapt to the new extension

While here adapt the ports tree to the new .pkg extension and prepare
the pkg-devel ports to swicth the package compression format to zstd
in FreeBSD 14 in a month to give time to upgrade to a version which
have the bootstrap knowing about .pkg.

Changes from 1.16.99.2 to 1.16.99.3
- lua update to 5.4.2
- pkg repo accept now all supported formats mixed without config
- pkg now default on creating .pkg files with backward compatible symlinks
- backward compatible symlinks are now an option
- make the default comprpession format a config option
- set the default compression level for zstd to 19
- make the default compression level a config option
- Update libucl to latest version

1 files changed, 42 insertions, 2 deletions

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 61fc0ee170ed..12e5843337a2 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -2230,11 +2230,24 @@ _PKGMESSAGES+=	${PKGMESSAGE}
 
 TMPPLIST?=	${WRKDIR}/.PLIST.mktmp
 
+.if ${WITH_PKG} == devel
+PKG_SUFX?=	.pkg
+.if defined(PKG_NOCOMPRESS)
+PKG_OLDSUFX?=	.tar
+.else
+.if ${OSVERSION} > 1400000
+PKG_OLDSUFX?=	.tzst
+.else
+PKG_OLDSUFX?=	.txz
+.endif
+.endif
+.else
 .if defined(PKG_NOCOMPRESS)
 PKG_SUFX?=		.tar
 .else
 PKG_SUFX?=		.txz
 .endif
+.endif
 # where pkg(8) stores its data
 PKG_DBDIR?=		/var/db/pkg
 
@@ -2624,6 +2637,9 @@ PKGREPOSITORY?=		${PACKAGES}/${PKGREPOSITORYSUBDIR}
 PACKAGES:=	${PACKAGES:S/:/\:/g}
 _HAVE_PACKAGES=	yes
 PKGFILE?=		${PKGREPOSITORY}/${PKGNAME}${PKG_SUFX}
+.if ${WITH_PKG} == devel
+PKGOLDFILE?=		${PKGREPOSITORY}/${PKGNAME}${PKG_OLDSUFX}
+.endif
 .else
 PKGFILE?=		${.CURDIR}/${PKGNAME}${PKG_SUFX}
 .endif
@@ -2633,6 +2649,9 @@ WRKDIR_PKGFILE=	${WRKDIR}/pkg/${PKGNAME}${PKG_SUFX}
 PKGLATESTREPOSITORY?=	${PACKAGES}/Latest
 PKGBASE?=			${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 PKGLATESTFILE=		${PKGLATESTREPOSITORY}/${PKGBASE}${PKG_SUFX}
+.if ${WITH_PKG} == devel
+PKGOLDLATESTFILE=		${PKGLATESTREPOSITORY}/${PKGBASE}${PKG_OLDSUFX}
+.endif
 
 CONFIGURE_SCRIPT?=	configure
 CONFIGURE_CMD?=		./${CONFIGURE_SCRIPT}
@@ -3415,20 +3434,34 @@ ${PKGFILE}: ${WRKDIR_PKGFILE} ${PKGREPOSITORY}
 	@${LN} -f ${WRKDIR_PKGFILE} ${PKGFILE} 2>/dev/null \
 			|| ${CP} -f ${WRKDIR_PKGFILE} ${PKGFILE}
 
+.if ${WITH_PKG} == devel
+_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}
 _EXTRA_PACKAGE_TARGET_DEP+=	${PKGLATESTFILE}
 
+
 ${PKGLATESTFILE}: ${PKGFILE} ${PKGLATESTREPOSITORY}
 	${INSTALL} -l rs ${PKGFILE} ${PKGLATESTFILE}
+
+.if ${WITH_PKG} == devel
+_EXTRA_PACKAGE_TARGET_DEP+=	${PKGOLDLATESTFILE}
+
+${PKGOLDLATESTFILE}: ${PKGOLDFILE} ${PKGLATESTREPOSITORY}
+	${INSTALL} -l rs ${PKGOLDFILE} ${PKGOLDLATESTFILE}
+.endif
 .  endif
 
 .endif
 
 # from here this will become a loop for subpackages
 ${WRKDIR_PKGFILE}: ${TMPPLIST} create-manifest ${WRKDIR}/pkg
-	@if ! ${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CREATE} ${PKG_CREATE_ARGS} -m ${METADIR} -p ${TMPPLIST} -f ${PKG_SUFX:S/.//} -o ${WRKDIR}/pkg ${PKGNAME}; then \
+	@if ! ${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CREATE} ${PKG_CREATE_ARGS} -m ${METADIR} -p ${TMPPLIST} -o ${WRKDIR}/pkg ${PKGNAME}; then \
 		cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \
 		exit 1; \
 	fi
@@ -3438,7 +3471,14 @@ _EXTRA_PACKAGE_TARGET_DEP+=	${WRKDIR_PKGFILE}
 # This will be the end of the loop
 
 .if !target(do-package)
-PKG_CREATE_ARGS=	-r ${STAGEDIR}
+.if ${WITH_PKG} == devel
+.if defined(PKG_NOCOMPRESS)
+PKG_CREATE_ARGS+= -f ${PKG_OLDSUFX:S/.//}
+.endif
+.else
+PKG_CREATE_ARGS+= -f ${PKG_SUFX:S/.//}
+.endif
+PKG_CREATE_ARGS+=	-r ${STAGEDIR}
 .  if defined(PKG_CREATE_VERBOSE)
 PKG_CREATE_ARGS+=	-v
 .  endif