Add test for default-ignored FLAVOR.

This is targeting code added in e158cb8814fa6a.

24 files changed, 532 insertions, 18 deletions

diff --git a/test-ports/omnibus/misc/Makefile b/test-ports/omnibus/misc/Makefile
index 84dd0e0b..a95012cd 100644
--- a/test-ports/omnibus/misc/Makefile
+++ b/test-ports/omnibus/misc/Makefile
@@ -1,4 +1,8 @@
 SUBDIR += foo
+SUBDIR += foo-all-DEPIGNORED
+SUBDIR += foo-all-IGNORED
+SUBDIR += foo-default-DEPIGNORED
+SUBDIR += foo-default-IGNORED
 SUBDIR += foo-dep-FLAVORS-unsorted
 SUBDIR += foop-IGNORED
 SUBDIR += foo-FLAVORS-unsorted
diff --git a/test-ports/omnibus/misc/foo-all-DEPIGNORED/Makefile b/test-ports/omnibus/misc/foo-all-DEPIGNORED/Makefile
new file mode 100644
index 00000000..d439d769
--- /dev/null
+++ b/test-ports/omnibus/misc/foo-all-DEPIGNORED/Makefile
@@ -0,0 +1,32 @@
+# $FreeBSD: head/misc/freebsd-release-manifests/Makefile 429892 2016-12-29 12:41:04Z mat $
+
+PORTNAME=	foo-all-DEPIGNORED
+DISTVERSION=	20161010
+PORTREVISION=	0
+FLAVORS=	DEFAULT FLAV
+FLAVOR?=	DEFAULT
+.if ${FLAVOR} != DEFAULT && !empty(FLAVORS:M${FLAVOR})
+PKGNAMESUFFIX=	-${FLAVOR}
+.endif
+CATEGORIES=	misc
+MASTER_SITES=	#
+DISTFILES=	#
+
+MAINTAINER=	bdrewery@FreeBSD.org
+COMMENT=	FreeBSD release manifests
+
+LICENSE=	BSD2CLAUSE
+
+NO_BUILD=	yes
+NO_ARCH=	yes
+
+DATADIR=	${PREFIX}/share/freebsd
+
+RUN_DEPENDS+=	foo-dep-FLAVORS-unsorted-DEPIGNORED:misc/foo-dep-FLAVORS-unsorted@DEPIGNORED
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}/MANIFESTS
+	${INSTALL_DATA} ${FILESDIR}/MANIFESTS/* \
+	    ${STAGEDIR}${DATADIR}/MANIFESTS/
+
+.include <bsd.port.mk>
diff --git a/test-ports/omnibus/misc/foo-all-DEPIGNORED/pkg-descr b/test-ports/omnibus/misc/foo-all-DEPIGNORED/pkg-descr
new file mode 100644
index 00000000..c5d831eb
--- /dev/null
+++ b/test-ports/omnibus/misc/foo-all-DEPIGNORED/pkg-descr
@@ -0,0 +1,3 @@
+MANIFEST files from the FreeBSD release images.
+
+WWW: https://www.FreeBSD.org
diff --git a/test-ports/omnibus/misc/foo-all-DEPIGNORED/pkg-plist b/test-ports/omnibus/misc/foo-all-DEPIGNORED/pkg-plist
new file mode 100644
index 00000000..cb59bff2
--- /dev/null
+++ b/test-ports/omnibus/misc/foo-all-DEPIGNORED/pkg-plist
@@ -0,0 +1,52 @@
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/arm64-aarch64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-11.0-RELEASE
diff --git a/test-ports/omnibus/misc/foo-all-IGNORED/Makefile b/test-ports/omnibus/misc/foo-all-IGNORED/Makefile
new file mode 100644
index 00000000..6396ec2f
--- /dev/null
+++ b/test-ports/omnibus/misc/foo-all-IGNORED/Makefile
@@ -0,0 +1,31 @@
+# $FreeBSD: head/misc/freebsd-release-manifests/Makefile 429892 2016-12-29 12:41:04Z mat $
+
+PORTNAME=	foo-all-IGNORED
+DISTVERSION=	20161010
+PORTREVISION=	0
+FLAVORS=	DEFAULT FLAV
+FLAVOR?=	DEFAULT
+.if ${FLAVOR} != DEFAULT && !empty(FLAVORS:M${FLAVOR})
+PKGNAMESUFFIX=	-${FLAVOR}
+.endif
+IGNORE=		ignored
+CATEGORIES=	misc
+MASTER_SITES=	#
+DISTFILES=	#
+
+MAINTAINER=	bdrewery@FreeBSD.org
+COMMENT=	FreeBSD release manifests
+
+LICENSE=	BSD2CLAUSE
+
+NO_BUILD=	yes
+NO_ARCH=	yes
+
+DATADIR=	${PREFIX}/share/freebsd
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}/MANIFESTS
+	${INSTALL_DATA} ${FILESDIR}/MANIFESTS/* \
+	    ${STAGEDIR}${DATADIR}/MANIFESTS/
+
+.include <bsd.port.mk>
diff --git a/test-ports/omnibus/misc/foo-all-IGNORED/pkg-descr b/test-ports/omnibus/misc/foo-all-IGNORED/pkg-descr
new file mode 100644
index 00000000..c5d831eb
--- /dev/null
+++ b/test-ports/omnibus/misc/foo-all-IGNORED/pkg-descr
@@ -0,0 +1,3 @@
+MANIFEST files from the FreeBSD release images.
+
+WWW: https://www.FreeBSD.org
diff --git a/test-ports/omnibus/misc/foo-all-IGNORED/pkg-plist b/test-ports/omnibus/misc/foo-all-IGNORED/pkg-plist
new file mode 100644
index 00000000..cb59bff2
--- /dev/null
+++ b/test-ports/omnibus/misc/foo-all-IGNORED/pkg-plist
@@ -0,0 +1,52 @@
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/arm64-aarch64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-11.0-RELEASE
diff --git a/test-ports/omnibus/misc/foo-default-DEPIGNORED/Makefile b/test-ports/omnibus/misc/foo-default-DEPIGNORED/Makefile
new file mode 100644
index 00000000..03852399
--- /dev/null
+++ b/test-ports/omnibus/misc/foo-default-DEPIGNORED/Makefile
@@ -0,0 +1,34 @@
+# $FreeBSD: head/misc/freebsd-release-manifests/Makefile 429892 2016-12-29 12:41:04Z mat $
+
+PORTNAME=	foo-default-DEPIGNORED
+DISTVERSION=	20161010
+PORTREVISION=	0
+FLAVORS=	DEFAULT FLAV
+FLAVOR?=	DEFAULT
+.if ${FLAVOR} != DEFAULT && !empty(FLAVORS:M${FLAVOR})
+PKGNAMESUFFIX=	-${FLAVOR}
+.endif
+CATEGORIES=	misc
+MASTER_SITES=	#
+DISTFILES=	#
+
+MAINTAINER=	bdrewery@FreeBSD.org
+COMMENT=	FreeBSD release manifests
+
+LICENSE=	BSD2CLAUSE
+
+NO_BUILD=	yes
+NO_ARCH=	yes
+
+DATADIR=	${PREFIX}/share/freebsd
+
+.if ${FLAVOR} == DEFAULT
+RUN_DEPENDS+=	foo-dep-FLAVORS-unsorted-DEPIGNORED:misc/foo-dep-FLAVORS-unsorted@DEPIGNORED
+.endif
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}/MANIFESTS
+	${INSTALL_DATA} ${FILESDIR}/MANIFESTS/* \
+	    ${STAGEDIR}${DATADIR}/MANIFESTS/
+
+.include <bsd.port.mk>
diff --git a/test-ports/omnibus/misc/foo-default-DEPIGNORED/pkg-descr b/test-ports/omnibus/misc/foo-default-DEPIGNORED/pkg-descr
new file mode 100644
index 00000000..c5d831eb
--- /dev/null
+++ b/test-ports/omnibus/misc/foo-default-DEPIGNORED/pkg-descr
@@ -0,0 +1,3 @@
+MANIFEST files from the FreeBSD release images.
+
+WWW: https://www.FreeBSD.org
diff --git a/test-ports/omnibus/misc/foo-default-DEPIGNORED/pkg-plist b/test-ports/omnibus/misc/foo-default-DEPIGNORED/pkg-plist
new file mode 100644
index 00000000..cb59bff2
--- /dev/null
+++ b/test-ports/omnibus/misc/foo-default-DEPIGNORED/pkg-plist
@@ -0,0 +1,52 @@
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/arm64-aarch64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-11.0-RELEASE
diff --git a/test-ports/omnibus/misc/foo-default-IGNORED/Makefile b/test-ports/omnibus/misc/foo-default-IGNORED/Makefile
new file mode 100644
index 00000000..8bf8ebd6
--- /dev/null
+++ b/test-ports/omnibus/misc/foo-default-IGNORED/Makefile
@@ -0,0 +1,37 @@
+# $FreeBSD: head/misc/freebsd-release-manifests/Makefile 429892 2016-12-29 12:41:04Z mat $
+
+PORTNAME=	foo-default-IGNORED
+DISTVERSION=	20161010
+PORTREVISION=	0
+FLAVORS=	DEFAULT FLAV
+FLAVOR?=	DEFAULT
+.if ${FLAVOR} != DEFAULT && !empty(FLAVORS:M${FLAVOR})
+PKGNAMESUFFIX=	-${FLAVOR}
+.endif
+.if ${FLAVOR} == DEFAULT
+IGNORE=		ignored
+.endif
+CATEGORIES=	misc
+MASTER_SITES=	#
+DISTFILES=	#
+
+MAINTAINER=	bdrewery@FreeBSD.org
+COMMENT=	FreeBSD release manifests
+
+LICENSE=	BSD2CLAUSE
+
+NO_BUILD=	yes
+NO_ARCH=	yes
+
+DATADIR=	${PREFIX}/share/freebsd
+
+.if ${FLAVOR} == DEFAULT
+RUN_DEPENDS+=	foo-dep-FLAVORS-unsorted-DEPIGNORED:misc/foo-dep-FLAVORS-unsorted@DEPIGNORED
+.endif
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}/MANIFESTS
+	${INSTALL_DATA} ${FILESDIR}/MANIFESTS/* \
+	    ${STAGEDIR}${DATADIR}/MANIFESTS/
+
+.include <bsd.port.mk>
diff --git a/test-ports/omnibus/misc/foo-default-IGNORED/pkg-descr b/test-ports/omnibus/misc/foo-default-IGNORED/pkg-descr
new file mode 100644
index 00000000..c5d831eb
--- /dev/null
+++ b/test-ports/omnibus/misc/foo-default-IGNORED/pkg-descr
@@ -0,0 +1,3 @@
+MANIFEST files from the FreeBSD release images.
+
+WWW: https://www.FreeBSD.org
diff --git a/test-ports/omnibus/misc/foo-default-IGNORED/pkg-plist b/test-ports/omnibus/misc/foo-default-IGNORED/pkg-plist
new file mode 100644
index 00000000..cb59bff2
--- /dev/null
+++ b/test-ports/omnibus/misc/foo-default-IGNORED/pkg-plist
@@ -0,0 +1,52 @@
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/ia64-ia64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.1-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.2-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-10.3-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.1-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.2-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-9.3-RELEASE
+%%DATADIR%%/MANIFESTS/amd64-amd64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/arm64-aarch64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/i386-i386-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/powerpc-powerpc64-11.0-RELEASE
+%%DATADIR%%/MANIFESTS/sparc64-sparc64-11.0-RELEASE
diff --git a/test/Makefile.am b/test/Makefile.am
index ab437314..97ed6c1a 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -47,8 +47,14 @@ JAIL_TESTS= \
 	bulk-flavor-default-dep-and-specific-listed.sh \
 	bulk-flavor-default-dep.sh \
 	bulk-flavor-ignore-all.sh \
+	bulk-flavor-ignore-vs-skip-listed-all-depignored-other.sh \
+	bulk-flavor-ignore-vs-skip-listed-all-depignored.sh \
 	bulk-flavor-ignore-vs-skip-listed-all.sh \
 	bulk-flavor-ignore-vs-skip-listed-default-all.sh \
+	bulk-flavor-ignore-vs-skip-listed-default-depignored-other.sh \
+	bulk-flavor-ignore-vs-skip-listed-default-depignored.sh \
+	bulk-flavor-ignore-vs-skip-listed-default-ignored-other.sh \
+	bulk-flavor-ignore-vs-skip-listed-default-ignored.sh \
 	bulk-flavor-ignore-vs-skip-listed-default.sh \
 	bulk-flavor-ignore-vs-skip-listed-flavor-ignored.sh \
 	bulk-flavor-ignore-vs-skip-listed-flavor.sh \
diff --git a/test/Makefile.in b/test/Makefile.in
index 254de763..173cad61 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -479,8 +479,14 @@ JAIL_TESTS = \
 	bulk-flavor-default-dep-and-specific-listed.sh \
 	bulk-flavor-default-dep.sh \
 	bulk-flavor-ignore-all.sh \
+	bulk-flavor-ignore-vs-skip-listed-all-depignored-other.sh \
+	bulk-flavor-ignore-vs-skip-listed-all-depignored.sh \
 	bulk-flavor-ignore-vs-skip-listed-all.sh \
 	bulk-flavor-ignore-vs-skip-listed-default-all.sh \
+	bulk-flavor-ignore-vs-skip-listed-default-depignored-other.sh \
+	bulk-flavor-ignore-vs-skip-listed-default-depignored.sh \
+	bulk-flavor-ignore-vs-skip-listed-default-ignored-other.sh \
+	bulk-flavor-ignore-vs-skip-listed-default-ignored.sh \
 	bulk-flavor-ignore-vs-skip-listed-default.sh \
 	bulk-flavor-ignore-vs-skip-listed-flavor-ignored.sh \
 	bulk-flavor-ignore-vs-skip-listed-flavor.sh \
@@ -974,6 +980,20 @@ bulk-flavor-ignore-all.sh.log: bulk-flavor-ignore-all.sh
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+bulk-flavor-ignore-vs-skip-listed-all-depignored-other.sh.log: bulk-flavor-ignore-vs-skip-listed-all-depignored-other.sh
+	@p='bulk-flavor-ignore-vs-skip-listed-all-depignored-other.sh'; \
+	b='bulk-flavor-ignore-vs-skip-listed-all-depignored-other.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+bulk-flavor-ignore-vs-skip-listed-all-depignored.sh.log: bulk-flavor-ignore-vs-skip-listed-all-depignored.sh
+	@p='bulk-flavor-ignore-vs-skip-listed-all-depignored.sh'; \
+	b='bulk-flavor-ignore-vs-skip-listed-all-depignored.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 bulk-flavor-ignore-vs-skip-listed-all.sh.log: bulk-flavor-ignore-vs-skip-listed-all.sh
 	@p='bulk-flavor-ignore-vs-skip-listed-all.sh'; \
 	b='bulk-flavor-ignore-vs-skip-listed-all.sh'; \
@@ -988,6 +1008,34 @@ bulk-flavor-ignore-vs-skip-listed-default-all.sh.log: bulk-flavor-ignore-vs-skip
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+bulk-flavor-ignore-vs-skip-listed-default-depignored-other.sh.log: bulk-flavor-ignore-vs-skip-listed-default-depignored-other.sh
+	@p='bulk-flavor-ignore-vs-skip-listed-default-depignored-other.sh'; \
+	b='bulk-flavor-ignore-vs-skip-listed-default-depignored-other.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+bulk-flavor-ignore-vs-skip-listed-default-depignored.sh.log: bulk-flavor-ignore-vs-skip-listed-default-depignored.sh
+	@p='bulk-flavor-ignore-vs-skip-listed-default-depignored.sh'; \
+	b='bulk-flavor-ignore-vs-skip-listed-default-depignored.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+bulk-flavor-ignore-vs-skip-listed-default-ignored-other.sh.log: bulk-flavor-ignore-vs-skip-listed-default-ignored-other.sh
+	@p='bulk-flavor-ignore-vs-skip-listed-default-ignored-other.sh'; \
+	b='bulk-flavor-ignore-vs-skip-listed-default-ignored-other.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+bulk-flavor-ignore-vs-skip-listed-default-ignored.sh.log: bulk-flavor-ignore-vs-skip-listed-default-ignored.sh
+	@p='bulk-flavor-ignore-vs-skip-listed-default-ignored.sh'; \
+	b='bulk-flavor-ignore-vs-skip-listed-default-ignored.sh'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 bulk-flavor-ignore-vs-skip-listed-default.sh.log: bulk-flavor-ignore-vs-skip-listed-default.sh
 	@p='bulk-flavor-ignore-vs-skip-listed-default.sh'; \
 	b='bulk-flavor-ignore-vs-skip-listed-default.sh'; \
diff --git a/test/bulk-flavor-ignore-all.sh b/test/bulk-flavor-ignore-all.sh
index 020ccd30..9d834d47 100644
--- a/test/bulk-flavor-ignore-all.sh
+++ b/test/bulk-flavor-ignore-all.sh
@@ -5,7 +5,7 @@ OVERLAYS="omnibus"
 do_bulk -n -a
 assert 0 $? "Bulk should pass"
 
-EXPECTED_IGNORED="misc/foo-FLAVORS-unsorted@IGNORED misc/foo-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@IGNORED misc/foo@IGNORED ports-mgmt/poudriere-devel-IGNORED ports-mgmt/poudriere-devel-IGNORED-and-skipped misc/foop-IGNORED"
-EXPECTED_SKIPPED="ports-mgmt/poudriere-devel-dep-IGNORED ports-mgmt/poudriere-devel-dep2-IGNORED"
+EXPECTED_IGNORED="misc/foo-FLAVORS-unsorted@IGNORED misc/foo-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@IGNORED misc/foo@IGNORED ports-mgmt/poudriere-devel-IGNORED ports-mgmt/poudriere-devel-IGNORED-and-skipped misc/foop-IGNORED misc/foo-all-IGNORED@DEFAULT misc/foo-all-IGNORED@FLAV misc/foo-default-IGNORED@DEFAULT misc/foo-all-DEPIGNORED@FLAV"
+EXPECTED_SKIPPED="ports-mgmt/poudriere-devel-dep-IGNORED ports-mgmt/poudriere-devel-dep2-IGNORED misc/foo-all-DEPIGNORED@DEFAULT misc/foo-default-DEPIGNORED@DEFAULT"
 
 assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-all-depignored-other.sh b/test/bulk-flavor-ignore-vs-skip-listed-all-depignored-other.sh
new file mode 100644
index 00000000..fee04cc7
--- /dev/null
+++ b/test/bulk-flavor-ignore-vs-skip-listed-all-depignored-other.sh
@@ -0,0 +1,18 @@
+FLAVOR_DEFAULT_ALL=no
+FLAVOR_DEFAULT=-
+
+LISTPORTS="misc/foo-all-DEPIGNORED@FLAV"
+# XXX: Adding this is because the framework gets very confused otherwise.
+# That is, why are we actually queueing the skipped listed port? It's
+# skipped early.
+LISTPORTS="${LISTPORTS} ports-mgmt/pkg"
+OVERLAYS="overlay omnibus"
+. common.bulk.sh
+
+do_bulk -n ${LISTPORTS}
+assert 0 $? "Bulk should pass"
+
+EXPECTED_IGNORED="misc/foo-dep-FLAVORS-unsorted@DEPIGNORED"
+EXPECTED_SKIPPED="misc/foo-all-DEPIGNORED@FLAV"
+
+assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-all-depignored.sh b/test/bulk-flavor-ignore-vs-skip-listed-all-depignored.sh
new file mode 100644
index 00000000..2017e02e
--- /dev/null
+++ b/test/bulk-flavor-ignore-vs-skip-listed-all-depignored.sh
@@ -0,0 +1,18 @@
+FLAVOR_DEFAULT_ALL=no
+
+# XXX: Removing DEFAULT here breaks the framework. It should default to the first flav due to FLAVOR_DEFAULT_ALL=no
+LISTPORTS="misc/foo-all-DEPIGNORED@DEFAULT"
+# XXX: Adding this is because the framework gets very confused otherwise.
+# That is, why are we actually queueing the skipped listed port? It's
+# skipped early.
+LISTPORTS="${LISTPORTS} ports-mgmt/pkg"
+OVERLAYS="overlay omnibus"
+. common.bulk.sh
+
+do_bulk -n ${LISTPORTS}
+assert 0 $? "Bulk should pass"
+
+EXPECTED_IGNORED="misc/foo-dep-FLAVORS-unsorted@DEPIGNORED"
+EXPECTED_SKIPPED="misc/foo-all-DEPIGNORED@DEFAULT"
+
+assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-default-depignored-other.sh b/test/bulk-flavor-ignore-vs-skip-listed-default-depignored-other.sh
new file mode 100644
index 00000000..a67d0c1e
--- /dev/null
+++ b/test/bulk-flavor-ignore-vs-skip-listed-default-depignored-other.sh
@@ -0,0 +1,14 @@
+FLAVOR_DEFAULT_ALL=no
+FLAVOR_DEFAULT=-
+
+LISTPORTS="misc/foo-default-DEPIGNORED@FLAV"
+OVERLAYS="overlay omnibus"
+. common.bulk.sh
+
+do_bulk -n ${LISTPORTS}
+assert 0 $? "Bulk should pass"
+
+EXPECTED_IGNORED=
+EXPECTED_SKIPPED=
+
+assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-default-depignored.sh b/test/bulk-flavor-ignore-vs-skip-listed-default-depignored.sh
new file mode 100644
index 00000000..38f5e560
--- /dev/null
+++ b/test/bulk-flavor-ignore-vs-skip-listed-default-depignored.sh
@@ -0,0 +1,18 @@
+FLAVOR_DEFAULT_ALL=no
+
+# XXX: Removing DEFAULT here breaks the framework. It should default to the first flav due to FLAVOR_DEFAULT_ALL=no
+LISTPORTS="misc/foo-default-DEPIGNORED@DEFAULT"
+# XXX: Adding this is because the framework gets very confused otherwise.
+# That is, why are we actually queueing the skipped listed port? It's
+# skipped early.
+LISTPORTS="${LISTPORTS} ports-mgmt/pkg"
+OVERLAYS="overlay omnibus"
+. common.bulk.sh
+
+do_bulk -n ${LISTPORTS}
+assert 0 $? "Bulk should pass"
+
+EXPECTED_IGNORED="misc/foo-dep-FLAVORS-unsorted@DEPIGNORED"
+EXPECTED_SKIPPED="misc/foo-default-DEPIGNORED@DEFAULT"
+
+assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-default-ignored-other.sh b/test/bulk-flavor-ignore-vs-skip-listed-default-ignored-other.sh
new file mode 100644
index 00000000..d970ef0c
--- /dev/null
+++ b/test/bulk-flavor-ignore-vs-skip-listed-default-ignored-other.sh
@@ -0,0 +1,14 @@
+FLAVOR_DEFAULT_ALL=no
+FLAVOR_DEFAULT=-
+
+LISTPORTS="misc/foo-default-IGNORED@FLAV"
+OVERLAYS="overlay omnibus"
+. common.bulk.sh
+
+do_bulk -n ${LISTPORTS}
+assert 0 $? "Bulk should pass"
+
+EXPECTED_IGNORED=
+EXPECTED_SKIPPED=
+
+assert_bulk_queue_and_stats
diff --git a/test/bulk-flavor-ignore-vs-skip-listed-default-ignored.sh b/test/bulk-flavor-ignore-vs-skip-listed-default-ignored.sh
new file mode 100644
index 00000000..803953fe
--- /dev/null
+++ b/test/bulk-flavor-ignore-vs-skip-listed-default-ignored.sh
@@ -0,0 +1,18 @@
+FLAVOR_DEFAULT_ALL=no
+
+LISTPORTS="misc/foo-default-IGNORED@DEFAULT"
+# XXX: Adding this is because the framework gets very confused otherwise.
+# That is, why are we actually queueing the skipped listed port? It's
+# skipped early.
+LISTPORTS="${LISTPORTS} ports-mgmt/pkg"
+OVERLAYS="overlay omnibus"
+. common.bulk.sh
+
+do_bulk -n ${LISTPORTS}
+assert 0 $? "Bulk should pass"
+
+EXPECTED_LISTPORTS_IGNORED="misc/foo-default-IGNORED@DEFAULT"
+EXPECTED_IGNORED="misc/foo-default-IGNORED@DEFAULT"
+EXPECTED_SKIPPED=
+
+assert_bulk_queue_and_stats
diff --git a/test/bulk-overlay-all.sh b/test/bulk-overlay-all.sh
index 6e668c3f..f04f6404 100644
--- a/test/bulk-overlay-all.sh
+++ b/test/bulk-overlay-all.sh
@@ -11,7 +11,7 @@ hash_get originspec-pkgname "misc/foo" pkgname || ret=$?
 assert 0 "${ret}" "Cannot find pkgname for misc/foo"
 assert "foo-OVERLAY-20161010" "${pkgname}" "misc/foo didn't find the overlay version"
 
-EXPECTED_IGNORED="misc/foo-FLAVORS-unsorted@IGNORED misc/foo-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@IGNORED misc/foo@IGNORED_OVERLAY ports-mgmt/poudriere-devel-IGNORED ports-mgmt/poudriere-devel-IGNORED-and-skipped misc/foop-IGNORED"
-EXPECTED_SKIPPED="ports-mgmt/poudriere-devel-dep-IGNORED ports-mgmt/poudriere-devel-dep2-IGNORED"
+EXPECTED_IGNORED="misc/foo-FLAVORS-unsorted@IGNORED misc/foo-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@DEPIGNORED misc/foo-dep-FLAVORS-unsorted@IGNORED misc/foo@IGNORED_OVERLAY ports-mgmt/poudriere-devel-IGNORED ports-mgmt/poudriere-devel-IGNORED-and-skipped misc/foop-IGNORED misc/foo-all-IGNORED@DEFAULT misc/foo-all-IGNORED@FLAV misc/foo-default-IGNORED@DEFAULT misc/foo-all-DEPIGNORED@FLAV"
+EXPECTED_SKIPPED="ports-mgmt/poudriere-devel-dep-IGNORED ports-mgmt/poudriere-devel-dep2-IGNORED misc/foo-all-DEPIGNORED@DEFAULT misc/foo-default-DEPIGNORED@DEFAULT"
 
 assert_bulk_queue_and_stats
diff --git a/test/common.bulk.sh b/test/common.bulk.sh
index 57ce05f3..11878248 100644
--- a/test/common.bulk.sh
+++ b/test/common.bulk.sh
@@ -92,9 +92,11 @@ cache_pkgnames() {
 	else
 		hash_get origin-flavors "${origin}" flavors || flavors=
 	fi
+	originspec_encode flavor_originspec "${origin}" "${port_flavor}"
 	fix_default_flavor "${originspec}" originspec
 	assert_not '' "${pkgname}" "cache_pkgnames: ${originspec} has no PKGNAME?"
 	hash_set originspec-pkgname "${originspec}" "${pkgname}"
+	hash_set originspec-pkgname "${flavor_originspec}" "${pkgname}"
 	if [ -n "${port_flavor}" ]; then
 		hash_set originspec-flavor "${originspec}" "${port_flavor}"
 	fi
@@ -105,8 +107,7 @@ cache_pkgnames() {
 	ALL_PKGNAMES="${ALL_PKGNAMES}${ALL_PKGNAMES:+ }${pkgname}"
 	ALL_ORIGINS="${ALL_ORIGINS}${ALL_ORIGINS:+ }${originspec}"
 	if [ -n "${ignore}" ]; then
-		list_add IGNOREDPORTS "${originspec}"
-		return
+		list_add IGNOREDPORTS "${flavor_originspec}"
 	fi
 	was_listed_with_flavor=0
 	if [ -n "${flavors}" ]; then
@@ -124,18 +125,19 @@ cache_pkgnames() {
 			esac
 		fi
 	fi
-	for dep_origin in ${pdeps}; do
-		if cache_pkgnames 1 "${dep_origin}"; then
-			if [ "${was_listed_with_flavor}" -eq 1 ] &&
-			    [ "${port_flavor}" != "${default_flavor}" ]; then
-				list_add IGNOREDPORTS "${originspec}"
-				continue
-			fi
-			if ! list_contains SKIPPEDPORTS "${originspec}"; then
-				list_add SKIPPEDPORTS "${originspec}"
+	if [ -z "${ignore}" ]; then
+		for dep_origin in ${pdeps}; do
+			if cache_pkgnames 1 "${dep_origin}"; then
+				if [ "${was_listed_with_flavor}" -eq 1 ]; then
+					list_add IGNOREDPORTS "${flavor_originspec}"
+					continue
+				fi
+				if ! list_contains SKIPPEDPORTS "${flavor_originspec}"; then
+					list_add SKIPPEDPORTS "${flavor_originspec}"
+				fi
 			fi
-		fi
-	done
+		done
+	fi
 	# Also cache all of the FLAVOR deps/PKGNAMES
 	if [ "${isdep}" -eq "0" -o "${ALL:-0}" -eq 1 ] &&
 		[ -n "${flavors}" ] &&
@@ -370,7 +372,7 @@ assert_skipped() {
 	origins_expanded="$(echo "${origins_expanded}" | tr ' ' '\n' | sort -u | paste -s -d ' ' -)"
 	echo "Asserting that only '${origins_expanded}' are in the skipped list"
 	for originspec in ${origins_expanded}; do
-		fix_default_flavor "${originspec}" originspec
+		#fix_default_flavor "${originspec}" originspec
 		hash_get originspec-pkgname "${originspec}" pkgname
 		assert_not '' "${pkgname}" "PKGNAME needed for ${originspec} (is this pkg actually expected here?)"
 		echo "=> Asserting that ${originspec} | ${pkgname} is skipped"