--- a/components/openjade/Makefile	Tue Sep 20 05:30:15 2016 -0700
+++ b/components/openjade/Makefile	Tue Sep 20 08:35:58 2016 -0700
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+COMPILER= gcc
 BUILD_BITS= 64_and_32
 include ../../make-rules/shared-macros.mk
 
@@ -56,8 +57,11 @@
 # Expects GNU install.
 CONFIGURE_ENV += INSTALL="$(INSTALL)"
 
-CONFIGURE_OPTIONS +=    --enable-spincludedir=$(USRINCDIR)/OpenSP
-CONFIGURE_OPTIONS +=	--enable-splibdir=$(USRLIB.$(BITS))
+# Get opensp header files and libraries out of the opensp build prototype area.
+OPENSP_BASE = $(WS_COMPONENTS)/opensp/build/prototype/$(MACH)
+
+CONFIGURE_OPTIONS +=    --enable-spincludedir=$(OPENSP_BASE)/$(USRINCDIR)/OpenSP
+CONFIGURE_OPTIONS +=	--enable-splibdir=$(OPENSP_BASE)/$(USRLIB.$(BITS))
 CONFIGURE_OPTIONS +=    --enable-mif
 CONFIGURE_OPTIONS +=	--disable-http
 CONFIGURE_OPTIONS +=	--enable-default-catalog="CATALOG:/etc/sgml/catalog:/usr/share/sgml/CATALOG"
@@ -79,5 +83,6 @@
 	$(MKDIR) $(PROTOUSRBINDIR)/$(MACH32);
 
 REQUIRED_PACKAGES += developer/documentation-tool/opensp
-REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
 REQUIRED_PACKAGES += system/library/math

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openjade/depend.mk	Tue Sep 20 08:35:58 2016 -0700
@@ -0,0 +1,1 @@
+openjade: opensp

--- a/components/opensp/Makefile	Tue Sep 20 05:30:15 2016 -0700
+++ b/components/opensp/Makefile	Tue Sep 20 08:35:58 2016 -0700
@@ -22,6 +22,7 @@
 #
 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
+COMPILER= gcc
 BUILD_BITS= 64_and_32
 include ../../make-rules/shared-macros.mk
 
@@ -37,13 +38,9 @@
 
 include $(WS_MAKE_RULES)/common.mk
 
-COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv)
-
 # Needed to find the man pages at install time.
 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
 
-CXX +=			$(studio_NORUNPATH)
-
 CONFIGURE_OPTIONS +=	--bindir=/usr/bin
 CONFIGURE_OPTIONS +=	--disable-http
 CONFIGURE_OPTIONS +=	--disable-nls
@@ -65,4 +62,5 @@
         '-e "/FAIL:/p" ' \
         '-e "/ERROR:/p" '
 
-REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c++-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime

--- a/components/opensp/patches/opensp-02-manpages.patch	Tue Sep 20 05:30:15 2016 -0700
+++ b/components/opensp/patches/opensp-02-manpages.patch	Tue Sep 20 08:35:58 2016 -0700
@@ -42,19 +42,19 @@
 @@ -0,0 +1,1 @@
 +.so man1/ospent.1
 /jds/bin/diff -uprN OpenSP-1.5.1.old/Makefile.am OpenSP-1.5.1/Makefile.am
---- OpenSP-1.5.1.old/Makefile.am	2009-02-20 16:56:54.307688000 +0000
-+++ OpenSP-1.5.1/Makefile.am	2009-02-20 17:53:27.579799000 +0000
-@@ -13,7 +13,7 @@ docdir = $(datadir)/doc
+--- OpenSP-1.5.1/Makefile.in.orig	2016-09-19 13:13:15.917725036 +0000
++++ OpenSP-1.5.1/Makefile.in	2016-09-19 13:14:16.098622235 +0000
+@@ -129,7 +129,7 @@
  pkgdocdir = $(docdir)/@PACKAGE@
- man1dir=$(mandir)/man1
+ man1dir = $(mandir)/man1
  
 -man_MANS = onsgmls.1 osgmlnorm.1 ospent.1 ospam.1 osx.1 ospcat.1
 +man_MANS = nsgmls.1 onsgmls.1 osgml2xml.1 osgmlnorm.1 ospent.1 ospam.1 osx.1 ospcat.1 s2x.1 sgml2xml.1 sgmlnorm.1 spam.1 spcat.1 spent.1
  
  pkgdoc_DATA = README ABOUT-NLS NEWS COPYING AUTHORS BUGS ChangeLog \
  	releasenotes.html releasenotes.pdf releasenotes.ps
-@@ -29,8 +29,7 @@ MAINTAINERCLEANFILES = install-sh mkinst
- ## We include msggen.pl, since it won't be generated on Windows.
+@@ -145,8 +145,7 @@
+ 
  EXTRA_DIST = instmac.pl msggen.pl sunfix.sh SP.dsw SP.mak \
  	build-win32.bat sp-generate.mak .cvsignore all \
 -	@PACKAGE@-@[email protected] config.rpath onsgmls.1 \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/opensp/patches/opensp-05-fix-gnu-build.patch	Tue Sep 20 08:35:58 2016 -0700
@@ -0,0 +1,18 @@
+Changes needed to successfully build opensp with the GNU compilers.
+
+Taken from the fix at:
+https://sourceforge.net/p/openjade/bugs/133/
+
+This change is already known upstream.
+
+--- OpenSP-1.5.1/include/InternalInputSource.h.orig	2016-09-19 12:19:35.766064218 +0000
++++ OpenSP-1.5.1/include/InternalInputSource.h	2016-09-19 12:20:04.849794945 +0000
+@@ -34,7 +34,7 @@
+   void pushCharRef(Char ch, const NamedCharRef &);
+   Boolean rewind(Messenger &);
+   const StringC *contents();
+-  InternalInputSource *InternalInputSource::asInternalInputSource();
++  InternalInputSource *asInternalInputSource();
+   ~InternalInputSource();
+ private:
+   InternalInputSource(const InternalInputSource &); // undefined