--- a/components/quilt/Makefile	Fri Oct 24 11:31:09 2014 -0700
+++ b/components/quilt/Makefile	Fri Oct 24 11:53:16 2014 -0700
@@ -55,9 +55,6 @@
 # generated README and man pages.
 COMPONENT_BUILD_ARGS+=	--no-print-directory
 
-# Quilt will need this option until Solaris has GNU getopt.
-CONFIGURE_OPTIONS += --without-getopt
-
 CONFIGURE_OPTIONS += --with-cp=/usr/gnu/bin/cp
 CONFIGURE_OPTIONS += --with-date=/usr/gnu/bin/date
 CONFIGURE_OPTIONS += --with-grep=/usr/gnu/bin/grep
@@ -71,7 +68,6 @@
 CONFIGURE_OPTIONS += --with-pod2man=/usr/perl5/$(PERL_VERSION)/bin/pod2man
 CONFIGURE_OPTIONS += --with-xgettext=/usr/bin/gxgettext
 CONFIGURE_OPTIONS += --with-msgfmt=/usr/bin/gmsgfmt
-CONFIGURE_OPTIONS += --without-column
 
 CONFIGURE_OPTIONS  +=	CFLAGS="$(CFLAGS)"
 

--- a/components/quilt/quilt.p5m	Fri Oct 24 11:31:09 2014 -0700
+++ b/components/quilt/quilt.p5m	Fri Oct 24 11:53:16 2014 -0700
@@ -60,8 +60,6 @@
 file path=usr/share/quilt/add
 file path=usr/share/quilt/annotate
 file path=usr/share/quilt/applied
-file path=usr/share/quilt/compat/column
-file path=usr/share/quilt/compat/getopt
 file path=usr/share/quilt/delete
 file path=usr/share/quilt/diff
 file path=usr/share/quilt/edit