aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES10
-rw-r--r--Mk/bsd.port.mk8
-rw-r--r--Mk/bsd.port.subdir.mk8
-rw-r--r--UPDATING22
4 files changed, 48 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index a7111996f8f6..8648f050ce2d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,6 +10,16 @@ in the release notes and/or placed into UPDATING.
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
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 227179a3aca7..9e542945108d 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -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}
diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk
index 56567fa4c23d..efa6d562ca4e 100644
--- a/Mk/bsd.port.subdir.mk
+++ b/Mk/bsd.port.subdir.mk
@@ -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
diff --git a/UPDATING b/UPDATING
index 122451ec44e8..d45efed634e5 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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