15786608 SUNBT7162754 create new meta package developer/opensolaris/userland s11-update
authorNorm Jacobs <Norm.Jacobs@Oracle.COM>
Thu, 19 Mar 2015 20:44:31 -0700
branchs11-update
changeset 3996 20c0f21bbe1e
parent 3994 3781477accf3
child 3999 da604685a0ed
15786608 SUNBT7162754 create new meta package developer/opensolaris/userland
components/Makefile
components/a2ps/Makefile
components/a2ps/resolve.deps
components/aalib/Makefile
components/aalib/resolve.deps
components/acpidump/Makefile
components/acpidump/resolve.deps
components/ant/Makefile
components/ant/resolve.deps
components/antlr/Makefile
components/antlr/resolve.deps
components/apache2-modules/mod_dtrace/Makefile
components/apache2-modules/mod_dtrace/resolve.deps
components/apache2-modules/mod_fcgid/Makefile
components/apache2-modules/mod_fcgid/resolve.deps
components/apache2-modules/mod_jk/Makefile
components/apache2-modules/mod_jk/resolve.deps
components/apache2-modules/mod_perl/Makefile
components/apache2-modules/mod_perl/resolve.deps
components/apache2-modules/mod_proxy_html/Makefile
components/apache2-modules/mod_proxy_html/resolve.deps
components/apache2-modules/mod_security2/Makefile
components/apache2-modules/mod_security2/resolve.deps
components/apache2-modules/mod_wsgi/Makefile
components/apache2-modules/mod_wsgi/resolve.deps
components/apache2/Makefile
components/apache2/resolve.deps
components/apache24/Makefile
components/apache24/resolve.deps
components/apr-1_5/Makefile
components/apr-1_5/resolve.deps
components/apr-util-1_5/Makefile
components/apr-util-1_5/resolve.deps
components/apr-util/Makefile
components/apr-util/resolve.deps
components/apr/Makefile
components/apr/resolve.deps
components/areca/Makefile
components/areca/resolve.deps
components/autoconf/Makefile
components/autoconf/resolve.deps
components/autogen/Makefile
components/autogen/resolve.deps
components/automake/automake-1.10/Makefile
components/automake/automake-1.10/resolve.deps
components/automake/automake-1.11.2/Makefile
components/automake/automake-1.11.2/resolve.deps
components/automake/automake-1.9.6/Makefile
components/automake/automake-1.9.6/resolve.deps
components/bash/Makefile
components/bash/resolve.deps
components/bcc/Makefile
components/bcc/resolve.deps
components/beanshell/Makefile
components/beanshell/resolve.deps
components/berkeleydb/Makefile
components/berkeleydb/resolve.deps
components/bind/Makefile
components/bind/resolve.deps
components/binutils/Makefile
components/binutils/resolve.deps
components/bison/Makefile
components/bison/resolve.deps
components/bzip2/Makefile
components/bzip2/resolve.deps
components/cdrtools/Makefile
components/cdrtools/resolve.deps
components/clisp/Makefile
components/clisp/resolve.deps
components/cmake/Makefile
components/cmake/resolve.deps
components/common/Makefile
components/common/resolve.deps
components/conflict/Makefile
components/conflict/resolve.deps
components/convmv/Makefile
components/convmv/resolve.deps
components/coreutils/Makefile
components/coreutils/resolve.deps
components/cups/Makefile
components/cups/resolve.deps
components/curl/Makefile
components/curl/resolve.deps
components/cvs/Makefile
components/cvs/resolve.deps
components/diffstat/Makefile
components/diffstat/resolve.deps
components/diffutils/Makefile
components/diffutils/resolve.deps
components/dnsmasq/Makefile
components/dnsmasq/resolve.deps
components/doxygen/Makefile
components/doxygen/resolve.deps
components/ejabberd/Makefile
components/ejabberd/resolve.deps
components/elinks/Makefile
components/elinks/resolve.deps
components/emacs/Makefile
components/emacs/resolve.deps
components/enscript/Makefile
components/enscript/resolve.deps
components/erlang/Makefile
components/erlang/resolve.deps
components/fastcgi/Makefile
components/fastcgi/resolve.deps
components/fetchmail/Makefile
components/fetchmail/resolve.deps
components/findutils/Makefile
components/findutils/resolve.deps
components/flex/Makefile
components/flex/resolve.deps
components/foomatic/db-engine/Makefile
components/foomatic/db-engine/resolve.deps
components/foomatic/db/Makefile
components/foomatic/filters/Makefile
components/foomatic/filters/resolve.deps
components/foomatic/fppd/Makefile
components/fping/Makefile
components/fping/resolve.deps
components/gawk/Makefile
components/gawk/resolve.deps
components/gcc3/Makefile
components/gcc3/resolve.deps
components/gcc45/Makefile
components/gcc45/resolve.deps
components/gcc47/Makefile
components/gcc47/resolve.deps
components/gcc48/Makefile
components/gcc48/resolve.deps
components/gd2/Makefile
components/gd2/resolve.deps
components/gdb/Makefile
components/gdb/resolve.deps
components/gdbm/Makefile
components/gdbm/resolve.deps
components/getopt/Makefile
components/getopt/resolve.deps
components/gettext/Makefile
components/gettext/resolve.deps
components/ggrep/Makefile
components/ggrep/resolve.deps
components/ghostscript/Makefile
components/ghostscript/resolve.deps
components/git/Makefile
components/git/resolve.deps
components/gnu-gs-fonts-other/Makefile
components/gnu-gs-fonts-std/Makefile
components/gnump/Makefile
components/gnump/resolve.deps
components/gnupg/Makefile
components/gnupg/resolve.deps
components/gnuplot/Makefile
components/gnuplot/resolve.deps
components/gnupth/Makefile
components/gnupth/resolve.deps
components/gocr/Makefile
components/gocr/resolve.deps
components/gperf/Makefile
components/gperf/resolve.deps
components/gpgme/Makefile
components/gpgme/resolve.deps
components/grails/Makefile
components/grails/resolve.deps
components/graphviz/Makefile
components/graphviz/resolve.deps
components/groff/Makefile
components/groff/resolve.deps
components/gtar/Makefile
components/gtar/resolve.deps
components/guile/Makefile
components/guile/resolve.deps
components/gutenprint/Makefile
components/gutenprint/resolve.deps
components/gzip/Makefile
components/gzip/resolve.deps
components/hal-cups-utils/Makefile
components/hal-cups-utils/resolve.deps
components/hexedit/Makefile
components/hexedit/resolve.deps
components/hplip/Makefile
components/hplip/resolve.deps
components/httping/Makefile
components/httping/resolve.deps
components/hwdata/Makefile
components/iftop/Makefile
components/iftop/resolve.deps
components/ilmbase/Makefile
components/ilmbase/resolve.deps
components/imagemagick/Makefile
components/imagemagick/resolve.deps
components/indent/Makefile
components/indent/resolve.deps
components/iperf/Makefile
components/iperf/resolve.deps
components/ircii/Makefile
components/ircii/resolve.deps
components/isc-dhcp/Makefile
components/isc-dhcp/resolve.deps
components/jsl/Makefile
components/jsl/resolve.deps
components/junit/Makefile
components/junit/resolve.deps
components/ksh93/Makefile
components/ksh93/resolve.deps
components/lcms/Makefile
components/lcms/resolve.deps
components/less/Makefile
components/less/resolve.deps
components/lftp/Makefile
components/lftp/resolve.deps
components/libarchive/Makefile
components/libarchive/resolve.deps
components/libassuan/Makefile
components/libassuan/resolve.deps
components/libconfuse/Makefile
components/libconfuse/resolve.deps
components/libedit/Makefile
components/libedit/resolve.deps
components/libee/Makefile
components/libee/resolve.deps
components/libestr/Makefile
components/libestr/resolve.deps
components/libevent/Makefile
components/libevent/resolve.deps
components/libexpat/Makefile
components/libexpat/resolve.deps
components/libidn/Makefile
components/libidn/resolve.deps
components/libksba/Makefile
components/libksba/resolve.deps
components/libmcrypt/Makefile
components/libmcrypt/resolve.deps
components/libmemcached/Makefile
components/libmemcached/resolve.deps
components/libmng/Makefile
components/libmng/resolve.deps
components/libneon/Makefile
components/libneon/resolve.deps
components/libnet/Makefile
components/libnet/resolve.deps
components/libpcap/Makefile
components/libpcap/resolve.deps
components/librsync/Makefile
components/librsync/resolve.deps
components/libsigsegv/Makefile
components/libsigsegv/resolve.deps
components/libsndfile/Makefile
components/libsndfile/resolve.deps
components/libtecla/Makefile
components/libtecla/resolve.deps
components/libtool/Makefile
components/libtool/resolve.deps
components/libtorrent/Makefile
components/libtorrent/resolve.deps
components/libusb/ugen/Makefile
components/libusb/ugen/resolve.deps
components/libusb/wrapper/Makefile
components/libusb/wrapper/resolve.deps
components/libxml2/Makefile
components/libxml2/resolve.deps
components/libxslt/Makefile
components/libxslt/resolve.deps
components/lighttpd/Makefile
components/lighttpd/resolve.deps
components/links/Makefile
components/links/resolve.deps
components/logilab-astng/Makefile
components/logilab-astng/resolve.deps
components/logilab-common/Makefile
components/logilab-common/resolve.deps
components/lua/Makefile
components/lua/resolve.deps
components/lynx/Makefile
components/lynx/resolve.deps
components/m4/Makefile
components/m4/resolve.deps
components/mailman/Makefile
components/mailman/resolve.deps
components/make/Makefile
components/make/resolve.deps
components/mc/Makefile
components/mc/resolve.deps
components/meld/Makefile
components/meld/resolve.deps
components/memcached-java/Makefile
components/memcached-java/resolve.deps
components/memcached/Makefile
components/memcached/resolve.deps
components/mercurial/Makefile
components/mercurial/resolve.deps
components/meta-packages/developer-opensolaris-userland/Makefile
components/meta-packages/developer-opensolaris-userland/developer-opensolaris-userland.p5m
components/meta-packages/history/Makefile
components/mlocate/Makefile
components/mlocate/resolve.deps
components/mpc/Makefile
components/mpc/resolve.deps
components/mpfr/Makefile
components/mpfr/resolve.deps
components/mutt/Makefile
components/mutt/resolve.deps
components/mysql-5-1/Makefile
components/mysql-5-1/resolve.deps
components/mysql-5-5/Makefile
components/mysql-5-5/resolve.deps
components/mysql-common/Makefile
components/mysql-common/resolve.deps
components/ncftp/Makefile
components/ncftp/resolve.deps
components/ncurses/Makefile
components/ncurses/resolve.deps
components/net-snmp/Makefile
components/net-snmp/resolve.deps
components/nethack/Makefile
components/nethack/resolve.deps
components/nmap/Makefile
components/nmap/resolve.deps
components/novnc/Makefile
components/novnc/resolve.deps
components/ntp/Makefile
components/ntp/resolve.deps
components/open-fabrics/Makefile
components/open-fabrics/ibutils/Makefile
components/open-fabrics/infiniband-diags/Makefile
components/open-fabrics/libibmad/Makefile
components/open-fabrics/libibumad/Makefile
components/open-fabrics/libibverbs/Makefile
components/open-fabrics/libmlx4/Makefile
components/open-fabrics/librdmacm/Makefile
components/open-fabrics/libsdp/Makefile
components/open-fabrics/opensm/Makefile
components/open-fabrics/perftest/Makefile
components/open-fabrics/qperf/Makefile
components/open-fabrics/rds-tools/Makefile
components/open-fabrics/resolve.deps
components/openexr/Makefile
components/openexr/resolve.deps
components/openldap/Makefile
components/openldap/resolve.deps
components/openscap/Makefile
components/openscap/resolve.deps
components/openssh/Makefile
components/openssh/resolve.deps
components/openssl/openssl-1.0.1-fips-140/Makefile
components/openssl/openssl-1.0.1-fips-140/resolve.deps
components/openssl/openssl-1.0.1/Makefile
components/openssl/openssl-1.0.1/resolve.deps
components/openssl/openssl-fips/Makefile
components/openstack/cinder/Makefile
components/openstack/cinder/resolve.deps
components/openstack/common/Makefile
components/openstack/common/resolve.deps
components/openstack/glance/Makefile
components/openstack/glance/resolve.deps
components/openstack/heat/Makefile
components/openstack/heat/resolve.deps
components/openstack/horizon/Makefile
components/openstack/horizon/resolve.deps
components/openstack/keystone/Makefile
components/openstack/keystone/resolve.deps
components/openstack/neutron/Makefile
components/openstack/neutron/resolve.deps
components/openstack/nova/Makefile
components/openstack/nova/resolve.deps
components/openstack/swift/Makefile
components/openstack/swift/resolve.deps
components/openusb/Makefile
components/openusb/resolve.deps
components/p7zip/Makefile
components/p7zip/resolve.deps
components/pam_pkcs11/Makefile
components/pam_pkcs11/resolve.deps
components/parallel/Makefile
components/parallel/resolve.deps
components/patch/Makefile
components/patch/resolve.deps
components/pbzip2/Makefile
components/pbzip2/resolve.deps
components/pconsole/Makefile
components/pconsole/resolve.deps
components/pcre/Makefile
components/pcre/resolve.deps
components/perl512/Makefile
components/perl512/resolve.deps
components/perl_modules/DBI/Makefile
components/perl_modules/DBI/resolve.deps
components/perl_modules/authen-pam/Makefile
components/perl_modules/authen-pam/resolve.deps
components/perl_modules/cssh/Makefile
components/perl_modules/cssh/resolve.deps
components/perl_modules/net-ssleay/Makefile
components/perl_modules/net-ssleay/resolve.deps
components/perl_modules/perl-tk/Makefile
components/perl_modules/perl-tk/resolve.deps
components/perl_modules/perl-x11-protocol/Makefile
components/perl_modules/perl-x11-protocol/resolve.deps
components/perl_modules/pmtools/Makefile
components/perl_modules/pmtools/resolve.deps
components/perl_modules/xml-libxml/Makefile
components/perl_modules/xml-libxml/resolve.deps
components/perl_modules/xml-namespacesupport/Makefile
components/perl_modules/xml-namespacesupport/resolve.deps
components/perl_modules/xml-parser/Makefile
components/perl_modules/xml-parser/resolve.deps
components/perl_modules/xml-sax-base/Makefile
components/perl_modules/xml-sax-base/resolve.deps
components/perl_modules/xml-sax/Makefile
components/perl_modules/xml-sax/resolve.deps
components/perl_modules/xml-simple/Makefile
components/perl_modules/xml-simple/resolve.deps
components/php-5_2/Makefile
components/php-5_2/extensions-zts.mk
components/php-5_2/extensions.mk
components/php-5_2/imap/Makefile
components/php-5_2/php-cgi/Makefile
components/php-5_2/php-nsapi/Makefile
components/php-5_2/php-sapi/Makefile
components/php-5_2/resolve.deps
components/php-5_3/Makefile
components/php-5_3/extensions-zts.mk
components/php-5_3/extensions.mk
components/php-5_3/imap/Makefile
components/php-5_3/php-cgi/Makefile
components/php-5_3/php-nsapi/Makefile
components/php-5_3/php-sapi/Makefile
components/php-5_3/resolve.deps
components/php-common/Makefile
components/php-common/resolve.deps
components/pigz/Makefile
components/pigz/resolve.deps
components/pinentry/Makefile
components/pinentry/resolve.deps
components/pixz/Makefile
components/pixz/resolve.deps
components/pkg-config/Makefile
components/pkg-config/resolve.deps
components/popt/Makefile
components/popt/resolve.deps
components/privoxy/Makefile
components/privoxy/resolve.deps
components/procmail/Makefile
components/procmail/resolve.deps
components/proftpd/Makefile
components/proftpd/resolve.deps
components/psutils/Makefile
components/psutils/resolve.deps
components/ptp/Makefile
components/ptp/resolve.deps
components/pv/Makefile
components/pv/resolve.deps
components/pwgen/Makefile
components/pwgen/resolve.deps
components/pylint/Makefile
components/pylint/resolve.deps
components/python/alembic/Makefile
components/python/alembic/resolve.deps
components/python/amqp/Makefile
components/python/amqp/resolve.deps
components/python/anyjson/Makefile
components/python/anyjson/resolve.deps
components/python/argparse/Makefile
components/python/argparse/resolve.deps
components/python/babel/Makefile
components/python/babel/resolve.deps
components/python/beautifulsoup4/Makefile
components/python/beautifulsoup4/resolve.deps
components/python/boto/Makefile
components/python/boto/resolve.deps
components/python/ceilometerclient/Makefile
components/python/ceilometerclient/resolve.deps
components/python/cffi/Makefile
components/python/cffi/resolve.deps
components/python/cheetah/Makefile
components/python/cheetah/resolve.deps
components/python/cherrypy/Makefile
components/python/cherrypy/resolve.deps
components/python/cinderclient/Makefile
components/python/cinderclient/resolve.deps
components/python/cliff/Makefile
components/python/cliff/resolve.deps
components/python/cmd2/Makefile
components/python/cmd2/resolve.deps
components/python/cov-core/Makefile
components/python/cov-core/resolve.deps
components/python/coverage/Makefile
components/python/coverage/resolve.deps
components/python/cssutils/Makefile
components/python/cssutils/resolve.deps
components/python/d2to1/Makefile
components/python/d2to1/resolve.deps
components/python/decorator/Makefile
components/python/decorator/resolve.deps
components/python/django-appconf/Makefile
components/python/django-appconf/resolve.deps
components/python/django/Makefile
components/python/django/resolve.deps
components/python/django_compressor/Makefile
components/python/django_compressor/resolve.deps
components/python/django_openstack_auth/Makefile
components/python/django_openstack_auth/resolve.deps
components/python/dnspython/Makefile
components/python/dnspython/resolve.deps
components/python/dogpile.cache/Makefile
components/python/dogpile.cache/resolve.deps
components/python/dogpile.core/Makefile
components/python/dogpile.core/resolve.deps
components/python/eventlet/Makefile
components/python/eventlet/resolve.deps
components/python/filechunkio/Makefile
components/python/filechunkio/resolve.deps
components/python/formencode/Makefile
components/python/formencode/resolve.deps
components/python/glanceclient/Makefile
components/python/glanceclient/resolve.deps
components/python/greenlet/Makefile
components/python/greenlet/resolve.deps
components/python/heatclient/Makefile
components/python/heatclient/resolve.deps
components/python/httplib2/Makefile
components/python/httplib2/resolve.deps
components/python/imaging/Makefile
components/python/imaging/resolve.deps
components/python/importlib/Makefile
components/python/importlib/resolve.deps
components/python/ipython/Makefile
components/python/ipython/resolve.deps
components/python/iso8601/Makefile
components/python/iso8601/resolve.deps
components/python/jinja2/Makefile
components/python/jinja2/resolve.deps
components/python/jsonpatch/Makefile
components/python/jsonpatch/resolve.deps
components/python/jsonpointer/Makefile
components/python/jsonpointer/resolve.deps
components/python/jsonrpclib/Makefile
components/python/jsonrpclib/resolve.deps
components/python/jsonschema/Makefile
components/python/jsonschema/resolve.deps
components/python/keystoneclient/Makefile
components/python/keystoneclient/resolve.deps
components/python/kombu/Makefile
components/python/kombu/resolve.deps
components/python/ldtp/Makefile
components/python/ldtp/resolve.deps
components/python/lesscpy/Makefile
components/python/lesscpy/resolve.deps
components/python/librabbitmq/Makefile
components/python/librabbitmq/resolve.deps
components/python/lockfile/Makefile
components/python/lockfile/resolve.deps
components/python/m2crypto/Makefile
components/python/m2crypto/resolve.deps
components/python/mako/Makefile
components/python/mako/resolve.deps
components/python/markdown/Makefile
components/python/markdown/resolve.deps
components/python/markupsafe/Makefile
components/python/markupsafe/resolve.deps
components/python/mock/Makefile
components/python/mock/resolve.deps
components/python/mysql/Makefile
components/python/mysql/resolve.deps
components/python/netaddr/Makefile
components/python/netaddr/resolve.deps
components/python/netifaces/Makefile
components/python/netifaces/resolve.deps
components/python/neutronclient/Makefile
components/python/neutronclient/resolve.deps
components/python/nose-cover3/Makefile
components/python/nose-cover3/resolve.deps
components/python/nose/Makefile
components/python/nose/resolve.deps
components/python/novaclient/Makefile
components/python/novaclient/resolve.deps
components/python/ordereddict/Makefile
components/python/ordereddict/resolve.deps
components/python/oslo.config/Makefile
components/python/oslo.config/resolve.deps
components/python/passlib/Makefile
components/python/passlib/resolve.deps
components/python/paste.deploy/Makefile
components/python/paste.deploy/resolve.deps
components/python/paste/Makefile
components/python/paste/resolve.deps
components/python/pbr/Makefile
components/python/pbr/resolve.deps
components/python/pep8/Makefile
components/python/pep8/resolve.deps
components/python/pip/Makefile
components/python/pip/resolve.deps
components/python/ply/Makefile
components/python/ply/resolve.deps
components/python/prettytable/Makefile
components/python/prettytable/resolve.deps
components/python/py/Makefile
components/python/py/resolve.deps
components/python/pyasn1-modules/Makefile
components/python/pyasn1-modules/resolve.deps
components/python/pyasn1/Makefile
components/python/pyasn1/resolve.deps
components/python/pybonjour/Makefile
components/python/pybonjour/resolve.deps
components/python/pycountry/Makefile
components/python/pycountry/resolve.deps
components/python/pycparser/Makefile
components/python/pycparser/resolve.deps
components/python/pycups/Makefile
components/python/pycups/resolve.deps
components/python/pycurl/Makefile
components/python/pycurl/resolve.deps
components/python/pydns/Makefile
components/python/pydns/resolve.deps
components/python/pyflakes/Makefile
components/python/pyflakes/resolve.deps
components/python/pygments/Makefile
components/python/pygments/resolve.deps
components/python/pylxml/Makefile
components/python/pylxml/resolve.deps
components/python/pyopenssl/Makefile
components/python/pyopenssl/resolve.deps
components/python/pyparsing/Makefile
components/python/pyparsing/resolve.deps
components/python/pyrabbit/Makefile
components/python/pyrabbit/resolve.deps
components/python/pytest-capturelog/Makefile
components/python/pytest-capturelog/resolve.deps
components/python/pytest-codecheckers/Makefile
components/python/pytest-codecheckers/resolve.deps
components/python/pytest-cov/Makefile
components/python/pytest-cov/resolve.deps
components/python/pytest/Makefile
components/python/pytest/resolve.deps
components/python/python-ldap/Makefile
components/python/python-ldap/resolve.deps
components/python/python-memcached/Makefile
components/python/python-memcached/resolve.deps
components/python/python26/Makefile
components/python/python26/resolve.deps
components/python/python27/Makefile
components/python/python27/resolve.deps
components/python/python34/Makefile
components/python/python34/resolve.deps
components/python/pytz/Makefile
components/python/pytz/resolve.deps
components/python/pywbem/Makefile
components/python/pywbem/resolve.deps
components/python/pyyaml/Makefile
components/python/pyyaml/resolve.deps
components/python/quantumclient/Makefile
components/python/quantumclient/resolve.deps
components/python/repoze.lru/Makefile
components/python/repoze.lru/resolve.deps
components/python/requests/Makefile
components/python/requests/resolve.deps
components/python/routes/Makefile
components/python/routes/resolve.deps
components/python/setuptools-git/Makefile
components/python/setuptools-git/resolve.deps
components/python/setuptools/Makefile
components/python/setuptools/resolve.deps
components/python/simplejson/Makefile
components/python/simplejson/resolve.deps
components/python/six/Makefile
components/python/six/resolve.deps
components/python/sqlalchemy-migrate/Makefile
components/python/sqlalchemy-migrate/resolve.deps
components/python/sqlalchemy/Makefile
components/python/sqlalchemy/resolve.deps
components/python/stevedore/Makefile
components/python/stevedore/resolve.deps
components/python/suds/Makefile
components/python/suds/resolve.deps
components/python/swiftclient/Makefile
components/python/swiftclient/resolve.deps
components/python/tempita/Makefile
components/python/tempita/resolve.deps
components/python/tox/Makefile
components/python/tox/resolve.deps
components/python/troveclient/Makefile
components/python/troveclient/resolve.deps
components/python/twisted-web2/Makefile
components/python/twisted-web2/resolve.deps
components/python/twisted/Makefile
components/python/twisted/resolve.deps
components/python/unittest2/Makefile
components/python/unittest2/resolve.deps
components/python/virtualenv/Makefile
components/python/virtualenv/resolve.deps
components/python/waitress/Makefile
components/python/waitress/resolve.deps
components/python/warlock/Makefile
components/python/warlock/resolve.deps
components/python/webob/Makefile
components/python/webob/resolve.deps
components/python/websockify/Makefile
components/python/websockify/resolve.deps
components/python/webtest/Makefile
components/python/webtest/resolve.deps
components/python/xattr/Makefile
components/python/xattr/resolve.deps
components/python/zope-interface/Makefile
components/python/zope-interface/resolve.deps
components/quagga/Makefile
components/quagga/resolve.deps
components/quilt/Makefile
components/quilt/resolve.deps
components/rabbitmq/Makefile
components/rabbitmq/resolve.deps
components/rdiff-backup/Makefile
components/rdiff-backup/resolve.deps
components/readline/Makefile
components/readline/resolve.deps
components/rpm2cpio/Makefile
components/rpm2cpio/resolve.deps
components/rsync/Makefile
components/rsync/resolve.deps
components/rsyslog/Makefile
components/rsyslog/resolve.deps
components/rtorrent/Makefile
components/rtorrent/resolve.deps
components/ruby/facter/Makefile
components/ruby/facter/resolve.deps
components/ruby/hiera/Makefile
components/ruby/hiera/resolve.deps
components/ruby/puppet/Makefile
components/ruby/puppet/resolve.deps
components/ruby/ruby-18/Makefile
components/ruby/ruby-18/resolve.deps
components/ruby/ruby-19/Makefile
components/ruby/ruby-19/resolve.deps
components/ruby/ruby-common/Makefile
components/samba/mozldap/Makefile
components/samba/samba/Makefile
components/samba/samba/resolve.deps
components/samba/samba30/Makefile
components/samba/samba30/resolve.deps
components/sane-backends/Makefile
components/sane-backends/resolve.deps
components/sane-frontends/Makefile
components/sane-frontends/resolve.deps
components/screen/Makefile
components/screen/resolve.deps
components/sed/Makefile
components/sed/resolve.deps
components/sg3_utils/Makefile
components/sg3_utils/resolve.deps
components/slang/Makefile
components/slang/resolve.deps
components/slib/Makefile
components/slib/resolve.deps
components/slrn/Makefile
components/slrn/resolve.deps
components/snort/Makefile
components/snort/resolve.deps
components/sox/Makefile
components/sox/resolve.deps
components/spawn-fcgi/Makefile
components/spawn-fcgi/resolve.deps
components/squid/Makefile
components/squid/resolve.deps
components/stdcxx/Makefile
components/stdcxx/resolve.deps
components/stunnel/Makefile
components/stunnel/resolve.deps
components/subversion/Makefile
components/subversion/resolve.deps
components/sudo/Makefile
components/sudo/resolve.deps
components/swig/Makefile
components/swig/resolve.deps
components/tcl/expect/Makefile
components/tcl/expect/resolve.deps
components/tcl/tcl/Makefile
components/tcl/tcl/resolve.deps
components/tcl/tk/Makefile
components/tcl/tk/resolve.deps
components/tcltls/Makefile
components/tcltls/resolve.deps
components/tcpdump/Makefile
components/tcpdump/resolve.deps
components/tcsh/Makefile
components/tcsh/resolve.deps
components/texinfo/Makefile
components/texinfo/resolve.deps
components/text-utilities/Makefile
components/text-utilities/resolve.deps
components/tidy/Makefile
components/tidy/resolve.deps
components/timezone/Makefile
components/tmux/Makefile
components/tmux/resolve.deps
components/tomcat/Makefile
components/tomcat/resolve.deps
components/top/Makefile
components/top/resolve.deps
components/tree/Makefile
components/tree/resolve.deps
components/trousers/Makefile
components/trousers/resolve.deps
components/unixodbc/Makefile
components/unixodbc/resolve.deps
components/unrar/Makefile
components/unrar/resolve.deps
components/unzip/Makefile
components/unzip/resolve.deps
components/vim/Makefile
components/vim/resolve.deps
components/visual-panels/apache/Makefile
components/visual-panels/apache/resolve.deps
components/visual-panels/core/Makefile
components/visual-panels/core/resolve.deps
components/visual-panels/core/src/java/lib/TimingFramework/Makefile
components/visual-panels/core/src/java/lib/swingx/Makefile
components/visual-panels/coreadm/Makefile
components/visual-panels/coreadm/resolve.deps
components/visual-panels/firewall/Makefile
components/visual-panels/firewall/resolve.deps
components/visual-panels/smf/Makefile
components/visual-panels/smf/resolve.deps
components/visual-panels/sysmon/Makefile
components/visual-panels/sysmon/resolve.deps
components/visual-panels/time/Makefile
components/visual-panels/time/resolve.deps
components/visual-panels/usermgr/Makefile
components/visual-panels/usermgr/resolve.deps
components/visual-panels/zconsole/Makefile
components/visual-panels/zconsole/resolve.deps
components/w3m/Makefile
components/w3m/resolve.deps
components/webalizer/Makefile
components/webalizer/resolve.deps
components/wget/Makefile
components/wget/resolve.deps
components/which/Makefile
components/which/resolve.deps
components/wireshark/Makefile
components/wireshark/resolve.deps
components/wxwidgets/Makefile
components/wxwidgets/resolve.deps
components/xmlto/Makefile
components/xmlto/resolve.deps
components/xorriso/Makefile
components/xorriso/resolve.deps
components/xz/Makefile
components/xz/resolve.deps
components/zip/Makefile
components/zip/resolve.deps
components/zlib/Makefile
components/zlib/resolve.deps
components/zsh/Makefile
components/zsh/resolve.deps
doc/makefile-targets.txt
doc/makefile-variables.txt
make-rules/ant.mk
make-rules/attpackagemake.mk
make-rules/build-zone.mk
make-rules/configure.mk
make-rules/depend.mk
make-rules/environment.mk
make-rules/gem.mk
make-rules/install.rb.mk
make-rules/ips.mk
make-rules/justmake.mk
make-rules/lint-libraries.mk
make-rules/makemaker.mk
make-rules/prep.mk
make-rules/setup.py.mk
make-rules/shared-macros.mk
tools/sc_profile.xml
tools/zone_default.xml
transforms/REQUIRED_PACKAGES
--- a/components/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../make-rules/shared-macros.mk
@@ -31,23 +31,43 @@
 # components.mk is auto-generated by the build tools.  It populates the
 # COMPONENT_DIRS macro with a list of all directories in the workspace that
 # contain a component.
