Date: Thu, 30 May 2013 15:17:30 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319432 - in head: Mk ports-mgmt ports-mgmt/pkg ports-mgmt/pkg-devel ports-mgmt/pkg-devel/files Message-ID: <201305301517.r4UFHUQo033526@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu May 30 15:17:29 2013 New Revision: 319432 URL: http://svnweb.freebsd.org/changeset/ports/319432 Log: The pkg developement team is proud to announce the new 1.1.0 beta1 release of pkg. Here is the list of new features that happened in pkg 1.1: - new simpler and more reliable solver - shared libraries are now always tracked - ssh:// is supported as a protocol to distribute packages (needs pkg 1.1+ on the server hosting the packages) - multirepository is no longer considered experimental and works by default. - incremental update of the catalog (only if the repository was created by pkg 1.1+) - simplification of the public API - stabilisation of the public API (we will now try to keep it stable and if change are needed there will be deprecation time before removal of some old functions) - new experimental pkg convert (can convert from and to legacy pkg database) pkg2ng now uses pkg convert (still recommanded to use pkg2ng) - new pkg lock/unlock to prevent any manipulation of a given package (no upgrade,delete,etc) - improved UI (now you can see the progress of an upgrade what is left to be done) - new pkg annotation to allow one to add annotations (free form key/value) to a package) - pkg audit is now able to directly parse the vuxml native format and not only the compact version - pkg -vv now shows all available options and their current settings - pkg -vvv now shows a description of all the available options - pkg info now automatically considers the query as globbing if * is in the requested pattern - new hook plugin interface (allows users to create hooks that get called at anytime during and upgrade/installation/deletion of a package) - new cmd plugin interface (allows users to create new sub command available for pkg) - pkg register can now register a port installation in the legacy database format - repository can be defined in simple yaml files Internal: - massive usage of hash tables (uthash), which simplifies a lot of the code, and improves performances - lots of optimisation in plist and manifest parsing - lots of optimisation in loading packages (mmap used when possible) - lots of cleanup in memory usage - regression test framework is now ready (using atf) regression test are slowly being added and populated. To use this new version: Ports users (or in building factories: poudriere/tinderbox): Add WITH_PKGNG=devel to your make.conf pkg set -o ports-mgmt/pkg:ports-mgmt/pkg-devel Binary package users, if the remote repository is providing pkg 1.1: pkg set -o ports-mgmt/pkg:ports-mgmt/pkg-devel pkg upgrade Note that pkg 1.1 can use a repository created for pkg 1.0 and vis versa. Huge thanks to all the people that have contributed to the pkg developement: - may that be by code - documentation - bug report - feedback - ideas List of people who contributed code: Baptiste Daroussin, Matthew Seaman, Bryan Drewery, Vsevolod Stakhov, Marin Atanasov Nikolov, Alexandre Perrin, Romain Tartière, Julien Laffaye, Glen Barber, John Marino, Alex Kozlov, Roman Naumann, Sofian Brabez, Alberto Villa, Will Andrews, Eitan Adler, Dan McGregor, namor, niamtokik, Arthur Gautier, Garrett Cooper, Andrew Turner, Jeremy Chadwick, Hajimu UMEMOTO, Mark Lokowich, Eygene Ryabinkin, Pietro Cerutti, Rolf Grossmann, Ed Schouten, Dimitry Andric, David Forsythe, Stefan Grundmann, Craig Rodrigues, Antoine Brodin, Andrey Zonov, Joel Dahl Stats between 1.0 and 1.1: 287 files changed, 63418 insertions(+), 18763 deletions(-) 1198 commits Added: head/ports-mgmt/pkg-devel/ - copied from r319411, head/ports-mgmt/pkg/ Deleted: head/ports-mgmt/pkg-devel/files/ Modified: head/Mk/bsd.pkgng.mk head/Mk/bsd.port.mk head/ports-mgmt/Makefile head/ports-mgmt/pkg-devel/Makefile head/ports-mgmt/pkg-devel/distinfo head/ports-mgmt/pkg-devel/pkg-plist head/ports-mgmt/pkg/Makefile Modified: head/Mk/bsd.pkgng.mk ============================================================================== --- head/Mk/bsd.pkgng.mk Thu May 30 14:42:59 2013 (r319431) +++ head/Mk/bsd.pkgng.mk Thu May 30 15:17:29 2013 (r319432) @@ -263,7 +263,7 @@ do-package: ${TMPPLIST} ${RM} -f ${PACKAGES}/$$cat/${PKGNAMEPREFIX}${PORTNAME}*${PKG_SUFX} ; \ done @if ${PKG_CREATE} -o ${PKGREPOSITORY} ${PKGNAME}; then \ - if [ "${PKGORIGIN}" = "ports-mgmt/pkg" ]; then \ + if [ "${PKGORIGIN}" = "ports-mgmt/pkg" -o "${PKGORIGIN}" = "ports-mgmt/pkg-devel" ]; then \ if [ ! -d ${PKGLATESTREPOSITORY} ]; then \ if ! ${MKDIR} ${PKGLATESTREPOSITORY}; then \ ${ECHO_MSG} "=> Can't create directory ${PKGLATESTREPOSITORY}."; \ Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Thu May 30 14:42:59 2013 (r319431) +++ head/Mk/bsd.port.mk Thu May 30 15:17:29 2013 (r319432) @@ -1205,7 +1205,7 @@ OSVERSION!= ${SYSCTL} -n kern.osreldate .if ${OSVERSION} >= 1000017 .if !defined(WITHOUT_PKGNG) -WITH_PKGNG= yes +WITH_PKGNG?= yes .else .undef WITH_PKGNG .endif @@ -1650,10 +1650,14 @@ LIB32DIR= lib .endif PLIST_SUB+= LIB32DIR=${LIB32DIR} +PKGNG_ORIGIN?= ports-mgmt/pkg .if defined(WITH_PKGNG) +.if ${WITH_PKGNG} == devel +PKGNG_ORIGIN= ports-mgmt/pkg-devel +.endif .if !defined(PKG_DEPENDS) .if !defined(CLEAN_FETCH_ENV) -PKG_DEPENDS+= ${LOCALBASE}/sbin/pkg:${PORTSDIR}/ports-mgmt/pkg +PKG_DEPENDS+= ${LOCALBASE}/sbin/pkg:${PORTSDIR}/${PKGNG_ORIGIN} .endif .endif .endif Modified: head/ports-mgmt/Makefile ============================================================================== --- head/ports-mgmt/Makefile Thu May 30 14:42:59 2013 (r319431) +++ head/ports-mgmt/Makefile Thu May 30 15:17:29 2013 (r319432) @@ -32,6 +32,7 @@ SUBDIR += pchecker SUBDIR += pib SUBDIR += pkg + SUBDIR += pkg-devel SUBDIR += pkg-orphan SUBDIR += pkg-plist SUBDIR += pkg-rmleaf Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Thu May 30 10:22:43 2013 (r319411) +++ head/ports-mgmt/pkg-devel/Makefile Thu May 30 15:17:29 2013 (r319432) @@ -1,12 +1,11 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.0.12 -PORTREVISION= 1 +DISTVERSION= 1.1.0.b1 CATEGORIES= ports-mgmt -MASTER_SITES= LOCAL/portmgr \ - http://files.etoilebsd.net/pkg/ \ - http://mirror.shatow.net/freebsd/${PORTNAME}/ +MASTER_SITES= http://files.etoilebsd.net/pkg/ \ + http://mirror.shatow.net/freebsd/${PORTNAME}/ \ + LOCAL/portmgr MAINTAINER= portmgr@FreeBSD.org COMMENT= New generation package manager @@ -31,16 +30,19 @@ USE_SUBMAKE= yes MAN8= pkg.8 \ pkg-add.8 \ + pkg-annotate.8 \ pkg-autoremove.8 \ pkg-audit.8 \ pkg-backup.8 \ pkg-check.8 \ pkg-clean.8 \ + pkg-convert.8 \ pkg-create.8 \ pkg-delete.8 \ pkg-fetch.8 \ pkg-info.8 \ pkg-install.8 \ + pkg-lock.8 \ pkg-query.8 \ pkg-register.8 \ pkg-repo.8 \ @@ -56,12 +58,17 @@ MAN8= pkg.8 \ pkg-version.8 \ pkg-which.8 MAN5= pkg.conf.5 +MAN3= pkg_printf.3 MLINKS= pkg-delete.8 pkg-remove.8 \ + pkg-lock.8 pkg-unlock.8 \ pkg.8 pkg-static.8 .include <bsd.port.pre.mk> .if defined(WITH_PKGNG) +.if ${WITH_PKGNG} != devel +IGNORE= WITH_PKGNG is not defined to 'devel', this version is the devel 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}) Modified: head/ports-mgmt/pkg-devel/distinfo ============================================================================== --- head/ports-mgmt/pkg/distinfo Thu May 30 10:22:43 2013 (r319411) +++ head/ports-mgmt/pkg-devel/distinfo Thu May 30 15:17:29 2013 (r319432) @@ -1,2 +1,2 @@ -SHA256 (pkg-1.0.12.tar.xz) = 04b5fe89c9f106b5499056825066df284e5f1bd3bcdf3b46228164c9be3a96b2 -SIZE (pkg-1.0.12.tar.xz) = 1456292 +SHA256 (pkg-1.1.0.b1.tar.xz) = bb851be8bb778b21f8e91271b15834c7dc0089e9973c8afe1dd62ae04a81f2f6 +SIZE (pkg-1.1.0.b1.tar.xz) = 1549412 Modified: head/ports-mgmt/pkg-devel/pkg-plist ============================================================================== --- head/ports-mgmt/pkg/pkg-plist Thu May 30 10:22:43 2013 (r319411) +++ head/ports-mgmt/pkg-devel/pkg-plist Thu May 30 15:17:29 2013 (r319432) @@ -3,7 +3,7 @@ sbin/pkg sbin/pkg-static sbin/pkg2ng include/pkg.h -lib/libpkg.so.0 +lib/libpkg.so.1 lib/libpkg.so lib/libpkg.a etc/periodic/daily/400.status-pkg Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Thu May 30 14:42:59 2013 (r319431) +++ head/ports-mgmt/pkg/Makefile Thu May 30 15:17:29 2013 (r319432) @@ -62,6 +62,9 @@ MLINKS= pkg-delete.8 pkg-remove.8 \ .include <bsd.port.pre.mk> .if defined(WITH_PKGNG) +.if ${WITH_PKGNG} == devel +IGNORE= WITH_PKGNG 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})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305301517.r4UFHUQo033526>