summaryrefslogtreecommitdiff
path: root/ports-mgmt/portmaster
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2013-03-14 22:11:47 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2013-03-14 22:11:47 +0000
commit8d9524b3b8ff9e93792e89179edb75bce2733b39 (patch)
treec430c886f744679b8cac6a3d376748a3fcdf7f52 /ports-mgmt/portmaster
parent- Add Desktop entries (diff)
- Remove use of bsd.port.pre.mk
- Reword pkg-message to try to be more clear
Notes
Notes: svn path=/head/; revision=314189
Diffstat (limited to 'ports-mgmt/portmaster')
-rw-r--r--ports-mgmt/portmaster/Makefile4
-rw-r--r--ports-mgmt/portmaster/pkg-message12
2 files changed, 8 insertions, 8 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile
index 9e89f722d093..60cc9fe39c26 100644
--- a/ports-mgmt/portmaster/Makefile
+++ b/ports-mgmt/portmaster/Makefile
@@ -30,7 +30,7 @@ PLIST_FILES= sbin/portmaster etc/portmaster.rc.sample
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>
diff --git a/ports-mgmt/portmaster/pkg-message b/ports-mgmt/portmaster/pkg-message
index 8c63ce6fd210..802773f00f1e 100644
--- a/ports-mgmt/portmaster/pkg-message
+++ b/ports-mgmt/portmaster/pkg-message
@@ -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