-components.mk:	# Makefile # $(WS_TOP)/components
+$(WS_MACH)/components.mk:	$(WS_MACH) # Makefile # $(WS_TOP)/components
 	@echo "Generating component list..."
 	@$(BASS_O_MATIC) --workspace=$(WS_TOP) --components=paths \
 		| sed -e 's;^$(shell pwd)/;COMPONENT_DIRS += ;g' >[email protected]
 
--include components.mk
+-include $(WS_MACH)/components.mk
 
 # depends.mk is auto-generated by concatenating 'depend.mk' files in each
 # component directory.
-depends.mk:     components.mk
+$(WS_MACH)/depends.mk:     $(WS_MACH)/components.mk
 	@echo "Generating component dependencies..."
 	@cat $(shell $(BASS_O_MATIC) --workspace=$(WS_TOP) --components=paths \
 		| sed -e 's;^$(shell pwd)/;;g' -e 's;$$;/depend.mk;g') >[email protected] \
 		2>/dev/null
  
--include depends.mk
+-include $(WS_MACH)/depends.mk
 
+#
+# Walk through all of the components echoing the REQUIRED_PACKAGES for each one.
+# Pass all output through sed to drop lines with whitespace between words,
+# remove whitespace from lines, drop empty lines, and REQUIRED_PACKAGES +=
+# to the lines.  Pass that through sort -u
+#
+$(WS_MACH)/requires.mk:	$(WS_MACH)
+	@echo "Generating list of required packages to build consolidation..."
+	@$(GMAKE) component-hook \
+		COMPONENT_HOOK='@echo $$(REQUIRED_PACKAGES:%="%\\n")' | \
+		$(GSED) -e '/\S\s\S/d' -e 's/^ //g' -e '/^\s*$$/d' \
+			-e 's/^/REQUIRED_PACKAGES += /' | \
+		sort -u >$(@)
+
+system-check::	$(WS_MACH)/requires.mk
+	@$(GMAKE) -f $(WS_MAKE_RULES)/environment.mk -f $< component-environment-check
+
+system-prep::	$(WS_MACH)/requires.mk
+	@echo "Installing any missing packages..."
+	@$(GMAKE) -f $(WS_MAKE_RULES)/environment.mk -f $< component-environment-prep
 
 download:		TARGET = download
 prep:			TARGET = prep
