--- a/components/re2c/Makefile	Mon Oct 12 15:58:48 2015 -0700
+++ b/components/re2c/Makefile	Tue Oct 13 18:21:51 2015 -0700
@@ -57,14 +57,20 @@
 # diffs failing due to script tracing in output files.
 unexport SHELLOPTS
 
+COMPONENT_SYSTEM_TEST_ENV +=	RE2C_BIN=/usr/bin/re2c
+
 ASLR_MODE = $(ASLR_ENABLE)
 
+configure:	$(CONFIGURE_64)
+
 build:		$(BUILD_64)
 
 install:	$(INSTALL_64)
 
 test:		$(TEST_64)
 
+system-test:	build $(SYSTEM_TEST_64)
+
 REQUIRED_PACKAGES += system/library
 REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
 REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/re2c/patches/fix-tests.patch	Tue Oct 13 18:21:51 2015 -0700
@@ -0,0 +1,26 @@
+We need to adjust the script that runs the tests to get them out of the
+build directory not the original source directory and we need to be able
+to specify an alternate re2c binary when running system tests.
+
+This patch should be sent upstream.
+
+--- re2c-0.14.2/run_tests.sh.in.orig	2015-10-13 06:22:20.787156312 -0700
++++ re2c-0.14.2/run_tests.sh.in	2015-10-13 06:33:42.229167381 -0700
+@@ -14,7 +14,7 @@
+ if uname|grep -q -i 'CYGWIN' && test -x "@WINBUILDDIR@/re2c.exe"; then
+ re2c='@WINBUILDDIR@/re2c.exe'
+ else
+-re2c='@builddir@/re2c'
++re2c="${RE2C_BIN:-@builddir@/re2c}"
+ fi
+ if test ! -x "${re2c}"; then
+   echo "Cannot find re2c executable (${re2c})."
+@@ -33,7 +33,7 @@
+ fi
+ echo "Diffing: ${diff}"
+ if test $# = 0; then
+-tests=`for i in test lessons; do find @top_srcdir@/$i -name '*.re'; done|sort`
++tests=`for i in test lessons; do find ./$i -name '*.re'; done|sort`
+ else
+ tests="$@"
+ fi;

--- a/components/re2c/test/results-64.master	Mon Oct 12 15:58:48 2015 -0700
+++ b/components/re2c/test/results-64.master	Tue Oct 13 18:21:51 2015 -0700
@@ -4,7 +4,7 @@
 /usr/gnu/bin/make  check-TESTS
 make[3]: Entering directory `$(@D)'
 make[4]: Entering directory `$(@D)'
-FAIL: run_tests.sh
+PASS: run_tests.sh
 make[5]: Entering directory `$(@D)'
 /usr/gnu/bin/make  all-am
 make[6]: Entering directory `$(@D)'
@@ -14,21 +14,14 @@
 Testsuite summary for re2c 0.14.2
 ============================================================================
 # TOTAL: 1
-# PASS:  0
+# PASS:  1
 # SKIP:  0
 # XFAIL: 0
-# FAIL:  1
+# FAIL:  0
 # XPASS: 0
 # ERROR: 0
 ============================================================================
-See ./test-suite.log
-Please report to [email protected]
-============================================================================
-make[4]: *** [test-suite.log] Error 1
 make[4]: Leaving directory `$(@D)'
-make[3]: *** [check-TESTS] Error 2
 make[3]: Leaving directory `$(@D)'
-make[2]: *** [check-am] Error 2
 make[2]: Leaving directory `$(@D)'
-make[1]: *** [check] Error 2
 make[1]: Leaving directory `$(@D)'