--- a/components/meta-packages/history/Makefile	Mon Apr 11 12:50:17 2016 -0700
+++ b/components/meta-packages/history/Makefile	Tue Apr 12 10:19:23 2016 -0700
@@ -32,10 +32,6 @@
 COMPONENT_SRC=
 include $(WS_MAKE_RULES)/prep.mk
 
-PKGSEND =	/usr/bin/pkgsend
-PKGLINT =	/usr/bin/pkglint
-PKGMOGRIFY =	/usr/bin/pkgmogrify
-
 COMPONENT_NAME=		"Package History"
 COMPONENT_BUGDB=	gate-stuff/userland
 

--- a/make-rules/ips.mk	Mon Apr 11 12:50:17 2016 -0700
+++ b/make-rules/ips.mk	Tue Apr 12 10:19:23 2016 -0700
@@ -39,13 +39,6 @@
 
 PKGDEPEND =	/usr/bin/pkgdepend
 PKGFMT =	/usr/bin/pkgfmt
-PKGMOGRIFY =	/usr/bin/pkgmogrify
-PKGSEND =	/usr/bin/pkgsend
-ifeq   ($(strip $(PKGLINT_COMPONENT)),)
-PKGLINT =	/usr/bin/pkglint
-else
-PKGLINT =	${WS_TOOLS}/pkglint
-endif
 PKGMANGLE =	$(WS_TOOLS)/userland-mangler
 
 GENERATE_HISTORY= $(WS_TOOLS)/generate-history

--- a/make-rules/shared-macros.mk	Mon Apr 11 12:50:17 2016 -0700
+++ b/make-rules/shared-macros.mk	Tue Apr 12 10:19:23 2016 -0700
@@ -622,6 +622,7 @@
 
 PKGREPO =	/usr/bin/pkgrepo
 PKGSEND =	/usr/bin/pkgsend
+PKGMOGRIFY =	/usr/bin/pkgmogrify
 ifeq   ($(strip $(PKGLINT_COMPONENT)),)
 PKGLINT =	/usr/bin/pkglint
 else