@@ -57,9 +77,9 @@
 clean:			TARGET = clean
 clobber:		TARGET = clobber
 test:			TARGET = test
+zone-build:		TARGET = component-zone-build
 component-hook:		TARGET = component-hook
-prep build install publish test:	TEMPLATE_ZONE=$(ZONE)
-prep build install publish test:	LOG = >$(WS_LOGS)/$(@F).$(TARGET).log 2>&1
+zone-build prep build install publish test:	LOG = >$(WS_LOGS)/$(@F).$(TARGET).log 2>&1
 
 # turn off pkglint for the individual component builds.
 ifeq   ($(strip $(PKGLINT_COMPONENT)),)
@@ -75,16 +95,18 @@
 
 .DEFAULT:	publish
 
-build install publish test: $(COMPONENT_DIRS)
+zone-build build install publish test: $(COMPONENT_DIRS)
 
 COMPONENT_DIRS.nosetup =	$(COMPONENT_DIRS:%=%.nosetup)
 
-download prep:	$(COMPONENT_DIRS.nosetup)
-
+download::	$(COMPONENT_DIRS.nosetup)
+prep:		$(COMPONENT_DIRS.nosetup)
+component-environment-check::	$(COMPONENT_DIRS.nosetup)
 component-hook:	$(COMPONENT_DIRS.nosetup)
 
 clean:		$(COMPONENT_DIRS.nosetup)
