aboutsummaryrefslogtreecommitdiff
path: root/pkgs/pseudo
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/pseudo')
-rw-r--r--pkgs/pseudo/bin/Makefile.depend2
-rw-r--r--pkgs/pseudo/cddl/Makefile.depend2
-rw-r--r--pkgs/pseudo/clang/Makefile.depend2
-rw-r--r--pkgs/pseudo/games/Makefile.depend2
-rw-r--r--pkgs/pseudo/gcc/Makefile.depend2
-rw-r--r--pkgs/pseudo/gnu/Makefile.depend2
-rw-r--r--pkgs/pseudo/include/Makefile.depend2
-rw-r--r--pkgs/pseudo/kerberos5/Makefile.depend2
-rw-r--r--pkgs/pseudo/lib/Makefile.depend2
-rw-r--r--pkgs/pseudo/libexec/Makefile.depend2
-rw-r--r--pkgs/pseudo/misc/Makefile.depend10
-rw-r--r--pkgs/pseudo/sbin/Makefile.depend2
-rw-r--r--pkgs/pseudo/secure/Makefile.depend2
-rw-r--r--pkgs/pseudo/share/Makefile.depend2
-rw-r--r--pkgs/pseudo/the-lot/Makefile.depend2
-rw-r--r--pkgs/pseudo/usr.bin/Makefile.depend2
-rw-r--r--pkgs/pseudo/usr.sbin/Makefile.depend2
17 files changed, 4 insertions, 38 deletions
diff --git a/pkgs/pseudo/bin/Makefile.depend b/pkgs/pseudo/bin/Makefile.depend
index 9c817504ff42..e94e9c378f3c 100644
--- a/pkgs/pseudo/bin/Makefile.depend
+++ b/pkgs/pseudo/bin/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
bin/cat \
bin/chflags \
diff --git a/pkgs/pseudo/cddl/Makefile.depend b/pkgs/pseudo/cddl/Makefile.depend
index 275084e70acd..ad0f9f373d6e 100644
--- a/pkgs/pseudo/cddl/Makefile.depend
+++ b/pkgs/pseudo/cddl/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
cddl/lib/drti \
cddl/lib/libavl \
diff --git a/pkgs/pseudo/clang/Makefile.depend b/pkgs/pseudo/clang/Makefile.depend
index 0b47fe6604b6..128712a7e078 100644
--- a/pkgs/pseudo/clang/Makefile.depend
+++ b/pkgs/pseudo/clang/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
lib/clang/libclanganalysis \
lib/clang/libclangarcmigrate \
diff --git a/pkgs/pseudo/games/Makefile.depend b/pkgs/pseudo/games/Makefile.depend
index 4fbcb3d2128d..7f5cfa2d8ba1 100644
--- a/pkgs/pseudo/games/Makefile.depend
+++ b/pkgs/pseudo/games/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
games/bcd \
games/caesar \
diff --git a/pkgs/pseudo/gcc/Makefile.depend b/pkgs/pseudo/gcc/Makefile.depend
index 4e3a43b7b9d5..8136da6a0ae3 100644
--- a/pkgs/pseudo/gcc/Makefile.depend
+++ b/pkgs/pseudo/gcc/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
gnu/usr.bin/cc/cc_tools \
gnu/usr.bin/cc/libiberty \
diff --git a/pkgs/pseudo/gnu/Makefile.depend b/pkgs/pseudo/gnu/Makefile.depend
index 30011a5bf50c..7f18a63d0ac2 100644
--- a/pkgs/pseudo/gnu/Makefile.depend
+++ b/pkgs/pseudo/gnu/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
gnu/lib/csu \
gnu/lib/libgcc \
diff --git a/pkgs/pseudo/include/Makefile.depend b/pkgs/pseudo/include/Makefile.depend
index f809febf40fc..e8e6e09c0ebd 100644
--- a/pkgs/pseudo/include/Makefile.depend
+++ b/pkgs/pseudo/include/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
include/arpa \
include/gssapi \
diff --git a/pkgs/pseudo/kerberos5/Makefile.depend b/pkgs/pseudo/kerberos5/Makefile.depend
index 5d4e9e48e863..525755d97bdc 100644
--- a/pkgs/pseudo/kerberos5/Makefile.depend
+++ b/pkgs/pseudo/kerberos5/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
kerberos5/doc \
kerberos5/lib/libasn1 \
diff --git a/pkgs/pseudo/lib/Makefile.depend b/pkgs/pseudo/lib/Makefile.depend
index f7e0c2e44e48..ff61cfb802bc 100644
--- a/pkgs/pseudo/lib/Makefile.depend
+++ b/pkgs/pseudo/lib/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
lib/${CSU_DIR} \
lib/libc \
diff --git a/pkgs/pseudo/libexec/Makefile.depend b/pkgs/pseudo/libexec/Makefile.depend
index e81f621e8ae8..161dcffad22b 100644
--- a/pkgs/pseudo/libexec/Makefile.depend
+++ b/pkgs/pseudo/libexec/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
libexec/atf/atf-check \
libexec/atrun \
diff --git a/pkgs/pseudo/misc/Makefile.depend b/pkgs/pseudo/misc/Makefile.depend
index ecb32412c0cc..efc3bb7a9446 100644
--- a/pkgs/pseudo/misc/Makefile.depend
+++ b/pkgs/pseudo/misc/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
rescue/librescue \
rescue/rescue \
@@ -13,8 +11,8 @@ DIRDEPS = \
etc/sendmail \
-.if ${_DEP_MACHINE:U${MACHINE}:S,amd64,i386,} == "i386"
-DIRDEPS += \
+
+DIRDEPS.x86sys= \
sys/boot/i386/mbr \
sys/boot/i386/pmbr \
sys/boot/i386/boot0 \
@@ -34,9 +32,9 @@ DIRDEPS += \
sys/boot/i386/gptzfsboot \
sys/boot/i386/zfsloader \
-.endif
DIRDEPS.amd64= \
+ ${DIRDEPS.x86sys} \
sys/boot/efi/libefi \
sys/boot/zfs \
sys/boot/userboot/ficl \
@@ -45,7 +43,7 @@ DIRDEPS.amd64= \
sys/boot/userboot/userboot \
DIRDEPS.arm= sys/boot/fdt sys/boot/uboot
-DIRDEPS.i386= sys/boot/efi/libefi sys/boot/zfs
+DIRDEPS.i386= ${DIRDEPS.x86sys} sys/boot/efi/libefi sys/boot/zfs
DIRDEPS.ia64= sys/boot/efi/libefi sys/boot/zfs
DIRDEPS.powerpc= sys/boot/fdt sys/boot/ofw sys/boot/uboot
DIRDEPS.sparc64= sys/boot/ofw sys/boot/zfs
diff --git a/pkgs/pseudo/sbin/Makefile.depend b/pkgs/pseudo/sbin/Makefile.depend
index fe9cff7cb693..127876d40a53 100644
--- a/pkgs/pseudo/sbin/Makefile.depend
+++ b/pkgs/pseudo/sbin/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
sbin/adjkerntz \
sbin/atacontrol \
diff --git a/pkgs/pseudo/secure/Makefile.depend b/pkgs/pseudo/secure/Makefile.depend
index 062bc5e2bd55..803430d0d83c 100644
--- a/pkgs/pseudo/secure/Makefile.depend
+++ b/pkgs/pseudo/secure/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
secure/lib/libcrypto/engines/lib4758cca \
secure/lib/libcrypto/engines/libaep \
diff --git a/pkgs/pseudo/share/Makefile.depend b/pkgs/pseudo/share/Makefile.depend
index 5f86ebd13387..17107fd60d55 100644
--- a/pkgs/pseudo/share/Makefile.depend
+++ b/pkgs/pseudo/share/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
share/info \
share/atf \
diff --git a/pkgs/pseudo/the-lot/Makefile.depend b/pkgs/pseudo/the-lot/Makefile.depend
index aae54e01c3f3..1a0f8d1816d2 100644
--- a/pkgs/pseudo/the-lot/Makefile.depend
+++ b/pkgs/pseudo/the-lot/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
pkgs/pseudo/userland \
diff --git a/pkgs/pseudo/usr.bin/Makefile.depend b/pkgs/pseudo/usr.bin/Makefile.depend
index ee28b2d19074..cdfdc1a5f051 100644
--- a/pkgs/pseudo/usr.bin/Makefile.depend
+++ b/pkgs/pseudo/usr.bin/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
usr.bin/alias \
usr.bin/apply \
diff --git a/pkgs/pseudo/usr.sbin/Makefile.depend b/pkgs/pseudo/usr.sbin/Makefile.depend
index a1b8905f43c2..dc6977254817 100644
--- a/pkgs/pseudo/usr.sbin/Makefile.depend
+++ b/pkgs/pseudo/usr.sbin/Makefile.depend
@@ -4,8 +4,6 @@
DEP_RELDIR := ${_PARSEDIR:S,${SRCTOP}/,,}
-DEP_MACHINE := ${.PARSEFILE:E}
-
DIRDEPS = \
usr.sbin/IPXrouted \
usr.sbin/ac \