--- /dev/null	Wed Jul  1 16:13:39 2015
+++ new/build/as/build.sh	Wed Jul  1 16:13:39 2015
@@ -0,0 +1,66 @@
+#!/usr/bin/bash
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2011-2012 OmniTI Computer Consulting, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# this will build
+#
+#   * assorted bin-only bits: (from sub root)
+#     * as
+#     * libtdf
+#     * libxprof
+#     * libxprof_audit
+
+# Load support functions
+. ../../lib/functions.sh
+
+PROG=make
+VER=0.5.11
+PKG=developer/as
+SUMMARY="OmniOS Bundled Assembler (aka DevPro)"
+DESC="$SUMMARY"
+
+DEPENDS_IPS="system/library SUNWcs system/library/math"
+
+CONFIGURE_OPTS=""
+PKGE=$(url_encode $PKG)
+DESTDIR=$DTMPDIR/as
+
+prebuild_clean() {
+    logmsg "Cleaning destdir: $DESTDIR"
+    logcmd rm -rf $DESTDIR
+    logcmd mkdir -p $DESTDIR
+}
+
+place_bins() {
+    logmsg "Moving closed bins into place"
+    (cd $SRCDIR/root && tar cf - .) | (cd $DESTDIR && tar xf -) ||
+        logerr "Failed to copy closed bins"
+}
+
+init
+prebuild_clean
+place_bins
+make_package
+clean_up
--- old/build/make/files/BINARYLICENSE.txt	Wed Jul  1 16:13:39 2015
+++ /dev/null	Wed Jul  1 16:13:39 2015
@@ -1,190 +0,0 @@
-Sun Microsystems, Inc. Binary Code License Agreement
-
-SUN MICROSYSTEMS, INC. ("SUN") IS WILLING TO LICENSE THE SOFTWARE TO YOU 
-ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN 
-THIS BINARY CODE LICENSE AGREEMENT ("AGREEMENT").  PLEASE READ THE 
-AGREEMENT CAREFULLY. BY DOWNLOADING OR INSTALLING THIS SOFTWARE, YOU 
-ACCEPT THE FULL TERMS OF THIS AGREEMENT.
-
-1. Definitions. 
-
-"Software" means all software provided to You in binary code form by Sun 
-under this License as indicated on the opensolaris.org website.  Software 
-includes any updates or error corrections or documentation relating to 
-Software provided to You by Sun under this License as indicated on the 
-opensolaris.org website.
-
-2. Permitted Uses.
-
-Subject to the terms and conditions of this Agreement and restrictions and 
-exceptions set forth in the Software's documentation, Sun grants you a 
-non-exclusive, non-transferable, limited license without fees to
-
-(a) reproduce and use internally the Software for the purposes of 
-developing or running an Open Solaris distribution.
-
-(b) reproduce and distribute the Software (and also portions of Software 
-identified as Redistributable in the documentation accompanying Software), 
-provided that you (i) distribute the Software or Redistributables bundled 
-as part of, and for the sole purpose of running, OpenSolaris code; 
-(ii) do not remove or alter any proprietary legends or notices contained 
-in or on the Software or Redistributables, (iii) only distribute the 
-Software or Redistributables subject to a license agreement that protects 
-Sun's interests consistent with the terms contained in this Agreement, 
-and (iv) you agree to defend and indemnify Sun and its licensors from and 
-against any damages, costs, liabilities, settlement amounts and/or 
-expenses (including attorneys' fees) incurred in connection with any claim, 
-lawsuit or action by any third party that arises or results from the use 
-or distribution of any and all Programs, Software, or Redistributables.
-
-3. Restrictions.
-
-(a) The copies of Software provided to you under this Agreement is 
-licensed, not sold, to you by Sun.  Sun reserves all rights not expressly 
-granted. 
-
-(b) You may not modify Software.  However if the documentation 
-accompanying Software lists specific portions of Software, such as header 
-files, class libraries, reference source code, and/or redistributable 
-files, that may be handled differently, you may do so only as provided in 
-the documentation. 
-
-(c) You may not rent, lease, lend or encumber Software. 
-
-(d) You do not remove or alter any proprietary legends or notices 
-contained in the Software,
-
-(e) Unless enforcement is prohibited by applicable law, you may not 
-decompile, or reverse engineer Software. 
-
-(f) The terms and conditions of this Agreement will apply to any Software
-updates, provided to you at Sun's discretion, that replace and/or 
-supplement the original Software, unless such update contains a separate
-license. 
-
-(g) Software is copyrighted. 
-
-(h) Software is not designed, licensed or intended for use in the design, 
-construction, operation or maintenance of any nuclear facility and Sun 
-and its licensors disclaim any express or implied warranty of fitness for 
-such uses. 
-
-(i) No right, title or interest in or to any trademark, service mark, 
-logo or trade name of Sun or its licensors is granted under this 
-Agreement. 
-
-(j) If your Permitted Use in this Agreement permits the distribution 
-Software or portions of the Software, you may only distribute the Software 
-subject to a license agreement that protects Sun's interests consistent 
-with the terms contained in this Agreement.
-
-4. Java Compatibility and Open Source.
-
-Software may contain Java technology.  You may not create additional 
-classes to, or modifications of, the Java technology, except under 
-compatibility requirements available under a separate agreement available 
-at www.java.net.
-
-Sun supports and benefits from the global community of open source 
-developers, and thanks the community for its important contributions and 
-open standards-based technology, which Sun has adopted into many of its 
-products.
-
-Please note that portions of Software may be provided with notices and 
-open source licenses from such communities and third parties that govern 
-the use of those portions, and any licenses granted hereunder do not 
-alter any rights and obligations you may have under such open source 
-licenses, however, the disclaimer of warranty and limitation of 
-liability provisions in this Agreement will apply to all Software in 
-this distribution.
-
-5. Term and Termination. 
-
-The Agreement is effective on the Date you recieve the Software and 
-remains effective until terminated.  Your rights under this Agreement 
-will terminate immediately without notice from Sun if you materially 
-breach it or take any action in derogation of Sun's and/or its 
-licensors' rights to Software.  Sun may terminate this Agreement should 
-any Software become, or in Sun's reasonable opinion likely to become, 
-the subject of a claim of intellectual property infringement or trade 
-secret misappropriation.  Upon termination, you will cease use of, and 
-destroy, Software and confirm compliance in writing to Sun.  Sections 1, 
-3, 4, 5, and 7-13 will survive termination of the Agreement.
-
-6. Limited Warranty. 
-
-Sun warrants to you that for a period of 90 days from the date of 
-receipt, the media on which Software is furnished (if any) will be free 
-of defects in materials and workmanship under normal use.  Except for 
-the foregoing, Software is provided "AS IS".  Your exclusive remedy and 
-Sun's entire liability under this limited warranty will be at Sun's 
-option to replace Software media or refund the fee paid for Software.  
-Some states do not allow limitations on certain implied warranties, so 
-the above may not apply to you.  This limited warranty gives you 
-specific legal rights.  You may have others, which vary from state to 
-state.
-
-7. Disclaimer of Warranty. 
-
-UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, 
-REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF 
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT 
-ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO 
-BE LEGALLY INVALID. 
-
-8. Limitation of Liability. 
-
-TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS 
-LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, 
-INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED 
-REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE 
-USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGES.  In no event will Sun's liability to you, 
-whether in contract, tort (including negligence), or otherwise, exceed 
-the amount paid by you for Software under this Agreement.  The foregoing 
-limitations will apply even if the above stated warranty fails of its 
-essential purpose.  Some states do not allow the exclusion of incidental 
-or consequential damages, so some of the terms above may not be 
-applicable to you. 
-
-9. Export Regulations. 
-
-All Software, documents, technical data, and any other materials 
-delivered under this Agreement are subject to U.S. export control laws 
-and may be subject to export or import regulations in other countries.  
-You agree to comply strictly with these laws and regulations and 
-acknowledge that you have the responsibility to obtain any licenses to 
-export, re-export, or import as may be required after delivery to you. 
-
-10. U.S. Government Restricted Rights. 
-
-If Software is being acquired by or on behalf of the U.S. Government or 
-by a U.S. Government prime contractor or subcontractor (at any tier), 
-then the Government's rights in Software and accompanying documentation 
-will be only as set forth in this Agreement; this is in accordance with 
-48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) 
-acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). 
-
-11. Governing Law. 
-
-Any action related to this Agreement will be governed by California law 
-and controlling U.S. federal law.  No choice of law rules of any 
-jurisdiction will apply. 
-
-12. Severability. 
-
-If any provision of this Agreement is held to be unenforceable, this 
-Agreement will remain in effect with the provision omitted, unless 
-omission would frustrate the intent of the parties, in which case this 
-Agreement will immediately terminate.
-
-13. Integration. 
-
-This Agreement is the entire agreement between you and Sun relating to 
-its subject matter.  It supersedes all prior or contemporaneous oral or 
-written communications, proposals, representations and warranties and 
-prevails over any conflicting or additional terms of any quote, order, 
-acknowledgment, or other communication between the parties relating to 
-its subject matter during the term of this Agreement.  No modification 
-of this Agreement will be binding, unless in writing and signed by an 
-authorized representative of each party.
--- /dev/null	Wed Jul  1 16:13:39 2015
+++ new/build/as/files/BINARYLICENSE.txt	Wed Jul  1 16:13:39 2015
@@ -0,0 +1,190 @@
+Sun Microsystems, Inc. Binary Code License Agreement
+
+SUN MICROSYSTEMS, INC. ("SUN") IS WILLING TO LICENSE THE SOFTWARE TO YOU 
+ONLY UPON THE CONDITION THAT YOU ACCEPT ALL OF THE TERMS CONTAINED IN 
+THIS BINARY CODE LICENSE AGREEMENT ("AGREEMENT").  PLEASE READ THE 
+AGREEMENT CAREFULLY. BY DOWNLOADING OR INSTALLING THIS SOFTWARE, YOU 
+ACCEPT THE FULL TERMS OF THIS AGREEMENT.
+
+1. Definitions. 
+
+"Software" means all software provided to You in binary code form by Sun 
+under this License as indicated on the opensolaris.org website.  Software 
+includes any updates or error corrections or documentation relating to 
+Software provided to You by Sun under this License as indicated on the 
+opensolaris.org website.
+
+2. Permitted Uses.
+
+Subject to the terms and conditions of this Agreement and restrictions and 
+exceptions set forth in the Software's documentation, Sun grants you a 
+non-exclusive, non-transferable, limited license without fees to
+
+(a) reproduce and use internally the Software for the purposes of 
+developing or running an Open Solaris distribution.
+
+(b) reproduce and distribute the Software (and also portions of Software 
+identified as Redistributable in the documentation accompanying Software), 
+provided that you (i) distribute the Software or Redistributables bundled 
+as part of, and for the sole purpose of running, OpenSolaris code; 
+(ii) do not remove or alter any proprietary legends or notices contained 
+in or on the Software or Redistributables, (iii) only distribute the 
+Software or Redistributables subject to a license agreement that protects 
+Sun's interests consistent with the terms contained in this Agreement, 
+and (iv) you agree to defend and indemnify Sun and its licensors from and 
+against any damages, costs, liabilities, settlement amounts and/or 
+expenses (including attorneys' fees) incurred in connection with any claim, 
+lawsuit or action by any third party that arises or results from the use 
+or distribution of any and all Programs, Software, or Redistributables.
+
+3. Restrictions.
+
+(a) The copies of Software provided to you under this Agreement is 
+licensed, not sold, to you by Sun.  Sun reserves all rights not expressly 
+granted. 
+
+(b) You may not modify Software.  However if the documentation 
+accompanying Software lists specific portions of Software, such as header 
+files, class libraries, reference source code, and/or redistributable 
+files, that may be handled differently, you may do so only as provided in 
+the documentation. 
+
+(c) You may not rent, lease, lend or encumber Software. 
+
+(d) You do not remove or alter any proprietary legends or notices 
+contained in the Software,
+
+(e) Unless enforcement is prohibited by applicable law, you may not 
+decompile, or reverse engineer Software. 
+
+(f) The terms and conditions of this Agreement will apply to any Software
+updates, provided to you at Sun's discretion, that replace and/or 
+supplement the original Software, unless such update contains a separate
+license. 
+
+(g) Software is copyrighted. 
+
+(h) Software is not designed, licensed or intended for use in the design, 
+construction, operation or maintenance of any nuclear facility and Sun 
+and its licensors disclaim any express or implied warranty of fitness for 
+such uses. 
+
+(i) No right, title or interest in or to any trademark, service mark, 
+logo or trade name of Sun or its licensors is granted under this 
+Agreement. 
+
+(j) If your Permitted Use in this Agreement permits the distribution 
+Software or portions of the Software, you may only distribute the Software 
+subject to a license agreement that protects Sun's interests consistent 
+with the terms contained in this Agreement.
+
+4. Java Compatibility and Open Source.
+
+Software may contain Java technology.  You may not create additional 
+classes to, or modifications of, the Java technology, except under 
+compatibility requirements available under a separate agreement available 
+at www.java.net.
+
+Sun supports and benefits from the global community of open source 
+developers, and thanks the community for its important contributions and 
+open standards-based technology, which Sun has adopted into many of its 
+products.
+
+Please note that portions of Software may be provided with notices and 
+open source licenses from such communities and third parties that govern 
+the use of those portions, and any licenses granted hereunder do not 
+alter any rights and obligations you may have under such open source 
+licenses, however, the disclaimer of warranty and limitation of 
+liability provisions in this Agreement will apply to all Software in 
+this distribution.
+
+5. Term and Termination. 
+
+The Agreement is effective on the Date you recieve the Software and 
+remains effective until terminated.  Your rights under this Agreement 
+will terminate immediately without notice from Sun if you materially 
+breach it or take any action in derogation of Sun's and/or its 
+licensors' rights to Software.  Sun may terminate this Agreement should 
+any Software become, or in Sun's reasonable opinion likely to become, 
+the subject of a claim of intellectual property infringement or trade 
+secret misappropriation.  Upon termination, you will cease use of, and 
+destroy, Software and confirm compliance in writing to Sun.  Sections 1, 
+3, 4, 5, and 7-13 will survive termination of the Agreement.
+
+6. Limited Warranty. 
+
+Sun warrants to you that for a period of 90 days from the date of 
+receipt, the media on which Software is furnished (if any) will be free 
+of defects in materials and workmanship under normal use.  Except for 
+the foregoing, Software is provided "AS IS".  Your exclusive remedy and 
+Sun's entire liability under this limited warranty will be at Sun's 
+option to replace Software media or refund the fee paid for Software.  
+Some states do not allow limitations on certain implied warranties, so 
+the above may not apply to you.  This limited warranty gives you 
+specific legal rights.  You may have others, which vary from state to 
+state.
+
+7. Disclaimer of Warranty. 
+
+UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, 
+REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT 
+ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO 
+BE LEGALLY INVALID. 
+
+8. Limitation of Liability. 
+
+TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS 
+LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, 
+INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED 
+REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE 
+USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGES.  In no event will Sun's liability to you, 
+whether in contract, tort (including negligence), or otherwise, exceed 
+the amount paid by you for Software under this Agreement.  The foregoing 
+limitations will apply even if the above stated warranty fails of its 
+essential purpose.  Some states do not allow the exclusion of incidental 
+or consequential damages, so some of the terms above may not be 
+applicable to you. 
+
+9. Export Regulations. 
+
+All Software, documents, technical data, and any other materials 
+delivered under this Agreement are subject to U.S. export control laws 
+and may be subject to export or import regulations in other countries.  
+You agree to comply strictly with these laws and regulations and 
+acknowledge that you have the responsibility to obtain any licenses to 
+export, re-export, or import as may be required after delivery to you. 
+
+10. U.S. Government Restricted Rights. 
+
+If Software is being acquired by or on behalf of the U.S. Government or 
+by a U.S. Government prime contractor or subcontractor (at any tier), 
+then the Government's rights in Software and accompanying documentation 
+will be only as set forth in this Agreement; this is in accordance with 
+48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) 
+acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). 
+
+11. Governing Law. 
+
+Any action related to this Agreement will be governed by California law 
+and controlling U.S. federal law.  No choice of law rules of any 
+jurisdiction will apply. 
+
+12. Severability. 
+
+If any provision of this Agreement is held to be unenforceable, this 
+Agreement will remain in effect with the provision omitted, unless 
+omission would frustrate the intent of the parties, in which case this 
+Agreement will immediately terminate.
+
+13. Integration. 
+
+This Agreement is the entire agreement between you and Sun relating to 
+its subject matter.  It supersedes all prior or contemporaneous oral or 
+written communications, proposals, representations and warranties and 
+prevails over any conflicting or additional terms of any quote, order, 
+acknowledgment, or other communication between the parties relating to 
+its subject matter during the term of this Agreement.  No modification 
+of this Agreement will be binding, unless in writing and signed by an 
+authorized representative of each party.
--- /dev/null	Wed Jul  1 16:13:39 2015
+++ new/build/as/local.mog	Wed Jul  1 16:13:39 2015
@@ -0,0 +1,26 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2015 OmniTI Computer Consulting, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+license files/BINARYLICENSE.txt license="Sun Binary License"
Binary files old/build/make/root/usr/bin/as and /tmp/dWcaOLT differ
Binary files /tmp/dYca4LT and new/build/as/root/usr/bin/as differ
Binary files /tmp/dTdaWPT and new/build/as/root/usr/lib/amd64/libtdf.so differ
Binary files old/build/make/root/usr/lib/amd64/libtdf.so.1 and /tmp/difaiXT differ
Binary files /tmp/dlfayXT and new/build/as/root/usr/lib/amd64/libtdf.so.1 differ
Binary files /tmp/dagaG2T and new/build/as/root/usr/lib/amd64/libxprof.so differ
Binary files old/build/make/root/usr/lib/amd64/libxprof.so.1 and /tmp/dPha49T differ
Binary files /tmp/dUhai.T and new/build/as/root/usr/lib/amd64/libxprof.so.1 differ
Binary files /tmp/dXiaqdU and new/build/as/root/usr/lib/amd64/libxprof_audit.so differ
Binary files old/build/make/root/usr/lib/amd64/libxprof_audit.so.1 and /tmp/d6jaOkU differ
Binary files /tmp/d9ja4kU and new/build/as/root/usr/lib/amd64/libxprof_audit.so.1 differ
Binary files /tmp/dTkaaqU and new/build/as/root/usr/lib/libtdf.so differ
Binary files old/build/make/root/usr/lib/libtdf.so.1 and /tmp/djmayxU differ
Binary files /tmp/domaOxU and new/build/as/root/usr/lib/libtdf.so.1 differ
Binary files /tmp/dnnaWCU and new/build/as/root/usr/lib/libxprof.so differ
Binary files old/build/make/root/usr/lib/libxprof.so.1 and /tmp/dVoaiKU differ
Binary files /tmp/dYoayKU and new/build/as/root/usr/lib/libxprof.so.1 differ
Binary files /tmp/dRpaGPU and new/build/as/root/usr/lib/libxprof_audit.so differ
Binary files old/build/make/root/usr/lib/libxprof_audit.so.1 and /tmp/d3qa4WU differ
Binary files /tmp/d6qaiXU and new/build/as/root/usr/lib/libxprof_audit.so.1 differ
--- old/build/illumos/build.sh	Wed Jul  1 16:13:40 2015
+++ new/build/illumos/build.sh	Wed Jul  1 16:13:40 2015
@@ -43,7 +43,7 @@
 
 #all of the ips depends should be available from OmniTI repos
 