-	$(RM) components.mk depends.mk .profile
+	$(RM) $(WS_MACH)/components.mk $(WS_MACH)/depends.mk \
+	      $(WS_MACH)/requires.mk $(WS_MACH)/*.p5m
 
 clobber:	$(COMPONENT_DIRS.nosetup) clean
 	@cd ../tools ; echo "clobbering tools..." ; $(GMAKE) clobber
@@ -92,9 +114,9 @@
 	    $(shell find . -name 'manifest-*.published')
 
 
-setup:	$(WS_LOGS) $(WS_REPO) tools $(WS_LINT_CACHE)
+setup:	$(WS_MACH) $(WS_LOGS) $(WS_REPO) tools $(WS_LINT_CACHE)
 
-$(WS_LOGS):
+$(WS_MACH) $(WS_LOGS):
 	$(MKDIR) [email protected]
 
 $(WS_REPO):
@@ -123,17 +145,9 @@
 tools:
 	@cd ../tools ; echo "building tools..." ; $(GMAKE) clean setup
 
-# $(WS_COMPONENTS) is the home directory for the zone user, so create a profile
-# to pass a few things on to zone based builds
-.profile:
-	echo "PATH=$(PATH)" >>[email protected]
-	echo "WS_TOP=$(WS_TOP)" >>[email protected]
-	echo "export PATH WS_TOP" >>[email protected]
-
 $(COMPONENT_DIRS):	$(WS_LOGS) setup FORCE
 	@cd [email protected] && echo "$(TARGET) [email protected]" && \
-	 $(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \
-			 $(@:%=--component %) --make $(TARGET) $(LOG)
+	 $(BASS_O_MATIC) $(@:%=--component %) --make $(TARGET) $(LOG)
 
 # Turn userland-incorporator warnings into build failures
 INCORPORATE_WERROR ?= --Werror
@@ -142,8 +156,8 @@
 	$(PKGREPO) refresh -s $(PKG_REPO)
 	$(WS_TOOLS)/userland-incorporator --repository $(PKG_REPO) \
           --version=0.$(OS_VERSION),$(BUILD_VERSION) -p $(PUBLISHER) \
-	  -c $(CONSOLIDATION) --destdir=$(WS_LOGS) $(INCORPORATE_WERROR)
-	for incorporation in $(WS_LOGS)/*.p5m ; do \
+	  -c $(CONSOLIDATION) --destdir=$(WS_MACH) $(INCORPORATE_WERROR)
+	for incorporation in $(WS_MACH)/*.p5m ; do \
 	    $(PKGSEND) -s $(PKG_REPO) publish --fmri-in-manifest \
 	               $${incorporation} ; \
 	done
@@ -162,7 +176,6 @@
 
 $(COMPONENT_DIRS.nosetup):	$(WS_LOGS) FORCE
 	@cd $(@:%.nosetup=%) && echo "$(TARGET) $(@:%.nosetup=%)" && \
-	 $(BASS_O_MATIC) $(TEMPLATE_ZONE:%=--template-zone %) \
-			 $(@:%.nosetup=--component %) --make $(TARGET) $(LOG)
+	 $(BASS_O_MATIC) $(@:%.nosetup=--component %) --make $(TARGET) $(LOG)
 
 FORCE:
--- a/components/a2ps/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/a2ps/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -37,9 +37,9 @@
 
 TPNO=			4517
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # don't use LD_Z_IGNORE: causes linker problems
 LD_Z_IGNORE=
@@ -70,6 +70,8 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/a2ps/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-runtime/perl-512
-shell/ksh93
-system/library
-system/library/math
--- a/components/aalib/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/aalib/Makefile	Thu Mar 19 20:44:31 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
@@ -39,10 +39,10 @@
 
 TPNO=			6118
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
-include ../../make-rules/lint-libraries.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/lint-libraries.mk
 
 PKG_PROTO_DIRS +=	$(COMPONENT_SRC)
 
@@ -71,6 +71,9 @@
 # but it's 32-bit only and not a target
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/slang
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += x11/library/libx11
--- a/components/aalib/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-library/slang
-shell/ksh93
-system/library
-system/library/math
-x11/library/libx11
--- a/components/acpidump/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/acpidump/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,9 +20,11 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
+COMPILER =	gcc3
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		acpidump
@@ -44,14 +46,12 @@
 PUBLISH_STAMP= 
 endif
 
-include ../../make-rules/prep.mk
-include ../../make-rules/justmake.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PKG_PROTO_DIRS += $(BUILD_DIR_32)
 
-COMPILER =	gcc3
-
 COMPONENT_BUILD_ENV  +=		CC=$(CC)
 
 
@@ -69,6 +69,5 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/acpidump/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/ant/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/ant/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -38,9 +38,9 @@
 
 TPNO=			16382
 
-include ../../make-rules/prep.mk
-include ../../make-rules/justmake.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 GMAKE=./build.sh
 
@@ -77,6 +77,6 @@
 
 test:  $(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
--- a/components/ant/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-runtime/perl-512
-shell/ksh93
--- a/components/antlr/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/antlr/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -40,9 +40,9 @@
 # Use version of Java defined in ../../make-rules/shared-macros.mk
 PATH=$(SPRO_VROOT)/bin:$(JAVA_HOME)/bin:/usr/bin
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATCH_LEVEL =		0
 
@@ -73,6 +73,6 @@
 
 test:           $(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/python-27
+REQUIRED_PACKAGES += shell/ksh93
--- a/components/antlr/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-runtime/python-27
-shell/ksh93
--- a/components/apache2-modules/mod_dtrace/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/apache2-modules/mod_dtrace/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -30,8 +30,8 @@
 
 TPNO=			8876
 
-include ../../../make-rules/justmake.mk
-include ../../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 APACHE_USR_PREFIX=/usr/apache2/2.2
 
@@ -56,6 +56,5 @@
 
 test: $(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/apache2-modules/mod_dtrace/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/apache2-modules/mod_fcgid/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/apache2-modules/mod_fcgid/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			8878
 
-include ../../../make-rules/prep.mk
-include ../../../make-rules/justmake.mk
-include ../../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATCH_LEVEL=0
 
@@ -55,6 +55,5 @@
 
 test: $(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/apache2-modules/mod_fcgid/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/apache2-modules/mod_jk/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/apache2-modules/mod_jk/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -35,9 +35,9 @@
 
 TPNO=			9082
 
-include ../../../make-rules/prep.mk
-include ../../../make-rules/configure.mk
-include ../../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATCH_LEVEL=0
 
@@ -61,6 +61,5 @@
 
 test: $(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/apache2-modules/mod_jk/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/apache2-modules/mod_perl/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/apache2-modules/mod_perl/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -36,9 +36,9 @@
 
 CONFIGURE_DEFAULT_DIRS=no
 
-include ../../../make-rules/prep.mk
-include ../../../make-rules/justmake.mk
-include ../../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 APACHE_USR_PREFIX=/usr/apache2/2.2
 AP_PERL5LIB=$(APACHE_USR_PREFIX)/lib/perl
@@ -71,6 +71,11 @@
 #test: $(TEST_32)
 test: $(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/apr-13
+REQUIRED_PACKAGES += library/apr-util-13
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker
+REQUIRED_PACKAGES += web/server/apache-22
--- a/components/apache2-modules/mod_perl/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-library/apr-13
-library/apr-util-13
-runtime/perl-512
-system/library
-system/library/math
-system/linker
-web/server/apache-22
--- a/components/apache2-modules/mod_proxy_html/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/apache2-modules/mod_proxy_html/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -38,9 +38,9 @@
 TPNO_MOD_PROXY_HTML=	9032
 TPNO_MOD_XML2ENC=	9034
 
-include ../../../make-rules/prep.mk
-include ../../../make-rules/justmake.mk
-include ../../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 APACHE_USR_PREFIX=/usr/apache2/2.2
 
@@ -53,6 +53,5 @@
 
 test: $(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/apache2-modules/mod_proxy_html/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/apache2-modules/mod_security2/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/apache2-modules/mod_security2/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -36,9 +36,9 @@
 
 TPNO=			14454
 
-include ../../../make-rules/prep.mk
-include ../../../make-rules/configure.mk
-include ../../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 APACHE_USR_PREFIX=/usr/apache2/2.2
 
@@ -57,6 +57,11 @@
 
 test: $(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/apr-13
+REQUIRED_PACKAGES += library/apr-util-13
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/pcre
+REQUIRED_PACKAGES += runtime/lua
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/apache2-modules/mod_security2/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-library/apr-13
-library/apr-util-13
-library/libxml2
-library/pcre
-runtime/lua
-system/library
-system/library/math
--- a/components/apache2-modules/mod_wsgi/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/apache2-modules/mod_wsgi/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
@@ -38,9 +38,9 @@
 
 TPNO=			7687
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/configure.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
@@ -80,4 +80,8 @@
 
 install:	$(INSTALL_32_and_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+REQUIRED_PACKAGES += runtime/python-26
+REQUIRED_PACKAGES += runtime/python-27
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker
--- a/components/apache2-modules/mod_wsgi/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-runtime/python-26
-runtime/python-27
-system/library
-system/library/math
-system/linker
--- a/components/apache2/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/apache2/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -37,9 +37,9 @@
 
 CONFIGURE_DEFAULT_DIRS=no
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 ASLR_MODE = $(ASLR_ENABLE)
 
@@ -127,6 +127,20 @@
 
 test: $(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/apr-15
+REQUIRED_PACKAGES += library/apr-util-15
+REQUIRED_PACKAGES += library/apr-util-15/apr-ldap
+REQUIRED_PACKAGES += library/apr-util-15/dbd-mysql
+REQUIRED_PACKAGES += library/apr-util-15/dbd-sqlite
+REQUIRED_PACKAGES += library/openldap
+REQUIRED_PACKAGES += library/pcre
+REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/library/security/gss
+REQUIRED_PACKAGES += system/network
--- a/components/apache2/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-library/apr-15
-library/apr-util-15
-library/apr-util-15/apr-ldap
-library/apr-util-15/dbd-mysql
-library/apr-util-15/dbd-sqlite
-library/openldap
-library/pcre
-library/security/openssl
-library/zlib
-runtime/perl-512
-shell/ksh93
-system/core-os
-system/library
-system/library/math
-system/library/security/gss
-system/network
--- a/components/apache24/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/apache24/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -37,9 +37,9 @@
 	
 CONFIGURE_DEFAULT_DIRS=no
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 ASLR_MODE = $(ASLR_ENABLE)
 
@@ -82,6 +82,23 @@
 
 test: $(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/apr-15
+REQUIRED_PACKAGES += library/apr-util-15
+REQUIRED_PACKAGES += library/apr-util-15/apr-ldap
+REQUIRED_PACKAGES += library/apr-util-15/dbd-mysql
+REQUIRED_PACKAGES += library/apr-util-15/dbd-sqlite
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/openldap
+REQUIRED_PACKAGES += library/pcre
+REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/security/openssl/openssl-fips-140
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += runtime/lua
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/library/security/gss
+REQUIRED_PACKAGES += system/network
--- a/components/apache24/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-library/apr-15
-library/apr-util-15
-library/apr-util-15/apr-ldap
-library/apr-util-15/dbd-mysql
-library/apr-util-15/dbd-sqlite
-library/libxml2
-library/openldap
-library/pcre
-library/security/openssl
-library/security/openssl/openssl-fips-140
-library/zlib
-runtime/lua
-runtime/perl-512
-shell/ksh93
-system/core-os
-system/library
-system/library/math
-system/library/security/gss
-system/network
--- a/components/apr-1_5/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/apr-1_5/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -36,9 +36,9 @@
 
 CONFIGURE_DEFAULT_DIRS=no
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # Micro version for easy libraries packaging
 MICRO_VERSION:= $(shell echo $(COMPONENT_VERSION) | awk -F. '{ print $$3 }')
@@ -85,6 +85,7 @@
 
 test: $(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
--- a/components/apr-1_5/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-shell/bash
-shell/ksh93
-system/library
--- a/components/apr-util-1_5/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/apr-util-1_5/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -36,9 +36,9 @@
 
 CONFIGURE_DEFAULT_DIRS=no
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # Micro version for easy libraries packaging
 MICRO_VERSION:= $(shell echo $(COMPONENT_VERSION) | awk -F. '{ print $$3 }')
@@ -86,6 +86,12 @@
 
 test: $(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += database/mysql-55/library
+REQUIRED_PACKAGES += database/sqlite-3
+REQUIRED_PACKAGES += library/apr-15
+REQUIRED_PACKAGES += library/expat
+REQUIRED_PACKAGES += library/openldap
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/apr-util-1_5/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-database/mysql-55/library
-database/sqlite-3
-library/apr-15
-library/expat
-library/openldap
-shell/ksh93
-system/library
-system/library/math
--- a/components/apr-util/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/apr-util/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -36,9 +36,9 @@
 
 CONFIGURE_DEFAULT_DIRS=no
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATCH_LEVEL=0
 
@@ -83,6 +83,12 @@
 
 test: $(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += database/mysql-55/library
+REQUIRED_PACKAGES += database/sqlite-3
+REQUIRED_PACKAGES += library/apr-13
+REQUIRED_PACKAGES += library/expat
+REQUIRED_PACKAGES += library/openldap
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/apr-util/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-database/mysql-55/library
-database/sqlite-3
-library/apr-13
-library/expat
-library/openldap
-shell/ksh93
-system/library
-system/library/math
--- a/components/apr/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/apr/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -36,9 +36,9 @@
 
 CONFIGURE_DEFAULT_DIRS=no
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATCH_LEVEL=0
 
@@ -83,6 +83,7 @@
 
 test: $(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
--- a/components/apr/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-shell/bash
-shell/ksh93
-system/library
--- a/components/areca/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/areca/Makefile	Thu Mar 19 20:44:31 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
@@ -43,9 +43,9 @@
 
 TPNO=			6138
 
-include ../../make-rules/prep.mk
-include ../../make-rules/ant.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/ant.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_BUILD_TARGETS += install -buildfile build.xml
 COMPONENT_BUILD_ENV += ANT_OPTS="-Dfile.encoding=iso-8859-1"
@@ -58,6 +58,7 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/java/swt
+REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += system/core-os
--- a/components/areca/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-library/java/swt
-shell/bash
-system/core-os
--- a/components/autoconf/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/autoconf/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			7252
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/configure.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
 
@@ -55,6 +55,7 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include $(WS_TOP)/make-rules/depend.mk
+REQUIRED_PACKAGES += developer/macro/gnu-m4
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
--- a/components/autoconf/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-developer/macro/gnu-m4
-runtime/perl-512
-shell/ksh93
--- a/components/autogen/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/autogen/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,8 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
+
+COMPILER = gcc3
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		autogen
@@ -34,15 +37,13 @@
 
 TPNO=			6148
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # build target is incorrect without this 
 COMPONENT_PRE_CONFIGURE_ACTION =        ($(CLONEY) $(SOURCE_DIR) $(@D))
 
-# built in SFW with gcc and builds cleanly now only with gcc
-COMPILER = gcc3
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)"
 
 # strip the environment or install target fails
@@ -55,6 +56,14 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/gmp
+REQUIRED_PACKAGES += library/guile
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/gcc-3-runtime
+REQUIRED_PACKAGES += system/library/gcc-45-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker
--- a/components/autogen/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-library/gmp
-library/guile
-library/libxml2
-shell/bash
-system/library
-system/library/gcc-3-runtime
-system/library/gcc-45-runtime
-system/library/gcc/gcc-c-runtime
-system/library/math
-system/linker
--- a/components/automake/automake-1.10/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/automake/automake-1.10/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			6149
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/configure.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
@@ -52,6 +52,6 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include $(WS_TOP)/make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
--- a/components/automake/automake-1.10/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-runtime/perl-512
-shell/ksh93
--- a/components/automake/automake-1.11.2/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/automake/automake-1.11.2/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
@@ -36,9 +36,9 @@
 
 TPNO=			7253
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/configure.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS  +=	--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=	CFLAGS="$(CFLAGS)"
@@ -51,6 +51,6 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include $(WS_TOP)/make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
--- a/components/automake/automake-1.11.2/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-runtime/perl-512
-shell/ksh93
--- a/components/automake/automake-1.9.6/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/automake/automake-1.9.6/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			6198
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/configure.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
@@ -52,6 +52,6 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include $(WS_TOP)/make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
--- a/components/automake/automake-1.9.6/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-runtime/perl-512
-shell/ksh93
--- a/components/bash/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/bash/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			7265
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 BASH_PATCHLEVEL=$(shell grep -h "define PATCHLEVEL" $(COMPONENT_DIR)/patches/bash* | nawk '{print $$NF}' | sort -n | tail -1)
 IPS_COMPONENT_VERSION = $(COMPONENT_VERSION).$(BASH_PATCHLEVEL)
@@ -138,7 +138,7 @@
 
 test: $(TEST_64)
 
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
 
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
--- a/components/bash/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-shell/ksh93
-system/library
--- a/components/bcc/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/bcc/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,9 +20,11 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
+COMPILER=gcc3
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		bcc
@@ -37,11 +39,9 @@
 
 TPNO=			8334
 
-include ../../make-rules/prep.mk
-include ../../make-rules/justmake.mk
-include ../../make-rules/ips.mk
-
-COMPILER=gcc3
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D))
 
@@ -62,6 +62,5 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/bcc/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/beanshell/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/beanshell/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -42,9 +42,9 @@
 
 TPNO=			6200
 
-include ../../make-rules/prep.mk
-include ../../make-rules/ant.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/ant.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_BUILD_ARGS +=	-Ddist-dir=${PROTO_DIR}
 COMPONENT_BUILD_ARGS +=	-Djavadoc-dir=${PROTO_DIR}
@@ -66,6 +66,5 @@
 
 test:	$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += shell/ksh93
--- a/components/beanshell/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-shell/ksh93
--- a/components/berkeleydb/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/berkeleydb/Makefile	Thu Mar 19 20:44:31 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
@@ -38,9 +38,9 @@
 COMPONENT_ARCHIVE_URL=	http://download.oracle.com/berkeley-db/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	database/berkeley
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 
 COMPONENT_PRE_CONFIGURE_ACTION = \
@@ -109,6 +109,8 @@
 # By default "gmake test" runs standard tests, takes ~2 days per $(BITS).
 RUN=run_std
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS) $(TCLSH)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/linker
--- a/components/berkeleydb/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-system/core-os
-system/library
-system/library/c++-runtime
-system/linker
--- a/components/bind/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/bind/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -39,9 +39,9 @@
 
 TPNO=			20537
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # Build.
 #
@@ -79,8 +79,6 @@
 .PHONY: build
 build:		$(BUILD_32)
 
-include ../../make-rules/shared-targets.mk
-
 # Install.
 #
 # Currently manual pages are distributed from pkg:/system/[email protected]
@@ -166,6 +164,10 @@
 test-clean:
 	$(RM) $(TEST_32) $(FULL_TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += network/dns/bind
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
--- a/components/bind/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-library/libxml2
-library/security/openssl
-network/dns/bind
-shell/ksh93
-system/core-os
-system/library
--- a/components/binutils/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/binutils/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			7483
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PARCH =		$(MACH:i386=i386-pc)
 GNU_ARCH =	$(PARCH:sparc=sparc-sun)-solaris$(SOLARIS_VERSION)
@@ -70,8 +70,9 @@
 
 install:	$(INSTALL_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
 test: $(TEST_32)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/binutils/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-library/zlib
-system/library
-system/library/math
--- a/components/bison/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/bison/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			6254
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_LIBDIR.32 =   $(GNULIB)
 CONFIGURE_LIBDIR.64 =   $(GNULIB)/$(MACH64)
@@ -56,6 +56,6 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += developer/macro/gnu-m4
+REQUIRED_PACKAGES += system/library
--- a/components/bison/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-developer/macro/gnu-m4
-system/library
--- a/components/bzip2/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/bzip2/Makefile	Thu Mar 19 20:44:31 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
@@ -37,10 +37,10 @@
 
 TPNO=			5547
 
-include ../../make-rules/prep.mk
-include ../../make-rules/justmake.mk
-include ../../make-rules/ips.mk
-include ../../make-rules/lint-libraries.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/lint-libraries.mk
 
 LINT_FLAGS +=	-I.
 
@@ -74,6 +74,6 @@
 # build does this always
 test:		$(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
--- a/components/bzip2/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-shell/ksh93
-system/library
--- a/components/cdrtools/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/cdrtools/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
@@ -42,9 +42,9 @@
 PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin
 endif
 
-include ../../make-rules/prep.mk
-include ../../make-rules/justmake.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_INSTALL_ARGS +=  GMAKE_NOWARN=true
 COMPONENT_BUILD_ARGS += GMAKE_NOWARN=true
@@ -60,6 +60,7 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/linker
--- a/components/cdrtools/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-shell/ksh93
-system/library
-system/linker
--- a/components/clisp/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/clisp/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,9 +20,11 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
+COMPILER=	gcc3
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		clisp
@@ -37,9 +39,9 @@
 
 TPNO=			8347
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # To include correct locale header file in .../modules/regexp/gllib/regex.c
 CPPFLAGS += -I/usr/share/gettext/intl
@@ -48,7 +50,6 @@
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
 
-COMPILER=	gcc3
 PATCH_LEVEL=	0
 
 # SHELLOPTS appears to cause clisp's configure script to fail while
@@ -94,6 +95,10 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/libsigsegv
+REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += library/readline
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/clisp/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-library/libsigsegv
-library/ncurses
-library/readline
-shell/ksh93
-system/library
-system/library/math
--- a/components/cmake/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/cmake/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 
 #
-# 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
@@ -36,9 +36,9 @@
 
 TPNO=			6581
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/configure.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # Need to remove this option from LD_OPTIONS (only affects sparc build);
 # it causes a SegFault failure in kwsys/testSystemInformation
@@ -83,6 +83,12 @@
 # expected failure: CTestTestUpload
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include $(WS_TOP)/make-rules/depend.mk
+REQUIRED_PACKAGES += compress/bzip2
+REQUIRED_PACKAGES += library/expat
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker
+REQUIRED_PACKAGES += web/curl
--- a/components/cmake/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-compress/bzip2
-library/expat
-library/zlib
-system/library
-system/library/c++-runtime
-system/library/math
-system/linker
-web/curl
--- a/components/common/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/common/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, 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
@@ -30,13 +30,13 @@
 COMPONENT_VERSION=	0.5.11
 COMPONENT_BUGDB=	gate-stuff/userland
 
-include ../../make-rules/prep.mk
+include $(WS_MAKE_RULES)/prep.mk
 
 # Do not clean the sources (set in prep.mk)
 #
 CLEAN_PATHS=
 
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CLEAN_PATHS+= $(BUILD_DIR)
 
@@ -52,6 +52,5 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/core-os
--- a/components/common/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-#added to speed up dependency resolution
-system/core-os
--- a/components/conflict/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/conflict/Makefile	Thu Mar 19 20:44:31 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
@@ -38,9 +38,9 @@
 
 TPNO=			8338
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # Required to configure correctly.
 COMPONENT_PRE_CONFIGURE_ACTION = \
@@ -63,6 +63,5 @@
 test:		build
 	@cd $(BUILD_DIR_32); ./run_test.sh
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/conflict/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/convmv/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/convmv/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			8348
 
-include ../../make-rules/prep.mk
-include ../../make-rules/justmake.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATCH_LEVEL=0
 
@@ -52,6 +52,5 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/perl-512
--- a/components/convmv/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-runtime/perl-512
--- a/components/coreutils/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/coreutils/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			8349
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_PREFIX	 =	/usr/gnu
 CONFIGURE_OPTIONS	+=	--bindir=/usr/gnu/bin
@@ -69,6 +69,6 @@
 # misc/timeout-parameters - see CR #17425658
 test:		install $(TEST_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/gmp
+REQUIRED_PACKAGES += system/library
--- a/components/coreutils/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-library/gmp
-system/library
--- a/components/cups/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/cups/Makefile	Thu Mar 19 20:44:31 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
 
@@ -36,9 +36,9 @@
 
 TPNO=			17705
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CXX +=	$(studio_NORUNPATH)
 
@@ -89,12 +89,25 @@
 # common targets
 build:		$(BUILD_32)
 
-include ../../make-rules/shared-targets.mk
-
 install:	$(INSTALL_32)
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += image/library/libjpeg
+REQUIRED_PACKAGES += image/library/libpng
+REQUIRED_PACKAGES += image/library/libtiff
+REQUIRED_PACKAGES += library/print/cups-libs
+REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += service/network/slp
+REQUIRED_PACKAGES += service/security/kerberos-5
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/libdbus
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/library/security/gss
+REQUIRED_PACKAGES += system/linker
--- a/components/cups/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-image/library/libjpeg
-image/library/libpng
-image/library/libtiff
-library/print/cups-libs
-library/security/openssl
-library/zlib
-runtime/perl-512
-service/network/slp
-service/security/kerberos-5
-shell/ksh93
-system/core-os
-system/library
-system/library/c++-runtime
-system/library/libdbus
-system/library/math
-system/library/security/gss
-system/linker
--- a/components/curl/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/curl/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,10 +34,10 @@
 
 TPNO=			8339
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
-include ../../make-rules/lint-libraries.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/lint-libraries.mk
 
 PATCH_LEVEL = 0
 
@@ -83,7 +83,11 @@
 
 test: $(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
 
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += library/libidn
+REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/security/gss
--- a/components/curl/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-library/libidn
-library/security/openssl
-library/zlib
-shell/ksh93
-system/library
-system/library/security/gss
--- a/components/cvs/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/cvs/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 # we hit parfait bug 12333159 in a case statement, so disable parfait
@@ -39,9 +39,9 @@
 
 TPNO=			6323
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CFLAGS += -D__ATTRIBUTE_DISABLED
 CONFIGURE_OPTIONS  +=	--with-external-zlib
@@ -57,6 +57,6 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += system/library
--- a/components/cvs/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-library/zlib
-system/library
--- a/components/diffstat/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/diffstat/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -34,9 +34,9 @@
 
 TPNO=			5494
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CC += $(CC_BITS)
 
@@ -50,6 +50,5 @@
 
 test:		$(TEST_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/diffstat/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/diffutils/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/diffutils/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			6324
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_BINDIR.32 =		$(CONFIGURE_PREFIX)/gnu/bin
 
@@ -53,6 +53,5 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/diffutils/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/dnsmasq/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/dnsmasq/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -40,9 +40,9 @@
 
 TPNO=			16307
 
-include ../../make-rules/prep.mk
-include ../../make-rules/justmake.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # Enable ASLR for this component
 ASLR_MODE = $(ASLR_ENABLE)
@@ -64,6 +64,7 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/libidn
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
--- a/components/dnsmasq/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-library/libidn
-system/core-os
-system/library
--- a/components/doxygen/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/doxygen/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -40,9 +40,9 @@
 
 TPNO=			6511
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # Necessary to find CC during build
 PATH=$(SPRO_VROOT)/bin:/usr/bin
@@ -64,6 +64,7 @@
 
 test:	$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/math
--- a/components/doxygen/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-system/library
-system/library/c++-runtime
-system/library/math
--- a/components/ejabberd/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/ejabberd/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -39,11 +39,11 @@
 COMPONENT_BUGDB=	service/ejabberd
 TPNO=                   21408
 
-include ../../make-rules/prep.mk
+include $(WS_MAKE_RULES)/prep.mk
 
 
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_SCRIPT = $(SOURCE_DIR)/src/configure
 BUILD_DIR_64 =	$(BUILD_DIR)/$(MACH64)/src
@@ -68,6 +68,11 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/expat
+REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/network
--- a/components/ejabberd/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-library/expat
-library/security/openssl
-library/zlib
-shell/ksh93
-system/core-os
-system/library
-system/network
--- a/components/elinks/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/elinks/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			8340
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS  +=		--enable-bittorrent
 CONFIGURE_OPTIONS  +=		--enable-html-highlight
@@ -50,6 +50,11 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += compress/bzip2
+REQUIRED_PACKAGES += library/expat
+REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/linker
+REQUIRED_PACKAGES += x11/library/libx11
--- a/components/elinks/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-compress/bzip2
-library/expat
-library/security/openssl
-library/zlib
-system/library
-system/linker
-x11/library/libx11
--- a/components/emacs/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/emacs/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			15684
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # we build three different variants of emacs for our users. As Solaris
 # always has a 64-bit kernel, and 64-bit emacs can handle larger files,
@@ -176,6 +176,34 @@
 test:
 	@echo "no tests available"
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += editor/gnu-emacs
+REQUIRED_PACKAGES += file/gnu-findutils
+REQUIRED_PACKAGES += gnome/config/gconf
+REQUIRED_PACKAGES += image/imagemagick
+REQUIRED_PACKAGES += image/library/libjpeg
+REQUIRED_PACKAGES += image/library/libpng
+REQUIRED_PACKAGES += image/library/librsvg
+REQUIRED_PACKAGES += image/library/libtiff
+REQUIRED_PACKAGES += library/desktop/gtk2
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/gnutls
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/fontconfig
+REQUIRED_PACKAGES += system/library/freetype-2
+REQUIRED_PACKAGES += system/library/libdbus
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += x11/library/libice
+REQUIRED_PACKAGES += x11/library/libsm
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxcursor
+REQUIRED_PACKAGES += x11/library/libxft
+REQUIRED_PACKAGES += x11/library/libxmu
+REQUIRED_PACKAGES += x11/library/libxpm
+REQUIRED_PACKAGES += x11/library/libxrender
+REQUIRED_PACKAGES += x11/library/toolkit/libxaw7
+REQUIRED_PACKAGES += x11/library/toolkit/libxt
--- a/components/emacs/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-editor/gnu-emacs
-file/gnu-findutils
-gnome/config/gconf
-image/imagemagick
-image/library/libjpeg
-image/library/libpng
-image/library/librsvg
-image/library/libtiff
-library/desktop/gtk2
-library/glib2
-library/gnutls
-library/libxml2
-library/ncurses
-runtime/perl-512
-shell/ksh93
-system/library
-system/library/fontconfig
-system/library/freetype-2
-system/library/libdbus
-system/library/math
-x11/library/libice
-x11/library/libsm
-x11/library/libx11
-x11/library/libxcursor
-x11/library/libxft
-x11/library/libxmu
-x11/library/libxpm
-x11/library/libxrender
-x11/library/toolkit/libxaw7
-x11/library/toolkit/libxt
--- a/components/enscript/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/enscript/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -49,9 +49,9 @@
 
 TPNO=			4380
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATCH_LEVEL = 1
 
@@ -82,6 +82,8 @@
 
 test:           $(TEST_64)
 
-BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/enscript/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-runtime/perl-512
-runtime/perl-516
-shell/ksh93
-system/library
-system/library/math
--- a/components/erlang/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/erlang/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,9 +20,11 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
+COMPILER =	gcc
+
 include ../../make-rules/shared-macros.mk
 
 PATH=$(SPRO_VROOT)/bin:$(JAVA_HOME)/bin:/usr/bin
@@ -60,9 +62,9 @@
 
 TPNO=			18548
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # IPS_COMPONENT_VERSION is by default set to $(COMPONENT_VERSION) but it is not
 # enough for us. We need to include the $(COMPONENT_SUBVERSION) somehow.
@@ -71,9 +73,6 @@
 # R(major)(minor)(micro) - (major).(minor as number).(micro)
 IPS_COMPONENT_VERSION=  $(COMPONENT_VERSION_MAJOR).2.3
 
-# Built in SFW with gcc and builds cleanly now only with gcc
-COMPILER =	gcc
-
 CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS += CPPFLAGS="$(CPPFLAGS) -I/usr/include/gd2"
 CONFIGURE_OPTIONS += --enable-smp-support
@@ -134,6 +133,11 @@
 
 test:	$(TEST_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker
--- a/components/erlang/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-library/ncurses
-library/security/openssl
-shell/ksh93
-system/core-os
-system/library
-system/library/math
-system/linker
--- a/components/fastcgi/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/fastcgi/Makefile	Thu Mar 19 20:44:31 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
@@ -38,10 +38,10 @@
 
 TPNO=			8415
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
-include ../../make-rules/lint-libraries.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/lint-libraries.mk
 
 CONFIGURE_OPTIONS += --disable-static
 CONFIGURE_OPTIONS += --with-pic
@@ -60,7 +60,7 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
+
 
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
--- a/components/fastcgi/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-system/library
-system/library/c++-runtime
--- a/components/fetchmail/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/fetchmail/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			8416
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  +=		PYTHON="$(PYTHON.2.7.32)"
@@ -61,6 +61,10 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/python/tkinter-27
+REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += runtime/python-27
+REQUIRED_PACKAGES += service/security/kerberos-5
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
--- a/components/fetchmail/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-library/python/tkinter-27
-library/security/openssl
-runtime/python-27
-service/security/kerberos-5
-shell/ksh93
-system/library
--- a/components/findutils/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/findutils/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -37,9 +37,9 @@
 
 TPNO=			7495
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_PREFIX =	/usr/gnu
 
@@ -57,6 +57,5 @@
 # findutils tests use dejagnu which isn't currently included in Solaris.
 test:           $(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/findutils/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/flex/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/flex/Makefile	Thu Mar 19 20:44:31 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
@@ -40,9 +40,9 @@
 SONAME=libfl.so.1
 LDFLAGS = $(CC_BITS)
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
@@ -58,8 +58,6 @@
 COMPONENT_BUILD_TARGETS += $(SONAME)
 COMPONENT_INSTALL_TARGETS += $(SONAME)
 
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32_and_64)
 
@@ -67,7 +65,8 @@
 
 test:		$(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
 
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += developer/macro/gnu-m4
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/flex/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-developer/macro/gnu-m4
-system/library
-system/library/math
--- a/components/foomatic/db-engine/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/foomatic/db-engine/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			6399
 
-include ../../../make-rules/prep.mk
-include ../../../make-rules/configure.mk
-include ../../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS +=	CFLAGS="$(CFLAGS)" 
 CONFIGURE_OPTIONS +=	PERL=$(PERL)
@@ -69,6 +69,8 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += system/library
--- a/components/foomatic/db-engine/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-library/libxml2
-runtime/perl-512
-shell/bash
-system/library
--- a/components/foomatic/db/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/foomatic/db/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,12 +34,11 @@
 
 TPNO=			6398
 
-include ../../../make-rules/prep.mk
-include ../../../make-rules/configure.mk
-include ../../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # This package delivers only data files and has no dependencies.
-EXTDEPFILES = $(NULLDEPFILE)
 
 COMPONENT_PRE_CONFIGURE_ACTION = $(CLONEY) $(SOURCE_DIR) $(@D)
 
@@ -55,6 +54,4 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../../make-rules/depend.mk
--- a/components/foomatic/filters/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/foomatic/filters/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			8420
 
-include ../../../make-rules/prep.mk
-include ../../../make-rules/configure.mk
-include ../../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS +=	--prefix=$(USRLIBDIR)/lp
 CONFIGURE_OPTIONS +=	--sysconfdir=$(ETCDIR)/gnu
@@ -57,6 +57,8 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../../make-rules/depend.mk
+REQUIRED_PACKAGES += print/filter/a2ps
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/libdbus
+REQUIRED_PACKAGES += system/library/math
--- a/components/foomatic/filters/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-print/filter/a2ps
-system/library
-system/library/libdbus
-system/library/math
--- a/components/foomatic/fppd/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/foomatic/fppd/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,11 +34,10 @@
 
 TPNO=			6400
 
-include ../../../make-rules/prep.mk
-include ../../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # This package delivers only data files and has no dependencies.
-EXTDEPFILES = $(NULLDEPFILE)
 
 CACHE_FILE=$(PROTOUSRLIBDIR)/lp/caches/SUNWfoomatic.cache
 
@@ -65,4 +64,3 @@
 clean::
 	$(RM) -r $(BUILD_DIR)
 
-include ../../../make-rules/depend.mk
--- a/components/fping/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/fping/Makefile	Thu Mar 19 20:44:31 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
@@ -38,9 +38,9 @@
 
 TPNO=			5500
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_PRE_CONFIGURE_ACTION =  \
         ($(CLONEY) $(SOURCE_DIR) $(@D))
@@ -55,6 +55,5 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/fping/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/gawk/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gawk/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			6808
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS	+=	--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS	+=	--libexecdir=$(CONFIGURE_LIBDIR.$(BITS))
@@ -49,6 +49,8 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/libsigsegv
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/gawk/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-library/libsigsegv
-shell/ksh93
-system/library
-system/library/math
--- a/components/gcc3/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gcc3/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,8 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
+
+COMPILER =	gcc
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		gcc
@@ -35,18 +38,15 @@
 
 TPNO=			17028
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PARCH =		$(MACH:i386=i386-pc)
 GNU_ARCH =	$(PARCH:sparc=sparc-sun)-solaris$(SOLARIS_VERSION)
 
 PKG_MACROS +=	GNU_ARCH="$(GNU_ARCH)"
 
-# we build gcc with gcc
-COMPILER =	gcc
-
 # CC_BITS may get in the way
 CC_BITS=
 
@@ -90,8 +90,13 @@
 
 install:	$(PROTO_DIR)/.sedded
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
 test: $(TEST_32)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += developer/assembler
+REQUIRED_PACKAGES += developer/gnu-binutils
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/gcc-3-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker
--- a/components/gcc3/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-developer/assembler
-developer/gnu-binutils
-shell/ksh93
-system/library
-system/library/gcc-3-runtime
-system/library/math
-system/linker
--- a/components/gcc45/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gcc45/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -39,9 +39,9 @@
 
 TPNO=			4456
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATH=/usr/bin:/usr/gnu/bin:/usr/perl5/bin
 
@@ -102,6 +102,15 @@
 	    ulimit -Ss 16384 ; \
 	    $(GMAKE) check )
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += developer/assembler
+REQUIRED_PACKAGES += developer/gnu-binutils
+REQUIRED_PACKAGES += library/gmp
+REQUIRED_PACKAGES += library/mpc
+REQUIRED_PACKAGES += library/mpfr
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/gcc-45-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker
--- a/components/gcc45/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-developer/assembler
-developer/gnu-binutils
-library/gmp
-library/mpc
-library/mpfr
-shell/ksh93
-system/library
-system/library/gcc-45-runtime
-system/library/gcc/gcc-c-runtime
-system/library/math
-system/linker
--- a/components/gcc47/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gcc47/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -34,9 +34,9 @@
 
 TPNO=			14467
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # The GNU compiler wants the GNU utilities.
 PATH=/usr/gnu/bin:/usr/bin:/usr/perl5/bin
@@ -126,7 +126,12 @@
 
 test:	$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
 
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += library/gmp
+REQUIRED_PACKAGES += library/mpc
+REQUIRED_PACKAGES += library/mpfr
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker
--- a/components/gcc47/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-library/gmp
-library/mpc
-library/mpfr
-system/library
-system/library/gcc/gcc-c-runtime
-system/library/math
-system/linker
--- a/components/gcc48/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gcc48/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,10 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 export PARFAIT_BUILD=no
 
+COMPILER=gcc
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		gcc
@@ -36,11 +38,9 @@
 
 TPNO=			15448
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
-
-COMPILER=gcc
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # The GNU compiler wants the GNU utilities.
 PATH=/usr/gnu/bin:/usr/bin:/usr/perl5/bin
@@ -132,7 +132,14 @@
 
 test:	$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+
 
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += library/gmp
+REQUIRED_PACKAGES += library/mpc
+REQUIRED_PACKAGES += library/mpfr
+REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker
--- a/components/gcc48/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-library/gmp
-library/mpc
-library/mpfr
-system/library
-system/library/gcc/gcc-c-runtime
-system/library/math
-system/linker
-shell/bash
-shell/ksh93
--- a/components/gd2/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gd2/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -37,10 +37,10 @@
 
 TPNO=			8786
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
-include ../../make-rules/lint-libraries.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/lint-libraries.mk
 
 PKG_CONFIG_PATH_32 = /usr/lib/pkgconfig
 PKG_CONFIG_PATH_64 = /usr/lib/$(MACH64)/pkgconfig
@@ -71,7 +71,15 @@
 	@echo "Test programs must be run manually and their output"
 	@echo "should be visually inspected."
 
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
 
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += image/library/libjpeg
+REQUIRED_PACKAGES += image/library/libpng
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/fontconfig
+REQUIRED_PACKAGES += system/library/freetype-2
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxpm
--- a/components/gd2/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-image/library/libjpeg
-image/library/libpng
-library/zlib
-shell/ksh93
-system/library
-system/library/fontconfig
-system/library/freetype-2
-system/library/math
-x11/library/libx11
-x11/library/libxpm
--- a/components/gdb/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gdb/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,9 +20,11 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
+COMPILER=gcc
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		gdb
@@ -37,11 +39,9 @@
 
 TPNO=			17258
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
-
-COMPILER=gcc
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # GDB wants the GNU utilities
 PATH=/usr/gnu/bin:$(GCC_ROOT)/bin:/usr/bin:/usr/perl5/bin
@@ -131,6 +131,14 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += compress/xz
+REQUIRED_PACKAGES += library/expat
+REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += library/readline
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += runtime/python-26
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker
--- a/components/gdb/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-compress/xz
-library/expat
-library/ncurses
-library/readline
-library/zlib
-runtime/python-26
-shell/ksh93
-system/library
-system/library/math
-system/linker
--- a/components/gdbm/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gdbm/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			8440
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS +=	--disable-static
 CONFIGURE_OPTIONS +=	--enable-shared
@@ -55,6 +55,5 @@
 COMPONENT_TEST_TARGETS =	progs
 test:	$(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/gdbm/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/getopt/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/getopt/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -37,9 +37,9 @@
 
 TPNO=			11356
 
-include ../../make-rules/prep.mk
-include ../../make-rules/justmake.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # getopt doesn't use configure, override the hard-wired values in the Makefile.
 COMPONENT_BUILD_ARGS+=	CC="$(SPRO_VROOT)/bin/cc $(CC_BITS)"
@@ -62,6 +62,5 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/getopt/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/gettext/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gettext/Makefile	Thu Mar 19 20:44:31 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
@@ -38,9 +38,9 @@
 
 TPNO=			8435
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS  +=		--disable-java
 CONFIGURE_OPTIONS  +=		--disable-libasprintf
@@ -57,6 +57,8 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/expat
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/gettext/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-library/expat
-shell/ksh93
-system/library
-system/library/math
--- a/components/ggrep/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/ggrep/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -36,9 +36,9 @@
 
 TPNO=			8710
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # We need to be able to return from void functions
 CFLAGS	+=			$(studio_FEATURES_EXTENSIONS)
@@ -64,6 +64,6 @@
 # test-mbrtowc3.sh, test-mbrtowc4.sh, test-mbsrtowcs4.sh
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/pcre
+REQUIRED_PACKAGES += system/library
--- a/components/ggrep/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-library/pcre
-system/library
--- a/components/ghostscript/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/ghostscript/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 # parfait seems to spin when looking at the .bc files (13704877), so
@@ -41,9 +41,9 @@
 
 TPNO=			3796
 
-include ../../make-rules/prep.mk
-include ../../make-rules/ips.mk
-include ../../make-rules/configure.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/configure.mk
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
 
@@ -112,4 +112,18 @@
 test:
 	@echo "no tests available"
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += image/library/libjpeg
+REQUIRED_PACKAGES += image/library/libpng
+REQUIRED_PACKAGES += library/desktop/gtk2
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/print/cups-libs
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/fontconfig
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxcursor
+REQUIRED_PACKAGES += x11/library/toolkit/libxt
--- a/components/ghostscript/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-image/library/libjpeg
-image/library/libpng
-library/desktop/gtk2
-library/glib2
-library/print/cups-libs
-library/zlib
-runtime/perl-512
-shell/ksh93
-system/library
-system/library/fontconfig
-system/library/math
-system/linker
-x11/library/libx11
-x11/library/libxcursor
-x11/library/toolkit/libxt
--- a/components/git/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/git/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -42,9 +42,9 @@
     sha256:c653a3678bb5668c280a0d5ba584fdfb0e4272acbbd00901dc2363ea3f58eede
 COMPONENT_ARCHIVE_URL_1 = http://git-core.googlecode.com/files/$(COMPONENT_ARCHIVE_1)
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PYTHON_VERSION =	2.7
 
@@ -102,6 +102,12 @@
 	done
 	$(TOUCH) [email protected]
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/expat
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += runtime/python-27
+REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += web/curl
--- a/components/git/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-library/expat
-library/zlib
-runtime/perl-512
-runtime/python-27
-shell/bash
-shell/ksh93
-system/library
-web/curl
--- a/components/gnu-gs-fonts-other/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gnu-gs-fonts-other/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -40,11 +40,10 @@
 
 PROTOGSSHAREDIR=$(PROTOUSRSHAREDIR)/ghostscript
 
-include ../../make-rules/prep.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # This package delivers only data files and has no dependencies.
-EXTDEPFILES = $(NULLDEPFILE)
 
 # untar the tar ball and apply the patches
 build:		$(SOURCE_DIR)/.prep
@@ -59,4 +58,3 @@
 clean::
 	$(RM) -r $(BUILD_DIR)
 
-include ../../make-rules/depend.mk
--- a/components/gnu-gs-fonts-std/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gnu-gs-fonts-std/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -19,7 +19,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -40,11 +40,10 @@
 
 PROTOGSSHAREDIR=$(PROTOUSRSHAREDIR)/ghostscript
 
-include ../../make-rules/prep.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # This package delivers only data files and has no dependencies.
-EXTDEPFILES = $(NULLDEPFILE)
 
 # untar the tar ball and apply the patches
 build:  $(SOURCE_DIR)/.prep
@@ -59,4 +58,3 @@
 clean::
 	$(RM) -r $(BUILD_DIR)
 
-include ../../make-rules/depend.mk
--- a/components/gnump/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gnump/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -19,7 +19,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
@@ -39,10 +39,10 @@
 
 TPNO=			16955
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
-include ../../make-rules/lint-libraries.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/lint-libraries.mk
 
 PATCH_LEVEL = 0
 
@@ -157,7 +157,7 @@
 
 test: $(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
 
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
--- a/components/gnump/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-system/library
-system/library/c++-runtime
--- a/components/gnupg/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gnupg/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			17706
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # Enable C99 mode + -Xc for its additional warnings.
 studio_C99MODE = -Xc $(studio_C99_ENABLE)
@@ -120,7 +120,22 @@
 
 test: $(TEST_32)
 
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
 
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += compress/bzip2
+REQUIRED_PACKAGES += library/desktop/gtk2
+REQUIRED_PACKAGES += library/desktop/pango
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/pth
+REQUIRED_PACKAGES += library/readline
+REQUIRED_PACKAGES += library/security/libassuan
+REQUIRED_PACKAGES += library/security/libgpg-error
+REQUIRED_PACKAGES += library/security/libksba
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += security/pinentry
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/security/libgcrypt
+REQUIRED_PACKAGES += system/library/usb/libusb
+REQUIRED_PACKAGES += system/linker
+REQUIRED_PACKAGES += web/curl
--- a/components/gnupg/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-compress/bzip2
-library/pth
-library/readline
-library/security/libassuan
-library/security/libgpg-error
-library/security/libksba
-library/zlib
-security/pinentry
-shell/ksh93
-system/library
-system/library/security/libgcrypt
-system/library/usb/libusb
-web/curl
--- a/components/gnuplot/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gnuplot/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -41,9 +41,9 @@
 
 COMPONENT_BUILD_TARGETS = all info
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS  += --libexecdir=$(CONFIGURE_LIBDIR.$(BITS))
 CONFIGURE_OPTIONS  += --sysconfdir=/etc/gnu
@@ -52,8 +52,6 @@
 CONFIGURE_OPTIONS  += CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS  += CXXFLAGS="$(CXXFLAGS)"
 
-include ../../make-rules/shared-targets.mk
-
 # common targets
 build:		$(BUILD_32)
 
@@ -61,6 +59,39 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += image/library/libjpeg
+REQUIRED_PACKAGES += image/library/libpng
+REQUIRED_PACKAGES += library/desktop/atk
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/gtk2
+REQUIRED_PACKAGES += library/desktop/pango
+REQUIRED_PACKAGES += library/desktop/xdg/libcanberra
+REQUIRED_PACKAGES += library/gd
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/graphics/wxwidgets
+REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += library/readline
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += runtime/lua
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/font/truetype/liberation
+REQUIRED_PACKAGES += system/font/xorg/xorg-core
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/fontconfig
+REQUIRED_PACKAGES += system/library/freetype-2
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxcomposite
+REQUIRED_PACKAGES += x11/library/libxcursor
+REQUIRED_PACKAGES += x11/library/libxdamage
+REQUIRED_PACKAGES += x11/library/libxevie
+REQUIRED_PACKAGES += x11/library/libxext
+REQUIRED_PACKAGES += x11/library/libxfixes
+REQUIRED_PACKAGES += x11/library/libxi
+REQUIRED_PACKAGES += x11/library/libxinerama
+REQUIRED_PACKAGES += x11/library/libxpm
+REQUIRED_PACKAGES += x11/library/libxrandr
+REQUIRED_PACKAGES += x11/library/libxrender
+REQUIRED_PACKAGES += x11/library/libxscrnsaver
--- a/components/gnuplot/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-image/library/libjpeg
-image/library/libpng
-library/desktop/atk
-library/desktop/cairo
-library/desktop/gdk-pixbuf
-library/desktop/gtk2
-library/desktop/pango
-library/desktop/xdg/libcanberra
-library/gd
-library/glib2
-library/graphics/wxwidgets
-library/ncurses
-library/readline
-library/zlib
-runtime/lua
-shell/ksh93
-system/font/truetype/liberation
-system/font/xorg/xorg-core
-system/library
-system/library/c++-runtime
-system/library/fontconfig
-system/library/freetype-2
-system/library/math
-x11/library/libx11
-x11/library/libxcomposite
-x11/library/libxcursor
-x11/library/libxdamage
-x11/library/libxevie
-x11/library/libxext
-x11/library/libxfixes
-x11/library/libxi
-x11/library/libxinerama
-x11/library/libxpm
-x11/library/libxrandr
-x11/library/libxrender
-x11/library/libxscrnsaver
--- a/components/gnupth/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gnupth/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			8899
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATCH_LEVEL = 0
 
@@ -75,7 +75,7 @@
 
 test: $(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
 
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
--- a/components/gnupth/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-shell/ksh93
-system/library
--- a/components/gocr/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gocr/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			8587
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PKG_PROTO_DIRS +=	$(COMPONENT_SRC)
 
@@ -56,6 +56,7 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/gocr/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-shell/ksh93
-system/library
-system/library/math
--- a/components/gperf/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gperf/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			8589
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_OPTIONS  +=	--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=	--docdir=/usr/share/doc/gperf
@@ -49,6 +49,7 @@
 
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/math
--- a/components/gperf/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-system/library
-system/library/c++-runtime
-system/library/math
--- a/components/gpgme/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gpgme/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -36,9 +36,9 @@
 
 TPNO=			8637
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATCH_LEVEL = 0
 
@@ -81,7 +81,10 @@
 
 test: $(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
 
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += library/pth
+REQUIRED_PACKAGES += library/security/libgpg-error
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/linker
--- a/components/gpgme/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-library/pth
-library/security/libgpg-error
-shell/ksh93
-system/library
-system/linker
--- a/components/grails/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/grails/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			8709
 
-include ../../make-rules/prep.mk
-include ../../make-rules/ant.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/ant.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # Make sure we use the specially modified versions of grails and grails-debug
 COMPONENT_POST_UNPACK_ACTION = \
@@ -75,6 +75,8 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += runtime/python-26
+REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += shell/ksh93
--- a/components/grails/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-runtime/perl-512
-runtime/python-27
-shell/bash
-shell/ksh93
--- a/components/graphviz/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/graphviz/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			17707
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATH =		/usr/bin:/usr/gnu/bin:/usr/php/5.2/bin
 
@@ -82,4 +82,31 @@
 # http://graphviz.org/bugs/b2063.html
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
+REQUIRED_PACKAGES += image/graphviz
+REQUIRED_PACKAGES += image/library/libpng
+REQUIRED_PACKAGES += image/library/librsvg
+REQUIRED_PACKAGES += library/desktop/atk
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/gtk2
+REQUIRED_PACKAGES += library/desktop/pango
+REQUIRED_PACKAGES += library/expat
+REQUIRED_PACKAGES += library/gd
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/libtool/libltdl
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += print/filter/ghostscript
+REQUIRED_PACKAGES += runtime/lua
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += runtime/ruby-18
+REQUIRED_PACKAGES += runtime/tk-8
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxcursor
+REQUIRED_PACKAGES += x11/library/libxmu
+REQUIRED_PACKAGES += x11/library/libxrender
+REQUIRED_PACKAGES += x11/library/toolkit/libxaw7
+REQUIRED_PACKAGES += x11/library/toolkit/libxt
--- a/components/graphviz/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-image/graphviz
-image/library/libpng
-image/library/librsvg
-library/desktop/atk
-library/desktop/cairo
-library/desktop/gtk2
-library/desktop/pango
-library/expat
-library/gd
-library/glib2
-library/libtool/libltdl
-library/zlib
-print/filter/ghostscript
-runtime/lua
-runtime/perl-512
-runtime/ruby-18
-runtime/tk-8
-shell/ksh93
-system/library
-system/library/c++-runtime
-system/library/math
-system/linker
-x11/library/libx11
-x11/library/libxcursor
-x11/library/libxmu
-x11/library/libxrender
-x11/library/toolkit/libxaw7
-x11/library/toolkit/libxt
--- a/components/groff/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/groff/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -37,9 +37,9 @@
 
 TPNO=			8829
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # The grog.sh script needs GNU awk not the Solaris one.
 COMPONENT_PRE_CONFIGURE_ACTION = \
@@ -99,6 +99,15 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += text/gawk
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxmu
+REQUIRED_PACKAGES += x11/library/toolkit/libxaw7
+REQUIRED_PACKAGES += x11/library/toolkit/libxt
--- a/components/groff/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-runtime/perl-512
-runtime/perl-516
-shell/ksh93
-system/core-os
-system/library
-system/library/c++-runtime
-system/library/math
-text/gawk
-x11/library/libx11
-x11/library/libxmu
-x11/library/toolkit/libxaw7
-x11/library/toolkit/libxt
--- a/components/gtar/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gtar/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			16886
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # workaround for CR 6998994
 sparc_COPTFLAG = -xO2
@@ -61,6 +61,9 @@
 
 test:		$(TEST_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += compress/bzip2
+REQUIRED_PACKAGES += compress/gzip
+REQUIRED_PACKAGES += network/ssh
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
--- a/components/gtar/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-compress/bzip2
-compress/gzip
-network/ssh
-system/core-os
-system/library
--- a/components/guile/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/guile/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,8 +18,11 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 #
+
+COMPILER = gcc3
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		guile
@@ -34,12 +37,10 @@
 
 TPNO=			8939
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
-# Built in SFW with gcc and builds cleanly now only with gcc
-COMPILER = gcc3
 CONFIGURE_OPTIONS +=	CPPFLAGS="-I/usr/include/gmp -D__USE_LEGACY_PROTOTYPES__"
 CONFIGURE_OPTIONS +=	--disable-static 
 CONFIGURE_OPTIONS +=	--disable-error-on-warning
@@ -53,6 +54,14 @@
 
 test:		$(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/gmp
+REQUIRED_PACKAGES += library/libtool/libltdl
+REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += library/readline
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/gcc-3-runtime
+REQUIRED_PACKAGES += system/library/gcc-45-runtime
+REQUIRED_PACKAGES += system/library/gcc/gcc-c-runtime
+REQUIRED_PACKAGES += system/library/math
--- a/components/guile/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-library/gmp
-library/libtool/libltdl
-library/ncurses
-library/readline
-shell/ksh93
-system/library
-system/library/gcc-3-runtime
-system/library/gcc-45-runtime
-system/library/gcc/gcc-c-runtime
-system/library/math
--- a/components/gutenprint/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gutenprint/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			8943
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
 CONFIGURE_OPTIONS +=	 --infodir=$(CONFIGURE_INFODIR)
@@ -60,7 +60,16 @@
 # the tests mostly pass, but it can't find several drivers for ppd files
 test:		$(TEST_32)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/desktop/gtk2
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/print/cups-libs
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/linker
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxcursor
--- a/components/gutenprint/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-library/desktop/gtk2
-library/glib2
-library/print/cups-libs
-library/zlib
-runtime/perl-512
-shell/ksh93
-system/library
-system/library/math
-system/linker
-x11/library/libx11
-x11/library/libxcursor
--- a/components/gzip/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/gzip/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			17904
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # To get correct @[email protected] substitution in the various gz<whatever> scripts.
 CONFIGURE_BINDIR.64 =   $(CONFIGURE_PREFIX)/bin
@@ -90,6 +90,9 @@
 
 test:		$(TEST_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/python-26
+REQUIRED_PACKAGES += runtime/python-27
+REQUIRED_PACKAGES += shell/bash
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/xopen/xcu4
--- a/components/gzip/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-shell/bash
-system/library
-system/xopen/xcu4
-runtime/python-26
-runtime/python-27
--- a/components/hal-cups-utils/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/hal-cups-utils/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 
 #
-# 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
@@ -36,9 +36,9 @@
 
 TPNO=			8957
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATCH_LEVEL = 0
 USED_PYTHON=$(PYTHON.2.6.32)
@@ -64,6 +64,8 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/print/cups-libs
+REQUIRED_PACKAGES += system/hal
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/libdbus
--- a/components/hal-cups-utils/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-library/print/cups-libs
-system/hal
-system/library
-system/library/libdbus
--- a/components/hexedit/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/hexedit/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			9060
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_PRE_CONFIGURE_ACTION =  \
         ($(CLONEY) $(SOURCE_DIR) $(@D))
@@ -56,6 +56,5 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/hexedit/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/hplip/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/hplip/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -97,7 +97,6 @@
 $(HPLIP_VARIANT)/.built: COMPONENT_PREP_ACTION = \
 		(cd $(@D) ; autoconf )
 
-BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
 $(BUILD_DIR)/.allvariantsinstalled: $(VARIANTS:%=%/.installed)
 	$(RM) $(ROOTPPDCACHE)
@@ -137,4 +136,14 @@
 # empty test target
 test:	$(NO_TESTS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += image/library/libjpeg
+REQUIRED_PACKAGES += image/scanner/xsane/sane-backends
+REQUIRED_PACKAGES += library/print/cups-libs
+REQUIRED_PACKAGES += runtime/python-27
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/libdbus
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/library/usb/libusb
+REQUIRED_PACKAGES += system/linker
+REQUIRED_PACKAGES += system/management/snmp/net-snmp
--- a/components/hplip/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-image/library/libjpeg
-image/scanner/xsane/sane-backends
-library/print/cups-libs
-runtime/python-27
-system/library
-system/library/c++-runtime
-system/library/libdbus
-system/library/math
-system/library/usb/libusb
-system/linker
-system/management/snmp/net-snmp
--- a/components/httping/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/httping/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			9238
 
-include ../../make-rules/prep.mk
-include ../../make-rules/justmake.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_BUILD_ARGS +=	CFLAGS="$(CFLAGS) -Dstrndup=strndup -DVERSION=\\\"$(COMPONENT_VERSION)\\\""
 COMPONENT_BUILD_ARGS +=	LDFLAGS="$(LDFLAGS) -lsocket -lnsl -lssl -lcrypto"
@@ -49,6 +49,6 @@
 
 test:	$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += system/library
--- a/components/httping/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-library/security/openssl
-system/library
--- a/components/hwdata/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/hwdata/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -28,7 +28,7 @@
 TPNO_PCI=	7530
 TPNO_USB=	7831
 
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # Since upstream only offers the latest snapshot for download, without
 # any way to retrieve a specific version, we just keep the currently
@@ -59,7 +59,6 @@
     COMPONENT_VERSION_$(i)='$(shell $(ID_VERSION_EXTRACT_COMMAND) $(i))')
 
 # This package delivers only data files and has no dependencies.
-EXTDEPFILES = $(NULLDEPFILE)
 
 # Since we have two separately licensed components we don't use the default
 # license transform rules, but handle the license info metadata directly
@@ -90,4 +89,3 @@
 clobber clean::
 	$(RM) -r $(BUILD_DIR)
 
-include ../../make-rules/depend.mk
--- a/components/iftop/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/iftop/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			9256
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_PRE_CONFIGURE_ACTION = \
     ($(CLONEY) $(SOURCE_DIR) $(@D))
@@ -67,6 +67,8 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/libpcap
+REQUIRED_PACKAGES += system/library/math
--- a/components/iftop/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-library/ncurses
-system/library
-system/library/libpcap
-system/library/math
--- a/components/ilmbase/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/ilmbase/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			5574
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATCH_LEVEL = 0
 
@@ -66,7 +66,8 @@
 
 test:	 $(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
 
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/math
--- a/components/ilmbase/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-system/library
-system/library/c++-runtime
-system/library/math
--- a/components/imagemagick/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/imagemagick/Makefile	Thu Mar 19 20:44:31 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
@@ -39,9 +39,9 @@
 
 TPNO=			17708
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
 
@@ -122,6 +122,26 @@
 test:		$(NO_TESTS)
 	@echo "Tests can be run only after ImageMagick is installed."
 
-BUILD_PKG_DEPENDENCIES= $(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += compress/bzip2
+REQUIRED_PACKAGES += compress/xz
+REQUIRED_PACKAGES += image/library/libjpeg
+REQUIRED_PACKAGES += image/library/libpng
+REQUIRED_PACKAGES += image/library/libtiff
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += library/desktop/pango
+REQUIRED_PACKAGES += library/fftw-3
+REQUIRED_PACKAGES += library/glib2
+REQUIRED_PACKAGES += library/lcms
+REQUIRED_PACKAGES += library/libtool/libltdl
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/fontconfig
+REQUIRED_PACKAGES += system/library/freetype-2
+REQUIRED_PACKAGES += system/library/math
+REQUIRED_PACKAGES += system/library/openmp
+REQUIRED_PACKAGES += x11/library/libx11
+REQUIRED_PACKAGES += x11/library/libxext
--- a/components/imagemagick/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-compress/bzip2
-compress/xz
-image/library/libjpeg
-image/library/libpng
-image/library/libtiff
-library/desktop/cairo
-library/desktop/pango
-library/fftw-3
-library/glib2
-library/lcms
-library/libtool/libltdl
-library/libxml2
-library/zlib
-shell/ksh93
-system/library
-system/library/c++-runtime
-system/library/fontconfig
-system/library/freetype-2
-system/library/math
-system/library/openmp
-x11/library/libx11
-x11/library/libxext
--- a/components/indent/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/indent/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -19,7 +19,7 @@
 # CDDL HEADER END
 
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -36,9 +36,9 @@
 
 TPNO=			12225
 
-include $(WS_TOP)/make-rules/prep.mk
-include $(WS_TOP)/make-rules/configure.mk
-include $(WS_TOP)/make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # Needed to get "gmake test" working.
 COMPONENT_PRE_CONFIGURE_ACTION =	($(CLONEY) $(SOURCE_DIR) $(@D))
@@ -54,6 +54,5 @@
 test:		install
 	@cd $(BUILD_DIR_64)/regression; PATH=/usr/gnu/bin:/usr/bin $(MAKE) test
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include $(WS_TOP)/make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/indent/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/iperf/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/iperf/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			5730
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
@@ -61,6 +61,7 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/math
--- a/components/iperf/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-system/library
-system/library/c++-runtime
-system/library/math
--- a/components/ircii/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/ircii/Makefile	Thu Mar 19 20:44:31 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
@@ -38,9 +38,9 @@
 
 TPNO=			5578
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CONFIGURE_ENV += CC="$(CC)"
 
@@ -59,6 +59,5 @@
 
 test:           $(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
--- a/components/ircii/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-system/library
--- a/components/isc-dhcp/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/isc-dhcp/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -37,9 +37,9 @@
 
 TPNO=			10383
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))
@@ -59,7 +59,6 @@
 
 install:	build $(INSTALL_32) $(PROTO_DIR)/dhcpd.leases
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
 test:	build
 	@cd $(BUILD_DIR_32); $(MAKE) check
@@ -67,4 +66,7 @@
 $(PROTO_DIR)/dhcpd.leases:	$(INSTALL_32)
 	$(TOUCH) [email protected]
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/network
--- a/components/isc-dhcp/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-shell/ksh93
-system/core-os
-system/library
-system/network
--- a/components/jsl/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/jsl/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,8 +18,14 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
 #
+
+# Preferred compiler set to gcc and not Studio as on Sparc architecture
+# some assembler code is required for locking which fails to compile on
+# solaris, when using gcc this is inlined (see jslock.c)
+COMPILER=	gcc3
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		jsl
@@ -34,14 +40,10 @@
 
 TPNO=			10774
 
-include ../../make-rules/prep.mk
-include ../../make-rules/justmake.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/justmake.mk
+include $(WS_MAKE_RULES)/ips.mk
 
-# Preferred compiler set to gcc and not Studio as on Sparc architecture
-# some assembler code is required for locking which fails to compile on
-# solaris, when using gcc this is inlined (see jslock.c)
-COMPILER=	gcc3
 
 COMPONENT_BUILD_ARGS += -f src/Makefile
 COMPONENT_BUILD_ARGS += CC="$(CC)"
@@ -61,6 +63,6 @@
 test:
 	cd $(COMPONENT_SRC)/tests; $(PERL) ./run_tests.pl $(PROTOUSRBINDIR64)/jsl
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/jsl/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-system/library
-system/library/math
--- a/components/junit/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/junit/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			9070
 
-include ../../make-rules/prep.mk
-include ../../make-rules/ant.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/ant.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # These ARGS override what is set in build.xml
 COMPONENT_BUILD_ARGS 	+= -Ddist=${PROTO_DIR}
@@ -59,6 +59,5 @@
 # OK (22 tests)
 test:		$(NO_TESTS)
 		
-BUILD_PKG_DEPENDENCIES =        $(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += runtime/java/jre-7
--- a/components/junit/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-runtime/java/jre-7
--- a/components/ksh93/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/ksh93/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -155,11 +155,12 @@
 		
 test:		$(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES= $(BUILD_TOOLS)
 
 PKG_PROTO_DIRS +=   $(COMPONENT_DIR)/files
 
-include ../../make-rules/prep.mk
-include ../../make-rules/attpackagemake.mk
-include ../../make-rules/ips.mk
-include ../../make-rules/depend.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/attpackagemake.mk
+include $(WS_MAKE_RULES)/ips.mk
+REQUIRED_PACKAGES += system/core-os
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/math
--- a/components/ksh93/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-system/core-os
-system/library
-system/library/math
--- a/components/lcms/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/lcms/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,10 +34,10 @@
 
 TPNO=			9072
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
-include ../../make-rules/lint-libraries.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
+include $(WS_MAKE_RULES)/lint-libraries.mk
 
 PATCH_LEVEL = 0
 
@@ -102,7 +102,13 @@
 
 test: $(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
 
-include ../../make-rules/depend.mk
-
+REQUIRED_PACKAGES += image/library/libjpeg
+REQUIRED_PACKAGES += image/library/libtiff
+REQUIRED_PACKAGES += library/lcms
+REQUIRED_PACKAGES += runtime/python-26
+REQUIRED_PACKAGES += runtime/python-27
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/math
--- a/components/lcms/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-image/library/libjpeg
-image/library/libtiff
-library/lcms
-runtime/python-26
-runtime/python-27
-system/library
-system/library/c++-runtime
-system/library/math
--- a/components/less/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/less/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -37,9 +37,9 @@
 
 TPNO=			9286
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 CC += $(CC_BITS)
 
@@ -58,6 +58,6 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/ncurses
+REQUIRED_PACKAGES += system/library
--- a/components/less/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-library/ncurses
-system/library
--- a/components/lftp/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/lftp/Makefile	Thu Mar 19 20:44:31 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
@@ -37,9 +37,9 @@
 
 TPNO=			16991
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 PATCH_LEVEL =   0
 
@@ -55,6 +55,12 @@
 
 test:		$(NO_TESTS)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += library/expat
+REQUIRED_PACKAGES += library/gnutls
+REQUIRED_PACKAGES += library/readline
+REQUIRED_PACKAGES += runtime/perl-512
+REQUIRED_PACKAGES += shell/ksh93
+REQUIRED_PACKAGES += system/library
+REQUIRED_PACKAGES += system/library/c++-runtime
+REQUIRED_PACKAGES += system/library/math
--- a/components/lftp/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-library/expat
-library/gnutls
-library/readline
-runtime/perl-512
-shell/ksh93
-system/library
-system/library/c++-runtime
-system/library/math
--- a/components/libarchive/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/libarchive/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
 
@@ -35,9 +35,9 @@
 
 TPNO=			11624
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # Userland default includes -mt which links with libthread which we don't need.
 studio_MT =
@@ -61,6 +61,10 @@
 
 test:		$(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES =	$(BUILD_TOOLS)
 
-include ../../make-rules/depend.mk
+REQUIRED_PACKAGES += compress/bzip2
+REQUIRED_PACKAGES += compress/xz
+REQUIRED_PACKAGES += library/libxml2
+REQUIRED_PACKAGES += library/security/openssl
+REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += system/library
--- a/components/libarchive/resolve.deps	Thu Mar 19 14:35:58 2015 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-compress/bzip2
-compress/xz
-library/libxml2
-library/security/openssl
-library/zlib
-system/library
--- a/components/libassuan/Makefile	Thu Mar 19 14:35:58 2015 -0700
+++ b/components/libassuan/Makefile	Thu Mar 19 20:44:31 2015 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# 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
 
@@ -34,9 +34,9 @@
 
 TPNO=			18558
 
-include ../../make-rules/prep.mk
-include ../../make-rules/configure.mk
-include ../../make-rules/ips.mk
+include $(WS_MAKE_RULES)/prep.mk
+include $(WS_MAKE_RULES)/configure.mk
+include $(WS_MAKE_RULES)/ips.mk
 
 # Enable C99 mode + -Xc for its additional warnings.
 studio_C99MODE = -Xc $(studio_C99_ENABLE)
@@ -69,7 +69,8 @@
 
 test: $(TEST_32_and_64)
 
-BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)
+
 </