From owner-svn-ports-all@FreeBSD.ORG  Mon Oct 15 16:14:36 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 6F9776FE;
 Mon, 15 Oct 2012 16:14:36 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 3E3B78FC16;
 Mon, 15 Oct 2012 16:14:36 +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 q9FGEatO024785;
 Mon, 15 Oct 2012 16:14:36 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9FGEa49024781;
 Mon, 15 Oct 2012 16:14:36 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201210151614.q9FGEa49024781@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Mon, 15 Oct 2012 16:14:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305920 - in head: . ports-mgmt/portmaster
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 15 Oct 2012 16:14:36 -0000

Author: bdrewery
Date: Mon Oct 15 16:14:35 2012
New Revision: 305920
URL: http://svn.freebsd.org/changeset/ports/305920

Log:
  - Add ports-mgmt/pkg as a RUN_DEPENDS if enabling pkgng support
  - Add UPDATING entry and pkg-message to assist in converting
  
  Feature safe:	yes

Added:
  head/ports-mgmt/portmaster/pkg-message   (contents, props changed)
Modified:
  head/UPDATING
  head/ports-mgmt/portmaster/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Oct 15 16:08:57 2012	(r305919)
+++ head/UPDATING	Mon Oct 15 16:14:35 2012	(r305920)
@@ -6,6 +6,19 @@ You should get into the habit of checkin
 you update your ports collection, before attempting any port upgrades.
 
 20121015:
+  AFFECTS: users of ports-mgmt/portmaster
+  AUTHOR: bdrewery@FreeBSD.org
+
+  Portmaster now support pkgng. To use pkgng, enable the patch in the port,
+  enable pkgng in your make.conf, and convert your existing /var/db/pkg
+  database. Also see UPDATING entry 20121010 if you are on a recent CURRENT
+  and do not want to use pkg.
+
+  # make -C /usr/ports/ports-mgmt/portmaster config build deinstall install clean
+  # echo 'WITH_PKGNG=yes' >> /etc/make.conf
+  # pkg2ng
+
+20121015:
   AFFECTS: users of ports-mgmt/portupgrade
   AUTHOR: bdrewery@FreeBSD.org
 

Modified: head/ports-mgmt/portmaster/Makefile
==============================================================================
--- head/ports-mgmt/portmaster/Makefile	Mon Oct 15 16:08:57 2012	(r305919)
+++ head/ports-mgmt/portmaster/Makefile	Mon Oct 15 16:14:35 2012	(r305920)
@@ -2,7 +2,7 @@
 
 PORTNAME=	portmaster
 PORTVERSION=	3.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	GH \
   		http://mirror.shatow.net/freebsd/portmaster/
@@ -30,6 +30,7 @@ MAN8=		portmaster.8
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPKGNGPATCH}
+RUN_DEPENDS+=	pkg>0:${PORTSDIR}/ports-mgmt/pkg
 PATCH_SITES+=	http://mirror.shatow.net/freebsd/portmaster/
 PATCHFILES+=	patch-portmaster-pkgng.gz
 .endif
@@ -67,5 +68,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/files/zsh-completions \
 		${PREFIX}/share/zsh/site-functions/_portmaster
 .endif
+.if ${PORT_OPTIONS:MPKGNGPATCH}
+	${CAT} ${PKGMESSAGE}
+.endif
 
 .include <bsd.port.mk>

Added: head/ports-mgmt/portmaster/pkg-message
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/ports-mgmt/portmaster/pkg-message	Mon Oct 15 16:14:35 2012	(r305920)
@@ -0,0 +1,10 @@
+If you are upgrading from the old package format, there are 2
+extra steps required.
+
+Enable PKGNG as your package format:
+
+  # echo 'WITH_PKGNG=yes' >> /etc/make.conf
+
+Then convert your /var/db/pkg database to the new pkg format:
+
+  # pkg2ng