-BUILD_DEPENDS_IPS="developer/astdev developer/build/make developer/build/onbld developer/gcc44 developer/java/jdk developer/lexer/flex developer/object-file developer/parser/bison library/glib2 library/libxml2 library/libxslt library/nspr/header-nspr library/perl-5/xml-parser library/security/trousers runtime/perl runtime/perl-64 runtime/perl/manual system/library/install system/library/dbus system/library/libdbus system/library/libdbus-glib system/library/mozilla-nss/header-nss system/management/snmp/net-snmp text/gnu-gettext sunstudio12.1"
+BUILD_DEPENDS_IPS="developer/versioning/sccs developer/as developer/astdev developer/build/make developer/build/onbld developer/gcc44 developer/java/jdk developer/lexer/flex developer/object-file developer/parser/bison library/glib2 library/libxml2 library/libxslt library/nspr/header-nspr library/perl-5/xml-parser library/security/trousers runtime/perl runtime/perl-64 runtime/perl/manual system/library/install system/library/dbus system/library/libdbus system/library/libdbus-glib system/library/mozilla-nss/header-nss system/management/snmp/net-snmp text/gnu-gettext sunstudio12.1"
 
 GIT=git
 
--- old/build/jeos/illumos-gate.p5m	Wed Jul  1 16:13:40 2015
+++ new/build/jeos/illumos-gate.p5m	Wed Jul  1 16:13:40 2015
@@ -374,6 +374,7 @@
 depend fmri=developer/apptrace/ucblib@0.5.11,5.11-@PVER@ type=incorporate
 depend fmri=developer/apptrace@0.5.11,5.11-@PVER@ type=incorporate
 depend fmri=developer/astdev@0.5.11,5.11-@PVER@ type=incorporate
