svn commit: r314189 - head/ports-mgmt/portmaster

[Bryan Drewery]

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