aboutsummaryrefslogtreecommitdiff
path: root/Mk/bsd.pkgng.mk
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2012-02-22 17:34:47 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2012-02-22 17:34:47 +0000
commit7d51693e8c5337bb4971cdef923228972b73c161 (patch)
tree0d31f1819f69285413a420afa23451e8cd7765c0 /Mk/bsd.pkgng.mk
parent902f3b04d93098651438657405d7def58a270922 (diff)
downloadports-7d51693e8c5337bb4971cdef923228972b73c161.tar.gz
ports-7d51693e8c5337bb4971cdef923228972b73c161.zip
- only include bsd.pkgng.mk once [1]
- only read bsd.pkgng.mk in post.mk [1] - move the command definition to bsd.command.mk [1] - fix check-vulnerable [2] Submitted by: avilla [1], rene [2]
Notes
Notes: svn path=/head/; revision=292069
Diffstat (limited to 'Mk/bsd.pkgng.mk')
-rw-r--r--Mk/bsd.pkgng.mk14
1 files changed, 3 insertions, 11 deletions
diff --git a/Mk/bsd.pkgng.mk b/Mk/bsd.pkgng.mk
index d8d17b5e67b1..f0c9973b896c 100644
--- a/Mk/bsd.pkgng.mk
+++ b/Mk/bsd.pkgng.mk
@@ -3,18 +3,9 @@
#
# $FreeBSD$
#
-PKGNG_MAINTAINER= portmgr@FreeBSD.org
-PKG_BIN?= ${LOCALBASE}/sbin/pkg
-PKG_CMD= ${PKG_BIN} register
-PKG_DELETE= ${PKG_BIN} delete -y
-PKG_INFO= ${PKG_BIN} info -g
-PKG_VERSION= ${PKG_BIN} version
-PKG_CREATE= ${PKG_BIN} create
-PKG_ADD= ${PKG_BIN} add
-PKG_QUERY= ${PKG_BIN} query
-
-PKG_SUFX= .txz
+.if defined(_POSTMKINCLUDED)
+PKGNG_Include_MAINTAINER= portmgr@FreeBSD.org
METADIR= ${WRKDIR}/.metadir
MANIFESTF= ${METADIR}/+MANIFEST
@@ -276,3 +267,4 @@ deinstall:
@${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE}
.endif
+.endif # defined(_POSTMKINCLUDED)