--- a/components/quilt/Makefile	Mon Sep 21 05:55:19 2015 -0700
+++ b/components/quilt/Makefile	Mon Sep 21 13:07:33 2015 -0700
@@ -55,8 +55,10 @@
 # generated README and man pages.
 COMPONENT_BUILD_ARGS+=	--no-print-directory
 
+CONFIGURE_OPTIONS += --with-column=/usr/bin/column
 CONFIGURE_OPTIONS += --with-cp=/usr/gnu/bin/cp
 CONFIGURE_OPTIONS += --with-date=/usr/gnu/bin/date
+CONFIGURE_OPTIONS += --with-getopt=/usr/gnu/bin/getopt
 CONFIGURE_OPTIONS += --with-grep=/usr/gnu/bin/grep
 CONFIGURE_OPTIONS += --with-tail=/usr/gnu/bin/tail
 CONFIGURE_OPTIONS += --with-tr=/usr/gnu/bin/tr
@@ -80,11 +82,6 @@
 	'-e "s|^make.*: Entering directory.*$$|XXX_REMOVE_XXX|g" ' \
 	'-e "/^XXX_REMOVE_XXX$$/d" '
 
-COMPONENT_PRE_SYSTEM_TEST_ACTION += \
-	$(GSED) -e "s|^PATH.*$$|PATH := /usr/gnu/bin:/usr/bin|" \
-	$(BUILD_DIR_64)/Makefile > $(BUILD_DIR_64)/Makefile-system-test
-COMPONENT_SYSTEM_TEST_ARGS = -f $(BUILD_DIR_64)/Makefile-system-test
-
 ASLR_MODE = $(ASLR_NOT_APPLICABLE)
 
 configure:	$(CONFIGURE_64)
@@ -104,8 +101,10 @@
 REQUIRED_PACKAGES += runtime/perl-512
 REQUIRED_PACKAGES += service/network/smtp/sendmail
 REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += shell/gnu-getopt
 REQUIRED_PACKAGES += text/gawk
 REQUIRED_PACKAGES += text/gnu-diffutils
 REQUIRED_PACKAGES += text/gnu-grep
 REQUIRED_PACKAGES += text/gnu-patch
 REQUIRED_PACKAGES += text/gnu-sed
+REQUIRED_PACKAGES += text/text-utilities

--- a/components/quilt/quilt.p5m	Mon Sep 21 05:55:19 2015 -0700
+++ b/components/quilt/quilt.p5m	Mon Sep 21 13:07:33 2015 -0700
@@ -58,10 +58,12 @@
 file path=usr/share/quilt/annotate
 file path=usr/share/quilt/applied
 link path=usr/share/quilt/compat/awk target=../../../gnu/bin/awk
+link path=usr/share/quilt/compat/column target=../../../bin/column
 link path=usr/share/quilt/compat/cp target=../../../gnu/bin/cp
 link path=usr/share/quilt/compat/date target=../../../gnu/bin/date
 link path=usr/share/quilt/compat/diff target=../../../gnu/bin/diff
 link path=usr/share/quilt/compat/find target=../../../gnu/bin/find
+link path=usr/share/quilt/compat/getopt target=../../../gnu/bin/getopt
 link path=usr/share/quilt/compat/grep target=../../../gnu/bin/grep
 link path=usr/share/quilt/compat/patch target=../../../gnu/bin/patch
 link path=usr/share/quilt/compat/perl target=../../../perl5/5.12/bin/perl
@@ -105,11 +107,13 @@
 file path=usr/share/quilt/unapplied
 file path=usr/share/quilt/upgrade
 license quilt.license license=GPLv2
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/column
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/awk
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/cp
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/date
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/diff
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/find
+depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/getopt
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/grep
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/patch
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/sed