--- a/components/quilt/Makefile	Wed Mar 18 13:40:46 2015 -0700
+++ b/components/quilt/Makefile	Thu Mar 19 09:18:01 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -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

--- a/components/quilt/quilt.p5m	Wed Mar 18 13:40:46 2015 -0700
+++ b/components/quilt/quilt.p5m	Thu Mar 19 09:18:01 2015 -0700
@@ -78,12 +78,10 @@
 file path=usr/share/quilt/applied
 dir  path=usr/share/quilt/compat
 link path=usr/share/quilt/compat/awk target=../../../gnu/bin/awk
-file path=usr/share/quilt/compat/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
-file path=usr/share/quilt/compat/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