+depend fmri=developer/build/make@0.5.11,5.11-@PVER@ type=incorporate
 depend fmri=developer/build/onbld@0.5.11,5.11-@PVER@ type=incorporate
 depend fmri=developer/debug/mdb/module/module-fibre-channel@0.5.11,5.11-@PVER@ type=incorporate
 depend fmri=developer/debug/mdb/module/module-qlc@0.5.11,5.11-@PVER@ type=incorporate
--- old/build/jeos/omnios-userland.p5m	Wed Jul  1 16:13:41 2015
+++ new/build/jeos/omnios-userland.p5m	Wed Jul  1 16:13:41 2015
@@ -11,11 +11,11 @@
 depend fmri=compress/zip@3.0,5.11-@PVER@ type=incorporate
 depend fmri=data/iso-codes@3.57,5.11-@PVER@ type=incorporate
 depend fmri=database/sqlite-3@3.8.8.2,5.11-@PVER@ type=incorporate
+depend fmri=developer/as@0.5.11,5.11-@PVER@ type=incorporate
 depend fmri=developer/build/autoconf@2.69,5.11-@PVER@ type=incorporate
 depend fmri=developer/build/automake@1.14,5.11-@PVER@ type=incorporate
 depend fmri=developer/build/gnu-make@3.82,5.11-@PVER@ type=incorporate
 depend fmri=developer/build/libtool@2.4.2,5.11-@PVER@ type=incorporate
