From owner-svn-ports-all@FreeBSD.ORG Wed Oct 10 08:40:23 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DAE8E557; Wed, 10 Oct 2012 08:40:22 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B59BE8FC14; Wed, 10 Oct 2012 08:40:22 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9A8eMaA088951; Wed, 10 Oct 2012 08:40:22 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9A8eMcS088946; Wed, 10 Oct 2012 08:40:22 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201210100840.q9A8eMcS088946@svn.freebsd.org> From: Baptiste Daroussin Date: Wed, 10 Oct 2012 08:40:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305637 - in head: . Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Oct 2012 08:40:23 -0000 Author: bapt Date: Wed Oct 10 08:40:21 2012 New Revision: 305637 URL: http://svn.freebsd.org/changeset/ports/305637 Log: Switching current to use pkgng by default Adding WITHOUT_PKGNG for people not willing to migrate to pkgng now Hat: portmgr Non-regression: beat Exp-runs: beat Modified: head/CHANGES head/Mk/bsd.port.mk head/Mk/bsd.port.subdir.mk head/UPDATING Modified: head/CHANGES ============================================================================== --- head/CHANGES Wed Oct 10 08:09:24 2012 (r305636) +++ head/CHANGES Wed Oct 10 08:40:21 2012 (r305637) @@ -10,6 +10,16 @@ in the release notes and/or placed into All ports committers are allowed to commit to this file. +20121010: +AUTHOR: bapt@FreeBSD.org + + * The ports tree is now using pkgng as the default package manager + for HEAD. This only affects users of CURRENT -- users of other + branches need not take any action. + + To keep pkg_install as the default package manager, use the new + WITHOUT_PKGNG knob in make.conf + 20120830: AUTHOR: beat@FreeBSD.org Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Oct 10 08:09:24 2012 (r305636) +++ head/Mk/bsd.port.mk Wed Oct 10 08:40:21 2012 (r305637) @@ -1209,6 +1209,14 @@ OSVERSION!= ${SYSCTL} -n kern.osreldate .endif .endif +.if ${OSVERSION} >= 1000017 +.if !defined(WITHOUT_PKGNG) +WITH_PKGNG= yes +.else +.undef WITH_PKGNG +.endif +.endif + MASTERDIR?= ${.CURDIR} .if ${MASTERDIR} != ${.CURDIR} Modified: head/Mk/bsd.port.subdir.mk ============================================================================== --- head/Mk/bsd.port.subdir.mk Wed Oct 10 08:09:24 2012 (r305636) +++ head/Mk/bsd.port.subdir.mk Wed Oct 10 08:40:21 2012 (r305637) @@ -77,6 +77,14 @@ OSVERSION!= ${SYSCTL} -n kern.osreldate .endif .endif +.if ${OSVERSION} >= 1000017 +.if !defined(WITHOUT_PKGNG) +WITH_PKGNG= yes +.else +.undef WITH_PKGNG +.endif +.endif + .if !defined(_OSRELEASE) _OSRELEASE!= uname -r .endif Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Oct 10 08:09:24 2012 (r305636) +++ head/UPDATING Wed Oct 10 08:40:21 2012 (r305637) @@ -5,6 +5,28 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20121010: + AFFECTS: users of CURRENT + AUTHOR: bapt@FreeBSD.org + + The ports tree is now using pkgng as the default package manager + for HEAD. This only affects users of CURRENT -- users of other + branches need not take any action. + + To keep pkg_install as the default package manager, use the new + WITHOUT_PKGNG knob in make.conf + + To make the switch: + + 1/ Set WITHOUT_PKGNG=yes in make.conf and upgrade all your ports to + the latest available versions using your favourite tools. + + 2/ Install ports-mgmt/pkg + + 3/ Remove WITHOUT_PKGNG from make.conf and run + + # pkg2ng + 20121009: AFFECTS: users of multimedia/vdpau-video AUTHOR: madpilot@FreeBSD.org