svn commit: r568662 - in head: Mk ports-mgmt/pkg-devel
Baptiste Daroussin
bapt at FreeBSD.org
Wed Mar 17 14:16:12 UTC 2021
Author: bapt
Date: Wed Mar 17 14:16:11 2021
New Revision: 568662
URL: https://svnweb.freebsd.org/changeset/ports/568662
Log:
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
Modified:
head/Mk/bsd.port.mk
head/ports-mgmt/pkg-devel/Makefile
head/ports-mgmt/pkg-devel/distinfo
Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk Wed Mar 17 14:12:19 2021 (r568661)
+++ head/Mk/bsd.port.mk Wed Mar 17 14:16:11 2021 (r568662)
@@ -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
Modified: head/ports-mgmt/pkg-devel/Makefile
==============================================================================
--- head/ports-mgmt/pkg-devel/Makefile Wed Mar 17 14:12:19 2021 (r568661)
+++ head/ports-mgmt/pkg-devel/Makefile Wed Mar 17 14:16:11 2021 (r568662)
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= pkg
-DISTVERSION= 1.16.99.2
+DISTVERSION= 1.16.99.3
_PKG_VERSION= ${DISTVERSION}
CATEGORIES= ports-mgmt
PKGNAMESUFFIX= -devel
@@ -13,7 +13,7 @@ LICENSE= BSD2CLAUSE
USE_GITHUB= yes
GH_ACCOUNT= freebsd
-GH_TAGNAME= c1aba2b2
+GH_TAGNAME= deae242d
CFLAGS+= -O0 -g -Wno-error
USE_LDCONFIG= ${PREFIX}/lib/compat/pkg
@@ -34,6 +34,11 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8
.endif
.include <bsd.port.pre.mk>
+
+# TODO: activate in april 2021
+#.if ${OPSYS} == FreeBSD && ${OSVERSION} > 1400000
+#CONFIGURE_ARGS+= --default-format=tzst
+#.endif
.if !exists(/usr/libdata/pkgconfig/liblzma.pc)
LIBLZMA_LIBS= -llzma
Modified: head/ports-mgmt/pkg-devel/distinfo
==============================================================================
--- head/ports-mgmt/pkg-devel/distinfo Wed Mar 17 14:12:19 2021 (r568661)
+++ head/ports-mgmt/pkg-devel/distinfo Wed Mar 17 14:16:11 2021 (r568662)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613671365
-SHA256 (freebsd-pkg-1.16.99.2-c1aba2b2_GH0.tar.gz) = 812cdc6ea419b5edbb78c70ebce6141c9020fff27d25373296fad7f304a66fb9
-SIZE (freebsd-pkg-1.16.99.2-c1aba2b2_GH0.tar.gz) = 3835259
+TIMESTAMP = 1615990258
+SHA256 (freebsd-pkg-1.16.99.3-deae242d_GH0.tar.gz) = 826574033d38ae7a83c84ead7cafb91c7f647a20cf6536bc1d216a854cdd6944
+SIZE (freebsd-pkg-1.16.99.3-deae242d_GH0.tar.gz) = 3893622
More information about the svn-ports-head
mailing list