From owner-svn-ports-all@FreeBSD.ORG  Thu Mar 14 22:11:48 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 78A82E65;
 Thu, 14 Mar 2013 22:11:48 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 53484E9F;
 Thu, 14 Mar 2013 22:11:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2EMBmZR040755;
 Thu, 14 Mar 2013 22:11:48 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2EMBmbK040753;
 Thu, 14 Mar 2013 22:11:48 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201303142211.r2EMBmbK040753@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 14 Mar 2013 22:11:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r314189 - 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: Thu, 14 Mar 2013 22:11:48 -0000

Author: bdrewery
Date: Thu Mar 14 22:11:47 2013
New Revision: 314189
URL: http://svnweb.freebsd.org/changeset/ports/314189

Log:
  - Remove use of bsd.port.pre.mk
  - Reword pkg-message to try to be more clear

Modified:
  head/ports-mgmt/portmaster/Makefile
  head/ports-mgmt/portmaster/pkg-message

Modified: head/ports-mgmt/portmaster/Makefile
==============================================================================
--- head/ports-mgmt/portmaster/Makefile	Thu Mar 14 21:57:16 2013	(r314188)
+++ head/ports-mgmt/portmaster/Makefile	Thu Mar 14 22:11:47 2013	(r314189)
@@ -30,7 +30,7 @@ PLIST_FILES=	sbin/portmaster etc/portmas
 
 MAN8=		portmaster.8
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPKGNGPATCH}
 PATCH_SITES+=	http://mirror.shatow.net/freebsd/portmaster/
@@ -79,4 +79,4 @@ post-install:
 	${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/ports-mgmt/portmaster/pkg-message
==============================================================================
--- head/ports-mgmt/portmaster/pkg-message	Thu Mar 14 21:57:16 2013	(r314188)
+++ head/ports-mgmt/portmaster/pkg-message	Thu Mar 14 22:11:47 2013	(r314189)
@@ -1,10 +1,10 @@
-To switch to the new PKGNG package manager there are 2
-extra steps required.
+If you want to switch to the new pkg(8) format, and have not already done so,
+there are some extra steps to take:
 
-	Enable PKGNG as your package format:
+    Enable PKGNG as your package format:
 
-	  # echo 'WITH_PKGNG=yes' >> /etc/make.conf
+        # echo 'WITH_PKGNG=yes' >> /etc/make.conf
 
-	Then convert your /var/db/pkg database to the new pkg format:
+    Then convert your /var/db/pkg database to the new pkg format:
 
-	  # pkg2ng
+        # pkg2ng