-depend fmri=developer/build/make@0.5.11,5.11-@PVER@ type=incorporate
 depend fmri=developer/dtrace/toolkit@0.99,5.11-@PVER@ type=incorporate
 depend fmri=developer/gcc44@4.4.4,5.11-@PVER@ type=incorporate
 depend fmri=developer/gcc44/libgmp-gcc44@5.0.2,5.11-@PVER@ type=incorporate
@@ -32,6 +32,7 @@
 depend fmri=developer/parser/bison@3.0,5.11-@PVER@ type=incorporate
 depend fmri=developer/sunstudio12.1@12.1,5.11-@PVER@ type=incorporate
 depend fmri=developer/swig@2.0.12,5.11-@PVER@ type=incorporate
+depend fmri=developer/versioning/sccs@0.5.11,5.11-@PVER@ type=incorporate
 depend fmri=developer/versioning/git@2.3,5.11-@PVER@ type=incorporate
 depend fmri=developer/versioning/mercurial@2.7,5.11-@PVER@ type=incorporate
 depend fmri=driver/virtualization/kvm@1.0,5.11-@PVER@ type=incorporate
--- old/build/make/build.sh	Wed Jul  1 16:13:41 2015
+++ /dev/null	Wed Jul  1 16:13:40 2015
@@ -1,101 +0,0 @@
-#!/usr/bin/bash
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2011-2012 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-# this will build
-#
-#   * make
-#   * sccs
-#   * assorted bin-only bits: (from sub root)
-#     * as
-#     * libtdf
-#     * libxprof
-#     * libxprof_audit
-
-# Load support functions
-. ../../lib/functions.sh
-
-PROG=make
-VER=0.5.11
-PKG=developer/build/make
-SUMMARY="OmniOS Bundled Development Tools (aka DevPro)"
-DESC="$SUMMARY"
-
-BUILD_DEPENDS_IPS="sunstudio12.1 compatibility/ucb"
-DEPENDS_IPS="system/library SUNWcs system/library/math"
-
-CONFIGURE_OPTS=""
-PKGE=$(url_encode $PKG)
-DESTDIR=$DTMPDIR/make_pkg
-
-prebuild_clean() {
-    logmsg "Cleaning destdir: $DESTDIR"
-    logcmd rm -rf $DESTDIR
-}
-
-build() {
-    logmsg "Building and installing ($1)"
-    pushd $TMPDIR/$1/usr/src > /dev/null || logerr "can't enter build harness"
-    logcmd env STUDIOBIN=/opt/sunstudio12.1/bin DESTDIR=$DESTDIR ./build ||
-        logerr "make/install ($1) failed"
-    popd > /dev/null
-}
-
-place_bins() {
-    logmsg "Moving closed bins into place"
-    (cd $SRCDIR/root && tar cf - .) | (cd $DESTDIR && tar xf -) ||
-        logerr "Failed to copy closed bins"
-}
-move_and_links() {
-    logmsg "Shifting binaries and setting up links"
-    logcmd mv $DESTDIR/usr/ccs/bin/help $DESTDIR/usr/bin/sccshelp
-    pushd $DESTDIR/usr/ccs/bin > /dev/null || logerr "Cannot chdir"
-    for cmd in *
-    do
-        logcmd mv $cmd $DESTDIR/usr/bin/ || logerr "Cannot relocate /usr/ccs/bin/$cmd"
-        logcmd ln -s ../../$cmd $cmd
-    done
-    logcmd ln -s ../../sccshelp $DESTDIR/usr/ccs/bin/sccshelp
-    logcmd ln -s ../../sccshelp $DESTDIR/usr/ccs/bin/help
-    popd > /dev/null
-}
-
-init
-
-prebuild_clean
-
-BUILDDIR=devpro-make-20061219
-download_source devpro devpro-make src-20061219
-build devpro-make-20061219
-
-BUILDDIR=devpro-sccs-20061219
-download_source devpro devpro-sccs src-20061219
-build devpro-sccs-20061219
-
-place_bins
-move_and_links
-
-make_package
-clean_up
--- /dev/null	Wed Jul  1 16:13:40 2015
+++ new/build/sccs/build.sh	Wed Jul  1 16:13:41 2015
@@ -0,0 +1,83 @@
+#!/usr/bin/bash
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2011-2012 OmniTI Computer Consulting, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# this will build
+#
+#   * sccs
+#
+
+# Load support functions
+. ../../lib/functions.sh
+
+PROG=make
+VER=0.5.11
+PKG=developer/versioning/sccs
+SUMMARY="Source Code Control System (SCCS)"
+DESC="$SUMMARY"
+
+BUILD_DEPENDS_IPS="sunstudio12.1 compatibility/ucb"
+DEPENDS_IPS="system/library SUNWcs system/library/math"
+
+CONFIGURE_OPTS=""
+PKGE=$(url_encode $PKG)
+DESTDIR=$DTMPDIR/sccs
+
+prebuild_clean() {
+    logmsg "Cleaning destdir: $DESTDIR"
+    logcmd rm -rf $DESTDIR
+    mkdir -p $DESTDIR/usr/bin
+}
+
+build() {
+    logmsg "Building and installing ($1)"
+    pushd $TMPDIR/$1/usr/src > /dev/null || logerr "can't enter build harness"
+    logcmd env STUDIOBIN=/opt/sunstudio12.1/bin DESTDIR=$DESTDIR ./build ||
+        logerr "make/install ($1) failed"
+    popd > /dev/null
+}
+
+move_and_links() {
+    logmsg "Shifting binaries and setting up links"
+    logcmd mv $DESTDIR/usr/ccs/bin/help $DESTDIR/usr/bin/sccshelp
+    pushd $DESTDIR/usr/ccs/bin > /dev/null || logerr "Cannot chdir"
+    for cmd in *
+    do
+        logcmd mv $cmd $DESTDIR/usr/bin/ || logerr "Cannot relocate /usr/ccs/bin/$cmd"
+        logcmd ln -s ../../$cmd $cmd
+    done
+    logcmd ln -s ../../sccshelp $DESTDIR/usr/ccs/bin/sccshelp
+    logcmd ln -s ../../sccshelp $DESTDIR/usr/ccs/bin/help
+    popd > /dev/null
+}
+
+init
+prebuild_clean
+BUILDDIR=devpro-sccs-20061219
+download_source devpro devpro-sccs src-20061219
+build devpro-sccs-20061219
+move_and_links
+make_package
+clean_up
--- old/build/make/local.mog	Wed Jul  1 16:13:41 2015
+++ /dev/null	Wed Jul  1 16:13:40 2015
@@ -1,30 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright 2011-2012 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
-<transform dir path=usr/xpg4.* -> drop>
-<transform file path=usr/xpg4/bin/.* -> drop>
-<transform link path=usr/xpg4/bin/.* -> drop>
-license usr/src/OPENSOLARIS.LICENSE license=CDDL
-license files/BINARYLICENSE.txt license="Sun Binary License"
--- /dev/null	Wed Jul  1 16:13:40 2015
+++ new/build/sccs/local.mog	Wed Jul  1 16:13:41 2015
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License, Version 1.0 only
+# (the "License").  You may not use this file except in compliance
+# with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2015 OmniTI Computer Consulting, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+<transform dir path=usr/xpg4.* -> drop>
+<transform file path=usr/xpg4/bin/.* -> drop>
+<transform link path=usr/xpg4/bin/.* -> drop>
+license usr/src/OPENSOLARIS.LICENSE license=CDDL
