6357230 specfiles should be nuked

--HG--
rename : usr/src/cmd/abi/libstabspf/amd64/Makefile => deleted_files/usr/src/cmd/abi/libstabspf/amd64/Makefile
rename : usr/src/cmd/abi/libstabspf/spec/amd64/Makefile => deleted_files/usr/src/cmd/abi/libstabspf/spec/amd64/Makefile
rename : usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/Makefile => deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/Makefile
rename : usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/Makefile.targ => deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/Makefile.targ
rename : usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/i386/Makefile => deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/i386/Makefile
rename : usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/picld_pluginutil.spec => deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/picld_pluginutil.spec
rename : usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/sparc/Makefile => deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/sparc/Makefile
rename : usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/versions => deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/versions
rename : usr/src/cmd/pools/poold/libjkstat/spec/Makefile => deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/Makefile
rename : usr/src/cmd/pools/poold/libjkstat/spec/Makefile.targ => deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/Makefile.targ
rename : usr/src/cmd/pools/poold/libjkstat/spec/amd64/Makefile => deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/amd64/Makefile
rename : usr/src/cmd/pools/poold/libjkstat/spec/i386/Makefile => deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/i386/Makefile
rename : usr/src/cmd/pools/poold/libjkstat/spec/jkstat.spec => deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/jkstat.spec
rename : usr/src/cmd/pools/poold/libjkstat/spec/sparc/Makefile => deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/sparc/Makefile
rename : usr/src/cmd/pools/poold/libjkstat/spec/sparcv9/Makefile => deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/sparcv9/Makefile
rename : usr/src/cmd/pools/poold/libjkstat/spec/versions => deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/versions
rename : usr/src/cmd/pools/poold/libjlgrp/spec/Makefile => deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/Makefile
rename : usr/src/cmd/pools/poold/libjlgrp/spec/Makefile.targ => deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/Makefile.targ
rename : usr/src/cmd/pools/poold/libjlgrp/spec/amd64/Makefile => deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/amd64/Makefile
rename : usr/src/cmd/pools/poold/libjlgrp/spec/i386/Makefile => deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/i386/Makefile
rename : usr/src/cmd/pools/poold/libjlgrp/spec/jlgrp.spec => deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/jlgrp.spec
rename : usr/src/cmd/pools/poold/libjlgrp/spec/sparc/Makefile => deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/sparc/Makefile
rename : usr/src/cmd/pools/poold/libjlgrp/spec/sparcv9/Makefile => deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/sparcv9/Makefile
rename : usr/src/cmd/pools/poold/libjlgrp/spec/versions => deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/versions
rename : usr/src/cmd/pools/poold/libjpool/spec/Makefile => deleted_files/usr/src/cmd/pools/poold/libjpool/spec/Makefile
rename : usr/src/cmd/pools/poold/libjpool/spec/Makefile.targ => deleted_files/usr/src/cmd/pools/poold/libjpool/spec/Makefile.targ
rename : usr/src/cmd/pools/poold/libjpool/spec/amd64/Makefile => deleted_files/usr/src/cmd/pools/poold/libjpool/spec/amd64/Makefile
rename : usr/src/cmd/pools/poold/libjpool/spec/i386/Makefile => deleted_files/usr/src/cmd/pools/poold/libjpool/spec/i386/Makefile
rename : usr/src/cmd/pools/poold/libjpool/spec/jpool.spec => deleted_files/usr/src/cmd/pools/poold/libjpool/spec/jpool.spec
rename : usr/src/cmd/pools/poold/libjpool/spec/sparc/Makefile => deleted_files/usr/src/cmd/pools/poold/libjpool/spec/sparc/Makefile
rename : usr/src/cmd/pools/poold/libjpool/spec/sparcv9/Makefile => deleted_files/usr/src/cmd/pools/poold/libjpool/spec/sparcv9/Makefile
rename : usr/src/cmd/pools/poold/libjpool/spec/versions => deleted_files/usr/src/cmd/pools/poold/libjpool/spec/versions
rename : usr/src/cmd/pools/poold/libjsyslog/spec/Makefile => deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/Makefile
rename : usr/src/cmd/pools/poold/libjsyslog/spec/Makefile.targ => deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/Makefile.targ
rename : usr/src/cmd/pools/poold/libjsyslog/spec/amd64/Makefile => deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/amd64/Makefile
rename : usr/src/cmd/pools/poold/libjsyslog/spec/i386/Makefile => deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/i386/Makefile
rename : usr/src/cmd/pools/poold/libjsyslog/spec/jsyslog.spec => deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/jsyslog.spec
rename : usr/src/cmd/pools/poold/libjsyslog/spec/sparc/Makefile => deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/sparc/Makefile
rename : usr/src/cmd/pools/poold/libjsyslog/spec/sparcv9/Makefile => deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/sparcv9/Makefile
rename : usr/src/cmd/pools/poold/libjsyslog/spec/versions => deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/versions
rename : usr/src/lib/Makefile.spec => deleted_files/usr/src/lib/Makefile.spec
rename : usr/src/lib/Makefile.spec.arch => deleted_files/usr/src/lib/Makefile.spec.arch
rename : usr/src/lib/Makefile.spec.psm => deleted_files/usr/src/lib/Makefile.spec.psm
rename : usr/src/lib/auditd_plugins/binfile/spec/Makefile => deleted_files/usr/src/lib/auditd_plugins/binfile/spec/Makefile
rename : usr/src/lib/auditd_plugins/binfile/spec/Makefile.targ => deleted_files/usr/src/lib/auditd_plugins/binfile/spec/Makefile.targ
rename : usr/src/lib/auditd_plugins/binfile/spec/amd64/Makefile => deleted_files/usr/src/lib/auditd_plugins/binfile/spec/amd64/Makefile
rename : usr/src/lib/auditd_plugins/binfile/spec/i386/Makefile => deleted_files/usr/src/lib/auditd_plugins/binfile/spec/i386/Makefile
rename : usr/src/lib/auditd_plugins/binfile/spec/private.spec => deleted_files/usr/src/lib/auditd_plugins/binfile/spec/private.spec
rename : usr/src/lib/auditd_plugins/binfile/spec/sparc/Makefile => deleted_files/usr/src/lib/auditd_plugins/binfile/spec/sparc/Makefile
rename : usr/src/lib/auditd_plugins/binfile/spec/sparcv9/Makefile => deleted_files/usr/src/lib/auditd_plugins/binfile/spec/sparcv9/Makefile
rename : usr/src/lib/auditd_plugins/binfile/spec/versions => deleted_files/usr/src/lib/auditd_plugins/binfile/spec/versions
rename : usr/src/lib/auditd_plugins/syslog/spec/Makefile => deleted_files/usr/src/lib/auditd_plugins/syslog/spec/Makefile
rename : usr/src/lib/auditd_plugins/syslog/spec/Makefile.targ => deleted_files/usr/src/lib/auditd_plugins/syslog/spec/Makefile.targ
rename : usr/src/lib/auditd_plugins/syslog/spec/amd64/Makefile => deleted_files/usr/src/lib/auditd_plugins/syslog/spec/amd64/Makefile
rename : usr/src/lib/auditd_plugins/syslog/spec/i386/Makefile => deleted_files/usr/src/lib/auditd_plugins/syslog/spec/i386/Makefile
rename : usr/src/lib/auditd_plugins/syslog/spec/private.spec => deleted_files/usr/src/lib/auditd_plugins/syslog/spec/private.spec
rename : usr/src/lib/auditd_plugins/syslog/spec/sparc/Makefile => deleted_files/usr/src/lib/auditd_plugins/syslog/spec/sparc/Makefile
rename : usr/src/lib/auditd_plugins/syslog/spec/sparcv9/Makefile => deleted_files/usr/src/lib/auditd_plugins/syslog/spec/sparcv9/Makefile
rename : usr/src/lib/auditd_plugins/syslog/spec/versions => deleted_files/usr/src/lib/auditd_plugins/syslog/spec/versions
rename : usr/src/lib/auditd_plugins/template/spec/template.spec => deleted_files/usr/src/lib/auditd_plugins/template/spec/template.spec
rename : usr/src/lib/cfgadm_plugins/ib/spec/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/Makefile
rename : usr/src/lib/cfgadm_plugins/ib/spec/Makefile.targ => deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/Makefile.targ
rename : usr/src/lib/cfgadm_plugins/ib/spec/amd64/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/amd64/Makefile
rename : usr/src/lib/cfgadm_plugins/ib/spec/cfga_ib.spec => deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/cfga_ib.spec
rename : usr/src/lib/cfgadm_plugins/ib/spec/i386/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/i386/Makefile
rename : usr/src/lib/cfgadm_plugins/ib/spec/sparc/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/sparc/Makefile
rename : usr/src/lib/cfgadm_plugins/ib/spec/sparcv9/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/sparcv9/Makefile
rename : usr/src/lib/cfgadm_plugins/ib/spec/versions => deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/versions
rename : usr/src/lib/cfgadm_plugins/pci/spec/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/Makefile
rename : usr/src/lib/cfgadm_plugins/pci/spec/Makefile.targ => deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/Makefile.targ
rename : usr/src/lib/cfgadm_plugins/pci/spec/amd64/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/amd64/Makefile
rename : usr/src/lib/cfgadm_plugins/pci/spec/i386/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/i386/Makefile
rename : usr/src/lib/cfgadm_plugins/pci/spec/pci.spec => deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/pci.spec
rename : usr/src/lib/cfgadm_plugins/pci/spec/sparc/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/sparc/Makefile
rename : usr/src/lib/cfgadm_plugins/pci/spec/sparcv9/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/sparcv9/Makefile
rename : usr/src/lib/cfgadm_plugins/pci/spec/versions => deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/versions
rename : usr/src/lib/cfgadm_plugins/sata/spec/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/Makefile
rename : usr/src/lib/cfgadm_plugins/sata/spec/Makefile.targ => deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/Makefile.targ
rename : usr/src/lib/cfgadm_plugins/sata/spec/amd64/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/amd64/Makefile
rename : usr/src/lib/cfgadm_plugins/sata/spec/cfga_sata.spec => deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/cfga_sata.spec
rename : usr/src/lib/cfgadm_plugins/sata/spec/i386/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/i386/Makefile
rename : usr/src/lib/cfgadm_plugins/sata/spec/versions => deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/versions
rename : usr/src/lib/cfgadm_plugins/scsi/spec/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile
rename : usr/src/lib/cfgadm_plugins/scsi/spec/Makefile.targ => deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile.targ
rename : usr/src/lib/cfgadm_plugins/scsi/spec/amd64/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/amd64/Makefile
rename : usr/src/lib/cfgadm_plugins/scsi/spec/cfga_scsi.spec => deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/cfga_scsi.spec
rename : usr/src/lib/cfgadm_plugins/scsi/spec/i386/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/i386/Makefile
rename : usr/src/lib/cfgadm_plugins/scsi/spec/sparc/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/sparc/Makefile
rename : usr/src/lib/cfgadm_plugins/scsi/spec/sparcv9/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/sparcv9/Makefile
rename : usr/src/lib/cfgadm_plugins/scsi/spec/versions => deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/versions
rename : usr/src/lib/cfgadm_plugins/usb/spec/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/Makefile
rename : usr/src/lib/cfgadm_plugins/usb/spec/Makefile.targ => deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/Makefile.targ
rename : usr/src/lib/cfgadm_plugins/usb/spec/amd64/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/amd64/Makefile
rename : usr/src/lib/cfgadm_plugins/usb/spec/cfga_usb.spec => deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/cfga_usb.spec
rename : usr/src/lib/cfgadm_plugins/usb/spec/i386/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/i386/Makefile
rename : usr/src/lib/cfgadm_plugins/usb/spec/sparc/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/sparc/Makefile
rename : usr/src/lib/cfgadm_plugins/usb/spec/sparcv9/Makefile => deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/sparcv9/Makefile
rename : usr/src/lib/cfgadm_plugins/usb/spec/versions => deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/versions
rename : usr/src/lib/crypt_modules/bsdbf/spec/Makefile => deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/Makefile
rename : usr/src/lib/crypt_modules/bsdbf/spec/Makefile.targ => deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/Makefile.targ
rename : usr/src/lib/crypt_modules/bsdbf/spec/amd64/Makefile => deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/amd64/Makefile
rename : usr/src/lib/crypt_modules/bsdbf/spec/bsdbf.spec => deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/bsdbf.spec
rename : usr/src/lib/crypt_modules/bsdbf/spec/i386/Makefile => deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/i386/Makefile
rename : usr/src/lib/crypt_modules/bsdbf/spec/sparc/Makefile => deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/sparc/Makefile
rename : usr/src/lib/crypt_modules/bsdbf/spec/sparcv9/Makefile => deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/sparcv9/Makefile
rename : usr/src/lib/crypt_modules/bsdbf/spec/versions => deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/versions
rename : usr/src/lib/crypt_modules/bsdmd5/spec/Makefile => deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile
rename : usr/src/lib/crypt_modules/bsdmd5/spec/Makefile.targ => deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile.targ
rename : usr/src/lib/crypt_modules/bsdmd5/spec/amd64/Makefile => deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/amd64/Makefile
rename : usr/src/lib/crypt_modules/bsdmd5/spec/bsdmd5.spec => deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/bsdmd5.spec
rename : usr/src/lib/crypt_modules/bsdmd5/spec/i386/Makefile => deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/i386/Makefile
rename : usr/src/lib/crypt_modules/bsdmd5/spec/sparc/Makefile => deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/sparc/Makefile
rename : usr/src/lib/crypt_modules/bsdmd5/spec/sparcv9/Makefile => deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/sparcv9/Makefile
rename : usr/src/lib/crypt_modules/bsdmd5/spec/versions => deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/versions
rename : usr/src/lib/crypt_modules/sunmd5/spec/Makefile => deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/Makefile
rename : usr/src/lib/crypt_modules/sunmd5/spec/Makefile.targ => deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/Makefile.targ
rename : usr/src/lib/crypt_modules/sunmd5/spec/amd64/Makefile => deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/amd64/Makefile
rename : usr/src/lib/crypt_modules/sunmd5/spec/i386/Makefile => deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/i386/Makefile
rename : usr/src/lib/crypt_modules/sunmd5/spec/sparc/Makefile => deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/sparc/Makefile
rename : usr/src/lib/crypt_modules/sunmd5/spec/sparcv9/Makefile => deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/sparcv9/Makefile
rename : usr/src/lib/crypt_modules/sunmd5/spec/sunmd5.spec => deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/sunmd5.spec
rename : usr/src/lib/crypt_modules/sunmd5/spec/versions => deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/versions
rename : usr/src/lib/fm/libdiagcode/spec/Makefile => deleted_files/usr/src/lib/fm/libdiagcode/spec/Makefile
rename : usr/src/lib/fm/libdiagcode/spec/Makefile.targ => deleted_files/usr/src/lib/fm/libdiagcode/spec/Makefile.targ
rename : usr/src/lib/fm/libdiagcode/spec/amd64/Makefile => deleted_files/usr/src/lib/fm/libdiagcode/spec/amd64/Makefile
rename : usr/src/lib/fm/libdiagcode/spec/diagcode.spec => deleted_files/usr/src/lib/fm/libdiagcode/spec/diagcode.spec
rename : usr/src/lib/fm/libdiagcode/spec/i386/Makefile => deleted_files/usr/src/lib/fm/libdiagcode/spec/i386/Makefile
rename : usr/src/lib/fm/libdiagcode/spec/sparc/Makefile => deleted_files/usr/src/lib/fm/libdiagcode/spec/sparc/Makefile
rename : usr/src/lib/fm/libdiagcode/spec/sparcv9/Makefile => deleted_files/usr/src/lib/fm/libdiagcode/spec/sparcv9/Makefile
rename : usr/src/lib/fm/libdiagcode/spec/versions => deleted_files/usr/src/lib/fm/libdiagcode/spec/versions
rename : usr/src/lib/fm/libfmd_adm/spec/Makefile => deleted_files/usr/src/lib/fm/libfmd_adm/spec/Makefile
rename : usr/src/lib/fm/libfmd_adm/spec/Makefile.targ => deleted_files/usr/src/lib/fm/libfmd_adm/spec/Makefile.targ
rename : usr/src/lib/fm/libfmd_adm/spec/amd64/Makefile => deleted_files/usr/src/lib/fm/libfmd_adm/spec/amd64/Makefile
rename : usr/src/lib/fm/libfmd_adm/spec/fmd_adm.spec => deleted_files/usr/src/lib/fm/libfmd_adm/spec/fmd_adm.spec
rename : usr/src/lib/fm/libfmd_adm/spec/i386/Makefile => deleted_files/usr/src/lib/fm/libfmd_adm/spec/i386/Makefile
rename : usr/src/lib/fm/libfmd_adm/spec/sparc/Makefile => deleted_files/usr/src/lib/fm/libfmd_adm/spec/sparc/Makefile
rename : usr/src/lib/fm/libfmd_adm/spec/sparcv9/Makefile => deleted_files/usr/src/lib/fm/libfmd_adm/spec/sparcv9/Makefile
rename : usr/src/lib/fm/libfmd_adm/spec/versions => deleted_files/usr/src/lib/fm/libfmd_adm/spec/versions
rename : usr/src/lib/fm/libfmd_log/spec/Makefile => deleted_files/usr/src/lib/fm/libfmd_log/spec/Makefile
rename : usr/src/lib/fm/libfmd_log/spec/Makefile.targ => deleted_files/usr/src/lib/fm/libfmd_log/spec/Makefile.targ
rename : usr/src/lib/fm/libfmd_log/spec/amd64/Makefile => deleted_files/usr/src/lib/fm/libfmd_log/spec/amd64/Makefile
rename : usr/src/lib/fm/libfmd_log/spec/fmd_log.spec => deleted_files/usr/src/lib/fm/libfmd_log/spec/fmd_log.spec
rename : usr/src/lib/fm/libfmd_log/spec/i386/Makefile => deleted_files/usr/src/lib/fm/libfmd_log/spec/i386/Makefile
rename : usr/src/lib/fm/libfmd_log/spec/sparc/Makefile => deleted_files/usr/src/lib/fm/libfmd_log/spec/sparc/Makefile
rename : usr/src/lib/fm/libfmd_log/spec/sparcv9/Makefile => deleted_files/usr/src/lib/fm/libfmd_log/spec/sparcv9/Makefile
rename : usr/src/lib/fm/libfmd_log/spec/versions => deleted_files/usr/src/lib/fm/libfmd_log/spec/versions
rename : usr/src/lib/fm/libfmd_snmp/spec/Makefile => deleted_files/usr/src/lib/fm/libfmd_snmp/spec/Makefile
rename : usr/src/lib/fm/libfmd_snmp/spec/Makefile.targ => deleted_files/usr/src/lib/fm/libfmd_snmp/spec/Makefile.targ
rename : usr/src/lib/fm/libfmd_snmp/spec/amd64/Makefile => deleted_files/usr/src/lib/fm/libfmd_snmp/spec/amd64/Makefile
rename : usr/src/lib/fm/libfmd_snmp/spec/fmd_snmp.spec => deleted_files/usr/src/lib/fm/libfmd_snmp/spec/fmd_snmp.spec
rename : usr/src/lib/fm/libfmd_snmp/spec/i386/Makefile => deleted_files/usr/src/lib/fm/libfmd_snmp/spec/i386/Makefile
rename : usr/src/lib/fm/libfmd_snmp/spec/sparc/Makefile => deleted_files/usr/src/lib/fm/libfmd_snmp/spec/sparc/Makefile
rename : usr/src/lib/fm/libfmd_snmp/spec/sparcv9/Makefile => deleted_files/usr/src/lib/fm/libfmd_snmp/spec/sparcv9/Makefile
rename : usr/src/lib/fm/libfmd_snmp/spec/versions => deleted_files/usr/src/lib/fm/libfmd_snmp/spec/versions
rename : usr/src/lib/fm/libldom/spec/Makefile => deleted_files/usr/src/lib/fm/libldom/spec/Makefile
rename : usr/src/lib/fm/libldom/spec/Makefile.targ => deleted_files/usr/src/lib/fm/libldom/spec/Makefile.targ
rename : usr/src/lib/fm/libldom/spec/ldom.spec => deleted_files/usr/src/lib/fm/libldom/spec/ldom.spec
rename : usr/src/lib/fm/libldom/spec/sparc/Makefile => deleted_files/usr/src/lib/fm/libldom/spec/sparc/Makefile
rename : usr/src/lib/fm/libldom/spec/sparcv9/Makefile => deleted_files/usr/src/lib/fm/libldom/spec/sparcv9/Makefile
rename : usr/src/lib/fm/libldom/spec/versions => deleted_files/usr/src/lib/fm/libldom/spec/versions
rename : usr/src/lib/fm/libmdesc/spec/Makefile => deleted_files/usr/src/lib/fm/libmdesc/spec/Makefile
rename : usr/src/lib/fm/libmdesc/spec/Makefile.targ => deleted_files/usr/src/lib/fm/libmdesc/spec/Makefile.targ
rename : usr/src/lib/fm/libmdesc/spec/mdesc.spec => deleted_files/usr/src/lib/fm/libmdesc/spec/mdesc.spec
rename : usr/src/lib/fm/libmdesc/spec/sparc/Makefile => deleted_files/usr/src/lib/fm/libmdesc/spec/sparc/Makefile
rename : usr/src/lib/fm/libmdesc/spec/sparcv9/Makefile => deleted_files/usr/src/lib/fm/libmdesc/spec/sparcv9/Makefile
rename : usr/src/lib/fm/libmdesc/spec/versions => deleted_files/usr/src/lib/fm/libmdesc/spec/versions
rename : usr/src/lib/fm/topo/libtopo/spec/Makefile => deleted_files/usr/src/lib/fm/topo/libtopo/spec/Makefile
rename : usr/src/lib/fm/topo/libtopo/spec/Makefile.targ => deleted_files/usr/src/lib/fm/topo/libtopo/spec/Makefile.targ
rename : usr/src/lib/fm/topo/libtopo/spec/amd64/Makefile => deleted_files/usr/src/lib/fm/topo/libtopo/spec/amd64/Makefile
rename : usr/src/lib/fm/topo/libtopo/spec/i386/Makefile => deleted_files/usr/src/lib/fm/topo/libtopo/spec/i386/Makefile
rename : usr/src/lib/fm/topo/libtopo/spec/sparc/Makefile => deleted_files/usr/src/lib/fm/topo/libtopo/spec/sparc/Makefile
rename : usr/src/lib/fm/topo/libtopo/spec/sparcv9/Makefile => deleted_files/usr/src/lib/fm/topo/libtopo/spec/sparcv9/Makefile
rename : usr/src/lib/fm/topo/libtopo/spec/topo.spec => deleted_files/usr/src/lib/fm/topo/libtopo/spec/topo.spec
rename : usr/src/lib/fm/topo/libtopo/spec/versions => deleted_files/usr/src/lib/fm/topo/libtopo/spec/versions
rename : usr/src/lib/gss_mechs/mech_krb5/spec/Makefile => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile
rename : usr/src/lib/gss_mechs/mech_krb5/spec/Makefile.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/Makefile.targ => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile.targ
rename : usr/src/lib/gss_mechs/mech_krb5/spec/amd64/Makefile => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/amd64/Makefile
rename : usr/src/lib/gss_mechs/mech_krb5/spec/i386/Makefile => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/i386/Makefile
rename : usr/src/lib/gss_mechs/mech_krb5/spec/krb5_asn1.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_asn1.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/krb5_cache.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_cache.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/krb5_clean.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_clean.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/krb5_crypto.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_crypto.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/krb5_errtbl.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_errtbl.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/krb5_gss.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_gss.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/krb5_int.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_int.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/krb5_keytab.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_keytab.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/krb5_krb.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_krb.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech1.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech1.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech2.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech2.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech3.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech3.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/krb5_profile.spec => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_profile.spec
rename : usr/src/lib/gss_mechs/mech_krb5/spec/sparc/Makefile => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/sparc/Makefile
rename : usr/src/lib/gss_mechs/mech_krb5/spec/sparcv9/Makefile => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/sparcv9/Makefile
rename : usr/src/lib/gss_mechs/mech_krb5/spec/versions => deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/versions
rename : usr/src/lib/gss_mechs/mech_spnego/spec/Makefile => deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/Makefile
rename : usr/src/lib/gss_mechs/mech_spnego/spec/Makefile.targ => deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/Makefile.targ
rename : usr/src/lib/gss_mechs/mech_spnego/spec/amd64/Makefile => deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/amd64/Makefile
rename : usr/src/lib/gss_mechs/mech_spnego/spec/clean.spec => deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/clean.spec
rename : usr/src/lib/gss_mechs/mech_spnego/spec/i386/Makefile => deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/i386/Makefile
rename : usr/src/lib/gss_mechs/mech_spnego/spec/sparc/Makefile => deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/sparc/Makefile
rename : usr/src/lib/gss_mechs/mech_spnego/spec/sparcv9/Makefile => deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/sparcv9/Makefile
rename : usr/src/lib/gss_mechs/mech_spnego/spec/spnego.spec => deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/spnego.spec
rename : usr/src/lib/gss_mechs/mech_spnego/spec/versions => deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/versions
rename : usr/src/lib/krb5/Makefile.spec.arch => deleted_files/usr/src/lib/krb5/Makefile.spec.arch
rename : usr/src/lib/krb5/db2/spec/Makefile => deleted_files/usr/src/lib/krb5/db2/spec/Makefile
rename : usr/src/lib/krb5/db2/spec/Makefile.targ => deleted_files/usr/src/lib/krb5/db2/spec/Makefile.targ
rename : usr/src/lib/krb5/db2/spec/db2.spec => deleted_files/usr/src/lib/krb5/db2/spec/db2.spec
rename : usr/src/lib/krb5/db2/spec/i386/Makefile => deleted_files/usr/src/lib/krb5/db2/spec/i386/Makefile
rename : usr/src/lib/krb5/db2/spec/sparc/Makefile => deleted_files/usr/src/lib/krb5/db2/spec/sparc/Makefile
rename : usr/src/lib/krb5/db2/spec/versions => deleted_files/usr/src/lib/krb5/db2/spec/versions
rename : usr/src/lib/krb5/dyn/spec/Makefile => deleted_files/usr/src/lib/krb5/dyn/spec/Makefile
rename : usr/src/lib/krb5/dyn/spec/Makefile.targ => deleted_files/usr/src/lib/krb5/dyn/spec/Makefile.targ
rename : usr/src/lib/krb5/dyn/spec/dyn.spec => deleted_files/usr/src/lib/krb5/dyn/spec/dyn.spec
rename : usr/src/lib/krb5/dyn/spec/i386/Makefile => deleted_files/usr/src/lib/krb5/dyn/spec/i386/Makefile
rename : usr/src/lib/krb5/dyn/spec/sparc/Makefile => deleted_files/usr/src/lib/krb5/dyn/spec/sparc/Makefile
rename : usr/src/lib/krb5/dyn/spec/versions => deleted_files/usr/src/lib/krb5/dyn/spec/versions
rename : usr/src/lib/krb5/kadm5/clnt/spec/Makefile => deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/Makefile
rename : usr/src/lib/krb5/kadm5/clnt/spec/Makefile.targ => deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/Makefile.targ
rename : usr/src/lib/krb5/kadm5/clnt/spec/amd64/Makefile => deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/amd64/Makefile
rename : usr/src/lib/krb5/kadm5/clnt/spec/i386/Makefile => deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/i386/Makefile
rename : usr/src/lib/krb5/kadm5/clnt/spec/kadm5clnt.spec => deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/kadm5clnt.spec
rename : usr/src/lib/krb5/kadm5/clnt/spec/sparc/Makefile => deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/sparc/Makefile
rename : usr/src/lib/krb5/kadm5/clnt/spec/sparcv9/Makefile => deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/sparcv9/Makefile
rename : usr/src/lib/krb5/kadm5/clnt/spec/versions => deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/versions
rename : usr/src/lib/krb5/kadm5/srv/spec/Makefile => deleted_files/usr/src/lib/krb5/kadm5/srv/spec/Makefile
rename : usr/src/lib/krb5/kadm5/srv/spec/Makefile.targ => deleted_files/usr/src/lib/krb5/kadm5/srv/spec/Makefile.targ
rename : usr/src/lib/krb5/kadm5/srv/spec/i386/Makefile => deleted_files/usr/src/lib/krb5/kadm5/srv/spec/i386/Makefile
rename : usr/src/lib/krb5/kadm5/srv/spec/kadm5srv.spec => deleted_files/usr/src/lib/krb5/kadm5/srv/spec/kadm5srv.spec
rename : usr/src/lib/krb5/kadm5/srv/spec/sparc/Makefile => deleted_files/usr/src/lib/krb5/kadm5/srv/spec/sparc/Makefile
rename : usr/src/lib/krb5/kadm5/srv/spec/versions => deleted_files/usr/src/lib/krb5/kadm5/srv/spec/versions
rename : usr/src/lib/krb5/kdb/spec/Makefile => deleted_files/usr/src/lib/krb5/kdb/spec/Makefile
rename : usr/src/lib/krb5/kdb/spec/Makefile.targ => deleted_files/usr/src/lib/krb5/kdb/spec/Makefile.targ
rename : usr/src/lib/krb5/kdb/spec/i386/Makefile => deleted_files/usr/src/lib/krb5/kdb/spec/i386/Makefile
rename : usr/src/lib/krb5/kdb/spec/kdb.spec => deleted_files/usr/src/lib/krb5/kdb/spec/kdb.spec
rename : usr/src/lib/krb5/kdb/spec/sparc/Makefile => deleted_files/usr/src/lib/krb5/kdb/spec/sparc/Makefile
rename : usr/src/lib/krb5/kdb/spec/versions => deleted_files/usr/src/lib/krb5/kdb/spec/versions
rename : usr/src/lib/krb5/ss/spec/Makefile => deleted_files/usr/src/lib/krb5/ss/spec/Makefile
rename : usr/src/lib/krb5/ss/spec/Makefile.targ => deleted_files/usr/src/lib/krb5/ss/spec/Makefile.targ
rename : usr/src/lib/krb5/ss/spec/amd64/Makefile => deleted_files/usr/src/lib/krb5/ss/spec/amd64/Makefile
rename : usr/src/lib/krb5/ss/spec/i386/Makefile => deleted_files/usr/src/lib/krb5/ss/spec/i386/Makefile
rename : usr/src/lib/krb5/ss/spec/sparc/Makefile => deleted_files/usr/src/lib/krb5/ss/spec/sparc/Makefile
rename : usr/src/lib/krb5/ss/spec/sparcv9/Makefile => deleted_files/usr/src/lib/krb5/ss/spec/sparcv9/Makefile
rename : usr/src/lib/krb5/ss/spec/ss.spec => deleted_files/usr/src/lib/krb5/ss/spec/ss.spec
rename : usr/src/lib/krb5/ss/spec/versions => deleted_files/usr/src/lib/krb5/ss/spec/versions
rename : usr/src/lib/libadm/spec/Makefile => deleted_files/usr/src/lib/libadm/spec/Makefile
rename : usr/src/lib/libadm/spec/Makefile.targ => deleted_files/usr/src/lib/libadm/spec/Makefile.targ
rename : usr/src/lib/libadm/spec/adm.spec => deleted_files/usr/src/lib/libadm/spec/adm.spec
rename : usr/src/lib/libadm/spec/amd64/Makefile => deleted_files/usr/src/lib/libadm/spec/amd64/Makefile
rename : usr/src/lib/libadm/spec/i386/Makefile => deleted_files/usr/src/lib/libadm/spec/i386/Makefile
rename : usr/src/lib/libadm/spec/sparc/Makefile => deleted_files/usr/src/lib/libadm/spec/sparc/Makefile
rename : usr/src/lib/libadm/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libadm/spec/sparcv9/Makefile
rename : usr/src/lib/libadm/spec/versions => deleted_files/usr/src/lib/libadm/spec/versions
rename : usr/src/lib/libadt_jni/spec/Makefile => deleted_files/usr/src/lib/libadt_jni/spec/Makefile
rename : usr/src/lib/libadt_jni/spec/Makefile.targ => deleted_files/usr/src/lib/libadt_jni/spec/Makefile.targ
rename : usr/src/lib/libadt_jni/spec/amd64/Makefile => deleted_files/usr/src/lib/libadt_jni/spec/amd64/Makefile
rename : usr/src/lib/libadt_jni/spec/i386/Makefile => deleted_files/usr/src/lib/libadt_jni/spec/i386/Makefile
rename : usr/src/lib/libadt_jni/spec/private.spec => deleted_files/usr/src/lib/libadt_jni/spec/private.spec
rename : usr/src/lib/libadt_jni/spec/sparc/Makefile => deleted_files/usr/src/lib/libadt_jni/spec/sparc/Makefile
rename : usr/src/lib/libadt_jni/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libadt_jni/spec/sparcv9/Makefile
rename : usr/src/lib/libadt_jni/spec/versions => deleted_files/usr/src/lib/libadt_jni/spec/versions
rename : usr/src/lib/libavl/spec/Makefile => deleted_files/usr/src/lib/libavl/spec/Makefile
rename : usr/src/lib/libavl/spec/Makefile.targ => deleted_files/usr/src/lib/libavl/spec/Makefile.targ
rename : usr/src/lib/libavl/spec/amd64/Makefile => deleted_files/usr/src/lib/libavl/spec/amd64/Makefile
rename : usr/src/lib/libavl/spec/avl.spec => deleted_files/usr/src/lib/libavl/spec/avl.spec
rename : usr/src/lib/libavl/spec/i386/Makefile => deleted_files/usr/src/lib/libavl/spec/i386/Makefile
rename : usr/src/lib/libavl/spec/sparc/Makefile => deleted_files/usr/src/lib/libavl/spec/sparc/Makefile
rename : usr/src/lib/libavl/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libavl/spec/sparcv9/Makefile
rename : usr/src/lib/libavl/spec/versions => deleted_files/usr/src/lib/libavl/spec/versions
rename : usr/src/lib/libbsdmalloc/spec/Makefile => deleted_files/usr/src/lib/libbsdmalloc/spec/Makefile
rename : usr/src/lib/libbsdmalloc/spec/Makefile.targ => deleted_files/usr/src/lib/libbsdmalloc/spec/Makefile.targ
rename : usr/src/lib/libbsdmalloc/spec/amd64/Makefile => deleted_files/usr/src/lib/libbsdmalloc/spec/amd64/Makefile
rename : usr/src/lib/libbsdmalloc/spec/bsdmalloc.spec => deleted_files/usr/src/lib/libbsdmalloc/spec/bsdmalloc.spec
rename : usr/src/lib/libbsdmalloc/spec/i386/Makefile => deleted_files/usr/src/lib/libbsdmalloc/spec/i386/Makefile
rename : usr/src/lib/libbsdmalloc/spec/sparc/Makefile => deleted_files/usr/src/lib/libbsdmalloc/spec/sparc/Makefile
rename : usr/src/lib/libbsdmalloc/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libbsdmalloc/spec/sparcv9/Makefile
rename : usr/src/lib/libbsdmalloc/spec/versions => deleted_files/usr/src/lib/libbsdmalloc/spec/versions
rename : usr/src/lib/libbsm/spec/Makefile => deleted_files/usr/src/lib/libbsm/spec/Makefile
rename : usr/src/lib/libbsm/spec/Makefile.targ => deleted_files/usr/src/lib/libbsm/spec/Makefile.targ
rename : usr/src/lib/libbsm/spec/amd64/Makefile => deleted_files/usr/src/lib/libbsm/spec/amd64/Makefile
rename : usr/src/lib/libbsm/spec/au_open.spec => deleted_files/usr/src/lib/libbsm/spec/au_open.spec
rename : usr/src/lib/libbsm/spec/au_preselect.spec => deleted_files/usr/src/lib/libbsm/spec/au_preselect.spec
rename : usr/src/lib/libbsm/spec/au_to.spec => deleted_files/usr/src/lib/libbsm/spec/au_to.spec
rename : usr/src/lib/libbsm/spec/au_user_mask.spec => deleted_files/usr/src/lib/libbsm/spec/au_user_mask.spec
rename : usr/src/lib/libbsm/spec/audit.spec => deleted_files/usr/src/lib/libbsm/spec/audit.spec
rename : usr/src/lib/libbsm/spec/auditon.spec => deleted_files/usr/src/lib/libbsm/spec/auditon.spec
rename : usr/src/lib/libbsm/spec/auditsvc.spec => deleted_files/usr/src/lib/libbsm/spec/auditsvc.spec
rename : usr/src/lib/libbsm/spec/devalloc.spec => deleted_files/usr/src/lib/libbsm/spec/devalloc.spec
rename : usr/src/lib/libbsm/spec/exceptions.spec => deleted_files/usr/src/lib/libbsm/spec/exceptions.spec
rename : usr/src/lib/libbsm/spec/getacinfo.spec => deleted_files/usr/src/lib/libbsm/spec/getacinfo.spec
rename : usr/src/lib/libbsm/spec/getauclassent.spec => deleted_files/usr/src/lib/libbsm/spec/getauclassent.spec
rename : usr/src/lib/libbsm/spec/getaudit.spec => deleted_files/usr/src/lib/libbsm/spec/getaudit.spec
rename : usr/src/lib/libbsm/spec/getauditflags.spec => deleted_files/usr/src/lib/libbsm/spec/getauditflags.spec
rename : usr/src/lib/libbsm/spec/getauevent.spec => deleted_files/usr/src/lib/libbsm/spec/getauevent.spec
rename : usr/src/lib/libbsm/spec/getauid.spec => deleted_files/usr/src/lib/libbsm/spec/getauid.spec
rename : usr/src/lib/libbsm/spec/getauusernam.spec => deleted_files/usr/src/lib/libbsm/spec/getauusernam.spec
rename : usr/src/lib/libbsm/spec/getfauditflags.spec => deleted_files/usr/src/lib/libbsm/spec/getfauditflags.spec
rename : usr/src/lib/libbsm/spec/i386/Makefile => deleted_files/usr/src/lib/libbsm/spec/i386/Makefile
rename : usr/src/lib/libbsm/spec/private.spec => deleted_files/usr/src/lib/libbsm/spec/private.spec
rename : usr/src/lib/libbsm/spec/sparc/Makefile => deleted_files/usr/src/lib/libbsm/spec/sparc/Makefile
rename : usr/src/lib/libbsm/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libbsm/spec/sparcv9/Makefile
rename : usr/src/lib/libbsm/spec/versions => deleted_files/usr/src/lib/libbsm/spec/versions
rename : usr/src/lib/libc/spec/Makefile => deleted_files/usr/src/lib/libc/spec/Makefile
rename : usr/src/lib/libc/spec/Makefile.targ => deleted_files/usr/src/lib/libc/spec/Makefile.targ
rename : usr/src/lib/libc/spec/aio.spec => deleted_files/usr/src/lib/libc/spec/aio.spec
rename : usr/src/lib/libc/spec/amd64/Makefile => deleted_files/usr/src/lib/libc/spec/amd64/Makefile
rename : usr/src/lib/libc/spec/atomic.spec => deleted_files/usr/src/lib/libc/spec/atomic.spec
rename : usr/src/lib/libc/spec/data.spec => deleted_files/usr/src/lib/libc/spec/data.spec
rename : usr/src/lib/libc/spec/door.spec => deleted_files/usr/src/lib/libc/spec/door.spec
rename : usr/src/lib/libc/spec/fmtmsg.spec => deleted_files/usr/src/lib/libc/spec/fmtmsg.spec
rename : usr/src/lib/libc/spec/fp.spec => deleted_files/usr/src/lib/libc/spec/fp.spec
rename : usr/src/lib/libc/spec/gen.spec => deleted_files/usr/src/lib/libc/spec/gen.spec
rename : usr/src/lib/libc/spec/i18n.spec => deleted_files/usr/src/lib/libc/spec/i18n.spec
rename : usr/src/lib/libc/spec/i386/Makefile => deleted_files/usr/src/lib/libc/spec/i386/Makefile
rename : usr/src/lib/libc/spec/interface64.spec => deleted_files/usr/src/lib/libc/spec/interface64.spec
rename : usr/src/lib/libc/spec/missing.spec => deleted_files/usr/src/lib/libc/spec/missing.spec
rename : usr/src/lib/libc/spec/print.spec => deleted_files/usr/src/lib/libc/spec/print.spec
rename : usr/src/lib/libc/spec/private.spec => deleted_files/usr/src/lib/libc/spec/private.spec
rename : usr/src/lib/libc/spec/privatedata.spec => deleted_files/usr/src/lib/libc/spec/privatedata.spec
rename : usr/src/lib/libc/spec/regex.spec => deleted_files/usr/src/lib/libc/spec/regex.spec
rename : usr/src/lib/libc/spec/rt.spec => deleted_files/usr/src/lib/libc/spec/rt.spec
rename : usr/src/lib/libc/spec/sparc/Makefile => deleted_files/usr/src/lib/libc/spec/sparc/Makefile
rename : usr/src/lib/libc/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libc/spec/sparcv9/Makefile
rename : usr/src/lib/libc/spec/stdio.spec => deleted_files/usr/src/lib/libc/spec/stdio.spec
rename : usr/src/lib/libc/spec/sys.spec => deleted_files/usr/src/lib/libc/spec/sys.spec
rename : usr/src/lib/libc/spec/threads.spec => deleted_files/usr/src/lib/libc/spec/threads.spec
rename : usr/src/lib/libc/spec/unwind.spec => deleted_files/usr/src/lib/libc/spec/unwind.spec
rename : usr/src/lib/libc/spec/versions => deleted_files/usr/src/lib/libc/spec/versions
rename : usr/src/lib/libc/spec/widec.spec => deleted_files/usr/src/lib/libc/spec/widec.spec
rename : usr/src/lib/libc_db/spec/Makefile => deleted_files/usr/src/lib/libc_db/spec/Makefile
rename : usr/src/lib/libc_db/spec/Makefile.targ => deleted_files/usr/src/lib/libc_db/spec/Makefile.targ
rename : usr/src/lib/libc_db/spec/amd64/Makefile => deleted_files/usr/src/lib/libc_db/spec/amd64/Makefile
rename : usr/src/lib/libc_db/spec/i386/Makefile => deleted_files/usr/src/lib/libc_db/spec/i386/Makefile
rename : usr/src/lib/libc_db/spec/sparc/Makefile => deleted_files/usr/src/lib/libc_db/spec/sparc/Makefile
rename : usr/src/lib/libc_db/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libc_db/spec/sparcv9/Makefile
rename : usr/src/lib/libc_db/spec/thread_db.spec => deleted_files/usr/src/lib/libc_db/spec/thread_db.spec
rename : usr/src/lib/libc_db/spec/versions => deleted_files/usr/src/lib/libc_db/spec/versions
rename : usr/src/lib/libc_psr/spec/Makefile => deleted_files/usr/src/lib/libc_psr/spec/Makefile
rename : usr/src/lib/libc_psr/spec/Makefile.com => deleted_files/usr/src/lib/libc_psr/spec/Makefile.com
rename : usr/src/lib/libc_psr/spec/sun4u-opl/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/Makefile
rename : usr/src/lib/libc_psr/spec/sun4u-opl/Makefile.links => deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/Makefile.links
rename : usr/src/lib/libc_psr/spec/sun4u-opl/c_psr-sparc.spec => deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/c_psr-sparc.spec
rename : usr/src/lib/libc_psr/spec/sun4u-opl/c_psr-sparcv9.spec => deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/c_psr-sparcv9.spec
rename : usr/src/lib/libc_psr/spec/sun4u-opl/sparc/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/sparc/Makefile
rename : usr/src/lib/libc_psr/spec/sun4u-opl/sparcv9/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/sparcv9/Makefile
rename : usr/src/lib/libc_psr/spec/sun4u-opl/versions-sparc => deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/versions-sparc
rename : usr/src/lib/libc_psr/spec/sun4u-opl/versions-sparcv9 => deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/versions-sparcv9
rename : usr/src/lib/libc_psr/spec/sun4u/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4u/Makefile
rename : usr/src/lib/libc_psr/spec/sun4u/Makefile.links => deleted_files/usr/src/lib/libc_psr/spec/sun4u/Makefile.links
rename : usr/src/lib/libc_psr/spec/sun4u/c_psr-sparc.spec => deleted_files/usr/src/lib/libc_psr/spec/sun4u/c_psr-sparc.spec
rename : usr/src/lib/libc_psr/spec/sun4u/c_psr-sparcv9.spec => deleted_files/usr/src/lib/libc_psr/spec/sun4u/c_psr-sparcv9.spec
rename : usr/src/lib/libc_psr/spec/sun4u/sparc/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4u/sparc/Makefile
rename : usr/src/lib/libc_psr/spec/sun4u/sparcv9/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4u/sparcv9/Makefile
rename : usr/src/lib/libc_psr/spec/sun4u/versions-sparc => deleted_files/usr/src/lib/libc_psr/spec/sun4u/versions-sparc
rename : usr/src/lib/libc_psr/spec/sun4u/versions-sparcv9 => deleted_files/usr/src/lib/libc_psr/spec/sun4u/versions-sparcv9
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap1/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/Makefile
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap1/Makefile.links => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/Makefile.links
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap1/c_psr-sparc.spec => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/c_psr-sparc.spec
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap1/c_psr-sparcv9.spec => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/c_psr-sparcv9.spec
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap1/sparc/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/sparc/Makefile
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap1/sparcv9/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/sparcv9/Makefile
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap1/versions-sparc => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/versions-sparc
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap1/versions-sparcv9 => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/versions-sparcv9
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap2/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/Makefile
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap2/Makefile.links => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/Makefile.links
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap2/c_psr-sparc.spec => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/c_psr-sparc.spec
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap2/c_psr-sparcv9.spec => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/c_psr-sparcv9.spec
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap2/sparc/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/sparc/Makefile
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap2/sparcv9/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/sparcv9/Makefile
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap2/versions-sparc => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/versions-sparc
rename : usr/src/lib/libc_psr/spec/sun4u_hwcap2/versions-sparcv9 => deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/versions-sparcv9
rename : usr/src/lib/libc_psr/spec/sun4v_hwcap1/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/Makefile
rename : usr/src/lib/libc_psr/spec/sun4v_hwcap1/Makefile.links => deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/Makefile.links
rename : usr/src/lib/libc_psr/spec/sun4v_hwcap1/c_psr-sparc.spec => deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/c_psr-sparc.spec
rename : usr/src/lib/libc_psr/spec/sun4v_hwcap1/c_psr-sparcv9.spec => deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/c_psr-sparcv9.spec
rename : usr/src/lib/libc_psr/spec/sun4v_hwcap1/sparc/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/sparc/Makefile
rename : usr/src/lib/libc_psr/spec/sun4v_hwcap1/sparcv9/Makefile => deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/sparcv9/Makefile
rename : usr/src/lib/libc_psr/spec/sun4v_hwcap1/versions-sparc => deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/versions-sparc
rename : usr/src/lib/libc_psr/spec/sun4v_hwcap1/versions-sparcv9 => deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/versions-sparcv9
rename : usr/src/lib/libcfgadm/spec/Makefile => deleted_files/usr/src/lib/libcfgadm/spec/Makefile
rename : usr/src/lib/libcfgadm/spec/Makefile.targ => deleted_files/usr/src/lib/libcfgadm/spec/Makefile.targ
rename : usr/src/lib/libcfgadm/spec/amd64/Makefile => deleted_files/usr/src/lib/libcfgadm/spec/amd64/Makefile
rename : usr/src/lib/libcfgadm/spec/cfgadm.spec => deleted_files/usr/src/lib/libcfgadm/spec/cfgadm.spec
rename : usr/src/lib/libcfgadm/spec/i386/Makefile => deleted_files/usr/src/lib/libcfgadm/spec/i386/Makefile
rename : usr/src/lib/libcfgadm/spec/sparc/Makefile => deleted_files/usr/src/lib/libcfgadm/spec/sparc/Makefile
rename : usr/src/lib/libcfgadm/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libcfgadm/spec/sparcv9/Makefile
rename : usr/src/lib/libcfgadm/spec/versions => deleted_files/usr/src/lib/libcfgadm/spec/versions
rename : usr/src/lib/libcmd/spec/Makefile => deleted_files/usr/src/lib/libcmd/spec/Makefile
rename : usr/src/lib/libcmd/spec/Makefile.targ => deleted_files/usr/src/lib/libcmd/spec/Makefile.targ
rename : usr/src/lib/libcmd/spec/amd64/Makefile => deleted_files/usr/src/lib/libcmd/spec/amd64/Makefile
rename : usr/src/lib/libcmd/spec/cmd.spec => deleted_files/usr/src/lib/libcmd/spec/cmd.spec
rename : usr/src/lib/libcmd/spec/i386/Makefile => deleted_files/usr/src/lib/libcmd/spec/i386/Makefile
rename : usr/src/lib/libcmd/spec/sparc/Makefile => deleted_files/usr/src/lib/libcmd/spec/sparc/Makefile
rename : usr/src/lib/libcmd/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libcmd/spec/sparcv9/Makefile
rename : usr/src/lib/libcmd/spec/versions => deleted_files/usr/src/lib/libcmd/spec/versions
rename : usr/src/lib/libcmdutils/spec/Makefile => deleted_files/usr/src/lib/libcmdutils/spec/Makefile
rename : usr/src/lib/libcmdutils/spec/Makefile.targ => deleted_files/usr/src/lib/libcmdutils/spec/Makefile.targ
rename : usr/src/lib/libcmdutils/spec/amd64/Makefile => deleted_files/usr/src/lib/libcmdutils/spec/amd64/Makefile
rename : usr/src/lib/libcmdutils/spec/cmdutils.spec => deleted_files/usr/src/lib/libcmdutils/spec/cmdutils.spec
rename : usr/src/lib/libcmdutils/spec/i386/Makefile => deleted_files/usr/src/lib/libcmdutils/spec/i386/Makefile
rename : usr/src/lib/libcmdutils/spec/sparc/Makefile => deleted_files/usr/src/lib/libcmdutils/spec/sparc/Makefile
rename : usr/src/lib/libcmdutils/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libcmdutils/spec/sparcv9/Makefile
rename : usr/src/lib/libcmdutils/spec/versions => deleted_files/usr/src/lib/libcmdutils/spec/versions
rename : usr/src/lib/libcontract/spec/Makefile => deleted_files/usr/src/lib/libcontract/spec/Makefile
rename : usr/src/lib/libcontract/spec/Makefile.targ => deleted_files/usr/src/lib/libcontract/spec/Makefile.targ
rename : usr/src/lib/libcontract/spec/amd64/Makefile => deleted_files/usr/src/lib/libcontract/spec/amd64/Makefile
rename : usr/src/lib/libcontract/spec/contract.spec => deleted_files/usr/src/lib/libcontract/spec/contract.spec
rename : usr/src/lib/libcontract/spec/i386/Makefile => deleted_files/usr/src/lib/libcontract/spec/i386/Makefile
rename : usr/src/lib/libcontract/spec/private.spec => deleted_files/usr/src/lib/libcontract/spec/private.spec
rename : usr/src/lib/libcontract/spec/sparc/Makefile => deleted_files/usr/src/lib/libcontract/spec/sparc/Makefile
rename : usr/src/lib/libcontract/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libcontract/spec/sparcv9/Makefile
rename : usr/src/lib/libcontract/spec/versions => deleted_files/usr/src/lib/libcontract/spec/versions
rename : usr/src/lib/libcpc/spec/Makefile => deleted_files/usr/src/lib/libcpc/spec/Makefile
rename : usr/src/lib/libcpc/spec/Makefile.targ => deleted_files/usr/src/lib/libcpc/spec/Makefile.targ
rename : usr/src/lib/libcpc/spec/amd64/Makefile => deleted_files/usr/src/lib/libcpc/spec/amd64/Makefile
rename : usr/src/lib/libcpc/spec/cpc.spec => deleted_files/usr/src/lib/libcpc/spec/cpc.spec
rename : usr/src/lib/libcpc/spec/i386/Makefile => deleted_files/usr/src/lib/libcpc/spec/i386/Makefile
rename : usr/src/lib/libcpc/spec/sparc/Makefile => deleted_files/usr/src/lib/libcpc/spec/sparc/Makefile
rename : usr/src/lib/libcpc/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libcpc/spec/sparcv9/Makefile
rename : usr/src/lib/libcpc/spec/versions => deleted_files/usr/src/lib/libcpc/spec/versions
rename : usr/src/lib/libcrypt/spec/Makefile => deleted_files/usr/src/lib/libcrypt/spec/Makefile
rename : usr/src/lib/libcrypt/spec/Makefile.targ => deleted_files/usr/src/lib/libcrypt/spec/Makefile.targ
rename : usr/src/lib/libcrypt/spec/amd64/Makefile => deleted_files/usr/src/lib/libcrypt/spec/amd64/Makefile
rename : usr/src/lib/libcrypt/spec/crypt.spec => deleted_files/usr/src/lib/libcrypt/spec/crypt.spec
rename : usr/src/lib/libcrypt/spec/i386/Makefile => deleted_files/usr/src/lib/libcrypt/spec/i386/Makefile
rename : usr/src/lib/libcrypt/spec/sparc/Makefile => deleted_files/usr/src/lib/libcrypt/spec/sparc/Makefile
rename : usr/src/lib/libcrypt/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libcrypt/spec/sparcv9/Makefile
rename : usr/src/lib/libcrypt/spec/versions => deleted_files/usr/src/lib/libcrypt/spec/versions
rename : usr/src/lib/libcryptoutil/spec/Makefile => deleted_files/usr/src/lib/libcryptoutil/spec/Makefile
rename : usr/src/lib/libcryptoutil/spec/Makefile.targ => deleted_files/usr/src/lib/libcryptoutil/spec/Makefile.targ
rename : usr/src/lib/libcryptoutil/spec/amd64/Makefile => deleted_files/usr/src/lib/libcryptoutil/spec/amd64/Makefile
rename : usr/src/lib/libcryptoutil/spec/cryptoutil.spec => deleted_files/usr/src/lib/libcryptoutil/spec/cryptoutil.spec
rename : usr/src/lib/libcryptoutil/spec/i386/Makefile => deleted_files/usr/src/lib/libcryptoutil/spec/i386/Makefile
rename : usr/src/lib/libcryptoutil/spec/sparc/Makefile => deleted_files/usr/src/lib/libcryptoutil/spec/sparc/Makefile
rename : usr/src/lib/libcryptoutil/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libcryptoutil/spec/sparcv9/Makefile
rename : usr/src/lib/libcryptoutil/spec/versions => deleted_files/usr/src/lib/libcryptoutil/spec/versions
rename : usr/src/lib/libctf/spec/Makefile => deleted_files/usr/src/lib/libctf/spec/Makefile
rename : usr/src/lib/libctf/spec/Makefile.targ => deleted_files/usr/src/lib/libctf/spec/Makefile.targ
rename : usr/src/lib/libctf/spec/amd64/Makefile => deleted_files/usr/src/lib/libctf/spec/amd64/Makefile
rename : usr/src/lib/libctf/spec/ctf.spec => deleted_files/usr/src/lib/libctf/spec/ctf.spec
rename : usr/src/lib/libctf/spec/i386/Makefile => deleted_files/usr/src/lib/libctf/spec/i386/Makefile
rename : usr/src/lib/libctf/spec/sparc/Makefile => deleted_files/usr/src/lib/libctf/spec/sparc/Makefile
rename : usr/src/lib/libctf/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libctf/spec/sparcv9/Makefile
rename : usr/src/lib/libctf/spec/versions => deleted_files/usr/src/lib/libctf/spec/versions
rename : usr/src/lib/libcurses/spec/Makefile => deleted_files/usr/src/lib/libcurses/spec/Makefile
rename : usr/src/lib/libcurses/spec/Makefile.targ => deleted_files/usr/src/lib/libcurses/spec/Makefile.targ
rename : usr/src/lib/libcurses/spec/amd64/Makefile => deleted_files/usr/src/lib/libcurses/spec/amd64/Makefile
rename : usr/src/lib/libcurses/spec/curses.spec => deleted_files/usr/src/lib/libcurses/spec/curses.spec
rename : usr/src/lib/libcurses/spec/i386/Makefile => deleted_files/usr/src/lib/libcurses/spec/i386/Makefile
rename : usr/src/lib/libcurses/spec/sparc/Makefile => deleted_files/usr/src/lib/libcurses/spec/sparc/Makefile
rename : usr/src/lib/libcurses/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libcurses/spec/sparcv9/Makefile
rename : usr/src/lib/libcurses/spec/versions => deleted_files/usr/src/lib/libcurses/spec/versions
rename : usr/src/lib/libdevice/spec/Makefile => deleted_files/usr/src/lib/libdevice/spec/Makefile
rename : usr/src/lib/libdevice/spec/Makefile.targ => deleted_files/usr/src/lib/libdevice/spec/Makefile.targ
rename : usr/src/lib/libdevice/spec/amd64/Makefile => deleted_files/usr/src/lib/libdevice/spec/amd64/Makefile
rename : usr/src/lib/libdevice/spec/device.spec => deleted_files/usr/src/lib/libdevice/spec/device.spec
rename : usr/src/lib/libdevice/spec/i386/Makefile => deleted_files/usr/src/lib/libdevice/spec/i386/Makefile
rename : usr/src/lib/libdevice/spec/sparc/Makefile => deleted_files/usr/src/lib/libdevice/spec/sparc/Makefile
rename : usr/src/lib/libdevice/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdevice/spec/sparcv9/Makefile
rename : usr/src/lib/libdevice/spec/versions => deleted_files/usr/src/lib/libdevice/spec/versions
rename : usr/src/lib/libdevid/spec/Makefile => deleted_files/usr/src/lib/libdevid/spec/Makefile
rename : usr/src/lib/libdevid/spec/Makefile.targ => deleted_files/usr/src/lib/libdevid/spec/Makefile.targ
rename : usr/src/lib/libdevid/spec/amd64/Makefile => deleted_files/usr/src/lib/libdevid/spec/amd64/Makefile
rename : usr/src/lib/libdevid/spec/devid.spec => deleted_files/usr/src/lib/libdevid/spec/devid.spec
rename : usr/src/lib/libdevid/spec/i386/Makefile => deleted_files/usr/src/lib/libdevid/spec/i386/Makefile
rename : usr/src/lib/libdevid/spec/sparc/Makefile => deleted_files/usr/src/lib/libdevid/spec/sparc/Makefile
rename : usr/src/lib/libdevid/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdevid/spec/sparcv9/Makefile
rename : usr/src/lib/libdevid/spec/versions => deleted_files/usr/src/lib/libdevid/spec/versions
rename : usr/src/lib/libdevinfo/spec/Makefile => deleted_files/usr/src/lib/libdevinfo/spec/Makefile
rename : usr/src/lib/libdevinfo/spec/Makefile.targ => deleted_files/usr/src/lib/libdevinfo/spec/Makefile.targ
rename : usr/src/lib/libdevinfo/spec/amd64/Makefile => deleted_files/usr/src/lib/libdevinfo/spec/amd64/Makefile
rename : usr/src/lib/libdevinfo/spec/devinfo.spec => deleted_files/usr/src/lib/libdevinfo/spec/devinfo.spec
rename : usr/src/lib/libdevinfo/spec/i386/Makefile => deleted_files/usr/src/lib/libdevinfo/spec/i386/Makefile
rename : usr/src/lib/libdevinfo/spec/sparc/Makefile => deleted_files/usr/src/lib/libdevinfo/spec/sparc/Makefile
rename : usr/src/lib/libdevinfo/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdevinfo/spec/sparcv9/Makefile
rename : usr/src/lib/libdevinfo/spec/versions => deleted_files/usr/src/lib/libdevinfo/spec/versions
rename : usr/src/lib/libdhcpagent/spec/Makefile => deleted_files/usr/src/lib/libdhcpagent/spec/Makefile
rename : usr/src/lib/libdhcpagent/spec/Makefile.targ => deleted_files/usr/src/lib/libdhcpagent/spec/Makefile.targ
rename : usr/src/lib/libdhcpagent/spec/amd64/Makefile => deleted_files/usr/src/lib/libdhcpagent/spec/amd64/Makefile
rename : usr/src/lib/libdhcpagent/spec/dhcpagent.spec => deleted_files/usr/src/lib/libdhcpagent/spec/dhcpagent.spec
rename : usr/src/lib/libdhcpagent/spec/i386/Makefile => deleted_files/usr/src/lib/libdhcpagent/spec/i386/Makefile
rename : usr/src/lib/libdhcpagent/spec/sparc/Makefile => deleted_files/usr/src/lib/libdhcpagent/spec/sparc/Makefile
rename : usr/src/lib/libdhcpagent/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdhcpagent/spec/sparcv9/Makefile
rename : usr/src/lib/libdhcpagent/spec/versions => deleted_files/usr/src/lib/libdhcpagent/spec/versions
rename : usr/src/lib/libdhcpsvc/modules/binfiles/spec/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/Makefile
rename : usr/src/lib/libdhcpsvc/modules/binfiles/spec/Makefile.targ => deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/Makefile.targ
rename : usr/src/lib/libdhcpsvc/modules/binfiles/spec/amd64/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/amd64/Makefile
rename : usr/src/lib/libdhcpsvc/modules/binfiles/spec/ds_SUNWbinfiles.spec => deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/ds_SUNWbinfiles.spec
rename : usr/src/lib/libdhcpsvc/modules/binfiles/spec/i386/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/i386/Makefile
rename : usr/src/lib/libdhcpsvc/modules/binfiles/spec/sparc/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/sparc/Makefile
rename : usr/src/lib/libdhcpsvc/modules/binfiles/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/sparcv9/Makefile
rename : usr/src/lib/libdhcpsvc/modules/binfiles/spec/versions => deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/versions
rename : usr/src/lib/libdhcpsvc/modules/files/spec/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/Makefile
rename : usr/src/lib/libdhcpsvc/modules/files/spec/Makefile.targ => deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/Makefile.targ
rename : usr/src/lib/libdhcpsvc/modules/files/spec/amd64/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/amd64/Makefile
rename : usr/src/lib/libdhcpsvc/modules/files/spec/ds_SUNWfiles.spec => deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/ds_SUNWfiles.spec
rename : usr/src/lib/libdhcpsvc/modules/files/spec/i386/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/i386/Makefile
rename : usr/src/lib/libdhcpsvc/modules/files/spec/sparc/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/sparc/Makefile
rename : usr/src/lib/libdhcpsvc/modules/files/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/sparcv9/Makefile
rename : usr/src/lib/libdhcpsvc/modules/files/spec/versions => deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/versions
rename : usr/src/lib/libdhcpsvc/modules/files0/spec/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/Makefile
rename : usr/src/lib/libdhcpsvc/modules/files0/spec/Makefile.targ => deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/Makefile.targ
rename : usr/src/lib/libdhcpsvc/modules/files0/spec/amd64/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/amd64/Makefile
rename : usr/src/lib/libdhcpsvc/modules/files0/spec/ds_SUNWfiles.spec => deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/ds_SUNWfiles.spec
rename : usr/src/lib/libdhcpsvc/modules/files0/spec/i386/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/i386/Makefile
rename : usr/src/lib/libdhcpsvc/modules/files0/spec/sparc/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/sparc/Makefile
rename : usr/src/lib/libdhcpsvc/modules/files0/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/sparcv9/Makefile
rename : usr/src/lib/libdhcpsvc/modules/files0/spec/versions => deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/versions
rename : usr/src/lib/libdhcpsvc/modules/nisplus/spec/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/Makefile
rename : usr/src/lib/libdhcpsvc/modules/nisplus/spec/Makefile.targ => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/Makefile.targ
rename : usr/src/lib/libdhcpsvc/modules/nisplus/spec/amd64/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/amd64/Makefile
rename : usr/src/lib/libdhcpsvc/modules/nisplus/spec/ds_SUNWnisplus.spec => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/ds_SUNWnisplus.spec
rename : usr/src/lib/libdhcpsvc/modules/nisplus/spec/i386/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/i386/Makefile
rename : usr/src/lib/libdhcpsvc/modules/nisplus/spec/sparc/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/sparc/Makefile
rename : usr/src/lib/libdhcpsvc/modules/nisplus/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/sparcv9/Makefile
rename : usr/src/lib/libdhcpsvc/modules/nisplus/spec/versions => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/versions
rename : usr/src/lib/libdhcpsvc/modules/nisplus0/spec/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/Makefile
rename : usr/src/lib/libdhcpsvc/modules/nisplus0/spec/Makefile.targ => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/Makefile.targ
rename : usr/src/lib/libdhcpsvc/modules/nisplus0/spec/amd64/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/amd64/Makefile
rename : usr/src/lib/libdhcpsvc/modules/nisplus0/spec/ds_SUNWnisplus.spec => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/ds_SUNWnisplus.spec
rename : usr/src/lib/libdhcpsvc/modules/nisplus0/spec/i386/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/i386/Makefile
rename : usr/src/lib/libdhcpsvc/modules/nisplus0/spec/sparc/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/sparc/Makefile
rename : usr/src/lib/libdhcpsvc/modules/nisplus0/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/sparcv9/Makefile
rename : usr/src/lib/libdhcpsvc/modules/nisplus0/spec/versions => deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/versions
rename : usr/src/lib/libdhcpsvc/modules/templates/spec/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/Makefile
rename : usr/src/lib/libdhcpsvc/modules/templates/spec/Makefile.targ => deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/Makefile.targ
rename : usr/src/lib/libdhcpsvc/modules/templates/spec/amd64/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/amd64/Makefile
rename : usr/src/lib/libdhcpsvc/modules/templates/spec/ds_RESOURCE.spec => deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/ds_RESOURCE.spec
rename : usr/src/lib/libdhcpsvc/modules/templates/spec/i386/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/i386/Makefile
rename : usr/src/lib/libdhcpsvc/modules/templates/spec/public.spec => deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/public.spec
rename : usr/src/lib/libdhcpsvc/modules/templates/spec/sparc/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/sparc/Makefile
rename : usr/src/lib/libdhcpsvc/modules/templates/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/sparcv9/Makefile
rename : usr/src/lib/libdhcpsvc/modules/templates/spec/versions => deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/versions
rename : usr/src/lib/libdhcpsvc/private/spec/Makefile => deleted_files/usr/src/lib/libdhcpsvc/private/spec/Makefile
rename : usr/src/lib/libdhcpsvc/private/spec/Makefile.targ => deleted_files/usr/src/lib/libdhcpsvc/private/spec/Makefile.targ
rename : usr/src/lib/libdhcpsvc/private/spec/amd64/Makefile => deleted_files/usr/src/lib/libdhcpsvc/private/spec/amd64/Makefile
rename : usr/src/lib/libdhcpsvc/private/spec/dhcpsvc.spec => deleted_files/usr/src/lib/libdhcpsvc/private/spec/dhcpsvc.spec
rename : usr/src/lib/libdhcpsvc/private/spec/i386/Makefile => deleted_files/usr/src/lib/libdhcpsvc/private/spec/i386/Makefile
rename : usr/src/lib/libdhcpsvc/private/spec/sparc/Makefile => deleted_files/usr/src/lib/libdhcpsvc/private/spec/sparc/Makefile
rename : usr/src/lib/libdhcpsvc/private/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdhcpsvc/private/spec/sparcv9/Makefile
rename : usr/src/lib/libdhcpsvc/private/spec/versions => deleted_files/usr/src/lib/libdhcpsvc/private/spec/versions
rename : usr/src/lib/libdhcputil/spec/Makefile => deleted_files/usr/src/lib/libdhcputil/spec/Makefile
rename : usr/src/lib/libdhcputil/spec/Makefile.targ => deleted_files/usr/src/lib/libdhcputil/spec/Makefile.targ
rename : usr/src/lib/libdhcputil/spec/amd64/Makefile => deleted_files/usr/src/lib/libdhcputil/spec/amd64/Makefile
rename : usr/src/lib/libdhcputil/spec/dhcputil.spec => deleted_files/usr/src/lib/libdhcputil/spec/dhcputil.spec
rename : usr/src/lib/libdhcputil/spec/i386/Makefile => deleted_files/usr/src/lib/libdhcputil/spec/i386/Makefile
rename : usr/src/lib/libdhcputil/spec/sparc/Makefile => deleted_files/usr/src/lib/libdhcputil/spec/sparc/Makefile
rename : usr/src/lib/libdhcputil/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdhcputil/spec/sparcv9/Makefile
rename : usr/src/lib/libdhcputil/spec/versions => deleted_files/usr/src/lib/libdhcputil/spec/versions
rename : usr/src/lib/libdiagcode/spec/amd64/Makefile => deleted_files/usr/src/lib/libdiagcode/spec/amd64/Makefile
rename : usr/src/lib/libdisasm/spec/Makefile => deleted_files/usr/src/lib/libdisasm/spec/Makefile
rename : usr/src/lib/libdisasm/spec/Makefile.targ => deleted_files/usr/src/lib/libdisasm/spec/Makefile.targ
rename : usr/src/lib/libdisasm/spec/amd64/Makefile => deleted_files/usr/src/lib/libdisasm/spec/amd64/Makefile
rename : usr/src/lib/libdisasm/spec/i386/Makefile => deleted_files/usr/src/lib/libdisasm/spec/i386/Makefile
rename : usr/src/lib/libdisasm/spec/libdisasm.spec => deleted_files/usr/src/lib/libdisasm/spec/libdisasm.spec
rename : usr/src/lib/libdisasm/spec/sparc/Makefile => deleted_files/usr/src/lib/libdisasm/spec/sparc/Makefile
rename : usr/src/lib/libdisasm/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdisasm/spec/sparcv9/Makefile
rename : usr/src/lib/libdisasm/spec/versions => deleted_files/usr/src/lib/libdisasm/spec/versions
rename : usr/src/lib/libdiskmgt/spec/Makefile => deleted_files/usr/src/lib/libdiskmgt/spec/Makefile
rename : usr/src/lib/libdiskmgt/spec/Makefile.targ => deleted_files/usr/src/lib/libdiskmgt/spec/Makefile.targ
rename : usr/src/lib/libdiskmgt/spec/amd64/Makefile => deleted_files/usr/src/lib/libdiskmgt/spec/amd64/Makefile
rename : usr/src/lib/libdiskmgt/spec/diskmgt.spec => deleted_files/usr/src/lib/libdiskmgt/spec/diskmgt.spec
rename : usr/src/lib/libdiskmgt/spec/i386/Makefile => deleted_files/usr/src/lib/libdiskmgt/spec/i386/Makefile
rename : usr/src/lib/libdiskmgt/spec/sparc/Makefile => deleted_files/usr/src/lib/libdiskmgt/spec/sparc/Makefile
rename : usr/src/lib/libdiskmgt/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdiskmgt/spec/sparcv9/Makefile
rename : usr/src/lib/libdiskmgt/spec/versions => deleted_files/usr/src/lib/libdiskmgt/spec/versions
rename : usr/src/lib/libdladm/spec/Makefile => deleted_files/usr/src/lib/libdladm/spec/Makefile
rename : usr/src/lib/libdladm/spec/Makefile.targ => deleted_files/usr/src/lib/libdladm/spec/Makefile.targ
rename : usr/src/lib/libdladm/spec/amd64/Makefile => deleted_files/usr/src/lib/libdladm/spec/amd64/Makefile
rename : usr/src/lib/libdladm/spec/dladm.spec => deleted_files/usr/src/lib/libdladm/spec/dladm.spec
rename : usr/src/lib/libdladm/spec/i386/Makefile => deleted_files/usr/src/lib/libdladm/spec/i386/Makefile
rename : usr/src/lib/libdladm/spec/sparc/Makefile => deleted_files/usr/src/lib/libdladm/spec/sparc/Makefile
rename : usr/src/lib/libdladm/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdladm/spec/sparcv9/Makefile
rename : usr/src/lib/libdladm/spec/versions => deleted_files/usr/src/lib/libdladm/spec/versions
rename : usr/src/lib/libdlpi/spec/Makefile => deleted_files/usr/src/lib/libdlpi/spec/Makefile
rename : usr/src/lib/libdlpi/spec/Makefile.targ => deleted_files/usr/src/lib/libdlpi/spec/Makefile.targ
rename : usr/src/lib/libdlpi/spec/amd64/Makefile => deleted_files/usr/src/lib/libdlpi/spec/amd64/Makefile
rename : usr/src/lib/libdlpi/spec/dlpi.spec => deleted_files/usr/src/lib/libdlpi/spec/dlpi.spec
rename : usr/src/lib/libdlpi/spec/i386/Makefile => deleted_files/usr/src/lib/libdlpi/spec/i386/Makefile
rename : usr/src/lib/libdlpi/spec/sparc/Makefile => deleted_files/usr/src/lib/libdlpi/spec/sparc/Makefile
rename : usr/src/lib/libdlpi/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdlpi/spec/sparcv9/Makefile
rename : usr/src/lib/libdlpi/spec/versions => deleted_files/usr/src/lib/libdlpi/spec/versions
rename : usr/src/lib/libdscp/spec/Makefile => deleted_files/usr/src/lib/libdscp/spec/Makefile
rename : usr/src/lib/libdscp/spec/Makefile.targ => deleted_files/usr/src/lib/libdscp/spec/Makefile.targ
rename : usr/src/lib/libdscp/spec/libdscp.spec => deleted_files/usr/src/lib/libdscp/spec/libdscp.spec
rename : usr/src/lib/libdscp/spec/sparc/Makefile => deleted_files/usr/src/lib/libdscp/spec/sparc/Makefile
rename : usr/src/lib/libdscp/spec/versions => deleted_files/usr/src/lib/libdscp/spec/versions
rename : usr/src/lib/libdtrace/spec/Makefile => deleted_files/usr/src/lib/libdtrace/spec/Makefile
rename : usr/src/lib/libdtrace/spec/Makefile.targ => deleted_files/usr/src/lib/libdtrace/spec/Makefile.targ
rename : usr/src/lib/libdtrace/spec/amd64/Makefile => deleted_files/usr/src/lib/libdtrace/spec/amd64/Makefile
rename : usr/src/lib/libdtrace/spec/dtrace.spec => deleted_files/usr/src/lib/libdtrace/spec/dtrace.spec
rename : usr/src/lib/libdtrace/spec/i386/Makefile => deleted_files/usr/src/lib/libdtrace/spec/i386/Makefile
rename : usr/src/lib/libdtrace/spec/sparc/Makefile => deleted_files/usr/src/lib/libdtrace/spec/sparc/Makefile
rename : usr/src/lib/libdtrace/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdtrace/spec/sparcv9/Makefile
rename : usr/src/lib/libdtrace/spec/versions => deleted_files/usr/src/lib/libdtrace/spec/versions
rename : usr/src/lib/libdtrace_jni/spec/Makefile => deleted_files/usr/src/lib/libdtrace_jni/spec/Makefile
rename : usr/src/lib/libdtrace_jni/spec/Makefile.targ => deleted_files/usr/src/lib/libdtrace_jni/spec/Makefile.targ
rename : usr/src/lib/libdtrace_jni/spec/amd64/Makefile => deleted_files/usr/src/lib/libdtrace_jni/spec/amd64/Makefile
rename : usr/src/lib/libdtrace_jni/spec/dtrace_jni.spec => deleted_files/usr/src/lib/libdtrace_jni/spec/dtrace_jni.spec
rename : usr/src/lib/libdtrace_jni/spec/i386/Makefile => deleted_files/usr/src/lib/libdtrace_jni/spec/i386/Makefile
rename : usr/src/lib/libdtrace_jni/spec/sparc/Makefile => deleted_files/usr/src/lib/libdtrace_jni/spec/sparc/Makefile
rename : usr/src/lib/libdtrace_jni/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libdtrace_jni/spec/sparcv9/Makefile
rename : usr/src/lib/libdtrace_jni/spec/versions => deleted_files/usr/src/lib/libdtrace_jni/spec/versions
rename : usr/src/lib/libefi/spec/Makefile => deleted_files/usr/src/lib/libefi/spec/Makefile
rename : usr/src/lib/libefi/spec/Makefile.targ => deleted_files/usr/src/lib/libefi/spec/Makefile.targ
rename : usr/src/lib/libefi/spec/amd64/Makefile => deleted_files/usr/src/lib/libefi/spec/amd64/Makefile
rename : usr/src/lib/libefi/spec/efi.spec => deleted_files/usr/src/lib/libefi/spec/efi.spec
rename : usr/src/lib/libefi/spec/i386/Makefile => deleted_files/usr/src/lib/libefi/spec/i386/Makefile
rename : usr/src/lib/libefi/spec/sparc/Makefile => deleted_files/usr/src/lib/libefi/spec/sparc/Makefile
rename : usr/src/lib/libefi/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libefi/spec/sparcv9/Makefile
rename : usr/src/lib/libefi/spec/versions => deleted_files/usr/src/lib/libefi/spec/versions
rename : usr/src/lib/libeti/form/spec/Makefile => deleted_files/usr/src/lib/libeti/form/spec/Makefile
rename : usr/src/lib/libeti/form/spec/Makefile.targ => deleted_files/usr/src/lib/libeti/form/spec/Makefile.targ
rename : usr/src/lib/libeti/form/spec/amd64/Makefile => deleted_files/usr/src/lib/libeti/form/spec/amd64/Makefile
rename : usr/src/lib/libeti/form/spec/form.spec => deleted_files/usr/src/lib/libeti/form/spec/form.spec
rename : usr/src/lib/libeti/form/spec/i386/Makefile => deleted_files/usr/src/lib/libeti/form/spec/i386/Makefile
rename : usr/src/lib/libeti/form/spec/sparc/Makefile => deleted_files/usr/src/lib/libeti/form/spec/sparc/Makefile
rename : usr/src/lib/libeti/form/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libeti/form/spec/sparcv9/Makefile
rename : usr/src/lib/libeti/form/spec/versions => deleted_files/usr/src/lib/libeti/form/spec/versions
rename : usr/src/lib/libeti/menu/spec/Makefile => deleted_files/usr/src/lib/libeti/menu/spec/Makefile
rename : usr/src/lib/libeti/menu/spec/Makefile.targ => deleted_files/usr/src/lib/libeti/menu/spec/Makefile.targ
rename : usr/src/lib/libeti/menu/spec/amd64/Makefile => deleted_files/usr/src/lib/libeti/menu/spec/amd64/Makefile
rename : usr/src/lib/libeti/menu/spec/i386/Makefile => deleted_files/usr/src/lib/libeti/menu/spec/i386/Makefile
rename : usr/src/lib/libeti/menu/spec/menu.spec => deleted_files/usr/src/lib/libeti/menu/spec/menu.spec
rename : usr/src/lib/libeti/menu/spec/sparc/Makefile => deleted_files/usr/src/lib/libeti/menu/spec/sparc/Makefile
rename : usr/src/lib/libeti/menu/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libeti/menu/spec/sparcv9/Makefile
rename : usr/src/lib/libeti/menu/spec/versions => deleted_files/usr/src/lib/libeti/menu/spec/versions
rename : usr/src/lib/libeti/panel/spec/Makefile => deleted_files/usr/src/lib/libeti/panel/spec/Makefile
rename : usr/src/lib/libeti/panel/spec/Makefile.targ => deleted_files/usr/src/lib/libeti/panel/spec/Makefile.targ
rename : usr/src/lib/libeti/panel/spec/amd64/Makefile => deleted_files/usr/src/lib/libeti/panel/spec/amd64/Makefile
rename : usr/src/lib/libeti/panel/spec/i386/Makefile => deleted_files/usr/src/lib/libeti/panel/spec/i386/Makefile
rename : usr/src/lib/libeti/panel/spec/panel.spec => deleted_files/usr/src/lib/libeti/panel/spec/panel.spec
rename : usr/src/lib/libeti/panel/spec/sparc/Makefile => deleted_files/usr/src/lib/libeti/panel/spec/sparc/Makefile
rename : usr/src/lib/libeti/panel/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libeti/panel/spec/sparcv9/Makefile
rename : usr/src/lib/libeti/panel/spec/versions => deleted_files/usr/src/lib/libeti/panel/spec/versions
rename : usr/src/lib/libexacct/spec/Makefile => deleted_files/usr/src/lib/libexacct/spec/Makefile
rename : usr/src/lib/libexacct/spec/Makefile.targ => deleted_files/usr/src/lib/libexacct/spec/Makefile.targ
rename : usr/src/lib/libexacct/spec/amd64/Makefile => deleted_files/usr/src/lib/libexacct/spec/amd64/Makefile
rename : usr/src/lib/libexacct/spec/exacct.spec => deleted_files/usr/src/lib/libexacct/spec/exacct.spec
rename : usr/src/lib/libexacct/spec/i386/Makefile => deleted_files/usr/src/lib/libexacct/spec/i386/Makefile
rename : usr/src/lib/libexacct/spec/sparc/Makefile => deleted_files/usr/src/lib/libexacct/spec/sparc/Makefile
rename : usr/src/lib/libexacct/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libexacct/spec/sparcv9/Makefile
rename : usr/src/lib/libexacct/spec/versions => deleted_files/usr/src/lib/libexacct/spec/versions
rename : usr/src/lib/libfsmgt/spec/Makefile => deleted_files/usr/src/lib/libfsmgt/spec/Makefile
rename : usr/src/lib/libfsmgt/spec/Makefile.targ => deleted_files/usr/src/lib/libfsmgt/spec/Makefile.targ
rename : usr/src/lib/libfsmgt/spec/amd64/Makefile => deleted_files/usr/src/lib/libfsmgt/spec/amd64/Makefile
rename : usr/src/lib/libfsmgt/spec/fsmgt.spec => deleted_files/usr/src/lib/libfsmgt/spec/fsmgt.spec
rename : usr/src/lib/libfsmgt/spec/i386/Makefile => deleted_files/usr/src/lib/libfsmgt/spec/i386/Makefile
rename : usr/src/lib/libfsmgt/spec/sparc/Makefile => deleted_files/usr/src/lib/libfsmgt/spec/sparc/Makefile
rename : usr/src/lib/libfsmgt/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libfsmgt/spec/sparcv9/Makefile
rename : usr/src/lib/libfsmgt/spec/versions => deleted_files/usr/src/lib/libfsmgt/spec/versions
rename : usr/src/lib/libfstyp/spec/Makefile => deleted_files/usr/src/lib/libfstyp/spec/Makefile
rename : usr/src/lib/libfstyp/spec/Makefile.targ => deleted_files/usr/src/lib/libfstyp/spec/Makefile.targ
rename : usr/src/lib/libfstyp/spec/fstyp.spec => deleted_files/usr/src/lib/libfstyp/spec/fstyp.spec
rename : usr/src/lib/libfstyp/spec/i386/Makefile => deleted_files/usr/src/lib/libfstyp/spec/i386/Makefile
rename : usr/src/lib/libfstyp/spec/sparc/Makefile => deleted_files/usr/src/lib/libfstyp/spec/sparc/Makefile
rename : usr/src/lib/libfstyp/spec/versions => deleted_files/usr/src/lib/libfstyp/spec/versions
rename : usr/src/lib/libgen/spec/Makefile => deleted_files/usr/src/lib/libgen/spec/Makefile
rename : usr/src/lib/libgen/spec/Makefile.targ => deleted_files/usr/src/lib/libgen/spec/Makefile.targ
rename : usr/src/lib/libgen/spec/amd64/Makefile => deleted_files/usr/src/lib/libgen/spec/amd64/Makefile
rename : usr/src/lib/libgen/spec/gen.spec => deleted_files/usr/src/lib/libgen/spec/gen.spec
rename : usr/src/lib/libgen/spec/i386/Makefile => deleted_files/usr/src/lib/libgen/spec/i386/Makefile
rename : usr/src/lib/libgen/spec/private.spec => deleted_files/usr/src/lib/libgen/spec/private.spec
rename : usr/src/lib/libgen/spec/sparc/Makefile => deleted_files/usr/src/lib/libgen/spec/sparc/Makefile
rename : usr/src/lib/libgen/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libgen/spec/sparcv9/Makefile
rename : usr/src/lib/libgen/spec/versions => deleted_files/usr/src/lib/libgen/spec/versions
rename : usr/src/lib/libgen/spec/weak.spec => deleted_files/usr/src/lib/libgen/spec/weak.spec
rename : usr/src/lib/libgss/spec/Makefile => deleted_files/usr/src/lib/libgss/spec/Makefile
rename : usr/src/lib/libgss/spec/Makefile.targ => deleted_files/usr/src/lib/libgss/spec/Makefile.targ
rename : usr/src/lib/libgss/spec/amd64/Makefile => deleted_files/usr/src/lib/libgss/spec/amd64/Makefile
rename : usr/src/lib/libgss/spec/gss.spec => deleted_files/usr/src/lib/libgss/spec/gss.spec
rename : usr/src/lib/libgss/spec/i386/Makefile => deleted_files/usr/src/lib/libgss/spec/i386/Makefile
rename : usr/src/lib/libgss/spec/sparc/Makefile => deleted_files/usr/src/lib/libgss/spec/sparc/Makefile
rename : usr/src/lib/libgss/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libgss/spec/sparcv9/Makefile
rename : usr/src/lib/libgss/spec/versions => deleted_files/usr/src/lib/libgss/spec/versions
rename : usr/src/lib/libinetcfg/spec/Makefile => deleted_files/usr/src/lib/libinetcfg/spec/Makefile
rename : usr/src/lib/libinetcfg/spec/Makefile.targ => deleted_files/usr/src/lib/libinetcfg/spec/Makefile.targ
rename : usr/src/lib/libinetcfg/spec/amd64/Makefile => deleted_files/usr/src/lib/libinetcfg/spec/amd64/Makefile
rename : usr/src/lib/libinetcfg/spec/i386/Makefile => deleted_files/usr/src/lib/libinetcfg/spec/i386/Makefile
rename : usr/src/lib/libinetcfg/spec/inetcfg.spec => deleted_files/usr/src/lib/libinetcfg/spec/inetcfg.spec
rename : usr/src/lib/libinetcfg/spec/sparc/Makefile => deleted_files/usr/src/lib/libinetcfg/spec/sparc/Makefile
rename : usr/src/lib/libinetcfg/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libinetcfg/spec/sparcv9/Makefile
rename : usr/src/lib/libinetcfg/spec/versions => deleted_files/usr/src/lib/libinetcfg/spec/versions
rename : usr/src/lib/libinetsvc/spec/Makefile => deleted_files/usr/src/lib/libinetsvc/spec/Makefile
rename : usr/src/lib/libinetsvc/spec/Makefile.targ => deleted_files/usr/src/lib/libinetsvc/spec/Makefile.targ
rename : usr/src/lib/libinetsvc/spec/amd64/Makefile => deleted_files/usr/src/lib/libinetsvc/spec/amd64/Makefile
rename : usr/src/lib/libinetsvc/spec/i386/Makefile => deleted_files/usr/src/lib/libinetsvc/spec/i386/Makefile
rename : usr/src/lib/libinetsvc/spec/inetsvc.spec => deleted_files/usr/src/lib/libinetsvc/spec/inetsvc.spec
rename : usr/src/lib/libinetsvc/spec/sparc/Makefile => deleted_files/usr/src/lib/libinetsvc/spec/sparc/Makefile
rename : usr/src/lib/libinetsvc/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libinetsvc/spec/sparcv9/Makefile
rename : usr/src/lib/libinetsvc/spec/versions => deleted_files/usr/src/lib/libinetsvc/spec/versions
rename : usr/src/lib/libinetutil/spec/Makefile => deleted_files/usr/src/lib/libinetutil/spec/Makefile
rename : usr/src/lib/libinetutil/spec/Makefile.targ => deleted_files/usr/src/lib/libinetutil/spec/Makefile.targ
rename : usr/src/lib/libinetutil/spec/amd64/Makefile => deleted_files/usr/src/lib/libinetutil/spec/amd64/Makefile
rename : usr/src/lib/libinetutil/spec/i386/Makefile => deleted_files/usr/src/lib/libinetutil/spec/i386/Makefile
rename : usr/src/lib/libinetutil/spec/inetutil.spec => deleted_files/usr/src/lib/libinetutil/spec/inetutil.spec
rename : usr/src/lib/libinetutil/spec/sparc/Makefile => deleted_files/usr/src/lib/libinetutil/spec/sparc/Makefile
rename : usr/src/lib/libinetutil/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libinetutil/spec/sparcv9/Makefile
rename : usr/src/lib/libinetutil/spec/versions => deleted_files/usr/src/lib/libinetutil/spec/versions
rename : usr/src/lib/libipmp/spec/Makefile => deleted_files/usr/src/lib/libipmp/spec/Makefile
rename : usr/src/lib/libipmp/spec/Makefile.targ => deleted_files/usr/src/lib/libipmp/spec/Makefile.targ
rename : usr/src/lib/libipmp/spec/amd64/Makefile => deleted_files/usr/src/lib/libipmp/spec/amd64/Makefile
rename : usr/src/lib/libipmp/spec/i386/Makefile => deleted_files/usr/src/lib/libipmp/spec/i386/Makefile
rename : usr/src/lib/libipmp/spec/ipmp.spec => deleted_files/usr/src/lib/libipmp/spec/ipmp.spec
rename : usr/src/lib/libipmp/spec/sparc/Makefile => deleted_files/usr/src/lib/libipmp/spec/sparc/Makefile
rename : usr/src/lib/libipmp/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libipmp/spec/sparcv9/Makefile
rename : usr/src/lib/libipmp/spec/versions => deleted_files/usr/src/lib/libipmp/spec/versions
rename : usr/src/lib/libipp/spec/Makefile => deleted_files/usr/src/lib/libipp/spec/Makefile
rename : usr/src/lib/libipp/spec/Makefile.targ => deleted_files/usr/src/lib/libipp/spec/Makefile.targ
rename : usr/src/lib/libipp/spec/amd64/Makefile => deleted_files/usr/src/lib/libipp/spec/amd64/Makefile
rename : usr/src/lib/libipp/spec/i386/Makefile => deleted_files/usr/src/lib/libipp/spec/i386/Makefile
rename : usr/src/lib/libipp/spec/libipp.spec => deleted_files/usr/src/lib/libipp/spec/libipp.spec
rename : usr/src/lib/libipp/spec/sparc/Makefile => deleted_files/usr/src/lib/libipp/spec/sparc/Makefile
rename : usr/src/lib/libipp/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libipp/spec/sparcv9/Makefile
rename : usr/src/lib/libipp/spec/versions => deleted_files/usr/src/lib/libipp/spec/versions
rename : usr/src/lib/libipsecutil/spec/Makefile => deleted_files/usr/src/lib/libipsecutil/spec/Makefile
rename : usr/src/lib/libipsecutil/spec/Makefile.targ => deleted_files/usr/src/lib/libipsecutil/spec/Makefile.targ
rename : usr/src/lib/libipsecutil/spec/algs.spec => deleted_files/usr/src/lib/libipsecutil/spec/algs.spec
rename : usr/src/lib/libipsecutil/spec/amd64/Makefile => deleted_files/usr/src/lib/libipsecutil/spec/amd64/Makefile
rename : usr/src/lib/libipsecutil/spec/err.spec => deleted_files/usr/src/lib/libipsecutil/spec/err.spec
rename : usr/src/lib/libipsecutil/spec/i386/Makefile => deleted_files/usr/src/lib/libipsecutil/spec/i386/Makefile
rename : usr/src/lib/libipsecutil/spec/ipsec_util.spec => deleted_files/usr/src/lib/libipsecutil/spec/ipsec_util.spec
rename : usr/src/lib/libipsecutil/spec/sparc/Makefile => deleted_files/usr/src/lib/libipsecutil/spec/sparc/Makefile
rename : usr/src/lib/libipsecutil/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libipsecutil/spec/sparcv9/Makefile
rename : usr/src/lib/libipsecutil/spec/versions => deleted_files/usr/src/lib/libipsecutil/spec/versions
rename : usr/src/lib/libkstat/spec/Makefile => deleted_files/usr/src/lib/libkstat/spec/Makefile
rename : usr/src/lib/libkstat/spec/Makefile.targ => deleted_files/usr/src/lib/libkstat/spec/Makefile.targ
rename : usr/src/lib/libkstat/spec/amd64/Makefile => deleted_files/usr/src/lib/libkstat/spec/amd64/Makefile
rename : usr/src/lib/libkstat/spec/i386/Makefile => deleted_files/usr/src/lib/libkstat/spec/i386/Makefile
rename : usr/src/lib/libkstat/spec/kstat.spec => deleted_files/usr/src/lib/libkstat/spec/kstat.spec
rename : usr/src/lib/libkstat/spec/sparc/Makefile => deleted_files/usr/src/lib/libkstat/spec/sparc/Makefile
rename : usr/src/lib/libkstat/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libkstat/spec/sparcv9/Makefile
rename : usr/src/lib/libkstat/spec/versions => deleted_files/usr/src/lib/libkstat/spec/versions
rename : usr/src/lib/libkvm/spec/Makefile => deleted_files/usr/src/lib/libkvm/spec/Makefile
rename : usr/src/lib/libkvm/spec/Makefile.targ => deleted_files/usr/src/lib/libkvm/spec/Makefile.targ
rename : usr/src/lib/libkvm/spec/amd64/Makefile => deleted_files/usr/src/lib/libkvm/spec/amd64/Makefile
rename : usr/src/lib/libkvm/spec/i386/Makefile => deleted_files/usr/src/lib/libkvm/spec/i386/Makefile
rename : usr/src/lib/libkvm/spec/kvm.spec => deleted_files/usr/src/lib/libkvm/spec/kvm.spec
rename : usr/src/lib/libkvm/spec/sparc/Makefile => deleted_files/usr/src/lib/libkvm/spec/sparc/Makefile
rename : usr/src/lib/libkvm/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libkvm/spec/sparcv9/Makefile
rename : usr/src/lib/libkvm/spec/versions => deleted_files/usr/src/lib/libkvm/spec/versions
rename : usr/src/lib/liblaadm/spec/Makefile => deleted_files/usr/src/lib/liblaadm/spec/Makefile
rename : usr/src/lib/liblaadm/spec/Makefile.targ => deleted_files/usr/src/lib/liblaadm/spec/Makefile.targ
rename : usr/src/lib/liblaadm/spec/amd64/Makefile => deleted_files/usr/src/lib/liblaadm/spec/amd64/Makefile
rename : usr/src/lib/liblaadm/spec/i386/Makefile => deleted_files/usr/src/lib/liblaadm/spec/i386/Makefile
rename : usr/src/lib/liblaadm/spec/laadm.spec => deleted_files/usr/src/lib/liblaadm/spec/laadm.spec
rename : usr/src/lib/liblaadm/spec/sparc/Makefile => deleted_files/usr/src/lib/liblaadm/spec/sparc/Makefile
rename : usr/src/lib/liblaadm/spec/sparcv9/Makefile => deleted_files/usr/src/lib/liblaadm/spec/sparcv9/Makefile
rename : usr/src/lib/liblaadm/spec/versions => deleted_files/usr/src/lib/liblaadm/spec/versions
rename : usr/src/lib/libldap4/spec/Makefile => deleted_files/usr/src/lib/libldap4/spec/Makefile
rename : usr/src/lib/libldap4/spec/Makefile.targ => deleted_files/usr/src/lib/libldap4/spec/Makefile.targ
rename : usr/src/lib/libldap4/spec/amd64/Makefile => deleted_files/usr/src/lib/libldap4/spec/amd64/Makefile
rename : usr/src/lib/libldap4/spec/i386/Makefile => deleted_files/usr/src/lib/libldap4/spec/i386/Makefile
rename : usr/src/lib/libldap4/spec/ldap.spec => deleted_files/usr/src/lib/libldap4/spec/ldap.spec
rename : usr/src/lib/libldap4/spec/sparc/Makefile => deleted_files/usr/src/lib/libldap4/spec/sparc/Makefile
rename : usr/src/lib/libldap4/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libldap4/spec/sparcv9/Makefile
rename : usr/src/lib/libldap4/spec/versions => deleted_files/usr/src/lib/libldap4/spec/versions
rename : usr/src/lib/libldap5/spec/Makefile => deleted_files/usr/src/lib/libldap5/spec/Makefile
rename : usr/src/lib/libldap5/spec/Makefile.targ => deleted_files/usr/src/lib/libldap5/spec/Makefile.targ
rename : usr/src/lib/libldap5/spec/amd64/Makefile => deleted_files/usr/src/lib/libldap5/spec/amd64/Makefile
rename : usr/src/lib/libldap5/spec/i386/Makefile => deleted_files/usr/src/lib/libldap5/spec/i386/Makefile
rename : usr/src/lib/libldap5/spec/ldap.spec => deleted_files/usr/src/lib/libldap5/spec/ldap.spec
rename : usr/src/lib/libldap5/spec/sparc/Makefile => deleted_files/usr/src/lib/libldap5/spec/sparc/Makefile
rename : usr/src/lib/libldap5/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libldap5/spec/sparcv9/Makefile
rename : usr/src/lib/libldap5/spec/versions => deleted_files/usr/src/lib/libldap5/spec/versions
rename : usr/src/lib/liblgrp/spec/Makefile => deleted_files/usr/src/lib/liblgrp/spec/Makefile
rename : usr/src/lib/liblgrp/spec/Makefile.targ => deleted_files/usr/src/lib/liblgrp/spec/Makefile.targ
rename : usr/src/lib/liblgrp/spec/amd64/Makefile => deleted_files/usr/src/lib/liblgrp/spec/amd64/Makefile
rename : usr/src/lib/liblgrp/spec/i386/Makefile => deleted_files/usr/src/lib/liblgrp/spec/i386/Makefile
rename : usr/src/lib/liblgrp/spec/lgrp.spec => deleted_files/usr/src/lib/liblgrp/spec/lgrp.spec
rename : usr/src/lib/liblgrp/spec/sparc/Makefile => deleted_files/usr/src/lib/liblgrp/spec/sparc/Makefile
rename : usr/src/lib/liblgrp/spec/sparcv9/Makefile => deleted_files/usr/src/lib/liblgrp/spec/sparcv9/Makefile
rename : usr/src/lib/liblgrp/spec/versions => deleted_files/usr/src/lib/liblgrp/spec/versions
rename : usr/src/lib/liblm/spec/Makefile => deleted_files/usr/src/lib/liblm/spec/Makefile
rename : usr/src/lib/liblm/spec/Makefile.targ => deleted_files/usr/src/lib/liblm/spec/Makefile.targ
rename : usr/src/lib/liblm/spec/amd64/Makefile => deleted_files/usr/src/lib/liblm/spec/amd64/Makefile
rename : usr/src/lib/liblm/spec/i386/Makefile => deleted_files/usr/src/lib/liblm/spec/i386/Makefile
rename : usr/src/lib/liblm/spec/lm.spec => deleted_files/usr/src/lib/liblm/spec/lm.spec
rename : usr/src/lib/liblm/spec/sparc/Makefile => deleted_files/usr/src/lib/liblm/spec/sparc/Makefile
rename : usr/src/lib/liblm/spec/sparcv9/Makefile => deleted_files/usr/src/lib/liblm/spec/sparcv9/Makefile
rename : usr/src/lib/liblm/spec/versions => deleted_files/usr/src/lib/liblm/spec/versions
rename : usr/src/lib/libmacadm/spec/Makefile => deleted_files/usr/src/lib/libmacadm/spec/Makefile
rename : usr/src/lib/libmacadm/spec/Makefile.targ => deleted_files/usr/src/lib/libmacadm/spec/Makefile.targ
rename : usr/src/lib/libmacadm/spec/amd64/Makefile => deleted_files/usr/src/lib/libmacadm/spec/amd64/Makefile
rename : usr/src/lib/libmacadm/spec/i386/Makefile => deleted_files/usr/src/lib/libmacadm/spec/i386/Makefile
rename : usr/src/lib/libmacadm/spec/macadm.spec => deleted_files/usr/src/lib/libmacadm/spec/macadm.spec
rename : usr/src/lib/libmacadm/spec/sparc/Makefile => deleted_files/usr/src/lib/libmacadm/spec/sparc/Makefile
rename : usr/src/lib/libmacadm/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libmacadm/spec/sparcv9/Makefile
rename : usr/src/lib/libmacadm/spec/versions => deleted_files/usr/src/lib/libmacadm/spec/versions
rename : usr/src/lib/libmail/spec/Makefile => deleted_files/usr/src/lib/libmail/spec/Makefile
rename : usr/src/lib/libmail/spec/Makefile.targ => deleted_files/usr/src/lib/libmail/spec/Makefile.targ
rename : usr/src/lib/libmail/spec/amd64/Makefile => deleted_files/usr/src/lib/libmail/spec/amd64/Makefile
rename : usr/src/lib/libmail/spec/i386/Makefile => deleted_files/usr/src/lib/libmail/spec/i386/Makefile
rename : usr/src/lib/libmail/spec/mail.spec => deleted_files/usr/src/lib/libmail/spec/mail.spec
rename : usr/src/lib/libmail/spec/sparc/Makefile => deleted_files/usr/src/lib/libmail/spec/sparc/Makefile
rename : usr/src/lib/libmail/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libmail/spec/sparcv9/Makefile
rename : usr/src/lib/libmail/spec/versions => deleted_files/usr/src/lib/libmail/spec/versions
rename : usr/src/lib/libmalloc/spec/Makefile => deleted_files/usr/src/lib/libmalloc/spec/Makefile
rename : usr/src/lib/libmalloc/spec/Makefile.targ => deleted_files/usr/src/lib/libmalloc/spec/Makefile.targ
rename : usr/src/lib/libmalloc/spec/amd64/Makefile => deleted_files/usr/src/lib/libmalloc/spec/amd64/Makefile
rename : usr/src/lib/libmalloc/spec/i386/Makefile => deleted_files/usr/src/lib/libmalloc/spec/i386/Makefile
rename : usr/src/lib/libmalloc/spec/malloc.spec => deleted_files/usr/src/lib/libmalloc/spec/malloc.spec
rename : usr/src/lib/libmalloc/spec/sparc/Makefile => deleted_files/usr/src/lib/libmalloc/spec/sparc/Makefile
rename : usr/src/lib/libmalloc/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libmalloc/spec/sparcv9/Makefile
rename : usr/src/lib/libmalloc/spec/versions => deleted_files/usr/src/lib/libmalloc/spec/versions
rename : usr/src/lib/libmapid/spec/Makefile => deleted_files/usr/src/lib/libmapid/spec/Makefile
rename : usr/src/lib/libmapid/spec/Makefile.targ => deleted_files/usr/src/lib/libmapid/spec/Makefile.targ
rename : usr/src/lib/libmapid/spec/i386/Makefile => deleted_files/usr/src/lib/libmapid/spec/i386/Makefile
rename : usr/src/lib/libmapid/spec/mapid.spec => deleted_files/usr/src/lib/libmapid/spec/mapid.spec
rename : usr/src/lib/libmapid/spec/sparc/Makefile => deleted_files/usr/src/lib/libmapid/spec/sparc/Makefile
rename : usr/src/lib/libmapid/spec/versions => deleted_files/usr/src/lib/libmapid/spec/versions
rename : usr/src/lib/libmapmalloc/spec/Makefile => deleted_files/usr/src/lib/libmapmalloc/spec/Makefile
rename : usr/src/lib/libmapmalloc/spec/Makefile.targ => deleted_files/usr/src/lib/libmapmalloc/spec/Makefile.targ
rename : usr/src/lib/libmapmalloc/spec/amd64/Makefile => deleted_files/usr/src/lib/libmapmalloc/spec/amd64/Makefile
rename : usr/src/lib/libmapmalloc/spec/i386/Makefile => deleted_files/usr/src/lib/libmapmalloc/spec/i386/Makefile
rename : usr/src/lib/libmapmalloc/spec/mapmalloc.spec => deleted_files/usr/src/lib/libmapmalloc/spec/mapmalloc.spec
rename : usr/src/lib/libmapmalloc/spec/sparc/Makefile => deleted_files/usr/src/lib/libmapmalloc/spec/sparc/Makefile
rename : usr/src/lib/libmapmalloc/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libmapmalloc/spec/sparcv9/Makefile
rename : usr/src/lib/libmapmalloc/spec/versions => deleted_files/usr/src/lib/libmapmalloc/spec/versions
rename : usr/src/lib/libmd/spec/Makefile => deleted_files/usr/src/lib/libmd/spec/Makefile
rename : usr/src/lib/libmd/spec/Makefile.targ => deleted_files/usr/src/lib/libmd/spec/Makefile.targ
rename : usr/src/lib/libmd/spec/amd64/Makefile => deleted_files/usr/src/lib/libmd/spec/amd64/Makefile
rename : usr/src/lib/libmd/spec/i386/Makefile => deleted_files/usr/src/lib/libmd/spec/i386/Makefile
rename : usr/src/lib/libmd/spec/md.spec => deleted_files/usr/src/lib/libmd/spec/md.spec
rename : usr/src/lib/libmd/spec/sparc/Makefile => deleted_files/usr/src/lib/libmd/spec/sparc/Makefile
rename : usr/src/lib/libmd/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libmd/spec/sparcv9/Makefile
rename : usr/src/lib/libmd/spec/versions => deleted_files/usr/src/lib/libmd/spec/versions
rename : usr/src/lib/libmp/spec/Makefile => deleted_files/usr/src/lib/libmp/spec/Makefile
rename : usr/src/lib/libmp/spec/Makefile.targ => deleted_files/usr/src/lib/libmp/spec/Makefile.targ
rename : usr/src/lib/libmp/spec/amd64/Makefile => deleted_files/usr/src/lib/libmp/spec/amd64/Makefile
rename : usr/src/lib/libmp/spec/i386/Makefile => deleted_files/usr/src/lib/libmp/spec/i386/Makefile
rename : usr/src/lib/libmp/spec/mp.spec => deleted_files/usr/src/lib/libmp/spec/mp.spec
rename : usr/src/lib/libmp/spec/mp_1.spec => deleted_files/usr/src/lib/libmp/spec/mp_1.spec
rename : usr/src/lib/libmp/spec/sparc/Makefile => deleted_files/usr/src/lib/libmp/spec/sparc/Makefile
rename : usr/src/lib/libmp/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libmp/spec/sparcv9/Makefile
rename : usr/src/lib/libmp/spec/versions => deleted_files/usr/src/lib/libmp/spec/versions
rename : usr/src/lib/libmtmalloc/spec/Makefile => deleted_files/usr/src/lib/libmtmalloc/spec/Makefile
rename : usr/src/lib/libmtmalloc/spec/Makefile.targ => deleted_files/usr/src/lib/libmtmalloc/spec/Makefile.targ
rename : usr/src/lib/libmtmalloc/spec/amd64/Makefile => deleted_files/usr/src/lib/libmtmalloc/spec/amd64/Makefile
rename : usr/src/lib/libmtmalloc/spec/i386/Makefile => deleted_files/usr/src/lib/libmtmalloc/spec/i386/Makefile
rename : usr/src/lib/libmtmalloc/spec/mtmalloc.spec => deleted_files/usr/src/lib/libmtmalloc/spec/mtmalloc.spec
rename : usr/src/lib/libmtmalloc/spec/sparc/Makefile => deleted_files/usr/src/lib/libmtmalloc/spec/sparc/Makefile
rename : usr/src/lib/libmtmalloc/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libmtmalloc/spec/sparcv9/Makefile
rename : usr/src/lib/libmtmalloc/spec/versions => deleted_files/usr/src/lib/libmtmalloc/spec/versions
rename : usr/src/lib/libnisdb/spec/Makefile => deleted_files/usr/src/lib/libnisdb/spec/Makefile
rename : usr/src/lib/libnisdb/spec/Makefile.targ => deleted_files/usr/src/lib/libnisdb/spec/Makefile.targ
rename : usr/src/lib/libnisdb/spec/amd64/Makefile => deleted_files/usr/src/lib/libnisdb/spec/amd64/Makefile
rename : usr/src/lib/libnisdb/spec/i386/Makefile => deleted_files/usr/src/lib/libnisdb/spec/i386/Makefile
rename : usr/src/lib/libnisdb/spec/nisdb.spec => deleted_files/usr/src/lib/libnisdb/spec/nisdb.spec
rename : usr/src/lib/libnisdb/spec/sparc/Makefile => deleted_files/usr/src/lib/libnisdb/spec/sparc/Makefile
rename : usr/src/lib/libnisdb/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libnisdb/spec/sparcv9/Makefile
rename : usr/src/lib/libnisdb/spec/versions => deleted_files/usr/src/lib/libnisdb/spec/versions
rename : usr/src/lib/libnls/spec/Makefile => deleted_files/usr/src/lib/libnls/spec/Makefile
rename : usr/src/lib/libnls/spec/Makefile.targ => deleted_files/usr/src/lib/libnls/spec/Makefile.targ
rename : usr/src/lib/libnls/spec/amd64/Makefile => deleted_files/usr/src/lib/libnls/spec/amd64/Makefile
rename : usr/src/lib/libnls/spec/i386/Makefile => deleted_files/usr/src/lib/libnls/spec/i386/Makefile
rename : usr/src/lib/libnls/spec/nls.spec => deleted_files/usr/src/lib/libnls/spec/nls.spec
rename : usr/src/lib/libnls/spec/sparc/Makefile => deleted_files/usr/src/lib/libnls/spec/sparc/Makefile
rename : usr/src/lib/libnls/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libnls/spec/sparcv9/Makefile
rename : usr/src/lib/libnls/spec/versions => deleted_files/usr/src/lib/libnls/spec/versions
rename : usr/src/lib/libnsl/spec/Makefile => deleted_files/usr/src/lib/libnsl/spec/Makefile
rename : usr/src/lib/libnsl/spec/Makefile.targ => deleted_files/usr/src/lib/libnsl/spec/Makefile.targ
rename : usr/src/lib/libnsl/spec/amd64/Makefile => deleted_files/usr/src/lib/libnsl/spec/amd64/Makefile
rename : usr/src/lib/libnsl/spec/des.spec => deleted_files/usr/src/lib/libnsl/spec/des.spec
rename : usr/src/lib/libnsl/spec/dial.spec => deleted_files/usr/src/lib/libnsl/spec/dial.spec
rename : usr/src/lib/libnsl/spec/i386/Makefile => deleted_files/usr/src/lib/libnsl/spec/i386/Makefile
rename : usr/src/lib/libnsl/spec/inet.spec => deleted_files/usr/src/lib/libnsl/spec/inet.spec
rename : usr/src/lib/libnsl/spec/ipsec.spec => deleted_files/usr/src/lib/libnsl/spec/ipsec.spec
rename : usr/src/lib/libnsl/spec/netdir.spec => deleted_files/usr/src/lib/libnsl/spec/netdir.spec
rename : usr/src/lib/libnsl/spec/nis.spec => deleted_files/usr/src/lib/libnsl/spec/nis.spec
rename : usr/src/lib/libnsl/spec/nsl.spec => deleted_files/usr/src/lib/libnsl/spec/nsl.spec
rename : usr/src/lib/libnsl/spec/private.spec => deleted_files/usr/src/lib/libnsl/spec/private.spec
rename : usr/src/lib/libnsl/spec/rpc.spec => deleted_files/usr/src/lib/libnsl/spec/rpc.spec
rename : usr/src/lib/libnsl/spec/sparc/Makefile => deleted_files/usr/src/lib/libnsl/spec/sparc/Makefile
rename : usr/src/lib/libnsl/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libnsl/spec/sparcv9/Makefile
rename : usr/src/lib/libnsl/spec/tli.spec => deleted_files/usr/src/lib/libnsl/spec/tli.spec
rename : usr/src/lib/libnsl/spec/versions => deleted_files/usr/src/lib/libnsl/spec/versions
rename : usr/src/lib/libnsl/spec/xdr.spec => deleted_files/usr/src/lib/libnsl/spec/xdr.spec
rename : usr/src/lib/libnsl/spec/xti.spec => deleted_files/usr/src/lib/libnsl/spec/xti.spec
rename : usr/src/lib/libnsl/spec/yp.spec => deleted_files/usr/src/lib/libnsl/spec/yp.spec
rename : usr/src/lib/libnvpair/spec/Makefile => deleted_files/usr/src/lib/libnvpair/spec/Makefile
rename : usr/src/lib/libnvpair/spec/Makefile.targ => deleted_files/usr/src/lib/libnvpair/spec/Makefile.targ
rename : usr/src/lib/libnvpair/spec/amd64/Makefile => deleted_files/usr/src/lib/libnvpair/spec/amd64/Makefile
rename : usr/src/lib/libnvpair/spec/i386/Makefile => deleted_files/usr/src/lib/libnvpair/spec/i386/Makefile
rename : usr/src/lib/libnvpair/spec/nvpair.spec => deleted_files/usr/src/lib/libnvpair/spec/nvpair.spec
rename : usr/src/lib/libnvpair/spec/sparc/Makefile => deleted_files/usr/src/lib/libnvpair/spec/sparc/Makefile
rename : usr/src/lib/libnvpair/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libnvpair/spec/sparcv9/Makefile
rename : usr/src/lib/libnvpair/spec/versions => deleted_files/usr/src/lib/libnvpair/spec/versions
rename : usr/src/lib/libpam/spec/Makefile => deleted_files/usr/src/lib/libpam/spec/Makefile
rename : usr/src/lib/libpam/spec/Makefile.targ => deleted_files/usr/src/lib/libpam/spec/Makefile.targ
rename : usr/src/lib/libpam/spec/amd64/Makefile => deleted_files/usr/src/lib/libpam/spec/amd64/Makefile
rename : usr/src/lib/libpam/spec/i386/Makefile => deleted_files/usr/src/lib/libpam/spec/i386/Makefile
rename : usr/src/lib/libpam/spec/pam.spec => deleted_files/usr/src/lib/libpam/spec/pam.spec
rename : usr/src/lib/libpam/spec/sparc/Makefile => deleted_files/usr/src/lib/libpam/spec/sparc/Makefile
rename : usr/src/lib/libpam/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libpam/spec/sparcv9/Makefile
rename : usr/src/lib/libpam/spec/versions => deleted_files/usr/src/lib/libpam/spec/versions
rename : usr/src/lib/libpctx/spec/Makefile => deleted_files/usr/src/lib/libpctx/spec/Makefile
rename : usr/src/lib/libpctx/spec/Makefile.targ => deleted_files/usr/src/lib/libpctx/spec/Makefile.targ
rename : usr/src/lib/libpctx/spec/amd64/Makefile => deleted_files/usr/src/lib/libpctx/spec/amd64/Makefile
rename : usr/src/lib/libpctx/spec/i386/Makefile => deleted_files/usr/src/lib/libpctx/spec/i386/Makefile
rename : usr/src/lib/libpctx/spec/pctx.spec => deleted_files/usr/src/lib/libpctx/spec/pctx.spec
rename : usr/src/lib/libpctx/spec/sparc/Makefile => deleted_files/usr/src/lib/libpctx/spec/sparc/Makefile
rename : usr/src/lib/libpctx/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libpctx/spec/sparcv9/Makefile
rename : usr/src/lib/libpctx/spec/versions => deleted_files/usr/src/lib/libpctx/spec/versions
rename : usr/src/lib/libpicl/spec/Makefile => deleted_files/usr/src/lib/libpicl/spec/Makefile
rename : usr/src/lib/libpicl/spec/Makefile.targ => deleted_files/usr/src/lib/libpicl/spec/Makefile.targ
rename : usr/src/lib/libpicl/spec/amd64/Makefile => deleted_files/usr/src/lib/libpicl/spec/amd64/Makefile
rename : usr/src/lib/libpicl/spec/i386/Makefile => deleted_files/usr/src/lib/libpicl/spec/i386/Makefile
rename : usr/src/lib/libpicl/spec/picl.spec => deleted_files/usr/src/lib/libpicl/spec/picl.spec
rename : usr/src/lib/libpicl/spec/sparc/Makefile => deleted_files/usr/src/lib/libpicl/spec/sparc/Makefile
rename : usr/src/lib/libpicl/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libpicl/spec/sparcv9/Makefile
rename : usr/src/lib/libpicl/spec/versions => deleted_files/usr/src/lib/libpicl/spec/versions
rename : usr/src/lib/libpicltree/spec/Makefile => deleted_files/usr/src/lib/libpicltree/spec/Makefile
rename : usr/src/lib/libpicltree/spec/Makefile.targ => deleted_files/usr/src/lib/libpicltree/spec/Makefile.targ
rename : usr/src/lib/libpicltree/spec/i386/Makefile => deleted_files/usr/src/lib/libpicltree/spec/i386/Makefile
rename : usr/src/lib/libpicltree/spec/picltree.spec => deleted_files/usr/src/lib/libpicltree/spec/picltree.spec
rename : usr/src/lib/libpicltree/spec/sparc/Makefile => deleted_files/usr/src/lib/libpicltree/spec/sparc/Makefile
rename : usr/src/lib/libpicltree/spec/versions => deleted_files/usr/src/lib/libpicltree/spec/versions
rename : usr/src/lib/libplot/plot/spec/Makefile => deleted_files/usr/src/lib/libplot/plot/spec/Makefile
rename : usr/src/lib/libplot/plot/spec/Makefile.targ => deleted_files/usr/src/lib/libplot/plot/spec/Makefile.targ
rename : usr/src/lib/libplot/plot/spec/amd64/Makefile => deleted_files/usr/src/lib/libplot/plot/spec/amd64/Makefile
rename : usr/src/lib/libplot/plot/spec/i386/Makefile => deleted_files/usr/src/lib/libplot/plot/spec/i386/Makefile
rename : usr/src/lib/libplot/plot/spec/plot.spec => deleted_files/usr/src/lib/libplot/plot/spec/plot.spec
rename : usr/src/lib/libplot/plot/spec/sparc/Makefile => deleted_files/usr/src/lib/libplot/plot/spec/sparc/Makefile
rename : usr/src/lib/libplot/plot/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libplot/plot/spec/sparcv9/Makefile
rename : usr/src/lib/libplot/plot/spec/versions => deleted_files/usr/src/lib/libplot/plot/spec/versions
rename : usr/src/lib/libplot/t300/spec/Makefile => deleted_files/usr/src/lib/libplot/t300/spec/Makefile
rename : usr/src/lib/libplot/t300/spec/Makefile.targ => deleted_files/usr/src/lib/libplot/t300/spec/Makefile.targ
rename : usr/src/lib/libplot/t300/spec/amd64/Makefile => deleted_files/usr/src/lib/libplot/t300/spec/amd64/Makefile
rename : usr/src/lib/libplot/t300/spec/i386/Makefile => deleted_files/usr/src/lib/libplot/t300/spec/i386/Makefile
rename : usr/src/lib/libplot/t300/spec/sparc/Makefile => deleted_files/usr/src/lib/libplot/t300/spec/sparc/Makefile
rename : usr/src/lib/libplot/t300/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libplot/t300/spec/sparcv9/Makefile
rename : usr/src/lib/libplot/t300/spec/t300.spec => deleted_files/usr/src/lib/libplot/t300/spec/t300.spec
rename : usr/src/lib/libplot/t300/spec/versions => deleted_files/usr/src/lib/libplot/t300/spec/versions
rename : usr/src/lib/libplot/t300s/spec/Makefile => deleted_files/usr/src/lib/libplot/t300s/spec/Makefile
rename : usr/src/lib/libplot/t300s/spec/Makefile.targ => deleted_files/usr/src/lib/libplot/t300s/spec/Makefile.targ
rename : usr/src/lib/libplot/t300s/spec/amd64/Makefile => deleted_files/usr/src/lib/libplot/t300s/spec/amd64/Makefile
rename : usr/src/lib/libplot/t300s/spec/i386/Makefile => deleted_files/usr/src/lib/libplot/t300s/spec/i386/Makefile
rename : usr/src/lib/libplot/t300s/spec/sparc/Makefile => deleted_files/usr/src/lib/libplot/t300s/spec/sparc/Makefile
rename : usr/src/lib/libplot/t300s/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libplot/t300s/spec/sparcv9/Makefile
rename : usr/src/lib/libplot/t300s/spec/t300s.spec => deleted_files/usr/src/lib/libplot/t300s/spec/t300s.spec
rename : usr/src/lib/libplot/t300s/spec/versions => deleted_files/usr/src/lib/libplot/t300s/spec/versions
rename : usr/src/lib/libplot/t4014/spec/Makefile => deleted_files/usr/src/lib/libplot/t4014/spec/Makefile
rename : usr/src/lib/libplot/t4014/spec/Makefile.targ => deleted_files/usr/src/lib/libplot/t4014/spec/Makefile.targ
rename : usr/src/lib/libplot/t4014/spec/amd64/Makefile => deleted_files/usr/src/lib/libplot/t4014/spec/amd64/Makefile
rename : usr/src/lib/libplot/t4014/spec/i386/Makefile => deleted_files/usr/src/lib/libplot/t4014/spec/i386/Makefile
rename : usr/src/lib/libplot/t4014/spec/sparc/Makefile => deleted_files/usr/src/lib/libplot/t4014/spec/sparc/Makefile
rename : usr/src/lib/libplot/t4014/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libplot/t4014/spec/sparcv9/Makefile
rename : usr/src/lib/libplot/t4014/spec/t4014.spec => deleted_files/usr/src/lib/libplot/t4014/spec/t4014.spec
rename : usr/src/lib/libplot/t4014/spec/versions => deleted_files/usr/src/lib/libplot/t4014/spec/versions
rename : usr/src/lib/libplot/t450/spec/Makefile => deleted_files/usr/src/lib/libplot/t450/spec/Makefile
rename : usr/src/lib/libplot/t450/spec/Makefile.targ => deleted_files/usr/src/lib/libplot/t450/spec/Makefile.targ
rename : usr/src/lib/libplot/t450/spec/amd64/Makefile => deleted_files/usr/src/lib/libplot/t450/spec/amd64/Makefile
rename : usr/src/lib/libplot/t450/spec/i386/Makefile => deleted_files/usr/src/lib/libplot/t450/spec/i386/Makefile
rename : usr/src/lib/libplot/t450/spec/sparc/Makefile => deleted_files/usr/src/lib/libplot/t450/spec/sparc/Makefile
rename : usr/src/lib/libplot/t450/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libplot/t450/spec/sparcv9/Makefile
rename : usr/src/lib/libplot/t450/spec/t450.spec => deleted_files/usr/src/lib/libplot/t450/spec/t450.spec
rename : usr/src/lib/libplot/t450/spec/versions => deleted_files/usr/src/lib/libplot/t450/spec/versions
rename : usr/src/lib/libplot/vt0/spec/Makefile => deleted_files/usr/src/lib/libplot/vt0/spec/Makefile
rename : usr/src/lib/libplot/vt0/spec/Makefile.targ => deleted_files/usr/src/lib/libplot/vt0/spec/Makefile.targ
rename : usr/src/lib/libplot/vt0/spec/amd64/Makefile => deleted_files/usr/src/lib/libplot/vt0/spec/amd64/Makefile
rename : usr/src/lib/libplot/vt0/spec/i386/Makefile => deleted_files/usr/src/lib/libplot/vt0/spec/i386/Makefile
rename : usr/src/lib/libplot/vt0/spec/sparc/Makefile => deleted_files/usr/src/lib/libplot/vt0/spec/sparc/Makefile
rename : usr/src/lib/libplot/vt0/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libplot/vt0/spec/sparcv9/Makefile
rename : usr/src/lib/libplot/vt0/spec/versions => deleted_files/usr/src/lib/libplot/vt0/spec/versions
rename : usr/src/lib/libplot/vt0/spec/vt0.spec => deleted_files/usr/src/lib/libplot/vt0/spec/vt0.spec
rename : usr/src/lib/libpool/spec/Makefile => deleted_files/usr/src/lib/libpool/spec/Makefile
rename : usr/src/lib/libpool/spec/Makefile.targ => deleted_files/usr/src/lib/libpool/spec/Makefile.targ
rename : usr/src/lib/libpool/spec/amd64/Makefile => deleted_files/usr/src/lib/libpool/spec/amd64/Makefile
rename : usr/src/lib/libpool/spec/i386/Makefile => deleted_files/usr/src/lib/libpool/spec/i386/Makefile
rename : usr/src/lib/libpool/spec/pool.spec => deleted_files/usr/src/lib/libpool/spec/pool.spec
rename : usr/src/lib/libpool/spec/sparc/Makefile => deleted_files/usr/src/lib/libpool/spec/sparc/Makefile
rename : usr/src/lib/libpool/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libpool/spec/sparcv9/Makefile
rename : usr/src/lib/libpool/spec/versions => deleted_files/usr/src/lib/libpool/spec/versions
rename : usr/src/lib/libproc/spec/Makefile => deleted_files/usr/src/lib/libproc/spec/Makefile
rename : usr/src/lib/libproc/spec/Makefile.targ => deleted_files/usr/src/lib/libproc/spec/Makefile.targ
rename : usr/src/lib/libproc/spec/amd64/Makefile => deleted_files/usr/src/lib/libproc/spec/amd64/Makefile
rename : usr/src/lib/libproc/spec/i386/Makefile => deleted_files/usr/src/lib/libproc/spec/i386/Makefile
rename : usr/src/lib/libproc/spec/proc.spec => deleted_files/usr/src/lib/libproc/spec/proc.spec
rename : usr/src/lib/libproc/spec/sparc/Makefile => deleted_files/usr/src/lib/libproc/spec/sparc/Makefile
rename : usr/src/lib/libproc/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libproc/spec/sparcv9/Makefile
rename : usr/src/lib/libproc/spec/versions => deleted_files/usr/src/lib/libproc/spec/versions
rename : usr/src/lib/libproject/spec/Makefile => deleted_files/usr/src/lib/libproject/spec/Makefile
rename : usr/src/lib/libproject/spec/Makefile.targ => deleted_files/usr/src/lib/libproject/spec/Makefile.targ
rename : usr/src/lib/libproject/spec/amd64/Makefile => deleted_files/usr/src/lib/libproject/spec/amd64/Makefile
rename : usr/src/lib/libproject/spec/i386/Makefile => deleted_files/usr/src/lib/libproject/spec/i386/Makefile
rename : usr/src/lib/libproject/spec/project.spec => deleted_files/usr/src/lib/libproject/spec/project.spec
rename : usr/src/lib/libproject/spec/sparc/Makefile => deleted_files/usr/src/lib/libproject/spec/sparc/Makefile
rename : usr/src/lib/libproject/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libproject/spec/sparcv9/Makefile
rename : usr/src/lib/libproject/spec/versions => deleted_files/usr/src/lib/libproject/spec/versions
rename : usr/src/lib/librcm/spec/Makefile => deleted_files/usr/src/lib/librcm/spec/Makefile
rename : usr/src/lib/librcm/spec/Makefile.targ => deleted_files/usr/src/lib/librcm/spec/Makefile.targ
rename : usr/src/lib/librcm/spec/amd64/Makefile => deleted_files/usr/src/lib/librcm/spec/amd64/Makefile
rename : usr/src/lib/librcm/spec/i386/Makefile => deleted_files/usr/src/lib/librcm/spec/i386/Makefile
rename : usr/src/lib/librcm/spec/rcm.spec => deleted_files/usr/src/lib/librcm/spec/rcm.spec
rename : usr/src/lib/librcm/spec/rcm_event.spec => deleted_files/usr/src/lib/librcm/spec/rcm_event.spec
rename : usr/src/lib/librcm/spec/sparc/Makefile => deleted_files/usr/src/lib/librcm/spec/sparc/Makefile
rename : usr/src/lib/librcm/spec/sparcv9/Makefile => deleted_files/usr/src/lib/librcm/spec/sparcv9/Makefile
rename : usr/src/lib/librcm/spec/versions => deleted_files/usr/src/lib/librcm/spec/versions
rename : usr/src/lib/libresolv/spec/Makefile => deleted_files/usr/src/lib/libresolv/spec/Makefile
rename : usr/src/lib/libresolv/spec/Makefile.targ => deleted_files/usr/src/lib/libresolv/spec/Makefile.targ
rename : usr/src/lib/libresolv/spec/amd64/Makefile => deleted_files/usr/src/lib/libresolv/spec/amd64/Makefile
rename : usr/src/lib/libresolv/spec/i386/Makefile => deleted_files/usr/src/lib/libresolv/spec/i386/Makefile
rename : usr/src/lib/libresolv/spec/res_mkquery.spec => deleted_files/usr/src/lib/libresolv/spec/res_mkquery.spec
rename : usr/src/lib/libresolv/spec/resolv.spec => deleted_files/usr/src/lib/libresolv/spec/resolv.spec
rename : usr/src/lib/libresolv/spec/sparc/Makefile => deleted_files/usr/src/lib/libresolv/spec/sparc/Makefile
rename : usr/src/lib/libresolv/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libresolv/spec/sparcv9/Makefile
rename : usr/src/lib/libresolv/spec/versions => deleted_files/usr/src/lib/libresolv/spec/versions
rename : usr/src/lib/libresolv2/cylink/spec/Makefile => deleted_files/usr/src/lib/libresolv2/cylink/spec/Makefile
rename : usr/src/lib/libresolv2/cylink/spec/Makefile.targ => deleted_files/usr/src/lib/libresolv2/cylink/spec/Makefile.targ
rename : usr/src/lib/libresolv2/cylink/spec/amd64/Makefile => deleted_files/usr/src/lib/libresolv2/cylink/spec/amd64/Makefile
rename : usr/src/lib/libresolv2/cylink/spec/cylink.spec => deleted_files/usr/src/lib/libresolv2/cylink/spec/cylink.spec
rename : usr/src/lib/libresolv2/cylink/spec/i386/Makefile => deleted_files/usr/src/lib/libresolv2/cylink/spec/i386/Makefile
rename : usr/src/lib/libresolv2/cylink/spec/sparc/Makefile => deleted_files/usr/src/lib/libresolv2/cylink/spec/sparc/Makefile
rename : usr/src/lib/libresolv2/cylink/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libresolv2/cylink/spec/sparcv9/Makefile
rename : usr/src/lib/libresolv2/cylink/spec/versions => deleted_files/usr/src/lib/libresolv2/cylink/spec/versions
rename : usr/src/lib/libresolv2/dnssafe/spec/Makefile => deleted_files/usr/src/lib/libresolv2/dnssafe/spec/Makefile
rename : usr/src/lib/libresolv2/dnssafe/spec/Makefile.targ => deleted_files/usr/src/lib/libresolv2/dnssafe/spec/Makefile.targ
rename : usr/src/lib/libresolv2/dnssafe/spec/amd64/Makefile => deleted_files/usr/src/lib/libresolv2/dnssafe/spec/amd64/Makefile
rename : usr/src/lib/libresolv2/dnssafe/spec/dnssafe.spec => deleted_files/usr/src/lib/libresolv2/dnssafe/spec/dnssafe.spec
rename : usr/src/lib/libresolv2/dnssafe/spec/i386/Makefile => deleted_files/usr/src/lib/libresolv2/dnssafe/spec/i386/Makefile
rename : usr/src/lib/libresolv2/dnssafe/spec/sparc/Makefile => deleted_files/usr/src/lib/libresolv2/dnssafe/spec/sparc/Makefile
rename : usr/src/lib/libresolv2/dnssafe/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libresolv2/dnssafe/spec/sparcv9/Makefile
rename : usr/src/lib/libresolv2/dnssafe/spec/versions => deleted_files/usr/src/lib/libresolv2/dnssafe/spec/versions
rename : usr/src/lib/libresolv2/irs/spec/Makefile => deleted_files/usr/src/lib/libresolv2/irs/spec/Makefile
rename : usr/src/lib/libresolv2/irs/spec/Makefile.targ => deleted_files/usr/src/lib/libresolv2/irs/spec/Makefile.targ
rename : usr/src/lib/libresolv2/irs/spec/amd64/Makefile => deleted_files/usr/src/lib/libresolv2/irs/spec/amd64/Makefile
rename : usr/src/lib/libresolv2/irs/spec/i386/Makefile => deleted_files/usr/src/lib/libresolv2/irs/spec/i386/Makefile
rename : usr/src/lib/libresolv2/irs/spec/irs.spec => deleted_files/usr/src/lib/libresolv2/irs/spec/irs.spec
rename : usr/src/lib/libresolv2/irs/spec/sparc/Makefile => deleted_files/usr/src/lib/libresolv2/irs/spec/sparc/Makefile
rename : usr/src/lib/libresolv2/irs/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libresolv2/irs/spec/sparcv9/Makefile
rename : usr/src/lib/libresolv2/irs/spec/versions => deleted_files/usr/src/lib/libresolv2/irs/spec/versions
rename : usr/src/lib/libresolv2/spec/Makefile => deleted_files/usr/src/lib/libresolv2/spec/Makefile
rename : usr/src/lib/libresolv2/spec/Makefile.targ => deleted_files/usr/src/lib/libresolv2/spec/Makefile.targ
rename : usr/src/lib/libresolv2/spec/amd64/Makefile => deleted_files/usr/src/lib/libresolv2/spec/amd64/Makefile
rename : usr/src/lib/libresolv2/spec/i386/Makefile => deleted_files/usr/src/lib/libresolv2/spec/i386/Makefile
rename : usr/src/lib/libresolv2/spec/resolv2.spec => deleted_files/usr/src/lib/libresolv2/spec/resolv2.spec
rename : usr/src/lib/libresolv2/spec/sparc/Makefile => deleted_files/usr/src/lib/libresolv2/spec/sparc/Makefile
rename : usr/src/lib/libresolv2/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libresolv2/spec/sparcv9/Makefile
rename : usr/src/lib/libresolv2/spec/versions => deleted_files/usr/src/lib/libresolv2/spec/versions
rename : usr/src/lib/librestart/spec/Makefile => deleted_files/usr/src/lib/librestart/spec/Makefile
rename : usr/src/lib/librestart/spec/Makefile.targ => deleted_files/usr/src/lib/librestart/spec/Makefile.targ
rename : usr/src/lib/librestart/spec/amd64/Makefile => deleted_files/usr/src/lib/librestart/spec/amd64/Makefile
rename : usr/src/lib/librestart/spec/i386/Makefile => deleted_files/usr/src/lib/librestart/spec/i386/Makefile
rename : usr/src/lib/librestart/spec/librestart.spec => deleted_files/usr/src/lib/librestart/spec/librestart.spec
rename : usr/src/lib/librestart/spec/sparc/Makefile => deleted_files/usr/src/lib/librestart/spec/sparc/Makefile
rename : usr/src/lib/librestart/spec/sparcv9/Makefile => deleted_files/usr/src/lib/librestart/spec/sparcv9/Makefile
rename : usr/src/lib/librestart/spec/versions => deleted_files/usr/src/lib/librestart/spec/versions
rename : usr/src/lib/librpcsvc/spec/Makefile => deleted_files/usr/src/lib/librpcsvc/spec/Makefile
rename : usr/src/lib/librpcsvc/spec/Makefile.targ => deleted_files/usr/src/lib/librpcsvc/spec/Makefile.targ
rename : usr/src/lib/librpcsvc/spec/amd64/Makefile => deleted_files/usr/src/lib/librpcsvc/spec/amd64/Makefile
rename : usr/src/lib/librpcsvc/spec/i386/Makefile => deleted_files/usr/src/lib/librpcsvc/spec/i386/Makefile
rename : usr/src/lib/librpcsvc/spec/rpcsvc.spec => deleted_files/usr/src/lib/librpcsvc/spec/rpcsvc.spec
rename : usr/src/lib/librpcsvc/spec/sparc/Makefile => deleted_files/usr/src/lib/librpcsvc/spec/sparc/Makefile
rename : usr/src/lib/librpcsvc/spec/sparcv9/Makefile => deleted_files/usr/src/lib/librpcsvc/spec/sparcv9/Makefile
rename : usr/src/lib/librpcsvc/spec/versions => deleted_files/usr/src/lib/librpcsvc/spec/versions
rename : usr/src/lib/librsm/spec/Makefile => deleted_files/usr/src/lib/librsm/spec/Makefile
rename : usr/src/lib/librsm/spec/Makefile.targ => deleted_files/usr/src/lib/librsm/spec/Makefile.targ
rename : usr/src/lib/librsm/spec/amd64/Makefile => deleted_files/usr/src/lib/librsm/spec/amd64/Makefile
rename : usr/src/lib/librsm/spec/i386/Makefile => deleted_files/usr/src/lib/librsm/spec/i386/Makefile
rename : usr/src/lib/librsm/spec/rsm.spec => deleted_files/usr/src/lib/librsm/spec/rsm.spec
rename : usr/src/lib/librsm/spec/sparc/Makefile => deleted_files/usr/src/lib/librsm/spec/sparc/Makefile
rename : usr/src/lib/librsm/spec/sparcv9/Makefile => deleted_files/usr/src/lib/librsm/spec/sparcv9/Makefile
rename : usr/src/lib/librsm/spec/versions => deleted_files/usr/src/lib/librsm/spec/versions
rename : usr/src/lib/libsasl/spec/Makefile => deleted_files/usr/src/lib/libsasl/spec/Makefile
rename : usr/src/lib/libsasl/spec/Makefile.targ => deleted_files/usr/src/lib/libsasl/spec/Makefile.targ
rename : usr/src/lib/libsasl/spec/amd64/Makefile => deleted_files/usr/src/lib/libsasl/spec/amd64/Makefile
rename : usr/src/lib/libsasl/spec/i386/Makefile => deleted_files/usr/src/lib/libsasl/spec/i386/Makefile
rename : usr/src/lib/libsasl/spec/sasl.spec => deleted_files/usr/src/lib/libsasl/spec/sasl.spec
rename : usr/src/lib/libsasl/spec/sparc/Makefile => deleted_files/usr/src/lib/libsasl/spec/sparc/Makefile
rename : usr/src/lib/libsasl/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsasl/spec/sparcv9/Makefile
rename : usr/src/lib/libsasl/spec/versions => deleted_files/usr/src/lib/libsasl/spec/versions
rename : usr/src/lib/libscf/spec/Makefile => deleted_files/usr/src/lib/libscf/spec/Makefile
rename : usr/src/lib/libscf/spec/Makefile.targ => deleted_files/usr/src/lib/libscf/spec/Makefile.targ
rename : usr/src/lib/libscf/spec/amd64/Makefile => deleted_files/usr/src/lib/libscf/spec/amd64/Makefile
rename : usr/src/lib/libscf/spec/i386/Makefile => deleted_files/usr/src/lib/libscf/spec/i386/Makefile
rename : usr/src/lib/libscf/spec/lowlevel.spec => deleted_files/usr/src/lib/libscf/spec/lowlevel.spec
rename : usr/src/lib/libscf/spec/midlevel.spec => deleted_files/usr/src/lib/libscf/spec/midlevel.spec
rename : usr/src/lib/libscf/spec/sparc/Makefile => deleted_files/usr/src/lib/libscf/spec/sparc/Makefile
rename : usr/src/lib/libscf/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libscf/spec/sparcv9/Makefile
rename : usr/src/lib/libscf/spec/versions => deleted_files/usr/src/lib/libscf/spec/versions
rename : usr/src/lib/libsctp/spec/Makefile => deleted_files/usr/src/lib/libsctp/spec/Makefile
rename : usr/src/lib/libsctp/spec/Makefile.targ => deleted_files/usr/src/lib/libsctp/spec/Makefile.targ
rename : usr/src/lib/libsctp/spec/amd64/Makefile => deleted_files/usr/src/lib/libsctp/spec/amd64/Makefile
rename : usr/src/lib/libsctp/spec/i386/Makefile => deleted_files/usr/src/lib/libsctp/spec/i386/Makefile
rename : usr/src/lib/libsctp/spec/sctp.spec => deleted_files/usr/src/lib/libsctp/spec/sctp.spec
rename : usr/src/lib/libsctp/spec/sparc/Makefile => deleted_files/usr/src/lib/libsctp/spec/sparc/Makefile
rename : usr/src/lib/libsctp/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsctp/spec/sparcv9/Makefile
rename : usr/src/lib/libsctp/spec/versions => deleted_files/usr/src/lib/libsctp/spec/versions
rename : usr/src/lib/libsec/spec/Makefile => deleted_files/usr/src/lib/libsec/spec/Makefile
rename : usr/src/lib/libsec/spec/Makefile.targ => deleted_files/usr/src/lib/libsec/spec/Makefile.targ
rename : usr/src/lib/libsec/spec/acl.spec => deleted_files/usr/src/lib/libsec/spec/acl.spec
rename : usr/src/lib/libsec/spec/amd64/Makefile => deleted_files/usr/src/lib/libsec/spec/amd64/Makefile
rename : usr/src/lib/libsec/spec/i386/Makefile => deleted_files/usr/src/lib/libsec/spec/i386/Makefile
rename : usr/src/lib/libsec/spec/sparc/Makefile => deleted_files/usr/src/lib/libsec/spec/sparc/Makefile
rename : usr/src/lib/libsec/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsec/spec/sparcv9/Makefile
rename : usr/src/lib/libsec/spec/versions => deleted_files/usr/src/lib/libsec/spec/versions
rename : usr/src/lib/libsecdb/spec/Makefile => deleted_files/usr/src/lib/libsecdb/spec/Makefile
rename : usr/src/lib/libsecdb/spec/Makefile.targ => deleted_files/usr/src/lib/libsecdb/spec/Makefile.targ
rename : usr/src/lib/libsecdb/spec/amd64/Makefile => deleted_files/usr/src/lib/libsecdb/spec/amd64/Makefile
rename : usr/src/lib/libsecdb/spec/chkauthattr.spec => deleted_files/usr/src/lib/libsecdb/spec/chkauthattr.spec
rename : usr/src/lib/libsecdb/spec/getauthattr.spec => deleted_files/usr/src/lib/libsecdb/spec/getauthattr.spec
rename : usr/src/lib/libsecdb/spec/getexecattr.spec => deleted_files/usr/src/lib/libsecdb/spec/getexecattr.spec
rename : usr/src/lib/libsecdb/spec/getprofattr.spec => deleted_files/usr/src/lib/libsecdb/spec/getprofattr.spec
rename : usr/src/lib/libsecdb/spec/getuserattr.spec => deleted_files/usr/src/lib/libsecdb/spec/getuserattr.spec
rename : usr/src/lib/libsecdb/spec/i386/Makefile => deleted_files/usr/src/lib/libsecdb/spec/i386/Makefile
rename : usr/src/lib/libsecdb/spec/private.spec => deleted_files/usr/src/lib/libsecdb/spec/private.spec
rename : usr/src/lib/libsecdb/spec/secdb.spec => deleted_files/usr/src/lib/libsecdb/spec/secdb.spec
rename : usr/src/lib/libsecdb/spec/sparc/Makefile => deleted_files/usr/src/lib/libsecdb/spec/sparc/Makefile
rename : usr/src/lib/libsecdb/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsecdb/spec/sparcv9/Makefile
rename : usr/src/lib/libsecdb/spec/versions => deleted_files/usr/src/lib/libsecdb/spec/versions
rename : usr/src/lib/libsendfile/spec/Makefile => deleted_files/usr/src/lib/libsendfile/spec/Makefile
rename : usr/src/lib/libsendfile/spec/Makefile.targ => deleted_files/usr/src/lib/libsendfile/spec/Makefile.targ
rename : usr/src/lib/libsendfile/spec/amd64/Makefile => deleted_files/usr/src/lib/libsendfile/spec/amd64/Makefile
rename : usr/src/lib/libsendfile/spec/i386/Makefile => deleted_files/usr/src/lib/libsendfile/spec/i386/Makefile
rename : usr/src/lib/libsendfile/spec/sendfile.spec => deleted_files/usr/src/lib/libsendfile/spec/sendfile.spec
rename : usr/src/lib/libsendfile/spec/sparc/Makefile => deleted_files/usr/src/lib/libsendfile/spec/sparc/Makefile
rename : usr/src/lib/libsendfile/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsendfile/spec/sparcv9/Makefile
rename : usr/src/lib/libsendfile/spec/versions => deleted_files/usr/src/lib/libsendfile/spec/versions
rename : usr/src/lib/libsldap/spec/Makefile => deleted_files/usr/src/lib/libsldap/spec/Makefile
rename : usr/src/lib/libsldap/spec/Makefile.targ => deleted_files/usr/src/lib/libsldap/spec/Makefile.targ
rename : usr/src/lib/libsldap/spec/amd64/Makefile => deleted_files/usr/src/lib/libsldap/spec/amd64/Makefile
rename : usr/src/lib/libsldap/spec/i386/Makefile => deleted_files/usr/src/lib/libsldap/spec/i386/Makefile
rename : usr/src/lib/libsldap/spec/sldap.spec => deleted_files/usr/src/lib/libsldap/spec/sldap.spec
rename : usr/src/lib/libsldap/spec/sparc/Makefile => deleted_files/usr/src/lib/libsldap/spec/sparc/Makefile
rename : usr/src/lib/libsldap/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsldap/spec/sparcv9/Makefile
rename : usr/src/lib/libsldap/spec/versions => deleted_files/usr/src/lib/libsldap/spec/versions
rename : usr/src/lib/libslp/spec/Makefile => deleted_files/usr/src/lib/libslp/spec/Makefile
rename : usr/src/lib/libslp/spec/Makefile.targ => deleted_files/usr/src/lib/libslp/spec/Makefile.targ
rename : usr/src/lib/libslp/spec/amd64/Makefile => deleted_files/usr/src/lib/libslp/spec/amd64/Makefile
rename : usr/src/lib/libslp/spec/i386/Makefile => deleted_files/usr/src/lib/libslp/spec/i386/Makefile
rename : usr/src/lib/libslp/spec/slp.spec => deleted_files/usr/src/lib/libslp/spec/slp.spec
rename : usr/src/lib/libslp/spec/sparc/Makefile => deleted_files/usr/src/lib/libslp/spec/sparc/Makefile
rename : usr/src/lib/libslp/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libslp/spec/sparcv9/Makefile
rename : usr/src/lib/libslp/spec/versions => deleted_files/usr/src/lib/libslp/spec/versions
rename : usr/src/lib/libsmbios/spec/Makefile => deleted_files/usr/src/lib/libsmbios/spec/Makefile
rename : usr/src/lib/libsmbios/spec/Makefile.targ => deleted_files/usr/src/lib/libsmbios/spec/Makefile.targ
rename : usr/src/lib/libsmbios/spec/amd64/Makefile => deleted_files/usr/src/lib/libsmbios/spec/amd64/Makefile
rename : usr/src/lib/libsmbios/spec/i386/Makefile => deleted_files/usr/src/lib/libsmbios/spec/i386/Makefile
rename : usr/src/lib/libsmbios/spec/smbios.spec => deleted_files/usr/src/lib/libsmbios/spec/smbios.spec
rename : usr/src/lib/libsmbios/spec/sparc/Makefile => deleted_files/usr/src/lib/libsmbios/spec/sparc/Makefile
rename : usr/src/lib/libsmbios/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsmbios/spec/sparcv9/Makefile
rename : usr/src/lib/libsmbios/spec/versions => deleted_files/usr/src/lib/libsmbios/spec/versions
rename : usr/src/lib/libsmedia/library/spec/Makefile => deleted_files/usr/src/lib/libsmedia/library/spec/Makefile
rename : usr/src/lib/libsmedia/library/spec/Makefile.targ => deleted_files/usr/src/lib/libsmedia/library/spec/Makefile.targ
rename : usr/src/lib/libsmedia/library/spec/amd64/Makefile => deleted_files/usr/src/lib/libsmedia/library/spec/amd64/Makefile
rename : usr/src/lib/libsmedia/library/spec/i386/Makefile => deleted_files/usr/src/lib/libsmedia/library/spec/i386/Makefile
rename : usr/src/lib/libsmedia/library/spec/smedia.spec => deleted_files/usr/src/lib/libsmedia/library/spec/smedia.spec
rename : usr/src/lib/libsmedia/library/spec/sparc/Makefile => deleted_files/usr/src/lib/libsmedia/library/spec/sparc/Makefile
rename : usr/src/lib/libsmedia/library/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsmedia/library/spec/sparcv9/Makefile
rename : usr/src/lib/libsmedia/library/spec/versions => deleted_files/usr/src/lib/libsmedia/library/spec/versions
rename : usr/src/lib/libsmedia/plugins/floppy/spec/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/Makefile
rename : usr/src/lib/libsmedia/plugins/floppy/spec/Makefile.targ => deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/Makefile.targ
rename : usr/src/lib/libsmedia/plugins/floppy/spec/amd64/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/amd64/Makefile
rename : usr/src/lib/libsmedia/plugins/floppy/spec/i386/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/i386/Makefile
rename : usr/src/lib/libsmedia/plugins/floppy/spec/sm_fd.spec => deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/sm_fd.spec
rename : usr/src/lib/libsmedia/plugins/floppy/spec/sparc/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/sparc/Makefile
rename : usr/src/lib/libsmedia/plugins/floppy/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/sparcv9/Makefile
rename : usr/src/lib/libsmedia/plugins/floppy/spec/versions => deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/versions
rename : usr/src/lib/libsmedia/plugins/pcata/spec/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/Makefile
rename : usr/src/lib/libsmedia/plugins/pcata/spec/Makefile.targ => deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/Makefile.targ
rename : usr/src/lib/libsmedia/plugins/pcata/spec/amd64/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/amd64/Makefile
rename : usr/src/lib/libsmedia/plugins/pcata/spec/i386/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/i386/Makefile
rename : usr/src/lib/libsmedia/plugins/pcata/spec/sm_pcata.spec => deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/sm_pcata.spec
rename : usr/src/lib/libsmedia/plugins/pcata/spec/sparc/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/sparc/Makefile
rename : usr/src/lib/libsmedia/plugins/pcata/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/sparcv9/Makefile
rename : usr/src/lib/libsmedia/plugins/pcata/spec/versions => deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/versions
rename : usr/src/lib/libsmedia/plugins/pcmem/spec/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/Makefile
rename : usr/src/lib/libsmedia/plugins/pcmem/spec/Makefile.targ => deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/Makefile.targ
rename : usr/src/lib/libsmedia/plugins/pcmem/spec/amd64/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/amd64/Makefile
rename : usr/src/lib/libsmedia/plugins/pcmem/spec/i386/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/i386/Makefile
rename : usr/src/lib/libsmedia/plugins/pcmem/spec/sm_pcmem.spec => deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/sm_pcmem.spec
rename : usr/src/lib/libsmedia/plugins/pcmem/spec/sparc/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/sparc/Makefile
rename : usr/src/lib/libsmedia/plugins/pcmem/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/sparcv9/Makefile
rename : usr/src/lib/libsmedia/plugins/pcmem/spec/versions => deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/versions
rename : usr/src/lib/libsmedia/plugins/scsi/spec/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/Makefile
rename : usr/src/lib/libsmedia/plugins/scsi/spec/Makefile.targ => deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/Makefile.targ
rename : usr/src/lib/libsmedia/plugins/scsi/spec/amd64/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/amd64/Makefile
rename : usr/src/lib/libsmedia/plugins/scsi/spec/i386/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/i386/Makefile
rename : usr/src/lib/libsmedia/plugins/scsi/spec/sm_scsi.spec => deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/sm_scsi.spec
rename : usr/src/lib/libsmedia/plugins/scsi/spec/sparc/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/sparc/Makefile
rename : usr/src/lib/libsmedia/plugins/scsi/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/sparcv9/Makefile
rename : usr/src/lib/libsmedia/plugins/scsi/spec/versions => deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/versions
rename : usr/src/lib/libsocket/spec/Makefile => deleted_files/usr/src/lib/libsocket/spec/Makefile
rename : usr/src/lib/libsocket/spec/Makefile.targ => deleted_files/usr/src/lib/libsocket/spec/Makefile.targ
rename : usr/src/lib/libsocket/spec/amd64/Makefile => deleted_files/usr/src/lib/libsocket/spec/amd64/Makefile
rename : usr/src/lib/libsocket/spec/i386/Makefile => deleted_files/usr/src/lib/libsocket/spec/i386/Makefile
rename : usr/src/lib/libsocket/spec/socket.spec => deleted_files/usr/src/lib/libsocket/spec/socket.spec
rename : usr/src/lib/libsocket/spec/sparc/Makefile => deleted_files/usr/src/lib/libsocket/spec/sparc/Makefile
rename : usr/src/lib/libsocket/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsocket/spec/sparcv9/Makefile
rename : usr/src/lib/libsocket/spec/svr4msg.spec => deleted_files/usr/src/lib/libsocket/spec/svr4msg.spec
rename : usr/src/lib/libsocket/spec/versions => deleted_files/usr/src/lib/libsocket/spec/versions
rename : usr/src/lib/libsocket/spec/xpgmsg.spec => deleted_files/usr/src/lib/libsocket/spec/xpgmsg.spec
rename : usr/src/lib/libsysevent/spec/Makefile => deleted_files/usr/src/lib/libsysevent/spec/Makefile
rename : usr/src/lib/libsysevent/spec/Makefile.targ => deleted_files/usr/src/lib/libsysevent/spec/Makefile.targ
rename : usr/src/lib/libsysevent/spec/amd64/Makefile => deleted_files/usr/src/lib/libsysevent/spec/amd64/Makefile
rename : usr/src/lib/libsysevent/spec/i386/Makefile => deleted_files/usr/src/lib/libsysevent/spec/i386/Makefile
rename : usr/src/lib/libsysevent/spec/sparc/Makefile => deleted_files/usr/src/lib/libsysevent/spec/sparc/Makefile
rename : usr/src/lib/libsysevent/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libsysevent/spec/sparcv9/Makefile
rename : usr/src/lib/libsysevent/spec/sysevent.spec => deleted_files/usr/src/lib/libsysevent/spec/sysevent.spec
rename : usr/src/lib/libsysevent/spec/versions => deleted_files/usr/src/lib/libsysevent/spec/versions
rename : usr/src/lib/libtecla/spec/Makefile => deleted_files/usr/src/lib/libtecla/spec/Makefile
rename : usr/src/lib/libtecla/spec/Makefile.targ => deleted_files/usr/src/lib/libtecla/spec/Makefile.targ
rename : usr/src/lib/libtecla/spec/amd64/Makefile => deleted_files/usr/src/lib/libtecla/spec/amd64/Makefile
rename : usr/src/lib/libtecla/spec/i386/Makefile => deleted_files/usr/src/lib/libtecla/spec/i386/Makefile
rename : usr/src/lib/libtecla/spec/sparc/Makefile => deleted_files/usr/src/lib/libtecla/spec/sparc/Makefile
rename : usr/src/lib/libtecla/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libtecla/spec/sparcv9/Makefile
rename : usr/src/lib/libtecla/spec/tecla.spec => deleted_files/usr/src/lib/libtecla/spec/tecla.spec
rename : usr/src/lib/libtecla/spec/versions => deleted_files/usr/src/lib/libtecla/spec/versions
rename : usr/src/lib/libtnf/spec/Makefile => deleted_files/usr/src/lib/libtnf/spec/Makefile
rename : usr/src/lib/libtnf/spec/Makefile.targ => deleted_files/usr/src/lib/libtnf/spec/Makefile.targ
rename : usr/src/lib/libtnf/spec/amd64/Makefile => deleted_files/usr/src/lib/libtnf/spec/amd64/Makefile
rename : usr/src/lib/libtnf/spec/i386/Makefile => deleted_files/usr/src/lib/libtnf/spec/i386/Makefile
rename : usr/src/lib/libtnf/spec/sparc/Makefile => deleted_files/usr/src/lib/libtnf/spec/sparc/Makefile
rename : usr/src/lib/libtnf/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libtnf/spec/sparcv9/Makefile
rename : usr/src/lib/libtnf/spec/tnf.spec => deleted_files/usr/src/lib/libtnf/spec/tnf.spec
rename : usr/src/lib/libtnf/spec/versions => deleted_files/usr/src/lib/libtnf/spec/versions
rename : usr/src/lib/libtnfctl/spec/Makefile => deleted_files/usr/src/lib/libtnfctl/spec/Makefile
rename : usr/src/lib/libtnfctl/spec/Makefile.targ => deleted_files/usr/src/lib/libtnfctl/spec/Makefile.targ
rename : usr/src/lib/libtnfctl/spec/amd64/Makefile => deleted_files/usr/src/lib/libtnfctl/spec/amd64/Makefile
rename : usr/src/lib/libtnfctl/spec/i386/Makefile => deleted_files/usr/src/lib/libtnfctl/spec/i386/Makefile
rename : usr/src/lib/libtnfctl/spec/sparc/Makefile => deleted_files/usr/src/lib/libtnfctl/spec/sparc/Makefile
rename : usr/src/lib/libtnfctl/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libtnfctl/spec/sparcv9/Makefile
rename : usr/src/lib/libtnfctl/spec/tnfctl.spec => deleted_files/usr/src/lib/libtnfctl/spec/tnfctl.spec
rename : usr/src/lib/libtnfctl/spec/versions => deleted_files/usr/src/lib/libtnfctl/spec/versions
rename : usr/src/lib/libtnfprobe/spec/Makefile => deleted_files/usr/src/lib/libtnfprobe/spec/Makefile
rename : usr/src/lib/libtnfprobe/spec/Makefile.targ => deleted_files/usr/src/lib/libtnfprobe/spec/Makefile.targ
rename : usr/src/lib/libtnfprobe/spec/amd64/Makefile => deleted_files/usr/src/lib/libtnfprobe/spec/amd64/Makefile
rename : usr/src/lib/libtnfprobe/spec/i386/Makefile => deleted_files/usr/src/lib/libtnfprobe/spec/i386/Makefile
rename : usr/src/lib/libtnfprobe/spec/private.spec => deleted_files/usr/src/lib/libtnfprobe/spec/private.spec
rename : usr/src/lib/libtnfprobe/spec/sparc/Makefile => deleted_files/usr/src/lib/libtnfprobe/spec/sparc/Makefile
rename : usr/src/lib/libtnfprobe/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libtnfprobe/spec/sparcv9/Makefile
rename : usr/src/lib/libtnfprobe/spec/versions => deleted_files/usr/src/lib/libtnfprobe/spec/versions
rename : usr/src/lib/libtsnet/spec/Makefile => deleted_files/usr/src/lib/libtsnet/spec/Makefile
rename : usr/src/lib/libtsnet/spec/Makefile.targ => deleted_files/usr/src/lib/libtsnet/spec/Makefile.targ
rename : usr/src/lib/libtsnet/spec/amd64/Makefile => deleted_files/usr/src/lib/libtsnet/spec/amd64/Makefile
rename : usr/src/lib/libtsnet/spec/i386/Makefile => deleted_files/usr/src/lib/libtsnet/spec/i386/Makefile
rename : usr/src/lib/libtsnet/spec/sparc/Makefile => deleted_files/usr/src/lib/libtsnet/spec/sparc/Makefile
rename : usr/src/lib/libtsnet/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libtsnet/spec/sparcv9/Makefile
rename : usr/src/lib/libtsnet/spec/tsnet.spec => deleted_files/usr/src/lib/libtsnet/spec/tsnet.spec
rename : usr/src/lib/libtsnet/spec/versions => deleted_files/usr/src/lib/libtsnet/spec/versions
rename : usr/src/lib/libtsol/spec/Makefile => deleted_files/usr/src/lib/libtsol/spec/Makefile
rename : usr/src/lib/libtsol/spec/Makefile.targ => deleted_files/usr/src/lib/libtsol/spec/Makefile.targ
rename : usr/src/lib/libtsol/spec/amd64/Makefile => deleted_files/usr/src/lib/libtsol/spec/amd64/Makefile
rename : usr/src/lib/libtsol/spec/i386/Makefile => deleted_files/usr/src/lib/libtsol/spec/i386/Makefile
rename : usr/src/lib/libtsol/spec/obsolete.spec => deleted_files/usr/src/lib/libtsol/spec/obsolete.spec
rename : usr/src/lib/libtsol/spec/private.spec => deleted_files/usr/src/lib/libtsol/spec/private.spec
rename : usr/src/lib/libtsol/spec/sparc/Makefile => deleted_files/usr/src/lib/libtsol/spec/sparc/Makefile
rename : usr/src/lib/libtsol/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libtsol/spec/sparcv9/Makefile
rename : usr/src/lib/libtsol/spec/tsol.spec => deleted_files/usr/src/lib/libtsol/spec/tsol.spec
rename : usr/src/lib/libtsol/spec/versions => deleted_files/usr/src/lib/libtsol/spec/versions
rename : usr/src/lib/libumem/spec/Makefile => deleted_files/usr/src/lib/libumem/spec/Makefile
rename : usr/src/lib/libumem/spec/Makefile.targ => deleted_files/usr/src/lib/libumem/spec/Makefile.targ
rename : usr/src/lib/libumem/spec/amd64/Makefile => deleted_files/usr/src/lib/libumem/spec/amd64/Makefile
rename : usr/src/lib/libumem/spec/i386/Makefile => deleted_files/usr/src/lib/libumem/spec/i386/Makefile
rename : usr/src/lib/libumem/spec/libumem.spec => deleted_files/usr/src/lib/libumem/spec/libumem.spec
rename : usr/src/lib/libumem/spec/sparc/Makefile => deleted_files/usr/src/lib/libumem/spec/sparc/Makefile
rename : usr/src/lib/libumem/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libumem/spec/sparcv9/Makefile
rename : usr/src/lib/libumem/spec/versions => deleted_files/usr/src/lib/libumem/spec/versions
rename : usr/src/lib/libuuid/spec/Makefile => deleted_files/usr/src/lib/libuuid/spec/Makefile
rename : usr/src/lib/libuuid/spec/Makefile.targ => deleted_files/usr/src/lib/libuuid/spec/Makefile.targ
rename : usr/src/lib/libuuid/spec/amd64/Makefile => deleted_files/usr/src/lib/libuuid/spec/amd64/Makefile
rename : usr/src/lib/libuuid/spec/i386/Makefile => deleted_files/usr/src/lib/libuuid/spec/i386/Makefile
rename : usr/src/lib/libuuid/spec/sparc/Makefile => deleted_files/usr/src/lib/libuuid/spec/sparc/Makefile
rename : usr/src/lib/libuuid/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libuuid/spec/sparcv9/Makefile
rename : usr/src/lib/libuuid/spec/uuid.spec => deleted_files/usr/src/lib/libuuid/spec/uuid.spec
rename : usr/src/lib/libuuid/spec/versions => deleted_files/usr/src/lib/libuuid/spec/versions
rename : usr/src/lib/libuutil/spec/Makefile => deleted_files/usr/src/lib/libuutil/spec/Makefile
rename : usr/src/lib/libuutil/spec/Makefile.targ => deleted_files/usr/src/lib/libuutil/spec/Makefile.targ
rename : usr/src/lib/libuutil/spec/amd64/Makefile => deleted_files/usr/src/lib/libuutil/spec/amd64/Makefile
rename : usr/src/lib/libuutil/spec/i386/Makefile => deleted_files/usr/src/lib/libuutil/spec/i386/Makefile
rename : usr/src/lib/libuutil/spec/sparc/Makefile => deleted_files/usr/src/lib/libuutil/spec/sparc/Makefile
rename : usr/src/lib/libuutil/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libuutil/spec/sparcv9/Makefile
rename : usr/src/lib/libuutil/spec/updt.spec => deleted_files/usr/src/lib/libuutil/spec/updt.spec
rename : usr/src/lib/libuutil/spec/uutil.spec => deleted_files/usr/src/lib/libuutil/spec/uutil.spec
rename : usr/src/lib/libuutil/spec/versions => deleted_files/usr/src/lib/libuutil/spec/versions
rename : usr/src/lib/libvolmgt/spec/Makefile => deleted_files/usr/src/lib/libvolmgt/spec/Makefile
rename : usr/src/lib/libvolmgt/spec/Makefile.targ => deleted_files/usr/src/lib/libvolmgt/spec/Makefile.targ
rename : usr/src/lib/libvolmgt/spec/amd64/Makefile => deleted_files/usr/src/lib/libvolmgt/spec/amd64/Makefile
rename : usr/src/lib/libvolmgt/spec/i386/Makefile => deleted_files/usr/src/lib/libvolmgt/spec/i386/Makefile
rename : usr/src/lib/libvolmgt/spec/sparc/Makefile => deleted_files/usr/src/lib/libvolmgt/spec/sparc/Makefile
rename : usr/src/lib/libvolmgt/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libvolmgt/spec/sparcv9/Makefile
rename : usr/src/lib/libvolmgt/spec/versions => deleted_files/usr/src/lib/libvolmgt/spec/versions
rename : usr/src/lib/libvolmgt/spec/volmgt.spec => deleted_files/usr/src/lib/libvolmgt/spec/volmgt.spec
rename : usr/src/lib/libwanboot/spec/Makefile => deleted_files/usr/src/lib/libwanboot/spec/Makefile
rename : usr/src/lib/libwanboot/spec/Makefile.targ => deleted_files/usr/src/lib/libwanboot/spec/Makefile.targ
rename : usr/src/lib/libwanboot/spec/amd64/Makefile => deleted_files/usr/src/lib/libwanboot/spec/amd64/Makefile
rename : usr/src/lib/libwanboot/spec/i386/Makefile => deleted_files/usr/src/lib/libwanboot/spec/i386/Makefile
rename : usr/src/lib/libwanboot/spec/sparc/Makefile => deleted_files/usr/src/lib/libwanboot/spec/sparc/Makefile
rename : usr/src/lib/libwanboot/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libwanboot/spec/sparcv9/Makefile
rename : usr/src/lib/libwanboot/spec/versions => deleted_files/usr/src/lib/libwanboot/spec/versions
rename : usr/src/lib/libwanboot/spec/wanboot.spec => deleted_files/usr/src/lib/libwanboot/spec/wanboot.spec
rename : usr/src/lib/libwanbootutil/spec/Makefile => deleted_files/usr/src/lib/libwanbootutil/spec/Makefile
rename : usr/src/lib/libwanbootutil/spec/Makefile.targ => deleted_files/usr/src/lib/libwanbootutil/spec/Makefile.targ
rename : usr/src/lib/libwanbootutil/spec/amd64/Makefile => deleted_files/usr/src/lib/libwanbootutil/spec/amd64/Makefile
rename : usr/src/lib/libwanbootutil/spec/i386/Makefile => deleted_files/usr/src/lib/libwanbootutil/spec/i386/Makefile
rename : usr/src/lib/libwanbootutil/spec/sparc/Makefile => deleted_files/usr/src/lib/libwanbootutil/spec/sparc/Makefile
rename : usr/src/lib/libwanbootutil/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libwanbootutil/spec/sparcv9/Makefile
rename : usr/src/lib/libwanbootutil/spec/versions => deleted_files/usr/src/lib/libwanbootutil/spec/versions
rename : usr/src/lib/libwanbootutil/spec/wanbootutil.spec => deleted_files/usr/src/lib/libwanbootutil/spec/wanbootutil.spec
rename : usr/src/lib/libxcurses/spec/Makefile => deleted_files/usr/src/lib/libxcurses/spec/Makefile
rename : usr/src/lib/libxcurses/spec/Makefile.targ => deleted_files/usr/src/lib/libxcurses/spec/Makefile.targ
rename : usr/src/lib/libxcurses/spec/amd64/Makefile => deleted_files/usr/src/lib/libxcurses/spec/amd64/Makefile
rename : usr/src/lib/libxcurses/spec/i386/Makefile => deleted_files/usr/src/lib/libxcurses/spec/i386/Makefile
rename : usr/src/lib/libxcurses/spec/sparc/Makefile => deleted_files/usr/src/lib/libxcurses/spec/sparc/Makefile
rename : usr/src/lib/libxcurses/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libxcurses/spec/sparcv9/Makefile
rename : usr/src/lib/libxcurses/spec/versions => deleted_files/usr/src/lib/libxcurses/spec/versions
rename : usr/src/lib/libxcurses/spec/xcurses.spec => deleted_files/usr/src/lib/libxcurses/spec/xcurses.spec
rename : usr/src/lib/libxcurses2/spec/Makefile => deleted_files/usr/src/lib/libxcurses2/spec/Makefile
rename : usr/src/lib/libxcurses2/spec/Makefile.targ => deleted_files/usr/src/lib/libxcurses2/spec/Makefile.targ
rename : usr/src/lib/libxcurses2/spec/amd64/Makefile => deleted_files/usr/src/lib/libxcurses2/spec/amd64/Makefile
rename : usr/src/lib/libxcurses2/spec/i386/Makefile => deleted_files/usr/src/lib/libxcurses2/spec/i386/Makefile
rename : usr/src/lib/libxcurses2/spec/sparc/Makefile => deleted_files/usr/src/lib/libxcurses2/spec/sparc/Makefile
rename : usr/src/lib/libxcurses2/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libxcurses2/spec/sparcv9/Makefile
rename : usr/src/lib/libxcurses2/spec/versions => deleted_files/usr/src/lib/libxcurses2/spec/versions
rename : usr/src/lib/libxcurses2/spec/xcurses.spec => deleted_files/usr/src/lib/libxcurses2/spec/xcurses.spec
rename : usr/src/lib/libzfs/spec/Makefile => deleted_files/usr/src/lib/libzfs/spec/Makefile
rename : usr/src/lib/libzfs/spec/Makefile.targ => deleted_files/usr/src/lib/libzfs/spec/Makefile.targ
rename : usr/src/lib/libzfs/spec/amd64/Makefile => deleted_files/usr/src/lib/libzfs/spec/amd64/Makefile
rename : usr/src/lib/libzfs/spec/i386/Makefile => deleted_files/usr/src/lib/libzfs/spec/i386/Makefile
rename : usr/src/lib/libzfs/spec/libzfs.spec => deleted_files/usr/src/lib/libzfs/spec/libzfs.spec
rename : usr/src/lib/libzfs/spec/sparc/Makefile => deleted_files/usr/src/lib/libzfs/spec/sparc/Makefile
rename : usr/src/lib/libzfs/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libzfs/spec/sparcv9/Makefile
rename : usr/src/lib/libzfs/spec/versions => deleted_files/usr/src/lib/libzfs/spec/versions
rename : usr/src/lib/libzfs_jni/spec/Makefile => deleted_files/usr/src/lib/libzfs_jni/spec/Makefile
rename : usr/src/lib/libzfs_jni/spec/Makefile.targ => deleted_files/usr/src/lib/libzfs_jni/spec/Makefile.targ
rename : usr/src/lib/libzfs_jni/spec/amd64/Makefile => deleted_files/usr/src/lib/libzfs_jni/spec/amd64/Makefile
rename : usr/src/lib/libzfs_jni/spec/i386/Makefile => deleted_files/usr/src/lib/libzfs_jni/spec/i386/Makefile
rename : usr/src/lib/libzfs_jni/spec/libzfs_jni.spec => deleted_files/usr/src/lib/libzfs_jni/spec/libzfs_jni.spec
rename : usr/src/lib/libzfs_jni/spec/sparc/Makefile => deleted_files/usr/src/lib/libzfs_jni/spec/sparc/Makefile
rename : usr/src/lib/libzfs_jni/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libzfs_jni/spec/sparcv9/Makefile
rename : usr/src/lib/libzfs_jni/spec/versions => deleted_files/usr/src/lib/libzfs_jni/spec/versions
rename : usr/src/lib/libzonecfg/spec/Makefile => deleted_files/usr/src/lib/libzonecfg/spec/Makefile
rename : usr/src/lib/libzonecfg/spec/Makefile.targ => deleted_files/usr/src/lib/libzonecfg/spec/Makefile.targ
rename : usr/src/lib/libzonecfg/spec/amd64/Makefile => deleted_files/usr/src/lib/libzonecfg/spec/amd64/Makefile
rename : usr/src/lib/libzonecfg/spec/i386/Makefile => deleted_files/usr/src/lib/libzonecfg/spec/i386/Makefile
rename : usr/src/lib/libzonecfg/spec/libzonecfg.spec => deleted_files/usr/src/lib/libzonecfg/spec/libzonecfg.spec
rename : usr/src/lib/libzonecfg/spec/sparc/Makefile => deleted_files/usr/src/lib/libzonecfg/spec/sparc/Makefile
rename : usr/src/lib/libzonecfg/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libzonecfg/spec/sparcv9/Makefile
rename : usr/src/lib/libzonecfg/spec/versions => deleted_files/usr/src/lib/libzonecfg/spec/versions
rename : usr/src/lib/libzoneinfo/spec/Makefile => deleted_files/usr/src/lib/libzoneinfo/spec/Makefile
rename : usr/src/lib/libzoneinfo/spec/Makefile.targ => deleted_files/usr/src/lib/libzoneinfo/spec/Makefile.targ
rename : usr/src/lib/libzoneinfo/spec/amd64/Makefile => deleted_files/usr/src/lib/libzoneinfo/spec/amd64/Makefile
rename : usr/src/lib/libzoneinfo/spec/i386/Makefile => deleted_files/usr/src/lib/libzoneinfo/spec/i386/Makefile
rename : usr/src/lib/libzoneinfo/spec/sparc/Makefile => deleted_files/usr/src/lib/libzoneinfo/spec/sparc/Makefile
rename : usr/src/lib/libzoneinfo/spec/sparcv9/Makefile => deleted_files/usr/src/lib/libzoneinfo/spec/sparcv9/Makefile
rename : usr/src/lib/libzoneinfo/spec/versions => deleted_files/usr/src/lib/libzoneinfo/spec/versions
rename : usr/src/lib/libzoneinfo/spec/zoneinfo.spec => deleted_files/usr/src/lib/libzoneinfo/spec/zoneinfo.spec
rename : usr/src/lib/lvm/libmeta/spec/Makefile => deleted_files/usr/src/lib/lvm/libmeta/spec/Makefile
rename : usr/src/lib/lvm/libmeta/spec/Makefile.targ => deleted_files/usr/src/lib/lvm/libmeta/spec/Makefile.targ
rename : usr/src/lib/lvm/libmeta/spec/amd64/Makefile => deleted_files/usr/src/lib/lvm/libmeta/spec/amd64/Makefile
rename : usr/src/lib/lvm/libmeta/spec/i386/Makefile => deleted_files/usr/src/lib/lvm/libmeta/spec/i386/Makefile
rename : usr/src/lib/lvm/libmeta/spec/meta.spec => deleted_files/usr/src/lib/lvm/libmeta/spec/meta.spec
rename : usr/src/lib/lvm/libmeta/spec/sparc/Makefile => deleted_files/usr/src/lib/lvm/libmeta/spec/sparc/Makefile
rename : usr/src/lib/lvm/libmeta/spec/sparcv9/Makefile => deleted_files/usr/src/lib/lvm/libmeta/spec/sparcv9/Makefile
rename : usr/src/lib/lvm/libmeta/spec/versions => deleted_files/usr/src/lib/lvm/libmeta/spec/versions
rename : usr/src/lib/lvm/libpreen/spec/Makefile => deleted_files/usr/src/lib/lvm/libpreen/spec/Makefile
rename : usr/src/lib/lvm/libpreen/spec/Makefile.targ => deleted_files/usr/src/lib/lvm/libpreen/spec/Makefile.targ
rename : usr/src/lib/lvm/libpreen/spec/amd64/Makefile => deleted_files/usr/src/lib/lvm/libpreen/spec/amd64/Makefile
rename : usr/src/lib/lvm/libpreen/spec/i386/Makefile => deleted_files/usr/src/lib/lvm/libpreen/spec/i386/Makefile
rename : usr/src/lib/lvm/libpreen/spec/preen.spec => deleted_files/usr/src/lib/lvm/libpreen/spec/preen.spec
rename : usr/src/lib/lvm/libpreen/spec/sparc/Makefile => deleted_files/usr/src/lib/lvm/libpreen/spec/sparc/Makefile
rename : usr/src/lib/lvm/libpreen/spec/sparcv9/Makefile => deleted_files/usr/src/lib/lvm/libpreen/spec/sparcv9/Makefile
rename : usr/src/lib/lvm/libpreen/spec/versions => deleted_files/usr/src/lib/lvm/libpreen/spec/versions
rename : usr/src/lib/lvm/libsvm/spec/Makefile => deleted_files/usr/src/lib/lvm/libsvm/spec/Makefile
rename : usr/src/lib/lvm/libsvm/spec/Makefile.targ => deleted_files/usr/src/lib/lvm/libsvm/spec/Makefile.targ
rename : usr/src/lib/lvm/libsvm/spec/amd64/Makefile => deleted_files/usr/src/lib/lvm/libsvm/spec/amd64/Makefile
rename : usr/src/lib/lvm/libsvm/spec/i386/Makefile => deleted_files/usr/src/lib/lvm/libsvm/spec/i386/Makefile
rename : usr/src/lib/lvm/libsvm/spec/sparc/Makefile => deleted_files/usr/src/lib/lvm/libsvm/spec/sparc/Makefile
rename : usr/src/lib/lvm/libsvm/spec/sparcv9/Makefile => deleted_files/usr/src/lib/lvm/libsvm/spec/sparcv9/Makefile
rename : usr/src/lib/lvm/libsvm/spec/svm.spec => deleted_files/usr/src/lib/lvm/libsvm/spec/svm.spec
rename : usr/src/lib/lvm/libsvm/spec/versions => deleted_files/usr/src/lib/lvm/libsvm/spec/versions
rename : usr/src/lib/nametoaddr/straddr/spec/Makefile => deleted_files/usr/src/lib/nametoaddr/straddr/spec/Makefile
rename : usr/src/lib/nametoaddr/straddr/spec/Makefile.targ => deleted_files/usr/src/lib/nametoaddr/straddr/spec/Makefile.targ
rename : usr/src/lib/nametoaddr/straddr/spec/amd64/Makefile => deleted_files/usr/src/lib/nametoaddr/straddr/spec/amd64/Makefile
rename : usr/src/lib/nametoaddr/straddr/spec/i386/Makefile => deleted_files/usr/src/lib/nametoaddr/straddr/spec/i386/Makefile
rename : usr/src/lib/nametoaddr/straddr/spec/sparc/Makefile => deleted_files/usr/src/lib/nametoaddr/straddr/spec/sparc/Makefile
rename : usr/src/lib/nametoaddr/straddr/spec/sparcv9/Makefile => deleted_files/usr/src/lib/nametoaddr/straddr/spec/sparcv9/Makefile
rename : usr/src/lib/nametoaddr/straddr/spec/straddr.spec => deleted_files/usr/src/lib/nametoaddr/straddr/spec/straddr.spec
rename : usr/src/lib/nametoaddr/straddr/spec/versions => deleted_files/usr/src/lib/nametoaddr/straddr/spec/versions
rename : usr/src/lib/ncad_addr/spec/Makefile => deleted_files/usr/src/lib/ncad_addr/spec/Makefile
rename : usr/src/lib/ncad_addr/spec/Makefile.targ => deleted_files/usr/src/lib/ncad_addr/spec/Makefile.targ
rename : usr/src/lib/ncad_addr/spec/amd64/Makefile => deleted_files/usr/src/lib/ncad_addr/spec/amd64/Makefile
rename : usr/src/lib/ncad_addr/spec/i386/Makefile => deleted_files/usr/src/lib/ncad_addr/spec/i386/Makefile
rename : usr/src/lib/ncad_addr/spec/ncad_addr.spec => deleted_files/usr/src/lib/ncad_addr/spec/ncad_addr.spec
rename : usr/src/lib/ncad_addr/spec/sparc/Makefile => deleted_files/usr/src/lib/ncad_addr/spec/sparc/Makefile
rename : usr/src/lib/ncad_addr/spec/sparcv9/Makefile => deleted_files/usr/src/lib/ncad_addr/spec/sparcv9/Makefile
rename : usr/src/lib/ncad_addr/spec/versions => deleted_files/usr/src/lib/ncad_addr/spec/versions
rename : usr/src/lib/pam_modules/allow/spec/Makefile => deleted_files/usr/src/lib/pam_modules/allow/spec/Makefile
rename : usr/src/lib/pam_modules/allow/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/allow/spec/Makefile.targ
rename : usr/src/lib/pam_modules/allow/spec/allow.spec => deleted_files/usr/src/lib/pam_modules/allow/spec/allow.spec
rename : usr/src/lib/pam_modules/allow/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/allow/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/allow/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/allow/spec/i386/Makefile
rename : usr/src/lib/pam_modules/allow/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/allow/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/allow/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/allow/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/allow/spec/versions => deleted_files/usr/src/lib/pam_modules/allow/spec/versions
rename : usr/src/lib/pam_modules/authtok_check/spec/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_check/spec/Makefile
rename : usr/src/lib/pam_modules/authtok_check/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/authtok_check/spec/Makefile.targ
rename : usr/src/lib/pam_modules/authtok_check/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_check/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/authtok_check/spec/authtok_check.spec => deleted_files/usr/src/lib/pam_modules/authtok_check/spec/authtok_check.spec
rename : usr/src/lib/pam_modules/authtok_check/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_check/spec/i386/Makefile
rename : usr/src/lib/pam_modules/authtok_check/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_check/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/authtok_check/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_check/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/authtok_check/spec/versions => deleted_files/usr/src/lib/pam_modules/authtok_check/spec/versions
rename : usr/src/lib/pam_modules/authtok_get/spec/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_get/spec/Makefile
rename : usr/src/lib/pam_modules/authtok_get/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/authtok_get/spec/Makefile.targ
rename : usr/src/lib/pam_modules/authtok_get/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_get/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/authtok_get/spec/authtok_get.spec => deleted_files/usr/src/lib/pam_modules/authtok_get/spec/authtok_get.spec
rename : usr/src/lib/pam_modules/authtok_get/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_get/spec/i386/Makefile
rename : usr/src/lib/pam_modules/authtok_get/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_get/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/authtok_get/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_get/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/authtok_get/spec/versions => deleted_files/usr/src/lib/pam_modules/authtok_get/spec/versions
rename : usr/src/lib/pam_modules/authtok_store/spec/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_store/spec/Makefile
rename : usr/src/lib/pam_modules/authtok_store/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/authtok_store/spec/Makefile.targ
rename : usr/src/lib/pam_modules/authtok_store/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_store/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/authtok_store/spec/authtok_store.spec => deleted_files/usr/src/lib/pam_modules/authtok_store/spec/authtok_store.spec
rename : usr/src/lib/pam_modules/authtok_store/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_store/spec/i386/Makefile
rename : usr/src/lib/pam_modules/authtok_store/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_store/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/authtok_store/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/authtok_store/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/authtok_store/spec/versions => deleted_files/usr/src/lib/pam_modules/authtok_store/spec/versions
rename : usr/src/lib/pam_modules/deny/spec/Makefile => deleted_files/usr/src/lib/pam_modules/deny/spec/Makefile
rename : usr/src/lib/pam_modules/deny/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/deny/spec/Makefile.targ
rename : usr/src/lib/pam_modules/deny/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/deny/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/deny/spec/deny.spec => deleted_files/usr/src/lib/pam_modules/deny/spec/deny.spec
rename : usr/src/lib/pam_modules/deny/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/deny/spec/i386/Makefile
rename : usr/src/lib/pam_modules/deny/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/deny/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/deny/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/deny/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/deny/spec/versions => deleted_files/usr/src/lib/pam_modules/deny/spec/versions
rename : usr/src/lib/pam_modules/dhkeys/spec/Makefile => deleted_files/usr/src/lib/pam_modules/dhkeys/spec/Makefile
rename : usr/src/lib/pam_modules/dhkeys/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/dhkeys/spec/Makefile.targ
rename : usr/src/lib/pam_modules/dhkeys/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/dhkeys/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/dhkeys/spec/dhkeys.spec => deleted_files/usr/src/lib/pam_modules/dhkeys/spec/dhkeys.spec
rename : usr/src/lib/pam_modules/dhkeys/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/dhkeys/spec/i386/Makefile
rename : usr/src/lib/pam_modules/dhkeys/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/dhkeys/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/dhkeys/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/dhkeys/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/dhkeys/spec/versions => deleted_files/usr/src/lib/pam_modules/dhkeys/spec/versions
rename : usr/src/lib/pam_modules/dial_auth/spec/Makefile => deleted_files/usr/src/lib/pam_modules/dial_auth/spec/Makefile
rename : usr/src/lib/pam_modules/dial_auth/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/dial_auth/spec/Makefile.targ
rename : usr/src/lib/pam_modules/dial_auth/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/dial_auth/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/dial_auth/spec/dial_auth.spec => deleted_files/usr/src/lib/pam_modules/dial_auth/spec/dial_auth.spec
rename : usr/src/lib/pam_modules/dial_auth/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/dial_auth/spec/i386/Makefile
rename : usr/src/lib/pam_modules/dial_auth/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/dial_auth/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/dial_auth/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/dial_auth/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/dial_auth/spec/versions => deleted_files/usr/src/lib/pam_modules/dial_auth/spec/versions
rename : usr/src/lib/pam_modules/krb5/spec/Makefile => deleted_files/usr/src/lib/pam_modules/krb5/spec/Makefile
rename : usr/src/lib/pam_modules/krb5/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/krb5/spec/Makefile.targ
rename : usr/src/lib/pam_modules/krb5/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/krb5/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/krb5/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/krb5/spec/i386/Makefile
rename : usr/src/lib/pam_modules/krb5/spec/krb5.spec => deleted_files/usr/src/lib/pam_modules/krb5/spec/krb5.spec
rename : usr/src/lib/pam_modules/krb5/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/krb5/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/krb5/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/krb5/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/krb5/spec/versions => deleted_files/usr/src/lib/pam_modules/krb5/spec/versions
rename : usr/src/lib/pam_modules/krb5_migrate/spec/Makefile => deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/Makefile
rename : usr/src/lib/pam_modules/krb5_migrate/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/Makefile.targ
rename : usr/src/lib/pam_modules/krb5_migrate/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/krb5_migrate/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/i386/Makefile
rename : usr/src/lib/pam_modules/krb5_migrate/spec/krb5_migrate.spec => deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/krb5_migrate.spec
rename : usr/src/lib/pam_modules/krb5_migrate/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/krb5_migrate/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/krb5_migrate/spec/versions => deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/versions
rename : usr/src/lib/pam_modules/ldap/spec/Makefile => deleted_files/usr/src/lib/pam_modules/ldap/spec/Makefile
rename : usr/src/lib/pam_modules/ldap/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/ldap/spec/Makefile.targ
rename : usr/src/lib/pam_modules/ldap/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/ldap/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/ldap/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/ldap/spec/i386/Makefile
rename : usr/src/lib/pam_modules/ldap/spec/ldap.spec => deleted_files/usr/src/lib/pam_modules/ldap/spec/ldap.spec
rename : usr/src/lib/pam_modules/ldap/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/ldap/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/ldap/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/ldap/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/ldap/spec/versions => deleted_files/usr/src/lib/pam_modules/ldap/spec/versions
rename : usr/src/lib/pam_modules/passwd_auth/spec/Makefile => deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/Makefile
rename : usr/src/lib/pam_modules/passwd_auth/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/Makefile.targ
rename : usr/src/lib/pam_modules/passwd_auth/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/passwd_auth/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/i386/Makefile
rename : usr/src/lib/pam_modules/passwd_auth/spec/passwd_auth.spec => deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/passwd_auth.spec
rename : usr/src/lib/pam_modules/passwd_auth/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/passwd_auth/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/passwd_auth/spec/versions => deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/versions
rename : usr/src/lib/pam_modules/projects/spec/Makefile => deleted_files/usr/src/lib/pam_modules/projects/spec/Makefile
rename : usr/src/lib/pam_modules/projects/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/projects/spec/Makefile.targ
rename : usr/src/lib/pam_modules/projects/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/projects/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/projects/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/projects/spec/i386/Makefile
rename : usr/src/lib/pam_modules/projects/spec/projects.spec => deleted_files/usr/src/lib/pam_modules/projects/spec/projects.spec
rename : usr/src/lib/pam_modules/projects/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/projects/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/projects/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/projects/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/projects/spec/versions => deleted_files/usr/src/lib/pam_modules/projects/spec/versions
rename : usr/src/lib/pam_modules/rhosts_auth/spec/Makefile => deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/Makefile
rename : usr/src/lib/pam_modules/rhosts_auth/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/Makefile.targ
rename : usr/src/lib/pam_modules/rhosts_auth/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/rhosts_auth/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/i386/Makefile
rename : usr/src/lib/pam_modules/rhosts_auth/spec/rhosts_auth.spec => deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/rhosts_auth.spec
rename : usr/src/lib/pam_modules/rhosts_auth/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/rhosts_auth/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/rhosts_auth/spec/versions => deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/versions
rename : usr/src/lib/pam_modules/roles/spec/Makefile => deleted_files/usr/src/lib/pam_modules/roles/spec/Makefile
rename : usr/src/lib/pam_modules/roles/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/roles/spec/Makefile.targ
rename : usr/src/lib/pam_modules/roles/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/roles/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/roles/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/roles/spec/i386/Makefile
rename : usr/src/lib/pam_modules/roles/spec/roles.spec => deleted_files/usr/src/lib/pam_modules/roles/spec/roles.spec
rename : usr/src/lib/pam_modules/roles/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/roles/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/roles/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/roles/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/roles/spec/versions => deleted_files/usr/src/lib/pam_modules/roles/spec/versions
rename : usr/src/lib/pam_modules/sample/spec/Makefile => deleted_files/usr/src/lib/pam_modules/sample/spec/Makefile
rename : usr/src/lib/pam_modules/sample/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/sample/spec/Makefile.targ
rename : usr/src/lib/pam_modules/sample/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/sample/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/sample/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/sample/spec/i386/Makefile
rename : usr/src/lib/pam_modules/sample/spec/sample.spec => deleted_files/usr/src/lib/pam_modules/sample/spec/sample.spec
rename : usr/src/lib/pam_modules/sample/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/sample/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/sample/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/sample/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/sample/spec/versions => deleted_files/usr/src/lib/pam_modules/sample/spec/versions
rename : usr/src/lib/pam_modules/unix_account/spec/Makefile => deleted_files/usr/src/lib/pam_modules/unix_account/spec/Makefile
rename : usr/src/lib/pam_modules/unix_account/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/unix_account/spec/Makefile.targ
rename : usr/src/lib/pam_modules/unix_account/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/unix_account/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/unix_account/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/unix_account/spec/i386/Makefile
rename : usr/src/lib/pam_modules/unix_account/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/unix_account/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/unix_account/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/unix_account/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/unix_account/spec/unix_account.spec => deleted_files/usr/src/lib/pam_modules/unix_account/spec/unix_account.spec
rename : usr/src/lib/pam_modules/unix_account/spec/versions => deleted_files/usr/src/lib/pam_modules/unix_account/spec/versions
rename : usr/src/lib/pam_modules/unix_auth/spec/Makefile => deleted_files/usr/src/lib/pam_modules/unix_auth/spec/Makefile
rename : usr/src/lib/pam_modules/unix_auth/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/unix_auth/spec/Makefile.targ
rename : usr/src/lib/pam_modules/unix_auth/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/unix_auth/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/unix_auth/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/unix_auth/spec/i386/Makefile
rename : usr/src/lib/pam_modules/unix_auth/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/unix_auth/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/unix_auth/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/unix_auth/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/unix_auth/spec/unix_auth.spec => deleted_files/usr/src/lib/pam_modules/unix_auth/spec/unix_auth.spec
rename : usr/src/lib/pam_modules/unix_auth/spec/versions => deleted_files/usr/src/lib/pam_modules/unix_auth/spec/versions
rename : usr/src/lib/pam_modules/unix_cred/spec/Makefile => deleted_files/usr/src/lib/pam_modules/unix_cred/spec/Makefile
rename : usr/src/lib/pam_modules/unix_cred/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/unix_cred/spec/Makefile.targ
rename : usr/src/lib/pam_modules/unix_cred/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/unix_cred/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/unix_cred/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/unix_cred/spec/i386/Makefile
rename : usr/src/lib/pam_modules/unix_cred/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/unix_cred/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/unix_cred/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/unix_cred/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/unix_cred/spec/unix_cred.spec => deleted_files/usr/src/lib/pam_modules/unix_cred/spec/unix_cred.spec
rename : usr/src/lib/pam_modules/unix_cred/spec/versions => deleted_files/usr/src/lib/pam_modules/unix_cred/spec/versions
rename : usr/src/lib/pam_modules/unix_session/spec/Makefile => deleted_files/usr/src/lib/pam_modules/unix_session/spec/Makefile
rename : usr/src/lib/pam_modules/unix_session/spec/Makefile.targ => deleted_files/usr/src/lib/pam_modules/unix_session/spec/Makefile.targ
rename : usr/src/lib/pam_modules/unix_session/spec/amd64/Makefile => deleted_files/usr/src/lib/pam_modules/unix_session/spec/amd64/Makefile
rename : usr/src/lib/pam_modules/unix_session/spec/i386/Makefile => deleted_files/usr/src/lib/pam_modules/unix_session/spec/i386/Makefile
rename : usr/src/lib/pam_modules/unix_session/spec/sparc/Makefile => deleted_files/usr/src/lib/pam_modules/unix_session/spec/sparc/Makefile
rename : usr/src/lib/pam_modules/unix_session/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pam_modules/unix_session/spec/sparcv9/Makefile
rename : usr/src/lib/pam_modules/unix_session/spec/unix_session.spec => deleted_files/usr/src/lib/pam_modules/unix_session/spec/unix_session.spec
rename : usr/src/lib/pam_modules/unix_session/spec/versions => deleted_files/usr/src/lib/pam_modules/unix_session/spec/versions
rename : usr/src/lib/passwdutil/spec/Makefile => deleted_files/usr/src/lib/passwdutil/spec/Makefile
rename : usr/src/lib/passwdutil/spec/Makefile.targ => deleted_files/usr/src/lib/passwdutil/spec/Makefile.targ
rename : usr/src/lib/passwdutil/spec/amd64/Makefile => deleted_files/usr/src/lib/passwdutil/spec/amd64/Makefile
rename : usr/src/lib/passwdutil/spec/i386/Makefile => deleted_files/usr/src/lib/passwdutil/spec/i386/Makefile
rename : usr/src/lib/passwdutil/spec/passwdutil.spec => deleted_files/usr/src/lib/passwdutil/spec/passwdutil.spec
rename : usr/src/lib/passwdutil/spec/sparc/Makefile => deleted_files/usr/src/lib/passwdutil/spec/sparc/Makefile
rename : usr/src/lib/passwdutil/spec/sparcv9/Makefile => deleted_files/usr/src/lib/passwdutil/spec/sparcv9/Makefile
rename : usr/src/lib/passwdutil/spec/versions => deleted_files/usr/src/lib/passwdutil/spec/versions
rename : usr/src/lib/pkcs11/libpkcs11/spec/Makefile => deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/Makefile
rename : usr/src/lib/pkcs11/libpkcs11/spec/Makefile.targ => deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/Makefile.targ
rename : usr/src/lib/pkcs11/libpkcs11/spec/amd64/Makefile => deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/amd64/Makefile
rename : usr/src/lib/pkcs11/libpkcs11/spec/i386/Makefile => deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/i386/Makefile
rename : usr/src/lib/pkcs11/libpkcs11/spec/pkcs11.spec => deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/pkcs11.spec
rename : usr/src/lib/pkcs11/libpkcs11/spec/sparc/Makefile => deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/sparc/Makefile
rename : usr/src/lib/pkcs11/libpkcs11/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/sparcv9/Makefile
rename : usr/src/lib/pkcs11/libpkcs11/spec/versions => deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/versions
rename : usr/src/lib/pkcs11/pkcs11_kernel/spec/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/Makefile
rename : usr/src/lib/pkcs11/pkcs11_kernel/spec/Makefile.targ => deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/Makefile.targ
rename : usr/src/lib/pkcs11/pkcs11_kernel/spec/amd64/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/amd64/Makefile
rename : usr/src/lib/pkcs11/pkcs11_kernel/spec/i386/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/i386/Makefile
rename : usr/src/lib/pkcs11/pkcs11_kernel/spec/pkcs11_kernel.spec => deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/pkcs11_kernel.spec
rename : usr/src/lib/pkcs11/pkcs11_kernel/spec/sparc/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/sparc/Makefile
rename : usr/src/lib/pkcs11/pkcs11_kernel/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/sparcv9/Makefile
rename : usr/src/lib/pkcs11/pkcs11_kernel/spec/versions => deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/versions
rename : usr/src/lib/pkcs11/pkcs11_softtoken/spec/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken/spec/Makefile.targ => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/Makefile.targ
rename : usr/src/lib/pkcs11/pkcs11_softtoken/spec/amd64/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/amd64/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken/spec/i386/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/i386/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken/spec/pkcs11_softtoken.spec => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/pkcs11_softtoken.spec
rename : usr/src/lib/pkcs11/pkcs11_softtoken/spec/sparc/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/sparc/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/sparcv9/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken/spec/versions => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/versions
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/Makefile.targ => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/Makefile.targ
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/amd64/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/amd64/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/i386/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/i386/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/pkcs11_softtoken_extra.spec => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/pkcs11_softtoken_extra.spec
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/sparc/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/sparc/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/sparcv9/Makefile => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/sparcv9/Makefile
rename : usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/versions => deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/versions
rename : usr/src/lib/sasl_plugins/cram/spec/Makefile => deleted_files/usr/src/lib/sasl_plugins/cram/spec/Makefile
rename : usr/src/lib/sasl_plugins/cram/spec/Makefile.targ => deleted_files/usr/src/lib/sasl_plugins/cram/spec/Makefile.targ
rename : usr/src/lib/sasl_plugins/cram/spec/amd64/Makefile => deleted_files/usr/src/lib/sasl_plugins/cram/spec/amd64/Makefile
rename : usr/src/lib/sasl_plugins/cram/spec/cram.spec => deleted_files/usr/src/lib/sasl_plugins/cram/spec/cram.spec
rename : usr/src/lib/sasl_plugins/cram/spec/i386/Makefile => deleted_files/usr/src/lib/sasl_plugins/cram/spec/i386/Makefile
rename : usr/src/lib/sasl_plugins/cram/spec/sparc/Makefile => deleted_files/usr/src/lib/sasl_plugins/cram/spec/sparc/Makefile
rename : usr/src/lib/sasl_plugins/cram/spec/sparcv9/Makefile => deleted_files/usr/src/lib/sasl_plugins/cram/spec/sparcv9/Makefile
rename : usr/src/lib/sasl_plugins/cram/spec/versions => deleted_files/usr/src/lib/sasl_plugins/cram/spec/versions
rename : usr/src/lib/sasl_plugins/digestmd5/spec/Makefile => deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/Makefile
rename : usr/src/lib/sasl_plugins/digestmd5/spec/Makefile.targ => deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/Makefile.targ
rename : usr/src/lib/sasl_plugins/digestmd5/spec/amd64/Makefile => deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/amd64/Makefile
rename : usr/src/lib/sasl_plugins/digestmd5/spec/digestmd5.spec => deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/digestmd5.spec
rename : usr/src/lib/sasl_plugins/digestmd5/spec/i386/Makefile => deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/i386/Makefile
rename : usr/src/lib/sasl_plugins/digestmd5/spec/sparc/Makefile => deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/sparc/Makefile
rename : usr/src/lib/sasl_plugins/digestmd5/spec/sparcv9/Makefile => deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/sparcv9/Makefile
rename : usr/src/lib/sasl_plugins/digestmd5/spec/versions => deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/versions
rename : usr/src/lib/sasl_plugins/gssapi/spec/Makefile => deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/Makefile
rename : usr/src/lib/sasl_plugins/gssapi/spec/Makefile.targ => deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/Makefile.targ
rename : usr/src/lib/sasl_plugins/gssapi/spec/amd64/Makefile => deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/amd64/Makefile
rename : usr/src/lib/sasl_plugins/gssapi/spec/gssapi.spec => deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/gssapi.spec
rename : usr/src/lib/sasl_plugins/gssapi/spec/i386/Makefile => deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/i386/Makefile
rename : usr/src/lib/sasl_plugins/gssapi/spec/sparc/Makefile => deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/sparc/Makefile
rename : usr/src/lib/sasl_plugins/gssapi/spec/sparcv9/Makefile => deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/sparcv9/Makefile
rename : usr/src/lib/sasl_plugins/gssapi/spec/versions => deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/versions
rename : usr/src/lib/sasl_plugins/plain/spec/Makefile => deleted_files/usr/src/lib/sasl_plugins/plain/spec/Makefile
rename : usr/src/lib/sasl_plugins/plain/spec/Makefile.targ => deleted_files/usr/src/lib/sasl_plugins/plain/spec/Makefile.targ
rename : usr/src/lib/sasl_plugins/plain/spec/amd64/Makefile => deleted_files/usr/src/lib/sasl_plugins/plain/spec/amd64/Makefile
rename : usr/src/lib/sasl_plugins/plain/spec/i386/Makefile => deleted_files/usr/src/lib/sasl_plugins/plain/spec/i386/Makefile
rename : usr/src/lib/sasl_plugins/plain/spec/plain.spec => deleted_files/usr/src/lib/sasl_plugins/plain/spec/plain.spec
rename : usr/src/lib/sasl_plugins/plain/spec/sparc/Makefile => deleted_files/usr/src/lib/sasl_plugins/plain/spec/sparc/Makefile
rename : usr/src/lib/sasl_plugins/plain/spec/sparcv9/Makefile => deleted_files/usr/src/lib/sasl_plugins/plain/spec/sparcv9/Makefile
rename : usr/src/lib/sasl_plugins/plain/spec/versions => deleted_files/usr/src/lib/sasl_plugins/plain/spec/versions
rename : usr/src/lib/udapl/libdat/spec/Makefile => deleted_files/usr/src/lib/udapl/libdat/spec/Makefile
rename : usr/src/lib/udapl/libdat/spec/Makefile.targ => deleted_files/usr/src/lib/udapl/libdat/spec/Makefile.targ
rename : usr/src/lib/udapl/libdat/spec/amd64/Makefile => deleted_files/usr/src/lib/udapl/libdat/spec/amd64/Makefile
rename : usr/src/lib/udapl/libdat/spec/dat.spec => deleted_files/usr/src/lib/udapl/libdat/spec/dat.spec
rename : usr/src/lib/udapl/libdat/spec/i386/Makefile => deleted_files/usr/src/lib/udapl/libdat/spec/i386/Makefile
rename : usr/src/lib/udapl/libdat/spec/sparc/Makefile => deleted_files/usr/src/lib/udapl/libdat/spec/sparc/Makefile
rename : usr/src/lib/udapl/libdat/spec/sparcv9/Makefile => deleted_files/usr/src/lib/udapl/libdat/spec/sparcv9/Makefile
rename : usr/src/lib/udapl/libdat/spec/versions => deleted_files/usr/src/lib/udapl/libdat/spec/versions
rename : usr/src/lib/watchmalloc/spec/Makefile => deleted_files/usr/src/lib/watchmalloc/spec/Makefile
rename : usr/src/lib/watchmalloc/spec/Makefile.targ => deleted_files/usr/src/lib/watchmalloc/spec/Makefile.targ
rename : usr/src/lib/watchmalloc/spec/amd64/Makefile => deleted_files/usr/src/lib/watchmalloc/spec/amd64/Makefile
rename : usr/src/lib/watchmalloc/spec/i386/Makefile => deleted_files/usr/src/lib/watchmalloc/spec/i386/Makefile
rename : usr/src/lib/watchmalloc/spec/sparc/Makefile => deleted_files/usr/src/lib/watchmalloc/spec/sparc/Makefile
rename : usr/src/lib/watchmalloc/spec/sparcv9/Makefile => deleted_files/usr/src/lib/watchmalloc/spec/sparcv9/Makefile
rename : usr/src/lib/watchmalloc/spec/versions => deleted_files/usr/src/lib/watchmalloc/spec/versions
rename : usr/src/lib/watchmalloc/spec/watchmalloc.spec => deleted_files/usr/src/lib/watchmalloc/spec/watchmalloc.spec
rename : usr/src/ucblib/libcurses/spec/Makefile => deleted_files/usr/src/ucblib/libcurses/spec/Makefile
rename : usr/src/ucblib/libcurses/spec/Makefile.override => deleted_files/usr/src/ucblib/libcurses/spec/Makefile.override
rename : usr/src/ucblib/libcurses/spec/Makefile.targ => deleted_files/usr/src/ucblib/libcurses/spec/Makefile.targ
rename : usr/src/ucblib/libcurses/spec/amd64/Makefile => deleted_files/usr/src/ucblib/libcurses/spec/amd64/Makefile
rename : usr/src/ucblib/libcurses/spec/curses.spec => deleted_files/usr/src/ucblib/libcurses/spec/curses.spec
rename : usr/src/ucblib/libcurses/spec/i386/Makefile => deleted_files/usr/src/ucblib/libcurses/spec/i386/Makefile
rename : usr/src/ucblib/libcurses/spec/sparc/Makefile => deleted_files/usr/src/ucblib/libcurses/spec/sparc/Makefile
rename : usr/src/ucblib/libcurses/spec/sparcv9/Makefile => deleted_files/usr/src/ucblib/libcurses/spec/sparcv9/Makefile
rename : usr/src/ucblib/libcurses/spec/versions => deleted_files/usr/src/ucblib/libcurses/spec/versions
rename : usr/src/ucblib/libdbm/spec/Makefile => deleted_files/usr/src/ucblib/libdbm/spec/Makefile
rename : usr/src/ucblib/libdbm/spec/Makefile.targ => deleted_files/usr/src/ucblib/libdbm/spec/Makefile.targ
rename : usr/src/ucblib/libdbm/spec/amd64/Makefile => deleted_files/usr/src/ucblib/libdbm/spec/amd64/Makefile
rename : usr/src/ucblib/libdbm/spec/dbm.spec => deleted_files/usr/src/ucblib/libdbm/spec/dbm.spec
rename : usr/src/ucblib/libdbm/spec/i386/Makefile => deleted_files/usr/src/ucblib/libdbm/spec/i386/Makefile
rename : usr/src/ucblib/libdbm/spec/sparc/Makefile => deleted_files/usr/src/ucblib/libdbm/spec/sparc/Makefile
rename : usr/src/ucblib/libdbm/spec/sparcv9/Makefile => deleted_files/usr/src/ucblib/libdbm/spec/sparcv9/Makefile
rename : usr/src/ucblib/libdbm/spec/versions => deleted_files/usr/src/ucblib/libdbm/spec/versions
rename : usr/src/ucblib/librpcsoc/spec/Makefile => deleted_files/usr/src/ucblib/librpcsoc/spec/Makefile
rename : usr/src/ucblib/librpcsoc/spec/Makefile.targ => deleted_files/usr/src/ucblib/librpcsoc/spec/Makefile.targ
rename : usr/src/ucblib/librpcsoc/spec/amd64/Makefile => deleted_files/usr/src/ucblib/librpcsoc/spec/amd64/Makefile
rename : usr/src/ucblib/librpcsoc/spec/i386/Makefile => deleted_files/usr/src/ucblib/librpcsoc/spec/i386/Makefile
rename : usr/src/ucblib/librpcsoc/spec/rpcsoc.spec => deleted_files/usr/src/ucblib/librpcsoc/spec/rpcsoc.spec
rename : usr/src/ucblib/librpcsoc/spec/sparc/Makefile => deleted_files/usr/src/ucblib/librpcsoc/spec/sparc/Makefile
rename : usr/src/ucblib/librpcsoc/spec/sparcv9/Makefile => deleted_files/usr/src/ucblib/librpcsoc/spec/sparcv9/Makefile
rename : usr/src/ucblib/librpcsoc/spec/versions => deleted_files/usr/src/ucblib/librpcsoc/spec/versions
rename : usr/src/ucblib/libtermcap/spec/Makefile => deleted_files/usr/src/ucblib/libtermcap/spec/Makefile
rename : usr/src/ucblib/libtermcap/spec/Makefile.targ => deleted_files/usr/src/ucblib/libtermcap/spec/Makefile.targ
rename : usr/src/ucblib/libtermcap/spec/amd64/Makefile => deleted_files/usr/src/ucblib/libtermcap/spec/amd64/Makefile
rename : usr/src/ucblib/libtermcap/spec/i386/Makefile => deleted_files/usr/src/ucblib/libtermcap/spec/i386/Makefile
rename : usr/src/ucblib/libtermcap/spec/sparc/Makefile => deleted_files/usr/src/ucblib/libtermcap/spec/sparc/Makefile
rename : usr/src/ucblib/libtermcap/spec/sparcv9/Makefile => deleted_files/usr/src/ucblib/libtermcap/spec/sparcv9/Makefile
rename : usr/src/ucblib/libtermcap/spec/termcap.spec => deleted_files/usr/src/ucblib/libtermcap/spec/termcap.spec
rename : usr/src/ucblib/libtermcap/spec/versions => deleted_files/usr/src/ucblib/libtermcap/spec/versions
rename : usr/src/ucblib/libucb/spec/Makefile => deleted_files/usr/src/ucblib/libucb/spec/Makefile
rename : usr/src/ucblib/libucb/spec/Makefile.override => deleted_files/usr/src/ucblib/libucb/spec/Makefile.override
rename : usr/src/ucblib/libucb/spec/Makefile.targ => deleted_files/usr/src/ucblib/libucb/spec/Makefile.targ
rename : usr/src/ucblib/libucb/spec/amd64/Makefile => deleted_files/usr/src/ucblib/libucb/spec/amd64/Makefile
rename : usr/src/ucblib/libucb/spec/i386/Makefile => deleted_files/usr/src/ucblib/libucb/spec/i386/Makefile
rename : usr/src/ucblib/libucb/spec/sparc/Makefile => deleted_files/usr/src/ucblib/libucb/spec/sparc/Makefile
rename : usr/src/ucblib/libucb/spec/sparcv9/Makefile => deleted_files/usr/src/ucblib/libucb/spec/sparcv9/Makefile
rename : usr/src/ucblib/libucb/spec/ucb.spec => deleted_files/usr/src/ucblib/libucb/spec/ucb.spec
rename : usr/src/ucblib/libucb/spec/versions => deleted_files/usr/src/ucblib/libucb/spec/versions

2729 files changed, 30800 insertions, 6574 deletions

diff --git a/usr/src/cmd/abi/libstabspf/amd64/Makefile b/deleted_files/usr/src/cmd/abi/libstabspf/amd64/Makefile
index 62e90b478c..62e90b478c 100644
--- a/usr/src/cmd/abi/libstabspf/amd64/Makefile
+++ b/deleted_files/usr/src/cmd/abi/libstabspf/amd64/Makefile
diff --git a/usr/src/cmd/abi/libstabspf/spec/amd64/Makefile b/deleted_files/usr/src/cmd/abi/libstabspf/spec/amd64/Makefile
index f2aa3557ce..f2aa3557ce 100644
--- a/usr/src/cmd/abi/libstabspf/spec/amd64/Makefile
+++ b/deleted_files/usr/src/cmd/abi/libstabspf/spec/amd64/Makefile
diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/Makefile b/deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/Makefile
index 85b2b88b49..85b2b88b49 100644
--- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/Makefile
+++ b/deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/Makefile
diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/Makefile.targ b/deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/Makefile.targ
index a3a6cf3354..a3a6cf3354 100644
--- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/Makefile.targ
+++ b/deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/Makefile.targ
diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/i386/Makefile b/deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/i386/Makefile
index 37ccb3842c..37ccb3842c 100644
--- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/i386/Makefile
+++ b/deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/i386/Makefile
diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/picld_pluginutil.spec b/deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/picld_pluginutil.spec
index af4cf0b06a..af4cf0b06a 100644
--- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/picld_pluginutil.spec
+++ b/deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/picld_pluginutil.spec
diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/sparc/Makefile b/deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/sparc/Makefile
index 0d82a70c3e..0d82a70c3e 100644
--- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/sparc/Makefile
+++ b/deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/sparc/Makefile
diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/versions b/deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/versions
index dc8fbc1956..dc8fbc1956 100644
--- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/versions
+++ b/deleted_files/usr/src/cmd/picl/plugins/lib/picld_pluginutil/spec/versions
diff --git a/usr/src/cmd/pools/poold/libjkstat/spec/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/Makefile
index 24a6d4bf52..24a6d4bf52 100644
--- a/usr/src/cmd/pools/poold/libjkstat/spec/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/Makefile
diff --git a/usr/src/cmd/pools/poold/libjkstat/spec/Makefile.targ b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/Makefile.targ
index 0d7392118f..0d7392118f 100644
--- a/usr/src/cmd/pools/poold/libjkstat/spec/Makefile.targ
+++ b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/Makefile.targ
diff --git a/usr/src/cmd/pools/poold/libjkstat/spec/amd64/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/amd64/Makefile
index 1add7fe765..1add7fe765 100644
--- a/usr/src/cmd/pools/poold/libjkstat/spec/amd64/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/amd64/Makefile
diff --git a/usr/src/cmd/pools/poold/libjkstat/spec/i386/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/i386/Makefile
index 4bd5775646..4bd5775646 100644
--- a/usr/src/cmd/pools/poold/libjkstat/spec/i386/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/i386/Makefile
diff --git a/usr/src/cmd/pools/poold/libjkstat/spec/jkstat.spec b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/jkstat.spec
index 55571135de..55571135de 100644
--- a/usr/src/cmd/pools/poold/libjkstat/spec/jkstat.spec
+++ b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/jkstat.spec
diff --git a/usr/src/cmd/pools/poold/libjkstat/spec/sparc/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/sparc/Makefile
index c755776ae9..c755776ae9 100644
--- a/usr/src/cmd/pools/poold/libjkstat/spec/sparc/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/sparc/Makefile
diff --git a/usr/src/cmd/pools/poold/libjkstat/spec/sparcv9/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/sparcv9/Makefile
index 304c1d6ef3..304c1d6ef3 100644
--- a/usr/src/cmd/pools/poold/libjkstat/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/sparcv9/Makefile
diff --git a/usr/src/cmd/pools/poold/libjkstat/spec/versions b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/versions
index 9455f211e2..9455f211e2 100644
--- a/usr/src/cmd/pools/poold/libjkstat/spec/versions
+++ b/deleted_files/usr/src/cmd/pools/poold/libjkstat/spec/versions
diff --git a/usr/src/cmd/pools/poold/libjlgrp/spec/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/Makefile
index a5107dd9f9..a5107dd9f9 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/spec/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/Makefile
diff --git a/usr/src/cmd/pools/poold/libjlgrp/spec/Makefile.targ b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/Makefile.targ
index 48cdd9a230..48cdd9a230 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/spec/Makefile.targ
+++ b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/Makefile.targ
diff --git a/usr/src/cmd/pools/poold/libjlgrp/spec/amd64/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/amd64/Makefile
index e827ac53f6..e827ac53f6 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/spec/amd64/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/amd64/Makefile
diff --git a/usr/src/cmd/pools/poold/libjlgrp/spec/i386/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/i386/Makefile
index f9d884b09f..f9d884b09f 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/spec/i386/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/i386/Makefile
diff --git a/usr/src/cmd/pools/poold/libjlgrp/spec/jlgrp.spec b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/jlgrp.spec
index 81bc8189a6..81bc8189a6 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/spec/jlgrp.spec
+++ b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/jlgrp.spec
diff --git a/usr/src/cmd/pools/poold/libjlgrp/spec/sparc/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/sparc/Makefile
index ae86fd7d13..ae86fd7d13 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/spec/sparc/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/sparc/Makefile
diff --git a/usr/src/cmd/pools/poold/libjlgrp/spec/sparcv9/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/sparcv9/Makefile
index da5f498611..da5f498611 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/sparcv9/Makefile
diff --git a/usr/src/cmd/pools/poold/libjlgrp/spec/versions b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/versions
index 2d7d033084..2d7d033084 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/spec/versions
+++ b/deleted_files/usr/src/cmd/pools/poold/libjlgrp/spec/versions
diff --git a/usr/src/cmd/pools/poold/libjpool/spec/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/Makefile
index ac42336aea..ac42336aea 100644
--- a/usr/src/cmd/pools/poold/libjpool/spec/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/Makefile
diff --git a/usr/src/cmd/pools/poold/libjpool/spec/Makefile.targ b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/Makefile.targ
index 1fecfd654a..1fecfd654a 100644
--- a/usr/src/cmd/pools/poold/libjpool/spec/Makefile.targ
+++ b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/Makefile.targ
diff --git a/usr/src/cmd/pools/poold/libjpool/spec/amd64/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/amd64/Makefile
index aa209263c6..aa209263c6 100644
--- a/usr/src/cmd/pools/poold/libjpool/spec/amd64/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/amd64/Makefile
diff --git a/usr/src/cmd/pools/poold/libjpool/spec/i386/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/i386/Makefile
index 616e85b404..616e85b404 100644
--- a/usr/src/cmd/pools/poold/libjpool/spec/i386/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/i386/Makefile
diff --git a/usr/src/cmd/pools/poold/libjpool/spec/jpool.spec b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/jpool.spec
index faeabb575e..faeabb575e 100644
--- a/usr/src/cmd/pools/poold/libjpool/spec/jpool.spec
+++ b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/jpool.spec
diff --git a/usr/src/cmd/pools/poold/libjpool/spec/sparc/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/sparc/Makefile
index 00d0224208..00d0224208 100644
--- a/usr/src/cmd/pools/poold/libjpool/spec/sparc/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/sparc/Makefile
diff --git a/usr/src/cmd/pools/poold/libjpool/spec/sparcv9/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/sparcv9/Makefile
index d7de5d0445..d7de5d0445 100644
--- a/usr/src/cmd/pools/poold/libjpool/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/sparcv9/Makefile
diff --git a/usr/src/cmd/pools/poold/libjpool/spec/versions b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/versions
index 88bc34e512..88bc34e512 100644
--- a/usr/src/cmd/pools/poold/libjpool/spec/versions
+++ b/deleted_files/usr/src/cmd/pools/poold/libjpool/spec/versions
diff --git a/usr/src/cmd/pools/poold/libjsyslog/spec/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/Makefile
index 7f90194f7a..7f90194f7a 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/spec/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/Makefile
diff --git a/usr/src/cmd/pools/poold/libjsyslog/spec/Makefile.targ b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/Makefile.targ
index 902097f7f3..902097f7f3 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/spec/Makefile.targ
+++ b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/Makefile.targ
diff --git a/usr/src/cmd/pools/poold/libjsyslog/spec/amd64/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/amd64/Makefile
index 834ae5533d..834ae5533d 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/spec/amd64/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/amd64/Makefile
diff --git a/usr/src/cmd/pools/poold/libjsyslog/spec/i386/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/i386/Makefile
index d3a8371369..d3a8371369 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/spec/i386/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/i386/Makefile
diff --git a/usr/src/cmd/pools/poold/libjsyslog/spec/jsyslog.spec b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/jsyslog.spec
index 090b4de9bd..090b4de9bd 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/spec/jsyslog.spec
+++ b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/jsyslog.spec
diff --git a/usr/src/cmd/pools/poold/libjsyslog/spec/sparc/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/sparc/Makefile
index 57a87c60a4..57a87c60a4 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/spec/sparc/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/sparc/Makefile
diff --git a/usr/src/cmd/pools/poold/libjsyslog/spec/sparcv9/Makefile b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/sparcv9/Makefile
index 754d9ca943..754d9ca943 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/sparcv9/Makefile
diff --git a/usr/src/cmd/pools/poold/libjsyslog/spec/versions b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/versions
index e1a5cf94b6..e1a5cf94b6 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/spec/versions
+++ b/deleted_files/usr/src/cmd/pools/poold/libjsyslog/spec/versions
diff --git a/usr/src/lib/Makefile.spec b/deleted_files/usr/src/lib/Makefile.spec
index 4c15107cbc..4c15107cbc 100644
--- a/usr/src/lib/Makefile.spec
+++ b/deleted_files/usr/src/lib/Makefile.spec
diff --git a/usr/src/lib/Makefile.spec.arch b/deleted_files/usr/src/lib/Makefile.spec.arch
index d5eab5a0af..d5eab5a0af 100644
--- a/usr/src/lib/Makefile.spec.arch
+++ b/deleted_files/usr/src/lib/Makefile.spec.arch
diff --git a/usr/src/lib/Makefile.spec.psm b/deleted_files/usr/src/lib/Makefile.spec.psm
index a25271ddc5..a25271ddc5 100644
--- a/usr/src/lib/Makefile.spec.psm
+++ b/deleted_files/usr/src/lib/Makefile.spec.psm
diff --git a/usr/src/lib/auditd_plugins/binfile/spec/Makefile b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/Makefile
index d9ff13c10b..d9ff13c10b 100644
--- a/usr/src/lib/auditd_plugins/binfile/spec/Makefile
+++ b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/Makefile
diff --git a/usr/src/lib/auditd_plugins/binfile/spec/Makefile.targ b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/Makefile.targ
index d54d00f883..d54d00f883 100644
--- a/usr/src/lib/auditd_plugins/binfile/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/Makefile.targ
diff --git a/usr/src/lib/auditd_plugins/binfile/spec/amd64/Makefile b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/amd64/Makefile
index 98f45d6f94..98f45d6f94 100644
--- a/usr/src/lib/auditd_plugins/binfile/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/amd64/Makefile
diff --git a/usr/src/lib/auditd_plugins/binfile/spec/i386/Makefile b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/i386/Makefile
index b7374bd0ea..b7374bd0ea 100644
--- a/usr/src/lib/auditd_plugins/binfile/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/i386/Makefile
diff --git a/usr/src/lib/auditd_plugins/binfile/spec/private.spec b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/private.spec
index c33a968e35..c33a968e35 100644
--- a/usr/src/lib/auditd_plugins/binfile/spec/private.spec
+++ b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/private.spec
diff --git a/usr/src/lib/auditd_plugins/binfile/spec/sparc/Makefile b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/sparc/Makefile
index b7374bd0ea..b7374bd0ea 100644
--- a/usr/src/lib/auditd_plugins/binfile/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/sparc/Makefile
diff --git a/usr/src/lib/auditd_plugins/binfile/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/sparcv9/Makefile
index 4bae41ca27..4bae41ca27 100644
--- a/usr/src/lib/auditd_plugins/binfile/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/sparcv9/Makefile
diff --git a/usr/src/lib/auditd_plugins/binfile/spec/versions b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/versions
index d0b09b98ae..d0b09b98ae 100644
--- a/usr/src/lib/auditd_plugins/binfile/spec/versions
+++ b/deleted_files/usr/src/lib/auditd_plugins/binfile/spec/versions
diff --git a/usr/src/lib/auditd_plugins/syslog/spec/Makefile b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/Makefile
index d9ff13c10b..d9ff13c10b 100644
--- a/usr/src/lib/auditd_plugins/syslog/spec/Makefile
+++ b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/Makefile
diff --git a/usr/src/lib/auditd_plugins/syslog/spec/Makefile.targ b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/Makefile.targ
index 21621fe572..21621fe572 100644
--- a/usr/src/lib/auditd_plugins/syslog/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/Makefile.targ
diff --git a/usr/src/lib/auditd_plugins/syslog/spec/amd64/Makefile b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/amd64/Makefile
index 98f45d6f94..98f45d6f94 100644
--- a/usr/src/lib/auditd_plugins/syslog/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/amd64/Makefile
diff --git a/usr/src/lib/auditd_plugins/syslog/spec/i386/Makefile b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/i386/Makefile
index b7374bd0ea..b7374bd0ea 100644
--- a/usr/src/lib/auditd_plugins/syslog/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/i386/Makefile
diff --git a/usr/src/lib/auditd_plugins/syslog/spec/private.spec b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/private.spec
index c33a968e35..c33a968e35 100644
--- a/usr/src/lib/auditd_plugins/syslog/spec/private.spec
+++ b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/private.spec
diff --git a/usr/src/lib/auditd_plugins/syslog/spec/sparc/Makefile b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/sparc/Makefile
index b7374bd0ea..b7374bd0ea 100644
--- a/usr/src/lib/auditd_plugins/syslog/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/sparc/Makefile
diff --git a/usr/src/lib/auditd_plugins/syslog/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/sparcv9/Makefile
index 4bae41ca27..4bae41ca27 100644
--- a/usr/src/lib/auditd_plugins/syslog/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/sparcv9/Makefile
diff --git a/usr/src/lib/auditd_plugins/syslog/spec/versions b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/versions
index d0b09b98ae..d0b09b98ae 100644
--- a/usr/src/lib/auditd_plugins/syslog/spec/versions
+++ b/deleted_files/usr/src/lib/auditd_plugins/syslog/spec/versions
diff --git a/usr/src/lib/auditd_plugins/template/spec/template.spec b/deleted_files/usr/src/lib/auditd_plugins/template/spec/template.spec
index d1a1f33ea8..d1a1f33ea8 100644
--- a/usr/src/lib/auditd_plugins/template/spec/template.spec
+++ b/deleted_files/usr/src/lib/auditd_plugins/template/spec/template.spec
diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/Makefile
index 33f7f7a082..33f7f7a082 100644
--- a/usr/src/lib/cfgadm_plugins/ib/spec/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/Makefile.targ b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/Makefile.targ
index 93ae557a05..93ae557a05 100644
--- a/usr/src/lib/cfgadm_plugins/ib/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/Makefile.targ
diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/amd64/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/amd64/Makefile
index 4d70ca12b2..4d70ca12b2 100644
--- a/usr/src/lib/cfgadm_plugins/ib/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/amd64/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/cfga_ib.spec b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/cfga_ib.spec
index 55396bf6d9..55396bf6d9 100644
--- a/usr/src/lib/cfgadm_plugins/ib/spec/cfga_ib.spec
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/cfga_ib.spec
diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/i386/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/i386/Makefile
index b00af9887a..b00af9887a 100644
--- a/usr/src/lib/cfgadm_plugins/ib/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/i386/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/sparc/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/sparc/Makefile
index 7a9ab38247..7a9ab38247 100644
--- a/usr/src/lib/cfgadm_plugins/ib/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/sparc/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/sparcv9/Makefile
index f96d11d5ba..f96d11d5ba 100644
--- a/usr/src/lib/cfgadm_plugins/ib/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/sparcv9/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/ib/spec/versions b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/versions
index 567008d876..567008d876 100644
--- a/usr/src/lib/cfgadm_plugins/ib/spec/versions
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/ib/spec/versions
diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/Makefile
index 4aed628ebb..4aed628ebb 100644
--- a/usr/src/lib/cfgadm_plugins/pci/spec/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/Makefile.targ b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/Makefile.targ
index 554ecd55c1..554ecd55c1 100644
--- a/usr/src/lib/cfgadm_plugins/pci/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/Makefile.targ
diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/amd64/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/amd64/Makefile
index 5dd1b7240f..5dd1b7240f 100644
--- a/usr/src/lib/cfgadm_plugins/pci/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/amd64/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/i386/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/i386/Makefile
index 7c10315acd..7c10315acd 100644
--- a/usr/src/lib/cfgadm_plugins/pci/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/i386/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/pci.spec b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/pci.spec
index 76eaad9434..76eaad9434 100644
--- a/usr/src/lib/cfgadm_plugins/pci/spec/pci.spec
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/pci.spec
diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/sparc/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/sparc/Makefile
index 753d945350..753d945350 100644
--- a/usr/src/lib/cfgadm_plugins/pci/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/sparc/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/sparcv9/Makefile
index ac0abc07cf..ac0abc07cf 100644
--- a/usr/src/lib/cfgadm_plugins/pci/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/sparcv9/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/pci/spec/versions b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/cfgadm_plugins/pci/spec/versions
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/pci/spec/versions
diff --git a/usr/src/lib/cfgadm_plugins/sata/spec/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/Makefile
index be85571cfa..be85571cfa 100644
--- a/usr/src/lib/cfgadm_plugins/sata/spec/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/sata/spec/Makefile.targ b/deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/Makefile.targ
index ebf2c3ed62..ebf2c3ed62 100644
--- a/usr/src/lib/cfgadm_plugins/sata/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/Makefile.targ
diff --git a/usr/src/lib/cfgadm_plugins/sata/spec/amd64/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/amd64/Makefile
index a06ecae4b3..a06ecae4b3 100644
--- a/usr/src/lib/cfgadm_plugins/sata/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/amd64/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/sata/spec/cfga_sata.spec b/deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/cfga_sata.spec
index 83793393bd..83793393bd 100644
--- a/usr/src/lib/cfgadm_plugins/sata/spec/cfga_sata.spec
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/cfga_sata.spec
diff --git a/usr/src/lib/cfgadm_plugins/sata/spec/i386/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/i386/Makefile
index 2b765a917c..2b765a917c 100644
--- a/usr/src/lib/cfgadm_plugins/sata/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/i386/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/sata/spec/versions b/deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/versions
index 9bd9c66def..9bd9c66def 100644
--- a/usr/src/lib/cfgadm_plugins/sata/spec/versions
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/sata/spec/versions
diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile
index 53b36048b6..53b36048b6 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile.targ b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile.targ
index 582dfef74f..582dfef74f 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/Makefile.targ
diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/amd64/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/amd64/Makefile
index 5dd1b7240f..5dd1b7240f 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/amd64/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/cfga_scsi.spec b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/cfga_scsi.spec
index f896b36f80..f896b36f80 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/spec/cfga_scsi.spec
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/cfga_scsi.spec
diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/i386/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/i386/Makefile
index 41d7ee2ed9..41d7ee2ed9 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/i386/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/sparc/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/sparc/Makefile
index b86d0d4ff0..b86d0d4ff0 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/sparc/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/sparcv9/Makefile
index ec134c723c..ec134c723c 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/sparcv9/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/scsi/spec/versions b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/spec/versions
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/scsi/spec/versions
diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/Makefile
index c3663627b8..c3663627b8 100644
--- a/usr/src/lib/cfgadm_plugins/usb/spec/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/Makefile.targ b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/Makefile.targ
index 104af2d358..104af2d358 100644
--- a/usr/src/lib/cfgadm_plugins/usb/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/Makefile.targ
diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/amd64/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/amd64/Makefile
index 5dd1b7240f..5dd1b7240f 100644
--- a/usr/src/lib/cfgadm_plugins/usb/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/amd64/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/cfga_usb.spec b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/cfga_usb.spec
index b1c0aa9cb5..b1c0aa9cb5 100644
--- a/usr/src/lib/cfgadm_plugins/usb/spec/cfga_usb.spec
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/cfga_usb.spec
diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/i386/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/i386/Makefile
index f73285202b..f73285202b 100644
--- a/usr/src/lib/cfgadm_plugins/usb/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/i386/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/sparc/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/sparc/Makefile
index f754ed4c66..f754ed4c66 100644
--- a/usr/src/lib/cfgadm_plugins/usb/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/sparc/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/sparcv9/Makefile
index 6c2baae2fa..6c2baae2fa 100644
--- a/usr/src/lib/cfgadm_plugins/usb/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/sparcv9/Makefile
diff --git a/usr/src/lib/cfgadm_plugins/usb/spec/versions b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/cfgadm_plugins/usb/spec/versions
+++ b/deleted_files/usr/src/lib/cfgadm_plugins/usb/spec/versions
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/Makefile b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/Makefile
index 3adc9dfc19..3adc9dfc19 100644
--- a/usr/src/lib/crypt_modules/bsdbf/spec/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/Makefile
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/Makefile.targ b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/Makefile.targ
index 9b212125b8..9b212125b8 100644
--- a/usr/src/lib/crypt_modules/bsdbf/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/Makefile.targ
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/amd64/Makefile b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/amd64/Makefile
index 25ccbbbd01..25ccbbbd01 100644
--- a/usr/src/lib/crypt_modules/bsdbf/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/amd64/Makefile
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/bsdbf.spec b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/bsdbf.spec
index 46e30228ae..46e30228ae 100644
--- a/usr/src/lib/crypt_modules/bsdbf/spec/bsdbf.spec
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/bsdbf.spec
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/i386/Makefile b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/i386/Makefile
index ebf8d7f907..ebf8d7f907 100644
--- a/usr/src/lib/crypt_modules/bsdbf/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/i386/Makefile
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/sparc/Makefile b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/sparc/Makefile
index ebf8d7f907..ebf8d7f907 100644
--- a/usr/src/lib/crypt_modules/bsdbf/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/sparc/Makefile
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/sparcv9/Makefile
index 77087cd2af..77087cd2af 100644
--- a/usr/src/lib/crypt_modules/bsdbf/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/sparcv9/Makefile
diff --git a/usr/src/lib/crypt_modules/bsdbf/spec/versions b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/versions
index 26282a6b11..26282a6b11 100644
--- a/usr/src/lib/crypt_modules/bsdbf/spec/versions
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdbf/spec/versions
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile
index 3adc9dfc19..3adc9dfc19 100644
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile.targ b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile.targ
index 36ffc54005..36ffc54005 100644
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/Makefile.targ
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/amd64/Makefile b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/amd64/Makefile
index 25ccbbbd01..25ccbbbd01 100644
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/amd64/Makefile
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/bsdmd5.spec b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/bsdmd5.spec
index 46e30228ae..46e30228ae 100644
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/bsdmd5.spec
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/bsdmd5.spec
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/i386/Makefile b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/i386/Makefile
index ebf8d7f907..ebf8d7f907 100644
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/i386/Makefile
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/sparc/Makefile b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/sparc/Makefile
index ebf8d7f907..ebf8d7f907 100644
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/sparc/Makefile
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/sparcv9/Makefile
index 77087cd2af..77087cd2af 100644
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/sparcv9/Makefile
diff --git a/usr/src/lib/crypt_modules/bsdmd5/spec/versions b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/versions
index 26282a6b11..26282a6b11 100644
--- a/usr/src/lib/crypt_modules/bsdmd5/spec/versions
+++ b/deleted_files/usr/src/lib/crypt_modules/bsdmd5/spec/versions
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/Makefile b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/Makefile
index 3adc9dfc19..3adc9dfc19 100644
--- a/usr/src/lib/crypt_modules/sunmd5/spec/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/Makefile
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/Makefile.targ b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/Makefile.targ
index 6963190527..6963190527 100644
--- a/usr/src/lib/crypt_modules/sunmd5/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/Makefile.targ
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/amd64/Makefile b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/amd64/Makefile
index 25ccbbbd01..25ccbbbd01 100644
--- a/usr/src/lib/crypt_modules/sunmd5/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/amd64/Makefile
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/i386/Makefile b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/i386/Makefile
index ebf8d7f907..ebf8d7f907 100644
--- a/usr/src/lib/crypt_modules/sunmd5/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/i386/Makefile
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/sparc/Makefile b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/sparc/Makefile
index ebf8d7f907..ebf8d7f907 100644
--- a/usr/src/lib/crypt_modules/sunmd5/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/sparc/Makefile
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/sparcv9/Makefile
index 77087cd2af..77087cd2af 100644
--- a/usr/src/lib/crypt_modules/sunmd5/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/sparcv9/Makefile
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/sunmd5.spec b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/sunmd5.spec
index 46e30228ae..46e30228ae 100644
--- a/usr/src/lib/crypt_modules/sunmd5/spec/sunmd5.spec
+++ b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/sunmd5.spec
diff --git a/usr/src/lib/crypt_modules/sunmd5/spec/versions b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/versions
index 26282a6b11..26282a6b11 100644
--- a/usr/src/lib/crypt_modules/sunmd5/spec/versions
+++ b/deleted_files/usr/src/lib/crypt_modules/sunmd5/spec/versions
diff --git a/usr/src/lib/fm/libdiagcode/spec/Makefile b/deleted_files/usr/src/lib/fm/libdiagcode/spec/Makefile
index 331f5a8c84..331f5a8c84 100644
--- a/usr/src/lib/fm/libdiagcode/spec/Makefile
+++ b/deleted_files/usr/src/lib/fm/libdiagcode/spec/Makefile
diff --git a/usr/src/lib/fm/libdiagcode/spec/Makefile.targ b/deleted_files/usr/src/lib/fm/libdiagcode/spec/Makefile.targ
index da70279522..da70279522 100644
--- a/usr/src/lib/fm/libdiagcode/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/fm/libdiagcode/spec/Makefile.targ
diff --git a/usr/src/lib/fm/libdiagcode/spec/amd64/Makefile b/deleted_files/usr/src/lib/fm/libdiagcode/spec/amd64/Makefile
index f0681fb2d9..f0681fb2d9 100644
--- a/usr/src/lib/fm/libdiagcode/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/fm/libdiagcode/spec/amd64/Makefile
diff --git a/usr/src/lib/fm/libdiagcode/spec/diagcode.spec b/deleted_files/usr/src/lib/fm/libdiagcode/spec/diagcode.spec
index 02305cfedb..02305cfedb 100644
--- a/usr/src/lib/fm/libdiagcode/spec/diagcode.spec
+++ b/deleted_files/usr/src/lib/fm/libdiagcode/spec/diagcode.spec
diff --git a/usr/src/lib/fm/libdiagcode/spec/i386/Makefile b/deleted_files/usr/src/lib/fm/libdiagcode/spec/i386/Makefile
index 737c38c9c3..737c38c9c3 100644
--- a/usr/src/lib/fm/libdiagcode/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/fm/libdiagcode/spec/i386/Makefile
diff --git a/usr/src/lib/fm/libdiagcode/spec/sparc/Makefile b/deleted_files/usr/src/lib/fm/libdiagcode/spec/sparc/Makefile
index 941355bc7a..941355bc7a 100644
--- a/usr/src/lib/fm/libdiagcode/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/fm/libdiagcode/spec/sparc/Makefile
diff --git a/usr/src/lib/fm/libdiagcode/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/fm/libdiagcode/spec/sparcv9/Makefile
index 141b507494..141b507494 100644
--- a/usr/src/lib/fm/libdiagcode/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/fm/libdiagcode/spec/sparcv9/Makefile
diff --git a/usr/src/lib/fm/libdiagcode/spec/versions b/deleted_files/usr/src/lib/fm/libdiagcode/spec/versions
index 157a741300..157a741300 100644
--- a/usr/src/lib/fm/libdiagcode/spec/versions
+++ b/deleted_files/usr/src/lib/fm/libdiagcode/spec/versions
diff --git a/usr/src/lib/fm/libfmd_adm/spec/Makefile b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/Makefile
index babb709ad7..babb709ad7 100644
--- a/usr/src/lib/fm/libfmd_adm/spec/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/Makefile
diff --git a/usr/src/lib/fm/libfmd_adm/spec/Makefile.targ b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/Makefile.targ
index db289f7958..db289f7958 100644
--- a/usr/src/lib/fm/libfmd_adm/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/Makefile.targ
diff --git a/usr/src/lib/fm/libfmd_adm/spec/amd64/Makefile b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/amd64/Makefile
index 7d4d7e8b1b..7d4d7e8b1b 100644
--- a/usr/src/lib/fm/libfmd_adm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/amd64/Makefile
diff --git a/usr/src/lib/fm/libfmd_adm/spec/fmd_adm.spec b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/fmd_adm.spec
index 7a00630a6f..7a00630a6f 100644
--- a/usr/src/lib/fm/libfmd_adm/spec/fmd_adm.spec
+++ b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/fmd_adm.spec
diff --git a/usr/src/lib/fm/libfmd_adm/spec/i386/Makefile b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/i386/Makefile
index 684c03a198..684c03a198 100644
--- a/usr/src/lib/fm/libfmd_adm/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/i386/Makefile
diff --git a/usr/src/lib/fm/libfmd_adm/spec/sparc/Makefile b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/sparc/Makefile
index 281960b060..281960b060 100644
--- a/usr/src/lib/fm/libfmd_adm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/sparc/Makefile
diff --git a/usr/src/lib/fm/libfmd_adm/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/sparcv9/Makefile
index 9f9cb6ace4..9f9cb6ace4 100644
--- a/usr/src/lib/fm/libfmd_adm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/sparcv9/Makefile
diff --git a/usr/src/lib/fm/libfmd_adm/spec/versions b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/versions
index de52db1857..de52db1857 100644
--- a/usr/src/lib/fm/libfmd_adm/spec/versions
+++ b/deleted_files/usr/src/lib/fm/libfmd_adm/spec/versions
diff --git a/usr/src/lib/fm/libfmd_log/spec/Makefile b/deleted_files/usr/src/lib/fm/libfmd_log/spec/Makefile
index babb709ad7..babb709ad7 100644
--- a/usr/src/lib/fm/libfmd_log/spec/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_log/spec/Makefile
diff --git a/usr/src/lib/fm/libfmd_log/spec/Makefile.targ b/deleted_files/usr/src/lib/fm/libfmd_log/spec/Makefile.targ
index 7e145824d8..7e145824d8 100644
--- a/usr/src/lib/fm/libfmd_log/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/fm/libfmd_log/spec/Makefile.targ
diff --git a/usr/src/lib/fm/libfmd_log/spec/amd64/Makefile b/deleted_files/usr/src/lib/fm/libfmd_log/spec/amd64/Makefile
index 7d4d7e8b1b..7d4d7e8b1b 100644
--- a/usr/src/lib/fm/libfmd_log/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_log/spec/amd64/Makefile
diff --git a/usr/src/lib/fm/libfmd_log/spec/fmd_log.spec b/deleted_files/usr/src/lib/fm/libfmd_log/spec/fmd_log.spec
index 03a5c2b82e..03a5c2b82e 100644
--- a/usr/src/lib/fm/libfmd_log/spec/fmd_log.spec
+++ b/deleted_files/usr/src/lib/fm/libfmd_log/spec/fmd_log.spec
diff --git a/usr/src/lib/fm/libfmd_log/spec/i386/Makefile b/deleted_files/usr/src/lib/fm/libfmd_log/spec/i386/Makefile
index 684c03a198..684c03a198 100644
--- a/usr/src/lib/fm/libfmd_log/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_log/spec/i386/Makefile
diff --git a/usr/src/lib/fm/libfmd_log/spec/sparc/Makefile b/deleted_files/usr/src/lib/fm/libfmd_log/spec/sparc/Makefile
index 281960b060..281960b060 100644
--- a/usr/src/lib/fm/libfmd_log/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_log/spec/sparc/Makefile
diff --git a/usr/src/lib/fm/libfmd_log/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/fm/libfmd_log/spec/sparcv9/Makefile
index 9f9cb6ace4..9f9cb6ace4 100644
--- a/usr/src/lib/fm/libfmd_log/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_log/spec/sparcv9/Makefile
diff --git a/usr/src/lib/fm/libfmd_log/spec/versions b/deleted_files/usr/src/lib/fm/libfmd_log/spec/versions
index de52db1857..de52db1857 100644
--- a/usr/src/lib/fm/libfmd_log/spec/versions
+++ b/deleted_files/usr/src/lib/fm/libfmd_log/spec/versions
diff --git a/usr/src/lib/fm/libfmd_snmp/spec/Makefile b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/Makefile
index a66eef302e..a66eef302e 100644
--- a/usr/src/lib/fm/libfmd_snmp/spec/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/Makefile
diff --git a/usr/src/lib/fm/libfmd_snmp/spec/Makefile.targ b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/Makefile.targ
index ab462b0bc2..ab462b0bc2 100644
--- a/usr/src/lib/fm/libfmd_snmp/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/Makefile.targ
diff --git a/usr/src/lib/fm/libfmd_snmp/spec/amd64/Makefile b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/amd64/Makefile
index f0f7dfb2bc..f0f7dfb2bc 100644
--- a/usr/src/lib/fm/libfmd_snmp/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/amd64/Makefile
diff --git a/usr/src/lib/fm/libfmd_snmp/spec/fmd_snmp.spec b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/fmd_snmp.spec
index f51540d62b..f51540d62b 100644
--- a/usr/src/lib/fm/libfmd_snmp/spec/fmd_snmp.spec
+++ b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/fmd_snmp.spec
diff --git a/usr/src/lib/fm/libfmd_snmp/spec/i386/Makefile b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/i386/Makefile
index 4e313b5aa8..4e313b5aa8 100644
--- a/usr/src/lib/fm/libfmd_snmp/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/i386/Makefile
diff --git a/usr/src/lib/fm/libfmd_snmp/spec/sparc/Makefile b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/sparc/Makefile
index 0783a6dc00..0783a6dc00 100644
--- a/usr/src/lib/fm/libfmd_snmp/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/sparc/Makefile
diff --git a/usr/src/lib/fm/libfmd_snmp/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/sparcv9/Makefile
index aced5376d3..aced5376d3 100644
--- a/usr/src/lib/fm/libfmd_snmp/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/sparcv9/Makefile
diff --git a/usr/src/lib/fm/libfmd_snmp/spec/versions b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/versions
index 02542a46ff..02542a46ff 100644
--- a/usr/src/lib/fm/libfmd_snmp/spec/versions
+++ b/deleted_files/usr/src/lib/fm/libfmd_snmp/spec/versions
diff --git a/usr/src/lib/fm/libldom/spec/Makefile b/deleted_files/usr/src/lib/fm/libldom/spec/Makefile
index 08cdfb34ac..08cdfb34ac 100644
--- a/usr/src/lib/fm/libldom/spec/Makefile
+++ b/deleted_files/usr/src/lib/fm/libldom/spec/Makefile
diff --git a/usr/src/lib/fm/libldom/spec/Makefile.targ b/deleted_files/usr/src/lib/fm/libldom/spec/Makefile.targ
index 6fe36a13a5..6fe36a13a5 100644
--- a/usr/src/lib/fm/libldom/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/fm/libldom/spec/Makefile.targ
diff --git a/usr/src/lib/fm/libldom/spec/ldom.spec b/deleted_files/usr/src/lib/fm/libldom/spec/ldom.spec
index f2e2844dfd..f2e2844dfd 100644
--- a/usr/src/lib/fm/libldom/spec/ldom.spec
+++ b/deleted_files/usr/src/lib/fm/libldom/spec/ldom.spec
diff --git a/usr/src/lib/fm/libldom/spec/sparc/Makefile b/deleted_files/usr/src/lib/fm/libldom/spec/sparc/Makefile
index 8c109c851c..8c109c851c 100644
--- a/usr/src/lib/fm/libldom/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/fm/libldom/spec/sparc/Makefile
diff --git a/usr/src/lib/fm/libldom/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/fm/libldom/spec/sparcv9/Makefile
index 6d49e3f9d5..6d49e3f9d5 100644
--- a/usr/src/lib/fm/libldom/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/fm/libldom/spec/sparcv9/Makefile
diff --git a/usr/src/lib/fm/libldom/spec/versions b/deleted_files/usr/src/lib/fm/libldom/spec/versions
index 097712f238..097712f238 100644
--- a/usr/src/lib/fm/libldom/spec/versions
+++ b/deleted_files/usr/src/lib/fm/libldom/spec/versions
diff --git a/usr/src/lib/fm/libmdesc/spec/Makefile b/deleted_files/usr/src/lib/fm/libmdesc/spec/Makefile
index 2cb984bfc9..2cb984bfc9 100644
--- a/usr/src/lib/fm/libmdesc/spec/Makefile
+++ b/deleted_files/usr/src/lib/fm/libmdesc/spec/Makefile
diff --git a/usr/src/lib/fm/libmdesc/spec/Makefile.targ b/deleted_files/usr/src/lib/fm/libmdesc/spec/Makefile.targ
index bad8b2b5de..bad8b2b5de 100644
--- a/usr/src/lib/fm/libmdesc/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/fm/libmdesc/spec/Makefile.targ
diff --git a/usr/src/lib/fm/libmdesc/spec/mdesc.spec b/deleted_files/usr/src/lib/fm/libmdesc/spec/mdesc.spec
index e64d5d6f25..e64d5d6f25 100644
--- a/usr/src/lib/fm/libmdesc/spec/mdesc.spec
+++ b/deleted_files/usr/src/lib/fm/libmdesc/spec/mdesc.spec
diff --git a/usr/src/lib/fm/libmdesc/spec/sparc/Makefile b/deleted_files/usr/src/lib/fm/libmdesc/spec/sparc/Makefile
index 2ad3b54409..2ad3b54409 100644
--- a/usr/src/lib/fm/libmdesc/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/fm/libmdesc/spec/sparc/Makefile
diff --git a/usr/src/lib/fm/libmdesc/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/fm/libmdesc/spec/sparcv9/Makefile
index b6eb6145ad..b6eb6145ad 100644
--- a/usr/src/lib/fm/libmdesc/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/fm/libmdesc/spec/sparcv9/Makefile
diff --git a/usr/src/lib/fm/libmdesc/spec/versions b/deleted_files/usr/src/lib/fm/libmdesc/spec/versions
index 1da266aa3a..1da266aa3a 100644
--- a/usr/src/lib/fm/libmdesc/spec/versions
+++ b/deleted_files/usr/src/lib/fm/libmdesc/spec/versions
diff --git a/usr/src/lib/fm/topo/libtopo/spec/Makefile b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/Makefile
index 1208d7a09f..1208d7a09f 100644
--- a/usr/src/lib/fm/topo/libtopo/spec/Makefile
+++ b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/Makefile
diff --git a/usr/src/lib/fm/topo/libtopo/spec/Makefile.targ b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/Makefile.targ
index e1102bd53f..e1102bd53f 100644
--- a/usr/src/lib/fm/topo/libtopo/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/Makefile.targ
diff --git a/usr/src/lib/fm/topo/libtopo/spec/amd64/Makefile b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/amd64/Makefile
index a04ea5eb47..a04ea5eb47 100644
--- a/usr/src/lib/fm/topo/libtopo/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/amd64/Makefile
diff --git a/usr/src/lib/fm/topo/libtopo/spec/i386/Makefile b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/i386/Makefile
index afd97ec009..afd97ec009 100644
--- a/usr/src/lib/fm/topo/libtopo/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/i386/Makefile
diff --git a/usr/src/lib/fm/topo/libtopo/spec/sparc/Makefile b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/sparc/Makefile
index afd97ec009..afd97ec009 100644
--- a/usr/src/lib/fm/topo/libtopo/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/sparc/Makefile
diff --git a/usr/src/lib/fm/topo/libtopo/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/sparcv9/Makefile
index a04ea5eb47..a04ea5eb47 100644
--- a/usr/src/lib/fm/topo/libtopo/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/sparcv9/Makefile
diff --git a/usr/src/lib/fm/topo/libtopo/spec/topo.spec b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/topo.spec
index 3954952908..3954952908 100644
--- a/usr/src/lib/fm/topo/libtopo/spec/topo.spec
+++ b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/topo.spec
diff --git a/usr/src/lib/fm/topo/libtopo/spec/versions b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/versions
index 7a65542162..7a65542162 100644
--- a/usr/src/lib/fm/topo/libtopo/spec/versions
+++ b/deleted_files/usr/src/lib/fm/topo/libtopo/spec/versions
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile
index 1fb89ffa2f..1fb89ffa2f 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile.spec
index 83e66353d4..83e66353d4 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile.targ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile.targ
index 320d564b2d..320d564b2d 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/Makefile.targ
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/amd64/Makefile b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/amd64/Makefile
index d256579bdc..d256579bdc 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/amd64/Makefile
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/i386/Makefile b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/i386/Makefile
index 578a4b2eaa..578a4b2eaa 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/i386/Makefile
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_asn1.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_asn1.spec
index 806451ca0a..806451ca0a 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_asn1.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_asn1.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_cache.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_cache.spec
index fa60cbe503..fa60cbe503 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_cache.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_cache.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_clean.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_clean.spec
index e083e41a0b..e083e41a0b 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_clean.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_clean.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_crypto.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_crypto.spec
index 5817ed05a5..5817ed05a5 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_crypto.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_crypto.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_errtbl.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_errtbl.spec
index 7372a638f3..7372a638f3 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_errtbl.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_errtbl.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_gss.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_gss.spec
index fc08da65f3..fc08da65f3 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_gss.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_gss.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_int.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_int.spec
index 29a42cef36..29a42cef36 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_int.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_int.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_keytab.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_keytab.spec
index 64c50c9235..64c50c9235 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_keytab.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_keytab.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_krb.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_krb.spec
index dd30629198..dd30629198 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_krb.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_krb.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech1.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech1.spec
index 8c140bf0e7..8c140bf0e7 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech1.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech1.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech2.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech2.spec
index 0c0b09c978..0c0b09c978 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech2.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech2.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech3.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech3.spec
index 727311f11c..727311f11c 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech3.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_mech3.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_profile.spec b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_profile.spec
index 4318c44844..4318c44844 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_profile.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/krb5_profile.spec
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/sparc/Makefile b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/sparc/Makefile
index 10f424bd25..10f424bd25 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/sparc/Makefile
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/sparcv9/Makefile
index 164fe7158f..164fe7158f 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/sparcv9/Makefile
diff --git a/usr/src/lib/gss_mechs/mech_krb5/spec/versions b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/versions
index 7690404cd5..7690404cd5 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/spec/versions
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_krb5/spec/versions
diff --git a/usr/src/lib/gss_mechs/mech_spnego/spec/Makefile b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/Makefile
index 9a4ddd9025..9a4ddd9025 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/spec/Makefile
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/Makefile
diff --git a/usr/src/lib/gss_mechs/mech_spnego/spec/Makefile.targ b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/Makefile.targ
index 737f4ae7d0..737f4ae7d0 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/Makefile.targ
diff --git a/usr/src/lib/gss_mechs/mech_spnego/spec/amd64/Makefile b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/amd64/Makefile
index 4f64d4490a..4f64d4490a 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/amd64/Makefile
diff --git a/usr/src/lib/gss_mechs/mech_spnego/spec/clean.spec b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/clean.spec
index 7faef7ebdc..7faef7ebdc 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/spec/clean.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/clean.spec
diff --git a/usr/src/lib/gss_mechs/mech_spnego/spec/i386/Makefile b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/i386/Makefile
index 8f26f1edc8..8f26f1edc8 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/i386/Makefile
diff --git a/usr/src/lib/gss_mechs/mech_spnego/spec/sparc/Makefile b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/sparc/Makefile
index 805d13be9c..805d13be9c 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/sparc/Makefile
diff --git a/usr/src/lib/gss_mechs/mech_spnego/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/sparcv9/Makefile
index 548df197f2..548df197f2 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/sparcv9/Makefile
diff --git a/usr/src/lib/gss_mechs/mech_spnego/spec/spnego.spec b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/spnego.spec
index acd14eb89a..acd14eb89a 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/spec/spnego.spec
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/spnego.spec
diff --git a/usr/src/lib/gss_mechs/mech_spnego/spec/versions b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/versions
index af6a148700..af6a148700 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/spec/versions
+++ b/deleted_files/usr/src/lib/gss_mechs/mech_spnego/spec/versions
diff --git a/usr/src/lib/krb5/Makefile.spec.arch b/deleted_files/usr/src/lib/krb5/Makefile.spec.arch
index 9be195001d..9be195001d 100644
--- a/usr/src/lib/krb5/Makefile.spec.arch
+++ b/deleted_files/usr/src/lib/krb5/Makefile.spec.arch
diff --git a/usr/src/lib/krb5/db2/spec/Makefile b/deleted_files/usr/src/lib/krb5/db2/spec/Makefile
index 5d4453b4a1..5d4453b4a1 100644
--- a/usr/src/lib/krb5/db2/spec/Makefile
+++ b/deleted_files/usr/src/lib/krb5/db2/spec/Makefile
diff --git a/usr/src/lib/krb5/db2/spec/Makefile.targ b/deleted_files/usr/src/lib/krb5/db2/spec/Makefile.targ
index f0b4eb6991..f0b4eb6991 100644
--- a/usr/src/lib/krb5/db2/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/krb5/db2/spec/Makefile.targ
diff --git a/usr/src/lib/krb5/db2/spec/db2.spec b/deleted_files/usr/src/lib/krb5/db2/spec/db2.spec
index d6cedb6e72..d6cedb6e72 100644
--- a/usr/src/lib/krb5/db2/spec/db2.spec
+++ b/deleted_files/usr/src/lib/krb5/db2/spec/db2.spec
diff --git a/usr/src/lib/krb5/db2/spec/i386/Makefile b/deleted_files/usr/src/lib/krb5/db2/spec/i386/Makefile
index 0be82a49c8..0be82a49c8 100644
--- a/usr/src/lib/krb5/db2/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/krb5/db2/spec/i386/Makefile
diff --git a/usr/src/lib/krb5/db2/spec/sparc/Makefile b/deleted_files/usr/src/lib/krb5/db2/spec/sparc/Makefile
index 6193d4b441..6193d4b441 100644
--- a/usr/src/lib/krb5/db2/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/krb5/db2/spec/sparc/Makefile
diff --git a/usr/src/lib/krb5/db2/spec/versions b/deleted_files/usr/src/lib/krb5/db2/spec/versions
index 7690404cd5..7690404cd5 100644
--- a/usr/src/lib/krb5/db2/spec/versions
+++ b/deleted_files/usr/src/lib/krb5/db2/spec/versions
diff --git a/usr/src/lib/krb5/dyn/spec/Makefile b/deleted_files/usr/src/lib/krb5/dyn/spec/Makefile
index 18ab143444..18ab143444 100644
--- a/usr/src/lib/krb5/dyn/spec/Makefile
+++ b/deleted_files/usr/src/lib/krb5/dyn/spec/Makefile
diff --git a/usr/src/lib/krb5/dyn/spec/Makefile.targ b/deleted_files/usr/src/lib/krb5/dyn/spec/Makefile.targ
index 941fc88aee..941fc88aee 100644
--- a/usr/src/lib/krb5/dyn/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/krb5/dyn/spec/Makefile.targ
diff --git a/usr/src/lib/krb5/dyn/spec/dyn.spec b/deleted_files/usr/src/lib/krb5/dyn/spec/dyn.spec
index 248ea4a4be..248ea4a4be 100644
--- a/usr/src/lib/krb5/dyn/spec/dyn.spec
+++ b/deleted_files/usr/src/lib/krb5/dyn/spec/dyn.spec
diff --git a/usr/src/lib/krb5/dyn/spec/i386/Makefile b/deleted_files/usr/src/lib/krb5/dyn/spec/i386/Makefile
index 0949c9ed2f..0949c9ed2f 100644
--- a/usr/src/lib/krb5/dyn/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/krb5/dyn/spec/i386/Makefile
diff --git a/usr/src/lib/krb5/dyn/spec/sparc/Makefile b/deleted_files/usr/src/lib/krb5/dyn/spec/sparc/Makefile
index cf92d0653e..cf92d0653e 100644
--- a/usr/src/lib/krb5/dyn/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/krb5/dyn/spec/sparc/Makefile
diff --git a/usr/src/lib/krb5/dyn/spec/versions b/deleted_files/usr/src/lib/krb5/dyn/spec/versions
index 7690404cd5..7690404cd5 100644
--- a/usr/src/lib/krb5/dyn/spec/versions
+++ b/deleted_files/usr/src/lib/krb5/dyn/spec/versions
diff --git a/usr/src/lib/krb5/kadm5/clnt/spec/Makefile b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/Makefile
index 05c8165b9d..05c8165b9d 100644
--- a/usr/src/lib/krb5/kadm5/clnt/spec/Makefile
+++ b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/Makefile
diff --git a/usr/src/lib/krb5/kadm5/clnt/spec/Makefile.targ b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/Makefile.targ
index 61295a87ca..61295a87ca 100644
--- a/usr/src/lib/krb5/kadm5/clnt/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/Makefile.targ
diff --git a/usr/src/lib/krb5/kadm5/clnt/spec/amd64/Makefile b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/amd64/Makefile
index bc0a6d45d7..bc0a6d45d7 100644
--- a/usr/src/lib/krb5/kadm5/clnt/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/amd64/Makefile
diff --git a/usr/src/lib/krb5/kadm5/clnt/spec/i386/Makefile b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/i386/Makefile
index 08d1ed15dc..08d1ed15dc 100644
--- a/usr/src/lib/krb5/kadm5/clnt/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/i386/Makefile
diff --git a/usr/src/lib/krb5/kadm5/clnt/spec/kadm5clnt.spec b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/kadm5clnt.spec
index 85b970af4a..85b970af4a 100644
--- a/usr/src/lib/krb5/kadm5/clnt/spec/kadm5clnt.spec
+++ b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/kadm5clnt.spec
diff --git a/usr/src/lib/krb5/kadm5/clnt/spec/sparc/Makefile b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/sparc/Makefile
index 3883050aee..3883050aee 100644
--- a/usr/src/lib/krb5/kadm5/clnt/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/sparc/Makefile
diff --git a/usr/src/lib/krb5/kadm5/clnt/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/sparcv9/Makefile
index 51958af12e..51958af12e 100644
--- a/usr/src/lib/krb5/kadm5/clnt/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/sparcv9/Makefile
diff --git a/usr/src/lib/krb5/kadm5/clnt/spec/versions b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/versions
index 6a318d48a3..6a318d48a3 100644
--- a/usr/src/lib/krb5/kadm5/clnt/spec/versions
+++ b/deleted_files/usr/src/lib/krb5/kadm5/clnt/spec/versions
diff --git a/usr/src/lib/krb5/kadm5/srv/spec/Makefile b/deleted_files/usr/src/lib/krb5/kadm5/srv/spec/Makefile
index 4c1197e78d..4c1197e78d 100644
--- a/usr/src/lib/krb5/kadm5/srv/spec/Makefile
+++ b/deleted_files/usr/src/lib/krb5/kadm5/srv/spec/Makefile
diff --git a/usr/src/lib/krb5/kadm5/srv/spec/Makefile.targ b/deleted_files/usr/src/lib/krb5/kadm5/srv/spec/Makefile.targ
index 5b7038ab75..5b7038ab75 100644
--- a/usr/src/lib/krb5/kadm5/srv/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/krb5/kadm5/srv/spec/Makefile.targ
diff --git a/usr/src/lib/krb5/kadm5/srv/spec/i386/Makefile b/deleted_files/usr/src/lib/krb5/kadm5/srv/spec/i386/Makefile
index 3d15861bdc..3d15861bdc 100644
--- a/usr/src/lib/krb5/kadm5/srv/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/krb5/kadm5/srv/spec/i386/Makefile
diff --git a/usr/src/lib/krb5/kadm5/srv/spec/kadm5srv.spec b/deleted_files/usr/src/lib/krb5/kadm5/srv/spec/kadm5srv.spec
index 0805e5a9ec..0805e5a9ec 100644
--- a/usr/src/lib/krb5/kadm5/srv/spec/kadm5srv.spec
+++ b/deleted_files/usr/src/lib/krb5/kadm5/srv/spec/kadm5srv.spec
diff --git a/usr/src/lib/krb5/kadm5/srv/spec/sparc/Makefile b/deleted_files/usr/src/lib/krb5/kadm5/srv/spec/sparc/Makefile
index 1c01d64146..1c01d64146 100644
--- a/usr/src/lib/krb5/kadm5/srv/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/krb5/kadm5/srv/spec/sparc/Makefile
diff --git a/usr/src/lib/krb5/kadm5/srv/spec/versions b/deleted_files/usr/src/lib/krb5/kadm5/srv/spec/versions
index 7690404cd5..7690404cd5 100644
--- a/usr/src/lib/krb5/kadm5/srv/spec/versions
+++ b/deleted_files/usr/src/lib/krb5/kadm5/srv/spec/versions
diff --git a/usr/src/lib/krb5/kdb/spec/Makefile b/deleted_files/usr/src/lib/krb5/kdb/spec/Makefile
index 558bb5fc73..558bb5fc73 100644
--- a/usr/src/lib/krb5/kdb/spec/Makefile
+++ b/deleted_files/usr/src/lib/krb5/kdb/spec/Makefile
diff --git a/usr/src/lib/krb5/kdb/spec/Makefile.targ b/deleted_files/usr/src/lib/krb5/kdb/spec/Makefile.targ
index f63e6d8bae..f63e6d8bae 100644
--- a/usr/src/lib/krb5/kdb/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/krb5/kdb/spec/Makefile.targ
diff --git a/usr/src/lib/krb5/kdb/spec/i386/Makefile b/deleted_files/usr/src/lib/krb5/kdb/spec/i386/Makefile
index c1129abe79..c1129abe79 100644
--- a/usr/src/lib/krb5/kdb/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/krb5/kdb/spec/i386/Makefile
diff --git a/usr/src/lib/krb5/kdb/spec/kdb.spec b/deleted_files/usr/src/lib/krb5/kdb/spec/kdb.spec
index 63c3d0cc96..63c3d0cc96 100644
--- a/usr/src/lib/krb5/kdb/spec/kdb.spec
+++ b/deleted_files/usr/src/lib/krb5/kdb/spec/kdb.spec
diff --git a/usr/src/lib/krb5/kdb/spec/sparc/Makefile b/deleted_files/usr/src/lib/krb5/kdb/spec/sparc/Makefile
index 34ec9d237e..34ec9d237e 100644
--- a/usr/src/lib/krb5/kdb/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/krb5/kdb/spec/sparc/Makefile
diff --git a/usr/src/lib/krb5/kdb/spec/versions b/deleted_files/usr/src/lib/krb5/kdb/spec/versions
index 7690404cd5..7690404cd5 100644
--- a/usr/src/lib/krb5/kdb/spec/versions
+++ b/deleted_files/usr/src/lib/krb5/kdb/spec/versions
diff --git a/usr/src/lib/krb5/ss/spec/Makefile b/deleted_files/usr/src/lib/krb5/ss/spec/Makefile
index ff34a3c9e9..ff34a3c9e9 100644
--- a/usr/src/lib/krb5/ss/spec/Makefile
+++ b/deleted_files/usr/src/lib/krb5/ss/spec/Makefile
diff --git a/usr/src/lib/krb5/ss/spec/Makefile.targ b/deleted_files/usr/src/lib/krb5/ss/spec/Makefile.targ
index 5c86dff4f5..5c86dff4f5 100644
--- a/usr/src/lib/krb5/ss/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/krb5/ss/spec/Makefile.targ
diff --git a/usr/src/lib/krb5/ss/spec/amd64/Makefile b/deleted_files/usr/src/lib/krb5/ss/spec/amd64/Makefile
index ff8d4177fa..ff8d4177fa 100644
--- a/usr/src/lib/krb5/ss/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/krb5/ss/spec/amd64/Makefile
diff --git a/usr/src/lib/krb5/ss/spec/i386/Makefile b/deleted_files/usr/src/lib/krb5/ss/spec/i386/Makefile
index 0ef948bedb..0ef948bedb 100644
--- a/usr/src/lib/krb5/ss/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/krb5/ss/spec/i386/Makefile
diff --git a/usr/src/lib/krb5/ss/spec/sparc/Makefile b/deleted_files/usr/src/lib/krb5/ss/spec/sparc/Makefile
index d6b5d30a3d..d6b5d30a3d 100644
--- a/usr/src/lib/krb5/ss/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/krb5/ss/spec/sparc/Makefile
diff --git a/usr/src/lib/krb5/ss/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/krb5/ss/spec/sparcv9/Makefile
index 9ce7bb1587..9ce7bb1587 100644
--- a/usr/src/lib/krb5/ss/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/krb5/ss/spec/sparcv9/Makefile
diff --git a/usr/src/lib/krb5/ss/spec/ss.spec b/deleted_files/usr/src/lib/krb5/ss/spec/ss.spec
index dad94b7976..dad94b7976 100644
--- a/usr/src/lib/krb5/ss/spec/ss.spec
+++ b/deleted_files/usr/src/lib/krb5/ss/spec/ss.spec
diff --git a/usr/src/lib/krb5/ss/spec/versions b/deleted_files/usr/src/lib/krb5/ss/spec/versions
index 6a318d48a3..6a318d48a3 100644
--- a/usr/src/lib/krb5/ss/spec/versions
+++ b/deleted_files/usr/src/lib/krb5/ss/spec/versions
diff --git a/usr/src/lib/libadm/spec/Makefile b/deleted_files/usr/src/lib/libadm/spec/Makefile
index 4367acf239..4367acf239 100644
--- a/usr/src/lib/libadm/spec/Makefile
+++ b/deleted_files/usr/src/lib/libadm/spec/Makefile
diff --git a/usr/src/lib/libadm/spec/Makefile.targ b/deleted_files/usr/src/lib/libadm/spec/Makefile.targ
index 021fec95d0..021fec95d0 100644
--- a/usr/src/lib/libadm/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libadm/spec/Makefile.targ
diff --git a/usr/src/lib/libadm/spec/adm.spec b/deleted_files/usr/src/lib/libadm/spec/adm.spec
index 0400628969..0400628969 100644
--- a/usr/src/lib/libadm/spec/adm.spec
+++ b/deleted_files/usr/src/lib/libadm/spec/adm.spec
diff --git a/usr/src/lib/libadm/spec/amd64/Makefile b/deleted_files/usr/src/lib/libadm/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libadm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libadm/spec/amd64/Makefile
diff --git a/usr/src/lib/libadm/spec/i386/Makefile b/deleted_files/usr/src/lib/libadm/spec/i386/Makefile
index c7d5274776..c7d5274776 100644
--- a/usr/src/lib/libadm/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libadm/spec/i386/Makefile
diff --git a/usr/src/lib/libadm/spec/sparc/Makefile b/deleted_files/usr/src/lib/libadm/spec/sparc/Makefile
index cd4364e37d..cd4364e37d 100644
--- a/usr/src/lib/libadm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libadm/spec/sparc/Makefile
diff --git a/usr/src/lib/libadm/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libadm/spec/sparcv9/Makefile
index 1a73918201..1a73918201 100644
--- a/usr/src/lib/libadm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libadm/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libadm/spec/versions b/deleted_files/usr/src/lib/libadm/spec/versions
index 2fed5f1c60..2fed5f1c60 100644
--- a/usr/src/lib/libadm/spec/versions
+++ b/deleted_files/usr/src/lib/libadm/spec/versions
diff --git a/usr/src/lib/libadt_jni/spec/Makefile b/deleted_files/usr/src/lib/libadt_jni/spec/Makefile
index fea0d22987..fea0d22987 100644
--- a/usr/src/lib/libadt_jni/spec/Makefile
+++ b/deleted_files/usr/src/lib/libadt_jni/spec/Makefile
diff --git a/usr/src/lib/libadt_jni/spec/Makefile.targ b/deleted_files/usr/src/lib/libadt_jni/spec/Makefile.targ
index 2b69321c49..2b69321c49 100644
--- a/usr/src/lib/libadt_jni/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libadt_jni/spec/Makefile.targ
diff --git a/usr/src/lib/libadt_jni/spec/amd64/Makefile b/deleted_files/usr/src/lib/libadt_jni/spec/amd64/Makefile
index bca8f0b3ac..bca8f0b3ac 100644
--- a/usr/src/lib/libadt_jni/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libadt_jni/spec/amd64/Makefile
diff --git a/usr/src/lib/libadt_jni/spec/i386/Makefile b/deleted_files/usr/src/lib/libadt_jni/spec/i386/Makefile
index 22cbaec52f..22cbaec52f 100644
--- a/usr/src/lib/libadt_jni/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libadt_jni/spec/i386/Makefile
diff --git a/usr/src/lib/libadt_jni/spec/private.spec b/deleted_files/usr/src/lib/libadt_jni/spec/private.spec
index 01ec52067a..01ec52067a 100644
--- a/usr/src/lib/libadt_jni/spec/private.spec
+++ b/deleted_files/usr/src/lib/libadt_jni/spec/private.spec
diff --git a/usr/src/lib/libadt_jni/spec/sparc/Makefile b/deleted_files/usr/src/lib/libadt_jni/spec/sparc/Makefile
index a04e75169d..a04e75169d 100644
--- a/usr/src/lib/libadt_jni/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libadt_jni/spec/sparc/Makefile
diff --git a/usr/src/lib/libadt_jni/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libadt_jni/spec/sparcv9/Makefile
index f9e619f159..f9e619f159 100644
--- a/usr/src/lib/libadt_jni/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libadt_jni/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libadt_jni/spec/versions b/deleted_files/usr/src/lib/libadt_jni/spec/versions
index 22e0dd1104..22e0dd1104 100644
--- a/usr/src/lib/libadt_jni/spec/versions
+++ b/deleted_files/usr/src/lib/libadt_jni/spec/versions
diff --git a/usr/src/lib/libavl/spec/Makefile b/deleted_files/usr/src/lib/libavl/spec/Makefile
index a5831e097c..a5831e097c 100644
--- a/usr/src/lib/libavl/spec/Makefile
+++ b/deleted_files/usr/src/lib/libavl/spec/Makefile
diff --git a/usr/src/lib/libavl/spec/Makefile.targ b/deleted_files/usr/src/lib/libavl/spec/Makefile.targ
index a069059512..a069059512 100644
--- a/usr/src/lib/libavl/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libavl/spec/Makefile.targ
diff --git a/usr/src/lib/libavl/spec/amd64/Makefile b/deleted_files/usr/src/lib/libavl/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libavl/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libavl/spec/amd64/Makefile
diff --git a/usr/src/lib/libavl/spec/avl.spec b/deleted_files/usr/src/lib/libavl/spec/avl.spec
index 67a4782034..67a4782034 100644
--- a/usr/src/lib/libavl/spec/avl.spec
+++ b/deleted_files/usr/src/lib/libavl/spec/avl.spec
diff --git a/usr/src/lib/libavl/spec/i386/Makefile b/deleted_files/usr/src/lib/libavl/spec/i386/Makefile
index d5084c6b39..d5084c6b39 100644
--- a/usr/src/lib/libavl/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libavl/spec/i386/Makefile
diff --git a/usr/src/lib/libavl/spec/sparc/Makefile b/deleted_files/usr/src/lib/libavl/spec/sparc/Makefile
index 550f614b3b..550f614b3b 100644
--- a/usr/src/lib/libavl/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libavl/spec/sparc/Makefile
diff --git a/usr/src/lib/libavl/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libavl/spec/sparcv9/Makefile
index bd6acac8c9..bd6acac8c9 100644
--- a/usr/src/lib/libavl/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libavl/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libavl/spec/versions b/deleted_files/usr/src/lib/libavl/spec/versions
index 3fc6f92d2d..3fc6f92d2d 100644
--- a/usr/src/lib/libavl/spec/versions
+++ b/deleted_files/usr/src/lib/libavl/spec/versions
diff --git a/usr/src/lib/libbsdmalloc/spec/Makefile b/deleted_files/usr/src/lib/libbsdmalloc/spec/Makefile
index f98f80264a..f98f80264a 100644
--- a/usr/src/lib/libbsdmalloc/spec/Makefile
+++ b/deleted_files/usr/src/lib/libbsdmalloc/spec/Makefile
diff --git a/usr/src/lib/libbsdmalloc/spec/Makefile.targ b/deleted_files/usr/src/lib/libbsdmalloc/spec/Makefile.targ
index 3ab2281464..3ab2281464 100644
--- a/usr/src/lib/libbsdmalloc/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libbsdmalloc/spec/Makefile.targ
diff --git a/usr/src/lib/libbsdmalloc/spec/amd64/Makefile b/deleted_files/usr/src/lib/libbsdmalloc/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libbsdmalloc/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libbsdmalloc/spec/amd64/Makefile
diff --git a/usr/src/lib/libbsdmalloc/spec/bsdmalloc.spec b/deleted_files/usr/src/lib/libbsdmalloc/spec/bsdmalloc.spec
index 4f5554e6bf..4f5554e6bf 100644
--- a/usr/src/lib/libbsdmalloc/spec/bsdmalloc.spec
+++ b/deleted_files/usr/src/lib/libbsdmalloc/spec/bsdmalloc.spec
diff --git a/usr/src/lib/libbsdmalloc/spec/i386/Makefile b/deleted_files/usr/src/lib/libbsdmalloc/spec/i386/Makefile
index 4e0939499f..4e0939499f 100644
--- a/usr/src/lib/libbsdmalloc/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libbsdmalloc/spec/i386/Makefile
diff --git a/usr/src/lib/libbsdmalloc/spec/sparc/Makefile b/deleted_files/usr/src/lib/libbsdmalloc/spec/sparc/Makefile
index 3ded548f28..3ded548f28 100644
--- a/usr/src/lib/libbsdmalloc/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libbsdmalloc/spec/sparc/Makefile
diff --git a/usr/src/lib/libbsdmalloc/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libbsdmalloc/spec/sparcv9/Makefile
index 5c2d1e621e..5c2d1e621e 100644
--- a/usr/src/lib/libbsdmalloc/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libbsdmalloc/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libbsdmalloc/spec/versions b/deleted_files/usr/src/lib/libbsdmalloc/spec/versions
index f7955484e7..f7955484e7 100644
--- a/usr/src/lib/libbsdmalloc/spec/versions
+++ b/deleted_files/usr/src/lib/libbsdmalloc/spec/versions
diff --git a/usr/src/lib/libbsm/spec/Makefile b/deleted_files/usr/src/lib/libbsm/spec/Makefile
index 2ae23eeab1..2ae23eeab1 100644
--- a/usr/src/lib/libbsm/spec/Makefile
+++ b/deleted_files/usr/src/lib/libbsm/spec/Makefile
diff --git a/usr/src/lib/libbsm/spec/Makefile.targ b/deleted_files/usr/src/lib/libbsm/spec/Makefile.targ
index 1784ff6015..1784ff6015 100644
--- a/usr/src/lib/libbsm/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libbsm/spec/Makefile.targ
diff --git a/usr/src/lib/libbsm/spec/amd64/Makefile b/deleted_files/usr/src/lib/libbsm/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libbsm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libbsm/spec/amd64/Makefile
diff --git a/usr/src/lib/libbsm/spec/au_open.spec b/deleted_files/usr/src/lib/libbsm/spec/au_open.spec
index 129cc15828..129cc15828 100644
--- a/usr/src/lib/libbsm/spec/au_open.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/au_open.spec
diff --git a/usr/src/lib/libbsm/spec/au_preselect.spec b/deleted_files/usr/src/lib/libbsm/spec/au_preselect.spec
index 52b5483971..52b5483971 100644
--- a/usr/src/lib/libbsm/spec/au_preselect.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/au_preselect.spec
diff --git a/usr/src/lib/libbsm/spec/au_to.spec b/deleted_files/usr/src/lib/libbsm/spec/au_to.spec
index 43ca9f34cc..43ca9f34cc 100644
--- a/usr/src/lib/libbsm/spec/au_to.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/au_to.spec
diff --git a/usr/src/lib/libbsm/spec/au_user_mask.spec b/deleted_files/usr/src/lib/libbsm/spec/au_user_mask.spec
index bd638a618e..bd638a618e 100644
--- a/usr/src/lib/libbsm/spec/au_user_mask.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/au_user_mask.spec
diff --git a/usr/src/lib/libbsm/spec/audit.spec b/deleted_files/usr/src/lib/libbsm/spec/audit.spec
index 10fda9ad3d..10fda9ad3d 100644
--- a/usr/src/lib/libbsm/spec/audit.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/audit.spec
diff --git a/usr/src/lib/libbsm/spec/auditon.spec b/deleted_files/usr/src/lib/libbsm/spec/auditon.spec
index a67641ed47..a67641ed47 100644
--- a/usr/src/lib/libbsm/spec/auditon.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/auditon.spec
diff --git a/usr/src/lib/libbsm/spec/auditsvc.spec b/deleted_files/usr/src/lib/libbsm/spec/auditsvc.spec
index dde14b3c6c..dde14b3c6c 100644
--- a/usr/src/lib/libbsm/spec/auditsvc.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/auditsvc.spec
diff --git a/usr/src/lib/libbsm/spec/devalloc.spec b/deleted_files/usr/src/lib/libbsm/spec/devalloc.spec
index 3861d93b6c..3861d93b6c 100644
--- a/usr/src/lib/libbsm/spec/devalloc.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/devalloc.spec
diff --git a/usr/src/lib/libbsm/spec/exceptions.spec b/deleted_files/usr/src/lib/libbsm/spec/exceptions.spec
index 698d9dc79e..698d9dc79e 100644
--- a/usr/src/lib/libbsm/spec/exceptions.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/exceptions.spec
diff --git a/usr/src/lib/libbsm/spec/getacinfo.spec b/deleted_files/usr/src/lib/libbsm/spec/getacinfo.spec
index 96d91a5564..96d91a5564 100644
--- a/usr/src/lib/libbsm/spec/getacinfo.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/getacinfo.spec
diff --git a/usr/src/lib/libbsm/spec/getauclassent.spec b/deleted_files/usr/src/lib/libbsm/spec/getauclassent.spec
index da298b8799..da298b8799 100644
--- a/usr/src/lib/libbsm/spec/getauclassent.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/getauclassent.spec
diff --git a/usr/src/lib/libbsm/spec/getaudit.spec b/deleted_files/usr/src/lib/libbsm/spec/getaudit.spec
index 430a5ab920..430a5ab920 100644
--- a/usr/src/lib/libbsm/spec/getaudit.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/getaudit.spec
diff --git a/usr/src/lib/libbsm/spec/getauditflags.spec b/deleted_files/usr/src/lib/libbsm/spec/getauditflags.spec
index ad1b2d8d22..ad1b2d8d22 100644
--- a/usr/src/lib/libbsm/spec/getauditflags.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/getauditflags.spec
diff --git a/usr/src/lib/libbsm/spec/getauevent.spec b/deleted_files/usr/src/lib/libbsm/spec/getauevent.spec
index 3d55cb9cb7..3d55cb9cb7 100644
--- a/usr/src/lib/libbsm/spec/getauevent.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/getauevent.spec
diff --git a/usr/src/lib/libbsm/spec/getauid.spec b/deleted_files/usr/src/lib/libbsm/spec/getauid.spec
index 3ada4b5850..3ada4b5850 100644
--- a/usr/src/lib/libbsm/spec/getauid.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/getauid.spec
diff --git a/usr/src/lib/libbsm/spec/getauusernam.spec b/deleted_files/usr/src/lib/libbsm/spec/getauusernam.spec
index dc06840629..dc06840629 100644
--- a/usr/src/lib/libbsm/spec/getauusernam.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/getauusernam.spec
diff --git a/usr/src/lib/libbsm/spec/getfauditflags.spec b/deleted_files/usr/src/lib/libbsm/spec/getfauditflags.spec
index 9dbaba8341..9dbaba8341 100644
--- a/usr/src/lib/libbsm/spec/getfauditflags.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/getfauditflags.spec
diff --git a/usr/src/lib/libbsm/spec/i386/Makefile b/deleted_files/usr/src/lib/libbsm/spec/i386/Makefile
index c7d5274776..c7d5274776 100644
--- a/usr/src/lib/libbsm/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libbsm/spec/i386/Makefile
diff --git a/usr/src/lib/libbsm/spec/private.spec b/deleted_files/usr/src/lib/libbsm/spec/private.spec
index fb0fbe9452..fb0fbe9452 100644
--- a/usr/src/lib/libbsm/spec/private.spec
+++ b/deleted_files/usr/src/lib/libbsm/spec/private.spec
diff --git a/usr/src/lib/libbsm/spec/sparc/Makefile b/deleted_files/usr/src/lib/libbsm/spec/sparc/Makefile
index 0570ec23de..0570ec23de 100644
--- a/usr/src/lib/libbsm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libbsm/spec/sparc/Makefile
diff --git a/usr/src/lib/libbsm/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libbsm/spec/sparcv9/Makefile
index 6c9eb1b8e6..6c9eb1b8e6 100644
--- a/usr/src/lib/libbsm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libbsm/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libbsm/spec/versions b/deleted_files/usr/src/lib/libbsm/spec/versions
index 3c101d5962..3c101d5962 100644
--- a/usr/src/lib/libbsm/spec/versions
+++ b/deleted_files/usr/src/lib/libbsm/spec/versions
diff --git a/usr/src/lib/libc/spec/Makefile b/deleted_files/usr/src/lib/libc/spec/Makefile
index 660d580642..660d580642 100644
--- a/usr/src/lib/libc/spec/Makefile
+++ b/deleted_files/usr/src/lib/libc/spec/Makefile
diff --git a/usr/src/lib/libc/spec/Makefile.targ b/deleted_files/usr/src/lib/libc/spec/Makefile.targ
index 4243823247..4243823247 100644
--- a/usr/src/lib/libc/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libc/spec/Makefile.targ
diff --git a/usr/src/lib/libc/spec/aio.spec b/deleted_files/usr/src/lib/libc/spec/aio.spec
index 6b2612210e..6b2612210e 100644
--- a/usr/src/lib/libc/spec/aio.spec
+++ b/deleted_files/usr/src/lib/libc/spec/aio.spec
diff --git a/usr/src/lib/libc/spec/amd64/Makefile b/deleted_files/usr/src/lib/libc/spec/amd64/Makefile
index 26ff7e0812..26ff7e0812 100644
--- a/usr/src/lib/libc/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libc/spec/amd64/Makefile
diff --git a/usr/src/lib/libc/spec/atomic.spec b/deleted_files/usr/src/lib/libc/spec/atomic.spec
index be99e5d506..be99e5d506 100644
--- a/usr/src/lib/libc/spec/atomic.spec
+++ b/deleted_files/usr/src/lib/libc/spec/atomic.spec
diff --git a/usr/src/lib/libc/spec/data.spec b/deleted_files/usr/src/lib/libc/spec/data.spec
index a13a24a64c..a13a24a64c 100644
--- a/usr/src/lib/libc/spec/data.spec
+++ b/deleted_files/usr/src/lib/libc/spec/data.spec
diff --git a/usr/src/lib/libc/spec/door.spec b/deleted_files/usr/src/lib/libc/spec/door.spec
index 33ff93f3e2..33ff93f3e2 100644
--- a/usr/src/lib/libc/spec/door.spec
+++ b/deleted_files/usr/src/lib/libc/spec/door.spec
diff --git a/usr/src/lib/libc/spec/fmtmsg.spec b/deleted_files/usr/src/lib/libc/spec/fmtmsg.spec
index 97e8e1b5c5..97e8e1b5c5 100644
--- a/usr/src/lib/libc/spec/fmtmsg.spec
+++ b/deleted_files/usr/src/lib/libc/spec/fmtmsg.spec
diff --git a/usr/src/lib/libc/spec/fp.spec b/deleted_files/usr/src/lib/libc/spec/fp.spec
index 51344aa19f..51344aa19f 100644
--- a/usr/src/lib/libc/spec/fp.spec
+++ b/deleted_files/usr/src/lib/libc/spec/fp.spec
diff --git a/usr/src/lib/libc/spec/gen.spec b/deleted_files/usr/src/lib/libc/spec/gen.spec
index 2b14689e7a..2b14689e7a 100644
--- a/usr/src/lib/libc/spec/gen.spec
+++ b/deleted_files/usr/src/lib/libc/spec/gen.spec
diff --git a/usr/src/lib/libc/spec/i18n.spec b/deleted_files/usr/src/lib/libc/spec/i18n.spec
index b6b830910f..b6b830910f 100644
--- a/usr/src/lib/libc/spec/i18n.spec
+++ b/deleted_files/usr/src/lib/libc/spec/i18n.spec
diff --git a/usr/src/lib/libc/spec/i386/Makefile b/deleted_files/usr/src/lib/libc/spec/i386/Makefile
index 825874072f..825874072f 100644
--- a/usr/src/lib/libc/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libc/spec/i386/Makefile
diff --git a/usr/src/lib/libc/spec/interface64.spec b/deleted_files/usr/src/lib/libc/spec/interface64.spec
index d423fcdf7e..d423fcdf7e 100644
--- a/usr/src/lib/libc/spec/interface64.spec
+++ b/deleted_files/usr/src/lib/libc/spec/interface64.spec
diff --git a/usr/src/lib/libc/spec/missing.spec b/deleted_files/usr/src/lib/libc/spec/missing.spec
index df4cd2d605..df4cd2d605 100644
--- a/usr/src/lib/libc/spec/missing.spec
+++ b/deleted_files/usr/src/lib/libc/spec/missing.spec
diff --git a/usr/src/lib/libc/spec/print.spec b/deleted_files/usr/src/lib/libc/spec/print.spec
index 4e8a2d1a5c..4e8a2d1a5c 100644
--- a/usr/src/lib/libc/spec/print.spec
+++ b/deleted_files/usr/src/lib/libc/spec/print.spec
diff --git a/usr/src/lib/libc/spec/private.spec b/deleted_files/usr/src/lib/libc/spec/private.spec
index 9868be02cf..9868be02cf 100644
--- a/usr/src/lib/libc/spec/private.spec
+++ b/deleted_files/usr/src/lib/libc/spec/private.spec
diff --git a/usr/src/lib/libc/spec/privatedata.spec b/deleted_files/usr/src/lib/libc/spec/privatedata.spec
index 3fc9b1687f..3fc9b1687f 100644
--- a/usr/src/lib/libc/spec/privatedata.spec
+++ b/deleted_files/usr/src/lib/libc/spec/privatedata.spec
diff --git a/usr/src/lib/libc/spec/regex.spec b/deleted_files/usr/src/lib/libc/spec/regex.spec
index 5087b5c2e6..5087b5c2e6 100644
--- a/usr/src/lib/libc/spec/regex.spec
+++ b/deleted_files/usr/src/lib/libc/spec/regex.spec
diff --git a/usr/src/lib/libc/spec/rt.spec b/deleted_files/usr/src/lib/libc/spec/rt.spec
index 52de0469bd..52de0469bd 100644
--- a/usr/src/lib/libc/spec/rt.spec
+++ b/deleted_files/usr/src/lib/libc/spec/rt.spec
diff --git a/usr/src/lib/libc/spec/sparc/Makefile b/deleted_files/usr/src/lib/libc/spec/sparc/Makefile
index cd46b18934..cd46b18934 100644
--- a/usr/src/lib/libc/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libc/spec/sparc/Makefile
diff --git a/usr/src/lib/libc/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libc/spec/sparcv9/Makefile
index 64cbc66a56..64cbc66a56 100644
--- a/usr/src/lib/libc/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libc/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libc/spec/stdio.spec b/deleted_files/usr/src/lib/libc/spec/stdio.spec
index 561085ce1e..561085ce1e 100644
--- a/usr/src/lib/libc/spec/stdio.spec
+++ b/deleted_files/usr/src/lib/libc/spec/stdio.spec
diff --git a/usr/src/lib/libc/spec/sys.spec b/deleted_files/usr/src/lib/libc/spec/sys.spec
index c7117904f5..c7117904f5 100644
--- a/usr/src/lib/libc/spec/sys.spec
+++ b/deleted_files/usr/src/lib/libc/spec/sys.spec
diff --git a/usr/src/lib/libc/spec/threads.spec b/deleted_files/usr/src/lib/libc/spec/threads.spec
index 21e22d308a..21e22d308a 100644
--- a/usr/src/lib/libc/spec/threads.spec
+++ b/deleted_files/usr/src/lib/libc/spec/threads.spec
diff --git a/usr/src/lib/libc/spec/unwind.spec b/deleted_files/usr/src/lib/libc/spec/unwind.spec
index a647b1790b..a647b1790b 100644
--- a/usr/src/lib/libc/spec/unwind.spec
+++ b/deleted_files/usr/src/lib/libc/spec/unwind.spec
diff --git a/usr/src/lib/libc/spec/versions b/deleted_files/usr/src/lib/libc/spec/versions
index fd2128210a..fd2128210a 100644
--- a/usr/src/lib/libc/spec/versions
+++ b/deleted_files/usr/src/lib/libc/spec/versions
diff --git a/usr/src/lib/libc/spec/widec.spec b/deleted_files/usr/src/lib/libc/spec/widec.spec
index 42766fbd4f..42766fbd4f 100644
--- a/usr/src/lib/libc/spec/widec.spec
+++ b/deleted_files/usr/src/lib/libc/spec/widec.spec
diff --git a/usr/src/lib/libc_db/spec/Makefile b/deleted_files/usr/src/lib/libc_db/spec/Makefile
index 6cc082e6f1..6cc082e6f1 100644
--- a/usr/src/lib/libc_db/spec/Makefile
+++ b/deleted_files/usr/src/lib/libc_db/spec/Makefile
diff --git a/usr/src/lib/libc_db/spec/Makefile.targ b/deleted_files/usr/src/lib/libc_db/spec/Makefile.targ
index 2c603acd28..2c603acd28 100644
--- a/usr/src/lib/libc_db/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libc_db/spec/Makefile.targ
diff --git a/usr/src/lib/libc_db/spec/amd64/Makefile b/deleted_files/usr/src/lib/libc_db/spec/amd64/Makefile
index d334868181..d334868181 100644
--- a/usr/src/lib/libc_db/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libc_db/spec/amd64/Makefile
diff --git a/usr/src/lib/libc_db/spec/i386/Makefile b/deleted_files/usr/src/lib/libc_db/spec/i386/Makefile
index 1c8d2125c0..1c8d2125c0 100644
--- a/usr/src/lib/libc_db/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libc_db/spec/i386/Makefile
diff --git a/usr/src/lib/libc_db/spec/sparc/Makefile b/deleted_files/usr/src/lib/libc_db/spec/sparc/Makefile
index 6a4ee42847..6a4ee42847 100644
--- a/usr/src/lib/libc_db/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libc_db/spec/sparc/Makefile
diff --git a/usr/src/lib/libc_db/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libc_db/spec/sparcv9/Makefile
index 51be97e736..51be97e736 100644
--- a/usr/src/lib/libc_db/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libc_db/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libc_db/spec/thread_db.spec b/deleted_files/usr/src/lib/libc_db/spec/thread_db.spec
index cb6c801130..cb6c801130 100644
--- a/usr/src/lib/libc_db/spec/thread_db.spec
+++ b/deleted_files/usr/src/lib/libc_db/spec/thread_db.spec
diff --git a/usr/src/lib/libc_db/spec/versions b/deleted_files/usr/src/lib/libc_db/spec/versions
index 729ed1173d..729ed1173d 100644
--- a/usr/src/lib/libc_db/spec/versions
+++ b/deleted_files/usr/src/lib/libc_db/spec/versions
diff --git a/usr/src/lib/libc_psr/spec/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/Makefile
index 7742b756e6..7742b756e6 100644
--- a/usr/src/lib/libc_psr/spec/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/Makefile
diff --git a/usr/src/lib/libc_psr/spec/Makefile.com b/deleted_files/usr/src/lib/libc_psr/spec/Makefile.com
index a96dfbe579..a96dfbe579 100644
--- a/usr/src/lib/libc_psr/spec/Makefile.com
+++ b/deleted_files/usr/src/lib/libc_psr/spec/Makefile.com
diff --git a/usr/src/lib/libc_psr/spec/sun4u-opl/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/Makefile
index e41b66e7f1..e41b66e7f1 100644
--- a/usr/src/lib/libc_psr/spec/sun4u-opl/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4u-opl/Makefile.links b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/Makefile.links
index 53c0bd026e..53c0bd026e 100644
--- a/usr/src/lib/libc_psr/spec/sun4u-opl/Makefile.links
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/Makefile.links
diff --git a/usr/src/lib/libc_psr/spec/sun4u-opl/c_psr-sparc.spec b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/c_psr-sparc.spec
index ade9554bdc..ade9554bdc 100644
--- a/usr/src/lib/libc_psr/spec/sun4u-opl/c_psr-sparc.spec
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/c_psr-sparc.spec
diff --git a/usr/src/lib/libc_psr/spec/sun4u-opl/c_psr-sparcv9.spec b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/c_psr-sparcv9.spec
index 07acdd7e66..07acdd7e66 100644
--- a/usr/src/lib/libc_psr/spec/sun4u-opl/c_psr-sparcv9.spec
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/c_psr-sparcv9.spec
diff --git a/usr/src/lib/libc_psr/spec/sun4u-opl/sparc/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/sparc/Makefile
index 5d45224c42..5d45224c42 100644
--- a/usr/src/lib/libc_psr/spec/sun4u-opl/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/sparc/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4u-opl/sparcv9/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/sparcv9/Makefile
index 66d6473c41..66d6473c41 100644
--- a/usr/src/lib/libc_psr/spec/sun4u-opl/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/sparcv9/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4u-opl/versions-sparc b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/versions-sparc
index 048669407d..048669407d 100644
--- a/usr/src/lib/libc_psr/spec/sun4u-opl/versions-sparc
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/versions-sparc
diff --git a/usr/src/lib/libc_psr/spec/sun4u-opl/versions-sparcv9 b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/versions-sparcv9
index 2c57d5f9db..2c57d5f9db 100644
--- a/usr/src/lib/libc_psr/spec/sun4u-opl/versions-sparcv9
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u-opl/versions-sparcv9
diff --git a/usr/src/lib/libc_psr/spec/sun4u/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/Makefile
index 7574220b3c..7574220b3c 100644
--- a/usr/src/lib/libc_psr/spec/sun4u/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4u/Makefile.links b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/Makefile.links
index b02b75f836..b02b75f836 100644
--- a/usr/src/lib/libc_psr/spec/sun4u/Makefile.links
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/Makefile.links
diff --git a/usr/src/lib/libc_psr/spec/sun4u/c_psr-sparc.spec b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/c_psr-sparc.spec
index e787068a6c..e787068a6c 100644
--- a/usr/src/lib/libc_psr/spec/sun4u/c_psr-sparc.spec
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/c_psr-sparc.spec
diff --git a/usr/src/lib/libc_psr/spec/sun4u/c_psr-sparcv9.spec b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/c_psr-sparcv9.spec
index fd75d9801c..fd75d9801c 100644
--- a/usr/src/lib/libc_psr/spec/sun4u/c_psr-sparcv9.spec
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/c_psr-sparcv9.spec
diff --git a/usr/src/lib/libc_psr/spec/sun4u/sparc/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/sparc/Makefile
index c7aff51b85..c7aff51b85 100644
--- a/usr/src/lib/libc_psr/spec/sun4u/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/sparc/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4u/sparcv9/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/sparcv9/Makefile
index 1017c5c1b3..1017c5c1b3 100644
--- a/usr/src/lib/libc_psr/spec/sun4u/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/sparcv9/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4u/versions-sparc b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/versions-sparc
index 7888d5d0f9..7888d5d0f9 100644
--- a/usr/src/lib/libc_psr/spec/sun4u/versions-sparc
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/versions-sparc
diff --git a/usr/src/lib/libc_psr/spec/sun4u/versions-sparcv9 b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/versions-sparcv9
index e043b91286..e043b91286 100644
--- a/usr/src/lib/libc_psr/spec/sun4u/versions-sparcv9
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u/versions-sparcv9
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/Makefile
index 5c5bc9173c..5c5bc9173c 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/Makefile.links b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/Makefile.links
index ea6a6692e6..ea6a6692e6 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/Makefile.links
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/Makefile.links
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/c_psr-sparc.spec b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/c_psr-sparc.spec
index 28f9858822..28f9858822 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/c_psr-sparc.spec
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/c_psr-sparc.spec
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/c_psr-sparcv9.spec b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/c_psr-sparcv9.spec
index b38dd1ce0a..b38dd1ce0a 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/c_psr-sparcv9.spec
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/c_psr-sparcv9.spec
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/sparc/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/sparc/Makefile
index e2f7604be8..e2f7604be8 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/sparc/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/sparcv9/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/sparcv9/Makefile
index b8a42bd57f..b8a42bd57f 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/sparcv9/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/versions-sparc b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/versions-sparc
index 63f2180b6f..63f2180b6f 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/versions-sparc
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/versions-sparc
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/versions-sparcv9 b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/versions-sparcv9
index 8f68e4b07e..8f68e4b07e 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap1/versions-sparcv9
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap1/versions-sparcv9
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/Makefile
index 3ef7a89c14..3ef7a89c14 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/Makefile.links b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/Makefile.links
index b64f666163..b64f666163 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/Makefile.links
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/Makefile.links
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/c_psr-sparc.spec b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/c_psr-sparc.spec
index 8293f690d6..8293f690d6 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/c_psr-sparc.spec
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/c_psr-sparc.spec
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/c_psr-sparcv9.spec b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/c_psr-sparcv9.spec
index b8ae6ef46b..b8ae6ef46b 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/c_psr-sparcv9.spec
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/c_psr-sparcv9.spec
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/sparc/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/sparc/Makefile
index 98b294d11b..98b294d11b 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/sparc/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/sparcv9/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/sparcv9/Makefile
index 03b98cb12e..03b98cb12e 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/sparcv9/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/versions-sparc b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/versions-sparc
index f3e88dd71c..f3e88dd71c 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/versions-sparc
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/versions-sparc
diff --git a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/versions-sparcv9 b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/versions-sparcv9
index 36cda0d75d..36cda0d75d 100644
--- a/usr/src/lib/libc_psr/spec/sun4u_hwcap2/versions-sparcv9
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4u_hwcap2/versions-sparcv9
diff --git a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/Makefile
index 6f8b0d5878..6f8b0d5878 100644
--- a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/Makefile.links b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/Makefile.links
index da6d5a2c7d..da6d5a2c7d 100644
--- a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/Makefile.links
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/Makefile.links
diff --git a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/c_psr-sparc.spec b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/c_psr-sparc.spec
index 1464388a8a..1464388a8a 100644
--- a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/c_psr-sparc.spec
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/c_psr-sparc.spec
diff --git a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/c_psr-sparcv9.spec b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/c_psr-sparcv9.spec
index 8c3e583ce0..8c3e583ce0 100644
--- a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/c_psr-sparcv9.spec
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/c_psr-sparcv9.spec
diff --git a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/sparc/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/sparc/Makefile
index 270ef54090..270ef54090 100644
--- a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/sparc/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/sparcv9/Makefile b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/sparcv9/Makefile
index e2d7b7f570..e2d7b7f570 100644
--- a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/sparcv9/Makefile
diff --git a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/versions-sparc b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/versions-sparc
index d8e71fe28b..d8e71fe28b 100644
--- a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/versions-sparc
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/versions-sparc
diff --git a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/versions-sparcv9 b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/versions-sparcv9
index 7d8c1d24f1..7d8c1d24f1 100644
--- a/usr/src/lib/libc_psr/spec/sun4v_hwcap1/versions-sparcv9
+++ b/deleted_files/usr/src/lib/libc_psr/spec/sun4v_hwcap1/versions-sparcv9
diff --git a/usr/src/lib/libcfgadm/spec/Makefile b/deleted_files/usr/src/lib/libcfgadm/spec/Makefile
index a1dd5932c7..a1dd5932c7 100644
--- a/usr/src/lib/libcfgadm/spec/Makefile
+++ b/deleted_files/usr/src/lib/libcfgadm/spec/Makefile
diff --git a/usr/src/lib/libcfgadm/spec/Makefile.targ b/deleted_files/usr/src/lib/libcfgadm/spec/Makefile.targ
index fc096fe02a..fc096fe02a 100644
--- a/usr/src/lib/libcfgadm/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libcfgadm/spec/Makefile.targ
diff --git a/usr/src/lib/libcfgadm/spec/amd64/Makefile b/deleted_files/usr/src/lib/libcfgadm/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libcfgadm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libcfgadm/spec/amd64/Makefile
diff --git a/usr/src/lib/libcfgadm/spec/cfgadm.spec b/deleted_files/usr/src/lib/libcfgadm/spec/cfgadm.spec
index 918fe37540..918fe37540 100644
--- a/usr/src/lib/libcfgadm/spec/cfgadm.spec
+++ b/deleted_files/usr/src/lib/libcfgadm/spec/cfgadm.spec
diff --git a/usr/src/lib/libcfgadm/spec/i386/Makefile b/deleted_files/usr/src/lib/libcfgadm/spec/i386/Makefile
index 169a9871a5..169a9871a5 100644
--- a/usr/src/lib/libcfgadm/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libcfgadm/spec/i386/Makefile
diff --git a/usr/src/lib/libcfgadm/spec/sparc/Makefile b/deleted_files/usr/src/lib/libcfgadm/spec/sparc/Makefile
index 57b9642fdb..57b9642fdb 100644
--- a/usr/src/lib/libcfgadm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libcfgadm/spec/sparc/Makefile
diff --git a/usr/src/lib/libcfgadm/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libcfgadm/spec/sparcv9/Makefile
index c2b93c4612..c2b93c4612 100644
--- a/usr/src/lib/libcfgadm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libcfgadm/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libcfgadm/spec/versions b/deleted_files/usr/src/lib/libcfgadm/spec/versions
index b7d90defcb..b7d90defcb 100644
--- a/usr/src/lib/libcfgadm/spec/versions
+++ b/deleted_files/usr/src/lib/libcfgadm/spec/versions
diff --git a/usr/src/lib/libcmd/spec/Makefile b/deleted_files/usr/src/lib/libcmd/spec/Makefile
index a827993b70..a827993b70 100644
--- a/usr/src/lib/libcmd/spec/Makefile
+++ b/deleted_files/usr/src/lib/libcmd/spec/Makefile
diff --git a/usr/src/lib/libcmd/spec/Makefile.targ b/deleted_files/usr/src/lib/libcmd/spec/Makefile.targ
index c07f6787b6..c07f6787b6 100644
--- a/usr/src/lib/libcmd/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libcmd/spec/Makefile.targ
diff --git a/usr/src/lib/libcmd/spec/amd64/Makefile b/deleted_files/usr/src/lib/libcmd/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libcmd/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libcmd/spec/amd64/Makefile
diff --git a/usr/src/lib/libcmd/spec/cmd.spec b/deleted_files/usr/src/lib/libcmd/spec/cmd.spec
index 775b9b510a..775b9b510a 100644
--- a/usr/src/lib/libcmd/spec/cmd.spec
+++ b/deleted_files/usr/src/lib/libcmd/spec/cmd.spec
diff --git a/usr/src/lib/libcmd/spec/i386/Makefile b/deleted_files/usr/src/lib/libcmd/spec/i386/Makefile
index d537268376..d537268376 100644
--- a/usr/src/lib/libcmd/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libcmd/spec/i386/Makefile
diff --git a/usr/src/lib/libcmd/spec/sparc/Makefile b/deleted_files/usr/src/lib/libcmd/spec/sparc/Makefile
index 60214320f8..60214320f8 100644
--- a/usr/src/lib/libcmd/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libcmd/spec/sparc/Makefile
diff --git a/usr/src/lib/libcmd/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libcmd/spec/sparcv9/Makefile
index 24bb405094..24bb405094 100644
--- a/usr/src/lib/libcmd/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libcmd/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libcmd/spec/versions b/deleted_files/usr/src/lib/libcmd/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libcmd/spec/versions
+++ b/deleted_files/usr/src/lib/libcmd/spec/versions
diff --git a/usr/src/lib/libcmdutils/spec/Makefile b/deleted_files/usr/src/lib/libcmdutils/spec/Makefile
index 10b44c4a23..10b44c4a23 100644
--- a/usr/src/lib/libcmdutils/spec/Makefile
+++ b/deleted_files/usr/src/lib/libcmdutils/spec/Makefile
diff --git a/usr/src/lib/libcmdutils/spec/Makefile.targ b/deleted_files/usr/src/lib/libcmdutils/spec/Makefile.targ
index 2aa6949184..2aa6949184 100644
--- a/usr/src/lib/libcmdutils/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libcmdutils/spec/Makefile.targ
diff --git a/usr/src/lib/libcmdutils/spec/amd64/Makefile b/deleted_files/usr/src/lib/libcmdutils/spec/amd64/Makefile
index d334868181..d334868181 100644
--- a/usr/src/lib/libcmdutils/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libcmdutils/spec/amd64/Makefile
diff --git a/usr/src/lib/libcmdutils/spec/cmdutils.spec b/deleted_files/usr/src/lib/libcmdutils/spec/cmdutils.spec
index 465ad0b5dc..465ad0b5dc 100644
--- a/usr/src/lib/libcmdutils/spec/cmdutils.spec
+++ b/deleted_files/usr/src/lib/libcmdutils/spec/cmdutils.spec
diff --git a/usr/src/lib/libcmdutils/spec/i386/Makefile b/deleted_files/usr/src/lib/libcmdutils/spec/i386/Makefile
index 3d22afeb56..3d22afeb56 100644
--- a/usr/src/lib/libcmdutils/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libcmdutils/spec/i386/Makefile
diff --git a/usr/src/lib/libcmdutils/spec/sparc/Makefile b/deleted_files/usr/src/lib/libcmdutils/spec/sparc/Makefile
index 7cf9d1bc49..7cf9d1bc49 100644
--- a/usr/src/lib/libcmdutils/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libcmdutils/spec/sparc/Makefile
diff --git a/usr/src/lib/libcmdutils/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libcmdutils/spec/sparcv9/Makefile
index 4a8fb1958d..4a8fb1958d 100644
--- a/usr/src/lib/libcmdutils/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libcmdutils/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libcmdutils/spec/versions b/deleted_files/usr/src/lib/libcmdutils/spec/versions
index a129966488..a129966488 100644
--- a/usr/src/lib/libcmdutils/spec/versions
+++ b/deleted_files/usr/src/lib/libcmdutils/spec/versions
diff --git a/usr/src/lib/libcontract/spec/Makefile b/deleted_files/usr/src/lib/libcontract/spec/Makefile
index ecee1572a9..ecee1572a9 100644
--- a/usr/src/lib/libcontract/spec/Makefile
+++ b/deleted_files/usr/src/lib/libcontract/spec/Makefile
diff --git a/usr/src/lib/libcontract/spec/Makefile.targ b/deleted_files/usr/src/lib/libcontract/spec/Makefile.targ
index 5280075a79..5280075a79 100644
--- a/usr/src/lib/libcontract/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libcontract/spec/Makefile.targ
diff --git a/usr/src/lib/libcontract/spec/amd64/Makefile b/deleted_files/usr/src/lib/libcontract/spec/amd64/Makefile
index 6b587843c7..6b587843c7 100644
--- a/usr/src/lib/libcontract/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libcontract/spec/amd64/Makefile
diff --git a/usr/src/lib/libcontract/spec/contract.spec b/deleted_files/usr/src/lib/libcontract/spec/contract.spec
index 60b4925d11..60b4925d11 100644
--- a/usr/src/lib/libcontract/spec/contract.spec
+++ b/deleted_files/usr/src/lib/libcontract/spec/contract.spec
diff --git a/usr/src/lib/libcontract/spec/i386/Makefile b/deleted_files/usr/src/lib/libcontract/spec/i386/Makefile
index 027b13f5af..027b13f5af 100644
--- a/usr/src/lib/libcontract/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libcontract/spec/i386/Makefile
diff --git a/usr/src/lib/libcontract/spec/private.spec b/deleted_files/usr/src/lib/libcontract/spec/private.spec
index 65413dbb58..65413dbb58 100644
--- a/usr/src/lib/libcontract/spec/private.spec
+++ b/deleted_files/usr/src/lib/libcontract/spec/private.spec
diff --git a/usr/src/lib/libcontract/spec/sparc/Makefile b/deleted_files/usr/src/lib/libcontract/spec/sparc/Makefile
index 027b13f5af..027b13f5af 100644
--- a/usr/src/lib/libcontract/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libcontract/spec/sparc/Makefile
diff --git a/usr/src/lib/libcontract/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libcontract/spec/sparcv9/Makefile
index 751257f818..751257f818 100644
--- a/usr/src/lib/libcontract/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libcontract/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libcontract/spec/versions b/deleted_files/usr/src/lib/libcontract/spec/versions
index 1081ac6057..1081ac6057 100644
--- a/usr/src/lib/libcontract/spec/versions
+++ b/deleted_files/usr/src/lib/libcontract/spec/versions
diff --git a/usr/src/lib/libcpc/spec/Makefile b/deleted_files/usr/src/lib/libcpc/spec/Makefile
index 25277194e4..25277194e4 100644
--- a/usr/src/lib/libcpc/spec/Makefile
+++ b/deleted_files/usr/src/lib/libcpc/spec/Makefile
diff --git a/usr/src/lib/libcpc/spec/Makefile.targ b/deleted_files/usr/src/lib/libcpc/spec/Makefile.targ
index 13968ee539..13968ee539 100644
--- a/usr/src/lib/libcpc/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libcpc/spec/Makefile.targ
diff --git a/usr/src/lib/libcpc/spec/amd64/Makefile b/deleted_files/usr/src/lib/libcpc/spec/amd64/Makefile
index d334868181..d334868181 100644
--- a/usr/src/lib/libcpc/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libcpc/spec/amd64/Makefile
diff --git a/usr/src/lib/libcpc/spec/cpc.spec b/deleted_files/usr/src/lib/libcpc/spec/cpc.spec
index d4eae95935..d4eae95935 100644
--- a/usr/src/lib/libcpc/spec/cpc.spec
+++ b/deleted_files/usr/src/lib/libcpc/spec/cpc.spec
diff --git a/usr/src/lib/libcpc/spec/i386/Makefile b/deleted_files/usr/src/lib/libcpc/spec/i386/Makefile
index c7d44e5cb9..c7d44e5cb9 100644
--- a/usr/src/lib/libcpc/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libcpc/spec/i386/Makefile
diff --git a/usr/src/lib/libcpc/spec/sparc/Makefile b/deleted_files/usr/src/lib/libcpc/spec/sparc/Makefile
index 3f5dabf87b..3f5dabf87b 100644
--- a/usr/src/lib/libcpc/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libcpc/spec/sparc/Makefile
diff --git a/usr/src/lib/libcpc/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libcpc/spec/sparcv9/Makefile
index 709adc3baa..709adc3baa 100644
--- a/usr/src/lib/libcpc/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libcpc/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libcpc/spec/versions b/deleted_files/usr/src/lib/libcpc/spec/versions
index 1d4572d689..1d4572d689 100644
--- a/usr/src/lib/libcpc/spec/versions
+++ b/deleted_files/usr/src/lib/libcpc/spec/versions
diff --git a/usr/src/lib/libcrypt/spec/Makefile b/deleted_files/usr/src/lib/libcrypt/spec/Makefile
index 7bfb8914a5..7bfb8914a5 100644
--- a/usr/src/lib/libcrypt/spec/Makefile
+++ b/deleted_files/usr/src/lib/libcrypt/spec/Makefile
diff --git a/usr/src/lib/libcrypt/spec/Makefile.targ b/deleted_files/usr/src/lib/libcrypt/spec/Makefile.targ
index b3c0b4d2f9..b3c0b4d2f9 100644
--- a/usr/src/lib/libcrypt/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libcrypt/spec/Makefile.targ
diff --git a/usr/src/lib/libcrypt/spec/amd64/Makefile b/deleted_files/usr/src/lib/libcrypt/spec/amd64/Makefile
index 4b31884011..4b31884011 100644
--- a/usr/src/lib/libcrypt/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libcrypt/spec/amd64/Makefile
diff --git a/usr/src/lib/libcrypt/spec/crypt.spec b/deleted_files/usr/src/lib/libcrypt/spec/crypt.spec
index b5c4820f4c..b5c4820f4c 100644
--- a/usr/src/lib/libcrypt/spec/crypt.spec
+++ b/deleted_files/usr/src/lib/libcrypt/spec/crypt.spec
diff --git a/usr/src/lib/libcrypt/spec/i386/Makefile b/deleted_files/usr/src/lib/libcrypt/spec/i386/Makefile
index 4365a173d5..4365a173d5 100644
--- a/usr/src/lib/libcrypt/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libcrypt/spec/i386/Makefile
diff --git a/usr/src/lib/libcrypt/spec/sparc/Makefile b/deleted_files/usr/src/lib/libcrypt/spec/sparc/Makefile
index 9b7e7ba95a..9b7e7ba95a 100644
--- a/usr/src/lib/libcrypt/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libcrypt/spec/sparc/Makefile
diff --git a/usr/src/lib/libcrypt/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libcrypt/spec/sparcv9/Makefile
index 4b31884011..4b31884011 100644
--- a/usr/src/lib/libcrypt/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libcrypt/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libcrypt/spec/versions b/deleted_files/usr/src/lib/libcrypt/spec/versions
index 125f9b00f1..125f9b00f1 100644
--- a/usr/src/lib/libcrypt/spec/versions
+++ b/deleted_files/usr/src/lib/libcrypt/spec/versions
diff --git a/usr/src/lib/libcryptoutil/spec/Makefile b/deleted_files/usr/src/lib/libcryptoutil/spec/Makefile
index 7fc3c15e34..7fc3c15e34 100644
--- a/usr/src/lib/libcryptoutil/spec/Makefile
+++ b/deleted_files/usr/src/lib/libcryptoutil/spec/Makefile
diff --git a/usr/src/lib/libcryptoutil/spec/Makefile.targ b/deleted_files/usr/src/lib/libcryptoutil/spec/Makefile.targ
index fb1d5ef898..fb1d5ef898 100644
--- a/usr/src/lib/libcryptoutil/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libcryptoutil/spec/Makefile.targ
diff --git a/usr/src/lib/libcryptoutil/spec/amd64/Makefile b/deleted_files/usr/src/lib/libcryptoutil/spec/amd64/Makefile
index 40a72c892d..40a72c892d 100644
--- a/usr/src/lib/libcryptoutil/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libcryptoutil/spec/amd64/Makefile
diff --git a/usr/src/lib/libcryptoutil/spec/cryptoutil.spec b/deleted_files/usr/src/lib/libcryptoutil/spec/cryptoutil.spec
index 947cce551a..947cce551a 100644
--- a/usr/src/lib/libcryptoutil/spec/cryptoutil.spec
+++ b/deleted_files/usr/src/lib/libcryptoutil/spec/cryptoutil.spec
diff --git a/usr/src/lib/libcryptoutil/spec/i386/Makefile b/deleted_files/usr/src/lib/libcryptoutil/spec/i386/Makefile
index bb5123e331..bb5123e331 100644
--- a/usr/src/lib/libcryptoutil/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libcryptoutil/spec/i386/Makefile
diff --git a/usr/src/lib/libcryptoutil/spec/sparc/Makefile b/deleted_files/usr/src/lib/libcryptoutil/spec/sparc/Makefile
index 76d47aab26..76d47aab26 100644
--- a/usr/src/lib/libcryptoutil/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libcryptoutil/spec/sparc/Makefile
diff --git a/usr/src/lib/libcryptoutil/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libcryptoutil/spec/sparcv9/Makefile
index 1cfa32dc3c..1cfa32dc3c 100644
--- a/usr/src/lib/libcryptoutil/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libcryptoutil/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libcryptoutil/spec/versions b/deleted_files/usr/src/lib/libcryptoutil/spec/versions
index a990772196..a990772196 100644
--- a/usr/src/lib/libcryptoutil/spec/versions
+++ b/deleted_files/usr/src/lib/libcryptoutil/spec/versions
diff --git a/usr/src/lib/libctf/spec/Makefile b/deleted_files/usr/src/lib/libctf/spec/Makefile
index 39ee06a616..39ee06a616 100644
--- a/usr/src/lib/libctf/spec/Makefile
+++ b/deleted_files/usr/src/lib/libctf/spec/Makefile
diff --git a/usr/src/lib/libctf/spec/Makefile.targ b/deleted_files/usr/src/lib/libctf/spec/Makefile.targ
index d4c1f1050d..d4c1f1050d 100644
--- a/usr/src/lib/libctf/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libctf/spec/Makefile.targ
diff --git a/usr/src/lib/libctf/spec/amd64/Makefile b/deleted_files/usr/src/lib/libctf/spec/amd64/Makefile
index 026853df1b..026853df1b 100644
--- a/usr/src/lib/libctf/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libctf/spec/amd64/Makefile
diff --git a/usr/src/lib/libctf/spec/ctf.spec b/deleted_files/usr/src/lib/libctf/spec/ctf.spec
index 552816c9db..552816c9db 100644
--- a/usr/src/lib/libctf/spec/ctf.spec
+++ b/deleted_files/usr/src/lib/libctf/spec/ctf.spec
diff --git a/usr/src/lib/libctf/spec/i386/Makefile b/deleted_files/usr/src/lib/libctf/spec/i386/Makefile
index 144265254a..144265254a 100644
--- a/usr/src/lib/libctf/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libctf/spec/i386/Makefile
diff --git a/usr/src/lib/libctf/spec/sparc/Makefile b/deleted_files/usr/src/lib/libctf/spec/sparc/Makefile
index 2043f6dc4c..2043f6dc4c 100644
--- a/usr/src/lib/libctf/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libctf/spec/sparc/Makefile
diff --git a/usr/src/lib/libctf/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libctf/spec/sparcv9/Makefile
index 2d54261765..2d54261765 100644
--- a/usr/src/lib/libctf/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libctf/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libctf/spec/versions b/deleted_files/usr/src/lib/libctf/spec/versions
index c15a94cfe8..c15a94cfe8 100644
--- a/usr/src/lib/libctf/spec/versions
+++ b/deleted_files/usr/src/lib/libctf/spec/versions
diff --git a/usr/src/lib/libcurses/spec/Makefile b/deleted_files/usr/src/lib/libcurses/spec/Makefile
index ef6c68e2a4..ef6c68e2a4 100644
--- a/usr/src/lib/libcurses/spec/Makefile
+++ b/deleted_files/usr/src/lib/libcurses/spec/Makefile
diff --git a/usr/src/lib/libcurses/spec/Makefile.targ b/deleted_files/usr/src/lib/libcurses/spec/Makefile.targ
index 23d4453718..23d4453718 100644
--- a/usr/src/lib/libcurses/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libcurses/spec/Makefile.targ
diff --git a/usr/src/lib/libcurses/spec/amd64/Makefile b/deleted_files/usr/src/lib/libcurses/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libcurses/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libcurses/spec/amd64/Makefile
diff --git a/usr/src/lib/libcurses/spec/curses.spec b/deleted_files/usr/src/lib/libcurses/spec/curses.spec
index 9d34513aa7..9d34513aa7 100644
--- a/usr/src/lib/libcurses/spec/curses.spec
+++ b/deleted_files/usr/src/lib/libcurses/spec/curses.spec
diff --git a/usr/src/lib/libcurses/spec/i386/Makefile b/deleted_files/usr/src/lib/libcurses/spec/i386/Makefile
index 44bc48652e..44bc48652e 100644
--- a/usr/src/lib/libcurses/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libcurses/spec/i386/Makefile
diff --git a/usr/src/lib/libcurses/spec/sparc/Makefile b/deleted_files/usr/src/lib/libcurses/spec/sparc/Makefile
index 16877a6747..16877a6747 100644
--- a/usr/src/lib/libcurses/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libcurses/spec/sparc/Makefile
diff --git a/usr/src/lib/libcurses/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libcurses/spec/sparcv9/Makefile
index d5d3a92af9..d5d3a92af9 100644
--- a/usr/src/lib/libcurses/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libcurses/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libcurses/spec/versions b/deleted_files/usr/src/lib/libcurses/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libcurses/spec/versions
+++ b/deleted_files/usr/src/lib/libcurses/spec/versions
diff --git a/usr/src/lib/libdevice/spec/Makefile b/deleted_files/usr/src/lib/libdevice/spec/Makefile
index 7dc67f05ef..7dc67f05ef 100644
--- a/usr/src/lib/libdevice/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdevice/spec/Makefile
diff --git a/usr/src/lib/libdevice/spec/Makefile.targ b/deleted_files/usr/src/lib/libdevice/spec/Makefile.targ
index 04eac9aad3..04eac9aad3 100644
--- a/usr/src/lib/libdevice/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdevice/spec/Makefile.targ
diff --git a/usr/src/lib/libdevice/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdevice/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libdevice/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdevice/spec/amd64/Makefile
diff --git a/usr/src/lib/libdevice/spec/device.spec b/deleted_files/usr/src/lib/libdevice/spec/device.spec
index 6be747179f..6be747179f 100644
--- a/usr/src/lib/libdevice/spec/device.spec
+++ b/deleted_files/usr/src/lib/libdevice/spec/device.spec
diff --git a/usr/src/lib/libdevice/spec/i386/Makefile b/deleted_files/usr/src/lib/libdevice/spec/i386/Makefile
index 6a0eed0e6e..6a0eed0e6e 100644
--- a/usr/src/lib/libdevice/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdevice/spec/i386/Makefile
diff --git a/usr/src/lib/libdevice/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdevice/spec/sparc/Makefile
index 1f60fde554..1f60fde554 100644
--- a/usr/src/lib/libdevice/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdevice/spec/sparc/Makefile
diff --git a/usr/src/lib/libdevice/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdevice/spec/sparcv9/Makefile
index 86c4c1e032..86c4c1e032 100644
--- a/usr/src/lib/libdevice/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdevice/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdevice/spec/versions b/deleted_files/usr/src/lib/libdevice/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libdevice/spec/versions
+++ b/deleted_files/usr/src/lib/libdevice/spec/versions
diff --git a/usr/src/lib/libdevid/spec/Makefile b/deleted_files/usr/src/lib/libdevid/spec/Makefile
index f6d27e20e1..f6d27e20e1 100644
--- a/usr/src/lib/libdevid/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdevid/spec/Makefile
diff --git a/usr/src/lib/libdevid/spec/Makefile.targ b/deleted_files/usr/src/lib/libdevid/spec/Makefile.targ
index 061bead63c..061bead63c 100644
--- a/usr/src/lib/libdevid/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdevid/spec/Makefile.targ
diff --git a/usr/src/lib/libdevid/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdevid/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libdevid/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdevid/spec/amd64/Makefile
diff --git a/usr/src/lib/libdevid/spec/devid.spec b/deleted_files/usr/src/lib/libdevid/spec/devid.spec
index b7a14d1486..b7a14d1486 100644
--- a/usr/src/lib/libdevid/spec/devid.spec
+++ b/deleted_files/usr/src/lib/libdevid/spec/devid.spec
diff --git a/usr/src/lib/libdevid/spec/i386/Makefile b/deleted_files/usr/src/lib/libdevid/spec/i386/Makefile
index 472668a010..472668a010 100644
--- a/usr/src/lib/libdevid/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdevid/spec/i386/Makefile
diff --git a/usr/src/lib/libdevid/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdevid/spec/sparc/Makefile
index 850a834f1e..850a834f1e 100644
--- a/usr/src/lib/libdevid/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdevid/spec/sparc/Makefile
diff --git a/usr/src/lib/libdevid/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdevid/spec/sparcv9/Makefile
index ab0f9e69c9..ab0f9e69c9 100644
--- a/usr/src/lib/libdevid/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdevid/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdevid/spec/versions b/deleted_files/usr/src/lib/libdevid/spec/versions
index f5e512d84b..f5e512d84b 100644
--- a/usr/src/lib/libdevid/spec/versions
+++ b/deleted_files/usr/src/lib/libdevid/spec/versions
diff --git a/usr/src/lib/libdevinfo/spec/Makefile b/deleted_files/usr/src/lib/libdevinfo/spec/Makefile
index 17a9843469..17a9843469 100644
--- a/usr/src/lib/libdevinfo/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdevinfo/spec/Makefile
diff --git a/usr/src/lib/libdevinfo/spec/Makefile.targ b/deleted_files/usr/src/lib/libdevinfo/spec/Makefile.targ
index 7c57fa8369..7c57fa8369 100644
--- a/usr/src/lib/libdevinfo/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdevinfo/spec/Makefile.targ
diff --git a/usr/src/lib/libdevinfo/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdevinfo/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libdevinfo/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdevinfo/spec/amd64/Makefile
diff --git a/usr/src/lib/libdevinfo/spec/devinfo.spec b/deleted_files/usr/src/lib/libdevinfo/spec/devinfo.spec
index cbf95569e3..cbf95569e3 100644
--- a/usr/src/lib/libdevinfo/spec/devinfo.spec
+++ b/deleted_files/usr/src/lib/libdevinfo/spec/devinfo.spec
diff --git a/usr/src/lib/libdevinfo/spec/i386/Makefile b/deleted_files/usr/src/lib/libdevinfo/spec/i386/Makefile
index 2ac46c39dc..2ac46c39dc 100644
--- a/usr/src/lib/libdevinfo/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdevinfo/spec/i386/Makefile
diff --git a/usr/src/lib/libdevinfo/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdevinfo/spec/sparc/Makefile
index 1b69ee2c55..1b69ee2c55 100644
--- a/usr/src/lib/libdevinfo/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdevinfo/spec/sparc/Makefile
diff --git a/usr/src/lib/libdevinfo/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdevinfo/spec/sparcv9/Makefile
index c0625153f3..c0625153f3 100644
--- a/usr/src/lib/libdevinfo/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdevinfo/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdevinfo/spec/versions b/deleted_files/usr/src/lib/libdevinfo/spec/versions
index 1a698fbb9f..1a698fbb9f 100644
--- a/usr/src/lib/libdevinfo/spec/versions
+++ b/deleted_files/usr/src/lib/libdevinfo/spec/versions
diff --git a/usr/src/lib/libdhcpagent/spec/Makefile b/deleted_files/usr/src/lib/libdhcpagent/spec/Makefile
index 8ed5392dab..8ed5392dab 100644
--- a/usr/src/lib/libdhcpagent/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpagent/spec/Makefile
diff --git a/usr/src/lib/libdhcpagent/spec/Makefile.targ b/deleted_files/usr/src/lib/libdhcpagent/spec/Makefile.targ
index cfd33e6b04..cfd33e6b04 100644
--- a/usr/src/lib/libdhcpagent/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdhcpagent/spec/Makefile.targ
diff --git a/usr/src/lib/libdhcpagent/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdhcpagent/spec/amd64/Makefile
index 4ee7613aaf..4ee7613aaf 100644
--- a/usr/src/lib/libdhcpagent/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpagent/spec/amd64/Makefile
diff --git a/usr/src/lib/libdhcpagent/spec/dhcpagent.spec b/deleted_files/usr/src/lib/libdhcpagent/spec/dhcpagent.spec
index 99c42f72e1..99c42f72e1 100644
--- a/usr/src/lib/libdhcpagent/spec/dhcpagent.spec
+++ b/deleted_files/usr/src/lib/libdhcpagent/spec/dhcpagent.spec
diff --git a/usr/src/lib/libdhcpagent/spec/i386/Makefile b/deleted_files/usr/src/lib/libdhcpagent/spec/i386/Makefile
index 5e7ead776d..5e7ead776d 100644
--- a/usr/src/lib/libdhcpagent/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpagent/spec/i386/Makefile
diff --git a/usr/src/lib/libdhcpagent/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdhcpagent/spec/sparc/Makefile
index edf4bf0eb8..edf4bf0eb8 100644
--- a/usr/src/lib/libdhcpagent/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpagent/spec/sparc/Makefile
diff --git a/usr/src/lib/libdhcpagent/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdhcpagent/spec/sparcv9/Makefile
index 88c0d60efa..88c0d60efa 100644
--- a/usr/src/lib/libdhcpagent/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpagent/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdhcpagent/spec/versions b/deleted_files/usr/src/lib/libdhcpagent/spec/versions
index 22e0dd1104..22e0dd1104 100644
--- a/usr/src/lib/libdhcpagent/spec/versions
+++ b/deleted_files/usr/src/lib/libdhcpagent/spec/versions
diff --git a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/Makefile
index ea31a56c68..ea31a56c68 100644
--- a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/Makefile.targ b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/Makefile.targ
index 8ffab2c191..8ffab2c191 100644
--- a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/Makefile.targ
diff --git a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/amd64/Makefile
index 98f45d6f94..98f45d6f94 100644
--- a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/amd64/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/ds_SUNWbinfiles.spec b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/ds_SUNWbinfiles.spec
index e698a19243..e698a19243 100644
--- a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/ds_SUNWbinfiles.spec
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/ds_SUNWbinfiles.spec
diff --git a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/i386/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/i386/Makefile
index 337d83a17d..337d83a17d 100644
--- a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/i386/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/sparc/Makefile
index be20696b91..be20696b91 100644
--- a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/sparc/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/sparcv9/Makefile
index 385bf7622b..385bf7622b 100644
--- a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/versions b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libdhcpsvc/modules/binfiles/spec/versions
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/binfiles/spec/versions
diff --git a/usr/src/lib/libdhcpsvc/modules/files/spec/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/Makefile
index 1438b9cda6..1438b9cda6 100644
--- a/usr/src/lib/libdhcpsvc/modules/files/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/files/spec/Makefile.targ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/Makefile.targ
index 0155e81cf9..0155e81cf9 100644
--- a/usr/src/lib/libdhcpsvc/modules/files/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/Makefile.targ
diff --git a/usr/src/lib/libdhcpsvc/modules/files/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/amd64/Makefile
index 98f45d6f94..98f45d6f94 100644
--- a/usr/src/lib/libdhcpsvc/modules/files/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/amd64/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/files/spec/ds_SUNWfiles.spec b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/ds_SUNWfiles.spec
index ebb367d634..ebb367d634 100644
--- a/usr/src/lib/libdhcpsvc/modules/files/spec/ds_SUNWfiles.spec
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/ds_SUNWfiles.spec
diff --git a/usr/src/lib/libdhcpsvc/modules/files/spec/i386/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/i386/Makefile
index 15c76e0732..15c76e0732 100644
--- a/usr/src/lib/libdhcpsvc/modules/files/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/i386/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/files/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/sparc/Makefile
index 8c73560bfe..8c73560bfe 100644
--- a/usr/src/lib/libdhcpsvc/modules/files/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/sparc/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/files/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/sparcv9/Makefile
index 50282a75d3..50282a75d3 100644
--- a/usr/src/lib/libdhcpsvc/modules/files/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/files/spec/versions b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libdhcpsvc/modules/files/spec/versions
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files/spec/versions
diff --git a/usr/src/lib/libdhcpsvc/modules/files0/spec/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/Makefile
index 8dcd45a363..8dcd45a363 100644
--- a/usr/src/lib/libdhcpsvc/modules/files0/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/files0/spec/Makefile.targ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/Makefile.targ
index d9cbaacfff..d9cbaacfff 100644
--- a/usr/src/lib/libdhcpsvc/modules/files0/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/Makefile.targ
diff --git a/usr/src/lib/libdhcpsvc/modules/files0/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/amd64/Makefile
index 98f45d6f94..98f45d6f94 100644
--- a/usr/src/lib/libdhcpsvc/modules/files0/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/amd64/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/files0/spec/ds_SUNWfiles.spec b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/ds_SUNWfiles.spec
index acfebfd0e8..acfebfd0e8 100644
--- a/usr/src/lib/libdhcpsvc/modules/files0/spec/ds_SUNWfiles.spec
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/ds_SUNWfiles.spec
diff --git a/usr/src/lib/libdhcpsvc/modules/files0/spec/i386/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/i386/Makefile
index 4927e56071..4927e56071 100644
--- a/usr/src/lib/libdhcpsvc/modules/files0/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/i386/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/files0/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/sparc/Makefile
index 60fad6a048..60fad6a048 100644
--- a/usr/src/lib/libdhcpsvc/modules/files0/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/sparc/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/files0/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/sparcv9/Makefile
index 47c58e7393..47c58e7393 100644
--- a/usr/src/lib/libdhcpsvc/modules/files0/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/files0/spec/versions b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libdhcpsvc/modules/files0/spec/versions
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/files0/spec/versions
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/Makefile
index 40f813d4f2..40f813d4f2 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/Makefile.targ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/Makefile.targ
index fa43471a88..fa43471a88 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/Makefile.targ
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/amd64/Makefile
index 98f45d6f94..98f45d6f94 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/amd64/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/ds_SUNWnisplus.spec b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/ds_SUNWnisplus.spec
index dac30cf1a1..dac30cf1a1 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/ds_SUNWnisplus.spec
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/ds_SUNWnisplus.spec
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/i386/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/i386/Makefile
index d770cf0930..d770cf0930 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/i386/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/sparc/Makefile
index 3968022371..3968022371 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/sparc/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/sparcv9/Makefile
index 11f65ca8ef..11f65ca8ef 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/versions b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus/spec/versions
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus/spec/versions
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/Makefile
index 42baacc734..42baacc734 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/Makefile.targ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/Makefile.targ
index 5cee6e93c3..5cee6e93c3 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/Makefile.targ
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/amd64/Makefile
index 98f45d6f94..98f45d6f94 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/amd64/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/ds_SUNWnisplus.spec b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/ds_SUNWnisplus.spec
index 385427b766..385427b766 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/ds_SUNWnisplus.spec
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/ds_SUNWnisplus.spec
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/i386/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/i386/Makefile
index 80e2efc640..80e2efc640 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/i386/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/sparc/Makefile
index 3ab842df8d..3ab842df8d 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/sparc/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/sparcv9/Makefile
index e6843fd3f5..e6843fd3f5 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/versions b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/versions
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/nisplus0/spec/versions
diff --git a/usr/src/lib/libdhcpsvc/modules/templates/spec/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/Makefile
index 4c6a997e4f..4c6a997e4f 100644
--- a/usr/src/lib/libdhcpsvc/modules/templates/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/templates/spec/Makefile.targ b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/Makefile.targ
index 0f95cec689..0f95cec689 100644
--- a/usr/src/lib/libdhcpsvc/modules/templates/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/Makefile.targ
diff --git a/usr/src/lib/libdhcpsvc/modules/templates/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/amd64/Makefile
index 98f45d6f94..98f45d6f94 100644
--- a/usr/src/lib/libdhcpsvc/modules/templates/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/amd64/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/templates/spec/ds_RESOURCE.spec b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/ds_RESOURCE.spec
index 88a5dfeeb5..88a5dfeeb5 100644
--- a/usr/src/lib/libdhcpsvc/modules/templates/spec/ds_RESOURCE.spec
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/ds_RESOURCE.spec
diff --git a/usr/src/lib/libdhcpsvc/modules/templates/spec/i386/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/i386/Makefile
index 904a73a4c9..904a73a4c9 100644
--- a/usr/src/lib/libdhcpsvc/modules/templates/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/i386/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/templates/spec/public.spec b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/public.spec
index 24d9e07991..24d9e07991 100644
--- a/usr/src/lib/libdhcpsvc/modules/templates/spec/public.spec
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/public.spec
diff --git a/usr/src/lib/libdhcpsvc/modules/templates/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/sparc/Makefile
index 0b7f977ce7..0b7f977ce7 100644
--- a/usr/src/lib/libdhcpsvc/modules/templates/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/sparc/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/templates/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/sparcv9/Makefile
index 60b3f17058..60b3f17058 100644
--- a/usr/src/lib/libdhcpsvc/modules/templates/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdhcpsvc/modules/templates/spec/versions b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libdhcpsvc/modules/templates/spec/versions
+++ b/deleted_files/usr/src/lib/libdhcpsvc/modules/templates/spec/versions
diff --git a/usr/src/lib/libdhcpsvc/private/spec/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/Makefile
index 6c5642e7d0..6c5642e7d0 100644
--- a/usr/src/lib/libdhcpsvc/private/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/Makefile
diff --git a/usr/src/lib/libdhcpsvc/private/spec/Makefile.targ b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/Makefile.targ
index c8e34bd81c..c8e34bd81c 100644
--- a/usr/src/lib/libdhcpsvc/private/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/Makefile.targ
diff --git a/usr/src/lib/libdhcpsvc/private/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/amd64/Makefile
index 98f45d6f94..98f45d6f94 100644
--- a/usr/src/lib/libdhcpsvc/private/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/amd64/Makefile
diff --git a/usr/src/lib/libdhcpsvc/private/spec/dhcpsvc.spec b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/dhcpsvc.spec
index 0a170e8a85..0a170e8a85 100644
--- a/usr/src/lib/libdhcpsvc/private/spec/dhcpsvc.spec
+++ b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/dhcpsvc.spec
diff --git a/usr/src/lib/libdhcpsvc/private/spec/i386/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/i386/Makefile
index ade9177938..ade9177938 100644
--- a/usr/src/lib/libdhcpsvc/private/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/i386/Makefile
diff --git a/usr/src/lib/libdhcpsvc/private/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/sparc/Makefile
index 8a6b0aca95..8a6b0aca95 100644
--- a/usr/src/lib/libdhcpsvc/private/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/sparc/Makefile
diff --git a/usr/src/lib/libdhcpsvc/private/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/sparcv9/Makefile
index 27000f6825..27000f6825 100644
--- a/usr/src/lib/libdhcpsvc/private/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdhcpsvc/private/spec/versions b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libdhcpsvc/private/spec/versions
+++ b/deleted_files/usr/src/lib/libdhcpsvc/private/spec/versions
diff --git a/usr/src/lib/libdhcputil/spec/Makefile b/deleted_files/usr/src/lib/libdhcputil/spec/Makefile
index ad76aff4a5..ad76aff4a5 100644
--- a/usr/src/lib/libdhcputil/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdhcputil/spec/Makefile
diff --git a/usr/src/lib/libdhcputil/spec/Makefile.targ b/deleted_files/usr/src/lib/libdhcputil/spec/Makefile.targ
index d0cbd76ba4..d0cbd76ba4 100644
--- a/usr/src/lib/libdhcputil/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdhcputil/spec/Makefile.targ
diff --git a/usr/src/lib/libdhcputil/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdhcputil/spec/amd64/Makefile
index 4ee7613aaf..4ee7613aaf 100644
--- a/usr/src/lib/libdhcputil/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdhcputil/spec/amd64/Makefile
diff --git a/usr/src/lib/libdhcputil/spec/dhcputil.spec b/deleted_files/usr/src/lib/libdhcputil/spec/dhcputil.spec
index eaaed806b3..eaaed806b3 100644
--- a/usr/src/lib/libdhcputil/spec/dhcputil.spec
+++ b/deleted_files/usr/src/lib/libdhcputil/spec/dhcputil.spec
diff --git a/usr/src/lib/libdhcputil/spec/i386/Makefile b/deleted_files/usr/src/lib/libdhcputil/spec/i386/Makefile
index 6ad76c1208..6ad76c1208 100644
--- a/usr/src/lib/libdhcputil/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdhcputil/spec/i386/Makefile
diff --git a/usr/src/lib/libdhcputil/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdhcputil/spec/sparc/Makefile
index 4aba178c6f..4aba178c6f 100644
--- a/usr/src/lib/libdhcputil/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdhcputil/spec/sparc/Makefile
diff --git a/usr/src/lib/libdhcputil/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdhcputil/spec/sparcv9/Makefile
index 86fdf91c6b..86fdf91c6b 100644
--- a/usr/src/lib/libdhcputil/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdhcputil/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdhcputil/spec/versions b/deleted_files/usr/src/lib/libdhcputil/spec/versions
index 05e8e3e9ca..05e8e3e9ca 100644
--- a/usr/src/lib/libdhcputil/spec/versions
+++ b/deleted_files/usr/src/lib/libdhcputil/spec/versions
diff --git a/usr/src/lib/libdiagcode/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdiagcode/spec/amd64/Makefile
index 0b3b4f1ff2..0b3b4f1ff2 100644
--- a/usr/src/lib/libdiagcode/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdiagcode/spec/amd64/Makefile
diff --git a/usr/src/lib/libdisasm/spec/Makefile b/deleted_files/usr/src/lib/libdisasm/spec/Makefile
index aa4090be64..aa4090be64 100644
--- a/usr/src/lib/libdisasm/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdisasm/spec/Makefile
diff --git a/usr/src/lib/libdisasm/spec/Makefile.targ b/deleted_files/usr/src/lib/libdisasm/spec/Makefile.targ
index 7f0c111966..7f0c111966 100644
--- a/usr/src/lib/libdisasm/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdisasm/spec/Makefile.targ
diff --git a/usr/src/lib/libdisasm/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdisasm/spec/amd64/Makefile
index ccb7881373..ccb7881373 100644
--- a/usr/src/lib/libdisasm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdisasm/spec/amd64/Makefile
diff --git a/usr/src/lib/libdisasm/spec/i386/Makefile b/deleted_files/usr/src/lib/libdisasm/spec/i386/Makefile
index 9c275ffd2d..9c275ffd2d 100644
--- a/usr/src/lib/libdisasm/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdisasm/spec/i386/Makefile
diff --git a/usr/src/lib/libdisasm/spec/libdisasm.spec b/deleted_files/usr/src/lib/libdisasm/spec/libdisasm.spec
index d06dc0f18e..d06dc0f18e 100644
--- a/usr/src/lib/libdisasm/spec/libdisasm.spec
+++ b/deleted_files/usr/src/lib/libdisasm/spec/libdisasm.spec
diff --git a/usr/src/lib/libdisasm/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdisasm/spec/sparc/Makefile
index 9c275ffd2d..9c275ffd2d 100644
--- a/usr/src/lib/libdisasm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdisasm/spec/sparc/Makefile
diff --git a/usr/src/lib/libdisasm/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdisasm/spec/sparcv9/Makefile
index ccb7881373..ccb7881373 100644
--- a/usr/src/lib/libdisasm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdisasm/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdisasm/spec/versions b/deleted_files/usr/src/lib/libdisasm/spec/versions
index 4b00fdea49..4b00fdea49 100644
--- a/usr/src/lib/libdisasm/spec/versions
+++ b/deleted_files/usr/src/lib/libdisasm/spec/versions
diff --git a/usr/src/lib/libdiskmgt/spec/Makefile b/deleted_files/usr/src/lib/libdiskmgt/spec/Makefile
index 7ec77b7139..7ec77b7139 100644
--- a/usr/src/lib/libdiskmgt/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdiskmgt/spec/Makefile
diff --git a/usr/src/lib/libdiskmgt/spec/Makefile.targ b/deleted_files/usr/src/lib/libdiskmgt/spec/Makefile.targ
index 3b1f0e9cc9..3b1f0e9cc9 100644
--- a/usr/src/lib/libdiskmgt/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdiskmgt/spec/Makefile.targ
diff --git a/usr/src/lib/libdiskmgt/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdiskmgt/spec/amd64/Makefile
index 5dd1b7240f..5dd1b7240f 100644
--- a/usr/src/lib/libdiskmgt/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdiskmgt/spec/amd64/Makefile
diff --git a/usr/src/lib/libdiskmgt/spec/diskmgt.spec b/deleted_files/usr/src/lib/libdiskmgt/spec/diskmgt.spec
index cd86d49b36..cd86d49b36 100644
--- a/usr/src/lib/libdiskmgt/spec/diskmgt.spec
+++ b/deleted_files/usr/src/lib/libdiskmgt/spec/diskmgt.spec
diff --git a/usr/src/lib/libdiskmgt/spec/i386/Makefile b/deleted_files/usr/src/lib/libdiskmgt/spec/i386/Makefile
index 2548b2bdb4..2548b2bdb4 100644
--- a/usr/src/lib/libdiskmgt/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdiskmgt/spec/i386/Makefile
diff --git a/usr/src/lib/libdiskmgt/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdiskmgt/spec/sparc/Makefile
index b1aa1cc40c..b1aa1cc40c 100644
--- a/usr/src/lib/libdiskmgt/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdiskmgt/spec/sparc/Makefile
diff --git a/usr/src/lib/libdiskmgt/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdiskmgt/spec/sparcv9/Makefile
index 1d4ec142d6..1d4ec142d6 100644
--- a/usr/src/lib/libdiskmgt/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdiskmgt/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdiskmgt/spec/versions b/deleted_files/usr/src/lib/libdiskmgt/spec/versions
index 22e0dd1104..22e0dd1104 100644
--- a/usr/src/lib/libdiskmgt/spec/versions
+++ b/deleted_files/usr/src/lib/libdiskmgt/spec/versions
diff --git a/usr/src/lib/libdladm/spec/Makefile b/deleted_files/usr/src/lib/libdladm/spec/Makefile
index 53fbd3ad4b..53fbd3ad4b 100644
--- a/usr/src/lib/libdladm/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdladm/spec/Makefile
diff --git a/usr/src/lib/libdladm/spec/Makefile.targ b/deleted_files/usr/src/lib/libdladm/spec/Makefile.targ
index 3ba97559a4..3ba97559a4 100644
--- a/usr/src/lib/libdladm/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdladm/spec/Makefile.targ
diff --git a/usr/src/lib/libdladm/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdladm/spec/amd64/Makefile
index af603444ad..af603444ad 100644
--- a/usr/src/lib/libdladm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdladm/spec/amd64/Makefile
diff --git a/usr/src/lib/libdladm/spec/dladm.spec b/deleted_files/usr/src/lib/libdladm/spec/dladm.spec
index 6aca5746ee..6aca5746ee 100644
--- a/usr/src/lib/libdladm/spec/dladm.spec
+++ b/deleted_files/usr/src/lib/libdladm/spec/dladm.spec
diff --git a/usr/src/lib/libdladm/spec/i386/Makefile b/deleted_files/usr/src/lib/libdladm/spec/i386/Makefile
index 0a770cb926..0a770cb926 100644
--- a/usr/src/lib/libdladm/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdladm/spec/i386/Makefile
diff --git a/usr/src/lib/libdladm/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdladm/spec/sparc/Makefile
index 0a770cb926..0a770cb926 100644
--- a/usr/src/lib/libdladm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdladm/spec/sparc/Makefile
diff --git a/usr/src/lib/libdladm/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdladm/spec/sparcv9/Makefile
index f1868eaa18..f1868eaa18 100644
--- a/usr/src/lib/libdladm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdladm/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdladm/spec/versions b/deleted_files/usr/src/lib/libdladm/spec/versions
index 60672092ef..60672092ef 100644
--- a/usr/src/lib/libdladm/spec/versions
+++ b/deleted_files/usr/src/lib/libdladm/spec/versions
diff --git a/usr/src/lib/libdlpi/spec/Makefile b/deleted_files/usr/src/lib/libdlpi/spec/Makefile
index 53fbd3ad4b..53fbd3ad4b 100644
--- a/usr/src/lib/libdlpi/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdlpi/spec/Makefile
diff --git a/usr/src/lib/libdlpi/spec/Makefile.targ b/deleted_files/usr/src/lib/libdlpi/spec/Makefile.targ
index 3c83dca3e6..3c83dca3e6 100644
--- a/usr/src/lib/libdlpi/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdlpi/spec/Makefile.targ
diff --git a/usr/src/lib/libdlpi/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdlpi/spec/amd64/Makefile
index af603444ad..af603444ad 100644
--- a/usr/src/lib/libdlpi/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdlpi/spec/amd64/Makefile
diff --git a/usr/src/lib/libdlpi/spec/dlpi.spec b/deleted_files/usr/src/lib/libdlpi/spec/dlpi.spec
index 27a44abf18..27a44abf18 100644
--- a/usr/src/lib/libdlpi/spec/dlpi.spec
+++ b/deleted_files/usr/src/lib/libdlpi/spec/dlpi.spec
diff --git a/usr/src/lib/libdlpi/spec/i386/Makefile b/deleted_files/usr/src/lib/libdlpi/spec/i386/Makefile
index 0a770cb926..0a770cb926 100644
--- a/usr/src/lib/libdlpi/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdlpi/spec/i386/Makefile
diff --git a/usr/src/lib/libdlpi/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdlpi/spec/sparc/Makefile
index 0a770cb926..0a770cb926 100644
--- a/usr/src/lib/libdlpi/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdlpi/spec/sparc/Makefile
diff --git a/usr/src/lib/libdlpi/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdlpi/spec/sparcv9/Makefile
index f1868eaa18..f1868eaa18 100644
--- a/usr/src/lib/libdlpi/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdlpi/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdlpi/spec/versions b/deleted_files/usr/src/lib/libdlpi/spec/versions
index 60672092ef..60672092ef 100644
--- a/usr/src/lib/libdlpi/spec/versions
+++ b/deleted_files/usr/src/lib/libdlpi/spec/versions
diff --git a/usr/src/lib/libdscp/spec/Makefile b/deleted_files/usr/src/lib/libdscp/spec/Makefile
index 048c9a5306..048c9a5306 100644
--- a/usr/src/lib/libdscp/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdscp/spec/Makefile
diff --git a/usr/src/lib/libdscp/spec/Makefile.targ b/deleted_files/usr/src/lib/libdscp/spec/Makefile.targ
index c9f02d8818..c9f02d8818 100644
--- a/usr/src/lib/libdscp/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdscp/spec/Makefile.targ
diff --git a/usr/src/lib/libdscp/spec/libdscp.spec b/deleted_files/usr/src/lib/libdscp/spec/libdscp.spec
index 91cdd7c540..91cdd7c540 100644
--- a/usr/src/lib/libdscp/spec/libdscp.spec
+++ b/deleted_files/usr/src/lib/libdscp/spec/libdscp.spec
diff --git a/usr/src/lib/libdscp/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdscp/spec/sparc/Makefile
index 79205aad21..79205aad21 100644
--- a/usr/src/lib/libdscp/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdscp/spec/sparc/Makefile
diff --git a/usr/src/lib/libdscp/spec/versions b/deleted_files/usr/src/lib/libdscp/spec/versions
index bbebe2a784..bbebe2a784 100644
--- a/usr/src/lib/libdscp/spec/versions
+++ b/deleted_files/usr/src/lib/libdscp/spec/versions
diff --git a/usr/src/lib/libdtrace/spec/Makefile b/deleted_files/usr/src/lib/libdtrace/spec/Makefile
index 76070e312f..76070e312f 100644
--- a/usr/src/lib/libdtrace/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdtrace/spec/Makefile
diff --git a/usr/src/lib/libdtrace/spec/Makefile.targ b/deleted_files/usr/src/lib/libdtrace/spec/Makefile.targ
index 1940a23e95..1940a23e95 100644
--- a/usr/src/lib/libdtrace/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdtrace/spec/Makefile.targ
diff --git a/usr/src/lib/libdtrace/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdtrace/spec/amd64/Makefile
index 026853df1b..026853df1b 100644
--- a/usr/src/lib/libdtrace/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdtrace/spec/amd64/Makefile
diff --git a/usr/src/lib/libdtrace/spec/dtrace.spec b/deleted_files/usr/src/lib/libdtrace/spec/dtrace.spec
index 86fe4ec44c..86fe4ec44c 100644
--- a/usr/src/lib/libdtrace/spec/dtrace.spec
+++ b/deleted_files/usr/src/lib/libdtrace/spec/dtrace.spec
diff --git a/usr/src/lib/libdtrace/spec/i386/Makefile b/deleted_files/usr/src/lib/libdtrace/spec/i386/Makefile
index d7c2a7cf3a..d7c2a7cf3a 100644
--- a/usr/src/lib/libdtrace/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdtrace/spec/i386/Makefile
diff --git a/usr/src/lib/libdtrace/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdtrace/spec/sparc/Makefile
index 5b93400cf8..5b93400cf8 100644
--- a/usr/src/lib/libdtrace/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdtrace/spec/sparc/Makefile
diff --git a/usr/src/lib/libdtrace/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdtrace/spec/sparcv9/Makefile
index 23f39e0922..23f39e0922 100644
--- a/usr/src/lib/libdtrace/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdtrace/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdtrace/spec/versions b/deleted_files/usr/src/lib/libdtrace/spec/versions
index 3fc6f92d2d..3fc6f92d2d 100644
--- a/usr/src/lib/libdtrace/spec/versions
+++ b/deleted_files/usr/src/lib/libdtrace/spec/versions
diff --git a/usr/src/lib/libdtrace_jni/spec/Makefile b/deleted_files/usr/src/lib/libdtrace_jni/spec/Makefile
index a66eef302e..a66eef302e 100644
--- a/usr/src/lib/libdtrace_jni/spec/Makefile
+++ b/deleted_files/usr/src/lib/libdtrace_jni/spec/Makefile
diff --git a/usr/src/lib/libdtrace_jni/spec/Makefile.targ b/deleted_files/usr/src/lib/libdtrace_jni/spec/Makefile.targ
index 9be768f2eb..9be768f2eb 100644
--- a/usr/src/lib/libdtrace_jni/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libdtrace_jni/spec/Makefile.targ
diff --git a/usr/src/lib/libdtrace_jni/spec/amd64/Makefile b/deleted_files/usr/src/lib/libdtrace_jni/spec/amd64/Makefile
index aced5376d3..aced5376d3 100644
--- a/usr/src/lib/libdtrace_jni/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libdtrace_jni/spec/amd64/Makefile
diff --git a/usr/src/lib/libdtrace_jni/spec/dtrace_jni.spec b/deleted_files/usr/src/lib/libdtrace_jni/spec/dtrace_jni.spec
index ac34d71659..ac34d71659 100644
--- a/usr/src/lib/libdtrace_jni/spec/dtrace_jni.spec
+++ b/deleted_files/usr/src/lib/libdtrace_jni/spec/dtrace_jni.spec
diff --git a/usr/src/lib/libdtrace_jni/spec/i386/Makefile b/deleted_files/usr/src/lib/libdtrace_jni/spec/i386/Makefile
index 4e313b5aa8..4e313b5aa8 100644
--- a/usr/src/lib/libdtrace_jni/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libdtrace_jni/spec/i386/Makefile
diff --git a/usr/src/lib/libdtrace_jni/spec/sparc/Makefile b/deleted_files/usr/src/lib/libdtrace_jni/spec/sparc/Makefile
index 0783a6dc00..0783a6dc00 100644
--- a/usr/src/lib/libdtrace_jni/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libdtrace_jni/spec/sparc/Makefile
diff --git a/usr/src/lib/libdtrace_jni/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libdtrace_jni/spec/sparcv9/Makefile
index aced5376d3..aced5376d3 100644
--- a/usr/src/lib/libdtrace_jni/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libdtrace_jni/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libdtrace_jni/spec/versions b/deleted_files/usr/src/lib/libdtrace_jni/spec/versions
index 3be654f018..3be654f018 100644
--- a/usr/src/lib/libdtrace_jni/spec/versions
+++ b/deleted_files/usr/src/lib/libdtrace_jni/spec/versions
diff --git a/usr/src/lib/libefi/spec/Makefile b/deleted_files/usr/src/lib/libefi/spec/Makefile
index 631c5dd98c..631c5dd98c 100644
--- a/usr/src/lib/libefi/spec/Makefile
+++ b/deleted_files/usr/src/lib/libefi/spec/Makefile
diff --git a/usr/src/lib/libefi/spec/Makefile.targ b/deleted_files/usr/src/lib/libefi/spec/Makefile.targ
index 93620cea6d..93620cea6d 100644
--- a/usr/src/lib/libefi/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libefi/spec/Makefile.targ
diff --git a/usr/src/lib/libefi/spec/amd64/Makefile b/deleted_files/usr/src/lib/libefi/spec/amd64/Makefile
index 5dd1b7240f..5dd1b7240f 100644
--- a/usr/src/lib/libefi/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libefi/spec/amd64/Makefile
diff --git a/usr/src/lib/libefi/spec/efi.spec b/deleted_files/usr/src/lib/libefi/spec/efi.spec
index 9957cccbf4..9957cccbf4 100644
--- a/usr/src/lib/libefi/spec/efi.spec
+++ b/deleted_files/usr/src/lib/libefi/spec/efi.spec
diff --git a/usr/src/lib/libefi/spec/i386/Makefile b/deleted_files/usr/src/lib/libefi/spec/i386/Makefile
index e1550e7f62..e1550e7f62 100644
--- a/usr/src/lib/libefi/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libefi/spec/i386/Makefile
diff --git a/usr/src/lib/libefi/spec/sparc/Makefile b/deleted_files/usr/src/lib/libefi/spec/sparc/Makefile
index 13c653d998..13c653d998 100644
--- a/usr/src/lib/libefi/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libefi/spec/sparc/Makefile
diff --git a/usr/src/lib/libefi/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libefi/spec/sparcv9/Makefile
index 35aa251bbd..35aa251bbd 100644
--- a/usr/src/lib/libefi/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libefi/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libefi/spec/versions b/deleted_files/usr/src/lib/libefi/spec/versions
index dc2cad2ce6..dc2cad2ce6 100644
--- a/usr/src/lib/libefi/spec/versions
+++ b/deleted_files/usr/src/lib/libefi/spec/versions
diff --git a/usr/src/lib/libeti/form/spec/Makefile b/deleted_files/usr/src/lib/libeti/form/spec/Makefile
index 17f4255c0e..17f4255c0e 100644
--- a/usr/src/lib/libeti/form/spec/Makefile
+++ b/deleted_files/usr/src/lib/libeti/form/spec/Makefile
diff --git a/usr/src/lib/libeti/form/spec/Makefile.targ b/deleted_files/usr/src/lib/libeti/form/spec/Makefile.targ
index 7d1d500c29..7d1d500c29 100644
--- a/usr/src/lib/libeti/form/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libeti/form/spec/Makefile.targ
diff --git a/usr/src/lib/libeti/form/spec/amd64/Makefile b/deleted_files/usr/src/lib/libeti/form/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libeti/form/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libeti/form/spec/amd64/Makefile
diff --git a/usr/src/lib/libeti/form/spec/form.spec b/deleted_files/usr/src/lib/libeti/form/spec/form.spec
index acabf86547..acabf86547 100644
--- a/usr/src/lib/libeti/form/spec/form.spec
+++ b/deleted_files/usr/src/lib/libeti/form/spec/form.spec
diff --git a/usr/src/lib/libeti/form/spec/i386/Makefile b/deleted_files/usr/src/lib/libeti/form/spec/i386/Makefile
index 1d286bf325..1d286bf325 100644
--- a/usr/src/lib/libeti/form/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libeti/form/spec/i386/Makefile
diff --git a/usr/src/lib/libeti/form/spec/sparc/Makefile b/deleted_files/usr/src/lib/libeti/form/spec/sparc/Makefile
index 2d6b7997c6..2d6b7997c6 100644
--- a/usr/src/lib/libeti/form/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libeti/form/spec/sparc/Makefile
diff --git a/usr/src/lib/libeti/form/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libeti/form/spec/sparcv9/Makefile
index 9435d14450..9435d14450 100644
--- a/usr/src/lib/libeti/form/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libeti/form/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libeti/form/spec/versions b/deleted_files/usr/src/lib/libeti/form/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libeti/form/spec/versions
+++ b/deleted_files/usr/src/lib/libeti/form/spec/versions
diff --git a/usr/src/lib/libeti/menu/spec/Makefile b/deleted_files/usr/src/lib/libeti/menu/spec/Makefile
index 0ee81155b6..0ee81155b6 100644
--- a/usr/src/lib/libeti/menu/spec/Makefile
+++ b/deleted_files/usr/src/lib/libeti/menu/spec/Makefile
diff --git a/usr/src/lib/libeti/menu/spec/Makefile.targ b/deleted_files/usr/src/lib/libeti/menu/spec/Makefile.targ
index 75f6ec5571..75f6ec5571 100644
--- a/usr/src/lib/libeti/menu/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libeti/menu/spec/Makefile.targ
diff --git a/usr/src/lib/libeti/menu/spec/amd64/Makefile b/deleted_files/usr/src/lib/libeti/menu/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libeti/menu/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libeti/menu/spec/amd64/Makefile
diff --git a/usr/src/lib/libeti/menu/spec/i386/Makefile b/deleted_files/usr/src/lib/libeti/menu/spec/i386/Makefile
index dca9c4bcdc..dca9c4bcdc 100644
--- a/usr/src/lib/libeti/menu/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libeti/menu/spec/i386/Makefile
diff --git a/usr/src/lib/libeti/menu/spec/menu.spec b/deleted_files/usr/src/lib/libeti/menu/spec/menu.spec
index 00a0b7a9f6..00a0b7a9f6 100644
--- a/usr/src/lib/libeti/menu/spec/menu.spec
+++ b/deleted_files/usr/src/lib/libeti/menu/spec/menu.spec
diff --git a/usr/src/lib/libeti/menu/spec/sparc/Makefile b/deleted_files/usr/src/lib/libeti/menu/spec/sparc/Makefile
index bd3ceedb93..bd3ceedb93 100644
--- a/usr/src/lib/libeti/menu/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libeti/menu/spec/sparc/Makefile
diff --git a/usr/src/lib/libeti/menu/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libeti/menu/spec/sparcv9/Makefile
index e4e1ea6862..e4e1ea6862 100644
--- a/usr/src/lib/libeti/menu/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libeti/menu/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libeti/menu/spec/versions b/deleted_files/usr/src/lib/libeti/menu/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libeti/menu/spec/versions
+++ b/deleted_files/usr/src/lib/libeti/menu/spec/versions
diff --git a/usr/src/lib/libeti/panel/spec/Makefile b/deleted_files/usr/src/lib/libeti/panel/spec/Makefile
index 4ecd4c567b..4ecd4c567b 100644
--- a/usr/src/lib/libeti/panel/spec/Makefile
+++ b/deleted_files/usr/src/lib/libeti/panel/spec/Makefile
diff --git a/usr/src/lib/libeti/panel/spec/Makefile.targ b/deleted_files/usr/src/lib/libeti/panel/spec/Makefile.targ
index d6bb3f03bc..d6bb3f03bc 100644
--- a/usr/src/lib/libeti/panel/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libeti/panel/spec/Makefile.targ
diff --git a/usr/src/lib/libeti/panel/spec/amd64/Makefile b/deleted_files/usr/src/lib/libeti/panel/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libeti/panel/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libeti/panel/spec/amd64/Makefile
diff --git a/usr/src/lib/libeti/panel/spec/i386/Makefile b/deleted_files/usr/src/lib/libeti/panel/spec/i386/Makefile
index d3797c6cbf..d3797c6cbf 100644
--- a/usr/src/lib/libeti/panel/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libeti/panel/spec/i386/Makefile
diff --git a/usr/src/lib/libeti/panel/spec/panel.spec b/deleted_files/usr/src/lib/libeti/panel/spec/panel.spec
index d99791b29b..d99791b29b 100644
--- a/usr/src/lib/libeti/panel/spec/panel.spec
+++ b/deleted_files/usr/src/lib/libeti/panel/spec/panel.spec
diff --git a/usr/src/lib/libeti/panel/spec/sparc/Makefile b/deleted_files/usr/src/lib/libeti/panel/spec/sparc/Makefile
index 6ebc46a79e..6ebc46a79e 100644
--- a/usr/src/lib/libeti/panel/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libeti/panel/spec/sparc/Makefile
diff --git a/usr/src/lib/libeti/panel/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libeti/panel/spec/sparcv9/Makefile
index e3c7abe755..e3c7abe755 100644
--- a/usr/src/lib/libeti/panel/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libeti/panel/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libeti/panel/spec/versions b/deleted_files/usr/src/lib/libeti/panel/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libeti/panel/spec/versions
+++ b/deleted_files/usr/src/lib/libeti/panel/spec/versions
diff --git a/usr/src/lib/libexacct/spec/Makefile b/deleted_files/usr/src/lib/libexacct/spec/Makefile
index e91ff02df0..e91ff02df0 100644
--- a/usr/src/lib/libexacct/spec/Makefile
+++ b/deleted_files/usr/src/lib/libexacct/spec/Makefile
diff --git a/usr/src/lib/libexacct/spec/Makefile.targ b/deleted_files/usr/src/lib/libexacct/spec/Makefile.targ
index b6a2252892..b6a2252892 100644
--- a/usr/src/lib/libexacct/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libexacct/spec/Makefile.targ
diff --git a/usr/src/lib/libexacct/spec/amd64/Makefile b/deleted_files/usr/src/lib/libexacct/spec/amd64/Makefile
index 747e875202..747e875202 100644
--- a/usr/src/lib/libexacct/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libexacct/spec/amd64/Makefile
diff --git a/usr/src/lib/libexacct/spec/exacct.spec b/deleted_files/usr/src/lib/libexacct/spec/exacct.spec
index 03c3def8a4..03c3def8a4 100644
--- a/usr/src/lib/libexacct/spec/exacct.spec
+++ b/deleted_files/usr/src/lib/libexacct/spec/exacct.spec
diff --git a/usr/src/lib/libexacct/spec/i386/Makefile b/deleted_files/usr/src/lib/libexacct/spec/i386/Makefile
index e78e070926..e78e070926 100644
--- a/usr/src/lib/libexacct/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libexacct/spec/i386/Makefile
diff --git a/usr/src/lib/libexacct/spec/sparc/Makefile b/deleted_files/usr/src/lib/libexacct/spec/sparc/Makefile
index cbb55369ea..cbb55369ea 100644
--- a/usr/src/lib/libexacct/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libexacct/spec/sparc/Makefile
diff --git a/usr/src/lib/libexacct/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libexacct/spec/sparcv9/Makefile
index 1ea4581cac..1ea4581cac 100644
--- a/usr/src/lib/libexacct/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libexacct/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libexacct/spec/versions b/deleted_files/usr/src/lib/libexacct/spec/versions
index f7133b5c7a..f7133b5c7a 100644
--- a/usr/src/lib/libexacct/spec/versions
+++ b/deleted_files/usr/src/lib/libexacct/spec/versions
diff --git a/usr/src/lib/libfsmgt/spec/Makefile b/deleted_files/usr/src/lib/libfsmgt/spec/Makefile
index 0378e0e3c9..0378e0e3c9 100644
--- a/usr/src/lib/libfsmgt/spec/Makefile
+++ b/deleted_files/usr/src/lib/libfsmgt/spec/Makefile
diff --git a/usr/src/lib/libfsmgt/spec/Makefile.targ b/deleted_files/usr/src/lib/libfsmgt/spec/Makefile.targ
index a002604ffa..a002604ffa 100644
--- a/usr/src/lib/libfsmgt/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libfsmgt/spec/Makefile.targ
diff --git a/usr/src/lib/libfsmgt/spec/amd64/Makefile b/deleted_files/usr/src/lib/libfsmgt/spec/amd64/Makefile
index 4ee7613aaf..4ee7613aaf 100644
--- a/usr/src/lib/libfsmgt/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libfsmgt/spec/amd64/Makefile
diff --git a/usr/src/lib/libfsmgt/spec/fsmgt.spec b/deleted_files/usr/src/lib/libfsmgt/spec/fsmgt.spec
index ea271f0023..ea271f0023 100644
--- a/usr/src/lib/libfsmgt/spec/fsmgt.spec
+++ b/deleted_files/usr/src/lib/libfsmgt/spec/fsmgt.spec
diff --git a/usr/src/lib/libfsmgt/spec/i386/Makefile b/deleted_files/usr/src/lib/libfsmgt/spec/i386/Makefile
index e12e4cd84d..e12e4cd84d 100644
--- a/usr/src/lib/libfsmgt/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libfsmgt/spec/i386/Makefile
diff --git a/usr/src/lib/libfsmgt/spec/sparc/Makefile b/deleted_files/usr/src/lib/libfsmgt/spec/sparc/Makefile
index e91aa5fd82..e91aa5fd82 100644
--- a/usr/src/lib/libfsmgt/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libfsmgt/spec/sparc/Makefile
diff --git a/usr/src/lib/libfsmgt/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libfsmgt/spec/sparcv9/Makefile
index aa21494217..aa21494217 100644
--- a/usr/src/lib/libfsmgt/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libfsmgt/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libfsmgt/spec/versions b/deleted_files/usr/src/lib/libfsmgt/spec/versions
index 22e0dd1104..22e0dd1104 100644
--- a/usr/src/lib/libfsmgt/spec/versions
+++ b/deleted_files/usr/src/lib/libfsmgt/spec/versions
diff --git a/usr/src/lib/libfstyp/spec/Makefile b/deleted_files/usr/src/lib/libfstyp/spec/Makefile
index 6c16bc1c97..6c16bc1c97 100644
--- a/usr/src/lib/libfstyp/spec/Makefile
+++ b/deleted_files/usr/src/lib/libfstyp/spec/Makefile
diff --git a/usr/src/lib/libfstyp/spec/Makefile.targ b/deleted_files/usr/src/lib/libfstyp/spec/Makefile.targ
index 3da4b5d5b0..3da4b5d5b0 100644
--- a/usr/src/lib/libfstyp/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libfstyp/spec/Makefile.targ
diff --git a/usr/src/lib/libfstyp/spec/fstyp.spec b/deleted_files/usr/src/lib/libfstyp/spec/fstyp.spec
index 86b2881f22..86b2881f22 100644
--- a/usr/src/lib/libfstyp/spec/fstyp.spec
+++ b/deleted_files/usr/src/lib/libfstyp/spec/fstyp.spec
diff --git a/usr/src/lib/libfstyp/spec/i386/Makefile b/deleted_files/usr/src/lib/libfstyp/spec/i386/Makefile
index dc68f36de0..dc68f36de0 100644
--- a/usr/src/lib/libfstyp/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libfstyp/spec/i386/Makefile
diff --git a/usr/src/lib/libfstyp/spec/sparc/Makefile b/deleted_files/usr/src/lib/libfstyp/spec/sparc/Makefile
index 12fb3f9086..12fb3f9086 100644
--- a/usr/src/lib/libfstyp/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libfstyp/spec/sparc/Makefile
diff --git a/usr/src/lib/libfstyp/spec/versions b/deleted_files/usr/src/lib/libfstyp/spec/versions
index 8dc3b55e0b..8dc3b55e0b 100644
--- a/usr/src/lib/libfstyp/spec/versions
+++ b/deleted_files/usr/src/lib/libfstyp/spec/versions
diff --git a/usr/src/lib/libgen/spec/Makefile b/deleted_files/usr/src/lib/libgen/spec/Makefile
index 6570cc455e..6570cc455e 100644
--- a/usr/src/lib/libgen/spec/Makefile
+++ b/deleted_files/usr/src/lib/libgen/spec/Makefile
diff --git a/usr/src/lib/libgen/spec/Makefile.targ b/deleted_files/usr/src/lib/libgen/spec/Makefile.targ
index 966a351179..966a351179 100644
--- a/usr/src/lib/libgen/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libgen/spec/Makefile.targ
diff --git a/usr/src/lib/libgen/spec/amd64/Makefile b/deleted_files/usr/src/lib/libgen/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libgen/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libgen/spec/amd64/Makefile
diff --git a/usr/src/lib/libgen/spec/gen.spec b/deleted_files/usr/src/lib/libgen/spec/gen.spec
index 02fd888134..02fd888134 100644
--- a/usr/src/lib/libgen/spec/gen.spec
+++ b/deleted_files/usr/src/lib/libgen/spec/gen.spec
diff --git a/usr/src/lib/libgen/spec/i386/Makefile b/deleted_files/usr/src/lib/libgen/spec/i386/Makefile
index 13fd65f65a..13fd65f65a 100644
--- a/usr/src/lib/libgen/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libgen/spec/i386/Makefile
diff --git a/usr/src/lib/libgen/spec/private.spec b/deleted_files/usr/src/lib/libgen/spec/private.spec
index 4231fbded4..4231fbded4 100644
--- a/usr/src/lib/libgen/spec/private.spec
+++ b/deleted_files/usr/src/lib/libgen/spec/private.spec
diff --git a/usr/src/lib/libgen/spec/sparc/Makefile b/deleted_files/usr/src/lib/libgen/spec/sparc/Makefile
index 1362b1144c..1362b1144c 100644
--- a/usr/src/lib/libgen/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libgen/spec/sparc/Makefile
diff --git a/usr/src/lib/libgen/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libgen/spec/sparcv9/Makefile
index e935b65bbf..e935b65bbf 100644
--- a/usr/src/lib/libgen/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libgen/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libgen/spec/versions b/deleted_files/usr/src/lib/libgen/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libgen/spec/versions
+++ b/deleted_files/usr/src/lib/libgen/spec/versions
diff --git a/usr/src/lib/libgen/spec/weak.spec b/deleted_files/usr/src/lib/libgen/spec/weak.spec
index 26fd753d6d..26fd753d6d 100644
--- a/usr/src/lib/libgen/spec/weak.spec
+++ b/deleted_files/usr/src/lib/libgen/spec/weak.spec
diff --git a/usr/src/lib/libgss/spec/Makefile b/deleted_files/usr/src/lib/libgss/spec/Makefile
index 7a3f89b118..7a3f89b118 100644
--- a/usr/src/lib/libgss/spec/Makefile
+++ b/deleted_files/usr/src/lib/libgss/spec/Makefile
diff --git a/usr/src/lib/libgss/spec/Makefile.targ b/deleted_files/usr/src/lib/libgss/spec/Makefile.targ
index ce18aa182d..ce18aa182d 100644
--- a/usr/src/lib/libgss/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libgss/spec/Makefile.targ
diff --git a/usr/src/lib/libgss/spec/amd64/Makefile b/deleted_files/usr/src/lib/libgss/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libgss/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libgss/spec/amd64/Makefile
diff --git a/usr/src/lib/libgss/spec/gss.spec b/deleted_files/usr/src/lib/libgss/spec/gss.spec
index 6cfae0c489..6cfae0c489 100644
--- a/usr/src/lib/libgss/spec/gss.spec
+++ b/deleted_files/usr/src/lib/libgss/spec/gss.spec
diff --git a/usr/src/lib/libgss/spec/i386/Makefile b/deleted_files/usr/src/lib/libgss/spec/i386/Makefile
index 401acdcae1..401acdcae1 100644
--- a/usr/src/lib/libgss/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libgss/spec/i386/Makefile
diff --git a/usr/src/lib/libgss/spec/sparc/Makefile b/deleted_files/usr/src/lib/libgss/spec/sparc/Makefile
index 1af31f36a2..1af31f36a2 100644
--- a/usr/src/lib/libgss/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libgss/spec/sparc/Makefile
diff --git a/usr/src/lib/libgss/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libgss/spec/sparcv9/Makefile
index 1eb81d037c..1eb81d037c 100644
--- a/usr/src/lib/libgss/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libgss/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libgss/spec/versions b/deleted_files/usr/src/lib/libgss/spec/versions
index 5fa1ed3b51..5fa1ed3b51 100644
--- a/usr/src/lib/libgss/spec/versions
+++ b/deleted_files/usr/src/lib/libgss/spec/versions
diff --git a/usr/src/lib/libinetcfg/spec/Makefile b/deleted_files/usr/src/lib/libinetcfg/spec/Makefile
index ad235ae8d2..ad235ae8d2 100644
--- a/usr/src/lib/libinetcfg/spec/Makefile
+++ b/deleted_files/usr/src/lib/libinetcfg/spec/Makefile
diff --git a/usr/src/lib/libinetcfg/spec/Makefile.targ b/deleted_files/usr/src/lib/libinetcfg/spec/Makefile.targ
index 808aead6f7..808aead6f7 100644
--- a/usr/src/lib/libinetcfg/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libinetcfg/spec/Makefile.targ
diff --git a/usr/src/lib/libinetcfg/spec/amd64/Makefile b/deleted_files/usr/src/lib/libinetcfg/spec/amd64/Makefile
index 4ee7613aaf..4ee7613aaf 100644
--- a/usr/src/lib/libinetcfg/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libinetcfg/spec/amd64/Makefile
diff --git a/usr/src/lib/libinetcfg/spec/i386/Makefile b/deleted_files/usr/src/lib/libinetcfg/spec/i386/Makefile
index 3a1dd0d6f8..3a1dd0d6f8 100644
--- a/usr/src/lib/libinetcfg/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libinetcfg/spec/i386/Makefile
diff --git a/usr/src/lib/libinetcfg/spec/inetcfg.spec b/deleted_files/usr/src/lib/libinetcfg/spec/inetcfg.spec
index 7d2af8201a..7d2af8201a 100644
--- a/usr/src/lib/libinetcfg/spec/inetcfg.spec
+++ b/deleted_files/usr/src/lib/libinetcfg/spec/inetcfg.spec
diff --git a/usr/src/lib/libinetcfg/spec/sparc/Makefile b/deleted_files/usr/src/lib/libinetcfg/spec/sparc/Makefile
index c502395dff..c502395dff 100644
--- a/usr/src/lib/libinetcfg/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libinetcfg/spec/sparc/Makefile
diff --git a/usr/src/lib/libinetcfg/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libinetcfg/spec/sparcv9/Makefile
index 1826191a45..1826191a45 100644
--- a/usr/src/lib/libinetcfg/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libinetcfg/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libinetcfg/spec/versions b/deleted_files/usr/src/lib/libinetcfg/spec/versions
index 22e0dd1104..22e0dd1104 100644
--- a/usr/src/lib/libinetcfg/spec/versions
+++ b/deleted_files/usr/src/lib/libinetcfg/spec/versions
diff --git a/usr/src/lib/libinetsvc/spec/Makefile b/deleted_files/usr/src/lib/libinetsvc/spec/Makefile
index 97ff568ece..97ff568ece 100644
--- a/usr/src/lib/libinetsvc/spec/Makefile
+++ b/deleted_files/usr/src/lib/libinetsvc/spec/Makefile
diff --git a/usr/src/lib/libinetsvc/spec/Makefile.targ b/deleted_files/usr/src/lib/libinetsvc/spec/Makefile.targ
index c5b9409832..c5b9409832 100644
--- a/usr/src/lib/libinetsvc/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libinetsvc/spec/Makefile.targ
diff --git a/usr/src/lib/libinetsvc/spec/amd64/Makefile b/deleted_files/usr/src/lib/libinetsvc/spec/amd64/Makefile
index 9ec1b071b8..9ec1b071b8 100644
--- a/usr/src/lib/libinetsvc/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libinetsvc/spec/amd64/Makefile
diff --git a/usr/src/lib/libinetsvc/spec/i386/Makefile b/deleted_files/usr/src/lib/libinetsvc/spec/i386/Makefile
index 1fa4955779..1fa4955779 100644
--- a/usr/src/lib/libinetsvc/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libinetsvc/spec/i386/Makefile
diff --git a/usr/src/lib/libinetsvc/spec/inetsvc.spec b/deleted_files/usr/src/lib/libinetsvc/spec/inetsvc.spec
index 49aa24aa1e..49aa24aa1e 100644
--- a/usr/src/lib/libinetsvc/spec/inetsvc.spec
+++ b/deleted_files/usr/src/lib/libinetsvc/spec/inetsvc.spec
diff --git a/usr/src/lib/libinetsvc/spec/sparc/Makefile b/deleted_files/usr/src/lib/libinetsvc/spec/sparc/Makefile
index 8f3b7be350..8f3b7be350 100644
--- a/usr/src/lib/libinetsvc/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libinetsvc/spec/sparc/Makefile
diff --git a/usr/src/lib/libinetsvc/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libinetsvc/spec/sparcv9/Makefile
index 9ec1b071b8..9ec1b071b8 100644
--- a/usr/src/lib/libinetsvc/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libinetsvc/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libinetsvc/spec/versions b/deleted_files/usr/src/lib/libinetsvc/spec/versions
index 48f7ac760c..48f7ac760c 100644
--- a/usr/src/lib/libinetsvc/spec/versions
+++ b/deleted_files/usr/src/lib/libinetsvc/spec/versions
diff --git a/usr/src/lib/libinetutil/spec/Makefile b/deleted_files/usr/src/lib/libinetutil/spec/Makefile
index ca996b5cd4..ca996b5cd4 100644
--- a/usr/src/lib/libinetutil/spec/Makefile
+++ b/deleted_files/usr/src/lib/libinetutil/spec/Makefile
diff --git a/usr/src/lib/libinetutil/spec/Makefile.targ b/deleted_files/usr/src/lib/libinetutil/spec/Makefile.targ
index dc5a1e2c9d..dc5a1e2c9d 100644
--- a/usr/src/lib/libinetutil/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libinetutil/spec/Makefile.targ
diff --git a/usr/src/lib/libinetutil/spec/amd64/Makefile b/deleted_files/usr/src/lib/libinetutil/spec/amd64/Makefile
index fb532ef308..fb532ef308 100644
--- a/usr/src/lib/libinetutil/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libinetutil/spec/amd64/Makefile
diff --git a/usr/src/lib/libinetutil/spec/i386/Makefile b/deleted_files/usr/src/lib/libinetutil/spec/i386/Makefile
index 5998e7365a..5998e7365a 100644
--- a/usr/src/lib/libinetutil/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libinetutil/spec/i386/Makefile
diff --git a/usr/src/lib/libinetutil/spec/inetutil.spec b/deleted_files/usr/src/lib/libinetutil/spec/inetutil.spec
index 25741fd0ef..25741fd0ef 100644
--- a/usr/src/lib/libinetutil/spec/inetutil.spec
+++ b/deleted_files/usr/src/lib/libinetutil/spec/inetutil.spec
diff --git a/usr/src/lib/libinetutil/spec/sparc/Makefile b/deleted_files/usr/src/lib/libinetutil/spec/sparc/Makefile
index e41e118fe4..e41e118fe4 100644
--- a/usr/src/lib/libinetutil/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libinetutil/spec/sparc/Makefile
diff --git a/usr/src/lib/libinetutil/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libinetutil/spec/sparcv9/Makefile
index 57683cf1ec..57683cf1ec 100644
--- a/usr/src/lib/libinetutil/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libinetutil/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libinetutil/spec/versions b/deleted_files/usr/src/lib/libinetutil/spec/versions
index 22e0dd1104..22e0dd1104 100644
--- a/usr/src/lib/libinetutil/spec/versions
+++ b/deleted_files/usr/src/lib/libinetutil/spec/versions
diff --git a/usr/src/lib/libipmp/spec/Makefile b/deleted_files/usr/src/lib/libipmp/spec/Makefile
index 5df87a9a92..5df87a9a92 100644
--- a/usr/src/lib/libipmp/spec/Makefile
+++ b/deleted_files/usr/src/lib/libipmp/spec/Makefile
diff --git a/usr/src/lib/libipmp/spec/Makefile.targ b/deleted_files/usr/src/lib/libipmp/spec/Makefile.targ
index 48aa2df3e3..48aa2df3e3 100644
--- a/usr/src/lib/libipmp/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libipmp/spec/Makefile.targ
diff --git a/usr/src/lib/libipmp/spec/amd64/Makefile b/deleted_files/usr/src/lib/libipmp/spec/amd64/Makefile
index 4ee7613aaf..4ee7613aaf 100644
--- a/usr/src/lib/libipmp/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libipmp/spec/amd64/Makefile
diff --git a/usr/src/lib/libipmp/spec/i386/Makefile b/deleted_files/usr/src/lib/libipmp/spec/i386/Makefile
index 01df11b35b..01df11b35b 100644
--- a/usr/src/lib/libipmp/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libipmp/spec/i386/Makefile
diff --git a/usr/src/lib/libipmp/spec/ipmp.spec b/deleted_files/usr/src/lib/libipmp/spec/ipmp.spec
index d2cb5c473e..d2cb5c473e 100644
--- a/usr/src/lib/libipmp/spec/ipmp.spec
+++ b/deleted_files/usr/src/lib/libipmp/spec/ipmp.spec
diff --git a/usr/src/lib/libipmp/spec/sparc/Makefile b/deleted_files/usr/src/lib/libipmp/spec/sparc/Makefile
index 01df11b35b..01df11b35b 100644
--- a/usr/src/lib/libipmp/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libipmp/spec/sparc/Makefile
diff --git a/usr/src/lib/libipmp/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libipmp/spec/sparcv9/Makefile
index 4f53c7c87f..4f53c7c87f 100644
--- a/usr/src/lib/libipmp/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libipmp/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libipmp/spec/versions b/deleted_files/usr/src/lib/libipmp/spec/versions
index 3fc6f92d2d..3fc6f92d2d 100644
--- a/usr/src/lib/libipmp/spec/versions
+++ b/deleted_files/usr/src/lib/libipmp/spec/versions
diff --git a/usr/src/lib/libipp/spec/Makefile b/deleted_files/usr/src/lib/libipp/spec/Makefile
index 31bb39f628..31bb39f628 100644
--- a/usr/src/lib/libipp/spec/Makefile
+++ b/deleted_files/usr/src/lib/libipp/spec/Makefile
diff --git a/usr/src/lib/libipp/spec/Makefile.targ b/deleted_files/usr/src/lib/libipp/spec/Makefile.targ
index 8b3e56b1be..8b3e56b1be 100644
--- a/usr/src/lib/libipp/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libipp/spec/Makefile.targ
diff --git a/usr/src/lib/libipp/spec/amd64/Makefile b/deleted_files/usr/src/lib/libipp/spec/amd64/Makefile
index d334868181..d334868181 100644
--- a/usr/src/lib/libipp/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libipp/spec/amd64/Makefile
diff --git a/usr/src/lib/libipp/spec/i386/Makefile b/deleted_files/usr/src/lib/libipp/spec/i386/Makefile
index a784448676..a784448676 100644
--- a/usr/src/lib/libipp/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libipp/spec/i386/Makefile
diff --git a/usr/src/lib/libipp/spec/libipp.spec b/deleted_files/usr/src/lib/libipp/spec/libipp.spec
index cd44a75dd7..cd44a75dd7 100644
--- a/usr/src/lib/libipp/spec/libipp.spec
+++ b/deleted_files/usr/src/lib/libipp/spec/libipp.spec
diff --git a/usr/src/lib/libipp/spec/sparc/Makefile b/deleted_files/usr/src/lib/libipp/spec/sparc/Makefile
index a2355696d6..a2355696d6 100644
--- a/usr/src/lib/libipp/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libipp/spec/sparc/Makefile
diff --git a/usr/src/lib/libipp/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libipp/spec/sparcv9/Makefile
index aca6202ef2..aca6202ef2 100644
--- a/usr/src/lib/libipp/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libipp/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libipp/spec/versions b/deleted_files/usr/src/lib/libipp/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libipp/spec/versions
+++ b/deleted_files/usr/src/lib/libipp/spec/versions
diff --git a/usr/src/lib/libipsecutil/spec/Makefile b/deleted_files/usr/src/lib/libipsecutil/spec/Makefile
index be32cec89c..be32cec89c 100644
--- a/usr/src/lib/libipsecutil/spec/Makefile
+++ b/deleted_files/usr/src/lib/libipsecutil/spec/Makefile
diff --git a/usr/src/lib/libipsecutil/spec/Makefile.targ b/deleted_files/usr/src/lib/libipsecutil/spec/Makefile.targ
index 97762819e3..97762819e3 100644
--- a/usr/src/lib/libipsecutil/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libipsecutil/spec/Makefile.targ
diff --git a/usr/src/lib/libipsecutil/spec/algs.spec b/deleted_files/usr/src/lib/libipsecutil/spec/algs.spec
index 7122e4010c..7122e4010c 100644
--- a/usr/src/lib/libipsecutil/spec/algs.spec
+++ b/deleted_files/usr/src/lib/libipsecutil/spec/algs.spec
diff --git a/usr/src/lib/libipsecutil/spec/amd64/Makefile b/deleted_files/usr/src/lib/libipsecutil/spec/amd64/Makefile
index 4ae9e0b124..4ae9e0b124 100644
--- a/usr/src/lib/libipsecutil/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libipsecutil/spec/amd64/Makefile
diff --git a/usr/src/lib/libipsecutil/spec/err.spec b/deleted_files/usr/src/lib/libipsecutil/spec/err.spec
index 84173ab351..84173ab351 100644
--- a/usr/src/lib/libipsecutil/spec/err.spec
+++ b/deleted_files/usr/src/lib/libipsecutil/spec/err.spec
diff --git a/usr/src/lib/libipsecutil/spec/i386/Makefile b/deleted_files/usr/src/lib/libipsecutil/spec/i386/Makefile
index 2038c3c9e8..2038c3c9e8 100644
--- a/usr/src/lib/libipsecutil/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libipsecutil/spec/i386/Makefile
diff --git a/usr/src/lib/libipsecutil/spec/ipsec_util.spec b/deleted_files/usr/src/lib/libipsecutil/spec/ipsec_util.spec
index 26719e815d..26719e815d 100644
--- a/usr/src/lib/libipsecutil/spec/ipsec_util.spec
+++ b/deleted_files/usr/src/lib/libipsecutil/spec/ipsec_util.spec
diff --git a/usr/src/lib/libipsecutil/spec/sparc/Makefile b/deleted_files/usr/src/lib/libipsecutil/spec/sparc/Makefile
index 2038c3c9e8..2038c3c9e8 100644
--- a/usr/src/lib/libipsecutil/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libipsecutil/spec/sparc/Makefile
diff --git a/usr/src/lib/libipsecutil/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libipsecutil/spec/sparcv9/Makefile
index fee0765eae..fee0765eae 100644
--- a/usr/src/lib/libipsecutil/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libipsecutil/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libipsecutil/spec/versions b/deleted_files/usr/src/lib/libipsecutil/spec/versions
index 1bc677d6dc..1bc677d6dc 100644
--- a/usr/src/lib/libipsecutil/spec/versions
+++ b/deleted_files/usr/src/lib/libipsecutil/spec/versions
diff --git a/usr/src/lib/libkstat/spec/Makefile b/deleted_files/usr/src/lib/libkstat/spec/Makefile
index 5e671bddfe..5e671bddfe 100644
--- a/usr/src/lib/libkstat/spec/Makefile
+++ b/deleted_files/usr/src/lib/libkstat/spec/Makefile
diff --git a/usr/src/lib/libkstat/spec/Makefile.targ b/deleted_files/usr/src/lib/libkstat/spec/Makefile.targ
index a774e562ec..a774e562ec 100644
--- a/usr/src/lib/libkstat/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libkstat/spec/Makefile.targ
diff --git a/usr/src/lib/libkstat/spec/amd64/Makefile b/deleted_files/usr/src/lib/libkstat/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libkstat/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libkstat/spec/amd64/Makefile
diff --git a/usr/src/lib/libkstat/spec/i386/Makefile b/deleted_files/usr/src/lib/libkstat/spec/i386/Makefile
index 90d510fd09..90d510fd09 100644
--- a/usr/src/lib/libkstat/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libkstat/spec/i386/Makefile
diff --git a/usr/src/lib/libkstat/spec/kstat.spec b/deleted_files/usr/src/lib/libkstat/spec/kstat.spec
index 00a8b70acc..00a8b70acc 100644
--- a/usr/src/lib/libkstat/spec/kstat.spec
+++ b/deleted_files/usr/src/lib/libkstat/spec/kstat.spec
diff --git a/usr/src/lib/libkstat/spec/sparc/Makefile b/deleted_files/usr/src/lib/libkstat/spec/sparc/Makefile
index 9f95f97dc7..9f95f97dc7 100644
--- a/usr/src/lib/libkstat/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libkstat/spec/sparc/Makefile
diff --git a/usr/src/lib/libkstat/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libkstat/spec/sparcv9/Makefile
index 81257bca98..81257bca98 100644
--- a/usr/src/lib/libkstat/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libkstat/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libkstat/spec/versions b/deleted_files/usr/src/lib/libkstat/spec/versions
index d59d4f7280..d59d4f7280 100644
--- a/usr/src/lib/libkstat/spec/versions
+++ b/deleted_files/usr/src/lib/libkstat/spec/versions
diff --git a/usr/src/lib/libkvm/spec/Makefile b/deleted_files/usr/src/lib/libkvm/spec/Makefile
index 4ee371daa5..4ee371daa5 100644
--- a/usr/src/lib/libkvm/spec/Makefile
+++ b/deleted_files/usr/src/lib/libkvm/spec/Makefile
diff --git a/usr/src/lib/libkvm/spec/Makefile.targ b/deleted_files/usr/src/lib/libkvm/spec/Makefile.targ
index c9e2738b79..c9e2738b79 100644
--- a/usr/src/lib/libkvm/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libkvm/spec/Makefile.targ
diff --git a/usr/src/lib/libkvm/spec/amd64/Makefile b/deleted_files/usr/src/lib/libkvm/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libkvm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libkvm/spec/amd64/Makefile
diff --git a/usr/src/lib/libkvm/spec/i386/Makefile b/deleted_files/usr/src/lib/libkvm/spec/i386/Makefile
index c7d5274776..c7d5274776 100644
--- a/usr/src/lib/libkvm/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libkvm/spec/i386/Makefile
diff --git a/usr/src/lib/libkvm/spec/kvm.spec b/deleted_files/usr/src/lib/libkvm/spec/kvm.spec
index fc3fed5062..fc3fed5062 100644
--- a/usr/src/lib/libkvm/spec/kvm.spec
+++ b/deleted_files/usr/src/lib/libkvm/spec/kvm.spec
diff --git a/usr/src/lib/libkvm/spec/sparc/Makefile b/deleted_files/usr/src/lib/libkvm/spec/sparc/Makefile
index faa8631beb..faa8631beb 100644
--- a/usr/src/lib/libkvm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libkvm/spec/sparc/Makefile
diff --git a/usr/src/lib/libkvm/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libkvm/spec/sparcv9/Makefile
index a90d93da31..a90d93da31 100644
--- a/usr/src/lib/libkvm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libkvm/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libkvm/spec/versions b/deleted_files/usr/src/lib/libkvm/spec/versions
index f62e5bb2e2..f62e5bb2e2 100644
--- a/usr/src/lib/libkvm/spec/versions
+++ b/deleted_files/usr/src/lib/libkvm/spec/versions
diff --git a/usr/src/lib/liblaadm/spec/Makefile b/deleted_files/usr/src/lib/liblaadm/spec/Makefile
index 53fbd3ad4b..53fbd3ad4b 100644
--- a/usr/src/lib/liblaadm/spec/Makefile
+++ b/deleted_files/usr/src/lib/liblaadm/spec/Makefile
diff --git a/usr/src/lib/liblaadm/spec/Makefile.targ b/deleted_files/usr/src/lib/liblaadm/spec/Makefile.targ
index 4da2bc7b5d..4da2bc7b5d 100644
--- a/usr/src/lib/liblaadm/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/liblaadm/spec/Makefile.targ
diff --git a/usr/src/lib/liblaadm/spec/amd64/Makefile b/deleted_files/usr/src/lib/liblaadm/spec/amd64/Makefile
index af603444ad..af603444ad 100644
--- a/usr/src/lib/liblaadm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/liblaadm/spec/amd64/Makefile
diff --git a/usr/src/lib/liblaadm/spec/i386/Makefile b/deleted_files/usr/src/lib/liblaadm/spec/i386/Makefile
index 0a770cb926..0a770cb926 100644
--- a/usr/src/lib/liblaadm/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/liblaadm/spec/i386/Makefile
diff --git a/usr/src/lib/liblaadm/spec/laadm.spec b/deleted_files/usr/src/lib/liblaadm/spec/laadm.spec
index dc10f43a34..dc10f43a34 100644
--- a/usr/src/lib/liblaadm/spec/laadm.spec
+++ b/deleted_files/usr/src/lib/liblaadm/spec/laadm.spec
diff --git a/usr/src/lib/liblaadm/spec/sparc/Makefile b/deleted_files/usr/src/lib/liblaadm/spec/sparc/Makefile
index 0a770cb926..0a770cb926 100644
--- a/usr/src/lib/liblaadm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/liblaadm/spec/sparc/Makefile
diff --git a/usr/src/lib/liblaadm/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/liblaadm/spec/sparcv9/Makefile
index f1868eaa18..f1868eaa18 100644
--- a/usr/src/lib/liblaadm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/liblaadm/spec/sparcv9/Makefile
diff --git a/usr/src/lib/liblaadm/spec/versions b/deleted_files/usr/src/lib/liblaadm/spec/versions
index 60672092ef..60672092ef 100644
--- a/usr/src/lib/liblaadm/spec/versions
+++ b/deleted_files/usr/src/lib/liblaadm/spec/versions
diff --git a/usr/src/lib/libldap4/spec/Makefile b/deleted_files/usr/src/lib/libldap4/spec/Makefile
index 6718d324a0..6718d324a0 100644
--- a/usr/src/lib/libldap4/spec/Makefile
+++ b/deleted_files/usr/src/lib/libldap4/spec/Makefile
diff --git a/usr/src/lib/libldap4/spec/Makefile.targ b/deleted_files/usr/src/lib/libldap4/spec/Makefile.targ
index 5642e0126f..5642e0126f 100644
--- a/usr/src/lib/libldap4/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libldap4/spec/Makefile.targ
diff --git a/usr/src/lib/libldap4/spec/amd64/Makefile b/deleted_files/usr/src/lib/libldap4/spec/amd64/Makefile
index d9dd978091..d9dd978091 100644
--- a/usr/src/lib/libldap4/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libldap4/spec/amd64/Makefile
diff --git a/usr/src/lib/libldap4/spec/i386/Makefile b/deleted_files/usr/src/lib/libldap4/spec/i386/Makefile
index 56982ab8a4..56982ab8a4 100644
--- a/usr/src/lib/libldap4/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libldap4/spec/i386/Makefile
diff --git a/usr/src/lib/libldap4/spec/ldap.spec b/deleted_files/usr/src/lib/libldap4/spec/ldap.spec
index c2c8ff4b89..c2c8ff4b89 100644
--- a/usr/src/lib/libldap4/spec/ldap.spec
+++ b/deleted_files/usr/src/lib/libldap4/spec/ldap.spec
diff --git a/usr/src/lib/libldap4/spec/sparc/Makefile b/deleted_files/usr/src/lib/libldap4/spec/sparc/Makefile
index 3d9a47c524..3d9a47c524 100644
--- a/usr/src/lib/libldap4/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libldap4/spec/sparc/Makefile
diff --git a/usr/src/lib/libldap4/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libldap4/spec/sparcv9/Makefile
index 29dfe75f94..29dfe75f94 100644
--- a/usr/src/lib/libldap4/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libldap4/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libldap4/spec/versions b/deleted_files/usr/src/lib/libldap4/spec/versions
index 04f28e32c1..04f28e32c1 100644
--- a/usr/src/lib/libldap4/spec/versions
+++ b/deleted_files/usr/src/lib/libldap4/spec/versions
diff --git a/usr/src/lib/libldap5/spec/Makefile b/deleted_files/usr/src/lib/libldap5/spec/Makefile
index 912373b065..912373b065 100644
--- a/usr/src/lib/libldap5/spec/Makefile
+++ b/deleted_files/usr/src/lib/libldap5/spec/Makefile
diff --git a/usr/src/lib/libldap5/spec/Makefile.targ b/deleted_files/usr/src/lib/libldap5/spec/Makefile.targ
index 909010a47d..909010a47d 100644
--- a/usr/src/lib/libldap5/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libldap5/spec/Makefile.targ
diff --git a/usr/src/lib/libldap5/spec/amd64/Makefile b/deleted_files/usr/src/lib/libldap5/spec/amd64/Makefile
index 96bda57a49..96bda57a49 100644
--- a/usr/src/lib/libldap5/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libldap5/spec/amd64/Makefile
diff --git a/usr/src/lib/libldap5/spec/i386/Makefile b/deleted_files/usr/src/lib/libldap5/spec/i386/Makefile
index c39e7707c6..c39e7707c6 100644
--- a/usr/src/lib/libldap5/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libldap5/spec/i386/Makefile
diff --git a/usr/src/lib/libldap5/spec/ldap.spec b/deleted_files/usr/src/lib/libldap5/spec/ldap.spec
index 387d97e53a..387d97e53a 100644
--- a/usr/src/lib/libldap5/spec/ldap.spec
+++ b/deleted_files/usr/src/lib/libldap5/spec/ldap.spec
diff --git a/usr/src/lib/libldap5/spec/sparc/Makefile b/deleted_files/usr/src/lib/libldap5/spec/sparc/Makefile
index 3d18cd8216..3d18cd8216 100644
--- a/usr/src/lib/libldap5/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libldap5/spec/sparc/Makefile
diff --git a/usr/src/lib/libldap5/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libldap5/spec/sparcv9/Makefile
index 90f05dd7d0..90f05dd7d0 100644
--- a/usr/src/lib/libldap5/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libldap5/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libldap5/spec/versions b/deleted_files/usr/src/lib/libldap5/spec/versions
index c78872899c..c78872899c 100644
--- a/usr/src/lib/libldap5/spec/versions
+++ b/deleted_files/usr/src/lib/libldap5/spec/versions
diff --git a/usr/src/lib/liblgrp/spec/Makefile b/deleted_files/usr/src/lib/liblgrp/spec/Makefile
index 4c7f99b71d..4c7f99b71d 100644
--- a/usr/src/lib/liblgrp/spec/Makefile
+++ b/deleted_files/usr/src/lib/liblgrp/spec/Makefile
diff --git a/usr/src/lib/liblgrp/spec/Makefile.targ b/deleted_files/usr/src/lib/liblgrp/spec/Makefile.targ
index d57b83fe96..d57b83fe96 100644
--- a/usr/src/lib/liblgrp/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/liblgrp/spec/Makefile.targ
diff --git a/usr/src/lib/liblgrp/spec/amd64/Makefile b/deleted_files/usr/src/lib/liblgrp/spec/amd64/Makefile
index 5dd1b7240f..5dd1b7240f 100644
--- a/usr/src/lib/liblgrp/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/liblgrp/spec/amd64/Makefile
diff --git a/usr/src/lib/liblgrp/spec/i386/Makefile b/deleted_files/usr/src/lib/liblgrp/spec/i386/Makefile
index d333544fbb..d333544fbb 100644
--- a/usr/src/lib/liblgrp/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/liblgrp/spec/i386/Makefile
diff --git a/usr/src/lib/liblgrp/spec/lgrp.spec b/deleted_files/usr/src/lib/liblgrp/spec/lgrp.spec
index 78e4302e03..78e4302e03 100644
--- a/usr/src/lib/liblgrp/spec/lgrp.spec
+++ b/deleted_files/usr/src/lib/liblgrp/spec/lgrp.spec
diff --git a/usr/src/lib/liblgrp/spec/sparc/Makefile b/deleted_files/usr/src/lib/liblgrp/spec/sparc/Makefile
index 1acb498d81..1acb498d81 100644
--- a/usr/src/lib/liblgrp/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/liblgrp/spec/sparc/Makefile
diff --git a/usr/src/lib/liblgrp/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/liblgrp/spec/sparcv9/Makefile
index 62244b89f2..62244b89f2 100644
--- a/usr/src/lib/liblgrp/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/liblgrp/spec/sparcv9/Makefile
diff --git a/usr/src/lib/liblgrp/spec/versions b/deleted_files/usr/src/lib/liblgrp/spec/versions
index c14c0409ee..c14c0409ee 100644
--- a/usr/src/lib/liblgrp/spec/versions
+++ b/deleted_files/usr/src/lib/liblgrp/spec/versions
diff --git a/usr/src/lib/liblm/spec/Makefile b/deleted_files/usr/src/lib/liblm/spec/Makefile
index 354eccbafa..354eccbafa 100644
--- a/usr/src/lib/liblm/spec/Makefile
+++ b/deleted_files/usr/src/lib/liblm/spec/Makefile
diff --git a/usr/src/lib/liblm/spec/Makefile.targ b/deleted_files/usr/src/lib/liblm/spec/Makefile.targ
index 01cc7e5365..01cc7e5365 100644
--- a/usr/src/lib/liblm/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/liblm/spec/Makefile.targ
diff --git a/usr/src/lib/liblm/spec/amd64/Makefile b/deleted_files/usr/src/lib/liblm/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/liblm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/liblm/spec/amd64/Makefile
diff --git a/usr/src/lib/liblm/spec/i386/Makefile b/deleted_files/usr/src/lib/liblm/spec/i386/Makefile
index 8f3a978cdf..8f3a978cdf 100644
--- a/usr/src/lib/liblm/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/liblm/spec/i386/Makefile
diff --git a/usr/src/lib/liblm/spec/lm.spec b/deleted_files/usr/src/lib/liblm/spec/lm.spec
index c322a5da96..c322a5da96 100644
--- a/usr/src/lib/liblm/spec/lm.spec
+++ b/deleted_files/usr/src/lib/liblm/spec/lm.spec
diff --git a/usr/src/lib/liblm/spec/sparc/Makefile b/deleted_files/usr/src/lib/liblm/spec/sparc/Makefile
index b4ce2de6db..b4ce2de6db 100644
--- a/usr/src/lib/liblm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/liblm/spec/sparc/Makefile
diff --git a/usr/src/lib/liblm/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/liblm/spec/sparcv9/Makefile
index b43f94d92a..b43f94d92a 100644
--- a/usr/src/lib/liblm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/liblm/spec/sparcv9/Makefile
diff --git a/usr/src/lib/liblm/spec/versions b/deleted_files/usr/src/lib/liblm/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/liblm/spec/versions
+++ b/deleted_files/usr/src/lib/liblm/spec/versions
diff --git a/usr/src/lib/libmacadm/spec/Makefile b/deleted_files/usr/src/lib/libmacadm/spec/Makefile
index 53fbd3ad4b..53fbd3ad4b 100644
--- a/usr/src/lib/libmacadm/spec/Makefile
+++ b/deleted_files/usr/src/lib/libmacadm/spec/Makefile
diff --git a/usr/src/lib/libmacadm/spec/Makefile.targ b/deleted_files/usr/src/lib/libmacadm/spec/Makefile.targ
index 7508c2160e..7508c2160e 100644
--- a/usr/src/lib/libmacadm/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libmacadm/spec/Makefile.targ
diff --git a/usr/src/lib/libmacadm/spec/amd64/Makefile b/deleted_files/usr/src/lib/libmacadm/spec/amd64/Makefile
index af603444ad..af603444ad 100644
--- a/usr/src/lib/libmacadm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libmacadm/spec/amd64/Makefile
diff --git a/usr/src/lib/libmacadm/spec/i386/Makefile b/deleted_files/usr/src/lib/libmacadm/spec/i386/Makefile
index 0a770cb926..0a770cb926 100644
--- a/usr/src/lib/libmacadm/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libmacadm/spec/i386/Makefile
diff --git a/usr/src/lib/libmacadm/spec/macadm.spec b/deleted_files/usr/src/lib/libmacadm/spec/macadm.spec
index 32cbe46145..32cbe46145 100644
--- a/usr/src/lib/libmacadm/spec/macadm.spec
+++ b/deleted_files/usr/src/lib/libmacadm/spec/macadm.spec
diff --git a/usr/src/lib/libmacadm/spec/sparc/Makefile b/deleted_files/usr/src/lib/libmacadm/spec/sparc/Makefile
index 0a770cb926..0a770cb926 100644
--- a/usr/src/lib/libmacadm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libmacadm/spec/sparc/Makefile
diff --git a/usr/src/lib/libmacadm/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libmacadm/spec/sparcv9/Makefile
index f1868eaa18..f1868eaa18 100644
--- a/usr/src/lib/libmacadm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libmacadm/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libmacadm/spec/versions b/deleted_files/usr/src/lib/libmacadm/spec/versions
index 60672092ef..60672092ef 100644
--- a/usr/src/lib/libmacadm/spec/versions
+++ b/deleted_files/usr/src/lib/libmacadm/spec/versions
diff --git a/usr/src/lib/libmail/spec/Makefile b/deleted_files/usr/src/lib/libmail/spec/Makefile
index 62af484744..62af484744 100644
--- a/usr/src/lib/libmail/spec/Makefile
+++ b/deleted_files/usr/src/lib/libmail/spec/Makefile
diff --git a/usr/src/lib/libmail/spec/Makefile.targ b/deleted_files/usr/src/lib/libmail/spec/Makefile.targ
index 56e7ce4f20..56e7ce4f20 100644
--- a/usr/src/lib/libmail/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libmail/spec/Makefile.targ
diff --git a/usr/src/lib/libmail/spec/amd64/Makefile b/deleted_files/usr/src/lib/libmail/spec/amd64/Makefile
index d334868181..d334868181 100644
--- a/usr/src/lib/libmail/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libmail/spec/amd64/Makefile
diff --git a/usr/src/lib/libmail/spec/i386/Makefile b/deleted_files/usr/src/lib/libmail/spec/i386/Makefile
index b52967dd4d..b52967dd4d 100644
--- a/usr/src/lib/libmail/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libmail/spec/i386/Makefile
diff --git a/usr/src/lib/libmail/spec/mail.spec b/deleted_files/usr/src/lib/libmail/spec/mail.spec
index b6f96cf54d..b6f96cf54d 100644
--- a/usr/src/lib/libmail/spec/mail.spec
+++ b/deleted_files/usr/src/lib/libmail/spec/mail.spec
diff --git a/usr/src/lib/libmail/spec/sparc/Makefile b/deleted_files/usr/src/lib/libmail/spec/sparc/Makefile
index dfa6699b45..dfa6699b45 100644
--- a/usr/src/lib/libmail/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libmail/spec/sparc/Makefile
diff --git a/usr/src/lib/libmail/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libmail/spec/sparcv9/Makefile
index 587fa638cb..587fa638cb 100644
--- a/usr/src/lib/libmail/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libmail/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libmail/spec/versions b/deleted_files/usr/src/lib/libmail/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libmail/spec/versions
+++ b/deleted_files/usr/src/lib/libmail/spec/versions
diff --git a/usr/src/lib/libmalloc/spec/Makefile b/deleted_files/usr/src/lib/libmalloc/spec/Makefile
index 8f0318ff3f..8f0318ff3f 100644
--- a/usr/src/lib/libmalloc/spec/Makefile
+++ b/deleted_files/usr/src/lib/libmalloc/spec/Makefile
diff --git a/usr/src/lib/libmalloc/spec/Makefile.targ b/deleted_files/usr/src/lib/libmalloc/spec/Makefile.targ
index 632b71c117..632b71c117 100644
--- a/usr/src/lib/libmalloc/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libmalloc/spec/Makefile.targ
diff --git a/usr/src/lib/libmalloc/spec/amd64/Makefile b/deleted_files/usr/src/lib/libmalloc/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libmalloc/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libmalloc/spec/amd64/Makefile
diff --git a/usr/src/lib/libmalloc/spec/i386/Makefile b/deleted_files/usr/src/lib/libmalloc/spec/i386/Makefile
index da4f5ca90b..da4f5ca90b 100644
--- a/usr/src/lib/libmalloc/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libmalloc/spec/i386/Makefile
diff --git a/usr/src/lib/libmalloc/spec/malloc.spec b/deleted_files/usr/src/lib/libmalloc/spec/malloc.spec
index 579ecbcd9e..579ecbcd9e 100644
--- a/usr/src/lib/libmalloc/spec/malloc.spec
+++ b/deleted_files/usr/src/lib/libmalloc/spec/malloc.spec
diff --git a/usr/src/lib/libmalloc/spec/sparc/Makefile b/deleted_files/usr/src/lib/libmalloc/spec/sparc/Makefile
index 90145115fc..90145115fc 100644
--- a/usr/src/lib/libmalloc/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libmalloc/spec/sparc/Makefile
diff --git a/usr/src/lib/libmalloc/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libmalloc/spec/sparcv9/Makefile
index e58792b19d..e58792b19d 100644
--- a/usr/src/lib/libmalloc/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libmalloc/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libmalloc/spec/versions b/deleted_files/usr/src/lib/libmalloc/spec/versions
index aa4d8b22ee..aa4d8b22ee 100644
--- a/usr/src/lib/libmalloc/spec/versions
+++ b/deleted_files/usr/src/lib/libmalloc/spec/versions
diff --git a/usr/src/lib/libmapid/spec/Makefile b/deleted_files/usr/src/lib/libmapid/spec/Makefile
index 17689ea886..17689ea886 100644
--- a/usr/src/lib/libmapid/spec/Makefile
+++ b/deleted_files/usr/src/lib/libmapid/spec/Makefile
diff --git a/usr/src/lib/libmapid/spec/Makefile.targ b/deleted_files/usr/src/lib/libmapid/spec/Makefile.targ
index f8d074e5dc..f8d074e5dc 100644
--- a/usr/src/lib/libmapid/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libmapid/spec/Makefile.targ
diff --git a/usr/src/lib/libmapid/spec/i386/Makefile b/deleted_files/usr/src/lib/libmapid/spec/i386/Makefile
index eea4352b2d..eea4352b2d 100644
--- a/usr/src/lib/libmapid/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libmapid/spec/i386/Makefile
diff --git a/usr/src/lib/libmapid/spec/mapid.spec b/deleted_files/usr/src/lib/libmapid/spec/mapid.spec
index b5176dc047..b5176dc047 100644
--- a/usr/src/lib/libmapid/spec/mapid.spec
+++ b/deleted_files/usr/src/lib/libmapid/spec/mapid.spec
diff --git a/usr/src/lib/libmapid/spec/sparc/Makefile b/deleted_files/usr/src/lib/libmapid/spec/sparc/Makefile
index eea4352b2d..eea4352b2d 100644
--- a/usr/src/lib/libmapid/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libmapid/spec/sparc/Makefile
diff --git a/usr/src/lib/libmapid/spec/versions b/deleted_files/usr/src/lib/libmapid/spec/versions
index 08681460bf..08681460bf 100644
--- a/usr/src/lib/libmapid/spec/versions
+++ b/deleted_files/usr/src/lib/libmapid/spec/versions
diff --git a/usr/src/lib/libmapmalloc/spec/Makefile b/deleted_files/usr/src/lib/libmapmalloc/spec/Makefile
index 199af00347..199af00347 100644
--- a/usr/src/lib/libmapmalloc/spec/Makefile
+++ b/deleted_files/usr/src/lib/libmapmalloc/spec/Makefile
diff --git a/usr/src/lib/libmapmalloc/spec/Makefile.targ b/deleted_files/usr/src/lib/libmapmalloc/spec/Makefile.targ
index 856510644c..856510644c 100644
--- a/usr/src/lib/libmapmalloc/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libmapmalloc/spec/Makefile.targ
diff --git a/usr/src/lib/libmapmalloc/spec/amd64/Makefile b/deleted_files/usr/src/lib/libmapmalloc/spec/amd64/Makefile
index 47aa59af67..47aa59af67 100644
--- a/usr/src/lib/libmapmalloc/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libmapmalloc/spec/amd64/Makefile
diff --git a/usr/src/lib/libmapmalloc/spec/i386/Makefile b/deleted_files/usr/src/lib/libmapmalloc/spec/i386/Makefile
index e5cf096471..e5cf096471 100644
--- a/usr/src/lib/libmapmalloc/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libmapmalloc/spec/i386/Makefile
diff --git a/usr/src/lib/libmapmalloc/spec/mapmalloc.spec b/deleted_files/usr/src/lib/libmapmalloc/spec/mapmalloc.spec
index fe433cd09c..fe433cd09c 100644
--- a/usr/src/lib/libmapmalloc/spec/mapmalloc.spec
+++ b/deleted_files/usr/src/lib/libmapmalloc/spec/mapmalloc.spec
diff --git a/usr/src/lib/libmapmalloc/spec/sparc/Makefile b/deleted_files/usr/src/lib/libmapmalloc/spec/sparc/Makefile
index 3ed6f4b565..3ed6f4b565 100644
--- a/usr/src/lib/libmapmalloc/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libmapmalloc/spec/sparc/Makefile
diff --git a/usr/src/lib/libmapmalloc/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libmapmalloc/spec/sparcv9/Makefile
index ecf35cd331..ecf35cd331 100644
--- a/usr/src/lib/libmapmalloc/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libmapmalloc/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libmapmalloc/spec/versions b/deleted_files/usr/src/lib/libmapmalloc/spec/versions
index 2fed5f1c60..2fed5f1c60 100644
--- a/usr/src/lib/libmapmalloc/spec/versions
+++ b/deleted_files/usr/src/lib/libmapmalloc/spec/versions
diff --git a/usr/src/lib/libmd/spec/Makefile b/deleted_files/usr/src/lib/libmd/spec/Makefile
index 98e4eb2a33..98e4eb2a33 100644
--- a/usr/src/lib/libmd/spec/Makefile
+++ b/deleted_files/usr/src/lib/libmd/spec/Makefile
diff --git a/usr/src/lib/libmd/spec/Makefile.targ b/deleted_files/usr/src/lib/libmd/spec/Makefile.targ
index 6f966d7486..6f966d7486 100644
--- a/usr/src/lib/libmd/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libmd/spec/Makefile.targ
diff --git a/usr/src/lib/libmd/spec/amd64/Makefile b/deleted_files/usr/src/lib/libmd/spec/amd64/Makefile
index a474b4b09b..a474b4b09b 100644
--- a/usr/src/lib/libmd/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libmd/spec/amd64/Makefile
diff --git a/usr/src/lib/libmd/spec/i386/Makefile b/deleted_files/usr/src/lib/libmd/spec/i386/Makefile
index 4dd0d6208e..4dd0d6208e 100644
--- a/usr/src/lib/libmd/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libmd/spec/i386/Makefile
diff --git a/usr/src/lib/libmd/spec/md.spec b/deleted_files/usr/src/lib/libmd/spec/md.spec
index 7fc227873e..7fc227873e 100644
--- a/usr/src/lib/libmd/spec/md.spec
+++ b/deleted_files/usr/src/lib/libmd/spec/md.spec
diff --git a/usr/src/lib/libmd/spec/sparc/Makefile b/deleted_files/usr/src/lib/libmd/spec/sparc/Makefile
index b03a759294..b03a759294 100644
--- a/usr/src/lib/libmd/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libmd/spec/sparc/Makefile
diff --git a/usr/src/lib/libmd/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libmd/spec/sparcv9/Makefile
index b8c5ba76bb..b8c5ba76bb 100644
--- a/usr/src/lib/libmd/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libmd/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libmd/spec/versions b/deleted_files/usr/src/lib/libmd/spec/versions
index 5bfbaae1ed..5bfbaae1ed 100644
--- a/usr/src/lib/libmd/spec/versions
+++ b/deleted_files/usr/src/lib/libmd/spec/versions
diff --git a/usr/src/lib/libmp/spec/Makefile b/deleted_files/usr/src/lib/libmp/spec/Makefile
index a2bc21cb32..a2bc21cb32 100644
--- a/usr/src/lib/libmp/spec/Makefile
+++ b/deleted_files/usr/src/lib/libmp/spec/Makefile
diff --git a/usr/src/lib/libmp/spec/Makefile.targ b/deleted_files/usr/src/lib/libmp/spec/Makefile.targ
index 25efb1cb19..25efb1cb19 100644
--- a/usr/src/lib/libmp/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libmp/spec/Makefile.targ
diff --git a/usr/src/lib/libmp/spec/amd64/Makefile b/deleted_files/usr/src/lib/libmp/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libmp/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libmp/spec/amd64/Makefile
diff --git a/usr/src/lib/libmp/spec/i386/Makefile b/deleted_files/usr/src/lib/libmp/spec/i386/Makefile
index 4114777cf0..4114777cf0 100644
--- a/usr/src/lib/libmp/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libmp/spec/i386/Makefile
diff --git a/usr/src/lib/libmp/spec/mp.spec b/deleted_files/usr/src/lib/libmp/spec/mp.spec
index a2d790b22f..a2d790b22f 100644
--- a/usr/src/lib/libmp/spec/mp.spec
+++ b/deleted_files/usr/src/lib/libmp/spec/mp.spec
diff --git a/usr/src/lib/libmp/spec/mp_1.spec b/deleted_files/usr/src/lib/libmp/spec/mp_1.spec
index 14dd60b257..14dd60b257 100644
--- a/usr/src/lib/libmp/spec/mp_1.spec
+++ b/deleted_files/usr/src/lib/libmp/spec/mp_1.spec
diff --git a/usr/src/lib/libmp/spec/sparc/Makefile b/deleted_files/usr/src/lib/libmp/spec/sparc/Makefile
index 605df92b13..605df92b13 100644
--- a/usr/src/lib/libmp/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libmp/spec/sparc/Makefile
diff --git a/usr/src/lib/libmp/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libmp/spec/sparcv9/Makefile
index e06d4e2b81..e06d4e2b81 100644
--- a/usr/src/lib/libmp/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libmp/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libmp/spec/versions b/deleted_files/usr/src/lib/libmp/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libmp/spec/versions
+++ b/deleted_files/usr/src/lib/libmp/spec/versions
diff --git a/usr/src/lib/libmtmalloc/spec/Makefile b/deleted_files/usr/src/lib/libmtmalloc/spec/Makefile
index 736aa6fbe5..736aa6fbe5 100644
--- a/usr/src/lib/libmtmalloc/spec/Makefile
+++ b/deleted_files/usr/src/lib/libmtmalloc/spec/Makefile
diff --git a/usr/src/lib/libmtmalloc/spec/Makefile.targ b/deleted_files/usr/src/lib/libmtmalloc/spec/Makefile.targ
index bb17aa1aff..bb17aa1aff 100644
--- a/usr/src/lib/libmtmalloc/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libmtmalloc/spec/Makefile.targ
diff --git a/usr/src/lib/libmtmalloc/spec/amd64/Makefile b/deleted_files/usr/src/lib/libmtmalloc/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libmtmalloc/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libmtmalloc/spec/amd64/Makefile
diff --git a/usr/src/lib/libmtmalloc/spec/i386/Makefile b/deleted_files/usr/src/lib/libmtmalloc/spec/i386/Makefile
index c55d7fd334..c55d7fd334 100644
--- a/usr/src/lib/libmtmalloc/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libmtmalloc/spec/i386/Makefile
diff --git a/usr/src/lib/libmtmalloc/spec/mtmalloc.spec b/deleted_files/usr/src/lib/libmtmalloc/spec/mtmalloc.spec
index f0e68678a1..f0e68678a1 100644
--- a/usr/src/lib/libmtmalloc/spec/mtmalloc.spec
+++ b/deleted_files/usr/src/lib/libmtmalloc/spec/mtmalloc.spec
diff --git a/usr/src/lib/libmtmalloc/spec/sparc/Makefile b/deleted_files/usr/src/lib/libmtmalloc/spec/sparc/Makefile
index 63851270f7..63851270f7 100644
--- a/usr/src/lib/libmtmalloc/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libmtmalloc/spec/sparc/Makefile
diff --git a/usr/src/lib/libmtmalloc/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libmtmalloc/spec/sparcv9/Makefile
index f66826636c..f66826636c 100644
--- a/usr/src/lib/libmtmalloc/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libmtmalloc/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libmtmalloc/spec/versions b/deleted_files/usr/src/lib/libmtmalloc/spec/versions
index 2c005c8fcc..2c005c8fcc 100644
--- a/usr/src/lib/libmtmalloc/spec/versions
+++ b/deleted_files/usr/src/lib/libmtmalloc/spec/versions
diff --git a/usr/src/lib/libnisdb/spec/Makefile b/deleted_files/usr/src/lib/libnisdb/spec/Makefile
index 525358c817..525358c817 100644
--- a/usr/src/lib/libnisdb/spec/Makefile
+++ b/deleted_files/usr/src/lib/libnisdb/spec/Makefile
diff --git a/usr/src/lib/libnisdb/spec/Makefile.targ b/deleted_files/usr/src/lib/libnisdb/spec/Makefile.targ
index 23691797f4..23691797f4 100644
--- a/usr/src/lib/libnisdb/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libnisdb/spec/Makefile.targ
diff --git a/usr/src/lib/libnisdb/spec/amd64/Makefile b/deleted_files/usr/src/lib/libnisdb/spec/amd64/Makefile
index 5dd1b7240f..5dd1b7240f 100644
--- a/usr/src/lib/libnisdb/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libnisdb/spec/amd64/Makefile
diff --git a/usr/src/lib/libnisdb/spec/i386/Makefile b/deleted_files/usr/src/lib/libnisdb/spec/i386/Makefile
index 661a0df715..661a0df715 100644
--- a/usr/src/lib/libnisdb/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libnisdb/spec/i386/Makefile
diff --git a/usr/src/lib/libnisdb/spec/nisdb.spec b/deleted_files/usr/src/lib/libnisdb/spec/nisdb.spec
index 68d630f71d..68d630f71d 100644
--- a/usr/src/lib/libnisdb/spec/nisdb.spec
+++ b/deleted_files/usr/src/lib/libnisdb/spec/nisdb.spec
diff --git a/usr/src/lib/libnisdb/spec/sparc/Makefile b/deleted_files/usr/src/lib/libnisdb/spec/sparc/Makefile
index a161b46ee7..a161b46ee7 100644
--- a/usr/src/lib/libnisdb/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libnisdb/spec/sparc/Makefile
diff --git a/usr/src/lib/libnisdb/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libnisdb/spec/sparcv9/Makefile
index a93fefe2e9..a93fefe2e9 100644
--- a/usr/src/lib/libnisdb/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libnisdb/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libnisdb/spec/versions b/deleted_files/usr/src/lib/libnisdb/spec/versions
index 3438f267a7..3438f267a7 100644
--- a/usr/src/lib/libnisdb/spec/versions
+++ b/deleted_files/usr/src/lib/libnisdb/spec/versions
diff --git a/usr/src/lib/libnls/spec/Makefile b/deleted_files/usr/src/lib/libnls/spec/Makefile
index 440aa5d46d..440aa5d46d 100644
--- a/usr/src/lib/libnls/spec/Makefile
+++ b/deleted_files/usr/src/lib/libnls/spec/Makefile
diff --git a/usr/src/lib/libnls/spec/Makefile.targ b/deleted_files/usr/src/lib/libnls/spec/Makefile.targ
index a425f94e50..a425f94e50 100644
--- a/usr/src/lib/libnls/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libnls/spec/Makefile.targ
diff --git a/usr/src/lib/libnls/spec/amd64/Makefile b/deleted_files/usr/src/lib/libnls/spec/amd64/Makefile
index a1ab35dfb4..a1ab35dfb4 100644
--- a/usr/src/lib/libnls/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libnls/spec/amd64/Makefile
diff --git a/usr/src/lib/libnls/spec/i386/Makefile b/deleted_files/usr/src/lib/libnls/spec/i386/Makefile
index c7c14867b3..c7c14867b3 100644
--- a/usr/src/lib/libnls/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libnls/spec/i386/Makefile
diff --git a/usr/src/lib/libnls/spec/nls.spec b/deleted_files/usr/src/lib/libnls/spec/nls.spec
index a494450df9..a494450df9 100644
--- a/usr/src/lib/libnls/spec/nls.spec
+++ b/deleted_files/usr/src/lib/libnls/spec/nls.spec
diff --git a/usr/src/lib/libnls/spec/sparc/Makefile b/deleted_files/usr/src/lib/libnls/spec/sparc/Makefile
index c7c14867b3..c7c14867b3 100644
--- a/usr/src/lib/libnls/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libnls/spec/sparc/Makefile
diff --git a/usr/src/lib/libnls/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libnls/spec/sparcv9/Makefile
index 81d78b5cb2..81d78b5cb2 100644
--- a/usr/src/lib/libnls/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libnls/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libnls/spec/versions b/deleted_files/usr/src/lib/libnls/spec/versions
index 7b49152118..7b49152118 100644
--- a/usr/src/lib/libnls/spec/versions
+++ b/deleted_files/usr/src/lib/libnls/spec/versions
diff --git a/usr/src/lib/libnsl/spec/Makefile b/deleted_files/usr/src/lib/libnsl/spec/Makefile
index 2efaab68bf..2efaab68bf 100644
--- a/usr/src/lib/libnsl/spec/Makefile
+++ b/deleted_files/usr/src/lib/libnsl/spec/Makefile
diff --git a/usr/src/lib/libnsl/spec/Makefile.targ b/deleted_files/usr/src/lib/libnsl/spec/Makefile.targ
index 3aaba06a6b..3aaba06a6b 100644
--- a/usr/src/lib/libnsl/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libnsl/spec/Makefile.targ
diff --git a/usr/src/lib/libnsl/spec/amd64/Makefile b/deleted_files/usr/src/lib/libnsl/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libnsl/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libnsl/spec/amd64/Makefile
diff --git a/usr/src/lib/libnsl/spec/des.spec b/deleted_files/usr/src/lib/libnsl/spec/des.spec
index 413b397324..413b397324 100644
--- a/usr/src/lib/libnsl/spec/des.spec
+++ b/deleted_files/usr/src/lib/libnsl/spec/des.spec
diff --git a/usr/src/lib/libnsl/spec/dial.spec b/deleted_files/usr/src/lib/libnsl/spec/dial.spec
index ab010e9a9d..ab010e9a9d 100644
--- a/usr/src/lib/libnsl/spec/dial.spec
+++ b/deleted_files/usr/src/lib/libnsl/spec/dial.spec
diff --git a/usr/src/lib/libnsl/spec/i386/Makefile b/deleted_files/usr/src/lib/libnsl/spec/i386/Makefile
index 406cb811a9..406cb811a9 100644
--- a/usr/src/lib/libnsl/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libnsl/spec/i386/Makefile
diff --git a/usr/src/lib/libnsl/spec/inet.spec b/deleted_files/usr/src/lib/libnsl/spec/inet.spec
index 0010ed0368..0010ed0368 100644
--- a/usr/src/lib/libnsl/spec/inet.spec
+++ b/deleted_files/usr/src/lib/libnsl/spec/inet.spec
diff --git a/usr/src/lib/libnsl/spec/ipsec.spec b/deleted_files/usr/src/lib/libnsl/spec/ipsec.spec
index 50fa227ec1..50fa227ec1 100644
--- a/usr/src/lib/libnsl/spec/ipsec.spec
+++ b/deleted_files/usr/src/lib/libnsl/spec/ipsec.spec
diff --git a/usr/src/lib/libnsl/spec/netdir.spec b/deleted_files/usr/src/lib/libnsl/spec/netdir.spec
index 22402600a4..22402600a4 100644
--- a/usr/src/lib/libnsl/spec/netdir.spec
+++ b/deleted_files/usr/src/lib/libnsl/spec/netdir.spec
diff --git a/usr/src/lib/libnsl/spec/nis.spec b/deleted_files/usr/src/lib/libnsl/spec/nis.spec
index f43b5428e4..f43b5428e4 100644
--- a/usr/src/lib/libnsl/spec/nis.spec
+++ b/deleted_files/usr/src/lib/libnsl/spec/nis.spec
diff --git a/usr/src/lib/libnsl/spec/nsl.spec b/deleted_files/usr/src/lib/libnsl/spec/nsl.spec
index 5b3cda708e..5b3cda708e 100644
--- a/usr/src/lib/libnsl/spec/nsl.spec
+++ b/deleted_files/usr/src/lib/libnsl/spec/nsl.spec
diff --git a/usr/src/lib/libnsl/spec/private.spec b/deleted_files/usr/src/lib/libnsl/spec/private.spec
index 85c5ce9ef9..85c5ce9ef9 100644
--- a/usr/src/lib/libnsl/spec/private.spec
+++ b/deleted_files/usr/src/lib/libnsl/spec/private.spec
diff --git a/usr/src/lib/libnsl/spec/rpc.spec b/deleted_files/usr/src/lib/libnsl/spec/rpc.spec
index 2bb4f6067c..2bb4f6067c 100644
--- a/usr/src/lib/libnsl/spec/rpc.spec
+++ b/deleted_files/usr/src/lib/libnsl/spec/rpc.spec
diff --git a/usr/src/lib/libnsl/spec/sparc/Makefile b/deleted_files/usr/src/lib/libnsl/spec/sparc/Makefile
index 113928a7d0..113928a7d0 100644
--- a/usr/src/lib/libnsl/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libnsl/spec/sparc/Makefile
diff --git a/usr/src/lib/libnsl/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libnsl/spec/sparcv9/Makefile
index d21c0426f5..d21c0426f5 100644
--- a/usr/src/lib/libnsl/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libnsl/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libnsl/spec/tli.spec b/deleted_files/usr/src/lib/libnsl/spec/tli.spec
index 07caa8c2df..07caa8c2df 100644
--- a/usr/src/lib/libnsl/spec/tli.spec
+++ b/deleted_files/usr/src/lib/libnsl/spec/tli.spec
diff --git a/usr/src/lib/libnsl/spec/versions b/deleted_files/usr/src/lib/libnsl/spec/versions
index adf4dd7fe7..adf4dd7fe7 100644
--- a/usr/src/lib/libnsl/spec/versions
+++ b/deleted_files/usr/src/lib/libnsl/spec/versions
diff --git a/usr/src/lib/libnsl/spec/xdr.spec b/deleted_files/usr/src/lib/libnsl/spec/xdr.spec
index 62d3f47986..62d3f47986 100644
--- a/usr/src/lib/libnsl/spec/xdr.spec
+++ b/deleted_files/usr/src/lib/libnsl/spec/xdr.spec
diff --git a/usr/src/lib/libnsl/spec/xti.spec b/deleted_files/usr/src/lib/libnsl/spec/xti.spec
index 7245c98948..7245c98948 100644
--- a/usr/src/lib/libnsl/spec/xti.spec
+++ b/deleted_files/usr/src/lib/libnsl/spec/xti.spec
diff --git a/usr/src/lib/libnsl/spec/yp.spec b/deleted_files/usr/src/lib/libnsl/spec/yp.spec
index 8c3a39af3d..8c3a39af3d 100644
--- a/usr/src/lib/libnsl/spec/yp.spec
+++ b/deleted_files/usr/src/lib/libnsl/spec/yp.spec
diff --git a/usr/src/lib/libnvpair/spec/Makefile b/deleted_files/usr/src/lib/libnvpair/spec/Makefile
index 5c6b2f57b7..5c6b2f57b7 100644
--- a/usr/src/lib/libnvpair/spec/Makefile
+++ b/deleted_files/usr/src/lib/libnvpair/spec/Makefile
diff --git a/usr/src/lib/libnvpair/spec/Makefile.targ b/deleted_files/usr/src/lib/libnvpair/spec/Makefile.targ
index e10236057a..e10236057a 100644
--- a/usr/src/lib/libnvpair/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libnvpair/spec/Makefile.targ
diff --git a/usr/src/lib/libnvpair/spec/amd64/Makefile b/deleted_files/usr/src/lib/libnvpair/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libnvpair/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libnvpair/spec/amd64/Makefile
diff --git a/usr/src/lib/libnvpair/spec/i386/Makefile b/deleted_files/usr/src/lib/libnvpair/spec/i386/Makefile
index b841b87a38..b841b87a38 100644
--- a/usr/src/lib/libnvpair/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libnvpair/spec/i386/Makefile
diff --git a/usr/src/lib/libnvpair/spec/nvpair.spec b/deleted_files/usr/src/lib/libnvpair/spec/nvpair.spec
index 91a63b7283..91a63b7283 100644
--- a/usr/src/lib/libnvpair/spec/nvpair.spec
+++ b/deleted_files/usr/src/lib/libnvpair/spec/nvpair.spec
diff --git a/usr/src/lib/libnvpair/spec/sparc/Makefile b/deleted_files/usr/src/lib/libnvpair/spec/sparc/Makefile
index 449e83e1ee..449e83e1ee 100644
--- a/usr/src/lib/libnvpair/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libnvpair/spec/sparc/Makefile
diff --git a/usr/src/lib/libnvpair/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libnvpair/spec/sparcv9/Makefile
index c2d56769e8..c2d56769e8 100644
--- a/usr/src/lib/libnvpair/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libnvpair/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libnvpair/spec/versions b/deleted_files/usr/src/lib/libnvpair/spec/versions
index 956b4e7a99..956b4e7a99 100644
--- a/usr/src/lib/libnvpair/spec/versions
+++ b/deleted_files/usr/src/lib/libnvpair/spec/versions
diff --git a/usr/src/lib/libpam/spec/Makefile b/deleted_files/usr/src/lib/libpam/spec/Makefile
index 4b45cfd46f..4b45cfd46f 100644
--- a/usr/src/lib/libpam/spec/Makefile
+++ b/deleted_files/usr/src/lib/libpam/spec/Makefile
diff --git a/usr/src/lib/libpam/spec/Makefile.targ b/deleted_files/usr/src/lib/libpam/spec/Makefile.targ
index b73c33f4f5..b73c33f4f5 100644
--- a/usr/src/lib/libpam/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libpam/spec/Makefile.targ
diff --git a/usr/src/lib/libpam/spec/amd64/Makefile b/deleted_files/usr/src/lib/libpam/spec/amd64/Makefile
index a7f7707a18..a7f7707a18 100644
--- a/usr/src/lib/libpam/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libpam/spec/amd64/Makefile
diff --git a/usr/src/lib/libpam/spec/i386/Makefile b/deleted_files/usr/src/lib/libpam/spec/i386/Makefile
index e62c057a5b..e62c057a5b 100644
--- a/usr/src/lib/libpam/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libpam/spec/i386/Makefile
diff --git a/usr/src/lib/libpam/spec/pam.spec b/deleted_files/usr/src/lib/libpam/spec/pam.spec
index 52c8e8fec1..52c8e8fec1 100644
--- a/usr/src/lib/libpam/spec/pam.spec
+++ b/deleted_files/usr/src/lib/libpam/spec/pam.spec
diff --git a/usr/src/lib/libpam/spec/sparc/Makefile b/deleted_files/usr/src/lib/libpam/spec/sparc/Makefile
index 06d7dbe2eb..06d7dbe2eb 100644
--- a/usr/src/lib/libpam/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libpam/spec/sparc/Makefile
diff --git a/usr/src/lib/libpam/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libpam/spec/sparcv9/Makefile
index abcd19e54e..abcd19e54e 100644
--- a/usr/src/lib/libpam/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libpam/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libpam/spec/versions b/deleted_files/usr/src/lib/libpam/spec/versions
index e52e3b6279..e52e3b6279 100644
--- a/usr/src/lib/libpam/spec/versions
+++ b/deleted_files/usr/src/lib/libpam/spec/versions
diff --git a/usr/src/lib/libpctx/spec/Makefile b/deleted_files/usr/src/lib/libpctx/spec/Makefile
index dcb189f23a..dcb189f23a 100644
--- a/usr/src/lib/libpctx/spec/Makefile
+++ b/deleted_files/usr/src/lib/libpctx/spec/Makefile
diff --git a/usr/src/lib/libpctx/spec/Makefile.targ b/deleted_files/usr/src/lib/libpctx/spec/Makefile.targ
index b8b0adf71c..b8b0adf71c 100644
--- a/usr/src/lib/libpctx/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libpctx/spec/Makefile.targ
diff --git a/usr/src/lib/libpctx/spec/amd64/Makefile b/deleted_files/usr/src/lib/libpctx/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libpctx/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libpctx/spec/amd64/Makefile
diff --git a/usr/src/lib/libpctx/spec/i386/Makefile b/deleted_files/usr/src/lib/libpctx/spec/i386/Makefile
index d61fe4f625..d61fe4f625 100644
--- a/usr/src/lib/libpctx/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libpctx/spec/i386/Makefile
diff --git a/usr/src/lib/libpctx/spec/pctx.spec b/deleted_files/usr/src/lib/libpctx/spec/pctx.spec
index e2c6054fc8..e2c6054fc8 100644
--- a/usr/src/lib/libpctx/spec/pctx.spec
+++ b/deleted_files/usr/src/lib/libpctx/spec/pctx.spec
diff --git a/usr/src/lib/libpctx/spec/sparc/Makefile b/deleted_files/usr/src/lib/libpctx/spec/sparc/Makefile
index 94839b26c8..94839b26c8 100644
--- a/usr/src/lib/libpctx/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libpctx/spec/sparc/Makefile
diff --git a/usr/src/lib/libpctx/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libpctx/spec/sparcv9/Makefile
index 655b03f97d..655b03f97d 100644
--- a/usr/src/lib/libpctx/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libpctx/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libpctx/spec/versions b/deleted_files/usr/src/lib/libpctx/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libpctx/spec/versions
+++ b/deleted_files/usr/src/lib/libpctx/spec/versions
diff --git a/usr/src/lib/libpicl/spec/Makefile b/deleted_files/usr/src/lib/libpicl/spec/Makefile
index b9a7ca757e..b9a7ca757e 100644
--- a/usr/src/lib/libpicl/spec/Makefile
+++ b/deleted_files/usr/src/lib/libpicl/spec/Makefile
diff --git a/usr/src/lib/libpicl/spec/Makefile.targ b/deleted_files/usr/src/lib/libpicl/spec/Makefile.targ
index 66b462cfe2..66b462cfe2 100644
--- a/usr/src/lib/libpicl/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libpicl/spec/Makefile.targ
diff --git a/usr/src/lib/libpicl/spec/amd64/Makefile b/deleted_files/usr/src/lib/libpicl/spec/amd64/Makefile
index 63f2fed1b9..63f2fed1b9 100644
--- a/usr/src/lib/libpicl/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libpicl/spec/amd64/Makefile
diff --git a/usr/src/lib/libpicl/spec/i386/Makefile b/deleted_files/usr/src/lib/libpicl/spec/i386/Makefile
index 4476b125e5..4476b125e5 100644
--- a/usr/src/lib/libpicl/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libpicl/spec/i386/Makefile
diff --git a/usr/src/lib/libpicl/spec/picl.spec b/deleted_files/usr/src/lib/libpicl/spec/picl.spec
index 95b34d653c..95b34d653c 100644
--- a/usr/src/lib/libpicl/spec/picl.spec
+++ b/deleted_files/usr/src/lib/libpicl/spec/picl.spec
diff --git a/usr/src/lib/libpicl/spec/sparc/Makefile b/deleted_files/usr/src/lib/libpicl/spec/sparc/Makefile
index 42ad7d2515..42ad7d2515 100644
--- a/usr/src/lib/libpicl/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libpicl/spec/sparc/Makefile
diff --git a/usr/src/lib/libpicl/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libpicl/spec/sparcv9/Makefile
index 9a8bccd58c..9a8bccd58c 100644
--- a/usr/src/lib/libpicl/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libpicl/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libpicl/spec/versions b/deleted_files/usr/src/lib/libpicl/spec/versions
index a1bbf2b7f3..a1bbf2b7f3 100644
--- a/usr/src/lib/libpicl/spec/versions
+++ b/deleted_files/usr/src/lib/libpicl/spec/versions
diff --git a/usr/src/lib/libpicltree/spec/Makefile b/deleted_files/usr/src/lib/libpicltree/spec/Makefile
index 452f7d2a99..452f7d2a99 100644
--- a/usr/src/lib/libpicltree/spec/Makefile
+++ b/deleted_files/usr/src/lib/libpicltree/spec/Makefile
diff --git a/usr/src/lib/libpicltree/spec/Makefile.targ b/deleted_files/usr/src/lib/libpicltree/spec/Makefile.targ
index 4c735985f1..4c735985f1 100644
--- a/usr/src/lib/libpicltree/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libpicltree/spec/Makefile.targ
diff --git a/usr/src/lib/libpicltree/spec/i386/Makefile b/deleted_files/usr/src/lib/libpicltree/spec/i386/Makefile
index 958dfa3b32..958dfa3b32 100644
--- a/usr/src/lib/libpicltree/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libpicltree/spec/i386/Makefile
diff --git a/usr/src/lib/libpicltree/spec/picltree.spec b/deleted_files/usr/src/lib/libpicltree/spec/picltree.spec
index 616fa7ba9e..616fa7ba9e 100644
--- a/usr/src/lib/libpicltree/spec/picltree.spec
+++ b/deleted_files/usr/src/lib/libpicltree/spec/picltree.spec
diff --git a/usr/src/lib/libpicltree/spec/sparc/Makefile b/deleted_files/usr/src/lib/libpicltree/spec/sparc/Makefile
index b9f5cac008..b9f5cac008 100644
--- a/usr/src/lib/libpicltree/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libpicltree/spec/sparc/Makefile
diff --git a/usr/src/lib/libpicltree/spec/versions b/deleted_files/usr/src/lib/libpicltree/spec/versions
index 7f0c0d243b..7f0c0d243b 100644
--- a/usr/src/lib/libpicltree/spec/versions
+++ b/deleted_files/usr/src/lib/libpicltree/spec/versions
diff --git a/usr/src/lib/libplot/plot/spec/Makefile b/deleted_files/usr/src/lib/libplot/plot/spec/Makefile
index fb4e1aa5cd..fb4e1aa5cd 100644
--- a/usr/src/lib/libplot/plot/spec/Makefile
+++ b/deleted_files/usr/src/lib/libplot/plot/spec/Makefile
diff --git a/usr/src/lib/libplot/plot/spec/Makefile.targ b/deleted_files/usr/src/lib/libplot/plot/spec/Makefile.targ
index 9d527efb4e..9d527efb4e 100644
--- a/usr/src/lib/libplot/plot/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libplot/plot/spec/Makefile.targ
diff --git a/usr/src/lib/libplot/plot/spec/amd64/Makefile b/deleted_files/usr/src/lib/libplot/plot/spec/amd64/Makefile
index 5dd1b7240f..5dd1b7240f 100644
--- a/usr/src/lib/libplot/plot/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libplot/plot/spec/amd64/Makefile
diff --git a/usr/src/lib/libplot/plot/spec/i386/Makefile b/deleted_files/usr/src/lib/libplot/plot/spec/i386/Makefile
index 7f79ddec84..7f79ddec84 100644
--- a/usr/src/lib/libplot/plot/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libplot/plot/spec/i386/Makefile
diff --git a/usr/src/lib/libplot/plot/spec/plot.spec b/deleted_files/usr/src/lib/libplot/plot/spec/plot.spec
index 9ccf6250e3..9ccf6250e3 100644
--- a/usr/src/lib/libplot/plot/spec/plot.spec
+++ b/deleted_files/usr/src/lib/libplot/plot/spec/plot.spec
diff --git a/usr/src/lib/libplot/plot/spec/sparc/Makefile b/deleted_files/usr/src/lib/libplot/plot/spec/sparc/Makefile
index d2cc8ab285..d2cc8ab285 100644
--- a/usr/src/lib/libplot/plot/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libplot/plot/spec/sparc/Makefile
diff --git a/usr/src/lib/libplot/plot/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libplot/plot/spec/sparcv9/Makefile
index 9283948d89..9283948d89 100644
--- a/usr/src/lib/libplot/plot/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libplot/plot/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libplot/plot/spec/versions b/deleted_files/usr/src/lib/libplot/plot/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libplot/plot/spec/versions
+++ b/deleted_files/usr/src/lib/libplot/plot/spec/versions
diff --git a/usr/src/lib/libplot/t300/spec/Makefile b/deleted_files/usr/src/lib/libplot/t300/spec/Makefile
index 93fe6012d7..93fe6012d7 100644
--- a/usr/src/lib/libplot/t300/spec/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t300/spec/Makefile
diff --git a/usr/src/lib/libplot/t300/spec/Makefile.targ b/deleted_files/usr/src/lib/libplot/t300/spec/Makefile.targ
index 0eefa4fcc5..0eefa4fcc5 100644
--- a/usr/src/lib/libplot/t300/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libplot/t300/spec/Makefile.targ
diff --git a/usr/src/lib/libplot/t300/spec/amd64/Makefile b/deleted_files/usr/src/lib/libplot/t300/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libplot/t300/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t300/spec/amd64/Makefile
diff --git a/usr/src/lib/libplot/t300/spec/i386/Makefile b/deleted_files/usr/src/lib/libplot/t300/spec/i386/Makefile
index 34140d9a8f..34140d9a8f 100644
--- a/usr/src/lib/libplot/t300/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t300/spec/i386/Makefile
diff --git a/usr/src/lib/libplot/t300/spec/sparc/Makefile b/deleted_files/usr/src/lib/libplot/t300/spec/sparc/Makefile
index 98ea9b929d..98ea9b929d 100644
--- a/usr/src/lib/libplot/t300/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t300/spec/sparc/Makefile
diff --git a/usr/src/lib/libplot/t300/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libplot/t300/spec/sparcv9/Makefile
index e703b48efe..e703b48efe 100644
--- a/usr/src/lib/libplot/t300/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t300/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libplot/t300/spec/t300.spec b/deleted_files/usr/src/lib/libplot/t300/spec/t300.spec
index a76fb11a55..a76fb11a55 100644
--- a/usr/src/lib/libplot/t300/spec/t300.spec
+++ b/deleted_files/usr/src/lib/libplot/t300/spec/t300.spec
diff --git a/usr/src/lib/libplot/t300/spec/versions b/deleted_files/usr/src/lib/libplot/t300/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libplot/t300/spec/versions
+++ b/deleted_files/usr/src/lib/libplot/t300/spec/versions
diff --git a/usr/src/lib/libplot/t300s/spec/Makefile b/deleted_files/usr/src/lib/libplot/t300s/spec/Makefile
index 58f12a97d6..58f12a97d6 100644
--- a/usr/src/lib/libplot/t300s/spec/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t300s/spec/Makefile
diff --git a/usr/src/lib/libplot/t300s/spec/Makefile.targ b/deleted_files/usr/src/lib/libplot/t300s/spec/Makefile.targ
index d0b7daf600..d0b7daf600 100644
--- a/usr/src/lib/libplot/t300s/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libplot/t300s/spec/Makefile.targ
diff --git a/usr/src/lib/libplot/t300s/spec/amd64/Makefile b/deleted_files/usr/src/lib/libplot/t300s/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libplot/t300s/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t300s/spec/amd64/Makefile
diff --git a/usr/src/lib/libplot/t300s/spec/i386/Makefile b/deleted_files/usr/src/lib/libplot/t300s/spec/i386/Makefile
index 147605852e..147605852e 100644
--- a/usr/src/lib/libplot/t300s/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t300s/spec/i386/Makefile
diff --git a/usr/src/lib/libplot/t300s/spec/sparc/Makefile b/deleted_files/usr/src/lib/libplot/t300s/spec/sparc/Makefile
index ed24261bad..ed24261bad 100644
--- a/usr/src/lib/libplot/t300s/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t300s/spec/sparc/Makefile
diff --git a/usr/src/lib/libplot/t300s/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libplot/t300s/spec/sparcv9/Makefile
index d922d70b8f..d922d70b8f 100644
--- a/usr/src/lib/libplot/t300s/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t300s/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libplot/t300s/spec/t300s.spec b/deleted_files/usr/src/lib/libplot/t300s/spec/t300s.spec
index 92aa659d88..92aa659d88 100644
--- a/usr/src/lib/libplot/t300s/spec/t300s.spec
+++ b/deleted_files/usr/src/lib/libplot/t300s/spec/t300s.spec
diff --git a/usr/src/lib/libplot/t300s/spec/versions b/deleted_files/usr/src/lib/libplot/t300s/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libplot/t300s/spec/versions
+++ b/deleted_files/usr/src/lib/libplot/t300s/spec/versions
diff --git a/usr/src/lib/libplot/t4014/spec/Makefile b/deleted_files/usr/src/lib/libplot/t4014/spec/Makefile
index 2d90e25b62..2d90e25b62 100644
--- a/usr/src/lib/libplot/t4014/spec/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t4014/spec/Makefile
diff --git a/usr/src/lib/libplot/t4014/spec/Makefile.targ b/deleted_files/usr/src/lib/libplot/t4014/spec/Makefile.targ
index 4113761ecb..4113761ecb 100644
--- a/usr/src/lib/libplot/t4014/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libplot/t4014/spec/Makefile.targ
diff --git a/usr/src/lib/libplot/t4014/spec/amd64/Makefile b/deleted_files/usr/src/lib/libplot/t4014/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libplot/t4014/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t4014/spec/amd64/Makefile
diff --git a/usr/src/lib/libplot/t4014/spec/i386/Makefile b/deleted_files/usr/src/lib/libplot/t4014/spec/i386/Makefile
index 78d1350294..78d1350294 100644
--- a/usr/src/lib/libplot/t4014/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t4014/spec/i386/Makefile
diff --git a/usr/src/lib/libplot/t4014/spec/sparc/Makefile b/deleted_files/usr/src/lib/libplot/t4014/spec/sparc/Makefile
index f53a9b8021..f53a9b8021 100644
--- a/usr/src/lib/libplot/t4014/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t4014/spec/sparc/Makefile
diff --git a/usr/src/lib/libplot/t4014/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libplot/t4014/spec/sparcv9/Makefile
index 6d7e683133..6d7e683133 100644
--- a/usr/src/lib/libplot/t4014/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t4014/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libplot/t4014/spec/t4014.spec b/deleted_files/usr/src/lib/libplot/t4014/spec/t4014.spec
index ae4b72e555..ae4b72e555 100644
--- a/usr/src/lib/libplot/t4014/spec/t4014.spec
+++ b/deleted_files/usr/src/lib/libplot/t4014/spec/t4014.spec
diff --git a/usr/src/lib/libplot/t4014/spec/versions b/deleted_files/usr/src/lib/libplot/t4014/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libplot/t4014/spec/versions
+++ b/deleted_files/usr/src/lib/libplot/t4014/spec/versions
diff --git a/usr/src/lib/libplot/t450/spec/Makefile b/deleted_files/usr/src/lib/libplot/t450/spec/Makefile
index 5bddab677c..5bddab677c 100644
--- a/usr/src/lib/libplot/t450/spec/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t450/spec/Makefile
diff --git a/usr/src/lib/libplot/t450/spec/Makefile.targ b/deleted_files/usr/src/lib/libplot/t450/spec/Makefile.targ
index f06f8fec28..f06f8fec28 100644
--- a/usr/src/lib/libplot/t450/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libplot/t450/spec/Makefile.targ
diff --git a/usr/src/lib/libplot/t450/spec/amd64/Makefile b/deleted_files/usr/src/lib/libplot/t450/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libplot/t450/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t450/spec/amd64/Makefile
diff --git a/usr/src/lib/libplot/t450/spec/i386/Makefile b/deleted_files/usr/src/lib/libplot/t450/spec/i386/Makefile
index 7f79ddec84..7f79ddec84 100644
--- a/usr/src/lib/libplot/t450/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t450/spec/i386/Makefile
diff --git a/usr/src/lib/libplot/t450/spec/sparc/Makefile b/deleted_files/usr/src/lib/libplot/t450/spec/sparc/Makefile
index a8ff490ca5..a8ff490ca5 100644
--- a/usr/src/lib/libplot/t450/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t450/spec/sparc/Makefile
diff --git a/usr/src/lib/libplot/t450/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libplot/t450/spec/sparcv9/Makefile
index b2d1027e46..b2d1027e46 100644
--- a/usr/src/lib/libplot/t450/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libplot/t450/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libplot/t450/spec/t450.spec b/deleted_files/usr/src/lib/libplot/t450/spec/t450.spec
index 4037bbf5fa..4037bbf5fa 100644
--- a/usr/src/lib/libplot/t450/spec/t450.spec
+++ b/deleted_files/usr/src/lib/libplot/t450/spec/t450.spec
diff --git a/usr/src/lib/libplot/t450/spec/versions b/deleted_files/usr/src/lib/libplot/t450/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libplot/t450/spec/versions
+++ b/deleted_files/usr/src/lib/libplot/t450/spec/versions
diff --git a/usr/src/lib/libplot/vt0/spec/Makefile b/deleted_files/usr/src/lib/libplot/vt0/spec/Makefile
index a45ac5db53..a45ac5db53 100644
--- a/usr/src/lib/libplot/vt0/spec/Makefile
+++ b/deleted_files/usr/src/lib/libplot/vt0/spec/Makefile
diff --git a/usr/src/lib/libplot/vt0/spec/Makefile.targ b/deleted_files/usr/src/lib/libplot/vt0/spec/Makefile.targ
index d9694ec076..d9694ec076 100644
--- a/usr/src/lib/libplot/vt0/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libplot/vt0/spec/Makefile.targ
diff --git a/usr/src/lib/libplot/vt0/spec/amd64/Makefile b/deleted_files/usr/src/lib/libplot/vt0/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libplot/vt0/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libplot/vt0/spec/amd64/Makefile
diff --git a/usr/src/lib/libplot/vt0/spec/i386/Makefile b/deleted_files/usr/src/lib/libplot/vt0/spec/i386/Makefile
index 79f9865fd2..79f9865fd2 100644
--- a/usr/src/lib/libplot/vt0/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libplot/vt0/spec/i386/Makefile
diff --git a/usr/src/lib/libplot/vt0/spec/sparc/Makefile b/deleted_files/usr/src/lib/libplot/vt0/spec/sparc/Makefile
index 6c39d2ba11..6c39d2ba11 100644
--- a/usr/src/lib/libplot/vt0/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libplot/vt0/spec/sparc/Makefile
diff --git a/usr/src/lib/libplot/vt0/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libplot/vt0/spec/sparcv9/Makefile
index 4eb6eca6bf..4eb6eca6bf 100644
--- a/usr/src/lib/libplot/vt0/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libplot/vt0/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libplot/vt0/spec/versions b/deleted_files/usr/src/lib/libplot/vt0/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libplot/vt0/spec/versions
+++ b/deleted_files/usr/src/lib/libplot/vt0/spec/versions
diff --git a/usr/src/lib/libplot/vt0/spec/vt0.spec b/deleted_files/usr/src/lib/libplot/vt0/spec/vt0.spec
index 7ad2e273cf..7ad2e273cf 100644
--- a/usr/src/lib/libplot/vt0/spec/vt0.spec
+++ b/deleted_files/usr/src/lib/libplot/vt0/spec/vt0.spec
diff --git a/usr/src/lib/libpool/spec/Makefile b/deleted_files/usr/src/lib/libpool/spec/Makefile
index cca5e6a58e..cca5e6a58e 100644
--- a/usr/src/lib/libpool/spec/Makefile
+++ b/deleted_files/usr/src/lib/libpool/spec/Makefile
diff --git a/usr/src/lib/libpool/spec/Makefile.targ b/deleted_files/usr/src/lib/libpool/spec/Makefile.targ
index 5285eaaddd..5285eaaddd 100644
--- a/usr/src/lib/libpool/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libpool/spec/Makefile.targ
diff --git a/usr/src/lib/libpool/spec/amd64/Makefile b/deleted_files/usr/src/lib/libpool/spec/amd64/Makefile
index 751257f818..751257f818 100644
--- a/usr/src/lib/libpool/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libpool/spec/amd64/Makefile
diff --git a/usr/src/lib/libpool/spec/i386/Makefile b/deleted_files/usr/src/lib/libpool/spec/i386/Makefile
index 45be8a966a..45be8a966a 100644
--- a/usr/src/lib/libpool/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libpool/spec/i386/Makefile
diff --git a/usr/src/lib/libpool/spec/pool.spec b/deleted_files/usr/src/lib/libpool/spec/pool.spec
index 8d2fb44ba9..8d2fb44ba9 100644
--- a/usr/src/lib/libpool/spec/pool.spec
+++ b/deleted_files/usr/src/lib/libpool/spec/pool.spec
diff --git a/usr/src/lib/libpool/spec/sparc/Makefile b/deleted_files/usr/src/lib/libpool/spec/sparc/Makefile
index b958b95596..b958b95596 100644
--- a/usr/src/lib/libpool/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libpool/spec/sparc/Makefile
diff --git a/usr/src/lib/libpool/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libpool/spec/sparcv9/Makefile
index 8a99a89371..8a99a89371 100644
--- a/usr/src/lib/libpool/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libpool/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libpool/spec/versions b/deleted_files/usr/src/lib/libpool/spec/versions
index 7cbf70c7e2..7cbf70c7e2 100644
--- a/usr/src/lib/libpool/spec/versions
+++ b/deleted_files/usr/src/lib/libpool/spec/versions
diff --git a/usr/src/lib/libproc/spec/Makefile b/deleted_files/usr/src/lib/libproc/spec/Makefile
index f33253b720..f33253b720 100644
--- a/usr/src/lib/libproc/spec/Makefile
+++ b/deleted_files/usr/src/lib/libproc/spec/Makefile
diff --git a/usr/src/lib/libproc/spec/Makefile.targ b/deleted_files/usr/src/lib/libproc/spec/Makefile.targ
index 855d48af0b..855d48af0b 100644
--- a/usr/src/lib/libproc/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libproc/spec/Makefile.targ
diff --git a/usr/src/lib/libproc/spec/amd64/Makefile b/deleted_files/usr/src/lib/libproc/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libproc/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libproc/spec/amd64/Makefile
diff --git a/usr/src/lib/libproc/spec/i386/Makefile b/deleted_files/usr/src/lib/libproc/spec/i386/Makefile
index f033cf3593..f033cf3593 100644
--- a/usr/src/lib/libproc/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libproc/spec/i386/Makefile
diff --git a/usr/src/lib/libproc/spec/proc.spec b/deleted_files/usr/src/lib/libproc/spec/proc.spec
index 956fd9b850..956fd9b850 100644
--- a/usr/src/lib/libproc/spec/proc.spec
+++ b/deleted_files/usr/src/lib/libproc/spec/proc.spec
diff --git a/usr/src/lib/libproc/spec/sparc/Makefile b/deleted_files/usr/src/lib/libproc/spec/sparc/Makefile
index 37c9a46e81..37c9a46e81 100644
--- a/usr/src/lib/libproc/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libproc/spec/sparc/Makefile
diff --git a/usr/src/lib/libproc/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libproc/spec/sparcv9/Makefile
index 6c522ec231..6c522ec231 100644
--- a/usr/src/lib/libproc/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libproc/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libproc/spec/versions b/deleted_files/usr/src/lib/libproc/spec/versions
index 77f7410d00..77f7410d00 100644
--- a/usr/src/lib/libproc/spec/versions
+++ b/deleted_files/usr/src/lib/libproc/spec/versions
diff --git a/usr/src/lib/libproject/spec/Makefile b/deleted_files/usr/src/lib/libproject/spec/Makefile
index 9af284f007..9af284f007 100644
--- a/usr/src/lib/libproject/spec/Makefile
+++ b/deleted_files/usr/src/lib/libproject/spec/Makefile
diff --git a/usr/src/lib/libproject/spec/Makefile.targ b/deleted_files/usr/src/lib/libproject/spec/Makefile.targ
index d9f61e3f8b..d9f61e3f8b 100644
--- a/usr/src/lib/libproject/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libproject/spec/Makefile.targ
diff --git a/usr/src/lib/libproject/spec/amd64/Makefile b/deleted_files/usr/src/lib/libproject/spec/amd64/Makefile
index fb532ef308..fb532ef308 100644
--- a/usr/src/lib/libproject/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libproject/spec/amd64/Makefile
diff --git a/usr/src/lib/libproject/spec/i386/Makefile b/deleted_files/usr/src/lib/libproject/spec/i386/Makefile
index a41d547a8f..a41d547a8f 100644
--- a/usr/src/lib/libproject/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libproject/spec/i386/Makefile
diff --git a/usr/src/lib/libproject/spec/project.spec b/deleted_files/usr/src/lib/libproject/spec/project.spec
index 283a204f85..283a204f85 100644
--- a/usr/src/lib/libproject/spec/project.spec
+++ b/deleted_files/usr/src/lib/libproject/spec/project.spec
diff --git a/usr/src/lib/libproject/spec/sparc/Makefile b/deleted_files/usr/src/lib/libproject/spec/sparc/Makefile
index c67261f12c..c67261f12c 100644
--- a/usr/src/lib/libproject/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libproject/spec/sparc/Makefile
diff --git a/usr/src/lib/libproject/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libproject/spec/sparcv9/Makefile
index d3899a0ff2..d3899a0ff2 100644
--- a/usr/src/lib/libproject/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libproject/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libproject/spec/versions b/deleted_files/usr/src/lib/libproject/spec/versions
index b7d90defcb..b7d90defcb 100644
--- a/usr/src/lib/libproject/spec/versions
+++ b/deleted_files/usr/src/lib/libproject/spec/versions
diff --git a/usr/src/lib/librcm/spec/Makefile b/deleted_files/usr/src/lib/librcm/spec/Makefile
index f181040d29..f181040d29 100644
--- a/usr/src/lib/librcm/spec/Makefile
+++ b/deleted_files/usr/src/lib/librcm/spec/Makefile
diff --git a/usr/src/lib/librcm/spec/Makefile.targ b/deleted_files/usr/src/lib/librcm/spec/Makefile.targ
index 575ddf3fd6..575ddf3fd6 100644
--- a/usr/src/lib/librcm/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/librcm/spec/Makefile.targ
diff --git a/usr/src/lib/librcm/spec/amd64/Makefile b/deleted_files/usr/src/lib/librcm/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/librcm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/librcm/spec/amd64/Makefile
diff --git a/usr/src/lib/librcm/spec/i386/Makefile b/deleted_files/usr/src/lib/librcm/spec/i386/Makefile
index e14fe4ea4d..e14fe4ea4d 100644
--- a/usr/src/lib/librcm/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/librcm/spec/i386/Makefile
diff --git a/usr/src/lib/librcm/spec/rcm.spec b/deleted_files/usr/src/lib/librcm/spec/rcm.spec
index 775e23db96..775e23db96 100644
--- a/usr/src/lib/librcm/spec/rcm.spec
+++ b/deleted_files/usr/src/lib/librcm/spec/rcm.spec
diff --git a/usr/src/lib/librcm/spec/rcm_event.spec b/deleted_files/usr/src/lib/librcm/spec/rcm_event.spec
index f6c238d7eb..f6c238d7eb 100644
--- a/usr/src/lib/librcm/spec/rcm_event.spec
+++ b/deleted_files/usr/src/lib/librcm/spec/rcm_event.spec
diff --git a/usr/src/lib/librcm/spec/sparc/Makefile b/deleted_files/usr/src/lib/librcm/spec/sparc/Makefile
index 486cdc5f7d..486cdc5f7d 100644
--- a/usr/src/lib/librcm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/librcm/spec/sparc/Makefile
diff --git a/usr/src/lib/librcm/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/librcm/spec/sparcv9/Makefile
index 2d5a76c3aa..2d5a76c3aa 100644
--- a/usr/src/lib/librcm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/librcm/spec/sparcv9/Makefile
diff --git a/usr/src/lib/librcm/spec/versions b/deleted_files/usr/src/lib/librcm/spec/versions
index a986dca11b..a986dca11b 100644
--- a/usr/src/lib/librcm/spec/versions
+++ b/deleted_files/usr/src/lib/librcm/spec/versions
diff --git a/usr/src/lib/libresolv/spec/Makefile b/deleted_files/usr/src/lib/libresolv/spec/Makefile
index cb7140006e..cb7140006e 100644
--- a/usr/src/lib/libresolv/spec/Makefile
+++ b/deleted_files/usr/src/lib/libresolv/spec/Makefile
diff --git a/usr/src/lib/libresolv/spec/Makefile.targ b/deleted_files/usr/src/lib/libresolv/spec/Makefile.targ
index b9f97daf6e..b9f97daf6e 100644
--- a/usr/src/lib/libresolv/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libresolv/spec/Makefile.targ
diff --git a/usr/src/lib/libresolv/spec/amd64/Makefile b/deleted_files/usr/src/lib/libresolv/spec/amd64/Makefile
index d334868181..d334868181 100644
--- a/usr/src/lib/libresolv/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libresolv/spec/amd64/Makefile
diff --git a/usr/src/lib/libresolv/spec/i386/Makefile b/deleted_files/usr/src/lib/libresolv/spec/i386/Makefile
index a3f2757746..a3f2757746 100644
--- a/usr/src/lib/libresolv/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libresolv/spec/i386/Makefile
diff --git a/usr/src/lib/libresolv/spec/res_mkquery.spec b/deleted_files/usr/src/lib/libresolv/spec/res_mkquery.spec
index bed047b457..bed047b457 100644
--- a/usr/src/lib/libresolv/spec/res_mkquery.spec
+++ b/deleted_files/usr/src/lib/libresolv/spec/res_mkquery.spec
diff --git a/usr/src/lib/libresolv/spec/resolv.spec b/deleted_files/usr/src/lib/libresolv/spec/resolv.spec
index 83db4e4b6d..83db4e4b6d 100644
--- a/usr/src/lib/libresolv/spec/resolv.spec
+++ b/deleted_files/usr/src/lib/libresolv/spec/resolv.spec
diff --git a/usr/src/lib/libresolv/spec/sparc/Makefile b/deleted_files/usr/src/lib/libresolv/spec/sparc/Makefile
index 3d23bad698..3d23bad698 100644
--- a/usr/src/lib/libresolv/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libresolv/spec/sparc/Makefile
diff --git a/usr/src/lib/libresolv/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libresolv/spec/sparcv9/Makefile
index e772bf503c..e772bf503c 100644
--- a/usr/src/lib/libresolv/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libresolv/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libresolv/spec/versions b/deleted_files/usr/src/lib/libresolv/spec/versions
index 23ec67427b..23ec67427b 100644
--- a/usr/src/lib/libresolv/spec/versions
+++ b/deleted_files/usr/src/lib/libresolv/spec/versions
diff --git a/usr/src/lib/libresolv2/cylink/spec/Makefile b/deleted_files/usr/src/lib/libresolv2/cylink/spec/Makefile
index 335473f4cc..335473f4cc 100644
--- a/usr/src/lib/libresolv2/cylink/spec/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/cylink/spec/Makefile
diff --git a/usr/src/lib/libresolv2/cylink/spec/Makefile.targ b/deleted_files/usr/src/lib/libresolv2/cylink/spec/Makefile.targ
index 25ade9b830..25ade9b830 100644
--- a/usr/src/lib/libresolv2/cylink/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libresolv2/cylink/spec/Makefile.targ
diff --git a/usr/src/lib/libresolv2/cylink/spec/amd64/Makefile b/deleted_files/usr/src/lib/libresolv2/cylink/spec/amd64/Makefile
index 84ccf3ca89..84ccf3ca89 100644
--- a/usr/src/lib/libresolv2/cylink/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/cylink/spec/amd64/Makefile
diff --git a/usr/src/lib/libresolv2/cylink/spec/cylink.spec b/deleted_files/usr/src/lib/libresolv2/cylink/spec/cylink.spec
index aaa45150f4..aaa45150f4 100644
--- a/usr/src/lib/libresolv2/cylink/spec/cylink.spec
+++ b/deleted_files/usr/src/lib/libresolv2/cylink/spec/cylink.spec
diff --git a/usr/src/lib/libresolv2/cylink/spec/i386/Makefile b/deleted_files/usr/src/lib/libresolv2/cylink/spec/i386/Makefile
index 1c7d394c11..1c7d394c11 100644
--- a/usr/src/lib/libresolv2/cylink/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/cylink/spec/i386/Makefile
diff --git a/usr/src/lib/libresolv2/cylink/spec/sparc/Makefile b/deleted_files/usr/src/lib/libresolv2/cylink/spec/sparc/Makefile
index 59d2b5cd6c..59d2b5cd6c 100644
--- a/usr/src/lib/libresolv2/cylink/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/cylink/spec/sparc/Makefile
diff --git a/usr/src/lib/libresolv2/cylink/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libresolv2/cylink/spec/sparcv9/Makefile
index 311dcf33e4..311dcf33e4 100644
--- a/usr/src/lib/libresolv2/cylink/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/cylink/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libresolv2/cylink/spec/versions b/deleted_files/usr/src/lib/libresolv2/cylink/spec/versions
index 6a318d48a3..6a318d48a3 100644
--- a/usr/src/lib/libresolv2/cylink/spec/versions
+++ b/deleted_files/usr/src/lib/libresolv2/cylink/spec/versions
diff --git a/usr/src/lib/libresolv2/dnssafe/spec/Makefile b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/Makefile
index 8ad8521042..8ad8521042 100644
--- a/usr/src/lib/libresolv2/dnssafe/spec/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/Makefile
diff --git a/usr/src/lib/libresolv2/dnssafe/spec/Makefile.targ b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/Makefile.targ
index 84dd50716e..84dd50716e 100644
--- a/usr/src/lib/libresolv2/dnssafe/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/Makefile.targ
diff --git a/usr/src/lib/libresolv2/dnssafe/spec/amd64/Makefile b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/amd64/Makefile
index 84ccf3ca89..84ccf3ca89 100644
--- a/usr/src/lib/libresolv2/dnssafe/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/amd64/Makefile
diff --git a/usr/src/lib/libresolv2/dnssafe/spec/dnssafe.spec b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/dnssafe.spec
index 55b7a26fe0..55b7a26fe0 100644
--- a/usr/src/lib/libresolv2/dnssafe/spec/dnssafe.spec
+++ b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/dnssafe.spec
diff --git a/usr/src/lib/libresolv2/dnssafe/spec/i386/Makefile b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/i386/Makefile
index d60f7c85f9..d60f7c85f9 100644
--- a/usr/src/lib/libresolv2/dnssafe/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/i386/Makefile
diff --git a/usr/src/lib/libresolv2/dnssafe/spec/sparc/Makefile b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/sparc/Makefile
index 6046f459ec..6046f459ec 100644
--- a/usr/src/lib/libresolv2/dnssafe/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/sparc/Makefile
diff --git a/usr/src/lib/libresolv2/dnssafe/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/sparcv9/Makefile
index e405d11dc7..e405d11dc7 100644
--- a/usr/src/lib/libresolv2/dnssafe/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libresolv2/dnssafe/spec/versions b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/versions
index 6a318d48a3..6a318d48a3 100644
--- a/usr/src/lib/libresolv2/dnssafe/spec/versions
+++ b/deleted_files/usr/src/lib/libresolv2/dnssafe/spec/versions
diff --git a/usr/src/lib/libresolv2/irs/spec/Makefile b/deleted_files/usr/src/lib/libresolv2/irs/spec/Makefile
index 1928a002a5..1928a002a5 100644
--- a/usr/src/lib/libresolv2/irs/spec/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/irs/spec/Makefile
diff --git a/usr/src/lib/libresolv2/irs/spec/Makefile.targ b/deleted_files/usr/src/lib/libresolv2/irs/spec/Makefile.targ
index fe57106695..fe57106695 100644
--- a/usr/src/lib/libresolv2/irs/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libresolv2/irs/spec/Makefile.targ
diff --git a/usr/src/lib/libresolv2/irs/spec/amd64/Makefile b/deleted_files/usr/src/lib/libresolv2/irs/spec/amd64/Makefile
index 84ccf3ca89..84ccf3ca89 100644
--- a/usr/src/lib/libresolv2/irs/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/irs/spec/amd64/Makefile
diff --git a/usr/src/lib/libresolv2/irs/spec/i386/Makefile b/deleted_files/usr/src/lib/libresolv2/irs/spec/i386/Makefile
index b399d8191c..b399d8191c 100644
--- a/usr/src/lib/libresolv2/irs/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/irs/spec/i386/Makefile
diff --git a/usr/src/lib/libresolv2/irs/spec/irs.spec b/deleted_files/usr/src/lib/libresolv2/irs/spec/irs.spec
index 9b08d54093..9b08d54093 100644
--- a/usr/src/lib/libresolv2/irs/spec/irs.spec
+++ b/deleted_files/usr/src/lib/libresolv2/irs/spec/irs.spec
diff --git a/usr/src/lib/libresolv2/irs/spec/sparc/Makefile b/deleted_files/usr/src/lib/libresolv2/irs/spec/sparc/Makefile
index 0440fdd8c6..0440fdd8c6 100644
--- a/usr/src/lib/libresolv2/irs/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/irs/spec/sparc/Makefile
diff --git a/usr/src/lib/libresolv2/irs/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libresolv2/irs/spec/sparcv9/Makefile
index 63a2917247..63a2917247 100644
--- a/usr/src/lib/libresolv2/irs/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/irs/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libresolv2/irs/spec/versions b/deleted_files/usr/src/lib/libresolv2/irs/spec/versions
index 6a318d48a3..6a318d48a3 100644
--- a/usr/src/lib/libresolv2/irs/spec/versions
+++ b/deleted_files/usr/src/lib/libresolv2/irs/spec/versions
diff --git a/usr/src/lib/libresolv2/spec/Makefile b/deleted_files/usr/src/lib/libresolv2/spec/Makefile
index bc844c2654..bc844c2654 100644
--- a/usr/src/lib/libresolv2/spec/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/spec/Makefile
diff --git a/usr/src/lib/libresolv2/spec/Makefile.targ b/deleted_files/usr/src/lib/libresolv2/spec/Makefile.targ
index 16385fb51f..16385fb51f 100644
--- a/usr/src/lib/libresolv2/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libresolv2/spec/Makefile.targ
diff --git a/usr/src/lib/libresolv2/spec/amd64/Makefile b/deleted_files/usr/src/lib/libresolv2/spec/amd64/Makefile
index 96bda57a49..96bda57a49 100644
--- a/usr/src/lib/libresolv2/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/spec/amd64/Makefile
diff --git a/usr/src/lib/libresolv2/spec/i386/Makefile b/deleted_files/usr/src/lib/libresolv2/spec/i386/Makefile
index 9d0faf35d0..9d0faf35d0 100644
--- a/usr/src/lib/libresolv2/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/spec/i386/Makefile
diff --git a/usr/src/lib/libresolv2/spec/resolv2.spec b/deleted_files/usr/src/lib/libresolv2/spec/resolv2.spec
index ef489c41ff..ef489c41ff 100644
--- a/usr/src/lib/libresolv2/spec/resolv2.spec
+++ b/deleted_files/usr/src/lib/libresolv2/spec/resolv2.spec
diff --git a/usr/src/lib/libresolv2/spec/sparc/Makefile b/deleted_files/usr/src/lib/libresolv2/spec/sparc/Makefile
index ee76178462..ee76178462 100644
--- a/usr/src/lib/libresolv2/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/spec/sparc/Makefile
diff --git a/usr/src/lib/libresolv2/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libresolv2/spec/sparcv9/Makefile
index a6ebe9c847..a6ebe9c847 100644
--- a/usr/src/lib/libresolv2/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libresolv2/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libresolv2/spec/versions b/deleted_files/usr/src/lib/libresolv2/spec/versions
index 90e69aa7fb..90e69aa7fb 100644
--- a/usr/src/lib/libresolv2/spec/versions
+++ b/deleted_files/usr/src/lib/libresolv2/spec/versions
diff --git a/usr/src/lib/librestart/spec/Makefile b/deleted_files/usr/src/lib/librestart/spec/Makefile
index a72bbb53f5..a72bbb53f5 100644
--- a/usr/src/lib/librestart/spec/Makefile
+++ b/deleted_files/usr/src/lib/librestart/spec/Makefile
diff --git a/usr/src/lib/librestart/spec/Makefile.targ b/deleted_files/usr/src/lib/librestart/spec/Makefile.targ
index de29d3c2ac..de29d3c2ac 100644
--- a/usr/src/lib/librestart/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/librestart/spec/Makefile.targ
diff --git a/usr/src/lib/librestart/spec/amd64/Makefile b/deleted_files/usr/src/lib/librestart/spec/amd64/Makefile
index 45383cbd1f..45383cbd1f 100644
--- a/usr/src/lib/librestart/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/librestart/spec/amd64/Makefile
diff --git a/usr/src/lib/librestart/spec/i386/Makefile b/deleted_files/usr/src/lib/librestart/spec/i386/Makefile
index 1fa4955779..1fa4955779 100644
--- a/usr/src/lib/librestart/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/librestart/spec/i386/Makefile
diff --git a/usr/src/lib/librestart/spec/librestart.spec b/deleted_files/usr/src/lib/librestart/spec/librestart.spec
index 535258fde1..535258fde1 100644
--- a/usr/src/lib/librestart/spec/librestart.spec
+++ b/deleted_files/usr/src/lib/librestart/spec/librestart.spec
diff --git a/usr/src/lib/librestart/spec/sparc/Makefile b/deleted_files/usr/src/lib/librestart/spec/sparc/Makefile
index 8f3b7be350..8f3b7be350 100644
--- a/usr/src/lib/librestart/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/librestart/spec/sparc/Makefile
diff --git a/usr/src/lib/librestart/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/librestart/spec/sparcv9/Makefile
index c1c82cf308..c1c82cf308 100644
--- a/usr/src/lib/librestart/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/librestart/spec/sparcv9/Makefile
diff --git a/usr/src/lib/librestart/spec/versions b/deleted_files/usr/src/lib/librestart/spec/versions
index 148df6782d..148df6782d 100644
--- a/usr/src/lib/librestart/spec/versions
+++ b/deleted_files/usr/src/lib/librestart/spec/versions
diff --git a/usr/src/lib/librpcsvc/spec/Makefile b/deleted_files/usr/src/lib/librpcsvc/spec/Makefile
index b8db3ec14e..b8db3ec14e 100644
--- a/usr/src/lib/librpcsvc/spec/Makefile
+++ b/deleted_files/usr/src/lib/librpcsvc/spec/Makefile
diff --git a/usr/src/lib/librpcsvc/spec/Makefile.targ b/deleted_files/usr/src/lib/librpcsvc/spec/Makefile.targ
index 16f656ded0..16f656ded0 100644
--- a/usr/src/lib/librpcsvc/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/librpcsvc/spec/Makefile.targ
diff --git a/usr/src/lib/librpcsvc/spec/amd64/Makefile b/deleted_files/usr/src/lib/librpcsvc/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/librpcsvc/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/librpcsvc/spec/amd64/Makefile
diff --git a/usr/src/lib/librpcsvc/spec/i386/Makefile b/deleted_files/usr/src/lib/librpcsvc/spec/i386/Makefile
index 65942c1722..65942c1722 100644
--- a/usr/src/lib/librpcsvc/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/librpcsvc/spec/i386/Makefile
diff --git a/usr/src/lib/librpcsvc/spec/rpcsvc.spec b/deleted_files/usr/src/lib/librpcsvc/spec/rpcsvc.spec
index 3567a7ad0b..3567a7ad0b 100644
--- a/usr/src/lib/librpcsvc/spec/rpcsvc.spec
+++ b/deleted_files/usr/src/lib/librpcsvc/spec/rpcsvc.spec
diff --git a/usr/src/lib/librpcsvc/spec/sparc/Makefile b/deleted_files/usr/src/lib/librpcsvc/spec/sparc/Makefile
index b7fbb05116..b7fbb05116 100644
--- a/usr/src/lib/librpcsvc/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/librpcsvc/spec/sparc/Makefile
diff --git a/usr/src/lib/librpcsvc/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/librpcsvc/spec/sparcv9/Makefile
index 012d10c3eb..012d10c3eb 100644
--- a/usr/src/lib/librpcsvc/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/librpcsvc/spec/sparcv9/Makefile
diff --git a/usr/src/lib/librpcsvc/spec/versions b/deleted_files/usr/src/lib/librpcsvc/spec/versions
index 2fed5f1c60..2fed5f1c60 100644
--- a/usr/src/lib/librpcsvc/spec/versions
+++ b/deleted_files/usr/src/lib/librpcsvc/spec/versions
diff --git a/usr/src/lib/librsm/spec/Makefile b/deleted_files/usr/src/lib/librsm/spec/Makefile
index c262e85954..c262e85954 100644
--- a/usr/src/lib/librsm/spec/Makefile
+++ b/deleted_files/usr/src/lib/librsm/spec/Makefile
diff --git a/usr/src/lib/librsm/spec/Makefile.targ b/deleted_files/usr/src/lib/librsm/spec/Makefile.targ
index 136f71d2c7..136f71d2c7 100644
--- a/usr/src/lib/librsm/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/librsm/spec/Makefile.targ
diff --git a/usr/src/lib/librsm/spec/amd64/Makefile b/deleted_files/usr/src/lib/librsm/spec/amd64/Makefile
index d334868181..d334868181 100644
--- a/usr/src/lib/librsm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/librsm/spec/amd64/Makefile
diff --git a/usr/src/lib/librsm/spec/i386/Makefile b/deleted_files/usr/src/lib/librsm/spec/i386/Makefile
index c824989917..c824989917 100644
--- a/usr/src/lib/librsm/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/librsm/spec/i386/Makefile
diff --git a/usr/src/lib/librsm/spec/rsm.spec b/deleted_files/usr/src/lib/librsm/spec/rsm.spec
index 6d6ac9597d..6d6ac9597d 100644
--- a/usr/src/lib/librsm/spec/rsm.spec
+++ b/deleted_files/usr/src/lib/librsm/spec/rsm.spec
diff --git a/usr/src/lib/librsm/spec/sparc/Makefile b/deleted_files/usr/src/lib/librsm/spec/sparc/Makefile
index 519ecd477c..519ecd477c 100644
--- a/usr/src/lib/librsm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/librsm/spec/sparc/Makefile
diff --git a/usr/src/lib/librsm/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/librsm/spec/sparcv9/Makefile
index 4a0276313c..4a0276313c 100644
--- a/usr/src/lib/librsm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/librsm/spec/sparcv9/Makefile
diff --git a/usr/src/lib/librsm/spec/versions b/deleted_files/usr/src/lib/librsm/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/librsm/spec/versions
+++ b/deleted_files/usr/src/lib/librsm/spec/versions
diff --git a/usr/src/lib/libsasl/spec/Makefile b/deleted_files/usr/src/lib/libsasl/spec/Makefile
index 8b3aa273d8..8b3aa273d8 100644
--- a/usr/src/lib/libsasl/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsasl/spec/Makefile
diff --git a/usr/src/lib/libsasl/spec/Makefile.targ b/deleted_files/usr/src/lib/libsasl/spec/Makefile.targ
index a269674a94..a269674a94 100644
--- a/usr/src/lib/libsasl/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsasl/spec/Makefile.targ
diff --git a/usr/src/lib/libsasl/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsasl/spec/amd64/Makefile
index 46271f9ef2..46271f9ef2 100644
--- a/usr/src/lib/libsasl/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsasl/spec/amd64/Makefile
diff --git a/usr/src/lib/libsasl/spec/i386/Makefile b/deleted_files/usr/src/lib/libsasl/spec/i386/Makefile
index 11c6f965a0..11c6f965a0 100644
--- a/usr/src/lib/libsasl/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsasl/spec/i386/Makefile
diff --git a/usr/src/lib/libsasl/spec/sasl.spec b/deleted_files/usr/src/lib/libsasl/spec/sasl.spec
index 93550b89e1..93550b89e1 100644
--- a/usr/src/lib/libsasl/spec/sasl.spec
+++ b/deleted_files/usr/src/lib/libsasl/spec/sasl.spec
diff --git a/usr/src/lib/libsasl/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsasl/spec/sparc/Makefile
index 9bf2a2c21f..9bf2a2c21f 100644
--- a/usr/src/lib/libsasl/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsasl/spec/sparc/Makefile
diff --git a/usr/src/lib/libsasl/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsasl/spec/sparcv9/Makefile
index 69f239f28a..69f239f28a 100644
--- a/usr/src/lib/libsasl/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsasl/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsasl/spec/versions b/deleted_files/usr/src/lib/libsasl/spec/versions
index 7690404cd5..7690404cd5 100644
--- a/usr/src/lib/libsasl/spec/versions
+++ b/deleted_files/usr/src/lib/libsasl/spec/versions
diff --git a/usr/src/lib/libscf/spec/Makefile b/deleted_files/usr/src/lib/libscf/spec/Makefile
index a72bbb53f5..a72bbb53f5 100644
--- a/usr/src/lib/libscf/spec/Makefile
+++ b/deleted_files/usr/src/lib/libscf/spec/Makefile
diff --git a/usr/src/lib/libscf/spec/Makefile.targ b/deleted_files/usr/src/lib/libscf/spec/Makefile.targ
index 1619a3d9d1..1619a3d9d1 100644
--- a/usr/src/lib/libscf/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libscf/spec/Makefile.targ
diff --git a/usr/src/lib/libscf/spec/amd64/Makefile b/deleted_files/usr/src/lib/libscf/spec/amd64/Makefile
index 08a55cd49b..08a55cd49b 100644
--- a/usr/src/lib/libscf/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libscf/spec/amd64/Makefile
diff --git a/usr/src/lib/libscf/spec/i386/Makefile b/deleted_files/usr/src/lib/libscf/spec/i386/Makefile
index 1fa4955779..1fa4955779 100644
--- a/usr/src/lib/libscf/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libscf/spec/i386/Makefile
diff --git a/usr/src/lib/libscf/spec/lowlevel.spec b/deleted_files/usr/src/lib/libscf/spec/lowlevel.spec
index c45db23bbb..c45db23bbb 100644
--- a/usr/src/lib/libscf/spec/lowlevel.spec
+++ b/deleted_files/usr/src/lib/libscf/spec/lowlevel.spec
diff --git a/usr/src/lib/libscf/spec/midlevel.spec b/deleted_files/usr/src/lib/libscf/spec/midlevel.spec
index 51137a82f6..51137a82f6 100644
--- a/usr/src/lib/libscf/spec/midlevel.spec
+++ b/deleted_files/usr/src/lib/libscf/spec/midlevel.spec
diff --git a/usr/src/lib/libscf/spec/sparc/Makefile b/deleted_files/usr/src/lib/libscf/spec/sparc/Makefile
index 8f3b7be350..8f3b7be350 100644
--- a/usr/src/lib/libscf/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libscf/spec/sparc/Makefile
diff --git a/usr/src/lib/libscf/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libscf/spec/sparcv9/Makefile
index c1c82cf308..c1c82cf308 100644
--- a/usr/src/lib/libscf/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libscf/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libscf/spec/versions b/deleted_files/usr/src/lib/libscf/spec/versions
index e46cbfc3f0..e46cbfc3f0 100644
--- a/usr/src/lib/libscf/spec/versions
+++ b/deleted_files/usr/src/lib/libscf/spec/versions
diff --git a/usr/src/lib/libsctp/spec/Makefile b/deleted_files/usr/src/lib/libsctp/spec/Makefile
index 9ac4af6ec4..9ac4af6ec4 100644
--- a/usr/src/lib/libsctp/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsctp/spec/Makefile
diff --git a/usr/src/lib/libsctp/spec/Makefile.targ b/deleted_files/usr/src/lib/libsctp/spec/Makefile.targ
index aea0a8834f..aea0a8834f 100644
--- a/usr/src/lib/libsctp/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsctp/spec/Makefile.targ
diff --git a/usr/src/lib/libsctp/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsctp/spec/amd64/Makefile
index fb532ef308..fb532ef308 100644
--- a/usr/src/lib/libsctp/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsctp/spec/amd64/Makefile
diff --git a/usr/src/lib/libsctp/spec/i386/Makefile b/deleted_files/usr/src/lib/libsctp/spec/i386/Makefile
index 20752a2475..20752a2475 100644
--- a/usr/src/lib/libsctp/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsctp/spec/i386/Makefile
diff --git a/usr/src/lib/libsctp/spec/sctp.spec b/deleted_files/usr/src/lib/libsctp/spec/sctp.spec
index 760c64a8a5..760c64a8a5 100644
--- a/usr/src/lib/libsctp/spec/sctp.spec
+++ b/deleted_files/usr/src/lib/libsctp/spec/sctp.spec
diff --git a/usr/src/lib/libsctp/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsctp/spec/sparc/Makefile
index 4122cf3b08..4122cf3b08 100644
--- a/usr/src/lib/libsctp/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsctp/spec/sparc/Makefile
diff --git a/usr/src/lib/libsctp/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsctp/spec/sparcv9/Makefile
index a85df6c93b..a85df6c93b 100644
--- a/usr/src/lib/libsctp/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsctp/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsctp/spec/versions b/deleted_files/usr/src/lib/libsctp/spec/versions
index f7955484e7..f7955484e7 100644
--- a/usr/src/lib/libsctp/spec/versions
+++ b/deleted_files/usr/src/lib/libsctp/spec/versions
diff --git a/usr/src/lib/libsec/spec/Makefile b/deleted_files/usr/src/lib/libsec/spec/Makefile
index 04d1851ff8..04d1851ff8 100644
--- a/usr/src/lib/libsec/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsec/spec/Makefile
diff --git a/usr/src/lib/libsec/spec/Makefile.targ b/deleted_files/usr/src/lib/libsec/spec/Makefile.targ
index dca847f7c0..dca847f7c0 100644
--- a/usr/src/lib/libsec/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsec/spec/Makefile.targ
diff --git a/usr/src/lib/libsec/spec/acl.spec b/deleted_files/usr/src/lib/libsec/spec/acl.spec
index 6bdcec37cc..6bdcec37cc 100644
--- a/usr/src/lib/libsec/spec/acl.spec
+++ b/deleted_files/usr/src/lib/libsec/spec/acl.spec
diff --git a/usr/src/lib/libsec/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsec/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libsec/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsec/spec/amd64/Makefile
diff --git a/usr/src/lib/libsec/spec/i386/Makefile b/deleted_files/usr/src/lib/libsec/spec/i386/Makefile
index c5b9831e2f..c5b9831e2f 100644
--- a/usr/src/lib/libsec/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsec/spec/i386/Makefile
diff --git a/usr/src/lib/libsec/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsec/spec/sparc/Makefile
index 696a94a08a..696a94a08a 100644
--- a/usr/src/lib/libsec/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsec/spec/sparc/Makefile
diff --git a/usr/src/lib/libsec/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsec/spec/sparcv9/Makefile
index 44a835c629..44a835c629 100644
--- a/usr/src/lib/libsec/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsec/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsec/spec/versions b/deleted_files/usr/src/lib/libsec/spec/versions
index c8e4665f4d..c8e4665f4d 100644
--- a/usr/src/lib/libsec/spec/versions
+++ b/deleted_files/usr/src/lib/libsec/spec/versions
diff --git a/usr/src/lib/libsecdb/spec/Makefile b/deleted_files/usr/src/lib/libsecdb/spec/Makefile
index 1c8b206cb9..1c8b206cb9 100644
--- a/usr/src/lib/libsecdb/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsecdb/spec/Makefile
diff --git a/usr/src/lib/libsecdb/spec/Makefile.targ b/deleted_files/usr/src/lib/libsecdb/spec/Makefile.targ
index f8a9f5e88b..f8a9f5e88b 100644
--- a/usr/src/lib/libsecdb/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsecdb/spec/Makefile.targ
diff --git a/usr/src/lib/libsecdb/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsecdb/spec/amd64/Makefile
index d334868181..d334868181 100644
--- a/usr/src/lib/libsecdb/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsecdb/spec/amd64/Makefile
diff --git a/usr/src/lib/libsecdb/spec/chkauthattr.spec b/deleted_files/usr/src/lib/libsecdb/spec/chkauthattr.spec
index f0dbc24373..f0dbc24373 100644
--- a/usr/src/lib/libsecdb/spec/chkauthattr.spec
+++ b/deleted_files/usr/src/lib/libsecdb/spec/chkauthattr.spec
diff --git a/usr/src/lib/libsecdb/spec/getauthattr.spec b/deleted_files/usr/src/lib/libsecdb/spec/getauthattr.spec
index 5d6b728a89..5d6b728a89 100644
--- a/usr/src/lib/libsecdb/spec/getauthattr.spec
+++ b/deleted_files/usr/src/lib/libsecdb/spec/getauthattr.spec
diff --git a/usr/src/lib/libsecdb/spec/getexecattr.spec b/deleted_files/usr/src/lib/libsecdb/spec/getexecattr.spec
index 6a7f82c042..6a7f82c042 100644
--- a/usr/src/lib/libsecdb/spec/getexecattr.spec
+++ b/deleted_files/usr/src/lib/libsecdb/spec/getexecattr.spec
diff --git a/usr/src/lib/libsecdb/spec/getprofattr.spec b/deleted_files/usr/src/lib/libsecdb/spec/getprofattr.spec
index 83e5a62de4..83e5a62de4 100644
--- a/usr/src/lib/libsecdb/spec/getprofattr.spec
+++ b/deleted_files/usr/src/lib/libsecdb/spec/getprofattr.spec
diff --git a/usr/src/lib/libsecdb/spec/getuserattr.spec b/deleted_files/usr/src/lib/libsecdb/spec/getuserattr.spec
index 4bd3d24afb..4bd3d24afb 100644
--- a/usr/src/lib/libsecdb/spec/getuserattr.spec
+++ b/deleted_files/usr/src/lib/libsecdb/spec/getuserattr.spec
diff --git a/usr/src/lib/libsecdb/spec/i386/Makefile b/deleted_files/usr/src/lib/libsecdb/spec/i386/Makefile
index aa74795e4b..aa74795e4b 100644
--- a/usr/src/lib/libsecdb/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsecdb/spec/i386/Makefile
diff --git a/usr/src/lib/libsecdb/spec/private.spec b/deleted_files/usr/src/lib/libsecdb/spec/private.spec
index d66b4b7b95..d66b4b7b95 100644
--- a/usr/src/lib/libsecdb/spec/private.spec
+++ b/deleted_files/usr/src/lib/libsecdb/spec/private.spec
diff --git a/usr/src/lib/libsecdb/spec/secdb.spec b/deleted_files/usr/src/lib/libsecdb/spec/secdb.spec
index ce547a2cb3..ce547a2cb3 100644
--- a/usr/src/lib/libsecdb/spec/secdb.spec
+++ b/deleted_files/usr/src/lib/libsecdb/spec/secdb.spec
diff --git a/usr/src/lib/libsecdb/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsecdb/spec/sparc/Makefile
index 79f8ed9782..79f8ed9782 100644
--- a/usr/src/lib/libsecdb/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsecdb/spec/sparc/Makefile
diff --git a/usr/src/lib/libsecdb/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsecdb/spec/sparcv9/Makefile
index 0be7dfcc95..0be7dfcc95 100644
--- a/usr/src/lib/libsecdb/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsecdb/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsecdb/spec/versions b/deleted_files/usr/src/lib/libsecdb/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libsecdb/spec/versions
+++ b/deleted_files/usr/src/lib/libsecdb/spec/versions
diff --git a/usr/src/lib/libsendfile/spec/Makefile b/deleted_files/usr/src/lib/libsendfile/spec/Makefile
index 8cc2eb46b2..8cc2eb46b2 100644
--- a/usr/src/lib/libsendfile/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsendfile/spec/Makefile
diff --git a/usr/src/lib/libsendfile/spec/Makefile.targ b/deleted_files/usr/src/lib/libsendfile/spec/Makefile.targ
index f16637847f..f16637847f 100644
--- a/usr/src/lib/libsendfile/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsendfile/spec/Makefile.targ
diff --git a/usr/src/lib/libsendfile/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsendfile/spec/amd64/Makefile
index ae8ad43947..ae8ad43947 100644
--- a/usr/src/lib/libsendfile/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsendfile/spec/amd64/Makefile
diff --git a/usr/src/lib/libsendfile/spec/i386/Makefile b/deleted_files/usr/src/lib/libsendfile/spec/i386/Makefile
index a1f8da7fef..a1f8da7fef 100644
--- a/usr/src/lib/libsendfile/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsendfile/spec/i386/Makefile
diff --git a/usr/src/lib/libsendfile/spec/sendfile.spec b/deleted_files/usr/src/lib/libsendfile/spec/sendfile.spec
index 0cf33bdc45..0cf33bdc45 100644
--- a/usr/src/lib/libsendfile/spec/sendfile.spec
+++ b/deleted_files/usr/src/lib/libsendfile/spec/sendfile.spec
diff --git a/usr/src/lib/libsendfile/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsendfile/spec/sparc/Makefile
index 15511f2ecf..15511f2ecf 100644
--- a/usr/src/lib/libsendfile/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsendfile/spec/sparc/Makefile
diff --git a/usr/src/lib/libsendfile/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsendfile/spec/sparcv9/Makefile
index be6b94e091..be6b94e091 100644
--- a/usr/src/lib/libsendfile/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsendfile/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsendfile/spec/versions b/deleted_files/usr/src/lib/libsendfile/spec/versions
index f9134de951..f9134de951 100644
--- a/usr/src/lib/libsendfile/spec/versions
+++ b/deleted_files/usr/src/lib/libsendfile/spec/versions
diff --git a/usr/src/lib/libsldap/spec/Makefile b/deleted_files/usr/src/lib/libsldap/spec/Makefile
index 07631562f5..07631562f5 100644
--- a/usr/src/lib/libsldap/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsldap/spec/Makefile
diff --git a/usr/src/lib/libsldap/spec/Makefile.targ b/deleted_files/usr/src/lib/libsldap/spec/Makefile.targ
index 9460a6c792..9460a6c792 100644
--- a/usr/src/lib/libsldap/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsldap/spec/Makefile.targ
diff --git a/usr/src/lib/libsldap/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsldap/spec/amd64/Makefile
index d334868181..d334868181 100644
--- a/usr/src/lib/libsldap/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsldap/spec/amd64/Makefile
diff --git a/usr/src/lib/libsldap/spec/i386/Makefile b/deleted_files/usr/src/lib/libsldap/spec/i386/Makefile
index c42ce9f948..c42ce9f948 100644
--- a/usr/src/lib/libsldap/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsldap/spec/i386/Makefile
diff --git a/usr/src/lib/libsldap/spec/sldap.spec b/deleted_files/usr/src/lib/libsldap/spec/sldap.spec
index 5edac82600..5edac82600 100644
--- a/usr/src/lib/libsldap/spec/sldap.spec
+++ b/deleted_files/usr/src/lib/libsldap/spec/sldap.spec
diff --git a/usr/src/lib/libsldap/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsldap/spec/sparc/Makefile
index 1c214efff5..1c214efff5 100644
--- a/usr/src/lib/libsldap/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsldap/spec/sparc/Makefile
diff --git a/usr/src/lib/libsldap/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsldap/spec/sparcv9/Makefile
index aadda75391..aadda75391 100644
--- a/usr/src/lib/libsldap/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsldap/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsldap/spec/versions b/deleted_files/usr/src/lib/libsldap/spec/versions
index d8ec684e68..d8ec684e68 100644
--- a/usr/src/lib/libsldap/spec/versions
+++ b/deleted_files/usr/src/lib/libsldap/spec/versions
diff --git a/usr/src/lib/libslp/spec/Makefile b/deleted_files/usr/src/lib/libslp/spec/Makefile
index 644e7bb0b1..644e7bb0b1 100644
--- a/usr/src/lib/libslp/spec/Makefile
+++ b/deleted_files/usr/src/lib/libslp/spec/Makefile
diff --git a/usr/src/lib/libslp/spec/Makefile.targ b/deleted_files/usr/src/lib/libslp/spec/Makefile.targ
index d930d83367..d930d83367 100644
--- a/usr/src/lib/libslp/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libslp/spec/Makefile.targ
diff --git a/usr/src/lib/libslp/spec/amd64/Makefile b/deleted_files/usr/src/lib/libslp/spec/amd64/Makefile
index 5dd1b7240f..5dd1b7240f 100644
--- a/usr/src/lib/libslp/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libslp/spec/amd64/Makefile
diff --git a/usr/src/lib/libslp/spec/i386/Makefile b/deleted_files/usr/src/lib/libslp/spec/i386/Makefile
index 4f14ba49ae..4f14ba49ae 100644
--- a/usr/src/lib/libslp/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libslp/spec/i386/Makefile
diff --git a/usr/src/lib/libslp/spec/slp.spec b/deleted_files/usr/src/lib/libslp/spec/slp.spec
index 99ad649858..99ad649858 100644
--- a/usr/src/lib/libslp/spec/slp.spec
+++ b/deleted_files/usr/src/lib/libslp/spec/slp.spec
diff --git a/usr/src/lib/libslp/spec/sparc/Makefile b/deleted_files/usr/src/lib/libslp/spec/sparc/Makefile
index 1a7be71e2a..1a7be71e2a 100644
--- a/usr/src/lib/libslp/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libslp/spec/sparc/Makefile
diff --git a/usr/src/lib/libslp/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libslp/spec/sparcv9/Makefile
index db0c16e5d8..db0c16e5d8 100644
--- a/usr/src/lib/libslp/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libslp/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libslp/spec/versions b/deleted_files/usr/src/lib/libslp/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libslp/spec/versions
+++ b/deleted_files/usr/src/lib/libslp/spec/versions
diff --git a/usr/src/lib/libsmbios/spec/Makefile b/deleted_files/usr/src/lib/libsmbios/spec/Makefile
index 2cb984bfc9..2cb984bfc9 100644
--- a/usr/src/lib/libsmbios/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsmbios/spec/Makefile
diff --git a/usr/src/lib/libsmbios/spec/Makefile.targ b/deleted_files/usr/src/lib/libsmbios/spec/Makefile.targ
index 6f45581c46..6f45581c46 100644
--- a/usr/src/lib/libsmbios/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsmbios/spec/Makefile.targ
diff --git a/usr/src/lib/libsmbios/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsmbios/spec/amd64/Makefile
index ef98bd8314..ef98bd8314 100644
--- a/usr/src/lib/libsmbios/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsmbios/spec/amd64/Makefile
diff --git a/usr/src/lib/libsmbios/spec/i386/Makefile b/deleted_files/usr/src/lib/libsmbios/spec/i386/Makefile
index 83d6a28b73..83d6a28b73 100644
--- a/usr/src/lib/libsmbios/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsmbios/spec/i386/Makefile
diff --git a/usr/src/lib/libsmbios/spec/smbios.spec b/deleted_files/usr/src/lib/libsmbios/spec/smbios.spec
index 3f6c32b542..3f6c32b542 100644
--- a/usr/src/lib/libsmbios/spec/smbios.spec
+++ b/deleted_files/usr/src/lib/libsmbios/spec/smbios.spec
diff --git a/usr/src/lib/libsmbios/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsmbios/spec/sparc/Makefile
index 375f0ff614..375f0ff614 100644
--- a/usr/src/lib/libsmbios/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsmbios/spec/sparc/Makefile
diff --git a/usr/src/lib/libsmbios/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsmbios/spec/sparcv9/Makefile
index ef98bd8314..ef98bd8314 100644
--- a/usr/src/lib/libsmbios/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsmbios/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsmbios/spec/versions b/deleted_files/usr/src/lib/libsmbios/spec/versions
index 43aa0fe433..43aa0fe433 100644
--- a/usr/src/lib/libsmbios/spec/versions
+++ b/deleted_files/usr/src/lib/libsmbios/spec/versions
diff --git a/usr/src/lib/libsmedia/library/spec/Makefile b/deleted_files/usr/src/lib/libsmedia/library/spec/Makefile
index 4b2caa30d7..4b2caa30d7 100644
--- a/usr/src/lib/libsmedia/library/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/library/spec/Makefile
diff --git a/usr/src/lib/libsmedia/library/spec/Makefile.targ b/deleted_files/usr/src/lib/libsmedia/library/spec/Makefile.targ
index cde8e5c6f5..cde8e5c6f5 100644
--- a/usr/src/lib/libsmedia/library/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsmedia/library/spec/Makefile.targ
diff --git a/usr/src/lib/libsmedia/library/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsmedia/library/spec/amd64/Makefile
index a1ab35dfb4..a1ab35dfb4 100644
--- a/usr/src/lib/libsmedia/library/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/library/spec/amd64/Makefile
diff --git a/usr/src/lib/libsmedia/library/spec/i386/Makefile b/deleted_files/usr/src/lib/libsmedia/library/spec/i386/Makefile
index a18cc99dd4..a18cc99dd4 100644
--- a/usr/src/lib/libsmedia/library/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/library/spec/i386/Makefile
diff --git a/usr/src/lib/libsmedia/library/spec/smedia.spec b/deleted_files/usr/src/lib/libsmedia/library/spec/smedia.spec
index 01ba22b778..01ba22b778 100644
--- a/usr/src/lib/libsmedia/library/spec/smedia.spec
+++ b/deleted_files/usr/src/lib/libsmedia/library/spec/smedia.spec
diff --git a/usr/src/lib/libsmedia/library/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsmedia/library/spec/sparc/Makefile
index 97dfe89e10..97dfe89e10 100644
--- a/usr/src/lib/libsmedia/library/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/library/spec/sparc/Makefile
diff --git a/usr/src/lib/libsmedia/library/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsmedia/library/spec/sparcv9/Makefile
index 035764c21b..035764c21b 100644
--- a/usr/src/lib/libsmedia/library/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/library/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsmedia/library/spec/versions b/deleted_files/usr/src/lib/libsmedia/library/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libsmedia/library/spec/versions
+++ b/deleted_files/usr/src/lib/libsmedia/library/spec/versions
diff --git a/usr/src/lib/libsmedia/plugins/floppy/spec/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/Makefile
index 4dadf90cae..4dadf90cae 100644
--- a/usr/src/lib/libsmedia/plugins/floppy/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/floppy/spec/Makefile.targ b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/Makefile.targ
index 765ccf336f..765ccf336f 100644
--- a/usr/src/lib/libsmedia/plugins/floppy/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/Makefile.targ
diff --git a/usr/src/lib/libsmedia/plugins/floppy/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/amd64/Makefile
index 65f7fce23f..65f7fce23f 100644
--- a/usr/src/lib/libsmedia/plugins/floppy/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/amd64/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/floppy/spec/i386/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/i386/Makefile
index 8a2c7d78af..8a2c7d78af 100644
--- a/usr/src/lib/libsmedia/plugins/floppy/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/i386/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/floppy/spec/sm_fd.spec b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/sm_fd.spec
index 5e4f4aed1a..5e4f4aed1a 100644
--- a/usr/src/lib/libsmedia/plugins/floppy/spec/sm_fd.spec
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/sm_fd.spec
diff --git a/usr/src/lib/libsmedia/plugins/floppy/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/sparc/Makefile
index 127a056d39..127a056d39 100644
--- a/usr/src/lib/libsmedia/plugins/floppy/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/sparc/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/floppy/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/sparcv9/Makefile
index 736a16e1c1..736a16e1c1 100644
--- a/usr/src/lib/libsmedia/plugins/floppy/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/floppy/spec/versions b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/versions
index ae128e3da2..ae128e3da2 100644
--- a/usr/src/lib/libsmedia/plugins/floppy/spec/versions
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/floppy/spec/versions
diff --git a/usr/src/lib/libsmedia/plugins/pcata/spec/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/Makefile
index 8f7c4765bf..8f7c4765bf 100644
--- a/usr/src/lib/libsmedia/plugins/pcata/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/pcata/spec/Makefile.targ b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/Makefile.targ
index 09e2a3059f..09e2a3059f 100644
--- a/usr/src/lib/libsmedia/plugins/pcata/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/Makefile.targ
diff --git a/usr/src/lib/libsmedia/plugins/pcata/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/amd64/Makefile
index 65f7fce23f..65f7fce23f 100644
--- a/usr/src/lib/libsmedia/plugins/pcata/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/amd64/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/pcata/spec/i386/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/i386/Makefile
index 2160634138..2160634138 100644
--- a/usr/src/lib/libsmedia/plugins/pcata/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/i386/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/pcata/spec/sm_pcata.spec b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/sm_pcata.spec
index ebdca2a358..ebdca2a358 100644
--- a/usr/src/lib/libsmedia/plugins/pcata/spec/sm_pcata.spec
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/sm_pcata.spec
diff --git a/usr/src/lib/libsmedia/plugins/pcata/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/sparc/Makefile
index 4750629616..4750629616 100644
--- a/usr/src/lib/libsmedia/plugins/pcata/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/sparc/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/pcata/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/sparcv9/Makefile
index 24696559fc..24696559fc 100644
--- a/usr/src/lib/libsmedia/plugins/pcata/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/pcata/spec/versions b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/versions
index aa1788fb4e..aa1788fb4e 100644
--- a/usr/src/lib/libsmedia/plugins/pcata/spec/versions
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcata/spec/versions
diff --git a/usr/src/lib/libsmedia/plugins/pcmem/spec/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/Makefile
index 6ce491ea74..6ce491ea74 100644
--- a/usr/src/lib/libsmedia/plugins/pcmem/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/pcmem/spec/Makefile.targ b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/Makefile.targ
index 94650b8956..94650b8956 100644
--- a/usr/src/lib/libsmedia/plugins/pcmem/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/Makefile.targ
diff --git a/usr/src/lib/libsmedia/plugins/pcmem/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/amd64/Makefile
index 65f7fce23f..65f7fce23f 100644
--- a/usr/src/lib/libsmedia/plugins/pcmem/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/amd64/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/pcmem/spec/i386/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/i386/Makefile
index 62e294ae5a..62e294ae5a 100644
--- a/usr/src/lib/libsmedia/plugins/pcmem/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/i386/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/pcmem/spec/sm_pcmem.spec b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/sm_pcmem.spec
index 703655385a..703655385a 100644
--- a/usr/src/lib/libsmedia/plugins/pcmem/spec/sm_pcmem.spec
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/sm_pcmem.spec
diff --git a/usr/src/lib/libsmedia/plugins/pcmem/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/sparc/Makefile
index 20d205ce9e..20d205ce9e 100644
--- a/usr/src/lib/libsmedia/plugins/pcmem/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/sparc/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/pcmem/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/sparcv9/Makefile
index 18ea5ae534..18ea5ae534 100644
--- a/usr/src/lib/libsmedia/plugins/pcmem/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/pcmem/spec/versions b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/versions
index bdf810a5ef..bdf810a5ef 100644
--- a/usr/src/lib/libsmedia/plugins/pcmem/spec/versions
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/pcmem/spec/versions
diff --git a/usr/src/lib/libsmedia/plugins/scsi/spec/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/Makefile
index facb7a614c..facb7a614c 100644
--- a/usr/src/lib/libsmedia/plugins/scsi/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/scsi/spec/Makefile.targ b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/Makefile.targ
index 9809667a23..9809667a23 100644
--- a/usr/src/lib/libsmedia/plugins/scsi/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/Makefile.targ
diff --git a/usr/src/lib/libsmedia/plugins/scsi/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/amd64/Makefile
index 65f7fce23f..65f7fce23f 100644
--- a/usr/src/lib/libsmedia/plugins/scsi/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/amd64/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/scsi/spec/i386/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/i386/Makefile
index 2e2317a67f..2e2317a67f 100644
--- a/usr/src/lib/libsmedia/plugins/scsi/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/i386/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/scsi/spec/sm_scsi.spec b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/sm_scsi.spec
index b341b2a298..b341b2a298 100644
--- a/usr/src/lib/libsmedia/plugins/scsi/spec/sm_scsi.spec
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/sm_scsi.spec
diff --git a/usr/src/lib/libsmedia/plugins/scsi/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/sparc/Makefile
index 100677af49..100677af49 100644
--- a/usr/src/lib/libsmedia/plugins/scsi/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/sparc/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/scsi/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/sparcv9/Makefile
index b75a221440..b75a221440 100644
--- a/usr/src/lib/libsmedia/plugins/scsi/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsmedia/plugins/scsi/spec/versions b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/versions
index c0d5814fbd..c0d5814fbd 100644
--- a/usr/src/lib/libsmedia/plugins/scsi/spec/versions
+++ b/deleted_files/usr/src/lib/libsmedia/plugins/scsi/spec/versions
diff --git a/usr/src/lib/libsocket/spec/Makefile b/deleted_files/usr/src/lib/libsocket/spec/Makefile
index e64c72ecb3..e64c72ecb3 100644
--- a/usr/src/lib/libsocket/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsocket/spec/Makefile
diff --git a/usr/src/lib/libsocket/spec/Makefile.targ b/deleted_files/usr/src/lib/libsocket/spec/Makefile.targ
index 9cc59c24e7..9cc59c24e7 100644
--- a/usr/src/lib/libsocket/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsocket/spec/Makefile.targ
diff --git a/usr/src/lib/libsocket/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsocket/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libsocket/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsocket/spec/amd64/Makefile
diff --git a/usr/src/lib/libsocket/spec/i386/Makefile b/deleted_files/usr/src/lib/libsocket/spec/i386/Makefile
index e5a8b4318a..e5a8b4318a 100644
--- a/usr/src/lib/libsocket/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsocket/spec/i386/Makefile
diff --git a/usr/src/lib/libsocket/spec/socket.spec b/deleted_files/usr/src/lib/libsocket/spec/socket.spec
index bb614f918b..bb614f918b 100644
--- a/usr/src/lib/libsocket/spec/socket.spec
+++ b/deleted_files/usr/src/lib/libsocket/spec/socket.spec
diff --git a/usr/src/lib/libsocket/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsocket/spec/sparc/Makefile
index 3de398fdd4..3de398fdd4 100644
--- a/usr/src/lib/libsocket/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsocket/spec/sparc/Makefile
diff --git a/usr/src/lib/libsocket/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsocket/spec/sparcv9/Makefile
index 378854c037..378854c037 100644
--- a/usr/src/lib/libsocket/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsocket/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsocket/spec/svr4msg.spec b/deleted_files/usr/src/lib/libsocket/spec/svr4msg.spec
index 47f236948c..47f236948c 100644
--- a/usr/src/lib/libsocket/spec/svr4msg.spec
+++ b/deleted_files/usr/src/lib/libsocket/spec/svr4msg.spec
diff --git a/usr/src/lib/libsocket/spec/versions b/deleted_files/usr/src/lib/libsocket/spec/versions
index 5ad9b43212..5ad9b43212 100644
--- a/usr/src/lib/libsocket/spec/versions
+++ b/deleted_files/usr/src/lib/libsocket/spec/versions
diff --git a/usr/src/lib/libsocket/spec/xpgmsg.spec b/deleted_files/usr/src/lib/libsocket/spec/xpgmsg.spec
index 61ffcef9f8..61ffcef9f8 100644
--- a/usr/src/lib/libsocket/spec/xpgmsg.spec
+++ b/deleted_files/usr/src/lib/libsocket/spec/xpgmsg.spec
diff --git a/usr/src/lib/libsysevent/spec/Makefile b/deleted_files/usr/src/lib/libsysevent/spec/Makefile
index 1c63d1251e..1c63d1251e 100644
--- a/usr/src/lib/libsysevent/spec/Makefile
+++ b/deleted_files/usr/src/lib/libsysevent/spec/Makefile
diff --git a/usr/src/lib/libsysevent/spec/Makefile.targ b/deleted_files/usr/src/lib/libsysevent/spec/Makefile.targ
index f939d9d889..f939d9d889 100644
--- a/usr/src/lib/libsysevent/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libsysevent/spec/Makefile.targ
diff --git a/usr/src/lib/libsysevent/spec/amd64/Makefile b/deleted_files/usr/src/lib/libsysevent/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/libsysevent/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libsysevent/spec/amd64/Makefile
diff --git a/usr/src/lib/libsysevent/spec/i386/Makefile b/deleted_files/usr/src/lib/libsysevent/spec/i386/Makefile
index 315735abeb..315735abeb 100644
--- a/usr/src/lib/libsysevent/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libsysevent/spec/i386/Makefile
diff --git a/usr/src/lib/libsysevent/spec/sparc/Makefile b/deleted_files/usr/src/lib/libsysevent/spec/sparc/Makefile
index 8af986c67d..8af986c67d 100644
--- a/usr/src/lib/libsysevent/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libsysevent/spec/sparc/Makefile
diff --git a/usr/src/lib/libsysevent/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libsysevent/spec/sparcv9/Makefile
index a4e7cd3f3f..a4e7cd3f3f 100644
--- a/usr/src/lib/libsysevent/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libsysevent/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libsysevent/spec/sysevent.spec b/deleted_files/usr/src/lib/libsysevent/spec/sysevent.spec
index 5f5a2ed660..5f5a2ed660 100644
--- a/usr/src/lib/libsysevent/spec/sysevent.spec
+++ b/deleted_files/usr/src/lib/libsysevent/spec/sysevent.spec
diff --git a/usr/src/lib/libsysevent/spec/versions b/deleted_files/usr/src/lib/libsysevent/spec/versions
index f91c9031df..f91c9031df 100644
--- a/usr/src/lib/libsysevent/spec/versions
+++ b/deleted_files/usr/src/lib/libsysevent/spec/versions
diff --git a/usr/src/lib/libtecla/spec/Makefile b/deleted_files/usr/src/lib/libtecla/spec/Makefile
index 50e74e3c61..50e74e3c61 100644
--- a/usr/src/lib/libtecla/spec/Makefile
+++ b/deleted_files/usr/src/lib/libtecla/spec/Makefile
diff --git a/usr/src/lib/libtecla/spec/Makefile.targ b/deleted_files/usr/src/lib/libtecla/spec/Makefile.targ
index 751465c18c..751465c18c 100644
--- a/usr/src/lib/libtecla/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libtecla/spec/Makefile.targ
diff --git a/usr/src/lib/libtecla/spec/amd64/Makefile b/deleted_files/usr/src/lib/libtecla/spec/amd64/Makefile
index bca8f0b3ac..bca8f0b3ac 100644
--- a/usr/src/lib/libtecla/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libtecla/spec/amd64/Makefile
diff --git a/usr/src/lib/libtecla/spec/i386/Makefile b/deleted_files/usr/src/lib/libtecla/spec/i386/Makefile
index b77da6d531..b77da6d531 100644
--- a/usr/src/lib/libtecla/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libtecla/spec/i386/Makefile
diff --git a/usr/src/lib/libtecla/spec/sparc/Makefile b/deleted_files/usr/src/lib/libtecla/spec/sparc/Makefile
index b77da6d531..b77da6d531 100644
--- a/usr/src/lib/libtecla/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libtecla/spec/sparc/Makefile
diff --git a/usr/src/lib/libtecla/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libtecla/spec/sparcv9/Makefile
index 751257f818..751257f818 100644
--- a/usr/src/lib/libtecla/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libtecla/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libtecla/spec/tecla.spec b/deleted_files/usr/src/lib/libtecla/spec/tecla.spec
index 5f9e7fa158..5f9e7fa158 100644
--- a/usr/src/lib/libtecla/spec/tecla.spec
+++ b/deleted_files/usr/src/lib/libtecla/spec/tecla.spec
diff --git a/usr/src/lib/libtecla/spec/versions b/deleted_files/usr/src/lib/libtecla/spec/versions
index e9969983c9..e9969983c9 100644
--- a/usr/src/lib/libtecla/spec/versions
+++ b/deleted_files/usr/src/lib/libtecla/spec/versions
diff --git a/usr/src/lib/libtnf/spec/Makefile b/deleted_files/usr/src/lib/libtnf/spec/Makefile
index 789cc7cbfa..789cc7cbfa 100644
--- a/usr/src/lib/libtnf/spec/Makefile
+++ b/deleted_files/usr/src/lib/libtnf/spec/Makefile
diff --git a/usr/src/lib/libtnf/spec/Makefile.targ b/deleted_files/usr/src/lib/libtnf/spec/Makefile.targ
index b99ce2250a..b99ce2250a 100644
--- a/usr/src/lib/libtnf/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libtnf/spec/Makefile.targ
diff --git a/usr/src/lib/libtnf/spec/amd64/Makefile b/deleted_files/usr/src/lib/libtnf/spec/amd64/Makefile
index d334868181..d334868181 100644
--- a/usr/src/lib/libtnf/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libtnf/spec/amd64/Makefile
diff --git a/usr/src/lib/libtnf/spec/i386/Makefile b/deleted_files/usr/src/lib/libtnf/spec/i386/Makefile
index 569932e5ab..569932e5ab 100644
--- a/usr/src/lib/libtnf/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libtnf/spec/i386/Makefile
diff --git a/usr/src/lib/libtnf/spec/sparc/Makefile b/deleted_files/usr/src/lib/libtnf/spec/sparc/Makefile
index 9f90d1bd91..9f90d1bd91 100644
--- a/usr/src/lib/libtnf/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libtnf/spec/sparc/Makefile
diff --git a/usr/src/lib/libtnf/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libtnf/spec/sparcv9/Makefile
index cbf3eb7fa6..cbf3eb7fa6 100644
--- a/usr/src/lib/libtnf/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libtnf/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libtnf/spec/tnf.spec b/deleted_files/usr/src/lib/libtnf/spec/tnf.spec
index 9ee8baa0f1..9ee8baa0f1 100644
--- a/usr/src/lib/libtnf/spec/tnf.spec
+++ b/deleted_files/usr/src/lib/libtnf/spec/tnf.spec
diff --git a/usr/src/lib/libtnf/spec/versions b/deleted_files/usr/src/lib/libtnf/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libtnf/spec/versions
+++ b/deleted_files/usr/src/lib/libtnf/spec/versions
diff --git a/usr/src/lib/libtnfctl/spec/Makefile b/deleted_files/usr/src/lib/libtnfctl/spec/Makefile
index 1ca59b30d3..1ca59b30d3 100644
--- a/usr/src/lib/libtnfctl/spec/Makefile
+++ b/deleted_files/usr/src/lib/libtnfctl/spec/Makefile
diff --git a/usr/src/lib/libtnfctl/spec/Makefile.targ b/deleted_files/usr/src/lib/libtnfctl/spec/Makefile.targ
index 07d4d8b869..07d4d8b869 100644
--- a/usr/src/lib/libtnfctl/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libtnfctl/spec/Makefile.targ
diff --git a/usr/src/lib/libtnfctl/spec/amd64/Makefile b/deleted_files/usr/src/lib/libtnfctl/spec/amd64/Makefile
index d334868181..d334868181 100644
--- a/usr/src/lib/libtnfctl/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libtnfctl/spec/amd64/Makefile
diff --git a/usr/src/lib/libtnfctl/spec/i386/Makefile b/deleted_files/usr/src/lib/libtnfctl/spec/i386/Makefile
index c7d5274776..c7d5274776 100644
--- a/usr/src/lib/libtnfctl/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libtnfctl/spec/i386/Makefile
diff --git a/usr/src/lib/libtnfctl/spec/sparc/Makefile b/deleted_files/usr/src/lib/libtnfctl/spec/sparc/Makefile
index a313a6b7bb..a313a6b7bb 100644
--- a/usr/src/lib/libtnfctl/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libtnfctl/spec/sparc/Makefile
diff --git a/usr/src/lib/libtnfctl/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libtnfctl/spec/sparcv9/Makefile
index 7d7a66d4e0..7d7a66d4e0 100644
--- a/usr/src/lib/libtnfctl/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libtnfctl/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libtnfctl/spec/tnfctl.spec b/deleted_files/usr/src/lib/libtnfctl/spec/tnfctl.spec
index ef81742f95..ef81742f95 100644
--- a/usr/src/lib/libtnfctl/spec/tnfctl.spec
+++ b/deleted_files/usr/src/lib/libtnfctl/spec/tnfctl.spec
diff --git a/usr/src/lib/libtnfctl/spec/versions b/deleted_files/usr/src/lib/libtnfctl/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libtnfctl/spec/versions
+++ b/deleted_files/usr/src/lib/libtnfctl/spec/versions
diff --git a/usr/src/lib/libtnfprobe/spec/Makefile b/deleted_files/usr/src/lib/libtnfprobe/spec/Makefile
index ac58046e65..ac58046e65 100644
--- a/usr/src/lib/libtnfprobe/spec/Makefile
+++ b/deleted_files/usr/src/lib/libtnfprobe/spec/Makefile
diff --git a/usr/src/lib/libtnfprobe/spec/Makefile.targ b/deleted_files/usr/src/lib/libtnfprobe/spec/Makefile.targ
index 8db60348fa..8db60348fa 100644
--- a/usr/src/lib/libtnfprobe/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libtnfprobe/spec/Makefile.targ
diff --git a/usr/src/lib/libtnfprobe/spec/amd64/Makefile b/deleted_files/usr/src/lib/libtnfprobe/spec/amd64/Makefile
index d334868181..d334868181 100644
--- a/usr/src/lib/libtnfprobe/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libtnfprobe/spec/amd64/Makefile
diff --git a/usr/src/lib/libtnfprobe/spec/i386/Makefile b/deleted_files/usr/src/lib/libtnfprobe/spec/i386/Makefile
index f1bfd7338d..f1bfd7338d 100644
--- a/usr/src/lib/libtnfprobe/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libtnfprobe/spec/i386/Makefile
diff --git a/usr/src/lib/libtnfprobe/spec/private.spec b/deleted_files/usr/src/lib/libtnfprobe/spec/private.spec
index 013d014460..013d014460 100644
--- a/usr/src/lib/libtnfprobe/spec/private.spec
+++ b/deleted_files/usr/src/lib/libtnfprobe/spec/private.spec
diff --git a/usr/src/lib/libtnfprobe/spec/sparc/Makefile b/deleted_files/usr/src/lib/libtnfprobe/spec/sparc/Makefile
index 28c49c697e..28c49c697e 100644
--- a/usr/src/lib/libtnfprobe/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libtnfprobe/spec/sparc/Makefile
diff --git a/usr/src/lib/libtnfprobe/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libtnfprobe/spec/sparcv9/Makefile
index f42afa00ac..f42afa00ac 100644
--- a/usr/src/lib/libtnfprobe/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libtnfprobe/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libtnfprobe/spec/versions b/deleted_files/usr/src/lib/libtnfprobe/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libtnfprobe/spec/versions
+++ b/deleted_files/usr/src/lib/libtnfprobe/spec/versions
diff --git a/usr/src/lib/libtsnet/spec/Makefile b/deleted_files/usr/src/lib/libtsnet/spec/Makefile
index 66c61a6d05..66c61a6d05 100644
--- a/usr/src/lib/libtsnet/spec/Makefile
+++ b/deleted_files/usr/src/lib/libtsnet/spec/Makefile
diff --git a/usr/src/lib/libtsnet/spec/Makefile.targ b/deleted_files/usr/src/lib/libtsnet/spec/Makefile.targ
index aeafa46121..aeafa46121 100644
--- a/usr/src/lib/libtsnet/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libtsnet/spec/Makefile.targ
diff --git a/usr/src/lib/libtsnet/spec/amd64/Makefile b/deleted_files/usr/src/lib/libtsnet/spec/amd64/Makefile
index 03d9b122a2..03d9b122a2 100644
--- a/usr/src/lib/libtsnet/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libtsnet/spec/amd64/Makefile
diff --git a/usr/src/lib/libtsnet/spec/i386/Makefile b/deleted_files/usr/src/lib/libtsnet/spec/i386/Makefile
index b378e293ca..b378e293ca 100644
--- a/usr/src/lib/libtsnet/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libtsnet/spec/i386/Makefile
diff --git a/usr/src/lib/libtsnet/spec/sparc/Makefile b/deleted_files/usr/src/lib/libtsnet/spec/sparc/Makefile
index 013c8f71b0..013c8f71b0 100644
--- a/usr/src/lib/libtsnet/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libtsnet/spec/sparc/Makefile
diff --git a/usr/src/lib/libtsnet/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libtsnet/spec/sparcv9/Makefile
index 03d9b122a2..03d9b122a2 100644
--- a/usr/src/lib/libtsnet/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libtsnet/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libtsnet/spec/tsnet.spec b/deleted_files/usr/src/lib/libtsnet/spec/tsnet.spec
index 78e222075d..78e222075d 100644
--- a/usr/src/lib/libtsnet/spec/tsnet.spec
+++ b/deleted_files/usr/src/lib/libtsnet/spec/tsnet.spec
diff --git a/usr/src/lib/libtsnet/spec/versions b/deleted_files/usr/src/lib/libtsnet/spec/versions
index 36bb621276..36bb621276 100644
--- a/usr/src/lib/libtsnet/spec/versions
+++ b/deleted_files/usr/src/lib/libtsnet/spec/versions
diff --git a/usr/src/lib/libtsol/spec/Makefile b/deleted_files/usr/src/lib/libtsol/spec/Makefile
index 835bbc66f1..835bbc66f1 100644
--- a/usr/src/lib/libtsol/spec/Makefile
+++ b/deleted_files/usr/src/lib/libtsol/spec/Makefile
diff --git a/usr/src/lib/libtsol/spec/Makefile.targ b/deleted_files/usr/src/lib/libtsol/spec/Makefile.targ
index e76d79a49d..e76d79a49d 100644
--- a/usr/src/lib/libtsol/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libtsol/spec/Makefile.targ
diff --git a/usr/src/lib/libtsol/spec/amd64/Makefile b/deleted_files/usr/src/lib/libtsol/spec/amd64/Makefile
index 03d9b122a2..03d9b122a2 100644
--- a/usr/src/lib/libtsol/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libtsol/spec/amd64/Makefile
diff --git a/usr/src/lib/libtsol/spec/i386/Makefile b/deleted_files/usr/src/lib/libtsol/spec/i386/Makefile
index 7aab1a07a8..7aab1a07a8 100644
--- a/usr/src/lib/libtsol/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libtsol/spec/i386/Makefile
diff --git a/usr/src/lib/libtsol/spec/obsolete.spec b/deleted_files/usr/src/lib/libtsol/spec/obsolete.spec
index ccebc2f8b9..ccebc2f8b9 100644
--- a/usr/src/lib/libtsol/spec/obsolete.spec
+++ b/deleted_files/usr/src/lib/libtsol/spec/obsolete.spec
diff --git a/usr/src/lib/libtsol/spec/private.spec b/deleted_files/usr/src/lib/libtsol/spec/private.spec
index c5e66ea7b6..c5e66ea7b6 100644
--- a/usr/src/lib/libtsol/spec/private.spec
+++ b/deleted_files/usr/src/lib/libtsol/spec/private.spec
diff --git a/usr/src/lib/libtsol/spec/sparc/Makefile b/deleted_files/usr/src/lib/libtsol/spec/sparc/Makefile
index 7aab1a07a8..7aab1a07a8 100644
--- a/usr/src/lib/libtsol/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libtsol/spec/sparc/Makefile
diff --git a/usr/src/lib/libtsol/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libtsol/spec/sparcv9/Makefile
index 03d9b122a2..03d9b122a2 100644
--- a/usr/src/lib/libtsol/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libtsol/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libtsol/spec/tsol.spec b/deleted_files/usr/src/lib/libtsol/spec/tsol.spec
index 089f5eb2ec..089f5eb2ec 100644
--- a/usr/src/lib/libtsol/spec/tsol.spec
+++ b/deleted_files/usr/src/lib/libtsol/spec/tsol.spec
diff --git a/usr/src/lib/libtsol/spec/versions b/deleted_files/usr/src/lib/libtsol/spec/versions
index 40f1cccb72..40f1cccb72 100644
--- a/usr/src/lib/libtsol/spec/versions
+++ b/deleted_files/usr/src/lib/libtsol/spec/versions
diff --git a/usr/src/lib/libumem/spec/Makefile b/deleted_files/usr/src/lib/libumem/spec/Makefile
index 6bbf3f9ad1..6bbf3f9ad1 100644
--- a/usr/src/lib/libumem/spec/Makefile
+++ b/deleted_files/usr/src/lib/libumem/spec/Makefile
diff --git a/usr/src/lib/libumem/spec/Makefile.targ b/deleted_files/usr/src/lib/libumem/spec/Makefile.targ
index 45191e4bd3..45191e4bd3 100644
--- a/usr/src/lib/libumem/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libumem/spec/Makefile.targ
diff --git a/usr/src/lib/libumem/spec/amd64/Makefile b/deleted_files/usr/src/lib/libumem/spec/amd64/Makefile
index 91f01ca104..91f01ca104 100644
--- a/usr/src/lib/libumem/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libumem/spec/amd64/Makefile
diff --git a/usr/src/lib/libumem/spec/i386/Makefile b/deleted_files/usr/src/lib/libumem/spec/i386/Makefile
index b3492827d2..b3492827d2 100644
--- a/usr/src/lib/libumem/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libumem/spec/i386/Makefile
diff --git a/usr/src/lib/libumem/spec/libumem.spec b/deleted_files/usr/src/lib/libumem/spec/libumem.spec
index 1ff510c9d0..1ff510c9d0 100644
--- a/usr/src/lib/libumem/spec/libumem.spec
+++ b/deleted_files/usr/src/lib/libumem/spec/libumem.spec
diff --git a/usr/src/lib/libumem/spec/sparc/Makefile b/deleted_files/usr/src/lib/libumem/spec/sparc/Makefile
index f55cc3ef54..f55cc3ef54 100644
--- a/usr/src/lib/libumem/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libumem/spec/sparc/Makefile
diff --git a/usr/src/lib/libumem/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libumem/spec/sparcv9/Makefile
index d230ddb563..d230ddb563 100644
--- a/usr/src/lib/libumem/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libumem/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libumem/spec/versions b/deleted_files/usr/src/lib/libumem/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/libumem/spec/versions
+++ b/deleted_files/usr/src/lib/libumem/spec/versions
diff --git a/usr/src/lib/libuuid/spec/Makefile b/deleted_files/usr/src/lib/libuuid/spec/Makefile
index f144a481db..f144a481db 100644
--- a/usr/src/lib/libuuid/spec/Makefile
+++ b/deleted_files/usr/src/lib/libuuid/spec/Makefile
diff --git a/usr/src/lib/libuuid/spec/Makefile.targ b/deleted_files/usr/src/lib/libuuid/spec/Makefile.targ
index 2f8fea834e..2f8fea834e 100644
--- a/usr/src/lib/libuuid/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libuuid/spec/Makefile.targ
diff --git a/usr/src/lib/libuuid/spec/amd64/Makefile b/deleted_files/usr/src/lib/libuuid/spec/amd64/Makefile
index d334868181..d334868181 100644
--- a/usr/src/lib/libuuid/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libuuid/spec/amd64/Makefile
diff --git a/usr/src/lib/libuuid/spec/i386/Makefile b/deleted_files/usr/src/lib/libuuid/spec/i386/Makefile
index 179c815f8f..179c815f8f 100644
--- a/usr/src/lib/libuuid/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libuuid/spec/i386/Makefile
diff --git a/usr/src/lib/libuuid/spec/sparc/Makefile b/deleted_files/usr/src/lib/libuuid/spec/sparc/Makefile
index fbd86f3471..fbd86f3471 100644
--- a/usr/src/lib/libuuid/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libuuid/spec/sparc/Makefile
diff --git a/usr/src/lib/libuuid/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libuuid/spec/sparcv9/Makefile
index 63623eaf9b..63623eaf9b 100644
--- a/usr/src/lib/libuuid/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libuuid/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libuuid/spec/uuid.spec b/deleted_files/usr/src/lib/libuuid/spec/uuid.spec
index 501dcdcecf..501dcdcecf 100644
--- a/usr/src/lib/libuuid/spec/uuid.spec
+++ b/deleted_files/usr/src/lib/libuuid/spec/uuid.spec
diff --git a/usr/src/lib/libuuid/spec/versions b/deleted_files/usr/src/lib/libuuid/spec/versions
index 1b96e716d5..1b96e716d5 100644
--- a/usr/src/lib/libuuid/spec/versions
+++ b/deleted_files/usr/src/lib/libuuid/spec/versions
diff --git a/usr/src/lib/libuutil/spec/Makefile b/deleted_files/usr/src/lib/libuutil/spec/Makefile
index 8a87e16694..8a87e16694 100644
--- a/usr/src/lib/libuutil/spec/Makefile
+++ b/deleted_files/usr/src/lib/libuutil/spec/Makefile
diff --git a/usr/src/lib/libuutil/spec/Makefile.targ b/deleted_files/usr/src/lib/libuutil/spec/Makefile.targ
index c8bc4e2f8c..c8bc4e2f8c 100644
--- a/usr/src/lib/libuutil/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libuutil/spec/Makefile.targ
diff --git a/usr/src/lib/libuutil/spec/amd64/Makefile b/deleted_files/usr/src/lib/libuutil/spec/amd64/Makefile
index c6ccbab315..c6ccbab315 100644
--- a/usr/src/lib/libuutil/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libuutil/spec/amd64/Makefile
diff --git a/usr/src/lib/libuutil/spec/i386/Makefile b/deleted_files/usr/src/lib/libuutil/spec/i386/Makefile
index 226ee80bd4..226ee80bd4 100644
--- a/usr/src/lib/libuutil/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libuutil/spec/i386/Makefile
diff --git a/usr/src/lib/libuutil/spec/sparc/Makefile b/deleted_files/usr/src/lib/libuutil/spec/sparc/Makefile
index 3bd5b4de45..3bd5b4de45 100644
--- a/usr/src/lib/libuutil/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libuutil/spec/sparc/Makefile
diff --git a/usr/src/lib/libuutil/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libuutil/spec/sparcv9/Makefile
index dbd9af7ad5..dbd9af7ad5 100644
--- a/usr/src/lib/libuutil/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libuutil/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libuutil/spec/updt.spec b/deleted_files/usr/src/lib/libuutil/spec/updt.spec
index 1a220c8806..1a220c8806 100644
--- a/usr/src/lib/libuutil/spec/updt.spec
+++ b/deleted_files/usr/src/lib/libuutil/spec/updt.spec
diff --git a/usr/src/lib/libuutil/spec/uutil.spec b/deleted_files/usr/src/lib/libuutil/spec/uutil.spec
index cd6ecdfe80..cd6ecdfe80 100644
--- a/usr/src/lib/libuutil/spec/uutil.spec
+++ b/deleted_files/usr/src/lib/libuutil/spec/uutil.spec
diff --git a/usr/src/lib/libuutil/spec/versions b/deleted_files/usr/src/lib/libuutil/spec/versions
index a397482d50..a397482d50 100644
--- a/usr/src/lib/libuutil/spec/versions
+++ b/deleted_files/usr/src/lib/libuutil/spec/versions
diff --git a/usr/src/lib/libvolmgt/spec/Makefile b/deleted_files/usr/src/lib/libvolmgt/spec/Makefile
index ed628396d5..ed628396d5 100644
--- a/usr/src/lib/libvolmgt/spec/Makefile
+++ b/deleted_files/usr/src/lib/libvolmgt/spec/Makefile
diff --git a/usr/src/lib/libvolmgt/spec/Makefile.targ b/deleted_files/usr/src/lib/libvolmgt/spec/Makefile.targ
index b097349e6d..b097349e6d 100644
--- a/usr/src/lib/libvolmgt/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libvolmgt/spec/Makefile.targ
diff --git a/usr/src/lib/libvolmgt/spec/amd64/Makefile b/deleted_files/usr/src/lib/libvolmgt/spec/amd64/Makefile
index 453c0ea671..453c0ea671 100644
--- a/usr/src/lib/libvolmgt/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libvolmgt/spec/amd64/Makefile
diff --git a/usr/src/lib/libvolmgt/spec/i386/Makefile b/deleted_files/usr/src/lib/libvolmgt/spec/i386/Makefile
index 932e9e0c00..932e9e0c00 100644
--- a/usr/src/lib/libvolmgt/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libvolmgt/spec/i386/Makefile
diff --git a/usr/src/lib/libvolmgt/spec/sparc/Makefile b/deleted_files/usr/src/lib/libvolmgt/spec/sparc/Makefile
index d0d95aac44..d0d95aac44 100644
--- a/usr/src/lib/libvolmgt/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libvolmgt/spec/sparc/Makefile
diff --git a/usr/src/lib/libvolmgt/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libvolmgt/spec/sparcv9/Makefile
index 65ea487076..65ea487076 100644
--- a/usr/src/lib/libvolmgt/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libvolmgt/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libvolmgt/spec/versions b/deleted_files/usr/src/lib/libvolmgt/spec/versions
index 36e65e4d0a..36e65e4d0a 100644
--- a/usr/src/lib/libvolmgt/spec/versions
+++ b/deleted_files/usr/src/lib/libvolmgt/spec/versions
diff --git a/usr/src/lib/libvolmgt/spec/volmgt.spec b/deleted_files/usr/src/lib/libvolmgt/spec/volmgt.spec
index 191bffedc5..191bffedc5 100644
--- a/usr/src/lib/libvolmgt/spec/volmgt.spec
+++ b/deleted_files/usr/src/lib/libvolmgt/spec/volmgt.spec
diff --git a/usr/src/lib/libwanboot/spec/Makefile b/deleted_files/usr/src/lib/libwanboot/spec/Makefile
index 2827d8afb2..2827d8afb2 100644
--- a/usr/src/lib/libwanboot/spec/Makefile
+++ b/deleted_files/usr/src/lib/libwanboot/spec/Makefile
diff --git a/usr/src/lib/libwanboot/spec/Makefile.targ b/deleted_files/usr/src/lib/libwanboot/spec/Makefile.targ
index 4b51b21078..4b51b21078 100644
--- a/usr/src/lib/libwanboot/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libwanboot/spec/Makefile.targ
diff --git a/usr/src/lib/libwanboot/spec/amd64/Makefile b/deleted_files/usr/src/lib/libwanboot/spec/amd64/Makefile
index 4ee7613aaf..4ee7613aaf 100644
--- a/usr/src/lib/libwanboot/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libwanboot/spec/amd64/Makefile
diff --git a/usr/src/lib/libwanboot/spec/i386/Makefile b/deleted_files/usr/src/lib/libwanboot/spec/i386/Makefile
index 0ac73af866..0ac73af866 100644
--- a/usr/src/lib/libwanboot/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libwanboot/spec/i386/Makefile
diff --git a/usr/src/lib/libwanboot/spec/sparc/Makefile b/deleted_files/usr/src/lib/libwanboot/spec/sparc/Makefile
index 16c6250202..16c6250202 100644
--- a/usr/src/lib/libwanboot/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libwanboot/spec/sparc/Makefile
diff --git a/usr/src/lib/libwanboot/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libwanboot/spec/sparcv9/Makefile
index 1f494758f4..1f494758f4 100644
--- a/usr/src/lib/libwanboot/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libwanboot/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libwanboot/spec/versions b/deleted_files/usr/src/lib/libwanboot/spec/versions
index 22e0dd1104..22e0dd1104 100644
--- a/usr/src/lib/libwanboot/spec/versions
+++ b/deleted_files/usr/src/lib/libwanboot/spec/versions
diff --git a/usr/src/lib/libwanboot/spec/wanboot.spec b/deleted_files/usr/src/lib/libwanboot/spec/wanboot.spec
index b326ad7f84..b326ad7f84 100644
--- a/usr/src/lib/libwanboot/spec/wanboot.spec
+++ b/deleted_files/usr/src/lib/libwanboot/spec/wanboot.spec
diff --git a/usr/src/lib/libwanbootutil/spec/Makefile b/deleted_files/usr/src/lib/libwanbootutil/spec/Makefile
index 37b7cc69ad..37b7cc69ad 100644
--- a/usr/src/lib/libwanbootutil/spec/Makefile
+++ b/deleted_files/usr/src/lib/libwanbootutil/spec/Makefile
diff --git a/usr/src/lib/libwanbootutil/spec/Makefile.targ b/deleted_files/usr/src/lib/libwanbootutil/spec/Makefile.targ
index 1b7f5046ec..1b7f5046ec 100644
--- a/usr/src/lib/libwanbootutil/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libwanbootutil/spec/Makefile.targ
diff --git a/usr/src/lib/libwanbootutil/spec/amd64/Makefile b/deleted_files/usr/src/lib/libwanbootutil/spec/amd64/Makefile
index 4ee7613aaf..4ee7613aaf 100644
--- a/usr/src/lib/libwanbootutil/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libwanbootutil/spec/amd64/Makefile
diff --git a/usr/src/lib/libwanbootutil/spec/i386/Makefile b/deleted_files/usr/src/lib/libwanbootutil/spec/i386/Makefile
index 80344b3c95..80344b3c95 100644
--- a/usr/src/lib/libwanbootutil/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libwanbootutil/spec/i386/Makefile
diff --git a/usr/src/lib/libwanbootutil/spec/sparc/Makefile b/deleted_files/usr/src/lib/libwanbootutil/spec/sparc/Makefile
index 5808da4dd7..5808da4dd7 100644
--- a/usr/src/lib/libwanbootutil/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libwanbootutil/spec/sparc/Makefile
diff --git a/usr/src/lib/libwanbootutil/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libwanbootutil/spec/sparcv9/Makefile
index b107afa3fb..b107afa3fb 100644
--- a/usr/src/lib/libwanbootutil/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libwanbootutil/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libwanbootutil/spec/versions b/deleted_files/usr/src/lib/libwanbootutil/spec/versions
index 22e0dd1104..22e0dd1104 100644
--- a/usr/src/lib/libwanbootutil/spec/versions
+++ b/deleted_files/usr/src/lib/libwanbootutil/spec/versions
diff --git a/usr/src/lib/libwanbootutil/spec/wanbootutil.spec b/deleted_files/usr/src/lib/libwanbootutil/spec/wanbootutil.spec
index b2e756c857..b2e756c857 100644
--- a/usr/src/lib/libwanbootutil/spec/wanbootutil.spec
+++ b/deleted_files/usr/src/lib/libwanbootutil/spec/wanbootutil.spec
diff --git a/usr/src/lib/libxcurses/spec/Makefile b/deleted_files/usr/src/lib/libxcurses/spec/Makefile
index aba0676d97..aba0676d97 100644
--- a/usr/src/lib/libxcurses/spec/Makefile
+++ b/deleted_files/usr/src/lib/libxcurses/spec/Makefile
diff --git a/usr/src/lib/libxcurses/spec/Makefile.targ b/deleted_files/usr/src/lib/libxcurses/spec/Makefile.targ
index 09f3ea04e9..09f3ea04e9 100644
--- a/usr/src/lib/libxcurses/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libxcurses/spec/Makefile.targ
diff --git a/usr/src/lib/libxcurses/spec/amd64/Makefile b/deleted_files/usr/src/lib/libxcurses/spec/amd64/Makefile
index f0e66f90c9..f0e66f90c9 100644
--- a/usr/src/lib/libxcurses/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libxcurses/spec/amd64/Makefile
diff --git a/usr/src/lib/libxcurses/spec/i386/Makefile b/deleted_files/usr/src/lib/libxcurses/spec/i386/Makefile
index 130dc2cc39..130dc2cc39 100644
--- a/usr/src/lib/libxcurses/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libxcurses/spec/i386/Makefile
diff --git a/usr/src/lib/libxcurses/spec/sparc/Makefile b/deleted_files/usr/src/lib/libxcurses/spec/sparc/Makefile
index a3984406d6..a3984406d6 100644
--- a/usr/src/lib/libxcurses/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libxcurses/spec/sparc/Makefile
diff --git a/usr/src/lib/libxcurses/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libxcurses/spec/sparcv9/Makefile
index 6f9ca8f837..6f9ca8f837 100644
--- a/usr/src/lib/libxcurses/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libxcurses/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libxcurses/spec/versions b/deleted_files/usr/src/lib/libxcurses/spec/versions
index b7d90defcb..b7d90defcb 100644
--- a/usr/src/lib/libxcurses/spec/versions
+++ b/deleted_files/usr/src/lib/libxcurses/spec/versions
diff --git a/usr/src/lib/libxcurses/spec/xcurses.spec b/deleted_files/usr/src/lib/libxcurses/spec/xcurses.spec
index 381201773e..381201773e 100644
--- a/usr/src/lib/libxcurses/spec/xcurses.spec
+++ b/deleted_files/usr/src/lib/libxcurses/spec/xcurses.spec
diff --git a/usr/src/lib/libxcurses2/spec/Makefile b/deleted_files/usr/src/lib/libxcurses2/spec/Makefile
index aba0676d97..aba0676d97 100644
--- a/usr/src/lib/libxcurses2/spec/Makefile
+++ b/deleted_files/usr/src/lib/libxcurses2/spec/Makefile
diff --git a/usr/src/lib/libxcurses2/spec/Makefile.targ b/deleted_files/usr/src/lib/libxcurses2/spec/Makefile.targ
index 27332aebc7..27332aebc7 100644
--- a/usr/src/lib/libxcurses2/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libxcurses2/spec/Makefile.targ
diff --git a/usr/src/lib/libxcurses2/spec/amd64/Makefile b/deleted_files/usr/src/lib/libxcurses2/spec/amd64/Makefile
index 1aa658b7c3..1aa658b7c3 100644
--- a/usr/src/lib/libxcurses2/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libxcurses2/spec/amd64/Makefile
diff --git a/usr/src/lib/libxcurses2/spec/i386/Makefile b/deleted_files/usr/src/lib/libxcurses2/spec/i386/Makefile
index 8758753959..8758753959 100644
--- a/usr/src/lib/libxcurses2/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libxcurses2/spec/i386/Makefile
diff --git a/usr/src/lib/libxcurses2/spec/sparc/Makefile b/deleted_files/usr/src/lib/libxcurses2/spec/sparc/Makefile
index c5b7effa2f..c5b7effa2f 100644
--- a/usr/src/lib/libxcurses2/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libxcurses2/spec/sparc/Makefile
diff --git a/usr/src/lib/libxcurses2/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libxcurses2/spec/sparcv9/Makefile
index 3c17e696b5..3c17e696b5 100644
--- a/usr/src/lib/libxcurses2/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libxcurses2/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libxcurses2/spec/versions b/deleted_files/usr/src/lib/libxcurses2/spec/versions
index 5fa1ed3b51..5fa1ed3b51 100644
--- a/usr/src/lib/libxcurses2/spec/versions
+++ b/deleted_files/usr/src/lib/libxcurses2/spec/versions
diff --git a/usr/src/lib/libxcurses2/spec/xcurses.spec b/deleted_files/usr/src/lib/libxcurses2/spec/xcurses.spec
index b530fb89fb..b530fb89fb 100644
--- a/usr/src/lib/libxcurses2/spec/xcurses.spec
+++ b/deleted_files/usr/src/lib/libxcurses2/spec/xcurses.spec
diff --git a/usr/src/lib/libzfs/spec/Makefile b/deleted_files/usr/src/lib/libzfs/spec/Makefile
index 2cb984bfc9..2cb984bfc9 100644
--- a/usr/src/lib/libzfs/spec/Makefile
+++ b/deleted_files/usr/src/lib/libzfs/spec/Makefile
diff --git a/usr/src/lib/libzfs/spec/Makefile.targ b/deleted_files/usr/src/lib/libzfs/spec/Makefile.targ
index 5af8faa767..5af8faa767 100644
--- a/usr/src/lib/libzfs/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libzfs/spec/Makefile.targ
diff --git a/usr/src/lib/libzfs/spec/amd64/Makefile b/deleted_files/usr/src/lib/libzfs/spec/amd64/Makefile
index 98db1f9271..98db1f9271 100644
--- a/usr/src/lib/libzfs/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libzfs/spec/amd64/Makefile
diff --git a/usr/src/lib/libzfs/spec/i386/Makefile b/deleted_files/usr/src/lib/libzfs/spec/i386/Makefile
index 6256c68c81..6256c68c81 100644
--- a/usr/src/lib/libzfs/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libzfs/spec/i386/Makefile
diff --git a/usr/src/lib/libzfs/spec/libzfs.spec b/deleted_files/usr/src/lib/libzfs/spec/libzfs.spec
index e5d33c678a..e5d33c678a 100644
--- a/usr/src/lib/libzfs/spec/libzfs.spec
+++ b/deleted_files/usr/src/lib/libzfs/spec/libzfs.spec
diff --git a/usr/src/lib/libzfs/spec/sparc/Makefile b/deleted_files/usr/src/lib/libzfs/spec/sparc/Makefile
index 6256c68c81..6256c68c81 100644
--- a/usr/src/lib/libzfs/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libzfs/spec/sparc/Makefile
diff --git a/usr/src/lib/libzfs/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libzfs/spec/sparcv9/Makefile
index 98db1f9271..98db1f9271 100644
--- a/usr/src/lib/libzfs/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libzfs/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libzfs/spec/versions b/deleted_files/usr/src/lib/libzfs/spec/versions
index 0cbdf7e792..0cbdf7e792 100644
--- a/usr/src/lib/libzfs/spec/versions
+++ b/deleted_files/usr/src/lib/libzfs/spec/versions
diff --git a/usr/src/lib/libzfs_jni/spec/Makefile b/deleted_files/usr/src/lib/libzfs_jni/spec/Makefile
index 2cb984bfc9..2cb984bfc9 100644
--- a/usr/src/lib/libzfs_jni/spec/Makefile
+++ b/deleted_files/usr/src/lib/libzfs_jni/spec/Makefile
diff --git a/usr/src/lib/libzfs_jni/spec/Makefile.targ b/deleted_files/usr/src/lib/libzfs_jni/spec/Makefile.targ
index 0a844e13a9..0a844e13a9 100644
--- a/usr/src/lib/libzfs_jni/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libzfs_jni/spec/Makefile.targ
diff --git a/usr/src/lib/libzfs_jni/spec/amd64/Makefile b/deleted_files/usr/src/lib/libzfs_jni/spec/amd64/Makefile
index 98db1f9271..98db1f9271 100644
--- a/usr/src/lib/libzfs_jni/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libzfs_jni/spec/amd64/Makefile
diff --git a/usr/src/lib/libzfs_jni/spec/i386/Makefile b/deleted_files/usr/src/lib/libzfs_jni/spec/i386/Makefile
index 6256c68c81..6256c68c81 100644
--- a/usr/src/lib/libzfs_jni/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libzfs_jni/spec/i386/Makefile
diff --git a/usr/src/lib/libzfs_jni/spec/libzfs_jni.spec b/deleted_files/usr/src/lib/libzfs_jni/spec/libzfs_jni.spec
index 5da10c71fb..5da10c71fb 100644
--- a/usr/src/lib/libzfs_jni/spec/libzfs_jni.spec
+++ b/deleted_files/usr/src/lib/libzfs_jni/spec/libzfs_jni.spec
diff --git a/usr/src/lib/libzfs_jni/spec/sparc/Makefile b/deleted_files/usr/src/lib/libzfs_jni/spec/sparc/Makefile
index 6256c68c81..6256c68c81 100644
--- a/usr/src/lib/libzfs_jni/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libzfs_jni/spec/sparc/Makefile
diff --git a/usr/src/lib/libzfs_jni/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libzfs_jni/spec/sparcv9/Makefile
index 98db1f9271..98db1f9271 100644
--- a/usr/src/lib/libzfs_jni/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libzfs_jni/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libzfs_jni/spec/versions b/deleted_files/usr/src/lib/libzfs_jni/spec/versions
index 5b067849f5..5b067849f5 100644
--- a/usr/src/lib/libzfs_jni/spec/versions
+++ b/deleted_files/usr/src/lib/libzfs_jni/spec/versions
diff --git a/usr/src/lib/libzonecfg/spec/Makefile b/deleted_files/usr/src/lib/libzonecfg/spec/Makefile
index cb95f72f3b..cb95f72f3b 100644
--- a/usr/src/lib/libzonecfg/spec/Makefile
+++ b/deleted_files/usr/src/lib/libzonecfg/spec/Makefile
diff --git a/usr/src/lib/libzonecfg/spec/Makefile.targ b/deleted_files/usr/src/lib/libzonecfg/spec/Makefile.targ
index d2732b9081..d2732b9081 100644
--- a/usr/src/lib/libzonecfg/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libzonecfg/spec/Makefile.targ
diff --git a/usr/src/lib/libzonecfg/spec/amd64/Makefile b/deleted_files/usr/src/lib/libzonecfg/spec/amd64/Makefile
index 751257f818..751257f818 100644
--- a/usr/src/lib/libzonecfg/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libzonecfg/spec/amd64/Makefile
diff --git a/usr/src/lib/libzonecfg/spec/i386/Makefile b/deleted_files/usr/src/lib/libzonecfg/spec/i386/Makefile
index 9b52fa33bf..9b52fa33bf 100644
--- a/usr/src/lib/libzonecfg/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libzonecfg/spec/i386/Makefile
diff --git a/usr/src/lib/libzonecfg/spec/libzonecfg.spec b/deleted_files/usr/src/lib/libzonecfg/spec/libzonecfg.spec
index 06cb413a43..06cb413a43 100644
--- a/usr/src/lib/libzonecfg/spec/libzonecfg.spec
+++ b/deleted_files/usr/src/lib/libzonecfg/spec/libzonecfg.spec
diff --git a/usr/src/lib/libzonecfg/spec/sparc/Makefile b/deleted_files/usr/src/lib/libzonecfg/spec/sparc/Makefile
index 9b52fa33bf..9b52fa33bf 100644
--- a/usr/src/lib/libzonecfg/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libzonecfg/spec/sparc/Makefile
diff --git a/usr/src/lib/libzonecfg/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libzonecfg/spec/sparcv9/Makefile
index 29320c8700..29320c8700 100644
--- a/usr/src/lib/libzonecfg/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libzonecfg/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libzonecfg/spec/versions b/deleted_files/usr/src/lib/libzonecfg/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libzonecfg/spec/versions
+++ b/deleted_files/usr/src/lib/libzonecfg/spec/versions
diff --git a/usr/src/lib/libzoneinfo/spec/Makefile b/deleted_files/usr/src/lib/libzoneinfo/spec/Makefile
index f909e0fac7..f909e0fac7 100644
--- a/usr/src/lib/libzoneinfo/spec/Makefile
+++ b/deleted_files/usr/src/lib/libzoneinfo/spec/Makefile
diff --git a/usr/src/lib/libzoneinfo/spec/Makefile.targ b/deleted_files/usr/src/lib/libzoneinfo/spec/Makefile.targ
index 4209e89b5c..4209e89b5c 100644
--- a/usr/src/lib/libzoneinfo/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/libzoneinfo/spec/Makefile.targ
diff --git a/usr/src/lib/libzoneinfo/spec/amd64/Makefile b/deleted_files/usr/src/lib/libzoneinfo/spec/amd64/Makefile
index 4ee7613aaf..4ee7613aaf 100644
--- a/usr/src/lib/libzoneinfo/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/libzoneinfo/spec/amd64/Makefile
diff --git a/usr/src/lib/libzoneinfo/spec/i386/Makefile b/deleted_files/usr/src/lib/libzoneinfo/spec/i386/Makefile
index 09fbf92572..09fbf92572 100644
--- a/usr/src/lib/libzoneinfo/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/libzoneinfo/spec/i386/Makefile
diff --git a/usr/src/lib/libzoneinfo/spec/sparc/Makefile b/deleted_files/usr/src/lib/libzoneinfo/spec/sparc/Makefile
index 09fbf92572..09fbf92572 100644
--- a/usr/src/lib/libzoneinfo/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/libzoneinfo/spec/sparc/Makefile
diff --git a/usr/src/lib/libzoneinfo/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/libzoneinfo/spec/sparcv9/Makefile
index 2c98f6189b..2c98f6189b 100644
--- a/usr/src/lib/libzoneinfo/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/libzoneinfo/spec/sparcv9/Makefile
diff --git a/usr/src/lib/libzoneinfo/spec/versions b/deleted_files/usr/src/lib/libzoneinfo/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/libzoneinfo/spec/versions
+++ b/deleted_files/usr/src/lib/libzoneinfo/spec/versions
diff --git a/usr/src/lib/libzoneinfo/spec/zoneinfo.spec b/deleted_files/usr/src/lib/libzoneinfo/spec/zoneinfo.spec
index 11913d6621..11913d6621 100644
--- a/usr/src/lib/libzoneinfo/spec/zoneinfo.spec
+++ b/deleted_files/usr/src/lib/libzoneinfo/spec/zoneinfo.spec
diff --git a/usr/src/lib/lvm/libmeta/spec/Makefile b/deleted_files/usr/src/lib/lvm/libmeta/spec/Makefile
index 5e88f3ac7e..5e88f3ac7e 100644
--- a/usr/src/lib/lvm/libmeta/spec/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libmeta/spec/Makefile
diff --git a/usr/src/lib/lvm/libmeta/spec/Makefile.targ b/deleted_files/usr/src/lib/lvm/libmeta/spec/Makefile.targ
index 40ffb28073..40ffb28073 100644
--- a/usr/src/lib/lvm/libmeta/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/lvm/libmeta/spec/Makefile.targ
diff --git a/usr/src/lib/lvm/libmeta/spec/amd64/Makefile b/deleted_files/usr/src/lib/lvm/libmeta/spec/amd64/Makefile
index c7d89e007c..c7d89e007c 100644
--- a/usr/src/lib/lvm/libmeta/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libmeta/spec/amd64/Makefile
diff --git a/usr/src/lib/lvm/libmeta/spec/i386/Makefile b/deleted_files/usr/src/lib/lvm/libmeta/spec/i386/Makefile
index 3fe06d99af..3fe06d99af 100644
--- a/usr/src/lib/lvm/libmeta/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libmeta/spec/i386/Makefile
diff --git a/usr/src/lib/lvm/libmeta/spec/meta.spec b/deleted_files/usr/src/lib/lvm/libmeta/spec/meta.spec
index e9def563b1..e9def563b1 100644
--- a/usr/src/lib/lvm/libmeta/spec/meta.spec
+++ b/deleted_files/usr/src/lib/lvm/libmeta/spec/meta.spec
diff --git a/usr/src/lib/lvm/libmeta/spec/sparc/Makefile b/deleted_files/usr/src/lib/lvm/libmeta/spec/sparc/Makefile
index 8d93c87287..8d93c87287 100644
--- a/usr/src/lib/lvm/libmeta/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libmeta/spec/sparc/Makefile
diff --git a/usr/src/lib/lvm/libmeta/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/lvm/libmeta/spec/sparcv9/Makefile
index 5a7be1d65b..5a7be1d65b 100644
--- a/usr/src/lib/lvm/libmeta/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libmeta/spec/sparcv9/Makefile
diff --git a/usr/src/lib/lvm/libmeta/spec/versions b/deleted_files/usr/src/lib/lvm/libmeta/spec/versions
index 523cb927d5..523cb927d5 100644
--- a/usr/src/lib/lvm/libmeta/spec/versions
+++ b/deleted_files/usr/src/lib/lvm/libmeta/spec/versions
diff --git a/usr/src/lib/lvm/libpreen/spec/Makefile b/deleted_files/usr/src/lib/lvm/libpreen/spec/Makefile
index 4f28d95836..4f28d95836 100644
--- a/usr/src/lib/lvm/libpreen/spec/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libpreen/spec/Makefile
diff --git a/usr/src/lib/lvm/libpreen/spec/Makefile.targ b/deleted_files/usr/src/lib/lvm/libpreen/spec/Makefile.targ
index 582a2c4653..582a2c4653 100644
--- a/usr/src/lib/lvm/libpreen/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/lvm/libpreen/spec/Makefile.targ
diff --git a/usr/src/lib/lvm/libpreen/spec/amd64/Makefile b/deleted_files/usr/src/lib/lvm/libpreen/spec/amd64/Makefile
index c7d89e007c..c7d89e007c 100644
--- a/usr/src/lib/lvm/libpreen/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libpreen/spec/amd64/Makefile
diff --git a/usr/src/lib/lvm/libpreen/spec/i386/Makefile b/deleted_files/usr/src/lib/lvm/libpreen/spec/i386/Makefile
index a50dd5cd36..a50dd5cd36 100644
--- a/usr/src/lib/lvm/libpreen/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libpreen/spec/i386/Makefile
diff --git a/usr/src/lib/lvm/libpreen/spec/preen.spec b/deleted_files/usr/src/lib/lvm/libpreen/spec/preen.spec
index 839c0fcafe..839c0fcafe 100644
--- a/usr/src/lib/lvm/libpreen/spec/preen.spec
+++ b/deleted_files/usr/src/lib/lvm/libpreen/spec/preen.spec
diff --git a/usr/src/lib/lvm/libpreen/spec/sparc/Makefile b/deleted_files/usr/src/lib/lvm/libpreen/spec/sparc/Makefile
index f3d039672f..f3d039672f 100644
--- a/usr/src/lib/lvm/libpreen/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libpreen/spec/sparc/Makefile
diff --git a/usr/src/lib/lvm/libpreen/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/lvm/libpreen/spec/sparcv9/Makefile
index 520e996ffb..520e996ffb 100644
--- a/usr/src/lib/lvm/libpreen/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libpreen/spec/sparcv9/Makefile
diff --git a/usr/src/lib/lvm/libpreen/spec/versions b/deleted_files/usr/src/lib/lvm/libpreen/spec/versions
index 523cb927d5..523cb927d5 100644
--- a/usr/src/lib/lvm/libpreen/spec/versions
+++ b/deleted_files/usr/src/lib/lvm/libpreen/spec/versions
diff --git a/usr/src/lib/lvm/libsvm/spec/Makefile b/deleted_files/usr/src/lib/lvm/libsvm/spec/Makefile
index 7256a09a20..7256a09a20 100644
--- a/usr/src/lib/lvm/libsvm/spec/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libsvm/spec/Makefile
diff --git a/usr/src/lib/lvm/libsvm/spec/Makefile.targ b/deleted_files/usr/src/lib/lvm/libsvm/spec/Makefile.targ
index 3a5ed0eb26..3a5ed0eb26 100644
--- a/usr/src/lib/lvm/libsvm/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/lvm/libsvm/spec/Makefile.targ
diff --git a/usr/src/lib/lvm/libsvm/spec/amd64/Makefile b/deleted_files/usr/src/lib/lvm/libsvm/spec/amd64/Makefile
index a3a067f7a0..a3a067f7a0 100644
--- a/usr/src/lib/lvm/libsvm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libsvm/spec/amd64/Makefile
diff --git a/usr/src/lib/lvm/libsvm/spec/i386/Makefile b/deleted_files/usr/src/lib/lvm/libsvm/spec/i386/Makefile
index 23807a39c5..23807a39c5 100644
--- a/usr/src/lib/lvm/libsvm/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libsvm/spec/i386/Makefile
diff --git a/usr/src/lib/lvm/libsvm/spec/sparc/Makefile b/deleted_files/usr/src/lib/lvm/libsvm/spec/sparc/Makefile
index 19aecc452c..19aecc452c 100644
--- a/usr/src/lib/lvm/libsvm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libsvm/spec/sparc/Makefile
diff --git a/usr/src/lib/lvm/libsvm/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/lvm/libsvm/spec/sparcv9/Makefile
index 704f35f988..704f35f988 100644
--- a/usr/src/lib/lvm/libsvm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/lvm/libsvm/spec/sparcv9/Makefile
diff --git a/usr/src/lib/lvm/libsvm/spec/svm.spec b/deleted_files/usr/src/lib/lvm/libsvm/spec/svm.spec
index ae381eaae5..ae381eaae5 100644
--- a/usr/src/lib/lvm/libsvm/spec/svm.spec
+++ b/deleted_files/usr/src/lib/lvm/libsvm/spec/svm.spec
diff --git a/usr/src/lib/lvm/libsvm/spec/versions b/deleted_files/usr/src/lib/lvm/libsvm/spec/versions
index 523cb927d5..523cb927d5 100644
--- a/usr/src/lib/lvm/libsvm/spec/versions
+++ b/deleted_files/usr/src/lib/lvm/libsvm/spec/versions
diff --git a/usr/src/lib/nametoaddr/straddr/spec/Makefile b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/Makefile
index 3a326caeb9..3a326caeb9 100644
--- a/usr/src/lib/nametoaddr/straddr/spec/Makefile
+++ b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/Makefile
diff --git a/usr/src/lib/nametoaddr/straddr/spec/Makefile.targ b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/Makefile.targ
index edd28218b7..edd28218b7 100644
--- a/usr/src/lib/nametoaddr/straddr/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/Makefile.targ
diff --git a/usr/src/lib/nametoaddr/straddr/spec/amd64/Makefile b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/amd64/Makefile
index 2e565ec504..2e565ec504 100644
--- a/usr/src/lib/nametoaddr/straddr/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/amd64/Makefile
diff --git a/usr/src/lib/nametoaddr/straddr/spec/i386/Makefile b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/i386/Makefile
index 9f250576b0..9f250576b0 100644
--- a/usr/src/lib/nametoaddr/straddr/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/i386/Makefile
diff --git a/usr/src/lib/nametoaddr/straddr/spec/sparc/Makefile b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/sparc/Makefile
index 692a223716..692a223716 100644
--- a/usr/src/lib/nametoaddr/straddr/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/sparc/Makefile
diff --git a/usr/src/lib/nametoaddr/straddr/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/sparcv9/Makefile
index e6bda7370c..e6bda7370c 100644
--- a/usr/src/lib/nametoaddr/straddr/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/sparcv9/Makefile
diff --git a/usr/src/lib/nametoaddr/straddr/spec/straddr.spec b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/straddr.spec
index 7ffcca448e..7ffcca448e 100644
--- a/usr/src/lib/nametoaddr/straddr/spec/straddr.spec
+++ b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/straddr.spec
diff --git a/usr/src/lib/nametoaddr/straddr/spec/versions b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/versions
index f8f9e023f4..f8f9e023f4 100644
--- a/usr/src/lib/nametoaddr/straddr/spec/versions
+++ b/deleted_files/usr/src/lib/nametoaddr/straddr/spec/versions
diff --git a/usr/src/lib/ncad_addr/spec/Makefile b/deleted_files/usr/src/lib/ncad_addr/spec/Makefile
index 1573519434..1573519434 100644
--- a/usr/src/lib/ncad_addr/spec/Makefile
+++ b/deleted_files/usr/src/lib/ncad_addr/spec/Makefile
diff --git a/usr/src/lib/ncad_addr/spec/Makefile.targ b/deleted_files/usr/src/lib/ncad_addr/spec/Makefile.targ
index 48245294b8..48245294b8 100644
--- a/usr/src/lib/ncad_addr/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/ncad_addr/spec/Makefile.targ
diff --git a/usr/src/lib/ncad_addr/spec/amd64/Makefile b/deleted_files/usr/src/lib/ncad_addr/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/ncad_addr/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/ncad_addr/spec/amd64/Makefile
diff --git a/usr/src/lib/ncad_addr/spec/i386/Makefile b/deleted_files/usr/src/lib/ncad_addr/spec/i386/Makefile
index 4198b9fd59..4198b9fd59 100644
--- a/usr/src/lib/ncad_addr/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/ncad_addr/spec/i386/Makefile
diff --git a/usr/src/lib/ncad_addr/spec/ncad_addr.spec b/deleted_files/usr/src/lib/ncad_addr/spec/ncad_addr.spec
index 6f125c5170..6f125c5170 100644
--- a/usr/src/lib/ncad_addr/spec/ncad_addr.spec
+++ b/deleted_files/usr/src/lib/ncad_addr/spec/ncad_addr.spec
diff --git a/usr/src/lib/ncad_addr/spec/sparc/Makefile b/deleted_files/usr/src/lib/ncad_addr/spec/sparc/Makefile
index 630e63697c..630e63697c 100644
--- a/usr/src/lib/ncad_addr/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/ncad_addr/spec/sparc/Makefile
diff --git a/usr/src/lib/ncad_addr/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/ncad_addr/spec/sparcv9/Makefile
index 09aa43d1c5..09aa43d1c5 100644
--- a/usr/src/lib/ncad_addr/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/ncad_addr/spec/sparcv9/Makefile
diff --git a/usr/src/lib/ncad_addr/spec/versions b/deleted_files/usr/src/lib/ncad_addr/spec/versions
index 7b17a9f5db..7b17a9f5db 100644
--- a/usr/src/lib/ncad_addr/spec/versions
+++ b/deleted_files/usr/src/lib/ncad_addr/spec/versions
diff --git a/usr/src/lib/pam_modules/allow/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/allow/spec/Makefile
index 2cb984bfc9..2cb984bfc9 100644
--- a/usr/src/lib/pam_modules/allow/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/allow/spec/Makefile
diff --git a/usr/src/lib/pam_modules/allow/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/allow/spec/Makefile.targ
index c669fc5a62..c669fc5a62 100644
--- a/usr/src/lib/pam_modules/allow/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/allow/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/allow/spec/allow.spec b/deleted_files/usr/src/lib/pam_modules/allow/spec/allow.spec
index 5232771b6e..5232771b6e 100644
--- a/usr/src/lib/pam_modules/allow/spec/allow.spec
+++ b/deleted_files/usr/src/lib/pam_modules/allow/spec/allow.spec
diff --git a/usr/src/lib/pam_modules/allow/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/allow/spec/amd64/Makefile
index 96d246e35a..96d246e35a 100644
--- a/usr/src/lib/pam_modules/allow/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/allow/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/allow/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/allow/spec/i386/Makefile
index d54874ae3f..d54874ae3f 100644
--- a/usr/src/lib/pam_modules/allow/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/allow/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/allow/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/allow/spec/sparc/Makefile
index d54874ae3f..d54874ae3f 100644
--- a/usr/src/lib/pam_modules/allow/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/allow/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/allow/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/allow/spec/sparcv9/Makefile
index dde563465e..dde563465e 100644
--- a/usr/src/lib/pam_modules/allow/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/allow/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/allow/spec/versions b/deleted_files/usr/src/lib/pam_modules/allow/spec/versions
index 82d42faa94..82d42faa94 100644
--- a/usr/src/lib/pam_modules/allow/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/allow/spec/versions
diff --git a/usr/src/lib/pam_modules/authtok_check/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/Makefile
index 06c2392c67..06c2392c67 100644
--- a/usr/src/lib/pam_modules/authtok_check/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_check/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/Makefile.targ
index 8c814deb8f..8c814deb8f 100644
--- a/usr/src/lib/pam_modules/authtok_check/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/authtok_check/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/authtok_check/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_check/spec/authtok_check.spec b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/authtok_check.spec
index 7df7f4788e..7df7f4788e 100644
--- a/usr/src/lib/pam_modules/authtok_check/spec/authtok_check.spec
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/authtok_check.spec
diff --git a/usr/src/lib/pam_modules/authtok_check/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/i386/Makefile
index 3e282be4af..3e282be4af 100644
--- a/usr/src/lib/pam_modules/authtok_check/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_check/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/sparc/Makefile
index c4a35ff0d3..c4a35ff0d3 100644
--- a/usr/src/lib/pam_modules/authtok_check/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_check/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/sparcv9/Makefile
index b0fd603cf2..b0fd603cf2 100644
--- a/usr/src/lib/pam_modules/authtok_check/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_check/spec/versions b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/authtok_check/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_check/spec/versions
diff --git a/usr/src/lib/pam_modules/authtok_get/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/Makefile
index 93a676e77b..93a676e77b 100644
--- a/usr/src/lib/pam_modules/authtok_get/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_get/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/Makefile.targ
index 5811176f03..5811176f03 100644
--- a/usr/src/lib/pam_modules/authtok_get/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/authtok_get/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/authtok_get/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_get/spec/authtok_get.spec b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/authtok_get.spec
index 8e6ee2bc16..8e6ee2bc16 100644
--- a/usr/src/lib/pam_modules/authtok_get/spec/authtok_get.spec
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/authtok_get.spec
diff --git a/usr/src/lib/pam_modules/authtok_get/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/i386/Makefile
index e0b5a43cc6..e0b5a43cc6 100644
--- a/usr/src/lib/pam_modules/authtok_get/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_get/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/sparc/Makefile
index bde89cab1c..bde89cab1c 100644
--- a/usr/src/lib/pam_modules/authtok_get/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_get/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/sparcv9/Makefile
index adcca29323..adcca29323 100644
--- a/usr/src/lib/pam_modules/authtok_get/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_get/spec/versions b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/authtok_get/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_get/spec/versions
diff --git a/usr/src/lib/pam_modules/authtok_store/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/Makefile
index 520fd4a586..520fd4a586 100644
--- a/usr/src/lib/pam_modules/authtok_store/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_store/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/Makefile.targ
index 4ac98d4da1..4ac98d4da1 100644
--- a/usr/src/lib/pam_modules/authtok_store/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/authtok_store/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/authtok_store/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_store/spec/authtok_store.spec b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/authtok_store.spec
index 7c360123ab..7c360123ab 100644
--- a/usr/src/lib/pam_modules/authtok_store/spec/authtok_store.spec
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/authtok_store.spec
diff --git a/usr/src/lib/pam_modules/authtok_store/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/i386/Makefile
index 13f3b41fac..13f3b41fac 100644
--- a/usr/src/lib/pam_modules/authtok_store/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_store/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/sparc/Makefile
index d4d7c32790..d4d7c32790 100644
--- a/usr/src/lib/pam_modules/authtok_store/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_store/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/sparcv9/Makefile
index f83d2fa3cf..f83d2fa3cf 100644
--- a/usr/src/lib/pam_modules/authtok_store/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/authtok_store/spec/versions b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/authtok_store/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/authtok_store/spec/versions
diff --git a/usr/src/lib/pam_modules/deny/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/deny/spec/Makefile
index c0724f85fb..c0724f85fb 100644
--- a/usr/src/lib/pam_modules/deny/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/deny/spec/Makefile
diff --git a/usr/src/lib/pam_modules/deny/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/deny/spec/Makefile.targ
index 0710f0081f..0710f0081f 100644
--- a/usr/src/lib/pam_modules/deny/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/deny/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/deny/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/deny/spec/amd64/Makefile
index 48b4115203..48b4115203 100644
--- a/usr/src/lib/pam_modules/deny/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/deny/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/deny/spec/deny.spec b/deleted_files/usr/src/lib/pam_modules/deny/spec/deny.spec
index b7eec36a51..b7eec36a51 100644
--- a/usr/src/lib/pam_modules/deny/spec/deny.spec
+++ b/deleted_files/usr/src/lib/pam_modules/deny/spec/deny.spec
diff --git a/usr/src/lib/pam_modules/deny/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/deny/spec/i386/Makefile
index 4aa508a8e9..4aa508a8e9 100644
--- a/usr/src/lib/pam_modules/deny/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/deny/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/deny/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/deny/spec/sparc/Makefile
index e525e68cd0..e525e68cd0 100644
--- a/usr/src/lib/pam_modules/deny/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/deny/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/deny/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/deny/spec/sparcv9/Makefile
index 9e02669d7c..9e02669d7c 100644
--- a/usr/src/lib/pam_modules/deny/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/deny/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/deny/spec/versions b/deleted_files/usr/src/lib/pam_modules/deny/spec/versions
index 86437cd0a7..86437cd0a7 100644
--- a/usr/src/lib/pam_modules/deny/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/deny/spec/versions
diff --git a/usr/src/lib/pam_modules/dhkeys/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/Makefile
index c2b9bcae68..c2b9bcae68 100644
--- a/usr/src/lib/pam_modules/dhkeys/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/Makefile
diff --git a/usr/src/lib/pam_modules/dhkeys/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/Makefile.targ
index 2100a711d1..2100a711d1 100644
--- a/usr/src/lib/pam_modules/dhkeys/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/dhkeys/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/dhkeys/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/dhkeys/spec/dhkeys.spec b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/dhkeys.spec
index d075e6dd1e..d075e6dd1e 100644
--- a/usr/src/lib/pam_modules/dhkeys/spec/dhkeys.spec
+++ b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/dhkeys.spec
diff --git a/usr/src/lib/pam_modules/dhkeys/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/i386/Makefile
index e7550d6b20..e7550d6b20 100644
--- a/usr/src/lib/pam_modules/dhkeys/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/dhkeys/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/sparc/Makefile
index 8e86546e12..8e86546e12 100644
--- a/usr/src/lib/pam_modules/dhkeys/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/dhkeys/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/sparcv9/Makefile
index 203cac5e40..203cac5e40 100644
--- a/usr/src/lib/pam_modules/dhkeys/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/dhkeys/spec/versions b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/dhkeys/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/dhkeys/spec/versions
diff --git a/usr/src/lib/pam_modules/dial_auth/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/Makefile
index e358b05836..e358b05836 100644
--- a/usr/src/lib/pam_modules/dial_auth/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/Makefile
diff --git a/usr/src/lib/pam_modules/dial_auth/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/Makefile.targ
index 738ef5c688..738ef5c688 100644
--- a/usr/src/lib/pam_modules/dial_auth/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/dial_auth/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/dial_auth/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/dial_auth/spec/dial_auth.spec b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/dial_auth.spec
index 9b81c0fbd4..9b81c0fbd4 100644
--- a/usr/src/lib/pam_modules/dial_auth/spec/dial_auth.spec
+++ b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/dial_auth.spec
diff --git a/usr/src/lib/pam_modules/dial_auth/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/i386/Makefile
index dcf1fb5cba..dcf1fb5cba 100644
--- a/usr/src/lib/pam_modules/dial_auth/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/dial_auth/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/sparc/Makefile
index 8558f69f80..8558f69f80 100644
--- a/usr/src/lib/pam_modules/dial_auth/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/dial_auth/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/sparcv9/Makefile
index a1d2a3ead4..a1d2a3ead4 100644
--- a/usr/src/lib/pam_modules/dial_auth/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/dial_auth/spec/versions b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/dial_auth/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/dial_auth/spec/versions
diff --git a/usr/src/lib/pam_modules/krb5/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/krb5/spec/Makefile
index 78cf5890d4..78cf5890d4 100644
--- a/usr/src/lib/pam_modules/krb5/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/krb5/spec/Makefile
diff --git a/usr/src/lib/pam_modules/krb5/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/krb5/spec/Makefile.targ
index bb25a7d849..bb25a7d849 100644
--- a/usr/src/lib/pam_modules/krb5/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/krb5/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/krb5/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/krb5/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/krb5/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/krb5/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/krb5/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/krb5/spec/i386/Makefile
index 30a05a08c0..30a05a08c0 100644
--- a/usr/src/lib/pam_modules/krb5/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/krb5/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/krb5/spec/krb5.spec b/deleted_files/usr/src/lib/pam_modules/krb5/spec/krb5.spec
index b6668ed83e..b6668ed83e 100644
--- a/usr/src/lib/pam_modules/krb5/spec/krb5.spec
+++ b/deleted_files/usr/src/lib/pam_modules/krb5/spec/krb5.spec
diff --git a/usr/src/lib/pam_modules/krb5/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/krb5/spec/sparc/Makefile
index 7a55cc7dea..7a55cc7dea 100644
--- a/usr/src/lib/pam_modules/krb5/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/krb5/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/krb5/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/krb5/spec/sparcv9/Makefile
index 8e3b8b55d0..8e3b8b55d0 100644
--- a/usr/src/lib/pam_modules/krb5/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/krb5/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/krb5/spec/versions b/deleted_files/usr/src/lib/pam_modules/krb5/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/krb5/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/krb5/spec/versions
diff --git a/usr/src/lib/pam_modules/krb5_migrate/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/Makefile
index 3f6d2c2b4c..3f6d2c2b4c 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/Makefile
diff --git a/usr/src/lib/pam_modules/krb5_migrate/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/Makefile.targ
index c0c7815b55..c0c7815b55 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/krb5_migrate/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/amd64/Makefile
index 30ff120025..30ff120025 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/krb5_migrate/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/i386/Makefile
index 9f99578d57..9f99578d57 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/krb5_migrate/spec/krb5_migrate.spec b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/krb5_migrate.spec
index 55bf5e6b90..55bf5e6b90 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/spec/krb5_migrate.spec
+++ b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/krb5_migrate.spec
diff --git a/usr/src/lib/pam_modules/krb5_migrate/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/sparc/Makefile
index f01592ff5d..f01592ff5d 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/krb5_migrate/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/sparcv9/Makefile
index a684828dac..a684828dac 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/krb5_migrate/spec/versions b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/versions
index 38822b10d4..38822b10d4 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/krb5_migrate/spec/versions
diff --git a/usr/src/lib/pam_modules/ldap/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/ldap/spec/Makefile
index a503035fb5..a503035fb5 100644
--- a/usr/src/lib/pam_modules/ldap/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/ldap/spec/Makefile
diff --git a/usr/src/lib/pam_modules/ldap/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/ldap/spec/Makefile.targ
index 30924ec676..30924ec676 100644
--- a/usr/src/lib/pam_modules/ldap/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/ldap/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/ldap/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/ldap/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/ldap/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/ldap/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/ldap/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/ldap/spec/i386/Makefile
index b7aec962fb..b7aec962fb 100644
--- a/usr/src/lib/pam_modules/ldap/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/ldap/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/ldap/spec/ldap.spec b/deleted_files/usr/src/lib/pam_modules/ldap/spec/ldap.spec
index 66aabbedb7..66aabbedb7 100644
--- a/usr/src/lib/pam_modules/ldap/spec/ldap.spec
+++ b/deleted_files/usr/src/lib/pam_modules/ldap/spec/ldap.spec
diff --git a/usr/src/lib/pam_modules/ldap/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/ldap/spec/sparc/Makefile
index 1991300fff..1991300fff 100644
--- a/usr/src/lib/pam_modules/ldap/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/ldap/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/ldap/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/ldap/spec/sparcv9/Makefile
index dafeb15500..dafeb15500 100644
--- a/usr/src/lib/pam_modules/ldap/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/ldap/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/ldap/spec/versions b/deleted_files/usr/src/lib/pam_modules/ldap/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/ldap/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/ldap/spec/versions
diff --git a/usr/src/lib/pam_modules/passwd_auth/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/Makefile
index 79cb185378..79cb185378 100644
--- a/usr/src/lib/pam_modules/passwd_auth/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/Makefile
diff --git a/usr/src/lib/pam_modules/passwd_auth/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/Makefile.targ
index c1c4122c58..c1c4122c58 100644
--- a/usr/src/lib/pam_modules/passwd_auth/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/passwd_auth/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/passwd_auth/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/passwd_auth/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/i386/Makefile
index 89a7a9d348..89a7a9d348 100644
--- a/usr/src/lib/pam_modules/passwd_auth/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/passwd_auth/spec/passwd_auth.spec b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/passwd_auth.spec
index 51d61f0aa3..51d61f0aa3 100644
--- a/usr/src/lib/pam_modules/passwd_auth/spec/passwd_auth.spec
+++ b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/passwd_auth.spec
diff --git a/usr/src/lib/pam_modules/passwd_auth/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/sparc/Makefile
index 49d1b367f3..49d1b367f3 100644
--- a/usr/src/lib/pam_modules/passwd_auth/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/passwd_auth/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/sparcv9/Makefile
index a3ba433d4b..a3ba433d4b 100644
--- a/usr/src/lib/pam_modules/passwd_auth/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/passwd_auth/spec/versions b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/passwd_auth/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/passwd_auth/spec/versions
diff --git a/usr/src/lib/pam_modules/projects/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/projects/spec/Makefile
index 6351b60428..6351b60428 100644
--- a/usr/src/lib/pam_modules/projects/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/projects/spec/Makefile
diff --git a/usr/src/lib/pam_modules/projects/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/projects/spec/Makefile.targ
index 72666d9431..72666d9431 100644
--- a/usr/src/lib/pam_modules/projects/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/projects/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/projects/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/projects/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/projects/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/projects/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/projects/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/projects/spec/i386/Makefile
index 040c3d6731..040c3d6731 100644
--- a/usr/src/lib/pam_modules/projects/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/projects/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/projects/spec/projects.spec b/deleted_files/usr/src/lib/pam_modules/projects/spec/projects.spec
index c00b8a317e..c00b8a317e 100644
--- a/usr/src/lib/pam_modules/projects/spec/projects.spec
+++ b/deleted_files/usr/src/lib/pam_modules/projects/spec/projects.spec
diff --git a/usr/src/lib/pam_modules/projects/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/projects/spec/sparc/Makefile
index 5a0d05ce20..5a0d05ce20 100644
--- a/usr/src/lib/pam_modules/projects/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/projects/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/projects/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/projects/spec/sparcv9/Makefile
index 44ce2c1cff..44ce2c1cff 100644
--- a/usr/src/lib/pam_modules/projects/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/projects/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/projects/spec/versions b/deleted_files/usr/src/lib/pam_modules/projects/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/projects/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/projects/spec/versions
diff --git a/usr/src/lib/pam_modules/rhosts_auth/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/Makefile
index ea4e4faa6c..ea4e4faa6c 100644
--- a/usr/src/lib/pam_modules/rhosts_auth/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/Makefile
diff --git a/usr/src/lib/pam_modules/rhosts_auth/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/Makefile.targ
index 7bb217e204..7bb217e204 100644
--- a/usr/src/lib/pam_modules/rhosts_auth/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/rhosts_auth/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/rhosts_auth/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/rhosts_auth/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/i386/Makefile
index e5a1977732..e5a1977732 100644
--- a/usr/src/lib/pam_modules/rhosts_auth/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/rhosts_auth/spec/rhosts_auth.spec b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/rhosts_auth.spec
index 41b84d8d10..41b84d8d10 100644
--- a/usr/src/lib/pam_modules/rhosts_auth/spec/rhosts_auth.spec
+++ b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/rhosts_auth.spec
diff --git a/usr/src/lib/pam_modules/rhosts_auth/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/sparc/Makefile
index a16881ffde..a16881ffde 100644
--- a/usr/src/lib/pam_modules/rhosts_auth/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/rhosts_auth/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/sparcv9/Makefile
index 20dabcf9b1..20dabcf9b1 100644
--- a/usr/src/lib/pam_modules/rhosts_auth/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/rhosts_auth/spec/versions b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/rhosts_auth/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/rhosts_auth/spec/versions
diff --git a/usr/src/lib/pam_modules/roles/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/roles/spec/Makefile
index cbb31d34cf..cbb31d34cf 100644
--- a/usr/src/lib/pam_modules/roles/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/roles/spec/Makefile
diff --git a/usr/src/lib/pam_modules/roles/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/roles/spec/Makefile.targ
index 562f10a02f..562f10a02f 100644
--- a/usr/src/lib/pam_modules/roles/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/roles/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/roles/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/roles/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/roles/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/roles/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/roles/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/roles/spec/i386/Makefile
index d9b96f3f90..d9b96f3f90 100644
--- a/usr/src/lib/pam_modules/roles/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/roles/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/roles/spec/roles.spec b/deleted_files/usr/src/lib/pam_modules/roles/spec/roles.spec
index f1cfc03604..f1cfc03604 100644
--- a/usr/src/lib/pam_modules/roles/spec/roles.spec
+++ b/deleted_files/usr/src/lib/pam_modules/roles/spec/roles.spec
diff --git a/usr/src/lib/pam_modules/roles/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/roles/spec/sparc/Makefile
index 372ce8e986..372ce8e986 100644
--- a/usr/src/lib/pam_modules/roles/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/roles/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/roles/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/roles/spec/sparcv9/Makefile
index 6c69c45b7c..6c69c45b7c 100644
--- a/usr/src/lib/pam_modules/roles/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/roles/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/roles/spec/versions b/deleted_files/usr/src/lib/pam_modules/roles/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/roles/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/roles/spec/versions
diff --git a/usr/src/lib/pam_modules/sample/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/sample/spec/Makefile
index a666a1e264..a666a1e264 100644
--- a/usr/src/lib/pam_modules/sample/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/sample/spec/Makefile
diff --git a/usr/src/lib/pam_modules/sample/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/sample/spec/Makefile.targ
index f2e8bcaeac..f2e8bcaeac 100644
--- a/usr/src/lib/pam_modules/sample/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/sample/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/sample/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/sample/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/sample/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/sample/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/sample/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/sample/spec/i386/Makefile
index e2058c279f..e2058c279f 100644
--- a/usr/src/lib/pam_modules/sample/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/sample/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/sample/spec/sample.spec b/deleted_files/usr/src/lib/pam_modules/sample/spec/sample.spec
index 6a39e529e7..6a39e529e7 100644
--- a/usr/src/lib/pam_modules/sample/spec/sample.spec
+++ b/deleted_files/usr/src/lib/pam_modules/sample/spec/sample.spec
diff --git a/usr/src/lib/pam_modules/sample/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/sample/spec/sparc/Makefile
index 2a136d65a3..2a136d65a3 100644
--- a/usr/src/lib/pam_modules/sample/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/sample/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/sample/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/sample/spec/sparcv9/Makefile
index 5ec0529fe6..5ec0529fe6 100644
--- a/usr/src/lib/pam_modules/sample/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/sample/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/sample/spec/versions b/deleted_files/usr/src/lib/pam_modules/sample/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/sample/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/sample/spec/versions
diff --git a/usr/src/lib/pam_modules/unix_account/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/Makefile
index 3395e6bf35..3395e6bf35 100644
--- a/usr/src/lib/pam_modules/unix_account/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/Makefile
diff --git a/usr/src/lib/pam_modules/unix_account/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/Makefile.targ
index 9f64270db4..9f64270db4 100644
--- a/usr/src/lib/pam_modules/unix_account/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/unix_account/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/unix_account/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/unix_account/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/i386/Makefile
index 9fc269f4a8..9fc269f4a8 100644
--- a/usr/src/lib/pam_modules/unix_account/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/unix_account/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/sparc/Makefile
index 92772b52f5..92772b52f5 100644
--- a/usr/src/lib/pam_modules/unix_account/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/unix_account/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/sparcv9/Makefile
index f5b732ff4e..f5b732ff4e 100644
--- a/usr/src/lib/pam_modules/unix_account/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/unix_account/spec/unix_account.spec b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/unix_account.spec
index ed7253841d..ed7253841d 100644
--- a/usr/src/lib/pam_modules/unix_account/spec/unix_account.spec
+++ b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/unix_account.spec
diff --git a/usr/src/lib/pam_modules/unix_account/spec/versions b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/unix_account/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/unix_account/spec/versions
diff --git a/usr/src/lib/pam_modules/unix_auth/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/Makefile
index c846a17962..c846a17962 100644
--- a/usr/src/lib/pam_modules/unix_auth/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/Makefile
diff --git a/usr/src/lib/pam_modules/unix_auth/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/Makefile.targ
index 83cc2ccecf..83cc2ccecf 100644
--- a/usr/src/lib/pam_modules/unix_auth/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/unix_auth/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/unix_auth/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/unix_auth/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/i386/Makefile
index 246837a9d8..246837a9d8 100644
--- a/usr/src/lib/pam_modules/unix_auth/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/unix_auth/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/sparc/Makefile
index 6caf7b84ac..6caf7b84ac 100644
--- a/usr/src/lib/pam_modules/unix_auth/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/unix_auth/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/sparcv9/Makefile
index b56a7a4c06..b56a7a4c06 100644
--- a/usr/src/lib/pam_modules/unix_auth/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/unix_auth/spec/unix_auth.spec b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/unix_auth.spec
index 5bd6b56fdf..5bd6b56fdf 100644
--- a/usr/src/lib/pam_modules/unix_auth/spec/unix_auth.spec
+++ b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/unix_auth.spec
diff --git a/usr/src/lib/pam_modules/unix_auth/spec/versions b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/unix_auth/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/unix_auth/spec/versions
diff --git a/usr/src/lib/pam_modules/unix_cred/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/Makefile
index e1761ea9f3..e1761ea9f3 100644
--- a/usr/src/lib/pam_modules/unix_cred/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/Makefile
diff --git a/usr/src/lib/pam_modules/unix_cred/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/Makefile.targ
index 8f79fa3d64..8f79fa3d64 100644
--- a/usr/src/lib/pam_modules/unix_cred/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/unix_cred/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/unix_cred/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/unix_cred/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/i386/Makefile
index 304987c075..304987c075 100644
--- a/usr/src/lib/pam_modules/unix_cred/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/unix_cred/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/sparc/Makefile
index 0a3c3abea3..0a3c3abea3 100644
--- a/usr/src/lib/pam_modules/unix_cred/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/unix_cred/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/sparcv9/Makefile
index 3b1b5be150..3b1b5be150 100644
--- a/usr/src/lib/pam_modules/unix_cred/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/unix_cred/spec/unix_cred.spec b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/unix_cred.spec
index c45530409a..c45530409a 100644
--- a/usr/src/lib/pam_modules/unix_cred/spec/unix_cred.spec
+++ b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/unix_cred.spec
diff --git a/usr/src/lib/pam_modules/unix_cred/spec/versions b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/unix_cred/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/unix_cred/spec/versions
diff --git a/usr/src/lib/pam_modules/unix_session/spec/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/Makefile
index 2c6dc5ec39..2c6dc5ec39 100644
--- a/usr/src/lib/pam_modules/unix_session/spec/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/Makefile
diff --git a/usr/src/lib/pam_modules/unix_session/spec/Makefile.targ b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/Makefile.targ
index 54ba6b5785..54ba6b5785 100644
--- a/usr/src/lib/pam_modules/unix_session/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/Makefile.targ
diff --git a/usr/src/lib/pam_modules/unix_session/spec/amd64/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/amd64/Makefile
index 6b8107b610..6b8107b610 100644
--- a/usr/src/lib/pam_modules/unix_session/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/amd64/Makefile
diff --git a/usr/src/lib/pam_modules/unix_session/spec/i386/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/i386/Makefile
index 83c33d6113..83c33d6113 100644
--- a/usr/src/lib/pam_modules/unix_session/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/i386/Makefile
diff --git a/usr/src/lib/pam_modules/unix_session/spec/sparc/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/sparc/Makefile
index 586f037035..586f037035 100644
--- a/usr/src/lib/pam_modules/unix_session/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/sparc/Makefile
diff --git a/usr/src/lib/pam_modules/unix_session/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/sparcv9/Makefile
index b40a8bea80..b40a8bea80 100644
--- a/usr/src/lib/pam_modules/unix_session/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pam_modules/unix_session/spec/unix_session.spec b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/unix_session.spec
index eb793b3bdc..eb793b3bdc 100644
--- a/usr/src/lib/pam_modules/unix_session/spec/unix_session.spec
+++ b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/unix_session.spec
diff --git a/usr/src/lib/pam_modules/unix_session/spec/versions b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/versions
index baa02abaef..baa02abaef 100644
--- a/usr/src/lib/pam_modules/unix_session/spec/versions
+++ b/deleted_files/usr/src/lib/pam_modules/unix_session/spec/versions
diff --git a/usr/src/lib/passwdutil/spec/Makefile b/deleted_files/usr/src/lib/passwdutil/spec/Makefile
index f16855cc87..f16855cc87 100644
--- a/usr/src/lib/passwdutil/spec/Makefile
+++ b/deleted_files/usr/src/lib/passwdutil/spec/Makefile
diff --git a/usr/src/lib/passwdutil/spec/Makefile.targ b/deleted_files/usr/src/lib/passwdutil/spec/Makefile.targ
index fa502beea4..fa502beea4 100644
--- a/usr/src/lib/passwdutil/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/passwdutil/spec/Makefile.targ
diff --git a/usr/src/lib/passwdutil/spec/amd64/Makefile b/deleted_files/usr/src/lib/passwdutil/spec/amd64/Makefile
index 86b763b325..86b763b325 100644
--- a/usr/src/lib/passwdutil/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/passwdutil/spec/amd64/Makefile
diff --git a/usr/src/lib/passwdutil/spec/i386/Makefile b/deleted_files/usr/src/lib/passwdutil/spec/i386/Makefile
index 341092e045..341092e045 100644
--- a/usr/src/lib/passwdutil/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/passwdutil/spec/i386/Makefile
diff --git a/usr/src/lib/passwdutil/spec/passwdutil.spec b/deleted_files/usr/src/lib/passwdutil/spec/passwdutil.spec
index 4b87cf534b..4b87cf534b 100644
--- a/usr/src/lib/passwdutil/spec/passwdutil.spec
+++ b/deleted_files/usr/src/lib/passwdutil/spec/passwdutil.spec
diff --git a/usr/src/lib/passwdutil/spec/sparc/Makefile b/deleted_files/usr/src/lib/passwdutil/spec/sparc/Makefile
index c474a1af88..c474a1af88 100644
--- a/usr/src/lib/passwdutil/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/passwdutil/spec/sparc/Makefile
diff --git a/usr/src/lib/passwdutil/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/passwdutil/spec/sparcv9/Makefile
index 66f0975a89..66f0975a89 100644
--- a/usr/src/lib/passwdutil/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/passwdutil/spec/sparcv9/Makefile
diff --git a/usr/src/lib/passwdutil/spec/versions b/deleted_files/usr/src/lib/passwdutil/spec/versions
index a542a0f7fc..a542a0f7fc 100644
--- a/usr/src/lib/passwdutil/spec/versions
+++ b/deleted_files/usr/src/lib/passwdutil/spec/versions
diff --git a/usr/src/lib/pkcs11/libpkcs11/spec/Makefile b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/Makefile
index ae13c35801..ae13c35801 100644
--- a/usr/src/lib/pkcs11/libpkcs11/spec/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/Makefile
diff --git a/usr/src/lib/pkcs11/libpkcs11/spec/Makefile.targ b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/Makefile.targ
index 59f2f737fd..59f2f737fd 100644
--- a/usr/src/lib/pkcs11/libpkcs11/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/Makefile.targ
diff --git a/usr/src/lib/pkcs11/libpkcs11/spec/amd64/Makefile b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/amd64/Makefile
index 8fe2d4f795..8fe2d4f795 100644
--- a/usr/src/lib/pkcs11/libpkcs11/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/amd64/Makefile
diff --git a/usr/src/lib/pkcs11/libpkcs11/spec/i386/Makefile b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/i386/Makefile
index 81738f359c..81738f359c 100644
--- a/usr/src/lib/pkcs11/libpkcs11/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/i386/Makefile
diff --git a/usr/src/lib/pkcs11/libpkcs11/spec/pkcs11.spec b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/pkcs11.spec
index 7a2e29edc8..7a2e29edc8 100644
--- a/usr/src/lib/pkcs11/libpkcs11/spec/pkcs11.spec
+++ b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/pkcs11.spec
diff --git a/usr/src/lib/pkcs11/libpkcs11/spec/sparc/Makefile b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/sparc/Makefile
index 279003d4f4..279003d4f4 100644
--- a/usr/src/lib/pkcs11/libpkcs11/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/sparc/Makefile
diff --git a/usr/src/lib/pkcs11/libpkcs11/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/sparcv9/Makefile
index 2927485713..2927485713 100644
--- a/usr/src/lib/pkcs11/libpkcs11/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pkcs11/libpkcs11/spec/versions b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/versions
index f7955484e7..f7955484e7 100644
--- a/usr/src/lib/pkcs11/libpkcs11/spec/versions
+++ b/deleted_files/usr/src/lib/pkcs11/libpkcs11/spec/versions
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/spec/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/Makefile
index ae13c35801..ae13c35801 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/spec/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/spec/Makefile.targ b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/Makefile.targ
index 0c596dea52..0c596dea52 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/Makefile.targ
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/spec/amd64/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/amd64/Makefile
index f133a21843..f133a21843 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/amd64/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/spec/i386/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/i386/Makefile
index 91a6e69e0e..91a6e69e0e 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/i386/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/spec/pkcs11_kernel.spec b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/pkcs11_kernel.spec
index 03b6382f4e..03b6382f4e 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/spec/pkcs11_kernel.spec
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/pkcs11_kernel.spec
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/spec/sparc/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/sparc/Makefile
index ae6dc6ac9f..ae6dc6ac9f 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/sparc/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/sparcv9/Makefile
index 21d2119a91..21d2119a91 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/spec/versions b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/versions
index fa34bcefe7..fa34bcefe7 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/spec/versions
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_kernel/spec/versions
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/Makefile
index ae13c35801..ae13c35801 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/Makefile.targ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/Makefile.targ
index d680607664..d680607664 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/Makefile.targ
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/amd64/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/amd64/Makefile
index 32915eba8b..32915eba8b 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/amd64/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/i386/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/i386/Makefile
index a394286a55..a394286a55 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/i386/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/pkcs11_softtoken.spec b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/pkcs11_softtoken.spec
index 03b6382f4e..03b6382f4e 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/pkcs11_softtoken.spec
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/pkcs11_softtoken.spec
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/sparc/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/sparc/Makefile
index 91a6e69e0e..91a6e69e0e 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/sparc/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/sparcv9/Makefile
index 309d6fad83..309d6fad83 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/versions b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/versions
index fa34bcefe7..fa34bcefe7 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/spec/versions
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken/spec/versions
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/Makefile
index ae13c35801..ae13c35801 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/Makefile.targ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/Makefile.targ
index 57f5ba5557..57f5ba5557 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/Makefile.targ
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/amd64/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/amd64/Makefile
index 9194680b04..9194680b04 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/amd64/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/i386/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/i386/Makefile
index 07566df829..07566df829 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/i386/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/pkcs11_softtoken_extra.spec b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/pkcs11_softtoken_extra.spec
index 03b6382f4e..03b6382f4e 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/pkcs11_softtoken_extra.spec
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/pkcs11_softtoken_extra.spec
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/sparc/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/sparc/Makefile
index 558a47c627..558a47c627 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/sparc/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/sparcv9/Makefile
index 5b5f74b449..5b5f74b449 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/sparcv9/Makefile
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/versions b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/versions
index fa34bcefe7..fa34bcefe7 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/versions
+++ b/deleted_files/usr/src/lib/pkcs11/pkcs11_softtoken_extra/spec/versions
diff --git a/usr/src/lib/sasl_plugins/cram/spec/Makefile b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/Makefile
index 9e331dcd31..9e331dcd31 100644
--- a/usr/src/lib/sasl_plugins/cram/spec/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/Makefile
diff --git a/usr/src/lib/sasl_plugins/cram/spec/Makefile.targ b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/Makefile.targ
index 66db220e45..66db220e45 100644
--- a/usr/src/lib/sasl_plugins/cram/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/Makefile.targ
diff --git a/usr/src/lib/sasl_plugins/cram/spec/amd64/Makefile b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/amd64/Makefile
index 07e64367c4..07e64367c4 100644
--- a/usr/src/lib/sasl_plugins/cram/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/amd64/Makefile
diff --git a/usr/src/lib/sasl_plugins/cram/spec/cram.spec b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/cram.spec
index 37538e788e..37538e788e 100644
--- a/usr/src/lib/sasl_plugins/cram/spec/cram.spec
+++ b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/cram.spec
diff --git a/usr/src/lib/sasl_plugins/cram/spec/i386/Makefile b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/i386/Makefile
index 6306093f99..6306093f99 100644
--- a/usr/src/lib/sasl_plugins/cram/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/i386/Makefile
diff --git a/usr/src/lib/sasl_plugins/cram/spec/sparc/Makefile b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/sparc/Makefile
index dcbd1f7c3c..dcbd1f7c3c 100644
--- a/usr/src/lib/sasl_plugins/cram/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/sparc/Makefile
diff --git a/usr/src/lib/sasl_plugins/cram/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/sparcv9/Makefile
index 0c01722717..0c01722717 100644
--- a/usr/src/lib/sasl_plugins/cram/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/sparcv9/Makefile
diff --git a/usr/src/lib/sasl_plugins/cram/spec/versions b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/versions
index 6a318d48a3..6a318d48a3 100644
--- a/usr/src/lib/sasl_plugins/cram/spec/versions
+++ b/deleted_files/usr/src/lib/sasl_plugins/cram/spec/versions
diff --git a/usr/src/lib/sasl_plugins/digestmd5/spec/Makefile b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/Makefile
index 78e5a082a2..78e5a082a2 100644
--- a/usr/src/lib/sasl_plugins/digestmd5/spec/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/Makefile
diff --git a/usr/src/lib/sasl_plugins/digestmd5/spec/Makefile.targ b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/Makefile.targ
index bd86aec418..bd86aec418 100644
--- a/usr/src/lib/sasl_plugins/digestmd5/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/Makefile.targ
diff --git a/usr/src/lib/sasl_plugins/digestmd5/spec/amd64/Makefile b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/amd64/Makefile
index 07e64367c4..07e64367c4 100644
--- a/usr/src/lib/sasl_plugins/digestmd5/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/amd64/Makefile
diff --git a/usr/src/lib/sasl_plugins/digestmd5/spec/digestmd5.spec b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/digestmd5.spec
index aaa78d87df..aaa78d87df 100644
--- a/usr/src/lib/sasl_plugins/digestmd5/spec/digestmd5.spec
+++ b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/digestmd5.spec
diff --git a/usr/src/lib/sasl_plugins/digestmd5/spec/i386/Makefile b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/i386/Makefile
index 898bd186dc..898bd186dc 100644
--- a/usr/src/lib/sasl_plugins/digestmd5/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/i386/Makefile
diff --git a/usr/src/lib/sasl_plugins/digestmd5/spec/sparc/Makefile b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/sparc/Makefile
index d98d83e258..d98d83e258 100644
--- a/usr/src/lib/sasl_plugins/digestmd5/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/sparc/Makefile
diff --git a/usr/src/lib/sasl_plugins/digestmd5/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/sparcv9/Makefile
index 63a659bc17..63a659bc17 100644
--- a/usr/src/lib/sasl_plugins/digestmd5/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/sparcv9/Makefile
diff --git a/usr/src/lib/sasl_plugins/digestmd5/spec/versions b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/versions
index 6a318d48a3..6a318d48a3 100644
--- a/usr/src/lib/sasl_plugins/digestmd5/spec/versions
+++ b/deleted_files/usr/src/lib/sasl_plugins/digestmd5/spec/versions
diff --git a/usr/src/lib/sasl_plugins/gssapi/spec/Makefile b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/Makefile
index 78e5a082a2..78e5a082a2 100644
--- a/usr/src/lib/sasl_plugins/gssapi/spec/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/Makefile
diff --git a/usr/src/lib/sasl_plugins/gssapi/spec/Makefile.targ b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/Makefile.targ
index 0093ca71ad..0093ca71ad 100644
--- a/usr/src/lib/sasl_plugins/gssapi/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/Makefile.targ
diff --git a/usr/src/lib/sasl_plugins/gssapi/spec/amd64/Makefile b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/amd64/Makefile
index 07e64367c4..07e64367c4 100644
--- a/usr/src/lib/sasl_plugins/gssapi/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/amd64/Makefile
diff --git a/usr/src/lib/sasl_plugins/gssapi/spec/gssapi.spec b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/gssapi.spec
index 937b4fcf47..937b4fcf47 100644
--- a/usr/src/lib/sasl_plugins/gssapi/spec/gssapi.spec
+++ b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/gssapi.spec
diff --git a/usr/src/lib/sasl_plugins/gssapi/spec/i386/Makefile b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/i386/Makefile
index 5d849b6467..5d849b6467 100644
--- a/usr/src/lib/sasl_plugins/gssapi/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/i386/Makefile
diff --git a/usr/src/lib/sasl_plugins/gssapi/spec/sparc/Makefile b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/sparc/Makefile
index 0c9b8fa717..0c9b8fa717 100644
--- a/usr/src/lib/sasl_plugins/gssapi/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/sparc/Makefile
diff --git a/usr/src/lib/sasl_plugins/gssapi/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/sparcv9/Makefile
index a7b2bf8e22..a7b2bf8e22 100644
--- a/usr/src/lib/sasl_plugins/gssapi/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/sparcv9/Makefile
diff --git a/usr/src/lib/sasl_plugins/gssapi/spec/versions b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/versions
index 6a318d48a3..6a318d48a3 100644
--- a/usr/src/lib/sasl_plugins/gssapi/spec/versions
+++ b/deleted_files/usr/src/lib/sasl_plugins/gssapi/spec/versions
diff --git a/usr/src/lib/sasl_plugins/plain/spec/Makefile b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/Makefile
index 78e5a082a2..78e5a082a2 100644
--- a/usr/src/lib/sasl_plugins/plain/spec/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/Makefile
diff --git a/usr/src/lib/sasl_plugins/plain/spec/Makefile.targ b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/Makefile.targ
index 340888b209..340888b209 100644
--- a/usr/src/lib/sasl_plugins/plain/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/Makefile.targ
diff --git a/usr/src/lib/sasl_plugins/plain/spec/amd64/Makefile b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/amd64/Makefile
index 07e64367c4..07e64367c4 100644
--- a/usr/src/lib/sasl_plugins/plain/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/amd64/Makefile
diff --git a/usr/src/lib/sasl_plugins/plain/spec/i386/Makefile b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/i386/Makefile
index b15851e8d3..b15851e8d3 100644
--- a/usr/src/lib/sasl_plugins/plain/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/i386/Makefile
diff --git a/usr/src/lib/sasl_plugins/plain/spec/plain.spec b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/plain.spec
index 8f6fc71926..8f6fc71926 100644
--- a/usr/src/lib/sasl_plugins/plain/spec/plain.spec
+++ b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/plain.spec
diff --git a/usr/src/lib/sasl_plugins/plain/spec/sparc/Makefile b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/sparc/Makefile
index 8fdc1965c6..8fdc1965c6 100644
--- a/usr/src/lib/sasl_plugins/plain/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/sparc/Makefile
diff --git a/usr/src/lib/sasl_plugins/plain/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/sparcv9/Makefile
index b000497abc..b000497abc 100644
--- a/usr/src/lib/sasl_plugins/plain/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/sparcv9/Makefile
diff --git a/usr/src/lib/sasl_plugins/plain/spec/versions b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/versions
index 6a318d48a3..6a318d48a3 100644
--- a/usr/src/lib/sasl_plugins/plain/spec/versions
+++ b/deleted_files/usr/src/lib/sasl_plugins/plain/spec/versions
diff --git a/usr/src/lib/udapl/libdat/spec/Makefile b/deleted_files/usr/src/lib/udapl/libdat/spec/Makefile
index 482099da3a..482099da3a 100644
--- a/usr/src/lib/udapl/libdat/spec/Makefile
+++ b/deleted_files/usr/src/lib/udapl/libdat/spec/Makefile
diff --git a/usr/src/lib/udapl/libdat/spec/Makefile.targ b/deleted_files/usr/src/lib/udapl/libdat/spec/Makefile.targ
index b0a6a088c9..b0a6a088c9 100644
--- a/usr/src/lib/udapl/libdat/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/udapl/libdat/spec/Makefile.targ
diff --git a/usr/src/lib/udapl/libdat/spec/amd64/Makefile b/deleted_files/usr/src/lib/udapl/libdat/spec/amd64/Makefile
index ad5b7614b1..ad5b7614b1 100644
--- a/usr/src/lib/udapl/libdat/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/udapl/libdat/spec/amd64/Makefile
diff --git a/usr/src/lib/udapl/libdat/spec/dat.spec b/deleted_files/usr/src/lib/udapl/libdat/spec/dat.spec
index ee3929de2e..ee3929de2e 100644
--- a/usr/src/lib/udapl/libdat/spec/dat.spec
+++ b/deleted_files/usr/src/lib/udapl/libdat/spec/dat.spec
diff --git a/usr/src/lib/udapl/libdat/spec/i386/Makefile b/deleted_files/usr/src/lib/udapl/libdat/spec/i386/Makefile
index 7f867f4940..7f867f4940 100644
--- a/usr/src/lib/udapl/libdat/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/udapl/libdat/spec/i386/Makefile
diff --git a/usr/src/lib/udapl/libdat/spec/sparc/Makefile b/deleted_files/usr/src/lib/udapl/libdat/spec/sparc/Makefile
index c0ff57a4e1..c0ff57a4e1 100644
--- a/usr/src/lib/udapl/libdat/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/udapl/libdat/spec/sparc/Makefile
diff --git a/usr/src/lib/udapl/libdat/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/udapl/libdat/spec/sparcv9/Makefile
index f3153c8d17..f3153c8d17 100644
--- a/usr/src/lib/udapl/libdat/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/udapl/libdat/spec/sparcv9/Makefile
diff --git a/usr/src/lib/udapl/libdat/spec/versions b/deleted_files/usr/src/lib/udapl/libdat/spec/versions
index d90eb74a51..d90eb74a51 100644
--- a/usr/src/lib/udapl/libdat/spec/versions
+++ b/deleted_files/usr/src/lib/udapl/libdat/spec/versions
diff --git a/usr/src/lib/watchmalloc/spec/Makefile b/deleted_files/usr/src/lib/watchmalloc/spec/Makefile
index 3f613733f7..3f613733f7 100644
--- a/usr/src/lib/watchmalloc/spec/Makefile
+++ b/deleted_files/usr/src/lib/watchmalloc/spec/Makefile
diff --git a/usr/src/lib/watchmalloc/spec/Makefile.targ b/deleted_files/usr/src/lib/watchmalloc/spec/Makefile.targ
index 7e345bfc53..7e345bfc53 100644
--- a/usr/src/lib/watchmalloc/spec/Makefile.targ
+++ b/deleted_files/usr/src/lib/watchmalloc/spec/Makefile.targ
diff --git a/usr/src/lib/watchmalloc/spec/amd64/Makefile b/deleted_files/usr/src/lib/watchmalloc/spec/amd64/Makefile
index 2a38c1cba9..2a38c1cba9 100644
--- a/usr/src/lib/watchmalloc/spec/amd64/Makefile
+++ b/deleted_files/usr/src/lib/watchmalloc/spec/amd64/Makefile
diff --git a/usr/src/lib/watchmalloc/spec/i386/Makefile b/deleted_files/usr/src/lib/watchmalloc/spec/i386/Makefile
index b02839d2eb..b02839d2eb 100644
--- a/usr/src/lib/watchmalloc/spec/i386/Makefile
+++ b/deleted_files/usr/src/lib/watchmalloc/spec/i386/Makefile
diff --git a/usr/src/lib/watchmalloc/spec/sparc/Makefile b/deleted_files/usr/src/lib/watchmalloc/spec/sparc/Makefile
index 42c85081f4..42c85081f4 100644
--- a/usr/src/lib/watchmalloc/spec/sparc/Makefile
+++ b/deleted_files/usr/src/lib/watchmalloc/spec/sparc/Makefile
diff --git a/usr/src/lib/watchmalloc/spec/sparcv9/Makefile b/deleted_files/usr/src/lib/watchmalloc/spec/sparcv9/Makefile
index 1e75e1e948..1e75e1e948 100644
--- a/usr/src/lib/watchmalloc/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/lib/watchmalloc/spec/sparcv9/Makefile
diff --git a/usr/src/lib/watchmalloc/spec/versions b/deleted_files/usr/src/lib/watchmalloc/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/lib/watchmalloc/spec/versions
+++ b/deleted_files/usr/src/lib/watchmalloc/spec/versions
diff --git a/usr/src/lib/watchmalloc/spec/watchmalloc.spec b/deleted_files/usr/src/lib/watchmalloc/spec/watchmalloc.spec
index c4749f7561..c4749f7561 100644
--- a/usr/src/lib/watchmalloc/spec/watchmalloc.spec
+++ b/deleted_files/usr/src/lib/watchmalloc/spec/watchmalloc.spec
diff --git a/usr/src/ucblib/libcurses/spec/Makefile b/deleted_files/usr/src/ucblib/libcurses/spec/Makefile
index bc7d0b29c6..bc7d0b29c6 100644
--- a/usr/src/ucblib/libcurses/spec/Makefile
+++ b/deleted_files/usr/src/ucblib/libcurses/spec/Makefile
diff --git a/usr/src/ucblib/libcurses/spec/Makefile.override b/deleted_files/usr/src/ucblib/libcurses/spec/Makefile.override
index 55d9f1c59c..55d9f1c59c 100644
--- a/usr/src/ucblib/libcurses/spec/Makefile.override
+++ b/deleted_files/usr/src/ucblib/libcurses/spec/Makefile.override
diff --git a/usr/src/ucblib/libcurses/spec/Makefile.targ b/deleted_files/usr/src/ucblib/libcurses/spec/Makefile.targ
index c69ad3c34a..c69ad3c34a 100644
--- a/usr/src/ucblib/libcurses/spec/Makefile.targ
+++ b/deleted_files/usr/src/ucblib/libcurses/spec/Makefile.targ
diff --git a/usr/src/ucblib/libcurses/spec/amd64/Makefile b/deleted_files/usr/src/ucblib/libcurses/spec/amd64/Makefile
index 9207eb9774..9207eb9774 100644
--- a/usr/src/ucblib/libcurses/spec/amd64/Makefile
+++ b/deleted_files/usr/src/ucblib/libcurses/spec/amd64/Makefile
diff --git a/usr/src/ucblib/libcurses/spec/curses.spec b/deleted_files/usr/src/ucblib/libcurses/spec/curses.spec
index 4f1a09301e..4f1a09301e 100644
--- a/usr/src/ucblib/libcurses/spec/curses.spec
+++ b/deleted_files/usr/src/ucblib/libcurses/spec/curses.spec
diff --git a/usr/src/ucblib/libcurses/spec/i386/Makefile b/deleted_files/usr/src/ucblib/libcurses/spec/i386/Makefile
index c9523cfe53..c9523cfe53 100644
--- a/usr/src/ucblib/libcurses/spec/i386/Makefile
+++ b/deleted_files/usr/src/ucblib/libcurses/spec/i386/Makefile
diff --git a/usr/src/ucblib/libcurses/spec/sparc/Makefile b/deleted_files/usr/src/ucblib/libcurses/spec/sparc/Makefile
index 289ddb4ed3..289ddb4ed3 100644
--- a/usr/src/ucblib/libcurses/spec/sparc/Makefile
+++ b/deleted_files/usr/src/ucblib/libcurses/spec/sparc/Makefile
diff --git a/usr/src/ucblib/libcurses/spec/sparcv9/Makefile b/deleted_files/usr/src/ucblib/libcurses/spec/sparcv9/Makefile
index 52128c2902..52128c2902 100644
--- a/usr/src/ucblib/libcurses/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/ucblib/libcurses/spec/sparcv9/Makefile
diff --git a/usr/src/ucblib/libcurses/spec/versions b/deleted_files/usr/src/ucblib/libcurses/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/ucblib/libcurses/spec/versions
+++ b/deleted_files/usr/src/ucblib/libcurses/spec/versions
diff --git a/usr/src/ucblib/libdbm/spec/Makefile b/deleted_files/usr/src/ucblib/libdbm/spec/Makefile
index f118e481cd..f118e481cd 100644
--- a/usr/src/ucblib/libdbm/spec/Makefile
+++ b/deleted_files/usr/src/ucblib/libdbm/spec/Makefile
diff --git a/usr/src/ucblib/libdbm/spec/Makefile.targ b/deleted_files/usr/src/ucblib/libdbm/spec/Makefile.targ
index 6c412cdff2..6c412cdff2 100644
--- a/usr/src/ucblib/libdbm/spec/Makefile.targ
+++ b/deleted_files/usr/src/ucblib/libdbm/spec/Makefile.targ
diff --git a/usr/src/ucblib/libdbm/spec/amd64/Makefile b/deleted_files/usr/src/ucblib/libdbm/spec/amd64/Makefile
index 6beb38aa0f..6beb38aa0f 100644
--- a/usr/src/ucblib/libdbm/spec/amd64/Makefile
+++ b/deleted_files/usr/src/ucblib/libdbm/spec/amd64/Makefile
diff --git a/usr/src/ucblib/libdbm/spec/dbm.spec b/deleted_files/usr/src/ucblib/libdbm/spec/dbm.spec
index 8d19c7c51a..8d19c7c51a 100644
--- a/usr/src/ucblib/libdbm/spec/dbm.spec
+++ b/deleted_files/usr/src/ucblib/libdbm/spec/dbm.spec
diff --git a/usr/src/ucblib/libdbm/spec/i386/Makefile b/deleted_files/usr/src/ucblib/libdbm/spec/i386/Makefile
index 826dad2e4b..826dad2e4b 100644
--- a/usr/src/ucblib/libdbm/spec/i386/Makefile
+++ b/deleted_files/usr/src/ucblib/libdbm/spec/i386/Makefile
diff --git a/usr/src/ucblib/libdbm/spec/sparc/Makefile b/deleted_files/usr/src/ucblib/libdbm/spec/sparc/Makefile
index c07b49c229..c07b49c229 100644
--- a/usr/src/ucblib/libdbm/spec/sparc/Makefile
+++ b/deleted_files/usr/src/ucblib/libdbm/spec/sparc/Makefile
diff --git a/usr/src/ucblib/libdbm/spec/sparcv9/Makefile b/deleted_files/usr/src/ucblib/libdbm/spec/sparcv9/Makefile
index e42e96a0ab..e42e96a0ab 100644
--- a/usr/src/ucblib/libdbm/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/ucblib/libdbm/spec/sparcv9/Makefile
diff --git a/usr/src/ucblib/libdbm/spec/versions b/deleted_files/usr/src/ucblib/libdbm/spec/versions
index 38a2cfc77a..38a2cfc77a 100644
--- a/usr/src/ucblib/libdbm/spec/versions
+++ b/deleted_files/usr/src/ucblib/libdbm/spec/versions
diff --git a/usr/src/ucblib/librpcsoc/spec/Makefile b/deleted_files/usr/src/ucblib/librpcsoc/spec/Makefile
index 757104f257..757104f257 100644
--- a/usr/src/ucblib/librpcsoc/spec/Makefile
+++ b/deleted_files/usr/src/ucblib/librpcsoc/spec/Makefile
diff --git a/usr/src/ucblib/librpcsoc/spec/Makefile.targ b/deleted_files/usr/src/ucblib/librpcsoc/spec/Makefile.targ
index 5f49b2e642..5f49b2e642 100644
--- a/usr/src/ucblib/librpcsoc/spec/Makefile.targ
+++ b/deleted_files/usr/src/ucblib/librpcsoc/spec/Makefile.targ
diff --git a/usr/src/ucblib/librpcsoc/spec/amd64/Makefile b/deleted_files/usr/src/ucblib/librpcsoc/spec/amd64/Makefile
index 6beb38aa0f..6beb38aa0f 100644
--- a/usr/src/ucblib/librpcsoc/spec/amd64/Makefile
+++ b/deleted_files/usr/src/ucblib/librpcsoc/spec/amd64/Makefile
diff --git a/usr/src/ucblib/librpcsoc/spec/i386/Makefile b/deleted_files/usr/src/ucblib/librpcsoc/spec/i386/Makefile
index 9fa2f61309..9fa2f61309 100644
--- a/usr/src/ucblib/librpcsoc/spec/i386/Makefile
+++ b/deleted_files/usr/src/ucblib/librpcsoc/spec/i386/Makefile
diff --git a/usr/src/ucblib/librpcsoc/spec/rpcsoc.spec b/deleted_files/usr/src/ucblib/librpcsoc/spec/rpcsoc.spec
index e691dc6626..e691dc6626 100644
--- a/usr/src/ucblib/librpcsoc/spec/rpcsoc.spec
+++ b/deleted_files/usr/src/ucblib/librpcsoc/spec/rpcsoc.spec
diff --git a/usr/src/ucblib/librpcsoc/spec/sparc/Makefile b/deleted_files/usr/src/ucblib/librpcsoc/spec/sparc/Makefile
index 5f4541d4a8..5f4541d4a8 100644
--- a/usr/src/ucblib/librpcsoc/spec/sparc/Makefile
+++ b/deleted_files/usr/src/ucblib/librpcsoc/spec/sparc/Makefile
diff --git a/usr/src/ucblib/librpcsoc/spec/sparcv9/Makefile b/deleted_files/usr/src/ucblib/librpcsoc/spec/sparcv9/Makefile
index ec392f306c..ec392f306c 100644
--- a/usr/src/ucblib/librpcsoc/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/ucblib/librpcsoc/spec/sparcv9/Makefile
diff --git a/usr/src/ucblib/librpcsoc/spec/versions b/deleted_files/usr/src/ucblib/librpcsoc/spec/versions
index d81db16460..d81db16460 100644
--- a/usr/src/ucblib/librpcsoc/spec/versions
+++ b/deleted_files/usr/src/ucblib/librpcsoc/spec/versions
diff --git a/usr/src/ucblib/libtermcap/spec/Makefile b/deleted_files/usr/src/ucblib/libtermcap/spec/Makefile
index a28a1fe9fe..a28a1fe9fe 100644
--- a/usr/src/ucblib/libtermcap/spec/Makefile
+++ b/deleted_files/usr/src/ucblib/libtermcap/spec/Makefile
diff --git a/usr/src/ucblib/libtermcap/spec/Makefile.targ b/deleted_files/usr/src/ucblib/libtermcap/spec/Makefile.targ
index 793f5f2aed..793f5f2aed 100644
--- a/usr/src/ucblib/libtermcap/spec/Makefile.targ
+++ b/deleted_files/usr/src/ucblib/libtermcap/spec/Makefile.targ
diff --git a/usr/src/ucblib/libtermcap/spec/amd64/Makefile b/deleted_files/usr/src/ucblib/libtermcap/spec/amd64/Makefile
index 6beb38aa0f..6beb38aa0f 100644
--- a/usr/src/ucblib/libtermcap/spec/amd64/Makefile
+++ b/deleted_files/usr/src/ucblib/libtermcap/spec/amd64/Makefile
diff --git a/usr/src/ucblib/libtermcap/spec/i386/Makefile b/deleted_files/usr/src/ucblib/libtermcap/spec/i386/Makefile
index 528526ce44..528526ce44 100644
--- a/usr/src/ucblib/libtermcap/spec/i386/Makefile
+++ b/deleted_files/usr/src/ucblib/libtermcap/spec/i386/Makefile
diff --git a/usr/src/ucblib/libtermcap/spec/sparc/Makefile b/deleted_files/usr/src/ucblib/libtermcap/spec/sparc/Makefile
index 7350d27138..7350d27138 100644
--- a/usr/src/ucblib/libtermcap/spec/sparc/Makefile
+++ b/deleted_files/usr/src/ucblib/libtermcap/spec/sparc/Makefile
diff --git a/usr/src/ucblib/libtermcap/spec/sparcv9/Makefile b/deleted_files/usr/src/ucblib/libtermcap/spec/sparcv9/Makefile
index ca7b152f8d..ca7b152f8d 100644
--- a/usr/src/ucblib/libtermcap/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/ucblib/libtermcap/spec/sparcv9/Makefile
diff --git a/usr/src/ucblib/libtermcap/spec/termcap.spec b/deleted_files/usr/src/ucblib/libtermcap/spec/termcap.spec
index c95df25ef6..c95df25ef6 100644
--- a/usr/src/ucblib/libtermcap/spec/termcap.spec
+++ b/deleted_files/usr/src/ucblib/libtermcap/spec/termcap.spec
diff --git a/usr/src/ucblib/libtermcap/spec/versions b/deleted_files/usr/src/ucblib/libtermcap/spec/versions
index f7955484e7..f7955484e7 100644
--- a/usr/src/ucblib/libtermcap/spec/versions
+++ b/deleted_files/usr/src/ucblib/libtermcap/spec/versions
diff --git a/usr/src/ucblib/libucb/spec/Makefile b/deleted_files/usr/src/ucblib/libucb/spec/Makefile
index 810d58ffb7..810d58ffb7 100644
--- a/usr/src/ucblib/libucb/spec/Makefile
+++ b/deleted_files/usr/src/ucblib/libucb/spec/Makefile
diff --git a/usr/src/ucblib/libucb/spec/Makefile.override b/deleted_files/usr/src/ucblib/libucb/spec/Makefile.override
index 55d9f1c59c..55d9f1c59c 100644
--- a/usr/src/ucblib/libucb/spec/Makefile.override
+++ b/deleted_files/usr/src/ucblib/libucb/spec/Makefile.override
diff --git a/usr/src/ucblib/libucb/spec/Makefile.targ b/deleted_files/usr/src/ucblib/libucb/spec/Makefile.targ
index f3ccd86859..f3ccd86859 100644
--- a/usr/src/ucblib/libucb/spec/Makefile.targ
+++ b/deleted_files/usr/src/ucblib/libucb/spec/Makefile.targ
diff --git a/usr/src/ucblib/libucb/spec/amd64/Makefile b/deleted_files/usr/src/ucblib/libucb/spec/amd64/Makefile
index 9207eb9774..9207eb9774 100644
--- a/usr/src/ucblib/libucb/spec/amd64/Makefile
+++ b/deleted_files/usr/src/ucblib/libucb/spec/amd64/Makefile
diff --git a/usr/src/ucblib/libucb/spec/i386/Makefile b/deleted_files/usr/src/ucblib/libucb/spec/i386/Makefile
index cfea9bbb75..cfea9bbb75 100644
--- a/usr/src/ucblib/libucb/spec/i386/Makefile
+++ b/deleted_files/usr/src/ucblib/libucb/spec/i386/Makefile
diff --git a/usr/src/ucblib/libucb/spec/sparc/Makefile b/deleted_files/usr/src/ucblib/libucb/spec/sparc/Makefile
index 35c6dab469..35c6dab469 100644
--- a/usr/src/ucblib/libucb/spec/sparc/Makefile
+++ b/deleted_files/usr/src/ucblib/libucb/spec/sparc/Makefile
diff --git a/usr/src/ucblib/libucb/spec/sparcv9/Makefile b/deleted_files/usr/src/ucblib/libucb/spec/sparcv9/Makefile
index 7ea9199c8e..7ea9199c8e 100644
--- a/usr/src/ucblib/libucb/spec/sparcv9/Makefile
+++ b/deleted_files/usr/src/ucblib/libucb/spec/sparcv9/Makefile
diff --git a/usr/src/ucblib/libucb/spec/ucb.spec b/deleted_files/usr/src/ucblib/libucb/spec/ucb.spec
index aead21f06c..aead21f06c 100644
--- a/usr/src/ucblib/libucb/spec/ucb.spec
+++ b/deleted_files/usr/src/ucblib/libucb/spec/ucb.spec
diff --git a/usr/src/ucblib/libucb/spec/versions b/deleted_files/usr/src/ucblib/libucb/spec/versions
index 68c9b98bdc..68c9b98bdc 100644
--- a/usr/src/ucblib/libucb/spec/versions
+++ b/deleted_files/usr/src/ucblib/libucb/spec/versions
diff --git a/usr/src/Makefile b/usr/src/Makefile
index 1707c95d75..7f6d12be5b 100644
--- a/usr/src/Makefile
+++ b/usr/src/Makefile
@@ -202,7 +202,7 @@ check:	$(CHKHDRSUBDIRS) $(CHKMFSTSUBDIRS)
 # don't contain actual source code.
 #
 $(CLOSED_BUILD)XRDIRS += ../closed
-XRPRUNE = spec pkgdefs prototypes xmod
+XRPRUNE = pkgdefs prototypes xmod
 XRINCDIRS = uts/common head ucbhead
 $(CLOSED_BUILD)XRINCDIRS = uts/common ../closed/uts/common head ucbhead
 
diff --git a/usr/src/cmd/agents/snmp/agent/Makefile.com b/usr/src/cmd/agents/snmp/agent/Makefile.com
index c192804f12..138c191413 100644
--- a/usr/src/cmd/agents/snmp/agent/Makefile.com
+++ b/usr/src/cmd/agents/snmp/agent/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -13,14 +12,14 @@
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the 
+# If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -39,11 +38,10 @@ SRCS = 		$(SRCOBJS:%.o=$(SRCDIR)/%.c) personal.c
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lssasnmp -lc -lsocket -lnsl
 
-SRCDIR =	..
 CLEANFILES +=	personal.c personal.lex.c
-MAPFILE =	../agent-mapfile-vers 
 
-DYNFLAGS +=	-M$(MAPFILE)
+MAPFILES =	../agent-mapfile-vers 
+
 CPPFLAGS =	-I. -I.. -I../../snmplib $(CPPFLAGS.master)
 LINTFLAGS64 +=	-errchk=longptr64
 #
diff --git a/usr/src/cmd/agents/snmp/snmplib/Makefile.com b/usr/src/cmd/agents/snmp/snmplib/Makefile.com
index 0ad478ae9f..94e5a6bc6b 100644
--- a/usr/src/cmd/agents/snmp/snmplib/Makefile.com
+++ b/usr/src/cmd/agents/snmp/snmplib/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -13,14 +12,14 @@
 #
 # When distributing Covered Code, include this CDDL HEADER in each
 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the 
+# If applicable, add the following below this CDDL HEADER, with the
 # fields enclosed by brackets "[]" replaced with your own identifying
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -37,10 +36,8 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc -lsocket -lnsl
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	..
-MAPFILE =	../snmp-mapfile-vers 
+MAPFILES =	../snmp-mapfile-vers 
 
-DYNFLAGS +=	-M$(MAPFILE)
 CPPFLAGS +=	-I..
 LINTFLAGS64 +=	-errchk=longptr64
 
diff --git a/usr/src/cmd/backup/lib/Makefile b/usr/src/cmd/backup/lib/Makefile
index 4c1d3955d8..9d02a60649 100644
--- a/usr/src/cmd/backup/lib/Makefile
+++ b/usr/src/cmd/backup/lib/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/backup/lib/Makefile
-#
+
 LIBRARY=	libdump.a
 
 # Has to be before include of Makefile.backup
@@ -42,6 +40,8 @@ PROG=		libdump
 include ../../../lib/Makefile.lib
 include ../Makefile.backup
 
+SRCDIR =	.
+
 # Specifically request the construction of a static library.
 # This library is not installed in the proto area.
 LIBS=	$(LIBRARY)
diff --git a/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile b/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile
index b8d85c9c21..02b5c1b923 100644
--- a/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.bin/pppd/plugins/Makefile
@@ -1,12 +1,29 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/cmd-inet/usr.bin/pppd/plugins/Makefile
-#
-
 
 MINCONN =	minconn.so
 PASSPROMPT = 	passprompt.so
@@ -31,9 +48,9 @@ $(PPPOE):=	PICS = pics/pppoe.o
 # Establish external references through mapfiles and dependencies to allow
 # use of -zdefs.
 HSONAME=
-$(MINCONN):=	MAPFILE = mapfile-minconn
-$(PASSPROMPT):=	MAPFILE = mapfile-passprompt
-$(PPPOE):=	MAPFILE = mapfile-pppoe
+$(MINCONN):=	MAPFILES = mapfile-minconn
+$(PASSPROMPT):=	MAPFILES = mapfile-passprompt
+$(PPPOE):=	MAPFILES = mapfile-pppoe
 
 # A bug in pmake causes redundancy when '+=' is conditionally assigned, so
 # '=' is used with extra variables.
@@ -44,7 +61,6 @@ LDLIBS +=	$(XXXLDLIBS)
 CPPFLAGS +=	-I.. -I$(SRC)/uts/common
 # XX64 -- this should not be needed -- fix me
 DYNFLAGS +=	-_gcc=-nostdlib
-DYNFLAGS +=	-M$(MAPFILE)
 
 CLOBBERFILES +=	$(LIBRARIES)
 
@@ -75,15 +91,15 @@ $(ROOTSRCFILES):=	GROUP = bin
 
 all:	$(LIBRARIES)
 
-$(MINCONN): pics .WAIT $$(MAPFILE) $$(PICS)
+$(MINCONN): pics .WAIT $$(PICS)
 	$(BUILD.SO)
 	$(POST_PROCESS_SO)
 
-$(PASSPROMPT): pics .WAIT $$(MAPFILE) $$(PICS)
+$(PASSPROMPT): pics .WAIT $$(PICS)
 	$(BUILD.SO)
 	$(POST_PROCESS_SO)
 
-$(PPPOE): pics .WAIT $$(MAPFILE) $$(PICS)
+$(PPPOE): pics .WAIT $$(PICS)
 	$(BUILD.SO)
 	$(POST_PROCESS_SO)
 
diff --git a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/lib/Makefile b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/lib/Makefile
index ed76f57b7a..a29bdf1caf 100644
--- a/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/lib/Makefile
+++ b/usr/src/cmd/cmd-inet/usr.sadm/dhcpmgr/lib/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
 LIBRARY=	dhcpmgr.a
 VERS= 		.1
 OBJECTS= 	dhcptab.o exception.o network.o optiondefs.o service.o \
@@ -32,11 +32,16 @@ OBJECTS= 	dhcptab.o exception.o network.o optiondefs.o service.o \
 
 include $(SRC)/lib/Makefile.lib
 
+SRCDIR =	.
+
 # Override install location
 ROOTLIBDIR=	$(ROOT)/usr/sadm/admin/dhcpmgr
 
 LIBS=		$(DYNLIB)
 
+# There should be a mapfile here
+MAPFILES =
+
 CPPFLAGS += 	-I../com/sun/dhcpmgr/bridge \
 		-I$(JAVA_ROOT)/include \
 		-I$(JAVA_ROOT)/include/solaris \
diff --git a/usr/src/cmd/consadm/i386/Makefile b/usr/src/cmd/consadm/i386/Makefile
index cf306d374c..894822e5cf 100644
--- a/usr/src/cmd/consadm/i386/Makefile
+++ b/usr/src/cmd/consadm/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1998 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/consadm/i386/Makefile
-
-SRCDIR=	..
-
-.KEEP_STATE:
 
 include ../Makefile.com
diff --git a/usr/src/cmd/consadm/sparc/Makefile b/usr/src/cmd/consadm/sparc/Makefile
index 7b26e18b73..894822e5cf 100644
--- a/usr/src/cmd/consadm/sparc/Makefile
+++ b/usr/src/cmd/consadm/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1998 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/consadm/sparc/Makefile
-
-SRCDIR=	..
-
-.KEEP_STATE:
 
 include ../Makefile.com
diff --git a/usr/src/cmd/fs.d/hsfs/fstyp/Makefile b/usr/src/cmd/fs.d/hsfs/fstyp/Makefile
index 460f95d3c6..85a26afd04 100644
--- a/usr/src/cmd/fs.d/hsfs/fstyp/Makefile
+++ b/usr/src/cmd/fs.d/hsfs/fstyp/Makefile
@@ -19,11 +19,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 FSTYP_VERS=1
 FSTYPE=		hsfs
@@ -32,6 +32,9 @@ LIBPROG=	fstyp.so.${FSTYP_VERS}
 include ../../../../lib/Makefile.lib
 include ../../Makefile.fstype
 
+# There should be a mapfile here
+MAPFILES =
+
 CFLAGS +=	$(C_PICFLAGS)
 DYNLIB=		$(LIBPROG)
 
diff --git a/usr/src/cmd/fs.d/pcfs/fstyp/Makefile b/usr/src/cmd/fs.d/pcfs/fstyp/Makefile
index 8c28651fca..858d301da7 100644
--- a/usr/src/cmd/fs.d/pcfs/fstyp/Makefile
+++ b/usr/src/cmd/fs.d/pcfs/fstyp/Makefile
@@ -19,11 +19,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 FSTYP_VERS=1
 FSTYPE=		pcfs
@@ -32,6 +32,9 @@ LIBPROG=	fstyp.so.${FSTYP_VERS}
 include ../../../../lib/Makefile.lib
 include ../../Makefile.fstype
 
+# There should be a mapfile here
+MAPFILES =
+
 CFLAGS +=	$(C_PICFLAGS)
 DYNLIB=		$(LIBPROG)
 
diff --git a/usr/src/cmd/fs.d/pcfs/ident/Makefile b/usr/src/cmd/fs.d/pcfs/ident/Makefile
index 8a3ebe7070..9118659b16 100644
--- a/usr/src/cmd/fs.d/pcfs/ident/Makefile
+++ b/usr/src/cmd/fs.d/pcfs/ident/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Makefile for PCFS ident function.
-#
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-
 IDENT_VERS=1
 FSTYPE=		pcfs
 LIBPROG=	ident_pcfs.so.${IDENT_VERS} 
@@ -36,6 +32,9 @@ LIBPROG=	ident_pcfs.so.${IDENT_VERS}
 include ../../../../lib/Makefile.lib
 include ../../Makefile.fstype
 
+# There should be a mapfile here
+MAPFILES =
+
 DYNLIB=		$(LIBPROG)
 #
 # Override PMAP dependency
diff --git a/usr/src/cmd/fs.d/udfs/fstyp/Makefile b/usr/src/cmd/fs.d/udfs/fstyp/Makefile
index ea1a6385ec..55164e69cb 100644
--- a/usr/src/cmd/fs.d/udfs/fstyp/Makefile
+++ b/usr/src/cmd/fs.d/udfs/fstyp/Makefile
@@ -19,11 +19,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 FSTYP_VERS=1
 FSTYPE=		udfs
@@ -32,6 +32,9 @@ LIBPROG=	fstyp.so.${FSTYP_VERS}
 include ../../../../lib/Makefile.lib
 include ../../Makefile.fstype
 
+# There should be a mapfile here
+MAPFILES =
+
 CFLAGS +=	$(C_PICFLAGS)
 DYNLIB=		$(LIBPROG)
 
diff --git a/usr/src/cmd/fs.d/udfs/ident/Makefile b/usr/src/cmd/fs.d/udfs/ident/Makefile
index 65bb2cfe66..f326e6a8d4 100644
--- a/usr/src/cmd/fs.d/udfs/ident/Makefile
+++ b/usr/src/cmd/fs.d/udfs/ident/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-
 IDENT_VERS=1
 FSTYPE=		udfs
 LIBPROG=	ident_udfs.so.${IDENT_VERS} 
@@ -34,6 +32,9 @@ LIBPROG=	ident_udfs.so.${IDENT_VERS}
 include ../../../../lib/Makefile.lib
 include ../../Makefile.fstype
 
+# There should be a mapfile here
+MAPFILES =
+
 DYNLIB=		$(LIBPROG)
 
 #
diff --git a/usr/src/cmd/fs.d/ufs/fstyp/Makefile b/usr/src/cmd/fs.d/ufs/fstyp/Makefile
index f5ea7c8062..6743bc67e0 100644
--- a/usr/src/cmd/fs.d/ufs/fstyp/Makefile
+++ b/usr/src/cmd/fs.d/ufs/fstyp/Makefile
@@ -19,11 +19,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 FSTYP_VERS=1
 FSTYPE=		ufs
@@ -32,6 +32,9 @@ LIBPROG=	fstyp.so.${FSTYP_VERS}
 include ../../../../lib/Makefile.lib
 include ../../Makefile.fstype
 
+# There should be a mapfile here
+MAPFILES =
+
 CFLAGS +=	$(C_PICFLAGS)
 DYNLIB=		$(LIBPROG)
 
diff --git a/usr/src/cmd/fs.d/ufs/ident/Makefile b/usr/src/cmd/fs.d/ufs/ident/Makefile
index 816365331f..bd93aa9571 100644
--- a/usr/src/cmd/fs.d/ufs/ident/Makefile
+++ b/usr/src/cmd/fs.d/ufs/ident/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# Makefile for UFS ident function.
-#
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-
 IDENT_VERS=1
 FSTYPE=		ufs
 LIBPROG=	ident_ufs.so.${IDENT_VERS} 
@@ -36,6 +32,9 @@ LIBPROG=	ident_ufs.so.${IDENT_VERS}
 include ../../../../lib/Makefile.lib
 include ../../Makefile.fstype
 
+# There should be a mapfile here
+MAPFILES =
+
 CFLAGS += $(C_PICFLAGS)
 DYNLIB=		$(LIBPROG)
 
diff --git a/usr/src/cmd/fs.d/zfs/fstyp/Makefile b/usr/src/cmd/fs.d/zfs/fstyp/Makefile
index 7ec81ac1af..ba28b9e39f 100644
--- a/usr/src/cmd/fs.d/zfs/fstyp/Makefile
+++ b/usr/src/cmd/fs.d/zfs/fstyp/Makefile
@@ -19,11 +19,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 FSTYP_VERS=1
 FSTYPE=		zfs
@@ -32,6 +32,9 @@ LIBPROG=	fstyp.so.${FSTYP_VERS}
 include ../../../../lib/Makefile.lib
 include ../../Makefile.fstype
 
+# There should be a mapfile here
+MAPFILES =
+
 CFLAGS +=	$(C_PICFLAGS)
 DYNLIB=		$(LIBPROG)
 
diff --git a/usr/src/cmd/krb5/kadmin/gui/native/Makefile.com b/usr/src/cmd/krb5/kadmin/gui/native/Makefile.com
index 739948637c..42b179c552 100644
--- a/usr/src/cmd/krb5/kadmin/gui/native/Makefile.com
+++ b/usr/src/cmd/krb5/kadmin/gui/native/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,10 +18,12 @@
 #
 # CDDL HEADER END
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY=	libkadmin.a
 VERS=		.1
@@ -36,8 +37,6 @@ include $(SRC)/lib/Makefile.lib
 #
 include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5
 
-SRCDIR=		..
-MAPFILE=	../mapfile-vers
 ROOTLIBDIR=	$(ROOT)/usr/lib/krb5
 LIBS =		$(DYNLIB)
 
@@ -49,7 +48,7 @@ CPPFLAGS += -I../ -I$(SRC)/lib/krb5 \
 	-I$(JAVA_ROOT)/include -I$(JAVA_ROOT)/include/solaris
 
 LDLIBS += $(KMECHLIB) -L$(ROOT)/$(KERBLIBDIR) -lkadm5clnt -lsocket -lc
-DYNFLAGS += $(KRUNPATH) -M $(MAPFILE)
+DYNFLAGS += $(KRUNPATH)
 
 #
 # This library is not directly linked against by any C applications
@@ -64,7 +63,5 @@ LINTFLAGS	= -mxus
 
 lint: lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
 include $(SRC)/lib/Makefile.targ
 
diff --git a/usr/src/cmd/lp/cmd/adaptor/Makefile b/usr/src/cmd/lp/cmd/adaptor/Makefile
index 04aaa4547b..088d384e24 100644
--- a/usr/src/cmd/lp/cmd/adaptor/Makefile
+++ b/usr/src/cmd/lp/cmd/adaptor/Makefile
@@ -17,8 +17,6 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
-
-
 #
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
@@ -35,6 +33,9 @@ OBJECTS =	show_queue.o cancel_job.o submit_job.o misc.o
 include		../../../../lib/Makefile.lib
 include         ../../Makefile.lp
 
+# There should be a mapfile here
+MAPFILES =
+
 ROOTLIBDIR=	$(ROOT)/usr/lib/print/bsd-adaptor
 
 CPPFLAGS +=	-I$(LPINC)
diff --git a/usr/src/cmd/lp/lib/papi/Makefile b/usr/src/cmd/lp/lib/papi/Makefile
index 2f3d18a668..28da2a87d5 100644
--- a/usr/src/cmd/lp/lib/papi/Makefile
+++ b/usr/src/cmd/lp/lib/papi/Makefile
@@ -24,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/lp/lib/papi/Makefile
-#
 
 LIBRARY =	psm-lpsched.a
 VERS=.1
@@ -56,10 +54,9 @@ LDLIBS	+=	-L$(SRC)/cmd/lp/lib/forms -llpfrm
 LDLIBS	+=	-L$(SRC)/cmd/lp/lib/access -llpacc
 LDLIBS	+=	-L$(SRC)/cmd/lp/lib/lp -llp
 
-MAPFILES=	mapfile
-MAPOPTS=	$(MAPFILES:%=-M%)
-DYNFLAGS +=	$(BDIRECT) $(MAPOPTS)
+MAPFILES =	mapfile
 
+DYNFLAGS +=	$(BDIRECT)
 
 LIBS = $(DYNLIB)
 SRCS= $(OBJECTS:%.o=%.c)
diff --git a/usr/src/cmd/oamuser/lib/Makefile b/usr/src/cmd/oamuser/lib/Makefile
index 990c85493e..3f6475621b 100644
--- a/usr/src/cmd/oamuser/lib/Makefile
+++ b/usr/src/cmd/oamuser/lib/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# cmd/oamuser/lib/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
+
 LIBRARY= 	lib.a
 
 DATEFILE= 	ugdates
@@ -53,6 +51,8 @@ OBJECTS= 	putgrent.o \
 include ../../Makefile.cmd
 include ../../../lib/Makefile.lib
 
+SRCDIR =	.
+
 GREP= 		grep
 FILEMODE=	$(LIBFILEMODE)
 
diff --git a/usr/src/cmd/pcidr/Makefile.com b/usr/src/cmd/pcidr/Makefile.com
index 257987bb10..ff0bbce8e6 100755
--- a/usr/src/cmd/pcidr/Makefile.com
+++ b/usr/src/cmd/pcidr/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/pcidr/Makefile.com
+
 #
 # to be included AFTER cmd/Makefile.cmd or lib/Makefile.lib
+#
 
 TOP = $(SRC)/cmd/pcidr
 INSTALLDIR = /usr/lib/pci
@@ -35,6 +35,9 @@ INSTALLDIR = /usr/lib/pci
 #############################################################################
 ### used by macros in Makefile.cmd/lib
 
+# There should be a mapfile here
+MAPFILES =
+
 HDRDIR = $(TOP)
 HDRS_SH = cd $(HDRDIR); ls *.h
 HDRS = $(HDRS_SH:sh)
diff --git a/usr/src/cmd/pcidr/plugins/default/Makefile b/usr/src/cmd/pcidr/plugins/default/Makefile
index 2a8ced542c..31d01bc649 100755
--- a/usr/src/cmd/pcidr/plugins/default/Makefile
+++ b/usr/src/cmd/pcidr/plugins/default/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/pcidr/plugins/default/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 .PARALLEL:
@@ -50,6 +47,8 @@ THISDIR = $(TOP)/plugins/default
 # $(OBJECTS:%.o=$(SRCDIR)/%.c) where SRCDIR is this directory; set SRCS to a
 # list of source paths if it differ from the default
 #
+
+SRCDIR = .
 SRCS = $(TOPOBJECTS:%.o=$(TOP)/%.c) $(LOCOBJECTS:%.o=$(SRCDIR)/%.c)
 
 LIBS = $(DYNLIB)
diff --git a/usr/src/cmd/perl/5.6.1/distrib/Makefile.lib b/usr/src/cmd/perl/5.6.1/distrib/Makefile.lib
index c598f23298..c559d39e2e 100644
--- a/usr/src/cmd/perl/5.6.1/distrib/Makefile.lib
+++ b/usr/src/cmd/perl/5.6.1/distrib/Makefile.lib
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/perl/5.6.1/Makefile.lib
-#
-# Make libperl.so and libperl.so.1.
-#
 
 # When building libperl.so, hidden command and dependency checking is OK.
 .KEEP_STATE:
@@ -78,6 +73,9 @@ OBJECTS = \
 include ../../../../lib/Makefile.lib
 include ../Makefile.perlcfg
 
+# There should be a mapfile here
+MAPFILES =
+
 # Add in the perl-specific flags (including largefile flags).
 CPPFLAGS += $(PERL_COREFLAGS) $(PERL_LFFLAGS)
 
diff --git a/usr/src/cmd/perl/5.8.4/distrib/Makefile.lib b/usr/src/cmd/perl/5.8.4/distrib/Makefile.lib
index 8f7508c2f6..b5e6a6950f 100644
--- a/usr/src/cmd/perl/5.8.4/distrib/Makefile.lib
+++ b/usr/src/cmd/perl/5.8.4/distrib/Makefile.lib
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Make libperl.so and libperl.so.1.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 # When building libperl.so, hidden command and dependency checking is OK.
@@ -82,6 +79,9 @@ OBJECTS = \
 include ../../../../lib/Makefile.lib
 include ../Makefile.perlcfg
 
+# There should be a mapfile here
+MAPFILES =
+
 # Add in the perl-specific flags (including largefile flags).
 CPPFLAGS += $(PERL_COREFLAGS) $(PERL_LFFLAGS)
 
diff --git a/usr/src/cmd/picl/plugins/Makefile.com b/usr/src/cmd/picl/plugins/Makefile.com
index f9c06f5cdc..5e5dda5d6c 100644
--- a/usr/src/cmd/picl/plugins/Makefile.com
+++ b/usr/src/cmd/picl/plugins/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
-# cmd/picl/plugins/Makefile.com
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
+# There should be a mapfile here
+MAPFILES =
+
 CPPFLAGS	+= -I$(SRC)/lib/libpicl -I$(SRC)/lib/libpicltree
 CPPFLAGS	+= -I$(SRC)/cmd/picl/plugins/inc
 CFLAGS		+= $(CCVERBOSE)
@@ -63,4 +62,3 @@ ROOT_PLAT_PLUGINDIR := GROUP= sys
 
 USR_LIB_PICLDIR = $(ROOT)/usr/lib/picl
 USR_LIB_PLUGINDIR = $(USR_LIB_PICLDIR)/plugins
-
diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile
index 361bf2b972..7a3936d04f 100644
--- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile
+++ b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,33 +19,29 @@
 # CDDL HEADER END
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# cmd/picl/plugins/lib/picld_pluginutil/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include	$(SRC)/lib/Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH)
+SUBDIRS = $(MACH)
 
 # conditional assignments
-all :=      	TARGET= all
-install :=      TARGET= install
-clean :=        TARGET= clean
-clobber :=      TARGET= clobber
-lint :=         TARGET= lint
-_msg :=         TARGET= _msg
+all :=		TARGET= all
+clean :=	TARGET= clean
+clobber :=	TARGET= clobber
+install :=	TARGET= install
+lint :=		TARGET= lint
+_msg :=		TARGET= _msg
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
-
-_msg:	$(MACH)
+all clean clobber install lint _msg: $(SUBDIRS)
 
-$(MACH) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com
index c405952848..4d286b7475 100644
--- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com
+++ b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -35,8 +34,7 @@ OBJECTS=	picld_pluginutil.o
 include $(SRC)/lib/Makefile.lib
 
 SRCS=		$(OBJECTS:%.o=../%.c)
-MAPFILE=	$(MAPDIR)/mapfile
-CLOBBERFILES +=	$(MAPFILE)
+
 CLOBBERFILES +=	$(LIBLINKS)
 
 LIBS =		$(DYNLIB) $(LINTLIB)
@@ -57,7 +55,6 @@ POFILE=	picld_pluginutil.po
 CPPFLAGS +=	-I.. -I$(SRC)/lib/libpicl -I$(SRC)/lib/libpicltree
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-L$(SRC)/lib/libpicltree/$(MACH)
 LDLIBS +=	-lc -lpicltree
 
@@ -82,11 +79,6 @@ _msg:	$(MSGDOMAIN) $(POFILE)
 $(MSGDOMAIN):
 	$(INS.dir)
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include $(SRC)/lib/Makefile.targ
 
diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/i386/Makefile b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/i386/Makefile
index 61b81518f1..8787dcca02 100644
--- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/i386/Makefile
+++ b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/picl/plugins/lib/picld_pluginutil/i386/Makefile
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/mapfile-vers b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/mapfile-vers
new file mode 100644
index 0000000000..7952756c2d
--- /dev/null
+++ b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/mapfile-vers
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	picld_pluginutil_parse_config_file;
+    local:
+	*;
+};
diff --git a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/sparc/Makefile b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/sparc/Makefile
index 1bf4f62744..8787dcca02 100644
--- a/usr/src/cmd/picl/plugins/lib/picld_pluginutil/sparc/Makefile
+++ b/usr/src/cmd/picl/plugins/lib/picld_pluginutil/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/picl/plugins/lib/picld_pluginutil/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/cmd/pools/poold/libjkstat/Makefile b/usr/src/cmd/pools/poold/libjkstat/Makefile
index 0e23e77ff5..6f9caf443b 100644
--- a/usr/src/cmd/pools/poold/libjkstat/Makefile
+++ b/usr/src/cmd/pools/poold/libjkstat/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/pools/poold/libjkstat/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
 
-SUBDIRS =	spec .WAIT $(MACH)
+SUBDIRS =	$(MACH)
 
 all :=		TARGET = all
 clean :=	TARGET = clean
diff --git a/usr/src/cmd/pools/poold/libjkstat/Makefile.com b/usr/src/cmd/pools/poold/libjkstat/Makefile.com
index a8871f0bc3..21f1762460 100644
--- a/usr/src/cmd/pools/poold/libjkstat/Makefile.com
+++ b/usr/src/cmd/pools/poold/libjkstat/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/pools/poold/libjkstat/Makefile.com
-#
 
 LIBRARY =	libjkstat.a
 VERS =		.1
@@ -41,7 +38,6 @@ INCS =	-I$(JAVA_ROOT)/include \
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lkstat
 ROOTLIBDIR =	$(ROOT)/usr/lib/pool
-SRCDIR =	$(SRC)/cmd/pools/poold/libjkstat
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 $(INCS)
diff --git a/usr/src/cmd/pools/poold/libjkstat/i386/Makefile b/usr/src/cmd/pools/poold/libjkstat/i386/Makefile
index 0f84e63530..35ac6d4219 100644
--- a/usr/src/cmd/pools/poold/libjkstat/i386/Makefile
+++ b/usr/src/cmd/pools/poold/libjkstat/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/pools/poold/libjkstat/i386/Makefile
-#
-
 
 include ../Makefile.com
 
-MAPDIR= ../spec/i386
-
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjkstat/mapfile-vers b/usr/src/cmd/pools/poold/libjkstat/mapfile-vers
new file mode 100644
index 0000000000..39bfc234b6
--- /dev/null
+++ b/usr/src/cmd/pools/poold/libjkstat/mapfile-vers
@@ -0,0 +1,41 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	Java_com_sun_solaris_service_kstat_KstatCtl_chainUpdate;
+	Java_com_sun_solaris_service_kstat_KstatCtl_close;
+	Java_com_sun_solaris_service_kstat_KstatCtl_init;
+	Java_com_sun_solaris_service_kstat_KstatCtl_lookup;
+	Java_com_sun_solaris_service_kstat_KstatCtl_open;
+	Java_com_sun_solaris_service_kstat_Kstat_getCreationTime;
+	Java_com_sun_solaris_service_kstat_Kstat_getSnapTime;
+	Java_com_sun_solaris_service_kstat_Kstat_getValue;
+	Java_com_sun_solaris_service_kstat_Kstat_read;
+    local:
+	*;
+};
diff --git a/usr/src/cmd/pools/poold/libjkstat/sparc/Makefile b/usr/src/cmd/pools/poold/libjkstat/sparc/Makefile
index 1350b66bcf..35ac6d4219 100644
--- a/usr/src/cmd/pools/poold/libjkstat/sparc/Makefile
+++ b/usr/src/cmd/pools/poold/libjkstat/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/pools/poold/libjkstat/sparc/Makefile
-#
-
 
 include ../Makefile.com
 
-MAPDIR= ../spec/sparc
-
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjlgrp/Makefile b/usr/src/cmd/pools/poold/libjlgrp/Makefile
index a7d93d5174..15721c3e8f 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/Makefile
+++ b/usr/src/cmd/pools/poold/libjlgrp/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/pools/poold/libjlgrp/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
 
-SUBDIRS =	spec .WAIT $(MACH)
+SUBDIRS =	$(MACH)
 
 all :=		TARGET = all
 clean :=	TARGET = clean
diff --git a/usr/src/cmd/pools/poold/libjlgrp/Makefile.com b/usr/src/cmd/pools/poold/libjlgrp/Makefile.com
index 68ef5bf483..f878b1e6f2 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/Makefile.com
+++ b/usr/src/cmd/pools/poold/libjlgrp/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/pools/poold/libjlgrp/Makefile.com
-#
 
 LIBRARY =	libjlgrp.a
 VERS =		.1
@@ -38,12 +35,9 @@ include $(SRC)/lib/Makefile.lib
 INCS =	-I$(JAVA_ROOT)/include \
 	-I$(JAVA_ROOT)/include/solaris
 
-MAPFILE =	$(MAPDIR)/mapfile
-
 LIBS =		$(DYNLIB)
 LDLIBS +=	-llgrp -lc
 ROOTLIBDIR =	$(ROOT)/usr/lib/pool
-SRCDIR =	$(SRC)/cmd/pools/poold/libjlgrp
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 $(INCS)
diff --git a/usr/src/cmd/pools/poold/libjlgrp/i386/Makefile b/usr/src/cmd/pools/poold/libjlgrp/i386/Makefile
index 76ad708f5c..35ac6d4219 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/i386/Makefile
+++ b/usr/src/cmd/pools/poold/libjlgrp/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/pools/poold/libjlgrp/i386/Makefile
-#
-
 
 include ../Makefile.com
 
-MAPDIR= ../spec/i386
-
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjlgrp/mapfile-vers b/usr/src/cmd/pools/poold/libjlgrp/mapfile-vers
new file mode 100644
index 0000000000..fbd2dfd9ab
--- /dev/null
+++ b/usr/src/cmd/pools/poold/libjlgrp/mapfile-vers
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	Java_com_sun_solaris_service_locality_LocalityDomain_jl_1fini;
+	Java_com_sun_solaris_service_locality_LocalityDomain_jl_1init;
+	Java_com_sun_solaris_service_locality_LocalityDomain_jl_1root;
+	Java_com_sun_solaris_service_locality_LocalityGroup_jl_1children;
+	Java_com_sun_solaris_service_locality_LocalityGroup_jl_1cpus;
+	Java_com_sun_solaris_service_locality_LocalityGroup_jl_1latency;
+    local:
+	*;
+};
diff --git a/usr/src/cmd/pools/poold/libjlgrp/sparc/Makefile b/usr/src/cmd/pools/poold/libjlgrp/sparc/Makefile
index 8dbc2500a1..35ac6d4219 100644
--- a/usr/src/cmd/pools/poold/libjlgrp/sparc/Makefile
+++ b/usr/src/cmd/pools/poold/libjlgrp/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/pools/poold/libjlgrp/sparc/Makefile
-#
-
 
 include ../Makefile.com
 
-MAPDIR= ../spec/sparc
-
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjpool/Makefile b/usr/src/cmd/pools/poold/libjpool/Makefile
index 198a9ef241..8cdd821a9e 100644
--- a/usr/src/cmd/pools/poold/libjpool/Makefile
+++ b/usr/src/cmd/pools/poold/libjpool/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/pools/poold/libjpool/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
 
-SUBDIRS =	spec .WAIT $(MACH)
+SUBDIRS =	$(MACH)
 
 all :=		TARGET = all
 clean :=	TARGET = clean
diff --git a/usr/src/cmd/pools/poold/libjpool/Makefile.com b/usr/src/cmd/pools/poold/libjpool/Makefile.com
index 3de6d694a5..58567468ab 100644
--- a/usr/src/cmd/pools/poold/libjpool/Makefile.com
+++ b/usr/src/cmd/pools/poold/libjpool/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/pools/poold/libjpool/Makefile.com
-#
 
 LIBRARY =	libjpool.a
 VERS =		.1
@@ -38,13 +35,9 @@ include $(SRC)/lib/Makefile.lib
 INCS =	-I$(JAVA_ROOT)/include \
 	-I$(JAVA_ROOT)/include/solaris
 
-MAPFILE =	$(MAPDIR)/mapfile
-
 LIBS =		$(DYNLIB)
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lpool -lc
 ROOTLIBDIR =	$(ROOT)/usr/lib/pool
-SRCDIR =	$(SRC)/cmd/pools/poold/libjpool
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 $(INCS)
diff --git a/usr/src/cmd/pools/poold/libjpool/i386/Makefile b/usr/src/cmd/pools/poold/libjpool/i386/Makefile
index 5540c23533..35ac6d4219 100644
--- a/usr/src/cmd/pools/poold/libjpool/i386/Makefile
+++ b/usr/src/cmd/pools/poold/libjpool/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/pools/poold/libjpool/i386/Makefile
-#
-
 
 include ../Makefile.com
 
-MAPDIR= ../spec/i386
-
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjpool/mapfile-vers b/usr/src/cmd/pools/poold/libjpool/mapfile-vers
new file mode 100644
index 0000000000..dfba23da5b
--- /dev/null
+++ b/usr/src/cmd/pools/poold/libjpool/mapfile-vers
@@ -0,0 +1,121 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	Java_com_sun_solaris_service_pools_Element_walkProps;
+	Java_com_sun_solaris_service_pools_HRTime_timestamp;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POC_1BOOL;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POC_1DOUBLE;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POC_1INT;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POC_1INVAL;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POC_1STRING;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POC_1UINT;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POF_1DESTROY;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POF_1INVALID;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POF_1VALID;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POV_1LOOSE;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POV_1NONE;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POV_1RUNTIME;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POV_1STRICT;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POX_1NATIVE;
+	Java_com_sun_solaris_service_pools_PoolInternal_get_1POX_1TEXT;
+	Java_com_sun_solaris_service_pools_PoolInternal_init;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1associate;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1component_1info;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1component_1to_1elem;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1alloc;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1close;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1commit;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1export;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1free;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1info;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1location;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1open;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1remove;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1rollback;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1status;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1to_1elem;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1update;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1conf_1validate;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1create;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1destroy;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1dissociate;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1dynamic_1location;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1error;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1binding;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1owning_1resource;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1pool;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1property;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1resource;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1resource_1binding;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1get_1status;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1info;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1put_1property;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1query_1components;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1query_1pool_1resources;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1query_1pools;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1query_1resource_1components;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1query_1resources;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1create;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1destroy;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1info;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1to_1elem;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1transfer;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1type_1list;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1resource_1xtransfer;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1rm_1property;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1set_1binding;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1set_1status;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1static_1location;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1strerror;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1strerror_1sys;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1to_1elem;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1alloc;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1free;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1get_1name;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1get_1type;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1set_1bool;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1set_1double;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1set_1int64;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1set_1name;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1set_1string;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1value_1set_1uint64;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1version;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1walk_1components;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1walk_1pools;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1walk_1properties;
+	Java_com_sun_solaris_service_pools_PoolInternal_pool_1walk_1resources;
+	Java_com_sun_solaris_service_pools_PoolsException_getErrno;
+	Java_com_sun_solaris_service_pools_Value_getBoolValue;
+	Java_com_sun_solaris_service_pools_Value_getDoubleValue;
+	Java_com_sun_solaris_service_pools_Value_getLongValue;
+	Java_com_sun_solaris_service_pools_Value_getStringValue;
+	Java_com_sun_solaris_service_pools_Value_getUnsignedInt64Value;
+    local:
+	*;
+};
diff --git a/usr/src/cmd/pools/poold/libjpool/sparc/Makefile b/usr/src/cmd/pools/poold/libjpool/sparc/Makefile
index c362cddcde..35ac6d4219 100644
--- a/usr/src/cmd/pools/poold/libjpool/sparc/Makefile
+++ b/usr/src/cmd/pools/poold/libjpool/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/pools/poold/libjpool/sparc/Makefile
-#
-
 
 include ../Makefile.com
 
-MAPDIR= ../spec/sparc
-
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjsyslog/Makefile b/usr/src/cmd/pools/poold/libjsyslog/Makefile
index c668a01be3..80b59a3afb 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/Makefile
+++ b/usr/src/cmd/pools/poold/libjsyslog/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# cmd/pools/poold/libjsyslog/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
 
-SUBDIRS =	spec .WAIT $(MACH)
+SUBDIRS =	$(MACH)
 
 all :=		TARGET = all
 clean :=	TARGET = clean
diff --git a/usr/src/cmd/pools/poold/libjsyslog/Makefile.com b/usr/src/cmd/pools/poold/libjsyslog/Makefile.com
index eec6efccfa..9b0fc312a8 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/Makefile.com
+++ b/usr/src/cmd/pools/poold/libjsyslog/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/pools/poold/libjsyslog/Makefile.com
-#
 
 LIBRARY =	libjsyslog.a
 VERS =		.1
@@ -37,13 +34,10 @@ include $(SRC)/lib/Makefile.lib
 
 INCS =	-I$(JAVA_ROOT)/include \
 	-I$(JAVA_ROOT)/include/solaris
-MAPFILE	=	$(MAPDIR)/mapfile
 
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lc
-DYNFLAGS +=	-M$(MAPFILE)
 ROOTLIBDIR =	$(ROOT)/usr/lib/pool
-SRCDIR =	$(SRC)/cmd/pools/poold/libjsyslog
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 $(INCS)
diff --git a/usr/src/cmd/pools/poold/libjsyslog/i386/Makefile b/usr/src/cmd/pools/poold/libjsyslog/i386/Makefile
index c47e40e1d6..35ac6d4219 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/i386/Makefile
+++ b/usr/src/cmd/pools/poold/libjsyslog/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/pools/poold/libjsyslog/i386/Makefile
-#
-
 
 include ../Makefile.com
 
-MAPDIR= ../spec/i386
-
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/pools/poold/libjsyslog/mapfile-vers b/usr/src/cmd/pools/poold/libjsyslog/mapfile-vers
new file mode 100644
index 0000000000..7f181565b7
--- /dev/null
+++ b/usr/src/cmd/pools/poold/libjsyslog/mapfile-vers
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	Java_com_sun_solaris_service_logging_SyslogHandler_closelog;
+	Java_com_sun_solaris_service_logging_SyslogHandler_openlog;
+	Java_com_sun_solaris_service_logging_SyslogHandler_syslog;
+    local:
+	*;
+};
diff --git a/usr/src/cmd/pools/poold/libjsyslog/sparc/Makefile b/usr/src/cmd/pools/poold/libjsyslog/sparc/Makefile
index 73c4c909f0..35ac6d4219 100644
--- a/usr/src/cmd/pools/poold/libjsyslog/sparc/Makefile
+++ b/usr/src/cmd/pools/poold/libjsyslog/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/pools/poold/libjsyslog/sparc/Makefile
-#
-
 
 include ../Makefile.com
 
-MAPDIR= ../spec/sparc
-
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/cmd/print/gateway/translators/cascade/Makefile b/usr/src/cmd/print/gateway/translators/cascade/Makefile
index ee0cd19f03..efff220e82 100644
--- a/usr/src/cmd/print/gateway/translators/cascade/Makefile
+++ b/usr/src/cmd/print/gateway/translators/cascade/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1996, 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,6 +33,9 @@ OBJECTS =	cascade.o
 include		../../../../../lib/Makefile.lib
 include         ../../../Makefile.sp
 
+# There should be a mapfile here
+MAPFILES =
+
 ROOTLIBDIR=	$(ROOT)/usr/lib/print/bsd-adaptor
 
 #CPPFLAGS +=	-I$(LPINC)
diff --git a/usr/src/cmd/print/gateway/translators/test/Makefile b/usr/src/cmd/print/gateway/translators/test/Makefile
index e237bab625..301e3b8649 100644
--- a/usr/src/cmd/print/gateway/translators/test/Makefile
+++ b/usr/src/cmd/print/gateway/translators/test/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1989, 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,6 +33,9 @@ OBJECTS =	test.o
 include		../../../../../lib/Makefile.lib
 include         ../../../Makefile.sp
 
+# There should be a mapfile here
+MAPFILES =
+
 ROOTLIBDIR=	$(ROOT)/usr/lib/print/bsd-adaptor
 
 #CPPFLAGS +=	-I$(LPINC)
diff --git a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
index ce9fecbf20..35f3b5cb78 100644
--- a/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
+++ b/usr/src/cmd/print/printmgr/com/sun/admin/pm/server/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # Makefile for Java Print Manager server
 #
 
@@ -63,6 +64,11 @@ JNICLASSFILES =	DoPrinterNS.class
 
 include		$(SRC)/lib/Makefile.lib
 
+SRCDIR =	.
+
+# There should be a mapfile here
+MAPFILES =
+
 CLASSPATH=	$(SRC)/cmd/print/printmgr
 
 JAVAFILES =	$(CLASSFILES:.class=.java)
diff --git a/usr/src/cmd/sendmail/libmilter/Makefile.com b/usr/src/cmd/sendmail/libmilter/Makefile.com
index a6fdd9828e..96545bdfd7 100644
--- a/usr/src/cmd/sendmail/libmilter/Makefile.com
+++ b/usr/src/cmd/sendmail/libmilter/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -40,6 +39,9 @@ include		$(SRC)/lib/Makefile.lib
 REMDIR=		$(SENDMAIL)/libsm
 SRCDIR=		$(SENDMAIL)/libmilter
 
+# There should be a mapfile here
+MAPFILES =
+
 SRCS=		$(LOCOBJS:%.o=$(SRCDIR)/%.c) $(REMOBJS:%.o=$(REMDIR)/%.c)
 
 INCPATH=        -I$(SENDMAIL)/src -I$(SENDMAIL)/include
diff --git a/usr/src/cmd/sgs/0@0/Makefile.com b/usr/src/cmd/sgs/0@0/Makefile.com
index 1bd9227bf3..6d0dc93fb1 100644
--- a/usr/src/cmd/sgs/0@0/Makefile.com
+++ b/usr/src/cmd/sgs/0@0/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,11 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY=	0@0.a
 VERS=		.1
@@ -36,6 +35,7 @@ CRTS=		$(CRTI)		$(CRTN)
 
 include 	$(SRC)/lib/Makefile.lib
 
+MAPFILES=
 ASFLAGS=	-P -D_ASM	$(CPPFLAGS)
 DYNFLAGS +=	$(BLOCAL) $(ZNOVERSION) $(ZINITFIRST)
 LDLIBS +=	-lc
diff --git a/usr/src/cmd/sgs/Makefile b/usr/src/cmd/sgs/Makefile
index 40572f3e35..3374590b0b 100644
--- a/usr/src/cmd/sgs/Makefile
+++ b/usr/src/cmd/sgs/Makefile
@@ -28,6 +28,7 @@
 include		$(SRC)/cmd/Makefile.cmd
 
 SUBDIRS-common= libconv		\
+		.WAIT		\
 		libdl		\
 		libelf		\
 		liblddbg	\
@@ -173,7 +174,7 @@ FRC:
 # Cross-reference customization: ignore the directories named by XRPRUNE,
 # and tweak the file globs slightly.
 #
-XRPRUNE=	rtld.4.x spec packages abi
+XRPRUNE=	rtld.4.x packages abi
 XRADD=		*.msg mapfile* llib-[a-z]*
 XRDEL=		Makefile* kobj_*
 
diff --git a/usr/src/cmd/sgs/Makefile.com b/usr/src/cmd/sgs/Makefile.com
index d45a4d537b..7944654db2 100644
--- a/usr/src/cmd/sgs/Makefile.com
+++ b/usr/src/cmd/sgs/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -116,7 +115,7 @@ CHKMSGFLAGS =	$(SGSMSGTARG:%=-m %) $(SGSMSGCHK:%=-m %)
 # Native targets should use the minimum of ld(1) flags to allow building on
 # previous releases.  We use mapfiles to scope, but don't bother versioning.
 
-native :=	DYNFLAGS = $(MAPOPTS) -R$(SGSPROTO) -L$(SGSPROTO) $(ZNOVERSION)
+native :=	DYNFLAGS = -R$(SGSPROTO) -L$(SGSPROTO) $(ZNOVERSION)
 
 USE_PROTO =	-Yl,$(SGSPROTO)
 
diff --git a/usr/src/cmd/sgs/ldprof/Makefile.com b/usr/src/cmd/sgs/ldprof/Makefile.com
index de60ed4ff5..d14c2e9d39 100644
--- a/usr/src/cmd/sgs/ldprof/Makefile.com
+++ b/usr/src/cmd/sgs/ldprof/Makefile.com
@@ -19,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY=	ldprof.a
 VERS=		.1
@@ -39,7 +40,7 @@ ROOTLIBDIR=	$(ROOT)/usr/lib/link_audit
 
 SGSPROTO=	../../proto/$(MACH)
 
-MAPFILE=	mapfile-vers
+MAPFILES =	mapfile-vers
 
 # Building SUNWonld results in a call to the `package' target.  Requirements
 # needed to run this application on older releases are established:
@@ -48,7 +49,7 @@ MAPFILE=	mapfile-vers
 DLLIB =		$(VAR_DL_LIB)
 package	:=	DLLIB = $(VAR_PKG_DL_LIB)
 
-DYNFLAGS +=	-M$(MAPFILE) $(USE_PROTO)
+DYNFLAGS +=	$(USE_PROTO)
 CPPFLAGS=	-I. -I../common -I../../include \
 		-I../../rtld/common \
 		-I../../include/$(MACH) \
diff --git a/usr/src/cmd/sgs/ldprof/Makefile.targ b/usr/src/cmd/sgs/ldprof/Makefile.targ
index 3800548181..a52407b7b6 100644
--- a/usr/src/cmd/sgs/ldprof/Makefile.targ
+++ b/usr/src/cmd/sgs/ldprof/Makefile.targ
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
 
 lint:		$(SGSLINTOUT)
 
@@ -38,8 +38,6 @@ pics/%.o:	../common/%.c
 delete:
 		-$(RM) $(DYNLIB)
 
-$(DYNLIB):	$(MAPFILE)
-
 include		../../../../lib/Makefile.targ
 include		$(SRC)/cmd/sgs/Makefile.targ
 
diff --git a/usr/src/cmd/sgs/lex/Makefile.com b/usr/src/cmd/sgs/lex/Makefile.com
index afa0793390..7e498ee7d1 100644
--- a/usr/src/cmd/sgs/lex/Makefile.com
+++ b/usr/src/cmd/sgs/lex/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/sgs/lex/Makefile.com
-#
-
 
 MACHOBJS=	main.o sub1.o sub2.o sub3.o header.o parser.o
 WHATOBJS=	whatdir.o
@@ -44,11 +40,10 @@ OBJECTS=	$(LIBOBJS) $(LIBOBJS_W) $(LIBOBJS_E)
 
 FORMS=		nceucform ncform nrform
 
-# 32-bit environment mapfile
-MAPFILE=		../common/mapfile-vers
-
 include 	../../../../lib/Makefile.lib
 
+SRCDIR =	../common
+
 C99MODE=	$(C99_ENABLE)
 
 # Override default source file derivation rule (in Makefile.lib)
@@ -95,7 +90,6 @@ DYNLINKLIB=	$(LIBLINKS:%=$(DYNLINKLIBDIR)/%)
 $(DYNLIB) :=	CFLAGS += $(CCVERBOSE)
 $(DYNLIB) :=	CFLAGS64 += $(CCVERBOSE)
 
-DYNFLAGS += -M $(MAPFILE)
 $(DYNLIB) :=	LDLIBS += -lc
 
 CLEANFILES +=	../common/parser.c $(LINTPOUT) $(LINTOUT)
diff --git a/usr/src/cmd/sgs/lex/Makefile.targ b/usr/src/cmd/sgs/lex/Makefile.targ
index d0920f1cf2..41d7fcaf0a 100644
--- a/usr/src/cmd/sgs/lex/Makefile.targ
+++ b/usr/src/cmd/sgs/lex/Makefile.targ
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/sgs/lex/Makefile.targ
-#
 
 $(PROG): objs .WAIT $(POBJS)
 	$(LINK.c) $(POBJS) -o $@ $(LDLIBS)
@@ -69,7 +66,7 @@ $(LIBRARY): objs .WAIT $$(OBJS)
 	$(BUILD.AR)
 	$(POST_PROCESS_A)
 
-$(DYNLIB): $(MAPFILE) pics .WAIT $$(PICS)
+$(DYNLIB): pics .WAIT $$(PICS)
 	$(BUILD.SO)
 	$(POST_PROCESS_SO)
 
diff --git a/usr/src/cmd/sgs/libcrle/Makefile.com b/usr/src/cmd/sgs/libcrle/Makefile.com
index 1fbfb4adef..5ff1d69c30 100644
--- a/usr/src/cmd/sgs/libcrle/Makefile.com
+++ b/usr/src/cmd/sgs/libcrle/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -38,8 +37,7 @@ OBJECTS=	$(BLTOBJ)  $(COMOBJS)
 include		$(SRC)/lib/Makefile.lib
 include		$(SRC)/cmd/sgs/Makefile.com
 
-MAPFILES +=	../common/mapfile-vers
-MAPOPTS=	$(MAPFILES:%=-M%)
+SRCDIR =	../common
 
 # Building SUNWonld results in a call to the `package' target.  Requirements
 # needed to run this application on older releases are established:
@@ -55,8 +53,7 @@ LINTFLAGS +=	-u
 LINTFLAGS64 +=	-u
 
 CPPFLAGS +=	-I$(SRCBASE)/lib/libc/inc -I$(SRC)/common/sgsrtcid
-DYNFLAGS +=	$(VERSREF) $(CONVLIBDIR) -lconv \
-		$(MAPOPTS) $(USE_PROTO)
+DYNFLAGS +=	$(VERSREF) $(CONVLIBDIR) -lconv $(USE_PROTO)
 
 
 BLTDEFS=	msg.h
diff --git a/usr/src/cmd/sgs/libcrle/Makefile.targ b/usr/src/cmd/sgs/libcrle/Makefile.targ
index a87d02c2b8..c92cabe859 100644
--- a/usr/src/cmd/sgs/libcrle/Makefile.targ
+++ b/usr/src/cmd/sgs/libcrle/Makefile.targ
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
 
 pics64/%.o:	../common/%.c
 		$(COMPILE.c) -o $@ -D_ELF64 $<
@@ -33,8 +33,6 @@ pics/%.o:	../common/%.c
 		$(COMPILE.c) -o $@ $<
 		$(POST_PROCESS_O)
 
-$(DYNLIB):	$(MAPFILES)
- 
 $(LIBLINKS):
 		-$(RM) $@; $(SYMLINK) $(DYNLIB) $@
 
diff --git a/usr/src/cmd/sgs/libdl/Makefile.com b/usr/src/cmd/sgs/libdl/Makefile.com
index 3b6957dd8a..54bbb2c080 100644
--- a/usr/src/cmd/sgs/libdl/Makefile.com
+++ b/usr/src/cmd/sgs/libdl/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -32,8 +31,9 @@ VERS=		.1
 include 	$(SRC)/lib/Makefile.lib
 include 	$(SRC)/cmd/sgs/Makefile.com
 
-MAPFILES=	../common/mapfile-vers mapfile-vers $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M%)
+SRCDIR =	../common
+
+MAPFILES +=	mapfile-vers $(MAPFILE-FLTR)
 
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
 # and .fini sections being added).  Also, since there are no OBJECTS, turn
@@ -50,7 +50,6 @@ SRCS=		../common/llib-ldl
 
 CLEANFILES +=
 CLOBBERFILES +=	$(DYNLIB) $(LINTLIB) $(LINTOUTS) $(LIBLINKS)
-CLOBBERFILES += $(MAPFILE)
 
 
 ROOTFS_DYNLIB64=	$(DYNLIB:%=$(ROOTFS_LIBDIR64)/%)
diff --git a/usr/src/cmd/sgs/libdl/Makefile.targ b/usr/src/cmd/sgs/libdl/Makefile.targ
index 9983cc71ff..95cc2d06bd 100644
--- a/usr/src/cmd/sgs/libdl/Makefile.targ
+++ b/usr/src/cmd/sgs/libdl/Makefile.targ
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# sgs/libdl/Makefile.targ
-
-$(DYNLIB):	$(MAPFILES)
 
 $(ROOTFS_LIBDIR)/%:	%
 		$(INS.file)
diff --git a/usr/src/cmd/sgs/libdl/amd64/Makefile b/usr/src/cmd/sgs/libdl/amd64/Makefile
index 1e44e9a2d7..e2bc6ec326 100644
--- a/usr/src/cmd/sgs/libdl/amd64/Makefile
+++ b/usr/src/cmd/sgs/libdl/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -29,7 +28,7 @@
 include		../Makefile.com
 
 CONVLIBDIR=	$(CONVLIBDIR64)
-DYNFLAGS +=	-F /usr/lib/$(MACH64)/ld.so.1 -64 $(MAPOPTS)
+DYNFLAGS +=	-F /usr/lib/$(MACH64)/ld.so.1 -64
 LINTFLAGS64 +=	$(VAR_LINTFLAGS64)
 
 .KEEP_STATE:
@@ -41,6 +40,4 @@ all:		$(DYNLIB) $(LINTLIB)
 
 install:	all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64) $(ROOTFS_LINTLIB64)
 
-$(DYNLIB):	$(MAPFILES)
-
 BUILD.SO=	$(LD) -o $@ -G -64 $(DYNFLAGS) $(PICS)
diff --git a/usr/src/cmd/sgs/libdl/i386/Makefile b/usr/src/cmd/sgs/libdl/i386/Makefile
index 248838c8c0..9c83ff9ca9 100644
--- a/usr/src/cmd/sgs/libdl/i386/Makefile
+++ b/usr/src/cmd/sgs/libdl/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include		../Makefile.com
 
-DYNFLAGS +=	-F /usr/lib/ld.so.1 $(MAPOPTS)
+DYNFLAGS +=	-F /usr/lib/ld.so.1
 
 .KEEP_STATE:
 
diff --git a/usr/src/cmd/sgs/libdl/sparc/Makefile b/usr/src/cmd/sgs/libdl/sparc/Makefile
index a9a5a1923b..9dedb74d9d 100644
--- a/usr/src/cmd/sgs/libdl/sparc/Makefile
+++ b/usr/src/cmd/sgs/libdl/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,17 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 4VERS=		.0
 
 include		../Makefile.com
 
-DYNFLAGS +=	-F /usr/lib/ld.so.1 $(MAPOPTS)
+DYNFLAGS +=	-F /usr/lib/ld.so.1
 
 # A symbolic link from /usr/4lib/libdl.so.1.0 is required for BCP.
 
diff --git a/usr/src/cmd/sgs/libdl/sparcv9/Makefile b/usr/src/cmd/sgs/libdl/sparcv9/Makefile
index 1d03d75179..e2bc6ec326 100644
--- a/usr/src/cmd/sgs/libdl/sparcv9/Makefile
+++ b/usr/src/cmd/sgs/libdl/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/sgs/libdl/sparcv9/Makefile
 
 include		../Makefile.com
 
 CONVLIBDIR=	$(CONVLIBDIR64)
-DYNFLAGS +=	-F /usr/lib/$(MACH64)/ld.so.1 -64 $(MAPOPTS)
+DYNFLAGS +=	-F /usr/lib/$(MACH64)/ld.so.1 -64
 LINTFLAGS64 +=	$(VAR_LINTFLAGS64)
 
 .KEEP_STATE:
@@ -42,6 +40,4 @@ all:		$(DYNLIB) $(LINTLIB)
 
 install:	all $(ROOTFS_DYNLIB64) $(ROOTFS_LINKS64) $(ROOTFS_LINTLIB64)
 
-$(DYNLIB):	$(MAPFILES)
-
 BUILD.SO=	$(LD) -o $@ -G -64 $(DYNFLAGS) $(PICS)
diff --git a/usr/src/cmd/sgs/libelf/Makefile.com b/usr/src/cmd/sgs/libelf/Makefile.com
index 04fc80ed74..4e17b26de8 100644
--- a/usr/src/cmd/sgs/libelf/Makefile.com
+++ b/usr/src/cmd/sgs/libelf/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -64,12 +63,11 @@ $(OBJS) :=	XFFLAG=
 
 WARLOCKFILES=	$(OBJECTS:%.o=wlocks/%.ll)
 
-MAPFILES=	../common/mapfile-common
-MAPOPTS=	$(MAPFILES:%=-M%)
+MAPFILES =	../common/mapfile-common
 
 CLOBBERFILES +=
 
-DYNFLAGS +=	$(VERSREF) $(MAPOPTS)
+DYNFLAGS +=	$(VERSREF)
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) $(VAR_LIBELF_LDLIBS) -lc
 
 LINTFLAGS +=	-u -erroff=E_BAD_PTR_CAST_ALIGN
diff --git a/usr/src/cmd/sgs/libelf/Makefile.targ b/usr/src/cmd/sgs/libelf/Makefile.targ
index e2264e5178..a6d140f8a6 100644
--- a/usr/src/cmd/sgs/libelf/Makefile.targ
+++ b/usr/src/cmd/sgs/libelf/Makefile.targ
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -66,8 +65,6 @@ $(VAR_POUND_2)lint :=		LIBTHREADFLAG=-lthread
 delete:
 		$(RM) $(DYNLIB)
 
-$(DYNLIB):	$$(MAPFILES)
-
 $(LIBLINKS):
 		$(RM) $(LIBLINKS)
 		$(SYMLINK) $(DYNLIB) $(LIBLINKS)
@@ -136,7 +133,7 @@ wlocks/%.ll:	../common/%.c
 native:		$(SGSPROTO)/$(DYNLIB)
 
 $(SGSPROTO)/$(DYNLIB): \
-		pics .WAIT $$(PICS) $(MAPFILES)
+		pics .WAIT $$(PICS)
 		$(BUILD.SO)
 		$(POST_PROCESS_SO)
 		-@$(RM) $(SGSPROTO)/$(LIBLINKS)
diff --git a/usr/src/cmd/sgs/libelf/Makefile.targ.64 b/usr/src/cmd/sgs/libelf/Makefile.targ.64
index 4bb6e6f15f..5c932f4045 100644
--- a/usr/src/cmd/sgs/libelf/Makefile.targ.64
+++ b/usr/src/cmd/sgs/libelf/Makefile.targ.64
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -61,8 +60,6 @@ $(VAR_POUND_2)lint :=		LIBTHREADFLAG=-lthread
 delete:
 		$(RM) $(DYNLIB)
 
-$(DYNLIB):	$(MAPFILES)
-
 $(LIBLINKS):
 		$(RM) $(LIBLINKS)
 		$(SYMLINK) $(DYNLIB) $(LIBLINKS)
diff --git a/usr/src/cmd/sgs/libld/Makefile.com b/usr/src/cmd/sgs/libld/Makefile.com
index f79ced9e66..2bb0f77183 100644
--- a/usr/src/cmd/sgs/libld/Makefile.com
+++ b/usr/src/cmd/sgs/libld/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -63,9 +62,7 @@ OBJECTS =	$(BLTOBJ) $(G_MACHOBJS32) $(G_MACHOBJS64) \
 include 	$(SRC)/lib/Makefile.lib
 include 	$(SRC)/cmd/sgs/Makefile.com
 
-MAPFILES=	../common/mapfile-vers
-MAPOPTS=	$(MAPFILES:%=-M%)
-
+SRCDIR =	../common
 ELFCAP=		$(SRC)/common/elfcap
 
 # Building SUNWonld results in a call to the `package' target.  Requirements
@@ -85,10 +82,9 @@ LINTFLAGS +=	-u -D_REENTRANT
 LINTFLAGS64 +=	-u -D_REENTRANT
 
 DYNFLAGS +=	$(BDIRECT) $(VERSREF) \
-		$(ZLAZYLOAD) $(MAPOPTS) $(USE_PROTO) '-R$$ORIGIN'
+		$(ZLAZYLOAD) $(USE_PROTO) '-R$$ORIGIN'
 
 $(VAR_POUND_3)DEFS=
-$(VAR_POUND_3)native:=	MAPOPTS	=
 native:=	DYNFLAGS	+= $(CONVLIBDIR)
 
 BLTDEFS =	msg.h
diff --git a/usr/src/cmd/sgs/libld/Makefile.targ b/usr/src/cmd/sgs/libld/Makefile.targ
index 372eaa1bd3..46a7ef93c5 100644
--- a/usr/src/cmd/sgs/libld/Makefile.targ
+++ b/usr/src/cmd/sgs/libld/Makefile.targ
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -66,8 +65,6 @@ pics/elfcap.o:	$(ELFCAP)/elfcap.c
 		$(COMPILE.c) -o  $@ -DCAP_LOWERCASE $(ELFCAP)/elfcap.c
 		$(POST_PROCESS_O)
 
-$(DYNLIB):	$(MAPFILES)
-
 $(LIBLINKS):
 		$(RM) $@; $(SYMLINK) $(DYNLIB) $@
 
@@ -85,7 +82,7 @@ lint:		$(LINTLIB32) $(LINTOUT32) $(LINTLIB64) $(LINTOUT64) \
 native:		$(SGSPROTO)/$(DYNLIB)
 
 $(SGSPROTO)/$(DYNLIB): \
-		pics .WAIT $$(PICS) $(MAPFILES)
+		pics .WAIT $$(PICS)
 		$(BUILD.SO)
 		$(POST_PROCESS_SO)
 		@$(RM) $(SGSPROTO)/$(LIBLINKS)
diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.com b/usr/src/cmd/sgs/liblddbg/Makefile.com
index 677f149049..613f4d3a90 100644
--- a/usr/src/cmd/sgs/liblddbg/Makefile.com
+++ b/usr/src/cmd/sgs/liblddbg/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -56,14 +55,13 @@ OBJECTS =	$(BLTOBJ) $(COMOBJS) $(COMOBJS32) $(COMOBJS64) $(TOOLOBJ)
 include		$(SRC)/lib/Makefile.lib
 include		$(SRC)/cmd/sgs/Makefile.com
 
-MAPFILES +=	../common/mapfile-vers
-MAPOPTS =	$(MAPFILES:%=-M%)
+SRCDIR =	../common
 
 LINTFLAGS +=	-u -D_REENTRANT
 LINTFLAGS64 +=	-u -D_REENTRANT
 
 CPPFLAGS +=	-I$(SRCBASE)/lib/libc/inc $(VAR_LIBLDDBG_CPPFLAGS)
-DYNFLAGS +=	$(VERSREF) $(MAPOPTS) $(ZLAZYLOAD) '-R$$ORIGIN'
+DYNFLAGS +=	$(VERSREF) $(ZLAZYLOAD) '-R$$ORIGIN'
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) -lc
 
 # A bug in pmake causes redundancy when '+=' is conditionally assigned, so
@@ -74,7 +72,6 @@ XXXFLAGS=
 $(DYNLIB) :=	XXXFLAGS= $(USE_PROTO)
 DYNFLAGS +=     $(XXXFLAGS)
 
-native :=	MAPOPTS=
 native :=	DYNFLAGS	+= $(CONVLIBDIR)
 
 BLTDEFS =	msg.h
diff --git a/usr/src/cmd/sgs/liblddbg/Makefile.targ b/usr/src/cmd/sgs/liblddbg/Makefile.targ
index 1802dc3cf4..71c17d0bae 100644
--- a/usr/src/cmd/sgs/liblddbg/Makefile.targ
+++ b/usr/src/cmd/sgs/liblddbg/Makefile.targ
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -42,8 +41,6 @@ pics/%64.o:	../common/%.c
 		$(COMPILE.c) -D_ELF64 -o $@ $<
 		$(POST_PROCESS_O)
 
-$(DYNLIB):	$(MAPFILES)
-
 $(LIBLINKS):
 		-$(RM) $@; $(SYMLINK) $(DYNLIB) $@
 
@@ -61,7 +58,7 @@ lint:		$(LINTLIB32) $(LINTOUT32) $(LINTLIB64) $(LINTOUT64) \
 native:		$(SGSPROTO)/$(DYNLIB)
 
 $(SGSPROTO)/$(DYNLIB): \
-		pics .WAIT $$(PICS) $(MAPFILES)
+		pics .WAIT $$(PICS)
 		$(BUILD.SO)
 		$(POST_PROCESS_SO)
 		-@$(RM) $(SGSPROTO)/$(LIBLINKS)
diff --git a/usr/src/cmd/sgs/libldmake/Makefile.com b/usr/src/cmd/sgs/libldmake/Makefile.com
index bd1c06b9fc..0d6ebd7891 100644
--- a/usr/src/cmd/sgs/libldmake/Makefile.com
+++ b/usr/src/cmd/sgs/libldmake/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -38,9 +37,9 @@ ROOTLIBDIR64=	$(ROOT)/opt/SUNWonld/lib/$(MACH64)
 
 SGSPROTO=	../../proto/$(MACH)
 
-MAPFILE=	../common/mapfile-vers
+SRCDIR =	../common
 
-DYNFLAGS +=	$(USE_PROTO) -M$(MAPFILE)
+DYNFLAGS +=	$(USE_PROTO)
 
 CFLAGS +=	$(C_PICFLAGS)
 CFLAGS64 +=	$(C_PICFLAGS64)
diff --git a/usr/src/cmd/sgs/libldmake/Makefile.targ b/usr/src/cmd/sgs/libldmake/Makefile.targ
index 53893565d8..de946c6334 100644
--- a/usr/src/cmd/sgs/libldmake/Makefile.targ
+++ b/usr/src/cmd/sgs/libldmake/Makefile.targ
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,11 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 1994,2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 lint:		$(LINTLIB) $(LINTOUT32) $(LINTOUT64) $(SGSLINTOUT)
 
@@ -39,7 +38,5 @@ pics/%.o:	../common/%.c
 delete:
 		-$(RM) $(DYNLIB)
 
-$(DYNLIB):	$(MAPFILE)
-
 include		$(SRC)/lib/Makefile.targ
 include		$(SRC)/cmd/sgs/Makefile.targ
diff --git a/usr/src/cmd/sgs/libldstab/Makefile.com b/usr/src/cmd/sgs/libldstab/Makefile.com
index d862036421..91f93046a1 100644
--- a/usr/src/cmd/sgs/libldstab/Makefile.com
+++ b/usr/src/cmd/sgs/libldstab/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -38,13 +37,11 @@ OBJECTS=	$(BLTOBJ) $(COMOBJS) $(DUPOBJS)
 include		$(SRC)/lib/Makefile.lib
 include		$(SRC)/cmd/sgs/Makefile.com
 
+SRCDIR =	../common
 SRCBASE=	../../../..
 
-MAPFILES=	../common/mapfile-vers
-MAPOPTS=	$(MAPFILES:%=-M%)
-
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) $(ELFLIBDIR) -lelf -lc
-DYNFLAGS +=	$(VERSREF) $(MAPOPTS)
+DYNFLAGS +=	$(VERSREF)
 
 LINTFLAGS +=	-erroff=E_NAME_DECL_NOT_USED_DEF2 \
 		-erroff=E_NAME_DEF_NOT_USED2 \
diff --git a/usr/src/cmd/sgs/libldstab/Makefile.targ b/usr/src/cmd/sgs/libldstab/Makefile.targ
index 53fd6aace6..9ffef5b4d5 100644
--- a/usr/src/cmd/sgs/libldstab/Makefile.targ
+++ b/usr/src/cmd/sgs/libldstab/Makefile.targ
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
 
 pics/%.o:	../common/%.c
 		$(COMPILE.c) -o $@ $<
@@ -38,15 +38,13 @@ lint:		$(LINTOUT32) $(SGSLINTOUT)
 delete:
 		-$(RM) $(DYNLIB)
 
-$(DYNLIB):	$(MAPFILES)
-
 # Special target for native builds (ie. when we need to build a version of ld
 # to build a version of ld :-).
 
 native:		$(SGSPROTO)/$(DYNLIB)
 
 $(SGSPROTO)/$(DYNLIB): \
-		pics .WAIT $$(PICS) $(MAPFILES)
+		pics .WAIT $$(PICS)
 		$(BUILD.SO)
 		$(POST_PROCESS_SO)
 
diff --git a/usr/src/cmd/sgs/librtld/Makefile.com b/usr/src/cmd/sgs/librtld/Makefile.com
index 9d3d5b1735..7b0763aeb4 100644
--- a/usr/src/cmd/sgs/librtld/Makefile.com
+++ b/usr/src/cmd/sgs/librtld/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -40,9 +39,7 @@ OBJECTS=	$(BLTOBJ)  $(MACHOBJS)  $(COMOBJS)
 include		$(SRC)/lib/Makefile.lib
 include		$(SRC)/cmd/sgs/Makefile.com
 
-MAPFILES =	../common/mapfile-vers
-MAPOPTS =	$(MAPFILES:%=-M%)
-
+SRCDIR =	../common
 CPPFLAGS +=	-I../../rtld/common -I$(SRCBASE)/lib/libc/inc \
 		-I$(SRCBASE)/uts/common/krtld -I$(SRC)/common/sgsrtcid
 DYNFLAGS +=	$(VERSREF) $(ZLAZYLOAD) '-R$$ORIGIN'
@@ -55,7 +52,7 @@ LINTFLAGS64 +=	-u -erroff=E_NAME_DECL_NOT_USED_DEF2
 # '=' is used with extra variables.
 #
 XXXFLAGS=
-$(DYNLIB) :=	XXXFLAGS= $(USE_PROTO) $(MAPOPTS)
+$(DYNLIB) :=	XXXFLAGS= $(USE_PROTO)
 DYNFLAGS +=	$(XXXFLAGS)
 
 
diff --git a/usr/src/cmd/sgs/librtld/Makefile.targ b/usr/src/cmd/sgs/librtld/Makefile.targ
index 5404ef3806..134daba96a 100644
--- a/usr/src/cmd/sgs/librtld/Makefile.targ
+++ b/usr/src/cmd/sgs/librtld/Makefile.targ
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
 
 pics/%.o:	../common/%.c
 		$(COMPILE.c) -o $@ $<
 		$(POST_PROCESS_O)
 
-$(DYNLIB):	$(MAPFILE)
-
 $(LIBLINKS):
 		-$(RM) $@; $(SYMLINK) $(DYNLIB) $@
 
@@ -43,7 +41,7 @@ delete:
 native:		$(SGSPROTO)/$(DYNLIB)
 
 $(SGSPROTO)/$(DYNLIB): \
-		pics .WAIT $$(PICS) $(MAPFILE)
+		pics .WAIT $$(PICS)
 		$(BUILD.SO)
 		$(POST_PROCESS_SO)
 		-@$(RM) $(SGSPROTO)/$(LIBLINKS)
diff --git a/usr/src/cmd/sgs/librtld_db/Makefile.com b/usr/src/cmd/sgs/librtld_db/Makefile.com
index c0bdcded69..5a87d8d2f9 100644
--- a/usr/src/cmd/sgs/librtld_db/Makefile.com
+++ b/usr/src/cmd/sgs/librtld_db/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -37,10 +36,10 @@ OBJECTS =	$(BLTOBJ) $(COMOBJS) $(COMOBJS64) $(PLTOBJS)
 include		$(SRC)/lib/Makefile.lib
 include		$(SRC)/cmd/sgs/Makefile.com
 
-MAPFILE=	../common/mapfile-vers
+SRCDIR =	../common
 
 CPPFLAGS +=	-I$(SRCBASE)/lib/libc/inc
-DYNFLAGS +=	-M$(MAPFILE) $(VERSREF)
+DYNFLAGS +=	$(VERSREF)
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) -lc
 
 LINTFLAGS +=	-u -erroff=E_NAME_DECL_NOT_USED_DEF2
diff --git a/usr/src/cmd/sgs/librtld_db/Makefile.targ b/usr/src/cmd/sgs/librtld_db/Makefile.targ
index 6dbbe262a7..04c1f137c4 100644
--- a/usr/src/cmd/sgs/librtld_db/Makefile.targ
+++ b/usr/src/cmd/sgs/librtld_db/Makefile.targ
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -40,8 +39,6 @@ pics/%64.o:	../common/%.c
 		$(COMPILE.c) -D_ELF64 $(PICFLAGS) -o $@ $<
 		$(POST_PROCESS_O)
 
-$(DYNLIB):	$(MAPFILE)
-
 delete:
 		-$(RM) $(DYNLIB)
 
diff --git a/usr/src/cmd/sgs/link_audit/Makefile.com b/usr/src/cmd/sgs/link_audit/Makefile.com
index b47b460b54..0d0bbf0543 100644
--- a/usr/src/cmd/sgs/link_audit/Makefile.com
+++ b/usr/src/cmd/sgs/link_audit/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -95,11 +94,11 @@ $(WHOLIB):=	SONAME = $(WHOLIB)
 $(SYMBINDREP):=	SONAME = $(SYMBINDREP)
 $(BINDLIB):=	SONAME = $(BINDLIB)
 
-$(TRUSSLIB):=	MAPFILE = mapfile-vers-truss
-$(PERFLIB):=	MAPFILE = mapfile-vers-perfcnt
-$(WHOLIB):=	MAPFILE = mapfile-vers-who
-$(SYMBINDREP):=	MAPFILE = mapfile-vers-symbindrep
-$(BINDLIB):=	MAPFILE = mapfile-vers-bindings
+$(TRUSSLIB):=	MAPFILES = mapfile-vers-truss
+$(PERFLIB):=	MAPFILES = mapfile-vers-perfcnt
+$(WHOLIB):=	MAPFILES = mapfile-vers-who
+$(SYMBINDREP):=	MAPFILES = mapfile-vers-symbindrep
+$(BINDLIB):=	MAPFILES = mapfile-vers-bindings
 
 $(ROOTCCSLIB) :=	OWNER =		root
 $(ROOTCCSLIB) :=	GROUP =		bin
@@ -107,7 +106,7 @@ $(ROOTCCSLIB) :=	DIRMODE =	755
 
 CPPFLAGS +=	-D_REENTRANT
 LDFLAGS +=	$(USE_PROTO)
-DYNFLAGS +=	$(VERSREF) -M$(MAPFILE)
+DYNFLAGS +=	$(VERSREF)
 
 LINTFLAGS +=	-uaxs $(LDLIBS)
 LINTFLAGS64 +=	-uaxs $(LDLIBS)
diff --git a/usr/src/cmd/sgs/link_audit/Makefile.targ b/usr/src/cmd/sgs/link_audit/Makefile.targ
index 6efd456ee3..621d5a9e85 100644
--- a/usr/src/cmd/sgs/link_audit/Makefile.targ
+++ b/usr/src/cmd/sgs/link_audit/Makefile.targ
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -47,23 +46,23 @@ $(OBJDIR)/%.o: ../common/%.c
 		$(COMPILE.c) $< -o $@
 		$(POST_PROCESS_O)
 
-$(TRUSSLIB): $(TRUSSPICS) $$(MAPFILE)
+$(TRUSSLIB): $(TRUSSPICS)
 		$(BUILD.SO)
 		$(POST_PROCESS_SO)
 
-$(BINDLIB): $(BINDPICS) $$(MAPFILE)
+$(BINDLIB): $(BINDPICS)
 		$(BUILD.SO)
 		$(POST_PROCESS_SO)
 
-$(SYMBINDREP): $(SYMBINDREPPICS) $$(MAPFILE)
+$(SYMBINDREP): $(SYMBINDREPPICS)
 		$(BUILD.SO)
 		$(POST_PROCESS_SO)
 
-$(PERFLIB): $(PERFPICS) $$(MAPFILE)
+$(PERFLIB): $(PERFPICS)
 		$(BUILD.SO)
 		$(POST_PROCESS_SO)
 
-$(WHOLIB): $(WHOPICS) $$(MAPFILE)
+$(WHOLIB): $(WHOPICS)
 		$(BUILD.SO)
 		$(POST_PROCESS_SO)
 
diff --git a/usr/src/cmd/sgs/rtld/Makefile.com b/usr/src/cmd/sgs/rtld/Makefile.com
index a9a4080ae4..1a719315ec 100644
--- a/usr/src/cmd/sgs/rtld/Makefile.com
+++ b/usr/src/cmd/sgs/rtld/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -45,13 +44,13 @@ NOCTFOBJS=	$(ASOBJS)
 include		$(SRC)/lib/Makefile.lib
 include		$(SRC)/cmd/sgs/Makefile.com
 
+SRCDIR =	../common
 PLAT =		$(VAR_PLAT_$(BASEPLAT))
 
 # Dtrace needs an executable data segment.
 NX_MAP=
 
-MAPFILES =	../common/mapfile-vers $(MAPFILE-ORDER) $(MAPFILE-PLAT)
-MAPOPTS =	$(MAPFILES:%=-M%)
+MAPFILES +=	$(MAPFILE-ORDER) $(MAPFILE-PLAT)
 
 # For the libc/libthread unified world:
 # This library needs to be placed in /lib to allow
@@ -97,7 +96,7 @@ LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) \
 		$(LDLIB) $(LD_LIB) 
 
 DYNFLAGS +=	-i -e _rt_boot $(VERSREF) -Bsymbolic -zlazyload -znodlopen \
-		-z interpose -zdtrace=dtrace_data $(MAPOPTS) '-R$$ORIGIN'
+		-z interpose -zdtrace=dtrace_data '-R$$ORIGIN'
 
 BUILD.s=	$(AS) $(ASFLAGS) $< -o $@
 
diff --git a/usr/src/cmd/sgs/rtld/Makefile.targ b/usr/src/cmd/sgs/rtld/Makefile.targ
index c35e499d5b..c3ec985afa 100644
--- a/usr/src/cmd/sgs/rtld/Makefile.targ
+++ b/usr/src/cmd/sgs/rtld/Makefile.targ
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -63,7 +62,7 @@ pics/%.o:	$(SRCBASE)/uts/$(PLAT)/krtld/%.c
 		$(COMPILE.c) -o $@ $<  $(WARNFLAGS)
 		$(POST_PROCESS_O)
 
-$(RTLD):	pics $(PICS) $(CRTS) $(MAPFILES)
+$(RTLD):	pics $(PICS) $(CRTS)
 		$(SGSPROTO)/ld -o $@ -dy -G $(DYNFLAGS) $(CRTI) $(PICS) \
 		    $(LDLIBS) $(CRTN)
 		$(POST_PROCESS_SO)
diff --git a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com
index 1690f2ff09..960356c572 100644
--- a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com
+++ b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -40,7 +39,7 @@ include		$(SRC)/cmd/sgs/Makefile.com
 
 SGSMSGALL=	rtld.msg
 
-MAPFILE=	../common/mapfile
+MAPFILES =	../common/mapfile
 SRCS=		$(OBJECTS:%.o=../common/%.c)
 
 BLTDEFS=	msg.h
@@ -73,7 +72,7 @@ CPPFLAGS +=	-I. -I../common -I../../common -I../../../include \
 		-I$(SRC)/common/sgsrtcid \
 		-I$(SRC)/uts/$(ARCH)/sys
 
-DYNFLAGS +=	$(VERSREF) -M $(MAPFILE)
+DYNFLAGS +=	$(VERSREF)
 LDLIBS +=	$(CONVLIBDIR) $(CONV_LIB) -lc
 
 ROOTMDBLIB=	$(ROOT)/usr/lib/mdb/proc
diff --git a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.targ b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.targ
index 42f6344249..dbe4afe5ad 100644
--- a/usr/src/cmd/sgs/rtld/mdbmod/Makefile.targ
+++ b/usr/src/cmd/sgs/rtld/mdbmod/Makefile.targ
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -26,8 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-$(DYNLIB):      $(MAPFILE)
-
 catalog:
 
 pics/%.o:	../common/%.c
diff --git a/usr/src/cmd/sgs/yacc/Makefile.com b/usr/src/cmd/sgs/yacc/Makefile.com
index b07cc03225..3beb4021fb 100644
--- a/usr/src/cmd/sgs/yacc/Makefile.com
+++ b/usr/src/cmd/sgs/yacc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/sgs/yacc/Makefile.com
-#
 
 COMOBJS=	y1.o y2.o y3.o y4.o
 WHATOBJS=	whatdir.o
@@ -39,11 +36,10 @@ LIBRARY=	liby.a
 VERS=		.1
 YACCPAR=	yaccpar
 
-# 32-bit environment mapfile
-MAPFILE=	../common/mapfile-vers
-
 include ../../../../lib/Makefile.lib
 
+SRCDIR =	../common
+
 # Override default source file derivation rule (in Makefile.lib)
 # from objects
 #
@@ -83,7 +79,5 @@ DYNLINKLIB=	$(LIBLINKS:%=$(DYNLINKLIBDIR)/%)
 
 $(DYNLIB) :=	LDLIBS += -lc
 
-DYNFLAGS += -M$(MAPFILE)
-
 CLEANFILES +=	$(LINTPOUT) $(LINTOUT)
 CLOBBERFILES +=	$(LIBS) $(LIBRARY)
diff --git a/usr/src/cmd/sgs/yacc/Makefile.targ b/usr/src/cmd/sgs/yacc/Makefile.targ
index 75f692c9e5..5f909b5291 100644
--- a/usr/src/cmd/sgs/yacc/Makefile.targ
+++ b/usr/src/cmd/sgs/yacc/Makefile.targ
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1993-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/sgs/yacc/Makefile.targ
-#
 
 $(PROG): objs .WAIT $(POBJS)
 	$(LINK.c) $(POBJS) -o $@ $(LDLIBS)
@@ -69,7 +66,7 @@ $(LIBRARY): objs .WAIT $$(OBJS)
 	$(BUILD.AR)
 	$(POST_PROCESS_A)
 
-$(DYNLIB): $(MAPFILE) pics .WAIT $$(PICS)
+$(DYNLIB): pics .WAIT $$(PICS)
 	$(BUILD.SO)
 	$(POST_PROCESS_SO)
 
diff --git a/usr/src/cmd/syseventd/modules/Makefile.com b/usr/src/cmd/syseventd/modules/Makefile.com
index 8720a40b2c..e8b6ee468c 100644
--- a/usr/src/cmd/syseventd/modules/Makefile.com
+++ b/usr/src/cmd/syseventd/modules/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# cmd/syseventd/modules/Makefile.com
 
 #
 # Common prologue for Makefiles for all sysevent loadable .so modules
@@ -37,6 +35,8 @@ OBJECTS =	$(LIBRARY:%=%.o)
 include $(SRC)/lib/Makefile.lib
 include $(SRC)/cmd/syseventd/Makefile.com
 
+SRCDIR =	.
+
 #
 # Build modules with -Kpic, -z combreloc and -z text but not -z defs
 # Note: -K pic is inherited by including Makefile.lib
@@ -44,6 +44,9 @@ include $(SRC)/cmd/syseventd/Makefile.com
 HSONAME =
 ZDEFS =
 
+# There should be a mapfile here
+MAPFILES =
+
 #
 # sysevent loadable modules require sysevent header files
 #
diff --git a/usr/src/cmd/volmgt/rmm/Makefile b/usr/src/cmd/volmgt/rmm/Makefile
index 9c6390e1ba..150a98ce17 100644
--- a/usr/src/cmd/volmgt/rmm/Makefile
+++ b/usr/src/cmd/volmgt/rmm/Makefile
@@ -18,16 +18,15 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Makefile for Removable Media Mounter.
+
 #
-# cmd/volmgt/rmm/Makefile
+# Makefile for Removable Media Mounter.
 #
 
 PROG=	rmmount
@@ -37,6 +36,9 @@ include ../../../lib/Makefile.lib
 include ../../Makefile.cmd
 include ../Makefile.volmgt
 
+# There should be a mapfile here
+MAPFILES =
+
 SED=	sed
 
 OBJS=	rmm.o rmm_util.o rmm_config.o
diff --git a/usr/src/cmd/volmgt/vold/Makefile b/usr/src/cmd/volmgt/vold/Makefile
index 91fdb270eb..0cc8d97806 100644
--- a/usr/src/cmd/volmgt/vold/Makefile
+++ b/usr/src/cmd/volmgt/vold/Makefile
@@ -24,9 +24,9 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Makefile for volume management daemon
+
 #
-# cmd/volmgt/vold/Makefile
+# Makefile for volume management daemon
 #
 
 PROG=	vold
@@ -35,6 +35,9 @@ include ../../../lib/Makefile.lib
 include ../../Makefile.cmd
 include ../Makefile.volmgt
 
+# There should be a mapfile here
+MAPFILES =
+
 SED=	sed
 
 OBJS=	nfs_server.o nfs_trace.o vold_err.o vold_main.o vold_proc.o \
diff --git a/usr/src/lib/Makefile b/usr/src/lib/Makefile
index fd687773f4..d2ee41d742 100644
--- a/usr/src/lib/Makefile
+++ b/usr/src/lib/Makefile
@@ -23,6 +23,7 @@
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include ../Makefile.master
 
@@ -53,8 +54,6 @@ include ../Makefile.master
 #
 SUBDIRS= \
 	common			.WAIT	\
-	abi/apptrace		.WAIT	\
-	../cmd/abi/spectrans	.WAIT	\
 	../cmd/sgs/libconv		\
 	../cmd/sgs/libdl	.WAIT
 
@@ -63,7 +62,6 @@ $(CLOSED_BUILD)SUBDIRS += \
 
 SUBDIRS += \
 	libc			.WAIT	\
-	libmapmalloc		.WAIT	\
 	../cmd/sgs/libelf	.WAIT	\
 	libmd				\
 	libmd5				\
@@ -115,6 +113,7 @@ SUBDIRS += \
 	liblm		\
 	libmacadm	\
 	libmalloc	\
+	libmapmalloc	\
 	libmtmalloc	\
 	libnls		\
 	libsmbios	\
@@ -147,6 +146,7 @@ SUBDIRS += \
 	pam_modules	\
 	crypt_modules	\
 	libadt_jni	\
+	abi		\
 	auditd_plugins	\
 	libvolmgt	\
 	libdevice	\
@@ -492,14 +492,14 @@ libsec:		libavl
 # in certain situations (e.g., exportable source builds,
 # OpenSolaris).
 #
-$(SUBDIRS) abi: FRC
+$(SUBDIRS): FRC
 	@if [ -f $@/Makefile  ]; then \
 		cd $@; pwd; $(MAKE) $(TARGET); \
 	else \
 		true; \
 	fi
 
-$(SUBDIRS:%=%-nodepend) abi-nodepend:
+$(SUBDIRS:%=%-nodepend):
 	@if [ -f $(@:%-nodepend=%)/Makefile  ]; then \
 		cd $(@:%-nodepend=%); pwd; $(MAKE) $(TARGET); \
 	else \
diff --git a/usr/src/lib/Makefile.lib b/usr/src/lib/Makefile.lib
index 8218c4924b..f68c2e21e2 100644
--- a/usr/src/lib/Makefile.lib
+++ b/usr/src/lib/Makefile.lib
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -25,6 +24,8 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # Definitions common to libraries.
 #
 # include global definitions; SRC should be defined in the shell.
@@ -43,6 +44,27 @@ NX_MAP_sparc=
 
 NX_MAP=		$(NX_MAP_$(MACH))
 
+#
+# By default, we define the source directory for libraries to be
+# one level up from the ISA-specific directory, where the code is
+# actually built.  Many libraries define a 'common' directory to
+# contain the source.  These libraries must redefine SRCDIR as:
+#	SRCDIR = ../common
+# Other variations are possible (../port, ../src, etc).
+#
+SRCDIR =	..
+
+#
+# We define MAPFILES here for the benefit of most libraries,
+# those that follow the convention of having source files and other
+# common files in the $(SRCDIR) directory.  Libraries that do not
+# follow this convention must define MAPFILES for themselves.
+# Libraries that do follow this convention but that need supplemental
+# ISA-specific mapfiles can augment MAPFILES like this:
+#	MAPFILES += mapfile-vers
+#
+MAPFILES =	$(SRCDIR)/mapfile-vers
+
 C_SYNONYMS_H=	$(SRC)/lib/common/inc/c_synonyms.h
 
 #
@@ -53,7 +75,7 @@ C_SYNONYMS_H=	$(SRC)/lib/common/inc/c_synonyms.h
 # name that will almost surely not exist on the build machine.
 #
 HDRDIR=		/__nonexistent_directory__
-SRCDIR=		.
+
 #
 # We don't build archive (*.a) libraries by default anymore.
 # If a component of the build needs to build an archive library
@@ -147,7 +169,7 @@ SONAME=		$(DYNLIB)
 
 HSONAME=	-h$(SONAME)
 DYNFLAGS=	$(HSONAME) $(ZTEXT) $(ZDEFS) $(ZCOMBRELOC) \
-		$(SPECMAPFILE:%=-M%) $(PGA_MAPFILE:%=-M%) $(NX_MAP:%=-M%)
+		$(MAPFILES:%=-M%) $(PGA_MAPFILE:%=-M%) $(NX_MAP:%=-M%)
 
 LDLIBS=		$(LDLIBS.lib)
 
@@ -221,7 +243,7 @@ HSONAMECCC=	-h $(SONAMECCC)
 # Keep in sync with the standard DYNFLAGS
 #
 $(DYNLIBCCC):=	DYNFLAGS = $(HSONAMECCC) $(ZTEXT) $(ZDEFS) $(ZCOMBRELOC) \
-		$(SPECMAPFILE:%=-M%) $(PGA_MAPFILE:%=-M%) $(NX_MAP:%=-M%) \
+		$(MAPFILES:%=-M%) $(PGA_MAPFILE:%=-M%) $(NX_MAP:%=-M%) \
 		$(NORUNPATH)
 
 
@@ -252,15 +274,12 @@ LINTCHECKFLAGS = -m -erroff=E_NAME_DEF_NOT_USED2
 LINTCHECKFLAGS += -erroff=E_NAME_DECL_NOT_USED_DEF2 
 
 #
-# Spec/ABI stuff
+# Target Architecture
 #
-# Spectranslator Target Architecture
-TRANSMACH=	$(MACH)
-SPECMAPFILES=	$(SPECMAPFILE:%/$(MACH64)/mapfile=%/$(MACH)/mapfile)
-$(BUILD64)SPECMAPFILES += $(SPECMAPFILE:%/$(MACH)/mapfile=%/$(MACH64)/mapfile)
+TARGETMACH=	$(MACH)
 
 #
 # Allow people to define their own clobber rules.  Normal makefiles
 # shouldn't override this - they should override $(CLOBBERFILES) instead.
 #
-CLOBBERTARGFILES= $(LIBS) $(DYNLIB) $(SPECMAPFILE) $(CLOBBERFILES)
+CLOBBERTARGFILES= $(LIBS) $(DYNLIB) $(CLOBBERFILES)
diff --git a/usr/src/lib/Makefile.lib.64 b/usr/src/lib/Makefile.lib.64
index 8fd20d7bb9..244e892b2d 100644
--- a/usr/src/lib/Makefile.lib.64
+++ b/usr/src/lib/Makefile.lib.64
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,18 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # Include overrides for library builds of 64-bit objects
 #
 include	$(SRC)/Makefile.master.64
 
 #
-# Spectranslator Target Architecture
+# Target Architecture
 #
-TRANSMACH=	$(MACH64)
+TARGETMACH=	$(MACH64)
diff --git a/usr/src/lib/Makefile.targ b/usr/src/lib/Makefile.targ
index d8f38a337a..9918ad77fd 100644
--- a/usr/src/lib/Makefile.targ
+++ b/usr/src/lib/Makefile.targ
@@ -18,13 +18,14 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # included to define local library targets
 #
 
@@ -85,7 +86,7 @@ $(LIBRARY): objs .WAIT $$(OBJS)
 	$(BUILD.AR)
 	$(POST_PROCESS_A)
 
-$(DYNLIB): $$(SPECMAPFILE)
+$(DYNLIB): $$(MAPFILES)
 
 $(DYNLIB): pics .WAIT $$(PICS) $$(ALTPICS)
 	$(BUILD.SO)
@@ -104,9 +105,6 @@ $(LINTLIB): $$(SRCS)
 lintcheck: $$(SRCS)
 	$(LINT.c) $(LINTCHECKFLAGS) $(SRCS) $(LDLIBS)
 
-$(SPECMAPFILES):
-	cd $(MAPDIR); pwd; $(MAKE) $(@F)
-
 clobber: clean
 	-$(RM) $(CLOBBERTARGFILES)
 
diff --git a/usr/src/lib/README.Makefiles b/usr/src/lib/README.Makefiles
index dacebf4157..b576c3a9fc 100644
--- a/usr/src/lib/README.Makefiles
+++ b/usr/src/lib/README.Makefiles
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,14 +18,16 @@
 #
 # CDDL HEADER END
 #
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
 Writing Library Makefiles in ON
 ===============================
 
- Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
- Use is subject to license terms.
-
-ident	"%Z%%M%	%I%	%E% SMI"
-
 Introduction
 ------------
 
@@ -57,7 +58,7 @@ Your library should consist of a hierarchical collection of Makefiles:
 	lib/<library>/<isa>/Makefile
 
 	  These are your library's ISA-specific Makefiles, one per ISA
-	  (usually sparc and i386, and sometimes sparcv9 and ia64).  These
+	  (usually sparc and i386, and often sparcv9 and amd64).  These
 	  Makefiles should include your common Makefile and then provide any
 	  needed ISA-specific rules and definitions, perhaps overriding those
 	  provided in your common Makefile.
@@ -74,7 +75,7 @@ Makefiles before introducing your own custom build macros or rules.
 	lib/Makefile.lib.64
 
 	  This contains macros for building 64-bit objects, and should be
-	  included in Makfiles for 64-bit native ISAs.
+	  included in Makefiles for 64-bit native ISAs.
 
 	lib/Makefile.rootfs
 
@@ -98,20 +99,20 @@ ISA-independent targets usually consist of:
 
 	install_h
 
-	  Install all library header files into the proto area.  Can be
-	  omitted if your library has no header files.
+	  Install all library header files into the proto area.
+	  Can be omitted if your library has no header files.
 
 	check
 
-	  Check all library header files for hdrchk compliance.  Can be
-	  omitted if your library has no header files.
+	  Check all library header files for hdrchk compliance.
+	  Can be omitted if your library has no header files.
 
 	_msg
 
-	  Build and install a message catalog.  Can be omitted if your
-	  library has no message catalog.
+	  Build and install a message catalog.
+	  Can be omitted if your library has no message catalog.
 
-Of course, other targets are (such as `cstyle') are fine as well, as long as
+Of course, other targets (such as `cstyle') are fine as well, as long as
 they are ISA-independent.
 
 The ROOTHDRS and CHECKHDRS targets are provided in lib/Makefile.lib to make
@@ -164,7 +165,7 @@ above example.  If you need to skip the C preprocessor, just use the native
 (.[ch]) suffix.
 
 The only time you shouldn't use BUILDPO.msgfiles as the preferred means of
-extracting messages in when you're extracting them from shell scripts; in
+extracting messages is when you're extracting them from shell scripts; in
 that case, you can use the BUILDPO.pofiles macro as explained below.
 
 To build a message catalog from other message catalogs, or from source files
@@ -227,7 +228,7 @@ ISA-specific Makefiles.  You can do this by:
 
 	2. Providing a common "descend into SUBDIRS" rule:
 
-		spec $(SUBDIRS): FRC
+		$(SUBDIRS): FRC
 			@cd $@; pwd; $(MAKE) $(TARGET)
 
 		FRC:
@@ -245,56 +246,41 @@ ISA-specific Makefiles.  You can do this by:
 
 	4. Having the aforementioned targets depend on SUBDIRS:
 
-		all clean clobber install: spec .WAIT $(SUBDIRS)
-
-		lint: $(SUBDIRS)
-
-	   A few notes are in order here:
+		all clean clobber install lint: $(SUBDIRS)
 
-		* The `all' target must be listed first; the others might as
-		  well be listed alphabetically.
-
-		* The `lint' target is listed separately because there is
-		  nothing to lint in the spec subdirectory.
-
-		* The .WAIT between spec and $(SUBDIRS) is suboptimal but
-		  currently required to make sure that two different make
-		  invocations don't simultaneously build the mapfiles.  It
-		  will likely be replaced with a more sophisticated
-		  mechanism in the future.
+	   The `all' target must be listed first so that make uses it as the
+	   default target; the others might as well be listed alphabetically.
 
 As an example of how all of this goes together, here's libinetutil's
-top-level library Makefile (copyright omitted):
+top-level library Makefile (license notice and copyright omitted):
 
-		include ../Makefile.lib
-
-		HDRS =		libinetutil.h
-		HDRDIR =	common
-		SUBDIRS =	$(MACH)
-		$(BUILD64)SUBDIRS += $(MACH64)
+	include ../Makefile.lib
 
-		all :=		TARGET = all
-		clean :=	TARGET = clean
-		clobber :=	TARGET = clobber
-		install :=	TARGET = install
-		lint :=		TARGET = lint
+	HDRS =		libinetutil.h
+	HDRDIR =	common
+	SUBDIRS =	$(MACH)
+	$(BUILD64)SUBDIRS += $(MACH64)
 
-		.KEEP_STATE:
+	all :=		TARGET = all
+	clean :=	TARGET = clean
+	clobber :=	TARGET = clobber
+	install :=	TARGET = install
+	lint :=		TARGET = lint
 
-		all clean clobber install: spec .WAIT $(SUBDIRS)
+	.KEEP_STATE:
 
-		lint:		$(SUBDIRS)
+	all clean clobber install lint: $(SUBDIRS)
 
-		install_h:	$(ROOTHDRS)
+	install_h:	$(ROOTHDRS)
 
-		check:		$(CHECKHDRS)
+	check:		$(CHECKHDRS)
 
-		$(SUBDIRS) spec: FRC
-			@cd $@; pwd; $(MAKE) $(TARGET)
+	$(SUBDIRS): FRC
+		@cd $@; pwd; $(MAKE) $(TARGET)
 
-		FRC:
+	FRC:
 
-		include ../Makefile.targ
+	include ../Makefile.targ
 
 The Common Makefile
 -------------------
@@ -303,7 +289,9 @@ In concept, your common Makefile should contain all of the rules and
 definitions that are the same on all ISAs.  However, for reasons of
 maintainability and cleanliness, you're encouraged to place even
 ISA-dependent rules and definitions, as long you express them in an
-ISA-independent way (e.g., by using $(MACH), $(TRANSMACH), and their kin).
+ISA-independent way (e.g., by using $(MACH), $(TARGETMACH), and their kin).
+(TARGETMACH is the same as MACH for 32-bit targets, and the same as MACH64
+for 64-bit targets).
 
 The common Makefile can be conceptually split up into four sections:
 
@@ -425,37 +413,17 @@ The third section typically consists of the following macros:
 	  should be put in DYNFLAGS (if they apply only to shared object
 	  construction) or LDFLAGS (if they apply in general).
 
-	MAPDIR
-
-	  Set to the directory in which your library mapfile is built.  If
-	  your library builds its mapfile from specfiles, set this to
-	  `../spec/$(TRANSMACH)' (TRANSMACH is the same as MACH for
-	  32-bit targets, and the same as MACH64 for 64-bit targets).
-
-	MAPFILE (required if your mapfile is under source control)
+	MAPFILES (if necessary)
 
-	  Set to the path to your library mapfile.  If your library builds
-	  its mapfile from specfiles, this need not be set.  If you set this,
-	  you must also set DYNFLAGS to include `-M $(MAPFILE)' and set
-	  DYNLIB to depend on MAPFILE.
+	  Set to the list of mapfiles used to link each ISA-specific version
+	  of your library.  This defaults to `$(SRCDIR)/mapfile-vers' in
+	  Makefile.lib, so you only need to change this if you have additional
+	  mapfiles or your mapfile doesn't follow the standard naming
+	  convention.  If you have supplemental ISA-dependent mapfiles that
+	  reside in the respective <isa> directories, you can augment
+	  MAPFILES like this:
 
-	SPECMAPFILE (required if your mapfile is generated from specfiles)
-
-	  Set to the path to your generated mapfile (usually
-	  `$(MAPDIR)/mapfile').  If your library mapfile is under source
-	  control, you need not set this. Setting this triggers a number of
-	  features in higher-level Makefiles:
-
-		* Your shared library will automatically be linked with
-		  `-M $(SPECMAPFILE)'.
-
-		* A `make clobber' will remove $(SPECMAPFILE).
-
-		* Changes to $(SPECMAPFILE) will cause your shared library
-		  to be rebuilt.
-
-		* An attempt to build $(SPECMAPFILE) will automatically
-		  cause a `make mapfile' to be done in MAPDIR.
+		MAPFILES += mapfile-vers
 
 	CPPFLAGS (if necessary)
 
@@ -539,38 +507,41 @@ Once again, here's libinetutil's common Makefile, which shows how many of
 these directives go together.  Note that Makefile.rootfs is included to
 cause libinetutil.so.1 to be installed in /lib rather than /usr/lib:
 
-		LIBRARY =	libinetutil.a
-		VERS =		.1
-		OBJECTS =	octet.o inetutil4.o ifspec.o
+	LIBRARY =	libinetutil.a
+	VERS =		.1
+	OBJECTS =	octet.o inetutil4.o ifspec.o ifaddrlist.o eh.o tq.o
 
-		include ../../Makefile.lib
-		include ../../Makefile.rootfs
+	include ../../Makefile.lib
+	include ../../Makefile.rootfs
 
-		LIBS =		$(DYNLIB) $(LINTLIB)
-		SRCS =		$(COMDIR)/octet.c $(SRCDIR)/inetutil4.c \
-				$(SRCDIR)/ifspec.c
-		$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
-		LDLIBS +=	-lsocket -lc
+	LIBS =		$(DYNLIB) $(LINTLIB)
 
-		SRCDIR =	../common
-		COMDIR =	$(SRC)/common/net/dhcp
-		MAPDIR =	../spec/$(TRANSMACH)
-		SPECMAPFILE =	$(MAPDIR)/mapfile
+	SRCDIR =	../common
+	COMDIR =	$(SRC)/common/net/dhcp
+	SRCS =		$(COMDIR)/octet.c $(SRCDIR)/inetutil4.c \
+			$(SRCDIR)/ifspec.c $(SRCDIR)/eh.c $(SRCDIR)/tq.c \
+			$(SRCDIR)/ifaddrlist.c
 
-		CFLAGS +=	$(CCVERBOSE)
-		CPPFLAGS +=	-I$(SRCDIR)
+	$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
+	LDLIBS +=	-lsocket -lc
 
-		.KEEP_STATE:
+	CFLAGS +=	$(CCVERBOSE)
+	CPPFLAGS +=	-I$(SRCDIR)
 
-		all: $(LIBS)
+	.KEEP_STATE:
 
-		lint: lintcheck
+	all: $(LIBS)
+
+	lint: lintcheck
 
-		pics/%.o: $(COMDIR)/%.c
-			$(COMPILE.c) -o $@ $<
-			$(POST_PROCESS_O)
+	pics/%.o: $(COMDIR)/%.c
+		$(COMPILE.c) -o $@ $<
+		$(POST_PROCESS_O)
 
-		include ../../Makefile.targ
+	include ../../Makefile.targ
+
+The mapfile for libinetutil is named `mapfile-vers' and resides in $(SRCDIR),
+so the MAPFILES definition is omitted, defaulting to $(SRCDIR)/mapfile-vers.
 
 Note that for libinetutil, not all of the object files come from SRCDIR.  To
 support this, an alternate source file directory named COMDIR is defined, and
@@ -608,9 +579,16 @@ Makefiles for libinetutil:
 
 		install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
 
+	amd64/Makefile:
+
+		include ../Makefile.com
+		include ../../Makefile.lib.64
+
+		install: all $(ROOTLIBS64) $(ROOTLINKS64)
+
 Observe that there is no .KEEP_STATE directive in these Makefiles, since all
 of these Makefiles include libinetutil/Makefile.com, and it already has a
-.KEEP_STATE directive.  Also, note that the 64-bit Makefile also includes
+.KEEP_STATE directive.  Also, note that the 64-bit Makefiles also include
 Makefile.lib.64, which overrides some of the definitions contained in the
 higher level Makefiles included by the common Makefile so that 64-bit
 compiles work correctly.
@@ -618,7 +596,7 @@ compiles work correctly.
 CTF Data in Libraries
 ---------------------
 
-By default, all position-indepedent objects are built with CTF data using
+By default, all position-independent objects are built with CTF data using
 ctfconvert, which is then merged together using ctfmerge when the shared
 object is built.  All C-source objects processed via ctfmerge need to be
 processed via ctfconvert or the build will fail.  Objects built from non-C
diff --git a/usr/src/lib/README.mapfiles b/usr/src/lib/README.mapfiles
new file mode 100644
index 0000000000..be3e2be16d
--- /dev/null
+++ b/usr/src/lib/README.mapfiles
@@ -0,0 +1,437 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+Mapfiles and versioning in ON
+=============================
+
+1.0 Objective of this README
+
+This README describes the engineering practices of creating and updating
+visible library interfaces.  It describes various kinds of actions that
+typically occur as libraries are evolved, and shows how interface
+specifications are affected or updated in accordance.  It tells you what
+you must do as a shared library developer if you:
+
+	1. Make interface additions to an existing library
+		- add a Public interface
+		- add a Private interface
+	2. Update an interface in an existing library
+		- remove an existing interface
+		- promote a Private interface to Public
+		- scope a Private interface to local
+		- move an interface from one library to another
+		- copy interfaces which are part of the standard to a new or
+		  existing library
+	3. Introduce a new library
+		- source directory hierarchy
+		- creation of the "mapfile-vers" file
+		- Makefiles
+	4. Make an entire library obsolete before end-of-life
+		- introduce SUNWobsolete to the "mapfile-vers" file
+
+-------------------------------------------------------------------------------
+
+2.0 What's a mapfile?
+
+Mapfiles are used to tell the link editor ("ld") all sorts of things about
+how to generate an executable file or a shared object from a collection of
+relocatable objects, such as generated by a compiler.  For all the gory
+details, see the Solaris Linker and Libraries Guide, which can be found
+under http://docs.sun.com.
+
+Here, we are only concerned with specifying externally-visible interfaces
+for shared libraries (shared objects) and with specifying their versions
+for ABI (Application Binary Interface) purposes.  For these purposes, we
+only need to deal with a subset of the mapfile interfaces.
+
+There should be a "mapfile-vers" file associated with every shared library
+and it should reside in the common source directory for that library, most
+often in a "common" directory.  This is the usual layout of a library's
+top-level directory (usr/src/lib/libwombat):
+	Makefile       amd64/         i386/          sparcv9/
+	Makefile.com   common/        sparc/
+
+The "common" directory contains the source files and other common files
+for the library:
+	bat.c              libwombat_impl.h   mapfile-vers       wom.c
+	libwombat.h        llib-lwombat       util.c             wombat.c
+
+The mapfile's name is, by convention, "mapfile-vers" because it is used
+for only two purposes: to specify externally-visible interface names while
+suppressing visibility of all other names, and to specify their respective
+unique version names.
+
+-------------------------------------------------------------------------------
+
+3.0 Contents of mapfile-vers
+
+The structure of mapfile-vers is best explained by an example
+(the license notification and copyright notice is omitted here
+for brevity):
+
+SUNW_1.2 {	# update to libwombat, Solaris 10
+    global:
+	wb_readv;
+	wb_stat;
+	wb_writev;
+} SUNW_1.1;
+
+SUNW_1.1 {	# first release of libwombat, Solaris 9
+    global:
+	wb_read;
+	wb_write;
+};
+
+SUNWprivate {	# private libwombat symbols
+    global:
+	wb_add;
+	wb_delete;
+	wb_search;
+    local:
+	*;
+};
+
+The SUNW_1.* names are the Public version names for the library.
+There should be at most one version name for each release of Solaris,
+with the minor number incremented by one over the previous version.
+
+If no update to the Public-visible names in the library is made
+in a given Solaris release, no new version name should be generated
+for that release.  If multiple updates are made to the library at
+different points in the development of a given release of Solaris,
+only one version should be used for the entire release.
+
+So, for example, if an update to libwombat is made in Solaris 11,
+you would add "SUNW_1.3" at the start of the mapfile:
+
+SUNW_1.3 {	# update to libwombat, Solaris 11
+    global:
+	wb_lseek;
+} SUNW_1.2;
+
+Each version must inherit all symbols from its preceding version,
+specified at the ending "}" for each version.  SUNW_1.1 does not
+inherit any symbols.  SUNWprivate, if present, stands alone.
+
+The two lines in SUNWprivate:
+    local:
+	*;
+ensure that no symbols other than those listed in the mapfile are
+visible to clients of the library.  If there is no SUNWprivate,
+these two lines should appear in SUNW_1.1.
+
+For maintainability, the list of names in each version block should
+be sorted in dictionary order (sort -d).  Please comply.
+
+In addition to the common mapfile:
+	common/mapfile-vers
+some libraries require ISA-specific supplemental mapfiles, one in each
+of the ISA directories:
+	amd64/mapfile-vers
+	i386/mapfile-vers
+	sparc/mapfile-vers
+	sparcv9/mapfile-vers
+This is necessary only if there are ISA-specific library interfaces not
+common to all instances of the library.  For example, see libproc, or,
+if you are masochistic, libc or libnsl.
+
+The ISA-specific mapfiles look like the common mapfile, except that only
+the ISA-specific names appear.  The version names are the same as those
+in the common mapfile, but only non-empty version instances are present
+and no inheritance specification is present.
+
+-------------------------------------------------------------------------------
+
+4.0 Making interface additions to an existing library
+
+4.1 Adding a Public interface
+
+The first engineer to update the existing mapfile-vers file in a release needs
+to identify the current highest version name and properly increment the minor
+version number by 1 to be the new version name.  If this is the first Public
+interface in the shared object, a new SUNW_1.1 version name must be introduced.
+
+The major revision number is incremented whenever an incompatible change is
+made to an interface.  This could be the case if an API changes so dramatically
+as to invalidate dependencies.  This rarely occurs in practice.  It also
+requires changing the suffix of the shared object from, say, .so.1 to .so.2
+and introducing code to continue to ship the .so.1 version of the library.
+
+The minor revision number is incremented whenever one or more new interfaces
+is added to a library.  Note that the minor number is not incremented on every
+putback that makes an interface addition to the library.  Rather, it is
+incremented at most once per (external to Sun) release of the library.
+
+4.2 Adding a Private interface
+
+Private interfaces are the non-ABI interfaces of the library.  Unlike
+introducing a Public interface, a new entry is simply added to the
+SUNWprivate version.  No minor number increment is necessary.
+
+If this interface happens to be the first Private interface introduced
+into the library, the SUNWprivate version must be created (no major.minor
+version numbers).  It inherits nothing and nothing inherits from it.
+
+If the library already has Private interfaces, they may have numbered version 
+names like SUNWprivate_m.n (due to errors of the past).  If so, just use the
+highest numbered private version name to version the new interface.  There
+is no need to introduce a new private version name.  Be careful not to use
+a lower numbered private version name; doing so can cause runtime errors
+(as opposed to load time errors) when running an application with older
+versions of the library.
+
+4.3 Adding new public interfaces in an update release
+
+Adding new public interfaces in an update release requires careful
+coordination with the next marketing release currently under development.
+Multiple updates ship during the period before the next marketing release
+ships, and since it is generally impossible to know the full set of new
+interfaces in the next marketing release until late in its development
+(after multiple updates have shipped) it must be assumed that not all
+interfaces added to the next marketing release will be added to an update.
+
+Consequently, the new version number for an update cannot be a minor
+increment, but must be a micro increment.  For example, if Release N
+has version number SUNW_1.3 and Release N+1 will have SUNW_1.4, then
+interfaces added to an update of Release N must have micro numbers such
+as SUNW_1.3.1, SUNW_1.3.2, etc.  (note that the micro number is not
+directly tied to the update number: SUNW_1.3.1 may appear in Update 2).
+The micro versions form an inheritance chain that is inserted between
+two successive minor versions.  For example, the mapfile-vers file for
+minor release "N+1" to reflect its inclusion of micro releases will
+look like the following:
+
+SUNW_1.4 {		# release N+1
+    global:
+	...
+} SUNW_1.3.2;
+
+SUNW_1.3.2 {		# micro release 2 (e.g., release NU3)
+    global:
+	...
+} SUNW_1.3.1;
+
+SUNW_1.3.1 {		# micro release 1 (e.g., release NU2)
+    global:
+	...
+} SUNW_1.3;
+
+SUNW_1.3 {		# release N
+    global:
+	...
+} SUNW_1.2;
+
+SUNW_1.2 {		# release N-1
+    global:
+	...
+} SUNW_1.1;
+
+SUNW_1.1 {		# first release
+    global:
+	...
+};
+
+SUNW_private {		# same in all releases
+    global:
+	...
+    local:
+	*;
+};
+
+The corresponding update/patch mapfile-vers file will be identical
+except for the exclusion of SUNW_1.4.
+
+Those interfaces which are only present in Release N+1 are always put
+into the next minor version set, SUNW_1.4.
+
+Thus when adding a new public interface to an update, both the mapfiles
+of the update release and next marketing release must be modified to be
+consistent.  The update versions should not be added to the marketing
+release until the putback to the update release has occurred, to avoid
+timing problems with the update releases (it's all too easy for projects
+to slip out of updates, or to change ordering).
+
+-------------------------------------------------------------------------------
+
+5.0 How to update an interface in an existing library
+
+5.1 Removing an existing interface
+
+5.1.1 Moving a Public interface
+
+No Public interfaces should ever be removed from any mapfile.
+
+To move an interface from one library to (say) libc, the code has to be
+deleted from the library and added to libc, then the mapfile for the
+library has to have the interface's entry changed from:
+	getfoobar;
+to:
+	getfoobar = FUNCTION FILTER libc.so.1;
+See, for example, libnsl's common/mapfile-vers file.
+
+Follow the rules for adding a new interface for the necessary changes
+to libc's mapfile to accommodate the moved interface.  In particular,
+the new interface must be added to the current highest libc version.
+
+To move an entire library into libc, look at what has already been done
+for libthread, libaio, and librt.
+
+5.1.2 Removing a Private interface
+
+Deletion of Private interfaces is allowed, but caution should be taken;
+it should first be established that the interface is not being used.
+To remove a Private interface, simply delete the corresponding entry
+for that symbol from the mapfile's SUNWprivate section.
+
+Do not forget to delete these Public or Private interfaces from the library's
+header files as well as from the code that implements the interfaces.
+
+5.2 Promoting a Private interface to Public
+
+This is similar to what's done when adding a Public interface.  Promoting an
+existing Private interface to a Public one only requires a change to the
+existing interface definition.  Private interfaces have the symbol version name
+"SUNWprivate" associated with them.  To make the interface a Public one, the
+interface must be put into a set associated with the current Public release
+level of the library.
+
+As an example, if we were modifying libwombat.so.1 and its version in the
+last release of Solaris was SUNW_1.23, any new ABI introduced in the next
+release would be put into a version called SUNW_1.24.  Therefore, whether
+you wish to promote an existing Private interface to Public, or to introduce
+a new Public interface, this (next successive minor numbered version level)
+would be the version that it would be associated with.
+
+5.3 Scoping a Private interface local
+
+Any interfaces not present in the mapfile-vers file will automatically be
+scoped local (i.e., they will not be visible outside the library).  Simply
+remove the Private interface from the mapfile-vers file and the header file
+to prevent it from being exported.  This may require moving the Private
+interface into a library-private header file.  Scope reduction of Public
+interfaces is not allowed.
+
+For the interface to be used in more than one file within the library, it
+should be in a header file that can be included by each file in the library
+that uses the interface.  For example:
+
+	#include "libprivate.h"
+
+5.4 How to copy interfaces which are part of a standard to a new or existing
+    library
+
+SYSVABI and SISCD are reserved version names for interfaces listed in the
+System V Interface Definition and the Sparc Compliance Definition.  Avoid using
+these version names when copying the implementation of standard interfaces to
+another library.  Instead, use SUNW_1.1 for a new library, and SUNW_m.n for
+an existing library (where m.n is the next release version; i.e., if the
+last version was SUNW_1.18, then you should version the interfaces with
+SUNW_1.19).
+
+-------------------------------------------------------------------------------
+
+6.0 Introducing a new library
+
+6.1 Directories
+
+The normal discipline for introducing a new library in OS/Net is to create a
+new subdirectory of /usr/src/lib.  The interface definition discipline is to
+create a common/mapfile-vers file for the new library.  If we were introducing
+a new foo library, libfoo, we'd create /usr/src/lib/libfoo containing:
+	Makefile       amd64/         i386/          sparcv9/
+	Makefile.com   common/        sparc/
+The common subdirectory would contain the normal source files plus the
+mapfile-vers file.  See usr/src/lib/README.Makefiles for directions on
+how to organize the Makefiles.
+
+6.2 The mapfile
+
+The new common/mapfile-vers file would contain:
+
+SUNW_1.1 {	# first release of libfoo
+    global:
+	...
+};
+
+SUNWprivate {
+    global:
+	...
+    local:
+	*;
+};
+
+If there are no Public interfaces, the SUNW_1.1 section would be omitted.
+If there are no Private interfaces, the SUNWprivate section would be
+omitted and the two lines:
+    local:
+	*;
+would be moved into SUNW_1.1
+
+To decide which interfaces are Public (part of the ABI) and which are Private
+(unstable interfaces not intended to be used by third party applications or
+unbundled products), the heuristic which works to a first approximation is
+that if it has a man page then it's Public.  Also, it is really the ARC case
+for the new interfaces that prescribes which interfaces are Public and
+which are not (hence, which interfaces have man pages and which do not).
+
+For maintainability, the list of names in each version block should
+be sorted in dictionary order (sort -d).  Please comply.
+
+-------------------------------------------------------------------------------
+
+7.0 Make an entire library obsolete
+
+7.1 Introduce SUNWobsolete version
+
+Use this version name not for specific interfaces but for marking an entire
+library as obsolete.  The existing public/private version names are left
+unchanged, but a new SUNWobsolete version is created with no symbols in it.
+This becomes a tag by which the obsolescence of the library can be recognized.
+There is no numbering of this version name.
+
+SUNWobsolete {
+    global:
+	SUNWobsolete;	# This is the only way to do it.
+} SUNW_1.2;
+
+SUNW_1.2 {
+...
+
+-------------------------------------------------------------------------------
+
+8.0 Documentation
+
+For further information, please refer to the following documents:
+
+	"Solaris Linker and Libraries Guide", http://docs.sun.com
+	/shared/ON/general_docs/scoping-rules.fm.ps
+
+For information on the now-obsolete spec files, used in Solaris releases
+7 through 10, see:
+	/shared/ON/general_docs/README.spec
+	/shared/ON/general_docs/libspec-rules.ps
+	/shared/ON/general_docs/spectrans/*
diff --git a/usr/src/lib/abi/Makefile b/usr/src/lib/abi/Makefile
index 3500a99444..ce037a6606 100644
--- a/usr/src/lib/abi/Makefile
+++ b/usr/src/lib/abi/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -28,23 +27,14 @@
 
 include $(SRC)/lib/Makefile.lib
 
-#
-# NOTE: The `spec' target builds and installs the libraries needed to 
-#	build the spec subdirectories of the ON libraries.
-#
-
 SUBDIRS	=	apptrace
 
-ROOTABILIBDIRS = $(ROOT)/usr/lib/abi
-$(BUILD64)ROOTABILIBDIRS += $(ROOT)/usr/lib/abi/$(MACH64)
-
 all := 		TARGET = all
 clean :=	TARGET = clean
 clobber :=	TARGET = clobber
 install	:=	TARGET = install
 lint :=		TARGET = lint
 _msg :=		TARGET = _msg
-spec :=		TARGET = install
 
 .PARALLEL:
 
@@ -52,11 +42,6 @@ spec :=		TARGET = install
 
 all clean clobber install lint _msg: $(SUBDIRS)
 
-spec: $(ROOTABILIBDIRS) .WAIT $(SUBDIRS)
-
-$(ROOTABILIBDIRS):
-	$(INS.dir)
-
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
diff --git a/usr/src/lib/abi/apptrace/Makefile.com b/usr/src/lib/abi/apptrace/Makefile.com
index 6a171938cb..578ccf83eb 100644
--- a/usr/src/lib/abi/apptrace/Makefile.com
+++ b/usr/src/lib/abi/apptrace/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -35,6 +34,9 @@ include ../../Makefile.abi
 LIBS =		$(DYNLIB)
 CPPFLAGS =      -I. $(CPPFLAGS.master)
 
+# No mapfile here
+MAPFILES =
+
 # Because we are compiling native, amd64/Makefile wants us to suppress
 # linking with any 64-bit libraries unless the build machine is able
 # to run amd64 64-bit executables:
diff --git a/usr/src/lib/auditd_plugins/binfile/Makefile b/usr/src/lib/auditd_plugins/binfile/Makefile
index 2da57f987d..a8d5726fcc 100644
--- a/usr/src/lib/auditd_plugins/binfile/Makefile
+++ b/usr/src/lib/auditd_plugins/binfile/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include $(SRC)/lib/Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH)
+SUBDIRS = $(MACH)
 
 TEXT_DOMAIN=	SUNW_OST_OSCMD
 POFILE= audit_binfile.po
@@ -41,9 +41,7 @@ lint	:=	TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 $(POFILE): pofile_MSGFILES
 
diff --git a/usr/src/lib/auditd_plugins/binfile/Makefile.com b/usr/src/lib/auditd_plugins/binfile/Makefile.com
index d0b820fc3e..96185b4af1 100644
--- a/usr/src/lib/auditd_plugins/binfile/Makefile.com
+++ b/usr/src/lib/auditd_plugins/binfile/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY=	audit_binfile.a
 VERS=		.1
@@ -33,8 +33,6 @@ LIBBSM=		$(SRC)/lib/libbsm/common
 
 include		$(SRC)/lib/Makefile.lib
 
-SRCDIR=		..
-
 LIBS=		$(DYNLIB)
 LDLIBS		+= -lbsm -lsecdb -lc
 
@@ -42,9 +40,6 @@ CFLAGS		+= $(CCVERBOSE)
 CPPFLAGS	+= -D_REENTRANT -I$(LIBBSM)
 CPPFLAGS	+= -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 ROOTLIBDIR=	$(ROOT)/usr/lib/security
 
 .KEEP_STATE:
diff --git a/usr/src/lib/auditd_plugins/binfile/mapfile-vers b/usr/src/lib/auditd_plugins/binfile/mapfile-vers
new file mode 100644
index 0000000000..801006018e
--- /dev/null
+++ b/usr/src/lib/auditd_plugins/binfile/mapfile-vers
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	auditd_plugin;
+	auditd_plugin_close;
+	auditd_plugin_open;
+    local:
+	*;
+};
diff --git a/usr/src/lib/auditd_plugins/syslog/Makefile b/usr/src/lib/auditd_plugins/syslog/Makefile
index 4930c661ea..39802d1dfd 100644
--- a/usr/src/lib/auditd_plugins/syslog/Makefile
+++ b/usr/src/lib/auditd_plugins/syslog/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include $(SRC)/lib/Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH)
+SUBDIRS = $(MACH)
 
 TEXT_DOMAIN=	SUNW_OST_OSCMD
 POFILE= audit_syslog.po
@@ -41,9 +41,7 @@ lint	:=	TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 $(POFILE): pofile_MSGFILES
 
diff --git a/usr/src/lib/auditd_plugins/syslog/Makefile.com b/usr/src/lib/auditd_plugins/syslog/Makefile.com
index aa93c27c13..40ecbc25bd 100644
--- a/usr/src/lib/auditd_plugins/syslog/Makefile.com
+++ b/usr/src/lib/auditd_plugins/syslog/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -36,8 +35,6 @@ OBJECTS=	sysplugin.o		\
 
 include		$(SRC)/lib/Makefile.lib
 
-SRCDIR=		..
-
 SRCS=		$(SRCDIR)/sysplugin.c	\
 		$(PRAUDIT)/toktable.c	\
 		$(SRCDIR)/systoken.c
@@ -52,9 +49,6 @@ CPPFLAGS	+= -D_REENTRANT
 CPPFLAGS	+= -I$(PRAUDIT)
 CPPFLAGS	+= -I$(LIBBSM)
 
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 ROOTLIBDIR=	$(ROOT)/usr/lib/security
 
 .KEEP_STATE:
diff --git a/usr/src/lib/auditd_plugins/syslog/mapfile-vers b/usr/src/lib/auditd_plugins/syslog/mapfile-vers
new file mode 100644
index 0000000000..801006018e
--- /dev/null
+++ b/usr/src/lib/auditd_plugins/syslog/mapfile-vers
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	auditd_plugin;
+	auditd_plugin_close;
+	auditd_plugin_open;
+    local:
+	*;
+};
diff --git a/usr/src/lib/cfgadm_plugins/ac/Makefile.com b/usr/src/lib/cfgadm_plugins/ac/Makefile.com
index c7aa48aadc..a191402d23 100644
--- a/usr/src/lib/cfgadm_plugins/ac/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/ac/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/ac/Makefile.com
 
 include $(SRC)/lib/cfgadm_plugins/Makefile.com
 
@@ -53,13 +51,11 @@ USR_PSM_LIB_CFG_DIR_64	= $(USR_PSM_LIB_CFG_DIR)/$(MACH64)
 ROOTLIBDIR=     $(USR_PSM_LIB_CFG_DIR)
 ROOTLIBDIR64=   $(USR_PSM_LIB_CFG_DIR_64)
 
-MAPFILE=	../common/mapfile-vers
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS = $(DYNLIB)
 
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc
 
 CPPFLAGS +=	-I$(ROOT)/usr/platform/$(PLATFORM)/include
@@ -70,8 +66,6 @@ all: $(LIBS)
 
 lint:   lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
 # Create target directories
 $(USR_PSM_DIR):		$(LINKED_DIRS)
 	-$(INS.dir.root.sys)
diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile b/usr/src/lib/cfgadm_plugins/ib/Makefile
index 83ac985cd4..822ed3efc5 100644
--- a/usr/src/lib/cfgadm_plugins/ib/Makefile
+++ b/usr/src/lib/cfgadm_plugins/ib/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/ib/Makefile
 
 include		../../Makefile.lib
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -53,7 +52,7 @@ CP=	cp
 
 all clean clobber delete install lint package: $(SUBDIRS)
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/cfgadm_plugins/ib/Makefile.com b/usr/src/lib/cfgadm_plugins/ib/Makefile.com
index a0f4ec3e54..659d07eaa7 100644
--- a/usr/src/lib/cfgadm_plugins/ib/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/ib/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/ib/Makefile.com
-#
 
 LIBRARY= ib.a
 VERS= .1
@@ -36,14 +33,10 @@ OBJECTS= cfga_ib.o cfga_rcm.o cfga_conf.o
 # include library definitions
 include ../../../Makefile.lib
 
+SRCDIR =	../common
 ROOTLIBDIR=	$(ROOT)/usr/lib/cfgadm
 ROOTLIBDIR64=	$(ROOTLIBDIR)/$(MACH64)
 
-MAPFILE=	$(MAPDIR)/mapfile
-CLOBBERFILES +=	$(MAPFILE)
-
-SRCS=		$(OBJECTS:%.o=../common/%.c)
-
 LIBS=	$(DYNLIB)
 
 LINTFLAGS +=	-DDEBUG
@@ -52,7 +45,6 @@ LINTFLAGS64 +=	-DDEBUG
 CFLAGS +=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
 
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc -ldevice -ldevinfo -lrcm -lnvpair
 
 .KEEP_STATE:
@@ -61,11 +53,6 @@ all:	$(LIBS)
 
 lint:   lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # Install rules
 
 $(ROOTLIBDIR)/%: % $(ROOTLIBDIR)
diff --git a/usr/src/lib/cfgadm_plugins/ib/amd64/Makefile b/usr/src/lib/cfgadm_plugins/ib/amd64/Makefile
index b0e26c2283..4b07c3a63e 100644
--- a/usr/src/lib/cfgadm_plugins/ib/amd64/Makefile
+++ b/usr/src/lib/cfgadm_plugins/ib/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/cfgadm_plugins/ib/amd64/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/cfgadm_plugins/ib/common/mapfile-vers b/usr/src/lib/cfgadm_plugins/ib/common/mapfile-vers
new file mode 100644
index 0000000000..986c2b9b75
--- /dev/null
+++ b/usr/src/lib/cfgadm_plugins/ib/common/mapfile-vers
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	cfga_change_state;
+	cfga_help;
+	cfga_list_ext;
+	cfga_private_func;
+	cfga_test;
+	cfga_version;
+    local:
+	*;
+};
diff --git a/usr/src/lib/cfgadm_plugins/ib/i386/Makefile b/usr/src/lib/cfgadm_plugins/ib/i386/Makefile
index 8022c2a063..25e03c3f72 100644
--- a/usr/src/lib/cfgadm_plugins/ib/i386/Makefile
+++ b/usr/src/lib/cfgadm_plugins/ib/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/cfgadm_plugins/ib/i386/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/cfgadm_plugins/ib/sparc/Makefile b/usr/src/lib/cfgadm_plugins/ib/sparc/Makefile
index fa95546e40..25e03c3f72 100644
--- a/usr/src/lib/cfgadm_plugins/ib/sparc/Makefile
+++ b/usr/src/lib/cfgadm_plugins/ib/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/cfgadm_plugins/ib/sparc/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/cfgadm_plugins/ib/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/ib/sparcv9/Makefile
index c340752bb3..a0aa2c59c4 100644
--- a/usr/src/lib/cfgadm_plugins/ib/sparcv9/Makefile
+++ b/usr/src/lib/cfgadm_plugins/ib/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/cfgadm_plugins/ib/sparcv9/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile b/usr/src/lib/cfgadm_plugins/pci/Makefile
index 865b46e881..9a190d45f8 100644
--- a/usr/src/lib/cfgadm_plugins/pci/Makefile
+++ b/usr/src/lib/cfgadm_plugins/pci/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999, by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/pci/Makefile
 
 include		../../../Makefile.master
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -53,7 +52,7 @@ CP=	cp
 
 all clean clobber delete install lint package: $(SUBDIRS)
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/cfgadm_plugins/pci/Makefile.com b/usr/src/lib/cfgadm_plugins/pci/Makefile.com
index aa1c9120db..fe0d0703d0 100644
--- a/usr/src/lib/cfgadm_plugins/pci/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/pci/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/pci/Makefile.com
-#
 
 LIBRARY= pci.a
 VERS= .1
@@ -35,6 +32,7 @@ OBJECTS= cfga.o pci_strings.o
 # include library definitions
 include ../../../Makefile.lib
 
+SRCDIR =	../common
 INS.dir.root.sys=       $(INS) -s -d -m $(DIRMODE) $@
 $(CH)INS.dir.root.sys=  $(INS) -s -d -m $(DIRMODE) -u root -g sys $@
 INS.dir.bin.bin=        $(INS) -s -d -m $(DIRMODE) $@
@@ -47,16 +45,12 @@ USR_LIB_DIR_CFGADM_64	= $(USR_LIB_DIR_CFGADM)/$(MACH64)
 ROOTLIBDIR= $(USR_LIB_DIR_CFGADM)
 ROOTLIBDIR64= $(USR_LIB_DIR_CFGADM_64)
 
-MAPFILE=	$(MAPDIR)/mapfile
-CLOBBERFILES += $(MAPFILE)
-
 SRCS=		../common/cfga.c $(SRC)/common/pci/pci_strings.c
 
 LIBS = $(DYNLIB)
 
 CPPFLAGS +=	-D_POSIX_PTHREAD_SEMANTICS
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc -ldevice -ldevinfo -lrcm
 
 .KEEP_STATE:
@@ -65,11 +59,6 @@ all: $(LIBS)
 
 lint:   lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # Create target directories
 $(USR_LIB_DIR):
 	-$(INS.dir.root.sys)
diff --git a/usr/src/lib/cfgadm_plugins/pci/amd64/Makefile b/usr/src/lib/cfgadm_plugins/pci/amd64/Makefile
index c89e294820..4b07c3a63e 100644
--- a/usr/src/lib/cfgadm_plugins/pci/amd64/Makefile
+++ b/usr/src/lib/cfgadm_plugins/pci/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/amd64
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/cfgadm_plugins/pci/common/mapfile-vers b/usr/src/lib/cfgadm_plugins/pci/common/mapfile-vers
new file mode 100644
index 0000000000..986c2b9b75
--- /dev/null
+++ b/usr/src/lib/cfgadm_plugins/pci/common/mapfile-vers
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	cfga_change_state;
+	cfga_help;
+	cfga_list_ext;
+	cfga_private_func;
+	cfga_test;
+	cfga_version;
+    local:
+	*;
+};
diff --git a/usr/src/lib/cfgadm_plugins/pci/i386/Makefile b/usr/src/lib/cfgadm_plugins/pci/i386/Makefile
index 5dcc284162..50dd2a7dd7 100644
--- a/usr/src/lib/cfgadm_plugins/pci/i386/Makefile
+++ b/usr/src/lib/cfgadm_plugins/pci/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999, by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/pci/i386/Makefile
 
-MAPDIR= ../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/cfgadm_plugins/pci/sparc/Makefile b/usr/src/lib/cfgadm_plugins/pci/sparc/Makefile
index 39b2f356be..50dd2a7dd7 100644
--- a/usr/src/lib/cfgadm_plugins/pci/sparc/Makefile
+++ b/usr/src/lib/cfgadm_plugins/pci/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999, by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/pci/sparc/Makefile
 
-MAPDIR= ../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/cfgadm_plugins/pci/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/pci/sparcv9/Makefile
index 83382433a5..4b07c3a63e 100644
--- a/usr/src/lib/cfgadm_plugins/pci/sparcv9/Makefile
+++ b/usr/src/lib/cfgadm_plugins/pci/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999, by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/pci/sparcv9/Makefile
 
-MAPDIR= ../spec/sparcv9
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/cfgadm_plugins/sata/Makefile b/usr/src/lib/cfgadm_plugins/sata/Makefile
index 691964397e..1187341292 100644
--- a/usr/src/lib/cfgadm_plugins/sata/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sata/Makefile
@@ -18,18 +18,17 @@
 #
 # CDDL HEADER END
 #
-
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/sata/Makefile
 
 include		../../Makefile.lib
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -53,7 +52,7 @@ CP=	cp
 
 all clean clobber delete install lint package: $(SUBDIRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/cfgadm_plugins/sata/Makefile.com b/usr/src/lib/cfgadm_plugins/sata/Makefile.com
index dd1fb7e8b9..6b10ca7b3f 100644
--- a/usr/src/lib/cfgadm_plugins/sata/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sata/Makefile.com
@@ -18,15 +18,12 @@
 #
 # CDDL HEADER END
 #
-
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/sata/Makefile.com
-#
 
 LIBRARY= sata.a
 VERS= .1
@@ -36,14 +33,10 @@ OBJECTS= cfga_sata.o cfga_rcm.o
 # include library definitions
 include ../../../Makefile.lib
 
+SRCDIR =	../common
 ROOTLIBDIR=	$(ROOT)/usr/lib/cfgadm
 ROOTLIBDIR64=	$(ROOTLIBDIR)/$(MACH64)
 
-MAPFILE=	$(MAPDIR)/mapfile
-CLOBBERFILES +=	$(MAPFILE)
-
-SRCS=		$(OBJECTS:%.o=../common/%.c)
-
 LIBS=	$(DYNLIB)
 
 LINTFLAGS +=	-DDEBUG
@@ -52,7 +45,6 @@ LINTFLAGS64 +=	-DDEBUG
 CFLAGS +=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
 
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc -ldevice -ldevinfo -lrcm -lnvpair
 
 .KEEP_STATE:
@@ -61,11 +53,6 @@ all:	$(LIBS)
 
 lint:	lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # Install rules
 
 $(ROOTLIBDIR)/%: % $(ROOTLIBDIR)
diff --git a/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile b/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile
index 2caa30e412..12fe21de7f 100644
--- a/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sata/amd64/Makefile
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -26,7 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/amd64
 include ../Makefile.com
 include ../../../Makefile.lib.64
 CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
diff --git a/usr/src/lib/cfgadm_plugins/sata/common/mapfile-vers b/usr/src/lib/cfgadm_plugins/sata/common/mapfile-vers
new file mode 100644
index 0000000000..986c2b9b75
--- /dev/null
+++ b/usr/src/lib/cfgadm_plugins/sata/common/mapfile-vers
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	cfga_change_state;
+	cfga_help;
+	cfga_list_ext;
+	cfga_private_func;
+	cfga_test;
+	cfga_version;
+    local:
+	*;
+};
diff --git a/usr/src/lib/cfgadm_plugins/sata/i386/Makefile b/usr/src/lib/cfgadm_plugins/sata/i386/Makefile
index 04d069c967..9c9593ade6 100644
--- a/usr/src/lib/cfgadm_plugins/sata/i386/Makefile
+++ b/usr/src/lib/cfgadm_plugins/sata/i386/Makefile
@@ -18,17 +18,13 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/sata/i386/Makefile
-#
 
-MAPDIR= ../spec/i386
 include ../Makefile.com
 CFLAGS += -D_POSIX_PTHREAD_SEMANTICS
 LINTFLAGS += -D_POSIX_PTHREAD_SEMANTICS
diff --git a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
index 757b9d611b..f4ab702c77 100644
--- a/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sbd/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/sbd/Makefile.com
-#
 
 PLATFORM=	sun4u
 LIBRARY= sbd.a
@@ -51,13 +48,11 @@ USR_PSM_LIB_CFG_DIR_64	= $(USR_PSM_LIB_CFG_DIR)/$(MACH64)
 ROOTLIBDIR=     $(USR_PSM_LIB_CFG_DIR)
 ROOTLIBDIR64=   $(USR_PSM_LIB_CFG_DIR_64)
 
-MAPFILE=	../common/mapfile-vers
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS = $(DYNLIB)
 
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc -lkstat -lnvpair
 
 CPPFLAGS +=	-I$(ROOT)/usr/platform/$(PLATFORM)/include -DSBD_DEBUG
@@ -74,8 +69,6 @@ all: $(LIBS)
 
 lint:   lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
 # Create target directories
 $(USR_PSM_DIR):
 	-$(INS.dir.root.sys)
diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile b/usr/src/lib/cfgadm_plugins/scsi/Makefile
index a0b7f07b08..af85aa5804 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile
@@ -18,19 +18,18 @@
 #
 # CDDL HEADER END
 #
-
 #
-# Copyright 2006 Sun Microsystems, Inc.  All rights reserved. 
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/scsi/Makefile
 
 include		../../Makefile.lib
 
 sparc_SUBDIRS=	SUNW,SPARC-Enterprise
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64) $($(MACH)_SUBDIRS)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64) $($(MACH)_SUBDIRS)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -54,7 +53,7 @@ CP=	cp
 
 all clean clobber delete install lint package: $(SUBDIRS)
 
-$(MACH) $(MACH64) spec $($(MACH)_SUBDIRS):	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/cfgadm_plugins/scsi/Makefile.com b/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
index fa435b3484..c29b5bc91d 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/scsi/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/scsi/Makefile.com
-#
 
 LIBRARY= scsi.a
 VERS= .1
@@ -36,19 +33,14 @@ OBJECTS= cfga_ctl.o cfga_cvt.o cfga_list.o cfga_scsi.o cfga_utils.o cfga_rcm.o
 # include library definitions
 include ../../../Makefile.lib
 
+SRCDIR =	../common
 ROOTLIBDIR=	$(ROOT)/usr/lib/cfgadm
 ROOTLIBDIR64=	$(ROOTLIBDIR)/$(MACH64)
 
-MAPFILE=	$(MAPDIR)/mapfile
-CLOBBERFILES +=	$(MAPFILE)
-
-SRCS=		$(OBJECTS:%.o=../common/%.c)
-
 LIBS=	$(DYNLIB)
 
 CFLAGS +=	$(CCVERBOSE)
 
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc -ldevice -ldevinfo -lrcm
 
 .KEEP_STATE:
@@ -57,11 +49,6 @@ all:	$(LIBS)
 
 lint:   lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # Install rules
 
 $(ROOTLIBDIR)/%: % $(ROOTLIBDIR)
diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com
index 7c84f49c1c..e675ae9d87 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com
@@ -18,15 +18,12 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/Makefile.com
-#
 
 LIBRARY= scsi.a
 VERS= .1
@@ -47,8 +44,7 @@ include $(SRC)/lib/Makefile.lib
 ROOTLIBDIR=	$(ROOT)/usr/platform/SUNW,SPARC-Enterprise/lib/cfgadm
 ROOTLIBDIR64=	$(ROOTLIBDIR)/$(MACH64)
 
-MAPFILE=	$(MAPDIR)/mapfile
-CLOBBERFILES +=	$(MAPFILE)
+SRCDIR =	../../common
 
 SRCS=	$(GEN_OBJECTS:%.o=../../common/%.c) $(OPL_OBJECTS:%.o=../common/%.c)
 
@@ -56,7 +52,6 @@ LIBS=	$(DYNLIB)
 
 CFLAGS +=	$(CCVERBOSE)
 
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc -ldevice -ldevinfo -lrcm
 
 .KEEP_STATE:
@@ -65,11 +60,6 @@ all:	$(LIBS)
 
 lint:   lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # Install rules
 
 $(ROOTLIBDIR)/%: % $(ROOTLIBDIR)
diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile
index 14a712eb3b..c845c24bfc 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile
@@ -18,17 +18,13 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparc/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../../spec/sparc
 include ../Makefile.com
 CFLAGS += -I../../common -I$(SRC)/uts/sun4u/opl
 
diff --git a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile
index 88e3961369..c05026a824 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile
@@ -18,17 +18,13 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/scsi/SUNW,SPARC-Enterprise/sparcv9/Makefile
-#
 
-MAPDIR=	../../spec/sparcv9
 include ../Makefile.com
 include ../../../../Makefile.lib.64
 CFLAGS64 += -I../../common -I$(SRC)/uts/sun4u/opl
diff --git a/usr/src/lib/cfgadm_plugins/scsi/amd64/Makefile b/usr/src/lib/cfgadm_plugins/scsi/amd64/Makefile
index a95e1e4bbd..a0aa2c59c4 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/amd64/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/cfgadm_plugins/scsi/common/mapfile-vers b/usr/src/lib/cfgadm_plugins/scsi/common/mapfile-vers
new file mode 100644
index 0000000000..986c2b9b75
--- /dev/null
+++ b/usr/src/lib/cfgadm_plugins/scsi/common/mapfile-vers
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	cfga_change_state;
+	cfga_help;
+	cfga_list_ext;
+	cfga_private_func;
+	cfga_test;
+	cfga_version;
+    local:
+	*;
+};
diff --git a/usr/src/lib/cfgadm_plugins/scsi/i386/Makefile b/usr/src/lib/cfgadm_plugins/scsi/i386/Makefile
index deed4004f1..25e03c3f72 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/i386/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/cfgadm_plugins/scsi/i386/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/i386 
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/cfgadm_plugins/scsi/sparc/Makefile b/usr/src/lib/cfgadm_plugins/scsi/sparc/Makefile
index 81ba4e1d91..25e03c3f72 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/sparc/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/cfgadm_plugins/scsi/sparc/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/cfgadm_plugins/scsi/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/scsi/sparcv9/Makefile
index 7218db5703..a0aa2c59c4 100644
--- a/usr/src/lib/cfgadm_plugins/scsi/sparcv9/Makefile
+++ b/usr/src/lib/cfgadm_plugins/scsi/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/cfgadm_plugins/scsi/sparcv9/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
index f37a852473..beeeea5b3c 100644
--- a/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/sysctrl/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/sysctrl/Makefile.com
-#
 
 include $(SRC)/lib/cfgadm_plugins/Makefile.com
 
@@ -53,13 +50,11 @@ USR_PSM_LIB_CFG_DIR_64	= $(USR_PSM_LIB_CFG_DIR)/$(MACH64)
 ROOTLIBDIR=     $(USR_PSM_LIB_CFG_DIR)
 ROOTLIBDIR64=   $(USR_PSM_LIB_CFG_DIR_64)
 
-MAPFILE=	../common/mapfile-vers
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS = $(DYNLIB)
 
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc
 
 CPPFLAGS +=	-I$(ROOT)/usr/platform/$(PLATFORM)/include
@@ -70,8 +65,6 @@ all: $(LIBS)
 
 lint:   lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
 # Create target directories
 $(USR_PSM_DIR):		$(LINKED_DIRS)
 	-$(INS.dir.root.sys)
diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile b/usr/src/lib/cfgadm_plugins/usb/Makefile
index a934235ecd..c112dc38e3 100644
--- a/usr/src/lib/cfgadm_plugins/usb/Makefile
+++ b/usr/src/lib/cfgadm_plugins/usb/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved. 
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/usb/Makefile
 
 include		../../Makefile.lib
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -53,7 +52,7 @@ CP=	cp
 
 all clean clobber delete install lint package: $(SUBDIRS)
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/cfgadm_plugins/usb/Makefile.com b/usr/src/lib/cfgadm_plugins/usb/Makefile.com
index 4c0c59ecf9..bd2941c04c 100644
--- a/usr/src/lib/cfgadm_plugins/usb/Makefile.com
+++ b/usr/src/lib/cfgadm_plugins/usb/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/cfgadm_plugins/usb/Makefile.com
-#
 
 LIBRARY= usb.a
 VERS= .1
@@ -36,14 +33,10 @@ OBJECTS= cfga_usb.o cfga_rcm.o cfga_configfile.o
 # include library definitions
 include ../../../Makefile.lib
 
+SRCDIR =	../common
 ROOTLIBDIR=	$(ROOT)/usr/lib/cfgadm
 ROOTLIBDIR64=	$(ROOTLIBDIR)/$(MACH64)
 
-MAPFILE=	$(MAPDIR)/mapfile
-CLOBBERFILES +=	$(MAPFILE)
-
-SRCS=		$(OBJECTS:%.o=../common/%.c)
-
 LIBS=	$(DYNLIB)
 
 LINTFLAGS +=	-DDEBUG
@@ -52,7 +45,6 @@ LINTFLAGS64 +=	-DDEBUG
 CFLAGS +=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
 
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc -ldevice -ldevinfo -lrcm -lnvpair
 
 .KEEP_STATE:
@@ -61,11 +53,6 @@ all:	$(LIBS)
 
 lint:   lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # Install rules
 
 $(ROOTLIBDIR)/%: % $(ROOTLIBDIR)
diff --git a/usr/src/lib/cfgadm_plugins/usb/amd64/Makefile b/usr/src/lib/cfgadm_plugins/usb/amd64/Makefile
index a95e1e4bbd..a0aa2c59c4 100644
--- a/usr/src/lib/cfgadm_plugins/usb/amd64/Makefile
+++ b/usr/src/lib/cfgadm_plugins/usb/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/cfgadm_plugins/usb/common/mapfile-vers b/usr/src/lib/cfgadm_plugins/usb/common/mapfile-vers
new file mode 100644
index 0000000000..986c2b9b75
--- /dev/null
+++ b/usr/src/lib/cfgadm_plugins/usb/common/mapfile-vers
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	cfga_change_state;
+	cfga_help;
+	cfga_list_ext;
+	cfga_private_func;
+	cfga_test;
+	cfga_version;
+    local:
+	*;
+};
diff --git a/usr/src/lib/cfgadm_plugins/usb/i386/Makefile b/usr/src/lib/cfgadm_plugins/usb/i386/Makefile
index cb57b7323e..25e03c3f72 100644
--- a/usr/src/lib/cfgadm_plugins/usb/i386/Makefile
+++ b/usr/src/lib/cfgadm_plugins/usb/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/cfgadm_plugins/usb/i386/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/i386 
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/cfgadm_plugins/usb/sparc/Makefile b/usr/src/lib/cfgadm_plugins/usb/sparc/Makefile
index bccf710e4a..25e03c3f72 100644
--- a/usr/src/lib/cfgadm_plugins/usb/sparc/Makefile
+++ b/usr/src/lib/cfgadm_plugins/usb/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/cfgadm_plugins/usb/sparc/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/cfgadm_plugins/usb/sparcv9/Makefile b/usr/src/lib/cfgadm_plugins/usb/sparcv9/Makefile
index db46bd9557..a0aa2c59c4 100644
--- a/usr/src/lib/cfgadm_plugins/usb/sparcv9/Makefile
+++ b/usr/src/lib/cfgadm_plugins/usb/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/cfgadm_plugins/usb/sparcv9/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/crypt_modules/Makefile.crypt_modules b/usr/src/lib/crypt_modules/Makefile.crypt_modules
index abc97b8d52..56fea36cc1 100644
--- a/usr/src/lib/crypt_modules/Makefile.crypt_modules
+++ b/usr/src/lib/crypt_modules/Makefile.crypt_modules
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,18 +19,18 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # Common build macros used by (most every) crypt module.
 #
 
 include		$(SRC)/lib/Makefile.lib
 
-SRCDIR=		..
-
 LIBS=		$(DYNLIB)
 
 CFLAGS		+= $(CCVERBOSE)
@@ -39,9 +38,6 @@ CPPFLAGS	+= -D_REENTRANT
 LINTFLAGS	+= -y
 LINTFLAGS64	+= -y
 
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 ROOTLIBDIR=	$(ROOT)/usr/lib/security
 ROOTLIBDIR64=	$(ROOT)/usr/lib/security/$(MACH64)
 
diff --git a/usr/src/lib/crypt_modules/bsdbf/Makefile b/usr/src/lib/crypt_modules/bsdbf/Makefile
index a8ec19b7dd..6eb0c845ec 100644
--- a/usr/src/lib/crypt_modules/bsdbf/Makefile
+++ b/usr/src/lib/crypt_modules/bsdbf/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include $(SRC)/lib/Makefile.lib
 
@@ -40,15 +40,13 @@ package :=	TARGET= package
 
 .KEEP_STATE:
 
-all clean clobber delete install package: spec .WAIT $(SUBDIRS)
-
-lint:	$(SUBDIRS)
+all clean clobber delete install lint package: $(SUBDIRS)
 
 _msg:
 
 catalog:
 
-$(SUBDIRS) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/crypt_modules/bsdbf/mapfile-vers b/usr/src/lib/crypt_modules/bsdbf/mapfile-vers
new file mode 100644
index 0000000000..0ed1e6c0c5
--- /dev/null
+++ b/usr/src/lib/crypt_modules/bsdbf/mapfile-vers
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.0 {
+    global:
+	crypt_genhash_impl;
+	crypt_gensalt_impl;
+    local:
+	*;
+};
diff --git a/usr/src/lib/crypt_modules/bsdmd5/Makefile b/usr/src/lib/crypt_modules/bsdmd5/Makefile
index d7bd54983e..56ab3b9de1 100644
--- a/usr/src/lib/crypt_modules/bsdmd5/Makefile
+++ b/usr/src/lib/crypt_modules/bsdmd5/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include $(SRC)/lib/Makefile.lib
 
@@ -40,15 +40,13 @@ package :=	TARGET= package
 
 .KEEP_STATE:
 
-all clean clobber delete install package: spec .WAIT $(SUBDIRS)
-
-lint:	$(SUBDIRS)
+all clean clobber delete install lint package: $(SUBDIRS)
 
 _msg:
 
 catalog:
 
-$(SUBDIRS) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/crypt_modules/bsdmd5/mapfile-vers b/usr/src/lib/crypt_modules/bsdmd5/mapfile-vers
new file mode 100644
index 0000000000..0ed1e6c0c5
--- /dev/null
+++ b/usr/src/lib/crypt_modules/bsdmd5/mapfile-vers
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.0 {
+    global:
+	crypt_genhash_impl;
+	crypt_gensalt_impl;
+    local:
+	*;
+};
diff --git a/usr/src/lib/crypt_modules/sunmd5/Makefile b/usr/src/lib/crypt_modules/sunmd5/Makefile
index d7bd54983e..56ab3b9de1 100644
--- a/usr/src/lib/crypt_modules/sunmd5/Makefile
+++ b/usr/src/lib/crypt_modules/sunmd5/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include $(SRC)/lib/Makefile.lib
 
@@ -40,15 +40,13 @@ package :=	TARGET= package
 
 .KEEP_STATE:
 
-all clean clobber delete install package: spec .WAIT $(SUBDIRS)
-
-lint:	$(SUBDIRS)
+all clean clobber delete install lint package: $(SUBDIRS)
 
 _msg:
 
 catalog:
 
-$(SUBDIRS) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/crypt_modules/sunmd5/mapfile-vers b/usr/src/lib/crypt_modules/sunmd5/mapfile-vers
new file mode 100644
index 0000000000..0ed1e6c0c5
--- /dev/null
+++ b/usr/src/lib/crypt_modules/sunmd5/mapfile-vers
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.0 {
+    global:
+	crypt_genhash_impl;
+	crypt_gensalt_impl;
+    local:
+	*;
+};
diff --git a/usr/src/lib/efcode/Makefile.efcode b/usr/src/lib/efcode/Makefile.efcode
index 748c0294c2..b8c1e73b3d 100644
--- a/usr/src/lib/efcode/Makefile.efcode
+++ b/usr/src/lib/efcode/Makefile.efcode
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # Common build rules for efcode shared objects.
 #
 # For historical reasons, these shared objects aren't explicitly versioned, so
@@ -41,11 +42,12 @@ LIBS	= $(DYNLIB)
 LDLIBS	+= -lc
 LIBLINKS =
 
+MAPFILES =
+
 CPPFLAGS += -DDEBUG -DFCODE_INTERNAL
 CPPFLAGS += -I $(SRC)/lib/efcode/include -I $(ROOT)/usr/platform/sun4u/include
 DYNFLAGS += -R\$$ORIGIN
 
-SRCDIR = ..
 EFCODE64DIR = /usr/lib/efcode/$(MACH64)
 ROOTLIBDIR = $(ROOT)/usr/lib/efcode
 ROOTLIBDIR64 = $(ROOT)/usr/lib/efcode/$(MACH64)
diff --git a/usr/src/lib/extendedFILE/Makefile.com b/usr/src/lib/extendedFILE/Makefile.com
index 765237b411..cbe5370c10 100644
--- a/usr/src/lib/extendedFILE/Makefile.com
+++ b/usr/src/lib/extendedFILE/Makefile.com
@@ -24,7 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/extendedFILE/Makefile.com
 
 LIBRARY = extendedFILE.a
 VERS = .1
@@ -34,17 +33,14 @@ OBJECTS = extendedFILE.o
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE = ../common/mapfile-vers
-
-SRCS = $(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS = $(DYNLIB)
 LDLIBS += -lc
 CFLAGS += $(CCVERBOSE)
-CPPFLAGS += -D_REENTRANT -I../common
-DYNFLAGS += -M$(MAPFILE) $(ZINTERPOSE)
+CPPFLAGS += -D_REENTRANT -I../common -I../../common/inc
 
-CPPFLAGS += -I../../common/inc
+DYNFLAGS +=	$(ZINTERPOSE)
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/fm/libdiagcode/Makefile b/usr/src/lib/fm/libdiagcode/Makefile
index 322e291379..c6a223942a 100644
--- a/usr/src/lib/fm/libdiagcode/Makefile
+++ b/usr/src/lib/fm/libdiagcode/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include ../../Makefile.lib
 include ../Makefile.lib
@@ -43,17 +43,13 @@ test	:= TARGET= test
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
-
-test: $(SUBDIRS)
+all clean clobber install lint test: $(SUBDIRS)
 
 install_h: $(ROOTFMHDRS)
 
 check: $(CHECKHDRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/fm/libdiagcode/Makefile.com b/usr/src/lib/fm/libdiagcode/Makefile.com
index 49bb01a7c7..edb174cecb 100644
--- a/usr/src/lib/fm/libdiagcode/Makefile.com
+++ b/usr/src/lib/fm/libdiagcode/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -40,8 +39,6 @@ LDLIBS +=	-lc
 CLOBBERFILES += test $(TSTOBJECTS)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
 
 CFLAGS +=	$(CCVERBOSE)
 
diff --git a/usr/src/lib/fm/libdiagcode/common/mapfile-vers b/usr/src/lib/fm/libdiagcode/common/mapfile-vers
new file mode 100644
index 0000000000..48c9feb79d
--- /dev/null
+++ b/usr/src/lib/fm/libdiagcode/common/mapfile-vers
@@ -0,0 +1,39 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate {
+    global:
+	fm_dc_closedict;
+	fm_dc_code2key;
+	fm_dc_codelen;
+	fm_dc_getprop;
+	fm_dc_key2code;
+	fm_dc_maxkey;
+	fm_dc_opendict;
+    local:
+	*;
+};
diff --git a/usr/src/lib/fm/libfmd_adm/Makefile b/usr/src/lib/fm/libfmd_adm/Makefile
index 6b32b9c1f4..a05449c6c5 100644
--- a/usr/src/lib/fm/libfmd_adm/Makefile
+++ b/usr/src/lib/fm/libfmd_adm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include ../../Makefile.lib
 include ../Makefile.lib
@@ -42,17 +42,15 @@ lint := TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber: spec .WAIT $(SUBDIRS)
-
-install: install_h spec .WAIT $(SUBDIRS)
+all clean clobber lint: $(SUBDIRS)
 
-lint: $(SUBDIRS)
+install: install_h .WAIT $(SUBDIRS)
 
 install_h: $(ROOTFMHDRS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/fm/libfmd_adm/Makefile.com b/usr/src/lib/fm/libfmd_adm/Makefile.com
index b9760e1c20..250494f315 100644
--- a/usr/src/lib/fm/libfmd_adm/Makefile.com
+++ b/usr/src/lib/fm/libfmd_adm/Makefile.com
@@ -18,12 +18,12 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY = libfmd_adm.a
 VERS = .1
@@ -38,8 +38,7 @@ SRCS = $(LIBSRCS:%.c=../common/%.c)
 LIBS = $(DYNLIB) $(LINTLIB)
 CLEANFILES += fmd_rpc.c fmd_xdr.c fmd_rpc_adm.h fmd_rpc_adm.x
 
-SRCDIR = ../common
-SPECMAPFILE = $(MAPDIR)/mapfile
+SRCDIR =	../common
 
 CPPFLAGS += -I../common -I.
 CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
diff --git a/usr/src/lib/fm/libfmd_adm/amd64/Makefile b/usr/src/lib/fm/libfmd_adm/amd64/Makefile
index 07fe45208f..d7bfc90e79 100644
--- a/usr/src/lib/fm/libfmd_adm/amd64/Makefile
+++ b/usr/src/lib/fm/libfmd_adm/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/amd64
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/fm/libfmd_adm/common/mapfile-vers b/usr/src/lib/fm/libfmd_adm/common/mapfile-vers
new file mode 100644
index 0000000000..1760838562
--- /dev/null
+++ b/usr/src/lib/fm/libfmd_adm/common/mapfile-vers
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate {
+    global:
+	fmd_adm_case_iter;
+	fmd_adm_case_repair;
+	fmd_adm_close;
+	fmd_adm_errmsg;
+	fmd_adm_log_rotate;
+	fmd_adm_module_gc;
+	fmd_adm_module_iter;
+	fmd_adm_module_load;
+	fmd_adm_module_reset;
+	fmd_adm_module_stats;
+	fmd_adm_module_unload;
+	fmd_adm_open;
+	fmd_adm_rsrc_count;
+	fmd_adm_rsrc_flush;
+	fmd_adm_rsrc_iter;
+	fmd_adm_rsrc_repair;
+	fmd_adm_serd_iter;
+	fmd_adm_serd_reset;
+	fmd_adm_stats_free;
+	fmd_adm_stats_read;
+	fmd_adm_xprt_iter;
+	fmd_adm_xprt_stats;
+    local:
+	*;
+};
diff --git a/usr/src/lib/fm/libfmd_adm/i386/Makefile b/usr/src/lib/fm/libfmd_adm/i386/Makefile
index 905c136359..a333224278 100644
--- a/usr/src/lib/fm/libfmd_adm/i386/Makefile
+++ b/usr/src/lib/fm/libfmd_adm/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/i386
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/fm/libfmd_adm/sparc/Makefile b/usr/src/lib/fm/libfmd_adm/sparc/Makefile
index 65682c4299..a333224278 100644
--- a/usr/src/lib/fm/libfmd_adm/sparc/Makefile
+++ b/usr/src/lib/fm/libfmd_adm/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/sparc
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/fm/libfmd_adm/sparcv9/Makefile b/usr/src/lib/fm/libfmd_adm/sparcv9/Makefile
index 98cef7b91a..d7bfc90e79 100644
--- a/usr/src/lib/fm/libfmd_adm/sparcv9/Makefile
+++ b/usr/src/lib/fm/libfmd_adm/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/sparcv9
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/fm/libfmd_log/Makefile b/usr/src/lib/fm/libfmd_log/Makefile
index 834551b6c3..03101f021b 100644
--- a/usr/src/lib/fm/libfmd_log/Makefile
+++ b/usr/src/lib/fm/libfmd_log/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include ../../Makefile.lib
 include ../Makefile.lib
@@ -42,17 +42,15 @@ lint := TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber: spec .WAIT $(SUBDIRS)
-
-install: install_h spec .WAIT $(SUBDIRS)
+all clean clobber lint: $(SUBDIRS)
 
-lint: $(SUBDIRS)
+install: install_h .WAIT $(SUBDIRS)
 
 install_h: $(ROOTFMHDRS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/fm/libfmd_log/Makefile.com b/usr/src/lib/fm/libfmd_log/Makefile.com
index 1916a013ad..c48aff2a87 100644
--- a/usr/src/lib/fm/libfmd_log/Makefile.com
+++ b/usr/src/lib/fm/libfmd_log/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY = libfmd_log.a
 VERS = .1
@@ -37,8 +37,7 @@ include ../../Makefile.lib
 SRCS = $(LIBSRCS:%.c=../common/%.c)
 LIBS = $(DYNLIB) $(LINTLIB)
 
-SRCDIR = ../common
-SPECMAPFILE = $(MAPDIR)/mapfile
+SRCDIR =	../common
 
 CPPFLAGS += -I../common -I.
 CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
diff --git a/usr/src/lib/fm/libfmd_log/amd64/Makefile b/usr/src/lib/fm/libfmd_log/amd64/Makefile
index 07fe45208f..d7bfc90e79 100644
--- a/usr/src/lib/fm/libfmd_log/amd64/Makefile
+++ b/usr/src/lib/fm/libfmd_log/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/amd64
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/fm/libfmd_log/common/mapfile-vers b/usr/src/lib/fm/libfmd_log/common/mapfile-vers
new file mode 100644
index 0000000000..d7ba3e2c45
--- /dev/null
+++ b/usr/src/lib/fm/libfmd_log/common/mapfile-vers
@@ -0,0 +1,47 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate {
+    global:
+	fmd_log_close;
+	fmd_log_errmsg;
+	fmd_log_errno;
+	fmd_log_filter;
+	fmd_log_filter_after;
+	fmd_log_filter_before;
+	fmd_log_filter_class;
+	fmd_log_filter_uuid;
+	fmd_log_header;
+	fmd_log_iter;
+	fmd_log_label;
+	fmd_log_open;
+	fmd_log_rewind;
+	fmd_log_seek;
+	fmd_log_xiter;
+    local:
+	*;
+};
diff --git a/usr/src/lib/fm/libfmd_log/i386/Makefile b/usr/src/lib/fm/libfmd_log/i386/Makefile
index 905c136359..a333224278 100644
--- a/usr/src/lib/fm/libfmd_log/i386/Makefile
+++ b/usr/src/lib/fm/libfmd_log/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/i386
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/fm/libfmd_log/sparc/Makefile b/usr/src/lib/fm/libfmd_log/sparc/Makefile
index 65682c4299..a333224278 100644
--- a/usr/src/lib/fm/libfmd_log/sparc/Makefile
+++ b/usr/src/lib/fm/libfmd_log/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/sparc
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/fm/libfmd_log/sparcv9/Makefile b/usr/src/lib/fm/libfmd_log/sparcv9/Makefile
index 98cef7b91a..d7bfc90e79 100644
--- a/usr/src/lib/fm/libfmd_log/sparcv9/Makefile
+++ b/usr/src/lib/fm/libfmd_log/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/sparcv9
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/fm/libfmd_snmp/Makefile b/usr/src/lib/fm/libfmd_snmp/Makefile
index 8d9f7fea7f..9af0aa42de 100644
--- a/usr/src/lib/fm/libfmd_snmp/Makefile
+++ b/usr/src/lib/fm/libfmd_snmp/Makefile
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -51,9 +50,9 @@ lint := TARGET = lint
 
 .KEEP_STATE:
 
-all lint clean clobber: spec .WAIT $(SUBDIRS)
+all lint clean clobber: $(SUBDIRS)
 
-install: install_h install_mibs spec .WAIT $(SUBDIRS)
+install: install_h install_mibs .WAIT $(SUBDIRS)
 
 install_h: $(ROOTFMHDRS)
 
@@ -61,7 +60,7 @@ install_mibs: $(ROOTSMAMIBDIR) $(ROOTMIBS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 $(ROOTSMAMIBDIR):
diff --git a/usr/src/lib/fm/libfmd_snmp/Makefile.com b/usr/src/lib/fm/libfmd_snmp/Makefile.com
index b670761e40..cc316a0a76 100644
--- a/usr/src/lib/fm/libfmd_snmp/Makefile.com
+++ b/usr/src/lib/fm/libfmd_snmp/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -26,7 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-
 LIBRARY = libfmd_snmp.a
 VERS = .1
 
@@ -46,8 +44,7 @@ include ../../Makefile.lib
 SRCS = $(LIBSRCS:%.c=../common/%.c)
 LIBS = $(DYNLIB) $(LINTLIB)
 
-SRCDIR = ../common
-SPECMAPFILE = $(MAPDIR)/mapfile
+SRCDIR =	../common
 
 CPPFLAGS += -I../common -I. -I/usr/sfw/include
 $(NOT_RELEASE_BUILD)CPPFLAGS += -DDEBUG
diff --git a/usr/src/lib/fm/libfmd_snmp/amd64/Makefile b/usr/src/lib/fm/libfmd_snmp/amd64/Makefile
index 8d9565b2de..90f182e191 100644
--- a/usr/src/lib/fm/libfmd_snmp/amd64/Makefile
+++ b/usr/src/lib/fm/libfmd_snmp/amd64/Makefile
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -26,7 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR = ../spec/amd64
 MACH_LDLIBS = -L$(ROOT)/usr/lib/fm/$(MACH64)
 
 include ../Makefile.com
diff --git a/usr/src/lib/fm/libfmd_snmp/common/mapfile-vers b/usr/src/lib/fm/libfmd_snmp/common/mapfile-vers
new file mode 100644
index 0000000000..5052a6aabf
--- /dev/null
+++ b/usr/src/lib/fm/libfmd_snmp/common/mapfile-vers
@@ -0,0 +1,45 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate {
+    global:
+	fmd_fmri_alloc;
+	fmd_fmri_error;
+	fmd_fmri_free;
+	fmd_fmri_get_drgen;
+	fmd_fmri_get_platform;
+	fmd_fmri_get_rootdir;
+	fmd_fmri_set_errno;
+	fmd_fmri_strdup;
+	fmd_fmri_strescape;
+	fmd_fmri_strfree;
+	fmd_fmri_warn;
+	fmd_fmri_zalloc;
+	init_sunFM;
+    local:
+	*;
+};
diff --git a/usr/src/lib/fm/libfmd_snmp/i386/Makefile b/usr/src/lib/fm/libfmd_snmp/i386/Makefile
index a46e9857cf..2a905ab007 100644
--- a/usr/src/lib/fm/libfmd_snmp/i386/Makefile
+++ b/usr/src/lib/fm/libfmd_snmp/i386/Makefile
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -26,7 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR = ../spec/i386
 MACH_LDLIBS = -L$(ROOT)/usr/lib/fm
 
 include ../Makefile.com
diff --git a/usr/src/lib/fm/libfmd_snmp/sparc/Makefile b/usr/src/lib/fm/libfmd_snmp/sparc/Makefile
index 7e1078bf63..2a905ab007 100644
--- a/usr/src/lib/fm/libfmd_snmp/sparc/Makefile
+++ b/usr/src/lib/fm/libfmd_snmp/sparc/Makefile
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -26,7 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR = ../spec/sparc
 MACH_LDLIBS = -L$(ROOT)/usr/lib/fm
 
 include ../Makefile.com
diff --git a/usr/src/lib/fm/libfmd_snmp/sparcv9/Makefile b/usr/src/lib/fm/libfmd_snmp/sparcv9/Makefile
index 330b4782ae..90f182e191 100644
--- a/usr/src/lib/fm/libfmd_snmp/sparcv9/Makefile
+++ b/usr/src/lib/fm/libfmd_snmp/sparcv9/Makefile
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -26,7 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR = ../spec/sparcv9
 MACH_LDLIBS = -L$(ROOT)/usr/lib/fm/$(MACH64)
 
 include ../Makefile.com
diff --git a/usr/src/lib/fm/libldom/Makefile b/usr/src/lib/fm/libldom/Makefile
index f317a664ce..a5de1baa50 100644
--- a/usr/src/lib/fm/libldom/Makefile
+++ b/usr/src/lib/fm/libldom/Makefile
@@ -22,7 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include ../../Makefile.lib
 include ../Makefile.lib
@@ -42,17 +43,13 @@ lint := TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber: spec .WAIT $(SUBDIRS)
-
-install: install_h spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install_h lint: $(SUBDIRS)
 
-install_h: $(SUBDIRS)
+install: install_h .WAIT $(SUBDIRS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/fm/libldom/Makefile.com b/usr/src/lib/fm/libldom/Makefile.com
index 42ad27f826..46df47b9ab 100644
--- a/usr/src/lib/fm/libldom/Makefile.com
+++ b/usr/src/lib/fm/libldom/Makefile.com
@@ -22,7 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY = libldom.a
 VERS = .1
@@ -38,8 +39,6 @@ SRCDIR = ../sparc
 
 LIBS = $(DYNLIB) $(LINTLIB)
 
-SPECMAPFILE = $(MAPDIR)/mapfile
-
 CPPFLAGS += -I. -I$(SRC)/uts/sun4v
 CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
 CFLAGS64 += $(CCVERBOSE) $(C_BIGPICFLAGS)
diff --git a/usr/src/lib/fm/libldom/sparc/Makefile b/usr/src/lib/fm/libldom/sparc/Makefile
index 014c39fe59..261bf4c60f 100644
--- a/usr/src/lib/fm/libldom/sparc/Makefile
+++ b/usr/src/lib/fm/libldom/sparc/Makefile
@@ -22,9 +22,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/sparc
 MACH_LDLIBS = -L$(ROOT)/usr/lib/fm
 
 include ../Makefile.com
@@ -33,7 +33,6 @@ DYNFLAGS += -R/usr/lib/fm
 
 FMHDRS = ldom.h
 HDRDIR = .
-SRCDIR = .
 
 ROOTFMHDRDIR = $(ROOT)/usr/platform/sun4v/include/sys/fm
 
diff --git a/usr/src/lib/fm/libldom/sparc/mapfile-vers b/usr/src/lib/fm/libldom/sparc/mapfile-vers
new file mode 100644
index 0000000000..1533c21c9d
--- /dev/null
+++ b/usr/src/lib/fm/libldom/sparc/mapfile-vers
@@ -0,0 +1,40 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate {
+    global:
+	ldom_fini;
+	ldom_fmri_blacklist;
+	ldom_fmri_retire;
+	ldom_fmri_status;
+	ldom_get_core_md;
+	ldom_init;
+	ldom_major_version;
+	ldom_on_service;
+    local:
+	*;
+};
diff --git a/usr/src/lib/fm/libldom/sparcv9/Makefile b/usr/src/lib/fm/libldom/sparcv9/Makefile
index aeef7ffa5b..4502ccb407 100644
--- a/usr/src/lib/fm/libldom/sparcv9/Makefile
+++ b/usr/src/lib/fm/libldom/sparcv9/Makefile
@@ -22,9 +22,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/sparcv9
 MACH_LDLIBS = -L$(ROOT)/usr/lib/fm/$(MACH64)
 
 include ../Makefile.com
diff --git a/usr/src/lib/fm/libmdesc/Makefile b/usr/src/lib/fm/libmdesc/Makefile
index 81dde4a4f6..8d529ad6b7 100644
--- a/usr/src/lib/fm/libmdesc/Makefile
+++ b/usr/src/lib/fm/libmdesc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include ../../Makefile.lib
 include ../Makefile.lib
@@ -42,17 +42,15 @@ lint := TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber: spec .WAIT $(SUBDIRS)
-
-install: install_h spec .WAIT $(SUBDIRS)
+all clean clobber lint: $(SUBDIRS)
 
-lint: $(SUBDIRS)
+install: install_h .WAIT $(SUBDIRS)
 
 install_h: $(ROOTFMHDRS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/fm/libmdesc/Makefile.com b/usr/src/lib/fm/libmdesc/Makefile.com
index 14ceedb9bf..4da5c59d6a 100644
--- a/usr/src/lib/fm/libmdesc/Makefile.com
+++ b/usr/src/lib/fm/libmdesc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY = libmdesc.a
 VERS = .1
@@ -47,8 +47,7 @@ SRCS = $(LIBSRCS:%.c=$(SRC)/common/mdesc/%.c)
 
 LIBS = $(DYNLIB) $(LINTLIB)
 
-SRCDIR = ../common
-SPECMAPFILE = $(MAPDIR)/mapfile
+SRCDIR =	../common
 
 CPPFLAGS += -I../common -I.
 CFLAGS += $(CCVERBOSE) -K PIC
diff --git a/usr/src/lib/fm/libmdesc/common/mapfile-vers b/usr/src/lib/fm/libmdesc/common/mapfile-vers
new file mode 100644
index 0000000000..999a531591
--- /dev/null
+++ b/usr/src/lib/fm/libmdesc/common/mapfile-vers
@@ -0,0 +1,40 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate {
+    global:
+	md_find_name;
+	md_find_node_prop;
+	md_fini;
+	md_get_prop_str;
+	md_get_prop_val;
+	md_init_intern;
+	md_node_count;
+	md_scan_dag;
+    local:
+	*;
+};
diff --git a/usr/src/lib/fm/libmdesc/sparc/Makefile b/usr/src/lib/fm/libmdesc/sparc/Makefile
index dca1669f5d..a333224278 100644
--- a/usr/src/lib/fm/libmdesc/sparc/Makefile
+++ b/usr/src/lib/fm/libmdesc/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/sparc
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/fm/libmdesc/sparcv9/Makefile b/usr/src/lib/fm/libmdesc/sparcv9/Makefile
index 6614c15f09..d7bfc90e79 100644
--- a/usr/src/lib/fm/libmdesc/sparcv9/Makefile
+++ b/usr/src/lib/fm/libmdesc/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/sparcv9
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/fm/topo/libtopo/Makefile b/usr/src/lib/fm/topo/libtopo/Makefile
index 506f95de93..02d911d5cb 100644
--- a/usr/src/lib/fm/topo/libtopo/Makefile
+++ b/usr/src/lib/fm/topo/libtopo/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -23,7 +22,8 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include ../../../Makefile.lib
 include ../../Makefile.lib
@@ -31,10 +31,7 @@ include ../../Makefile.lib
 FMHDRS = libtopo.h topo_mod.h
 HDRDIR = common
 
-MACH_SUBDIRS = $(MACH)
-
 SUBDIRS = $(MACH)
-
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all := TARGET = all
@@ -45,17 +42,15 @@ lint := TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber: spec .WAIT $(SUBDIRS)
-
-install: install_h spec .WAIT $(SUBDIRS)
+all clean clobber lint: $(SUBDIRS)
 
-lint: $(SUBDIRS)
+install: install_h .WAIT $(SUBDIRS)
 
 install_h: $(ROOTFMHDRS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/fm/topo/libtopo/Makefile.com b/usr/src/lib/fm/topo/libtopo/Makefile.com
index 02233ec267..5b43c663de 100644
--- a/usr/src/lib/fm/topo/libtopo/Makefile.com
+++ b/usr/src/lib/fm/topo/libtopo/Makefile.com
@@ -18,12 +18,12 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY = libtopo.a
 VERS = .1
@@ -66,8 +66,7 @@ include ../../../Makefile.lib
 SRCS = $(BUILTINSRCS:%.c=../common/%.c) $(LIBSRCS:%.c=../common/%.c)
 LIBS = $(DYNLIB) $(LINTLIB)
 
-SRCDIR = ../common
-SPECMAPFILE = $(MAPDIR)/mapfile
+SRCDIR =	../common
 
 CLEANFILES += ../common/topo_error.c
 
diff --git a/usr/src/lib/fm/topo/libtopo/amd64/Makefile b/usr/src/lib/fm/topo/libtopo/amd64/Makefile
index 15debba846..f81fcaa5f0 100644
--- a/usr/src/lib/fm/topo/libtopo/amd64/Makefile
+++ b/usr/src/lib/fm/topo/libtopo/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -23,9 +22,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/amd64
 include ../Makefile.com
 include ../../../../Makefile.lib.64
 
diff --git a/usr/src/lib/fm/topo/libtopo/common/mapfile-vers b/usr/src/lib/fm/topo/libtopo/common/mapfile-vers
new file mode 100644
index 0000000000..84378f8c76
--- /dev/null
+++ b/usr/src/lib/fm/topo/libtopo/common/mapfile-vers
@@ -0,0 +1,117 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate {
+    global:
+	topo_close;
+	topo_debug_set;
+	topo_fmri_asru;
+	topo_fmri_compare;
+	topo_fmri_contains;
+	topo_fmri_create;
+	topo_fmri_expand;
+	topo_fmri_fru;
+	topo_fmri_invoke;
+	topo_fmri_nvl2str;
+	topo_fmri_present;
+	topo_fmri_str2nvl;
+	topo_fmri_unusable;
+	topo_hdl_alloc;
+	topo_hdl_errmsg;
+	topo_hdl_errno;
+	topo_hdl_free;
+	topo_hdl_nvalloc;
+	topo_hdl_nvdup;
+	topo_hdl_strdup;
+	topo_hdl_strfree;
+	topo_hdl_zalloc;
+	topo_method_invoke;
+	topo_method_register;
+	topo_method_unregister;
+	topo_method_unregister_all;
+	topo_mod_alloc;
+	topo_mod_clrdebug;
+	topo_mod_dprintf;
+	topo_mod_enumerate;
+	topo_mod_errmsg;
+	topo_mod_errno;
+	topo_mod_free;
+	topo_mod_handle;
+	topo_mod_load;
+	topo_mod_nvalloc;
+	topo_mod_nvdup;
+	topo_mod_private;
+	topo_mod_register;
+	topo_mod_rootdir;
+	topo_mod_setdebug;
+	topo_mod_seterrno;
+	topo_mod_strdup;
+	topo_mod_strfree;
+	topo_mod_unload;
+	topo_mod_unregister;
+	topo_mod_zalloc;
+	topo_node_asru;
+	topo_node_asru_set;
+	topo_node_bind;
+	topo_node_fru;
+	topo_node_fru_set;
+	topo_node_instance;
+	topo_node_label;
+	topo_node_label_set;
+	topo_node_name;
+	topo_node_private;
+	topo_node_range_create;
+	topo_node_range_destroy;
+	topo_node_resource;
+	topo_node_unbind;
+	topo_open;
+	topo_pgroup_create;
+	topo_pgroup_destroy;
+	topo_prop_get_all;
+	topo_prop_get_fmri;
+	topo_prop_get_int32;
+	topo_prop_get_int64;
+	topo_prop_get_string;
+	topo_prop_get_uint32;
+	topo_prop_get_uint64;
+	topo_prop_inherit;
+	topo_prop_set_fmri;
+	topo_prop_set_int32;
+	topo_prop_set_int64;
+	topo_prop_set_string;
+	topo_prop_set_uint32;
+	topo_prop_set_uint64;
+	topo_prop_stability;
+	topo_snap_hold;
+	topo_snap_release;
+	topo_strerror;
+	topo_walk_fini;
+	topo_walk_init;
+	topo_walk_step;
+    local:
+	*;
+};
diff --git a/usr/src/lib/fm/topo/libtopo/i386/Makefile b/usr/src/lib/fm/topo/libtopo/i386/Makefile
index c4b1489ab7..a333224278 100644
--- a/usr/src/lib/fm/topo/libtopo/i386/Makefile
+++ b/usr/src/lib/fm/topo/libtopo/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -23,9 +22,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/i386
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/fm/topo/libtopo/sparc/Makefile b/usr/src/lib/fm/topo/libtopo/sparc/Makefile
index a925bc82f9..a333224278 100644
--- a/usr/src/lib/fm/topo/libtopo/sparc/Makefile
+++ b/usr/src/lib/fm/topo/libtopo/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -23,9 +22,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/sparc
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile b/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile
index 3e287aef61..f81fcaa5f0 100644
--- a/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile
+++ b/usr/src/lib/fm/topo/libtopo/sparcv9/Makefile
@@ -18,14 +18,13 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/sparcv9
 include ../Makefile.com
 include ../../../../Makefile.lib.64
 
diff --git a/usr/src/lib/fm/topo/modules/Makefile.plugin b/usr/src/lib/fm/topo/modules/Makefile.plugin
index e711bbd58d..82a3cff0d9 100644
--- a/usr/src/lib/fm/topo/modules/Makefile.plugin
+++ b/usr/src/lib/fm/topo/modules/Makefile.plugin
@@ -18,12 +18,12 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 .KEEP_STATE:
 .SUFFIXES:
@@ -59,6 +59,7 @@ LINTFLAGS += -mu
 LINTFILES = $(SRCS:%.c=%.ln)
 
 APIMAP = ../../../libtopo/common/topo_mod.map
+MAPFILES =		# use APIMAP instead
 
 CFLAGS += $(CTF_FLAGS) $(CCVERBOSE) $(XSTRCONST) $(CC_PICFLAGS)
 CFLAGS += -G $(XREGSFLAG)
diff --git a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
index 4c10189a4f..fbc32c2d59 100644
--- a/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/backend/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # This make file will build mech_dh.so.1. This shared object
 # contains all the functionality needed to support Diffie-Hellman GSS-API
 # mechanism. 
@@ -59,11 +60,9 @@ $(PICS) :=	CCFLAGS64 += $(XFFLAG)
 LIBS = $(DYNLIB)
 LIBNAME = $(LIBRARY:%.a=%)
 
-MAPFILE = ../mapfile-vers
-
-$(EXPORT_RELEASE_BUILD)MAPFILE = $(CLOSED)/lib/gss_mechs/mech_dh/backend/mapfile-vers-export
-
-DYNFLAGS += -M$(MAPFILE)
+MAPFILES =	../mapfile-vers
+$(EXPORT_RELEASE_BUILD)MAPFILES = \
+	$(CLOSED)/lib/gss_mechs/mech_dh/backend/mapfile-vers-export
 
 LDLIBS +=  -lgss -lnsl -lc 
 
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com
index 91c47d2f87..daa1aab50e 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/dh1024/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/gss_mechs/mech_dh/dh1024.so
+
 #
 # This make file will build dh1024.so.1. This shared object
 # contains the functionality needed to initialize the  Diffie-Hellman GSS-API
@@ -58,11 +57,9 @@ $(PICS) :=	CCFLAGS64 += $(XFFLAG)
 LIBS = $(DYNLIB)
 LIBNAME = $(LIBRARY:%.a=%)
 
-MAPFILE = ../mapfile-vers
-
-$(EXPORT_RELEASE_BUILD)MAPFILE = $(CLOSED)/lib/gss_mechs/mech_dh/dh1024/mapfile-vers-export
-
-DYNFLAGS += -M$(MAPFILE)
+MAPFILES =	../mapfile-vers
+$(EXPORT_RELEASE_BUILD)MAPFILES = \
+	$(CLOSED)/lib/gss_mechs/mech_dh/dh1024/mapfile-vers-export
 
 LDLIBS += -lnsl -lmp -lc
 
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com
index 1fa573f0df..f6086a0450 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/dh192/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/gss_mechs/mech_dh/dh192/dh192.so
+
 #
 # This make file will build dh192.so.1. This shared object
 # contains the functionality needed to initialize the  Diffie-Hellman GSS-API
@@ -58,11 +57,9 @@ $(PICS) :=	CCFLAGS64 += $(XFFLAG)
 LIBS = $(DYNLIB)
 LIBNAME = $(LIBRARY:%.a=%)
 
-MAPFILE = ../mapfile-vers
-
-$(EXPORT_RELEASE_BUILD)MAPFILE = $(CLOSED)/lib/gss_mechs/mech_dh/dh192/mapfile-vers-export
-
-DYNFLAGS += -M$(MAPFILE)
+MAPFILES =	../mapfile-vers
+$(EXPORT_RELEASE_BUILD)MAPFILES = \
+	$(CLOSED)/lib/gss_mechs/mech_dh/dh192/mapfile-vers-export
 
 LDLIBS += -lnsl -lmp -lc
 
diff --git a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com
index 0a614b0ea1..484c1257ce 100644
--- a/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dh/dh640/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/gss_mechs/mech_dh/dh640.so
+
 #
 # This make file will build dh640.so.1. This shared object
 # contains the functionality needed to initialize the  Diffie-Hellman GSS-API
@@ -58,11 +57,9 @@ $(PICS) :=	CCFLAGS64 += $(XFFLAG)
 LIBS = $(DYNLIB)
 LIBNAME = $(LIBRARY:%.a=%)
 
-MAPFILE = ../mapfile-vers
-
-$(EXPORT_RELEASE_BUILD)MAPFILE = $(CLOSED)/lib/gss_mechs/mech_dh/dh640/mapfile-vers-export
-
-DYNFLAGS += -M$(MAPFILE)
+MAPFILES =	../mapfile-vers
+$(EXPORT_RELEASE_BUILD)MAPFILES = \
+	$(CLOSED)/lib/gss_mechs/mech_dh/dh640/mapfile-vers-export
 
 LDLIBS += -lnsl -lmp -lc
 
diff --git a/usr/src/lib/gss_mechs/mech_dummy/Makefile.com b/usr/src/lib/gss_mechs/mech_dummy/Makefile.com
index 3dee3af5db..4335c5acf5 100644
--- a/usr/src/lib/gss_mechs/mech_dummy/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_dummy/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # The mech_dummy shared object contains all the functionality needed to
 # support the Dummy GSS-API mechanism.
 #
@@ -35,6 +36,9 @@ OBJECTS =	dmech.o
 
 include $(SRC)/lib/Makefile.lib
 
+# There should be a mapfile here
+MAPFILES =
+
 CPPFLAGS +=	-I../../libgss -I$(SRC)/uts/common/gssapi/include \
 	    	-I$(ROOT)/usr/include/gssapi
 
diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile b/usr/src/lib/gss_mechs/mech_krb5/Makefile
index 58657e1b8d..c004c604a6 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile
@@ -1,10 +1,30 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/gss_mechs/mech_krb5/Makefile
+
 #
 # This make file will build mech_krb5.so.1. This shared object
 # contains all the functionality needed to support the Kereros V5 GSS-API
@@ -13,7 +33,8 @@
 
 include ../../../Makefile.master
 
-SUBDIRS= spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # include library definitions
 include ../../Makefile.lib
@@ -40,9 +61,7 @@ lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all:    .WAIT $(SUBDIRS)
-
-lint:   .WAIT $(SUBDIRS)
+all clean lint:    $(SUBDIRS)
 
 install: install_dir all .WAIT $(SUBDIRS)
 
@@ -53,8 +72,6 @@ install_dir:	$(ROOTLIBDIR) $(BUILD64)
 
 install_h:
 
-clean:  $(SUBDIRS)
-
 clobber: $(SUBDIRS)
 	$(RM) $(POFILE) $(POFILES)
 
@@ -70,7 +87,7 @@ $(ROOTLIBDIR):
 # include library targets
 # include ../../Makefile.targ
 
-spec $(MACH) $(MACH64):      FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
index 0d39b26c16..97a7440871 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_krb5/Makefile.com
@@ -1,9 +1,31 @@
 #
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # This make file will build mech_krb5.so.1. This shared object
 # contains all the functionality needed to support the Kereros V5 GSS-API
 # mechanism. No other Kerberos libraries are needed.
@@ -12,7 +34,6 @@
 
 LIBRARY= mech_krb5.a
 VERS = .1
-MAPFILE= $(MAPDIR)/mapfile
 
 GROUP=	sys
 FILEMODE=	755
@@ -226,15 +247,17 @@ CPPFLAGS += -I$(REL_PATH)/libgss -I../include  \
 
 CPPFLAGS += $(KRB5_DEFS)
 
+MAPFILE_EXPORT = ../mapfile-vers-clean
+$(EXPORT_RELEASE_BUILD)MAPFILE_EXPORT = \
+		$(CLOSED)/lib/gss_mechs/mech_krb5/mapfile-vers-export
+MAPFILES =	../mapfile-vers $(MAPFILE_EXPORT)
+
 $(EXPORT_RELEASE_BUILD)include $(CLOSED)/lib/gss_mechs/mech_krb5/Makefile.export
 
 #CPPFLAGS += 	-D_REENTRANT
 $(PICS) := 	CFLAGS += $(XFFLAG)
 $(PICS) := 	CCFLAGS += $(XFFLAG)
 
-CLOBBERFILES += $(MAPFILE)
-DYNFLAGS += -M$(MAPFILE)
-
 LIBS = $(DYNLIB) $(K5LIBLINK)
 
 # override ROOTLIBDIR and ROOTLINKS
@@ -442,11 +465,6 @@ objs/%.o pics/%.o: $(REL_PATH)/support/%.c
 	$(COMPILE.c)  -o $@ $<
 	$(POST_PROCESS_O)
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include $(REL_PATH)/../../Makefile.targ
 # We need to include all CPPFLAGS for the files since we are using
diff --git a/usr/src/lib/gss_mechs/mech_krb5/amd64/Makefile b/usr/src/lib/gss_mechs/mech_krb5/amd64/Makefile
index 678eac769c..e21d09eacc 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/amd64/Makefile
+++ b/usr/src/lib/gss_mechs/mech_krb5/amd64/Makefile
@@ -1,11 +1,30 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/amd64
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/gss_mechs/mech_krb5/i386/Makefile b/usr/src/lib/gss_mechs/mech_krb5/i386/Makefile
index e0af9c4797..43d5c6cf02 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/i386/Makefile
+++ b/usr/src/lib/gss_mechs/mech_krb5/i386/Makefile
@@ -1,12 +1,30 @@
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/gss_mechs/mech_krb5/i386/Makefile
 
-MAPDIR= ../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers b/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers
new file mode 100644
index 0000000000..a61439d044
--- /dev/null
+++ b/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers
@@ -0,0 +1,791 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+};
+
+SUNWprivate_1.1 {
+    global:
+	adb_error_table;
+	asn12krb5_buf;
+	asn1buf_create;
+	asn1buf_destroy;
+	asn1buf_ensure_space;
+	asn1buf_expand;
+	asn1buf_free;
+	asn1buf_hex_unparse;
+	asn1buf_imbed;
+	asn1buf_insert_charstring;
+	asn1buf_insert_octet;
+	asn1buf_insert_octetstring;
+	asn1buf_len;
+	asn1buf_remains;
+	asn1buf_remove_charstring;
+	asn1buf_remove_octet;
+	asn1buf_remove_octetstring;
+	asn1buf_size;
+	asn1buf_skiptail;
+	asn1buf_sync;
+	asn1buf_unparse;
+	asn1buf_wrap_data;
+	asn1_decode_addrtype;
+	asn1_decode_ap_options;
+	asn1_decode_authdata_elt;
+	asn1_decode_authdatatype;
+	asn1_decode_authorization_data;
+	asn1_decode_charstring;
+	asn1_decode_checksum;
+	asn1_decode_cksumtype;
+	asn1_decode_enc_kdc_rep_part;
+	asn1_decode_encrypted_data;
+	asn1_decode_encryption_key;
+	asn1_decode_enc_sam_key;
+	asn1_decode_enc_sam_response_enc;
+	asn1_decode_enctype;
+	asn1_decode_etype_info;
+	asn1_decode_generalstring;
+	asn1_decode_generaltime;
+	asn1_decode_host_address;
+	asn1_decode_host_addresses;
+	asn1_decode_ia5string;
+	asn1_decode_int;
+	asn1_decode_int32;
+	asn1_decode_integer;
+	asn1_decode_kdc_options;
+	asn1_decode_kdc_rep;
+	asn1_decode_kdc_req;
+	asn1_decode_kdc_req_body;
+	asn1_decode_kerberos_time;
+	asn1_decode_krb5_flags;
+	asn1_decode_krb_cred_info;
+	asn1_decode_krb_safe_body;
+	asn1_decode_kvno;
+	asn1_decode_last_req;
+	asn1_decode_last_req_entry;
+	asn1_decode_msgtype;
+	asn1_decode_null;
+	asn1_decode_octet;
+	asn1_decode_octetstring;
+	asn1_decode_pa_data;
+	asn1_decode_passwdsequence;
+	asn1_decode_predicted_sam_response;
+	asn1_decode_principal_name;
+	asn1_decode_printablestring;
+	asn1_decode_realm;
+	asn1_decode_sam_challenge;
+	asn1_decode_sam_flags;
+	asn1_decode_sam_response;
+	asn1_decode_sequence_of_enctype;
+	asn1_decode_sequence_of_krb_cred_info;
+	asn1_decode_sequence_of_pa_data;
+	asn1_decode_sequence_of_passwdsequence;
+	asn1_decode_sequence_of_ticket;
+	asn1_decode_ticket;
+	asn1_decode_ticket_flags;
+	asn1_decode_transited_encoding;
+	asn1_decode_ui_2;
+	asn1_decode_ui_4;
+	asn1_decode_unsigned_integer;
+	asn1_encode_ap_options;
+	asn1_encode_authorization_data;
+	asn1_encode_charstring;
+	asn1_encode_checksum;
+	asn1_encode_enc_kdc_rep_part;
+	asn1_encode_encrypted_data;
+	asn1_encode_encryption_key;
+	asn1_encode_enc_sam_response_enc;
+	asn1_encode_etype_info;
+	asn1_encode_etype_info_entry;
+	asn1_encode_generalstring;
+	asn1_encode_generaltime;
+	asn1_encode_host_address;
+	asn1_encode_host_addresses;
+	asn1_encode_ia5string;
+	asn1_encode_integer;
+	asn1_encode_kdc_options;
+	asn1_encode_kdc_rep;
+	asn1_encode_kdc_req;
+	asn1_encode_kdc_req_body;
+	asn1_encode_kerberos_time;
+	asn1_encode_krb5_authdata_elt;
+	asn1_encode_krb5_flags;
+	asn1_encode_krb_cred_info;
+	asn1_encode_krb_safe_body;
+	asn1_encode_last_req;
+	asn1_encode_last_req_entry;
+	asn1_encode_null;
+	asn1_encode_octetstring;
+	asn1_encode_pa_data;
+	asn1_encode_passwdsequence;
+	asn1_encode_predicted_sam_response;
+	asn1_encode_principal_name;
+	asn1_encode_printablestring;
+	asn1_encode_realm;
+	asn1_encode_sam_challenge;
+	asn1_encode_sam_flags;
+	asn1_encode_sam_key;
+	asn1_encode_sam_response;
+	asn1_encode_sequence_of_enctype;
+	asn1_encode_sequence_of_krb_cred_info;
+	asn1_encode_sequence_of_pa_data;
+	asn1_encode_sequence_of_passwdsequence;
+	asn1_encode_sequence_of_ticket;
+	asn1_encode_ticket;
+	asn1_encode_ticket_flags;
+	asn1_encode_transited_encoding;
+	asn1_encode_ui_4;
+	asn1_encode_unsigned_integer;
+	asn1_error_table;
+	asn1_get_sequence;
+	asn1_get_tag_2;
+	asn1_krb5_realm_copy;
+	asn1_make_etag;
+	asn1_make_id;
+	asn1_make_length;
+	asn1_make_sequence;
+	asn1_make_set;
+	asn1_make_string;
+	asn1_make_tag;
+	com_err;
+	com_err_va;
+	daemon;
+	decode_krb5_alt_method;
+	decode_krb5_ap_rep;
+	decode_krb5_ap_rep_enc_part;
+	decode_krb5_ap_req;
+	decode_krb5_as_rep;
+	decode_krb5_as_req;
+	decode_krb5_authdata;
+	decode_krb5_authenticator;
+	decode_krb5_cred;
+	decode_krb5_enc_cred_part;
+	decode_krb5_enc_data;
+	decode_krb5_enc_kdc_rep_part;
+	decode_krb5_enc_priv_part;
+	decode_krb5_encryption_key;
+	decode_krb5_enc_sam_key;
+	decode_krb5_enc_sam_response_enc;
+	decode_krb5_enc_tkt_part;
+	decode_krb5_error;
+	decode_krb5_etype_info;
+	decode_krb5_kdc_req_body;
+	decode_krb5_padata_sequence;
+	decode_krb5_pa_enc_ts;
+	decode_krb5_predicted_sam_response;
+	decode_krb5_priv;
+	decode_krb5_pwd_data;
+	decode_krb5_pwd_sequence;
+	decode_krb5_safe;
+	decode_krb5_sam_challenge;
+	decode_krb5_sam_response;
+	decode_krb5_tgs_rep;
+	decode_krb5_tgs_req;
+	decode_krb5_ticket;
+	display_unknown;
+	encode_krb5_alt_method;
+	encode_krb5_ap_rep;
+	encode_krb5_ap_rep_enc_part;
+	encode_krb5_ap_req;
+	encode_krb5_as_rep;
+	encode_krb5_as_req;
+	encode_krb5_authdata;
+	encode_krb5_authenticator;
+	encode_krb5_cred;
+	encode_krb5_enc_cred_part;
+	encode_krb5_enc_data;
+	encode_krb5_enc_kdc_rep_part;
+	encode_krb5_enc_priv_part;
+	encode_krb5_encryption_key;
+	encode_krb5_enc_sam_response_enc;
+	encode_krb5_enc_tkt_part;
+	encode_krb5_error;
+	encode_krb5_etype_info;
+	encode_krb5_etype_info2;
+	encode_krb5_kdc_req_body;
+	encode_krb5_padata_sequence;
+	encode_krb5_pa_enc_ts;
+	encode_krb5_predicted_sam_response;
+	encode_krb5_priv;
+	encode_krb5_pwd_data;
+	encode_krb5_pwd_sequence;
+	encode_krb5_safe;
+	encode_krb5_sam_challenge;
+	encode_krb5_sam_key;
+	encode_krb5_sam_response;
+	encode_krb5_tgs_rep;
+	encode_krb5_tgs_req;
+	encode_krb5_ticket;
+	error_message;
+	foreach_localaddr;
+	g_delete_cred_id;
+	g_delete_ctx_id;
+	g_delete_name;
+	g_display_com_err_status;
+	g_display_major_status;
+	ggss_error_table;
+	g_local_host_name;
+	g_make_string_buffer;
+	g_make_token_header;
+	gmt_mktime;
+	g_order_check;
+	g_order_free;
+	g_order_init;
+	g_queue_externalize;
+	g_queue_internalize;
+	g_queue_size;
+	g_save_cred_id;
+	g_save_ctx_id;
+	g_save_name;
+	g_set_destroy;
+	g_set_entry_add;
+	g_set_entry_delete;
+	g_set_entry_get;
+	g_set_init;
+	gss_krb5_ccache_name;
+	gss_krb5_copy_ccache;
+	gss_krb5_get_tkt_flags;
+	gss_mech_krb5;
+	gss_mech_krb5_old;
+	gss_mech_krb5_v2;
+	gss_mech_set_krb5;
+	gss_mech_set_krb5_both;
+	gss_mech_set_krb5_old;
+	gss_mech_set_krb5_v1v2;
+	gss_mech_set_krb5_v2;
+	gss_nt_krb5_name;
+	gss_nt_krb5_principal;
+	gssspi_acquire_cred_with_password;
+	g_strdup;
+	g_token_size;
+	g_validate_cred_id;
+	g_validate_ctx_id;
+	g_validate_name;
+	g_verify_token_header;
+	imp_error_table;
+	k5_ef_hash;
+	k5_ef_mac;
+	k5g_error_table;
+	kadm_error_table;
+	kdb5_error_table;
+	kdc5_error_table;
+	kg2_parse_token;
+	kg_checksum_channel_bindings;
+	kg_confounder_size;
+	kg_context;
+	kg_ctx_externalize;
+	kg_ctx_internalize;
+	kg_ctx_size;
+	kg_decrypt;
+	kg_encrypt;
+	kg_encrypt_size;
+	kg_get_context;
+	kg_get_defcred;
+	kg_get_seq_num;
+	kg_make_confounder;
+	kg_make_seed;
+	kg_make_seq_num;
+	kg_oid_size;
+	kg_queue_size;
+	kg_release_defcred;
+	kg_seal;
+	kg_unseal;
+	kg_vdb;
+	kpws_error_table;
+	krb5_425_conv_principal;
+	krb5_524_conv_principal;
+	krb5_address_compare;
+	krb5_address_order;
+	krb5_address_search;
+	krb5_aname_to_localname;
+	krb5_appdefault_boolean;
+	krb5_appdefault_string;
+	krb5_auth_con_free;
+	krb5_auth_con_genaddrs;
+	krb5_auth_con_getaddrs;
+	krb5_auth_con_getauthenticator;
+	krb5_auth_con_get_checksum_func;
+	krb5_auth_con_getflags;
+	krb5_auth_con_getivector;
+	krb5_auth_con_getkey;
+	krb5_auth_con_getlocalseqnumber;
+	krb5_auth_con_getlocalsubkey;
+	krb5_auth_con_getpermetypes;
+	krb5_auth_con_getrcache;
+	krb5_auth_con_getrecvsubkey;
+	krb5_auth_con_getremoteseqnumber;
+	krb5_auth_con_getremotesubkey;
+	krb5_auth_con_getsendsubkey;
+	krb5_auth_con_init;
+	krb5_auth_con_initivector;
+	krb5_auth_con_setaddrs;
+	krb5_auth_con_set_checksum_func;
+	krb5_auth_con_setflags;
+	krb5_auth_con_setivector;
+	krb5_auth_con_setpermetypes;
+	krb5_auth_con_setports;
+	krb5_auth_con_setrcache;
+	krb5_auth_con_setrecvsubkey;
+	krb5_auth_con_set_req_cksumtype;
+	krb5_auth_con_set_safe_cksumtype;
+	krb5_auth_con_setsendsubkey;
+	krb5_auth_con_setuseruserkey;
+	krb5_auth_to_rep;
+	krb5_build_principal;
+	krb5_build_principal_ext;
+	krb5_build_principal_va;
+	krb5_c_block_size;
+	krb5_cc_close;
+	krb5_cc_copy_creds;
+	krb5_cc_default;
+	krb5_cc_default_name;
+	krb5_cc_destroy;
+	krb5_cc_dfl_ops;
+	krb5_cc_end_seq_get;
+	krb5_cc_file_ops;
+	krb5_cc_get_name;
+	krb5_cc_get_principal;
+	krb5_cc_get_type;
+	krb5_c_checksum_length;
+	krb5_cc_initialize;
+	krb5_cc_next_cred;
+	krb5_cc_register;
+	krb5_cc_resolve;
+	krb5_cc_retrieve_cred;
+	krb5_cc_set_default_name;
+	krb5_cc_set_flags;
+	krb5_cc_start_seq_get;
+	krb5_cc_store_cred;
+	krb5_c_decrypt;
+	krb5_c_encrypt;
+	krb5_c_encrypt_length;
+	krb5_c_enctype_compare;
+	krb5_c_free_state;
+	krb5_change_cache;
+	krb5_change_password;
+	krb5_checksum_size;
+	krb5_check_transited_list;
+	krb5_c_init_state;
+	krb5_c_is_coll_proof_cksum;
+	krb5_c_is_keyed_cksum;
+	krb5_c_keyed_checksum_types;
+	krb5_cksumtypes_length;
+	krb5_cksumtypes_list;
+	krb5_cksumtype_to_string;
+	krb5_c_make_checksum;
+	krb5_c_make_random_key;
+	krb5_copy_addr;
+	krb5_copy_addresses;
+	krb5_copy_authdata;
+	krb5_copy_authenticator;
+	krb5_copy_checksum;
+	krb5_copy_creds;
+	krb5_copy_data;
+	krb5_copy_keyblock;
+	krb5_copy_keyblock_contents;
+	krb5_copy_keyblock_data;
+	krb5_copy_principal;
+	krb5_copy_ticket;
+	krb5_c_random_make_octets;
+	krb5_c_random_seed;
+	krb5_create_secure_file;
+	krb5_crypto_us_timeofday;
+	krb5_c_string_to_key;
+	krb5_c_string_to_key_with_params;
+	krb5_c_valid_cksumtype;
+	krb5_c_valid_enctype;
+	krb5_c_verify_checksum;
+	krb5_decode_kdc_rep;
+	krb5_decode_ticket;
+	krb5_decrypt_tkt_part;
+	krb5_default_pwd_prompt1;
+	krb5_default_pwd_prompt2;
+	krb5_defkeyname;
+	krb5_do_preauth;
+	krb5_encode_kdc_rep;
+	krb5_encrypt_helper;
+	krb5_encrypt_tkt_part;
+	krb5_enctypes_length;
+	krb5_enctypes_list;
+	krb5_enctype_to_string;
+	krb5_error_table;
+	krb5_externalize_data;
+	krb5_externalize_opaque;
+	krb5_fcc_ops;
+	krb5_find_serializer;
+	krb5_free_address;
+	krb5_free_addresses;
+	krb5_free_ap_rep;
+	krb5_free_ap_rep_enc_part;
+	krb5_free_ap_req;
+	krb5_free_authdata;
+	krb5_free_authenticator;
+	krb5_free_authenticator_contents;
+	krb5_free_checksum;
+	krb5_free_checksum_contents;
+	krb5_free_cksumtypes;
+	krb5_free_config_files;
+	krb5_free_context;
+	krb5_free_cred;
+	krb5_free_cred_contents;
+	krb5_free_cred_enc_part;
+	krb5_free_creds;
+	krb5_free_data;
+	krb5_free_data_contents;
+	krb5_free_default_realm;
+	krb5_free_ef_handle;
+	krb5_free_enc_kdc_rep_part;
+	krb5_free_enc_sam_response_enc;
+	krb5_free_enc_sam_response_enc_contents;
+	krb5_free_enc_tkt_part;
+	krb5_free_error;
+	krb5_free_etype_info;
+	krb5_free_host_realm;
+	krb5_free_kdc_rep;
+	krb5_free_kdc_req;
+	krb5_free_keyblock;
+	krb5_free_keyblock_contents;
+	krb5_free_krbhst;
+	krb5_free_ktypes;
+	krb5_free_last_req;
+	krb5_free_pa_data;
+	krb5_free_pa_enc_ts;
+	krb5_free_predicted_sam_response;
+	krb5_free_predicted_sam_response_contents;
+	krb5_free_principal;
+	krb5_free_priv;
+	krb5_free_priv_enc_part;
+	krb5_free_pwd_data;
+	krb5_free_pwd_sequences;
+	krb5_free_realm_string;
+	krb5_free_realm_tree;
+	krb5_free_safe;
+	krb5_free_sam_challenge;
+	krb5_free_sam_challenge_contents;
+	krb5_free_sam_response;
+	krb5_free_sam_response_contents;
+	krb5_free_tgt_creds;
+	krb5_free_ticket;
+	krb5_free_tickets;
+	krb5_free_tkt_authent;
+	krb5_free_uio;
+	krb5_free_unparsed_name;
+	krb5_fwd_tgt_creds;
+	krb5_generate_seq_number;
+	krb5_generate_subkey;
+	krb5_gen_portaddr;
+	krb5_gen_replay_name;
+	krb5_get_credentials;
+	krb5_get_credentials_renew;
+	krb5_get_credentials_validate;
+	krb5_get_cred_from_kdc;
+	krb5_get_cred_from_kdc_renew;
+	krb5_get_cred_from_kdc_validate;
+	krb5_get_cred_via_tkt;
+	krb5_get_default_config_files;
+	krb5_get_default_in_tkt_ktypes;
+	krb5_get_default_realm;
+	krb5_getenv;
+	krb5_get_host_realm;
+	krb5_get_init_creds;
+	krb5_get_init_creds_keytab;
+	krb5_get_init_creds_opt_init;
+	krb5_get_init_creds_opt_set_address_list;
+	krb5_get_init_creds_opt_set_etype_list;
+	krb5_get_init_creds_opt_set_forwardable;
+	krb5_get_init_creds_opt_set_preauth_list;
+	krb5_get_init_creds_opt_set_proxiable;
+	krb5_get_init_creds_opt_set_renew_life;
+	krb5_get_init_creds_opt_set_salt;
+	krb5_get_init_creds_opt_set_tkt_life;
+	krb5_get_init_creds_password;
+	krb5_get_key_data;
+	krb5_get_key_enctype;
+	krb5_get_key_length;
+	krb5_get_krbhst;
+	krb5_get_notification_message;
+	krb5_get_permitted_enctypes;
+	krb5_get_profile;
+	krb5_get_prompt_types;
+	krb5_get_realm_domain;
+	krb5_get_renewed_creds;
+	krb5_get_servername;
+	krb5_get_server_rcache;
+	krb5_get_tgs_ktypes;
+	krb5_get_time_offsets;
+	krb5_get_validated_creds;
+	krb5_gss_import_name;
+	krb5_gss_init_sec_context;
+	krb5_gss_oid_array;
+	krb5_gss_userok;
+	krb5_hmac;
+	krb5_init_allocated_keyblock;
+	krb5_init_context;
+	krb5_init_ef_handle;
+	krb5_init_keyblock;
+	krb5_init_secure_context;
+	krb5int_aes_encrypt;
+	krb5int_cm_call_select;
+	krb5_internalize_opaque;
+	krb5int_pbkdf2_hmac_sha1;
+	krb5int_sendtokdc_debug_handler;
+	krb5_is_permitted_enctype;
+	krb5_kdc_rep_decrypt_proc;
+	krb5_kt_add_entry;
+	krb5_kt_close;
+	krb5_kt_default;
+	krb5_kt_default_name;
+	krb5_kt_dfl_ops;
+	krb5_kt_end_seq_get;
+	krb5_ktfile_add;
+	krb5_ktfile_close;
+	krb5_ktfile_end_get;
+	krb5_ktfile_get_entry;
+	krb5_ktfile_get_name;
+	krb5_ktfile_get_next;
+	krb5_ktfileint_close;
+	krb5_ktfileint_delete_entry;
+	krb5_ktfileint_find_slot;
+	krb5_ktfileint_internal_read_entry;
+	krb5_ktfileint_openr;
+	krb5_ktfileint_openw;
+	krb5_ktfileint_read_entry;
+	krb5_ktfileint_size_entry;
+	krb5_ktfileint_write_entry;
+	krb5_ktfile_remove;
+	krb5_ktfile_resolve;
+	krb5_ktfile_ser_entry;
+	krb5_ktfile_start_seq_get;
+	krb5_ktfile_wresolve;
+	krb5_ktf_ops;
+	krb5_kt_free_entry;
+	krb5_ktf_writable_ops;
+	krb5_kt_get_entry;
+	krb5_kt_get_name;
+	krb5_kt_next_entry;
+	krb5_kt_read_service_key;
+	krb5_kt_register;
+	krb5_kt_remove_entry;
+	krb5_kt_resolve;
+	krb5_kt_start_seq_get;
+	krb5_kuserok;
+	krb5_libdefault_boolean;
+	krb5_locate_kdc;
+	krb5_lock_file;
+	krb5_make_fulladdr;
+	krb5_make_full_ipaddr;
+	krb5_max_dgram_size;
+	krb5_max_skdc_timeout;
+	krb5_mk_1cred;
+	krb5_mk_error;
+	krb5_mk_ncred;
+	krb5_mk_priv;
+	krb5_mk_rep;
+	krb5_mk_req;
+	krb5_mk_req_extended;
+	krb5_mk_safe;
+	krb5_mutex;
+	krb5_net_read;
+	krb5_net_write;
+	krb5_nfold;
+	krb5_old_decrypt;
+	krb5_old_encrypt;
+	krb5_old_encrypt_length;
+	krb5_os_free_context;
+	krb5_os_get_tty_uio;
+	krb5_os_hostaddr;
+	krb5_os_init_context;
+	krb5_os_localaddr;
+	krb5_overridekeyname;
+	krb5_parse_name;
+	krb5_pname_to_uid;
+	krb5_principal2salt;
+	krb5_principal2salt_norealm;
+	krb5_principal_compare;
+	krb5_privacy_allowed;
+	krb5_prompter_posix;
+	krb5_raw_decrypt;
+	krb5_raw_encrypt;
+	krb5_raw_encrypt_length;
+	krb5_rc_close;
+	krb5_rc_default;
+	krb5_rc_default_name;
+	krb5_rc_file_close;
+	krb5_rc_file_close_no_free;
+	krb5_rc_file_destroy;
+	krb5_rc_file_expunge;
+	krb5_rc_file_get_name;
+	krb5_rc_file_get_span;
+	krb5_rc_file_init;
+	krb5_rc_file_ops;
+	krb5_rc_file_recover;
+	krb5_rc_file_resolve;
+	krb5_rc_file_store;
+	krb5_rc_free_entry;
+	krb5_rc_get_type;
+	krb5_rc_io_close;
+	krb5_rc_io_creat;
+	krb5_rc_io_destroy;
+	krb5_rc_io_mark;
+	krb5_rc_io_move;
+	krb5_rc_io_open;
+	krb5_rc_io_read;
+	krb5_rc_io_size;
+	krb5_rc_io_sync;
+	krb5_rc_io_unmark;
+	krb5_rc_io_write;
+	krb5_rc_mem_close;
+	krb5_rc_mem_destroy;
+	krb5_rc_mem_get_name;
+	krb5_rc_mem_get_span;
+	krb5_rc_mem_init;
+	krb5_rc_mem_ops;
+	krb5_rc_mem_recover;
+	krb5_rc_mem_resolve;
+	krb5_rc_mem_store;
+	krb5_rc_register_type;
+	krb5_rc_resolve;
+	krb5_rc_resolve_full;
+	krb5_rd_cred;
+	krb5_rd_error;
+	krb5_rd_priv;
+	krb5_rd_rep;
+	krb5_rd_req;
+	krb5_rd_req_decoded;
+	krb5_rd_req_decoded_anyflag;
+	krb5_rd_safe;
+	krb5_read_message;
+	krb5_read_password;
+	krb5_realm_compare;
+	krb5_realm_iterator;
+	krb5_realm_iterator_create;
+	krb5_realm_iterator_free;
+	krb5_recvauth;
+	krb5_recvauth_version;
+	krb5_register_serializer;
+	krb5_salttype_to_string;
+	krb5_secure_config_files;
+	krb5_sendauth;
+	krb5_send_tgs;
+	krb5_sendto_kdc;
+	krb5_ser_address_init;
+	krb5_ser_auth_context_init;
+	krb5_ser_authdata_init;
+	krb5_ser_authenticator_init;
+	krb5_ser_ccache_init;
+	krb5_ser_checksum_init;
+	krb5_ser_context_init;
+	krb5_ser_keyblock_init;
+	krb5_ser_keytab_init;
+	krb5_ser_pack_bytes;
+	krb5_ser_pack_int32;
+	krb5_ser_principal_init;
+	krb5_ser_rcache_init;
+	krb5_ser_unpack_bytes;
+	krb5_ser_unpack_int32;
+	krb5_set_config_files;
+	krb5_set_debugging_time;
+	krb5_set_default_in_tkt_ktypes;
+	krb5_set_default_realm;
+	krb5_set_default_tgs_ktypes;
+	krb5_setenv;
+	krb5_set_key_data;
+	krb5_set_key_enctype;
+	krb5_set_key_length;
+	krb5_set_password;
+	krb5_set_principal_realm;
+	krb5_set_real_time;
+	krb5_set_time_offsets;
+	krb5_size_opaque;
+	krb5_skdc_timeout_1;
+	krb5_skdc_timeout_shift;
+	krb5_sname_to_principal;
+	krb5_string_to_cksumtype;
+	krb5_string_to_deltat;
+	krb5_string_to_enctype;
+	krb5_string_to_key;
+	krb5_string_to_salttype;
+	krb5_string_to_timestamp;
+	krb5_sync_disk_file;
+	krb5_tgtname;
+	krb5_timeofday;
+	krb5_timestamp_to_sfstring;
+	krb5_timestamp_to_string;
+	krb5_unlock_file;
+	krb5_unpack_full_ipaddr;
+	krb5_unparse_name;
+	krb5_unparse_name_ext;
+	krb5_unsetenv;
+	krb5_use_enctype;
+	krb5_use_natural_time;
+	krb5_us_timeofday;
+	krb5_validate_times;
+	krb5_verify_init_creds;
+	krb5_verify_init_creds_opt_init;
+	krb5_verify_init_creds_opt_set_ap_req_nofail;
+	krb5_walk_realm_tree;
+	krb5_write_message;
+	kv5m_error_table;
+	mit_des_check_key_parity;
+	mit_des_fixup_key_parity;
+	mit_des_is_weak_key;
+	ovk_error_table;
+	ovku_error_table;
+	prof_error_table;
+	profile_add_node;
+	profile_close_file;
+	profile_create_node;
+	profile_find_node_relation;
+	profile_find_node_subsection;
+	profile_free_node;
+	profile_get_integer;
+	profile_get_node_parent;
+	profile_get_options_boolean;
+	profile_get_options_string;
+	profile_get_string;
+	profile_get_values;
+	profile_init;
+	profile_init_path;
+	profile_open_file;
+	profile_parse_file;
+	profile_release;
+	profile_ser_externalize;
+	profile_ser_internalize;
+	profile_ser_size;
+	profile_verify_node;
+	pty_error_table;
+	reset_com_err_hook;
+	set_com_err_hook;
+	ss_error_table;
+    local:
+	*;
+};
diff --git a/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers-clean b/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers-clean
new file mode 100644
index 0000000000..6c27fdea9c
--- /dev/null
+++ b/usr/src/lib/gss_mechs/mech_krb5/mapfile-vers-clean
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	gss_mech_initialize;
+	mit_afs_string_to_key;
+	mit_des_string_to_key_int;
+};
diff --git a/usr/src/lib/gss_mechs/mech_krb5/sparc/Makefile b/usr/src/lib/gss_mechs/mech_krb5/sparc/Makefile
index 76ddfcd781..4a270806e9 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/sparc/Makefile
+++ b/usr/src/lib/gss_mechs/mech_krb5/sparc/Makefile
@@ -1,12 +1,30 @@
 #
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/gss_mechs/mech_krb5/sparc/Makefile
 
-MAPDIR= ../spec/sparc
 include ../Makefile.com
 
 sparc_C_PICFLAGS = $(C_BIGPICFLAGS)
diff --git a/usr/src/lib/gss_mechs/mech_krb5/sparcv9/Makefile b/usr/src/lib/gss_mechs/mech_krb5/sparcv9/Makefile
index 6d11fcc758..cce46ce8d9 100644
--- a/usr/src/lib/gss_mechs/mech_krb5/sparcv9/Makefile
+++ b/usr/src/lib/gss_mechs/mech_krb5/sparcv9/Makefile
@@ -1,12 +1,30 @@
 #
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/gss_mechs/mech_dummy/sparcv9/Makefile
 
-MAPDIR= ../spec/sparcv9
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/gss_mechs/mech_spnego/Makefile b/usr/src/lib/gss_mechs/mech_spnego/Makefile
index 99eefffc59..c1ab5b64da 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/Makefile
+++ b/usr/src/lib/gss_mechs/mech_spnego/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/gss_mechs/mech_spnego/Makefile
+
 #
 # This make file will build mech_spnego.so.1. This shared object
 # contains all the functionality needed to support the 
@@ -48,11 +47,9 @@ lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install:  spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint:  $(SUBDIRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com
index 221d38532b..af877f808a 100644
--- a/usr/src/lib/gss_mechs/mech_spnego/Makefile.com
+++ b/usr/src/lib/gss_mechs/mech_spnego/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/gss_mechs/mech_spnego/Makefile
+
 #
 # This make file will build mech_spnego.so.1. This shared object
 # contains all the functionality needed to support the SPNEGO GSS-API
@@ -44,8 +43,11 @@ ROOTLIBDIR =	$(ROOT)/usr/lib/gss
 ROOTLIBDIR64 = 	$(ROOT)/usr/lib/$(MACH64)/gss
 SRCDIR =	../mech
 LDLIBS += 	-lgss -lc
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+
+MAPFILE_EXPORT = ../mapfile-vers-clean
+$(EXPORT_RELEASE_BUILD)MAPFILE_EXPORT = \
+		$(CLOSED)/lib/gss_mechs/mech_spnego/mapfile-vers-export
+MAPFILES =	../mapfile-vers $(MAPFILE_EXPORT)
 
 CPPFLAGS += -I$(SRC)/uts/common/gssapi/include -I$(ROOT)/usr/include/gssapi $(DEBUG)
 
diff --git a/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers b/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers
new file mode 100644
index 0000000000..b2446634ef
--- /dev/null
+++ b/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate {
+    global:
+	spnego_gss_accept_sec_context;
+	spnego_gss_acquire_cred;
+	spnego_gss_context_time;
+	spnego_gss_delete_sec_context;
+	spnego_gss_display_name;
+	spnego_gss_display_status;
+	spnego_gss_export_sec_context;
+	spnego_gss_import_name;
+	spnego_gss_import_sec_context;
+	spnego_gss_init_sec_context;
+	spnego_gss_inquire_context;
+	spnego_gss_inquire_cred;
+	spnego_gss_inquire_names_for_mech;
+	spnego_gss_process_context_token;
+	spnego_gss_release_cred;
+	spnego_gss_release_name;
+	spnego_gss_seal;
+	spnego_gss_sign;
+	spnego_gss_unseal;
+	spnego_gss_verify;
+	spnego_gss_wrap_size_limit;
+    local:
+	*;
+};
diff --git a/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers-clean b/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers-clean
new file mode 100644
index 0000000000..c51885cc1a
--- /dev/null
+++ b/usr/src/lib/gss_mechs/mech_spnego/mapfile-vers-clean
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate {
+    global:
+	gss_mech_initialize;
+};
diff --git a/usr/src/lib/krb5/Makefile.lib b/usr/src/lib/krb5/Makefile.lib
index d9de1bc436..1cd613abdb 100644
--- a/usr/src/lib/krb5/Makefile.lib
+++ b/usr/src/lib/krb5/Makefile.lib
@@ -1,13 +1,29 @@
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
 #
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
 #
-# lib/krb5/Makefile.lib
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Definitions common to krb5 libraries.
 
 include		$(SRC)/lib/Makefile.lib
 
@@ -21,8 +37,4 @@ LINTFLAGS64=	-u -I..
 LINTSRC=	$(LINTLIB:%.ln=%)
 ROOTLINT=	$(LINTSRC:%=$(ROOTLINTDIR)/%)
 
-MAPFILE=	$(MAPDIR)/mapfile
-DYNFLAGS +=	-M $(MAPFILE)
-
 CLEANFILES +=	$(LINTOUT) $(LINTLIB)
-CLEANFILES +=	$(MAPFILE)
diff --git a/usr/src/lib/krb5/db2/Makefile b/usr/src/lib/krb5/db2/Makefile
index 744c8f4f51..a8066c5e62 100644
--- a/usr/src/lib/krb5/db2/Makefile
+++ b/usr/src/lib/krb5/db2/Makefile
@@ -1,16 +1,35 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/db2/Makefile
 
 include		../Makefile.lib
 
 include $(SRC)/lib/gss_mechs/mech_krb5/Makefile.mech_krb5
 
-SUBDIRS=	spec $(MACH)
+SUBDIRS=	$(MACH)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -35,7 +54,7 @@ $(ROOTLIBDIR)/%: %
 
 install:   $(ROOTLIBDIR) $(ROOTREADME) $(SUBDIRS)
 
-$(MACH) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/krb5/db2/Makefile.com b/usr/src/lib/krb5/db2/Makefile.com
index 36fc4ab84c..7b2ca4d96f 100644
--- a/usr/src/lib/krb5/db2/Makefile.com
+++ b/usr/src/lib/krb5/db2/Makefile.com
@@ -1,11 +1,29 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/db2/Makefile.com
-#
 
 LIBRARY= libdb2.a
 VERS= .1
@@ -98,11 +116,6 @@ all:	$(LIBS)
 
 lint:	lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/krb5/db2/i386/Makefile b/usr/src/lib/krb5/db2/i386/Makefile
index 1637d6e4a6..20a3695289 100644
--- a/usr/src/lib/krb5/db2/i386/Makefile
+++ b/usr/src/lib/krb5/db2/i386/Makefile
@@ -1,12 +1,29 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma	ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/db2/i386/Makefile
-
-MAPDIR= ../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/krb5/db2/mapfile-vers b/usr/src/lib/krb5/db2/mapfile-vers
new file mode 100644
index 0000000000..cb677fcf4e
--- /dev/null
+++ b/usr/src/lib/krb5/db2/mapfile-vers
@@ -0,0 +1,70 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+};
+
+SUNWprivate_1.1 {
+    global:
+	debugDisplayDB;
+	kdb2_dbm_clearerr;
+	kdb2_dbm_close;
+	kdb2_dbm_delete;
+	kdb2_dbm_dirfno;
+	kdb2_dbm_error;
+	kdb2_dbm_fetch;
+	kdb2_dbm_firstkey;
+	kdb2_dbminit;
+	kdb2_dbm_nextkey;
+	kdb2_dbm_open;
+	kdb2_dbm_store;
+	kdb2_dbopen;
+	kdb2_delete;
+	kdb2_fetch;
+	kdb2_firstkey;
+	kdb2_hcreate;
+	kdb2_hdestroy;
+	kdb2_hsearch;
+	kdb2_nextkey;
+	kdb2_store;
+	mpool_close;
+	mpool_delete;
+	mpool_filter;
+	mpool_get;
+	mpool_new;
+	mpool_open;
+	mpool_put;
+	mpool_sync;
+    local:
+	*;
+};
diff --git a/usr/src/lib/krb5/db2/sparc/Makefile b/usr/src/lib/krb5/db2/sparc/Makefile
index 9df77fea3f..20a3695289 100644
--- a/usr/src/lib/krb5/db2/sparc/Makefile
+++ b/usr/src/lib/krb5/db2/sparc/Makefile
@@ -1,12 +1,29 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma	ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/db2/sparc/Makefile
-
-MAPDIR= ../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/krb5/dyn/Makefile b/usr/src/lib/krb5/dyn/Makefile
index fe8a3ded2c..fb23ce54a0 100644
--- a/usr/src/lib/krb5/dyn/Makefile
+++ b/usr/src/lib/krb5/dyn/Makefile
@@ -1,14 +1,33 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/dyn/Makefile
 
 include		../Makefile.lib
 
-SUBDIRS=	spec $(MACH)
+SUBDIRS=	$(MACH)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -22,7 +41,7 @@ all clean clobber install lint: $(SUBDIRS)
 
 _msg:
 
-$(MACH) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/krb5/dyn/Makefile.com b/usr/src/lib/krb5/dyn/Makefile.com
index 2da9985ae1..c772a4897f 100644
--- a/usr/src/lib/krb5/dyn/Makefile.com
+++ b/usr/src/lib/krb5/dyn/Makefile.com
@@ -1,11 +1,29 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/dyn/Makefile.com
-#
 
 LIBRARY= libdyn.a
 VERS= .1
@@ -51,11 +69,6 @@ all:	$(LIBS)
 
 lint:	lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/krb5/dyn/i386/Makefile b/usr/src/lib/krb5/dyn/i386/Makefile
index f6acb058fe..20a3695289 100644
--- a/usr/src/lib/krb5/dyn/i386/Makefile
+++ b/usr/src/lib/krb5/dyn/i386/Makefile
@@ -1,12 +1,29 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma	ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/dyn/i386/Makefile
-
-MAPDIR= ../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/krb5/dyn/mapfile-vers b/usr/src/lib/krb5/dyn/mapfile-vers
new file mode 100644
index 0000000000..607bee9c36
--- /dev/null
+++ b/usr/src/lib/krb5/dyn/mapfile-vers
@@ -0,0 +1,57 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+};
+
+SUNWprivate_1.1 {
+    global:
+	DynAdd;
+	DynAppend;
+	DynArray;
+	DynCapacity;
+	DynCopy;
+	DynCreate;
+	DynDebug;
+	DynDelete;
+	DynDestroy;
+	DynGet;
+	DynInitzero;
+	DynInsert;
+	DynParanoid;
+	DynPut;
+	DynRelease;
+	DynSize;
+    local:
+	*;
+};
diff --git a/usr/src/lib/krb5/dyn/sparc/Makefile b/usr/src/lib/krb5/dyn/sparc/Makefile
index 072f0a6581..20a3695289 100644
--- a/usr/src/lib/krb5/dyn/sparc/Makefile
+++ b/usr/src/lib/krb5/dyn/sparc/Makefile
@@ -1,12 +1,29 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma	ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/dyn/sparc/Makefile
-
-MAPDIR= ../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/krb5/kadm5/clnt/Makefile b/usr/src/lib/krb5/kadm5/clnt/Makefile
index 63fc5a62e7..33fba4fea2 100644
--- a/usr/src/lib/krb5/kadm5/clnt/Makefile
+++ b/usr/src/lib/krb5/kadm5/clnt/Makefile
@@ -1,14 +1,34 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/kadm5/clnt/Makefile
 
 include		../../Makefile.lib
 
-SUBDIRS=	spec $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -38,7 +58,7 @@ generic.po: FRC
 	$(SED) "/^domain/d" messages.po > $@
 	$(RM) messages.po
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/krb5/kadm5/clnt/Makefile.com b/usr/src/lib/krb5/kadm5/clnt/Makefile.com
index 9471c0a18e..4f4d2c2f11 100644
--- a/usr/src/lib/krb5/kadm5/clnt/Makefile.com
+++ b/usr/src/lib/krb5/kadm5/clnt/Makefile.com
@@ -1,5 +1,25 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -79,11 +99,6 @@ CLEANFILES +=	$(ISRCHDR)
 
 lint:	lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../../Makefile.targ
 
diff --git a/usr/src/lib/krb5/kadm5/clnt/amd64/Makefile b/usr/src/lib/krb5/kadm5/clnt/amd64/Makefile
index 0092ac5fa5..a26441d4b5 100644
--- a/usr/src/lib/krb5/kadm5/clnt/amd64/Makefile
+++ b/usr/src/lib/krb5/kadm5/clnt/amd64/Makefile
@@ -1,16 +1,34 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/amd64
-
 include ../Makefile.com
 include ../../../../Makefile.lib.64
 
 DYNFLAGS += $(KRUNPATH64) $(KMECHLIB64)
 LDLIBS += -L $(ROOTLIBDIR) -lgss -lnsl -lsocket -lc
 
-install: all $(ROOTLIBDIR64) $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/krb5/kadm5/clnt/i386/Makefile b/usr/src/lib/krb5/kadm5/clnt/i386/Makefile
index be5c997173..0de30116e0 100644
--- a/usr/src/lib/krb5/kadm5/clnt/i386/Makefile
+++ b/usr/src/lib/krb5/kadm5/clnt/i386/Makefile
@@ -1,12 +1,30 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/i386
-
 include ../Makefile.com
 
 DYNFLAGS += $(KRUNPATH) $(KMECHLIB)
diff --git a/usr/src/lib/krb5/kadm5/clnt/mapfile-vers b/usr/src/lib/krb5/kadm5/clnt/mapfile-vers
new file mode 100644
index 0000000000..f47b2d722b
--- /dev/null
+++ b/usr/src/lib/krb5/kadm5/clnt/mapfile-vers
@@ -0,0 +1,148 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	chpass_principal_1;
+	chpw_error_message;
+	chrand_principal_1;
+	create_policy_1;
+	create_principal_1;
+	delete_policy_1;
+	delete_principal_1;
+	display_status;
+	get_policy_1;
+	get_pols_1;
+	get_principal_1;
+	get_princs_1;
+	get_privs_1;
+	init_1;
+	kadm5_chpass_principal;
+	kadm5_chpass_principal_3;
+	kadm5_chpass_principal_util;
+	kadm5_chpass_principal_v2;
+	kadm5_create_policy;
+	kadm5_create_principal;
+	kadm5_create_principal_3;
+	kadm5_decrypt_key;
+	kadm5_delete_policy;
+	kadm5_delete_principal;
+	kadm5_destroy;
+	kadm5_flush;
+	kadm5_free_config_params;
+	kadm5_free_name_list;
+	kadm5_free_policy_ent;
+	kadm5_free_principal_ent;
+	kadm5_get_adm_host_srv_name;
+	kadm5_get_config_params;
+	kadm5_get_cpw_host_srv_name;
+	kadm5_get_kiprop_host_srv_name;
+	_kadm5_get_kpasswd_protocol;
+	kadm5_get_master;
+	kadm5_get_policies;
+	kadm5_get_policy;
+	kadm5_get_principal;
+	kadm5_get_principals;
+	kadm5_get_privs;
+	kadm5_init;
+	kadm5_init_iprop;
+	kadm5_init_with_creds;
+	kadm5_init_with_password;
+	kadm5_init_with_skey;
+	kadm5_modify_policy;
+	kadm5_modify_principal;
+	kadm5_randkey_principal;
+	kadm5_randkey_principal_3;
+	kadm5_randkey_principal_old;
+	kadm5_rename_principal;
+	kadm5_setkey_principal_3;
+	krb5_aprof_finish;
+	krb5_aprof_get_deltat;
+	krb5_aprof_get_int32;
+	krb5_aprof_get_string;
+	krb5_aprof_getvals;
+	krb5_aprof_init;
+	krb5_flags_to_string;
+	krb5_free_key_data_contents;
+	krb5_free_realm_params;
+	krb5_input_flag_to_string;
+	krb5_keysalt_is_present;
+	krb5_keysalt_iterate;
+	krb5_klog_close;
+	krb5_klog_init;
+	krb5_klog_syslog;
+	krb5_log_error_table;
+	krb5_mk_chpw_req;
+	krb5_rd_chpw_rep;
+	krb5_read_realm_params;
+	krb5_string_to_flags;
+	krb5_string_to_keysalts;
+	modify_policy_1;
+	modify_principal_1;
+	rename_principal_1;
+	xdr_chpass_arg;
+	xdr_chrand_arg;
+	xdr_chrand_ret;
+	xdr_cpol_arg;
+	xdr_cprinc_arg;
+	xdr_dpol_arg;
+	xdr_dprinc_arg;
+	xdr_generic_ret;
+	xdr_getprivs_ret;
+	xdr_gpol_arg;
+	xdr_gpol_ret;
+	xdr_gpols_arg;
+	xdr_gpols_ret;
+	xdr_gprinc_arg;
+	xdr_gprinc_ret;
+	xdr_gprincs_arg;
+	xdr_gprincs_ret;
+	xdr_kadm5_policy_ent_rec;
+	xdr_kadm5_principal_ent_rec;
+	xdr_kadm5_principal_ent_rec_v1;
+	xdr_kadm5_ret_t;
+	xdr_krb5_deltat;
+	xdr_krb5_enctype;
+	xdr_krb5_flags;
+	xdr_krb5_int16;
+	xdr_krb5_keyblock;
+	xdr_krb5_key_data_nocontents;
+	xdr_krb5_kvno;
+	xdr_krb5_octet;
+	xdr_krb5_principal;
+	xdr_krb5_timestamp;
+	xdr_krb5_tl_data;
+	xdr_krb5_ui_4;
+	xdr_mpol_arg;
+	xdr_mprinc_arg;
+	xdr_nullstring;
+	xdr_nulltype;
+	xdr_rprinc_arg;
+	xdr_ui_4;
+    local:
+	*;
+};
diff --git a/usr/src/lib/krb5/kadm5/clnt/sparc/Makefile b/usr/src/lib/krb5/kadm5/clnt/sparc/Makefile
index 25ddb8300e..1db7c8014b 100644
--- a/usr/src/lib/krb5/kadm5/clnt/sparc/Makefile
+++ b/usr/src/lib/krb5/kadm5/clnt/sparc/Makefile
@@ -1,12 +1,30 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/sparc
-
 include ../Makefile.com
 
 DYNFLAGS += $(KRUNPATH) $(KMECHLIB)
diff --git a/usr/src/lib/krb5/kadm5/clnt/sparcv9/Makefile b/usr/src/lib/krb5/kadm5/clnt/sparcv9/Makefile
index 3143e75552..a26441d4b5 100644
--- a/usr/src/lib/krb5/kadm5/clnt/sparcv9/Makefile
+++ b/usr/src/lib/krb5/kadm5/clnt/sparcv9/Makefile
@@ -1,16 +1,34 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/sparcv9
-
 include ../Makefile.com
 include ../../../../Makefile.lib.64
 
 DYNFLAGS += $(KRUNPATH64) $(KMECHLIB64)
 LDLIBS += -L $(ROOTLIBDIR) -lgss -lnsl -lsocket -lc
 
-install: all $(ROOTLIBDIR64) $(ROOTLIBS64) $(ROOTLINKS64)
+install: all $(ROOTLIBS64) $(ROOTLINKS64)
diff --git a/usr/src/lib/krb5/kadm5/srv/Makefile b/usr/src/lib/krb5/kadm5/srv/Makefile
index 96e0c2497f..d85cc5dadb 100644
--- a/usr/src/lib/krb5/kadm5/srv/Makefile
+++ b/usr/src/lib/krb5/kadm5/srv/Makefile
@@ -1,14 +1,33 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/kadm5/srv/Makefile
 
 include		../../Makefile.lib
 
-SUBDIRS=	spec $(MACH)
+SUBDIRS=	$(MACH)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -21,7 +40,7 @@ _msg :=		TARGET= _msg
 
 all clean clobber install lint _msg: $(SUBDIRS)
 
-$(MACH) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/krb5/kadm5/srv/Makefile.com b/usr/src/lib/krb5/kadm5/srv/Makefile.com
index 958e171f5e..20fde869e3 100644
--- a/usr/src/lib/krb5/kadm5/srv/Makefile.com
+++ b/usr/src/lib/krb5/kadm5/srv/Makefile.com
@@ -1,11 +1,29 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/kadm5/srv/Makefile.com
-#
 
 LIBRARY= libkadm5srv.a
 VERS= .1
@@ -78,11 +96,6 @@ all:	$(LIBS)
 
 lint:	lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../../Makefile.targ
 
diff --git a/usr/src/lib/krb5/kadm5/srv/i386/Makefile b/usr/src/lib/krb5/kadm5/srv/i386/Makefile
index 3ec9873983..c9275248ca 100644
--- a/usr/src/lib/krb5/kadm5/srv/i386/Makefile
+++ b/usr/src/lib/krb5/kadm5/srv/i386/Makefile
@@ -1,12 +1,30 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/i386
-
 include ../Makefile.com
 
 # library dependency
diff --git a/usr/src/lib/krb5/kadm5/srv/mapfile-vers b/usr/src/lib/krb5/kadm5/srv/mapfile-vers
new file mode 100644
index 0000000000..074d6da1ce
--- /dev/null
+++ b/usr/src/lib/krb5/kadm5/srv/mapfile-vers
@@ -0,0 +1,205 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+};
+
+SUNWprivate_1.1 {
+    global:
+	acl_check;
+	acl_finish;
+	acl_impose_restrictions;
+	acl_init;
+	adb_policy_close;
+	adb_policy_init;
+	destroy_dict;
+	find_word;
+	free_history_entry;
+	get_either_iter;
+	get_pols_iter;
+	get_princs_iter;
+	glob_to_regexp;
+	handle_chpw;
+	hist_db;
+	hist_encblock;
+	hist_key;
+	hist_kvno;
+	hist_princ;
+	init_dict;
+	kadm5_chpass_principal;
+	kadm5_chpass_principal_3;
+	kadm5_chpass_principal_util;
+	kadm5_chpass_principal_v2;
+	kadm5_create_policy;
+	kadm5_create_policy_internal;
+	kadm5_create_principal;
+	kadm5_create_principal_3;
+	kadm5_decrypt_key;
+	kadm5_delete_policy;
+	kadm5_delete_principal;
+	kadm5_destroy;
+	kadm5_flush;
+	kadm5_free_config_params;
+	kadm5_free_name_list;
+	kadm5_free_policy_ent;
+	kadm5_free_principal_ent;
+	kadm5_get_adm_host_srv_name;
+	kadm5_get_config_params;
+	kadm5_get_cpw_host_srv_name;
+	kadm5_get_either;
+	kadm5_get_kiprop_host_srv_name;
+	_kadm5_get_kpasswd_protocol;
+	kadm5_get_master;
+	kadm5_get_policies;
+	kadm5_get_policy;
+	kadm5_get_principal;
+	kadm5_get_principals;
+	__kadm5_get_priv;
+	kadm5_init;
+	kadm5_init_iprop;
+	kadm5_init_with_creds;
+	kadm5_init_with_password;
+	kadm5_init_with_skey;
+	kadm5_modify_policy;
+	kadm5_modify_policy_internal;
+	kadm5_modify_principal;
+	kadm5_randkey_principal;
+	kadm5_randkey_principal_3;
+	kadm5_rename_principal;
+	kadm5_setkey_principal;
+	kadm5_setkey_principal_3;
+	kdb_delete_entry;
+	kdb_free_entry;
+	kdb_get_entry;
+	kdb_init_hist;
+	kdb_init_master;
+	kdb_iter_entry;
+	kdb_put_entry;
+	krb5_aprof_finish;
+	krb5_aprof_get_deltat;
+	krb5_aprof_get_int32;
+	krb5_aprof_get_string;
+	krb5_aprof_getvals;
+	krb5_aprof_init;
+	krb5_copy_key_data_contents;
+	krb5_flags_to_string;
+	krb5_free_key_data_contents;
+	krb5_free_realm_params;
+	krb5_input_flag_to_string;
+	krb5_keysalt_is_present;
+	krb5_keysalt_iterate;
+	krb5_klog_close;
+	krb5_klog_init;
+	krb5_klog_reopen;
+	krb5_klog_syslog;
+	krb5_read_realm_params;
+	krb5_string_to_flags;
+	krb5_string_to_keysalts;
+	master_db;
+	master_princ;
+	osa_adb_close_and_unlock;
+	osa_adb_close_policy;
+	osa_adb_create_db;
+	osa_adb_create_policy;
+	osa_adb_create_policy_db;
+	osa_adb_destroy_db;
+	osa_adb_destroy_policy;
+	osa_adb_destroy_policy_db;
+	osa_adb_fini_db;
+	osa_adb_get_lock;
+	osa_adb_get_policy;
+	osa_adb_init_db;
+	osa_adb_iter_policy;
+	osa_adb_open_and_lock;
+	osa_adb_open_policy;
+	osa_adb_put_policy;
+	osa_adb_release_lock;
+	osa_adb_rename_db;
+	osa_adb_rename_policy_db;
+	osa_free_policy_ent;
+	osa_free_princ_ent;
+	passwd_check;
+	xdralloc_create;
+	xdralloc_getdata;
+	xdralloc_release;
+	xdr_chpass3_arg;
+	xdr_chpass_arg;
+	xdr_chrand3_arg;
+	xdr_chrand_arg;
+	xdr_chrand_ret;
+	xdr_cpol_arg;
+	xdr_cprinc3_arg;
+	xdr_cprinc_arg;
+	xdr_dpol_arg;
+	xdr_dprinc_arg;
+	xdr_generic_ret;
+	xdr_getprivs_ret;
+	xdr_gpol_arg;
+	xdr_gpol_ret;
+	xdr_gpols_arg;
+	xdr_gpols_ret;
+	xdr_gprinc_arg;
+	xdr_gprinc_ret;
+	xdr_gprincs_arg;
+	xdr_gprincs_ret;
+	xdr_kadm5_policy_ent_rec;
+	xdr_kadm5_principal_ent_rec;
+	xdr_kadm5_principal_ent_rec_v1;
+	xdr_kadm5_ret_t;
+	xdr_krb5_deltat;
+	xdr_krb5_enctype;
+	xdr_krb5_flags;
+	xdr_krb5_int16;
+	xdr_krb5_keyblock;
+	xdr_krb5_key_data;
+	xdr_krb5_key_data_nocontents;
+	xdr_krb5_kvno;
+	xdr_krb5_octet;
+	xdr_krb5_principal;
+	xdr_krb5_timestamp;
+	xdr_krb5_tl_data;
+	xdr_krb5_ui_4;
+	xdr_mpol_arg;
+	xdr_mprinc_arg;
+	xdr_nullstring;
+	xdr_nulltype;
+	xdr_osa_policy_ent_rec;
+	xdr_osa_princ_ent_rec;
+	xdr_osa_pw_hist_ent;
+	xdr_rprinc_arg;
+	xdr_setkey3_arg;
+	xdr_setkey_arg;
+	xdr_ui_4;
+    local:
+	*;
+};
diff --git a/usr/src/lib/krb5/kadm5/srv/sparc/Makefile b/usr/src/lib/krb5/kadm5/srv/sparc/Makefile
index 83aa52a651..c9275248ca 100644
--- a/usr/src/lib/krb5/kadm5/srv/sparc/Makefile
+++ b/usr/src/lib/krb5/kadm5/srv/sparc/Makefile
@@ -1,12 +1,30 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/sparc
-
 include ../Makefile.com
 
 # library dependency
diff --git a/usr/src/lib/krb5/kdb/Makefile b/usr/src/lib/krb5/kdb/Makefile
index a3f14cb5dc..99160be316 100644
--- a/usr/src/lib/krb5/kdb/Makefile
+++ b/usr/src/lib/krb5/kdb/Makefile
@@ -1,14 +1,33 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI" 
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/kdb/Makefile
 
 include		../Makefile.lib
 
-SUBDIRS=	spec $(MACH)
+SUBDIRS=	$(MACH)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -21,7 +40,7 @@ _msg :=		TARGET= _msg
 
 all clean clobber install lint _msg: $(SUBDIRS)
 
-$(MACH) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/krb5/kdb/Makefile.com b/usr/src/lib/krb5/kdb/Makefile.com
index 9aed34e2de..f3c1efd3be 100644
--- a/usr/src/lib/krb5/kdb/Makefile.com
+++ b/usr/src/lib/krb5/kdb/Makefile.com
@@ -1,11 +1,29 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/kdb/Makefile.com
-#
 
 LIBRARY= libkdb.a
 VERS= .1
@@ -95,11 +113,6 @@ LINTFLAGS +=	-erroff=E_BAD_PTR_CAST_ALIGN
 
 lint:	lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/krb5/kdb/i386/Makefile b/usr/src/lib/krb5/kdb/i386/Makefile
index 2479c2f4c0..20a3695289 100644
--- a/usr/src/lib/krb5/kdb/i386/Makefile
+++ b/usr/src/lib/krb5/kdb/i386/Makefile
@@ -1,12 +1,30 @@
 #
-# Copyright 1997-2002 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/i386
-
 include ../Makefile.com
 
 install: all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/krb5/kdb/mapfile-vers b/usr/src/lib/krb5/kdb/mapfile-vers
new file mode 100644
index 0000000000..7734b92971
--- /dev/null
+++ b/usr/src/lib/krb5/kdb/mapfile-vers
@@ -0,0 +1,95 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+};
+
+SUNWprivate_1.1 {
+    global:
+	destroy_file_suffix;
+	krb5_db_close_database;
+	krb5_db_create;
+	krb5_db_delete_principal;
+	krb5_db_destroy;
+	krb5_dbe_apw;
+	krb5_dbe_ark;
+	krb5_dbe_cpw;
+	krb5_dbe_create_key_data;
+	krb5_dbe_crk;
+	krb5_dbe_find_enctype;
+	krb5_dbe_free_contents;
+	krb5_dbekd_decrypt_key_data;
+	krb5_dbekd_encrypt_key_data;
+	krb5_dbe_lookup_last_pwd_change;
+	krb5_dbe_lookup_mod_princ_data;
+	krb5_dbe_lookup_tl_data;
+	krb5_dbe_search_enctype;
+	krb5_dbe_update_last_pwd_change;
+	krb5_dbe_update_mod_princ_data;
+	krb5_dbe_update_tl_data;
+	krb5_db_fetch_mkey;
+	krb5_db_fini;
+	krb5_db_free_principal;
+	krb5_db_get_age;
+	krb5_db_get_principal;
+	krb5_db_init;
+	krb5_db_iterate;
+	krb5_db_lock;
+	krb5_db_open_database;
+	krb5_db_put_principal;
+	krb5_db_rename;
+	krb5_db_set_lockmode;
+	krb5_db_set_mkey;
+	krb5_db_set_name;
+	krb5_db_setup_mkey_name;
+	krb5_db_store_mkey;
+	krb5_db_unlock;
+	krb5_db_verify_master_key;
+	krb5_decode_princ_contents;
+	krb5_encode_princ_contents;
+	krb5_free_princ_contents;
+	krb5_ktkdb_close;
+	krb5_ktkdb_get_entry;
+	krb5_kt_kdb_ops;
+	krb5_ktkdb_resolve;
+	krb5_mkey_pwd_prompt1;
+	krb5_mkey_pwd_prompt2;
+	krb5_ser_db_context_init;
+	ulog_free_entries;
+	ulog_get_entries;
+	ulog_map;
+	ulog_replay;
+	ulog_set_role;
+    local:
+	*;
+};
diff --git a/usr/src/lib/krb5/kdb/sparc/Makefile b/usr/src/lib/krb5/kdb/sparc/Makefile
index 132bacd57a..20a3695289 100644
--- a/usr/src/lib/krb5/kdb/sparc/Makefile
+++ b/usr/src/lib/krb5/kdb/sparc/Makefile
@@ -1,12 +1,30 @@
 #
-# Copyright 1997-2002 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/sparc
-
 include ../Makefile.com
 
 install: all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/krb5/ss/Makefile b/usr/src/lib/krb5/ss/Makefile
index 1f89b37fd5..ce3bb2203d 100644
--- a/usr/src/lib/krb5/ss/Makefile
+++ b/usr/src/lib/krb5/ss/Makefile
@@ -1,14 +1,33 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/ss/Makefile
 
 include		../Makefile.lib
 
-SUBDIRS=	spec $(MACH)
+SUBDIRS=	$(MACH)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -25,7 +44,7 @@ POFILES = generic.po
 
 all clean clobber install lint: $(SUBDIRS)
 
-$(MACH) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/krb5/ss/Makefile.com b/usr/src/lib/krb5/ss/Makefile.com
index 95500fd3a2..5048cae0e1 100644
--- a/usr/src/lib/krb5/ss/Makefile.com
+++ b/usr/src/lib/krb5/ss/Makefile.com
@@ -1,11 +1,29 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/ss/Makefile.com
-#
 
 LIBRARY= libss.a
 VERS= .1
@@ -63,10 +81,5 @@ all:	$(LIBS)
 
 lint: lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
diff --git a/usr/src/lib/krb5/ss/i386/Makefile b/usr/src/lib/krb5/ss/i386/Makefile
index 294b6be277..20a3695289 100644
--- a/usr/src/lib/krb5/ss/i386/Makefile
+++ b/usr/src/lib/krb5/ss/i386/Makefile
@@ -1,12 +1,29 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma	ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/ss/i386/Makefile
-
-MAPDIR= ../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/krb5/ss/mapfile-vers b/usr/src/lib/krb5/ss/mapfile-vers
new file mode 100644
index 0000000000..932cc36186
--- /dev/null
+++ b/usr/src/lib/krb5/ss/mapfile-vers
@@ -0,0 +1,59 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	debugDisplaySS;
+	ss_abort_subsystem;
+	ss_add_info_dir;
+	ss_add_request_table;
+	ss_create_invocation;
+	ss_delete_info_dir;
+	ss_delete_invocation;
+	ss_delete_request_table;
+	ss_error;
+	ss_execute_command;
+	ss_execute_line;
+	ss_get_prompt;
+	ss_help;
+	ss_listen;
+	ss_list_requests;
+	ss_name;
+	ss_pager_create;
+	ss_page_stdin;
+	ss_parse;
+	ss_perror;
+	ss_quit;
+	ss_self_identify;
+	ss_set_prompt;
+	ss_std_requests;
+	ss_subsystem_name;
+	ss_subsystem_version;
+	ss_unimplemented;
+    local:
+	*;
+};
diff --git a/usr/src/lib/krb5/ss/sparc/Makefile b/usr/src/lib/krb5/ss/sparc/Makefile
index f459f341c7..20a3695289 100644
--- a/usr/src/lib/krb5/ss/sparc/Makefile
+++ b/usr/src/lib/krb5/ss/sparc/Makefile
@@ -1,12 +1,29 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma	ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/krb5/ss/sparc/Makefile
-
-MAPDIR= ../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libadm/Makefile b/usr/src/lib/libadm/Makefile
index e0c1013481..cd9fc7955b 100644
--- a/usr/src/lib/libadm/Makefile
+++ b/usr/src/lib/libadm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1990,1998-1999,2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libadm/Makefile
 
 include		../Makefile.lib
 
@@ -40,11 +38,9 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
-lint:	$(SUBDIRS)
-
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libadm/Makefile.com b/usr/src/lib/libadm/Makefile.com
index 3795d0898f..9e8f1299cf 100644
--- a/usr/src/lib/libadm/Makefile.com
+++ b/usr/src/lib/libadm/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -44,8 +43,9 @@ include ../../Makefile.rootfs
 
 LIBS=		$(DYNLIB) $(LINTLIB)
 SRCDIR=		../common
-MAPDIR=		../spec/$(TRANSMACH) 
-SPECMAPFILE=	$(MAPDIR)/mapfile 
+
+MAPFILES +=	mapfile-vers
+
 CPPFLAGS +=	-I ../inc
 
 $(LINTLIB) :=	SRCS=$(SRCDIR)/$(LINTSRC)
diff --git a/usr/src/lib/libadm/amd64/mapfile-vers b/usr/src/lib/libadm/amd64/mapfile-vers
new file mode 100644
index 0000000000..1eb0fcea63
--- /dev/null
+++ b/usr/src/lib/libadm/amd64/mapfile-vers
@@ -0,0 +1,29 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# This mapfile is empty, on purpose.
+# Look at the mapfiles under i386, sparc and sparcv9 for content.
diff --git a/usr/src/lib/libadm/common/mapfile-vers b/usr/src/lib/libadm/common/mapfile-vers
new file mode 100644
index 0000000000..3ae4aa1166
--- /dev/null
+++ b/usr/src/lib/libadm/common/mapfile-vers
@@ -0,0 +1,147 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	pkgdir;
+	read_vtoc;
+	write_vtoc;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_adddevtabrec;
+	_adddgrptabrec;
+	allocmenu;
+	ckdate;
+	ckdate_err;
+	ckdate_hlp;
+	ckdate_val;
+	ckgid;
+	ckgid_dsp;
+	ckgid_err;
+	ckgid_hlp;
+	ckgid_val;
+	ckindent;
+	ckint;
+	ckint_err;
+	ckint_hlp;
+	ckint_val;
+	ckitem;
+	ckitem_err;
+	ckitem_hlp;
+	ckkeywd;
+	ckpath;
+	ckpath_err;
+	ckpath_hlp;
+	ckpath_stx;
+	ckpath_val;
+	ckquit;
+	ckrange;
+	ckrange_err;
+	ckrange_hlp;
+	ckrange_val;
+	ckstr;
+	ckstr_err;
+	ckstr_hlp;
+	ckstr_val;
+	cktime;
+	cktime_err;
+	cktime_hlp;
+	cktime_val;
+	ckuid;
+	ckuid_dsp;
+	ckuid_err;
+	ckuid_hlp;
+	ckuid_val;
+	ckwidth;
+	ckyorn;
+	ckyorn_err;
+	ckyorn_hlp;
+	ckyorn_val;
+	devattr;
+	devfree;
+	devreserv;
+	_devtabpath;
+	_dgrptabpath;
+	_enddevtab;
+	fpkginfo;
+	fpkginst;
+	fpkgparam;
+	get_ABI_namelngth;
+	getdev;
+	getdgrp;
+	getfullblkname;
+	getfullrawname;
+	getinput;
+	get_install_root;
+	get_PKGADM;
+	get_PKGLOC;
+	get_PKGOLD;
+	getvol;
+	_getvol;
+	listdev;
+	listdgrp;
+	_moddevtabrec;
+	_opendevtab;
+	_opendgrptab;
+	pkgfile;
+	pkginfo;
+	pkginfofind;
+	pkgnmchk;
+	pkgparam;
+	printmenu;
+	puterror;
+	puthelp;
+	putprmpt;
+	puttext;
+	reservdev;
+	_rmdevtabattrs;
+	_rmdevtabrec;
+	_rmdgrpmems;
+	_rmdgrptabrec;
+	_rsvtabpath;
+	set_ABI_namelngth;
+	set_install_root;
+	setinvis;
+	setitem;
+	set_PKGADM;
+	set_PKGLOC;
+	set_PKGpaths;
+	_validalias;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libadm/i386/mapfile-vers b/usr/src/lib/libadm/i386/mapfile-vers
new file mode 100644
index 0000000000..1361e90bff
--- /dev/null
+++ b/usr/src/lib/libadm/i386/mapfile-vers
@@ -0,0 +1,48 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# It was a mistake ever to have exported these symbols from libadm.
+# They are now being redirected to libgen where they really belong,
+# except for 'circf' and 'sed', which do not exist in libgen and
+# are being retained as dummy variables in libadm.
+
+SUNW_0.7 {
+    global:
+	circf;
+	loc1 = DATA FILTER libgen.so.1 S0x4;
+	loc2 = DATA FILTER libgen.so.1 S0x4;
+	locs = DATA FILTER libgen.so.1 S0x4;
+	nbra = DATA FILTER libgen.so.1 S0x4;
+	sed;
+};
+
+SUNWprivate_1.1 {
+    global:
+	advance = FUNCTION FILTER libgen.so.1;
+	compile = FUNCTION FILTER libgen.so.1;
+	step = FUNCTION FILTER libgen.so.1;
+};
diff --git a/usr/src/lib/libadm/sparc/mapfile-vers b/usr/src/lib/libadm/sparc/mapfile-vers
new file mode 100644
index 0000000000..1361e90bff
--- /dev/null
+++ b/usr/src/lib/libadm/sparc/mapfile-vers
@@ -0,0 +1,48 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# It was a mistake ever to have exported these symbols from libadm.
+# They are now being redirected to libgen where they really belong,
+# except for 'circf' and 'sed', which do not exist in libgen and
+# are being retained as dummy variables in libadm.
+
+SUNW_0.7 {
+    global:
+	circf;
+	loc1 = DATA FILTER libgen.so.1 S0x4;
+	loc2 = DATA FILTER libgen.so.1 S0x4;
+	locs = DATA FILTER libgen.so.1 S0x4;
+	nbra = DATA FILTER libgen.so.1 S0x4;
+	sed;
+};
+
+SUNWprivate_1.1 {
+    global:
+	advance = FUNCTION FILTER libgen.so.1;
+	compile = FUNCTION FILTER libgen.so.1;
+	step = FUNCTION FILTER libgen.so.1;
+};
diff --git a/usr/src/lib/libadm/sparcv9/mapfile-vers b/usr/src/lib/libadm/sparcv9/mapfile-vers
new file mode 100644
index 0000000000..69496b28d9
--- /dev/null
+++ b/usr/src/lib/libadm/sparcv9/mapfile-vers
@@ -0,0 +1,48 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# It was a mistake ever to have exported these symbols from libadm.
+# They are now being redirected to libgen where they really belong,
+# except for 'circf' and 'sed', which do not exist in libgen and
+# are being retained as dummy variables in libadm.
+
+SUNW_0.7 {
+    global:
+	circf;
+	loc1 = DATA FILTER libgen.so.1 S0x8;
+	loc2 = DATA FILTER libgen.so.1 S0x8;
+	locs = DATA FILTER libgen.so.1 S0x8;
+	nbra = DATA FILTER libgen.so.1 S0x4;
+	sed;
+};
+
+SUNWprivate_1.1 {
+    global:
+	advance = FUNCTION FILTER libgen.so.1;
+	compile = FUNCTION FILTER libgen.so.1;
+	step = FUNCTION FILTER libgen.so.1;
+};
diff --git a/usr/src/lib/libadt_jni/Makefile b/usr/src/lib/libadt_jni/Makefile
index 42d45082be..ea3e23e818 100644
--- a/usr/src/lib/libadt_jni/Makefile
+++ b/usr/src/lib/libadt_jni/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,19 +19,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libadt_jni/Makefile
 
 include		../Makefile.lib
 
 POFILE	=	libadt_jni.po
 MSGFILES=	`$(GREP) -l gettext */*.[ch]`
 
-SUBDIRS	=	com/sun .WAIT spec $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all	:=	TARGET= all
 clean	:=	TARGET= clean
@@ -42,9 +41,9 @@ lint	:=	TARGET= lint
 
 .KEEP_STATE:
 
-all install clean clobber lint: $(SUBDIRS)
+all install clean clobber lint: com/sun .WAIT $(SUBDIRS)
 
-com/sun $(MACH) $(MACH64) spec: FRC
+com/sun $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 $(POFILE): pofile_MSGFILES
diff --git a/usr/src/lib/libadt_jni/Makefile.com b/usr/src/lib/libadt_jni/Makefile.com
index d64f5d0b1d..658a114f8e 100644
--- a/usr/src/lib/libadt_jni/Makefile.com
+++ b/usr/src/lib/libadt_jni/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libadt_jni/Makefile.com
-#
 
 LIBRARY=	libadt_jni.a
 VERS=		.1
@@ -36,14 +33,10 @@ OBJECTS=	adt_jni.o	\
 
 include		$(SRC)/lib/Makefile.lib
 
-MAPFILE=
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 LIBS =		$(DYNLIB) $(LINTLIB)
 
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
-# see also spec/Makefile's SPECCPP for java include
 CPPFLAGS +=	-I$(JAVA_ROOT)/include -I$(JAVA_ROOT)/include/solaris
 CPPFLAGS +=	-D_REENTRANT
 
diff --git a/usr/src/lib/libadt_jni/amd64/Makefile b/usr/src/lib/libadt_jni/amd64/Makefile
index 38f51189f5..d50a21bdb0 100644
--- a/usr/src/lib/libadt_jni/amd64/Makefile
+++ b/usr/src/lib/libadt_jni/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libadt_jni/common/mapfile-vers b/usr/src/lib/libadt_jni/common/mapfile-vers
new file mode 100644
index 0000000000..e87a88b92c
--- /dev/null
+++ b/usr/src/lib/libadt_jni/common/mapfile-vers
@@ -0,0 +1,71 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	c2j_pointer;
+	j2c_pointer;
+	Java_com_sun_audit_AuditEvent_1admin_1authenticate_putEvent;
+	Java_com_sun_audit_AuditEvent_1filesystem_1add_putEvent;
+	Java_com_sun_audit_AuditEvent_1filesystem_1delete_putEvent;
+	Java_com_sun_audit_AuditEvent_1filesystem_1modify_putEvent;
+	Java_com_sun_audit_AuditEvent_1login_putEvent;
+	Java_com_sun_audit_AuditEvent_1logout_putEvent;
+	Java_com_sun_audit_AuditEvent_1network_1add_putEvent;
+	Java_com_sun_audit_AuditEvent_1network_1delete_putEvent;
+	Java_com_sun_audit_AuditEvent_1network_1modify_putEvent;
+	Java_com_sun_audit_AuditEvent_1passwd_putEvent;
+	Java_com_sun_audit_AuditEvent_1printer_1add_putEvent;
+	Java_com_sun_audit_AuditEvent_1printer_1delete_putEvent;
+	Java_com_sun_audit_AuditEvent_1printer_1modify_putEvent;
+	Java_com_sun_audit_AuditEvent_1rlogin_putEvent;
+	Java_com_sun_audit_AuditEvent_1role_1login_putEvent;
+	Java_com_sun_audit_AuditEvent_1scheduledjob_1add_putEvent;
+	Java_com_sun_audit_AuditEvent_1scheduledjob_1delete_putEvent;
+	Java_com_sun_audit_AuditEvent_1scheduledjob_1modify_putEvent;
+	Java_com_sun_audit_AuditEvent_1screenlock_putEvent;
+	Java_com_sun_audit_AuditEvent_1screenunlock_putEvent;
+	Java_com_sun_audit_AuditEvent_1serialport_1add_putEvent;
+	Java_com_sun_audit_AuditEvent_1serialport_1delete_putEvent;
+	Java_com_sun_audit_AuditEvent_1serialport_1modify_putEvent;
+	Java_com_sun_audit_AuditEvent_1ssh_putEvent;
+	Java_com_sun_audit_AuditEvent_1su_putEvent;
+	Java_com_sun_audit_AuditEvent_1telnet_putEvent;
+	Java_com_sun_audit_AuditEvent_1uauth_putEvent;
+	Java_com_sun_audit_AuditEvent_1usermgr_1add_putEvent;
+	Java_com_sun_audit_AuditEvent_1usermgr_1delete_putEvent;
+	Java_com_sun_audit_AuditEvent_1usermgr_1modify_putEvent;
+	Java_com_sun_audit_AuditSession_bsmAuditOn;
+	Java_com_sun_audit_AuditSession_dupSession;
+	Java_com_sun_audit_AuditSession_endSession;
+	Java_com_sun_audit_AuditSession_exportSessionData;
+	Java_com_sun_audit_AuditSession_getSessionId;
+	Java_com_sun_audit_AuditSession_sessionAttr;
+	Java_com_sun_audit_AuditSession_startSession;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libadt_jni/i386/Makefile b/usr/src/lib/libadt_jni/i386/Makefile
index c2c58d7bce..f4504a2573 100644
--- a/usr/src/lib/libadt_jni/i386/Makefile
+++ b/usr/src/lib/libadt_jni/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libadt_jni/i386/Makefile
-
-MAPDIR= ../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libadt_jni/sparc/Makefile b/usr/src/lib/libadt_jni/sparc/Makefile
index 045b2283ba..f4504a2573 100644
--- a/usr/src/lib/libadt_jni/sparc/Makefile
+++ b/usr/src/lib/libadt_jni/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libadt_jni/sparc/Makefile
-
-MAPDIR= ../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libadt_jni/sparcv9/Makefile b/usr/src/lib/libadt_jni/sparcv9/Makefile
index e98a851c57..d50a21bdb0 100644
--- a/usr/src/lib/libadt_jni/sparcv9/Makefile
+++ b/usr/src/lib/libadt_jni/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libadt_jni/spec/sparcv9/Makefile
-
-MAPDIR= ../spec/sparcv9
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/libaio/Makefile.com b/usr/src/lib/libaio/Makefile.com
index 1842670697..3dc97f8300 100644
--- a/usr/src/lib/libaio/Makefile.com
+++ b/usr/src/lib/libaio/Makefile.com
@@ -31,10 +31,9 @@ VERS = .1
 include ../../Makefile.lib
 include ../../Makefile.rootfs
 
-MAPFILES=	mapfile-vers $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
+MAPFILES =	mapfile-vers $(MAPFILE-FLTR)
 
-DYNFLAGS +=	-F libc.so.1 $(MAPOPTS)
+DYNFLAGS +=	-F libc.so.1
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -56,5 +55,3 @@ include ../../Makefile.targ
 all:	$(LIBS)
 
 lint:
-
-$(DYNLIB):	$(MAPFILES)
diff --git a/usr/src/lib/libavl/Makefile b/usr/src/lib/libavl/Makefile
index 032744e5a3..8647d0ecf4 100644
--- a/usr/src/lib/libavl/Makefile
+++ b/usr/src/lib/libavl/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libavl/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 # include library definitions
@@ -42,11 +39,9 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libavl/Makefile.com b/usr/src/lib/libavl/Makefile.com
index b3f017f6b3..0627681a93 100644
--- a/usr/src/lib/libavl/Makefile.com
+++ b/usr/src/lib/libavl/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -25,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libavl/Makefile.com
-#
 
 LIBRARY=	libavl.a
 VERS=		.1
@@ -40,13 +37,8 @@ SRCS =		$(COMDIR)/avl.c
 
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	..
 COMDIR = 	$(SRC)/common/avl
 
-# library builds its mapfile from specfiles
-MAPDIR = 	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libavl/mapfile-vers b/usr/src/lib/libavl/mapfile-vers
new file mode 100644
index 0000000000..5e421e8781
--- /dev/null
+++ b/usr/src/lib/libavl/mapfile-vers
@@ -0,0 +1,45 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	avl_add;
+	avl_create;
+	avl_destroy;
+	avl_destroy_nodes;
+	avl_find;
+	avl_first;
+	avl_insert;
+	avl_insert_here;
+	avl_last;
+	avl_nearest;
+	avl_numnodes;
+	avl_remove;
+	avl_walk;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libbc/Makefile b/usr/src/lib/libbc/Makefile
index 294812affe..04b0b43dd2 100644
--- a/usr/src/lib/libbc/Makefile
+++ b/usr/src/lib/libbc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,19 +19,21 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libbc/Makefile
-#
+
 LIBRARY= libc.a
 VERS= .1.9
 
 # include common library definitions
 include ../Makefile.lib
 
+# There should be a mapfile here
+MAPFILES =
+
 C99MODE=	$(C99_DISABLE)
 
 # the bcp libraries go in /usr/4lib. override ROOTLIBDIR from ../Makefile.lib
diff --git a/usr/src/lib/libbc/sparc/Makefile b/usr/src/lib/libbc/sparc/Makefile
index 62e54ac68a..c66e6cc6cc 100644
--- a/usr/src/lib/libbc/sparc/Makefile
+++ b/usr/src/lib/libbc/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # This builds all objects needed for libbc.
 #
 
@@ -310,6 +311,9 @@ pics/%.o s5pics/%.o : ../libc/yp/%.c
 # include common library definitions
 include ../../Makefile.lib
 
+# There should be a mapfile here
+MAPFILES =
+
 C99MODE=	$(C99_DISABLE)
 
 #
diff --git a/usr/src/lib/libbsdmalloc/Makefile b/usr/src/lib/libbsdmalloc/Makefile
index 78cbe7f322..d608e0d064 100644
--- a/usr/src/lib/libbsdmalloc/Makefile
+++ b/usr/src/lib/libbsdmalloc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1989,1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libbsdmalloc/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include		../Makefile.lib
 
-SUBDIRS=        spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=          TARGET= all
 clean :=        TARGET= clean
@@ -69,7 +67,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-spec $(MACH) $(MACH64):      FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/libbsdmalloc/Makefile.com b/usr/src/lib/libbsdmalloc/Makefile.com
index dd5d6acb17..8057f220ef 100644
--- a/usr/src/lib/libbsdmalloc/Makefile.com
+++ b/usr/src/lib/libbsdmalloc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -35,9 +34,7 @@ OBJECTS=  \
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS=           $(OBJECTS:%.o=../common/%.c)
-CLOBBERFILES +=	$(MAPFILE)
+SRCDIR =	../common
 
 LIBS =          $(DYNLIB) $(LINTLIB)
 
@@ -55,7 +52,7 @@ CLEANFILES +=	$(LINTOUT) $(LINTLIB)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT
-DYNFLAGS +=     -M$(MAPFILE) $(ZINTERPOSE)
+DYNFLAGS +=     $(ZINTERPOSE)
 LDLIBS +=       -lc
 
 .KEEP_STATE:
@@ -63,11 +60,6 @@ LDLIBS +=       -lc
 lint:
 	$(LINT.c) $(SRCS) $(LDLIBS)
 
-$(DYNLIB):      $(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 #
 # create message catalogue files
 #
diff --git a/usr/src/lib/libbsdmalloc/amd64/Makefile b/usr/src/lib/libbsdmalloc/amd64/Makefile
index 7ff22584fa..70e24a9a5d 100644
--- a/usr/src/lib/libbsdmalloc/amd64/Makefile
+++ b/usr/src/lib/libbsdmalloc/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libbsdmalloc/common/mapfile-vers b/usr/src/lib/libbsdmalloc/common/mapfile-vers
new file mode 100644
index 0000000000..bc01ed38bf
--- /dev/null
+++ b/usr/src/lib/libbsdmalloc/common/mapfile-vers
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	free = NODIRECT;
+	malloc = NODIRECT;
+	realloc = NODIRECT;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libbsdmalloc/i386/Makefile b/usr/src/lib/libbsdmalloc/i386/Makefile
index 42cbcd9748..2a944b0b43 100644
--- a/usr/src/lib/libbsdmalloc/i386/Makefile
+++ b/usr/src/lib/libbsdmalloc/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libbsdmalloc/i386/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libbsdmalloc/sparc/Makefile b/usr/src/lib/libbsdmalloc/sparc/Makefile
index 5a4adb2fed..2a944b0b43 100644
--- a/usr/src/lib/libbsdmalloc/sparc/Makefile
+++ b/usr/src/lib/libbsdmalloc/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libbsdmalloc/sparc/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libbsdmalloc/sparcv9/Makefile b/usr/src/lib/libbsdmalloc/sparcv9/Makefile
index 418310c88b..70e24a9a5d 100644
--- a/usr/src/lib/libbsdmalloc/sparcv9/Makefile
+++ b/usr/src/lib/libbsdmalloc/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libbsdmalloc/sparcv9/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libbsm/Makefile b/usr/src/lib/libbsm/Makefile
index 4cc23687a8..8ac6aba1a6 100644
--- a/usr/src/lib/libbsm/Makefile
+++ b/usr/src/lib/libbsm/Makefile
@@ -18,19 +18,17 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libbsm/Makefile
-#
 
 include ../Makefile.lib
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 XGETFLAGS_ADT += -a
 
@@ -209,7 +207,7 @@ adt_xlate.po: $(COMMONDIR)/adt_xlate.c
 	$(SED) "/^domain/d" < messages.po > adt_xlate.po
 	$(RM) messages.po
 
-spec $(MACH) $(MACH64) :	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libbsm/Makefile.com b/usr/src/lib/libbsm/Makefile.com
index 399ed7a3dd..3c0552c893 100644
--- a/usr/src/lib/libbsm/Makefile.com
+++ b/usr/src/lib/libbsm/Makefile.com
@@ -24,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libbsm/Makefile.com
-#
 
 LIBRARY =	libbsm.a
 VERS = 		.1
@@ -81,9 +79,7 @@ include ../../Makefile.lib
 # install this library in the root filesystem
 include ../../Makefile.rootfs
 
-MAPFILE=	$(MAPDIR)/mapfile
-
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS =	 	$(DYNLIB) $(LINTLIB)
 
@@ -93,10 +89,8 @@ ROOTLINTDIR=	$(ROOTLIBDIR)
 ROOTLINT=	$(LINTSRC:%=$(ROOTLINTDIR)/%)
 
 CLEANFILES +=	$(LINTOUT) $(LINTLIB)
-CLOBBERFILES +=	$(MAPFILE)
 
 CFLAGS	+=	$(CCVERBOSE)
-DYNFLAGS +=	-M$(MAPFILE)
 
 LAZYLIBS =	$(ZLAZYLOAD) -ltsol $(ZNOLAZYLOAD)
 LDLIBS +=	-lsocket -lnsl -lmd -lc -lsecdb $(LAZYLIBS)
@@ -118,11 +112,6 @@ all: $(LIBS)
 
 lint: lintcheck
 
-$(DYNLIB) $(DYNLIB64): 	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); pwd; $(MAKE) mapfile
-
 # Include library targets
 #
 include ../../Makefile.targ
diff --git a/usr/src/lib/libbsm/amd64/Makefile b/usr/src/lib/libbsm/amd64/Makefile
index 55c713ccd0..2e8cdecf75 100644
--- a/usr/src/lib/libbsm/amd64/Makefile
+++ b/usr/src/lib/libbsm/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libbsm/common/mapfile-vers b/usr/src/lib/libbsm/common/mapfile-vers
new file mode 100644
index 0000000000..9d65671255
--- /dev/null
+++ b/usr/src/lib/libbsm/common/mapfile-vers
@@ -0,0 +1,322 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+	au_to_arg32;
+	au_to_arg64;
+	au_to_process_ex;
+	au_to_return32;
+	au_to_return64;
+	au_to_subject_ex;
+	getaudit_addr;
+	setaudit_addr;
+} SUNW_1.1;
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+} SUNW_0.8;
+
+SUNW_0.8 {
+    global:
+	au_to_newgroups;
+	getauclassent_r;
+	getauclassnam_r;
+	getauevent_r;
+	getauevnam_r;
+	getauevnum_r;
+	getauuserent_r;
+	getauusernam_r;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	au_close;
+	audit;
+	auditon;
+	auditsvc;
+	au_open;
+	au_preselect;
+	au_to_arg;
+	au_to_attr;
+	au_to_cmd;
+	au_to_data;
+	au_to_groups;
+	au_to_in_addr;
+	au_to_ipc;
+	au_to_iport;
+	au_to_me;
+	au_to_opaque;
+	au_to_path;
+	au_to_process;
+	au_to_return;
+	au_to_socket;
+	au_to_subject;
+	au_to_text;
+	au_user_mask;
+	au_write;
+	endac;
+	endauclass;
+	endauevent;
+	endauuser;
+	getacdir;
+	getacflg;
+	getacmin;
+	getacna;
+	getauclassent;
+	getauclassnam;
+	getaudit;
+	getauditflagsbin;
+	getauditflagschar;
+	getauevent;
+	getauevnam;
+	getauevnonam;
+	getauevnum;
+	getauid;
+	getauuserent;
+	getauusernam;
+	getfauditflags;
+	setac;
+	setauclass;
+	setauclassfile;
+	setaudit;
+	setauevent;
+	setaueventfile;
+	setauid;
+	setauuser;
+	setauuserfile;
+	testac;
+};
+
+SUNWprivate_1.1 {
+    global:
+	adr_char;
+	adr_count;
+	adrf_char;
+	adrf_int32;
+	adrf_int64;
+	adrf_peek;
+	adrf_short;
+	adrf_start;
+	adrf_u_char;
+	adrf_u_int32;
+	adrf_u_int64;
+	adrf_u_short;
+	adr_int32;
+	adr_int64;
+	adrm_char;
+	adrm_int32;
+	adrm_int64;
+	adrm_short;
+	adrm_start;
+	adrm_u_char;
+	adrm_u_int32;
+	adrm_u_int64;
+	adrm_u_short;
+	adr_short;
+	adr_start;
+	adt_alloc_event;
+	adt_audit_enabled;
+	adt_dup_session;
+	adt_end_session;
+	adt_export_session_data;
+	adt_free_event;
+	adt_get_asid;
+	adt_get_auid;
+	adt_get_mask;
+	adt_get_session_id;
+	adt_get_termid;
+	adt_import_proc;
+	adt_load_hostname;
+	adt_load_termid;
+	adt_load_ttyname;
+	adt_put_event;
+	adt_set_asid;
+	adt_set_auid;
+	adt_set_from_ucred;
+	adt_set_mask;
+	adt_set_proc;
+	adt_set_termid;
+	adt_set_user;
+	adt_start_session;
+	audit_allocate_argv;
+	audit_allocate_device;
+	audit_allocate_list;
+	audit_allocate_record;
+	audit_at_create;
+	audit_at_delete;
+	audit_cron_bad_user;
+	audit_cron_create_anc_file;
+	audit_cron_delete_anc_file;
+	audit_cron_is_anc_name;
+	audit_cron_mode;
+	audit_cron_new_job;
+	audit_cron_session;
+	audit_cron_setinfo;
+	audit_crontab_delete;
+	audit_crontab_modify;
+	audit_crontab_not_allowed;
+	audit_crontab_process_not_audited;
+	audit_cron_user_acct_expired;
+	__auditd_debug_file_open;
+	auditdoor;
+	__audit_dowarn;
+	__audit_dowarn2;
+	audit_ftpd_bad_pw;
+	audit_ftpd_excluded;
+	audit_ftpd_failure;
+	audit_ftpd_logout;
+	audit_ftpd_no_anon;
+	audit_ftpd_success;
+	audit_ftpd_unknown;
+	audit_halt_fail;
+	audit_halt_setup;
+	audit_halt_success;
+	audit_inetd_config;
+	audit_inetd_service;
+	audit_inetd_termid;
+	audit_kadmind_auth;
+	audit_kadmind_unauth;
+	audit_krb5kdc_as_req;
+	audit_krb5kdc_tgs_req;
+	audit_krb5kdc_tgs_req_2ndtktmm;
+	audit_krb5kdc_tgs_req_alt_tgt;
+	audit_mountd_mount;
+	audit_mountd_setup;
+	audit_mountd_umount;
+	audit_newgrp_login;
+	audit_reboot_fail;
+	audit_reboot_setup;
+	audit_reboot_success;
+	audit_rexd_fail;
+	audit_rexd_setup;
+	audit_rexd_success;
+	audit_rexecd_fail;
+	audit_rexecd_setup;
+	audit_rexecd_success;
+	audit_rshd_fail;
+	audit_rshd_setup;
+	audit_rshd_success;
+	audit_settid;
+	audit_shutdown_fail;
+	audit_shutdown_setup;
+	audit_shutdown_success;
+	__audit_syslog;
+	audit_uadmin_setup;
+	audit_uadmin_success;
+	aug_audit;
+	aug_get_machine;
+	aug_get_port;
+	aug_init;
+	aug_na_selected;
+	aug_save_afunc;
+	aug_save_asid;
+	aug_save_auid;
+	aug_save_egid;
+	aug_save_euid;
+	aug_save_event;
+	aug_save_gid;
+	aug_save_me;
+	aug_save_na;
+	aug_save_namask;
+	aug_save_path;
+	aug_save_pid;
+	aug_save_policy;
+	aug_save_sorf;
+	aug_save_text;
+	aug_save_tid;
+	aug_save_uid;
+	aug_selected;
+	au_to_exec_args;
+	au_to_exec_env;
+	au_to_exit;
+	au_to_fmri;
+	au_to_header;
+	au_to_header_ex;
+	au_to_label;
+	au_to_mylabel;
+	au_to_privset;
+	au_to_seq;
+	au_to_trailer;
+	au_to_uauth;
+	au_to_xatom;
+	au_to_xobj;
+	au_to_xproto;
+	au_to_xselect;
+	cacheauclass;
+	cacheauclassnam;
+	cacheauevent;
+	cannot_audit;
+	da_add_list;
+	da_check_logindevperm;
+	da_is_on;
+	da_open_devdb;
+	da_print_device;
+	da_remove_list;
+	da_update_defattrs;
+	da_update_device;
+	_endac;
+	enddadefent;
+	enddaent;
+	enddmapent;
+	freedadefent;
+	freedaent;
+	freedmapent;
+	_getacdir;
+	_getacflg;
+	_getacmin;
+	_getacna;
+	_getacplug;
+	getdadefent;
+	getdadeftype;
+	getdadmline;
+	getdaent;
+	getdanam;
+	getdatype;
+	getdevicerange;
+	getdmapdev;
+	getdmapdfield;
+	getdmapent;
+	getdmapfield;
+	getdmapnam;
+	getdmaptype;
+	__logpost;
+	_openac;
+	_rewindac;
+	setdadefent;
+	setdaent;
+	setdafile;
+	setdmapent;
+	setdmapfile;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libbsm/i386/Makefile b/usr/src/lib/libbsm/i386/Makefile
index 960fe88587..a333224278 100644
--- a/usr/src/lib/libbsm/i386/Makefile
+++ b/usr/src/lib/libbsm/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1995-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# libbsm/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libbsm/sparc/Makefile b/usr/src/lib/libbsm/sparc/Makefile
index ec82c1023d..a333224278 100644
--- a/usr/src/lib/libbsm/sparc/Makefile
+++ b/usr/src/lib/libbsm/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1995-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# libbsm/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libbsm/sparcv9/Makefile b/usr/src/lib/libbsm/sparcv9/Makefile
index e0fea439df..2e8cdecf75 100644
--- a/usr/src/lib/libbsm/sparcv9/Makefile
+++ b/usr/src/lib/libbsm/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libbsm/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/libc/Makefile b/usr/src/lib/libc/Makefile
index f232f2c11a..a82bb25f06 100644
--- a/usr/src/lib/libc/Makefile
+++ b/usr/src/lib/libc/Makefile
@@ -2,7 +2,7 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, (the "License").
+# Common Development and Distribution License (the "License").
 # You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -100,7 +99,7 @@ $(ROOTVARIANTDIR)/$(VAR2_DYNLIB)	:= FILEMODE= 755
 
 .KEEP_STATE:
 
-all:	check_i18n .WAIT spec .WAIT lib32 $(BUILD64) .WAIT lib64 .WAIT etc
+all:	check_i18n .WAIT lib32 $(BUILD64) .WAIT lib64 .WAIT etc
 
 check_i18n:
 	@if [ ! -f $(ROOTFS_LIBDIR)/libc_i18n.a -o \
@@ -140,7 +139,6 @@ $($(MACH)_ETC): FRC
 
 install:	all			\
 		etc			\
-		spec			\
 		inslib32		\
 		$(BUILD64) inslib64
 
@@ -199,10 +197,10 @@ lint	:=	TARGET= lint
 
 .PARALLEL:	$(SUBDIRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; VERSION='$(VERSION)' $(MAKE) $(TARGET)
 
-clean clobber: spec .WAIT $(SUBDIRS)
+clean clobber: $(SUBDIRS)
 	$(RM) -r $(MACH)/i18n_pics
 	$(BUILD64)$(RM) -r $(MACH64)/i18n_pics
 
@@ -216,8 +214,6 @@ catalog:
 $(MSGDOMAIN):
 	$(INS.dir)
 
-ARCHITECTURES = $(MACH) $(BUILD64) $(MACH64)
-
 cscope.out tags: FRC
 	$(XREF) -x $@
 
diff --git a/usr/src/lib/libc/Makefile.targ b/usr/src/lib/libc/Makefile.targ
index 26e8812bd7..3f851a6230 100644
--- a/usr/src/lib/libc/Makefile.targ
+++ b/usr/src/lib/libc/Makefile.targ
@@ -264,7 +264,7 @@ pics/%.o: $(LIBCBASE)/$(CRTSRCS)/%.s
 	$(POST_PROCESS_O)
 
 # $(SRC)/common rules
-pics/%.o: $(SRC)/common/atomic/$(TRANSMACH)/%.s
+pics/%.o: $(SRC)/common/atomic/$(TARGETMACH)/%.s
 	$(BUILD.s)
 	$(POST_PROCESS_O)
 
diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile
index 90aba817cc..3e758a94b2 100644
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -24,8 +24,7 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libc/amd64/Makefile
-#
+
 LIBCBASE=.
 
 LIBRARY= libc.a
@@ -912,8 +911,7 @@ ALTPICS= $(TRACEOBJS:%=pics/%)
 $(DYNLIB) := PICS += $(ROOTFS_LIBDIR64)/libc_i18n.a
 $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS)
 
-MAPDIR=		../spec/amd64
-MAPFILE=	$(MAPDIR)/mapfile
+MAPFILES =	../port/mapfile-vers mapfile-vers
 
 CPPFLAGS=	-D_REENTRANT -D$(MACH64) -D__$(MACH64) \
 		-I. -I$(LIBCBASE)/inc -I../inc $(CPPFLAGS.master) -I/usr/include
@@ -922,8 +920,7 @@ ASFLAGS=	$(AS_PICFLAGS) -P -D__STDC__ -D_ASM $(CPPFLAGS) \
 
 # Inform the run-time linker about libc specialized initialization
 RTLDINFO =	-z rtldinfo=tls_rtldinfo
-
-DYNFLAGS +=	-M $(MAPFILE) $(RTLDINFO)
+DYNFLAGS +=	$(RTLDINFO)
 
 BUILD.s=	$(AS) $(ASFLAGS) $< -o $@
 
@@ -947,7 +944,7 @@ CLEANFILES=			\
 	pics/crtn.o		\
 	$(ALTPICS)
 
-CLOBBERFILES +=	$(MAPFILE) $(LIB_PIC)
+CLOBBERFILES +=	$(LIB_PIC)
 
 # list of C source for lint
 SRCS=							\
@@ -983,11 +980,6 @@ SRCS=							\
 $(DYNLIB) := CRTI = crti.o
 $(DYNLIB) := CRTN = crtn.o
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # Files which need the threads .il inline template
 TIL=				\
 	aio.o			\
diff --git a/usr/src/lib/libc/amd64/mapfile-vers b/usr/src/lib/libc/amd64/mapfile-vers
new file mode 100644
index 0000000000..4c3570420c
--- /dev/null
+++ b/usr/src/lib/libc/amd64/mapfile-vers
@@ -0,0 +1,771 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.22 {
+    global:
+	dladdr = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	dladdr1 = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	dlamd64getunwind = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	dlclose = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	dldump = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	dlerror = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	dlinfo = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	dlmopen = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	dlopen = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	dlsym = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	_SUNW_Unwind_DeleteException;
+	_SUNW_Unwind_ForcedUnwind;
+	_SUNW_Unwind_GetCFA;
+	_SUNW_Unwind_GetGR;
+	_SUNW_Unwind_GetIP;
+	_SUNW_Unwind_GetLanguageSpecificData;
+	_SUNW_Unwind_GetRegionStart;
+	_SUNW_Unwind_RaiseException;
+	_SUNW_Unwind_Resume;
+	_SUNW_Unwind_SetGR;
+	_SUNW_Unwind_SetIP;
+	_UA_CLEANUP_PHASE;
+	_UA_FORCE_UNWIND;
+	_UA_HANDLER_FRAME;
+	_UA_SEARCH_PHASE;
+	_Unwind_DeleteException;
+	_Unwind_ForcedUnwind;
+	_Unwind_GetCFA;
+	_Unwind_GetGR;
+	_Unwind_GetIP;
+	_Unwind_GetLanguageSpecificData;
+	_Unwind_GetRegionStart;
+	_Unwind_RaiseException;
+	_Unwind_Resume;
+	_Unwind_SetGR;
+	_Unwind_SetIP;
+	walkcontext;
+};
+
+SUNW_0.7 {
+    global:
+	abort;
+	abs;
+	access;
+	_access;
+	acct;
+	_acct;
+	addseverity;
+	_addseverity;
+	alarm;
+	_alarm;
+	_altzone;
+	asctime;
+	asctime_r;
+	_assert;
+	__assert;
+	atexit;
+	atof;
+	atoi;
+	atol;
+	bsearch;
+	__builtin_alloca;
+	calloc = NODIRECT;
+	catclose;
+	_catclose;
+	catgets;
+	_catgets;
+	catopen;
+	_catopen;
+	cfgetispeed;
+	_cfgetispeed;
+	cfgetospeed;
+	_cfgetospeed;
+	cfsetispeed;
+	_cfsetispeed;
+	cfsetospeed;
+	_cfsetospeed;
+	chdir;
+	_chdir;
+	chmod;
+	_chmod;
+	chown;
+	_chown;
+	chroot;
+	_chroot;
+	_cleanup;
+	clearerr;
+	clock;
+	_close;
+	close = NODIRECT;
+	closedir;
+	_closedir;
+	creat;
+	_creat;
+	crypt;
+	_crypt;
+	ctermid;
+	ctime;
+	ctime_r;
+	_ctype;
+	__ctype;
+	cuserid;
+	_cuserid;
+	daylight;
+	_daylight;
+	difftime;
+	div;
+	dup;
+	_dup;
+	dup2;
+	_dup2;
+	encrypt;
+	_encrypt;
+	endgrent;
+	endpwent;
+	environ = NODIRECT;
+	_environ = NODIRECT;
+	errno;
+	___errno;
+	execl;
+	_execl;
+	execle;
+	_execle;
+	execlp;
+	_execlp;
+	execv;
+	_execv;
+	execve;
+	_execve;
+	execvp;
+	_execvp;
+	exit;
+	_exit;
+	fattach;
+	_fattach;
+	fchdir;
+	_fchdir;
+	fchmod;
+	_fchmod;
+	fchown;
+	_fchown;
+	fclose;
+	fcntl;
+	_fcntl;
+	fdetach;
+	_fdetach;
+	fdopen;
+	_fdopen;
+	feof;
+	ferror;
+	fflush;
+	fgetc;
+	fgetgrent;
+	fgetgrent_r;
+	fgetpos;
+	fgetpwent;
+	fgetpwent_r;
+	fgets;
+	__filbuf;
+	fileno;
+	_fileno;
+	file_to_decimal;
+	flockfile;
+	_flsbuf;
+	__flsbuf;
+	fmtmsg;
+	_fmtmsg;
+	fopen;
+	_fork;
+	fork = NODIRECT;
+	fpathconf;
+	_fpathconf;
+	fprintf;
+	fputc;
+	fputs;
+	fread;
+	free = NODIRECT;
+	freopen;
+	frexp = FUNCTION FILTER libm.so.2;
+	fscanf;
+	fseek;
+	fsetpos;
+	fstat;
+	_fstat;
+	fstatvfs;
+	_fstatvfs;
+	fsync;
+	_fsync;
+	ftell;
+	ftok;
+	_ftok;
+	funlockfile;
+	fwrite;
+	getc;
+	getchar;
+	getchar_unlocked;
+	getcontext;
+	_getcontext;
+	getc_unlocked;
+	getcwd;
+	_getcwd;
+	getdate;
+	_getdate;
+	getdate_err;
+	_getdate_err;
+	getegid;
+	_getegid;
+	getenv;
+	geteuid;
+	_geteuid;
+	getgid;
+	_getgid;
+	getgrent;
+	getgrent_r;
+	getgrgid;
+	getgrgid_r;
+	getgrnam;
+	getgrnam_r;
+	getgroups;
+	_getgroups;
+	getitimer;
+	_getitimer;
+	getlogin;
+	getlogin_r;
+	getmsg;
+	_getmsg;
+	getopt;
+	_getopt;
+	getpass;
+	_getpass;
+	getpgid;
+	_getpgid;
+	getpgrp;
+	_getpgrp;
+	getpid;
+	_getpid;
+	getpmsg;
+	_getpmsg;
+	getppid;
+	_getppid;
+	getpwent;
+	getpwent_r;
+	getpwnam;
+	getpwnam_r;
+	getpwuid;
+	getpwuid_r;
+	getrlimit;
+	_getrlimit;
+	gets;
+	getsid;
+	_getsid;
+	getsubopt;
+	_getsubopt;
+	gettimeofday;
+	_gettimeofday;
+	gettxt;
+	_gettxt;
+	getuid;
+	_getuid;
+	getw;
+	_getw;
+	gmtime;
+	gmtime_r;
+	grantpt;
+	_grantpt;
+	hcreate;
+	_hcreate;
+	hdestroy;
+	_hdestroy;
+	hsearch;
+	_hsearch;
+	__huge_val;
+	initgroups;
+	_initgroups;
+	_iob;
+	__iob;
+	ioctl;
+	_ioctl;
+	isalnum;
+	isalpha;
+	isascii;
+	_isascii;
+	isastream;
+	_isastream;
+	isatty;
+	_isatty;
+	iscntrl;
+	isdigit;
+	isgraph;
+	islower;
+	isnan = FUNCTION FILTER libm.so.2;
+	_isnan = FUNCTION FILTER libm.so.2;
+	isnand = FUNCTION FILTER libm.so.2;
+	_isnand = FUNCTION FILTER libm.so.2;
+	isprint;
+	ispunct;
+	isspace;
+	isupper;
+	isxdigit;
+	kill;
+	_kill;
+	labs;
+	lchown;
+	_lchown;
+	ldexp = FUNCTION FILTER libm.so.2;
+	ldiv;
+	lfind;
+	_lfind;
+	link;
+	_link;
+	localeconv;
+	localtime;
+	localtime_r;
+	lockf;
+	_lockf;
+	logb = FUNCTION FILTER libm.so.2;
+	longjmp;
+	lsearch;
+	_lsearch;
+	lseek;
+	_lseek;
+	lstat;
+	_lstat;
+	makecontext;
+	_makecontext;
+	malloc = NODIRECT;
+	mblen;
+	mbstowcs;
+	mbtowc;
+	memccpy;
+	_memccpy;
+	memchr;
+	memcmp;
+	memcntl;
+	_memcntl;
+	memcpy;
+	memmove;
+	memset;
+	mkdir;
+	_mkdir;
+	mkfifo;
+	_mkfifo;
+	mknod;
+	_mknod;
+	mktemp;
+	_mktemp;
+	mktime;
+	mlock;
+	_mlock;
+	mmap;
+	_mmap;
+	modf = FUNCTION FILTER libm.so.2;
+	_modf = FUNCTION FILTER libm.so.2;
+	monitor;
+	_monitor;
+	mount;
+	_mount;
+	mprotect;
+	_mprotect;
+	msgctl;
+	_msgctl;
+	msgget;
+	_msgget;
+	msgrcv;
+	_msgrcv;
+	msgsnd;
+	_msgsnd;
+	msync;
+	_msync;
+	munlock;
+	_munlock;
+	munmap;
+	_munmap;
+	_mutex_held;
+	_mutex_lock;
+	nextafter = FUNCTION FILTER libm.so.2;
+	_nextafter = FUNCTION FILTER libm.so.2;
+	nftw;
+	_nftw;
+	nice;
+	_nice;
+	nl_langinfo;
+	_nl_langinfo;
+	_numeric;
+	open;
+	_open;
+	opendir;
+	_opendir;
+	optarg;
+	opterr;
+	optind;
+	optopt;
+	pathconf;
+	_pathconf;
+	pause;
+	_pause;
+	pclose;
+	_pclose;
+	perror;
+	pipe;
+	_pipe;
+	poll;
+	_poll;
+	p_online;
+	popen;
+	_popen;
+	printf;
+	profil;
+	_profil;
+	ptsname;
+	_ptsname;
+	putc;
+	putchar;
+	putchar_unlocked;
+	putc_unlocked;
+	putenv;
+	_putenv;
+	putmsg;
+	_putmsg;
+	putpmsg;
+	_putpmsg;
+	puts;
+	putw;
+	_putw;
+	qsort;
+	raise;
+	rand;
+	rand_r;
+	read;
+	_read;
+	readdir;
+	_readdir;
+	readdir_r;
+	readlink;
+	_readlink;
+	readv;
+	_readv;
+	realloc = NODIRECT;
+	remove;
+	rename;
+	_rename;
+	rewind;
+	rewinddir;
+	_rewinddir;
+	rmdir;
+	_rmdir;
+	_rw_read_held;
+	_rw_write_held;
+	sbrk;
+	scalb = FUNCTION FILTER libm.so.2;
+	_scalb = FUNCTION FILTER libm.so.2;
+	scanf;
+	seekdir;
+	_seekdir;
+	semctl;
+	_semctl;
+	semget;
+	_semget;
+	semop;
+	_semop;
+	setbuf;
+	setcontext;
+	_setcontext;
+	setgid;
+	_setgid;
+	setgrent;
+	setgroups;
+	_setgroups;
+	setitimer;
+	_setitimer;
+	setjmp;
+	setkey;
+	_setkey;
+	setlabel;
+	setlocale;
+	setpgid;
+	_setpgid;
+	setpgrp;
+	_setpgrp;
+	setpwent;
+	setrlimit;
+	_setrlimit;
+	setsid;
+	_setsid;
+	setuid;
+	_setuid;
+	setvbuf;
+	shmat;
+	_shmat;
+	shmctl;
+	_shmctl;
+	shmdt;
+	_shmdt;
+	shmget;
+	_shmget;
+	_sibuf;
+	sigaction = NODIRECT;
+	_sigaction = NODIRECT;
+	sigaddset;
+	_sigaddset;
+	sigaltstack;
+	_sigaltstack;
+	sigdelset;
+	_sigdelset;
+	sigemptyset;
+	_sigemptyset;
+	sigfillset;
+	_sigfillset;
+	sighold;
+	_sighold;
+	sigignore;
+	_sigignore;
+	sigismember;
+	_sigismember;
+	siglongjmp;
+	_siglongjmp;
+	signal;
+	sigpause;
+	_sigpause;
+	sigpending;
+	_sigpending;
+	sigprocmask;
+	_sigprocmask;
+	sigrelse;
+	_sigrelse;
+	sigsend;
+	_sigsend;
+	sigsendset;
+	_sigsendset;
+	sigset;
+	_sigset;
+	sigsetjmp;
+	_sigsetjmp;
+	sigsuspend;
+	_sigsuspend;
+	sleep;
+	_sleep;
+	_sobuf;
+	sprintf;
+	srand;
+	srand48;
+	sscanf;
+	stat;
+	_stat;
+	statvfs;
+	_statvfs;
+	stime;
+	_stime;
+	strcat;
+	strchr;
+	strcmp;
+	strcoll;
+	strcpy;
+	strcspn;
+	strdup;
+	_strdup;
+	strerror;
+	strftime;
+	strlen;
+	strncat;
+	strncmp;
+	strncpy;
+	strpbrk;
+	strrchr;
+	strspn;
+	strstr;
+	strtod;
+	strtok;
+	strtok_r;
+	strtol;
+	strtoul;
+	strxfrm;
+	swab;
+	_swab;
+	swapcontext;
+	_swapcontext;
+	symlink;
+	_symlink;
+	sync;
+	_sync;
+	_sys_buslist;
+	_syscall;
+	_sys_cldlist;
+	sysconf;
+	_sysconf;
+	_sys_fpelist;
+	sysinfo;
+	_sysinfo;
+	_sys_segvlist;
+	_sys_siginfolistp;
+	_sys_siglist;
+	_sys_siglistn;
+	_sys_siglistp;
+	system;
+	_sys_traplist;
+	tcdrain;
+	_tcdrain;
+	tcflow;
+	_tcflow;
+	tcflush;
+	_tcflush;
+	tcgetattr;
+	_tcgetattr;
+	tcgetpgrp;
+	_tcgetpgrp;
+	tcgetsid;
+	_tcgetsid;
+	tcsendbreak;
+	_tcsendbreak;
+	tcsetattr;
+	_tcsetattr;
+	tcsetpgrp;
+	_tcsetpgrp;
+	tdelete;
+	_tdelete;
+	tell;
+	_tell;
+	telldir;
+	_telldir;
+	tempnam;
+	_tempnam;
+	tfind;
+	_tfind;
+	time;
+	_time;
+	times;
+	_times;
+	timezone;
+	_timezone;
+	tmpfile;
+	tmpnam;
+	toascii;
+	_toascii;
+	tolower;
+	_tolower;
+	toupper;
+	_toupper;
+	tsearch;
+	_tsearch;
+	ttyname;
+	ttyname_r;
+	twalk;
+	_twalk;
+	tzname;
+	_tzname;
+	tzset;
+	_tzset;
+	ulimit;
+	_ulimit;
+	umask;
+	_umask;
+	umount;
+	_umount;
+	uname;
+	_uname;
+	ungetc;
+	unlink;
+	_unlink;
+	unlockpt;
+	_unlockpt;
+	utime;
+	_utime;
+	vfprintf;
+	vprintf;
+	vsprintf;
+	wait;
+	_wait;
+	waitid;
+	_waitid;
+	waitpid;
+	_waitpid;
+	wcstombs;
+	wctomb;
+	write;
+	_write;
+	writev;
+	_writev;
+	_xftw;
+} SYSVABI_1.3;
+
+SYSVABI_1.3 {
+    global:
+	_ctermid;
+	__flt_rounds;
+	_fpstart;
+	__fpstart;
+	_getgrgid;
+	_getgrnam;
+	_getlogin;
+	_getpwnam;
+	_getpwuid;
+	_sbrk;
+	_ttyname;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_D_cplx_lr_div;
+	_D_cplx_lr_div_ix;
+	_D_cplx_lr_div_rx;
+	_dladdr = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	_dladdr1 = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	_dlamd64getunwind = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	_dlclose = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	_dldump = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	_dlerror = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	_dlinfo = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	_dlmopen = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	_dlopen = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	_dlsym = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	_F_cplx_lr_div;
+	_F_cplx_lr_div_ix;
+	_F_cplx_lr_div_rx;
+	__fltrounds;
+	__fseterror_u;
+	gtty;
+	_gtty;
+	_hasmntopt;
+	htonl;
+	htons;
+	_ld_libc = FUNCTION FILTER /usr/lib/amd64/ld.so.1;
+	_memcmp;
+	_memcpy;
+	_memmove;
+	_memset;
+	ntohl;
+	ntohs;
+	sysi86;
+	_sysi86;
+	_X_cplx_div;
+	_X_cplx_div_ix;
+	_X_cplx_div_rx;
+	_X_cplx_lr_div;
+	_X_cplx_lr_div_ix;
+	_X_cplx_lr_div_rx;
+	_X_cplx_mul;
+	__xgetRD;
+	__xtol;
+	__xtoll;
+	__xtoul;
+	__xtoull;
+};
diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com
index 3ca6342b0f..9560631ae8 100644
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -24,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libc/Makefile.com
-#
 
 LIB_PIC= libc_pic.a
 VERS=	.1
@@ -953,8 +951,7 @@ ALTPICS= $(TRACEOBJS:%=pics/%)
 $(DYNLIB) := PICS += $(ROOTFS_LIBDIR)/libc_i18n.a
 $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(LDLIBS)
 
-MAPDIR=		../spec/i386
-MAPFILE=	$(MAPDIR)/mapfile
+MAPFILES =	../port/mapfile-vers ../i386/mapfile-vers 
 
 #
 # EXTN_CPPFLAGS and EXTN_CFLAGS set in enclosing Makefile
@@ -966,10 +963,9 @@ ASFLAGS=	$(AS_PICFLAGS) -P -D__STDC__ -D_ASM $(CPPFLAGS) $(i386_AS_XARCH)
 
 # Inform the run-time linker about libc specialized initialization
 RTLDINFO =	-z rtldinfo=tls_rtldinfo
+DYNFLAGS +=	$(RTLDINFO)
 
-DYNFLAGS =	$(HSONAME) $(ZTEXT) $(ZDEFS) $(ZCOMBRELOC)
-DYNFLAGS +=	$(SPECMAPFILE:%=-M %) $(PGA_MAPFILE:%=-M %) $(NX_MAP:%=-M%) \
-		-e __rtboot -M $(MAPFILE) $(RTLDINFO)
+DYNFLAGS +=	-e __rtboot
 DYNFLAGS +=	$(EXTN_DYNFLAGS)
 
 BUILD.s=	$(AS) $(ASFLAGS) $< -o $@
@@ -996,7 +992,7 @@ CLEANFILES=			\
 	pics/crtn.o		\
 	$(ALTPICS)
 
-CLOBBERFILES +=	$(MAPFILE) $(LIB_PIC)
+CLOBBERFILES +=	$(LIB_PIC)
 
 # list of C source for lint
 SRCS=							\
@@ -1033,11 +1029,6 @@ $(DYNLIB) $(LIB_PIC) := DYNOBJS = _rtbootld.o
 $(DYNLIB) := CRTI = crti.o
 $(DYNLIB) := CRTN = crtn.o
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # Files which need the threads .il inline template
 TIL=				\
 	aio.o			\
diff --git a/usr/src/lib/libc/i386/mapfile-vers b/usr/src/lib/libc/i386/mapfile-vers
new file mode 100644
index 0000000000..6923652e79
--- /dev/null
+++ b/usr/src/lib/libc/i386/mapfile-vers
@@ -0,0 +1,909 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.23 {
+    global:
+	aio_cancel64;
+	aio_error64;
+	aio_fsync64;
+	aio_read64;
+	aioread64;
+	aio_return64;
+	aio_suspend64;
+	aio_waitn64;
+	aio_write64;
+	aiowrite64;
+	enable_extended_FILE_stdio;
+	lio_listio64;
+	mkstemps64;
+	_mkstemps64;
+	posix_fallocate64;
+};
+
+SUNW_1.22 {
+    global:
+	alphasort64;
+	_alphasort64;
+	dladdr = FUNCTION FILTER /usr/lib/ld.so.1;
+	dladdr1 = FUNCTION FILTER /usr/lib/ld.so.1;
+	dlclose = FUNCTION FILTER /usr/lib/ld.so.1;
+	dldump = FUNCTION FILTER /usr/lib/ld.so.1;
+	dlerror = FUNCTION FILTER /usr/lib/ld.so.1;
+	dlinfo = FUNCTION FILTER /usr/lib/ld.so.1;
+	dlmopen = FUNCTION FILTER /usr/lib/ld.so.1;
+	dlopen = FUNCTION FILTER /usr/lib/ld.so.1;
+	dlsym = FUNCTION FILTER /usr/lib/ld.so.1;
+	pselect_large_fdset;
+	scandir64;
+	_scandir64;
+};
+
+SUNW_1.21 {
+    global:
+	attropen64;
+	_attropen64;
+	fstatat64;
+	_fstatat64;
+	openat64;
+	_openat64;
+	walkcontext;
+};
+
+SUNW_1.18 {
+    global:
+	select_large_fdset;
+};
+
+SUNW_1.1 {
+    global:
+	creat64;
+	_creat64;
+	fgetpos64;
+	fopen64;
+	freopen64;
+	fseeko64;
+	fsetpos64;
+	fstat64;
+	_fstat64;
+	fstatvfs64;
+	_fstatvfs64;
+	ftello64;
+	ftruncate64;
+	_ftruncate64;
+	ftw64;
+	_ftw64;
+	getdents64;
+	_getdents64;
+	getrlimit64;
+	_getrlimit64;
+	lockf64;
+	_lockf64;
+	lseek64;
+	_lseek64;
+	lstat64;
+	_lstat64;
+	mkstemp64;
+	_mkstemp64;
+	mmap64;
+	_mmap64;
+	nftw64;
+	_nftw64;
+	open64;
+	_open64;
+	__posix_readdir_r;
+	pread64;
+	_pread64;
+	pwrite64;
+	_pwrite64;
+	readdir64;
+	_readdir64;
+	readdir64_r;
+	_readdir64_r;
+	setrlimit64;
+	_setrlimit64;
+	s_fcntl;
+	_s_fcntl;
+	s_ioctl;
+	stat64;
+	_stat64;
+	statvfs64;
+	_statvfs64;
+	tell64;
+	_tell64;
+	tmpfile64;
+	truncate64;
+	_truncate64;
+	_xftw64;
+};
+
+SUNW_0.7 {
+    global:
+	addseverity;
+	_addseverity;
+	asctime_r;
+	_assert;
+	_bufendtab;
+	__builtin_alloca;
+	crypt;
+	_crypt;
+	ctime_r;
+	_ctype;
+	__div64;
+	encrypt;
+	_encrypt;
+	endgrent;
+	endpwent;
+	errno;
+	___errno;
+	fgetgrent;
+	fgetgrent_r;
+	fgetpwent;
+	fgetpwent_r;
+	file_to_decimal;
+	flockfile;
+	_flsbuf;
+	funlockfile;
+	getchar_unlocked;
+	getc_unlocked;
+	getgrent;
+	getgrent_r;
+	getgrgid_r;
+	getgrnam_r;
+	getitimer;
+	_getitimer;
+	getlogin_r;
+	getpwent;
+	getpwent_r;
+	getpwnam_r;
+	getpwuid_r;
+	gettimeofday;
+	_gettimeofday;
+	gmtime_r;
+	_iob;
+	_lastbuf;
+	localtime_r;
+	__mul64;
+	_mutex_held;
+	_mutex_lock;
+	p_online;
+	putchar_unlocked;
+	putc_unlocked;
+	rand_r;
+	readdir_r;
+	__rem64;
+	_rw_read_held;
+	_rw_write_held;
+	setgrent;
+	setitimer;
+	_setitimer;
+	setkey;
+	_setkey;
+	setpwent;
+	_sibuf;
+	_sobuf;
+	srand48;
+	strtok_r;
+	_sys_buslist;
+	_syscall;
+	_sys_cldlist;
+	sys_errlist;
+	_sys_fpelist;
+	sysinfo;
+	_sysinfo;
+	sys_nerr;
+	_sys_nsig;
+	_sys_segvlist;
+	_sys_siginfolistp;
+	_sys_siglist;
+	_sys_siglistn;
+	_sys_siglistp;
+	_sys_traplist;
+	ttyname_r;
+	__udiv64;
+	__urem64;
+} SYSVABI_1.3;
+
+SYSVABI_1.3 {
+    global:
+	abort;
+	abs;
+	access;
+	_access;
+	acct;
+	_acct;
+	alarm;
+	_alarm;
+	_altzone;
+	asctime;
+	__assert;
+	atexit;
+	atof;
+	atoi;
+	atol;
+	bsearch;
+	calloc = NODIRECT;
+	catclose;
+	_catclose;
+	catgets;
+	_catgets;
+	catopen;
+	_catopen;
+	cfgetispeed;
+	_cfgetispeed;
+	cfgetospeed;
+	_cfgetospeed;
+	cfsetispeed;
+	_cfsetispeed;
+	cfsetospeed;
+	_cfsetospeed;
+	chdir;
+	_chdir;
+	chmod;
+	_chmod;
+	chown;
+	_chown;
+	chroot;
+	_chroot;
+	_cleanup;
+	clearerr;
+	clock;
+	_close;
+	close = NODIRECT;
+	closedir;
+	_closedir;
+	creat;
+	_creat;
+	ctermid;
+	_ctermid;
+	ctime;
+	__ctype;
+	cuserid;
+	_cuserid;
+	daylight;
+	_daylight;
+	difftime;
+	div;
+	dup;
+	_dup;
+	dup2;
+	_dup2;
+	environ = NODIRECT;
+	_environ = NODIRECT;
+	execl;
+	_execl;
+	execle;
+	_execle;
+	execlp;
+	_execlp;
+	execv;
+	_execv;
+	execve;
+	_execve;
+	execvp;
+	_execvp;
+	exit;
+	_exit;
+	fattach;
+	_fattach;
+	fchdir;
+	_fchdir;
+	fchmod;
+	_fchmod;
+	fchown;
+	_fchown;
+	fclose;
+	fcntl;
+	_fcntl;
+	fdetach;
+	_fdetach;
+	fdopen;
+	_fdopen;
+	feof;
+	ferror;
+	fflush;
+	fgetc;
+	fgetpos;
+	fgets;
+	__filbuf;
+	fileno;
+	_fileno;
+	__flsbuf;
+	__flt_rounds;
+	fmtmsg;
+	_fmtmsg;
+	fopen;
+	_fork;
+	fork = NODIRECT;
+	fpathconf;
+	_fpathconf;
+	_fp_hw;
+	fprintf;
+	_fpstart;
+	__fpstart;
+	fputc;
+	fputs;
+	fread;
+	free = NODIRECT;
+	freopen;
+	frexp = FUNCTION FILTER libm.so.2;
+	fscanf;
+	fseek;
+	fsetpos;
+	fstat;
+	_fstat;
+	fstatvfs;
+	_fstatvfs;
+	fsync;
+	_fsync;
+	ftell;
+	ftok;
+	_ftok;
+	fwrite;
+	_fxstat;
+	getc;
+	getchar;
+	getcontext;
+	_getcontext;
+	getcwd;
+	_getcwd;
+	getdate;
+	_getdate;
+	getdate_err;
+	_getdate_err;
+	getegid;
+	_getegid;
+	getenv;
+	geteuid;
+	_geteuid;
+	getgid;
+	_getgid;
+	getgrgid;
+	_getgrgid;
+	getgrnam;
+	_getgrnam;
+	getgroups;
+	_getgroups;
+	getlogin;
+	_getlogin;
+	getmsg;
+	_getmsg;
+	getopt;
+	_getopt;
+	getpass;
+	_getpass;
+	getpgid;
+	_getpgid;
+	getpgrp;
+	_getpgrp;
+	getpid;
+	_getpid;
+	getpmsg;
+	_getpmsg;
+	getppid;
+	_getppid;
+	getpwnam;
+	_getpwnam;
+	getpwuid;
+	_getpwuid;
+	getrlimit;
+	_getrlimit;
+	gets;
+	getsid;
+	_getsid;
+	getsubopt;
+	_getsubopt;
+	gettxt;
+	_gettxt;
+	getuid;
+	_getuid;
+	getw;
+	_getw;
+	gmtime;
+	grantpt;
+	_grantpt;
+	hcreate;
+	_hcreate;
+	hdestroy;
+	_hdestroy;
+	hsearch;
+	_hsearch;
+	__huge_val;
+	initgroups;
+	_initgroups;
+	__iob;
+	ioctl;
+	_ioctl;
+	isalnum;
+	isalpha;
+	isascii;
+	_isascii;
+	isastream;
+	_isastream;
+	isatty;
+	_isatty;
+	iscntrl;
+	isdigit;
+	isgraph;
+	islower;
+	isnan = FUNCTION FILTER libm.so.2;
+	_isnan = FUNCTION FILTER libm.so.2;
+	isnand = FUNCTION FILTER libm.so.2;
+	_isnand = FUNCTION FILTER libm.so.2;
+	isprint;
+	ispunct;
+	isspace;
+	isupper;
+	isxdigit;
+	kill;
+	_kill;
+	labs;
+	lchown;
+	_lchown;
+	ldexp = FUNCTION FILTER libm.so.2;
+	ldiv;
+	lfind;
+	_lfind;
+	link;
+	_link;
+	localeconv;
+	localtime;
+	lockf;
+	_lockf;
+	logb = FUNCTION FILTER libm.so.2;
+	longjmp;
+	lsearch;
+	_lsearch;
+	lseek;
+	_lseek;
+	lstat;
+	_lstat;
+	_lxstat;
+	makecontext;
+	_makecontext;
+	malloc = NODIRECT;
+	mblen;
+	mbstowcs;
+	mbtowc;
+	memccpy;
+	_memccpy;
+	memchr;
+	memcmp;
+	memcntl;
+	_memcntl;
+	memcpy;
+	memmove;
+	memset;
+	mkdir;
+	_mkdir;
+	mkfifo;
+	_mkfifo;
+	mknod;
+	_mknod;
+	mktemp;
+	_mktemp;
+	mktime;
+	mlock;
+	_mlock;
+	mmap;
+	_mmap;
+	modf = FUNCTION FILTER libm.so.2;
+	_modf = FUNCTION FILTER libm.so.2;
+	monitor;
+	_monitor;
+	mount;
+	_mount;
+	mprotect;
+	_mprotect;
+	msgctl;
+	_msgctl;
+	msgget;
+	_msgget;
+	msgrcv;
+	_msgrcv;
+	msgsnd;
+	_msgsnd;
+	msync;
+	_msync;
+	munlock;
+	_munlock;
+	munmap;
+	_munmap;
+	nextafter = FUNCTION FILTER libm.so.2;
+	_nextafter = FUNCTION FILTER libm.so.2;
+	nftw;
+	_nftw;
+	nice;
+	_nice;
+	nl_langinfo;
+	_nl_langinfo;
+	_numeric;
+	nuname;
+	_nuname;
+	open;
+	_open;
+	opendir;
+	_opendir;
+	optarg;
+	opterr;
+	optind;
+	optopt;
+	pathconf;
+	_pathconf;
+	pause;
+	_pause;
+	pclose;
+	_pclose;
+	perror;
+	pipe;
+	_pipe;
+	poll;
+	_poll;
+	popen;
+	_popen;
+	printf;
+	profil;
+	_profil;
+	ptrace;
+	_ptrace;
+	ptsname;
+	_ptsname;
+	putc;
+	putchar;
+	putenv;
+	_putenv;
+	putmsg;
+	_putmsg;
+	putpmsg;
+	_putpmsg;
+	puts;
+	putw;
+	_putw;
+	qsort;
+	raise;
+	rand;
+	read;
+	_read;
+	readdir;
+	_readdir;
+	readlink;
+	_readlink;
+	readv;
+	_readv;
+	realloc = NODIRECT;
+	remove;
+	rename;
+	_rename;
+	rewind;
+	rewinddir;
+	_rewinddir;
+	rmdir;
+	_rmdir;
+	sbrk;
+	_sbrk;
+	scalb = FUNCTION FILTER libm.so.2;
+	_scalb = FUNCTION FILTER libm.so.2;
+	scanf;
+	seekdir;
+	_seekdir;
+	semctl;
+	_semctl;
+	semget;
+	_semget;
+	semop;
+	_semop;
+	setbuf;
+	setcontext;
+	_setcontext;
+	setgid;
+	_setgid;
+	setgroups;
+	_setgroups;
+	setjmp;
+	setlabel;
+	setlocale;
+	setpgid;
+	_setpgid;
+	setpgrp;
+	_setpgrp;
+	setrlimit;
+	_setrlimit;
+	setsid;
+	_setsid;
+	setuid;
+	_setuid;
+	setvbuf;
+	shmat;
+	_shmat;
+	shmctl;
+	_shmctl;
+	shmdt;
+	_shmdt;
+	shmget;
+	_shmget;
+	sigaction = NODIRECT;
+	_sigaction = NODIRECT;
+	sigaddset;
+	_sigaddset;
+	sigaltstack;
+	_sigaltstack;
+	sigdelset;
+	_sigdelset;
+	sigemptyset;
+	_sigemptyset;
+	sigfillset;
+	_sigfillset;
+	sighold;
+	_sighold;
+	sigignore;
+	_sigignore;
+	sigismember;
+	_sigismember;
+	siglongjmp;
+	_siglongjmp;
+	signal;
+	sigpause;
+	_sigpause;
+	sigpending;
+	_sigpending;
+	sigprocmask;
+	_sigprocmask;
+	sigrelse;
+	_sigrelse;
+	sigsend;
+	_sigsend;
+	sigsendset;
+	_sigsendset;
+	sigset;
+	_sigset;
+	sigsetjmp;
+	_sigsetjmp;
+	sigsuspend;
+	_sigsuspend;
+	sleep;
+	_sleep;
+	sprintf;
+	srand;
+	sscanf;
+	stat;
+	_stat;
+	statvfs;
+	_statvfs;
+	stime;
+	_stime;
+	strcat;
+	strchr;
+	strcmp;
+	strcoll;
+	strcpy;
+	strcspn;
+	strdup;
+	_strdup;
+	strerror;
+	strftime;
+	strlen;
+	strncat;
+	strncmp;
+	strncpy;
+	strpbrk;
+	strrchr;
+	strspn;
+	strstr;
+	strtod;
+	strtok;
+	strtol;
+	strtoul;
+	strxfrm;
+	swab;
+	_swab;
+	swapcontext;
+	_swapcontext;
+	symlink;
+	_symlink;
+	sync;
+	_sync;
+	sysconf;
+	_sysconf;
+	system;
+	tcdrain;
+	_tcdrain;
+	tcflow;
+	_tcflow;
+	tcflush;
+	_tcflush;
+	tcgetattr;
+	_tcgetattr;
+	tcgetpgrp;
+	_tcgetpgrp;
+	tcgetsid;
+	_tcgetsid;
+	tcsendbreak;
+	_tcsendbreak;
+	tcsetattr;
+	_tcsetattr;
+	tcsetpgrp;
+	_tcsetpgrp;
+	tdelete;
+	_tdelete;
+	tell;
+	_tell;
+	telldir;
+	_telldir;
+	tempnam;
+	_tempnam;
+	tfind;
+	_tfind;
+	time;
+	_time;
+	times;
+	_times;
+	timezone;
+	_timezone;
+	tmpfile;
+	tmpnam;
+	toascii;
+	_toascii;
+	tolower;
+	_tolower;
+	toupper;
+	_toupper;
+	tsearch;
+	_tsearch;
+	ttyname;
+	_ttyname;
+	twalk;
+	_twalk;
+	tzname;
+	_tzname;
+	tzset;
+	_tzset;
+	ulimit;
+	_ulimit;
+	umask;
+	_umask;
+	umount;
+	_umount;
+	uname;
+	_uname;
+	ungetc;
+	unlink;
+	_unlink;
+	unlockpt;
+	_unlockpt;
+	utime;
+	_utime;
+	vfprintf;
+	vprintf;
+	vsprintf;
+	wait;
+	_wait;
+	waitid;
+	_waitid;
+	waitpid;
+	_waitpid;
+	wcstombs;
+	wctomb;
+	write;
+	_write;
+	writev;
+	_writev;
+	_xftw;
+	_xmknod;
+	_xstat;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_D_cplx_lr_div;
+	_D_cplx_lr_div_ix;
+	_D_cplx_lr_div_rx;
+	__divdi3;
+	__divrem64;
+	_dladdr = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dladdr1 = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dlclose = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dldump = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dlerror = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dlinfo = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dlmopen = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dlopen = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dlsym = FUNCTION FILTER /usr/lib/ld.so.1;
+	_F_cplx_lr_div;
+	_F_cplx_lr_div_ix;
+	_F_cplx_lr_div_rx;
+	_file_set;
+	__fltrounds;
+	_fprintf_c89;
+	_fscanf_c89;
+	__fseterror_u;
+	_fwprintf_c89;
+	_fwscanf_c89;
+	gtty;
+	_gtty;
+	_hasmntopt;
+	htonl;
+	htons;
+	_imaxabs_c89;
+	_imaxdiv_c89;
+	_ld_libc = FUNCTION FILTER /usr/lib/ld.so.1;
+	_memcmp;
+	_memcpy;
+	_memmove;
+	_memset;
+	__moddi3;
+	ntohl;
+	ntohs;
+	_printf_c89;
+	_scanf_c89;
+	_snprintf_c89;
+	_sprintf_c89;
+	_sscanf_c89;
+	_sse_hw;
+	_strtoimax_c89;
+	_strtoumax_c89;
+	_swprintf_c89;
+	_swscanf_c89;
+	_sys_errlist;
+	_sys_errs;
+	sysi86;
+	_sysi86;
+	_sys_index;
+	_sys_nerr;
+	_sys_num_err;
+	___tls_get_addr;
+	__udivdi3;
+	__udivrem64;
+	__umoddi3;
+	_vfprintf_c89;
+	_vfscanf_c89;
+	_vfwprintf_c89;
+	_vfwscanf_c89;
+	_vprintf_c89;
+	_vscanf_c89;
+	_vsnprintf_c89;
+	_vsprintf_c89;
+	_vsscanf_c89;
+	_vswprintf_c89;
+	_vswscanf_c89;
+	_vwprintf_c89;
+	_vwscanf_c89;
+	_wcstoimax_c89;
+	_wcstoumax_c89;
+	_wprintf_c89;
+	_wscanf_c89;
+	_X_cplx_div;
+	_X_cplx_div_ix;
+	_X_cplx_div_rx;
+	_X_cplx_lr_div;
+	_X_cplx_lr_div_ix;
+	_X_cplx_lr_div_rx;
+	_X_cplx_mul;
+	__xgetRD;
+	__xtol;
+	__xtoll;
+	__xtoul;
+	__xtoull;
+};
diff --git a/usr/src/lib/libc/port/mapfile-vers b/usr/src/lib/libc/port/mapfile-vers
new file mode 100644
index 0000000000..a4ec4c8d7e
--- /dev/null
+++ b/usr/src/lib/libc/port/mapfile-vers
@@ -0,0 +1,2205 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.23 {		# SunOS 5.11 (Solaris 11)
+    global:
+	aio_cancel;
+	aiocancel;
+	aio_error;
+	aio_fsync;
+	aio_read;
+	aioread;
+	aio_return;
+	aio_suspend;
+	aiowait;
+	aio_waitn;
+	aio_write;
+	aiowrite;
+	assfail;
+	clock_getres;
+	clock_gettime;
+	clock_nanosleep;
+	clock_settime;
+	door_bind;
+	door_call;
+	door_create;
+	door_cred;
+	door_getparam;
+	door_info;
+	door_return;
+	door_revoke;
+	door_server_create;
+	door_setparam;
+	door_ucred;
+	door_unbind;
+	fdatasync;
+	is_system_labeled;
+	lio_listio;
+	mkdtemp;
+	_mkdtemp;
+	mkstemps;
+	_mkstemps;
+	mq_close;
+	mq_getattr;
+	mq_notify;
+	mq_open;
+	mq_receive;
+	mq_reltimedreceive_np;
+	mq_reltimedsend_np;
+	mq_send;
+	mq_setattr;
+	mq_timedreceive;
+	mq_timedsend;
+	mq_unlink;
+	nanosleep;
+	posix_fallocate;
+	_renameat;
+	sched_getparam;
+	sched_get_priority_max;
+	sched_get_priority_min;
+	sched_getscheduler;
+	sched_rr_get_interval;
+	sched_setparam;
+	sched_setscheduler;
+	sched_yield;
+	sem_close;
+	sem_destroy;
+	sem_getvalue;
+	sem_init;
+	sem_open;
+	sem_post;
+	sem_reltimedwait_np;
+	sem_timedwait;
+	sem_trywait;
+	sem_unlink;
+	sem_wait;
+	shm_open;
+	shm_unlink;
+	sigqueue;
+	sigtimedwait;
+	sigwaitinfo;
+	timer_create;
+	timer_delete;
+	timer_getoverrun;
+	timer_gettime;
+	timer_settime;
+	ucred_getlabel;
+	_ucred_getlabel;
+} SUNW_1.22.1;
+
+SUNW_1.22.1 {
+    global:
+	atomic_add_8;
+	atomic_add_8_nv;
+	atomic_add_char;
+	atomic_add_char_nv;
+	atomic_add_int;
+	atomic_add_int_nv;
+	atomic_add_ptr;
+	atomic_add_ptr_nv;
+	atomic_add_short;
+	atomic_add_short_nv;
+	atomic_and_16;
+	atomic_and_16_nv;
+	atomic_and_32_nv;
+	atomic_and_64;
+	atomic_and_64_nv;
+	atomic_and_8;
+	atomic_and_8_nv;
+	atomic_and_uchar;
+	atomic_and_uchar_nv;
+	atomic_and_uint_nv;
+	atomic_and_ulong;
+	atomic_and_ulong_nv;
+	atomic_and_ushort;
+	atomic_and_ushort_nv;
+	atomic_cas_16;
+	atomic_cas_32;
+	atomic_cas_64;
+	atomic_cas_8;
+	atomic_cas_ptr;
+	atomic_cas_uchar;
+	atomic_cas_uint;
+	atomic_cas_ulong;
+	atomic_cas_ushort;
+	atomic_clear_long_excl;
+	atomic_dec_16;
+	atomic_dec_16_nv;
+	atomic_dec_32;
+	atomic_dec_32_nv;
+	atomic_dec_64;
+	atomic_dec_64_nv;
+	atomic_dec_8;
+	atomic_dec_8_nv;
+	atomic_dec_uchar;
+	atomic_dec_uchar_nv;
+	atomic_dec_uint;
+	atomic_dec_uint_nv;
+	atomic_dec_ulong;
+	atomic_dec_ulong_nv;
+	atomic_dec_ushort;
+	atomic_dec_ushort_nv;
+	atomic_inc_16;
+	atomic_inc_16_nv;
+	atomic_inc_32;
+	atomic_inc_32_nv;
+	atomic_inc_64;
+	atomic_inc_64_nv;
+	atomic_inc_8;
+	atomic_inc_8_nv;
+	atomic_inc_uchar;
+	atomic_inc_uchar_nv;
+	atomic_inc_uint;
+	atomic_inc_uint_nv;
+	atomic_inc_ulong;
+	atomic_inc_ulong_nv;
+	atomic_inc_ushort;
+	atomic_inc_ushort_nv;
+	atomic_or_16;
+	atomic_or_16_nv;
+	atomic_or_32_nv;
+	atomic_or_64;
+	atomic_or_64_nv;
+	atomic_or_8;
+	atomic_or_8_nv;
+	atomic_or_uchar;
+	atomic_or_uchar_nv;
+	atomic_or_uint_nv;
+	atomic_or_ulong;
+	atomic_or_ulong_nv;
+	atomic_or_ushort;
+	atomic_or_ushort_nv;
+	atomic_set_long_excl;
+	atomic_swap_16;
+	atomic_swap_32;
+	atomic_swap_64;
+	atomic_swap_8;
+	atomic_swap_ptr;
+	atomic_swap_uchar;
+	atomic_swap_uint;
+	atomic_swap_ulong;
+	atomic_swap_ushort;
+	membar_consumer;
+	membar_enter;
+	membar_exit;
+	membar_producer;
+} SUNW_1.22;
+
+SUNW_1.22 {		# SunOS 5.10 (Solaris 10)
+    global:
+	alphasort;
+	_alphasort;
+	atomic_add_16;
+	atomic_add_16_nv;
+	atomic_add_32;
+	atomic_add_32_nv;
+	atomic_add_64;
+	atomic_add_64_nv;
+	atomic_add_long;
+	atomic_add_long_nv;
+	atomic_and_32;
+	atomic_and_uint;
+	atomic_or_32;
+	atomic_or_uint;
+	_Exit;
+	getisax;
+	_getisax;
+	getopt_clip;
+	_getopt_clip;
+	getopt_long;
+	_getopt_long;
+	getopt_long_only;
+	_getopt_long_only;
+	getpeerucred;
+	_getpeerucred;
+	getpflags;
+	_getpflags;
+	getppriv;
+	_getppriv;
+	getprivimplinfo;
+	_getprivimplinfo;
+	getzoneid;
+	getzoneidbyname;
+	getzonenamebyid;
+	imaxabs;
+	imaxdiv;
+	isblank;
+	iswblank;
+	port_alert;
+	port_associate;
+	port_create;
+	port_dissociate;
+	port_get;
+	port_getn;
+	port_send;
+	port_sendn;
+	posix_openpt;
+	posix_spawn;
+	posix_spawnattr_destroy;
+	posix_spawnattr_getflags;
+	posix_spawnattr_getpgroup;
+	posix_spawnattr_getschedparam;
+	posix_spawnattr_getschedpolicy;
+	posix_spawnattr_getsigdefault;
+	posix_spawnattr_getsigmask;
+	posix_spawnattr_init;
+	posix_spawnattr_setflags;
+	posix_spawnattr_setpgroup;
+	posix_spawnattr_setschedparam;
+	posix_spawnattr_setschedpolicy;
+	posix_spawnattr_setsigdefault;
+	posix_spawnattr_setsigmask;
+	posix_spawn_file_actions_addclose;
+	posix_spawn_file_actions_adddup2;
+	posix_spawn_file_actions_addopen;
+	posix_spawn_file_actions_destroy;
+	posix_spawn_file_actions_init;
+	posix_spawnp;
+	priv_addset;
+	_priv_addset;
+	priv_allocset;
+	_priv_allocset;
+	priv_copyset;
+	_priv_copyset;
+	priv_delset;
+	_priv_delset;
+	priv_emptyset;
+	_priv_emptyset;
+	priv_fillset;
+	_priv_fillset;
+	__priv_free_info;
+	priv_freeset;
+	_priv_freeset;
+	priv_getbyname;
+	_priv_getbyname;
+	__priv_getbyname;
+	priv_getbynum;
+	_priv_getbynum;
+	__priv_getbynum;
+	__priv_getdata;
+	priv_getsetbyname;
+	_priv_getsetbyname;
+	__priv_getsetbyname;
+	priv_getsetbynum;
+	_priv_getsetbynum;
+	__priv_getsetbynum;
+	priv_gettext;
+	_priv_gettext;
+	priv_ineffect;
+	_priv_ineffect;
+	priv_intersect;
+	_priv_intersect;
+	priv_inverse;
+	_priv_inverse;
+	priv_isemptyset;
+	_priv_isemptyset;
+	priv_isequalset;
+	_priv_isequalset;
+	priv_isfullset;
+	_priv_isfullset;
+	priv_ismember;
+	_priv_ismember;
+	priv_issubset;
+	_priv_issubset;
+	__priv_parse_info;
+	priv_set;
+	_priv_set;
+	priv_set_to_str;
+	_priv_set_to_str;
+	__priv_set_to_str;
+	priv_str_to_set;
+	_priv_str_to_set;
+	priv_union;
+	_priv_union;
+	pselect;
+	pthread_attr_getstack;
+	pthread_attr_setstack;
+	pthread_barrierattr_destroy;
+	pthread_barrierattr_getpshared;
+	pthread_barrierattr_init;
+	pthread_barrierattr_setpshared;
+	pthread_barrier_destroy;
+	pthread_barrier_init;
+	pthread_barrier_wait;
+	pthread_condattr_getclock;
+	pthread_condattr_setclock;
+	pthread_mutexattr_getrobust_np;
+	pthread_mutexattr_setrobust_np;
+	pthread_mutex_consistent_np;
+	pthread_mutex_reltimedlock_np;
+	pthread_mutex_timedlock;
+	pthread_rwlock_reltimedrdlock_np;
+	pthread_rwlock_reltimedwrlock_np;
+	pthread_rwlock_timedrdlock;
+	pthread_rwlock_timedwrlock;
+	pthread_setschedprio;
+	pthread_spin_destroy;
+	pthread_spin_init;
+	pthread_spin_lock;
+	pthread_spin_trylock;
+	pthread_spin_unlock;
+	rctlblk_set_recipient_pid;
+	scandir;
+	_scandir;
+	schedctl_exit;
+	schedctl_init;
+	schedctl_lookup;
+	sema_reltimedwait;
+	sema_timedwait;
+	setenv;
+	setpflags;
+	_setpflags;
+	setppriv;
+	_setppriv;
+	strerror_r;
+	strtof;
+	strtoimax;
+	strtold;
+	strtoumax;
+	ucred_free;
+	_ucred_free;
+	ucred_get;
+	_ucred_get;
+	ucred_getegid;
+	_ucred_getegid;
+	ucred_geteuid;
+	_ucred_geteuid;
+	ucred_getgroups;
+	_ucred_getgroups;
+	ucred_getpflags;
+	_ucred_getpflags;
+	ucred_getpid;
+	_ucred_getpid;
+	ucred_getprivset;
+	_ucred_getprivset;
+	ucred_getprojid;
+	_ucred_getprojid;
+	ucred_getrgid;
+	_ucred_getrgid;
+	ucred_getruid;
+	_ucred_getruid;
+	ucred_getsgid;
+	_ucred_getsgid;
+	ucred_getsuid;
+	_ucred_getsuid;
+	ucred_getzoneid;
+	_ucred_getzoneid;
+	ucred_size;
+	_ucred_size;
+	unsetenv;
+	wcstof;
+	wcstoimax;
+	wcstold;
+	wcstoll;
+	wcstoull;
+	wcstoumax;
+} SUNW_1.21.3;
+
+SUNW_1.21.3 {
+    global:
+	forkall;
+} SUNW_1.21.2;
+
+SUNW_1.21.2 {
+    global:
+	getustack;
+	_getustack;
+	setustack;
+	_setustack;
+	stack_getbounds;
+	_stack_getbounds;
+	_stack_grow;
+	stack_inbounds;
+	_stack_inbounds;
+	stack_setbounds;
+	_stack_setbounds;
+	stack_violation;
+	_stack_violation;
+} SUNW_1.21.1;
+
+SUNW_1.21.1 {
+    global:
+	crypt_gensalt;
+} SUNW_1.21;
+
+SUNW_1.21 {		# SunOS 5.9 (Solaris 9)
+    global:
+	attropen;
+	_attropen;
+	bind_textdomain_codeset;
+	closefrom;
+	_closefrom;
+	cond_reltimedwait;
+	dcngettext;
+	dngettext;
+	fchownat;
+	_fchownat;
+	fdopendir;
+	_fdopendir;
+	fdwalk;
+	_fdwalk;
+	fstatat;
+	_fstatat;
+	futimesat;
+	_futimesat;
+	getcpuid;
+	_getcpuid;
+	gethomelgroup;
+	_gethomelgroup;
+	getpagesizes;
+	getrctl;
+	_getrctl;
+	issetugid;
+	_issetugid;
+	_lwp_cond_reltimedwait;
+	meminfo;
+	_meminfo;
+	ngettext;
+	openat;
+	_openat;
+	printstack;
+	priocntl;
+	priocntlset;
+	pset_getattr;
+	pset_getloadavg;
+	pset_list;
+	pset_setattr;
+	pthread_cond_reltimedwait_np;
+	rctlblk_get_enforced_value;
+	rctlblk_get_firing_time;
+	rctlblk_get_global_action;
+	rctlblk_get_global_flags;
+	rctlblk_get_local_action;
+	rctlblk_get_local_flags;
+	rctlblk_get_privilege;
+	rctlblk_get_recipient_pid;
+	rctlblk_get_value;
+	rctlblk_set_local_action;
+	rctlblk_set_local_flags;
+	rctlblk_set_privilege;
+	rctlblk_set_value;
+	rctlblk_size;
+	rctl_walk;
+	renameat;
+	setrctl;
+	_setrctl;
+	unlinkat;
+	_unlinkat;
+	vfscanf;
+	_vfscanf;
+	vfwscanf;
+	vscanf;
+	_vscanf;
+	vsscanf;
+	_vsscanf;
+	vswscanf;
+	vwscanf;
+} SUNW_1.20.4;
+
+SUNW_1.20.4 {
+    global:
+	semtimedop;
+	_semtimedop;
+} SUNW_1.20.1;
+
+SUNW_1.20.1 {
+    global:
+	getacct;
+	_getacct;
+	getprojid;
+	_getprojid;
+	gettaskid;
+	_gettaskid;
+	msgids;
+	_msgids;
+	msgsnap;
+	_msgsnap;
+	putacct;
+	_putacct;
+	semids;
+	_semids;
+	settaskid;
+	_settaskid;
+	shmids;
+	_shmids;
+	wracct;
+	_wracct;
+} SUNW_1.20;
+
+SUNW_1.20 {		# SunOS 5.8 (Solaris 8)
+    global:
+	getextmntent;
+	resetmnttab;
+} SUNW_1.19;
+
+SUNW_1.19 {
+    global:
+	strlcat;
+	strlcpy;
+	umount2;
+	_umount2;
+} SUNW_1.18.1;
+
+SUNW_1.18.1 {
+    global:
+	__fsetlocking;
+} SUNW_1.18;
+
+SUNW_1.18 {		# SunOS 5.7 (Solaris 7)
+    global:
+	btowc;
+	__fbufsize;
+	__flbf;
+	_flushlbf;
+	__fpending;
+	__fpurge;
+	__freadable;
+	__freading;
+	fwide;
+	fwprintf;
+	__fwritable;
+	__fwriting;
+	fwscanf;
+	getloadavg;
+	isaexec;
+	mbrlen;
+	mbrtowc;
+	mbsinit;
+	mbsrtowcs;
+	pcsample;
+	pthread_attr_getguardsize;
+	pthread_attr_setguardsize;
+	pthread_getconcurrency;
+	pthread_mutexattr_gettype;
+	pthread_mutexattr_settype;
+	pthread_rwlockattr_destroy;
+	pthread_rwlockattr_getpshared;
+	pthread_rwlockattr_init;
+	pthread_rwlockattr_setpshared;
+	pthread_rwlock_destroy;
+	pthread_rwlock_init;
+	pthread_rwlock_rdlock;
+	pthread_rwlock_tryrdlock;
+	pthread_rwlock_trywrlock;
+	pthread_rwlock_unlock;
+	pthread_rwlock_wrlock;
+	pthread_setconcurrency;
+	swprintf;
+	swscanf;
+	__sysconf_xpg5;
+	vfwprintf;
+	vswprintf;
+	vwprintf;
+	wcrtomb;
+	wcsrtombs;
+	wcsstr;
+	wctob;
+	wmemchr;
+	wmemcmp;
+	wmemcpy;
+	wmemmove;
+	wmemset;
+	wprintf;
+	wscanf;
+} SUNW_1.17;
+
+# The empty versions SUNW_1.2 through SUNW_1.17 must be preserved because
+# applications built on Solaris 2.6 Beta (when they did contain symbols)
+# may depend on them.  All symbol content for SunOS 5.6 is now in SUNW_1.1
+
+SUNW_1.17 {
+    global:
+	SUNW_1.17;
+} SUNW_1.16;
+
+SUNW_1.16 {
+    global:
+	SUNW_1.16;
+} SUNW_1.15;
+
+SUNW_1.15 {
+    global:
+	SUNW_1.15;
+} SUNW_1.14;
+
+SUNW_1.14 {
+    global:
+	SUNW_1.14;
+} SUNW_1.13;
+
+SUNW_1.13 {
+    global:
+	SUNW_1.13;
+} SUNW_1.12;
+
+SUNW_1.12 {
+    global:
+	SUNW_1.12;
+} SUNW_1.11;
+
+SUNW_1.11 {
+    global:
+	SUNW_1.11;
+} SUNW_1.10;
+
+SUNW_1.10 {
+    global:
+	SUNW_1.10;
+} SUNW_1.9;
+
+SUNW_1.9 {
+    global:
+	SUNW_1.9;
+} SUNW_1.8;
+
+SUNW_1.8 {
+    global:
+	SUNW_1.8;
+} SUNW_1.7;
+
+SUNW_1.7 {
+    global:
+	SUNW_1.7;
+} SUNW_1.6;
+
+SUNW_1.6 {
+    global:
+	SUNW_1.6;
+} SUNW_1.5;
+
+SUNW_1.5 {
+    global:
+	SUNW_1.5;
+} SUNW_1.4;
+
+SUNW_1.4 {
+    global:
+	SUNW_1.4;
+} SUNW_1.3;
+
+SUNW_1.3 {
+    global:
+	SUNW_1.3;
+} SUNW_1.2;
+
+SUNW_1.2 {
+    global:
+	SUNW_1.2;
+} SUNW_1.1;
+
+SUNW_1.1 {		# SunOS 5.6 (Solaris 2.6)
+    global:
+	basename;
+	bindtextdomain;
+	bsd_signal;
+	dbm_clearerr;
+	dbm_error;
+	dcgettext;
+	dgettext;
+	directio;
+	dirname;
+	endusershell;
+	_exithandle;
+	fgetwc;
+	fgetws;
+	fpgetround;
+	fpsetround;
+	fputwc;
+	fputws;
+	fseeko;
+	ftello;
+	ftrylockfile;
+	getexecname;
+	_getexecname;
+	getpassphrase;
+	gettext;
+	getusershell;
+	getwc;
+	getwchar;
+	getws;
+	isenglish;
+	isideogram;
+	isnumber;
+	isphonogram;
+	isspecial;
+	iswalnum;
+	iswalpha;
+	iswcntrl;
+	iswctype;
+	iswdigit;
+	iswgraph;
+	iswlower;
+	iswprint;
+	iswpunct;
+	iswspace;
+	iswupper;
+	iswxdigit;
+	__loc1;
+	____loc1;
+	_longjmp;
+	_lwp_sema_trywait;
+	ntp_adjtime;
+	_ntp_adjtime;
+	ntp_gettime;
+	_ntp_gettime;
+	__posix_asctime_r;
+	__posix_ctime_r;
+	__posix_getgrgid_r;
+	__posix_getgrnam_r;
+	__posix_getlogin_r;
+	__posix_getpwnam_r;
+	__posix_getpwuid_r;
+	__posix_sigwait;
+	__posix_ttyname_r;
+	pset_assign;
+	pset_bind;
+	pset_create;
+	pset_destroy;
+	pset_info;
+	pthread_atfork;
+	pthread_attr_destroy;
+	pthread_attr_getdetachstate;
+	pthread_attr_getinheritsched;
+	pthread_attr_getschedparam;
+	pthread_attr_getschedpolicy;
+	pthread_attr_getscope;
+	pthread_attr_getstackaddr;
+	pthread_attr_getstacksize;
+	pthread_attr_init;
+	pthread_attr_setdetachstate;
+	pthread_attr_setinheritsched;
+	pthread_attr_setschedparam;
+	pthread_attr_setschedpolicy;
+	pthread_attr_setscope;
+	pthread_attr_setstackaddr;
+	pthread_attr_setstacksize;
+	pthread_cancel;
+	__pthread_cleanup_pop;
+	__pthread_cleanup_push;
+	pthread_create;
+	pthread_detach;
+	pthread_equal;
+	pthread_exit;
+	pthread_getschedparam;
+	pthread_getspecific;
+	pthread_join;
+	pthread_key_create;
+	pthread_key_delete;
+	pthread_kill;
+	pthread_once;
+	pthread_self;
+	pthread_setcancelstate;
+	pthread_setcanceltype;
+	pthread_setschedparam;
+	pthread_setspecific;
+	pthread_sigmask;
+	pthread_testcancel;
+	putwc;
+	putwchar;
+	putws;
+	regcmp;
+	regex;
+	resolvepath;
+	_resolvepath;
+	rwlock_destroy;
+	_rwlock_destroy;
+	sema_destroy;
+	_sema_destroy;
+	_setjmp;
+	setusershell;
+	siginterrupt;
+	sigstack;
+	snprintf;
+	strtows;
+	sync_instruction_memory;
+	textdomain;
+	thr_main;
+	towctrans;
+	towlower;
+	towupper;
+	ungetwc;
+	vsnprintf;
+	watoll;
+	wcscat;
+	wcschr;
+	wcscmp;
+	wcscoll;
+	wcscpy;
+	wcscspn;
+	wcsftime;
+	wcslen;
+	wcsncat;
+	wcsncmp;
+	wcsncpy;
+	wcspbrk;
+	wcsrchr;
+	wcsspn;
+	wcstod;
+	wcstok;
+	wcstol;
+	wcstoul;
+	wcswcs;
+	wcswidth;
+	wcsxfrm;
+	wctrans;
+	wctype;
+	wcwidth;
+	wscasecmp;
+	wscat;
+	wschr;
+	wscmp;
+	wscol;
+	wscoll;
+	wscpy;
+	wscspn;
+	wsdup;
+	wslen;
+	wsncasecmp;
+	wsncat;
+	wsncmp;
+	wsncpy;
+	wspbrk;
+	wsprintf;
+	wsrchr;
+	wsscanf;
+	wsspn;
+	wstod;
+	wstok;
+	wstol;
+	wstoll;
+	wstostr;
+	wsxfrm;
+	__xpg4_putmsg;
+	__xpg4_putpmsg;
+} SUNW_0.9;
+
+SUNW_0.9 {		# SunOS 5.5 (Solaris 2.5)
+    global:
+	acl;
+	bcmp;
+	bcopy;
+	bzero;
+	facl;
+	ftime;
+	getdtablesize;
+	gethostid;
+	gethostname;
+	getpagesize;
+	getpriority;
+	getrusage;
+	getwd;
+	index;
+	initstate;
+	killpg;
+	_nsc_trydoorcall;
+	pthread_condattr_destroy;
+	pthread_condattr_getpshared;
+	pthread_condattr_init;
+	pthread_condattr_setpshared;
+	pthread_cond_broadcast;
+	pthread_cond_destroy;
+	pthread_cond_init;
+	pthread_cond_signal;
+	pthread_cond_timedwait;
+	pthread_cond_wait;
+	pthread_mutexattr_destroy;
+	pthread_mutexattr_getprioceiling;
+	pthread_mutexattr_getprotocol;
+	pthread_mutexattr_getpshared;
+	pthread_mutexattr_init;
+	pthread_mutexattr_setprioceiling;
+	pthread_mutexattr_setprotocol;
+	pthread_mutexattr_setpshared;
+	pthread_mutex_destroy;
+	pthread_mutex_getprioceiling;
+	pthread_mutex_init;
+	pthread_mutex_lock;
+	pthread_mutex_setprioceiling;
+	pthread_mutex_trylock;
+	pthread_mutex_unlock;
+	random;
+	reboot;
+	re_comp;
+	re_exec;
+	rindex;
+	setbuffer;
+	sethostname;
+	setlinebuf;
+	setpriority;
+	setregid;
+	setreuid;
+	setstate;
+	srandom;
+	thr_min_stack;
+	thr_stksegment;
+	ualarm;
+	usleep;
+	wait3;
+	wait4;
+} SUNW_0.8;
+
+SUNW_0.8 {		# SunOS 5.4 (Solaris 2.4)
+    global:
+	addsev;
+	cond_broadcast;
+	cond_destroy;
+	cond_init;
+	cond_signal;
+	cond_timedwait;
+	cond_wait;
+	confstr;
+	fnmatch;
+	_getdate_err_addr;
+	glob;
+	globfree;
+	iconv;
+	iconv_close;
+	iconv_open;
+	lfmt;
+	mutex_destroy;
+	mutex_init;
+	mutex_lock;
+	mutex_trylock;
+	mutex_unlock;
+	pfmt;
+	regcomp;
+	regerror;
+	regexec;
+	regfree;
+	rwlock_init;
+	rw_rdlock;
+	rw_read_held;
+	rw_tryrdlock;
+	rw_trywrlock;
+	rw_unlock;
+	rw_write_held;
+	rw_wrlock;
+	sema_held;
+	sema_init;
+	sema_post;
+	sema_trywait;
+	sema_wait;
+	setcat;
+	sigfpe;
+	strfmon;
+	strptime;
+	thr_continue;
+	thr_create;
+	thr_exit;
+	thr_getconcurrency;
+	thr_getprio;
+	thr_getspecific;
+	thr_join;
+	thr_keycreate;
+	thr_kill;
+	thr_self;
+	thr_setconcurrency;
+	thr_setprio;
+	thr_setspecific;
+	thr_sigsetmask;
+	thr_suspend;
+	thr_yield;
+	vlfmt;
+	vpfmt;
+	wordexp;
+	wordfree;
+	__xpg4 = NODIRECT;
+} SUNW_0.7;
+
+SUNW_0.7 {		# SunOS 5.3 (Solaris 2.3)
+    global:
+	a64l;
+	adjtime;
+	altzone;
+	ascftime;
+	atoll;
+	brk;
+	cftime;
+	closelog;
+	csetcol;
+	csetlen;
+	ctermid_r;
+	dbm_close;
+	dbm_delete;
+	dbm_fetch;
+	dbm_firstkey;
+	dbm_nextkey;
+	dbm_open;
+	dbm_store;
+	decimal_to_double;
+	decimal_to_extended;
+	decimal_to_quadruple;
+	decimal_to_single;
+	double_to_decimal;
+	drand48;
+	econvert;
+	ecvt;
+	endnetgrent;
+	endspent;
+	endutent;
+	endutxent;
+	erand48;
+	euccol;
+	euclen;
+	eucscol;
+	extended_to_decimal;
+	fchroot;
+	fconvert;
+	fcvt;
+	ffs;
+	fgetspent;
+	fgetspent_r;
+	_filbuf;
+	finite;
+	fork1;
+	fpclass;
+	fpgetmask;
+	fpgetsticky;
+	fpsetmask;
+	fpsetsticky;
+	fstatfs;
+	ftruncate;
+	ftw;
+	func_to_decimal;
+	gconvert;
+	gcvt;
+	getdents;
+	gethrtime;
+	gethrvtime;
+	getmntany;
+	getmntent;
+	getnetgrent;
+	getnetgrent_r;
+	getpw;
+	getspent;
+	getspent_r;
+	getspnam;
+	getspnam_r;
+	getutent;
+	getutid;
+	getutline;
+	getutmp;
+	getutmpx;
+	getutxent;
+	getutxid;
+	getutxline;
+	getvfsany;
+	getvfsent;
+	getvfsfile;
+	getvfsspec;
+	getwidth;
+	gsignal;
+	hasmntopt;
+	innetgr;
+	insque;
+	_insque;
+	isnanf = FUNCTION FILTER libm.so.2;
+	jrand48;
+	l64a;
+	ladd;
+	lckpwdf;
+	lcong48;
+	ldivide;
+	lexp10;
+	llabs;
+	lldiv;
+	llog10;
+	llseek;
+	lltostr;
+	lmul;
+	lone;
+	lrand48;
+	lshiftl;
+	lsub;
+	lten;
+	_lwp_cond_broadcast;
+	_lwp_cond_signal;
+	_lwp_cond_timedwait;
+	_lwp_cond_wait;
+	_lwp_continue;
+	_lwp_info;
+	_lwp_kill;
+	_lwp_mutex_lock;
+	_lwp_mutex_trylock;
+	_lwp_mutex_unlock;
+	_lwp_self;
+	_lwp_sema_init;
+	_lwp_sema_post;
+	_lwp_sema_wait;
+	_lwp_suspend;
+	lzero;
+	madvise;
+	__major;
+	__makedev;
+	memalign = NODIRECT;
+	mincore;
+	__minor;
+	mkstemp;
+	_mkstemp;
+	mlockall;
+	modff = FUNCTION FILTER libm.so.2;
+	mrand48;
+	munlockall;
+	nrand48;
+	nss_default_finders;
+	_nss_netdb_aliases;
+	_nss_XbyY_buf_alloc;
+	_nss_XbyY_buf_free;
+	__nsw_extended_action;
+	__nsw_freeconfig;
+	__nsw_getconfig;
+	openlog;
+	plock;
+	pread;
+	__priocntl;
+	__priocntlset;
+	processor_bind;
+	processor_info;
+	psiginfo;
+	psignal;
+	putpwent;
+	putspent;
+	pututline;
+	pututxline;
+	pwrite;
+	qeconvert;
+	qecvt;
+	qfconvert;
+	qfcvt;
+	qgconvert;
+	qgcvt;
+	quadruple_to_decimal;
+	realpath;
+	remque;
+	_remque;
+	seconvert;
+	seed48;
+	select;
+	_sema_held;
+	setegid;
+	seteuid;
+	setlogmask;
+	setnetgrent;
+	setspent;
+	settimeofday;
+	setutent;
+	setutxent;
+	sfconvert;
+	sgconvert;
+	sig2str;
+	sigwait;
+	single_to_decimal;
+	ssignal;
+	statfs;
+	str2sig;
+	strcasecmp;
+	string_to_decimal;
+	strncasecmp;
+	strsignal;
+	strtoll;
+	strtoull;
+	swapctl;
+	sysfs;
+	_sys_illlist;
+	syslog;
+	_syslog;
+	tmpnam_r;
+	truncate;
+	ttyslot;
+	uadmin;
+	ulckpwdf;
+	ulltostr;
+	unordered;
+	updwtmp;
+	updwtmpx;
+	ustat;
+	utimes;
+	utmpname;
+	utmpxname;
+	valloc = NODIRECT;
+	vfork;
+	vhangup;
+	vsyslog;
+	yield;
+};
+
+# There should never be more than one SUNWprivate version.
+# Don't add any more.  Add new private symbols to SUNWprivate_1.1
+
+SUNWprivate_1.1 {
+    global:
+	_a64l;
+	acctctl;
+	_acctctl;
+	_acl;
+	_adjtime;
+	___Argv = NODIRECT;
+	_ascftime;
+	_asctime_r;
+	_assert_c99;
+	__assert_c99;
+	_assfail;
+	_atoll;
+	_atomic_add_16;
+	_atomic_add_16_nv;
+	_atomic_add_32;
+	_atomic_add_32_nv;
+	_atomic_add_64;
+	_atomic_add_64_nv;
+	_atomic_add_8;
+	_atomic_add_8_nv;
+	_atomic_add_char;
+	_atomic_add_char_nv;
+	_atomic_add_int;
+	_atomic_add_int_nv;
+	_atomic_add_long;
+	_atomic_add_long_nv;
+	_atomic_add_ptr;
+	_atomic_add_ptr_nv;
+	_atomic_add_short;
+	_atomic_add_short_nv;
+	_atomic_and_16;
+	_atomic_and_16_nv;
+	_atomic_and_32;
+	_atomic_and_32_nv;
+	_atomic_and_64;
+	_atomic_and_64_nv;
+	_atomic_and_8;
+	_atomic_and_8_nv;
+	_atomic_and_uchar;
+	_atomic_and_uchar_nv;
+	_atomic_and_uint;
+	_atomic_and_uint_nv;
+	_atomic_and_ulong;
+	_atomic_and_ulong_nv;
+	_atomic_and_ushort;
+	_atomic_and_ushort_nv;
+	_atomic_cas_16;
+	_atomic_cas_32;
+	_atomic_cas_64;
+	_atomic_cas_8;
+	_atomic_cas_ptr;
+	_atomic_cas_uchar;
+	_atomic_cas_uint;
+	_atomic_cas_ulong;
+	_atomic_cas_ushort;
+	_atomic_clear_long_excl;
+	_atomic_dec_16;
+	_atomic_dec_16_nv;
+	_atomic_dec_32;
+	_atomic_dec_32_nv;
+	_atomic_dec_64;
+	_atomic_dec_64_nv;
+	_atomic_dec_8;
+	_atomic_dec_8_nv;
+	_atomic_dec_uchar;
+	_atomic_dec_uchar_nv;
+	_atomic_dec_uint;
+	_atomic_dec_uint_nv;
+	_atomic_dec_ulong;
+	_atomic_dec_ulong_nv;
+	_atomic_dec_ushort;
+	_atomic_dec_ushort_nv;
+	_atomic_inc_16;
+	_atomic_inc_16_nv;
+	_atomic_inc_32;
+	_atomic_inc_32_nv;
+	_atomic_inc_64;
+	_atomic_inc_64_nv;
+	_atomic_inc_8;
+	_atomic_inc_8_nv;
+	_atomic_inc_uchar;
+	_atomic_inc_uchar_nv;
+	_atomic_inc_uint;
+	_atomic_inc_uint_nv;
+	_atomic_inc_ulong;
+	_atomic_inc_ulong_nv;
+	_atomic_inc_ushort;
+	_atomic_inc_ushort_nv;
+	_atomic_or_16;
+	_atomic_or_16_nv;
+	_atomic_or_32;
+	_atomic_or_32_nv;
+	_atomic_or_64;
+	_atomic_or_64_nv;
+	_atomic_or_8;
+	_atomic_or_8_nv;
+	_atomic_or_uchar;
+	_atomic_or_uchar_nv;
+	_atomic_or_uint;
+	_atomic_or_uint_nv;
+	_atomic_or_ulong;
+	_atomic_or_ulong_nv;
+	_atomic_or_ushort;
+	_atomic_or_ushort_nv;
+	_atomic_set_long_excl;
+	_atomic_swap_16;
+	_atomic_swap_32;
+	_atomic_swap_64;
+	_atomic_swap_8;
+	_atomic_swap_ptr;
+	_atomic_swap_uchar;
+	_atomic_swap_uint;
+	_atomic_swap_ulong;
+	_atomic_swap_ushort;
+	_autofssys;
+	_brk;
+	__btowc_dense;
+	__btowc_euc;
+	__btowc_sb;
+	_bufsync;
+	_cfree;
+	cfree = NODIRECT;
+	_cftime;
+	__charmap_init;
+	_cladm;
+	__cladm;
+	__class_quadruple;
+	_clock_getres;
+	_clock_gettime;
+	_clock_nanosleep;
+	_clock_settime;
+	_closelog;
+	__collate_init;
+	_cond_broadcast;
+	_cond_destroy;
+	_cond_init;
+	_cond_reltimedwait;
+	_cond_signal;
+	_cond_timedwait;
+	_cond_wait;
+	core_get_default_content;
+	_core_get_default_content;
+	core_get_default_path;
+	_core_get_default_path;
+	core_get_global_content;
+	_core_get_global_content;
+	core_get_global_path;
+	_core_get_global_path;
+	core_get_options;
+	_core_get_options;
+	core_get_process_content;
+	_core_get_process_content;
+	core_get_process_path;
+	_core_get_process_path;
+	core_set_default_content;
+	_core_set_default_content;
+	core_set_default_path;
+	_core_set_default_path;
+	core_set_global_content;
+	_core_set_global_content;
+	core_set_global_path;
+	_core_set_global_path;
+	core_set_options;
+	_core_set_options;
+	core_set_process_content;
+	_core_set_process_content;
+	core_set_process_path;
+	_core_set_process_path;
+	_cswidth;
+	_ctermid_r;
+	_ctime_r;
+	__ctype_init;
+	__ctype_mask;
+	dbm_close_status;
+	dbm_do_nextkey;
+	dbm_setdefwrite;
+	_D_cplx_div;
+	_D_cplx_div_ix;
+	_D_cplx_div_rx;
+	_D_cplx_mul;
+	_decimal_to_double;
+	_decimal_to_extended;
+	_decimal_to_quadruple;
+	_decimal_to_single;
+	_delete;
+	_dgettext;
+	_door_bind;
+	_door_call;
+	_door_create;
+	_door_cred;
+	_door_getparam;
+	_door_info;
+	_door_return;
+	_door_revoke;
+	_door_server_create;
+	_door_setparam;
+	_door_ucred;
+	_door_unbind;
+	_doprnt;
+	_doscan;
+	_double_to_decimal;
+	_drand48;
+	_econvert;
+	_ecvt;
+	_endgrent;
+	_endpwent;
+	_endspent;
+	_endutent;
+	_endutxent;
+	__environ_lock = NODIRECT;
+	_erand48;
+	__eucpctowc_gen;
+	exportfs;
+	_exportfs;
+	_extended_to_decimal;
+	_facl;
+	_fchroot;
+	_fconvert;
+	_F_cplx_div;
+	_F_cplx_div_ix;
+	_F_cplx_div_rx;
+	_F_cplx_mul;
+	_fcvt;
+	_ffs;
+	_fgetgrent;
+	_fgetgrent_r;
+	_fgetpwent;
+	_fgetpwent_r;
+	_fgetspent;
+	_fgetspent_r;
+	__fgetwc_dense;
+	__fgetwc_euc;
+	__fgetwc_sb;
+	__fgetwc_xpg5;
+	__fgetws_xpg5;
+	_file_to_decimal;
+	_findbuf;
+	_findiop;
+	__fini_daemon_priv;
+	_finite;
+	_flockfile;
+	__fnmatch_C;
+	__fnmatch_sb;
+	__fnmatch_std;
+	_fork1;
+	_forkall;
+	_fpclass;
+	_fpgetmask;
+	_fpgetround;
+	_fpgetsticky;
+	_fprintf;
+	_fpsetmask;
+	_fpsetround;
+	_fpsetsticky;
+	__fputwc_xpg5;
+	__fputws_xpg5;
+	_fstatfs;
+	_ftruncate;
+	_ftrylockfile;
+	_ftw;
+	_func_to_decimal;
+	_funlockfile;
+	_gconvert;
+	_gcvt;
+	_getarg;
+	_getchar_unlocked;
+	__getcontext;
+	_getc_unlocked;
+	__getdate_std;
+	_getdents;
+	_get_exit_frame_monitor;
+	_getfp;
+	_getgrent;
+	_getgrent_r;
+	_getgrgid_r;
+	_getgrnam_r;
+	_getgroupsbymember;
+	__getloadavg;
+	_getlogin_r;
+	_getmntany;
+	_getmntent;
+	_getpw;
+	_getpwent;
+	_getpwent_r;
+	_getpwnam_r;
+	_getpwuid_r;
+	_getsp;
+	_getspent;
+	_getspent_r;
+	_getspnam;
+	_getspnam_r;
+	__gettsp;
+	_getutent;
+	_getutid;
+	_getutline;
+	_getutmp;
+	_getutmpx;
+	_getutxent;
+	_getutxid;
+	_getutxline;
+	_getvfsany;
+	_getvfsent;
+	_getvfsfile;
+	_getvfsspec;
+	__getwchar_xpg5;
+	__getwc_xpg5;
+	_getzoneid;
+	_getzoneidbyname;
+	_getzonenamebyid;
+	_gmtime_r;
+	_gsignal;
+	_iconv;
+	_iconv_close;
+	_iconv_open;
+	__inf_read;
+	__inf_written;
+	__init_daemon_priv;
+	__init_suid_priv;
+	_insert;
+	inst_sync;
+	_inst_sync;
+	_is_euc_fc;
+	_is_euc_pc;
+	__i_size;
+	_isnanf = FUNCTION FILTER libm.so.2;
+	_is_system_labeled;
+	_iswctype;
+	__iswctype_bc;
+	__iswctype_sb;
+	__iswctype_std;
+	_jrand48;
+	_l64a;
+	_ladd;
+	__lc_charmap;
+	__lc_collate;
+	__lc_ctype;
+	_lckpwdf;
+	__lc_locale;
+	__lc_messages;
+	__lc_monetary;
+	__lc_numeric;
+	_lcong48;
+	__lc_time;
+	_ldivide;
+	_lexp10;
+	_lgrp_home_fast;
+	_lgrpsys;
+	__libc_threaded;
+	_lib_version = NODIRECT;
+	_llabs;
+	_lldiv;
+	_llog10;
+	_llseek;
+	_lltostr;
+	_lmul;
+	__localeconv_std;
+	__locale_init;
+	_localtime_r;
+	_lock_clear;
+	_lock_try;
+	_logb = FUNCTION FILTER libm.so.2;
+	_lone;
+	_lrand48;
+	_lshiftl;
+	_lsub;
+	_lten;
+	_ltzset;
+	__lwp_cond_broadcast;
+	__lwp_cond_reltimedwait;
+	__lwp_cond_signal;
+	__lwp_cond_timedwait;
+	__lwp_cond_wait;
+	__lwp_continue;
+	__lwp_info;
+	__lwp_kill;
+	__lwp_mutex_lock;
+	__lwp_mutex_trylock;
+	__lwp_mutex_unlock;
+	lwp_self;
+	__lwp_self;
+	__lwp_sema_init;
+	__lwp_sema_post;
+	__lwp_sema_trywait;
+	__lwp_sema_wait;
+	__lwp_suspend;
+	_lzero;
+	_madvise;
+	makeut;
+	_makeut;
+	makeutx;
+	_makeutx;
+	__malloc_lock;
+	_mbftowc;
+	__mbftowc_dense;
+	__mbftowc_euc;
+	__mbftowc_sb;
+	__mblen_gen;
+	__mblen_sb;
+	__mbrlen_gen;
+	__mbrlen_sb;
+	__mbrtowc_dense;
+	__mbrtowc_euc;
+	__mbrtowc_sb;
+	__mbsinit_gen;
+	__mbsrtowcs_dense;
+	__mbsrtowcs_euc;
+	__mbsrtowcs_sb;
+	__mbst_get_consumed_array;
+	__mbst_get_locale;
+	__mbst_get_nconsumed;
+	__mbstowcs_dense;
+	__mbstowcs_euc;
+	__mbstowcs_sb;
+	__mbst_set_consumed_array;
+	__mbst_set_locale;
+	__mbst_set_nconsumed;
+	__mbtowc_dense;
+	__mbtowc_euc;
+	__mbtowc_sb;
+	mcfiller;
+	_memalign;
+	_membar_consumer;
+	_membar_enter;
+	_membar_exit;
+	_membar_producer;
+	__messages_init;
+	_mincore;
+	_mkarglst;
+	_mlockall;
+	mntopt;
+	modctl;
+	_modff = FUNCTION FILTER libm.so.2;
+	modutx;
+	_modutx;
+	__monetary_init;
+	_mrand48;
+	msgctl64;
+	_msgctl64;
+	__multi_innetgr;
+	_munlockall;
+	_mutex_destroy;
+	__mutex_destroy;
+	mutex_held;
+	__mutex_held;
+	_mutex_init;
+	__mutex_init;
+	__mutex_lock;
+	_mutex_trylock;
+	__mutex_trylock;
+	_mutex_unlock;
+	__mutex_unlock;
+	_nanosleep;
+	__nan_read;
+	__nan_written;
+	nfs_getfh;
+	_nfs_getfh;
+	nfssvc;
+	_nfssvc;
+	_nfssys;
+	__nis_debug_bind;
+	__nis_debug_calls;
+	__nis_debug_file;
+	__nis_debug_rpc;
+	__nis_get_environment;
+	__nis_prefsrv;
+	__nis_preftype;
+	__nis_server;
+	__nl_langinfo_std;
+	_nrand48;
+	_nss_db_state_destr;
+	_nss_default_finders;
+	nss_delete;
+	_nss_delete;
+	nss_endent;
+	_nss_endent;
+	nss_getent;
+	_nss_getent;
+	_nss_initf_netgroup;
+	nss_search;
+	_nss_search;
+	nss_setent;
+	_nss_setent;
+	_nss_XbyY_fgets;
+	__nsw_extended_action_v1;
+	__nsw_freeconfig_v1;
+	__nsw_getconfig_v1;
+	__nthreads;
+	__numeric_init;
+	_openlog;
+	_plock;
+	_port_alert;
+	_port_associate;
+	_port_create;
+	_port_dissociate;
+	_port_get;
+	_port_getn;
+	_port_send;
+	_port_sendn;
+	_posix_openpt;
+	_posix_spawn;
+	_posix_spawnattr_destroy;
+	_posix_spawnattr_getflags;
+	_posix_spawnattr_getpgroup;
+	_posix_spawnattr_getschedparam;
+	_posix_spawnattr_getschedpolicy;
+	_posix_spawnattr_getsigdefault;
+	_posix_spawnattr_getsigmask;
+	_posix_spawnattr_init;
+	_posix_spawnattr_setflags;
+	_posix_spawnattr_setpgroup;
+	_posix_spawnattr_setschedparam;
+	_posix_spawnattr_setschedpolicy;
+	_posix_spawnattr_setsigdefault;
+	_posix_spawnattr_setsigmask;
+	_posix_spawn_file_actions_addclose;
+	_posix_spawn_file_actions_adddup2;
+	_posix_spawn_file_actions_addopen;
+	_posix_spawn_file_actions_destroy;
+	_posix_spawn_file_actions_init;
+	_posix_spawnp;
+	_pread;
+	_printstack;
+	__priv_bracket;
+	__priv_relinquish;
+	_pselect;
+	pset_assign_forced;
+	_psiginfo;
+	_psignal;
+	_pthread_atfork;
+	_pthread_attr_destroy;
+	_pthread_attr_getdetachstate;
+	_pthread_attr_getguardsize;
+	_pthread_attr_getinheritsched;
+	_pthread_attr_getschedparam;
+	_pthread_attr_getschedpolicy;
+	_pthread_attr_getscope;
+	_pthread_attr_getstack;
+	_pthread_attr_getstackaddr;
+	_pthread_attr_getstacksize;
+	_pthread_attr_init;
+	_pthread_attr_setdetachstate;
+	_pthread_attr_setguardsize;
+	_pthread_attr_setinheritsched;
+	_pthread_attr_setschedparam;
+	_pthread_attr_setschedpolicy;
+	_pthread_attr_setscope;
+	_pthread_attr_setstack;
+	_pthread_attr_setstackaddr;
+	_pthread_attr_setstacksize;
+	_pthread_barrierattr_destroy;
+	_pthread_barrierattr_getpshared;
+	_pthread_barrierattr_init;
+	_pthread_barrierattr_setpshared;
+	_pthread_barrier_destroy;
+	_pthread_barrier_init;
+	_pthread_barrier_wait;
+	_pthread_cancel;
+	_pthread_condattr_destroy;
+	_pthread_condattr_getclock;
+	_pthread_condattr_getpshared;
+	_pthread_condattr_init;
+	_pthread_condattr_setclock;
+	_pthread_condattr_setpshared;
+	_pthread_cond_broadcast;
+	_pthread_cond_destroy;
+	_pthread_cond_init;
+	_pthread_cond_reltimedwait_np;
+	_pthread_cond_signal;
+	_pthread_cond_timedwait;
+	_pthread_cond_wait;
+	_pthread_create;
+	_pthread_detach;
+	_pthread_equal;
+	_pthread_exit;
+	_pthread_getconcurrency;
+	_pthread_getschedparam;
+	_pthread_getspecific;
+	_pthread_join;
+	_pthread_key_create;
+	_pthread_key_delete;
+	_pthread_kill;
+	__pthread_min_stack;
+	_pthread_mutexattr_destroy;
+	_pthread_mutexattr_getprioceiling;
+	_pthread_mutexattr_getprotocol;
+	_pthread_mutexattr_getpshared;
+	_pthread_mutexattr_getrobust_np;
+	_pthread_mutexattr_gettype;
+	_pthread_mutexattr_init;
+	_pthread_mutexattr_setprioceiling;
+	_pthread_mutexattr_setprotocol;
+	_pthread_mutexattr_setpshared;
+	_pthread_mutexattr_setrobust_np;
+	_pthread_mutexattr_settype;
+	_pthread_mutex_consistent_np;
+	_pthread_mutex_destroy;
+	_pthread_mutex_getprioceiling;
+	_pthread_mutex_init;
+	_pthread_mutex_lock;
+	_pthread_mutex_reltimedlock_np;
+	_pthread_mutex_setprioceiling;
+	_pthread_mutex_timedlock;
+	_pthread_mutex_trylock;
+	_pthread_mutex_unlock;
+	_pthread_once;
+	_pthread_rwlockattr_destroy;
+	_pthread_rwlockattr_getpshared;
+	_pthread_rwlockattr_init;
+	_pthread_rwlockattr_setpshared;
+	_pthread_rwlock_destroy;
+	_pthread_rwlock_init;
+	_pthread_rwlock_rdlock;
+	_pthread_rwlock_reltimedrdlock_np;
+	_pthread_rwlock_reltimedwrlock_np;
+	_pthread_rwlock_timedrdlock;
+	_pthread_rwlock_timedwrlock;
+	_pthread_rwlock_tryrdlock;
+	_pthread_rwlock_trywrlock;
+	_pthread_rwlock_unlock;
+	_pthread_rwlock_wrlock;
+	_pthread_self;
+	_pthread_setcancelstate;
+	_pthread_setcanceltype;
+	_pthread_setcleanupinit;
+	_pthread_setconcurrency;
+	_pthread_setschedparam;
+	_pthread_setschedprio;
+	_pthread_setspecific;
+	_pthread_sigmask;
+	_pthread_spin_destroy;
+	_pthread_spin_init;
+	_pthread_spin_lock;
+	_pthread_spin_trylock;
+	_pthread_spin_unlock;
+	_pthread_testcancel;
+	_putchar_unlocked;
+	_putc_unlocked;
+	_putpwent;
+	_putspent;
+	_pututline;
+	_pututxline;
+	__putwchar_xpg5;
+	__putwc_xpg5;
+	_pwrite;
+	_qeconvert;
+	_qecvt;
+	_qfconvert;
+	_qfcvt;
+	_qgconvert;
+	_qgcvt;
+	_quadruple_to_decimal;
+	_rand_r;
+	rctlctl;
+	_rctlctl;
+	rctllist;
+	_rctllist;
+	_readdir_r;
+	_realbufend;
+	_realpath;
+	__regcomp_C;
+	__regcomp_std;
+	__regerror_std;
+	__regexec_C;
+	__regexec_std;
+	__regfree_std;
+	_resume;
+	_resume_ret;
+	_rpcsys;
+	_rwlock_init;
+	_rw_rdlock;
+	_rw_tryrdlock;
+	_rw_trywrlock;
+	_rw_unlock;
+	_rw_wrlock;
+	_sbrk_grow_aligned;
+	_sbrk_unlocked;
+	_schedctl_exit;
+	_schedctl_init;
+	_schedctl_lookup;
+	scrwidth;
+	_seconvert;
+	_seed48;
+	_select;
+	_sema_init;
+	_sema_post;
+	_sema_reltimedwait;
+	_sema_timedwait;
+	_sema_trywait;
+	_sema_wait;
+	_sem_close;
+	semctl64;
+	_semctl64;
+	_sem_destroy;
+	_sem_getvalue;
+	_sem_init;
+	_sem_open;
+	_sem_post;
+	_sem_reltimedwait_np;
+	_sem_timedwait;
+	_sem_trywait;
+	_sem_unlink;
+	_sem_wait;
+	_setbufend;
+	_setegid;
+	_setenv;
+	__set_errno;
+	_seteuid;
+	_setgrent;
+	_setlogmask;
+	_setpwent;
+	_setregid;
+	_setreuid;
+	_setspent;
+	_settimeofday;
+	_setutent;
+	_setutxent;
+	_sfconvert;
+	_sgconvert;
+	shmctl64;
+	_shmctl64;
+	_sig2str;
+	sigflag;
+	_sigflag;
+	_sigfpe;
+	_siginterrupt;
+	_signal;
+	_sigoff;
+	_sigon;
+	_sigqueue;
+	_sigstack;
+	_sigtimedwait;
+	_sigwait;
+	_sigwaitinfo;
+	_single_to_decimal;
+	_smbuf;
+	_so_accept;
+	_so_bind;
+	_sockconfig;
+	_so_connect;
+	_so_getpeername;
+	_so_getsockname;
+	_so_getsockopt;
+	_so_listen;
+	_so_recv;
+	_so_recvfrom;
+	_so_recvmsg;
+	_so_send;
+	_so_sendmsg;
+	_so_sendto;
+	_so_setsockopt;
+	_so_shutdown;
+	_so_socket;
+	_so_socketpair;
+	_sp;
+	_srand48;
+	_ssignal;
+	_statfs;
+	_str2sig;
+	str2spwd;
+	__strcoll_C;
+	__strcoll_sb;
+	__strcoll_std;
+	_strerror;
+	_strerror_r;
+	__strfmon_std;
+	__strftime_std;
+	_string_to_decimal;
+	__strptime_dontzero;
+	__strptime_std;
+	_strsignal;
+	_strtok_r;
+	_strtoll;
+	_strtoull;
+	__strxfrm_C;
+	__strxfrm_sb;
+	__strxfrm_std;
+	stty;
+	_stty;
+	_swapctl;
+	syscall;
+	_sysconfig;
+	_sysfs;
+	__systemcall;
+	_tdb_bootstrap;
+	_thr_continue;
+	thr_continue_allmutators;
+	_thr_continue_allmutators;
+	thr_continue_mutator;
+	_thr_continue_mutator;
+	_thr_create;
+	_thr_detach;
+	__threaded;
+	_thr_exit;
+	_thr_getconcurrency;
+	_thr_get_inf_read;
+	_thr_get_nan_read;
+	_thr_getprio;
+	_thr_getspecific;
+	thr_getstate;
+	_thr_getstate;
+	_thr_join;
+	_thr_keycreate;
+	_thr_key_delete;
+	_thr_kill;
+	_thr_main;
+	_thr_min_stack;
+	thr_mutators_barrier;
+	_thr_mutators_barrier;
+	thr_probe_getfunc_addr;
+	thr_probe_setup;
+	_thr_schedctl;
+	_thr_self;
+	_thr_setconcurrency;
+	thr_setmutator;
+	_thr_setmutator;
+	_thr_setprio;
+	_thr_setspecific;
+	thr_setstate;
+	_thr_setstate;
+	thr_sighndlrinfo;
+	_thr_sighndlrinfo;
+	_thr_sigsetmask;
+	_thr_slot_offset;
+	_thr_stksegment;
+	_thr_suspend;
+	thr_suspend_allmutators;
+	_thr_suspend_allmutators;
+	thr_suspend_mutator;
+	_thr_suspend_mutator;
+	thr_wait_mutator;
+	_thr_wait_mutator;
+	_thr_yield;
+	__time_init;
+	_timer_create;
+	_timer_delete;
+	_timer_getoverrun;
+	_timer_gettime;
+	_timer_settime;
+	__tls_get_addr;
+	_tmpnam;
+	_tmpnam_r;
+	__towctrans_bc;
+	__towctrans_std;
+	__towlower_bc;
+	__towlower_std;
+	__towupper_bc;
+	__towupper_std;
+	__trans_lower;
+	__trans_upper;
+	_truncate;
+	_trwctype;
+	__trwctype_std;
+	_ttyname_dev;
+	_ttyname_r;
+	_ttyslot;
+	_uadmin;
+	_uberdata;
+	_ucred_alloc;
+	ucred_getamask;
+	_ucred_getamask;
+	ucred_getasid;
+	_ucred_getasid;
+	ucred_getatid;
+	_ucred_getatid;
+	ucred_getauid;
+	_ucred_getauid;
+	_ulckpwdf;
+	_ulltostr;
+	_uncached_getgrgid_r;
+	_uncached_getgrnam_r;
+	_uncached_getpwnam_r;
+	_uncached_getpwuid_r;
+	_ungetc_unlocked;
+	__ungetwc_xpg5;
+	_unordered;
+	_unsetenv;
+	_updwtmp;
+	_updwtmpx;
+	_usleep;
+	_ustat;
+	_utimes;
+	_utmpname;
+	_utmpxname;
+	utssys;
+	_utssys;
+	_valloc;
+	_vfork;
+	_vhangup;
+	_vsyslog;
+	_wait3;
+	_walkcontext;
+	__wcrtomb_dense;
+	__wcrtomb_euc;
+	__wcrtomb_sb;
+	__wcscoll_bc;
+	__wcscoll_C;
+	__wcscoll_std;
+	__wcsftime_std;
+	__wcsftime_xpg5;
+	__wcsrtombs_dense;
+	__wcsrtombs_euc;
+	__wcsrtombs_sb;
+	__wcstok_xpg5;
+	__wcstombs_dense;
+	__wcstombs_euc;
+	__wcstombs_sb;
+	__wcswidth_bc;
+	__wcswidth_dense;
+	__wcswidth_euc;
+	__wcswidth_sb;
+	__wcswidth_std;
+	__wcsxfrm_bc;
+	__wcsxfrm_C;
+	__wcsxfrm_std;
+	__wctob_dense;
+	__wctob_euc;
+	__wctob_sb;
+	__wctoeucpc_gen;
+	_wctomb;
+	__wctomb_dense;
+	__wctomb_euc;
+	__wctomb_sb;
+	__wctrans_std;
+	__wctype_std;
+	__wcwidth_bc;
+	__wcwidth_dense;
+	__wcwidth_euc;
+	__wcwidth_sb;
+	__wcwidth_std;
+	wdbindf;
+	wdchkind;
+	wddelim;
+	_wrtchk;
+	_xflsbuf;
+	_xgetwidth;
+	__xpg6 = NODIRECT;
+	_yield;
+	zone_boot;
+	zone_create;
+	zone_destroy;
+	zone_enter;
+	zone_getattr;
+	zone_get_id;
+	zone_list;
+	zonept;
+	zone_setattr;
+	zone_shutdown;
+	zone_version;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libc/sparc/Makefile b/usr/src/lib/libc/sparc/Makefile
index 3f75bbf549..e7f51d287d 100644
--- a/usr/src/lib/libc/sparc/Makefile
+++ b/usr/src/lib/libc/sparc/Makefile
@@ -1,4 +1,4 @@
-
+#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
@@ -18,15 +18,12 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libc/sparc/Makefile
-#
 
 LIBCBASE=.
 
@@ -974,8 +971,7 @@ ALTPICS= $(TRACEOBJS:%=pics/%)
 $(DYNLIB) := PICS += $(ROOTFS_LIBDIR)/libc_i18n.a
 $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS)
 
-MAPDIR=		../spec/sparc
-MAPFILE=	$(MAPDIR)/mapfile
+MAPFILES =	../port/mapfile-vers mapfile-vers
 
 CFLAGS +=	$(EXTN_CFLAGS)
 CPPFLAGS=	-D_REENTRANT -Dsparc $(EXTN_CPPFLAGS) \
@@ -984,8 +980,9 @@ ASFLAGS=	-K pic -P -D__STDC__ -D_ASM $(CPPFLAGS) $(sparc_AS_XARCH)
 
 # Inform the run-time linker about libc specialized initialization
 RTLDINFO =	-z rtldinfo=tls_rtldinfo
+DYNFLAGS +=	$(RTLDINFO)
 
-DYNFLAGS +=	-e __rtboot -M $(MAPFILE) $(RTLDINFO)
+DYNFLAGS +=	-e __rtboot
 DYNFLAGS +=	$(EXTN_DYNFLAGS)
 
 BUILD.s=	$(AS) $(ASFLAGS) $< -o $@
@@ -1012,7 +1009,7 @@ CLEANFILES=			\
 	pics/crtn.o		\
 	$(ALTPICS)
 
-CLOBBERFILES +=	$(MAPFILE) $(LIB_PIC)
+CLOBBERFILES +=	$(LIB_PIC)
 
 # list of C source for lint
 SRCS=							\
@@ -1050,11 +1047,6 @@ $(DYNLIB) $(LIB_PIC) := DYNOBJS = _rtbootld.o
 $(DYNLIB) := CRTI = crti.o
 $(DYNLIB) := CRTN = crtn.o
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # Files which need the threads .il inline template
 TIL=				\
 	aio.o			\
diff --git a/usr/src/lib/libc/sparc/mapfile-vers b/usr/src/lib/libc/sparc/mapfile-vers
new file mode 100644
index 0000000000..1de1823a76
--- /dev/null
+++ b/usr/src/lib/libc/sparc/mapfile-vers
@@ -0,0 +1,951 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.23 {
+    global:
+	aio_cancel64;
+	aio_error64;
+	aio_fsync64;
+	aio_read64;
+	aioread64;
+	aio_return64;
+	aio_suspend64;
+	aio_waitn64;
+	aio_write64;
+	aiowrite64;
+	enable_extended_FILE_stdio;
+	lio_listio64;
+	mkstemps64;
+	_mkstemps64;
+	posix_fallocate64;
+};
+
+SUNW_1.22 {
+    global:
+	alphasort64;
+	_alphasort64;
+	dladdr = FUNCTION FILTER /usr/lib/ld.so.1;
+	dladdr1 = FUNCTION FILTER /usr/lib/ld.so.1;
+	dlclose = FUNCTION FILTER /usr/lib/ld.so.1;
+	dldump = FUNCTION FILTER /usr/lib/ld.so.1;
+	dlerror = FUNCTION FILTER /usr/lib/ld.so.1;
+	dlinfo = FUNCTION FILTER /usr/lib/ld.so.1;
+	dlmopen = FUNCTION FILTER /usr/lib/ld.so.1;
+	dlopen = FUNCTION FILTER /usr/lib/ld.so.1;
+	dlsym = FUNCTION FILTER /usr/lib/ld.so.1;
+	pselect_large_fdset;
+	scandir64;
+	_scandir64;
+};
+
+SUNW_1.21.2 {
+    global:
+	__makecontext_v2;
+	___makecontext_v2;
+};
+
+SUNW_1.21 {
+    global:
+	attropen64;
+	_attropen64;
+	fstatat64;
+	_fstatat64;
+	openat64;
+	_openat64;
+	walkcontext;
+};
+
+SUNW_1.18 {
+    global:
+	select_large_fdset;
+};
+
+SUNW_1.1 {
+    global:
+	creat64;
+	_creat64;
+	fgetpos64;
+	__flt_rounds;
+	fopen64;
+	freopen64;
+	fseeko64;
+	fsetpos64;
+	fstat64;
+	_fstat64;
+	fstatvfs64;
+	_fstatvfs64;
+	ftello64;
+	ftruncate64;
+	_ftruncate64;
+	ftw64;
+	_ftw64;
+	getdents64;
+	_getdents64;
+	getrlimit64;
+	_getrlimit64;
+	lockf64;
+	_lockf64;
+	lseek64;
+	_lseek64;
+	lstat64;
+	_lstat64;
+	mkstemp64;
+	_mkstemp64;
+	mmap64;
+	_mmap64;
+	nftw64;
+	_nftw64;
+	open64;
+	_open64;
+	__posix_readdir_r;
+	pread64;
+	_pread64;
+	pwrite64;
+	_pwrite64;
+	readdir64;
+	_readdir64;
+	readdir64_r;
+	_readdir64_r;
+	setrlimit64;
+	_setrlimit64;
+	s_fcntl;
+	_s_fcntl;
+	s_ioctl;
+	stat64;
+	_stat64;
+	statvfs64;
+	_statvfs64;
+	tell64;
+	_tell64;
+	tmpfile64;
+	truncate64;
+	_truncate64;
+	_xftw64;
+};
+
+SUNW_0.7 {
+    global:
+	_assert;
+	_bufendtab;
+	__builtin_alloca;
+	_ctype;
+	file_to_decimal;
+	_flsbuf;
+	_lastbuf;
+	_mutex_held;
+	_mutex_lock;
+	p_online;
+	_rw_read_held;
+	_rw_write_held;
+	_sibuf;
+	_sobuf;
+	srand48;
+	_sys_buslist;
+	_syscall;
+	_sys_cldlist;
+	sys_errlist;
+	_sys_fpelist;
+	sys_nerr;
+	_sys_nsig;
+	_sys_segvlist;
+	_sys_siginfolistp;
+	_sys_siglist;
+	_sys_siglistn;
+	_sys_siglistp;
+	_sys_traplist;
+} SISCD_2.3;
+
+SISCD_2.3 {
+    global:
+	addseverity;
+	_addseverity;
+	asctime_r;
+	crypt;
+	_crypt;
+	ctime_r;
+	__div64;
+	__dtoll;
+	__dtoull;
+	encrypt;
+	_encrypt;
+	endgrent;
+	endpwent;
+	errno;
+	___errno;
+	fgetgrent;
+	fgetgrent_r;
+	fgetpwent;
+	fgetpwent_r;
+	flockfile;
+	__ftoll;
+	__ftoull;
+	funlockfile;
+	getchar_unlocked;
+	getc_unlocked;
+	getgrent;
+	getgrent_r;
+	getgrgid_r;
+	getgrnam_r;
+	getitimer;
+	_getitimer;
+	getlogin_r;
+	getpwent;
+	getpwent_r;
+	getpwnam_r;
+	getpwuid_r;
+	gettimeofday;
+	_gettimeofday;
+	gmtime_r;
+	_iob;
+	localtime_r;
+	__mul64;
+	putchar_unlocked;
+	putc_unlocked;
+	_Q_lltoq;
+	_Q_qtoll;
+	_Q_qtoull;
+	_Q_ulltoq;
+	rand_r;
+	readdir_r;
+	__rem64;
+	sbrk;
+	_sbrk;
+	setgrent;
+	setitimer;
+	_setitimer;
+	setkey;
+	_setkey;
+	setpwent;
+	strtok_r;
+	sysinfo;
+	_sysinfo;
+	ttyname_r;
+	__udiv64;
+	__umul64;
+	__urem64;
+} SYSVABI_1.3;
+
+SYSVABI_1.3 {
+    global:
+	.div;
+	.mul;
+	.rem;
+	.stret1;
+	.stret2;
+	.stret4;
+	.stret8;
+	.udiv;
+	.umul;
+	.urem;
+	abort;
+	abs;
+	access;
+	_access;
+	acct;
+	_acct;
+	alarm;
+	_alarm;
+	_altzone;
+	asctime;
+	__assert;
+	atexit;
+	atof;
+	atoi;
+	atol;
+	bsearch;
+	calloc = NODIRECT;
+	catclose;
+	_catclose;
+	catgets;
+	_catgets;
+	catopen;
+	_catopen;
+	cfgetispeed;
+	_cfgetispeed;
+	cfgetospeed;
+	_cfgetospeed;
+	cfsetispeed;
+	_cfsetispeed;
+	cfsetospeed;
+	_cfsetospeed;
+	chdir;
+	_chdir;
+	chmod;
+	_chmod;
+	chown;
+	_chown;
+	chroot;
+	_chroot;
+	_cleanup;
+	clearerr;
+	clock;
+	_close;
+	close = NODIRECT;
+	closedir;
+	_closedir;
+	creat;
+	_creat;
+	ctermid;
+	_ctermid;
+	ctime;
+	__ctype;
+	cuserid;
+	_cuserid;
+	daylight;
+	_daylight;
+	difftime;
+	div;
+	__dtou;
+	dup;
+	_dup;
+	dup2;
+	_dup2;
+	environ = NODIRECT;
+	_environ = NODIRECT;
+	execl;
+	_execl;
+	execle;
+	_execle;
+	execlp;
+	_execlp;
+	execv;
+	_execv;
+	execve;
+	_execve;
+	execvp;
+	_execvp;
+	exit;
+	_exit;
+	fattach;
+	_fattach;
+	fchdir;
+	_fchdir;
+	fchmod;
+	_fchmod;
+	fchown;
+	_fchown;
+	fclose;
+	fcntl;
+	_fcntl;
+	fdetach;
+	_fdetach;
+	fdopen;
+	_fdopen;
+	feof;
+	ferror;
+	fflush;
+	fgetc;
+	fgetpos;
+	fgets;
+	__filbuf;
+	fileno;
+	_fileno;
+	__flsbuf;
+	fmtmsg;
+	_fmtmsg;
+	fopen;
+	_fork;
+	fork = NODIRECT;
+	fpathconf;
+	_fpathconf;
+	fprintf;
+	fputc;
+	fputs;
+	fread;
+	free = NODIRECT;
+	freopen;
+	frexp = FUNCTION FILTER libm.so.2;
+	fscanf;
+	fseek;
+	fsetpos;
+	fstat;
+	_fstat;
+	fstatvfs;
+	_fstatvfs;
+	fsync;
+	_fsync;
+	ftell;
+	ftok;
+	_ftok;
+	__ftou;
+	fwrite;
+	getc;
+	getchar;
+	getcontext;
+	_getcontext;
+	getcwd;
+	_getcwd;
+	getdate;
+	_getdate;
+	getdate_err;
+	_getdate_err;
+	getegid;
+	_getegid;
+	getenv;
+	geteuid;
+	_geteuid;
+	getgid;
+	_getgid;
+	getgrgid;
+	_getgrgid;
+	getgrnam;
+	_getgrnam;
+	getgroups;
+	_getgroups;
+	getlogin;
+	_getlogin;
+	getmsg;
+	_getmsg;
+	getopt;
+	_getopt;
+	getpass;
+	_getpass;
+	getpgid;
+	_getpgid;
+	getpgrp;
+	_getpgrp;
+	getpid;
+	_getpid;
+	getpmsg;
+	_getpmsg;
+	getppid;
+	_getppid;
+	getpwnam;
+	_getpwnam;
+	getpwuid;
+	_getpwuid;
+	getrlimit;
+	_getrlimit;
+	gets;
+	getsid;
+	_getsid;
+	getsubopt;
+	_getsubopt;
+	gettxt;
+	_gettxt;
+	getuid;
+	_getuid;
+	getw;
+	_getw;
+	gmtime;
+	grantpt;
+	_grantpt;
+	hcreate;
+	_hcreate;
+	hdestroy;
+	_hdestroy;
+	hsearch;
+	_hsearch;
+	__huge_val;
+	initgroups;
+	_initgroups;
+	__iob;
+	ioctl;
+	_ioctl;
+	isalnum;
+	isalpha;
+	isascii;
+	_isascii;
+	isastream;
+	_isastream;
+	isatty;
+	_isatty;
+	iscntrl;
+	isdigit;
+	isgraph;
+	islower;
+	isnan = FUNCTION FILTER libm.so.2;
+	_isnan = FUNCTION FILTER libm.so.2;
+	isnand = FUNCTION FILTER libm.so.2;
+	_isnand = FUNCTION FILTER libm.so.2;
+	isprint;
+	ispunct;
+	isspace;
+	isupper;
+	isxdigit;
+	kill;
+	_kill;
+	labs;
+	lchown;
+	_lchown;
+	ldexp = FUNCTION FILTER libm.so.2;
+	ldiv;
+	lfind;
+	_lfind;
+	link;
+	_link;
+	localeconv;
+	localtime;
+	lockf;
+	_lockf;
+	logb = FUNCTION FILTER libm.so.2;
+	longjmp;
+	lsearch;
+	_lsearch;
+	lseek;
+	_lseek;
+	lstat;
+	_lstat;
+	makecontext;
+	_makecontext;
+	malloc = NODIRECT;
+	mblen;
+	mbstowcs;
+	mbtowc;
+	memccpy;
+	_memccpy;
+	memchr;
+	memcmp = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
+	memcntl;
+	_memcntl;
+	memcpy = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
+	memmove = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
+	memset = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
+	mkdir;
+	_mkdir;
+	mkfifo;
+	_mkfifo;
+	mknod;
+	_mknod;
+	mktemp;
+	_mktemp;
+	mktime;
+	mlock;
+	_mlock;
+	mmap;
+	_mmap;
+	modf = FUNCTION FILTER libm.so.2;
+	_modf = FUNCTION FILTER libm.so.2;
+	monitor;
+	_monitor;
+	mount;
+	_mount;
+	mprotect;
+	_mprotect;
+	msgctl;
+	_msgctl;
+	msgget;
+	_msgget;
+	msgrcv;
+	_msgrcv;
+	msgsnd;
+	_msgsnd;
+	msync;
+	_msync;
+	munlock;
+	_munlock;
+	munmap;
+	_munmap;
+	nextafter = FUNCTION FILTER libm.so.2;
+	_nextafter = FUNCTION FILTER libm.so.2;
+	nftw;
+	_nftw;
+	nice;
+	_nice;
+	nl_langinfo;
+	_nl_langinfo;
+	_numeric;
+	open;
+	_open;
+	opendir;
+	_opendir;
+	optarg;
+	opterr;
+	optind;
+	optopt;
+	pathconf;
+	_pathconf;
+	pause;
+	_pause;
+	pclose;
+	_pclose;
+	perror;
+	pipe;
+	_pipe;
+	poll;
+	_poll;
+	popen;
+	_popen;
+	printf;
+	profil;
+	_profil;
+	ptrace;
+	_ptrace;
+	ptsname;
+	_ptsname;
+	putc;
+	putchar;
+	putenv;
+	_putenv;
+	putmsg;
+	_putmsg;
+	putpmsg;
+	_putpmsg;
+	puts;
+	putw;
+	_putw;
+	_Q_add;
+	_Q_cmp;
+	_Q_cmpe;
+	_Q_div;
+	_Q_dtoq;
+	_Q_feq;
+	_Q_fge;
+	_Q_fgt;
+	_Q_fle;
+	_Q_flt;
+	_Q_fne;
+	_Q_itoq;
+	_Q_mul;
+	_Q_neg;
+	_Q_qtod;
+	_Q_qtoi;
+	_Q_qtos;
+	_Q_qtou;
+	qsort;
+	_Q_sqrt;
+	_Q_stoq;
+	_Q_sub;
+	_Q_utoq;
+	raise;
+	rand;
+	read;
+	_read;
+	readdir;
+	_readdir;
+	readlink;
+	_readlink;
+	readv;
+	_readv;
+	realloc = NODIRECT;
+	remove;
+	rename;
+	_rename;
+	rewind;
+	rewinddir;
+	_rewinddir;
+	rmdir;
+	_rmdir;
+	scalb = FUNCTION FILTER libm.so.2;
+	_scalb = FUNCTION FILTER libm.so.2;
+	scanf;
+	seekdir;
+	_seekdir;
+	semctl;
+	_semctl;
+	semget;
+	_semget;
+	semop;
+	_semop;
+	setbuf;
+	setcontext;
+	_setcontext;
+	setgid;
+	_setgid;
+	setgroups;
+	_setgroups;
+	setjmp;
+	setlabel;
+	setlocale;
+	setpgid;
+	_setpgid;
+	setpgrp;
+	_setpgrp;
+	setrlimit;
+	_setrlimit;
+	setsid;
+	_setsid;
+	setuid;
+	_setuid;
+	setvbuf;
+	shmat;
+	_shmat;
+	shmctl;
+	_shmctl;
+	shmdt;
+	_shmdt;
+	shmget;
+	_shmget;
+	sigaction = NODIRECT;
+	_sigaction = NODIRECT;
+	sigaddset;
+	_sigaddset;
+	sigaltstack;
+	_sigaltstack;
+	sigdelset;
+	_sigdelset;
+	sigemptyset;
+	_sigemptyset;
+	sigfillset;
+	_sigfillset;
+	sighold;
+	_sighold;
+	sigignore;
+	_sigignore;
+	sigismember;
+	_sigismember;
+	siglongjmp;
+	_siglongjmp;
+	signal;
+	sigpause;
+	_sigpause;
+	sigpending;
+	_sigpending;
+	sigprocmask;
+	_sigprocmask;
+	sigrelse;
+	_sigrelse;
+	sigsend;
+	_sigsend;
+	sigsendset;
+	_sigsendset;
+	sigset;
+	_sigset;
+	sigsetjmp;
+	_sigsetjmp;
+	sigsuspend;
+	_sigsuspend;
+	sleep;
+	_sleep;
+	sprintf;
+	srand;
+	sscanf;
+	stat;
+	_stat;
+	statvfs;
+	_statvfs;
+	stime;
+	_stime;
+	strcat;
+	strchr;
+	strcmp;
+	strcoll;
+	strcpy;
+	strcspn;
+	strdup;
+	_strdup;
+	strerror;
+	strftime;
+	strlen;
+	strncat;
+	strncmp;
+	strncpy;
+	strpbrk;
+	strrchr;
+	strspn;
+	strstr;
+	strtod;
+	strtok;
+	strtol;
+	strtoul;
+	strxfrm;
+	swab;
+	_swab;
+	swapcontext;
+	_swapcontext;
+	symlink;
+	_symlink;
+	sync;
+	_sync;
+	sysconf;
+	_sysconf;
+	system;
+	tcdrain;
+	_tcdrain;
+	tcflow;
+	_tcflow;
+	tcflush;
+	_tcflush;
+	tcgetattr;
+	_tcgetattr;
+	tcgetpgrp;
+	_tcgetpgrp;
+	tcgetsid;
+	_tcgetsid;
+	tcsendbreak;
+	_tcsendbreak;
+	tcsetattr;
+	_tcsetattr;
+	tcsetpgrp;
+	_tcsetpgrp;
+	tdelete;
+	_tdelete;
+	tell;
+	_tell;
+	telldir;
+	_telldir;
+	tempnam;
+	_tempnam;
+	tfind;
+	_tfind;
+	time;
+	_time;
+	times;
+	_times;
+	timezone;
+	_timezone;
+	tmpfile;
+	tmpnam;
+	toascii;
+	_toascii;
+	tolower;
+	_tolower;
+	toupper;
+	_toupper;
+	tsearch;
+	_tsearch;
+	ttyname;
+	_ttyname;
+	twalk;
+	_twalk;
+	tzname;
+	_tzname;
+	tzset;
+	_tzset;
+	ulimit;
+	_ulimit;
+	umask;
+	_umask;
+	umount;
+	_umount;
+	uname;
+	_uname;
+	ungetc;
+	unlink;
+	_unlink;
+	unlockpt;
+	_unlockpt;
+	utime;
+	_utime;
+	vfprintf;
+	vprintf;
+	vsprintf;
+	wait;
+	_wait;
+	waitid;
+	_waitid;
+	waitpid;
+	_waitpid;
+	wcstombs;
+	wctomb;
+	write;
+	_write;
+	writev;
+	_writev;
+	_xftw;
+};
+
+SUNWprivate_1.1 {
+    global:
+	__ashldi3;
+	__ashrdi3;
+	_cerror;
+	_cerror64;
+	__cmpdi2;
+	__divdi3;
+	_dladdr = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dladdr1 = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dlclose = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dldump = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dlerror = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dlinfo = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dlmopen = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dlopen = FUNCTION FILTER /usr/lib/ld.so.1;
+	_dlsym = FUNCTION FILTER /usr/lib/ld.so.1;
+	_file_set;
+	__floatdidf;
+	__floatdisf;
+	_fprintf_c89;
+	_fscanf_c89;
+	__fseterror_u;
+	_fwprintf_c89;
+	_fwscanf_c89;
+	gtty;
+	_gtty;
+	_hasmntopt;
+	_imaxabs_c89;
+	_imaxdiv_c89;
+	install_utrap;
+	_install_utrap;
+	_ld_libc = FUNCTION FILTER /usr/lib/ld.so.1;
+	__lshrdi3;
+	__lyday_to_month;
+	_memcmp = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
+	_memcpy = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
+	_memmove = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
+	_memset = AUXILIARY /platform/$PLATFORM/lib/libc_psr.so.1;
+	__moddi3;
+	__mon_lengths;
+	__muldi3;
+	nop;
+	_printf_c89;
+	_Q_cplx_div;
+	_Q_cplx_div_ix;
+	_Q_cplx_div_rx;
+	_Q_cplx_lr_div;
+	_Q_cplx_lr_div_ix;
+	_Q_cplx_lr_div_rx;
+	_Q_cplx_lr_mul;
+	_Q_cplx_mul;
+	_QgetRD;
+	_scanf_c89;
+	_snprintf_c89;
+	_sprintf_c89;
+	_sscanf_c89;
+	_strtoimax_c89;
+	_strtoumax_c89;
+	_swprintf_c89;
+	_swscanf_c89;
+	_sys_errlist;
+	_sys_errs;
+	_sys_index;
+	_sys_nerr;
+	_sys_num_err;
+	_syssun;
+	__ucmpdi2;
+	__udivdi3;
+	__umoddi3;
+	_vfprintf_c89;
+	_vfscanf_c89;
+	_vfwprintf_c89;
+	_vfwscanf_c89;
+	_vprintf_c89;
+	_vscanf_c89;
+	_vsnprintf_c89;
+	_vsprintf_c89;
+	_vsscanf_c89;
+	_vswprintf_c89;
+	_vswscanf_c89;
+	_vwprintf_c89;
+	_vwscanf_c89;
+	_wcstoimax_c89;
+	_wcstoumax_c89;
+	_wprintf_c89;
+	_wscanf_c89;
+	_xregs_clrptr;
+	__yday_to_month;
+};
diff --git a/usr/src/lib/libc/sparcv9/Makefile b/usr/src/lib/libc/sparcv9/Makefile
index bbdce6d862..81de2b2bb9 100644
--- a/usr/src/lib/libc/sparcv9/Makefile
+++ b/usr/src/lib/libc/sparcv9/Makefile
@@ -24,8 +24,7 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libc/sparcv9/Makefile
-#
+
 LIBCBASE=.
 
 LIBRARY= libc.a
@@ -920,8 +919,7 @@ ALTPICS= $(TRACEOBJS:%=pics/%)
 $(DYNLIB) := PICS += $(ROOTFS_LIBDIR64)/libc_i18n.a
 $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS)
 
-MAPDIR=		../spec/sparcv9
-MAPFILE=	$(MAPDIR)/mapfile
+MAPFILES =	../port/mapfile-vers mapfile-vers
 
 sparcv9_C_PICFLAGS= -K PIC
 CFLAGS64 +=	$(EXTN_CFLAGS)
@@ -932,8 +930,8 @@ ASFLAGS=	-K PIC -P -D__STDC__ -D_ASM -D__sparcv9 $(CPPFLAGS) \
 
 # Inform the run-time linker about libc specialized initialization
 RTLDINFO =	-z rtldinfo=tls_rtldinfo
+DYNFLAGS +=	$(RTLDINFO)
 
-DYNFLAGS +=	-M $(MAPFILE) $(RTLDINFO)
 DYNFLAGS +=	$(EXTN_DYNFLAGS)
 
 BUILD.s=	$(AS) $(ASFLAGS) $< -o $@
@@ -957,7 +955,7 @@ CLEANFILES=			\
 	pics/crtn.o		\
 	$(ALTPICS)
 
-CLOBBERFILES +=	$(MAPFILE) $(LIB_PIC)
+CLOBBERFILES +=	$(LIB_PIC)
 
 # list of C source for lint
 SRCS=							\
@@ -994,11 +992,6 @@ SRCS=							\
 $(DYNLIB) := CRTI = crti.o
 $(DYNLIB) := CRTN = crtn.o
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # Files which need the threads .il inline template
 TIL=				\
 	aio.o			\
diff --git a/usr/src/lib/libc/sparcv9/mapfile-vers b/usr/src/lib/libc/sparcv9/mapfile-vers
new file mode 100644
index 0000000000..35ba6af356
--- /dev/null
+++ b/usr/src/lib/libc/sparcv9/mapfile-vers
@@ -0,0 +1,776 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.22 {
+    global:
+	dladdr = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	dladdr1 = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	dlclose = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	dldump = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	dlerror = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	dlinfo = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	dlmopen = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	dlopen = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	dlsym = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	walkcontext;
+};
+
+SUNW_1.21.2 {
+    global:
+	__makecontext_v2;
+	___makecontext_v2;
+};
+
+SUNW_1.1 {
+    global:
+	__flt_rounds;
+};
+
+SUNW_0.7 {
+    global:
+	abort;
+	abs;
+	access;
+	_access;
+	acct;
+	_acct;
+	addseverity;
+	_addseverity;
+	alarm;
+	_alarm;
+	__align_cpy_1;
+	__align_cpy_16;
+	__align_cpy_2;
+	__align_cpy_4;
+	__align_cpy_8;
+	_altzone;
+	asctime;
+	asctime_r;
+	_assert;
+	__assert;
+	atexit;
+	atof;
+	atoi;
+	atol;
+	bsearch;
+	__builtin_alloca;
+	calloc = NODIRECT;
+	catclose;
+	_catclose;
+	catgets;
+	_catgets;
+	catopen;
+	_catopen;
+	cfgetispeed;
+	_cfgetispeed;
+	cfgetospeed;
+	_cfgetospeed;
+	cfsetispeed;
+	_cfsetispeed;
+	cfsetospeed;
+	_cfsetospeed;
+	chdir;
+	_chdir;
+	chmod;
+	_chmod;
+	chown;
+	_chown;
+	chroot;
+	_chroot;
+	_cleanup;
+	clearerr;
+	clock;
+	_close;
+	close = NODIRECT;
+	closedir;
+	_closedir;
+	creat;
+	_creat;
+	crypt;
+	_crypt;
+	ctermid;
+	_ctermid;
+	ctime;
+	ctime_r;
+	_ctype;
+	__ctype;
+	cuserid;
+	_cuserid;
+	daylight;
+	_daylight;
+	difftime;
+	div;
+	__dtou;
+	__dtoul;
+	dup;
+	_dup;
+	dup2;
+	_dup2;
+	encrypt;
+	_encrypt;
+	endgrent;
+	endpwent;
+	environ = NODIRECT;
+	_environ = NODIRECT;
+	errno;
+	___errno;
+	execl;
+	_execl;
+	execle;
+	_execle;
+	execlp;
+	_execlp;
+	execv;
+	_execv;
+	execve;
+	_execve;
+	execvp;
+	_execvp;
+	exit;
+	_exit;
+	fattach;
+	_fattach;
+	fchdir;
+	_fchdir;
+	fchmod;
+	_fchmod;
+	fchown;
+	_fchown;
+	fclose;
+	fcntl;
+	_fcntl;
+	fdetach;
+	_fdetach;
+	fdopen;
+	_fdopen;
+	feof;
+	ferror;
+	fflush;
+	fgetc;
+	fgetgrent;
+	fgetgrent_r;
+	fgetpos;
+	fgetpwent;
+	fgetpwent_r;
+	fgets;
+	__filbuf;
+	fileno;
+	_fileno;
+	file_to_decimal;
+	flockfile;
+	_flsbuf;
+	__flsbuf;
+	fmtmsg;
+	_fmtmsg;
+	fopen;
+	_fork;
+	fork = NODIRECT;
+	fpathconf;
+	_fpathconf;
+	fprintf;
+	fputc;
+	fputs;
+	fread;
+	free = NODIRECT;
+	freopen;
+	frexp = FUNCTION FILTER libm.so.2;
+	fscanf;
+	fseek;
+	fsetpos;
+	fstat;
+	_fstat;
+	fstatvfs;
+	_fstatvfs;
+	fsync;
+	_fsync;
+	ftell;
+	ftok;
+	_ftok;
+	__ftou;
+	__ftoul;
+	funlockfile;
+	fwrite;
+	getc;
+	getchar;
+	getchar_unlocked;
+	getcontext;
+	_getcontext;
+	getc_unlocked;
+	getcwd;
+	_getcwd;
+	getdate;
+	_getdate;
+	getdate_err;
+	_getdate_err;
+	getegid;
+	_getegid;
+	getenv;
+	geteuid;
+	_geteuid;
+	getgid;
+	_getgid;
+	getgrent;
+	getgrent_r;
+	getgrgid;
+	_getgrgid;
+	getgrgid_r;
+	getgrnam;
+	_getgrnam;
+	getgrnam_r;
+	getgroups;
+	_getgroups;
+	getitimer;
+	_getitimer;
+	getlogin;
+	_getlogin;
+	getlogin_r;
+	getmsg;
+	_getmsg;
+	getopt;
+	_getopt;
+	getpass;
+	_getpass;
+	getpgid;
+	_getpgid;
+	getpgrp;
+	_getpgrp;
+	getpid;
+	_getpid;
+	getpmsg;
+	_getpmsg;
+	getppid;
+	_getppid;
+	getpwent;
+	getpwent_r;
+	getpwnam;
+	_getpwnam;
+	getpwnam_r;
+	getpwuid;
+	_getpwuid;
+	getpwuid_r;
+	getrlimit;
+	_getrlimit;
+	gets;
+	getsid;
+	_getsid;
+	getsubopt;
+	_getsubopt;
+	gettimeofday;
+	_gettimeofday;
+	gettxt;
+	_gettxt;
+	getuid;
+	_getuid;
+	getw;
+	_getw;
+	gmtime;
+	gmtime_r;
+	grantpt;
+	_grantpt;
+	hcreate;
+	_hcreate;
+	hdestroy;
+	_hdestroy;
+	hsearch;
+	_hsearch;
+	__huge_val;
+	initgroups;
+	_initgroups;
+	_iob;
+	__iob;
+	ioctl;
+	_ioctl;
+	isalnum;
+	isalpha;
+	isascii;
+	_isascii;
+	isastream;
+	_isastream;
+	isatty;
+	_isatty;
+	iscntrl;
+	isdigit;
+	isgraph;
+	islower;
+	isnan = FUNCTION FILTER libm.so.2;
+	_isnan = FUNCTION FILTER libm.so.2;
+	isnand = FUNCTION FILTER libm.so.2;
+	_isnand = FUNCTION FILTER libm.so.2;
+	isprint;
+	ispunct;
+	isspace;
+	isupper;
+	isxdigit;
+	kill;
+	_kill;
+	labs;
+	lchown;
+	_lchown;
+	ldexp = FUNCTION FILTER libm.so.2;
+	ldiv;
+	lfind;
+	_lfind;
+	link;
+	_link;
+	localeconv;
+	localtime;
+	localtime_r;
+	lockf;
+	_lockf;
+	logb = FUNCTION FILTER libm.so.2;
+	longjmp;
+	lsearch;
+	_lsearch;
+	lseek;
+	_lseek;
+	lstat;
+	_lstat;
+	makecontext;
+	_makecontext;
+	malloc = NODIRECT;
+	mblen;
+	mbstowcs;
+	mbtowc;
+	memccpy;
+	_memccpy;
+	memchr;
+	memcmp = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
+	memcntl;
+	_memcntl;
+	memcpy = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
+	memmove = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
+	memset = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
+	mkdir;
+	_mkdir;
+	mkfifo;
+	_mkfifo;
+	mknod;
+	_mknod;
+	mktemp;
+	_mktemp;
+	mktime;
+	mlock;
+	_mlock;
+	mmap;
+	_mmap;
+	modf = FUNCTION FILTER libm.so.2;
+	_modf = FUNCTION FILTER libm.so.2;
+	monitor;
+	_monitor;
+	mount;
+	_mount;
+	mprotect;
+	_mprotect;
+	msgctl;
+	_msgctl;
+	msgget;
+	_msgget;
+	msgrcv;
+	_msgrcv;
+	msgsnd;
+	_msgsnd;
+	msync;
+	_msync;
+	munlock;
+	_munlock;
+	munmap;
+	_munmap;
+	_mutex_held;
+	_mutex_lock;
+	nextafter = FUNCTION FILTER libm.so.2;
+	_nextafter = FUNCTION FILTER libm.so.2;
+	nftw;
+	_nftw;
+	nice;
+	_nice;
+	nl_langinfo;
+	_nl_langinfo;
+	_numeric;
+	open;
+	_open;
+	opendir;
+	_opendir;
+	optarg;
+	opterr;
+	optind;
+	optopt;
+	pathconf;
+	_pathconf;
+	pause;
+	_pause;
+	pclose;
+	_pclose;
+	perror;
+	pipe;
+	_pipe;
+	poll;
+	_poll;
+	p_online;
+	popen;
+	_popen;
+	printf;
+	profil;
+	_profil;
+	ptsname;
+	_ptsname;
+	putc;
+	putchar;
+	putchar_unlocked;
+	putc_unlocked;
+	putenv;
+	_putenv;
+	putmsg;
+	_putmsg;
+	putpmsg;
+	_putpmsg;
+	puts;
+	putw;
+	_putw;
+	_Qp_add;
+	_Qp_cmp;
+	_Qp_cmpe;
+	_Qp_div;
+	_Qp_dtoq;
+	_Qp_feq;
+	_Qp_fge;
+	_Qp_fgt;
+	_Qp_fle;
+	_Qp_flt;
+	_Qp_fne;
+	_Qp_itoq;
+	_Qp_mul;
+	_Qp_neg;
+	_Qp_qtod;
+	_Qp_qtoi;
+	_Qp_qtos;
+	_Qp_qtoui;
+	_Qp_qtoux;
+	_Qp_qtox;
+	_Qp_sqrt;
+	_Qp_stoq;
+	_Qp_sub;
+	_Qp_uitoq;
+	_Qp_uxtoq;
+	_Qp_xtoq;
+	qsort;
+	raise;
+	rand;
+	rand_r;
+	read;
+	_read;
+	readdir;
+	_readdir;
+	readdir_r;
+	readlink;
+	_readlink;
+	readv;
+	_readv;
+	realloc = NODIRECT;
+	remove;
+	rename;
+	_rename;
+	rewind;
+	rewinddir;
+	_rewinddir;
+	rmdir;
+	_rmdir;
+	_rw_read_held;
+	_rw_write_held;
+	sbrk;
+	_sbrk;
+	scalb = FUNCTION FILTER libm.so.2;
+	_scalb = FUNCTION FILTER libm.so.2;
+	scanf;
+	seekdir;
+	_seekdir;
+	semctl;
+	_semctl;
+	semget;
+	_semget;
+	semop;
+	_semop;
+	setbuf;
+	setcontext;
+	_setcontext;
+	setgid;
+	_setgid;
+	setgrent;
+	setgroups;
+	_setgroups;
+	setitimer;
+	_setitimer;
+	setjmp;
+	setkey;
+	_setkey;
+	setlabel;
+	setlocale;
+	setpgid;
+	_setpgid;
+	setpgrp;
+	_setpgrp;
+	setpwent;
+	setrlimit;
+	_setrlimit;
+	setsid;
+	_setsid;
+	setuid;
+	_setuid;
+	setvbuf;
+	shmat;
+	_shmat;
+	shmctl;
+	_shmctl;
+	shmdt;
+	_shmdt;
+	shmget;
+	_shmget;
+	_sibuf;
+	sigaction = NODIRECT;
+	_sigaction = NODIRECT;
+	sigaddset;
+	_sigaddset;
+	sigaltstack;
+	_sigaltstack;
+	sigdelset;
+	_sigdelset;
+	sigemptyset;
+	_sigemptyset;
+	sigfillset;
+	_sigfillset;
+	sighold;
+	_sighold;
+	sigignore;
+	_sigignore;
+	sigismember;
+	_sigismember;
+	siglongjmp;
+	_siglongjmp;
+	signal;
+	sigpause;
+	_sigpause;
+	sigpending;
+	_sigpending;
+	sigprocmask;
+	_sigprocmask;
+	sigrelse;
+	_sigrelse;
+	sigsend;
+	_sigsend;
+	sigsendset;
+	_sigsendset;
+	sigset;
+	_sigset;
+	sigsetjmp;
+	_sigsetjmp;
+	sigsuspend;
+	_sigsuspend;
+	sleep;
+	_sleep;
+	_sobuf;
+	__sparc_utrap_install;
+	sprintf;
+	srand;
+	srand48;
+	sscanf;
+	stat;
+	_stat;
+	statvfs;
+	_statvfs;
+	stime;
+	_stime;
+	strcat;
+	strchr;
+	strcmp;
+	strcoll;
+	strcpy;
+	strcspn;
+	strdup;
+	_strdup;
+	strerror;
+	strftime;
+	strlen;
+	strncat;
+	strncmp;
+	strncpy;
+	strpbrk;
+	strrchr;
+	strspn;
+	strstr;
+	strtod;
+	strtok;
+	strtok_r;
+	strtol;
+	strtoul;
+	strxfrm;
+	swab;
+	_swab;
+	swapcontext;
+	_swapcontext;
+	symlink;
+	_symlink;
+	sync;
+	_sync;
+	_sys_buslist;
+	_syscall;
+	_sys_cldlist;
+	sysconf;
+	_sysconf;
+	_sys_fpelist;
+	sysinfo;
+	_sysinfo;
+	_sys_segvlist;
+	_sys_siginfolistp;
+	_sys_siglist;
+	_sys_siglistn;
+	_sys_siglistp;
+	system;
+	_sys_traplist;
+	tcdrain;
+	_tcdrain;
+	tcflow;
+	_tcflow;
+	tcflush;
+	_tcflush;
+	tcgetattr;
+	_tcgetattr;
+	tcgetpgrp;
+	_tcgetpgrp;
+	tcgetsid;
+	_tcgetsid;
+	tcsendbreak;
+	_tcsendbreak;
+	tcsetattr;
+	_tcsetattr;
+	tcsetpgrp;
+	_tcsetpgrp;
+	tdelete;
+	_tdelete;
+	tell;
+	_tell;
+	telldir;
+	_telldir;
+	tempnam;
+	_tempnam;
+	tfind;
+	_tfind;
+	time;
+	_time;
+	times;
+	_times;
+	timezone;
+	_timezone;
+	tmpfile;
+	tmpnam;
+	toascii;
+	_toascii;
+	tolower;
+	_tolower;
+	toupper;
+	_toupper;
+	tsearch;
+	_tsearch;
+	ttyname;
+	_ttyname;
+	ttyname_r;
+	twalk;
+	_twalk;
+	tzname;
+	_tzname;
+	tzset;
+	_tzset;
+	ulimit;
+	_ulimit;
+	umask;
+	_umask;
+	umount;
+	_umount;
+	uname;
+	_uname;
+	ungetc;
+	unlink;
+	_unlink;
+	unlockpt;
+	_unlockpt;
+	utime;
+	_utime;
+	vfprintf;
+	vprintf;
+	vsprintf;
+	wait;
+	_wait;
+	waitid;
+	_waitid;
+	waitpid;
+	_waitpid;
+	wcstombs;
+	wctomb;
+	write;
+	_write;
+	writev;
+	_writev;
+	_xftw;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_cerror;
+	_dladdr = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	_dladdr1 = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	_dlclose = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	_dldump = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	_dlerror = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	_dlinfo = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	_dlmopen = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	_dlopen = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	_dlsym = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	__fseterror_u;
+	gtty;
+	_gtty;
+	_hasmntopt;
+	install_utrap;
+	_install_utrap;
+	_ld_libc = FUNCTION FILTER /usr/lib/sparcv9/ld.so.1;
+	__lyday_to_month;
+	_memcmp = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
+	_memcpy = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
+	_memmove = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
+	_memset = AUXILIARY /platform/$PLATFORM/lib/sparcv9/libc_psr.so.1;
+	__mon_lengths;
+	nop;
+	_Q_cplx_div;
+	_Q_cplx_div_ix;
+	_Q_cplx_div_rx;
+	_Q_cplx_lr_div;
+	_Q_cplx_lr_div_ix;
+	_Q_cplx_lr_div_rx;
+	_Q_cplx_lr_mul;
+	_Q_cplx_mul;
+	_QgetRD;
+	_syssun;
+	_xregs_clrptr;
+	__yday_to_month;
+};
diff --git a/usr/src/lib/libc_db/Makefile b/usr/src/lib/libc_db/Makefile
index f6e3e6a169..a715f0a195 100644
--- a/usr/src/lib/libc_db/Makefile
+++ b/usr/src/lib/libc_db/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1999-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -41,11 +40,9 @@ TEXT_DOMAIN=	SUNW_OST_OSLIB
 
 .KEEP_STATE:
 
-all install clean clobber: spec .WAIT $(SUBDIRS)
+all install clean clobber lint: $(SUBDIRS)
 
-lint: $(SUBDIRS)
-
-spec $(SUBDIRS):	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libc_db/Makefile.com b/usr/src/lib/libc_db/Makefile.com
index e75c95d89e..179e75b3c4 100644
--- a/usr/src/lib/libc_db/Makefile.com
+++ b/usr/src/lib/libc_db/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -42,12 +41,10 @@ include ../../Makefile.rootfs
 ZDEFS =
 
 LIBS = $(DYNLIB) $(LINTLIB)
-SRCS = $(CMNOBJS:%.o=$(SRCDIR)/%.c)
-$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE = 	$(MAPDIR)/mapfile
+SRCS = $(CMNOBJS:%.o=$(SRCDIR)/%.c)
+$(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 
 ASFLAGS +=	-P -D__STDC__ -D_ASM -DPIC
 CPPFLAGS +=	-I../../libc/inc -D_REENTRANT
diff --git a/usr/src/lib/libc_db/common/mapfile-vers b/usr/src/lib/libc_db/common/mapfile-vers
new file mode 100644
index 0000000000..12cf359416
--- /dev/null
+++ b/usr/src/lib/libc_db/common/mapfile-vers
@@ -0,0 +1,147 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.3 {
+    global:
+	td_thr_tlsbase;
+} SUNW_1.2;
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.2 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.2 {
+    global:
+	SUNW_1.2;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	td_sync_get_info;
+	td_sync_setstate;
+	td_sync_waiters;
+	td_ta_clear_event;
+	td_ta_enable_stats;
+	td_ta_event_addr;
+	td_ta_event_getmsg;
+	td_ta_get_stats;
+	td_ta_map_addr2sync;
+	td_ta_reset_stats;
+	td_ta_setconcurrency;
+	td_ta_set_event;
+	td_ta_sync_iter;
+	td_thr_clear_event;
+	td_thr_dbresume;
+	td_thr_dbsuspend;
+	td_thr_event_enable;
+	td_thr_event_getmsg;
+	td_thr_lockowner;
+	td_thr_set_event;
+	td_thr_sleepinfo;
+} SUNW_0.9;
+
+SUNW_0.9 {
+    global:
+	td_init;
+	td_log;
+	td_ta_delete;
+	td_ta_get_nthreads;
+	td_ta_get_ph;
+	td_ta_map_id2thr;
+	td_ta_map_lwp2thr;
+	td_ta_new;
+	td_ta_thr_iter;
+	td_ta_tsd_iter;
+	td_thr_getfpregs;
+	td_thr_getgregs;
+	td_thr_get_info;
+	td_thr_getxregs;
+	td_thr_getxregsize;
+	td_thr_setfpregs;
+	td_thr_setgregs;
+	td_thr_setprio;
+	td_thr_setsigpending;
+	td_thr_setxregs;
+	td_thr_sigsetmask;
+	td_thr_tsd;
+	td_thr_validate;
+};
+
+SUNWprivate_1.1 {
+    global:
+	__td_init;
+	__td_log;
+	__td_sync_get_info;
+	td_sync_get_stats;
+	__td_sync_get_stats;
+	__td_sync_setstate;
+	__td_sync_waiters;
+	__td_ta_clear_event;
+	__td_ta_delete;
+	__td_ta_enable_stats;
+	__td_ta_event_addr;
+	__td_ta_event_getmsg;
+	__td_ta_get_nthreads;
+	__td_ta_get_ph;
+	__td_ta_get_stats;
+	__td_ta_map_addr2sync;
+	__td_ta_map_id2thr;
+	__td_ta_map_lwp2thr;
+	__td_ta_new;
+	__td_ta_reset_stats;
+	__td_ta_setconcurrency;
+	__td_ta_set_event;
+	__td_ta_sync_iter;
+	td_ta_sync_tracking_enable;
+	__td_ta_sync_tracking_enable;
+	__td_ta_thr_iter;
+	__td_ta_tsd_iter;
+	__td_thr_clear_event;
+	__td_thr_dbresume;
+	__td_thr_dbsuspend;
+	__td_thr_event_enable;
+	__td_thr_event_getmsg;
+	__td_thr_getfpregs;
+	__td_thr_getgregs;
+	__td_thr_get_info;
+	__td_thr_getxregs;
+	__td_thr_getxregsize;
+	__td_thr_lockowner;
+	__td_thr_set_event;
+	__td_thr_setfpregs;
+	__td_thr_setgregs;
+	__td_thr_setprio;
+	__td_thr_setsigpending;
+	__td_thr_setxregs;
+	__td_thr_sigsetmask;
+	__td_thr_sleepinfo;
+	__td_thr_tlsbase;
+	__td_thr_tsd;
+	__td_thr_validate;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libc_psr/Makefile b/usr/src/lib/libc_psr/Makefile
index 2521a042c0..f020b5107a 100644
--- a/usr/src/lib/libc_psr/Makefile
+++ b/usr/src/lib/libc_psr/Makefile
@@ -19,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/libc_psr/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
@@ -39,9 +37,9 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all install clean clobber lint lib32 lib64 : spec .WAIT $(SUBDIRS)
+all install clean clobber lint: $(SUBDIRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libc_psr/sun4u-opl/Makefile b/usr/src/lib/libc_psr/sun4u-opl/Makefile
index b114f86ba0..afe82538d2 100644
--- a/usr/src/lib/libc_psr/sun4u-opl/Makefile
+++ b/usr/src/lib/libc_psr/sun4u-opl/Makefile
@@ -24,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libc_psr/sun4u-opl/Makefile
-#
 
 include $(SRC)/lib/Makefile.lib
 include $(SRC)/Makefile.psm
@@ -72,14 +70,11 @@ $(LIBC_PSR64_LINKS): $(LIBC_PSR64_DIRS)
 lint:
 	@ $(ECHO) "Nothing to lint here: skipping"
 
-lib32: spec .WAIT $(SUBDIRS)
+lib32: $(SUBDIRS)
 
 lib64: $(SUBDIRS64)
 
 $(SUBDIRS) $(SUBDIRS64): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
-spec: FRC
-	@cd ../spec/$(PLATFORM); pwd; $(MAKE) $(TARGET)
-
 FRC:
diff --git a/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile b/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile
index eebe2596fe..39a6c4a39f 100644
--- a/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile
+++ b/usr/src/lib/libc_psr/sun4u-opl/sparc/Makefile
@@ -24,8 +24,11 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # Platform specific Makefile for libc_psr.
 #
+
 PLATFORM	= sun4u-opl
 COMPAT_PLAT	= sun4u-us3
 CLASS		= 32
@@ -34,12 +37,8 @@ OBJECTS		= memcpy.o memset.o memcmp.o
 
 include ../Makefile.com
 
-MAPDIR=		../../spec/$(PLATFORM)/$(MACH)
-MAPFILE=	$(MAPDIR)/mapfile-$(MACH)
-MAPFILES=	$(MAPFILE) $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
-DYNFLAGS +=	$(MAPOPTS)
-CLOBBERFILES +=	$(MAPFILE)
+MAPFILES =	../../sun4u/mapfile-vers $(MAPFILE-FLTR)
+
 ASFLAGS	+=	-xarch=v8plusb
 
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
@@ -47,11 +46,6 @@ ASFLAGS	+=	-xarch=v8plusb
 
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILES)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) `basename $@`
-
 .KEEP_STATE:
 
 MODULE		= libc_psr.so.1
diff --git a/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile
index 2288434a56..9a5173690f 100644
--- a/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile
+++ b/usr/src/lib/libc_psr/sun4u-opl/sparcv9/Makefile
@@ -24,8 +24,11 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # Platform specific Makefile for libc_psr.
 #
+
 PLATFORM	= sun4u-opl
 COMPAT_PLAT	= sun4u-us3
 CLASS		= 64
@@ -34,12 +37,7 @@ OBJECTS		= memcpy.o memset.o memcmp.o
 
 include ../Makefile.com
 
-MAPDIR=		../../spec/$(PLATFORM)/$(MACH64)
-MAPFILE=	$(MAPDIR)/mapfile-$(MACH64)
-MAPFILES=	$(MAPFILE) $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
-DYNFLAGS +=	$(MAPOPTS)
-CLOBBERFILES +=	$(MAPFILE)
+MAPFILES =	../../sun4u/mapfile-vers $(MAPFILE-FLTR)
 
 ASDEFS +=	-D__sparcv9
 ASFLAGS	+=	-xarch=v9b
@@ -51,11 +49,6 @@ include $(SRC)/Makefile.master.64
 
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILES)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) `basename $@`
-
 .KEEP_STATE:
 
 MODULE		= libc_psr.so.1
diff --git a/usr/src/lib/libc_psr/sun4u-us3/Makefile b/usr/src/lib/libc_psr/sun4u-us3/Makefile
index 8fe919b98b..73b94e840c 100644
--- a/usr/src/lib/libc_psr/sun4u-us3/Makefile
+++ b/usr/src/lib/libc_psr/sun4u-us3/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -23,9 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# usr/src/lib/libc_psr/sun4u-us3/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
@@ -103,4 +100,7 @@ install:	all $(ROOT_PSM_LIB_DIR)/$(MODULE) $(ROOT_PSM_LIB64_DIR)/$(MODULE) $(LIB
 clean clobber : FRC
 	$(RM) $(MODULE)
 
+lint:
+	@ $(ECHO) "Nothing to lint here: skipping"
+
 FRC:
diff --git a/usr/src/lib/libc_psr/sun4u/Makefile b/usr/src/lib/libc_psr/sun4u/Makefile
index 5ee29e2a5a..05f1d1ad94 100644
--- a/usr/src/lib/libc_psr/sun4u/Makefile
+++ b/usr/src/lib/libc_psr/sun4u/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libc_psr/sun4u/Makefile
-#
 
 include ../../Makefile.lib
 
@@ -48,14 +45,11 @@ all install clean clobber : lib32 \
 lint:
 	@ $(ECHO) "Nothing to lint here: skipping"
 
-lib32: spec .WAIT $(SUBDIRS)
+lib32: $(SUBDIRS)
 
 lib64: $(SUBDIRS64)
 
 $(SUBDIRS) $(SUBDIRS64): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
-spec: FRC
-	@cd ../spec/$(PLATFORM); pwd; $(MAKE) $(TARGET)
-
 FRC:
diff --git a/usr/src/lib/libc_psr/sun4u/mapfile-vers b/usr/src/lib/libc_psr/sun4u/mapfile-vers
new file mode 100644
index 0000000000..e59728b178
--- /dev/null
+++ b/usr/src/lib/libc_psr/sun4u/mapfile-vers
@@ -0,0 +1,40 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	memcmp;
+	_memcmp;
+	memcpy;
+	_memcpy;
+	memmove;
+	_memmove;
+	memset;
+	_memset;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libc_psr/sun4u/sparc/Makefile b/usr/src/lib/libc_psr/sun4u/sparc/Makefile
index 502818d8bf..6ad52d1151 100644
--- a/usr/src/lib/libc_psr/sun4u/sparc/Makefile
+++ b/usr/src/lib/libc_psr/sun4u/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # Platform specific Makefile for libc_psr.
 #
 
@@ -35,12 +36,7 @@ OBJECTS		= memcpy.o memset.o memcmp.o
 
 include ../Makefile.com
 
-MAPDIR=		../../spec/$(PLATFORM)/$(MACH)
-MAPFILE=	$(MAPDIR)/mapfile-$(MACH)
-MAPFILES=	$(MAPFILE) $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
-DYNFLAGS +=	$(MAPOPTS)
-CLOBBERFILES +=	$(MAPFILE)
+MAPFILES =	../../sun4u/mapfile-vers $(MAPFILE-FLTR)
 
 ASFLAGS	+=	-xarch=v8plusa -warn
 
@@ -49,11 +45,6 @@ ASFLAGS	+=	-xarch=v8plusa -warn
  
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILES)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) `basename $@`
-
 .KEEP_STATE:
 
 MODULE		= libc_psr.so.1
diff --git a/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile
index 2f95607f9f..1322d7d13f 100644
--- a/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile
+++ b/usr/src/lib/libc_psr/sun4u/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # Platform specific Makefile for libc_psr.
 #
 
@@ -35,12 +36,7 @@ OBJECTS		= memcpy.o memset.o memcmp.o
 
 include ../Makefile.com
 
-MAPDIR=		../../spec/$(PLATFORM)/$(MACH64)
-MAPFILE=	$(MAPDIR)/mapfile-$(MACH64)
-MAPFILES=	$(MAPFILE) $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
-DYNFLAGS +=	$(MAPOPTS)
-CLOBBERFILES +=	$(MAPFILE)
+MAPFILES =	../../sun4u/mapfile-vers $(MAPFILE-FLTR)
 
 ASDEFS +=	-D__sparcv9
 ASFLAGS	+=	-xarch=v9a
@@ -52,11 +48,6 @@ include $(SRC)/Makefile.master.64
  
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILES)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) `basename $@`
-
 .KEEP_STATE:
 
 MODULE		= libc_psr.so.1
diff --git a/usr/src/lib/libc_psr/sun4u_hwcap1/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap1/Makefile
index 52dd751f6a..90ff898954 100644
--- a/usr/src/lib/libc_psr/sun4u_hwcap1/Makefile
+++ b/usr/src/lib/libc_psr/sun4u_hwcap1/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# usr/src/lib/libc_psr/sun4u_hwcap1/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../../Makefile.lib
@@ -49,14 +46,11 @@ all install clean clobber : lib32 \
 lint:
 	@ $(ECHO) "Nothing to lint here: skipping"
 
-lib32: spec .WAIT $(SUBDIRS)
+lib32: $(SUBDIRS)
 
 lib64: $(SUBDIRS64)
 
 $(SUBDIRS) $(SUBDIRS64): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
-spec: FRC
-	@cd ../spec/$(ALT_PLAT); pwd; $(MAKE) $(TARGET)
-
 FRC:
diff --git a/usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile
index 0ff422f890..960154a17c 100644
--- a/usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile
+++ b/usr/src/lib/libc_psr/sun4u_hwcap1/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragam ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
 #
 # Platform specific Makefile for libc_psr_hwcap1.
 #
+
 PLATFORM	= sun4u-us3
 ALT_PLAT	= sun4u_hwcap1
 COMPAT_PLAT	= sun4u
@@ -36,13 +38,8 @@ OBJECTS		= memcpy.o memset.o memcmp.o
 
 include ../Makefile.com
 
-MAPDIR=		../../spec/$(ALT_PLAT)/$(MACH)
-MAPFILE=	$(MAPDIR)/mapfile-$(MACH)
+MAPFILES =	../../sun4u/mapfile-vers $(MAPFILE-FLTR)
 
-MAPFILES=	$(MAPFILE) $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
-DYNFLAGS +=	$(MAPOPTS)
-CLOBBERFILES +=	$(MAPFILE)
 ASFLAGS	+=	-xarch=v8plusb
 
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
@@ -50,11 +47,6 @@ ASFLAGS	+=	-xarch=v8plusb
 
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILES)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) `basename $@`
-
 .KEEP_STATE:
 
 MODULE		= libc_psr_hwcap1.so.1
diff --git a/usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile
index 6a331d3641..fbd5cf74d5 100644
--- a/usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile
+++ b/usr/src/lib/libc_psr/sun4u_hwcap1/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
 #
 # Platform specific Makefile for libc_psr_hwcap1.
 #
+
 PLATFORM	= sun4u-us3
 ALT_PLAT	= sun4u_hwcap1
 COMPAT_PLAT	= sun4u
@@ -36,13 +38,7 @@ OBJECTS		= memcpy.o memset.o memcmp.o
 
 include ../Makefile.com
 
-MAPDIR=		../../spec/$(ALT_PLAT)/$(MACH64)
-MAPFILE=	$(MAPDIR)/mapfile-$(MACH64)
-
-MAPFILES=	$(MAPFILE) $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
-DYNFLAGS +=	$(MAPOPTS)
-CLOBBERFILES +=	$(MAPFILE)
+MAPFILES =	../../sun4u/mapfile-vers $(MAPFILE-FLTR)
 
 ASDEFS +=	-D__sparcv9
 ASFLAGS	+=	-xarch=v9b
@@ -54,11 +50,6 @@ include $(SRC)/Makefile.master.64
 
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILES)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) `basename $@`
-
 .KEEP_STATE:
 
 MODULE		= libc_psr_hwcap1.so.1
diff --git a/usr/src/lib/libc_psr/sun4u_hwcap2/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap2/Makefile
index 0c2b391f12..564c1050ce 100644
--- a/usr/src/lib/libc_psr/sun4u_hwcap2/Makefile
+++ b/usr/src/lib/libc_psr/sun4u_hwcap2/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragam ident	"%Z%%M%	%I%	%E% SMI"
-#
-# usr/src/lib/libc_psr/sun4u_hwcap2/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../../Makefile.lib
@@ -49,14 +46,11 @@ all install clean clobber : lib32 \
 lint:
 	@ $(ECHO) "Nothing to lint here: skipping"
 
-lib32: spec .WAIT $(SUBDIRS)
+lib32: $(SUBDIRS)
 
 lib64: $(SUBDIRS64)
 
 $(SUBDIRS) $(SUBDIRS64): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
-spec: FRC
-	@cd ../spec/$(ALT_PLAT); pwd; $(MAKE) $(TARGET)
-
 FRC:
diff --git a/usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile
index aee6f5ccce..c9f9b8daf6 100644
--- a/usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile
+++ b/usr/src/lib/libc_psr/sun4u_hwcap2/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragam ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
 #
 # Platform specific Makefile for libc_psr_hwcap2.
 #
+
 PLATFORM	= sun4u-us3
 ALT_PLAT	= sun4u_hwcap2
 COMPAT_PLAT	= sun4u
@@ -36,14 +38,8 @@ OBJECTS		= memcpy.o memset.o memcmp.o
 
 include ../Makefile.com
 
-MAPDIR=		../../spec/$(ALT_PLAT)/$(MACH)
-MAPFILE=	$(MAPDIR)/mapfile-$(MACH)
-HWCAPMAPFILE=	../mapfile
+MAPFILES =	../../sun4u/mapfile-vers ../mapfile $(MAPFILE-FLTR)
 
-MAPFILES=	$(MAPFILE) $(HWCAPMAPFILE) $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
-DYNFLAGS +=	$(MAPOPTS)
-CLOBBERFILES +=	$(MAPFILE)
 ASFLAGS	+=	-xarch=v8plusb
 
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
@@ -51,11 +47,6 @@ ASFLAGS	+=	-xarch=v8plusb
 
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILES)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) `basename $@`
-
 .KEEP_STATE:
 
 MODULE		= libc_psr_hwcap2.so.1
diff --git a/usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile
index 61a5e1add0..7ee110438f 100644
--- a/usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile
+++ b/usr/src/lib/libc_psr/sun4u_hwcap2/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
 #
 # Platform specific Makefile for libc_psr_hwcap2.
 #
+
 PLATFORM	= sun4u-us3
 ALT_PLAT	= sun4u_hwcap2
 COMPAT_PLAT	= sun4u
@@ -36,14 +38,7 @@ OBJECTS		= memcpy.o memset.o memcmp.o
 
 include ../Makefile.com
 
-MAPDIR=		../../spec/$(ALT_PLAT)/$(MACH64)
-MAPFILE=	$(MAPDIR)/mapfile-$(MACH64)
-HWCAPMAPFILE=	../mapfile
-
-MAPFILES=	$(MAPFILE) $(HWCAPMAPFILE) $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
-DYNFLAGS +=	$(MAPOPTS)
-CLOBBERFILES +=	$(MAPFILE)
+MAPFILES =	../../sun4u/mapfile-vers ../mapfile $(MAPFILE-FLTR)
 
 ASDEFS +=	-D__sparcv9
 ASFLAGS	+=	-xarch=v9b
@@ -55,11 +50,6 @@ include $(SRC)/Makefile.master.64
 
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILES)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) `basename $@`
-
 .KEEP_STATE:
 
 MODULE		= libc_psr_hwcap2.so.1
diff --git a/usr/src/lib/libc_psr/sun4v/Makefile b/usr/src/lib/libc_psr/sun4v/Makefile
index c30118e696..7bd571a3bf 100644
--- a/usr/src/lib/libc_psr/sun4v/Makefile
+++ b/usr/src/lib/libc_psr/sun4v/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libc_psr/sun4v/Makefile
-#
 
 include $(SRC)/lib/Makefile.lib
 include $(SRC)/Makefile.psm
@@ -62,4 +59,7 @@ install:	all $(ROOT_PSM_LIB_DIR)/$(MODULE) $(ROOT_PSM_LIB64_DIR)/$(MODULE)
 clean clobber : FRC
 	$(RM) $(MODULE)
 
+lint:
+	@ $(ECHO) "Nothing to lint here: skipping"
+
 FRC:
diff --git a/usr/src/lib/libc_psr/sun4v/mapfile-vers b/usr/src/lib/libc_psr/sun4v/mapfile-vers
new file mode 100644
index 0000000000..26e4bd9f12
--- /dev/null
+++ b/usr/src/lib/libc_psr/sun4v/mapfile-vers
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	memcpy;
+	_memcpy;
+	memmove;
+	_memmove;
+	memset;
+	_memset;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile
index 5697fd9bef..0ffd0fe46b 100644
--- a/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile
+++ b/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libc_psr/sun4v_hwcap1/Makefile
-#
 
 include ../../Makefile.lib
 
@@ -49,14 +46,11 @@ all install clean clobber : lib32 \
 lint:
 	@ $(ECHO) "Nothing to lint here: skipping"
 
-lib32: spec .WAIT $(SUBDIRS)
+lib32: $(SUBDIRS)
 
 lib64: $(SUBDIRS64)
 
 $(SUBDIRS) $(SUBDIRS64): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
-spec: FRC
-	@cd ../spec/$(ALT_PLAT); pwd; $(MAKE) $(TARGET)
-
 FRC:
diff --git a/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com b/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com
index 8b6dd7f4ae..0dde8cadf6 100644
--- a/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com
+++ b/usr/src/lib/libc_psr/sun4v_hwcap1/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,20 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-#
-#	Create default so empty rules don't
-#	confuse make
-#
-
 LIBRARY		= libc_psr_hwcap1.a
 VERS		= .1
-HWCAP_MAPFILE	= ../mapfile
 
 include $(SRC)/lib/Makefile.lib
 include $(SRC)/Makefile.psm
diff --git a/usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile
index 3145a8e203..159468395b 100644
--- a/usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile
+++ b/usr/src/lib/libc_psr/sun4v_hwcap1/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # Platform specific Makefile for libc_psr.
 #
+
 PLATFORM	= sun4v
 ALT_PLAT	= sun4v_hwcap1
 CLASS		= 32
@@ -35,13 +37,8 @@ OBJECTS		= memcpy.o memset.o
 
 include ../Makefile.com
 
-MAPDIR=		../../spec/$(ALT_PLAT)/$(MACH)
-MAPFILE=	$(MAPDIR)/mapfile-$(MACH)
+MAPFILES =	../../sun4v/mapfile-vers ../mapfile $(MAPFILE-FLTR)
 
-MAPFILES=	$(MAPFILE) $(MAPFILE-FLTR) $(HWCAP_MAPFILE)
-MAPOPTS=	$(MAPFILES:%=-M %)
-DYNFLAGS +=	$(MAPOPTS)
-CLOBBERFILES +=	$(MAPFILE)
 ASFLAGS	+=	-xarch=v8plus
 
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
@@ -49,11 +46,6 @@ ASFLAGS	+=	-xarch=v8plus
 
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILES)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) `basename $@`
-
 .KEEP_STATE:
 
 MODULE		= libc_psr_hwcap1.so.1
diff --git a/usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile b/usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile
index b790281311..fc8f543a34 100644
--- a/usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile
+++ b/usr/src/lib/libc_psr/sun4v_hwcap1/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # Platform specific Makefile for libc_psr.
 #
+
 PLATFORM	= sun4v
 ALT_PLAT	= sun4v_hwcap1
 
@@ -36,13 +38,7 @@ OBJECTS		= memcpy.o memset.o
 
 include ../Makefile.com
 
-MAPDIR=		../../spec/$(ALT_PLAT)/$(MACH64)
-MAPFILE=	$(MAPDIR)/mapfile-$(MACH64)
-
-MAPFILES=	$(MAPFILE) $(MAPFILE-FLTR) $(HWCAP_MAPFILE)
-MAPOPTS=	$(MAPFILES:%=-M %)
-DYNFLAGS +=	$(MAPOPTS)
-CLOBBERFILES +=	$(MAPFILE)
+MAPFILES =	../../sun4v/mapfile-vers ../mapfile $(MAPFILE-FLTR)
 
 ASDEFS +=	-D__sparcv9
 ASFLAGS	+=	-xarch=v9
@@ -54,11 +50,6 @@ include $(SRC)/Makefile.master.64
 
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILES)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) `basename $@`
-
 .KEEP_STATE:
 
 MODULE		= libc_psr_hwcap1.so.1
diff --git a/usr/src/lib/libcfgadm/Makefile b/usr/src/lib/libcfgadm/Makefile
index a2c4a255ae..f611f09cfe 100644
--- a/usr/src/lib/libcfgadm/Makefile
+++ b/usr/src/lib/libcfgadm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -28,7 +27,9 @@
 
 include $(SRC)/lib/Makefile.lib
 
-SUBDIRS =	$(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
+
 POFILE =	libcfgadm.po
 MSGFILES =	*/*.[ch]
 XGETFLAGS =	-a -x libcfgadm.xcl
@@ -41,13 +42,11 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 check install_h:
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAINPOFILE)
diff --git a/usr/src/lib/libcfgadm/Makefile.com b/usr/src/lib/libcfgadm/Makefile.com
index f9c33dee0b..e2d2ff8bd6 100644
--- a/usr/src/lib/libcfgadm/Makefile.com
+++ b/usr/src/lib/libcfgadm/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,11 +33,9 @@ include ../../Makefile.lib
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-ldevinfo -lc
-$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 
diff --git a/usr/src/lib/libcfgadm/common/mapfile-vers b/usr/src/lib/libcfgadm/common/mapfile-vers
new file mode 100644
index 0000000000..c3e0c243a4
--- /dev/null
+++ b/usr/src/lib/libcfgadm/common/mapfile-vers
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+	config_list_ext;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	config_ap_id_cmp;
+	config_change_state;
+	config_help;
+	config_list;
+	config_private_func;
+	config_stat;
+	config_strerror;
+	config_test;
+	config_unload_libs;
+};
+
+SUNWprivate_1.1 {
+    global:
+	SUNWprivate_1.1;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libcmd/Makefile b/usr/src/lib/libcmd/Makefile
index 276ff7aabf..3892533bd7 100644
--- a/usr/src/lib/libcmd/Makefile
+++ b/usr/src/lib/libcmd/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -39,11 +38,9 @@ lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
-lint: $(SUBDIRS)
-
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libcmd/Makefile.com b/usr/src/lib/libcmd/Makefile.com
index b15605fc07..bc07b5cb06 100644
--- a/usr/src/lib/libcmd/Makefile.com
+++ b/usr/src/lib/libcmd/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -37,12 +36,10 @@ include ../../Makefile.rootfs
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lc $(ZNODELETE)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I../../common/inc -D_REENTRANT
diff --git a/usr/src/lib/libcmd/common/mapfile-vers b/usr/src/lib/libcmd/common/mapfile-vers
new file mode 100644
index 0000000000..1629c5c7eb
--- /dev/null
+++ b/usr/src/lib/libcmd/common/mapfile-vers
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	defcntl;
+	defopen;
+	defread;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libcmdutils/Makefile b/usr/src/lib/libcmdutils/Makefile
index bf58344823..20de3cba82 100644
--- a/usr/src/lib/libcmdutils/Makefile
+++ b/usr/src/lib/libcmdutils/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libcmdutils/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-# include library definitions
 include ../Makefile.lib
 
 SUBDIRS = $(MACH)
@@ -48,7 +44,7 @@ CHECKHDRS=	$(HDRS:%.h=%.check)
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 $(ROOTHDRDIR)/%: %
 	$(INS.file)
@@ -57,9 +53,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-lint: $(SUBDIRS)
-
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libcmdutils/Makefile.com b/usr/src/lib/libcmdutils/Makefile.com
index 9ddab62f5f..50ca57cedf 100644
--- a/usr/src/lib/libcmdutils/Makefile.com
+++ b/usr/src/lib/libcmdutils/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -25,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libcmdutils/Makefile.com
-#
 
 LIBRARY=	libcmdutils.a
 VERS=		.1
@@ -37,14 +34,10 @@ include ../../Makefile.rootfs
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lc -lavl
 
 SRCDIR =	../common
-
-# library builds its mapfile from specfiles
-MAPDIR = 	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 
diff --git a/usr/src/lib/libcmdutils/common/mapfile-vers b/usr/src/lib/libcmdutils/common/mapfile-vers
new file mode 100644
index 0000000000..48d26ca9af
--- /dev/null
+++ b/usr/src/lib/libcmdutils/common/mapfile-vers
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	add_tnode;
+	destroy_tree;
+	tnode_compare;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libcontract/Makefile b/usr/src/lib/libcontract/Makefile
index d42faf5b9d..a042993bfc 100644
--- a/usr/src/lib/libcontract/Makefile
+++ b/usr/src/lib/libcontract/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
@@ -44,19 +43,17 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 $(POFILE):	pofile_MSGFILES
 
-lint:		$(SUBDIRS)
-
 install_h:	$(ROOTHDRS)
 
 check:		$(CHECKHDRS)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libcontract/Makefile.com b/usr/src/lib/libcontract/Makefile.com
index 9ba9a44e9d..7d5ab8b471 100644
--- a/usr/src/lib/libcontract/Makefile.com
+++ b/usr/src/lib/libcontract/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -44,11 +43,9 @@ SRCDIR = 	../common
 
 $(LINTLIB) :=	SRCS = $(SRCDIR)/llib-lcontract
 LDLIBS +=	-lnvpair -lc
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
 
 CPPFLAGS +=	-I$(SRCDIR) -D_REENTRANT
-CFLAGS +=	-v
+CFLAGS +=	$(CCVERBOSE)
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libcontract/common/mapfile-vers b/usr/src/lib/libcontract/common/mapfile-vers
new file mode 100644
index 0000000000..2f220b60ad
--- /dev/null
+++ b/usr/src/lib/libcontract/common/mapfile-vers
@@ -0,0 +1,99 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	ct_ctl_abandon;
+	ct_ctl_ack;
+	ct_ctl_adopt;
+	ct_ctl_newct;
+	ct_ctl_qack;
+	ct_event_free;
+	ct_event_get_ctid;
+	ct_event_get_evid;
+	ct_event_get_flags;
+	ct_event_get_nevid;
+	ct_event_get_newct;
+	ct_event_get_type;
+	ct_event_read;
+	ct_event_read_critical;
+	ct_event_reliable;
+	ct_event_reset;
+	ct_pr_event_get_exitstatus;
+	ct_pr_event_get_gcorefile;
+	ct_pr_event_get_pcorefile;
+	ct_pr_event_get_pid;
+	ct_pr_event_get_ppid;
+	ct_pr_event_get_sender;
+	ct_pr_event_get_senderct;
+	ct_pr_event_get_signal;
+	ct_pr_event_get_zcorefile;
+	ct_pr_status_get_contracts;
+	ct_pr_status_get_fatal;
+	ct_pr_status_get_members;
+	ct_pr_status_get_param;
+	ct_pr_tmpl_get_fatal;
+	ct_pr_tmpl_get_param;
+	ct_pr_tmpl_get_transfer;
+	ct_pr_tmpl_set_fatal;
+	ct_pr_tmpl_set_param;
+	ct_pr_tmpl_set_transfer;
+	ct_status_free;
+	ct_status_get_cookie;
+	ct_status_get_critical;
+	ct_status_get_holder;
+	ct_status_get_id;
+	ct_status_get_informative;
+	ct_status_get_nevents;
+	ct_status_get_nevid;
+	ct_status_get_ntime;
+	ct_status_get_qtime;
+	ct_status_get_state;
+	ct_status_get_type;
+	ct_status_get_zoneid;
+	ct_status_read;
+	ct_tmpl_activate;
+	ct_tmpl_clear;
+	ct_tmpl_create;
+	ct_tmpl_get_cookie;
+	ct_tmpl_get_critical;
+	ct_tmpl_get_informative;
+	ct_tmpl_set_cookie;
+	ct_tmpl_set_critical;
+	ct_tmpl_set_informative;
+};
+
+SUNWprivate_1.1 {
+    global:
+	contract_abandon_id;
+	contract_event_dump;
+	contract_latest;
+	contract_open;
+	getctid;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libcpc/Makefile b/usr/src/lib/libcpc/Makefile
index e0e3d7f0c7..400c0ef52b 100644
--- a/usr/src/lib/libcpc/Makefile
+++ b/usr/src/lib/libcpc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libcpc/Makefile
 
 include ../Makefile.lib
 
@@ -48,15 +46,13 @@ XGETFLAGS=	-a
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
 check:		$(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 $(POFILE):	pofile_MSGFILES
diff --git a/usr/src/lib/libcpc/Makefile.com b/usr/src/lib/libcpc/Makefile.com
index 5cdc5f7b9d..d3c143c38f 100644
--- a/usr/src/lib/libcpc/Makefile.com
+++ b/usr/src/lib/libcpc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libcpc/Makefile.com
 
 LIBRARY = libcpc.a
 VERS	= .1
@@ -45,8 +43,8 @@ $(LINTLIB) :=	SRCS = ../common/llib-lcpc
 LDLIBS +=	-lpctx -lnvpair -lc
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+
+MAPFILES +=	mapfile-vers
 
 ASFLAGS +=	-P -D_ASM -I../common
 CPPFLAGS +=	-D_REENTRANT -I../common
diff --git a/usr/src/lib/libcpc/amd64/Makefile b/usr/src/lib/libcpc/amd64/Makefile
index f049307b31..b7511851fb 100644
--- a/usr/src/lib/libcpc/amd64/Makefile
+++ b/usr/src/lib/libcpc/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 
 OBJECTS = $(COBJS)
diff --git a/usr/src/lib/libcpc/amd64/mapfile-vers b/usr/src/lib/libcpc/amd64/mapfile-vers
new file mode 100644
index 0000000000..4505618b21
--- /dev/null
+++ b/usr/src/lib/libcpc/amd64/mapfile-vers
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+};
diff --git a/usr/src/lib/libcpc/common/mapfile-vers b/usr/src/lib/libcpc/common/mapfile-vers
new file mode 100644
index 0000000000..f4403fa877
--- /dev/null
+++ b/usr/src/lib/libcpc/common/mapfile-vers
@@ -0,0 +1,70 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+	cpc_bind_cpu;
+	cpc_bind_curlwp;
+	cpc_bind_pctx;
+	cpc_buf_add;
+	cpc_buf_copy;
+	cpc_buf_create;
+	cpc_buf_destroy;
+	cpc_buf_get;
+	cpc_buf_hrtime;
+	cpc_buf_set;
+	cpc_buf_sub;
+	cpc_buf_tick;
+	cpc_buf_zero;
+	cpc_caps;
+	cpc_cciname;
+	cpc_close;
+	cpc_cpuref;
+	cpc_disable;
+	cpc_enable;
+	cpc_npic;
+	cpc_open;
+	cpc_request_preset;
+	cpc_set_add_request;
+	cpc_set_create;
+	cpc_set_destroy;
+	cpc_seterrhndlr;
+	cpc_set_restart;
+	cpc_set_sample;
+	cpc_unbind;
+	cpc_walk_attrs;
+	cpc_walk_events_all;
+	cpc_walk_events_pic;
+	cpc_walk_requests;
+};
+
+SUNWprivate_1.1 {
+    global:
+	SUNWprivate_1.1;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libcpc/i386/mapfile-vers b/usr/src/lib/libcpc/i386/mapfile-vers
new file mode 100644
index 0000000000..59245793ba
--- /dev/null
+++ b/usr/src/lib/libcpc/i386/mapfile-vers
@@ -0,0 +1,61 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	cpc_access;
+	cpc_bind_event;
+	cpc_count_sys_events;
+	cpc_count_usr_events;
+	cpc_event_accum;
+	cpc_event_diff;
+	cpc_eventtostr;
+	cpc_getcciname;
+	cpc_getcpuref;
+	cpc_getcpuver;
+	cpc_getnpic;
+	cpc_getusage;
+	cpc_pctx_bind_event;
+	cpc_pctx_invalidate;
+	cpc_pctx_rele;
+	cpc_pctx_take_sample;
+	cpc_rele;
+	cpc_seterrfn;
+	cpc_shared_bind_event;
+	cpc_shared_close;
+	cpc_shared_open;
+	cpc_shared_rele;
+	cpc_shared_take_sample;
+	cpc_strtoevent;
+	cpc_take_sample;
+	cpc_version;
+	cpc_walk_names;
+};
diff --git a/usr/src/lib/libcpc/sparc/mapfile-vers b/usr/src/lib/libcpc/sparc/mapfile-vers
new file mode 100644
index 0000000000..59245793ba
--- /dev/null
+++ b/usr/src/lib/libcpc/sparc/mapfile-vers
@@ -0,0 +1,61 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	cpc_access;
+	cpc_bind_event;
+	cpc_count_sys_events;
+	cpc_count_usr_events;
+	cpc_event_accum;
+	cpc_event_diff;
+	cpc_eventtostr;
+	cpc_getcciname;
+	cpc_getcpuref;
+	cpc_getcpuver;
+	cpc_getnpic;
+	cpc_getusage;
+	cpc_pctx_bind_event;
+	cpc_pctx_invalidate;
+	cpc_pctx_rele;
+	cpc_pctx_take_sample;
+	cpc_rele;
+	cpc_seterrfn;
+	cpc_shared_bind_event;
+	cpc_shared_close;
+	cpc_shared_open;
+	cpc_shared_rele;
+	cpc_shared_take_sample;
+	cpc_strtoevent;
+	cpc_take_sample;
+	cpc_version;
+	cpc_walk_names;
+};
diff --git a/usr/src/lib/libcpc/sparcv9/mapfile-vers b/usr/src/lib/libcpc/sparcv9/mapfile-vers
new file mode 100644
index 0000000000..59245793ba
--- /dev/null
+++ b/usr/src/lib/libcpc/sparcv9/mapfile-vers
@@ -0,0 +1,61 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	cpc_access;
+	cpc_bind_event;
+	cpc_count_sys_events;
+	cpc_count_usr_events;
+	cpc_event_accum;
+	cpc_event_diff;
+	cpc_eventtostr;
+	cpc_getcciname;
+	cpc_getcpuref;
+	cpc_getcpuver;
+	cpc_getnpic;
+	cpc_getusage;
+	cpc_pctx_bind_event;
+	cpc_pctx_invalidate;
+	cpc_pctx_rele;
+	cpc_pctx_take_sample;
+	cpc_rele;
+	cpc_seterrfn;
+	cpc_shared_bind_event;
+	cpc_shared_close;
+	cpc_shared_open;
+	cpc_shared_rele;
+	cpc_shared_take_sample;
+	cpc_strtoevent;
+	cpc_take_sample;
+	cpc_version;
+	cpc_walk_names;
+};
diff --git a/usr/src/lib/libcrypt/Makefile b/usr/src/lib/libcrypt/Makefile
index bde11f7726..50b2067ac1 100644
--- a/usr/src/lib/libcrypt/Makefile
+++ b/usr/src/lib/libcrypt/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-# 
+#
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/libcrypt/Makefile
 
 include ../Makefile.lib
 
@@ -40,13 +38,11 @@ lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS):      FRC
+$(SUBDIRS):      FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libcrypt/Makefile.com b/usr/src/lib/libcrypt/Makefile.com
index b9092b8121..0e7af514ce 100644
--- a/usr/src/lib/libcrypt/Makefile.com
+++ b/usr/src/lib/libcrypt/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -42,9 +41,6 @@ include ../../Makefile.lib
 SRCDIR=		../common
 
 LIBS=		$(DYNLIB) $(LINTLIB)
-SRCS=		$(OBJECTS:%.o=$(SRCDIR)/%.c)
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
 
 $(LINTLIB):=	SRCS=$(SRCDIR)/$(LINTSRC)
 
diff --git a/usr/src/lib/libcrypt/common/mapfile-vers b/usr/src/lib/libcrypt/common/mapfile-vers
new file mode 100644
index 0000000000..e5bd887454
--- /dev/null
+++ b/usr/src/lib/libcrypt/common/mapfile-vers
@@ -0,0 +1,65 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	crypt = FUNCTION FILTER libc.so.1;
+	encrypt = FUNCTION FILTER libc.so.1;
+	setkey = FUNCTION FILTER libc.so.1;
+};
+
+SUNWprivate_1.1 {
+    global:
+	cbc_crypt;
+	_crypt = FUNCTION FILTER libc.so.1;
+	crypt_close;
+	_crypt_close;
+	crypt_close_nolock;
+	des_crypt;
+	_des_crypt;
+	__des_crypt;
+	_des_decrypt1;
+	des_encrypt;
+	_des_encrypt;
+	des_encrypt1;
+	_des_encrypt1;
+	des_setkey;
+	_des_setkey;
+	des_setparity;
+	ecb_crypt;
+	_encrypt = FUNCTION FILTER libc.so.1;
+	_lib_version;
+	makekey;
+	_makekey;
+	run_crypt;
+	_run_crypt;
+	run_setkey;
+	_run_setkey;
+	_setkey = FUNCTION FILTER libc.so.1;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libcryptoutil/Makefile b/usr/src/lib/libcryptoutil/Makefile
index 687e767a20..3f17cf53ab 100644
--- a/usr/src/lib/libcryptoutil/Makefile
+++ b/usr/src/lib/libcryptoutil/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-include			$(SRC)/lib/Makefile.lib
+include $(SRC)/lib/Makefile.lib
 
 HDRS=	cryptoutil.h
 HDRDIR=         common
@@ -40,13 +40,13 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install lint: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
 check:  $(CHECKHDRS)
 
-spec $(SUBDIRS):	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libcryptoutil/Makefile.com b/usr/src/lib/libcryptoutil/Makefile.com
index 716bd94b1e..2beda723bb 100644
--- a/usr/src/lib/libcryptoutil/Makefile.com
+++ b/usr/src/lib/libcryptoutil/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -42,7 +41,6 @@ include $(SRC)/lib/Makefile.lib
 SRCDIR=	../common
 
 LIBS =	$(DYNLIB) $(LINTLIB)
-SRCS=	$(OBJECTS:%.o=../common/%.c)
 $(LINTLIB) := SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS += -lc
 
diff --git a/usr/src/lib/libcryptoutil/common/mapfile-vers b/usr/src/lib/libcryptoutil/common/mapfile-vers
new file mode 100644
index 0000000000..92e53197af
--- /dev/null
+++ b/usr/src/lib/libcryptoutil/common/mapfile-vers
@@ -0,0 +1,45 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	create_umech;
+	cryptodebug;
+	cryptodebug_init;
+	cryptoerror;
+	free_uentry;
+	free_uentrylist;
+	free_umechlist;
+	get_pkcs11conf_info;
+	pkcs11_mech2keytype;
+	pkcs11_mech2str;
+	pkcs11_str2mech;
+	pkcs11_strerror;
+	tohexstr;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libctf/Makefile b/usr/src/lib/libctf/Makefile
index 097d5836ce..5a8b3f9ed4 100644
--- a/usr/src/lib/libctf/Makefile
+++ b/usr/src/lib/libctf/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
@@ -42,15 +41,13 @@ lint := TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libctf/Makefile.com b/usr/src/lib/libctf/Makefile.com
index c17e3da43e..267d67aa18 100644
--- a/usr/src/lib/libctf/Makefile.com
+++ b/usr/src/lib/libctf/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -53,7 +52,6 @@ SRCS = $(COMMON_OBJS:%.o=../../../common/ctf/%.c) $(LIB_OBJS:%.o=../common/%.c)
 LIBS = $(DYNLIB) $(LINTLIB)
 
 SRCDIR = ../common
-SPECMAPFILE = $(MAPDIR)/mapfile
 
 CPPFLAGS += -I../common -I../../../common/ctf -DCTF_OLD_VERSIONS
 CFLAGS += $(CCVERBOSE)
diff --git a/usr/src/lib/libctf/amd64/Makefile b/usr/src/lib/libctf/amd64/Makefile
index 3914aa208b..c9bd26cfd3 100644
--- a/usr/src/lib/libctf/amd64/Makefile
+++ b/usr/src/lib/libctf/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR = ../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libctf/common/mapfile-vers b/usr/src/lib/libctf/common/mapfile-vers
new file mode 100644
index 0000000000..78739ae56a
--- /dev/null
+++ b/usr/src/lib/libctf/common/mapfile-vers
@@ -0,0 +1,101 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# There really should be only one SUNWprivate version.
+# Don't add any more.  Add new private symbols to SUNWprivate_1.2
+
+SUNWprivate_1.2 {
+    global:
+	ctf_add_array;
+	ctf_add_const;
+	ctf_add_enum;
+	ctf_add_enumerator;
+	ctf_add_float;
+	ctf_add_forward;
+	ctf_add_function;
+	ctf_add_integer;
+	ctf_add_member;
+	ctf_add_pointer;
+	ctf_add_restrict;
+	ctf_add_struct;
+	ctf_add_type;
+	ctf_add_typedef;
+	ctf_add_union;
+	ctf_add_volatile;
+	ctf_create;
+	ctf_discard;
+	ctf_enum_value;
+	ctf_label_info;
+	ctf_label_iter;
+	ctf_label_topmost;
+	ctf_member_info;
+	ctf_parent_file;
+	ctf_parent_name;
+	ctf_set_array;
+	ctf_type_align;
+	ctf_type_cmp;
+	ctf_type_compat;
+	ctf_type_pointer;
+	ctf_update;
+	ctf_write;
+} SUNWprivate_1.1;
+
+SUNWprivate_1.1 {
+    global:
+	ctf_array_info;
+	ctf_bufopen;
+	ctf_close;
+	ctf_enum_iter;
+	ctf_enum_name;
+	ctf_errmsg;
+	ctf_errno;
+	ctf_fdopen;
+	ctf_func_args;
+	ctf_func_info;
+	ctf_getmodel;
+	ctf_getspecific;
+	ctf_import;
+	ctf_lookup_by_name;
+	ctf_lookup_by_symbol;
+	ctf_member_iter;
+	ctf_open;
+	ctf_setmodel;
+	ctf_setspecific;
+	ctf_type_encoding;
+	ctf_type_iter;
+	ctf_type_kind;
+	ctf_type_lname;
+	ctf_type_name;
+	ctf_type_reference;
+	ctf_type_resolve;
+	ctf_type_size;
+	ctf_type_visit;
+	ctf_version;
+	_libctf_debug;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libctf/i386/Makefile b/usr/src/lib/libctf/i386/Makefile
index f18c377711..a333224278 100644
--- a/usr/src/lib/libctf/i386/Makefile
+++ b/usr/src/lib/libctf/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
-MAPDIR = ../spec/i386
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libctf/sparc/Makefile b/usr/src/lib/libctf/sparc/Makefile
index 3d3aea72dd..a333224278 100644
--- a/usr/src/lib/libctf/sparc/Makefile
+++ b/usr/src/lib/libctf/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
-MAPDIR = ../spec/sparc
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libctf/sparcv9/Makefile b/usr/src/lib/libctf/sparcv9/Makefile
index 9c3e0f53b8..c9bd26cfd3 100644
--- a/usr/src/lib/libctf/sparcv9/Makefile
+++ b/usr/src/lib/libctf/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
-MAPDIR = ../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libcurses/Makefile b/usr/src/lib/libcurses/Makefile
index 27a9dc4a70..a1b04c3e9f 100644
--- a/usr/src/lib/libcurses/Makefile
+++ b/usr/src/lib/libcurses/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,19 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1990-2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libcurses/Makefile
-#
-# The builds occur in isa subdirectories.
-#
 
 include	../Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
 all :=		TARGET= all
@@ -85,7 +81,7 @@ check:	$(CHECKHDRS)
 
 scrfiles:	$(SCRFILES)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 ED = ed
@@ -119,11 +115,11 @@ screen/tmp:
 	rm -rf $@
 	mkdir $@
 
-_msg:	$(MSGDOMAIN) $(POFILE)
+_msg:	$(MSGDOMAIN) .WAIT $(POFILE)
 	$(RM) $(MSGDOMAIN)/$(POFILE)
 	$(CP) $(POFILE) $(MSGDOMAIN)
 
-$(POFILE): .WAIT $(POFILES)
+$(POFILE):	$(POFILES)
 	$(RM) $@
 	$(CAT) $(POFILES) > $@
 
diff --git a/usr/src/lib/libcurses/Makefile.com b/usr/src/lib/libcurses/Makefile.com
index 093db7a79a..6db4b1cc4e 100644
--- a/usr/src/lib/libcurses/Makefile.com
+++ b/usr/src/lib/libcurses/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libcurses/screen/Makefile
-#
+
 LIBRARY=	libcurses.a
 VERS=	.1
 
@@ -136,10 +134,7 @@ include ../../Makefile.lib
 # install this library in the root filesystem
 include ../../Makefile.rootfs
 
-MAPFILE=	$(MAPDIR)/mapfile
-MAPOPTS=	$(MAPFILE:%=-M %)
-
-SRCS=		$(OBJECTS:%.o=../screen/%.c)
+SRCDIR =	../screen
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -159,7 +154,7 @@ ROOTLINKS64=	$(ROOTLIBDIR64)/$(LIBLINKS)
 CLEANFILES +=	$(LINTOUT) $(LINTLIB)
 
 CFLAGS	+=	$(CCVERBOSE)
-DYNFLAGS +=	$(MAPOPTS)
+
 LDLIBS += -lc
 
 CPPFLAGS += -I../screen -I../../common/inc
@@ -179,12 +174,6 @@ all: $(LIBS)
 
 lint: lintcheck
 
-$(DYNLIB): 	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
-
 # install rule for 32-bit libcurses.a
 $(ROOTLIBDIR)/%.a: %.a
 	$(INS.file)
@@ -204,15 +193,6 @@ $(ROOTLINKS) := INS.liblink= \
 		$(SYMLINK) libtermlib.so$(VERS) libtermlib.so; \
 		$(SYMLINK) libtermcap.so$(VERS) libtermcap.so;
 
-#
-# Include library targets
-#
-include ../../Makefile.targ
-
-pics/%.o: ../screen/%.c
-	$(COMPILE.c) -o $@ $<
-	$(POST_PROCESS_O)
-
 # install rule for lint library target
 $(ROOTLINTDIR)/%: ../screen/%
 	$(INS.file)
@@ -234,3 +214,8 @@ $(ROOTLINTDIR64)/%: ../screen/%
 		$(RM) llib-ltermcap.ln llib-ltermlib.ln ; \
 		$(SYMLINK) ./llib-lcurses.ln llib-ltermcap.ln; \
 		$(SYMLINK) ./llib-lcurses.ln llib-ltermlib.ln;
+
+#
+# Include library targets
+#
+include ../../Makefile.targ
diff --git a/usr/src/lib/libcurses/amd64/Makefile b/usr/src/lib/libcurses/amd64/Makefile
index 4733b9a3dd..5e8087fc09 100644
--- a/usr/src/lib/libcurses/amd64/Makefile
+++ b/usr/src/lib/libcurses/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libcurses/i386/Makefile b/usr/src/lib/libcurses/i386/Makefile
index 951cf8b81d..2a944b0b43 100644
--- a/usr/src/lib/libcurses/i386/Makefile
+++ b/usr/src/lib/libcurses/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libcurses/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libcurses/screen/mapfile-vers b/usr/src/lib/libcurses/screen/mapfile-vers
new file mode 100644
index 0000000000..d499d4689a
--- /dev/null
+++ b/usr/src/lib/libcurses/screen/mapfile-vers
@@ -0,0 +1,581 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	addch;
+	addchnstr;
+	addchstr;
+	addnstr;
+	addnwstr;
+	addstr;
+	addwch;
+	addwchnstr;
+	addwchstr;
+	addwstr;
+	attroff;
+	attron;
+	attrset;
+	baudrate;
+	beep;
+	bkgd;
+	bkgdset;
+	border;
+	box;
+	can_change_color;
+	cbreak;
+	clear;
+	clearok;
+	clrtobot;
+	clrtoeol;
+	color_content;
+	copywin;
+	crmode;
+	curs_set;
+	def_prog_mode;
+	def_shell_mode;
+	delay_output;
+	delch;
+	del_curterm;
+	deleteln;
+	delscreen;
+	delwin;
+	derwin;
+	doupdate;
+	dupwin;
+	echo;
+	echochar;
+	echowchar;
+	endwin;
+	erase;
+	erasechar;
+	filter;
+	flash;
+	flushinp;
+	getch;
+	getnwstr;
+	getstr;
+	_getsyx;
+	getwch;
+	getwin;
+	getwstr;
+	halfdelay;
+	has_colors;
+	has_ic;
+	has_il;
+	idcok;
+	idlok;
+	immedok;
+	inch;
+	inchnstr;
+	inchstr;
+	init_color;
+	init_pair;
+	initscr;
+	innstr;
+	innwstr;
+	insch;
+	insdelln;
+	insertln;
+	insnstr;
+	insnwstr;
+	insstr;
+	instr;
+	inswch;
+	inswstr;
+	intrflush;
+	inwch;
+	inwchnstr;
+	inwchstr;
+	inwstr;
+	isendwin;
+	is_linetouched;
+	is_wintouched;
+	keyname;
+	keypad;
+	killchar;
+	leaveok;
+	longname;
+	meta;
+	_meta;
+	move;
+	mvaddch;
+	mvaddchnstr;
+	mvaddchstr;
+	mvaddnstr;
+	mvaddnwstr;
+	mvaddstr;
+	mvaddwch;
+	mvaddwchnstr;
+	mvaddwchstr;
+	mvaddwstr;
+	mvcur;
+	mvdelch;
+	mvderwin;
+	mvgetch;
+	mvgetnwstr;
+	mvgetstr;
+	mvgetwch;
+	mvgetwstr;
+	mvinch;
+	mvinchnstr;
+	mvinchstr;
+	mvinnstr;
+	mvinnwstr;
+	mvinsch;
+	mvinsnstr;
+	mvinsnwstr;
+	mvinsstr;
+	mvinstr;
+	mvinswch;
+	mvinswstr;
+	mvinwch;
+	mvinwchnstr;
+	mvinwchstr;
+	mvinwstr;
+	mvprintw;
+	mvscanw;
+	mvwaddch;
+	mvwaddchnstr;
+	mvwaddchstr;
+	mvwaddnstr;
+	mvwaddnwstr;
+	mvwaddstr;
+	mvwaddwch;
+	mvwaddwchnstr;
+	mvwaddwchstr;
+	mvwaddwstr;
+	mvwdelch;
+	mvwgetch;
+	mvwgetnwstr;
+	mvwgetstr;
+	mvwgetwch;
+	mvwgetwstr;
+	mvwin;
+	mvwinch;
+	mvwinchnstr;
+	mvwinchstr;
+	mvwinnstr;
+	mvwinnwstr;
+	mvwinsch;
+	mvwinsnstr;
+	mvwinsnwstr;
+	mvwinsstr;
+	mvwinstr;
+	mvwinswch;
+	mvwinswstr;
+	mvwinwch;
+	mvwinwchnstr;
+	mvwinwchstr;
+	mvwinwstr;
+	mvwprintw;
+	mvwscanw;
+	napms;
+	newpad;
+	newterm;
+	newwin;
+	nl;
+	nocbreak;
+	nocrmode;
+	nodelay;
+	noecho;
+	nonl;
+	noqiflush;
+	noraw;
+	notimeout;
+	overlay;
+	overwrite;
+	pair_content;
+	pechochar;
+	pechowchar;
+	pnoutrefresh;
+	prefresh;
+	printw;
+	putp;
+	putwin;
+	qiflush;
+	raw;
+	redrawwin;
+	refresh;
+	reset_prog_mode;
+	reset_shell_mode;
+	resetty;
+	restartterm;
+	_ring;
+	ripoffline;
+	savetty;
+	scanw;
+	scr_dump;
+	scr_init;
+	scrl;
+	scroll;
+	scrollok;
+	scr_restore;
+	scr_set;
+	_setecho;
+	_setnonl;
+	_setqiflush;
+	setscrreg;
+	setsyx;
+	set_term;
+	setterm;
+	setupterm;
+	slk_attroff;
+	slk_attron;
+	slk_attrset;
+	slk_clear;
+	slk_init;
+	slk_label;
+	slk_noutrefresh;
+	slk_refresh;
+	slk_restore;
+	slk_set;
+	slk_touch;
+	standend;
+	standout;
+	start_color;
+	subpad;
+	subwin;
+	syncok;
+	termattrs;
+	termname;
+	tgetent;
+	tgetflag;
+	tgetnum;
+	tgetstr;
+	tgoto;
+	tigetflag;
+	tigetnum;
+	tigetstr;
+	timeout;
+	touchline;
+	touchwin;
+	tparm;
+	tputs;
+	typeahead;
+	unctrl;
+	ungetch;
+	ungetwch;
+	untouchwin;
+	vidattr;
+	vidputs;
+	vwprintw;
+	vwscanw;
+	waddch;
+	waddchnstr;
+	waddchstr;
+	waddnstr;
+	waddnwstr;
+	waddstr;
+	waddwch;
+	waddwchnstr;
+	waddwchstr;
+	waddwstr;
+	wadjcurspos;
+	wattroff;
+	wattron;
+	wattrset;
+	wbkgd;
+	wbkgdset;
+	wborder;
+	wclear;
+	wclrtobot;
+	wclrtoeol;
+	wcursyncup;
+	wdelch;
+	wdeleteln;
+	wechochar;
+	wechowchar;
+	werase;
+	wgetch;
+	wgetnstr;
+	wgetnwstr;
+	wgetstr;
+	wgetwch;
+	wgetwstr;
+	whline;
+	winch;
+	winchnstr;
+	winchstr;
+	winnstr;
+	winnwstr;
+	winsch;
+	winsdelln;
+	winsertln;
+	winsnstr;
+	winsnwstr;
+	winsstr;
+	winstr;
+	winswch;
+	winswstr;
+	winwch;
+	winwchnstr;
+	winwchstr;
+	winwstr;
+	wmove;
+	wmovenextch;
+	wmoveprevch;
+	wnoutrefresh;
+	wprintw;
+	wredrawln;
+	wrefresh;
+	wscanw;
+	wscrl;
+	wsetscrreg;
+	wstandend;
+	wstandout;
+	wsyncdown;
+	wsyncup;
+	wtimeout;
+	wtouchln;
+	wvline;
+};
+
+SUNWprivate_1.1 {
+    global:
+	acs32map;
+	acs_map;
+	BC;
+	bit_attributes;
+	_blast_keys;
+	boolcodes;
+	boolfnames;
+	boolnames;
+	box32;
+	_branchto;
+	_called_before;
+	_ccleanup;
+	cconvert;
+	cexpand;
+	_change_color;
+	_change_video;
+	_chkinput;
+	COLOR_PAIRS;
+	COLORS;
+	COLS;
+	_countchar;
+	cpr;
+	_csmax;
+	cswidth;
+	cur_bools;
+	cur_nums;
+	curscr;
+	curserr;
+	curs_errno;
+	curs_err_strings;
+	curses_version;
+	_curs_mbstowcs;
+	_curs_mbtowc;
+	curs_parm_err;
+	_curs_scrwidth;
+	cur_strs;
+	_curs_wcstombs;
+	_curs_wctomb;
+	cur_term;
+	Def_term;
+	_delay;
+	delkey;
+	delkeymap;
+	delterm;
+	_do_slk_noref;
+	_do_slk_ref;
+	_do_slk_tch;
+	draino;
+	_endwin;
+	_first_term;
+	fixterm;
+	force_doupdate;
+	_frst_bools;
+	_frst_nums;
+	_frst_strs;
+	_frst_tblstr;
+	garbagedlines;
+	garbagedwin;
+	getattrs;
+	getbegx;
+	getbegy;
+	getbkgd;
+	getbmap;
+	getcurx;
+	getcury;
+	getmaxx;
+	getmaxy;
+	getmouse;
+	getparx;
+	getpary;
+	gettmode;
+	hline;
+	iexpand;
+	_image;
+	infotocap;
+	init_acs;
+	_init_costs;
+	_init_HP_pair;
+	initscr32;
+	_lib_version;
+	LINES;
+	m_addch;
+	m_addstr;
+	makenew;
+	_makenew;
+	map_button;
+	_mbaddch;
+	mbcharlen;
+	_mbclrch;
+	mbdisplen;
+	mbeucw;
+	mbgetwidth;
+	_mbinsshift;
+	mbscrw;
+	_mbtrue;
+	_mbvalid;
+	m_clear;
+	memSset;
+	m_erase;
+	m_initscr;
+	m_move;
+	m_newterm;
+	mouse_off;
+	mouse_on;
+	mouse_set;
+	Mouse_status;
+	m_refresh;
+	mvhline;
+	mvvline;
+	mvwhline;
+	mvwvline;
+	newkey;
+	newscreen;
+	newterm32;
+	numcodes;
+	numfnames;
+	numnames;
+	Oldcolors;
+	ospeed;
+	_outch;
+	_outchar;
+	outchcount;
+	_outwch;
+	_overlap;
+	p32echochar;
+	_padjust;
+	PC;
+	pr_bfooting;
+	pr_bheading;
+	pr_boolean;
+	pr_caprestrict;
+	_prefresh;
+	pr_heading;
+	pr_init;
+	pr_nfooting;
+	pr_nheading;
+	pr_number;
+	prog_istermios;
+	progname;
+	pr_onecolumn;
+	pr_sfooting;
+	pr_sheading;
+	pr_string;
+	pr_width;
+	_quick_echo;
+	_quick_ptr;
+	request_mouse_pos;
+	resetterm;
+	_rip_init;
+	rmpadding;
+	saveterm;
+	_scr_all;
+	scr_ll_dump;
+	_scrmax;
+	scr_reset;
+	setcurscreen;
+	set_curterm;
+	setcurterm;
+	_setidln;
+	setkeymap;
+	shell_istermios;
+	_slk_init;
+	slk_start;
+	_slk_update;
+	SP;
+	_sprintw;
+	__sscans;
+	stdscr;
+	_strbyte2code;
+	_strcode2byte;
+	strcodes;
+	strfnames;
+	strnames;
+	TABSIZE;
+	_tcsearch;
+	termerr;
+	term_errno;
+	term_err_strings;
+	term_parm_err;
+	tgetch;
+	tgetwch;
+	tifgetflag;
+	tifgetnum;
+	tifgetstr;
+	tinputfd;
+	tparm_p0;
+	tparm_p1;
+	tparm_p2;
+	tparm_p3;
+	tparm_p4;
+	tparm_p7;
+	tpr;
+	traceoff;
+	traceon;
+	_tstp;
+	ttimeout;
+	ttytype;
+	_unctrl;
+	UP;
+	_update_old_y_area;
+	use_env;
+	_use_env;
+	_useidln;
+	vid32attr;
+	vid32puts;
+	vidupdate;
+	_virtscr;
+	vline;
+	w32addch;
+	w32attroff;
+	w32attron;
+	w32attrset;
+	w32echochar;
+	w32insch;
+	wcscrw;
+	wmbinch;
+	wmbmove;
+	wmouse_position;
+	_y16update;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libcurses/sparc/Makefile b/usr/src/lib/libcurses/sparc/Makefile
index 7fad7849fe..2a944b0b43 100644
--- a/usr/src/lib/libcurses/sparc/Makefile
+++ b/usr/src/lib/libcurses/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libcurses/sparc/Makefile
-
-MAPDIR=		../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libcurses/sparcv9/Makefile b/usr/src/lib/libcurses/sparcv9/Makefile
index d420e5ba59..5e8087fc09 100644
--- a/usr/src/lib/libcurses/sparcv9/Makefile
+++ b/usr/src/lib/libcurses/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libcurses/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/libdevice/Makefile b/usr/src/lib/libdevice/Makefile
index 5facb90b3b..deea4f83e8 100644
--- a/usr/src/lib/libdevice/Makefile
+++ b/usr/src/lib/libdevice/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1990-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libdevice/Makefile
 
 include ../Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
 all :=          TARGET= all
@@ -58,7 +57,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libdevice/Makefile.com b/usr/src/lib/libdevice/Makefile.com
index f082e9e174..269cb501e7 100644
--- a/usr/src/lib/libdevice/Makefile.com
+++ b/usr/src/lib/libdevice/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -37,10 +36,6 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc -lnvpair
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	..
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT
 
diff --git a/usr/src/lib/libdevice/mapfile-vers b/usr/src/lib/libdevice/mapfile-vers
new file mode 100644
index 0000000000..c91a7adf82
--- /dev/null
+++ b/usr/src/lib/libdevice/mapfile-vers
@@ -0,0 +1,78 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	devctl_ap_acquire;
+	devctl_ap_configure;
+	devctl_ap_connect;
+	devctl_ap_disconnect;
+	devctl_ap_getstate;
+	devctl_ap_insert;
+	devctl_ap_remove;
+	devctl_ap_unconfigure;
+	devctl_bus_acquire;
+	devctl_bus_configure;
+	devctl_bus_dev_create;
+	devctl_bus_getstate;
+	devctl_bus_quiesce;
+	devctl_bus_reset;
+	devctl_bus_resetall;
+	devctl_bus_unconfigure;
+	devctl_bus_unquiesce;
+	devctl_ddef_alloc;
+	devctl_ddef_byte_array;
+	devctl_ddef_free;
+	devctl_ddef_int;
+	devctl_ddef_int_array;
+	devctl_ddef_string;
+	devctl_ddef_string_array;
+	devctl_device_acquire;
+	devctl_device_getstate;
+	devctl_device_offline;
+	devctl_device_online;
+	devctl_device_remove;
+	devctl_device_reset;
+	devctl_get_pathname;
+	devctl_pm_bus_acquire;
+	devctl_pm_bus_no_invol;
+	devctl_pm_bus_teststrict;
+	devctl_pm_busycomponent;
+	devctl_pm_changepowerhigh;
+	devctl_pm_changepowerlow;
+	devctl_pm_dev_acquire;
+	devctl_pm_device_changeonresume;
+	devctl_pm_device_no_lower_power;
+	devctl_pm_device_promprintf;
+	devctl_pm_failsuspend;
+	devctl_pm_idlecomponent;
+	devctl_pm_raisepower;
+	devctl_pm_testbusy;
+	devctl_release;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdevid/Makefile b/usr/src/lib/libdevid/Makefile
index eb9c9fd272..86addda787 100644
--- a/usr/src/lib/libdevid/Makefile
+++ b/usr/src/lib/libdevid/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libdevid/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include	../Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
 all :=      	TARGET= all
@@ -57,7 +55,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libdevid/Makefile.com b/usr/src/lib/libdevid/Makefile.com
index 8ef377e354..25c5e2d4c7 100644
--- a/usr/src/lib/libdevid/Makefile.com
+++ b/usr/src/lib/libdevid/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -42,10 +41,6 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 #
 LDLIBS +=	-ldevinfo -lc
 
-SRCDIR =	..
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libdevid/mapfile-vers b/usr/src/lib/libdevid/mapfile-vers
new file mode 100644
index 0000000000..209614fe26
--- /dev/null
+++ b/usr/src/lib/libdevid/mapfile-vers
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+	devid_str_decode;
+	devid_str_encode;
+	devid_str_free;
+	devid_valid;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	devid_compare;
+	devid_deviceid_to_nmlist;
+	devid_free;
+	devid_free_nmlist;
+	devid_get;
+	devid_get_minor_name;
+	devid_sizeof;
+};
+
+SUNWprivate_1.1 {
+    global:
+	devid_free_guid;
+	devid_scsi_encode;
+	devid_str_compare;
+	devid_to_guid;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdevinfo/Makefile b/usr/src/lib/libdevinfo/Makefile
index 96ce3a2dcd..17b5ed71f6 100644
--- a/usr/src/lib/libdevinfo/Makefile
+++ b/usr/src/lib/libdevinfo/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,17 +18,17 @@
 #
 # CDDL HEADER END
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Copyright (c) 1990-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# lib/libdevinfo/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include	../Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
 all :=      	TARGET= all
@@ -58,7 +57,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libdevinfo/Makefile.com b/usr/src/lib/libdevinfo/Makefile.com
index cc05e1bad6..d071f6a304 100644
--- a/usr/src/lib/libdevinfo/Makefile.com
+++ b/usr/src/lib/libdevinfo/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -39,10 +38,6 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lnvpair -lsec -lc
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	..
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I..
 
diff --git a/usr/src/lib/libdevinfo/amd64/Makefile b/usr/src/lib/libdevinfo/amd64/Makefile
index 45561f6e73..9ab764a959 100644
--- a/usr/src/lib/libdevinfo/amd64/Makefile
+++ b/usr/src/lib/libdevinfo/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libdevinfo/i386/Makefile b/usr/src/lib/libdevinfo/i386/Makefile
index 821c7b0afd..e41aa0aa25 100644
--- a/usr/src/lib/libdevinfo/i386/Makefile
+++ b/usr/src/lib/libdevinfo/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1996-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libdevinfo/i386/Makefile
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 all: $(LIBS)
diff --git a/usr/src/lib/libdevinfo/mapfile-vers b/usr/src/lib/libdevinfo/mapfile-vers
new file mode 100644
index 0000000000..7ddb19dae3
--- /dev/null
+++ b/usr/src/lib/libdevinfo/mapfile-vers
@@ -0,0 +1,185 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.3 {
+    global:
+	di_devfs_minor_path;
+	di_driver_major;
+	di_link_next_by_lnode;
+	di_link_next_by_node;
+	di_link_private_get;
+	di_link_private_set;
+	di_link_spectype;
+	di_link_to_lnode;
+	di_lnode_devinfo;
+	di_lnode_devt;
+	di_lnode_name;
+	di_lnode_next;
+	di_lnode_private_get;
+	di_lnode_private_set;
+	di_minor_private_get;
+	di_minor_private_set;
+	di_node_private_get;
+	di_node_private_set;
+	di_walk_link;
+	di_walk_lnode;
+} SUNW_1.2;
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.2 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.2 {
+    global:
+	SUNW_1.2;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	di_binding_name;
+	di_bus_addr;
+	di_child_node;
+	di_compatible_names;
+	di_devfs_path;
+	di_devfs_path_free;
+	di_devid;
+	di_driver_name;
+	di_driver_ops;
+	di_drv_first_node;
+	di_drv_next_node;
+	di_fini;
+	di_init;
+	di_instance;
+	di_minor_devt;
+	di_minor_name;
+	di_minor_next;
+	di_minor_nodetype;
+	di_minor_spectype;
+	di_minor_type;
+	di_nodeid;
+	di_node_name;
+	di_parent_node;
+	di_prom_fini;
+	di_prom_init;
+	di_prom_prop_data;
+	di_prom_prop_lookup_bytes;
+	di_prom_prop_lookup_ints;
+	di_prom_prop_lookup_strings;
+	di_prom_prop_name;
+	di_prom_prop_next;
+	di_prop_bytes;
+	di_prop_devt;
+	di_prop_int64;
+	di_prop_ints;
+	di_prop_lookup_bytes;
+	di_prop_lookup_int64;
+	di_prop_lookup_ints;
+	di_prop_lookup_strings;
+	di_prop_name;
+	di_prop_next;
+	di_prop_strings;
+	di_prop_type;
+	di_sibling_node;
+	di_state;
+	di_walk_minor;
+	di_walk_node;
+};
+
+SUNWprivate_1.1 {
+    global:
+	devfs_add_minor_perm;
+	devfs_bootdev_free_list;
+	devfs_bootdev_get_list;
+	devfs_bootdev_modifiable;
+	devfs_bootdev_set_list;
+	devfs_dev_to_prom_name;
+	devfs_free_all_prom_names;
+	devfs_free_minor_perm;
+	devfs_get_all_prom_names;
+	devfs_get_prom_names;
+	devfs_install2target;
+	devfs_load_minor_perm;
+	devfs_path_to_drv;
+	devfs_read_minor_perm;
+	devfs_resolve_aliases;
+	devfs_rm_minor_perm;
+	devfs_target2install;
+	di_devlink_add_link;
+	di_devlink_cache_walk;
+	di_devlink_close;
+	di_devlink_content;
+	di_devlink_dup;
+	di_devlink_fini;
+	di_devlink_free;
+	di_devlink_init;
+	di_devlink_init_root;
+	di_devlink_open;
+	di_devlink_path;
+	di_devlink_rm_link;
+	di_devlink_type;
+	di_devlink_update;
+	di_devlink_walk;
+	di_devperm_login;
+	di_devperm_logout;
+	di_driver_private_data;
+	di_init_driver;
+	di_init_impl;
+	di_lookup_node;
+	di_minor_devinfo;
+	di_node_state;
+	di_parent_private_data;
+	di_path_addr;
+	di_path_client_node;
+	di_path_next;
+	di_path_next_client;
+	di_path_next_phci;
+	di_path_phci_node;
+	di_path_prop_bytes;
+	di_path_prop_int64s;
+	di_path_prop_ints;
+	di_path_prop_len;
+	di_path_prop_lookup_bytes;
+	di_path_prop_lookup_int64s;
+	di_path_prop_lookup_ints;
+	di_path_prop_lookup_strings;
+	di_path_prop_name;
+	di_path_prop_next;
+	di_path_prop_strings;
+	di_path_prop_type;
+	di_path_state;
+	di_phci_first_node;
+	di_phci_next_node;
+	di_prop_drv_next;
+	di_prop_global_next;
+	di_prop_hw_next;
+	di_prop_rawdata;
+	di_prop_sys_next;
+	di_vhci_first_node;
+	di_vhci_next_node;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdevinfo/sparc/Makefile b/usr/src/lib/libdevinfo/sparc/Makefile
index 0c9bd6da6d..e41aa0aa25 100644
--- a/usr/src/lib/libdevinfo/sparc/Makefile
+++ b/usr/src/lib/libdevinfo/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1996-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libdevinfo/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 all: $(LIBS)
diff --git a/usr/src/lib/libdevinfo/sparcv9/Makefile b/usr/src/lib/libdevinfo/sparcv9/Makefile
index 2d0a109adf..9ab764a959 100644
--- a/usr/src/lib/libdevinfo/sparcv9/Makefile
+++ b/usr/src/lib/libdevinfo/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1996-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libdevinfo/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libdhcpagent/Makefile b/usr/src/lib/libdhcpagent/Makefile
index 118d233736..dde31ea7b3 100644
--- a/usr/src/lib/libdhcpagent/Makefile
+++ b/usr/src/lib/libdhcpagent/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
@@ -40,15 +39,13 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
 check:		$(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libdhcpagent/Makefile.com b/usr/src/lib/libdhcpagent/Makefile.com
index 7a428bb11d..ecd15a6496 100644
--- a/usr/src/lib/libdhcpagent/Makefile.com
+++ b/usr/src/lib/libdhcpagent/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -38,11 +37,9 @@ include ../../Makefile.rootfs
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 LDLIBS +=	-lc -lsocket -ldhcputil
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS += 	$(CCVERBOSE) 
 
diff --git a/usr/src/lib/libdhcpagent/common/mapfile-vers b/usr/src/lib/libdhcpagent/common/mapfile-vers
new file mode 100644
index 0000000000..589e76b4fb
--- /dev/null
+++ b/usr/src/lib/libdhcpagent/common/mapfile-vers
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	dhcp_ipc_accept;
+	dhcp_ipc_alloc_reply;
+	dhcp_ipc_alloc_request;
+	dhcp_ipc_close;
+	dhcp_ipc_get_data;
+	dhcp_ipc_getinfo;
+	dhcp_ipc_init;
+	dhcp_ipc_make_request;
+	dhcp_ipc_recv_request;
+	dhcp_ipc_send_reply;
+	dhcp_ipc_strerror;
+	dhcp_start_agent;
+	dhcp_state_to_string;
+	dhcp_status_hdr_string;
+	dhcp_status_reply_to_string;
+	dhcp_string_to_request;
+	ifname_to_hostconf;
+	read_hostconf;
+	remove_hostconf;
+	write_hostconf;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdhcpdu/Makefile.com b/usr/src/lib/libdhcpdu/Makefile.com
index e8f0530f5a..c758684255 100644
--- a/usr/src/lib/libdhcpdu/Makefile.com
+++ b/usr/src/lib/libdhcpdu/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -37,8 +36,6 @@ LDLIBS +=	-lnvpair -lresolv -lnsl -lc
 
 ROOTLIBDIR =	$(ROOT)/usr/lib/inet/dhcp/nsu
 SRCDIR =	../common
-MAPFILES =	../common/mapfile
-MAPOPTS =	$(MAPFILES:%=-M %)
 
 #
 # Since lint is not smart enough to grok `do { } while (0)' in macros,
@@ -46,7 +43,8 @@ MAPOPTS =	$(MAPFILES:%=-M %)
 #
 LINTFLAGS +=	-erroff=E_CONSTANT_CONDITION
 CPPFLAGS += 	-D_REENTRANT -I../../libresolv2/include
-DYNFLAGS +=	$(MAPOPTS)
+
+MAPFILES =	../common/mapfile
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libdhcpsvc/Makefile.com b/usr/src/lib/libdhcpsvc/Makefile.com
index 40c32694ec..df7838be2e 100644
--- a/usr/src/lib/libdhcpsvc/Makefile.com
+++ b/usr/src/lib/libdhcpsvc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -29,7 +28,5 @@
 include $(SRC)/lib/Makefile.lib
 
 COMDIR  = $(SRC)/common/net/dhcp
-SRCDIR	= ..
-SPECMAPFILE = $(MAPDIR)/mapfile
 
 CPPFLAGS += -I$(SRC)/lib/libdhcpsvc/head -D_REENTRANT
diff --git a/usr/src/lib/libdhcpsvc/modules/Makefile.com b/usr/src/lib/libdhcpsvc/modules/Makefile.com
index 7832eeb5aa..a1b00f4aa5 100644
--- a/usr/src/lib/libdhcpsvc/modules/Makefile.com
+++ b/usr/src/lib/libdhcpsvc/modules/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2000, 2003 Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libdhcpsvc/modules/Makefile.com
 
 include $(SRC)/lib/libdhcpsvc/Makefile.com
 
@@ -39,8 +36,5 @@ ROOTLIBDIR = $(ROOT)/usr/lib/inet/dhcp/svc
 # Make the utility routines available
 UTILDIR = ../../../modules/util
 
-# Specfile map directory, used by leaf module makefiles
-MAPDIR  = ../spec/$(MACH)
-
 # Provide the current container version as DSVC_CONVER
 CPPFLAGS += -DDSVC_CONVER=$(VERS:.%=%)
diff --git a/usr/src/lib/libdhcpsvc/modules/binfiles/Makefile b/usr/src/lib/libdhcpsvc/modules/binfiles/Makefile
index d2492aa321..2225b9c4c6 100644
--- a/usr/src/lib/libdhcpsvc/modules/binfiles/Makefile
+++ b/usr/src/lib/libdhcpsvc/modules/binfiles/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libdhcpsvc/modules/binfiles/Makefile
 
 include $(SRC)/lib/Makefile.lib
-SUBDIRS = spec .WAIT $(MACH)
+SUBDIRS = $(MACH)
 include ../../Makefile.subdirs
diff --git a/usr/src/lib/libdhcpsvc/modules/binfiles/mapfile-vers b/usr/src/lib/libdhcpsvc/modules/binfiles/mapfile-vers
new file mode 100644
index 0000000000..29713f6ee9
--- /dev/null
+++ b/usr/src/lib/libdhcpsvc/modules/binfiles/mapfile-vers
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	add_dn;
+	add_dt;
+	close_dn;
+	close_dt;
+	delete_dn;
+	delete_dt;
+	dsvc_synchtype;
+	list_dn;
+	list_dt;
+	lookup_dn;
+	lookup_dt;
+	mklocation;
+	modify_dn;
+	modify_dt;
+	open_dn;
+	open_dt;
+	remove_dn;
+	remove_dt;
+	status;
+	version;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdhcpsvc/modules/files/Makefile b/usr/src/lib/libdhcpsvc/modules/files/Makefile
index 3b3ad645ab..2225b9c4c6 100644
--- a/usr/src/lib/libdhcpsvc/modules/files/Makefile
+++ b/usr/src/lib/libdhcpsvc/modules/files/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libdhcpsvc/modules/files/Makefile
 
 include $(SRC)/lib/Makefile.lib
-SUBDIRS = spec .WAIT $(MACH)
+SUBDIRS = $(MACH)
 include ../../Makefile.subdirs
diff --git a/usr/src/lib/libdhcpsvc/modules/files/mapfile-vers b/usr/src/lib/libdhcpsvc/modules/files/mapfile-vers
new file mode 100644
index 0000000000..29713f6ee9
--- /dev/null
+++ b/usr/src/lib/libdhcpsvc/modules/files/mapfile-vers
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	add_dn;
+	add_dt;
+	close_dn;
+	close_dt;
+	delete_dn;
+	delete_dt;
+	dsvc_synchtype;
+	list_dn;
+	list_dt;
+	lookup_dn;
+	lookup_dt;
+	mklocation;
+	modify_dn;
+	modify_dt;
+	open_dn;
+	open_dt;
+	remove_dn;
+	remove_dt;
+	status;
+	version;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdhcpsvc/modules/files0/Makefile b/usr/src/lib/libdhcpsvc/modules/files0/Makefile
index 84baa395ff..2225b9c4c6 100644
--- a/usr/src/lib/libdhcpsvc/modules/files0/Makefile
+++ b/usr/src/lib/libdhcpsvc/modules/files0/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libdhcpsvc/modules/files0/Makefile
 
 include $(SRC)/lib/Makefile.lib
-SUBDIRS = spec .WAIT $(MACH)
+SUBDIRS = $(MACH)
 include ../../Makefile.subdirs
diff --git a/usr/src/lib/libdhcpsvc/modules/files0/mapfile-vers b/usr/src/lib/libdhcpsvc/modules/files0/mapfile-vers
new file mode 100644
index 0000000000..57e5bdbe3d
--- /dev/null
+++ b/usr/src/lib/libdhcpsvc/modules/files0/mapfile-vers
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	add_dn;
+	add_dt;
+	close_dn;
+	close_dt;
+	delete_dn;
+	delete_dt;
+	list_dn;
+	list_dt;
+	lookup_dn;
+	lookup_dt;
+	mklocation;
+	modify_dn;
+	modify_dt;
+	open_dn;
+	open_dt;
+	remove_dn;
+	remove_dt;
+	status;
+	version;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus/Makefile b/usr/src/lib/libdhcpsvc/modules/nisplus/Makefile
index 2bc5189767..2225b9c4c6 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus/Makefile
+++ b/usr/src/lib/libdhcpsvc/modules/nisplus/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libdhcpsvc/modules/nisplus/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
-SUBDIRS = spec .WAIT $(MACH)
+SUBDIRS = $(MACH)
 include ../../Makefile.subdirs
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus/mapfile-vers b/usr/src/lib/libdhcpsvc/modules/nisplus/mapfile-vers
new file mode 100644
index 0000000000..57e5bdbe3d
--- /dev/null
+++ b/usr/src/lib/libdhcpsvc/modules/nisplus/mapfile-vers
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	add_dn;
+	add_dt;
+	close_dn;
+	close_dt;
+	delete_dn;
+	delete_dt;
+	list_dn;
+	list_dt;
+	lookup_dn;
+	lookup_dt;
+	mklocation;
+	modify_dn;
+	modify_dt;
+	open_dn;
+	open_dt;
+	remove_dn;
+	remove_dt;
+	status;
+	version;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus0/Makefile b/usr/src/lib/libdhcpsvc/modules/nisplus0/Makefile
index 042efe7508..bdeebd3bee 100644
--- a/usr/src/lib/libdhcpsvc/modules/nisplus0/Makefile
+++ b/usr/src/lib/libdhcpsvc/modules/nisplus0/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libdhcpsvc/modules/nisplus0/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
-SUBDIRS = spec .WAIT $(MACH)
+SUBDIRS = $(MACH)
 include ../../Makefile.subdirs
 
diff --git a/usr/src/lib/libdhcpsvc/modules/nisplus0/mapfile-vers b/usr/src/lib/libdhcpsvc/modules/nisplus0/mapfile-vers
new file mode 100644
index 0000000000..57e5bdbe3d
--- /dev/null
+++ b/usr/src/lib/libdhcpsvc/modules/nisplus0/mapfile-vers
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	add_dn;
+	add_dt;
+	close_dn;
+	close_dt;
+	delete_dn;
+	delete_dt;
+	list_dn;
+	list_dt;
+	lookup_dn;
+	lookup_dt;
+	mklocation;
+	modify_dn;
+	modify_dt;
+	open_dn;
+	open_dt;
+	remove_dn;
+	remove_dt;
+	status;
+	version;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdhcpsvc/modules/templates/Makefile b/usr/src/lib/libdhcpsvc/modules/templates/Makefile
index af47db42cf..2225b9c4c6 100644
--- a/usr/src/lib/libdhcpsvc/modules/templates/Makefile
+++ b/usr/src/lib/libdhcpsvc/modules/templates/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libdhcpsvc/modules/RESOURCE/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
-SUBDIRS = spec .WAIT $(MACH)
+SUBDIRS = $(MACH)
 include ../../Makefile.subdirs
diff --git a/usr/src/lib/libdhcpsvc/private/Makefile b/usr/src/lib/libdhcpsvc/private/Makefile
index cdf3bb5781..8be228255c 100644
--- a/usr/src/lib/libdhcpsvc/private/Makefile
+++ b/usr/src/lib/libdhcpsvc/private/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
-SUBDIRS = spec .WAIT $(MACH)
+SUBDIRS = $(MACH)
 include ../Makefile.subdirs
 
 XGETFLAGS += -a
diff --git a/usr/src/lib/libdhcpsvc/private/Makefile.com b/usr/src/lib/libdhcpsvc/private/Makefile.com
index 5460919a98..6d5d7a397a 100644
--- a/usr/src/lib/libdhcpsvc/private/Makefile.com
+++ b/usr/src/lib/libdhcpsvc/private/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -29,7 +28,6 @@
 LIBRARY = libdhcpsvc.a
 VERS    = .1
 OBJECTS = confopt.o errmsgs.o private.o public.o dsvcd_synch.o
-MAPDIR  = ../spec/$(TRANSMACH)
 
 # include library definitions
 include $(SRC)/lib/libdhcpsvc/Makefile.com
diff --git a/usr/src/lib/libdhcpsvc/private/mapfile-vers b/usr/src/lib/libdhcpsvc/private/mapfile-vers
new file mode 100644
index 0000000000..755a781e8d
--- /dev/null
+++ b/usr/src/lib/libdhcpsvc/private/mapfile-vers
@@ -0,0 +1,63 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	add_dd_entry;
+	add_dnrec_to_list;
+	add_dsvc_conf;
+	add_dtrec_to_list;
+	alloc_dnrec;
+	alloc_dtrec;
+	close_dd;
+	confopt_to_datastore;
+	delete_dd_entry;
+	delete_dsvc_conf;
+	dhcpsvc_errmsg;
+	enumerate_dd;
+	free_dd;
+	free_dd_list;
+	free_dnrec;
+	free_dnrec_list;
+	free_dsvc_conf;
+	free_dtrec;
+	free_dtrec_list;
+	list_dd;
+	lookup_dd;
+	mklocation_dd;
+	modify_dd_entry;
+	module_synchtype;
+	open_dd;
+	query_dsvc_conf;
+	read_dsvc_conf;
+	remove_dd;
+	replace_dsvc_conf;
+	status_dd;
+	write_dsvc_conf;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdhcputil/Makefile b/usr/src/lib/libdhcputil/Makefile
index eebf93f7df..f5abdf9627 100644
--- a/usr/src/lib/libdhcputil/Makefile
+++ b/usr/src/lib/libdhcputil/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1999-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -50,9 +49,7 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
@@ -65,7 +62,7 @@ $(POFILE):	pofile_MSGFILES
 
 _msg:		$(MSGDOMAINPOFILE)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libdhcputil/Makefile.com b/usr/src/lib/libdhcputil/Makefile.com
index c6e3f163e4..e05af3bd3a 100644
--- a/usr/src/lib/libdhcputil/Makefile.com
+++ b/usr/src/lib/libdhcputil/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -41,12 +40,10 @@ include ../../Makefile.rootfs
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 LDLIBS +=	-lc -lnsl -lgen -linetutil
-SRCS =		$(LOCOBJS:%.o=$(SRCDIR)/%.c) $(COMOBJS:%.o=$(COMDIR)/%.c)
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+SRCS =		$(LOCOBJS:%.o=$(SRCDIR)/%.c) $(COMOBJS:%.o=$(COMDIR)/%.c)
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(COMDIR)
diff --git a/usr/src/lib/libdhcputil/common/mapfile-vers b/usr/src/lib/libdhcputil/common/mapfile-vers
new file mode 100644
index 0000000000..65d36e67d5
--- /dev/null
+++ b/usr/src/lib/libdhcputil/common/mapfile-vers
@@ -0,0 +1,61 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# There really should be only one SUNWprivate version.
+# Don't add any more.  Add new private symbols to SUNWprivate_1.2
+
+SUNWprivate_1.2 {
+    global:
+	dhcp_options_scan;
+} SUNWprivate_1.1;
+
+SUNWprivate_1.1 {
+    global:
+	dhcpmsg;
+	dhcpmsg_fini;
+	dhcpmsg_init;
+	dsym_close_parser;
+	dsym_free_classes;
+	dsym_free_fields;
+	dsym_get_cat_id;
+	dsym_get_code_ranges;
+	dsym_get_type_id;
+	dsym_init_parser;
+	dsym_parse_field;
+	dsym_parser;
+	inittab_decode;
+	inittab_decode_e;
+	inittab_encode;
+	inittab_encode_e;
+	inittab_getbycode;
+	inittab_getbyname;
+	inittab_load;
+	inittab_type_to_size;
+	inittab_verify;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdisasm/Makefile b/usr/src/lib/libdisasm/Makefile
index 2573befc49..69dbd89f35 100644
--- a/usr/src/lib/libdisasm/Makefile
+++ b/usr/src/lib/libdisasm/Makefile
@@ -23,7 +23,7 @@
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
-
+#
 
 include ../Makefile.lib
 
@@ -42,17 +42,13 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-$(INTEL_BLD)SPECDIR= spec
-
-all clean clobber install: $(SPECDIR) .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
 check:		$(CHECKHDRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libdisasm/Makefile.com b/usr/src/lib/libdisasm/Makefile.com
index d929ff46aa..a742d3e525 100644
--- a/usr/src/lib/libdisasm/Makefile.com
+++ b/usr/src/lib/libdisasm/Makefile.com
@@ -23,6 +23,7 @@
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 #
 # The build process for libdisasm is sightly different from that used by other
@@ -44,7 +45,6 @@ TYPES=		library
 CURTYPE=	library
 
 COMDIR=		$(SRC)/lib/libdisasm/common
-SPECDIR=	$(SRC)/lib/libdisasm/spec
 
 #
 # Architecture-dependent files common to both versions of libdisasm
@@ -86,8 +86,7 @@ LIBS_standalone	= $(STANDLIBRARY)
 LIBS_library = $(DYNLIB) $(LINTLIB)
 LIBS = $(LIBS_$(CURTYPE))
 
-MAPDIR=		$(SPECDIR)/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
+MAPFILES =	$(COMDIR)/mapfile-vers
 
 LDLIBS +=	-lc
 
diff --git a/usr/src/lib/libdisasm/Makefile.targ b/usr/src/lib/libdisasm/Makefile.targ
index c5798c1a94..3d4f928527 100644
--- a/usr/src/lib/libdisasm/Makefile.targ
+++ b/usr/src/lib/libdisasm/Makefile.targ
@@ -24,6 +24,8 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # We build each flavor in a separate make invocation to improve clarity(!) in
 # Makefile.com.  The subordinate makes have $(CURTYPE) set to indicate the
 # flavor they're supposed to build.  This causes the correct set of source
@@ -59,11 +61,6 @@ $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ)
 	rm $@.linktest
 	$(LD) $(LDFLAGS) -o $@ $(OBJS)
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 clobber: $(TYPES:%=clobber.%)
 
 $(TYPES:%=clobber.%):
diff --git a/usr/src/lib/libdisasm/common/mapfile-vers b/usr/src/lib/libdisasm/common/mapfile-vers
new file mode 100644
index 0000000000..aba1c6a51e
--- /dev/null
+++ b/usr/src/lib/libdisasm/common/mapfile-vers
@@ -0,0 +1,40 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	dis_disassemble;
+	dis_errno;
+	dis_handle_create;
+	dis_handle_destroy;
+	dis_max_instrlen;
+	dis_previnstr;
+	dis_set_data;
+	dis_strerror;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdiskmgt/Makefile b/usr/src/lib/libdiskmgt/Makefile
index 6c88d6c133..92b3f02d67 100644
--- a/usr/src/lib/libdiskmgt/Makefile
+++ b/usr/src/lib/libdiskmgt/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -33,7 +32,9 @@ ROOTHDRDIR=	$(ROOT)/usr/include
 ROOTHDRS=	$(HDRS:%=$(ROOTHDRDIR)/%)
 CHECKDIRS=	$(HDRS:%.h=%.check)
 HDRDIR =	common
-SUBDIRS =	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 $(ROOTHDRDIR)/%: %
 	$(INS.file)
@@ -55,7 +56,7 @@ check:		$(CHECKHDRS)
 
 $(POFILE):
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libdiskmgt/Makefile.com b/usr/src/lib/libdiskmgt/Makefile.com
index 5e8c824fc5..350c1248fd 100644
--- a/usr/src/lib/libdiskmgt/Makefile.com
+++ b/usr/src/lib/libdiskmgt/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -40,11 +39,9 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-ldevinfo -ladm -ldevid -lkstat -lsysevent \
 		-lvolmgt -lnvpair -lefi -lc
 LDFLAGS	+= 	-R/opt/VRTSvxvm/lib
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -I$(SRC)/lib/libdiskmgt/common 
diff --git a/usr/src/lib/libdiskmgt/amd64/Makefile b/usr/src/lib/libdiskmgt/amd64/Makefile
index cb86d986a2..80a8e6fcb2 100644
--- a/usr/src/lib/libdiskmgt/amd64/Makefile
+++ b/usr/src/lib/libdiskmgt/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libdiskmgt/common/mapfile-vers b/usr/src/lib/libdiskmgt/common/mapfile-vers
new file mode 100644
index 0000000000..80a66faf35
--- /dev/null
+++ b/usr/src/lib/libdiskmgt/common/mapfile-vers
@@ -0,0 +1,49 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	dm_free_descriptor;
+	dm_free_descriptors;
+	dm_free_name;
+	dm_get_associated_descriptors;
+	dm_get_associated_types;
+	dm_get_attributes;
+	dm_get_descriptor_by_name;
+	dm_get_descriptors;
+	dm_get_event;
+	dm_get_name;
+	dm_get_slices;
+	dm_get_slice_stats;
+	dm_get_stats;
+	dm_get_type;
+	dm_init_event_queue;
+	dm_inuse;
+	dm_isoverlapping;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdiskmgt/sparcv9/Makefile b/usr/src/lib/libdiskmgt/sparcv9/Makefile
index f2593718fe..80a8e6fcb2 100644
--- a/usr/src/lib/libdiskmgt/sparcv9/Makefile
+++ b/usr/src/lib/libdiskmgt/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libdiskmgt/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libdladm/Makefile b/usr/src/lib/libdladm/Makefile
index d6a19d60d0..6fdcdf8a88 100644
--- a/usr/src/lib/libdladm/Makefile
+++ b/usr/src/lib/libdladm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
@@ -44,11 +43,7 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all install: spec .WAIT $(SUBDIRS)
-
-clean clobber: spec $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
@@ -58,7 +53,7 @@ $(POFILE):	pofile_MSGFILES
 
 _msg:		$(MSGDOMAINPOFILE)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libdladm/Makefile.com b/usr/src/lib/libdladm/Makefile.com
index 94ed31b29b..23396f1091 100644
--- a/usr/src/lib/libdladm/Makefile.com
+++ b/usr/src/lib/libdladm/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 LIBRARY = libdladm.a
@@ -38,11 +37,9 @@ include ../../Makefile.rootfs
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 LDLIBS +=	-ldevinfo -ldlpi -lc
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR  =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR) -D_REENTRANT
diff --git a/usr/src/lib/libdladm/common/mapfile-vers b/usr/src/lib/libdladm/common/mapfile-vers
new file mode 100644
index 0000000000..5e0f599741
--- /dev/null
+++ b/usr/src/lib/libdladm/common/mapfile-vers
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	dladm_info;
+	dladm_walk;
+	dladm_walk_vlan;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdlpi/Makefile b/usr/src/lib/libdlpi/Makefile
index 5b0692f635..a354d4de53 100644
--- a/usr/src/lib/libdlpi/Makefile
+++ b/usr/src/lib/libdlpi/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
@@ -44,11 +43,7 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all install: spec .WAIT $(SUBDIRS)
-
-clean clobber: spec $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
@@ -58,7 +53,7 @@ $(POFILE):	pofile_MSGFILES
 
 _msg:		$(MSGDOMAINPOFILE)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libdlpi/Makefile.com b/usr/src/lib/libdlpi/Makefile.com
index 9d1fd1f72b..2ce8d412af 100644
--- a/usr/src/lib/libdlpi/Makefile.com
+++ b/usr/src/lib/libdlpi/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 LIBRARY = libdlpi.a
@@ -38,11 +37,9 @@ include ../../Makefile.rootfs
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 LDLIBS +=	-lc
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR  =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR) -D_REENTRANT
diff --git a/usr/src/lib/libdlpi/common/mapfile-vers b/usr/src/lib/libdlpi/common/mapfile-vers
new file mode 100644
index 0000000000..8a263e2d5c
--- /dev/null
+++ b/usr/src/lib/libdlpi/common/mapfile-vers
@@ -0,0 +1,49 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	dlpi_attach;
+	dlpi_bind;
+	dlpi_close;
+	dlpi_detach;
+	dlpi_disabmulti;
+	dlpi_enabmulti;
+	dlpi_if_open;
+	dlpi_if_parse;
+	dlpi_info;
+	dlpi_mac_type;
+	dlpi_open;
+	dlpi_passive;
+	dlpi_phys_addr;
+	dlpi_promiscoff;
+	dlpi_promiscon;
+	dlpi_set_phys_addr;
+	dlpi_unbind;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdoor/Makefile.com b/usr/src/lib/libdoor/Makefile.com
index 7c5437f4e9..afd16152e0 100644
--- a/usr/src/lib/libdoor/Makefile.com
+++ b/usr/src/lib/libdoor/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -32,10 +31,9 @@ VERS = .1
 include ../../Makefile.lib
 include ../../Makefile.rootfs
 
-MAPFILES=	../common/mapfile-vers $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
+MAPFILES +=	$(MAPFILE-FLTR)
 
-DYNFLAGS +=	-F libc.so.1 $(MAPOPTS)
+DYNFLAGS +=	-F libc.so.1
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -57,5 +55,3 @@ include ../../Makefile.targ
 all:	$(LIBS)
 
 lint:
-
-$(DYNLIB):	$(MAPFILES)
diff --git a/usr/src/lib/libdoor/amd64/Makefile b/usr/src/lib/libdoor/amd64/Makefile
index 10a1eda530..3caee6ff32 100644
--- a/usr/src/lib/libdoor/amd64/Makefile
+++ b/usr/src/lib/libdoor/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libdoor/i386/Makefile b/usr/src/lib/libdoor/i386/Makefile
index be20c8e521..2a944b0b43 100644
--- a/usr/src/lib/libdoor/i386/Makefile
+++ b/usr/src/lib/libdoor/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libdoor/i386/Makefile
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libdoor/sparc/Makefile b/usr/src/lib/libdoor/sparc/Makefile
index 3c61c0da3e..2a944b0b43 100644
--- a/usr/src/lib/libdoor/sparc/Makefile
+++ b/usr/src/lib/libdoor/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libdoor/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libdoor/sparcv9/Makefile b/usr/src/lib/libdoor/sparcv9/Makefile
index adf6597578..3caee6ff32 100644
--- a/usr/src/lib/libdoor/sparcv9/Makefile
+++ b/usr/src/lib/libdoor/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libdscp/Makefile b/usr/src/lib/libdscp/Makefile
index 8eff9de752..ed1d5b934e 100644
--- a/usr/src/lib/libdscp/Makefile
+++ b/usr/src/lib/libdscp/Makefile
@@ -22,14 +22,12 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/libdscp/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
 
-SUBDIRS=	spec .WAIT sparc svc
+SUBDIRS=	sparc svc
 
 all	:= TARGET= all
 install	:= TARGET= install
@@ -56,7 +54,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-spec sparc svc: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libdscp/Makefile.com b/usr/src/lib/libdscp/Makefile.com
index 5c9e76421c..ad61d43a21 100644
--- a/usr/src/lib/libdscp/Makefile.com
+++ b/usr/src/lib/libdscp/Makefile.com
@@ -22,9 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/libdscp/Makefile.com
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 LIBRARY=	libdscp.a
@@ -39,10 +37,6 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc -lsocket -lnsl
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	..
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 CPPFLAGS +=	-I..
 CFLAGS +=	$(CCVERBOSE)
 
diff --git a/usr/src/lib/libdscp/mapfile-vers b/usr/src/lib/libdscp/mapfile-vers
new file mode 100644
index 0000000000..bcf26421c6
--- /dev/null
+++ b/usr/src/lib/libdscp/mapfile-vers
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	dscpAddr;
+	dscpAuth;
+	dscpBind;
+	dscpIdent;
+	dscpSecure;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdscp/sparc/Makefile b/usr/src/lib/libdscp/sparc/Makefile
index 22bf606d7a..182e6180d4 100644
--- a/usr/src/lib/libdscp/sparc/Makefile
+++ b/usr/src/lib/libdscp/sparc/Makefile
@@ -22,12 +22,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/libdscp/sparc/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/sparc
 include	../Makefile.com
 
 all: $(LIBS)
diff --git a/usr/src/lib/libdtrace/Makefile b/usr/src/lib/libdtrace/Makefile
index c3113a4610..7aa994108e 100644
--- a/usr/src/lib/libdtrace/Makefile
+++ b/usr/src/lib/libdtrace/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include ../Makefile.lib
 
@@ -42,11 +42,9 @@ yydebug := TARGET = yydebug
 
 .KEEP_STATE:
 
-all clean clobber: spec .WAIT $(SUBDIRS)
-
-install: install_h spec .WAIT $(SUBDIRS)
+all clean clobber lint yydebug: $(SUBDIRS)
 
-lint yydebug: $(SUBDIRS)
+install: install_h $(SUBDIRS)
 
 $(ROOTHDRS) := GROUP = bin
 
@@ -54,7 +52,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libdtrace/Makefile.com b/usr/src/lib/libdtrace/Makefile.com
index c8db3eaec8..976df5437d 100644
--- a/usr/src/lib/libdtrace/Makefile.com
+++ b/usr/src/lib/libdtrace/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 LIBRARY = libdtrace.a
@@ -89,7 +88,6 @@ SRCS = $(LIBSRCS:%.c=../common/%.c) $(LIBISASRCS:%.c=../$(MACH)/%.c)
 LIBS = $(DYNLIB) $(LINTLIB)
 
 SRCDIR = ../common
-SPECMAPFILE = $(MAPDIR)/mapfile
 
 CLEANFILES += dt_lex.c dt_grammar.c dt_grammar.h y.output
 CLEANFILES += ../common/procfs.sed ../common/procfs.d
diff --git a/usr/src/lib/libdtrace/amd64/Makefile b/usr/src/lib/libdtrace/amd64/Makefile
index 3805f674b5..e9cdd5bdda 100644
--- a/usr/src/lib/libdtrace/amd64/Makefile
+++ b/usr/src/lib/libdtrace/amd64/Makefile
@@ -27,7 +27,6 @@
 
 ASFLAGS += $(AS_PICFLAGS) -P -D_ASM
 
-MAPDIR = ../spec/amd64
 MACHOBJS = dis_tables.o
 
 include ../Makefile.com
diff --git a/usr/src/lib/libdtrace/common/mapfile-vers b/usr/src/lib/libdtrace/common/mapfile-vers
new file mode 100644
index 0000000000..caa2ffd495
--- /dev/null
+++ b/usr/src/lib/libdtrace/common/mapfile-vers
@@ -0,0 +1,114 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	dtrace_addr2str;
+	dtrace_aggregate_clear;
+	dtrace_aggregate_print;
+	dtrace_aggregate_snap;
+	dtrace_aggregate_walk;
+	dtrace_aggregate_walk_joined;
+	dtrace_aggregate_walk_keyrevsorted;
+	dtrace_aggregate_walk_keysorted;
+	dtrace_aggregate_walk_keyvarrevsorted;
+	dtrace_aggregate_walk_keyvarsorted;
+	dtrace_aggregate_walk_valrevsorted;
+	dtrace_aggregate_walk_valsorted;
+	dtrace_aggregate_walk_valvarrevsorted;
+	dtrace_aggregate_walk_valvarsorted;
+	dtrace_attr2str;
+	dtrace_class_name;
+	dtrace_close;
+	dtrace_consume;
+	dtrace_ctlfd;
+	_dtrace_debug;
+	dtrace_desc2str;
+	dtrace_dof_create;
+	dtrace_dof_destroy;
+	dtrace_errmsg;
+	dtrace_errno;
+	dtrace_faultstr;
+	dtrace_fprinta;
+	dtrace_fprintf;
+	dtrace_geterr_dof;
+	dtrace_getopt;
+	dtrace_getopt_dof;
+	dtrace_go;
+	dtrace_handle_buffered;
+	dtrace_handle_drop;
+	dtrace_handle_err;
+	dtrace_handle_proc;
+	dtrace_handle_setopt;
+	dtrace_id2desc;
+	dtrace_lookup_by_addr;
+	dtrace_lookup_by_name;
+	dtrace_lookup_by_type;
+	dtrace_object_info;
+	dtrace_object_iter;
+	dtrace_open;
+	dtrace_printa_create;
+	dtrace_printf_create;
+	dtrace_printf_format;
+	dtrace_probe_info;
+	dtrace_probe_iter;
+	dtrace_proc_continue;
+	dtrace_proc_create;
+	dtrace_proc_grab;
+	dtrace_proc_release;
+	dtrace_program_exec;
+	dtrace_program_fcompile;
+	dtrace_program_header;
+	dtrace_program_info;
+	dtrace_program_link;
+	dtrace_program_strcompile;
+	dtrace_provider_modules;
+	dtrace_setopt;
+	dtrace_sleep;
+	dtrace_stability_name;
+	dtrace_status;
+	dtrace_stmt_action;
+	dtrace_stmt_add;
+	dtrace_stmt_create;
+	dtrace_stmt_destroy;
+	dtrace_stmt_iter;
+	dtrace_stop;
+	dtrace_str2attr;
+	dtrace_str2desc;
+	dtrace_subrstr;
+	dtrace_symbol_type;
+	dtrace_type_fcompile;
+	dtrace_type_strcompile;
+	dtrace_uaddr2str;
+	dtrace_update;
+	_dtrace_version;
+	dtrace_vopen;
+	dtrace_work;
+	dtrace_xstr2desc;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdtrace/i386/Makefile b/usr/src/lib/libdtrace/i386/Makefile
index 7f0a5f1bcf..6c479392f9 100644
--- a/usr/src/lib/libdtrace/i386/Makefile
+++ b/usr/src/lib/libdtrace/i386/Makefile
@@ -22,11 +22,11 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 ASFLAGS += $(AS_PICFLAGS) -P -D_ASM
 
-MAPDIR = ../spec/i386
 MACHOBJS = dis_tables.o
 DLIBSRCS = regs.d
 
diff --git a/usr/src/lib/libdtrace/sparc/Makefile b/usr/src/lib/libdtrace/sparc/Makefile
index 7b0e768522..99c63ef951 100644
--- a/usr/src/lib/libdtrace/sparc/Makefile
+++ b/usr/src/lib/libdtrace/sparc/Makefile
@@ -22,11 +22,11 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 ASFLAGS += -D_ASM -K PIC -P
 
-MAPDIR = ../spec/sparc
 include ../Makefile.com
 
 install yydebug: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT) \
diff --git a/usr/src/lib/libdtrace/sparcv9/Makefile b/usr/src/lib/libdtrace/sparcv9/Makefile
index 1db72d9e67..0e3892db51 100644
--- a/usr/src/lib/libdtrace/sparcv9/Makefile
+++ b/usr/src/lib/libdtrace/sparcv9/Makefile
@@ -22,11 +22,11 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 ASFLAGS += -D_ASM -K PIC -P
 
-MAPDIR = ../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libdtrace_jni/Makefile b/usr/src/lib/libdtrace_jni/Makefile
index d0d83dce97..4287dc1a01 100644
--- a/usr/src/lib/libdtrace_jni/Makefile
+++ b/usr/src/lib/libdtrace_jni/Makefile
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -39,9 +38,7 @@ lint := TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber: java spec .WAIT $(SUBDIRS)
-
-install: java spec .WAIT $(SUBDIRS)
+all clean clobber install: java .WAIT $(SUBDIRS)
 
 lint: $(SUBDIRS)
 
@@ -49,7 +46,7 @@ install_h:
 
 check: $(CHECKHDRS)
 
-java spec $(SUBDIRS): FRC
+java $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 doc:
diff --git a/usr/src/lib/libdtrace_jni/Makefile.com b/usr/src/lib/libdtrace_jni/Makefile.com
index e91ebe7a93..6d2aad2d0c 100644
--- a/usr/src/lib/libdtrace_jni/Makefile.com
+++ b/usr/src/lib/libdtrace_jni/Makefile.com
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -45,7 +44,6 @@ include ../../Makefile.lib
 SRCS = $(LIBSRCS:%.c=../common/%.c)
 
 SRCDIR = ../common
-SPECMAPFILE = $(MAPDIR)/mapfile
 
 CPPFLAGS += -I../common -I.
 CPPFLAGS += -I$(JAVA_ROOT)/include -I$(JAVA_ROOT)/include/solaris
diff --git a/usr/src/lib/libdtrace_jni/amd64/Makefile b/usr/src/lib/libdtrace_jni/amd64/Makefile
index 6755e8b390..c9bd26cfd3 100644
--- a/usr/src/lib/libdtrace_jni/amd64/Makefile
+++ b/usr/src/lib/libdtrace_jni/amd64/Makefile
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -26,8 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR = ../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libdtrace_jni/common/mapfile-vers b/usr/src/lib/libdtrace_jni/common/mapfile-vers
new file mode 100644
index 0000000000..b001e1aae4
--- /dev/null
+++ b/usr/src/lib/libdtrace_jni/common/mapfile-vers
@@ -0,0 +1,64 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1checkProgramEnabling;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1checkVersion;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1close;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1compileFile;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1compileString;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1consume;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1createProcess;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1destroy;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1exec;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1getAggregate;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1getExecutableName;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1getOption;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1getProgramInfo;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1getVersion;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1go;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1grabProcess;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1interrupt;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1isEnabled;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1listCompiledProbeDetail;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1listCompiledProbes;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1listProbeDetail;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1listProbes;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1loadJniTable;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1lookupKernelFunction;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1lookupUserFunction;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1open;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1openCount;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1quantizeBucket;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1setDebug;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1setMaximumConsumers;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1setOption;
+	Java_org_opensolaris_os_dtrace_LocalConsumer__1stop;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libdtrace_jni/i386/Makefile b/usr/src/lib/libdtrace_jni/i386/Makefile
index 5f95ecb5e8..a333224278 100644
--- a/usr/src/lib/libdtrace_jni/i386/Makefile
+++ b/usr/src/lib/libdtrace_jni/i386/Makefile
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -26,8 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR = ../spec/i386
-
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libdtrace_jni/sparc/Makefile b/usr/src/lib/libdtrace_jni/sparc/Makefile
index 758b71741f..a333224278 100644
--- a/usr/src/lib/libdtrace_jni/sparc/Makefile
+++ b/usr/src/lib/libdtrace_jni/sparc/Makefile
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -26,8 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR = ../spec/sparc
-
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libdtrace_jni/sparcv9/Makefile b/usr/src/lib/libdtrace_jni/sparcv9/Makefile
index 59d59c4abc..c9bd26cfd3 100644
--- a/usr/src/lib/libdtrace_jni/sparcv9/Makefile
+++ b/usr/src/lib/libdtrace_jni/sparcv9/Makefile
@@ -18,7 +18,6 @@
 #
 # CDDL HEADER END
 #
-
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -26,8 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR = ../spec/sparcv9
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libefi/Makefile b/usr/src/lib/libefi/Makefile
index 6b817122f0..80360ae8b7 100644
--- a/usr/src/lib/libefi/Makefile
+++ b/usr/src/lib/libefi/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -32,18 +31,16 @@ SUBDIRS=	$(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
-install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
+install :=	TARGET= install
 lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all install clean clobber: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libefi/Makefile.com b/usr/src/lib/libefi/Makefile.com
index 32003df9b1..4b8c5d1277 100644
--- a/usr/src/lib/libefi/Makefile.com
+++ b/usr/src/lib/libefi/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -36,8 +35,6 @@ include ../../Makefile.lib
 include ../../Makefile.rootfs
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-luuid -lc
diff --git a/usr/src/lib/libefi/common/mapfile-vers b/usr/src/lib/libefi/common/mapfile-vers
new file mode 100644
index 0000000000..ca2e3ae408
--- /dev/null
+++ b/usr/src/lib/libefi/common/mapfile-vers
@@ -0,0 +1,43 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	efi_alloc_and_init;
+	efi_alloc_and_read;
+	efi_free;
+	efi_write;
+};
+
+SUNWprivate_1.1 {
+    global:
+	efi_auto_sense;
+	efi_err_check;
+	efi_type;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libeti/form/Makefile b/usr/src/lib/libeti/form/Makefile
index 7c1c845930..a130b89a17 100644
--- a/usr/src/lib/libeti/form/Makefile
+++ b/usr/src/lib/libeti/form/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libeti/form/Makefile
-#
 
 include ../../Makefile.lib
 
@@ -41,9 +38,7 @@ lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:	$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 # definitions for install_h target
 HDRS=		form.h utility.h
@@ -59,7 +54,7 @@ install_h: $(ROOTHDRS)
 
 check:	$(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libeti/form/Makefile.com b/usr/src/lib/libeti/form/Makefile.com
index b0cbd9c713..932a603632 100644
--- a/usr/src/lib/libeti/form/Makefile.com
+++ b/usr/src/lib/libeti/form/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libeti/form/Makefile.com
-#
 
 LIBRARY=	libform.a
 VERS=		.1
@@ -70,8 +67,6 @@ OBJECTS=  \
 # include library definitions
 include ../../../Makefile.lib
 
-MAPFILE=        $(MAPDIR)/mapfile
-
 LIBS =          $(DYNLIB) $(LINTLIB)
 
 SRCDIR=		../common
@@ -80,7 +75,6 @@ $(LINTLIB) :=	SRCS=$(SRCDIR)/$(LINTSRC)
 
 CPPFLAGS +=	-I../inc
 CFLAGS +=       $(CCVERBOSE)
-DYNFLAGS +=     -M $(MAPFILE)
 LDLIBS +=       -lcurses -lc
 
 .KEEP_STATE:
@@ -89,11 +83,6 @@ all: $(LIBS)
 
 lint: lintcheck
 
-$(DYNLIB):      $(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../../Makefile.targ
 
diff --git a/usr/src/lib/libeti/form/amd64/Makefile b/usr/src/lib/libeti/form/amd64/Makefile
index c8f079aaac..04160e850a 100644
--- a/usr/src/lib/libeti/form/amd64/Makefile
+++ b/usr/src/lib/libeti/form/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
@@ -35,5 +33,3 @@ DYNFLAGS += $(DYNFLAGS64)
 .KEEP_STATE:
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
-
-$(DYNLIB): $(MAPFILE)
diff --git a/usr/src/lib/libeti/form/common/mapfile-vers b/usr/src/lib/libeti/form/common/mapfile-vers
new file mode 100644
index 0000000000..168cda804f
--- /dev/null
+++ b/usr/src/lib/libeti/form/common/mapfile-vers
@@ -0,0 +1,226 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	current_field;
+	data_ahead;
+	data_behind;
+	dup_field;
+	dynamic_field_info;
+	field_arg;
+	field_back;
+	field_buffer;
+	field_count;
+	field_fore;
+	field_index;
+	field_info;
+	field_init;
+	field_just;
+	field_opts;
+	field_opts_off;
+	field_opts_on;
+	field_pad;
+	field_status;
+	field_term;
+	field_type;
+	field_userptr;
+	form_driver;
+	form_fields;
+	form_init;
+	form_opts;
+	form_opts_off;
+	form_opts_on;
+	form_page;
+	form_sub;
+	form_term;
+	form_userptr;
+	form_win;
+	free_field;
+	free_fieldtype;
+	free_form;
+	link_field;
+	link_fieldtype;
+	move_field;
+	new_field;
+	new_fieldtype;
+	new_form;
+	new_page;
+	pos_form_cursor;
+	post_form;
+	scale_form;
+	set_current_field;
+	set_field_back;
+	set_field_buffer;
+	set_field_fore;
+	set_field_init;
+	set_field_just;
+	set_field_opts;
+	set_field_pad;
+	set_field_status;
+	set_field_term;
+	set_field_type;
+	set_fieldtype_arg;
+	set_fieldtype_choice;
+	set_field_userptr;
+	set_form_fields;
+	set_form_init;
+	set_form_opts;
+	set_form_page;
+	set_form_sub;
+	set_form_term;
+	set_form_userptr;
+	set_form_win;
+	set_max_field;
+	set_new_page;
+	unpost_form;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_adjust_cursor;
+	__advance;
+	_beg_field;
+	_beg_line;
+	__braelist;
+	__braslist;
+	__bravar;
+	_buf_to_win;
+	__cclass;
+	__cflg;
+	_checkchar;
+	_checkfield;
+	_clr_eof;
+	_clr_eol;
+	_clr_field;
+	_copyarg;
+	_data_beg;
+	_data_end;
+	_data_entry;
+	_data_manipulation;
+	_data_navigation;
+	_DEFAULT_FIELD;
+	_DEFAULT_FIELDTYPE;
+	_DEFAULT_FORM;
+	_del_char;
+	_del_line;
+	_del_prev;
+	_del_word;
+	_down_char;
+	_down_field;
+	_end_field;
+	_end_line;
+	__eptr_;
+	__execute;
+	_field_navigation;
+	_first_active;
+	_first_field;
+	_first_page;
+	_freearg;
+	__getrnge;
+	_grow_field;
+	_ins_char;
+	_ins_line;
+	_ins_mode;
+	__i_size;
+	_last_field;
+	_last_page;
+	_left_char;
+	_left_field;
+	_lib_version;
+	__loc1;
+	__lptr_;
+	_makearg;
+	_misc_request;
+	_new_line;
+	_next_char;
+	_next_choice;
+	_nextchoice;
+	_next_field;
+	_next_line;
+	_next_page;
+	_next_word;
+	_ovl_mode;
+	_page_navigation;
+	_pos_form_cursor;
+	_prev_char;
+	_prev_choice;
+	_prevchoice;
+	_prev_field;
+	_prev_line;
+	_prev_page;
+	_prev_word;
+	_right_char;
+	_right_field;
+	__rpop;
+	__rpush;
+	_scr_bchar;
+	_scr_bhpage;
+	_scr_bline;
+	_scr_bpage;
+	_scr_fchar;
+	_scr_fhpage;
+	_scr_fline;
+	_scr_fpage;
+	_scr_hbhalf;
+	_scr_hbline;
+	_scr_hfhalf;
+	_scr_hfline;
+	_set_current_field;
+	_set_form_page;
+	_sfirst_field;
+	__size;
+	_slast_field;
+	_snext_field;
+	__sp_;
+	_sprev_field;
+	__st;
+	__stmax;
+	_sync_attrs;
+	_sync_buffer;
+	_sync_field;
+	_sync_linked;
+	_sync_opts;
+	TYPE_ALNUM;
+	TYPE_ALPHA;
+	TYPE_ENUM;
+	TYPE_INTEGER;
+	TYPE_NUMERIC;
+	TYPE_REGEXP;
+	_up_char;
+	_update_current;
+	_up_field;
+	_validate;
+	_validation;
+	_whsp_beg;
+	_whsp_end;
+	_win_to_buf;
+	__xpop;
+	__xpush;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libeti/form/i386/Makefile b/usr/src/lib/libeti/form/i386/Makefile
index 1ef78fe4e3..775621cd27 100644
--- a/usr/src/lib/libeti/form/i386/Makefile
+++ b/usr/src/lib/libeti/form/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libeti/form/sparc/Makefile
-#
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libeti/form/sparc/Makefile b/usr/src/lib/libeti/form/sparc/Makefile
index d2d347cbee..775621cd27 100644
--- a/usr/src/lib/libeti/form/sparc/Makefile
+++ b/usr/src/lib/libeti/form/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libeti/panel/sparc/Makefile
-#
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libeti/form/sparcv9/Makefile b/usr/src/lib/libeti/form/sparcv9/Makefile
index 98528912b2..04160e850a 100644
--- a/usr/src/lib/libeti/form/sparcv9/Makefile
+++ b/usr/src/lib/libeti/form/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libeti/form/sparc/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
@@ -37,5 +33,3 @@ DYNFLAGS += $(DYNFLAGS64)
 .KEEP_STATE:
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
-
-$(DYNLIB): $(MAPFILE)
diff --git a/usr/src/lib/libeti/menu/Makefile b/usr/src/lib/libeti/menu/Makefile
index 2199c693c5..903974a531 100644
--- a/usr/src/lib/libeti/menu/Makefile
+++ b/usr/src/lib/libeti/menu/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libeti/menu/Makefile
-#
 
 include ../../Makefile.lib
 
@@ -41,9 +38,7 @@ lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:	$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 # definitions for install_h target
 HDRS=		menu.h
@@ -59,7 +54,7 @@ install_h: $(ROOTHDRS)
 
 check:	$(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libeti/menu/Makefile.com b/usr/src/lib/libeti/menu/Makefile.com
index 202b4b171c..974b465c5e 100644
--- a/usr/src/lib/libeti/menu/Makefile.com
+++ b/usr/src/lib/libeti/menu/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -25,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libeti/menu/Makefile.com
-#
 
 LIBRARY=	libmenu.a
 VERS=		.1
@@ -68,8 +65,6 @@ OBJECTS=  \
 # include library definitions
 include ../../../Makefile.lib
 
-MAPFILE=        $(MAPDIR)/mapfile
-
 LIBS =          $(DYNLIB) $(LINTLIB)
 
 SRCDIR=		../common
@@ -78,7 +73,6 @@ $(LINTLIB) :=	SRCS=$(SRCDIR)/$(LINTSRC)
 
 CPPFLAGS +=	-I../inc
 CFLAGS +=       $(CCVERBOSE)
-DYNFLAGS +=     -M $(MAPFILE)
 LDLIBS +=       -lcurses -lc
 
 .KEEP_STATE:
@@ -87,11 +81,6 @@ all: $(LIBS) fnamecheck
 
 lint: lintcheck
 
-$(DYNLIB):      $(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../../Makefile.targ
 
diff --git a/usr/src/lib/libeti/menu/amd64/Makefile b/usr/src/lib/libeti/menu/amd64/Makefile
index c8f079aaac..04160e850a 100644
--- a/usr/src/lib/libeti/menu/amd64/Makefile
+++ b/usr/src/lib/libeti/menu/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
@@ -35,5 +33,3 @@ DYNFLAGS += $(DYNFLAGS64)
 .KEEP_STATE:
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
-
-$(DYNLIB): $(MAPFILE)
diff --git a/usr/src/lib/libeti/menu/common/mapfile-vers b/usr/src/lib/libeti/menu/common/mapfile-vers
new file mode 100644
index 0000000000..b1213a584f
--- /dev/null
+++ b/usr/src/lib/libeti/menu/common/mapfile-vers
@@ -0,0 +1,113 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	current_item;
+	free_item;
+	free_menu;
+	item_count;
+	item_description;
+	item_index;
+	item_init;
+	item_name;
+	item_opts;
+	item_opts_off;
+	item_opts_on;
+	item_term;
+	item_userptr;
+	item_value;
+	item_visible;
+	menu_back;
+	menu_driver;
+	menu_fore;
+	menu_format;
+	menu_grey;
+	menu_init;
+	menu_items;
+	menu_mark;
+	menu_opts;
+	menu_opts_off;
+	menu_opts_on;
+	menu_pad;
+	menu_pattern;
+	menu_sub;
+	menu_term;
+	menu_userptr;
+	menu_win;
+	new_item;
+	new_menu;
+	pos_menu_cursor;
+	post_menu;
+	scale_menu;
+	set_current_item;
+	set_item_init;
+	set_item_opts;
+	set_item_term;
+	set_item_userptr;
+	set_item_value;
+	set_menu_back;
+	set_menu_fore;
+	set_menu_format;
+	set_menu_grey;
+	set_menu_init;
+	set_menu_items;
+	set_menu_mark;
+	set_menu_opts;
+	set_menu_pad;
+	set_menu_pattern;
+	set_menu_sub;
+	set_menu_term;
+	set_menu_userptr;
+	set_menu_win;
+	set_top_row;
+	top_row;
+	unpost_menu;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_affect_change;
+	_chk_current;
+	_chk_top;
+	_connect;
+	_Default_Item;
+	_Default_Menu;
+	_disconnect;
+	_draw;
+	_lib_version;
+	_link_items;
+	_match;
+	_movecurrent;
+	_move_post_item;
+	_position_cursor;
+	_post_item;
+	_scale;
+	_show;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libeti/menu/i386/Makefile b/usr/src/lib/libeti/menu/i386/Makefile
index 768dd99c23..775621cd27 100644
--- a/usr/src/lib/libeti/menu/i386/Makefile
+++ b/usr/src/lib/libeti/menu/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libeti/menu/sparc/Makefile
-#
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libeti/menu/sparc/Makefile b/usr/src/lib/libeti/menu/sparc/Makefile
index 0f6bc1c0ab..775621cd27 100644
--- a/usr/src/lib/libeti/menu/sparc/Makefile
+++ b/usr/src/lib/libeti/menu/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libeti/menu/sparc/Makefile
-#
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libeti/menu/sparcv9/Makefile b/usr/src/lib/libeti/menu/sparcv9/Makefile
index 7b4108b69c..04160e850a 100644
--- a/usr/src/lib/libeti/menu/sparcv9/Makefile
+++ b/usr/src/lib/libeti/menu/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libeti/menu/sparc/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
@@ -36,5 +33,3 @@ DYNFLAGS += $(DYNFLAGS64)
 .KEEP_STATE:
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
-
-$(DYNLIB): $(MAPFILE)
diff --git a/usr/src/lib/libeti/panel/Makefile b/usr/src/lib/libeti/panel/Makefile
index 9a32913d80..d39c71495b 100644
--- a/usr/src/lib/libeti/panel/Makefile
+++ b/usr/src/lib/libeti/panel/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libeti/panel/Makefile
-#
 
 include ../../Makefile.lib
 
@@ -41,9 +38,7 @@ lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:	$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 # definitions for install_h target
 HDRS=		panel.h
@@ -59,7 +54,7 @@ install_h: $(ROOTHDRS)
 
 check:	$(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libeti/panel/Makefile.com b/usr/src/lib/libeti/panel/Makefile.com
index ffdf998885..21f886f639 100644
--- a/usr/src/lib/libeti/panel/Makefile.com
+++ b/usr/src/lib/libeti/panel/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -25,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libeti/panel/Makefile.com
-#
 
 LIBRARY=	libpanel.a
 VERS=		.1
@@ -44,8 +41,6 @@ OBJECTS=  \
 # include library definitions
 include ../../../Makefile.lib
 
-MAPFILE=        $(MAPDIR)/mapfile
-
 LIBS =          $(DYNLIB) $(LINTLIB)
 
 SRCDIR=		../common
@@ -54,7 +49,6 @@ $(LINTLIB) :=	SRCS=$(SRCDIR)/$(LINTSRC)
 
 CPPFLAGS +=	-I../inc
 CFLAGS +=       $(CCVERBOSE)
-DYNFLAGS +=     -M $(MAPFILE)
 LDLIBS +=       -lcurses -lc
 
 .KEEP_STATE:
@@ -63,11 +57,6 @@ all: $(LIBS) fnamecheck
 
 lint: lintcheck
 
-$(DYNLIB):      $(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../../Makefile.targ
 
diff --git a/usr/src/lib/libeti/panel/amd64/Makefile b/usr/src/lib/libeti/panel/amd64/Makefile
index c8f079aaac..04160e850a 100644
--- a/usr/src/lib/libeti/panel/amd64/Makefile
+++ b/usr/src/lib/libeti/panel/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
@@ -35,5 +33,3 @@ DYNFLAGS += $(DYNFLAGS64)
 .KEEP_STATE:
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
-
-$(DYNLIB): $(MAPFILE)
diff --git a/usr/src/lib/libeti/panel/common/mapfile-vers b/usr/src/lib/libeti/panel/common/mapfile-vers
new file mode 100644
index 0000000000..407978bce4
--- /dev/null
+++ b/usr/src/lib/libeti/panel/common/mapfile-vers
@@ -0,0 +1,60 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	bottom_panel;
+	del_panel;
+	hide_panel;
+	move_panel;
+	new_panel;
+	panel_above;
+	panel_below;
+	panel_hidden;
+	panel_userptr;
+	panel_window;
+	replace_panel;
+	set_panel_userptr;
+	show_panel;
+	top_panel;
+	update_panels;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_alloc_overlap;
+	_Bottom_panel;
+	_free_overlap;
+	_intersect_panel;
+	_lib_version;
+	_Panel_cnt;
+	_remove_overlap;
+	_Top_panel;
+	_unlink_obs;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libeti/panel/i386/Makefile b/usr/src/lib/libeti/panel/i386/Makefile
index a237a87be2..775621cd27 100644
--- a/usr/src/lib/libeti/panel/i386/Makefile
+++ b/usr/src/lib/libeti/panel/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libeti/panel/sparc/Makefile
-#
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libeti/panel/sparc/Makefile b/usr/src/lib/libeti/panel/sparc/Makefile
index d2d347cbee..775621cd27 100644
--- a/usr/src/lib/libeti/panel/sparc/Makefile
+++ b/usr/src/lib/libeti/panel/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libeti/panel/sparc/Makefile
-#
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libeti/panel/sparcv9/Makefile b/usr/src/lib/libeti/panel/sparcv9/Makefile
index 15522725a0..04160e850a 100644
--- a/usr/src/lib/libeti/panel/sparcv9/Makefile
+++ b/usr/src/lib/libeti/panel/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-# All rights reserved.
-#
-# lib/libeti/panel/sparc/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
@@ -38,5 +33,3 @@ DYNFLAGS += $(DYNFLAGS64)
 .KEEP_STATE:
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
-
-$(DYNLIB): $(MAPFILE)
diff --git a/usr/src/lib/libexacct/Makefile b/usr/src/lib/libexacct/Makefile
index bf453238ba..222978e736 100644
--- a/usr/src/lib/libexacct/Makefile
+++ b/usr/src/lib/libexacct/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1999-2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libexacct/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
@@ -55,22 +52,20 @@ CP=	cp
 
 .KEEP_STATE:
 
-all debug clean clobber delete install package: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all debug clean clobber delete install lint package: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS):	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
-_msg:   $(MSGDOMAIN) $(POFILE)
+_msg:   $(MSGDOMAIN) .WAIT $(POFILE)
 	$(RM) $(MSGDOMAIN)/$(POFILE)
 	$(CP) $(POFILE) $(MSGDOMAIN)
 
-$(POFILE):      .WAIT $(POFILES)
+$(POFILE):	$(POFILES)
 	$(RM) $@
 	$(CAT) $(POFILES) > $@
 
diff --git a/usr/src/lib/libexacct/Makefile.com b/usr/src/lib/libexacct/Makefile.com
index 5662f38f83..82925b1906 100644
--- a/usr/src/lib/libexacct/Makefile.com
+++ b/usr/src/lib/libexacct/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -39,11 +38,9 @@ SRCS=		$(COMMON_OBJS:%.o=../../../common/exacct/%.c) \
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS += 	-lc
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS += 	$(CCVERBOSE)
 CPPFLAGS +=	-D_FILE_OFFSET_BITS=64
diff --git a/usr/src/lib/libexacct/common/mapfile-vers b/usr/src/lib/libexacct/common/mapfile-vers
new file mode 100644
index 0000000000..d1e0ff74ea
--- /dev/null
+++ b/usr/src/lib/libexacct/common/mapfile-vers
@@ -0,0 +1,74 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.3 {
+    global:
+	ea_clear;
+	ea_fdopen;
+} SUNW_1.2;
+
+SUNW_1.2 {
+    global:
+	ea_alloc;
+	ea_attach_to_group;
+	ea_attach_to_object;
+	ea_copy_object;
+	ea_copy_object_tree;
+	ea_free;
+	ea_free_item;
+	ea_get_object_tree;
+	ea_strdup;
+	ea_strfree;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	ea_close;
+	ea_error;
+	ea_free_object;
+	ea_get_creator;
+	ea_get_hostname;
+	ea_get_object;
+	ea_match_object_catalog;
+	ea_next_object;
+	ea_open;
+	ea_pack_object;
+	ea_previous_object;
+	ea_set_group;
+	ea_set_item;
+	ea_unpack_object;
+	ea_write_object;
+};
+
+SUNWprivate {
+    global:
+	exacct_order16;
+	exacct_order32;
+	exacct_order64;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libfru/Makefile.obj b/usr/src/lib/libfru/Makefile.obj
index 0eac420b35..6b32eb1147 100644
--- a/usr/src/lib/libfru/Makefile.obj
+++ b/usr/src/lib/libfru/Makefile.obj
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libfru/Makefile.obj
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 #
@@ -66,3 +63,5 @@ SRCS=		$(MAINSRCS) \
 # include common Makefiles
 include ../../Makefile.lib
 
+# There should be a mapfile here
+MAPFILES =
diff --git a/usr/src/lib/libfru/libfrupicl/Makefile.com b/usr/src/lib/libfru/libfrupicl/Makefile.com
index c3aecd6eaf..39d304c0ee 100644
--- a/usr/src/lib/libfru/libfrupicl/Makefile.com
+++ b/usr/src/lib/libfru/libfrupicl/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
+
 LIBRARY=	libfrupicl.a
 VERS=		.1
 
@@ -34,11 +34,13 @@ OBJECTS=	frupicl.o
 # include library definitions
 include $(SRC)/lib/Makefile.lib
 
-SRCS=		$(OBJECTS:%.o=../%.c)
 CLOBBERFILES += $(LIBLINKS)
 
 LIBS =		$(DYNLIB)
 
+# There should be a mapfile here
+MAPFILES =
+
 LINTFLAGS =	-mnux
 LINTFLAGS64 =	$(LINTFLAGS) -Xarch=$(MACH64:sparcv9=v9)
 LINTOUT=	lint.out
@@ -78,11 +80,6 @@ _msg:	$(MSGDOMAIN) $(POFILE)
 	$(RM) $(MSGDOMAIN)/$(POFILE)
 	$(CP) $(POFILE) $(MSGDOMAIN)
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include $(SRC)/lib/Makefile.targ
 
diff --git a/usr/src/lib/libfru/libfrupicltree/Makefile.com b/usr/src/lib/libfru/libfrupicltree/Makefile.com
index 5e3f905a7b..22ca075446 100644
--- a/usr/src/lib/libfru/libfrupicltree/Makefile.com
+++ b/usr/src/lib/libfru/libfrupicltree/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -33,11 +32,13 @@ OBJECTS=	frupicltree.o
 
 include $(SRC)/lib/Makefile.lib
 
-SRCS=		$(OBJECTS:%.o=../%.c)
 CLOBBERFILES += $(LIBLINKS)
 
 LIBS =		$(DYNLIB)
 
+# There should be a mapfile here
+MAPFILES =
+
 LINTFLAGS =	-mnux
 LINTFLAGS64 =	$(LINTFLAGS) -Xarch=$(MACH64:sparcv9=v9)
 LINTOUT=	lint.out
@@ -77,11 +78,6 @@ _msg:	$(MSGDOMAIN) $(POFILE)
 	$(RM) $(MSGDOMAIN)/$(POFILE)
 	$(CP) $(POFILE) $(MSGDOMAIN)
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 include $(SRC)/lib/Makefile.targ
 
 pics/%.o:	../%.c
diff --git a/usr/src/lib/libfru/libfrureg/Makefile.com b/usr/src/lib/libfru/libfrureg/Makefile.com
index 1d370fe047..243a16d8d1 100644
--- a/usr/src/lib/libfru/libfrureg/Makefile.com
+++ b/usr/src/lib/libfru/libfrureg/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,13 +33,13 @@ OBJECTS=	frureg.o
 # include library definitions
 include $(SRC)/lib/Makefile.lib
 
-SRCS=		$(OBJECTS:%.o=../%.c)
-#MAPFILE=	$(MAPDIR)/mapfile
-#CLOBBERFILES +=	$(MAPFILE)
 CLOBBERFILES += $(LIBLINKS)
 
 LIBS =		$(DYNLIB)
 
+# There should be a mapfile here
+MAPFILES =
+
 LINTFLAGS =	-uxn
 LINTFLAGS64 =	$(LINTFLAGS) -Xarch=$(MACH64:sparcv9=v9)
 LINTOUT=	lint.out
@@ -80,11 +79,6 @@ _msg:	$(MSGDOMAIN) $(POFILE)
 	$(RM) $(MSGDOMAIN)/$(POFILE)
 	$(CP) $(POFILE) $(MSGDOMAIN)
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include $(SRC)/lib/Makefile.targ
 
diff --git a/usr/src/lib/libfruutils/Makefile.com b/usr/src/lib/libfruutils/Makefile.com
index bc119e2373..25b526178d 100644
--- a/usr/src/lib/libfruutils/Makefile.com
+++ b/usr/src/lib/libfruutils/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -34,11 +33,13 @@ OBJECTS=	fru_tag.o
 # include library definitions
 include $(SRC)/lib/Makefile.lib
 
-SRCS=		$(OBJECTS:%.o=../%.c)
 CLOBBERFILES += $(LIBLINKS)
 
 LIBS =		$(DYNLIB)
 
+# There should be a mapfile here
+MAPFILES =
+
 LINTFLAGS =	-uxn
 LINTFLAGS64 =	$(LINTFLAGS) -Xarch=$(MACH64:sparcv9=v9)
 LINTOUT=	lint.out
diff --git a/usr/src/lib/libfsmgt/Makefile b/usr/src/lib/libfsmgt/Makefile
index 979ce766a8..13fd55c705 100644
--- a/usr/src/lib/libfsmgt/Makefile
+++ b/usr/src/lib/libfsmgt/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../../Makefile.master
@@ -42,9 +41,7 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:
 
@@ -52,7 +49,7 @@ check:		$(CHECKHDRS)
 
 $(POFILE):
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libfsmgt/Makefile.com b/usr/src/lib/libfsmgt/Makefile.com
index db42f9c89e..d0fd25a89d 100644
--- a/usr/src/lib/libfsmgt/Makefile.com
+++ b/usr/src/lib/libfsmgt/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -36,8 +35,6 @@ OBJECTS =	fs_mounts.o fs_mount_defaults.o \
 		cmd.o fileutil.o fs_dfstab.o \
 		nfs_netcfg.o nfs_nfssec.o
 
-SRCS =		$(OBJECTS:%.o=../%.c)
-
 include ../../Makefile.lib
 
 ROOTDIRS= $(ROOT)/usr/include
@@ -48,11 +45,9 @@ CHECKHDRS= $(HDRS:%.h=%.check)
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc -lnsl -lkstat
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 #add nfs/lib directory as part of the include path
 CFLAGS +=	$(CCVERBOSE)
diff --git a/usr/src/lib/libfsmgt/common/mapfile-vers b/usr/src/lib/libfsmgt/common/mapfile-vers
new file mode 100644
index 0000000000..3a98468e82
--- /dev/null
+++ b/usr/src/lib/libfsmgt/common/mapfile-vers
@@ -0,0 +1,90 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	cmd_execute_command;
+	cmd_execute_command_and_retrieve_string;
+	cmd_retrieve_string;
+	fileutil_add_string_to_array;
+	fileutil_free_string_array;
+	fileutil_get_cmd_from_string;
+	fileutil_get_first_column_data;
+	fileutil_getfs;
+	fileutil_getline;
+	fs_add_DFStab_ent;
+	fs_add_mount_default;
+	fs_check_for_duplicate_DFStab_paths;
+	fs_create_array_from_accesslist;
+	fs_del_All_DFStab_ents_with_Path;
+	fs_del_DFStab_ent;
+	fs_del_mount_default_ent;
+	fs_edit_DFStab_ent;
+	fs_edit_mount_defaults;
+	fs_free_DFStab_ents;
+	fs_free_mntdefaults_list;
+	fs_free_mount_list;
+	fs_free_share_list;
+	fs_get_availablesize;
+	fs_get_avail_for_nonsuperuser_size;
+	fs_get_blocksize;
+	fs_get_DFStab_ent_Desc;
+	fs_get_DFStab_ent_Fstype;
+	fs_get_DFStab_ent_Next;
+	fs_get_DFStab_ent_Options;
+	fs_get_DFStab_ent_Path;
+	fs_get_DFStab_ent_Res;
+	fs_get_DFStab_ents;
+	fs_get_Dfstab_share_cmd;
+	fs_get_filtered_mount_defaults;
+	fs_get_filtered_mount_list;
+	fs_get_fragsize;
+	fs_get_maxfilenamelen;
+	fs_get_mount_defaults;
+	fs_get_mount_list;
+	fs_get_mounts_by_mntopt;
+	fs_get_share_list;
+	fs_get_totalsize;
+	fs_get_usedsize;
+	fs_is_readonly;
+	fs_parse_optlist_for_option;
+	fs_parse_opts_for_sec_modes;
+	fs_print_dfstab_entries;
+	fs_set_DFStab_ent;
+	netcfg_free_networkid_list;
+	netcfg_get_networkid_list;
+	nfs_free_mntinfo_list;
+	nfs_get_filtered_mount_list;
+	nfs_get_mount_list;
+	nfs_get_mounts_by_mntopt;
+	nfssec_free_secmode_list;
+	nfssec_get_default_secmode;
+	nfssec_get_nfs_secmode_list;
+	sys_get_hostname;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libfstyp/Makefile b/usr/src/lib/libfstyp/Makefile
index d1218b7820..b9cf46e1eb 100644
--- a/usr/src/lib/libfstyp/Makefile
+++ b/usr/src/lib/libfstyp/Makefile
@@ -41,15 +41,13 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all install clean clobber: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all install clean clobber lint: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libfstyp/Makefile.com b/usr/src/lib/libfstyp/Makefile.com
index 399f6f9e9c..19177c1e25 100644
--- a/usr/src/lib/libfstyp/Makefile.com
+++ b/usr/src/lib/libfstyp/Makefile.com
@@ -32,8 +32,6 @@ OBJECTS =	libfstyp.o
 include ../../Makefile.lib
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc
diff --git a/usr/src/lib/libfstyp/common/mapfile-vers b/usr/src/lib/libfstyp/common/mapfile-vers
new file mode 100644
index 0000000000..bc4eaa57d2
--- /dev/null
+++ b/usr/src/lib/libfstyp/common/mapfile-vers
@@ -0,0 +1,43 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	fstyp_dump;
+	fstyp_fini;
+	fstyp_get_attr;
+	fstyp_ident;
+	fstyp_init;
+	fstyp_strerror;
+};
+
+SUNWprivate_1.1 {
+    global:
+	SUNWprivate_1.1;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libgen/Makefile b/usr/src/lib/libgen/Makefile
index cdc4709d50..50890d7703 100644
--- a/usr/src/lib/libgen/Makefile
+++ b/usr/src/lib/libgen/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1989-1999, 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -30,7 +29,9 @@ include ../Makefile.lib
 
 HDRS =		regexpr.h
 HDRDIR =	inc
-SUBDIRS =	spec .WAIT $(MACH) $(BUILD64) .WAIT $(MACH64)
+
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -46,7 +47,7 @@ install_h: $(ROOTHDRS)
 
 check:	$(CHECKHDRS)
 
-spec $(MACH) $(MACH64): FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libgen/Makefile.com b/usr/src/lib/libgen/Makefile.com
index 8cb653da1a..07e8fc6b27 100644
--- a/usr/src/lib/libgen/Makefile.com
+++ b/usr/src/lib/libgen/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -39,11 +38,11 @@ include ../../Makefile.rootfs
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
+
+MAPFILES +=	$(MAPFILE32)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_LARGEFILE64_SOURCE -I../inc -I../../common/inc
diff --git a/usr/src/lib/libgen/amd64/Makefile b/usr/src/lib/libgen/amd64/Makefile
index 4862ca2b90..d44bc0ad74 100644
--- a/usr/src/lib/libgen/amd64/Makefile
+++ b/usr/src/lib/libgen/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
+MAPFILE32 =
+
 include ../Makefile.com
 include ../../Makefile.lib.64
 
@@ -34,5 +35,3 @@ LIBS = $(DYNLIB) $(LINTLIB)
 all: $(LIBS)
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
-
-$(DYNLIB): $(MAPFILE)
diff --git a/usr/src/lib/libgen/common/mapfile-vers b/usr/src/lib/libgen/common/mapfile-vers
new file mode 100644
index 0000000000..9bfec93dfe
--- /dev/null
+++ b/usr/src/lib/libgen/common/mapfile-vers
@@ -0,0 +1,103 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	advance;
+	bgets;
+	braelist;
+	___braelist;
+	braslist;
+	___braslist;
+	bufsplit;
+	compile;
+	copylist;
+	eaccess;
+	gmatch;
+	isencrypt;
+	loc1;
+	___loc1;
+	loc2;
+	___loc2;
+	locs;
+	___locs;
+	mkdirp;
+	nbra;
+	___nbra;
+	p2close;
+	p2open;
+	pathfind;
+	regerrno;
+	___regerrno;
+	reglength;
+	___reglength;
+	rmdirp;
+	step;
+	strcadd;
+	strccpy;
+	streadd;
+	strecpy;
+	strfind;
+	strrspn;
+	strtrns;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_bgets;
+	_braelist;
+	_braslist;
+	_bufsplit;
+	_compile;
+	_copylist;
+	_eaccess;
+	_gmatch;
+	_isencrypt;
+	_loc1;
+	_loc2;
+	_locs;
+	_mkdirp;
+	_nbra;
+	_p2close;
+	__p2close;
+	_p2open;
+	__p2open;
+	_pathfind;
+	_regerrno;
+	_reglength;
+	_rmdirp;
+	_step;
+	_strcadd;
+	_strccpy;
+	_streadd;
+	_strecpy;
+	_strfind;
+	_strrspn;
+	_strtrns;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libgen/common/mapfile32-vers b/usr/src/lib/libgen/common/mapfile32-vers
new file mode 100644
index 0000000000..5c8e6d0e69
--- /dev/null
+++ b/usr/src/lib/libgen/common/mapfile32-vers
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {	# largefiles interfaces for 32-bit applications
+    global:
+	copylist64;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_copylist64;
+};
diff --git a/usr/src/lib/libgen/i386/Makefile b/usr/src/lib/libgen/i386/Makefile
index b844ab9d07..3ca446fd6e 100644
--- a/usr/src/lib/libgen/i386/Makefile
+++ b/usr/src/lib/libgen/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-1999, 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
+MAPFILE32 = ../common/mapfile32-vers
+
 include ../Makefile.com
 
 all: $(LIBS)
diff --git a/usr/src/lib/libgen/sparc/Makefile b/usr/src/lib/libgen/sparc/Makefile
index b844ab9d07..3ca446fd6e 100644
--- a/usr/src/lib/libgen/sparc/Makefile
+++ b/usr/src/lib/libgen/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-1999, 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
+MAPFILE32 = ../common/mapfile32-vers
+
 include ../Makefile.com
 
 all: $(LIBS)
diff --git a/usr/src/lib/libgen/sparcv9/Makefile b/usr/src/lib/libgen/sparcv9/Makefile
index 98caf3ac23..d44bc0ad74 100644
--- a/usr/src/lib/libgen/sparcv9/Makefile
+++ b/usr/src/lib/libgen/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-1999, 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
+MAPFILE32 =
+
 include ../Makefile.com
 include ../../Makefile.lib.64
 
@@ -34,5 +35,3 @@ LIBS = $(DYNLIB) $(LINTLIB)
 all: $(LIBS)
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
-
-$(DYNLIB): $(MAPFILE)
diff --git a/usr/src/lib/libgss/Makefile b/usr/src/lib/libgss/Makefile
index a1c813540e..e1ddcf1af3 100644
--- a/usr/src/lib/libgss/Makefile
+++ b/usr/src/lib/libgss/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libgss/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
+
 include ../Makefile.lib
 
 LIBRARY=	libgss.a
@@ -54,9 +52,7 @@ MSGFILES =	`$(GREP) -l gettext *.[ch]`
 
 .KEEP_STATE:
 
-all clean clobber install:  spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber lint:  $(SUBDIRS)
 
 install: $(GSSMECH_DIR) all .WAIT $(SUBDIRS)
 
@@ -69,7 +65,7 @@ $(POFILE):	pofile_MSGFILES
 $(GSSMECH_DIR):
 	$(INS.dir)
 
-$(SUBDIRS) spec:   FRC
+$(SUBDIRS):   FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libgss/Makefile.com b/usr/src/lib/libgss/Makefile.com
index 687e3f6cdd..82136b42d0 100644
--- a/usr/src/lib/libgss/Makefile.com
+++ b/usr/src/lib/libgss/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libgss/Makefile
 
 LIBRARY = libgss.a
 VERS = .1
@@ -87,10 +85,6 @@ LIBS =	$(DYNLIB) $(LINTLIB)
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS += 	-lc -lcmd
 
-SRCDIR	=	..
-MAPDIR	=	../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 CPPFLAGS += 	-I$(GSSCRED_DIR) -I$(SRC)/uts/common/gssapi/include \
 		-DHAVE_STDLIB_H
 
diff --git a/usr/src/lib/libgss/i386/Makefile b/usr/src/lib/libgss/i386/Makefile
index aacf5d2538..3a9b043b65 100644
--- a/usr/src/lib/libgss/i386/Makefile
+++ b/usr/src/lib/libgss/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libgss/i386/Makefile
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libgss/mapfile-vers b/usr/src/lib/libgss/mapfile-vers
new file mode 100644
index 0000000000..d3a8e1251e
--- /dev/null
+++ b/usr/src/lib/libgss/mapfile-vers
@@ -0,0 +1,121 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+	gss_accept_sec_context;
+	gss_acquire_cred;
+	gss_acquire_cred_with_password;
+	gss_add_cred;
+	gss_add_cred_with_password;
+	gss_add_oid_set_member;
+	gss_canonicalize_name;
+	GSS_C_NT_ANONYMOUS;
+	GSS_C_NT_EXPORT_NAME;
+	GSS_C_NT_HOSTBASED_SERVICE;
+	GSS_C_NT_MACHINE_UID_NAME;
+	GSS_C_NT_STRING_UID_NAME;
+	GSS_C_NT_USER_NAME;
+	gss_compare_name;
+	gss_context_time;
+	gss_create_empty_oid_set;
+	gss_delete_sec_context;
+	gss_display_name;
+	gss_display_status;
+	gss_duplicate_name;
+	gss_export_name;
+	gss_export_sec_context;
+	gss_get_mic;
+	gss_import_name;
+	gss_import_sec_context;
+	gss_indicate_mechs;
+	gss_init_sec_context;
+	gss_inquire_context;
+	gss_inquire_cred;
+	gss_inquire_cred_by_mech;
+	gss_inquire_mechs_for_name;
+	gss_inquire_names_for_mech;
+	gss_process_context_token;
+	gss_release_buffer;
+	gss_release_cred;
+	gss_release_name;
+	gss_release_oid;
+	gss_release_oid_set;
+	gss_seal;
+	gss_sign;
+	gss_store_cred;
+	gss_test_oid_set_member;
+	gss_unseal;
+	gss_unwrap;
+	gss_verify;
+	gss_verify_mic;
+	gss_wrap;
+	gss_wrap_size_limit;
+} SUNW_1.1;
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+};
+
+SUNWprivate_1.1 {
+    global:
+	der_length_size;
+	generic_gss_copy_oid;
+	generic_gss_release_oid;
+	get_der_length;
+	gss_copy_oid_set;
+	gsscred_expname_to_unix_cred;
+	gsscred_expname_to_unix_cred_ext;
+	gsscred_name_to_unix_cred;
+	gsscred_name_to_unix_cred_ext;
+	gsscred_set_options;
+	gss_get_group_info;
+	__gss_get_kmodName;
+	__gss_get_mechanisms;
+	__gss_get_mech_info;
+	__gss_get_mech_type;
+	__gss_get_modOptions;
+	__gss_mech_qops;
+	__gss_mech_to_oid;
+	gss_nt_exported_name;
+	gss_nt_service_name;
+	gss_nt_service_name_v2;
+	__gss_num_to_qop;
+	__gss_oid_to_mech;
+	gss_oid_to_str;
+	__gss_qop_to_num;
+	gss_str_to_oid;
+	__gss_userok;
+	put_der_length;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libgss/sparc/Makefile b/usr/src/lib/libgss/sparc/Makefile
index fe210b036e..2a944b0b43 100644
--- a/usr/src/lib/libgss/sparc/Makefile
+++ b/usr/src/lib/libgss/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libgss/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libinetcfg/Makefile b/usr/src/lib/libinetcfg/Makefile
index e66d14656c..108e33c201 100644
--- a/usr/src/lib/libinetcfg/Makefile
+++ b/usr/src/lib/libinetcfg/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
@@ -43,9 +42,7 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
@@ -55,7 +52,7 @@ $(POFILE):	pofile_MSGFILES
 
 _msg:		$(MSGDOMAINPOFILE)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libinetcfg/Makefile.com b/usr/src/lib/libinetcfg/Makefile.com
index 3600f689ed..1eb8a4aee4 100644
--- a/usr/src/lib/libinetcfg/Makefile.com
+++ b/usr/src/lib/libinetcfg/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -40,11 +39,9 @@ include ../../Makefile.rootfs
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 LDLIBS +=	-lc -lnsl -lsocket -ldevinfo
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR  =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR) -D_REENTRANT
diff --git a/usr/src/lib/libinetcfg/common/mapfile-vers b/usr/src/lib/libinetcfg/common/mapfile-vers
new file mode 100644
index 0000000000..e9c1e5d58e
--- /dev/null
+++ b/usr/src/lib/libinetcfg/common/mapfile-vers
@@ -0,0 +1,74 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	icfg_close;
+	icfg_errmsg;
+	icfg_free_if_list;
+	icfg_get_addr;
+	icfg_get_broadcast;
+	icfg_get_dest_addr;
+	icfg_get_flags;
+	icfg_get_groupname;
+	icfg_get_if_list;
+	icfg_get_index;
+	icfg_get_metric;
+	icfg_get_mtu;
+	icfg_get_netmask;
+	icfg_get_subnet;
+	icfg_get_token;
+	icfg_get_tunnel_dest;
+	icfg_get_tunnel_encaplimit;
+	icfg_get_tunnel_hoplimit;
+	icfg_get_tunnel_lower;
+	icfg_get_tunnel_src;
+	icfg_get_tunnel_upper;
+	icfg_is_logical;
+	icfg_iterate_if;
+	icfg_open;
+	icfg_refresh_tunnel_cache;
+	icfg_set_addr;
+	icfg_set_broadcast;
+	icfg_set_dest_addr;
+	icfg_set_flags;
+	icfg_set_index;
+	icfg_set_metric;
+	icfg_set_mtu;
+	icfg_set_netmask;
+	icfg_set_prefixlen;
+	icfg_set_subnet;
+	icfg_set_token;
+	icfg_set_tunnel_dest;
+	icfg_set_tunnel_encaplimit;
+	icfg_set_tunnel_hoplimit;
+	icfg_set_tunnel_src;
+	icfg_sockaddr_to_str;
+	icfg_str_to_sockaddr;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libinetsvc/Makefile b/usr/src/lib/libinetsvc/Makefile
index a72b2d665b..0b426c7c65 100644
--- a/usr/src/lib/libinetsvc/Makefile
+++ b/usr/src/lib/libinetsvc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include		../Makefile.lib
@@ -41,15 +40,13 @@ HDRS =          inetsvc.h
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-lint: $(SUBDIRS)
-
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libinetsvc/Makefile.com b/usr/src/lib/libinetsvc/Makefile.com
index 6ea2c906c6..164d31c196 100644
--- a/usr/src/lib/libinetsvc/Makefile.com
+++ b/usr/src/lib/libinetsvc/Makefile.com
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 LIBRARY =	libinetsvc.a
@@ -32,14 +32,12 @@ OBJECTS =	inetsvc.o
 include ../../Makefile.lib
 
 LIBS =		$(DYNLIB) $(LINTLIB)
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lscf -lc -lsocket -lnsl -lmd -luutil
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-CFLAGS +=			-v -Wp,-xc99=%all
+CFLAGS +=			$(CCVERBOSE) -Wp,-xc99=%all
 CPPFLAGS +=			-I../common -D_REENTRANT
 $(RELEASE_BUILD)CPPFLAGS +=     -DNDEBUG
 
diff --git a/usr/src/lib/libinetsvc/common/mapfile-vers b/usr/src/lib/libinetsvc/common/mapfile-vers
new file mode 100644
index 0000000000..d0913123e9
--- /dev/null
+++ b/usr/src/lib/libinetsvc/common/mapfile-vers
@@ -0,0 +1,66 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	calculate_hash;
+	connect_to_inetd;
+	destroy_basic_cfg;
+	destroy_proto_list;
+	destroy_strings;
+	dg_template;
+	find_prop;
+	free_instance_props;
+	get_netids;
+	get_prop_table;
+	get_prop_value_boolean;
+	get_prop_value_count;
+	get_prop_value_int;
+	get_prop_value_string;
+	get_protos;
+	get_rpc_prognum;
+	get_sock_type_id;
+	inet_ntop_native;
+	put_prop_value_boolean;
+	put_prop_value_count;
+	put_prop_value_int;
+	put_prop_value_string;
+	put_prop_value_string_list;
+	read_default_props;
+	read_instance_props;
+	read_prop;
+	refresh_inetd;
+	retrieve_inetd_hash;
+	safe_sendto;
+	safe_write;
+	setproctitle;
+	store_inetd_hash;
+	valid_default_prop;
+	valid_props;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libinetutil/Makefile b/usr/src/lib/libinetutil/Makefile
index 0d6e0903b8..980894ba78 100644
--- a/usr/src/lib/libinetutil/Makefile
+++ b/usr/src/lib/libinetutil/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -41,15 +40,13 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
 check:		$(CHECKHDRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libinetutil/Makefile.com b/usr/src/lib/libinetutil/Makefile.com
index d9e592c2df..810f24bd71 100644
--- a/usr/src/lib/libinetutil/Makefile.com
+++ b/usr/src/lib/libinetutil/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -37,6 +36,8 @@ include ../../Makefile.rootfs
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
+SRCDIR =	../common
+COMDIR =	$(SRC)/common/net/dhcp
 SRCS = 		$(COMDIR)/octet.c $(SRCDIR)/inetutil4.c \
 		$(SRCDIR)/ifspec.c $(SRCDIR)/eh.c $(SRCDIR)/tq.c \
 		$(SRCDIR)/ifaddrlist.c
@@ -44,11 +45,6 @@ SRCS = 		$(COMDIR)/octet.c $(SRCDIR)/inetutil4.c \
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lsocket -lc
 
-SRCDIR =	../common
-COMDIR =	$(SRC)/common/net/dhcp
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
 
diff --git a/usr/src/lib/libinetutil/common/mapfile-vers b/usr/src/lib/libinetutil/common/mapfile-vers
new file mode 100644
index 0000000000..51c168fcc4
--- /dev/null
+++ b/usr/src/lib/libinetutil/common/mapfile-vers
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	get_netmask4;
+	hexascii_to_octet;
+	ifaddrlist;
+	ifparse_ifspec;
+	iu_adjust_timer;
+	iu_cancel_timer;
+	iu_earliest_timer;
+	iu_eh_create;
+	iu_eh_destroy;
+	iu_eh_register_signal;
+	iu_eh_unregister_signal;
+	iu_expire_timers;
+	iu_handle_events;
+	iu_register_event;
+	iu_schedule_timer;
+	iu_schedule_timer_ms;
+	iu_stop_handling_events;
+	iu_tq_create;
+	iu_tq_destroy;
+	iu_unregister_event;
+	octet_to_hexascii;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libintl/Makefile.com b/usr/src/lib/libintl/Makefile.com
index 40a7f300b8..e229aa353e 100644
--- a/usr/src/lib/libintl/Makefile.com
+++ b/usr/src/lib/libintl/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,8 +18,8 @@
 #
 # CDDL HEADER END
 #
-# 
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -32,11 +31,11 @@ VERS=		.1
 include		../../Makefile.lib
 include		../../Makefile.rootfs
 
-MAPFILES=	../common/mapfile-vers $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
+MAPFILES +=	$(MAPFILE-FLTR)
+
 SRCDIR=		../common
 
-DYNFLAGS +=	-F libc.so.1 $(MAPOPTS)
+DYNFLAGS +=	-F libc.so.1
 
 LIBS=		$(DYNLIB) $(LINTLIB)
 $(LINTLIB):=	SRCS=$(SRCDIR)/$(LINTSRC)
@@ -53,5 +52,3 @@ all:		$(LIBS)
 lint:
 
 include		../../Makefile.targ
-
-$(DYNLIB):	$(MAPFILES)
diff --git a/usr/src/lib/libipmp/Makefile b/usr/src/lib/libipmp/Makefile
index 596c39e922..188c49c073 100644
--- a/usr/src/lib/libipmp/Makefile
+++ b/usr/src/lib/libipmp/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -44,9 +43,7 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
@@ -57,7 +54,7 @@ $(POFILE):	$(MSGFILES)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libipmp/Makefile.com b/usr/src/lib/libipmp/Makefile.com
index 5bce4ce86e..bea02659a8 100644
--- a/usr/src/lib/libipmp/Makefile.com
+++ b/usr/src/lib/libipmp/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -33,12 +32,10 @@ OBJECTS =	ipmp_query.o ipmp_mpathd.o ipmp.o
 include ../../Makefile.lib
 
 LIBS =		$(DYNLIB) $(LINTLIB)
-$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lsocket -lc
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -I$(SRCDIR)
diff --git a/usr/src/lib/libipmp/common/mapfile-vers b/usr/src/lib/libipmp/common/mapfile-vers
new file mode 100644
index 0000000000..a4052bfcd3
--- /dev/null
+++ b/usr/src/lib/libipmp/common/mapfile-vers
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	ipmp_close;
+	ipmp_errmsg;
+	ipmp_freegroupinfo;
+	ipmp_freegrouplist;
+	ipmp_freeifinfo;
+	ipmp_getgroupinfo;
+	ipmp_getgrouplist;
+	ipmp_getifinfo;
+	ipmp_groupinfo_create;
+	ipmp_grouplist_create;
+	ipmp_ifinfo_create;
+	ipmp_open;
+	ipmp_read;
+	ipmp_setqcontext;
+	ipmp_snap_addgroupinfo;
+	ipmp_snap_addifinfo;
+	ipmp_snap_create;
+	ipmp_snap_free;
+	ipmp_write;
+	ipmp_writetlv;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libipp/Makefile b/usr/src/lib/libipp/Makefile
index 2076598add..5675f84f5f 100644
--- a/usr/src/lib/libipp/Makefile
+++ b/usr/src/lib/libipp/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2001-2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libipp/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include	../Makefile.lib
@@ -46,15 +43,13 @@ lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all install clean clobber: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all install clean clobber lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
 check:		$(CHECKHDRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libipp/Makefile.com b/usr/src/lib/libipp/Makefile.com
index ab17f19204..94a44ec24e 100644
--- a/usr/src/lib/libipp/Makefile.com
+++ b/usr/src/lib/libipp/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libipp/Makefile.com
-#
 
 LIBRARY =	libipp.a
 VERS =		.1
@@ -36,15 +33,10 @@ OBJECTS =	libipp.o
 # include library definitions
 include ../../Makefile.lib
 
-SRCDIR =	..
-
 LIBS =		$(DYNLIB) $(LINTLIB)
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lc -lnvpair
 
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT
 
diff --git a/usr/src/lib/libipp/mapfile-vers b/usr/src/lib/libipp/mapfile-vers
new file mode 100644
index 0000000000..87edca0902
--- /dev/null
+++ b/usr/src/lib/libipp/mapfile-vers
@@ -0,0 +1,41 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	ipp_action_create;
+	ipp_action_destroy;
+	ipp_action_info;
+	ipp_action_mod;
+	ipp_action_modify;
+	ipp_free;
+	ipp_free_array;
+	ipp_list_mods;
+	ipp_mod_list_actions;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libipsecutil/Makefile b/usr/src/lib/libipsecutil/Makefile
index 1c52a89fa6..939c4710de 100644
--- a/usr/src/lib/libipsecutil/Makefile
+++ b/usr/src/lib/libipsecutil/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -40,10 +39,7 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all install: spec .WAIT $(SUBDIRS)
-clean clobber: spec $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
@@ -51,7 +47,7 @@ check:		$(CHECKHDRS)
 
 _msg:
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libipsecutil/Makefile.com b/usr/src/lib/libipsecutil/Makefile.com
index f3b9f02534..0465e30288 100644
--- a/usr/src/lib/libipsecutil/Makefile.com
+++ b/usr/src/lib/libipsecutil/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -33,15 +32,13 @@ OBJECTS =	ipsec_util.o algs.o err.o
 include ../../Makefile.lib
 
 LIBS +=		$(DYNLIB) $(LINTLIB)
+
+SRCDIR =	../common
 SRCS = 		$(SRCDIR)/ipsec_util.c $(SRCDIR)/algs.c $(SRCDIR)/err.c
 
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lnsl -lc
 
-SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
 
diff --git a/usr/src/lib/libipsecutil/common/mapfile-vers b/usr/src/lib/libipsecutil/common/mapfile-vers
new file mode 100644
index 0000000000..75f7eedc48
--- /dev/null
+++ b/usr/src/lib/libipsecutil/common/mapfile-vers
@@ -0,0 +1,74 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	addipsecalg;
+	addipsecproto;
+	bail;
+	bail_msg;
+	dbgstr2num;
+	delipsecalgbyname;
+	delipsecalgbynum;
+	delipsecprotobyname;
+	delipsecprotobynum;
+	do_interactive;
+	dump_aalg;
+	dump_ealg;
+	dump_key;
+	dump_sadb_idtype;
+	dump_sockaddr;
+	env;
+	err;
+	errx;
+	getipsecalgs;
+	getipsecprotos;
+	interactive;
+	ipsecalgs_diag;
+	ipsecproto_get_exec_mode;
+	ipsecproto_set_exec_mode;
+	keysock_diag;
+	kmc_insert_mapping;
+	kmc_lookup_by_cookie;
+	lineno;
+	list_ints;
+	nflag;
+	parsedbgopts;
+	pflag;
+	privstr2num;
+	readfile;
+	spdsock_diag;
+	spdsock_get_ext;
+	verr;
+	verrx;
+	vwarn;
+	vwarnx;
+	warn;
+	warnx;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libkrb5/Makefile b/usr/src/lib/libkrb5/Makefile
index 5b94b3aaef..3ee7c85c04 100755
--- a/usr/src/lib/libkrb5/Makefile
+++ b/usr/src/lib/libkrb5/Makefile
@@ -24,7 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libkrb5/Makefile
 
 include		$(SRC)/lib/Makefile.lib
 
@@ -53,7 +52,7 @@ LIBRARY= 	libkrb5.a
 
 .KEEP_STATE:
 
-all clean clobber install: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libkrb5/Makefile.com b/usr/src/lib/libkrb5/Makefile.com
index 341576dfae..0af464673e 100755
--- a/usr/src/lib/libkrb5/Makefile.com
+++ b/usr/src/lib/libkrb5/Makefile.com
@@ -24,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libkrb5/Makefile.com
-#
 
 # include library definitions
 include $(SRC)/lib/Makefile.lib
@@ -69,3 +67,5 @@ clobber: clean
 
 clean:
 	-$(RM) $(LIBS)
+
+lint:
diff --git a/usr/src/lib/libkrb5/amd64/Makefile b/usr/src/lib/libkrb5/amd64/Makefile
index 54b82e901c..ed38f8157b 100644
--- a/usr/src/lib/libkrb5/amd64/Makefile
+++ b/usr/src/lib/libkrb5/amd64/Makefile
@@ -24,9 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libkrb5/amd64/Makefile
-
-MAPDIR= ../common
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libkrb5/i386/Makefile b/usr/src/lib/libkrb5/i386/Makefile
index 8673c75014..eefe1d221f 100755
--- a/usr/src/lib/libkrb5/i386/Makefile
+++ b/usr/src/lib/libkrb5/i386/Makefile
@@ -24,9 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libkrb5/i386/Makefile
-
-MAPDIR= ../common
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libkrb5/sparc/Makefile b/usr/src/lib/libkrb5/sparc/Makefile
index 9187a100f5..2f8f7bfaa7 100755
--- a/usr/src/lib/libkrb5/sparc/Makefile
+++ b/usr/src/lib/libkrb5/sparc/Makefile
@@ -24,9 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libkrb5/sparc/Makefile
-
-MAPDIR= ../common
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libkrb5/sparcv9/Makefile b/usr/src/lib/libkrb5/sparcv9/Makefile
index c8105dab90..ed38f8157b 100755
--- a/usr/src/lib/libkrb5/sparcv9/Makefile
+++ b/usr/src/lib/libkrb5/sparcv9/Makefile
@@ -24,9 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libkrb5/sparcv9/Makefile
-
-MAPDIR= ../common
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libkstat/Makefile b/usr/src/lib/libkstat/Makefile
index 743288866c..ac5f368ea9 100644
--- a/usr/src/lib/libkstat/Makefile
+++ b/usr/src/lib/libkstat/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,17 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libkstat/Makefile
 
 include		../../Makefile.master
 include		../Makefile.lib
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -69,7 +68,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/libkstat/Makefile.com b/usr/src/lib/libkstat/Makefile.com
index 8de4e808fe..aacfa928bf 100644
--- a/usr/src/lib/libkstat/Makefile.com
+++ b/usr/src/lib/libkstat/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libkstat/Makefile.com
-#
 
 LIBRARY= libkstat.a
 VERS= .1
@@ -39,8 +36,7 @@ include ../../Makefile.lib
 # install this library in the root filesystem
 include ../../Makefile.rootfs
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -48,18 +44,12 @@ LINTSRC=	$(LINTLIB:%.ln=%)
 
 CPPFLAGS +=	-I..
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc
 
 .KEEP_STATE:
 
 lint: lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/libkstat/amd64/Makefile b/usr/src/lib/libkstat/amd64/Makefile
index 5ca4cbf62e..d50a21bdb0 100644
--- a/usr/src/lib/libkstat/amd64/Makefile
+++ b/usr/src/lib/libkstat/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libkstat/common/mapfile-vers b/usr/src/lib/libkstat/common/mapfile-vers
new file mode 100644
index 0000000000..21bfa76a0d
--- /dev/null
+++ b/usr/src/lib/libkstat/common/mapfile-vers
@@ -0,0 +1,48 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	kstat_chain_update;
+	kstat_close;
+	kstat_data_lookup;
+	kstat_lookup;
+	kstat_open;
+	kstat_read;
+	kstat_write;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libkstat/i386/Makefile b/usr/src/lib/libkstat/i386/Makefile
index 264147980a..2a944b0b43 100644
--- a/usr/src/lib/libkstat/i386/Makefile
+++ b/usr/src/lib/libkstat/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libkstat/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libkstat/sparc/Makefile b/usr/src/lib/libkstat/sparc/Makefile
index 3ae96b873f..2a944b0b43 100644
--- a/usr/src/lib/libkstat/sparc/Makefile
+++ b/usr/src/lib/libkstat/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libkstat/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libkstat/sparcv9/Makefile b/usr/src/lib/libkstat/sparcv9/Makefile
index b71bd0abd5..d50a21bdb0 100644
--- a/usr/src/lib/libkstat/sparcv9/Makefile
+++ b/usr/src/lib/libkstat/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libkstat/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/libkvm/Makefile b/usr/src/lib/libkvm/Makefile
index fbe73606ff..b4629602bf 100644
--- a/usr/src/lib/libkvm/Makefile
+++ b/usr/src/lib/libkvm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,21 +19,19 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1990-2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libkvm/Makefile
-#
-# The builds occur in isa subdirectories.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
 
 HDRS =		kvm.h
 HDRDIR =	.
-SUBDIRS =	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 install :=	TARGET= install
@@ -51,7 +48,7 @@ install_h: $(ROOTHDRS)
 
 check:	$(CHECKHDRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libkvm/Makefile.com b/usr/src/lib/libkvm/Makefile.com
index 9a2e6d1545..f85c414bf4 100644
--- a/usr/src/lib/libkvm/Makefile.com
+++ b/usr/src/lib/libkvm/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libkvm/Makefile.com
-#
 
 LIBRARY=	libkvm.a
 VERS=		.1
@@ -36,8 +33,7 @@ OBJECTS=	kvm.o kvm_getcmd.o
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -46,7 +42,6 @@ $(LINTLIB):= SRCS=../common/llib-lkvm
 LINTSRC=	$(LINTLIB:%.ln=%)
 
 CFLAGS	+=	$(CCVERBOSE)
-DYNFLAGS +=	-M $(MAPFILE)
 DYNFLAGS32 +=	-Wl,-f,/usr/platform/\$$PLATFORM/lib/$(DYNLIBPSR)
 DYNFLAGS64 +=	-Wl,-f,/usr/platform/\$$PLATFORM/lib/$(MACH64)/$(DYNLIBPSR)
 LDLIBS +=	-lelf -lc
@@ -59,11 +54,6 @@ CLOBBERFILES += test test.o
 
 lint: lintcheck
 
-$(DYNLIB): 	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 test: ../common/test.c
 	$(COMPILE.c) ../common/test.c
 	$(LINK.c) -o $@ test.o -lkvm -lelf
diff --git a/usr/src/lib/libkvm/amd64/Makefile b/usr/src/lib/libkvm/amd64/Makefile
index 8c3eb041f5..634b49163c 100644
--- a/usr/src/lib/libkvm/amd64/Makefile
+++ b/usr/src/lib/libkvm/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libkvm/common/mapfile-vers b/usr/src/lib/libkvm/common/mapfile-vers
new file mode 100644
index 0000000000..7f35fcc3ea
--- /dev/null
+++ b/usr/src/lib/libkvm/common/mapfile-vers
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	kvm_close;
+	kvm_getcmd;
+	kvm_getproc;
+	kvm_getu;
+	kvm_kread;
+	kvm_kwrite;
+	kvm_nextproc;
+	kvm_nlist;
+	kvm_open;
+	kvm_read;
+	kvm_setproc;
+	kvm_uread;
+	kvm_uwrite;
+	kvm_write;
+};
+
+SUNWprivate_1.1 {
+    global:
+	kvm_aread;
+	kvm_awrite;
+	kvm_physaddr;
+	kvm_pread;
+	kvm_pwrite;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libkvm/i386/Makefile b/usr/src/lib/libkvm/i386/Makefile
index b3c66f3435..6768df622e 100644
--- a/usr/src/lib/libkvm/i386/Makefile
+++ b/usr/src/lib/libkvm/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
diff --git a/usr/src/lib/libkvm/sparc/Makefile b/usr/src/lib/libkvm/sparc/Makefile
index ad0f0b9df1..6768df622e 100644
--- a/usr/src/lib/libkvm/sparc/Makefile
+++ b/usr/src/lib/libkvm/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
diff --git a/usr/src/lib/libkvm/sparcv9/Makefile b/usr/src/lib/libkvm/sparcv9/Makefile
index 4c5c46d496..634b49163c 100644
--- a/usr/src/lib/libkvm/sparcv9/Makefile
+++ b/usr/src/lib/libkvm/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/liblaadm/Makefile b/usr/src/lib/liblaadm/Makefile
index a70c31b9ac..aad578c055 100644
--- a/usr/src/lib/liblaadm/Makefile
+++ b/usr/src/lib/liblaadm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
@@ -44,11 +43,7 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all install: spec .WAIT $(SUBDIRS)
-
-clean clobber: spec $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
@@ -58,7 +53,7 @@ $(POFILE):	pofile_MSGFILES
 
 _msg:		$(MSGDOMAINPOFILE)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/liblaadm/Makefile.com b/usr/src/lib/liblaadm/Makefile.com
index a0008c047a..45b019e06e 100644
--- a/usr/src/lib/liblaadm/Makefile.com
+++ b/usr/src/lib/liblaadm/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 LIBRARY = liblaadm.a
@@ -38,11 +37,9 @@ include ../../Makefile.rootfs
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 LDLIBS +=	-lsocket -lc
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR  =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR) -D_REENTRANT
diff --git a/usr/src/lib/liblaadm/common/mapfile-vers b/usr/src/lib/liblaadm/common/mapfile-vers
new file mode 100644
index 0000000000..41f5be656b
--- /dev/null
+++ b/usr/src/lib/liblaadm/common/mapfile-vers
@@ -0,0 +1,49 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	laadm_add;
+	laadm_create;
+	laadm_delete;
+	laadm_diag;
+	laadm_down;
+	laadm_lacp_mode_to_str;
+	laadm_lacp_timer_to_str;
+	laadm_mac_addr_to_str;
+	laadm_modify;
+	laadm_policy_to_str;
+	laadm_remove;
+	laadm_str_to_lacp_mode;
+	laadm_str_to_lacp_timer;
+	laadm_str_to_mac_addr;
+	laadm_str_to_policy;
+	laadm_up;
+	laadm_walk_sys;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libldap4/Makefile b/usr/src/lib/libldap4/Makefile
index 1d83af4be5..b666813ce9 100644
--- a/usr/src/lib/libldap4/Makefile
+++ b/usr/src/lib/libldap4/Makefile
@@ -1,15 +1,34 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libldap4/Makefile
 
 include			../Makefile.lib
 
-
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -32,7 +51,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libldap4/Makefile.com b/usr/src/lib/libldap4/Makefile.com
index f1ba53072f..a92ce1d5c3 100644
--- a/usr/src/lib/libldap4/Makefile.com
+++ b/usr/src/lib/libldap4/Makefile.com
@@ -1,11 +1,29 @@
 #
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libldap4/Makefile.com
-#
 
 LIBRARY= libldap.a
 VERS= .4
@@ -46,8 +64,7 @@ include ../../Makefile.lib
 LDAPINC=	$(SRC)/lib/libldap4/include
 LDAP_FLAGS=	-DLDAP_REFERRALS -DCLDAP -DLDAP_DNS -DSUN
 
-MAPFILE=	$(MAPDIR)/mapfile
-
+SRCDIR =	../common
 SRCS=		$(LDAPOBJS:%.o=../common/%.c)	$(BEROBJS:%.o=../ber/%.c) \
 		$(UTILOBJS:%.o=../util/%.c)	$(SECOBJS:%.o=../sec/%.c) 
 
@@ -61,7 +78,6 @@ ROOTLINT=	$(LINTSRC:%=$(ROOTLINTDIR)/%)
 
 
 CLEANFILES += 	$(LINTOUT) $(LINTLIB)
-CLOBBERFILES +=	$(MAPFILE)
 
 # Local Libldap definitions
 
@@ -71,18 +87,12 @@ LOCFLAGS +=	-D_SYS_STREAM_H -D_REENTRANT -DSVR4 -DSUNW_OPTIONS \
 
 CPPFLAGS =	$(LOCFLAGS) $(CPPFLAGS.master)
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lsocket -lnsl -lresolv -lc -lmd
 
 .KEEP_STATE:
 
 lint: lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/libldap4/amd64/Makefile b/usr/src/lib/libldap4/amd64/Makefile
index f6dbac60d2..4e772d362a 100644
--- a/usr/src/lib/libldap4/amd64/Makefile
+++ b/usr/src/lib/libldap4/amd64/Makefile
@@ -1,12 +1,30 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libldap4/common/mapfile-vers b/usr/src/lib/libldap4/common/mapfile-vers
new file mode 100644
index 0000000000..74dbf66deb
--- /dev/null
+++ b/usr/src/lib/libldap4/common/mapfile-vers
@@ -0,0 +1,216 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+	ber_alloc;
+	ber_get_int;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	ber_alloc_t;
+	ber_bvdup;
+	ber_bvecfree;
+	ber_bvfree;
+	ber_first_element;
+	ber_flatten;
+	ber_free;
+	ber_init;
+	ber_next_element;
+	ber_peek_tag;
+	ber_printf;
+	ber_scanf;
+	ber_skip_tag;
+	cldap_close;
+	cldap_open;
+	cldap_search_s;
+	cldap_setretryinfo;
+	ldap_abandon;
+	ldap_abandon_ext;
+	ldap_add;
+	ldap_add_ext;
+	ldap_add_ext_s;
+	ldap_add_s;
+	ldap_bind;
+	ldap_bind_s;
+	ldap_build_filter;
+	ldap_compare;
+	ldap_compare_ext;
+	ldap_compare_ext_s;
+	ldap_compare_s;
+	ldap_control_free;
+	ldap_controls_free;
+	ldap_count_entries;
+	ldap_count_messages;
+	ldap_count_references;
+	ldap_count_values;
+	ldap_count_values_len;
+	ldap_create_sort_control;
+	ldap_create_sort_keylist;
+	ldap_create_virtuallist_control;
+	ldap_delete;
+	ldap_delete_ext;
+	ldap_delete_ext_s;
+	ldap_delete_s;
+	ldap_destroy_cache;
+	ldap_disable_cache;
+	ldap_dn2ufn;
+	ldap_dns_to_dn;
+	ldap_dns_to_url;
+	ldap_dn_to_url;
+	ldap_enable_cache;
+	ldap_enable_translation;
+	ldap_entry2html;
+	ldap_entry2html_search;
+	ldap_entry2text;
+	ldap_entry2text_search;
+	ldap_err2string;
+	ldap_explode_dn;
+	ldap_explode_dns;
+	ldap_explode_rdn;
+	ldap_extended_operation;
+	ldap_extended_operation_s;
+	ldap_first_attribute;
+	ldap_first_disptmpl;
+	ldap_first_entry;
+	ldap_first_message;
+	ldap_first_reference;
+	ldap_first_searchobj;
+	ldap_first_tmplcol;
+	ldap_first_tmplrow;
+	ldap_flush_cache;
+	ldap_free_friendlymap;
+	ldap_free_searchprefs;
+	ldap_free_sort_keylist;
+	ldap_free_templates;
+	ldap_free_urldesc;
+	ldap_friendly_name;
+	ldap_get_dn;
+	ldap_getfilter_free;
+	ldap_getfirstfilter;
+	ldap_getnextfilter;
+	ldap_get_option;
+	ldap_get_values;
+	ldap_get_values_len;
+	ldap_init;
+	ldap_init_getfilter;
+	ldap_init_getfilter_buf;
+	ldap_init_searchprefs;
+	ldap_init_searchprefs_buf;
+	ldap_init_templates;
+	ldap_init_templates_buf;
+	ldap_is_dns_dn;
+	ldap_is_ldap_url;
+	ldap_memfree;
+	ldap_modify;
+	ldap_modify_ext;
+	ldap_modify_ext_s;
+	ldap_modify_s;
+	ldap_modrdn;
+	ldap_modrdn_s;
+	ldap_mods_free;
+	ldap_msgfree;
+	ldap_msgid;
+	ldap_msgtype;
+	ldap_next_attribute;
+	ldap_next_disptmpl;
+	ldap_next_entry;
+	ldap_next_message;
+	ldap_next_reference;
+	ldap_next_searchobj;
+	ldap_next_tmplcol;
+	ldap_next_tmplrow;
+	ldap_oc2template;
+	ldap_open;
+	ldap_parse_extended_result;
+	ldap_parse_result;
+	ldap_parse_sasl_bind_result;
+	ldap_parse_sort_control;
+	ldap_parse_virtuallist_control;
+	ldap_perror;
+	ldap_rename;
+	ldap_rename_s;
+	ldap_result;
+	ldap_result2error;
+	ldap_sasl_bind;
+	ldap_sasl_bind_s;
+	ldap_sasl_cram_md5_bind_s;
+	ldap_search;
+	ldap_search_ext;
+	ldap_search_ext_s;
+	ldap_search_s;
+	ldap_search_st;
+	ldap_set_cache_options;
+	ldap_setfilteraffixes;
+	ldap_set_option;
+	ldap_set_rebind_proc;
+	ldap_set_string_translators;
+	ldap_simple_bind;
+	ldap_simple_bind_s;
+	ldap_sort_entries;
+	ldap_sort_strcasecmp;
+	ldap_sort_values;
+	ldap_tmplattrs;
+	ldap_translate_from_t61;
+	ldap_translate_to_t61;
+	ldap_ufn_search_c;
+	ldap_ufn_search_ct;
+	ldap_ufn_search_s;
+	ldap_ufn_setfilter;
+	ldap_ufn_setprefix;
+	ldap_ufn_timeout;
+	ldap_unbind;
+	ldap_unbind_s;
+	ldap_uncache_entry;
+	ldap_uncache_request;
+	ldap_url_parse;
+	ldap_url_search;
+	ldap_url_search_s;
+	ldap_url_search_st;
+	ldap_vals2html;
+	ldap_vals2text;
+	ldap_value_free;
+	ldap_value_free_len;
+	open_default_ldap_connection;
+	set_ber_options;
+};
+
+SUNWprivate_1.1 {
+    global:
+	i18n_catopen;
+	ldap_create_page_control;
+	ldap_get_reference_urls;
+	ldaplogconfigf;
+	ldap_parse_page_control;
+	ldif_type_and_value;
+	slapdcat;
+	str_getline;
+	str_parse_line;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libldap4/i386/Makefile b/usr/src/lib/libldap4/i386/Makefile
index 10b1c4f5f5..7cf5507978 100644
--- a/usr/src/lib/libldap4/i386/Makefile
+++ b/usr/src/lib/libldap4/i386/Makefile
@@ -1,12 +1,29 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/liblibldap4/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libldap4/sparc/Makefile b/usr/src/lib/libldap4/sparc/Makefile
index 07866abc0c..7cf5507978 100644
--- a/usr/src/lib/libldap4/sparc/Makefile
+++ b/usr/src/lib/libldap4/sparc/Makefile
@@ -1,12 +1,29 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libldap4/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libldap4/sparcv9/Makefile b/usr/src/lib/libldap4/sparcv9/Makefile
index 9776bf13ec..4e772d362a 100644
--- a/usr/src/lib/libldap4/sparcv9/Makefile
+++ b/usr/src/lib/libldap4/sparcv9/Makefile
@@ -1,12 +1,29 @@
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libldap4/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/libldap5/Makefile b/usr/src/lib/libldap5/Makefile
index 913ceb3b76..096d63a199 100644
--- a/usr/src/lib/libldap5/Makefile
+++ b/usr/src/lib/libldap5/Makefile
@@ -1,11 +1,29 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libldap5/Makefile
-#
 
 include			../Makefile.lib
 
@@ -27,7 +45,7 @@ POFILES=        generic.po
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install: $(SUBDIRS)
 
 lint:
 	@ $(ECHO) "usr/src/lib/libldap5 is third-party code that"
@@ -59,7 +77,7 @@ $(POFILES):
 	sed "/^domain/d" < messages.po  > $@
 	$(RM) messages.po
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libldap5/Makefile.com b/usr/src/lib/libldap5/Makefile.com
index 1874b19a76..895f57e5ad 100644
--- a/usr/src/lib/libldap5/Makefile.com
+++ b/usr/src/lib/libldap5/Makefile.com
@@ -23,9 +23,6 @@
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
-
-#
-# lib/libldap5/Makefile.com
 #
 
 LIBRARY= libldap.a
@@ -104,7 +101,6 @@ ROOTLINT=	$(LINTSRC:%=$(ROOTLINTDIR)/%)
 
 
 CLEANFILES += 	$(LINTOUT) $(LINTLIB)
-CLOBBERFILES +=	$(MAPFILE)
 
 # Local Libldap definitions
 LOCFLAGS +=	 $(XSTRCONST) -D_REENTRANT
@@ -115,9 +111,6 @@ sparcv9_C_PICFLAGS =	$(sparcv9_C_BIGPICFLAGS)
 #i386_C_PICFLAGS =	$(i386_C_BIGPICFLAGS)
 #amd64_C_PICFLAGS =	$(amd64_C_BIGPICFLAGS)
 
-MAPDIR = 	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE) $(LOCFLAGS)
 CFLAGS64 +=	$(LOCFLAGS)
 LDLIBS +=	-lsasl -lsocket -lnsl -lmd -lc
diff --git a/usr/src/lib/libldap5/mapfile-vers b/usr/src/lib/libldap5/mapfile-vers
new file mode 100644
index 0000000000..0170ec8c51
--- /dev/null
+++ b/usr/src/lib/libldap5/mapfile-vers
@@ -0,0 +1,252 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_5.2 {
+    global:
+	ldap_sasl_interactive_bind_s;
+} SUNW_5.1.1;
+
+SUNW_5.1.1 {
+    global:
+	ldap_url_parse_nodn;
+} SUNW_5.1;
+
+SUNW_5.1 {
+    global:
+	ber_alloc;
+	ber_alloc_t;
+	ber_bvdup;
+	ber_bvecfree;
+	ber_bvfree;
+	ber_first_element;
+	ber_flatten;
+	ber_free;
+	ber_get_int;
+	ber_init;
+	ber_next_element;
+	ber_peek_tag;
+	ber_printf;
+	ber_scanf;
+	ber_skip_tag;
+	ldap_abandon;
+	ldap_abandon_ext;
+	ldap_add;
+	ldap_add_ext;
+	ldap_add_ext_s;
+	ldap_add_s;
+	ldap_ber_free;
+	ldap_bind;
+	ldap_bind_s;
+	ldap_build_filter;
+	ldap_compare;
+	ldap_compare_ext;
+	ldap_compare_ext_s;
+	ldap_compare_s;
+	ldap_control_free;
+	ldap_controls_free;
+	ldap_count_entries;
+	ldap_count_messages;
+	ldap_count_references;
+	ldap_count_values;
+	ldap_count_values_len;
+	ldap_create_sort_control;
+	ldap_create_sort_keylist;
+	ldap_create_virtuallist_control;
+	ldap_delete;
+	ldap_delete_ext;
+	ldap_delete_ext_s;
+	ldap_delete_s;
+	ldap_dn2ufn;
+	ldap_dns_to_dn;
+	ldap_dns_to_url;
+	ldap_dn_to_url;
+	ldap_enable_translation;
+	ldap_entry2html;
+	ldap_entry2html_search;
+	ldap_entry2text;
+	ldap_entry2text_search;
+	ldap_err2string;
+	ldap_explode_dn;
+	ldap_explode_dns;
+	ldap_explode_rdn;
+	ldap_extended_operation;
+	ldap_extended_operation_s;
+	ldap_first_attribute;
+	ldap_first_disptmpl;
+	ldap_first_entry;
+	ldap_first_message;
+	ldap_first_reference;
+	ldap_first_searchobj;
+	ldap_first_tmplcol;
+	ldap_first_tmplrow;
+	ldap_free_friendlymap;
+	ldap_free_searchprefs;
+	ldap_free_sort_keylist;
+	ldap_free_templates;
+	ldap_free_urldesc;
+	ldap_friendly_name;
+	ldap_get_dn;
+	ldap_get_entry_controls;
+	ldap_getfilter_free;
+	ldap_getfirstfilter;
+	ldap_get_lang_values;
+	ldap_get_lang_values_len;
+	ldap_getnextfilter;
+	ldap_get_option;
+	ldap_get_values;
+	ldap_get_values_len;
+	ldap_init;
+	ldap_init_getfilter;
+	ldap_init_getfilter_buf;
+	ldap_init_searchprefs;
+	ldap_init_searchprefs_buf;
+	ldap_init_templates;
+	ldap_init_templates_buf;
+	ldap_is_dns_dn;
+	ldap_is_ldap_url;
+	ldap_memcache_destroy;
+	ldap_memcache_flush;
+	ldap_memcache_get;
+	ldap_memcache_init;
+	ldap_memcache_set;
+	ldap_memcache_update;
+	ldap_memfree;
+	ldap_modify;
+	ldap_modify_ext;
+	ldap_modify_ext_s;
+	ldap_modify_s;
+	ldap_modrdn;
+	ldap_modrdn2;
+	ldap_modrdn2_s;
+	ldap_modrdn_s;
+	ldap_mods_free;
+	ldap_msgfree;
+	ldap_msgid;
+	ldap_msgtype;
+	ldap_name2template;
+	ldap_next_attribute;
+	ldap_next_disptmpl;
+	ldap_next_entry;
+	ldap_next_message;
+	ldap_next_reference;
+	ldap_next_searchobj;
+	ldap_next_tmplcol;
+	ldap_next_tmplrow;
+	ldap_oc2template;
+	ldap_open;
+	ldap_parse_extended_result;
+	ldap_parse_reference;
+	ldap_parse_result;
+	ldap_parse_sasl_bind_result;
+	ldap_parse_sort_control;
+	ldap_parse_virtuallist_control;
+	ldap_perror;
+	ldap_rename;
+	ldap_rename_s;
+	ldap_result;
+	ldap_result2error;
+	ldap_sasl_bind;
+	ldap_sasl_bind_s;
+	ldap_sasl_cram_md5_bind_s;
+	ldap_search;
+	ldap_search_ext;
+	ldap_search_ext_s;
+	ldap_search_s;
+	ldap_search_st;
+	ldap_setfilteraffixes;
+	ldap_set_option;
+	ldap_set_rebind_proc;
+	ldap_set_string_translators;
+	ldap_simple_bind;
+	ldap_simple_bind_s;
+	ldap_sort_entries;
+	ldap_sort_strcasecmp;
+	ldap_sort_values;
+	ldap_tmplattrs;
+	ldap_translate_from_t61;
+	ldap_translate_to_t61;
+	ldap_ufn_search_c;
+	ldap_ufn_search_ct;
+	ldap_ufn_search_s;
+	ldap_ufn_setfilter;
+	ldap_ufn_setprefix;
+	ldap_ufn_timeout;
+	ldap_unbind;
+	ldap_unbind_ext;
+	ldap_unbind_s;
+	ldap_url_parse;
+	ldap_url_search;
+	ldap_url_search_s;
+	ldap_url_search_st;
+	ldap_vals2html;
+	ldap_vals2text;
+	ldap_value_free;
+	ldap_value_free_len;
+	ldap_version;
+};
+
+SUNWprivate_1.1 {
+    global:
+	ldap_charray_add;
+	ldap_charray_dup;
+	ldap_charray_inlist;
+	ldap_charray_position;
+	ldap_create_filter;
+	ldap_create_page_control;
+	ldap_create_persistentsearch_control;
+	ldap_create_proxiedauth_control;
+	ldap_create_proxyauth_control;
+	ldap_get_lderrno;
+	ldap_get_reference_urls;
+	ldaplogconfigf;
+	ldap_multisort_entries;
+	ldap_parse_entrychange_control;
+	ldap_parse_page_control;
+	ldap_set_lderrno;
+	ldapssl_advclientauth_init;
+	ldapssl_clientauth_init;
+	ldapssl_client_init;
+	ldapssl_enable_clientauth;
+	ldapssl_err2string;
+	ldapssl_init;
+	ldapssl_install_gethostbyaddr;
+	ldapssl_install_routines;
+	ldapssl_pkcs_init;
+	ldapssl_set_strength;
+	ldap_str2charray;
+	ldap_x_sasl_digest_md5_bind;
+	ldap_x_sasl_digest_md5_bind_s;
+	ldif_base64_decode;
+	ldif_type_and_value;
+	ldif_type_and_value_with_options;
+	prldap_get_session_option;
+	prldap_set_session_option;
+	str_getline;
+	str_parse_line;
+    local:
+	*;
+};
diff --git a/usr/src/lib/liblgrp/Makefile b/usr/src/lib/liblgrp/Makefile
index 6cae9246b3..bb2e2dda77 100644
--- a/usr/src/lib/liblgrp/Makefile
+++ b/usr/src/lib/liblgrp/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -47,8 +46,7 @@ CHECKHDRS=      $(HDRS:%.h=%.check)
 
 .KEEP_STATE:
 
-all install clean clobber: spec .WAIT $(SUBDIRS)
-lint:	$(SUBDIRS)
+all install clean clobber lint: $(SUBDIRS)
 
 # install rule for install_h target
 
@@ -59,7 +57,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/liblgrp/Makefile.com b/usr/src/lib/liblgrp/Makefile.com
index 30cfb354ce..cdeb2e54a1 100644
--- a/usr/src/lib/liblgrp/Makefile.com
+++ b/usr/src/lib/liblgrp/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -35,10 +34,6 @@ OBJECTS=	lgrp.o
 include ../../Makefile.lib
 
 SRCDIR=		../common
-SRCS=		$(OBJECTS:%.o=$(SRCDIR)/%.c)
-
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
diff --git a/usr/src/lib/liblgrp/common/mapfile-vers b/usr/src/lib/liblgrp/common/mapfile-vers
new file mode 100644
index 0000000000..3c636d8a0d
--- /dev/null
+++ b/usr/src/lib/liblgrp/common/mapfile-vers
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+	lgrp_latency_cookie;
+	lgrp_resources;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	lgrp_affinity_get;
+	lgrp_affinity_set;
+	lgrp_children;
+	lgrp_cookie_stale;
+	lgrp_cpus;
+	lgrp_fini;
+	lgrp_home;
+	lgrp_init;
+	lgrp_latency;
+	lgrp_mem_size;
+	lgrp_nlgrps;
+	lgrp_parents;
+	lgrp_root;
+	lgrp_version;
+	lgrp_view;
+    local:
+	*;
+};
diff --git a/usr/src/lib/liblm/Makefile b/usr/src/lib/liblm/Makefile
index 44d897019b..e9b89465dd 100644
--- a/usr/src/lib/liblm/Makefile
+++ b/usr/src/lib/liblm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1994-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/liblm/Makefile
 
 include		../Makefile.lib
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -54,7 +53,7 @@ CP=	cp
 
 all clean clobber delete install lint package: $(SUBDIRS)
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/liblm/Makefile.com b/usr/src/lib/liblm/Makefile.com
index 9e76539683..22d8865d56 100644
--- a/usr/src/lib/liblm/Makefile.com
+++ b/usr/src/lib/liblm/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -25,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/liblm/Makefile.com
-#
 
 LIBRARY= liblm.a
 VERS= .1
@@ -36,15 +33,13 @@ OBJECTS= lm_shutdown.o
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS = $(DYNLIB)
 
 # definitions for lint
 
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc
 
 .KEEP_STATE:
@@ -53,11 +48,6 @@ all: $(LIBS) fnamecheck
 
 lint:	lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/liblm/amd64/Makefile b/usr/src/lib/liblm/amd64/Makefile
index 5cb0c917cc..3f238e6cae 100644
--- a/usr/src/lib/liblm/amd64/Makefile
+++ b/usr/src/lib/liblm/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/liblm/common/mapfile-vers b/usr/src/lib/liblm/common/mapfile-vers
new file mode 100644
index 0000000000..cca4ba33e8
--- /dev/null
+++ b/usr/src/lib/liblm/common/mapfile-vers
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	lm_shutdown;
+    local:
+	*;
+};
diff --git a/usr/src/lib/liblm/i386/Makefile b/usr/src/lib/liblm/i386/Makefile
index 30784fb409..50dd2a7dd7 100644
--- a/usr/src/lib/liblm/i386/Makefile
+++ b/usr/src/lib/liblm/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/liblm/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/liblm/sparc/Makefile b/usr/src/lib/liblm/sparc/Makefile
index b220e7d4c0..50dd2a7dd7 100644
--- a/usr/src/lib/liblm/sparc/Makefile
+++ b/usr/src/lib/liblm/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/liblm/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/liblm/sparcv9/Makefile b/usr/src/lib/liblm/sparcv9/Makefile
index 91b385077d..3f238e6cae 100644
--- a/usr/src/lib/liblm/sparcv9/Makefile
+++ b/usr/src/lib/liblm/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/liblm/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libmacadm/Makefile b/usr/src/lib/libmacadm/Makefile
index b96b65da6d..2858be8fdc 100644
--- a/usr/src/lib/libmacadm/Makefile
+++ b/usr/src/lib/libmacadm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include $(SRC)/lib/Makefile.lib
@@ -44,11 +43,7 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all install: spec .WAIT $(SUBDIRS)
-
-clean clobber: spec $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
@@ -58,7 +53,7 @@ $(POFILE):	pofile_MSGFILES
 
 _msg:		$(MSGDOMAINPOFILE)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libmacadm/Makefile.com b/usr/src/lib/libmacadm/Makefile.com
index 41d7daeaf6..a6fb192048 100644
--- a/usr/src/lib/libmacadm/Makefile.com
+++ b/usr/src/lib/libmacadm/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -23,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 LIBRARY = libmacadm.a
@@ -38,11 +37,9 @@ include ../../Makefile.rootfs
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 LDLIBS +=	-ldevinfo -lc
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR  =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR) -D_REENTRANT
diff --git a/usr/src/lib/libmacadm/common/mapfile-vers b/usr/src/lib/libmacadm/common/mapfile-vers
new file mode 100644
index 0000000000..1ae18a3193
--- /dev/null
+++ b/usr/src/lib/libmacadm/common/mapfile-vers
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	macadm_walk;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libmail/Makefile b/usr/src/lib/libmail/Makefile
index 477c986063..ae02621be1 100644
--- a/usr/src/lib/libmail/Makefile
+++ b/usr/src/lib/libmail/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,18 +19,17 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999, by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmail/Makefile
 
 include		../../Makefile.master
 include		../Makefile.lib
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
-LINTDIRS=	$(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -52,9 +50,7 @@ CP=	cp
 
 .KEEP_STATE:
 
-all clean clobber install package: $(SUBDIRS)
-
-lint: $(LINTDIRS)
+all clean clobber install lint package: $(SUBDIRS)
 
 # definitions for install_h target
 HDRS=		maillock.h libmail.h s_string.h
@@ -73,7 +69,7 @@ CHECKHDRS=	$(PUBHDRS:%.h=inc/%.check)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/libmail/Makefile.com b/usr/src/lib/libmail/Makefile.com
index ca0c7dfdc0..e8233c7616 100644
--- a/usr/src/lib/libmail/Makefile.com
+++ b/usr/src/lib/libmail/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -25,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmail/Makefile.com
-#
 
 LIBRARY= libmail.a
 VERS= .1
@@ -36,11 +33,11 @@ OBJECTS= 	abspath.o  casncmp.o   copystream.o delempty.o \
 		s_string.o  setup_exec.o strmove.o  skipspace.o \
 		substr.o   systemvp.o  trimnl.o     xgetenv.o
 
-# include library definitions
 include ../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
+
+MAPFILES +=	$(MAPFILE32)
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -50,7 +47,6 @@ LINTSRC=	$(LINTLIB:%.ln=%)
 
 CPPFLAGS =	-I../inc -I../../common/inc $(CPPFLAGS.master)
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc
 
 .KEEP_STATE:
@@ -59,12 +55,6 @@ all: $(LIBS) fnamecheck
 
 lint: lintcheck
 
-$(DYNLIB) $(DYNLIB64):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
-# include library targets
 include ../../Makefile.targ
 
 pics/%.o: ../common/%.c
diff --git a/usr/src/lib/libmail/amd64/Makefile b/usr/src/lib/libmail/amd64/Makefile
index 7a9b08d46c..f69d11f706 100644
--- a/usr/src/lib/libmail/amd64/Makefile
+++ b/usr/src/lib/libmail/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -26,7 +25,7 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
+MAPFILE32 =
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/libmail/common/mapfile-vers b/usr/src/lib/libmail/common/mapfile-vers
new file mode 100644
index 0000000000..d1dd7900e8
--- /dev/null
+++ b/usr/src/lib/libmail/common/mapfile-vers
@@ -0,0 +1,52 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	maillock;
+	mailunlock;
+	touchlock;
+};
+
+SUNWprivate_1.1 {
+    global:
+	casncmp;
+	copystream;
+	delempty;
+	maildomain;
+	pclosevp;
+	popenvp;
+	skipspace;
+	strmove;
+	substr;
+	trimnl;
+	Xgetenv;
+	xgetenv;
+	xsetenv;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libmail/common/mapfile32-vers b/usr/src/lib/libmail/common/mapfile32-vers
new file mode 100644
index 0000000000..945c49e43b
--- /dev/null
+++ b/usr/src/lib/libmail/common/mapfile32-vers
@@ -0,0 +1,47 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {	# only for 32-bit applications
+    global:
+	abspath;
+	notify;
+	s_append;
+	s_array;
+	s_copy;
+	setup_exec;
+	s_free;
+	s_grow;
+	s_new;
+	s_parse;
+	s_read_line;
+	s_read_to_eof;
+	s_seq_read;
+	s_skipwhite;
+	s_tok;
+	s_tolower;
+	systemvp;
+};
diff --git a/usr/src/lib/libmail/i386/Makefile b/usr/src/lib/libmail/i386/Makefile
index 1f54277775..a579a6b1b6 100644
--- a/usr/src/lib/libmail/i386/Makefile
+++ b/usr/src/lib/libmail/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -25,9 +24,8 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmail/i386/Makefile
 
-MAPDIR=	../spec/i386
+MAPFILE32 = ../common/mapfile32-vers
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libmail/sparc/Makefile b/usr/src/lib/libmail/sparc/Makefile
index 5aad3e64df..a579a6b1b6 100644
--- a/usr/src/lib/libmail/sparc/Makefile
+++ b/usr/src/lib/libmail/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -23,11 +22,10 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmail/sparc/Makefile
 
-MAPDIR=	../spec/sparc
+MAPFILE32 = ../common/mapfile32-vers
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libmail/sparcv9/Makefile b/usr/src/lib/libmail/sparcv9/Makefile
index fd82d2bc2a..f69d11f706 100644
--- a/usr/src/lib/libmail/sparcv9/Makefile
+++ b/usr/src/lib/libmail/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -23,11 +22,10 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmail/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
+MAPFILE32 =
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/libmalloc/Makefile b/usr/src/lib/libmalloc/Makefile
index ea938cf4ea..7087b8cdde 100644
--- a/usr/src/lib/libmalloc/Makefile
+++ b/usr/src/lib/libmalloc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1989,1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libmalloc/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include		../Makefile.lib
 
-SUBDIRS=        spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=          TARGET= all
 clean :=        TARGET= clean
@@ -69,7 +67,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec:      FRC
+$(SUBDIRS):      FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
@@ -90,4 +88,3 @@ $(MSGDOMAIN):
 	$(INS.dir)
 
 FRC:
-
diff --git a/usr/src/lib/libmalloc/Makefile.com b/usr/src/lib/libmalloc/Makefile.com
index d969e8ac80..4380a1d20b 100644
--- a/usr/src/lib/libmalloc/Makefile.com
+++ b/usr/src/lib/libmalloc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmalloc/Makefile.com
-#
 
 LIBRARY=	libmalloc.a
 VERS=		.1
@@ -36,8 +33,7 @@ OBJECTS= 	malloc.o
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -47,18 +43,13 @@ LINTFLAGS64 +=	-erroff=E_BAD_PTR_CAST_ALIGN
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT
-DYNFLAGS +=	-M$(MAPFILE) $(ZINTERPOSE)
+DYNFLAGS +=	$(ZINTERPOSE)
 LDLIBS +=	-lc
 
 .KEEP_STATE:
 
 lint: lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/libmalloc/amd64/Makefile b/usr/src/lib/libmalloc/amd64/Makefile
index 0130b72d08..d50a21bdb0 100644
--- a/usr/src/lib/libmalloc/amd64/Makefile
+++ b/usr/src/lib/libmalloc/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libmalloc/common/mapfile-vers b/usr/src/lib/libmalloc/common/mapfile-vers
new file mode 100644
index 0000000000..b5df955077
--- /dev/null
+++ b/usr/src/lib/libmalloc/common/mapfile-vers
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1.1 {
+    global:
+	memalign = NODIRECT;
+	valloc = NODIRECT;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	calloc = NODIRECT;
+	cfree = NODIRECT;
+	_cfree = NODIRECT;
+	free = NODIRECT;
+	mallinfo = NODIRECT;
+	_mallinfo = NODIRECT;
+	malloc = NODIRECT;
+	mallopt = NODIRECT;
+	_mallopt = NODIRECT;
+	realloc = NODIRECT;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_memalign = NODIRECT;
+	_valloc = NODIRECT;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libmalloc/i386/Makefile b/usr/src/lib/libmalloc/i386/Makefile
index db004a3b26..87b5005f59 100644
--- a/usr/src/lib/libmalloc/i386/Makefile
+++ b/usr/src/lib/libmalloc/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmalloc/i386/Makefile
-#
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libmalloc/sparc/Makefile b/usr/src/lib/libmalloc/sparc/Makefile
index c8c56e1eba..87b5005f59 100644
--- a/usr/src/lib/libmalloc/sparc/Makefile
+++ b/usr/src/lib/libmalloc/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmalloc/sparc/Makefile
-#
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libmalloc/sparcv9/Makefile b/usr/src/lib/libmalloc/sparcv9/Makefile
index a399a598f0..d50a21bdb0 100644
--- a/usr/src/lib/libmalloc/sparcv9/Makefile
+++ b/usr/src/lib/libmalloc/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libmalloc/sparcv9/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libmapid/Makefile b/usr/src/lib/libmapid/Makefile
index 290ad0391f..77403556e8 100644
--- a/usr/src/lib/libmapid/Makefile
+++ b/usr/src/lib/libmapid/Makefile
@@ -19,8 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.
-# All rights reserved.  Use is subject to license terms.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
@@ -40,15 +40,13 @@ lint	:= TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber lint install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber lint install lint: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libmapid/Makefile.com b/usr/src/lib/libmapid/Makefile.com
index a84f6962a4..1945db1e85 100644
--- a/usr/src/lib/libmapid/Makefile.com
+++ b/usr/src/lib/libmapid/Makefile.com
@@ -19,8 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2006 Sun Microsystems, Inc.
-# All rights reserved.  Use is subject to license terms.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
@@ -51,9 +51,6 @@ $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 LDLIBS	+=	-lresolv -lcmd -lc
 
-MAPDIR	=	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 CFLAGS	+=	$(CCVERBOSE)
 CPPFLAGS+=	-I$(SRCDIR) -D_REENTRANT
 
diff --git a/usr/src/lib/libmapid/common/mapfile-vers b/usr/src/lib/libmapid/common/mapfile-vers
new file mode 100644
index 0000000000..e8c9cf9e8c
--- /dev/null
+++ b/usr/src/lib/libmapid/common/mapfile-vers
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	mapid_derive_domain;
+	mapid_get_domain;
+	mapid_reeval_domain;
+	mapid_stdchk_domain;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libmapmalloc/Makefile b/usr/src/lib/libmapmalloc/Makefile
index 393a0b81bc..9adf3c57ee 100644
--- a/usr/src/lib/libmapmalloc/Makefile
+++ b/usr/src/lib/libmapmalloc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,18 +19,17 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1989,1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libmapmalloc/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include         ../../Makefile.master
 include		../Makefile.lib
 
-SUBDIRS=        spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =        $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=          TARGET= all
 clean :=        TARGET= clean
@@ -42,8 +40,6 @@ lint :=         TARGET= lint
 _msg :=		TARGET= _msg
 package :=      TARGET= package
 
-_msg :=         TARGET= _msg
-
 LIBRARY= 	libmapmalloc.a
 TEXT_DOMAIN=	SUNW_OST_OSLIB
 XGETFLAGS=	-a
@@ -72,7 +68,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec:      FRC
+$(SUBDIRS):      FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/libmapmalloc/Makefile.com b/usr/src/lib/libmapmalloc/Makefile.com
index a7e8467914..a25eceaf54 100644
--- a/usr/src/lib/libmapmalloc/Makefile.com
+++ b/usr/src/lib/libmapmalloc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmapmalloc/Makefile.com
-#
 
 LIBRARY=	libmapmalloc.a
 VERS=		.1
@@ -41,8 +38,7 @@ OBJECTS=  \
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -50,18 +46,13 @@ LINTSRC=	$(LINTLIB:%.ln=%)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT
-DYNFLAGS +=	-M$(MAPFILE) $(ZINTERPOSE)
+DYNFLAGS +=	$(ZINTERPOSE)
 LDLIBS +=	-lc
 
 .KEEP_STATE:
 
 lint: lintcheck
 
-$(DYNLIB):      $(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/libmapmalloc/amd64/Makefile b/usr/src/lib/libmapmalloc/amd64/Makefile
index 5f23f3b9a7..70e24a9a5d 100644
--- a/usr/src/lib/libmapmalloc/amd64/Makefile
+++ b/usr/src/lib/libmapmalloc/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libmapmalloc/common/mapfile-vers b/usr/src/lib/libmapmalloc/common/mapfile-vers
new file mode 100644
index 0000000000..96815ef28d
--- /dev/null
+++ b/usr/src/lib/libmapmalloc/common/mapfile-vers
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	calloc = NODIRECT;
+	cfree = NODIRECT;
+	free = NODIRECT;
+	mallinfo = NODIRECT;
+	malloc = NODIRECT;
+	mallopt = NODIRECT;
+	memalign = NODIRECT;
+	realloc = NODIRECT;
+	valloc = NODIRECT;
+};
+
+SUNWprivate_1.1 {
+    global:
+	__mallinfo = NODIRECT;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libmapmalloc/i386/Makefile b/usr/src/lib/libmapmalloc/i386/Makefile
index d2ad6e3445..2a944b0b43 100644
--- a/usr/src/lib/libmapmalloc/i386/Makefile
+++ b/usr/src/lib/libmapmalloc/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmapmalloc/i386/Makefile
-#
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libmapmalloc/sparc/Makefile b/usr/src/lib/libmapmalloc/sparc/Makefile
index 7f5240bb86..2a944b0b43 100644
--- a/usr/src/lib/libmapmalloc/sparc/Makefile
+++ b/usr/src/lib/libmapmalloc/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmapmalloc/sparc/Makefile
-#
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libmapmalloc/sparcv9/Makefile b/usr/src/lib/libmapmalloc/sparcv9/Makefile
index eb031f8aa6..70e24a9a5d 100644
--- a/usr/src/lib/libmapmalloc/sparcv9/Makefile
+++ b/usr/src/lib/libmapmalloc/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmapmalolloc/sparcv9/Makefile
-#
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/libmd/Makefile b/usr/src/lib/libmd/Makefile
index 8d883853e6..16ca733489 100644
--- a/usr/src/lib/libmd/Makefile
+++ b/usr/src/lib/libmd/Makefile
@@ -19,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/libmd/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
@@ -45,19 +43,15 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-.PARALLEL: $(MACH) $(MACH64) $(PLATFORMS)
-
-all install: spec .WAIT $(SUBDIRS)
-
-clean clobber: $(SUBDIRS)
+.PARALLEL: $(SUBDIRS)
 
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
 check:		$(CHECKHDRS)
 
-spec $(MACH) $(MACH64) $(PLATFORMS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 FRC:
 
diff --git a/usr/src/lib/libmd/Makefile.com b/usr/src/lib/libmd/Makefile.com
index d872a0c83e..a32420fa42 100644
--- a/usr/src/lib/libmd/Makefile.com
+++ b/usr/src/lib/libmd/Makefile.com
@@ -24,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmd/Makefile.com
-#
 
 # $LIBRARY is set in lower makefiles so we can have platform and
 # processor optimised versions of this library via libmd_psr and libmd_hwcapN
@@ -54,8 +52,6 @@ LDLIBS +=	-lc
 
 SRCDIR =	../common
 COMDIR =	$(SRC)/common/crypto
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
 
 CFLAGS += $(CCVERBOSE) $(C_BIGPICFLAGS)
 CFLAGS64 += $(C_BIGPICFLAGS)
diff --git a/usr/src/lib/libmd/common/mapfile-vers b/usr/src/lib/libmd/common/mapfile-vers
new file mode 100644
index 0000000000..909d089c46
--- /dev/null
+++ b/usr/src/lib/libmd/common/mapfile-vers
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	MD4Final;
+	MD4Init;
+	MD4Update;
+	md5_calc;
+	MD5Final;
+	MD5Init;
+	MD5Update;
+	SHA1Final;
+	SHA1Init;
+	SHA1Update;
+	SHA256Final;
+	SHA256Init;
+	SHA256Update;
+	SHA2Final;
+	SHA2Init;
+	SHA2Update;
+	SHA384Final;
+	SHA384Init;
+	SHA384Update;
+	SHA512Final;
+	SHA512Init;
+	SHA512Update;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libmd/sun4u/sparc/Makefile b/usr/src/lib/libmd/sun4u/sparc/Makefile
index cac5b1d58d..426b732d4e 100644
--- a/usr/src/lib/libmd/sun4u/sparc/Makefile
+++ b/usr/src/lib/libmd/sun4u/sparc/Makefile
@@ -23,6 +23,7 @@
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 CLASS		= 32
 PLATFORM	= sun4u
@@ -34,9 +35,7 @@ include	../Makefile.com
 # set of algortithm optimisations and thus different source and object files.
 OBJECTS		= md5.o sha1.o sha1_asm.o
 
-SPECMAPFILE=
-MAPFILE=	mapfile
-DYNFLAGS +=	-M$(MAPFILE)
+MAPFILES =	mapfile
 
 ASFLAGS	+=	-xarch=v8plusa -warn
 
@@ -45,8 +44,6 @@ ASFLAGS	+=	-xarch=v8plusa -warn
  
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILE)
-
 .KEEP_STATE:
 
 all:		$(LIBS)
diff --git a/usr/src/lib/libmd/sun4u/sparcv9/Makefile b/usr/src/lib/libmd/sun4u/sparcv9/Makefile
index aca34d4c3c..d553a99f5b 100644
--- a/usr/src/lib/libmd/sun4u/sparcv9/Makefile
+++ b/usr/src/lib/libmd/sun4u/sparcv9/Makefile
@@ -23,6 +23,7 @@
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 CLASS		= 64
 PLATFORM	= sun4u
@@ -35,9 +36,7 @@ include $(SRC)/lib/Makefile.lib.64
 # set of algortithm optimisations and thus different source and object files.
 OBJECTS		= md5.o sha1.o sha1_asm.o
 
-SPECMAPFILE=
-MAPFILE=	mapfile
-DYNFLAGS +=	-M$(MAPFILE)
+MAPFILES =	mapfile
 
 ASDEFS +=	-D__sparcv9
 ASFLAGS	+=	-xarch=v9a $(AS_BIGPICFLAGS)
@@ -47,8 +46,6 @@ ASFLAGS	+=	-xarch=v9a $(AS_BIGPICFLAGS)
  
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILE)
-
 .KEEP_STATE:
 
 all:		$(LIBS)
diff --git a/usr/src/lib/libmd/sun4v/sparc/Makefile b/usr/src/lib/libmd/sun4v/sparc/Makefile
index 2633839ee3..2ae6feae21 100644
--- a/usr/src/lib/libmd/sun4v/sparc/Makefile
+++ b/usr/src/lib/libmd/sun4v/sparc/Makefile
@@ -23,6 +23,7 @@
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 CLASS		= 32
 PLATFORM	= sun4v
@@ -34,9 +35,7 @@ include ../Makefile.com
 # set of algortithm optimisations and thus different source and object files.
 OBJECTS		= md5.o
 
-SPECMAPFILE=
-MAPFILE=	mapfile
-DYNFLAGS +=	-M$(MAPFILE)
+MAPFILES =	mapfile
 
 ASFLAGS	+=	-xarch=v8plusa -warn
 
@@ -45,8 +44,6 @@ ASFLAGS	+=	-xarch=v8plusa -warn
  
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILE)
-
 .KEEP_STATE:
 
 all:		$(LIBS)
diff --git a/usr/src/lib/libmd/sun4v/sparcv9/Makefile b/usr/src/lib/libmd/sun4v/sparcv9/Makefile
index ac4ff682d3..4596401691 100644
--- a/usr/src/lib/libmd/sun4v/sparcv9/Makefile
+++ b/usr/src/lib/libmd/sun4v/sparcv9/Makefile
@@ -23,6 +23,7 @@
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 CLASS		= 64
 PLATFORM	= sun4v
@@ -35,9 +36,7 @@ include $(SRC)/lib/Makefile.lib.64
 # set of algortithm optimisations and thus different source and object files.
 OBJECTS		= md5.o
 
-SPECMAPFILE=
-MAPFILE=	mapfile
-DYNFLAGS +=	-M$(MAPFILE)
+MAPFILES =	mapfile
 
 ASDEFS +=	-D__sparcv9
 ASFLAGS	+=	-xarch=v9a $(AS_PICFLAGS)
@@ -47,8 +46,6 @@ ASFLAGS	+=	-xarch=v9a $(AS_PICFLAGS)
  
 BUILD.SO=	$(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(LDLIBS)
 
-$(DYNLIB):	$(MAPFILE)
-
 .KEEP_STATE:
 
 all:		$(LIBS)
diff --git a/usr/src/lib/libmd5/Makefile b/usr/src/lib/libmd5/Makefile
index 973a0bc83b..71408594af 100644
--- a/usr/src/lib/libmd5/Makefile
+++ b/usr/src/lib/libmd5/Makefile
@@ -18,13 +18,12 @@
 #
 # CDDL HEADER END
 #
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmd5/Makefile
 
 include $(SRC)/Makefile.master
 
@@ -35,12 +34,13 @@ all :=		TARGET= all
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
 install :=	TARGET= install
+lint :=		TARGET= lint
 
 .KEEP_STATE:
 
 .PARALLEL: $(MACH) $(MACH64)
 
-all clean clobber install: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 $(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
diff --git a/usr/src/lib/libmd5/Makefile.com b/usr/src/lib/libmd5/Makefile.com
index 1ef3db8a31..c07efd95b6 100644
--- a/usr/src/lib/libmd5/Makefile.com
+++ b/usr/src/lib/libmd5/Makefile.com
@@ -24,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmd5/Makefile.com
-#
 
 LIBRARY= libmd5.a
 VERS= .1
@@ -33,16 +31,14 @@ VERS= .1
 include ../../Makefile.lib
 include ../../Makefile.rootfs
 
-MAPFILES=       $(SRCDIR)/mapfile-vers $(MAPFILE-FLTR)
-MAPOPTS=        $(MAPFILES:%=-M %)
-
-DYNFLAGS +=     -F libmd.so.1 $(MAPOPTS)
+DYNFLAGS +=     -F libmd.so.1
 
 LIBS =          $(DYNLIB) $(LINTLIB)
 
 SRCDIR =        ../common
 $(LINTLIB) :=   SRCS = $(SRCDIR)/llib-lmd5
 
+MAPFILES +=	$(MAPFILE-FLTR)
 
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
 # and .fini sections being added).  Also, since there are no OBJECTS, turn
@@ -55,6 +51,6 @@ CTFMERGE_LIB=   :
 
 all: $(LIBS)
 
-include ../../Makefile.targ
+lint:
 
-$(DYNLIB):      $(MAPFILES)
+include ../../Makefile.targ
diff --git a/usr/src/lib/libmd5/i386/Makefile b/usr/src/lib/libmd5/i386/Makefile
index 2bb20f4cd2..a333224278 100644
--- a/usr/src/lib/libmd5/i386/Makefile
+++ b/usr/src/lib/libmd5/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/libmd5/i386/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/i386
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libmp/Makefile b/usr/src/lib/libmp/Makefile
index 69a5be60f7..f4e1d98996 100644
--- a/usr/src/lib/libmp/Makefile
+++ b/usr/src/lib/libmp/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmp/Makefile
-#
-# The builds occur in isa subdirectories.
-#
 
 include ../../Makefile.master
 include	../Makefile.lib
@@ -38,19 +33,17 @@ $(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
 all :=		TARGET= all
-install :=	TARGET= install
 clean :=	TARGET= clean
 clobber :=	TARGET= clobber
+install :=	TARGET= install
 lint :=		TARGET= lint
 test :=		TARGET= test
 
 .KEEP_STATE:
 
-all install clean clobber test: spec .WAIT $(SUBDIRS)
-
-lint:	$(SUBDIRS)
+all clean clobber install lint test: $(SUBDIRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libmp/Makefile.com b/usr/src/lib/libmp/Makefile.com
index c695f1a910..e2123569a9 100644
--- a/usr/src/lib/libmp/Makefile.com
+++ b/usr/src/lib/libmp/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmp/Makefile.com
-#
-# (libmp.so.1 is built from selected platform-specific makefiles)
-#
 
 LIBRARY=	libmp.a
 VERS=		.2
@@ -41,28 +36,19 @@ include ../../Makefile.lib
 # install this library in the root filesystem
 include ../../Makefile.rootfs
 
-MAPFILE=	$(MAPDIR)/mapfile
-OMAPFILE=	$(MAPDIR)/mapfile_1
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
+
+OMAPFILE =	../common/mapfile_1-vers
 
 LIBS =		$(DYNLIB)
 
 CFLAGS	+=	$(CCVERBOSE)
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc
 
 .KEEP_STATE:
 
 lint: lintcheck
 
-$(DYNLIB): 	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
-$(OMAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile_1
-
 #
 # Include library targets
 #
diff --git a/usr/src/lib/libmp/amd64/Makefile b/usr/src/lib/libmp/amd64/Makefile
index 8dc2052bf5..fc9ec9e40a 100644
--- a/usr/src/lib/libmp/amd64/Makefile
+++ b/usr/src/lib/libmp/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libmp/common/mapfile-vers b/usr/src/lib/libmp/common/mapfile-vers
new file mode 100644
index 0000000000..8b075b3f54
--- /dev/null
+++ b/usr/src/lib/libmp/common/mapfile-vers
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	mp_gcd;
+	mp_itom;
+	mp_madd;
+	mp_mcmp;
+	mp_mdiv;
+	mp_mfree;
+	mp_min;
+	mp_mout;
+	mp_msqrt;
+	mp_msub;
+	mp_mtox;
+	mp_mult;
+	mp_pow;
+	mp_rpow;
+	mp_sdiv;
+	mp_xtom;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_mp_move;
+	_mp_xalloc;
+	_mp_xfree;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libmp/common/mapfile_1-vers b/usr/src/lib/libmp/common/mapfile_1-vers
new file mode 100644
index 0000000000..399df9f10b
--- /dev/null
+++ b/usr/src/lib/libmp/common/mapfile_1-vers
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	gcd;
+	itom;
+	madd;
+	mcmp;
+	mdiv;
+	mfree;
+	min;
+	mout;
+	msqrt;
+	msub;
+	mtox;
+	mult;
+	pow;
+	rpow;
+	sdiv;
+	xtom;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_lib_version;
+	xalloc;
+	xfree;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libmp/i386/Makefile b/usr/src/lib/libmp/i386/Makefile
index 1571b1c7a4..5e129bfd7f 100644
--- a/usr/src/lib/libmp/i386/Makefile
+++ b/usr/src/lib/libmp/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -28,8 +27,6 @@
 
 OLIBRARY =	libmp.so.1
 
-MAPDIR=	../spec/i386
-
 include ../Makefile.com
 
 # For libmp.so.1
diff --git a/usr/src/lib/libmp/sparc/Makefile b/usr/src/lib/libmp/sparc/Makefile
index 19d8034e84..c69ce25350 100644
--- a/usr/src/lib/libmp/sparc/Makefile
+++ b/usr/src/lib/libmp/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -28,8 +27,6 @@
 
 OLIBRARY =	libmp.so.1
 
-MAPDIR=	../spec/sparc
-
 include ../Makefile.com
 
 # For libmp.so.1
diff --git a/usr/src/lib/libmp/sparcv9/Makefile b/usr/src/lib/libmp/sparcv9/Makefile
index 06de8a5c8b..fc9ec9e40a 100644
--- a/usr/src/lib/libmp/sparcv9/Makefile
+++ b/usr/src/lib/libmp/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmp/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/libmtmalloc/Makefile b/usr/src/lib/libmtmalloc/Makefile
index ea5a0f4fc4..aa5cccd34b 100644
--- a/usr/src/lib/libmtmalloc/Makefile
+++ b/usr/src/lib/libmtmalloc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmtmalloc/Makefile
 
 include ../Makefile.lib
 
@@ -41,7 +39,7 @@ $(ROOTHDRS) :=  FILEMODE= 644
 $(ROOTHDRDIR)/%: common/%
 	$(INS.file)
 
-SUBDIRS=	spec .WAIT $(MACH)
+SUBDIRS=	$(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
diff --git a/usr/src/lib/libmtmalloc/Makefile.com b/usr/src/lib/libmtmalloc/Makefile.com
index b7ee0a7d61..ee55f6c0cb 100644
--- a/usr/src/lib/libmtmalloc/Makefile.com
+++ b/usr/src/lib/libmtmalloc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,16 +33,15 @@ OBJECTS = mtmalloc.o
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS = ../common/mtmalloc.c
-
-LINTSRC=        $(LINTLIB:%.ln=%)
+SRCDIR =	../common
+SRCS =		../common/mtmalloc.c
+LINTSRC =        $(LINTLIB:%.ln=%)
 
 LIBS 		 = $(DYNLIB) $(LINTLIB)
 LDLIBS 		+= -lc
 CFLAGS 		+= $(CCVERBOSE) $(C_PICFLAGS)
 CPPFLAGS	+= -I../common -D_REENTRANT
-DYNFLAGS 	+= $(ZNODLOPEN) -M$(MAPFILE) $(ZINTERPOSE)
+DYNFLAGS 	+= $(ZNODLOPEN) $(ZINTERPOSE)
 
 .KEEP_STATE:
 
@@ -51,11 +49,6 @@ all: $(LIBS)
 
 lint:	lintcheck
 
-$(DYNLIB): $(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/libmtmalloc/amd64/Makefile b/usr/src/lib/libmtmalloc/amd64/Makefile
index 125e863932..2e8cdecf75 100644
--- a/usr/src/lib/libmtmalloc/amd64/Makefile
+++ b/usr/src/lib/libmtmalloc/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libmtmalloc/common/mapfile-vers b/usr/src/lib/libmtmalloc/common/mapfile-vers
new file mode 100644
index 0000000000..08e242cfd7
--- /dev/null
+++ b/usr/src/lib/libmtmalloc/common/mapfile-vers
@@ -0,0 +1,48 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1.1 {
+    global:
+	calloc = NODIRECT;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	free = NODIRECT;
+	malloc = NODIRECT;
+	mallocctl = NODIRECT;
+	memalign = NODIRECT;
+	realloc = NODIRECT;
+	valloc = NODIRECT;
+};
+
+SUNWprivate_1.1 {
+    global:
+	SUNWprivate_1.1;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libmtmalloc/i386/Makefile b/usr/src/lib/libmtmalloc/i386/Makefile
index 879604a649..35ac6d4219 100644
--- a/usr/src/lib/libmtmalloc/i386/Makefile
+++ b/usr/src/lib/libmtmalloc/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmtmalloc/i386/Makefile
-#
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/libmtmalloc/sparc/Makefile b/usr/src/lib/libmtmalloc/sparc/Makefile
index 926dd12ba2..35ac6d4219 100644
--- a/usr/src/lib/libmtmalloc/sparc/Makefile
+++ b/usr/src/lib/libmtmalloc/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmtmalloc/sparc/Makefile
-#
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
diff --git a/usr/src/lib/libmtmalloc/sparcv9/Makefile b/usr/src/lib/libmtmalloc/sparcv9/Makefile
index 063c1f455b..2e8cdecf75 100644
--- a/usr/src/lib/libmtmalloc/sparcv9/Makefile
+++ b/usr/src/lib/libmtmalloc/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmtmalloc/sparcv9/Makefile
-#
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libnisdb/Makefile b/usr/src/lib/libnisdb/Makefile
index 79c159b2fa..74e0ebbcef 100644
--- a/usr/src/lib/libnisdb/Makefile
+++ b/usr/src/lib/libnisdb/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libnisdb/Makefile
-#
 
 LIBRARY= libnisdb.a
 VERS=	.2
@@ -93,9 +90,7 @@ CLEANFILES += $(DERIVED_FILES)
 # include library definitions
 include ../Makefile.lib
 
-MAPDIR=		./spec/$(MACH)
-MAPFILE=	$(MAPDIR)/mapfile
-CLOBBERFILES +=	$(MAPFILE)
+MAPFILES =	mapfile-vers
 
 SRCS= db_dictionary_c_xdr.c db_dictlog_c_xdr.c db_dictxdr.c \
 db_entry_c_xdr.c db_index_c_xdr.c db_index_entry_c_xdr.c db_item_c_xdr.c \
@@ -145,8 +140,6 @@ CPPFLAGS +=	-D_REENTRANT
 # Extra includes, from yp, for yptol files.
 CPPFLAGS += -I$(SRC)/cmd/ypcmd
 
-DYNFLAGS +=	-M$(MAPFILE)
-
 LIBS = $(DYNLIB)
 ZDEFS=
 LDLIBS += -lnsl -lldap -lcmd -lc
@@ -159,17 +152,12 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all:	spec .WAIT $(DERIVED_FILES) $(LIBS)
+all:	$(DERIVED_FILES) $(LIBS)
 
 install: all $(ROOTLIBS) $(ROOTLINKS)
 
 lint: $(DERIVED_FILES) .WAIT lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 pics/%.o: %.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
@@ -206,13 +194,5 @@ $(DB_TABLE)_xdr.c:	$(DB_TABLE).x
 	$(RPCGEN) -DUSINGC -c $(DB_TABLE).x |\
 	$(SED) -e 's/^xdr_db_free_entry(/__OBSOLETED_xdr_db_free_entry(/' > $@
 
-clean clobber: spec
-
-spec:	FRC
-	@cd $@;pwd; $(MAKE) $(TARGET)
-
-
 # include library targets
 include ../Makefile.targ
-
-FRC:
diff --git a/usr/src/lib/libnisdb/mapfile-vers b/usr/src/lib/libnisdb/mapfile-vers
new file mode 100644
index 0000000000..9b7151a4e3
--- /dev/null
+++ b/usr/src/lib/libnisdb/mapfile-vers
@@ -0,0 +1,184 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_2.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_2.1 {
+    global:
+	SUNW_2.1;
+};
+
+SUNWprivate_2.1 {
+    global:
+	abort_transaction;
+	addUpdate;
+	assertExclusive;
+	beginTransaction;
+	bp2buf;
+	cons;
+	createQuery;
+	db_abort_merge_dict;
+	db_add_entry;
+	__db_add_entry_nolog;
+	__db_add_entry_nosync;
+	__db_allowLDAP;
+	db_begin_merge_dict;
+	db_checkpoint;
+	__db_commit;
+	__db_configure;
+	db_copy_file;
+	dbCreateFromLDAP;
+	db_create_table;
+	__db_defer;
+	db_destroy_table;
+	__db_disallowLDAP;
+	db_end_merge_dict;
+	db_extract_dict_entries;
+	db_first_entry;
+	db_in_dict_file;
+	db_initialize;
+	db_list_entries;
+	__db_list_entries;
+	db_massage_dict;
+	db_next_entry;
+	db_perror;
+	db_remove_entry;
+	__db_remove_entry_nosync;
+	db_reset_next_entry;
+	__db_rollback;
+	db_standby;
+	db_sync_log;
+	db_table_exists;
+	db_unload_table;
+	deleteLDAPobj;
+	delete_map;
+	dump_dit_to_maps;
+	dump_maps_to_dit;
+	endTransaction;
+	free_entry;
+	freeEntryObjArray;
+	freeObjAttr;
+	freeQuery;
+	freeRuleValue;
+	fullObjName;
+	get_list_max;
+	get_map_name;
+	getObjMapping;
+	get_root_object;
+	hash;
+	init_lock_map;
+	init_lock_system;
+	init_yptol_flag;
+	internalTableName;
+	internal_table_name;
+	justTesting;
+	ldapConfig;
+	ldapDBTableMapping;
+	ldapMappingList;
+	loadAllLDAP;
+	lock_core;
+	lock_map;
+	lockTransLog;
+	logmsg;
+	__make_legal;
+	mapFromLDAP;
+	mapToLDAP;
+	mflag;
+	__nisdb_get_tsd;
+	__nisdb_lock_report;
+	__nisdb_rlock;
+	__nisdb_rulock;
+	__nisdb_wlock;
+	__nisdb_wlock_trylock;
+	__nisdb_wulock;
+	__nis_find_item_mt;
+	__nis_init_hash_table;
+	__nis_insert_item_mt;
+	__nis_insert_name_mt;
+	nis_isserving;
+	__nis_item_access;
+	__nis_lock_db_table;
+	__nis_lock_hash_table;
+	__nis_pop_item_mt;
+	__nis_release_item;
+	__nis_remove_item_mt;
+	__nis_retry_sleep;
+	__nis_scan_table_mt;
+	nis_server_control;
+	__nis_ulock_db_table;
+	__nis_ulock_hash_table;
+	nogecos;
+	nopw;
+	noshell;
+	numMisaligned;
+	objFromLDAP;
+	objToLDAP;
+	p2buf;
+	parseConfig;
+	printbuf;
+	printObjAttr;
+	printQuery;
+	printTableMapping;
+	relative_name;
+	remove_root_object;
+	rename_map;
+	sc2buf;
+	setColumnsDuringConfig;
+	sfree;
+	shim_changepasswd;
+	shim_dbm_close;
+	shim_dbm_delete;
+	shim_dbm_do_nextkey;
+	shim_dbm_fetch;
+	shim_dbm_fetch_noupdate;
+	shim_dbm_firstkey;
+	shim_dbm_nextkey;
+	shim_dbm_open;
+	shim_dbm_store;
+	shim_exit;
+	single;
+	socket;
+	tbl_prototype;
+	unlock_core;
+	unlock_map;
+	unlockTransLog;
+	update_root_object;
+	validloginshell;
+	validstr;
+	verbose;
+	xdr_nis_fetus_object;
+	xdr_nis_name_abbrev;
+	ypcheck_domain_yptol;
+	ypcheck_map_existence_yptol;
+	ypmkfilename;
+	yptol_mode;
+	yptol_newlock;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libnls/Makefile b/usr/src/lib/libnls/Makefile
index 90b52272da..612a27d6d5 100644
--- a/usr/src/lib/libnls/Makefile
+++ b/usr/src/lib/libnls/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997, by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libnls/Makefile
 
 include		../../Makefile.master
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -62,7 +61,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 	
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/libnls/Makefile.com b/usr/src/lib/libnls/Makefile.com
index 2ca52e72c2..e19d456bb1 100644
--- a/usr/src/lib/libnls/Makefile.com
+++ b/usr/src/lib/libnls/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libnls/Makefile.com
-#
 
 LIBRARY= libnls.a
 VERS= .1
@@ -36,26 +33,19 @@ OBJECTS= nlsdata.o nlsenv.o nlsrequest.o
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 LINTSRC=	$(LINTLIB:%.ln=%)
 
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lnsl -lc
 
 .KEEP_STATE:
 
 lint: lintcheck
 
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
-$(DYNLIB):	$(MAPFILE)
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/libnls/amd64/Makefile b/usr/src/lib/libnls/amd64/Makefile
index 29ebb8f58b..e24ef38245 100644
--- a/usr/src/lib/libnls/amd64/Makefile
+++ b/usr/src/lib/libnls/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libnls/common/mapfile-vers b/usr/src/lib/libnls/common/mapfile-vers
new file mode 100644
index 0000000000..32ff350c5e
--- /dev/null
+++ b/usr/src/lib/libnls/common/mapfile-vers
@@ -0,0 +1,45 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	nlsgetcall;
+	nlsprovider;
+	nlsrequest;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_lib_version;
+	nlsc2addr;
+	_nlscall;
+	nlsenv;
+	_nlslog;
+	_nlsrmsg;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libnls/i386/Makefile b/usr/src/lib/libnls/i386/Makefile
index 6e3d767267..2a944b0b43 100644
--- a/usr/src/lib/libnls/i386/Makefile
+++ b/usr/src/lib/libnls/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libnls/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libnls/sparc/Makefile b/usr/src/lib/libnls/sparc/Makefile
index 2064733355..2a944b0b43 100644
--- a/usr/src/lib/libnls/sparc/Makefile
+++ b/usr/src/lib/libnls/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libnls/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libnls/sparcv9/Makefile b/usr/src/lib/libnls/sparcv9/Makefile
index 191668cd5c..e24ef38245 100644
--- a/usr/src/lib/libnls/sparcv9/Makefile
+++ b/usr/src/lib/libnls/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1998-2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libnls/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/libnsl/Makefile b/usr/src/lib/libnsl/Makefile
index 04728bf54a..1d45ffb18a 100644
--- a/usr/src/lib/libnsl/Makefile
+++ b/usr/src/lib/libnsl/Makefile
@@ -17,8 +17,6 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
-
-
 #
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
@@ -26,13 +24,13 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libnsl/Makefile
-#
+
 PROTOCOL_DIR= $(ROOTHDRDIR)/rpcsvc
 PROTOCOL_SRCDIR= $(SRC)/head/rpcsvc
 PROTOCOL_UTS_SRCDIR= $(SRC)/uts/common/rpc
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) .WAIT $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # objects are listed by source directory
 
@@ -98,7 +96,7 @@ all:		$(PROTOCOL_DIR) $(DERIVED_FILES) .WAIT $(SUBDIRS)
 headers:	$(PROTOCOL_DIR) .WAIT $(PROTOCOL_FILES) $(PROTOCOL_FILES_UTS) \
 		$(DERIVED_FILES)
 
-install:	all $(SUBDIRS)
+install:	all .WAIT $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
@@ -241,7 +239,7 @@ generic.po:
 $(MSGDOMAIN):
 	$(INS.dir)
 
-spec $(MACH) $(MACH64) $(SPEC) $(SPEC64):      FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libnsl/Makefile.com b/usr/src/lib/libnsl/Makefile.com
index e2c38be80a..ecea2a5007 100644
--- a/usr/src/lib/libnsl/Makefile.com
+++ b/usr/src/lib/libnsl/Makefile.com
@@ -17,8 +17,6 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
-
-
 #
 #
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
@@ -26,6 +24,7 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
 LIBRARY= libnsl.a
 VERS=	.1
 
@@ -177,9 +176,8 @@ include ../../Makefile.rootfs
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-MAPOPTS=	$(MAPFILES:%=-M%)
+SRCDIR=		../common
+MAPFILES +=	mapfile-vers
 
 # Override the position-independent code generation flags.
 #
@@ -205,22 +203,18 @@ CCFLAGS64 += $(NOEXCEPTIONS)
 CPPFLAGS +=	-I$(SRC)/lib/common/inc -I$(SRC)/lib/libnsl/include -D_REENTRANT
 CPPFLAGS +=	-I$(SRC)/lib/libnsl/dial
 
-CFLAGS +=	-v
+CFLAGS +=	$(CCVERBOSE)
 
 LAZYLIBS = $(ZLAZYLOAD) -lmp -lmd -lscf $(ZNOLAZYLOAD)
 lint := LAZYLIBS = -lmd
 LDLIBS +=	$(LAZYLIBS) -lc
-DYNFLAGS +=	$(MAPOPTS)
 
-SRCDIR=		../common
 $(LINTLIB):=	SRCS=$(SRCDIR)/$(LINTSRC)
 LINTFLAGS +=	-m -DPORTMAP
 LINTFLAGS64 +=	-m -DPORTMAP
 
 .KEEP_STATE:
 
-$(DYNLIB):	$(MAPFILES)
-
 all: $(LIBS) fnamecheck
 
 # Don't lint WRAPPERS as they are explicitly unclean
diff --git a/usr/src/lib/libnsl/amd64/mapfile-vers b/usr/src/lib/libnsl/amd64/mapfile-vers
new file mode 100644
index 0000000000..be34bab33f
--- /dev/null
+++ b/usr/src/lib/libnsl/amd64/mapfile-vers
@@ -0,0 +1,175 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_0.7 {
+    global:
+	authdes_getucred;
+	authdes_seccreate;
+	authnone_create;
+	authsys_create;
+	authsys_create_default;
+	clnt_create;
+	clnt_dg_create;
+	clnt_pcreateerror;
+	clnt_perrno;
+	clnt_perror;
+	clnt_raw_create;
+	clnt_spcreateerror;
+	clnt_sperrno;
+	clnt_sperror;
+	clnt_tli_create;
+	clnt_tp_create;
+	clnt_vc_create;
+	endnetconfig;
+	endnetpath;
+	freenetconfigent;
+	gethostbyaddr;
+	gethostbyname;
+	getnetconfig;
+	getnetconfigent;
+	getnetname;
+	getnetpath;
+	getpublickey;
+	getsecretkey;
+	host2netname;
+	inet_addr;
+	inet_netof;
+	inet_ntoa;
+	key_decryptsession;
+	key_encryptsession;
+	key_gendes;
+	key_setsecret;
+	nc_perror;
+	_nderror;
+	netdir_free;
+	netdir_getbyaddr;
+	netdir_getbyname;
+	netdir_options;
+	netname2host;
+	netname2user;
+	_null_auth;
+	rpcb_getaddr;
+	rpcb_getmaps;
+	rpcb_gettime;
+	rpcb_rmtcall;
+	rpc_broadcast;
+	rpc_broadcast_exp;
+	rpcb_set;
+	rpcb_unset;
+	rpc_call;
+	rpc_createerr;
+	__rpc_createerr;
+	rpc_reg;
+	setnetconfig;
+	setnetpath;
+	svc_create;
+	svc_dg_create;
+	svcerr_auth;
+	svcerr_decode;
+	svcerr_noproc;
+	svcerr_noprog;
+	svcerr_progvers;
+	svcerr_systemerr;
+	svcerr_weakauth;
+	svc_exit;
+	svc_fd_create;
+	svc_fdset;
+	svc_getreqset;
+	svc_raw_create;
+	svc_reg;
+	svc_run;
+	svc_sendreply;
+	svc_tli_create;
+	svc_tp_create;
+	svc_unreg;
+	svc_vc_create;
+	t_accept;
+	taddr2uaddr;
+	t_alloc;
+	t_bind;
+	t_close;
+	t_connect;
+	t_errno;
+	t_error;
+	t_free;
+	t_getinfo;
+	t_getstate;
+	t_listen;
+	t_look;
+	t_open;
+	t_optmgmt;
+	t_rcv;
+	t_rcvconnect;
+	t_rcvdis;
+	t_rcvrel;
+	t_rcvudata;
+	t_rcvuderr;
+	t_snd;
+	t_snddis;
+	t_sndrel;
+	t_sndudata;
+	t_sync;
+	t_unbind;
+	uaddr2taddr;
+	user2netname;
+	xdr_accepted_reply;
+	xdr_array;
+	xdr_authsys_parms;
+	xdr_bool;
+	xdr_bytes;
+	xdr_callhdr;
+	xdr_callmsg;
+	xdr_char;
+	xdr_double;
+	xdr_enum;
+	xdr_float;
+	xdr_free;
+	xdr_int;
+	xdr_long;
+	xdrmem_create;
+	xdr_opaque;
+	xdr_opaque_auth;
+	xdr_pointer;
+	xdrrec_create;
+	xdrrec_eof;
+	xdrrec_skiprecord;
+	xdr_reference;
+	xdr_rejected_reply;
+	xdr_replymsg;
+	xdr_short;
+	xdrstdio_create;
+	xdr_string;
+	xdr_u_char;
+	xdr_u_long;
+	xdr_union;
+	xdr_u_short;
+	xdr_vector;
+	xdr_void;
+	xdr_wrapstring;
+	xprt_register;
+	xprt_unregister;
+};
diff --git a/usr/src/lib/libnsl/common/mapfile-vers b/usr/src/lib/libnsl/common/mapfile-vers
new file mode 100644
index 0000000000..15160078c7
--- /dev/null
+++ b/usr/src/lib/libnsl/common/mapfile-vers
@@ -0,0 +1,750 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.10 {		# SunOS 5.11 (Solaris 11)
+    global:
+	inet_aton;
+	_inet_aton;
+} SUNW_1.9;
+
+SUNW_1.9 {		# SunOS 5.10 (Solaris 10)
+    global:
+	freeipsecalgent;
+	getipsecalgbyname;
+	getipsecalgbynum;
+	getipsecprotobyname;
+	getipsecprotobynum;
+	svc_fd_negotiate_ucred;
+	svc_getcallerucred;
+} SUNW_1.8;
+
+SUNW_1.8 {		# SunOS 5.9 (Solaris 9)
+    global:
+	clnt_send;
+	svc_add_input;
+	svc_remove_input;
+} SUNW_1.7;
+
+SUNW_1.7 {		# SunOS 5.8 (Solaris 8)
+    global:
+	freehostent;
+	getipnodebyaddr;
+	getipnodebyname;
+	inet_ntop;
+	inet_pton;
+} SUNW_1.6;
+
+SUNW_1.6 {		# SunOS 5.7 (Solaris 7)
+    global:
+	_xti_rcvreldata;
+	_xti_rcvv;
+	_xti_rcvvudata;
+	_xti_sndreldata;
+	_xti_sndv;
+	_xti_sndvudata;
+	_xti_sysconf;
+	_xti_xns5_accept;
+	_xti_xns5_snd;
+} SUNW_1.5;
+
+# The empty versions SUNW_1.2 through SUNW_1.5 must be preserved because
+# applications built on Solaris 2.6 Beta (when they did contain symbols)
+# may depend on them.  All symbol content for SunOS 5.6 is now in SUNW_1.1
+
+SUNW_1.5 {
+    global:
+	SUNW_1.5;
+} SUNW_1.4;
+
+SUNW_1.4 {
+    global:
+	SUNW_1.4;
+} SUNW_1.3;
+
+SUNW_1.3 {
+    global:
+	SUNW_1.3;
+} SUNW_1.2;
+
+SUNW_1.2 {
+    global:
+	SUNW_1.2;
+} SUNW_1.1;
+
+SUNW_1.1 {		# SunOS 5.6 (Solaris 2.6)
+    global:
+	clnt_create_vers_timed;
+	clnt_door_create;
+	rpc_gss_getcred;
+	rpc_gss_get_error;
+	rpc_gss_get_mechanisms;
+	rpc_gss_get_mech_info;
+	rpc_gss_get_principal_name;
+	rpc_gss_get_versions;
+	rpc_gss_is_installed;
+	rpc_gss_max_data_length;
+	rpc_gss_mech_to_oid;
+	rpc_gss_qop_to_num;
+	rpc_gss_seccreate;
+	rpc_gss_set_callback;
+	rpc_gss_set_defaults;
+	rpc_gss_set_svc_name;
+	rpc_gss_svc_max_data_length;
+	svc_door_create;
+	svc_max_pollfd;
+	svc_pollfd;
+	_xti_accept;
+	_xti_alloc;
+	_xti_bind;
+	_xti_close;
+	_xti_connect;
+	_xti_error;
+	_xti_free;
+	_xti_getinfo;
+	_xti_getprotaddr;
+	_xti_getstate;
+	_xti_listen;
+	_xti_look;
+	_xti_open;
+	_xti_optmgmt;
+	_xti_rcv;
+	_xti_rcvconnect;
+	_xti_rcvdis;
+	_xti_rcvrel;
+	_xti_rcvudata;
+	_xti_rcvuderr;
+	_xti_snd;
+	_xti_snddis;
+	_xti_sndrel;
+	_xti_sndudata;
+	_xti_strerror;
+	_xti_sync;
+	_xti_unbind;
+} SUNW_0.9;
+
+SUNW_0.9 {		# SunOS 5.5 (Solaris 2.5)
+    global:
+	clnt_create_timed;
+	clnt_tp_create_timed;
+	getrpcport;
+} SUNW_0.8;
+
+SUNW_0.8 {		# SunOS 5.4 (Solaris 2.4)
+    global:
+	rpc_control;
+	svc_done;
+} SUNW_0.7;
+
+SUNW_0.7 {		# SunOS 5.3 (Solaris 2.3)
+    global:
+	authdes_create;
+	authdes_lock;
+	auth_destroy;
+	callrpc;
+	clnt_broadcast;
+	clnt_call;
+	clnt_control;
+	clnt_create_vers;
+	clnt_destroy;
+	clnt_freeres;
+	clnt_geterr;
+	clntraw_create;
+	clnttcp_create;
+	clntudp_bufcreate;
+	clntudp_create;
+	dbmclose;
+	dbminit;
+	delete;
+	des_setparity;
+	dial;
+	doconfig;
+	endhostent;
+	endrpcent;
+	fetch;
+	firstkey;
+	gethostbyaddr_r;
+	gethostbyname_r;
+	gethostent;
+	gethostent_r;
+	get_myaddress;
+	getrpcbyname;
+	getrpcbyname_r;
+	getrpcbynumber;
+	getrpcbynumber_r;
+	getrpcent;
+	getrpcent_r;
+	h_errno;
+	inet_ntoa_r;
+	key_secretkey_is_set;
+	maxbno;
+	nc_sperror;
+	netdir_perror;
+	netdir_sperror;
+	nextkey;
+	nis_add;
+	nis_add_entry;
+	nis_addmember;
+	nis_checkpoint;
+	nis_clone_object;
+	nis_creategroup;
+	nis_destroygroup;
+	nis_destroy_object;
+	nis_dir_cmp;
+	nis_domain_of;
+	nis_first_entry;
+	nis_freenames;
+	nis_freeresult;
+	nis_freeservlist;
+	nis_freetags;
+	nis_getnames;
+	nis_getservlist;
+	nis_ismember;
+	nis_leaf_of;
+	nis_leaf_of_r;
+	nis_lerror;
+	nis_list;
+	nis_local_directory;
+	nis_local_group;
+	nis_local_host;
+	nis_local_principal;
+	nis_lookup;
+	nis_mkdir;
+	nis_modify;
+	nis_modify_entry;
+	nis_name_of;
+	nis_next_entry;
+	nis_perror;
+	nis_ping;
+	nis_print_group_entry;
+	nis_print_object;
+	nis_remove;
+	nis_remove_entry;
+	nis_removemember;
+	nis_rmdir;
+	nis_servstate;
+	nis_sperrno;
+	nis_sperror;
+	nis_sperror_r;
+	nis_stats;
+	nis_verifygroup;
+	pmap_getmaps;
+	pmap_getport;
+	pmap_rmtcall;
+	pmap_set;
+	pmap_unset;
+	registerrpc;
+	sethostent;
+	setrpcent;
+	store;
+	svc_auth_reg;
+	svc_control;
+	svc_destroy;
+	svc_dg_enablecache;
+	svcfd_create;
+	svc_freeargs;
+	svc_getargs;
+	svc_getreq;
+	svc_getreq_common;
+	svc_getreq_poll;
+	svc_getrpccaller;
+	svcraw_create;
+	svc_register;
+	svctcp_create;
+	svcudp_bufcreate;
+	svcudp_create;
+	svc_unregister;
+	__t_errno;
+	t_getname;
+	t_nerr;
+	t_strerror;
+	undial;
+	xdr_destroy;
+	xdr_getpos;
+	xdr_hyper;
+	xdr_inline;
+	xdr_longlong_t;
+	xdr_quadruple;
+	xdrrec_endofrecord;
+	xdrrec_readbytes;
+	xdr_setpos;
+	xdr_sizeof;
+	xdr_u_hyper;
+	xdr_u_int;
+	xdr_u_longlong_t;
+	yp_all;
+	yp_bind;
+	yperr_string;
+	yp_first;
+	yp_get_default_domain;
+	yp_master;
+	yp_match;
+	yp_next;
+	yp_order;
+	ypprot_err;
+	yp_unbind;
+	yp_update;
+};
+
+# There really should be only one SUNWprivate version.
+# Don't add any more.  Add new private symbols to SUNWprivate_1.5
+
+SUNWprivate_1.5 {
+    global:
+	clnt_create_service_timed;
+} SUNWprivate_1.4;
+
+SUNWprivate_1.4 {
+    global:
+	_build_internal_algs;
+	_check_daemon_lock;
+	_check_services;
+	_clean_trash;
+	_create_daemon_lock;
+	_duplicate_alg;
+	_enter_daemon_lock;
+	nis_make_rpchandle_gss_svc_ruid;
+	_real_getipsecalgs;
+	_real_getipsecprotos;
+	str2hostent6;
+	_str_to_ipsec_exec_mode;
+	__yp_all_cflookup;
+} SUNWprivate_1.3;
+
+SUNWprivate_1.3 {
+    global:
+	key_call_ruid;
+	key_removesecret_g_ruid;
+	key_secretkey_is_set_g_ruid;
+	key_setnet_g_ruid;
+	key_setnet_ruid;
+} SUNWprivate_1.2;
+
+SUNWprivate_1.2 {
+    global:
+	_doexeclist;
+	_dup_execstr;
+	_endauthattr;
+	_endauuser;
+	_endexecattr;
+	__endhostent6;
+	_endprofattr;
+	_enduserattr;
+	_escape;
+	_exec_cleanup;
+	_exec_wild_id;
+	_fgetuserattr;
+	_free_execstr;
+	_getauthattr;
+	_getauthnam;
+	_getauuserent;
+	_getauusernam;
+	_getexecattr;
+	_getexecprof;
+	__gethostent6;
+	_getprofattr;
+	_getprofnam;
+	_getuserattr;
+	_getusernam;
+	__nis_netconfig2ep;
+	__nis_netconfig_matches_ep;
+	_readbufline;
+	__rpc_bindresvport_ipv6;
+	_setauthattr;
+	_setauuser;
+	_setexecattr;
+	__sethostent6;
+	_setprofattr;
+	_setuserattr;
+	_strdup_null;
+	_strpbrk_escape;
+	_strtok_escape;
+	_switch_getipnodebyaddr_r;
+	_switch_getipnodebyname_r;
+	_uncached_getipnodebyaddr;
+	_uncached_getipnodebyname;
+	_unescape;
+	__yp_first_cflookup;
+	__yp_match_cflookup;
+	__yp_match_rsvdport_cflookup;
+	__yp_next_cflookup;
+} SUNWprivate_1.1;
+
+SUNWprivate_1.1 {
+    global:
+	__authenticate;
+	bitno;
+	blkno;
+	__break_name;
+	calchash;
+	cbc_crypt;
+	__cbc_triple_crypt;
+	check_version;
+	__clear_directory_ptr;
+	__clnt_create_loopback;
+	__cvt2attr;
+	dbrdonly;
+	__des_crypt;
+	des_setparity_g;
+	dirbuf;
+	dirf;
+	__do_ismember;
+	ecb_crypt;
+	__empty_yp_cache;
+	firsthash;
+	__free_nis_server;
+	__gen_common_dhkeys_g;
+	__gen_dhkeys;
+	__gen_dhkeys_g;
+	getdomainname;
+	gethostname = FUNCTION FILTER libc.so.1;
+	_get_hostserv_inetnetdir_byaddr;
+	_get_hostserv_inetnetdir_byname;
+	__getnetnamebyuid;
+	__getpublickey_cached;
+	__getpublickey_cached_g;
+	__getpublickey_flush;
+	__getpublickey_flush_g;
+	getpublickey_g;
+	getsecretkey_g;
+	hashinc;
+	_herrno2nss;
+	hmask;
+	__inet_address_count;
+	__inet_free_local_interfaces;
+	__inet_get_addr;
+	__inet_get_local_interfaces;
+	__inet_get_networka;
+	__inet_get_uaddr;
+	__inet_uaddr_is_local;
+	key_call;
+	key_decryptsession_g;
+	key_decryptsession_pk;
+	key_decryptsession_pk_g;
+	__key_decryptsession_pk_LOCAL;
+	key_encryptsession_g;
+	key_encryptsession_pk;
+	key_encryptsession_pk_g;
+	__key_encryptsession_pk_LOCAL;
+	key_gendes_g;
+	__key_gendes_LOCAL;
+	key_get_conv;
+	key_get_conv_g;
+	key_removesecret_g;
+	key_secretkey_is_set_g;
+	key_setnet;
+	key_setnet_g;
+	key_setsecret_g;
+	makdatum;
+	__name_distance;
+	__nderror;
+	__netdir_getbyaddr_nosrv;
+	__nis_auth2princ;
+	__nis_auth2princ_rpcgss;
+	__nis_authtype2mechalias;
+	__nis_bad_auth_server;
+	nis_bind_dir;
+	__nis_CacheAddEntry;
+	__nis_CacheBind;
+	__nis_CacheInit;
+	__nis_CacheLocalInit;
+	__nis_CacheLocalLoadPref;
+	__nis_CacheMgrBindMaster;
+	__nis_CacheMgrBindReplica;
+	__nis_CacheMgrBindServer;
+	__nis_CacheMgrCleanup;
+	__nis_CacheMgrInit;
+	__nis_CacheMgrInit_discard;
+	__nis_CacheMgrMarkUp;
+	__nis_CacheMgrRefreshAddress;
+	__nis_CacheMgrRefreshBinding;
+	__nis_CacheMgrRefreshCache;
+	__nis_CacheMgrRefreshCallback;
+	__nis_CacheMgrTimers;
+	__nis_CacheMgrUpdateUaddr;
+	__nis_CachePrint;
+	__nis_CacheRemoveEntry;
+	__nis_CacheRestart;
+	__nis_CacheSearch;
+	__nis_cast_proc;
+	__nis_ck_perms;
+	__nis_clnt_create;
+	__nis_core_lookup;
+	__nis_creategroup_obj;
+	nis_data;
+	__nis_debuglevel;
+	__nis_destroy_callback;
+	__nis_dhext_extract_pkey;
+	nis_dump;
+	nis_dumplog;
+	nis_finddirectory;
+	__nis_finddirectory;
+	__nis_finddirectory_remote;
+	nis_find_item;
+	__nis_flush_group_exp_name;
+	nis_flushgroups;
+	__nis_force_hard_lookups;
+	nis_free_binding;
+	__nis_freelogresult;
+	nis_free_request;
+	__nis_get_mechanism_library;
+	__nis_get_mechanisms;
+	__nis_get_mechanism_symbol;
+	__nis_get_netconfig;
+	nis_get_request;
+	__nis_get_server;
+	nis_get_static_storage;
+	__nis_group_cache_stats;
+	__nis_gssprin2netname;
+	__nis_host2nis_server;
+	__nis_host2nis_server_g;
+	__nis_host_is_server;
+	__nis_init_callback;
+	nis_insert_item;
+	nis_insert_name;
+	nis_in_table;
+	__nis_isadmin;
+	__nis_ismaster;
+	__nis_keyalg2authtype;
+	__nis_keyalg2mechalias;
+	__nis_list_localcb;
+	__nis_local_root;
+	nis_make_error;
+	nis_make_rpchandle;
+	nis_make_rpchandle_gss_svc;
+	__nis_map_group_r;
+	__nis_mechalias2authtype;
+	__nis_mechname2alias;
+	nis_old_data;
+	__nis_parse_path;
+	__nis_path;
+	__nis_path_free;
+	__nis_pingproc;
+	nis_pop_item;
+	__nis_principal;
+	nis_print_directory;
+	nis_print_entry;
+	nis_print_group;
+	nis_print_link;
+	__nis_print_result;
+	nis_print_rights;
+	nis_print_table;
+	nis_read_obj;
+	__nis_release_mechanisms;
+	__nis_release_server;
+	__nis_remote_lookup;
+	nis_remove_item;
+	nis_remove_name;
+	__nis_reset_state;
+	__nis_rpc_domain;
+	__nis_run_callback;
+	__nis_send_msg;
+	__nis_serverRefreshCache;
+	__nis_ss_used;
+	__nis_translate_mechanism;
+	nis_write_obj;
+	__npd_cbc_crypt;
+	__npd_ecb_crypt;
+	__nsl_dom;
+	__nss2herrno;
+	nss_ioctl;
+	order_haddrlist_af;
+	pagbuf;
+	pagf;
+	passwd2des;
+	passwd2des_g;
+	_rawcombuf;
+	__readColdStartFile;
+	__rpcbind_is_up;
+	__rpc_bindresvport;
+	rpcb_taddr2uaddr;
+	rpcb_uaddr2taddr;
+	__rpc_control;
+	__rpc_dtbsize;
+	__rpc_endconf;
+	__rpcfd_to_nconf;
+	__rpc_get_a_size;
+	__rpc_getconf;
+	__rpc_getconfip;
+	__rpc_get_default_domain;
+	__rpc_get_local_uid;
+	__rpc_get_t_size;
+	__rpc_matchserv;
+	__rpc_negotiate_uid;
+	__rpc_select_to_poll;
+	__rpc_setconf;
+	__rpc_timeval_to_msec;
+	__rpc_tli_set_options;
+	rtime_tli;
+	setdomainname;
+	__seterr_reply;
+	__start_clock;
+	__stop_clock;
+	str2hostent;
+	str2servent;
+	__svcauth_des;
+	svc_get_local_cred;
+	_svc_getreqset_proc;
+	__svc_get_svcauth;
+	__svc_nisplus_enable_timestamps;
+	__svc_nisplus_fdcleanup_hack;
+	__svc_nisplus_purge_since;
+	__svc_set_proc_cleanup_cb;
+	__svc_vc_dup;
+	__svc_vc_dupcache_init;
+	__svc_vc_dupdone;
+	svc_xprt_alloc;
+	svc_xprt_free;
+	_switch_gethostbyaddr_r;
+	_switch_gethostbyname_r;
+	t_errlist;
+	tiusr_statetbl;
+	_t_strerror;
+	_uncached_gethostbyaddr_r;
+	_uncached_gethostbyname_r;
+	usingypmap;
+	writeColdStartFile;
+	xdecrypt;
+	xdecrypt_g;
+	xdr_authdes_cred;
+	xdr_authdes_verf;
+	xdr_cback_data;
+	xdr_cp_result;
+	xdr_cryptkeyarg;
+	xdr_cryptkeyarg2;
+	xdr_cryptkeyarg3;
+	xdr_cryptkeyres;
+	xdr_cryptkeyres3;
+	xdr_datum;
+	xdr_des_block;
+	xdr_deskeyarg3;
+	xdr_deskeyarray;
+	xdr_directory_obj;
+	xdr_dump_args;
+	xdr_endpoint;
+	xdr_entry_obj;
+	xdr_fd_args;
+	xdr_fd_result;
+	xdr_getcredres;
+	xdr_getcredres3;
+	xdr_gid_t;
+	xdr_ib_request;
+	xdr_int16_t;
+	xdr_int32_t;
+	xdr_int64_t;
+	xdr_int8_t;
+	xdr_keybuf;
+	xdr_keybuf3;
+	xdr_key_netstarg;
+	xdr_key_netstarg3;
+	xdr_key_netstres;
+	xdr_key_netstres3;
+	xdr_keynum_t;
+	xdr_keystatus;
+	xdr_log_entry;
+	xdr_log_result;
+	xdr_mechtype;
+	xdr_netbuf;
+	xdr_netnamestr;
+	xdr_netobj;
+	xdr_nis_attr;
+	xdr_nis_bound_directory;
+	xdr_nis_bound_endpoint;
+	xdr_nis_error;
+	xdr_nis_name;
+	xdr_nis_object;
+	xdr_nis_oid;
+	xdr_nis_result;
+	xdr_nis_server;
+	xdr_nis_taglist;
+	xdr_ns_request;
+	xdr_objdata;
+	xdr_obj_p;
+	xdr_ping_args;
+	xdr_pmap;
+	xdr_pmaplist;
+	xdr_pmaplist_ptr;
+	xdr_rmtcallargs;
+	xdr_rmtcallres;
+	xdr_rpcb;
+	xdr_rpcb_entry;
+	xdr_rpcb_entry_list_ptr;
+	xdr_rpcblist;
+	xdr_rpcblist_ptr;
+	xdr_rpcb_rmtcallargs;
+	xdr_rpcb_rmtcallres;
+	xdr_rpcbs_addrlist;
+	xdr_rpcbs_addrlist_ptr;
+	xdr_rpcbs_proc;
+	xdr_rpcbs_rmtcalllist;
+	xdr_rpcbs_rmtcalllist_ptr;
+	xdr_rpcb_stat;
+	xdr_rpcb_stat_byvers;
+	xdr_setkeyarg3;
+	xdr_table_obj;
+	xdr_uid_t;
+	xdr_uint16_t;
+	xdr_uint32_t;
+	xdr_uint64_t;
+	xdr_uint8_t;
+	xdr_ulonglong_t;
+	xdr_unixcred;
+	xdr_ypall;
+	xdr_ypbind_domain;
+	xdr_ypbind_resp;
+	xdr_ypbind_resptype;
+	xdr_ypbind_setdom;
+	xdr_yp_buf;
+	xdr_ypdelete_args;
+	xdr_ypdomain_wrap_string;
+	xdr_ypmap_parms;
+	xdr_ypmap_wrap_string;
+	xdr_ypowner_wrap_string;
+	xdr_yppasswd;
+	xdr_yppushresp_xfr;
+	xdr_ypreq_key;
+	xdr_ypreq_newxfr;
+	xdr_ypreq_nokey;
+	xdr_ypreq_xfr;
+	xdr_ypresp_key_val;
+	xdr_ypresp_maplist;
+	xdr_ypresp_master;
+	xdr_ypresp_order;
+	xdr_ypresp_val;
+	xdr_ypupdate_args;
+	xencrypt;
+	xencrypt_g;
+	__yp_add_binding;
+	__yp_all_rsvdport;
+	ypbindproc_domain_3;
+	__yp_clnt_create_rsvdport;
+	__yp_dobind;
+	__yp_master_rsvdport;
+	yp_match_rsvdport;
+	__yp_rel_binding;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libnsl/i386/mapfile-vers b/usr/src/lib/libnsl/i386/mapfile-vers
new file mode 100644
index 0000000000..e364620aec
--- /dev/null
+++ b/usr/src/lib/libnsl/i386/mapfile-vers
@@ -0,0 +1,184 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	_new_svc_fdset;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	gethostbyaddr;
+	gethostbyname;
+	inet_addr;
+	inet_netof;
+	inet_ntoa;
+	_null_auth;
+	rpc_broadcast_exp;
+	__rpc_createerr;
+	svc_exit;
+	svc_fdset;
+} SYSVABI_1.3;
+
+SYSVABI_1.3 {
+    global:
+	authdes_getucred;
+	authdes_seccreate;
+	authnone_create;
+	authsys_create;
+	authsys_create_default;
+	clnt_create;
+	clnt_dg_create;
+	clnt_pcreateerror;
+	clnt_perrno;
+	clnt_perror;
+	clnt_raw_create;
+	clnt_spcreateerror;
+	clnt_sperrno;
+	clnt_sperror;
+	clnt_tli_create;
+	clnt_tp_create;
+	clnt_vc_create;
+	endnetconfig;
+	endnetpath;
+	freenetconfigent;
+	getnetconfig;
+	getnetconfigent;
+	getnetname;
+	getnetpath;
+	getpublickey;
+	getsecretkey;
+	host2netname;
+	key_decryptsession;
+	key_encryptsession;
+	key_gendes;
+	key_setsecret;
+	nc_perror;
+	_nderror;
+	netdir_free;
+	netdir_getbyaddr;
+	netdir_getbyname;
+	netdir_options;
+	netname2host;
+	netname2user;
+	rpcb_getaddr;
+	rpcb_getmaps;
+	rpcb_gettime;
+	rpcb_rmtcall;
+	rpc_broadcast;
+	rpcb_set;
+	rpcb_unset;
+	rpc_call;
+	rpc_createerr;
+	rpc_reg;
+	setnetconfig;
+	setnetpath;
+	svc_create;
+	svc_dg_create;
+	svcerr_auth;
+	svcerr_decode;
+	svcerr_noproc;
+	svcerr_noprog;
+	svcerr_progvers;
+	svcerr_systemerr;
+	svcerr_weakauth;
+	svc_fd_create;
+	svc_getreqset;
+	svc_raw_create;
+	svc_reg;
+	svc_run;
+	svc_sendreply;
+	svc_tli_create;
+	svc_tp_create;
+	svc_unreg;
+	svc_vc_create;
+	t_accept;
+	taddr2uaddr;
+	t_alloc;
+	t_bind;
+	t_close;
+	t_connect;
+	t_errno;
+	t_error;
+	t_free;
+	t_getinfo;
+	t_getstate;
+	t_listen;
+	t_look;
+	t_open;
+	t_optmgmt;
+	t_rcv;
+	t_rcvconnect;
+	t_rcvdis;
+	t_rcvrel;
+	t_rcvudata;
+	t_rcvuderr;
+	t_snd;
+	t_snddis;
+	t_sndrel;
+	t_sndudata;
+	t_sync;
+	t_unbind;
+	uaddr2taddr;
+	user2netname;
+	xdr_accepted_reply;
+	xdr_array;
+	xdr_authsys_parms;
+	xdr_bool;
+	xdr_bytes;
+	xdr_callhdr;
+	xdr_callmsg;
+	xdr_char;
+	xdr_double;
+	xdr_enum;
+	xdr_float;
+	xdr_free;
+	xdr_int;
+	xdr_long;
+	xdrmem_create;
+	xdr_opaque;
+	xdr_opaque_auth;
+	xdr_pointer;
+	xdrrec_create;
+	xdrrec_eof;
+	xdrrec_skiprecord;
+	xdr_reference;
+	xdr_rejected_reply;
+	xdr_replymsg;
+	xdr_short;
+	xdrstdio_create;
+	xdr_string;
+	xdr_u_char;
+	xdr_u_long;
+	xdr_union;
+	xdr_u_short;
+	xdr_vector;
+	xdr_void;
+	xdr_wrapstring;
+	xprt_register;
+	xprt_unregister;
+};
diff --git a/usr/src/lib/libnsl/sparc/mapfile-vers b/usr/src/lib/libnsl/sparc/mapfile-vers
new file mode 100644
index 0000000000..0ec46fbb66
--- /dev/null
+++ b/usr/src/lib/libnsl/sparc/mapfile-vers
@@ -0,0 +1,188 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	_new_svc_fdset;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	__rpc_createerr;
+	svc_exit;
+} SISCD_2.3;
+
+SISCD_2.3 {
+    global:
+	gethostbyaddr;
+	gethostbyname;
+	inet_addr;
+	inet_netof;
+	inet_ntoa;
+	_null_auth;
+	rpc_broadcast_exp;
+	svc_fdset;
+} SYSVABI_1.3;
+
+SYSVABI_1.3 {
+    global:
+	authdes_getucred;
+	authdes_seccreate;
+	authnone_create;
+	authsys_create;
+	authsys_create_default;
+	clnt_create;
+	clnt_dg_create;
+	clnt_pcreateerror;
+	clnt_perrno;
+	clnt_perror;
+	clnt_raw_create;
+	clnt_spcreateerror;
+	clnt_sperrno;
+	clnt_sperror;
+	clnt_tli_create;
+	clnt_tp_create;
+	clnt_vc_create;
+	endnetconfig;
+	endnetpath;
+	freenetconfigent;
+	getnetconfig;
+	getnetconfigent;
+	getnetname;
+	getnetpath;
+	getpublickey;
+	getsecretkey;
+	host2netname;
+	key_decryptsession;
+	key_encryptsession;
+	key_gendes;
+	key_setsecret;
+	nc_perror;
+	_nderror;
+	netdir_free;
+	netdir_getbyaddr;
+	netdir_getbyname;
+	netdir_options;
+	netname2host;
+	netname2user;
+	rpcb_getaddr;
+	rpcb_getmaps;
+	rpcb_gettime;
+	rpcb_rmtcall;
+	rpc_broadcast;
+	rpcb_set;
+	rpcb_unset;
+	rpc_call;
+	rpc_createerr;
+	rpc_reg;
+	setnetconfig;
+	setnetpath;
+	svc_create;
+	svc_dg_create;
+	svcerr_auth;
+	svcerr_decode;
+	svcerr_noproc;
+	svcerr_noprog;
+	svcerr_progvers;
+	svcerr_systemerr;
+	svcerr_weakauth;
+	svc_fd_create;
+	svc_getreqset;
+	svc_raw_create;
+	svc_reg;
+	svc_run;
+	svc_sendreply;
+	svc_tli_create;
+	svc_tp_create;
+	svc_unreg;
+	svc_vc_create;
+	t_accept;
+	taddr2uaddr;
+	t_alloc;
+	t_bind;
+	t_close;
+	t_connect;
+	t_errno;
+	t_error;
+	t_free;
+	t_getinfo;
+	t_getstate;
+	t_listen;
+	t_look;
+	t_open;
+	t_optmgmt;
+	t_rcv;
+	t_rcvconnect;
+	t_rcvdis;
+	t_rcvrel;
+	t_rcvudata;
+	t_rcvuderr;
+	t_snd;
+	t_snddis;
+	t_sndrel;
+	t_sndudata;
+	t_sync;
+	t_unbind;
+	uaddr2taddr;
+	user2netname;
+	xdr_accepted_reply;
+	xdr_array;
+	xdr_authsys_parms;
+	xdr_bool;
+	xdr_bytes;
+	xdr_callhdr;
+	xdr_callmsg;
+	xdr_char;
+	xdr_double;
+	xdr_enum;
+	xdr_float;
+	xdr_free;
+	xdr_int;
+	xdr_long;
+	xdrmem_create;
+	xdr_opaque;
+	xdr_opaque_auth;
+	xdr_pointer;
+	xdrrec_create;
+	xdrrec_eof;
+	xdrrec_skiprecord;
+	xdr_reference;
+	xdr_rejected_reply;
+	xdr_replymsg;
+	xdr_short;
+	xdrstdio_create;
+	xdr_string;
+	xdr_u_char;
+	xdr_u_long;
+	xdr_union;
+	xdr_u_short;
+	xdr_vector;
+	xdr_void;
+	xdr_wrapstring;
+	xprt_register;
+	xprt_unregister;
+};
diff --git a/usr/src/lib/libnsl/sparcv9/mapfile-vers b/usr/src/lib/libnsl/sparcv9/mapfile-vers
new file mode 100644
index 0000000000..be34bab33f
--- /dev/null
+++ b/usr/src/lib/libnsl/sparcv9/mapfile-vers
@@ -0,0 +1,175 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_0.7 {
+    global:
+	authdes_getucred;
+	authdes_seccreate;
+	authnone_create;
+	authsys_create;
+	authsys_create_default;
+	clnt_create;
+	clnt_dg_create;
+	clnt_pcreateerror;
+	clnt_perrno;
+	clnt_perror;
+	clnt_raw_create;
+	clnt_spcreateerror;
+	clnt_sperrno;
+	clnt_sperror;
+	clnt_tli_create;
+	clnt_tp_create;
+	clnt_vc_create;
+	endnetconfig;
+	endnetpath;
+	freenetconfigent;
+	gethostbyaddr;
+	gethostbyname;
+	getnetconfig;
+	getnetconfigent;
+	getnetname;
+	getnetpath;
+	getpublickey;
+	getsecretkey;
+	host2netname;
+	inet_addr;
+	inet_netof;
+	inet_ntoa;
+	key_decryptsession;
+	key_encryptsession;
+	key_gendes;
+	key_setsecret;
+	nc_perror;
+	_nderror;
+	netdir_free;
+	netdir_getbyaddr;
+	netdir_getbyname;
+	netdir_options;
+	netname2host;
+	netname2user;
+	_null_auth;
+	rpcb_getaddr;
+	rpcb_getmaps;
+	rpcb_gettime;
+	rpcb_rmtcall;
+	rpc_broadcast;
+	rpc_broadcast_exp;
+	rpcb_set;
+	rpcb_unset;
+	rpc_call;
+	rpc_createerr;
+	__rpc_createerr;
+	rpc_reg;
+	setnetconfig;
+	setnetpath;
+	svc_create;
+	svc_dg_create;
+	svcerr_auth;
+	svcerr_decode;
+	svcerr_noproc;
+	svcerr_noprog;
+	svcerr_progvers;
+	svcerr_systemerr;
+	svcerr_weakauth;
+	svc_exit;
+	svc_fd_create;
+	svc_fdset;
+	svc_getreqset;
+	svc_raw_create;
+	svc_reg;
+	svc_run;
+	svc_sendreply;
+	svc_tli_create;
+	svc_tp_create;
+	svc_unreg;
+	svc_vc_create;
+	t_accept;
+	taddr2uaddr;
+	t_alloc;
+	t_bind;
+	t_close;
+	t_connect;
+	t_errno;
+	t_error;
+	t_free;
+	t_getinfo;
+	t_getstate;
+	t_listen;
+	t_look;
+	t_open;
+	t_optmgmt;
+	t_rcv;
+	t_rcvconnect;
+	t_rcvdis;
+	t_rcvrel;
+	t_rcvudata;
+	t_rcvuderr;
+	t_snd;
+	t_snddis;
+	t_sndrel;
+	t_sndudata;
+	t_sync;
+	t_unbind;
+	uaddr2taddr;
+	user2netname;
+	xdr_accepted_reply;
+	xdr_array;
+	xdr_authsys_parms;
+	xdr_bool;
+	xdr_bytes;
+	xdr_callhdr;
+	xdr_callmsg;
+	xdr_char;
+	xdr_double;
+	xdr_enum;
+	xdr_float;
+	xdr_free;
+	xdr_int;
+	xdr_long;
+	xdrmem_create;
+	xdr_opaque;
+	xdr_opaque_auth;
+	xdr_pointer;
+	xdrrec_create;
+	xdrrec_eof;
+	xdrrec_skiprecord;
+	xdr_reference;
+	xdr_rejected_reply;
+	xdr_replymsg;
+	xdr_short;
+	xdrstdio_create;
+	xdr_string;
+	xdr_u_char;
+	xdr_u_long;
+	xdr_union;
+	xdr_u_short;
+	xdr_vector;
+	xdr_void;
+	xdr_wrapstring;
+	xprt_register;
+	xprt_unregister;
+};
diff --git a/usr/src/lib/libnvpair/Makefile b/usr/src/lib/libnvpair/Makefile
index 74a94fedbe..1dc8b802b0 100644
--- a/usr/src/lib/libnvpair/Makefile
+++ b/usr/src/lib/libnvpair/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,19 +19,16 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 2000 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libnvpair/Makefile
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-# include library definitions
 include ../Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
 all :=		TARGET= all
@@ -61,7 +57,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libnvpair/Makefile.com b/usr/src/lib/libnvpair/Makefile.com
index c2de4ef11d..532a1032cc 100644
--- a/usr/src/lib/libnvpair/Makefile.com
+++ b/usr/src/lib/libnvpair/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libnvpair/Makefile.com
-#
 
 LIBRARY=	libnvpair.a
 VERS=		.1
@@ -44,10 +41,6 @@ SRCS=		../libnvpair.c \
 		$(SRC)/common/nvpair/nvpair_alloc_fixed.c \
 		$(SRC)/common/nvpair/nvpair.c
 
-SRCDIR=		..
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 #
 # Libraries added to the next line must be present in miniroot
 #
diff --git a/usr/src/lib/libnvpair/mapfile-vers b/usr/src/lib/libnvpair/mapfile-vers
new file mode 100644
index 0000000000..b99b23fc01
--- /dev/null
+++ b/usr/src/lib/libnvpair/mapfile-vers
@@ -0,0 +1,146 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+	nv_alloc_fini;
+	nv_alloc_init;
+	nv_alloc_nosleep;
+	nv_alloc_reset;
+	nv_fixed_ops;
+	nvlist_add_boolean_array;
+	nvlist_add_boolean_value;
+	nvlist_add_int8;
+	nvlist_add_int8_array;
+	nvlist_add_nvpair;
+	nvlist_add_uint8;
+	nvlist_add_uint8_array;
+	nvlist_lookup_boolean_array;
+	nvlist_lookup_boolean_value;
+	nvlist_lookup_int8;
+	nvlist_lookup_int8_array;
+	nvlist_lookup_nv_alloc;
+	nvlist_lookup_pairs;
+	nvlist_lookup_uint8;
+	nvlist_lookup_uint8_array;
+	nvlist_merge;
+	nvlist_remove;
+	nvlist_remove_all;
+	nvlist_xalloc;
+	nvlist_xdup;
+	nvlist_xpack;
+	nvlist_xunpack;
+	nvpair_value_boolean_array;
+	nvpair_value_boolean_value;
+	nvpair_value_int8;
+	nvpair_value_int8_array;
+	nvpair_value_uint8;
+	nvpair_value_uint8_array;
+} SUNW_1.1.1;
+
+SUNW_1.1.1 {
+    global:
+	nvlist_add_nvlist;
+	nvlist_add_nvlist_array;
+	nvlist_lookup_nvlist;
+	nvlist_lookup_nvlist_array;
+	nvpair_value_nvlist;
+	nvpair_value_nvlist_array;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	nvlist_add_boolean;
+	nvlist_add_byte;
+	nvlist_add_byte_array;
+	nvlist_add_int16;
+	nvlist_add_int16_array;
+	nvlist_add_int32;
+	nvlist_add_int32_array;
+	nvlist_add_int64;
+	nvlist_add_int64_array;
+	nvlist_add_string;
+	nvlist_add_string_array;
+	nvlist_add_uint16;
+	nvlist_add_uint16_array;
+	nvlist_add_uint32;
+	nvlist_add_uint32_array;
+	nvlist_add_uint64;
+	nvlist_add_uint64_array;
+	nvlist_alloc;
+	nvlist_dup;
+	nvlist_free;
+	nvlist_lookup_boolean;
+	nvlist_lookup_byte;
+	nvlist_lookup_byte_array;
+	nvlist_lookup_int16;
+	nvlist_lookup_int16_array;
+	nvlist_lookup_int32;
+	nvlist_lookup_int32_array;
+	nvlist_lookup_int64;
+	nvlist_lookup_int64_array;
+	nvlist_lookup_string;
+	nvlist_lookup_string_array;
+	nvlist_lookup_uint16;
+	nvlist_lookup_uint16_array;
+	nvlist_lookup_uint32;
+	nvlist_lookup_uint32_array;
+	nvlist_lookup_uint64;
+	nvlist_lookup_uint64_array;
+	nvlist_next_nvpair;
+	nvlist_pack;
+	nvlist_size;
+	nvlist_unpack;
+	nvpair_name;
+	nvpair_type;
+	nvpair_value_byte;
+	nvpair_value_byte_array;
+	nvpair_value_int16;
+	nvpair_value_int16_array;
+	nvpair_value_int32;
+	nvpair_value_int32_array;
+	nvpair_value_int64;
+	nvpair_value_int64_array;
+	nvpair_value_string;
+	nvpair_value_string_array;
+	nvpair_value_uint16;
+	nvpair_value_uint16_array;
+	nvpair_value_uint32;
+	nvpair_value_uint32_array;
+	nvpair_value_uint64;
+	nvpair_value_uint64_array;
+};
+
+SUNWprivate_1.1 {
+    global:
+	nvlist_add_hrtime;
+	nvlist_lookup_hrtime;
+	nvlist_print;
+	nvpair_value_hrtime;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libpam/Makefile b/usr/src/lib/libpam/Makefile
index 0800e80a88..d91d435700 100644
--- a/usr/src/lib/libpam/Makefile
+++ b/usr/src/lib/libpam/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/libpam/Makefile
-#
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include ../Makefile.lib
 
@@ -54,7 +52,7 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
@@ -62,8 +60,6 @@ install:	$(IETCFILES)
 
 check:		$(CHECKHDRS)
 
-lint:		$(SUBDIRS)
-
 $(POFILE):	$(MSGFILES)
 	$(BUILDPO.msgfiles)
 
@@ -71,7 +67,7 @@ _msg:		$(MSGDOMAINPOFILE)
 
 include		$(SRC)/Makefile.msg.targ
 
-$(SUBDIRS) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 $(ROOTETC)/%:	%
diff --git a/usr/src/lib/libpam/Makefile.com b/usr/src/lib/libpam/Makefile.com
index 1bedffb88c..21f842c941 100644
--- a/usr/src/lib/libpam/Makefile.com
+++ b/usr/src/lib/libpam/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/libpam/Makefile.com
-#
 
 LIBRARY=	 libpam.a
 VERS=		.1
@@ -36,13 +33,9 @@ include		../../Makefile.lib
 include		../../Makefile.rootfs
 
 LIBS=		$(DYNLIB) $(LINTLIB)
-SRCDIR=		..
 $(LINTLIB) :=	SRCS= $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lcmd -lc
 
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I $(SRCDIR)
 
diff --git a/usr/src/lib/libpam/mapfile-vers b/usr/src/lib/libpam/mapfile-vers
new file mode 100644
index 0000000000..6972c29ed1
--- /dev/null
+++ b/usr/src/lib/libpam/mapfile-vers
@@ -0,0 +1,65 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.2 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.2 {
+    global:
+	SUNW_1.2;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	pam_acct_mgmt;
+	pam_authenticate;
+	pam_chauthtok;
+	pam_close_session;
+	pam_end;
+	pam_get_data;
+	pam_getenv;
+	pam_getenvlist;
+	pam_get_item;
+	pam_get_user;
+	pam_open_session;
+	pam_putenv;
+	pam_setcred;
+	pam_set_data;
+	pam_set_item;
+	pam_start;
+	pam_strerror;
+};
+
+SUNWprivate_1.1 {
+    global:
+	__pam_display_msg;
+	__pam_get_authtok;
+	__pam_log;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libpcp/Makefile.com b/usr/src/lib/libpcp/Makefile.com
index 15e9e70525..654f77cb8a 100644
--- a/usr/src/lib/libpcp/Makefile.com
+++ b/usr/src/lib/libpcp/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libpcp/Makefile.com
-#
 
 LIBRARY= libpcp.a
 VERS= .1
@@ -37,9 +34,7 @@ OBJECTS= $(PLATFORM_OBJECTS)
 include $(SRC)/lib/Makefile.lib
 include $(SRC)/Makefile.psm
 
-MAPFILE =	../common/mapfile-vers
-
-DYNFLAGS +=	-M $(MAPFILE)
+SRCDIR =	../common
 
 CPPFLAGS +=	$(PLATINCS) -DPCP_CKSUM_ENABLE
 
@@ -52,7 +47,6 @@ LINKED_LIBPCP1_DIR	= \
 LINKED_LLIBLPCP_DIR 	= \
 	$(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/llib-lpcp.ln)
 
-SRCDIR =	../common
 LIBS = $(DYNLIB) $(LINTLIB)
 CFLAGS +=	$(CCVERBOSE)
 LDLIBS +=	-lc -lumem
@@ -70,6 +64,4 @@ all:	$(LIBS)
 
 lint:	lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/libpctx/Makefile b/usr/src/lib/libpctx/Makefile
index f5286ba622..9c0caadfb2 100644
--- a/usr/src/lib/libpctx/Makefile
+++ b/usr/src/lib/libpctx/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libpctx/Makefile
 
 include $(SRC)/lib/Makefile.lib
 
@@ -46,9 +44,7 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
@@ -58,7 +54,7 @@ $(POFILE):	pofile_MSGFILES
 
 _msg:		$(MSGDOMAINPOFILE)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libpctx/Makefile.com b/usr/src/lib/libpctx/Makefile.com
index cf2ff69274..c9d50e434c 100644
--- a/usr/src/lib/libpctx/Makefile.com
+++ b/usr/src/lib/libpctx/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libpctx/Makefile.com
-#
 
 LIBRARY = libpctx.a
 VERS = .1
@@ -41,8 +38,6 @@ $(LINTLIB) :=	SRCS = ../common/llib-lpctx
 LDLIBS +=	-lproc -lc
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS += 	-D_REENTRANT -I$(SRCDIR)
diff --git a/usr/src/lib/libpctx/common/mapfile-vers b/usr/src/lib/libpctx/common/mapfile-vers
new file mode 100644
index 0000000000..0ccdb1802b
--- /dev/null
+++ b/usr/src/lib/libpctx/common/mapfile-vers
@@ -0,0 +1,43 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pctx_capture;
+	pctx_create;
+	pctx_release;
+	pctx_run;
+	pctx_set_events;
+};
+
+SUNWprivate_1.1 {
+    global:
+	__pctx_cpc;
+	__pctx_cpc_register_callback;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libpicl/Makefile b/usr/src/lib/libpicl/Makefile
index 5fa8016577..c35ebf5ea0 100644
--- a/usr/src/lib/libpicl/Makefile
+++ b/usr/src/lib/libpicl/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/libpicl/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include	$(SRC)/lib/Makefile.lib
@@ -49,9 +46,7 @@ CHECKHDRS=      $(HDRS:%.h=%.check)
 
 .KEEP_STATE:
 
-all install clean clobber: spec .WAIT $(SUBDIRS)
-
-lint _msg:	$(SUBDIRS)
+all install clean clobber lint _msg: $(SUBDIRS)
 
 # install rule for install_h target
 
@@ -65,7 +60,7 @@ $(ROOTHDRDIR):
 
 check: $(CHECKHDRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libpicl/Makefile.com b/usr/src/lib/libpicl/Makefile.com
index 1db40c86fa..3246d227e8 100644
--- a/usr/src/lib/libpicl/Makefile.com
+++ b/usr/src/lib/libpicl/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -36,10 +35,6 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	..
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 CPPFLAGS +=	-I.. -D_REENTRANT
 CFLAGS +=	$(CCVERBOSE)
 
diff --git a/usr/src/lib/libpicl/mapfile-vers b/usr/src/lib/libpicl/mapfile-vers
new file mode 100644
index 0000000000..206286d1b7
--- /dev/null
+++ b/usr/src/lib/libpicl/mapfile-vers
@@ -0,0 +1,60 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.3 {
+    global:
+	picl_find_node;
+	picl_get_frutree_parent;
+	picl_get_node_by_path;
+} SUNW_1.2;
+
+SUNW_1.2 {
+    global:
+	picl_get_propinfo_by_name;
+	picl_walk_tree_by_class;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	picl_get_first_prop;
+	picl_get_next_by_col;
+	picl_get_next_by_row;
+	picl_get_next_prop;
+	picl_get_prop_by_name;
+	picl_get_propinfo;
+	picl_get_propval;
+	picl_get_propval_by_name;
+	picl_get_root;
+	picl_initialize;
+	picl_set_propval;
+	picl_set_propval_by_name;
+	picl_shutdown;
+	picl_strerror;
+	picl_wait;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libpicltree/Makefile b/usr/src/lib/libpicltree/Makefile
index e97c1763ff..79d59401c1 100644
--- a/usr/src/lib/libpicltree/Makefile
+++ b/usr/src/lib/libpicltree/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,15 @@
 # CDDL HEADER END
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libpicltree/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include	$(SRC)/lib/Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH)
+SUBDIRS = $(MACH)
 
 # conditional assignments
 all :=      	TARGET= all
@@ -62,7 +59,7 @@ $(ROOTHDRDIR):
 
 check: $(CHECKHDRS)
 
-$(MACH) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libpicltree/Makefile.com b/usr/src/lib/libpicltree/Makefile.com
index cafb40a0d1..bb88e33d2e 100644
--- a/usr/src/lib/libpicltree/Makefile.com
+++ b/usr/src/lib/libpicltree/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -36,10 +35,6 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	..
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 CPPFLAGS +=	-D_REENTRANT -I.. -I../../libpicl -I$(SRC)/cmd/picl/plugins/inc
 CFLAGS +=	$(CCVERBOSE)
 
diff --git a/usr/src/lib/libpicltree/mapfile-vers b/usr/src/lib/libpicltree/mapfile-vers
new file mode 100644
index 0000000000..1833b4f824
--- /dev/null
+++ b/usr/src/lib/libpicltree/mapfile-vers
@@ -0,0 +1,97 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.3 {
+    global:
+	ptree_get_frutree_parent;
+} SUNW_1.2;
+
+SUNW_1.2 {
+    global:
+	ptree_create_and_add_node;
+	ptree_create_and_add_prop;
+	ptree_find_node;
+	ptree_get_node_by_path;
+	ptree_init_propinfo;
+	ptree_post_event;
+	ptree_register_handler;
+	ptree_unregister_handler;
+	ptree_walk_tree_by_class;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	picld_plugin_register;
+	ptree_add_node;
+	ptree_add_prop;
+	ptree_add_row_to_table;
+	ptree_create_node;
+	ptree_create_prop;
+	ptree_create_table;
+	ptree_delete_node;
+	ptree_delete_prop;
+	ptree_destroy_node;
+	ptree_destroy_prop;
+	ptree_get_first_prop;
+	ptree_get_next_by_col;
+	ptree_get_next_by_row;
+	ptree_get_next_prop;
+	ptree_get_prop_by_name;
+	ptree_get_propinfo;
+	ptree_get_propval;
+	ptree_get_propval_by_name;
+	ptree_get_root;
+	ptree_update_propval;
+	ptree_update_propval_by_name;
+};
+
+# There really should be only one SUNWprivate version.
+# Don't add any more.  Add new private symbols to SUNWprivate_1.2
+
+SUNWprivate_1.2 {
+    global:
+	dbg_exec;
+	dbg_print;
+	verbose_level;
+} SUNWprivate_1.1;
+
+SUNWprivate_1.1 {
+    global:
+	cvt_picl2ptree;
+	cvt_ptree2picl;
+	xptree_destroy;
+	xptree_get_propinfo_by_name;
+	xptree_get_propval_by_name_with_cred;
+	xptree_get_propval_with_cred;
+	xptree_initialize;
+	xptree_refresh_notify;
+	xptree_reinitialize;
+	xptree_update_propval_by_name_with_cred;
+	xptree_update_propval_with_cred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libplot/plot/Makefile b/usr/src/lib/libplot/plot/Makefile
index e94f5e4ccb..3e7d04deb5 100644
--- a/usr/src/lib/libplot/plot/Makefile
+++ b/usr/src/lib/libplot/plot/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,18 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1989-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1989-1998 by Sun Microsystems, Inc.
-#
-# lib/libplot/plot/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
+
 include		../../Makefile.lib
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -45,7 +42,7 @@ lint :=		TARGET= lint
 all clean clobber delete install lint: $(SUBDIRS)
 
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	 @cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libplot/plot/Makefile.com b/usr/src/lib/libplot/plot/Makefile.com
index 89695bfb81..e3de94f3ee 100644
--- a/usr/src/lib/libplot/plot/Makefile.com
+++ b/usr/src/lib/libplot/plot/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/plot/Makefile.com
-#
 
 LIBRARY= libplot.a
 VERS= .1
@@ -40,9 +37,7 @@ OBJECTS=	\
 # include library definitions
 include ../../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-MAPOPTS=	$(MAPFILE:%=-M %)
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -51,18 +46,12 @@ $(LINTLIB):= SRCS=../common/llib-lplot
 LINTSRC=	$(LINTLIB:%.ln=%)
 
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	$(MAPOPTS)
 LDLIBS += -lc
 
 .KEEP_STATE:
 
 lint: lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../../Makefile.targ
 
diff --git a/usr/src/lib/libplot/plot/amd64/Makefile b/usr/src/lib/libplot/plot/amd64/Makefile
index 7ca1ce38bf..7a373bbdcd 100644
--- a/usr/src/lib/libplot/plot/amd64/Makefile
+++ b/usr/src/lib/libplot/plot/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/libplot/plot/common/mapfile-vers b/usr/src/lib/libplot/plot/common/mapfile-vers
new file mode 100644
index 0000000000..ca180f5c41
--- /dev/null
+++ b/usr/src/lib/libplot/plot/common/mapfile-vers
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	arc;
+	box;
+	circle;
+	closepl;
+	closevt;
+	cont;
+	erase;
+	label;
+	line;
+	linemod;
+	move;
+	openpl;
+	openvt;
+	point;
+	space;
+};
+
+SUNWprivate_1.1 {
+    global:
+	dot;
+	_lib_version;
+	putsi;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libplot/plot/i386/Makefile b/usr/src/lib/libplot/plot/i386/Makefile
index 7d46601f07..2a944b0b43 100644
--- a/usr/src/lib/libplot/plot/i386/Makefile
+++ b/usr/src/lib/libplot/plot/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/plot/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libplot/plot/sparc/Makefile b/usr/src/lib/libplot/plot/sparc/Makefile
index b18ebae1a5..2a944b0b43 100644
--- a/usr/src/lib/libplot/plot/sparc/Makefile
+++ b/usr/src/lib/libplot/plot/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/plot/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libplot/plot/sparcv9/Makefile b/usr/src/lib/libplot/plot/sparcv9/Makefile
index 8c2cffc092..b10cb39a45 100644
--- a/usr/src/lib/libplot/plot/sparcv9/Makefile
+++ b/usr/src/lib/libplot/plot/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/plot/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
diff --git a/usr/src/lib/libplot/t300/Makefile b/usr/src/lib/libplot/t300/Makefile
index 52f7d504b3..4600e4afbf 100644
--- a/usr/src/lib/libplot/t300/Makefile
+++ b/usr/src/lib/libplot/t300/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1989,1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libplot/t300/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include	../../Makefile.lib
 
-SUBDIRS=        spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -44,7 +42,7 @@ lint :=		TARGET= lint
 all clean clobber delete install lint: $(SUBDIRS)
 
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	 @cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libplot/t300/Makefile.com b/usr/src/lib/libplot/t300/Makefile.com
index 2d28d341bf..83c88c3d8a 100644
--- a/usr/src/lib/libplot/t300/Makefile.com
+++ b/usr/src/lib/libplot/t300/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,14 +18,12 @@
 #
 # CDDL HEADER END
 #
- 
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/t300/Makefile.com
-#
 
 LIBRARY= lib300.a
 VERS= .1
@@ -40,9 +37,7 @@ OBJECTS=	\
 # include library definitions
 include ../../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-MAPOPTS=	$(MAPFILE:%=-M %)
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -51,18 +46,12 @@ $(LINTLIB):= SRCS=../common/llib-l300
 LINTSRC=	$(LINTLIB:%.ln=%)
 
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	$(MAPOPTS)
 LDLIBS += -lc -lm
 
 .KEEP_STATE:
 
 lint: lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../../Makefile.targ
 
diff --git a/usr/src/lib/libplot/t300/amd64/Makefile b/usr/src/lib/libplot/t300/amd64/Makefile
index 7ca1ce38bf..7a373bbdcd 100644
--- a/usr/src/lib/libplot/t300/amd64/Makefile
+++ b/usr/src/lib/libplot/t300/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/libplot/t300/common/mapfile-vers b/usr/src/lib/libplot/t300/common/mapfile-vers
new file mode 100644
index 0000000000..d47fe2d83d
--- /dev/null
+++ b/usr/src/lib/libplot/t300/common/mapfile-vers
@@ -0,0 +1,79 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	arc;
+	box;
+	circle;
+	closepl;
+	closevt;
+	cont;
+	erase;
+	label;
+	line;
+	linemod;
+	move;
+	openpl;
+	openvt;
+	point;
+	space;
+};
+
+SUNWprivate_1.1 {
+    global:
+	botx;
+	boty;
+	dist2;
+	dot;
+	inplot;
+	ITTY;
+	_lib_version;
+	movep;
+	obotx;
+	oboty;
+	OUTF;
+	outplot;
+	PTTY;
+	reset;
+	scalex;
+	scaley;
+	spew;
+	swap;
+	tobotleft;
+	xconv;
+	xnow;
+	xoffset;
+	xsc;
+	xscale;
+	yconv;
+	ynow;
+	ysc;
+	yscale;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libplot/t300/i386/Makefile b/usr/src/lib/libplot/t300/i386/Makefile
index be78bab600..c99a543017 100644
--- a/usr/src/lib/libplot/t300/i386/Makefile
+++ b/usr/src/lib/libplot/t300/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/t300/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libplot/t300/sparc/Makefile b/usr/src/lib/libplot/t300/sparc/Makefile
index eb90472fed..3fa035b373 100644
--- a/usr/src/lib/libplot/t300/sparc/Makefile
+++ b/usr/src/lib/libplot/t300/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/t300/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libplot/t300/sparcv9/Makefile b/usr/src/lib/libplot/t300/sparcv9/Makefile
index 87ca2d9111..b10cb39a45 100644
--- a/usr/src/lib/libplot/t300/sparcv9/Makefile
+++ b/usr/src/lib/libplot/t300/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/t300/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
diff --git a/usr/src/lib/libplot/t300s/Makefile b/usr/src/lib/libplot/t300s/Makefile
index 0e188dc0ef..3affe1a3b3 100644
--- a/usr/src/lib/libplot/t300s/Makefile
+++ b/usr/src/lib/libplot/t300s/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1989,1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libplot/t300s/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../../Makefile.lib
 
-SUBDIRS=        spec $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -44,7 +42,7 @@ lint :=		TARGET= lint
 all clean clobber delete install lint: $(SUBDIRS)
 
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	 @cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libplot/t300s/Makefile.com b/usr/src/lib/libplot/t300s/Makefile.com
index 3918a0eeed..556853dd87 100644
--- a/usr/src/lib/libplot/t300s/Makefile.com
+++ b/usr/src/lib/libplot/t300s/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/t300s/Makefile.com
-#
 
 LIBRARY= lib300s.a
 VERS= .1
@@ -40,9 +37,7 @@ OBJECTS=	\
 # include library definitions
 include ../../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-MAPOPTS=	$(MAPFILE:%=-M %)
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -51,18 +46,12 @@ $(LINTLIB):= SRCS=../common/llib-l300s
 LINTSRC=	$(LINTLIB:%.ln=%)
 
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	$(MAPOPTS)
 LDLIBS += -lc -lm
 
 .KEEP_STATE:
 
 lint: lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../../Makefile.targ
 
diff --git a/usr/src/lib/libplot/t300s/amd64/Makefile b/usr/src/lib/libplot/t300s/amd64/Makefile
index 5a418230f5..f5fbe83e2c 100644
--- a/usr/src/lib/libplot/t300s/amd64/Makefile
+++ b/usr/src/lib/libplot/t300s/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/libplot/t300s/common/mapfile-vers b/usr/src/lib/libplot/t300s/common/mapfile-vers
new file mode 100644
index 0000000000..104d8d7dda
--- /dev/null
+++ b/usr/src/lib/libplot/t300s/common/mapfile-vers
@@ -0,0 +1,81 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	arc;
+	box;
+	circle;
+	closepl;
+	closevt;
+	cont;
+	dot;
+	erase;
+	label;
+	line;
+	linemod;
+	move;
+	openpl;
+	openvt;
+	point;
+	space;
+};
+
+SUNWprivate_1.1 {
+    global:
+	botx;
+	boty;
+	deltx;
+	delty;
+	dist2;
+	inplot;
+	ITTY;
+	_lib_version;
+	movep;
+	obotx;
+	oboty;
+	OUTF;
+	outplot;
+	PTTY;
+	reset;
+	scalex;
+	scaley;
+	spew;
+	swap;
+	tobotleft;
+	xconv;
+	xnow;
+	xoffset;
+	xsc;
+	xscale;
+	yconv;
+	ynow;
+	ysc;
+	yscale;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libplot/t300s/i386/Makefile b/usr/src/lib/libplot/t300s/i386/Makefile
index 2302b3d6a0..c99a543017 100644
--- a/usr/src/lib/libplot/t300s/i386/Makefile
+++ b/usr/src/lib/libplot/t300s/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/t300s/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libplot/t300s/sparc/Makefile b/usr/src/lib/libplot/t300s/sparc/Makefile
index 83d618f4fd..3fa035b373 100644
--- a/usr/src/lib/libplot/t300s/sparc/Makefile
+++ b/usr/src/lib/libplot/t300s/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/t300s/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libplot/t300s/sparcv9/Makefile b/usr/src/lib/libplot/t300s/sparcv9/Makefile
index 938872cab7..ce59ffd0dd 100644
--- a/usr/src/lib/libplot/t300s/sparcv9/Makefile
+++ b/usr/src/lib/libplot/t300s/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/t300s/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
diff --git a/usr/src/lib/libplot/t4014/Makefile b/usr/src/lib/libplot/t4014/Makefile
index b574371379..6150f281b5 100644
--- a/usr/src/lib/libplot/t4014/Makefile
+++ b/usr/src/lib/libplot/t4014/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1989,1992,1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libplot/t4014/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include	../../Makefile.lib
 
-SUBDIRS=        spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -44,7 +42,7 @@ lint :=		TARGET= lint
 all clean clobber delete install lint: $(SUBDIRS)
 
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	 @cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libplot/t4014/Makefile.com b/usr/src/lib/libplot/t4014/Makefile.com
index 8607861a28..ddba3f5b83 100644
--- a/usr/src/lib/libplot/t4014/Makefile.com
+++ b/usr/src/lib/libplot/t4014/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/t4014/Makefile.com
-#
 
 LIBRARY= lib4014.a
 VERS= .1
@@ -40,29 +37,19 @@ OBJECTS=	\
 # include library definitions
 include ../../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-MAPOPTS=	$(MAPFILE:%=-M %)
-SRCS=           $(OBJECTS:%.o=../common/%.c)
-
-CLOBBERFILES +=	$(MAPFILE)
+SRCDIR =	../common
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 LINTSRC=	$(LINTLIB:%.ln=%)
 
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	$(MAPOPTS)
 LDLIBS += -lc -lm
 
 .KEEP_STATE:
 
 lint: lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../../Makefile.targ
 
diff --git a/usr/src/lib/libplot/t4014/amd64/Makefile b/usr/src/lib/libplot/t4014/amd64/Makefile
index 5a418230f5..f5fbe83e2c 100644
--- a/usr/src/lib/libplot/t4014/amd64/Makefile
+++ b/usr/src/lib/libplot/t4014/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/libplot/t4014/common/mapfile-vers b/usr/src/lib/libplot/t4014/common/mapfile-vers
new file mode 100644
index 0000000000..38ac152e12
--- /dev/null
+++ b/usr/src/lib/libplot/t4014/common/mapfile-vers
@@ -0,0 +1,65 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	arc;
+	box;
+	circle;
+	closepl;
+	closevt;
+	cont;
+	dot;
+	erase;
+	label;
+	line;
+	linemod;
+	move;
+	openpl;
+	openvt;
+	point;
+	space;
+};
+
+SUNWprivate_1.1 {
+    global:
+	botx;
+	boty;
+	_lib_version;
+	obotx;
+	oboty;
+	oextra;
+	ohix;
+	ohiy;
+	oloy;
+	putch;
+	scaleflag;
+	scalex;
+	scaley;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libplot/t4014/i386/Makefile b/usr/src/lib/libplot/t4014/i386/Makefile
index 036dad49c9..3fa035b373 100644
--- a/usr/src/lib/libplot/t4014/i386/Makefile
+++ b/usr/src/lib/libplot/t4014/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/plot/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libplot/t4014/sparc/Makefile b/usr/src/lib/libplot/t4014/sparc/Makefile
index d0196b39cc..3fa035b373 100644
--- a/usr/src/lib/libplot/t4014/sparc/Makefile
+++ b/usr/src/lib/libplot/t4014/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/plot/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libplot/t4014/sparcv9/Makefile b/usr/src/lib/libplot/t4014/sparcv9/Makefile
index 99c1745c9b..ce59ffd0dd 100644
--- a/usr/src/lib/libplot/t4014/sparcv9/Makefile
+++ b/usr/src/lib/libplot/t4014/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/plot/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
diff --git a/usr/src/lib/libplot/t450/Makefile b/usr/src/lib/libplot/t450/Makefile
index 5c812d99d9..3affe1a3b3 100644
--- a/usr/src/lib/libplot/t450/Makefile
+++ b/usr/src/lib/libplot/t450/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1989,1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libplot/t450/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../../Makefile.lib
 
-SUBDIRS=        spec $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -44,7 +42,7 @@ lint :=		TARGET= lint
 all clean clobber delete install lint: $(SUBDIRS)
 
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	 @cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libplot/t450/Makefile.com b/usr/src/lib/libplot/t450/Makefile.com
index 590471d6d2..b2c268ca89 100644
--- a/usr/src/lib/libplot/t450/Makefile.com
+++ b/usr/src/lib/libplot/t450/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/t450/Makefile.com
-#
 
 LIBRARY= lib450.a
 VERS= .1
@@ -40,9 +37,7 @@ OBJECTS=	\
 # include library definitions
 include ../../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-MAPOPTS=	$(MAPFILE:%=-M %)
-SRCS=           $(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -51,18 +46,12 @@ $(LINTLIB):= SRCS=../common/llib-l450
 LINTSRC=	$(LINTLIB:%.ln=%)
 
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	$(MAPOPTS)
 LDLIBS += -lc -lm
 
 .KEEP_STATE:
 
 lint: lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../../Makefile.targ
 
diff --git a/usr/src/lib/libplot/t450/amd64/Makefile b/usr/src/lib/libplot/t450/amd64/Makefile
index 5a418230f5..f5fbe83e2c 100644
--- a/usr/src/lib/libplot/t450/amd64/Makefile
+++ b/usr/src/lib/libplot/t450/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/libplot/t450/common/mapfile-vers b/usr/src/lib/libplot/t450/common/mapfile-vers
new file mode 100644
index 0000000000..d47fe2d83d
--- /dev/null
+++ b/usr/src/lib/libplot/t450/common/mapfile-vers
@@ -0,0 +1,79 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	arc;
+	box;
+	circle;
+	closepl;
+	closevt;
+	cont;
+	erase;
+	label;
+	line;
+	linemod;
+	move;
+	openpl;
+	openvt;
+	point;
+	space;
+};
+
+SUNWprivate_1.1 {
+    global:
+	botx;
+	boty;
+	dist2;
+	dot;
+	inplot;
+	ITTY;
+	_lib_version;
+	movep;
+	obotx;
+	oboty;
+	OUTF;
+	outplot;
+	PTTY;
+	reset;
+	scalex;
+	scaley;
+	spew;
+	swap;
+	tobotleft;
+	xconv;
+	xnow;
+	xoffset;
+	xsc;
+	xscale;
+	yconv;
+	ynow;
+	ysc;
+	yscale;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libplot/t450/i386/Makefile b/usr/src/lib/libplot/t450/i386/Makefile
index 1edc4d6ef6..3fa035b373 100644
--- a/usr/src/lib/libplot/t450/i386/Makefile
+++ b/usr/src/lib/libplot/t450/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/t450/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libplot/t450/sparc/Makefile b/usr/src/lib/libplot/t450/sparc/Makefile
index ead6b4b084..3fa035b373 100644
--- a/usr/src/lib/libplot/t450/sparc/Makefile
+++ b/usr/src/lib/libplot/t450/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/t450/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libplot/t450/sparcv9/Makefile b/usr/src/lib/libplot/t450/sparcv9/Makefile
index 993a795538..ce59ffd0dd 100644
--- a/usr/src/lib/libplot/t450/sparcv9/Makefile
+++ b/usr/src/lib/libplot/t450/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/t450/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
diff --git a/usr/src/lib/libplot/vt0/Makefile b/usr/src/lib/libplot/vt0/Makefile
index 55878b5bf6..f6a079520d 100644
--- a/usr/src/lib/libplot/vt0/Makefile
+++ b/usr/src/lib/libplot/vt0/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,18 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1989,1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/vt0/Makefile
-#
-#LIBRARY= libvt0.a
 
 include		../../Makefile.lib
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -47,7 +44,7 @@ package :=	TARGET= package
 all clean clobber delete install lint catalog package: $(SUBDIRS)
 
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	 @cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libplot/vt0/Makefile.com b/usr/src/lib/libplot/vt0/Makefile.com
index f3cd3fd7f6..a8ef8c8590 100644
--- a/usr/src/lib/libplot/vt0/Makefile.com
+++ b/usr/src/lib/libplot/vt0/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/vt0/Makefile.com
-#
 
 LIBRARY= libvt0.a
 VERS= .1
@@ -40,9 +37,7 @@ OBJECTS=	\
 # include library definitions
 include ../../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-MAPOPTS=	$(MAPFILE:%=-M %)
-SRCS=           $(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -51,18 +46,12 @@ $(LINTLIB):= SRCS=../common/llib-lvt0
 LINTSRC=	$(LINTLIB:%.ln=%)
 
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	$(MAPOPTS)
 LDLIBS += -lc
 
 .KEEP_STATE:
 
 lint: lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../../Makefile.targ
 
diff --git a/usr/src/lib/libplot/vt0/amd64/Makefile b/usr/src/lib/libplot/vt0/amd64/Makefile
index 0128e6d41e..f5fbe83e2c 100644
--- a/usr/src/lib/libplot/vt0/amd64/Makefile
+++ b/usr/src/lib/libplot/vt0/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/libplot/vt0/common/mapfile-vers b/usr/src/lib/libplot/vt0/common/mapfile-vers
new file mode 100644
index 0000000000..47b749b8a0
--- /dev/null
+++ b/usr/src/lib/libplot/vt0/common/mapfile-vers
@@ -0,0 +1,67 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	arc;
+	box;
+	circle;
+	closepl;
+	closevt;
+	cont;
+	dot;
+	erase;
+	frame;
+	label;
+	line;
+	linemod;
+	move;
+	openpl;
+	openvt;
+	point;
+	space;
+};
+
+SUNWprivate_1.1 {
+    global:
+	botx;
+	boty;
+	deltx;
+	delty;
+	_lib_version;
+	obotx;
+	oboty;
+	scalex;
+	scaley;
+	vti;
+	xnow;
+	xsc;
+	ynow;
+	ysc;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libplot/vt0/i386/Makefile b/usr/src/lib/libplot/vt0/i386/Makefile
index 703181103d..3fa035b373 100644
--- a/usr/src/lib/libplot/vt0/i386/Makefile
+++ b/usr/src/lib/libplot/vt0/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/vt0/i386/Makefile
-MAPDIR=	../spec/i386
+
 include ../Makefile.com
 
 all: $(LIBS)
diff --git a/usr/src/lib/libplot/vt0/sparc/Makefile b/usr/src/lib/libplot/vt0/sparc/Makefile
index 9eeb6f9703..3fa035b373 100644
--- a/usr/src/lib/libplot/vt0/sparc/Makefile
+++ b/usr/src/lib/libplot/vt0/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/vt0/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 all: $(LIBS)
diff --git a/usr/src/lib/libplot/vt0/sparcv9/Makefile b/usr/src/lib/libplot/vt0/sparcv9/Makefile
index de1f0aedc2..ce59ffd0dd 100644
--- a/usr/src/lib/libplot/vt0/sparcv9/Makefile
+++ b/usr/src/lib/libplot/vt0/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libplot/vt0/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/libpool/Makefile b/usr/src/lib/libpool/Makefile
index 06172886db..c9e929b86e 100644
--- a/usr/src/lib/libpool/Makefile
+++ b/usr/src/lib/libpool/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libpool/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
@@ -76,12 +73,10 @@ $(XMLDIR)/%: %
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 $(POFILE):	pofile_MSGFILES
 
-lint:		$(SUBDIRS)
-
 install:	$(ROOTDTDS)
 
 install_h:	$(ROOTHDRS)
@@ -90,7 +85,7 @@ check:		$(CHECKHDRS)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-spec $(SUBDIRS):	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libpool/Makefile.com b/usr/src/lib/libpool/Makefile.com
index 76a1b880d3..0431dc906e 100644
--- a/usr/src/lib/libpool/Makefile.com
+++ b/usr/src/lib/libpool/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# libpool/Makefile.com
-#
 
 LIBRARY =	libpool.a
 VERS =		.1
@@ -48,11 +45,9 @@ DYNFLAGS +=	-lxml2
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lnvpair -lexacct -lc
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -D_FILE_OFFSET_BITS=64 -I/usr/include/libxml2
diff --git a/usr/src/lib/libpool/common/mapfile-vers b/usr/src/lib/libpool/common/mapfile-vers
new file mode 100644
index 0000000000..436d5d062e
--- /dev/null
+++ b/usr/src/lib/libpool/common/mapfile-vers
@@ -0,0 +1,108 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# There really should be only one SUNWprivate version.
+# Don't add any more.  Add new private symbols to SUNWprivate_1.2
+
+SUNWprivate_1.2 {
+    global:
+	pool_conf_update;
+	pool_get_status;
+	pool_resource_type_list;
+	pool_set_status;
+} SUNWprivate_1.1;
+
+SUNWprivate_1.1 {
+    global:
+	pool_associate;
+	pool_component_info;
+	pool_component_to_elem;
+	pool_conf_alloc;
+	pool_conf_close;
+	pool_conf_commit;
+	pool_conf_export;
+	pool_conf_free;
+	pool_conf_info;
+	pool_conf_location;
+	pool_conf_open;
+	pool_conf_remove;
+	pool_conf_rollback;
+	pool_conf_status;
+	pool_conf_to_elem;
+	pool_conf_validate;
+	pool_create;
+	pool_destroy;
+	pool_dissociate;
+	pool_dynamic_location;
+	pool_error;
+	pool_get_binding;
+	pool_get_owning_resource;
+	pool_get_pool;
+	pool_get_property;
+	pool_get_resource;
+	pool_get_resource_binding;
+	pool_info;
+	pool_put_property;
+	pool_query_components;
+	pool_query_pool_resources;
+	pool_query_pools;
+	pool_query_resource_components;
+	pool_query_resources;
+	pool_resource_create;
+	pool_resource_destroy;
+	pool_resource_info;
+	pool_resource_to_elem;
+	pool_resource_transfer;
+	pool_resource_xtransfer;
+	pool_rm_property;
+	pool_set_binding;
+	pool_static_location;
+	pool_strerror;
+	pool_to_elem;
+	pool_value_alloc;
+	pool_value_free;
+	pool_value_get_bool;
+	pool_value_get_double;
+	pool_value_get_int64;
+	pool_value_get_name;
+	pool_value_get_string;
+	pool_value_get_type;
+	pool_value_get_uint64;
+	pool_value_set_bool;
+	pool_value_set_double;
+	pool_value_set_int64;
+	pool_value_set_name;
+	pool_value_set_string;
+	pool_value_set_uint64;
+	pool_version;
+	pool_walk_components;
+	pool_walk_pools;
+	pool_walk_properties;
+	pool_walk_resources;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libproc/Makefile b/usr/src/lib/libproc/Makefile
index ae7946c90d..4d2553bc7b 100644
--- a/usr/src/lib/libproc/Makefile
+++ b/usr/src/lib/libproc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libproc/Makefile
 
 include ../Makefile.lib
 
@@ -65,22 +63,20 @@ $(ROOTHDRDIR)/%: common/%
 
 .KEEP_STATE:
 
-all clean clobber delete install package: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber delete install lint package: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS):	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
-_msg:	$(MSGDOMAIN) $(POFILE)
+_msg:	$(MSGDOMAIN) .WAIT $(POFILE)
 	$(RM) $(MSGDOMAIN)/$(POFILE)
 	$(CP) $(POFILE) $(MSGDOMAIN)
 
-$(POFILE):	.WAIT $(POFILES)
+$(POFILE):	$(POFILES)
 	$(RM) $@
 	$(CAT) $(POFILES) > $@
 
diff --git a/usr/src/lib/libproc/Makefile.com b/usr/src/lib/libproc/Makefile.com
index 7c8fce8355..b6dcff9bad 100644
--- a/usr/src/lib/libproc/Makefile.com
+++ b/usr/src/lib/libproc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libproc/Makefile.com
 
 LIBRARY = libproc.a
 VERS = .1
@@ -84,11 +82,11 @@ SRCS =		$(CMNOBJS:%.o=../common/%.c) $(ISAOBJS:%.o=%.c)
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lrtld_db -lelf -lctf -lc
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
+
+MAPFILES +=	mapfile-vers
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
diff --git a/usr/src/lib/libproc/amd64/mapfile-vers b/usr/src/lib/libproc/amd64/mapfile-vers
new file mode 100644
index 0000000000..633026ef2f
--- /dev/null
+++ b/usr/src/lib/libproc/amd64/mapfile-vers
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+};
diff --git a/usr/src/lib/libproc/common/mapfile-vers b/usr/src/lib/libproc/common/mapfile-vers
new file mode 100644
index 0000000000..f3c517dcf5
--- /dev/null
+++ b/usr/src/lib/libproc/common/mapfile-vers
@@ -0,0 +1,281 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are no
+# SUNW_1.1 through SUNW_1.4 symbols, but they are now kept as placeholders.
+# Don't add any symbols to these versions.
+
+SUNW_1.4 {
+    global:
+	SUNW_1.4;
+} SUNW_1.3;
+
+SUNW_1.3 {
+    global:
+	SUNW_1.3;
+} SUNW_1.2;
+
+SUNW_1.2 {
+    global:
+	SUNW_1.2;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+};
+
+SUNWprivate_1.1 {
+    global:
+	Lalt_stack;
+	Lclearfault;
+	Lclearsig;
+	Lctlfd;
+	Ldstop;
+	Lfree;
+	Lgetareg;
+	Lgrab;
+	Lgrab_error;
+	_libproc_debug;
+	Lmain_stack;
+	Lprochandle;
+	Lpsinfo;
+	Lputareg;
+	Lsetrun;
+	Lstack;
+	Lstate;
+	Lstatus;
+	Lstop;
+	Lsync;
+	Lwait;
+	Lxecbkpt;
+	Lxecwapt;
+	Paddr_to_ctf;
+	Paddr_to_loadobj;
+	Paddr_to_map;
+	Paddr_to_text_map;
+	Pasfd;
+	Pclearfault;
+	Pclearsig;
+	Pcontent;
+	Pcreate;
+	Pcreate_agent;
+	Pcreate_callback;
+	Pcreate_error;
+	Pcred;
+	Pctlfd;
+	Pdelbkpt;
+	Pdelwapt;
+	Pdestroy_agent;
+	Pdstop;
+	Penv_iter;
+	Perror_printf;
+	Pexecname;
+	Pfault;
+	Pfgcore;
+	Pfgrab_core;
+	Pfree;
+	Pgcore;
+	Pgetareg;
+	Pgetauxval;
+	Pgetauxvec;
+	Pgetenv;
+	Pgrab;
+	Pgrab_core;
+	Pgrab_error;
+	Pgrab_file;
+	Pisprocdir;
+	Pissyscall_prev;
+	Plmid;
+	Plmid_to_loadobj;
+	Plmid_to_map;
+	Plookup_by_addr;
+	Plookup_by_name;
+	Plwp_alt_stack;
+	Plwp_getfpregs;
+	Plwp_getpsinfo;
+	Plwp_getregs;
+	Plwp_iter;
+	Plwp_iter_all;
+	Plwp_main_stack;
+	Plwp_setfpregs;
+	Plwp_setregs;
+	Plwp_stack;
+	Pmapping_iter;
+	Pname_to_ctf;
+	Pname_to_loadobj;
+	Pname_to_map;
+	Pobject_iter;
+	Pobjname;
+	Pplatform;
+	Ppltdest;
+	Ppriv;
+	Pprivinfo;
+	Ppsinfo;
+	Pputareg;
+	pr_access;
+	pr_close;
+	pr_creat;
+	Prd_agent;
+	pr_door_info;
+	Pread;
+	Pread_string;
+	Prelease;
+	Preopen;
+	Preset_maps;
+	pr_exit;
+	pr_fcntl;
+	pr_fstat;
+	pr_fstat64;
+	pr_fstatvfs;
+	pr_getitimer;
+	pr_getpeername;
+	pr_getprojid;
+	pr_getrctl;
+	pr_getrlimit;
+	pr_getrlimit64;
+	pr_getsockname;
+	pr_getsockopt;
+	pr_gettaskid;
+	pr_getzoneid;
+	pr_ioctl;
+	pr_link;
+	pr_llseek;
+	pr_lseek;
+	pr_lstat;
+	pr_lstat64;
+	pr_lwp_exit;
+	pr_memcntl;
+	pr_meminfo;
+	pr_mmap;
+	pr_munmap;
+	proc_arg_grab;
+	proc_arg_psinfo;
+	proc_arg_xgrab;
+	proc_arg_xpsinfo;
+	proc_content2str;
+	proc_finistdio;
+	proc_fltname;
+	proc_fltset2str;
+	proc_flushstdio;
+	proc_get_auxv;
+	proc_get_cred;
+	proc_get_priv;
+	proc_get_psinfo;
+	proc_get_status;
+	proc_initstdio;
+	proc_lwp_in_set;
+	proc_lwp_range_valid;
+	proc_signame;
+	proc_sigset2str;
+	proc_str2content;
+	proc_str2flt;
+	proc_str2fltset;
+	proc_str2sig;
+	proc_str2sigset;
+	proc_str2sys;
+	proc_str2sysset;
+	proc_sysname;
+	proc_sysset2str;
+	proc_unctrl_psinfo;
+	proc_walk;
+	pr_open;
+	pr_processor_bind;
+	pr_pset_bind;
+	pr_rename;
+	pr_setitimer;
+	pr_setrctl;
+	pr_setrlimit;
+	pr_setrlimit64;
+	pr_settaskid;
+	pr_sigaction;
+	pr_stat;
+	pr_stat64;
+	pr_statvfs;
+	pr_unlink;
+	pr_waitid;
+	pr_zmap;
+	Psetbkpt;
+	Psetcred;
+	Psetfault;
+	Psetflags;
+	Psetpriv;
+	Psetrun;
+	Psetsignal;
+	Psetsysentry;
+	Psetsysexit;
+	Psetwapt;
+	Psetzoneid;
+	Psignal;
+	ps_lcontinue;
+	ps_lgetfpregs;
+	ps_lgetregs;
+	ps_lsetfpregs;
+	ps_lsetregs;
+	ps_lstop;
+	ps_pauxv;
+	ps_pcontinue;
+	ps_pdmodel;
+	ps_pdread;
+	ps_pdwrite;
+	ps_pglobal_lookup;
+	ps_pglobal_sym;
+	ps_plog;
+	ps_pread;
+	ps_pstop;
+	ps_ptread;
+	ps_ptwrite;
+	ps_pwrite;
+	Pstack_iter;
+	Pstate;
+	Pstatus;
+	Pstop;
+	Pstopstatus;
+	Psymbol_iter;
+	Psymbol_iter_by_addr;
+	Psymbol_iter_by_lmid;
+	Psymbol_iter_by_name;
+	Psync;
+	Psyscall;
+	Psysentry;
+	Psysexit;
+	Puname;
+	Punsetflags;
+	Pupdate_maps;
+	Pupdate_syms;
+	Pwait;
+	Pwrite;
+	Pxcreate;
+	Pxecbkpt;
+	Pxecwapt;
+	Pxlookup_by_addr;
+	Pxlookup_by_name;
+	Pxsymbol_iter;
+	Pzonename;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libproc/i386/mapfile-vers b/usr/src/lib/libproc/i386/mapfile-vers
new file mode 100644
index 0000000000..9e7e13f5fe
--- /dev/null
+++ b/usr/src/lib/libproc/i386/mapfile-vers
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	Pldt;
+	proc_get_ldt;
+	ps_lgetLDT;
+};
diff --git a/usr/src/lib/libproc/sparc/mapfile-vers b/usr/src/lib/libproc/sparc/mapfile-vers
new file mode 100644
index 0000000000..d4aa10e54a
--- /dev/null
+++ b/usr/src/lib/libproc/sparc/mapfile-vers
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	Plwp_getgwindows;
+	Plwp_getxregs;
+	Plwp_setxregs;
+	ps_lgetxregs;
+	ps_lgetxregsize;
+	ps_lsetxregs;
+};
diff --git a/usr/src/lib/libproc/sparcv9/mapfile-vers b/usr/src/lib/libproc/sparcv9/mapfile-vers
new file mode 100644
index 0000000000..5a2a3c4a77
--- /dev/null
+++ b/usr/src/lib/libproc/sparcv9/mapfile-vers
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	Plwp_getasrs;
+	Plwp_getgwindows;
+	Plwp_getxregs;
+	Plwp_setasrs;
+	Plwp_setxregs;
+	ps_lgetxregs;
+	ps_lgetxregsize;
+	ps_lsetxregs;
+};
diff --git a/usr/src/lib/libproject/Makefile b/usr/src/lib/libproject/Makefile
index 6d498ed533..2776f9bc2a 100644
--- a/usr/src/lib/libproject/Makefile
+++ b/usr/src/lib/libproject/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# lib/libproject/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all:=		TARGET= all
 clean:=		TARGET= clean
@@ -44,7 +42,7 @@ all clean clobber delete install lint package: $(SUBDIRS)
 
 _msg:
 
-spec help $(MACH) $(MACH64) :	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libproject/Makefile.com b/usr/src/lib/libproject/Makefile.com
index e4144d071d..454a72f3e5 100644
--- a/usr/src/lib/libproject/Makefile.com
+++ b/usr/src/lib/libproject/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -37,8 +36,7 @@ OBJECTS = \
 # include library definitsion
 include ../../Makefile.lib
 
-MAPFILE =	$(MAPDIR)/mapfile
-SRCS =		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -49,11 +47,9 @@ ROOTLINTDIR =	$(ROOTLIBDIR)
 ROOTLINT =	$(LINTSRC:%=$(ROOTLINTDIR)/%)
 
 CLEANFILES +=	$(LINTOUT) $(LINTLIB)
-CLOBBERFILES += $(MAPFILE)
 
 CPPFLAGS +=	-D_REENTRANT
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=     -M$(MAPFILE)
 LDLIBS +=	-lc -lsecdb -lproc
 
 lint :=		LDLIBS += -lpool
@@ -67,11 +63,6 @@ all: $(LIBS)
 
 lint:	lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/libproject/amd64/Makefile b/usr/src/lib/libproject/amd64/Makefile
index 99e18f1980..72daafe13a 100644
--- a/usr/src/lib/libproject/amd64/Makefile
+++ b/usr/src/lib/libproject/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libproject/common/mapfile-vers b/usr/src/lib/libproject/common/mapfile-vers
new file mode 100644
index 0000000000..9d0fb35446
--- /dev/null
+++ b/usr/src/lib/libproject/common/mapfile-vers
@@ -0,0 +1,53 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+	project_walk;
+	setproject;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	endprojent;
+	fgetprojent;
+	getdefaultproj;
+	getprojbyid;
+	getprojbyname;
+	getprojent;
+	getprojidbyname;
+	inproj;
+	setprojent;
+};
+
+SUNWprivate_1.1 {
+    global:
+	setproject_initpriv;
+	setproject_proc;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libproject/i386/Makefile b/usr/src/lib/libproject/i386/Makefile
index 42e5514c35..50cbcb01b9 100644
--- a/usr/src/lib/libproject/i386/Makefile
+++ b/usr/src/lib/libproject/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libproject/i386/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libproject/sparc/Makefile b/usr/src/lib/libproject/sparc/Makefile
index 4d64ef3c5f..50cbcb01b9 100644
--- a/usr/src/lib/libproject/sparc/Makefile
+++ b/usr/src/lib/libproject/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libproject/sparc/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libproject/sparcv9/Makefile b/usr/src/lib/libproject/sparcv9/Makefile
index eb1fc824ca..72daafe13a 100644
--- a/usr/src/lib/libproject/sparcv9/Makefile
+++ b/usr/src/lib/libproject/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/libproject/sparcv9/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libprtdiag/Makefile.com b/usr/src/lib/libprtdiag/Makefile.com
index 0997c2f910..3f6762338e 100644
--- a/usr/src/lib/libprtdiag/Makefile.com
+++ b/usr/src/lib/libprtdiag/Makefile.com
@@ -48,6 +48,9 @@ CFLAGS		+= $(CCVERBOSE)
 LDLIBS		+= -lc -lkstat
 DYNFLAGS	+= -Wl,-f/usr/platform/\$$PLATFORM/lib/$(DYNLIBPSR)
 
+# There should be a mapfile here
+MAPFILES =
+
 SRCDIR		= ../../common
 $(LINTLIB)	:= SRCS = $(SRCDIR)/$(LINTSRC)
 USR_PSMLINT=	$(LINTSRC:%=$(USR_PSM_LIB_DIR)/%)
diff --git a/usr/src/lib/libprtdiag_psr/sparc/Makefile.com b/usr/src/lib/libprtdiag_psr/sparc/Makefile.com
index 18df32a634..e954427363 100644
--- a/usr/src/lib/libprtdiag_psr/sparc/Makefile.com
+++ b/usr/src/lib/libprtdiag_psr/sparc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -48,6 +47,9 @@ SRCS=		$(OBJECTS:%.o=./common/%.c)
 
 LIBS = $(DYNLIB)
 
+# There should be a mapfile here
+MAPFILES =
+
 CFLAGS +=	$(CCVERBOSE)
 IFLAGS +=	-I $(UTSBASE)/sun4u 
 IFLAGS +=	-I $(UTSCLOSED)/sun4u 
diff --git a/usr/src/lib/libpthread/Makefile.com b/usr/src/lib/libpthread/Makefile.com
index 156b36ae33..f313249ed2 100644
--- a/usr/src/lib/libpthread/Makefile.com
+++ b/usr/src/lib/libpthread/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -32,16 +31,15 @@ VERS = .1
 include ../../Makefile.lib
 include ../../Makefile.rootfs
 
-MAPFILES=	mapfile-vers $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
-
-DYNFLAGS +=	-F libc.so.1 $(MAPOPTS)
+DYNFLAGS +=	-F libc.so.1
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 SRCDIR =	../common
 $(LINTLIB) :=	SRCS = $(SRCDIR)/llib-lpthread
 
+MAPFILES =	mapfile-vers $(MAPFILE-FLTR)
+
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
 # and .fini sections being added).  Also, since there are no OBJECTS, turn
 # off CTF.
@@ -56,5 +54,3 @@ include ../../Makefile.targ
 all:	$(LIBS)
 
 lint:
-
-$(DYNLIB):	$(MAPFILES)
diff --git a/usr/src/lib/librcm/Makefile b/usr/src/lib/librcm/Makefile
index 88edc674d8..1640557189 100644
--- a/usr/src/lib/librcm/Makefile
+++ b/usr/src/lib/librcm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,20 +19,16 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1999-2000 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/librcm/Makefile
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
+
 include	../Makefile.lib
 
-#
-# 64 bit build is turned off pending libsysevent conversion to 64 bit
-#
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
 all :=      	TARGET= all
@@ -62,7 +57,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/librcm/Makefile.com b/usr/src/lib/librcm/Makefile.com
index 81c6440ede..0678946b95 100644
--- a/usr/src/lib/librcm/Makefile.com
+++ b/usr/src/lib/librcm/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -36,10 +35,6 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc -lnvpair
 $(LINTLIB) :=	SRCS = ../llib-lrcm
 
-SRCDIR =	..
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 
 .KEEP_STATE:
diff --git a/usr/src/lib/librcm/mapfile-vers b/usr/src/lib/librcm/mapfile-vers
new file mode 100644
index 0000000000..7becdd80d7
--- /dev/null
+++ b/usr/src/lib/librcm/mapfile-vers
@@ -0,0 +1,80 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	create_event_service;
+	get_event_service;
+	rcm_alloc_handle;
+	rcm_append_info;
+	rcm_dir;
+	rcm_exec_cmd;
+	rcm_free_handle;
+	rcm_free_info;
+	rcm_get_client_name;
+	rcm_get_info;
+	rcm_get_info_list;
+	rcm_get_rsrcstate;
+	rcm_get_script_dir;
+	rcm_info_error;
+	rcm_info_info;
+	rcm_info_modname;
+	rcm_info_next;
+	rcm_info_pid;
+	rcm_info_properties;
+	rcm_info_rsrc;
+	rcm_info_seqnum;
+	rcm_info_state;
+	rcm_is_script;
+	rcm_log_message;
+	rcm_module_close;
+	rcm_module_dir;
+	rcm_module_open;
+	rcm_notify_capacity_change;
+	rcm_notify_event;
+	rcm_notify_online;
+	rcm_notify_online_list;
+	rcm_notify_remove;
+	rcm_notify_remove_list;
+	rcm_notify_resume;
+	rcm_notify_resume_list;
+	rcm_register_capacity;
+	rcm_register_event;
+	rcm_register_interest;
+	rcm_request_capacity_change;
+	rcm_request_offline;
+	rcm_request_offline_list;
+	rcm_request_suspend;
+	rcm_request_suspend_list;
+	rcm_script_dir;
+	rcm_unregister_capacity;
+	rcm_unregister_event;
+	rcm_unregister_interest;
+	revoke_event_service;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libresolv/Makefile b/usr/src/lib/libresolv/Makefile
index 9e9fbedc68..b2637e6f89 100644
--- a/usr/src/lib/libresolv/Makefile
+++ b/usr/src/lib/libresolv/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -25,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libresolv/Makefile
-#
 
 LIBRARY= libresolv.a
 VERS= .1
@@ -49,14 +46,7 @@ include ../Makefile.lib
 # install this library in the root filesystem
 include ../Makefile.rootfs
 
-SUBDIRS=	spec
-
-MAPDIR=		./spec/$(MACH)
-MAPFILE=	$(MAPDIR)/mapfile
-MAPFILES=	$(MAPFILE) mapfile-vers
-MAPOPTS=	$(MAPFILES:%=-M%)
-
-CLOBBERFILES +=	$(MAPFILE)
+SRCDIR =	.
 
 C99MODE=	$(C99_DISABLE)
 
@@ -66,40 +56,18 @@ C99MODE=	$(C99_DISABLE)
 # so we must put -I. ahead of the default include directories:
 CPPFLAGS = -I. -I../common/inc $(CPPFLAGS.master) -DDEBUG -DSYSV -D_REENTRANT
 LDLIBS += -lsocket -lnsl -lc
-DYNFLAGS +=	$(MAPOPTS)
 
 ROOTDYNLIBS=	$(DYNLIB:%=$(ROOTLIBDIR)/%)
 
-all :=		TARGET= all
-clean :=	TARGET= clean
-clobber :=	TARGET= clobber
-delete :=	TARGET= delete
-install :=	TARGET= install
-lint :=		TARGET= lint
-catalog :=	TARGET= catalog
-package :=	TARGET= package
-
 .KEEP_STATE:
 
 LIBS = $(DYNLIB)
 
-all: $(SUBDIRS) $(LIBS)
+all: $(LIBS)
 
-install: all $(ROOTDYNLIBS) $(SUBDIRS)
+install: all $(ROOTDYNLIBS)
 
 lint: lintcheck
 
-clean clobber: $(SUBDIRS)
-
-spec: FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-$(DYNLIB): $(MAPFILES)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../Makefile.targ
-
-FRC:
diff --git a/usr/src/lib/libresolv/mapfile-vers b/usr/src/lib/libresolv/mapfile-vers
index 8107ddfb6e..6e7d8ac332 100644
--- a/usr/src/lib/libresolv/mapfile-vers
+++ b/usr/src/lib/libresolv/mapfile-vers
@@ -1,13 +1,9 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -22,14 +18,59 @@
 #
 # CDDL HEADER END
 #
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Special mapfile to establish h_errno as a filter on libnsl.  As a filtered
-# symbol, this isn't visible to apptrace, and thus doesn't have to be defined
-# from the specfiles.  To ensure the symbol remains in .bss, with the correct
-# size, its filtering capabilities are assigned here rather than via a specfile.
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+} SUNW_0.7;
 
 SUNW_0.7 {
-	global:
-		h_errno = FILTER libnsl.so.1;
+    global:
+	dn_comp;
+	dn_expand;
+	dn_skipname;
+	fp_query;
+	_getlong;
+	_getshort;
+	h_errno = FILTER libnsl.so.1;
+	hostalias;
+	p_cdname;
+	p_class;
+	p_query;
+	p_rr;
+	p_time;
+	p_type;
+	putlong;
+	_res;
+	res_init;
+	res_mkquery;
+	res_query;
+	res_querydomain;
+	res_search;
+	res_send;
+	strcasecmp = FUNCTION FILTER libc.so.1;
+	strncasecmp = FUNCTION FILTER libc.so.1;
+};
+
+SUNWprivate_1.1 {
+    global:
+	res_endhostent;
+	res_gethostbyaddr;
+	res_gethostbyname;
+	_res_opcodes;
+	_res_resultcodes;
+	res_sethostent;
+	__res_set_no_hosts_fallback;
+    local:
+	*;
 };
diff --git a/usr/src/lib/libresolv2/Makefile b/usr/src/lib/libresolv2/Makefile
index cfb4e5d6d9..b70fae546f 100644
--- a/usr/src/lib/libresolv2/Makefile
+++ b/usr/src/lib/libresolv2/Makefile
@@ -1,11 +1,29 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libresolv2/Makefile
-#
 
 include		../../Makefile.master
 include		../Makefile.lib
@@ -20,7 +38,7 @@ $(ROOTMANIFEST) :=	GROUP = bin
 
 CHKMANIFEST=	$(MANIFEST:%.xml=%.xmlchk)
 
-SUBDIRS=	include spec $(MACH)
+SUBDIRS=	include $(MACH)
 $(BUILD64)SUBDIRS +=	$(MACH64)
 SUBDIRS +=	.WAIT irs
 
diff --git a/usr/src/lib/libresolv2/Makefile.com b/usr/src/lib/libresolv2/Makefile.com
index fe02612bd6..b37e4ba50d 100644
--- a/usr/src/lib/libresolv2/Makefile.com
+++ b/usr/src/lib/libresolv2/Makefile.com
@@ -1,11 +1,29 @@
 #
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libresolv2/Makefile.com
-#
 
 LIBRARY= libresolv.a
 VERS= .2
@@ -87,10 +105,7 @@ include ../../Makefile.lib
 # install this library in the root filesystem
 include ../../Makefile.rootfs
 
-MAPFILE=	$(MAPDIR)/mapfile
-MAPFILES=	$(MAPFILE) ../common/mapfile-vers
-MAPOPTS=	$(MAPFILES:%=-M%)
-
+SRCDIR =	../common
 SRCS=		$(BSDOBJS:%.o=../common/bsd/%.c) \
 		$(DSTOBJS:%.o=../common/dst/%.c) \
 		$(INETOBJS:%.o=../common/inet/%.c) \
@@ -125,7 +140,7 @@ LOCFLAGS +=	-D_SYS_STREAM_H -D_REENTRANT -DSVR4 -DSUNW_OPTIONS \
 		$(SOLCOMPAT) -I../include -I../../common/inc
 
 CPPFLAGS +=	$(LOCFLAGS) 
-DYNFLAGS +=	$(MAPOPTS) $(ZNODELETE)
+DYNFLAGS +=	$(ZNODELETE)
 LDLIBS +=	-lsocket -lnsl -lc
 
 .KEEP_STATE:
@@ -134,11 +149,6 @@ all:	$(LIBS)
 
 lint:	lintcheck
 
-$(DYNLIB):	$(MAPFILES)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/libresolv2/amd64/Makefile b/usr/src/lib/libresolv2/amd64/Makefile
index 4d512a2004..2e8cdecf75 100644
--- a/usr/src/lib/libresolv2/amd64/Makefile
+++ b/usr/src/lib/libresolv2/amd64/Makefile
@@ -1,12 +1,30 @@
 #
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libresolv2/common/mapfile-vers b/usr/src/lib/libresolv2/common/mapfile-vers
index e700b09635..bfc8d05dbe 100644
--- a/usr/src/lib/libresolv2/common/mapfile-vers
+++ b/usr/src/lib/libresolv2/common/mapfile-vers
@@ -1,15 +1,311 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# Special mapfile to establish h_errno as a filter on libnsl.  As a filtered
-# symbol, this isn't visible to apptrace, and thus doesn't have to be defined
-# from the specfiles.  To ensure the symbol remains in .bss, with the correct
-# size, its filtering capabilities are assigned here rather than via a specfile.
 
-SUNW_2.1 {
-	global:
-		h_errno = FILTER libnsl.so.1;
+SUNW_2.3 {		# SunOS 5.11 (Solaris 11)
+    global:
+	inet_aton = FUNCTION FILTER libnsl.so.1;
+} SUNW_2.2;
+
+SUNW_2.2 {		# SunOS 5.9 (Solaris 9)
+    global:
+	fp_resstat;
+	herror;
+	res_hostalias;
+	res_nclose;
+	res_ninit;
+	res_nmkquery;
+	res_nquery;
+	res_nquerydomain;
+	res_nsearch;
+	res_nsend;
+	res_nsendsigned;
+} SUNW_2.1;
+
+SUNW_2.1 {		# SunOS 5.6 (Solaris 2.6)
+    global:
+	dn_comp;
+	dn_expand;
+	__dn_skipname;
+	__fp_query;
+	_getlong;
+	_getshort;
+	h_errno = FILTER libnsl.so.1;
+	__hostalias;
+	hstrerror;
+	__p_cdname;
+	__p_class;
+	__p_query;
+	__p_time;
+	__p_type;
+	__putlong;
+	_res;
+	res_init;
+	res_mkquery;
+	res_query;
+	res_querydomain;
+	res_search;
+	res_send;
+	res_update;
+};
+
+# There really should be only one SUNWprivate version.
+# Don't add any more.  Add new private symbols to SUNWprivate_2.2
+
+SUNWprivate_2.2 {
+    global:
+	isc_gethexstring;
+	isc_puthexstring;
+	__log_close_debug_channels;
+	__memactive;
+	p_sockun;
+	res_gethostbyname2;
+	res_getservers;
+	res_nametoclass;
+	res_nametotype;
+	res_nopt;
+	res_setservers;
+} SUNWprivate_2.1;
+
+SUNWprivate_2.1 {
+    global:
+	__areweinnamed;
+	__assertion_failed;
+	assertion_type_to_text;
+	b64_ntop;
+	__b64_ntop;
+	b64_pton;
+	__b64_pton;
+	__ctl_client;
+	__ctl_command;
+	__ctl_endclient;
+	__ctl_endserver;
+	__ctl_getcsctx;
+	__ctl_response;
+	__ctl_sendhelp;
+	__ctl_server;
+	__ctl_setcsctx;
+	daemon;
+	dn_count_labels;
+	__dn_count_labels;
+	dn_skipname;
+	dst_buffer_to_key;
+	dst_check_algorithm;
+	dst_dnskey_to_key;
+	dst_free_key;
+	dst_generate_key;
+	dst_init;
+	dst_key_to_buffer;
+	dst_random;
+	dst_read_key;
+	dst_s_calculate_bits;
+	dst_s_conv_bignum_b64_to_u8;
+	dst_s_conv_bignum_u8_to_b64;
+	dst_s_dns_key_id;
+	dst_s_get_int16;
+	dst_s_id_calc;
+	dst_sign_data;
+	dst_s_put_int16;
+	dst_s_verify_str;
+	dst_t_func;
+	dst_verify_data;
+	dst_write_key;
+	__evAddTime;
+	__evCancelConn;
+	__evCancelRW;
+	__evClearTimer;
+	__evConnect;
+	__evConsIovec;
+	__evConsTime;
+	__evCreate;
+	__evDeselectFD;
+	__evDestroy;
+	__evDispatch;
+	__evDo;
+	__evGetNext;
+	__evHighestFD;
+	__evListen;
+	__evNowTime;
+	__evRead;
+	__evResetTimer;
+	__evSelectFD;
+	__evSetDebug;
+	__evSetTimer;
+	__evTimeVal;
+	__evUnwait;
+	__evWaitFor;
+	fp_nquery;
+	__fp_nquery;
+	fp_query;
+	__fp_resstat;
+	h_errlist;
+	__h_errno;
+	__h_errno_set;
+	hostalias;
+	inet_net_ntop;
+	inet_net_pton;
+	inet_nsap_addr;
+	inet_nsap_ntoa;
+	irs_destroy;
+	__ISC_res_freeupdrec;
+	__ISC_res_mkupdate;
+	__ISC_res_mkupdrec;
+	__ISC_res_nmkupdate;
+	__ISC_res_nupdate;
+	__ISC_res_update;
+	key_file_fmt_str;
+	loc_aton;
+	__loc_aton;
+	loc_ntoa;
+	__loc_ntoa;
+	__log_add_channel;
+	__log_category_is_active;
+	__log_check;
+	__log_close_stream;
+	__log_free_channel;
+	__log_free_context;
+	__log_get_channel_type;
+	__log_get_stream;
+	__log_inc_references;
+	__log_new_context;
+	__log_new_file_channel;
+	__log_new_null_channel;
+	__log_new_syslog_channel;
+	__log_open_stream;
+	__log_option;
+	__log_set_file_owner;
+	__log_vwrite;
+	__log_write;
+	__memget;
+	__memget_record;
+	__memput;
+	__memput_record;
+	__memstats;
+	__net_data_init;
+	net_data_minimize;
+	__ns_datetosecs;
+	__ns_find_tsig;
+	_ns_flagdata;
+	__ns_format_ttl;
+	__ns_get16;
+	__ns_get32;
+	__ns_initparse;
+	__ns_makecanon;
+	__ns_msg_getflag;
+	__ns_name_ntol;
+	__ns_name_ntop;
+	__ns_name_pton;
+	__ns_name_rollback;
+	__ns_name_unpack;
+	__ns_parserr;
+	__ns_parse_ttl;
+	__ns_put16;
+	__ns_samedomain;
+	__ns_samename;
+	__ns_sign;
+	__ns_sign2;
+	__ns_sign_tcp;
+	__ns_sign_tcp2;
+	__ns_sign_tcp_init;
+	__ns_skiprr;
+	__ns_sprintrr;
+	__ns_sprintrrf;
+	__ns_verify;
+	__ns_verify_tcp;
+	__ns_verify_tcp_init;
+	p_cdname;
+	__p_cert_syms;
+	p_class;
+	__p_class_syms;
+	p_fqnname;
+	__p_key_syms;
+	p_query;
+	p_rcode;
+	p_secstodate;
+	__p_secstodate;
+	p_section;
+	__p_section;
+	p_time;
+	p_type;
+	__p_type_syms;
+	putlong;
+	putshort;
+	__putshort;
+	res_close;
+	__res_disable_mt;
+	res_dnok;
+	__res_dnok;
+	__res_enable_mt;
+	res_endhostent;
+	res_findzonecut;
+	res_freehostent;
+	res_freeupdrec;
+	__res_get_h_errno;
+	res_gethostbyaddr;
+	res_gethostbyname;
+	res_gethostent;
+	res_getipnodebyaddr;
+	res_getipnodebyname;
+	__res_get_res;
+	res_hnok;
+	__res_hnok;
+	res_isourserver;
+	res_mailok;
+	__res_mailok;
+	res_mkupdate;
+	res_mkupdrec;
+	res_nameinquery;
+	__res_nameinquery;
+	res_nisourserver;
+	_res_opcodes;
+	__res_override_retry;
+	res_ownok;
+	__res_ownok;
+	res_pquery;
+	res_queriesmatch;
+	__res_queriesmatch;
+	res_randomid;
+	__res_randomid;
+	res_sendsigned;
+	res_sethostent;
+	__res_set_no_hosts_fallback;
+	__res_state;
+	__res_unset_no_hosts_fallback;
+	set_assertion_failure_callback;
+	sym_ntop;
+	__sym_ntop;
+	sym_ntos;
+	__sym_ntos;
+	sym_ston;
+	__sym_ston;
+	tree_add;
+	tree_init;
+	tree_mung;
+	tree_srch;
+	tree_trav;
+    local:
+	*;
 };
diff --git a/usr/src/lib/libresolv2/cylink/Makefile b/usr/src/lib/libresolv2/cylink/Makefile
index cb38b82b0a..0ece5bae46 100644
--- a/usr/src/lib/libresolv2/cylink/Makefile
+++ b/usr/src/lib/libresolv2/cylink/Makefile
@@ -1,15 +1,35 @@
 #
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libresolv2/cylink/Makefile
 
 include		../../../Makefile.master
 include		../../Makefile.lib
 
-SUBDIRS=	spec $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -42,7 +62,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/libresolv2/cylink/Makefile.com b/usr/src/lib/libresolv2/cylink/Makefile.com
index 0edb108d14..e8eedebc14 100644
--- a/usr/src/lib/libresolv2/cylink/Makefile.com
+++ b/usr/src/lib/libresolv2/cylink/Makefile.com
@@ -1,11 +1,29 @@
 #
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libresolv2/cylink/Makefile.com
-#
 
 LIBRARY= cylink.a
 VERS= .1
@@ -25,8 +43,8 @@ LIBNAME=	$(LIBRARY:%.a=%)
 LIBS=		$(DYNLIB)
 LDLIBS +=	-lresolv -lc
 
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+MAPFILES =	../mapfile-vers
+
 SRCDIR=		../../common/cylink
 SRCS=		$(DSTOBJS:%.o=../../common/dst/%.c) \
 		$(CYLINKOBJS:%.o=$(SRCDIR)/%.c)
diff --git a/usr/src/lib/libresolv2/cylink/amd64/Makefile b/usr/src/lib/libresolv2/cylink/amd64/Makefile
index 2b37434e6b..8df6381cfa 100644
--- a/usr/src/lib/libresolv2/cylink/amd64/Makefile
+++ b/usr/src/lib/libresolv2/cylink/amd64/Makefile
@@ -1,12 +1,30 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/libresolv2/cylink/mapfile-vers b/usr/src/lib/libresolv2/cylink/mapfile-vers
new file mode 100644
index 0000000000..d27bbde0ca
--- /dev/null
+++ b/usr/src/lib/libresolv2/cylink/mapfile-vers
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	dst_cylink_init;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libresolv2/dnssafe/Makefile b/usr/src/lib/libresolv2/dnssafe/Makefile
index 03fb3d5f5b..7363b2c344 100644
--- a/usr/src/lib/libresolv2/dnssafe/Makefile
+++ b/usr/src/lib/libresolv2/dnssafe/Makefile
@@ -1,15 +1,35 @@
 #
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libresolv2/dnssafe/Makefile
 
 include		../../../Makefile.master
 include		../../Makefile.lib
 
-SUBDIRS=	spec $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -42,7 +62,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/libresolv2/dnssafe/Makefile.com b/usr/src/lib/libresolv2/dnssafe/Makefile.com
index c3c12e49bd..ec11476c81 100644
--- a/usr/src/lib/libresolv2/dnssafe/Makefile.com
+++ b/usr/src/lib/libresolv2/dnssafe/Makefile.com
@@ -1,11 +1,29 @@
 #
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libresolv2/dnssafe/Makefile.com
-#
 
 LIBRARY= dnssafe.a
 VERS= .1
@@ -43,11 +61,11 @@ LIBNAME=	$(LIBRARY:%.a=%)
 LIBS=		$(DYNLIB)
 LDLIBS +=	-lmd -lresolv -lc
 
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+MAPFILES =	../mapfile-vers
+
 SRCDIR=		../../common/dnssafe
 SRCS=		$(DSTOBJS:%.o=../../common/dst/%.c) \
-		$(DNSSAFEOBJS:%o=$(SRCDIR)/%.c)
+		$(DNSSAFEOBJS:%.o=$(SRCDIR)/%.c)
 
 ROOTLIBDIR=	$(ROOT)/usr/lib/dns
 ROOTLIBDIR64=	$(ROOT)/usr/lib/dns/$(MACH64)
diff --git a/usr/src/lib/libresolv2/dnssafe/amd64/Makefile b/usr/src/lib/libresolv2/dnssafe/amd64/Makefile
index 2b37434e6b..8df6381cfa 100644
--- a/usr/src/lib/libresolv2/dnssafe/amd64/Makefile
+++ b/usr/src/lib/libresolv2/dnssafe/amd64/Makefile
@@ -1,12 +1,30 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/libresolv2/dnssafe/mapfile-vers b/usr/src/lib/libresolv2/dnssafe/mapfile-vers
new file mode 100644
index 0000000000..8da7def4ba
--- /dev/null
+++ b/usr/src/lib/libresolv2/dnssafe/mapfile-vers
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	dst_bsafe_init;
+	dst_eay_dss_init;
+	dst_md5_hmac_init;
+	dst_rsaref_init;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libresolv2/i386/Makefile b/usr/src/lib/libresolv2/i386/Makefile
index 3c5e466c4d..a333224278 100644
--- a/usr/src/lib/libresolv2/i386/Makefile
+++ b/usr/src/lib/libresolv2/i386/Makefile
@@ -1,12 +1,29 @@
 #
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libresolv2/sparc/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libresolv2/irs/Makefile b/usr/src/lib/libresolv2/irs/Makefile
index 42a540092b..476477d9fb 100644
--- a/usr/src/lib/libresolv2/irs/Makefile
+++ b/usr/src/lib/libresolv2/irs/Makefile
@@ -1,15 +1,35 @@
 #
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# CDDL HEADER START
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libresolv2/irs/Makefile
 
 include		../../../Makefile.master
 include		../../Makefile.lib
 
-SUBDIRS=	spec $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -42,7 +62,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/libresolv2/irs/Makefile.com b/usr/src/lib/libresolv2/irs/Makefile.com
index 860edbc7cf..a8e27db89e 100644
--- a/usr/src/lib/libresolv2/irs/Makefile.com
+++ b/usr/src/lib/libresolv2/irs/Makefile.com
@@ -1,11 +1,29 @@
 #
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libresolv2/irs/Makefile.com
-#
 
 LIBRARY= irs.a
 VERS= .1
@@ -29,10 +47,10 @@ LIBNAME=	$(LIBRARY:%.a=%)
 LIBS=		$(DYNLIB)
 LDLIBS +=	-lresolv -lnsl -lsocket -lc
 
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+MAPFILES =	../mapfile-vers
+
 SRCDIR=		../../common/irs
-SRCS=		$(IRSDYNOBJS:%.$(SRCDIR)/%.c) \
+SRCS=		$(IRSDYNOBJS:%.o=$(SRCDIR)/%.c) \
 		$(SUNWOBJS:%.o=../../common/sunw/%.c)
 
 ROOTLIBDIR=	$(ROOT)/usr/lib/dns
diff --git a/usr/src/lib/libresolv2/irs/amd64/Makefile b/usr/src/lib/libresolv2/irs/amd64/Makefile
index 2b37434e6b..8df6381cfa 100644
--- a/usr/src/lib/libresolv2/irs/amd64/Makefile
+++ b/usr/src/lib/libresolv2/irs/amd64/Makefile
@@ -1,12 +1,30 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/libresolv2/irs/mapfile-vers b/usr/src/lib/libresolv2/irs/mapfile-vers
new file mode 100644
index 0000000000..3170dfe489
--- /dev/null
+++ b/usr/src/lib/libresolv2/irs/mapfile-vers
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	__irs_irp_acc;
+	__irs_nis_acc;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libresolv2/sparc/Makefile b/usr/src/lib/libresolv2/sparc/Makefile
index 1dca7a6c60..a333224278 100644
--- a/usr/src/lib/libresolv2/sparc/Makefile
+++ b/usr/src/lib/libresolv2/sparc/Makefile
@@ -1,12 +1,29 @@
 #
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libresolv2/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libresolv2/sparcv9/Makefile b/usr/src/lib/libresolv2/sparcv9/Makefile
index dcec10d2ca..ceed393e0d 100644
--- a/usr/src/lib/libresolv2/sparcv9/Makefile
+++ b/usr/src/lib/libresolv2/sparcv9/Makefile
@@ -1,12 +1,29 @@
 #
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libresolv2/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/librestart/Makefile b/usr/src/lib/librestart/Makefile
index c3334a95af..b88c1c5b27 100644
--- a/usr/src/lib/librestart/Makefile
+++ b/usr/src/lib/librestart/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include		../Makefile.lib
@@ -42,15 +41,13 @@ HDRS =		librestart.h librestart_priv.h
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-lint: $(SUBDIRS)
-
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/librestart/Makefile.com b/usr/src/lib/librestart/Makefile.com
index 364c3b1c8b..4871d4bac5 100644
--- a/usr/src/lib/librestart/Makefile.com
+++ b/usr/src/lib/librestart/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 LIBRARY =	librestart.a
@@ -35,7 +34,6 @@ include ../../Makefile.lib
 include ../../Makefile.rootfs
 
 LIBS =		$(DYNLIB) $(LINTLIB)
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 START_LAZY = -z lazyload
 END_LAZY = -z nolazyload
@@ -47,10 +45,9 @@ LDLIBS +=	$(START_LAZY) -lpool -lproject $(END_LAZY) \
 		-lsecdb -lnvpair -lsysevent -lscf -luutil -lc
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-CFLAGS +=	-v -Wp,-xc99=%all
+CFLAGS +=	$(CCVERBOSE) -Wp,-xc99=%all
 
 CPPFLAGS +=
 
diff --git a/usr/src/lib/librestart/common/mapfile-vers b/usr/src/lib/librestart/common/mapfile-vers
new file mode 100644
index 0000000000..66b61b76fc
--- /dev/null
+++ b/usr/src/lib/librestart/common/mapfile-vers
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	restarter_bind_handle;
+	_restarter_commit_states;
+	restarter_event_get_current_states;
+	restarter_event_get_enabled;
+	restarter_event_get_handle;
+	restarter_event_get_instance;
+	restarter_event_get_seq;
+	restarter_event_get_time;
+	restarter_event_get_type;
+	restarter_free_method_context;
+	_restarter_get_channel_name;
+	restarter_get_method_context;
+	restarter_is_kill_method;
+	restarter_is_kill_proc_method;
+	restarter_is_null_method;
+	restarter_remove_contract;
+	restarter_rm_libs_loadable;
+	restarter_set_method_context;
+	restarter_set_states;
+	restarter_state_to_string;
+	restarter_store_contract;
+	restarter_string_to_state;
+    local:
+	*;
+};
diff --git a/usr/src/lib/librpcsvc/Makefile b/usr/src/lib/librpcsvc/Makefile
index 558858bce5..4e61f7a7e2 100644
--- a/usr/src/lib/librpcsvc/Makefile
+++ b/usr/src/lib/librpcsvc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/librpcsvc/Makefile
-#
 
 include  ../../Makefile.master
 
@@ -69,19 +66,15 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all:	$(DERIVED_FILES) $(TXTS) .WAIT spec .WAIT $(SUBDIRS)
+all:	$(DERIVED_FILES) $(TXTS) .WAIT $(SUBDIRS)
 
-install: all .WAIT spec .WAIT $(SUBDIRS)
+install: all .WAIT $(SUBDIRS)
 
 install_h: $(DERIVED_FILES) $(ROOTHDRS)
 
-lint: $(SUBDIRS)
-
 check: $(CHECKHDRS)
 
-clean clobber : spec .WAIT $(SUBDIRS)
-
-MAPFILE=	mapfile-vers
+clean clobber lint: $(SUBDIRS)
 
 #
 # Rules for building the derived files
@@ -118,7 +111,7 @@ common/rpc_sztypes.c: $(PROTOCOL_DIR)/rpc_sztypes.x
 # include library targets
 include ../Makefile.targ
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/librpcsvc/Makefile.com b/usr/src/lib/librpcsvc/Makefile.com
index 8f8f2d9851..3c4dc1bedd 100644
--- a/usr/src/lib/librpcsvc/Makefile.com
+++ b/usr/src/lib/librpcsvc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/librpcsvc/Makefile
-#
 
 LIBRARY= librpcsvc.a
 VERS = .1
@@ -42,13 +39,7 @@ include ../../Makefile.lib
 # install this library in the root filesystem
 include ../../Makefile.rootfs
 
-# Don't mess with this. DAAMAPFILE gets correctly overridden
-# for 64bit.
-MAPFILE=	$(MAPDIR)/mapfile
-
-CLOBBERFILES +=	$(MAPFILE)
-
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 pics/%.o: ../common/%.c
 	$(COMPILE.c) -o $@ $<
@@ -56,18 +47,11 @@ pics/%.o: ../common/%.c
 
 LIBS = $(DYNLIB)
 
-
 CPPFLAGS += -DYP
 LDLIBS += -lnsl -lc
-DYNFLAGS += -M $(MAPFILE)
 
 .KEEP_STATE:
 
-
-$(DYNLIB): $(MAPFILE)
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 lint:	lintcheck
 
 # include library targets
diff --git a/usr/src/lib/librpcsvc/amd64/Makefile b/usr/src/lib/librpcsvc/amd64/Makefile
index 605222a8ac..9ab764a959 100644
--- a/usr/src/lib/librpcsvc/amd64/Makefile
+++ b/usr/src/lib/librpcsvc/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,21 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
 all: $(LIBS)
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
-
-# This needs to be restated, otherwise we'll be dependent
-# on the 32bit mapfile...
-$(DYNLIB):	$(MAPFILE)
diff --git a/usr/src/lib/librpcsvc/common/mapfile-vers b/usr/src/lib/librpcsvc/common/mapfile-vers
new file mode 100644
index 0000000000..cc9b2e6660
--- /dev/null
+++ b/usr/src/lib/librpcsvc/common/mapfile-vers
@@ -0,0 +1,136 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	havedisk;
+	rnusers;
+	rstat;
+	rusers;
+	rwall;
+	xdr_statstime;
+	xdr_statsvar;
+	xdr_utmpidlearr;
+};
+
+SUNWprivate_1.1 {
+    global:
+	__clnt_bindresvport;
+	xdr_bp_address;
+	xdr_bp_fileid_t;
+	xdr_bp_getfile_arg;
+	xdr_bp_getfile_res;
+	xdr_bp_machine_name_t;
+	xdr_bp_path_t;
+	xdr_bp_whoami_arg;
+	xdr_bp_whoami_res;
+	xdr_dirpath;
+	xdr_exportnode;
+	xdr_exports;
+	xdr_fhandle;
+	xdr_fhandle3;
+	xdr_fhstatus;
+	xdr_fsh4_access;
+	xdr_fsh4_mode;
+	xdr_fsh_access;
+	xdr_fsh_mode;
+	xdr_groupnode;
+	xdr_groups;
+	xdr_int32;
+	xdr_int64;
+	xdr_ip_addr_t;
+	xdr_mon;
+	xdr_mon_id;
+	xdr_mountbody;
+	xdr_mountlist;
+	xdr_mountres3;
+	xdr_mountres3_ok;
+	xdr_mountstat3;
+	xdr_my_id;
+	xdr_name;
+	xdr_nlm4_cancargs;
+	xdr_nlm4_holder;
+	xdr_nlm4_lock;
+	xdr_nlm4_lockargs;
+	xdr_nlm4_notify;
+	xdr_nlm4_res;
+	xdr_nlm4_share;
+	xdr_nlm4_shareargs;
+	xdr_nlm4_shareres;
+	xdr_nlm4_stat;
+	xdr_nlm4_stats;
+	xdr_nlm4_testargs;
+	xdr_nlm4_testres;
+	xdr_nlm4_testrply;
+	xdr_nlm4_unlockargs;
+	xdr_nlm_cancargs;
+	xdr_nlm_holder;
+	xdr_nlm_lock;
+	xdr_nlm_lockargs;
+	xdr_nlm_notify;
+	xdr_nlm_res;
+	xdr_nlm_share;
+	xdr_nlm_shareargs;
+	xdr_nlm_shareres;
+	xdr_nlm_stat;
+	xdr_nlm_stats;
+	xdr_nlm_testargs;
+	xdr_nlm_testres;
+	xdr_nlm_testrply;
+	xdr_nlm_unlockargs;
+	xdr_ppathcnf;
+	xdr_reg1args;
+	xdr_reg1res;
+	xdr_res;
+	xdr_rstat_timeval;
+	xdr_rusers_utmp;
+	xdr_sm_name;
+	xdr_sm_stat;
+	xdr_sm_stat_res;
+	xdr_sprayarr;
+	xdr_spraycumul;
+	xdr_spraytimeval;
+	xdr_stat_chge;
+	xdr_status;
+	xdr_timeval;
+	xdr_uint32;
+	xdr_uint64;
+	xdr_unreg1args;
+	xdr_unreg1res;
+	xdr_utmp_array;
+    local:
+	*;
+};
diff --git a/usr/src/lib/librpcsvc/i386/Makefile b/usr/src/lib/librpcsvc/i386/Makefile
index d51e3be102..340541fb1b 100644
--- a/usr/src/lib/librpcsvc/i386/Makefile
+++ b/usr/src/lib/librpcsvc/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/librpcsvc/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/librpcsvc/sparc/Makefile b/usr/src/lib/librpcsvc/sparc/Makefile
index 673b48987c..340541fb1b 100644
--- a/usr/src/lib/librpcsvc/sparc/Makefile
+++ b/usr/src/lib/librpcsvc/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/librpcsvc/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/librpcsvc/sparcv9/Makefile b/usr/src/lib/librpcsvc/sparcv9/Makefile
index e20daa29e0..9ab764a959 100644
--- a/usr/src/lib/librpcsvc/sparcv9/Makefile
+++ b/usr/src/lib/librpcsvc/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/librpcsvc/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../Makefile.lib.64
@@ -35,7 +31,3 @@ include ../../Makefile.lib.64
 all: $(LIBS)
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64)
-
-# This needs to be restated, otherwise we'll be dependent
-# on the 32bit mapfile...
-$(DYNLIB):	$(MAPFILE)
diff --git a/usr/src/lib/librsc/Makefile.com b/usr/src/lib/librsc/Makefile.com
index f5f08298fd..55f2a98176 100644
--- a/usr/src/lib/librsc/Makefile.com
+++ b/usr/src/lib/librsc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/librsc/Makefile.com
-#
 
 LIBRARY= librsc.a
 VERS= .1
@@ -48,6 +45,9 @@ LINKED_LIBRSC1_DIR	= \
 LINKED_LLIBLRSC_DIR 	= \
 	$(LINKED_PLATFORMS:%=$(USR_PLAT_DIR)/%/lib/llib-lrsc.ln)
 
+# There should be a mapfile here
+MAPFILES =
+
 SRCDIR =	common
 LIBS = $(DYNLIB) $(LINTLIB)
 CFLAGS +=	$(CCVERBOSE)
diff --git a/usr/src/lib/librsm/Makefile b/usr/src/lib/librsm/Makefile
index e4098d8964..dddd826312 100644
--- a/usr/src/lib/librsm/Makefile
+++ b/usr/src/lib/librsm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1998-2001 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/librsm/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all:=           TARGET= all
 clean:=         TARGET= clean
@@ -64,7 +62,7 @@ install_h:	$(ROOTHDRS) $(ROOTSYSHDRS)
 
 check:	$(CHECKHDRS) $(CHECKSYSHDRS)
 
-spec $(MACH) $(MACH64):     FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/librsm/Makefile.com b/usr/src/lib/librsm/Makefile.com
index 86e2b1ae5d..ce497b6ceb 100644
--- a/usr/src/lib/librsm/Makefile.com
+++ b/usr/src/lib/librsm/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -25,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/librsm/Makefile.com
-#
 
 LIBRARY= librsm.a
 VERS= .2
@@ -38,8 +35,7 @@ OBJECTS = rsmlib.o rsmgen.o rsmloopback.o
 # include library definitions, do not change order of include and DYNLIB
 include ../../Makefile.lib
 
-MAPFILE = 	$(MAPDIR)/mapfile
-SRCS =		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS = $(DYNLIB)
 
@@ -54,8 +50,6 @@ $(NOT_RELEASE_BUILD)COPTFLAG64 =
 
 CPPFLAGS = -I../inc -I../../common/inc $(CPPFLAGS.master) -D_REENTRANT $(DEBUG)
 
-DYNFLAGS += -M$(MAPFILE)
-
 LDLIBS += -lc
 
 .KEEP_STATE:
@@ -64,11 +58,6 @@ all:  $(LIBS) fnamecheck
 
 lint: lintcheck
 
-$(DYNLIB): 	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/librsm/amd64/Makefile b/usr/src/lib/librsm/amd64/Makefile
index f42f8846a4..108875b6f6 100644
--- a/usr/src/lib/librsm/amd64/Makefile
+++ b/usr/src/lib/librsm/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR = ../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/librsm/common/mapfile-vers b/usr/src/lib/librsm/common/mapfile-vers
new file mode 100644
index 0000000000..490ac96527
--- /dev/null
+++ b/usr/src/lib/librsm/common/mapfile-vers
@@ -0,0 +1,116 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	rsm_create_localmemory_handle;
+	_rsm_create_localmemory_handle;
+	rsm_free_interconnect_topology;
+	_rsm_free_interconnect_topology;
+	rsm_free_localmemory_handle;
+	_rsm_free_localmemory_handle;
+	rsm_get_controller;
+	_rsm_get_controller;
+	rsm_get_controller_attr;
+	_rsm_get_controller_attr;
+	rsm_get_interconnect_topology;
+	_rsm_get_interconnect_topology;
+	rsm_get_segmentid_range;
+	_rsm_get_segmentid_range;
+	rsm_intr_signal_post;
+	_rsm_intr_signal_post;
+	rsm_intr_signal_wait;
+	_rsm_intr_signal_wait;
+	rsm_intr_signal_wait_pollfd;
+	_rsm_intr_signal_wait_pollfd;
+	rsm_memseg_export_create;
+	_rsm_memseg_export_create;
+	rsm_memseg_export_destroy;
+	_rsm_memseg_export_destroy;
+	rsm_memseg_export_publish;
+	_rsm_memseg_export_publish;
+	rsm_memseg_export_rebind;
+	_rsm_memseg_export_rebind;
+	rsm_memseg_export_republish;
+	_rsm_memseg_export_republish;
+	rsm_memseg_export_unpublish;
+	_rsm_memseg_export_unpublish;
+	rsm_memseg_get_pollfd;
+	_rsm_memseg_get_pollfd;
+	rsm_memseg_import_close_barrier;
+	_rsm_memseg_import_close_barrier;
+	rsm_memseg_import_connect;
+	_rsm_memseg_import_connect;
+	rsm_memseg_import_destroy_barrier;
+	_rsm_memseg_import_destroy_barrier;
+	rsm_memseg_import_disconnect;
+	_rsm_memseg_import_disconnect;
+	rsm_memseg_import_get;
+	_rsm_memseg_import_get;
+	rsm_memseg_import_get16;
+	_rsm_memseg_import_get16;
+	rsm_memseg_import_get32;
+	_rsm_memseg_import_get32;
+	rsm_memseg_import_get64;
+	_rsm_memseg_import_get64;
+	rsm_memseg_import_get8;
+	_rsm_memseg_import_get8;
+	rsm_memseg_import_get_mode;
+	_rsm_memseg_import_get_mode;
+	rsm_memseg_import_getv;
+	_rsm_memseg_import_getv;
+	rsm_memseg_import_init_barrier;
+	_rsm_memseg_import_init_barrier;
+	rsm_memseg_import_map;
+	_rsm_memseg_import_map;
+	rsm_memseg_import_open_barrier;
+	_rsm_memseg_import_open_barrier;
+	rsm_memseg_import_order_barrier;
+	_rsm_memseg_import_order_barrier;
+	rsm_memseg_import_put;
+	_rsm_memseg_import_put;
+	rsm_memseg_import_put16;
+	_rsm_memseg_import_put16;
+	rsm_memseg_import_put32;
+	_rsm_memseg_import_put32;
+	rsm_memseg_import_put64;
+	_rsm_memseg_import_put64;
+	rsm_memseg_import_put8;
+	_rsm_memseg_import_put8;
+	rsm_memseg_import_putv;
+	_rsm_memseg_import_putv;
+	rsm_memseg_import_set_mode;
+	_rsm_memseg_import_set_mode;
+	rsm_memseg_import_unmap;
+	_rsm_memseg_import_unmap;
+	rsm_memseg_release_pollfd;
+	_rsm_memseg_release_pollfd;
+	rsm_release_controller;
+	_rsm_release_controller;
+    local:
+	*;
+};
diff --git a/usr/src/lib/librsm/i386/Makefile b/usr/src/lib/librsm/i386/Makefile
index 4a1e19c980..ff6859db70 100644
--- a/usr/src/lib/librsm/i386/Makefile
+++ b/usr/src/lib/librsm/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/librsm/i386/Makefile
-#
-
-MAPDIR = ../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/librsm/sparc/Makefile b/usr/src/lib/librsm/sparc/Makefile
index 80d8716b05..ff6859db70 100644
--- a/usr/src/lib/librsm/sparc/Makefile
+++ b/usr/src/lib/librsm/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/librsm/sparc/Makefile
-#
-
-MAPDIR = ../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/librsm/sparcv9/Makefile b/usr/src/lib/librsm/sparcv9/Makefile
index d33234814f..d579ebda99 100644
--- a/usr/src/lib/librsm/sparcv9/Makefile
+++ b/usr/src/lib/librsm/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/librsm/sparcv9/Makefile
-#
-
-MAPDIR = ../spec/sparcv9
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/librt/Makefile.com b/usr/src/lib/librt/Makefile.com
index 66458cd5b4..9e9c0075fa 100644
--- a/usr/src/lib/librt/Makefile.com
+++ b/usr/src/lib/librt/Makefile.com
@@ -31,16 +31,14 @@ VERS = .1
 include ../../Makefile.lib
 include ../../Makefile.rootfs
 
-MAPFILES=	mapfile-vers $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
-
-DYNFLAGS +=	-F libc.so.1 $(MAPOPTS)
+DYNFLAGS +=	-F libc.so.1
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 SRCDIR =	../common
 $(LINTLIB) :=	SRCS = $(SRCDIR)/llib-lrt
 
+MAPFILES =	mapfile-vers $(MAPFILE-FLTR)
 
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
 # and .fini sections being added).  Also, since there are no OBJECTS, turn
@@ -56,5 +54,3 @@ include ../../Makefile.targ
 all:	$(LIBS)
 
 lint:
-
-$(DYNLIB):	$(MAPFILES)
diff --git a/usr/src/lib/libsasl/Makefile b/usr/src/lib/libsasl/Makefile
index 10981ca87a..dab3a911ba 100644
--- a/usr/src/lib/libsasl/Makefile
+++ b/usr/src/lib/libsasl/Makefile
@@ -1,11 +1,29 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libsasl/Makefile
-#
 
 include	../Makefile.lib
 
@@ -14,7 +32,6 @@ HDRDIR=		include
 ROOTHDRDIR=	$(ROOT)/usr/include/sasl
 
 SUBDIRS =	$(MACH)
-
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
@@ -35,9 +52,7 @@ MSGFILES=	lib/canonusr.c lib/checkpw.c lib/client.c lib/common.c \
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
@@ -50,7 +65,7 @@ _msg: $(MSGDOMAINPOFILE)
 
 include $(SRC)/Makefile.msg.targ
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libsasl/Makefile.com b/usr/src/lib/libsasl/Makefile.com
index a28a4f4c84..0403f1fa15 100644
--- a/usr/src/lib/libsasl/Makefile.com
+++ b/usr/src/lib/libsasl/Makefile.com
@@ -1,11 +1,29 @@
 #
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libsasl/Makefile.com
-#
 
 LIBRARY= libsasl.a
 VERS= .1
@@ -29,8 +47,6 @@ LINTFLAGS64 +=	-DPIC
 
 SRCDIR=		../lib
 PLUGDIR=	../plugin
-MAPDIR= 	../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
 
 CFLAGS +=	$(CCVERBOSE) $(XSTRCONST)
 CFLAGS64 +=	$(XSTRCONST)
diff --git a/usr/src/lib/libsasl/lib/mapfile-vers b/usr/src/lib/libsasl/lib/mapfile-vers
new file mode 100644
index 0000000000..b11be0fd7c
--- /dev/null
+++ b/usr/src/lib/libsasl/lib/mapfile-vers
@@ -0,0 +1,95 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	prop_clear;
+	prop_dispose;
+	prop_dup;
+	prop_erase;
+	prop_format;
+	prop_get;
+	prop_getnames;
+	prop_new;
+	prop_request;
+	prop_set;
+	prop_setvals;
+	sasl_auxprop_add_plugin;
+	sasl_auxprop_getctx;
+	sasl_auxprop_request;
+	sasl_canonuser_add_plugin;
+	sasl_checkapop;
+	sasl_checkpass;
+	sasl_client_add_plugin;
+	sasl_client_init;
+	sasl_client_new;
+	sasl_client_start;
+	sasl_client_step;
+	sasl_decode;
+	sasl_decode64;
+	sasl_dispose;
+	sasl_done;
+	sasl_encode;
+	sasl_encode64;
+	sasl_encodev;
+	sasl_erasebuffer;
+	sasl_errdetail;
+	sasl_errstring;
+	sasl_getprop;
+	sasl_global_listmech;
+	sasl_idle;
+	sasl_listmech;
+	sasl_server_add_plugin;
+	sasl_server_init;
+	sasl_server_new;
+	sasl_server_start;
+	sasl_server_step;
+	sasl_set_alloc;
+	sasl_seterror;
+	sasl_set_mutex;
+	sasl_setpass;
+	sasl_setprop;
+	sasl_user_exists;
+	sasl_utf8verify;
+	sasl_version;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_sasl_auxprop_add_plugin;
+	_sasl_canonuser_add_plugin;
+	_sasl_client_add_plugin;
+	_sasl_client_init;
+	_sasl_client_new;
+	sasl_create_context;
+	sasl_free_context;
+	_sasl_server_add_plugin;
+	_sasl_server_init;
+	_sasl_server_new;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libscf/Makefile b/usr/src/lib/libscf/Makefile
index e1b724a1b1..9925a9ed2e 100644
--- a/usr/src/lib/libscf/Makefile
+++ b/usr/src/lib/libscf/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 #
@@ -55,7 +54,9 @@ XGETFLAGS +=	-a
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT native $(SUBDIRS)
+all clean clobber install: native $(SUBDIRS)
+
+lint: $(SUBDIRS)
 
 $(POFILE):	pofile_MSGFILES
 
@@ -63,11 +64,9 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-lint: $(SUBDIRS)
-
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) native spec: FRC
+$(SUBDIRS) native: FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libscf/Makefile.com b/usr/src/lib/libscf/Makefile.com
index f3822557c7..4bfbd1a811 100644
--- a/usr/src/lib/libscf/Makefile.com
+++ b/usr/src/lib/libscf/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -44,16 +43,14 @@ $(NOT_NATIVE)NATIVE_BUILD = $(POUND_SIGN)
 $(NATIVE_BUILD)VERS =
 $(NATIVE_BUILD)LIBS = $(DYNLIB)
 
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-luutil -lc
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 COMDIR =	../../../common/svc
 
-CFLAGS +=	-v -Wp,-xc99=%all
+CFLAGS +=	$(CCVERBOSE) -Wp,-xc99=%all
 CPPFLAGS +=	-I../inc -I../../common/inc -I$(COMDIR)
 
 #
diff --git a/usr/src/lib/libscf/common/mapfile-vers b/usr/src/lib/libscf/common/mapfile-vers
new file mode 100644
index 0000000000..9efd0293b7
--- /dev/null
+++ b/usr/src/lib/libscf/common/mapfile-vers
@@ -0,0 +1,230 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	scf_entry_add_value;
+	scf_entry_create;
+	scf_entry_destroy;
+	scf_entry_destroy_children;
+	scf_entry_handle;
+	scf_entry_reset;
+	scf_error;
+	scf_handle_bind;
+	scf_handle_create;
+	scf_handle_decode_fmri;
+	scf_handle_decorate;
+	scf_handle_destroy;
+	scf_handle_get_scope;
+	scf_handle_unbind;
+	scf_instance_add_pg;
+	scf_instance_create;
+	scf_instance_delete;
+	scf_instance_destroy;
+	scf_instance_get_name;
+	scf_instance_get_parent;
+	scf_instance_get_pg;
+	scf_instance_get_pg_composed;
+	scf_instance_get_snapshot;
+	scf_instance_handle;
+	scf_instance_to_fmri;
+	scf_iter_create;
+	scf_iter_destroy;
+	scf_iter_handle;
+	scf_iter_handle_scopes;
+	scf_iter_instance_pgs;
+	scf_iter_instance_pgs_composed;
+	scf_iter_instance_pgs_typed;
+	scf_iter_instance_pgs_typed_composed;
+	scf_iter_instance_snapshots;
+	scf_iter_next_instance;
+	scf_iter_next_pg;
+	scf_iter_next_property;
+	scf_iter_next_scope;
+	scf_iter_next_service;
+	scf_iter_next_snapshot;
+	scf_iter_next_value;
+	scf_iter_pg_properties;
+	scf_iter_property_values;
+	scf_iter_reset;
+	scf_iter_scope_services;
+	scf_iter_service_instances;
+	scf_iter_service_pgs;
+	scf_iter_service_pgs_typed;
+	scf_iter_snaplevel_pgs;
+	scf_iter_snaplevel_pgs_typed;
+	scf_limit;
+	scf_myname;
+	scf_pg_create;
+	scf_pg_delete;
+	scf_pg_destroy;
+	scf_pg_get_flags;
+	scf_pg_get_name;
+	scf_pg_get_parent_instance;
+	scf_pg_get_parent_service;
+	scf_pg_get_parent_snaplevel;
+	scf_pg_get_property;
+	scf_pg_get_type;
+	scf_pg_get_underlying_pg;
+	scf_pg_handle;
+	scf_pg_to_fmri;
+	scf_pg_update;
+	scf_property_create;
+	scf_property_destroy;
+	scf_property_get_name;
+	scf_property_get_value;
+	scf_property_handle;
+	scf_property_is_type;
+	scf_property_to_fmri;
+	scf_property_type;
+	scf_scope_add_service;
+	scf_scope_create;
+	scf_scope_destroy;
+	scf_scope_get_name;
+	scf_scope_get_parent;
+	scf_scope_get_service;
+	scf_scope_handle;
+	scf_scope_to_fmri;
+	scf_service_add_instance;
+	scf_service_add_pg;
+	scf_service_create;
+	scf_service_delete;
+	scf_service_destroy;
+	scf_service_get_instance;
+	scf_service_get_name;
+	scf_service_get_parent;
+	scf_service_get_pg;
+	scf_service_handle;
+	scf_service_to_fmri;
+	scf_simple_app_props_free;
+	scf_simple_app_props_get;
+	scf_simple_app_props_next;
+	scf_simple_app_props_search;
+	scf_simple_prop_free;
+	scf_simple_prop_get;
+	scf_simple_prop_name;
+	scf_simple_prop_next_astring;
+	scf_simple_prop_next_boolean;
+	scf_simple_prop_next_count;
+	scf_simple_prop_next_integer;
+	scf_simple_prop_next_opaque;
+	scf_simple_prop_next_reset;
+	scf_simple_prop_next_time;
+	scf_simple_prop_next_ustring;
+	scf_simple_prop_numvalues;
+	scf_simple_prop_pgname;
+	scf_simple_prop_type;
+	scf_simple_walk_instances;
+	scf_snaplevel_create;
+	scf_snaplevel_destroy;
+	scf_snaplevel_get_instance_name;
+	scf_snaplevel_get_next_snaplevel;
+	scf_snaplevel_get_parent;
+	scf_snaplevel_get_pg;
+	scf_snaplevel_get_scope_name;
+	scf_snaplevel_get_service_name;
+	scf_snaplevel_handle;
+	scf_snapshot_create;
+	scf_snapshot_destroy;
+	scf_snapshot_get_base_snaplevel;
+	scf_snapshot_get_name;
+	scf_snapshot_get_parent;
+	scf_snapshot_handle;
+	scf_snapshot_update;
+	scf_strerror;
+	scf_transaction_commit;
+	scf_transaction_create;
+	scf_transaction_destroy;
+	scf_transaction_destroy_children;
+	scf_transaction_handle;
+	scf_transaction_property_change;
+	scf_transaction_property_change_type;
+	scf_transaction_property_delete;
+	scf_transaction_property_new;
+	scf_transaction_reset;
+	scf_transaction_reset_all;
+	scf_transaction_start;
+	scf_type_base_type;
+	scf_value_base_type;
+	scf_value_create;
+	scf_value_destroy;
+	scf_value_get_as_string;
+	scf_value_get_as_string_typed;
+	scf_value_get_astring;
+	scf_value_get_boolean;
+	scf_value_get_count;
+	scf_value_get_integer;
+	scf_value_get_opaque;
+	scf_value_get_time;
+	scf_value_get_ustring;
+	scf_value_handle;
+	scf_value_is_type;
+	scf_value_reset;
+	scf_value_set_astring;
+	scf_value_set_boolean;
+	scf_value_set_count;
+	scf_value_set_from_string;
+	scf_value_set_integer;
+	scf_value_set_opaque;
+	scf_value_set_time;
+	scf_value_set_ustring;
+	scf_value_type;
+	smf_degrade_instance;
+	smf_disable_instance;
+	smf_enable_instance;
+	smf_get_state;
+	smf_maintain_instance;
+	smf_refresh_instance;
+	smf_restart_instance;
+	smf_restore_instance;
+};
+
+SUNWprivate_1.1 {
+    global:
+	scf_canonify_fmri;
+	scf_cmp_pattern;
+	_scf_handle_decorations;
+	_scf_notify_add_pgname;
+	_scf_notify_add_pgtype;
+	_scf_notify_wait;
+	scf_parse_file_fmri;
+	scf_parse_fmri;
+	scf_parse_svc_fmri;
+	_scf_pg_wait;
+	_scf_request_backup;
+	_scf_snapshot_attach;
+	_scf_snapshot_delete;
+	_scf_snapshot_take_attach;
+	_scf_snapshot_take_new;
+	_scf_snapshot_take_new_named;
+	scf_string_to_type;
+	scf_type_to_string;
+	scf_walk_fmri;
+	_smf_refresh_instance_i;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libsched/Makefile.com b/usr/src/lib/libsched/Makefile.com
index 8fd0e48916..c2d68d7f75 100644
--- a/usr/src/lib/libsched/Makefile.com
+++ b/usr/src/lib/libsched/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -35,11 +34,10 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 $(LINTLIB) :=	SRCS = ../common/llib-lsched
 
 SRCDIR=		../common
-MAPFILES=	../common/mapfile-vers $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
 
-DYNFLAGS +=	-F libc.so.1 $(MAPOPTS)
+MAPFILES +=	$(MAPFILE-FLTR)
 
+DYNFLAGS +=	-F libc.so.1
 
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
 # and .fini sections being added).  Also, since there are no OBJECTS, turn
diff --git a/usr/src/lib/libsctp/Makefile b/usr/src/lib/libsctp/Makefile
index 13666c41a1..3bfcbd1888 100644
--- a/usr/src/lib/libsctp/Makefile
+++ b/usr/src/lib/libsctp/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -39,13 +38,9 @@ lint	:= TARGET= lint
 
 .KEEP_STATE:
 
-all install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
-clean clobber: spec $(SUBDIRS)
-
-lint: $(SUBDIRS)
-
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libsctp/Makefile.com b/usr/src/lib/libsctp/Makefile.com
index fdefdaac88..689f18d5b3 100644
--- a/usr/src/lib/libsctp/Makefile.com
+++ b/usr/src/lib/libsctp/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -37,10 +36,7 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lsocket -lc
 
-MAPDIR  =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
-CFLAGS +=	-v
+CFLAGS +=	$(CCVERBOSE)
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libsctp/common/mapfile-vers b/usr/src/lib/libsctp/common/mapfile-vers
new file mode 100644
index 0000000000..c27042b00b
--- /dev/null
+++ b/usr/src/lib/libsctp/common/mapfile-vers
@@ -0,0 +1,42 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	sctp_bindx;
+	sctp_freeladdrs;
+	sctp_freepaddrs;
+	sctp_getladdrs;
+	sctp_getpaddrs;
+	sctp_opt_info;
+	sctp_peeloff;
+	sctp_recvmsg;
+	sctp_send;
+	sctp_sendmsg;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libsec/Makefile b/usr/src/lib/libsec/Makefile
index 8859248afd..c83d290f9d 100644
--- a/usr/src/lib/libsec/Makefile
+++ b/usr/src/lib/libsec/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -23,14 +22,14 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libsec/Makefile
 
 include		../Makefile.lib
 
 HDRDIR=		common
 HDRS=		aclutils.h
+
 SUBDIRS=	$(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
@@ -48,19 +47,17 @@ POFILE=		libsec.po
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS) 
+all clean clobber install lint: $(SUBDIRS) 
 
 $(POFILE):	pofile_MSGFILES
 
-lint: $(SUBDIRS)
-
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
 _msg: $(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libsec/Makefile.com b/usr/src/lib/libsec/Makefile.com
index 2145f769a2..45e074e745 100644
--- a/usr/src/lib/libsec/Makefile.com
+++ b/usr/src/lib/libsec/Makefile.com
@@ -24,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libsec/Makefile.com
-#
 
 LIBRARY= libsec.a
 VERS= .1
@@ -42,6 +40,8 @@ LINTSRCS = $(OBJS_COMMON)
 # include library definitions
 include ../../Makefile.lib
 
+SRCDIR=		../common
+
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 CFLAGS +=	$(CCVERBOSE)
@@ -56,10 +56,6 @@ SRCS=		$(OBJS_COMMON:%.o=$(SRCDIR)/%.c) \
 
 $(LINTLIB):= SRCS=	$(SRCDIR)/$(LINTSRC)
 
-SRCDIR=		../common
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libsec/amd64/Makefile b/usr/src/lib/libsec/amd64/Makefile
index 29ebb8f58b..e24ef38245 100644
--- a/usr/src/lib/libsec/amd64/Makefile
+++ b/usr/src/lib/libsec/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libsec/common/mapfile-vers b/usr/src/lib/libsec/common/mapfile-vers
new file mode 100644
index 0000000000..e4216cf692
--- /dev/null
+++ b/usr/src/lib/libsec/common/mapfile-vers
@@ -0,0 +1,79 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+	acl_check;
+	acl_free;
+	acl_fromtext;
+	acl_get;
+	acl_set;
+	acl_strip;
+	acl_totext;
+	acl_trivial;
+	facl_get;
+	facl_set;
+} SUNW_1.1;
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.1 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+} SUNW_0.9;
+
+SUNW_0.9 {
+    global:
+	aclcheck;
+	aclfrommode;
+	aclfromtext;
+	aclsort;
+	acltomode;
+	acltotext;
+};
+
+SUNWprivate_1.1 {
+    global:
+	acl_addentries;
+	acl_alloc;
+	acl_cnt;
+	acl_data;
+	acl_dup;
+	acl_error;
+	acl_flags;
+	acl_modifyentries;
+	acl_parse;
+	acl_printacl;
+	acl_removeentries;
+	acl_strerror;
+	acl_to_aclp;
+	acl_type;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libsec/i386/Makefile b/usr/src/lib/libsec/i386/Makefile
index 765e97be50..2a944b0b43 100644
--- a/usr/src/lib/libsec/i386/Makefile
+++ b/usr/src/lib/libsec/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libsec/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libsec/sparc/Makefile b/usr/src/lib/libsec/sparc/Makefile
index 2a9a1e2be2..2a944b0b43 100644
--- a/usr/src/lib/libsec/sparc/Makefile
+++ b/usr/src/lib/libsec/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libsec/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libsec/sparcv9/Makefile b/usr/src/lib/libsec/sparcv9/Makefile
index 9234baa89e..e24ef38245 100644
--- a/usr/src/lib/libsec/sparcv9/Makefile
+++ b/usr/src/lib/libsec/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libsec/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/libsecdb/Makefile b/usr/src/lib/libsecdb/Makefile
index 2fbf9fc112..6dbeb3267d 100644
--- a/usr/src/lib/libsecdb/Makefile
+++ b/usr/src/lib/libsecdb/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,17 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/libsecdb/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
 
-SUBDIRS=	spec .WAIT help $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	help $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
+
 MSGSUBDIRS=	help
 
 all:=		TARGET= all
@@ -112,7 +111,7 @@ $(CLASS_SCR_DIR)/%: $(CLASS_SCR_SRC_DIR)/%
 clobber clean:
 	$(RM) $(ATTR_FILES)
 
-spec help $(MACH) $(MACH64) :	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libsecdb/Makefile.com b/usr/src/lib/libsecdb/Makefile.com
index e12380bb6e..565045492f 100644
--- a/usr/src/lib/libsecdb/Makefile.com
+++ b/usr/src/lib/libsecdb/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -37,12 +36,10 @@ include ../../Makefile.lib
 include ../../Makefile.rootfs
 
 LIBS =		$(DYNLIB) $(LINTLIB)
-$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lc -lnsl -lcmd
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT
diff --git a/usr/src/lib/libsecdb/common/mapfile-vers b/usr/src/lib/libsecdb/common/mapfile-vers
new file mode 100644
index 0000000000..63e8c70206
--- /dev/null
+++ b/usr/src/lib/libsecdb/common/mapfile-vers
@@ -0,0 +1,76 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	chkauthattr;
+	endauthattr;
+	endexecattr;
+	endprofattr;
+	enduserattr;
+	fgetuserattr;
+	free_authattr;
+	free_execattr;
+	free_profattr;
+	free_proflist;
+	free_userattr;
+	getauthattr;
+	getauthnam;
+	getexecattr;
+	getexecprof;
+	getexecuser;
+	getprofattr;
+	getproflist;
+	getprofnam;
+	getuserattr;
+	getusernam;
+	getuseruid;
+	kva_match;
+	match_execattr;
+	setauthattr;
+	setexecattr;
+	setprofattr;
+	setuserattr;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_argv_to_csl;
+	_auth_match;
+	_csl_to_argv;
+	_do_unescape;
+	_free_argv;
+	_get_auth_policy;
+	_insert2kva;
+	_kva2str;
+	_kva_dup;
+	_kva_free;
+	_new_kva;
+	_str2kva;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libsendfile/Makefile b/usr/src/lib/libsendfile/Makefile
index bda4771ea7..80b0e8c55f 100644
--- a/usr/src/lib/libsendfile/Makefile
+++ b/usr/src/lib/libsendfile/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
@@ -39,11 +38,9 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
-lint: $(SUBDIRS)
-
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libsendfile/Makefile.com b/usr/src/lib/libsendfile/Makefile.com
index c1810c305b..b0bb417688 100644
--- a/usr/src/lib/libsendfile/Makefile.com
+++ b/usr/src/lib/libsendfile/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -36,8 +35,9 @@ include ../../Makefile.lib
 include ../../Makefile.rootfs
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+
+MAPFILES +=	$(MAPFILE32)
+
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 LIBS =		$(DYNLIB) $(LINTLIB)
diff --git a/usr/src/lib/libsendfile/amd64/Makefile b/usr/src/lib/libsendfile/amd64/Makefile
index cb39a2beff..f69d11f706 100644
--- a/usr/src/lib/libsendfile/amd64/Makefile
+++ b/usr/src/lib/libsendfile/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
+MAPFILE32 =
+
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libsendfile/common/mapfile-vers b/usr/src/lib/libsendfile/common/mapfile-vers
new file mode 100644
index 0000000000..d310fba714
--- /dev/null
+++ b/usr/src/lib/libsendfile/common/mapfile-vers
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	sendfile;
+	sendfilev;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libsendfile/common/mapfile32-vers b/usr/src/lib/libsendfile/common/mapfile32-vers
new file mode 100644
index 0000000000..82488f393c
--- /dev/null
+++ b/usr/src/lib/libsendfile/common/mapfile32-vers
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {	# largefile interfaces for 32-bit applications
+    global:
+	sendfile64;
+	sendfilev64;
+};
diff --git a/usr/src/lib/libsendfile/i386/Makefile b/usr/src/lib/libsendfile/i386/Makefile
index 19a9e65a11..a579a6b1b6 100644
--- a/usr/src/lib/libsendfile/i386/Makefile
+++ b/usr/src/lib/libsendfile/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
+MAPFILE32 = ../common/mapfile32-vers
+
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libsendfile/sparc/Makefile b/usr/src/lib/libsendfile/sparc/Makefile
index 19a9e65a11..a579a6b1b6 100644
--- a/usr/src/lib/libsendfile/sparc/Makefile
+++ b/usr/src/lib/libsendfile/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
+MAPFILE32 = ../common/mapfile32-vers
+
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libsendfile/sparcv9/Makefile b/usr/src/lib/libsendfile/sparcv9/Makefile
index 87e9702141..f69d11f706 100644
--- a/usr/src/lib/libsendfile/sparcv9/Makefile
+++ b/usr/src/lib/libsendfile/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
+MAPFILE32 =
+
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libsldap/Makefile b/usr/src/lib/libsldap/Makefile
index b81cdd4072..e535561e35 100644
--- a/usr/src/lib/libsldap/Makefile
+++ b/usr/src/lib/libsldap/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# lib/libsldap/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include			../Makefile.lib
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -56,7 +54,7 @@ all clean clobber delete install lint catalog package: $(SUBDIRS)
 $(ROOTHDRDIR)/%: %
 	$(INS.file)
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/libsldap/Makefile.com b/usr/src/lib/libsldap/Makefile.com
index 8a5c871ed8..ce3a899fec 100644
--- a/usr/src/lib/libsldap/Makefile.com
+++ b/usr/src/lib/libsldap/Makefile.com
@@ -44,8 +44,6 @@ $(LINTLIB):= 	SRCS=../common/llib-lsldap
 LDLIBS +=	-lnsl -lldap -lc
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
 
 CFLAGS +=	$(CCVERBOSE)
 LOCFLAGS +=	-D_REENTRANT -DSUNW_OPTIONS -DTHREAD_SUNOS5_LWP
diff --git a/usr/src/lib/libsldap/common/mapfile-vers b/usr/src/lib/libsldap/common/mapfile-vers
new file mode 100644
index 0000000000..37fd9dd2be
--- /dev/null
+++ b/usr/src/lib/libsldap/common/mapfile-vers
@@ -0,0 +1,94 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# There really should be only one SUNWprivate version.
+# Don't add any more.  Add new private symbols to SUNWprivate_1.1
+
+SUNWprivate_1.1 {
+    global:
+	__ns_ldap_getAcctMgmt;
+	__s_api_get_canonical_name;
+} SUNWprivate_1.0;
+
+SUNWprivate_1.0 {
+    global:
+	__getldapaliasbyname;
+	__ns_ldap_addAttr;
+	__ns_ldap_addEntry;
+	__ns_ldap_addTypedEntry;
+	__ns_ldap_auth;
+	__ns_ldap_cache_ping;
+	__ns_ldap_default_config;
+	__ns_ldap_delAttr;
+	__ns_ldap_delEntry;
+	__ns_ldap_dn2domain;
+	__ns_ldap_download;
+	__ns_ldap_DumpConfiguration;
+	__ns_ldap_DumpLdif;
+	__ns_ldap_endEntry;
+	__ns_ldap_err2str;
+	__ns_ldap_firstEntry;
+	__ns_ldap_freeAttributeMaps;
+	__ns_ldap_freeCred;
+	__ns_ldap_freeError;
+	__ns_ldap_freeObjectClassMaps;
+	__ns_ldap_freeParam;
+	__ns_ldap_freeResult;
+	__ns_ldap_freeSearchDescriptors;
+	__ns_ldap_getAttr;
+	__ns_ldap_getAttributeMaps;
+	__ns_ldap_getMappedAttributes;
+	__ns_ldap_getMappedObjectClass;
+	__ns_ldap_getObjectClassMaps;
+	__ns_ldap_getOrigAttribute;
+	__ns_ldap_getOrigObjectClass;
+	__ns_ldap_getParam;
+	__ns_ldap_getParamType;
+	__ns_ldap_getSearchDescriptors;
+	__ns_ldap_getServiceAuthMethods;
+	__ns_ldap_host2dn;
+	__ns_ldap_list;
+	__ns_ldap_LoadConfiguration;
+	__ns_ldap_LoadDoorInfo;
+	__ns_ldap_make_config;
+	__ns_ldap_nextEntry;
+	__ns_ldap_print_config;
+	__ns_ldap_repAttr;
+	__ns_ldap_setParam;
+	__ns_ldap_setParamValue;
+	__ns_ldap_setServer;
+	__ns_ldap_trydoorcall;
+	__ns_ldap_uid2dn;
+	__s_api_crosscheck;
+	__s_api_destroy_config;
+	__s_api_free2dArray;
+	__s_api_getServers;
+	__s_api_init_config;
+	__s_api_prepend_automountmapname_to_dn;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libslp/Makefile b/usr/src/lib/libslp/Makefile
index fa78f1fdea..77b05be5b8 100644
--- a/usr/src/lib/libslp/Makefile
+++ b/usr/src/lib/libslp/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,15 +19,17 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1999, by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
+
 include $(SRC)/Makefile.master
 
 SLP_COMPONENTS= javalib etc
-SUBDIRS= spec .WAIT  $(SLP_COMPONENTS) $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(SLP_COMPONENTS) $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # include library definitions
 include ../Makefile.lib
@@ -73,7 +74,7 @@ install_h:	$(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec $(SLP_COMPONENTS):	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libslp/Makefile.com b/usr/src/lib/libslp/Makefile.com
index 991787a315..c7b8fa21b8 100644
--- a/usr/src/lib/libslp/Makefile.com
+++ b/usr/src/lib/libslp/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -43,7 +42,6 @@ LDLIBS +=	-lc -lnsl -lsocket
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../clib
-SPECMAPFILE =	$(MAPDIR)/mapfile
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-D_REENTRANT -I../clib -I$(JAVA_ROOT)/include \
diff --git a/usr/src/lib/libslp/amd64/Makefile b/usr/src/lib/libslp/amd64/Makefile
index 38f51189f5..d50a21bdb0 100644
--- a/usr/src/lib/libslp/amd64/Makefile
+++ b/usr/src/lib/libslp/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libslp/clib/mapfile-vers b/usr/src/lib/libslp/clib/mapfile-vers
new file mode 100644
index 0000000000..94649ea895
--- /dev/null
+++ b/usr/src/lib/libslp/clib/mapfile-vers
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	SLPClose;
+	SLPDelAttrs;
+	SLPDereg;
+	SLPEscape;
+	SLPFindAttrs;
+	SLPFindScopes;
+	SLPFindSrvs;
+	SLPFindSrvTypes;
+	SLPFree;
+	SLPGetProperty;
+	SLPGetRefreshInterval;
+	SLPOpen;
+	SLPParseSrvURL;
+	SLPReg;
+	SLPSetProperty;
+	slp_strerror;
+	SLPUnescape;
+};
+
+SUNWprivate_1.1 {
+    global:
+	Java_com_sun_slp_Syslog_syslog;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libslp/i386/Makefile b/usr/src/lib/libslp/i386/Makefile
index 24558151a9..2a944b0b43 100644
--- a/usr/src/lib/libslp/i386/Makefile
+++ b/usr/src/lib/libslp/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1998, by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/i386
-
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libslp/sparc/Makefile b/usr/src/lib/libslp/sparc/Makefile
index 1a02ffeea6..2a944b0b43 100644
--- a/usr/src/lib/libslp/sparc/Makefile
+++ b/usr/src/lib/libslp/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1998, by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/sparc
-
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libslp/sparcv9/Makefile b/usr/src/lib/libslp/sparcv9/Makefile
index 9d4f243dcb..d50a21bdb0 100644
--- a/usr/src/lib/libslp/sparcv9/Makefile
+++ b/usr/src/lib/libslp/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1998, by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/sparcv9
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libsmbios/Makefile b/usr/src/lib/libsmbios/Makefile
index 6869a3bc4e..065ab04fdd 100644
--- a/usr/src/lib/libsmbios/Makefile
+++ b/usr/src/lib/libsmbios/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include ../Makefile.lib
 
@@ -41,15 +41,13 @@ lint := TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libsmbios/Makefile.com b/usr/src/lib/libsmbios/Makefile.com
index 83f112299b..176df10d8d 100644
--- a/usr/src/lib/libsmbios/Makefile.com
+++ b/usr/src/lib/libsmbios/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY = libsmbios.a
 VERS = .1
@@ -49,7 +49,7 @@ SRCS = $(COMMON_OBJS:%.o=$(COMMON_SRCDIR)/%.c) $(LIB_OBJS:%.o=../common/%.c)
 LIBS = $(DYNLIB) $(LINTLIB)
 
 SRCDIR = ../common
-SPECMAPFILE = $(MAPDIR)/mapfile
+
 CLEANFILES += ../common/smb_tables.c
 
 CPPFLAGS += -I../common -I$(COMMON_SRCDIR)
diff --git a/usr/src/lib/libsmbios/amd64/Makefile b/usr/src/lib/libsmbios/amd64/Makefile
index 7b40f7053a..c9bd26cfd3 100644
--- a/usr/src/lib/libsmbios/amd64/Makefile
+++ b/usr/src/lib/libsmbios/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libsmbios/common/mapfile-vers b/usr/src/lib/libsmbios/common/mapfile-vers
new file mode 100644
index 0000000000..10a042638f
--- /dev/null
+++ b/usr/src/lib/libsmbios/common/mapfile-vers
@@ -0,0 +1,119 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	_smb_debug;
+	smbios_bboard_flag_desc;
+	smbios_bboard_flag_name;
+	smbios_bboard_type_desc;
+	smbios_bios_flag_desc;
+	smbios_bios_flag_name;
+	smbios_bios_xb1_desc;
+	smbios_bios_xb1_name;
+	smbios_bios_xb2_desc;
+	smbios_bios_xb2_name;
+	smbios_boot_desc;
+	smbios_buf;
+	smbios_buflen;
+	smbios_bufopen;
+	smbios_cache_assoc_desc;
+	smbios_cache_ctype_desc;
+	smbios_cache_ctype_name;
+	smbios_cache_ecc_desc;
+	smbios_cache_flag_desc;
+	smbios_cache_flag_name;
+	smbios_cache_loc_desc;
+	smbios_cache_logical_desc;
+	smbios_cache_mode_desc;
+	smbios_chassis_state_desc;
+	smbios_chassis_type_desc;
+	smbios_checksum;
+	smbios_close;
+	smbios_errmsg;
+	smbios_errno;
+	smbios_evlog_flag_desc;
+	smbios_evlog_flag_name;
+	smbios_evlog_format_desc;
+	smbios_evlog_method_desc;
+	smbios_fdopen;
+	smbios_hwsec_desc;
+	smbios_info_bboard;
+	smbios_info_bios;
+	smbios_info_boot;
+	smbios_info_cache;
+	smbios_info_chassis;
+	smbios_info_common;
+	smbios_info_eventlog;
+	smbios_info_hwsec;
+	smbios_info_ipmi;
+	smbios_info_lang;
+	smbios_info_memarray;
+	smbios_info_memarrmap;
+	smbios_info_memdevice;
+	smbios_info_memdevmap;
+	smbios_info_obdevs;
+	smbios_info_port;
+	smbios_info_processor;
+	smbios_info_slot;
+	smbios_info_smbios;
+	smbios_info_strtab;
+	smbios_info_system;
+	smbios_ipmi_flag_desc;
+	smbios_ipmi_flag_name;
+	smbios_ipmi_type_desc;
+	smbios_iter;
+	smbios_lookup_id;
+	smbios_memarray_ecc_desc;
+	smbios_memarray_loc_desc;
+	smbios_memarray_use_desc;
+	smbios_memdevice_flag_desc;
+	smbios_memdevice_flag_name;
+	smbios_memdevice_form_desc;
+	smbios_memdevice_type_desc;
+	smbios_open;
+	smbios_port_conn_desc;
+	smbios_port_type_desc;
+	smbios_processor_family_desc;
+	smbios_processor_status_desc;
+	smbios_processor_type_desc;
+	smbios_processor_upgrade_desc;
+	smbios_slot_ch1_desc;
+	smbios_slot_ch1_name;
+	smbios_slot_ch2_desc;
+	smbios_slot_ch2_name;
+	smbios_slot_length_desc;
+	smbios_slot_type_desc;
+	smbios_slot_usage_desc;
+	smbios_slot_width_desc;
+	smbios_system_wakeup_desc;
+	smbios_type_desc;
+	smbios_type_name;
+	smbios_write;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libsmbios/i386/Makefile b/usr/src/lib/libsmbios/i386/Makefile
index 5b2f167595..a333224278 100644
--- a/usr/src/lib/libsmbios/i386/Makefile
+++ b/usr/src/lib/libsmbios/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/i386
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libsmbios/sparc/Makefile b/usr/src/lib/libsmbios/sparc/Makefile
index dca1669f5d..a333224278 100644
--- a/usr/src/lib/libsmbios/sparc/Makefile
+++ b/usr/src/lib/libsmbios/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/sparc
 include ../Makefile.com
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/libsmbios/sparcv9/Makefile b/usr/src/lib/libsmbios/sparcv9/Makefile
index 0f01536cf7..c9bd26cfd3 100644
--- a/usr/src/lib/libsmbios/sparcv9/Makefile
+++ b/usr/src/lib/libsmbios/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-MAPDIR = ../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libsmedia/library/Makefile b/usr/src/lib/libsmedia/library/Makefile
index c1ab69ccaa..1ee16b5b19 100644
--- a/usr/src/lib/libsmedia/library/Makefile
+++ b/usr/src/lib/libsmedia/library/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,19 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libsmedia/library/Makefile
 
 include		../../Makefile.lib
 
-sparc_ARCHITECTURES = sparc sparcv9
-i386_ARCHITECTURES =    i386 $(BUILD64) amd64
-
-SUBDIRS=	spec .WAIT $($(MACH)_ARCHITECTURES)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -74,7 +70,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec :	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 catalog: $(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/libsmedia/library/Makefile.com b/usr/src/lib/libsmedia/library/Makefile.com
index b52e218688..afd20c4864 100644
--- a/usr/src/lib/libsmedia/library/Makefile.com
+++ b/usr/src/lib/libsmedia/library/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -36,8 +35,8 @@ DERIVED_FILES = smed.h smed_clnt.c smed_xdr.c
 # include library definitions
 include ../../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
+
 # We can't lint the rpcgen-generated files.
 # (Well, we could, but we couldn't fix them.)
 lintcheck := SRCS = ../common/l_generic.c ../common/l_misc.c
@@ -54,7 +53,6 @@ CLEANFILES +=	$(DERIVED_FILES:%=../common/%)
 CPPFLAGS += -D_REENTRANT -I$(SRC)/cmd/smserverd/
 CFLAGS +=	$(CCVERBOSE) 
 CFLAGS64 +=	$(CCVERBOSE)
-DYNFLAGS +=	-M $(MAPFILE)
 
 LDLIBS +=	-lnsl -lc
 
@@ -64,11 +62,6 @@ all: $(LIBS)
 
 lint:	lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../../Makefile.targ
 
diff --git a/usr/src/lib/libsmedia/library/amd64/Makefile b/usr/src/lib/libsmedia/library/amd64/Makefile
index 20dc45f385..4b07c3a63e 100644
--- a/usr/src/lib/libsmedia/library/amd64/Makefile
+++ b/usr/src/lib/libsmedia/library/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../../Makefile.lib.64
 
diff --git a/usr/src/lib/libsmedia/library/common/mapfile-vers b/usr/src/lib/libsmedia/library/common/mapfile-vers
new file mode 100644
index 0000000000..256921105b
--- /dev/null
+++ b/usr/src/lib/libsmedia/library/common/mapfile-vers
@@ -0,0 +1,47 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	smedia_check_format_status;
+	smedia_eject;
+	smedia_format;
+	smedia_format_track;
+	smedia_free_device_info;
+	smedia_get_device_info;
+	smedia_get_handle;
+	smedia_get_medium_property;
+	smedia_get_protection_status;
+	smedia_raw_read;
+	smedia_raw_write;
+	smedia_reassign_block;
+	smedia_release_handle;
+	smedia_set_protection_status;
+	smedia_uscsi_cmd;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libsmedia/library/i386/Makefile b/usr/src/lib/libsmedia/library/i386/Makefile
index 0e06bf4e32..50cbcb01b9 100644
--- a/usr/src/lib/libsmedia/library/i386/Makefile
+++ b/usr/src/lib/libsmedia/library/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/library/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libsmedia/library/sparc/Makefile b/usr/src/lib/libsmedia/library/sparc/Makefile
index f596f4ee3c..6cfe59363b 100644
--- a/usr/src/lib/libsmedia/library/sparc/Makefile
+++ b/usr/src/lib/libsmedia/library/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/library/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libsmedia/library/sparcv9/Makefile b/usr/src/lib/libsmedia/library/sparcv9/Makefile
index bca5a2faf3..4b07c3a63e 100644
--- a/usr/src/lib/libsmedia/library/sparcv9/Makefile
+++ b/usr/src/lib/libsmedia/library/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/library/sparc/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../../Makefile.lib.64
diff --git a/usr/src/lib/libsmedia/plugins/Makefile.com b/usr/src/lib/libsmedia/plugins/Makefile.com
index 54d571c3fe..f1fa1c19e2 100644
--- a/usr/src/lib/libsmedia/plugins/Makefile.com
+++ b/usr/src/lib/libsmedia/plugins/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,19 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libsmedia/plugins/Makefile.com
-
-MAPFILE=	$(MAPDIR)/mapfile
 
 LIBS =		$(DYNLIB)
 
 CPPFLAGS +=	-I../inc -I$(SRC)/cmd/smserverd/
-DYNFLAGS +=	-M $(MAPFILE)
 LDLIBS +=	-lc $(PLUGIN_SPECIFIC_LIB)
 
 LINTPLUGIN  = llib-$(LIBNAME).ln
@@ -45,9 +40,9 @@ PLUGINS  = $(LIBS:%=$(PLUGINDIR)/%)
 PLUGINS64  = $(LIBS:%=$(PLUGINDIR64)/%)
 
 CLEANFILES=	$(LINTOUT) $(LINTPLUGIN)
-CLOBBERFILES +=	$(MAPFILE)
 
-SRCS = $(OBJECTS:%.o=../common/%.c) 
+SRCDIR =	../common
+
 LINTFLAGS += -xu
 LINTFLAGS64 += -xu
 $(LINTPLUGIN) :=	SRCS=$(OBJECTS:%.o=../common/%.c)
@@ -58,13 +53,8 @@ LINTSRC=	$(LINTPLUGIN:%.ln=%)
 ROOTLINTDIR=	$(ROOTLIBDIR)
 ROOTLINT=	$(LINTSRC:%=$(ROOTLINTDIR)/%)
 
-$(DYNLIB):	$(MAPFILE)
-
 .KEEP_STATE:
 
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 lint:	lintcheck
 
 objs/%.o pics/%.o: ../common/%.c
diff --git a/usr/src/lib/libsmedia/plugins/Makefile.plugin b/usr/src/lib/libsmedia/plugins/Makefile.plugin
index 9dfaf2acce..0dd6e561b6 100644
--- a/usr/src/lib/libsmedia/plugins/Makefile.plugin
+++ b/usr/src/lib/libsmedia/plugins/Makefile.plugin
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libsmedia/plugins/Makefile.plugin
-#
-# This file contains the targets and rules for plugins
 
-MAPFILE=	$(MAPDIR)/mapfile
 LIBS =		$(DYNLIB)
 
 CPPFLAGS +=	-I../inc -I$(SRC)/cmd/smserverd/
@@ -39,10 +34,8 @@ POFILE_SRCS =  $(OBJECTS:%.o=common/%.c)
 SED	= /usr/bin/sed
 CP	= /usr/bin/cp
 
-i386_ARCHITECTURES =    i386 $(BUILD64) amd64
-sparc_ARCHITECTURES =   sparc sparcv9
-
-SUBDIRS=	spec .WAIT $($(MACH)_ARCHITECTURES)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -55,7 +48,7 @@ all install clean lint: $(SUBDIRS)
 clobber : $(SUBDIRS)
 	$(RM) -f $(POFILE)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libsmedia/plugins/floppy/amd64/Makefile b/usr/src/lib/libsmedia/plugins/floppy/amd64/Makefile
index 58b8e02555..fb4ba5994f 100644
--- a/usr/src/lib/libsmedia/plugins/floppy/amd64/Makefile
+++ b/usr/src/lib/libsmedia/plugins/floppy/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.targ
 include ../../../../Makefile.lib
 include ../../../../Makefile.targ
diff --git a/usr/src/lib/libsmedia/plugins/floppy/common/mapfile-vers b/usr/src/lib/libsmedia/plugins/floppy/common/mapfile-vers
new file mode 100644
index 0000000000..c23d711f40
--- /dev/null
+++ b/usr/src/lib/libsmedia/plugins/floppy/common/mapfile-vers
@@ -0,0 +1,43 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	_m_device_type;
+	_m_eject;
+	_m_free_device_info;
+	_m_get_device_info;
+	_m_get_media_info;
+	_m_get_media_status;
+	_m_media_format;
+	_m_media_format_track;
+	_m_raw_read;
+	_m_raw_write;
+	_m_version_no;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libsmedia/plugins/floppy/i386/Makefile b/usr/src/lib/libsmedia/plugins/floppy/i386/Makefile
index ce6e9af6c8..988437ada2 100644
--- a/usr/src/lib/libsmedia/plugins/floppy/i386/Makefile
+++ b/usr/src/lib/libsmedia/plugins/floppy/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/pluggins/floppy/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.targ
 include ../../../../Makefile.lib
diff --git a/usr/src/lib/libsmedia/plugins/floppy/sparc/Makefile b/usr/src/lib/libsmedia/plugins/floppy/sparc/Makefile
index e4fa346d00..eed569e3d1 100644
--- a/usr/src/lib/libsmedia/plugins/floppy/sparc/Makefile
+++ b/usr/src/lib/libsmedia/plugins/floppy/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/pluggins/floppy/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.targ
 include ../../../../Makefile.lib
diff --git a/usr/src/lib/libsmedia/plugins/floppy/sparcv9/Makefile b/usr/src/lib/libsmedia/plugins/floppy/sparcv9/Makefile
index 5c9b07f4c3..fb4ba5994f 100644
--- a/usr/src/lib/libsmedia/plugins/floppy/sparcv9/Makefile
+++ b/usr/src/lib/libsmedia/plugins/floppy/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/pluggins/floppy/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.targ
 include ../../../../Makefile.lib
diff --git a/usr/src/lib/libsmedia/plugins/pcata/amd64/Makefile b/usr/src/lib/libsmedia/plugins/pcata/amd64/Makefile
index 7eb8ee482f..26912cfea9 100644
--- a/usr/src/lib/libsmedia/plugins/pcata/amd64/Makefile
+++ b/usr/src/lib/libsmedia/plugins/pcata/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.targ
 include	../../../../Makefile.lib
 include	../../../../Makefile.targ
diff --git a/usr/src/lib/libsmedia/plugins/pcata/common/mapfile-vers b/usr/src/lib/libsmedia/plugins/pcata/common/mapfile-vers
new file mode 100644
index 0000000000..89e17d0348
--- /dev/null
+++ b/usr/src/lib/libsmedia/plugins/pcata/common/mapfile-vers
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	_m_device_type;
+	_m_free_device_info;
+	_m_get_device_info;
+	_m_get_media_info;
+	_m_version_no;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libsmedia/plugins/pcata/i386/Makefile b/usr/src/lib/libsmedia/plugins/pcata/i386/Makefile
index 1efc944766..b402f394dc 100644
--- a/usr/src/lib/libsmedia/plugins/pcata/i386/Makefile
+++ b/usr/src/lib/libsmedia/plugins/pcata/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/plugins/pcata/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.targ
 include	../../../../Makefile.lib
diff --git a/usr/src/lib/libsmedia/plugins/pcata/sparc/Makefile b/usr/src/lib/libsmedia/plugins/pcata/sparc/Makefile
index c7e928ce1d..b402f394dc 100644
--- a/usr/src/lib/libsmedia/plugins/pcata/sparc/Makefile
+++ b/usr/src/lib/libsmedia/plugins/pcata/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/plugin/pcata/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.targ
 include	../../../../Makefile.lib
diff --git a/usr/src/lib/libsmedia/plugins/pcata/sparcv9/Makefile b/usr/src/lib/libsmedia/plugins/pcata/sparcv9/Makefile
index 6c5a0633bf..26912cfea9 100644
--- a/usr/src/lib/libsmedia/plugins/pcata/sparcv9/Makefile
+++ b/usr/src/lib/libsmedia/plugins/pcata/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/plugins/pcata/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.targ
 include	../../../../Makefile.lib
diff --git a/usr/src/lib/libsmedia/plugins/pcmem/amd64/Makefile b/usr/src/lib/libsmedia/plugins/pcmem/amd64/Makefile
index 58b8e02555..fb4ba5994f 100644
--- a/usr/src/lib/libsmedia/plugins/pcmem/amd64/Makefile
+++ b/usr/src/lib/libsmedia/plugins/pcmem/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.targ
 include ../../../../Makefile.lib
 include ../../../../Makefile.targ
diff --git a/usr/src/lib/libsmedia/plugins/pcmem/common/mapfile-vers b/usr/src/lib/libsmedia/plugins/pcmem/common/mapfile-vers
new file mode 100644
index 0000000000..98459fec6d
--- /dev/null
+++ b/usr/src/lib/libsmedia/plugins/pcmem/common/mapfile-vers
@@ -0,0 +1,39 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	_m_device_type;
+	_m_free_device_info;
+	_m_get_device_info;
+	_m_get_media_info;
+	_m_media_format;
+	_m_media_format_track;
+	_m_version_no;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libsmedia/plugins/pcmem/i386/Makefile b/usr/src/lib/libsmedia/plugins/pcmem/i386/Makefile
index 7f7cdf740e..988437ada2 100644
--- a/usr/src/lib/libsmedia/plugins/pcmem/i386/Makefile
+++ b/usr/src/lib/libsmedia/plugins/pcmem/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libsmedia/plugins/pcmem/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.targ
 include ../../../../Makefile.lib
diff --git a/usr/src/lib/libsmedia/plugins/pcmem/sparc/Makefile b/usr/src/lib/libsmedia/plugins/pcmem/sparc/Makefile
index 71091c72f7..eed569e3d1 100644
--- a/usr/src/lib/libsmedia/plugins/pcmem/sparc/Makefile
+++ b/usr/src/lib/libsmedia/plugins/pcmem/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/plugins/pcmem/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.targ
 include ../../../../Makefile.lib
diff --git a/usr/src/lib/libsmedia/plugins/pcmem/sparcv9/Makefile b/usr/src/lib/libsmedia/plugins/pcmem/sparcv9/Makefile
index c9e0ee0c8a..fb4ba5994f 100644
--- a/usr/src/lib/libsmedia/plugins/pcmem/sparcv9/Makefile
+++ b/usr/src/lib/libsmedia/plugins/pcmem/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/plugins/pcmem/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.targ
 include ../../../../Makefile.lib
diff --git a/usr/src/lib/libsmedia/plugins/scsi/amd64/Makefile b/usr/src/lib/libsmedia/plugins/scsi/amd64/Makefile
index 7eb8ee482f..26912cfea9 100644
--- a/usr/src/lib/libsmedia/plugins/scsi/amd64/Makefile
+++ b/usr/src/lib/libsmedia/plugins/scsi/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.targ
 include	../../../../Makefile.lib
 include	../../../../Makefile.targ
diff --git a/usr/src/lib/libsmedia/plugins/scsi/common/mapfile-vers b/usr/src/lib/libsmedia/plugins/scsi/common/mapfile-vers
new file mode 100644
index 0000000000..9b1290498a
--- /dev/null
+++ b/usr/src/lib/libsmedia/plugins/scsi/common/mapfile-vers
@@ -0,0 +1,46 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	_m_check_format_status;
+	_m_device_type;
+	_m_eject;
+	_m_free_device_info;
+	_m_get_device_info;
+	_m_get_media_info;
+	_m_get_media_status;
+	_m_media_format;
+	_m_raw_read;
+	_m_raw_write;
+	_m_reassign_block;
+	_m_set_media_status;
+	_m_uscsi_cmd;
+	_m_version_no;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libsmedia/plugins/scsi/i386/Makefile b/usr/src/lib/libsmedia/plugins/scsi/i386/Makefile
index 4baf8fc9ea..b402f394dc 100644
--- a/usr/src/lib/libsmedia/plugins/scsi/i386/Makefile
+++ b/usr/src/lib/libsmedia/plugins/scsi/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/plugins/scsi/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.targ
 include	../../../../Makefile.lib
diff --git a/usr/src/lib/libsmedia/plugins/scsi/sparc/Makefile b/usr/src/lib/libsmedia/plugins/scsi/sparc/Makefile
index 6d45989da2..b402f394dc 100644
--- a/usr/src/lib/libsmedia/plugins/scsi/sparc/Makefile
+++ b/usr/src/lib/libsmedia/plugins/scsi/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/plugin/scsi/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.targ
 include	../../../../Makefile.lib
diff --git a/usr/src/lib/libsmedia/plugins/scsi/sparcv9/Makefile b/usr/src/lib/libsmedia/plugins/scsi/sparcv9/Makefile
index 35033237a8..26912cfea9 100644
--- a/usr/src/lib/libsmedia/plugins/scsi/sparcv9/Makefile
+++ b/usr/src/lib/libsmedia/plugins/scsi/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libmedia/plugins/scsi/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.targ
 include	../../../../Makefile.lib
diff --git a/usr/src/lib/libsocket/Makefile b/usr/src/lib/libsocket/Makefile
index 6252e47d92..18d1f13290 100644
--- a/usr/src/lib/libsocket/Makefile
+++ b/usr/src/lib/libsocket/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1993-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
@@ -44,15 +43,13 @@ TEXT_DOMAIN =	SUNW_OST_NETRPC
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg: $(MSGDOMAINPOFILE)
 
 $(POFILE): pofile_MSGFILES
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libsocket/Makefile.com b/usr/src/lib/libsocket/Makefile.com
index 4664a4e7bb..74b3b5c364 100644
--- a/usr/src/lib/libsocket/Makefile.com
+++ b/usr/src/lib/libsocket/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -46,12 +45,12 @@ include ../../Makefile.rootfs
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 SRCS =		$(INETOBJS:%.o=../inet/%.c) $(SOCKOBJS:%.o=../socket/%.c)
-$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lnsl -lc
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
+
+MAPFILES +=	mapfile-vers
 
 CPPFLAGS +=	-DSYSV -D_REENTRANT -I../../common/inc
 %/rcmd.o :=	CPPFLAGS += -DNIS
diff --git a/usr/src/lib/libsocket/amd64/mapfile-vers b/usr/src/lib/libsocket/amd64/mapfile-vers
new file mode 100644
index 0000000000..399acbda69
--- /dev/null
+++ b/usr/src/lib/libsocket/amd64/mapfile-vers
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_0.7 {
+    global:
+	accept;
+	bind;
+	connect;
+	getpeername;
+	getprotobyname;
+	getprotobynumber;
+	getprotoent;
+	getservbyname;
+	getservbyport;
+	getsockname;
+	getsockopt;
+	inet_lnaof;
+	inet_makeaddr;
+	inet_network;
+	listen;
+	recv;
+	recvfrom;
+	recvmsg;
+	send;
+	sendmsg;
+	sendto;
+	setsockopt;
+	shutdown;
+	socket;
+};
diff --git a/usr/src/lib/libsocket/common/mapfile-vers b/usr/src/lib/libsocket/common/mapfile-vers
new file mode 100644
index 0000000000..81c0972716
--- /dev/null
+++ b/usr/src/lib/libsocket/common/mapfile-vers
@@ -0,0 +1,178 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.6 {
+    global:
+	getipv4sourcefilter;
+	getsourcefilter;
+	setipv4sourcefilter;
+	setsourcefilter;
+} SUNW_1.5;
+
+SUNW_1.5 {
+    global:
+	inet6_opt_append;
+	inet6_opt_find;
+	inet6_opt_finish;
+	inet6_opt_get_val;
+	inet6_opt_init;
+	inet6_opt_next;
+	inet6_opt_set_val;
+	inet6_rth_add;
+	inet6_rth_getaddr;
+	inet6_rth_init;
+	inet6_rth_reverse;
+	inet6_rth_segments;
+	inet6_rth_space;
+	sockatmark;
+	__xnet_getaddrinfo;
+} SUNW_1.4;
+
+SUNW_1.4 {
+    global:
+	freeaddrinfo;
+	gai_strerror;
+	getaddrinfo;
+	getnameinfo;
+	if_freenameindex;
+	if_indextoname;
+	if_nameindex;
+	if_nametoindex;
+	in6addr_any;
+	in6addr_loopback;
+	rcmd_af;
+	rexec_af;
+	rresvport_af;
+} SUNW_1.3;
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.2 or SUNW_1.3 symbols, but they are now kept as placeholders.
+# Don't add any symbols to these versions.
+
+SUNW_1.3 {
+    global:
+	SUNW_1.3;
+} SUNW_1.2;
+
+SUNW_1.2 {
+    global:
+	SUNW_1.2;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	__xnet_bind;
+	__xnet_connect;
+	__xnet_getsockopt;
+	__xnet_listen;
+	__xnet_recvmsg;
+	__xnet_sendmsg;
+	__xnet_sendto;
+	__xnet_socket;
+	__xnet_socketpair;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	endnetent;
+	endprotoent;
+	endservent;
+	ether_aton;
+	ether_hostton;
+	ether_line;
+	ether_ntoa;
+	ether_ntohost;
+	getnetbyaddr;
+	getnetbyaddr_r;
+	getnetbyname;
+	getnetbyname_r;
+	getnetent;
+	getnetent_r;
+	getprotobyname_r;
+	getprotobynumber_r;
+	getprotoent_r;
+	getservbyname_r;
+	getservbyport_r;
+	getservent;
+	getservent_r;
+	htonl;
+	htons;
+	ntohl;
+	ntohs;
+	rcmd;
+	rexec;
+	rresvport;
+	ruserok;
+	setnetent;
+	setprotoent;
+	setservent;
+	socketpair;
+};
+
+# There really should be only one SUNWprivate version.
+# Don't add any more.  Add new private symbols to SUNWprivate_1.3
+
+SUNWprivate_1.3 {
+    global:
+	_link_aton;
+	_link_ntoa;
+} SUNWprivate_1.2;
+
+SUNWprivate_1.2 {
+    global:
+	getnetmaskbyaddr;
+	getnetmaskbynet;
+} SUNWprivate_1.1;
+
+SUNWprivate_1.1 {
+    global:
+	_accept;
+	_bind;
+	bindresvport;
+	bootparams_getbyname;
+	_connect;
+	_getpeername;
+	_getsockname;
+	_getsockopt;
+	_listen;
+	_recv;
+	_recvfrom;
+	_recvmsg;
+	rresvport_addr;
+	_ruserpass;
+	_send;
+	_sendmsg;
+	_sendto;
+	_setsockopt;
+	_shutdown;
+	_socket;
+	_socket_bsd;
+	_socketpair;
+	_socketpair_bsd;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libsocket/i386/mapfile-vers b/usr/src/lib/libsocket/i386/mapfile-vers
new file mode 100644
index 0000000000..399acbda69
--- /dev/null
+++ b/usr/src/lib/libsocket/i386/mapfile-vers
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_0.7 {
+    global:
+	accept;
+	bind;
+	connect;
+	getpeername;
+	getprotobyname;
+	getprotobynumber;
+	getprotoent;
+	getservbyname;
+	getservbyport;
+	getsockname;
+	getsockopt;
+	inet_lnaof;
+	inet_makeaddr;
+	inet_network;
+	listen;
+	recv;
+	recvfrom;
+	recvmsg;
+	send;
+	sendmsg;
+	sendto;
+	setsockopt;
+	shutdown;
+	socket;
+};
diff --git a/usr/src/lib/libsocket/inet/byteorder.c b/usr/src/lib/libsocket/inet/byteorder.c
index 1b325c6c5e..b28bfebdd0 100644
--- a/usr/src/lib/libsocket/inet/byteorder.c
+++ b/usr/src/lib/libsocket/inet/byteorder.c
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -30,7 +30,8 @@
 #include <sys/types.h>
 
 
-#ifdef	_LITTLE_ENDIAN
+#if defined(_LITTLE_ENDIAN) && !defined(__lint)
+
 #error	Use ISA-specific byteorder.s on a little-endian machine.
 
 #else	/* !_LITTLE_ENDIAN */
@@ -58,4 +59,5 @@ ntohs(uint16_t in)
 {
 	return (in);
 }
+
 #endif	/* _LITTLE_ENDIAN */
diff --git a/usr/src/lib/libsocket/sparc/mapfile-vers b/usr/src/lib/libsocket/sparc/mapfile-vers
new file mode 100644
index 0000000000..02547154b6
--- /dev/null
+++ b/usr/src/lib/libsocket/sparc/mapfile-vers
@@ -0,0 +1,58 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_0.7 {
+    global:
+} SISCD_2.3;
+
+SISCD_2.3 {
+    global:
+	accept;
+	bind;
+	connect;
+	getpeername;
+	getprotobyname;
+	getprotobynumber;
+	getprotoent;
+	getservbyname;
+	getservbyport;
+	getsockname;
+	getsockopt;
+	inet_lnaof;
+	inet_makeaddr;
+	inet_network;
+	listen;
+	recv;
+	recvfrom;
+	recvmsg;
+	send;
+	sendmsg;
+	sendto;
+	setsockopt;
+	shutdown;
+	socket;
+};
diff --git a/usr/src/lib/libsocket/sparcv9/mapfile-vers b/usr/src/lib/libsocket/sparcv9/mapfile-vers
new file mode 100644
index 0000000000..399acbda69
--- /dev/null
+++ b/usr/src/lib/libsocket/sparcv9/mapfile-vers
@@ -0,0 +1,54 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_0.7 {
+    global:
+	accept;
+	bind;
+	connect;
+	getpeername;
+	getprotobyname;
+	getprotobynumber;
+	getprotoent;
+	getservbyname;
+	getservbyport;
+	getsockname;
+	getsockopt;
+	inet_lnaof;
+	inet_makeaddr;
+	inet_network;
+	listen;
+	recv;
+	recvfrom;
+	recvmsg;
+	send;
+	sendmsg;
+	sendto;
+	setsockopt;
+	shutdown;
+	socket;
+};
diff --git a/usr/src/lib/libsys/Makefile.com b/usr/src/lib/libsys/Makefile.com
index ef37bbf272..3f5359c93e 100644
--- a/usr/src/lib/libsys/Makefile.com
+++ b/usr/src/lib/libsys/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libsys/Makefile.com
-#
 
 LIBRARY=	libsys.a
 VERS=		.1
@@ -36,13 +33,13 @@ OBJECTS=	$(COMOBJ)  $(MACHOBJ)
 
 include 	../../../lib/Makefile.lib
 
-MAPFILES=	mapfile-vers $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M%)
+MAPFILES =	mapfile-vers $(MAPFILE-FLTR)
 
 # Define libsys to be a filter on libc.  The ABI requires the runtime linker as
 # the soname.
 
-DYNFLAGS +=	-F/usr/lib/libc.so.1 $(MAPOPTS)
+DYNFLAGS +=	-F/usr/lib/libc.so.1
+
 SONAME=		/usr/lib/ld.so.1
 
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
@@ -55,4 +52,4 @@ pics/%.o :=	ASFLAGS += $(AS_PICFLAGS)
 COMSRC=		$(COMOBJ:%.o=%.c)
 MACHSRC=	$(MACHOBJ:%.o=%.s)
 
-CLOBBERFILES +=	$(DYNLIB)  $(LIBLINKS)  $(COMSRC)  $(MACHSRC) $(MAPFILE)
+CLOBBERFILES +=	$(DYNLIB)  $(LIBLINKS)  $(COMSRC)  $(MACHSRC)
diff --git a/usr/src/lib/libsys/Makefile.targ b/usr/src/lib/libsys/Makefile.targ
index e447c21727..c78f09af6a 100644
--- a/usr/src/lib/libsys/Makefile.targ
+++ b/usr/src/lib/libsys/Makefile.targ
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 pics/%.o:	%.s
 		$(COMPILE.s) -o $@ $<
@@ -33,8 +33,6 @@ pics/%.o:	%.c
 		$(COMPILE.c) -o $@ $<
 		$(POST_PROCESS_O)
 
-$(DYNLIB):	$(MAPFILES)
-
 include		../../../lib/Makefile.targ
 
 FRC:
diff --git a/usr/src/lib/libsysevent/Makefile b/usr/src/lib/libsysevent/Makefile
index 7edc64ff6f..15ab4b3c28 100644
--- a/usr/src/lib/libsysevent/Makefile
+++ b/usr/src/lib/libsysevent/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,19 +19,16 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2000,2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/libsysevent/Makefile
-#
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-# include library definitions
 include ../Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
 all :=		TARGET= all
@@ -61,7 +57,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libsysevent/Makefile.com b/usr/src/lib/libsysevent/Makefile.com
index 5abbe900e7..dcb6517a0d 100644
--- a/usr/src/lib/libsysevent/Makefile.com
+++ b/usr/src/lib/libsysevent/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -37,11 +36,6 @@ OBJECTS=	libsysevent.o		\
 include ../../Makefile.lib
 include ../../Makefile.rootfs
 
-SRCS=		$(OBJECTS:%.o=../%.c)
-
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 LINTSRC =       $(LINTLIB:%.ln=%)
diff --git a/usr/src/lib/libsysevent/mapfile-vers b/usr/src/lib/libsysevent/mapfile-vers
new file mode 100644
index 0000000000..78d82b15d8
--- /dev/null
+++ b/usr/src/lib/libsysevent/mapfile-vers
@@ -0,0 +1,88 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.2 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.2 {
+    global:
+	SUNW_1.2;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	sysevent_bind_handle;
+	sysevent_free;
+	sysevent_get_attr_list;
+	sysevent_get_class_name;
+	sysevent_get_pid;
+	sysevent_get_pub_name;
+	sysevent_get_seq;
+	sysevent_get_size;
+	sysevent_get_subclass_name;
+	sysevent_get_time;
+	sysevent_get_vendor_name;
+	sysevent_post_event;
+	sysevent_subscribe_event;
+	sysevent_unbind_handle;
+	sysevent_unsubscribe_event;
+};
+
+SUNWprivate_1.1 {
+    global:
+	se_print;
+	sysevent_alloc_event;
+	sysevent_attr_name;
+	sysevent_attr_next;
+	sysevent_attr_value;
+	sysevent_bind_publisher;
+	sysevent_bind_subscriber;
+	sysevent_cleanup_publishers;
+	sysevent_cleanup_subscribers;
+	sysevent_close_channel;
+	sysevent_dup;
+	sysevent_evc_bind;
+	sysevent_evc_control;
+	sysevent_evc_publish;
+	sysevent_evc_subscribe;
+	sysevent_evc_unbind;
+	sysevent_evc_unsubscribe;
+	sysevent_get_class;
+	sysevent_get_pub;
+	sysevent_get_subclass;
+	sysevent_lookup_attr;
+	sysevent_open_channel;
+	sysevent_open_channel_alt;
+	sysevent_register_event;
+	sysevent_send_event;
+	sysevent_unbind_publisher;
+	sysevent_unbind_subscriber;
+	sysevent_unregister_event;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libtecla/Makefile b/usr/src/lib/libtecla/Makefile
index 9c29c15300..e5d9e1e429 100644
--- a/usr/src/lib/libtecla/Makefile
+++ b/usr/src/lib/libtecla/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -31,6 +30,7 @@ include		../Makefile.lib
 HDRS =		libtecla.h
 CHECKHDRS =
 HDRDIR =	.
+
 SUBDIRS=	$(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
@@ -42,15 +42,13 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
 check:		$(CHECKHDRS)
 
-lint:		$(SUBDIRS)
-
-spec $(SUBDIRS):  FRC
+$(SUBDIRS):  FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libtecla/Makefile.com b/usr/src/lib/libtecla/Makefile.com
index ac2630ecd1..f80b1320b6 100644
--- a/usr/src/lib/libtecla/Makefile.com
+++ b/usr/src/lib/libtecla/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,6 +33,7 @@ OBJECTS=	getline.o keytab.o freelist.o strngmem.o hash.o history.o \
 
 include ../../Makefile.lib
 
+SRCDIR =	../common
 LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc
 $(DYNLIB) :=	LDLIBS += -lcurses
@@ -46,10 +46,6 @@ CPPFLAGS +=	-I$(SRCDIR) -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 \
 	-DPREFER_REENTRANT
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 .KEEP_STATE:
 
 all:	$(LIBS)
diff --git a/usr/src/lib/libtecla/common/mapfile-vers b/usr/src/lib/libtecla/common/mapfile-vers
new file mode 100644
index 0000000000..dd298250c8
--- /dev/null
+++ b/usr/src/lib/libtecla/common/mapfile-vers
@@ -0,0 +1,138 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+#
+# The instances of "tecla_l.5" below (note "l" vs "1") are by design;
+# quoting the author:
+#
+# Unfortunately the tecla_l.5 version string is by now embedded in any
+# executable that linked with libtecla versions 1.5 ..., so I can't fix
+# the typo without preventing those programs from linking against 1.6.
+# Thus I now have to derive tecla_1.6 from tecla_l.5, in the map file.
+#
+
+tecla_1.6 {
+    global:
+	gl_append_history;
+	gl_automatic_history;
+	gl_query_char;
+	gl_read_char;
+} tecla_l.5;
+
+tecla_l.5 {
+    global:
+	cpl_recall_matches;
+	gl_abandon_line;
+	gl_bind_keyseq;
+	gl_catch_blocked;
+	gl_display_text;
+	gl_erase_terminal;
+	gl_error_message;
+	gl_handle_signal;
+	gl_inactivity_timeout;
+	gl_io_mode;
+	gl_list_signals;
+	gl_normal_io;
+	gl_pending_io;
+	gl_raw_io;
+	gl_register_action;
+	gl_return_status;
+	gl_tty_signals;
+} tecla_1.4;
+
+tecla_1.4 {
+    global:
+	gl_clear_history;
+	gl_configure_getline;
+	gl_echo_mode;
+	gl_group_history;
+	gl_ignore_signal;
+	gl_last_signal;
+	gl_limit_history;
+	gl_load_history;
+	gl_lookup_history;
+	gl_prompt_style;
+	gl_range_of_history;
+	gl_replace_prompt;
+	gl_resize_history;
+	gl_save_history;
+	gl_set_term_size;
+	gl_show_history;
+	gl_size_of_history;
+	gl_state_of_history;
+	gl_terminal_size;
+	gl_toggle_history;
+	gl_trap_signal;
+	gl_watch_fd;
+	libtecla_version;
+} tecla_1.3;
+
+tecla_1.3 {
+    global:
+	ef_list_expansions;
+} tecla_1.2;
+
+tecla_1.2 {
+    global:
+	cfc_file_start;
+	cfc_literal_escapes;
+	cfc_set_check_fn;
+	cpl_add_completion;
+	cpl_check_exe;
+	cpl_complete_word;
+	cpl_file_completions;
+	cpl_init_FileArgs;
+	cpl_last_error;
+	cpl_list_completions;
+	cpl_record_error;
+	del_CplFileConf;
+	del_ExpandFile;
+	del_GetLine;
+	del_PathCache;
+	del_PcaPathConf;
+	del_WordCompletion;
+	ef_expand_file;
+	ef_last_error;
+	gl_change_terminal;
+	gl_completion_action;
+	gl_customize_completion;
+	gl_get_line;
+	new_CplFileConf;
+	new_ExpandFile;
+	new_GetLine;
+	new_PathCache;
+	new_PcaPathConf;
+	new_WordCompletion;
+	pca_last_error;
+	pca_lookup_file;
+	pca_scan_path;
+	pca_set_check_fn;
+	ppc_file_start;
+	ppc_literal_escapes;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libthread/Makefile.com b/usr/src/lib/libthread/Makefile.com
index f193f22a6b..0b67d6a562 100644
--- a/usr/src/lib/libthread/Makefile.com
+++ b/usr/src/lib/libthread/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -32,16 +31,14 @@ VERS = .1
 include ../../Makefile.lib
 include ../../Makefile.rootfs
 
-MAPFILES=	mapfile-vers $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
-
-DYNFLAGS +=	-F libc.so.1 $(MAPOPTS)
+DYNFLAGS +=	-F libc.so.1
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
 SRCDIR =	../common
 $(LINTLIB) :=	SRCS = $(SRCDIR)/llib-lthread
 
+MAPFILES =	mapfile-vers $(MAPFILE-FLTR)
 
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
 # and .fini sections being added).  Also, since there are no OBJECTS, turn
@@ -57,5 +54,3 @@ include ../../Makefile.targ
 all:	$(LIBS)
 
 lint:
-
-$(DYNLIB):	$(MAPFILES)
diff --git a/usr/src/lib/libtnf/Makefile b/usr/src/lib/libtnf/Makefile
index 523845a683..131ee8057d 100644
--- a/usr/src/lib/libtnf/Makefile
+++ b/usr/src/lib/libtnf/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libtnf/Makefile
-#
 
 LIBRARY=	libtnf.a
 VERS=		.1
@@ -45,18 +42,10 @@ OBJECTS=	$(MACH)dep.o	\
 		access.o	\
 		reader.o
 
-all :=		TARGET= all
-clean :=	TARGET= clean
-clobber :=	TARGET= clobber
-check :=	TARGET= check
-install :=	TARGET= install
-lint :=		TARGET= lint
-install_h :=	TARGET= install_h
-_msg :=		TARGET= _msg
-
-
 include ../Makefile.lib
 
+SRCDIR =	.
+
 TEXT_DOMAIN=	SUNW_OST_OSLIB
 XGETFLAGS=	-a
 POFILE=		$(LIBRARY:%.a=%.po)
@@ -68,12 +57,6 @@ CP=	cp
 
 LIBS=		$(DYNLIB)
 
-MAPDIR=		./spec/$(MACH)
-MAPFILE=	$(MAPDIR)/mapfile
-MAPOPTS=	$(MAPFILE:%=-M%)
-DYNFLAGS +=	$(MAPOPTS)
-CLOBBERFILES +=	$(MAPFILE)
-
 LDLIBS += -lc
 
 HDRS=		tnf.h
@@ -89,22 +72,14 @@ CPPFLAGS +=	-D_DATUM_MACROS -D_REENTRANT
 
 LINTFLAGS +=	-y
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
-
 .KEEP_STATE:
 
-all: spec .WAIT $(LIBS)
+all: $(LIBS)
 
-install: all spec $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS)
+install: all $(ROOTLIBDIR) $(ROOTLIBS) $(ROOTLINKS)
 
 install_h: $(ROOTHDRDIR) $(ROOTHDRS)
 
-clean clobber: spec $(BUILD64)
-
 lint:
 	$(LINT.c) $(SRCS)
 
@@ -142,8 +117,3 @@ $(POFILES):
 	$(RM) messages.po
 
 include ../Makefile.targ
-
-spec:	FRC
-	@cd $@; pwd; $(MAKE) $(TARGET)
-
-FRC:
diff --git a/usr/src/lib/libtnf/mapfile-vers b/usr/src/lib/libtnf/mapfile-vers
new file mode 100644
index 0000000000..22831ec2de
--- /dev/null
+++ b/usr/src/lib/libtnf/mapfile-vers
@@ -0,0 +1,79 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	tnf_default_error_handler;
+	tnf_error_message;
+	tnf_get_block_absolute;
+	tnf_get_block_count;
+	tnf_get_block_header;
+	tnf_get_block_relative;
+	tnf_get_char;
+	tnf_get_chars;
+	tnf_get_element;
+	tnf_get_element_count;
+	tnf_get_elements;
+	tnf_get_element_type;
+	tnf_get_file_header;
+	tnf_get_float32;
+	tnf_get_float64;
+	tnf_get_int16;
+	tnf_get_int32;
+	tnf_get_int64;
+	tnf_get_int8;
+	tnf_get_kind;
+	tnf_get_next_record;
+	tnf_get_raw;
+	tnf_get_size;
+	tnf_get_slot_count;
+	tnf_get_slot_index;
+	tnf_get_slot_indexed;
+	tnf_get_slot_name;
+	tnf_get_slot_named;
+	tnf_get_tag_arg;
+	tnf_get_type;
+	tnf_get_type_name;
+	tnf_is_array;
+	tnf_is_block_header;
+	tnf_is_inline;
+	tnf_is_record;
+	tnf_is_scalar;
+	tnf_is_string;
+	tnf_is_struct;
+	tnf_is_type;
+	tnf_reader_begin;
+	tnf_reader_end;
+	tnf_set_error_handler;
+	tnf_type_get_base;
+	tnf_type_get_kind;
+	tnf_type_get_name;
+	tnf_type_get_property;
+	tnf_type_get_size;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libtnfctl/Makefile b/usr/src/lib/libtnfctl/Makefile
index 0b1d31137c..c35d5206b7 100644
--- a/usr/src/lib/libtnfctl/Makefile
+++ b/usr/src/lib/libtnfctl/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,18 +19,16 @@
 # CDDL HEADER END
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#
-# Copyright (c) 1989,1995-1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libtnfctl/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include	../Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
 all	:= 	TARGET = all
@@ -74,14 +71,14 @@ $(ROOTLIBDIR) $(ROOTHDRDIR):
 $(ROOTHDRDIR)/% : %
 	$(INS.file)
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
-_msg:	$(MSGDOMAIN) $(POFILE)
+_msg:	$(MSGDOMAIN) .WAIT $(POFILE)
 	$(RM) $(MSGDOMAIN)/$(POFILE)
 	$(CP) $(POFILE) $(MSGDOMAIN)
 
-$(POFILE):	.WAIT $(POFILES)
+$(POFILE):	$(POFILES)
 	$(RM) $@
 	$(CAT) $(POFILES) > $@
 
diff --git a/usr/src/lib/libtnfctl/Makefile.com b/usr/src/lib/libtnfctl/Makefile.com
index 1c7d836fa0..0f64791b28 100644
--- a/usr/src/lib/libtnfctl/Makefile.com
+++ b/usr/src/lib/libtnfctl/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libtnfctl/Makefile
-#
 
 LIBRARY=	libtnfctl.a
 VERS=		.1
@@ -66,11 +63,6 @@ SRCS= $(OBJECTS.c:%.o=../%.c)
 
 LIBS=		$(DYNLIB)
 
-MAPFILE=	$(MAPDIR)/mapfile
-MAPOPTS=	$(MAPFILE:%=-M%)
-CLOBBERFILES +=	$(MAPFILE)
-DYNFLAGS +=	$(MAPOPTS)
-
 HDRS=		tnfctl.h
 ROOTHDRDIR=	$(ROOT)/usr/include/tnf
 ROOTHDRS=	$(HDRS:%=$(ROOTHDRDIR)/%)
@@ -101,11 +93,6 @@ lint:
 
 check: $(CHECKHDRS)
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 $(ROOTLIBDIR) $(ROOTHDRDIR):
 	$(INS.dir)
 
diff --git a/usr/src/lib/libtnfctl/amd64/Makefile b/usr/src/lib/libtnfctl/amd64/Makefile
index 5cb0c917cc..3f238e6cae 100644
--- a/usr/src/lib/libtnfctl/amd64/Makefile
+++ b/usr/src/lib/libtnfctl/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libtnfctl/i386/Makefile b/usr/src/lib/libtnfctl/i386/Makefile
index 4b2bfed7a8..50dd2a7dd7 100644
--- a/usr/src/lib/libtnfctl/i386/Makefile
+++ b/usr/src/lib/libtnfctl/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/litnfctl/i386/Makefile
 
-MAPDIR= ../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libtnfctl/mapfile-vers b/usr/src/lib/libtnfctl/mapfile-vers
new file mode 100644
index 0000000000..f10b35a6a2
--- /dev/null
+++ b/usr/src/lib/libtnfctl/mapfile-vers
@@ -0,0 +1,65 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	tnfctl_buffer_alloc;
+	tnfctl_buffer_dealloc;
+	tnfctl_check_libs;
+	tnfctl_close;
+	tnfctl_continue;
+	tnfctl_exec_open;
+	tnfctl_filter_list_add;
+	tnfctl_filter_list_delete;
+	tnfctl_filter_list_get;
+	tnfctl_filter_state_set;
+	tnfctl_indirect_open;
+	tnfctl_internal_open;
+	tnfctl_kernel_open;
+	tnfctl_pid_open;
+	tnfctl_probe_apply;
+	tnfctl_probe_apply_ids;
+	tnfctl_probe_connect;
+	tnfctl_probe_disable;
+	tnfctl_probe_disconnect_all;
+	tnfctl_probe_enable;
+	tnfctl_probe_state_get;
+	tnfctl_probe_trace;
+	tnfctl_probe_untrace;
+	tnfctl_register_funcs;
+	tnfctl_strerror;
+	tnfctl_trace_attrs_get;
+	tnfctl_trace_state_set;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_tnfctl_externally_traced_pid;
+	_tnfctl_internal_tracing_flag;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libtnfctl/sparc/Makefile b/usr/src/lib/libtnfctl/sparc/Makefile
index 16f419083d..50dd2a7dd7 100644
--- a/usr/src/lib/libtnfctl/sparc/Makefile
+++ b/usr/src/lib/libtnfctl/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/litnfctl/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libtnfctl/sparcv9/Makefile b/usr/src/lib/libtnfctl/sparcv9/Makefile
index c01f7591a9..3f238e6cae 100644
--- a/usr/src/lib/libtnfctl/sparcv9/Makefile
+++ b/usr/src/lib/libtnfctl/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libtnfctl/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libtnfprobe/Makefile b/usr/src/lib/libtnfprobe/Makefile
index 59f9eb9b4a..1235f9d41d 100644
--- a/usr/src/lib/libtnfprobe/Makefile
+++ b/usr/src/lib/libtnfprobe/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,18 +19,16 @@
 # CDDL HEADER END
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#
-# Copyright (c) 1989,1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
-#
-# lib/libtnfprobe/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
 all	:= 	TARGET = all
@@ -62,7 +59,7 @@ $(ROOTLIBDIR) $(ROOTHDRDIR):
 $(ROOTHDRDIR)/% : %
 	$(INS.file)
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libtnfprobe/Makefile.com b/usr/src/lib/libtnfprobe/Makefile.com
index 5265b73dc0..50448d6d64 100644
--- a/usr/src/lib/libtnfprobe/Makefile.com
+++ b/usr/src/lib/libtnfprobe/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/libtnfprobe/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 LIBRARY=	libtnfprobe.a
@@ -53,10 +50,7 @@ SRCS= $(OBJECTS.c:%.o=../%.c) $(UFSOBJS:%.o=$(UFSDIR)/%.c)
 
 LIBS=		$(DYNLIB)
 
-MAPFILE=	$(MAPDIR)/mapfile
-MAPOPTS=	$(MAPFILE:%=-M %)
-DYNFLAGS +=	$(MAPOPTS)
-CLOBBERFILES +=	$(MAPFILE)
+MAPFILES +=	mapfile-vers
 
 HDRS=		com.h writer.h probe.h
 ROOTHDRDIR=	$(ROOT)/usr/include/tnf
@@ -73,11 +67,6 @@ LINTFLAGS +=	-y
 
 $(ROOTHDRS) :=	FILEMODE = 644
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 LDLIBS += -lc
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libtnfprobe/amd64/Makefile b/usr/src/lib/libtnfprobe/amd64/Makefile
index 5cb0c917cc..3f238e6cae 100644
--- a/usr/src/lib/libtnfprobe/amd64/Makefile
+++ b/usr/src/lib/libtnfprobe/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libtnfprobe/amd64/mapfile-vers b/usr/src/lib/libtnfprobe/amd64/mapfile-vers
new file mode 100644
index 0000000000..633026ef2f
--- /dev/null
+++ b/usr/src/lib/libtnfprobe/amd64/mapfile-vers
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+};
diff --git a/usr/src/lib/libtnfprobe/i386/Makefile b/usr/src/lib/libtnfprobe/i386/Makefile
index 1e3dd6d31c..50dd2a7dd7 100644
--- a/usr/src/lib/libtnfprobe/i386/Makefile
+++ b/usr/src/lib/libtnfprobe/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libtnfprobe/i386/Makefile
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libtnfprobe/i386/mapfile-vers b/usr/src/lib/libtnfprobe/i386/mapfile-vers
new file mode 100644
index 0000000000..633026ef2f
--- /dev/null
+++ b/usr/src/lib/libtnfprobe/i386/mapfile-vers
@@ -0,0 +1,30 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+};
diff --git a/usr/src/lib/libtnfprobe/mapfile-vers b/usr/src/lib/libtnfprobe/mapfile-vers
new file mode 100644
index 0000000000..46c25a9378
--- /dev/null
+++ b/usr/src/lib/libtnfprobe/mapfile-vers
@@ -0,0 +1,93 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	fork = NODIRECT;
+	fork1;
+	pthread_create;
+	pthread_exit;
+	_resume_ret;
+	thr_create;
+	thr_exit;
+	tnf_allocate;
+	tnf_char_tag_data;
+	tnf_float32_tag_data;
+	tnf_float64_tag_data;
+	tnf_int16_tag_data;
+	tnf_int32_tag_data;
+	tnf_int64_tag_data;
+	tnf_int8_tag_data;
+	tnf_lwpid_tag_data;
+	tnf_name_tag_data;
+	tnf_non_threaded_test_addr;
+	tnf_opaque_tag_data;
+	tnf_pid_tag_data;
+	__tnf_probe_alloc;
+	tnf_probe_debug;
+	tnf_probe_event_tag_data;
+	tnf_probe_get_arg_indexed;
+	tnf_probe_get_chars;
+	tnf_probe_get_num_args;
+	tnf_probe_get_type_indexed;
+	tnf_probe_get_value;
+	__tnf_probe_list_head;
+	__tnf_probe_list_valid;
+	__tnf_probe_memseg_p;
+	__tnf_probe_notify;
+	__tnf_probe_thr_sync;
+	__tnf_probe_version_1_info;
+	tnf_process_disable;
+	tnf_process_enable;
+	tnf_ref32_1;
+	tnf_size_tag_data;
+	tnf_string_1;
+	tnf_string_tag_data;
+	tnf_struct_tag_1;
+	tnf_tag_tag_data;
+	__tnf_tag_version_1_info;
+	tnf_thread_disable;
+	tnf_threaded_test_addr;
+	tnf_thread_enable;
+	tnf_time_base_tag_data;
+	tnf_time_delta_tag_data;
+	tnf_trace_alloc;
+	tnf_trace_commit;
+	tnf_trace_end;
+	tnf_trace_file_min;
+	tnf_trace_file_name;
+	tnf_trace_file_size;
+	tnf_trace_rollback;
+	tnf_uint16_tag_data;
+	tnf_uint32_tag_data;
+	tnf_uint64_tag_data;
+	tnf_uint8_tag_data;
+	tnf_user_struct_properties;
+	_tnfw_b_control;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libtnfprobe/sparc/Makefile b/usr/src/lib/libtnfprobe/sparc/Makefile
index e6d58f0949..50dd2a7dd7 100644
--- a/usr/src/lib/libtnfprobe/sparc/Makefile
+++ b/usr/src/lib/libtnfprobe/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libtnfprobe/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libtnfprobe/sparc/mapfile-vers b/usr/src/lib/libtnfprobe/sparc/mapfile-vers
new file mode 100644
index 0000000000..b8c91e7960
--- /dev/null
+++ b/usr/src/lib/libtnfprobe/sparc/mapfile-vers
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	thr_stksegment;
+};
diff --git a/usr/src/lib/libtnfprobe/sparcv9/Makefile b/usr/src/lib/libtnfprobe/sparcv9/Makefile
index 79f06e219e..3f238e6cae 100644
--- a/usr/src/lib/libtnfprobe/sparcv9/Makefile
+++ b/usr/src/lib/libtnfprobe/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libtnfprobe/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libtnfprobe/sparcv9/mapfile-vers b/usr/src/lib/libtnfprobe/sparcv9/mapfile-vers
new file mode 100644
index 0000000000..b8c91e7960
--- /dev/null
+++ b/usr/src/lib/libtnfprobe/sparcv9/mapfile-vers
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	thr_stksegment;
+};
diff --git a/usr/src/lib/libtsnet/Makefile b/usr/src/lib/libtsnet/Makefile
index aa06ccdef0..e02f847ac2 100644
--- a/usr/src/lib/libtsnet/Makefile
+++ b/usr/src/lib/libtsnet/Makefile
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
@@ -43,11 +43,7 @@ MSGFILES =	common/misc.i
 
 .KEEP_STATE:
 
-all install: spec .WAIT $(SUBDIRS)
-
-clean clobber: spec $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
@@ -58,7 +54,7 @@ _msg: $(MSGDOMAINPOFILE)
 $(POFILE): $(MSGFILES)
 	$(BUILDPO.msgfiles)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libtsnet/Makefile.com b/usr/src/lib/libtsnet/Makefile.com
index c77b2403ad..6e8d1e3105 100644
--- a/usr/src/lib/libtsnet/Makefile.com
+++ b/usr/src/lib/libtsnet/Makefile.com
@@ -22,7 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 LIBRARY	=	libtsnet.a
@@ -40,16 +40,14 @@ include ../../Makefile.lib
 include ../../Makefile.rootfs
 
 LIBS =		$(DYNLIB) $(LINTLIB)
+
+SRCDIR =	../common
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 LAZYLIBS =	$(ZLAZYLOAD) -ltsol $(ZNOLAZYLOAD)
 LDLIBS +=	-lsocket -lnsl -lc -lsecdb $(LAZYLIBS)
 lint :=		LAZYLIBS = -ltsol
 
-SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 LIBTSOLINC =	$(SRC)/lib/libtsol/common
 
 CPPFLAGS +=	-D_REENTRANT -I$(LIBTSOLINC)
diff --git a/usr/src/lib/libtsnet/common/mapfile-vers b/usr/src/lib/libtsnet/common/mapfile-vers
new file mode 100644
index 0000000000..f9379fd0ea
--- /dev/null
+++ b/usr/src/lib/libtsnet/common/mapfile-vers
@@ -0,0 +1,58 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	rhstr_to_ent;
+	rtsa_keyword;
+	rtsa_to_str;
+	sl_to_str;
+	str_to_rhstr;
+	str_to_tpstr;
+	tnmlp;
+	tnrh;
+	tnrhtp;
+	tpstr_to_ent;
+	tsol_endrhent;
+	tsol_endtpent;
+	tsol_fgetrhent;
+	tsol_fgettpent;
+	tsol_freerhent;
+	tsol_freetpent;
+	tsol_freezcent;
+	tsol_getrhbyaddr;
+	tsol_getrhent;
+	tsol_getrhtype;
+	tsol_gettpbyname;
+	tsol_gettpent;
+	tsol_setrhent;
+	tsol_settpent;
+	tsol_sgetzcent;
+	tsol_strerror;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libtsnet/i386/Makefile b/usr/src/lib/libtsnet/i386/Makefile
index ee3ea88a08..2a944b0b43 100644
--- a/usr/src/lib/libtsnet/i386/Makefile
+++ b/usr/src/lib/libtsnet/i386/Makefile
@@ -22,10 +22,9 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR= ../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libtsol/Makefile b/usr/src/lib/libtsol/Makefile
index 2bb6a81725..8e91f2fadb 100644
--- a/usr/src/lib/libtsol/Makefile
+++ b/usr/src/lib/libtsol/Makefile
@@ -22,11 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-#
-# lib/libtsol/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
@@ -51,9 +47,7 @@ lint :=		TARGET = lint
 # Override so that label.h gets installed where expected.
 ROOTHDRDIR=	$(ROOT)/usr/include/tsol
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:	$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
@@ -64,7 +58,7 @@ $(POFILE):	$(MSGFILES)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libtsol/Makefile.com b/usr/src/lib/libtsol/Makefile.com
index 46959e7662..1f600d0e16 100644
--- a/usr/src/lib/libtsol/Makefile.com
+++ b/usr/src/lib/libtsol/Makefile.com
@@ -22,11 +22,7 @@
 # Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-
-#ident	"%Z%%M%	%I%	%E% SMI"
-
-#
-# lib/libtsol/Makefile.com
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 LIBRARY =	libtsol.a
@@ -44,16 +40,14 @@ include ../../Makefile.lib
 include ../../Makefile.rootfs
 
 LIBS =		$(DYNLIB) $(LINTLIB)
-$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lsecdb -lc
 
+SRCDIR =	../common
+$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
+
 NONCOMMON =	$(OBJECTS:blabel.o=)
 lint:=		SRCS = $(NONCOMMON:%.o=$(SRCDIR)/%.c) $(COMMONDIR)/blabel.c
 
-SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 COMMONDIR=	$(SRC)/common/tsol
 
 CFLAGS +=	$(CCVERBOSE)
diff --git a/usr/src/lib/libtsol/common/mapfile-vers b/usr/src/lib/libtsol/common/mapfile-vers
new file mode 100644
index 0000000000..e71c377cdf
--- /dev/null
+++ b/usr/src/lib/libtsol/common/mapfile-vers
@@ -0,0 +1,103 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_2.1 {
+    global:
+	bldominates;
+	blequal;
+	blstrictdom;
+	fgetlabel;
+	getlabel;
+	getplabel;
+	getuserrange;
+	getzoneidbylabel;
+	getzonelabelbyid;
+	getzonelabelbyname;
+	getzonerootbyid;
+	getzonerootbylabel;
+	getzonerootbyname;
+	label_to_str;
+	m_label_alloc;
+	m_label_dup;
+	m_label_free;
+	setflabel;
+	str_to_label;
+};
+
+SUNWprivate_1.1 {
+    global:
+	bclearcvt;
+	bclearcvtfull;
+	bclearhigh;
+	bclearlow;
+	bcleartoh;
+	bcleartoh_r;
+	bcleartos;
+	bclearundef;
+	bclearvalid;
+	bisinvalid;
+	blabel_alloc;
+	blabel_free;
+	blabel_size;
+	blinrange;
+	blinset;
+	blmaximum;
+	blminimum;
+	bltocolor;
+	bltocolor_r;
+	bltype;
+	bslcvt;
+	bslcvtfull;
+	bslhigh;
+	bsllow;
+	bsltoh;
+	bsltoh_r;
+	bsltos;
+	bslundef;
+	bslvalid;
+	getlabelbypath;
+	getpathbylabel;
+	h_alloc;
+	h_free;
+	htobclear;
+	htobsl;
+	labelfields;
+	labelinfo;
+	labelvers;
+	sbcleartos;
+	sbsltos;
+	setbltype;
+	set_effective_priv;
+	set_inheritable_priv;
+	set_permitted_priv;
+	stobclear;
+	stobsl;
+	userdefs;
+	zonecopy;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libumem/Makefile b/usr/src/lib/libumem/Makefile
index 6e47bc6076..ed59c686ef 100644
--- a/usr/src/lib/libumem/Makefile
+++ b/usr/src/lib/libumem/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2000-2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/libumem/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.lib
@@ -43,15 +40,13 @@ lint	:= TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libumem/Makefile.com b/usr/src/lib/libumem/Makefile.com
index cb0f64bf21..b22a8cea14 100644
--- a/usr/src/lib/libumem/Makefile.com
+++ b/usr/src/lib/libumem/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -116,13 +115,10 @@ LIBS =	$(LIBS_$(CURTYPE))
 MAPFILE_SUPPLEMENTAL_standalone = ../common/stand_mapfile
 MAPFILE_SUPPLEMENTAL = $(MAPFILE_SUPPLEMENTAL_$(CURTYPE))
 
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 LDLIBS +=	-lc
 
-LDFLAGS_standalone = -znoversion -Breduce -M $(SPECMAPFILE) \
-	-M $(MAPFILE_SUPPLEMENTAL) -dy -r
+LDFLAGS_standalone = -znoversion -Breduce  -M../common/mapfile-vers \
+	-M$(MAPFILE_SUPPLEMENTAL) -dy -r
 LDFLAGS = $(LDFLAGS_$(CURTYPE))
 
 ASFLAGS_standalone = -DUMEM_STANDALONE
diff --git a/usr/src/lib/libumem/Makefile.targ b/usr/src/lib/libumem/Makefile.targ
index 8b47694ea2..380d00ad0e 100644
--- a/usr/src/lib/libumem/Makefile.targ
+++ b/usr/src/lib/libumem/Makefile.targ
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 #
@@ -56,11 +55,6 @@ $(STANDLIBRARY): $(OBJS) $(LINKTEST_OBJ)
 	rm $@.linktest
 	$(LD) $(LDFLAGS) -o $@ $(OBJS)
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 clobber: $(TYPES:%=clobber.%)
 
 $(TYPES:%=clobber.%):
diff --git a/usr/src/lib/libumem/common/mapfile-vers b/usr/src/lib/libumem/common/mapfile-vers
new file mode 100644
index 0000000000..e6e209a790
--- /dev/null
+++ b/usr/src/lib/libumem/common/mapfile-vers
@@ -0,0 +1,64 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	calloc = NODIRECT;
+	free = NODIRECT;
+	malloc = NODIRECT;
+	memalign = NODIRECT;
+	realloc = NODIRECT;
+	umem_alloc;
+	umem_cache_alloc;
+	umem_cache_create;
+	umem_cache_destroy;
+	umem_cache_free;
+	umem_free;
+	umem_nofail_callback;
+	umem_zalloc;
+	valloc = NODIRECT;
+};
+
+SUNWprivate_1.1 {
+    global:
+	umem_alloc_align;
+	umem_free_align;
+	umem_reap;
+	vmem_add;
+	vmem_alloc;
+	vmem_contains;
+	vmem_create;
+	vmem_destroy;
+	vmem_free;
+	vmem_heap_arena;
+	vmem_size;
+	vmem_walk;
+	vmem_xalloc;
+	vmem_xfree;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libuuid/Makefile b/usr/src/lib/libuuid/Makefile
index 2eeead5cca..933be73e70 100644
--- a/usr/src/lib/libuuid/Makefile
+++ b/usr/src/lib/libuuid/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libuuid/Makefile
 
 include		../Makefile.lib
 
-SUBDIRS=	spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -41,7 +40,7 @@ lint :=		TARGET= lint
 
 all install clean clobber lint: $(SUBDIRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libuuid/Makefile.com b/usr/src/lib/libuuid/Makefile.com
index fdd1c7bc57..7329255870 100644
--- a/usr/src/lib/libuuid/Makefile.com
+++ b/usr/src/lib/libuuid/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -37,11 +36,9 @@ include ../../Makefile.rootfs
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lsocket -lnsl -lc
-$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
 
diff --git a/usr/src/lib/libuuid/common/mapfile-vers b/usr/src/lib/libuuid/common/mapfile-vers
new file mode 100644
index 0000000000..59a11dbe73
--- /dev/null
+++ b/usr/src/lib/libuuid/common/mapfile-vers
@@ -0,0 +1,47 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	uuid_clear;
+	uuid_compare;
+	uuid_copy;
+	uuid_generate;
+	uuid_generate_random;
+	uuid_generate_time;
+	uuid_is_null;
+	uuid_parse;
+	uuid_time;
+	uuid_unparse;
+};
+
+SUNWprivate_1.1 {
+    global:
+	SUNWprivate_1.1;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libuutil/Makefile b/usr/src/lib/libuutil/Makefile
index ddde73d1e6..9f9e3c2f06 100644
--- a/usr/src/lib/libuutil/Makefile
+++ b/usr/src/lib/libuutil/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 #
@@ -38,6 +37,7 @@ HDRS = \
 	libuutil_impl.h
 
 HDRDIR =	common
+
 SUBDIRS	=	$(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
@@ -55,19 +55,19 @@ POFILE =	libuutil.po
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT native $(SUBDIRS)
-
-$(POFILE):	pofile_MSGFILES
+all clean clobber install: native $(SUBDIRS)
 
 lint:		$(SUBDIRS)
 
+$(POFILE):	pofile_MSGFILES
+
 install_h:	$(ROOTHDRS)
 
 check:		$(CHECKHDRS)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) native spec: FRC
+naive $(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libuutil/Makefile.com b/usr/src/lib/libuutil/Makefile.com
index 031fbcc897..288f0f366c 100644
--- a/usr/src/lib/libuutil/Makefile.com
+++ b/usr/src/lib/libuutil/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -26,7 +25,6 @@
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-
 LIBRARY =	libuutil.a
 VERS =		.1
 
@@ -65,15 +63,13 @@ SRCS =	\
 
 LINTS =		$(OBJECTS:%.o=%.ln)
 
+SRCDIR =	../common
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lc
 
-SRCDIR =	../common
 AVLDIR =	../../../common/avl
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
 
-CFLAGS +=	-v
+CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR) -I../../common/inc
 LINTFLAGS +=	-erroff=E_GLOBAL_COULD_BE_STATIC2
 LINTFLAGS64 +=	-erroff=E_GLOBAL_COULD_BE_STATIC2
diff --git a/usr/src/lib/libuutil/common/mapfile-vers b/usr/src/lib/libuutil/common/mapfile-vers
new file mode 100644
index 0000000000..9794b33328
--- /dev/null
+++ b/usr/src/lib/libuutil/common/mapfile-vers
@@ -0,0 +1,101 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	uu_alt_exit;
+	uu_avl_create;
+	uu_avl_destroy;
+	uu_avl_find;
+	uu_avl_first;
+	uu_avl_insert;
+	uu_avl_last;
+	uu_avl_nearest_next;
+	uu_avl_nearest_prev;
+	uu_avl_next;
+	uu_avl_node_fini;
+	uu_avl_node_init;
+	uu_avl_numnodes;
+	uu_avl_pool_create;
+	uu_avl_pool_destroy;
+	uu_avl_prev;
+	uu_avl_remove;
+	uu_avl_teardown;
+	uu_avl_walk;
+	uu_avl_walk_end;
+	uu_avl_walk_next;
+	uu_avl_walk_start;
+	uu_check_name;
+	uu_die;
+	uu_dprintf;
+	uu_dprintf_create;
+	uu_dprintf_destroy;
+	uu_dprintf_getname;
+	uu_error;
+	uu_exit_fatal;
+	uu_exit_ok;
+	uu_exit_usage;
+	uu_free;
+	uu_getpname;
+	uu_list_create;
+	uu_list_destroy;
+	uu_list_find;
+	uu_list_first;
+	uu_list_insert;
+	uu_list_insert_after;
+	uu_list_insert_before;
+	uu_list_last;
+	uu_list_nearest_next;
+	uu_list_nearest_prev;
+	uu_list_next;
+	uu_list_node_fini;
+	uu_list_node_init;
+	uu_list_numnodes;
+	uu_list_pool_create;
+	uu_list_pool_destroy;
+	uu_list_prev;
+	uu_list_remove;
+	uu_list_teardown;
+	uu_list_walk;
+	uu_list_walk_end;
+	uu_list_walk_next;
+	uu_list_walk_start;
+	uu_msprintf;
+	uu_open_tmp;
+	uu_setpname;
+	uu_strerror;
+	uu_strtoint;
+	uu_strtouint;
+	uu_vdie;
+	uu_vwarn;
+	uu_vxdie;
+	uu_warn;
+	uu_xdie;
+	uu_zalloc;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libvolmgt/Makefile b/usr/src/lib/libvolmgt/Makefile
index 4efe44b33f..aa5f8fae95 100644
--- a/usr/src/lib/libvolmgt/Makefile
+++ b/usr/src/lib/libvolmgt/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,17 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libvolmgt/Makefile
 
 include		../../Makefile.master
 include		../Makefile.lib
 
-SUBDIRS=	spec $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 clean :=	TARGET= clean
@@ -69,7 +68,7 @@ install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(MACH) $(MACH64) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 _msg:	$(MSGDOMAIN) $(POFILE)
diff --git a/usr/src/lib/libvolmgt/Makefile.com b/usr/src/lib/libvolmgt/Makefile.com
index df9137070e..0a5a1187b6 100644
--- a/usr/src/lib/libvolmgt/Makefile.com
+++ b/usr/src/lib/libvolmgt/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libvolmgt/Makefile.com
-#
 
 LIBRARY= libvolmgt.a
 VERS=.1
@@ -37,8 +34,7 @@ OBJECTS= volattr.o volutil.o volprivate.o volname.o volmgt_fsi.o \
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS=		$(OBJECTS:%.o=../common/%.c)
+SRCDIR =	../common
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 
@@ -48,18 +44,13 @@ LINTSRC=	$(LINTLIB:%.ln=%)
 
 CPPFLAGS =	-I.. $(CPPFLAGS.master)
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=	-M $(MAPFILE)
+
 LDLIBS +=       -ladm -lc
 
 .KEEP_STATE:
 
 lint:	lintcheck
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/libvolmgt/amd64/Makefile b/usr/src/lib/libvolmgt/amd64/Makefile
index bf7f82677c..c9a1718a16 100644
--- a/usr/src/lib/libvolmgt/amd64/Makefile
+++ b/usr/src/lib/libvolmgt/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libvolmgt/common/mapfile-vers b/usr/src/lib/libvolmgt/common/mapfile-vers
new file mode 100644
index 0000000000..48acf618a9
--- /dev/null
+++ b/usr/src/lib/libvolmgt/common/mapfile-vers
@@ -0,0 +1,72 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.2 or SUNW_1.3 symbols, but they are now kept as placeholders.
+# Don't add any symbols to these versions.
+
+SUNW_1.3 {
+    global:
+	SUNW_1.3;
+} SUNW_1.2;
+
+SUNW_1.2 {
+    global:
+	SUNW_1.2;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	volmgt_acquire;
+	volmgt_feature_enabled;
+	volmgt_release;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	media_findname;
+	media_getattr;
+	media_getid;
+	media_setattr;
+	volmgt_check;
+	volmgt_inuse;
+	volmgt_ownspath;
+	volmgt_root;
+	volmgt_running;
+	volmgt_symdev;
+	volmgt_symname;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_dev_mounted;
+	_dev_unmount;
+	_media_oldaliases;
+	_media_printaliases;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libvolmgt/i386/Makefile b/usr/src/lib/libvolmgt/i386/Makefile
index 7a3f4e3529..2a944b0b43 100644
--- a/usr/src/lib/libvolmgt/i386/Makefile
+++ b/usr/src/lib/libvolmgt/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libvolmgt/i386/Makefile
-
-MAPDIR=	../spec/i386
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libvolmgt/sparc/Makefile b/usr/src/lib/libvolmgt/sparc/Makefile
index 5003bea721..2a944b0b43 100644
--- a/usr/src/lib/libvolmgt/sparc/Makefile
+++ b/usr/src/lib/libvolmgt/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libvolmgt/sparc/Makefile
-
-MAPDIR=	../spec/sparc
 
 include ../Makefile.com
 
diff --git a/usr/src/lib/libvolmgt/sparcv9/Makefile b/usr/src/lib/libvolmgt/sparcv9/Makefile
index 8c07fd15ad..c9a1718a16 100644
--- a/usr/src/lib/libvolmgt/sparcv9/Makefile
+++ b/usr/src/lib/libvolmgt/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libvolmgt/sparcv9/Makefile
-
-MAPDIR=	../spec/sparcv9
 
 include ../Makefile.com
 include ../../Makefile.lib.64
diff --git a/usr/src/lib/libw/Makefile.com b/usr/src/lib/libw/Makefile.com
index 9ecc982a0a..00cb20e480 100644
--- a/usr/src/lib/libw/Makefile.com
+++ b/usr/src/lib/libw/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -19,11 +18,12 @@
 #
 # CDDL HEADER END
 #
-# 
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY=	libw.a
 VERS=		.1
@@ -31,10 +31,11 @@ VERS=		.1
 include		../../Makefile.lib
 include		../../Makefile.rootfs
 
-MAPFILES=	../common/mapfile-vers $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M %)
+SRCDIR =	../common
 
-DYNFLAGS +=	-F libc.so.1 $(MAPOPTS)
+MAPFILES +=	$(MAPFILE-FLTR)
+
+DYNFLAGS +=	-F libc.so.1
 
 LIBS=		$(DYNLIB)
 
@@ -50,5 +51,3 @@ include		../../Makefile.targ
 all:		$(LIBS)
 
 lint:
-
-$(DYNLIB):	$(MAPFILES)
diff --git a/usr/src/lib/libwanboot/Makefile b/usr/src/lib/libwanboot/Makefile
index d410edb331..45cf48d3d2 100644
--- a/usr/src/lib/libwanboot/Makefile
+++ b/usr/src/lib/libwanboot/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2002-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include $(SRC)/lib/Makefile.lib
 
@@ -58,9 +58,7 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec	.WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
@@ -70,7 +68,7 @@ $(POFILE):	pofile_MSGFILES
 
 _msg:		$(MSGDOMAINPOFILE)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libwanboot/Makefile.com b/usr/src/lib/libwanboot/Makefile.com
index 9423c8edc7..00434d96fb 100644
--- a/usr/src/lib/libwanboot/Makefile.com
+++ b/usr/src/lib/libwanboot/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -60,9 +59,6 @@ DHCP_SRCS =	$(DHCP_OBJS:%.o=$(DHCP_DIR)/%.c)
 
 OBJECTS =	$(LOC_OBJS) $(COM_OBJS) $(DHCP_OBJS)
 
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 include ../../Makefile.lib
 
 LIBS +=		$(LINTLIB)
diff --git a/usr/src/lib/libwanboot/common/mapfile-vers b/usr/src/lib/libwanboot/common/mapfile-vers
new file mode 100644
index 0000000000..7b0607cc4e
--- /dev/null
+++ b/usr/src/lib/libwanboot/common/mapfile-vers
@@ -0,0 +1,82 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	bootconf_end;
+	bootconf_errmsg;
+	bootconf_get;
+	bootconf_init;
+	bootinfo_end;
+	bootinfo_get;
+	bootinfo_init;
+	bootlog;
+	http_conn_is_https;
+	http_decode_err;
+	http_errorstr;
+	http_free_respinfo;
+	http_get_conn_info;
+	http_get_header_value;
+	http_get_lasterr;
+	http_get_range_request;
+	http_get_request;
+	http_get_response_header;
+	http_get_version;
+	http_head_request;
+	http_process_headers;
+	http_process_part_headers;
+	http_read_body;
+	http_set_basic_auth;
+	http_set_certificate_authority_file;
+	http_set_cipher_list;
+	http_set_client_certificate_file;
+	http_set_keepalive;
+	http_set_key_file_password;
+	http_set_p12_format;
+	http_set_password;
+	http_set_private_key_file;
+	http_set_proxy;
+	http_set_random_file;
+	http_set_socket_read_timeout;
+	http_set_verbose;
+	http_srv_close;
+	http_srv_connect;
+	http_srv_disconnect;
+	http_srv_init;
+	sunw_check_keys;
+	sunw_crypto_init;
+	sunw_evp_pkey_free;
+	sunw_issuer_attrs;
+	sunw_PKCS12_create;
+	sunw_PKCS12_parse;
+	sunw_print_times;
+	sunw_subject_attrs;
+	url_parse;
+	url_parse_hostport;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libwanbootutil/Makefile b/usr/src/lib/libwanbootutil/Makefile
index 670e9bea04..060530d0a3 100644
--- a/usr/src/lib/libwanbootutil/Makefile
+++ b/usr/src/lib/libwanbootutil/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include ../Makefile.lib
 
@@ -64,7 +64,7 @@ lint :=		TARGET = lint
 .KEEP_STATE:
 .PARALLEL:      $(ROOTHDRS)
 
-all clean clobber install: spec .WAIT $(RPCFILES) $(SUBDIRS)
+all clean clobber install: $(RPCFILES) $(SUBDIRS)
 
 lint:		$(SUBDIRS)
 
@@ -76,7 +76,7 @@ $(POFILE):	pofile_MSGFILES
 
 _msg:		$(MSGDOMAINPOFILE)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libwanbootutil/Makefile.com b/usr/src/lib/libwanbootutil/Makefile.com
index 23463dad43..56b7a96871 100644
--- a/usr/src/lib/libwanbootutil/Makefile.com
+++ b/usr/src/lib/libwanbootutil/Makefile.com
@@ -60,9 +60,6 @@ SRCS =		$(LOC_SRCS) $(CRYPTO_SRCS)
 SRCDIR =	$(LOC_DIR)
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
-
 # Library includes sources created via rpcgen. And rpcgen unfortunately
 # created unused function variables.
 LINTFLAGS +=	-erroff=E_FUNC_VAR_UNUSED
diff --git a/usr/src/lib/libwanbootutil/common/mapfile-vers b/usr/src/lib/libwanbootutil/common/mapfile-vers
new file mode 100644
index 0000000000..d8e07ad0c5
--- /dev/null
+++ b/usr/src/lib/libwanbootutil/common/mapfile-vers
@@ -0,0 +1,60 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	aes_decrypt;
+	aes_encrypt;
+	aes_fini;
+	aes_init;
+	aes_key;
+	aes_keycheck;
+	cbc_decrypt;
+	cbc_encrypt;
+	cbc_makehandle;
+	des3_decrypt;
+	des3_encrypt;
+	des3_fini;
+	des3_init;
+	des3_key;
+	des3_keycheck;
+	HMACFinal;
+	HMACInit;
+	HMACUpdate;
+	wbio_nread;
+	wbio_nread_rand;
+	wbio_nwrite;
+	wbku_delete_key;
+	wbku_errinit;
+	wbku_find_key;
+	wbku_printerr;
+	wbku_retmsg;
+	wbku_str_to_keyattr;
+	wbku_write_key;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libwrap/Makefile.com b/usr/src/lib/libwrap/Makefile.com
index bbe4df7713..8ad0096289 100644
--- a/usr/src/lib/libwrap/Makefile.com
+++ b/usr/src/lib/libwrap/Makefile.com
@@ -1,5 +1,25 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -20,9 +40,10 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 ROOTLIBDIR =	$(ROOTSFWLIB)
 SONAME =	$(LIBRARY:.a=.so)$(MAJOR)
 ROOTLINKS +=	$(ROOTLIBDIR)/$(LIBLINKS)$(MAJOR)
-SRCDIR =	..
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
-DYNFLAGS +=	-M $(SRCDIR)/mapfile
+
+MAPFILES =	../mapfile
+
 LDLIBS +=	-lsocket -lnsl -lc
 
 CPPFLAGS +=	$(NETGROUP) $(TLI) $(ALWAYS_HOSTNAME) $(AUTH) \
diff --git a/usr/src/lib/libwrsmconf/Makefile.com b/usr/src/lib/libwrsmconf/Makefile.com
index 26487f9950..7efd97660c 100644
--- a/usr/src/lib/libwrsmconf/Makefile.com
+++ b/usr/src/lib/libwrsmconf/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -51,6 +50,9 @@ ROOTLIBDIR64= $(ROOT)/platform/sun4u/lib/sparcv9
 
 LIBS = $(DYNLIB)
 
+# There should be a mapfile here
+MAPFILES =
+
 BUILD.SO=	$(CC) $(CFLAGS) -o $@ $(GSHARED) $(DYNFLAGS) $(OBJECTS) $(LDLIBS)
 
 CLEANFILES=	$(OBJECTS) confparse.yy.c confparse.tab.c confparse.tab.h
diff --git a/usr/src/lib/libxcurses/Makefile b/usr/src/lib/libxcurses/Makefile
index 27ca87ebca..b2d69bbe71 100644
--- a/usr/src/lib/libxcurses/Makefile
+++ b/usr/src/lib/libxcurses/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1995-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libxcurses/Makefile
 
 include	../Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 install :=	TARGET= install
@@ -71,7 +70,7 @@ lint: $(SUBDIRS)
 # do this when we go through and make this library cstyle clean.
 check: $(HDRS)
 
-$(MACH) $(MACH64) spec: $(GENERATED)
+$(SUBDIRS):	$(GENERATED)
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 # derived C files
@@ -88,5 +87,3 @@ h/term.h : src/libc/xcurses/mkterm.awk src/libc/xcurses/caps
 src/libc/xcurses/keyindex.c : src/libc/xcurses/mkkey.awk src/libc/xcurses/caps
 	$(RM) $@
 	cd src/libc/xcurses; nawk -f mkkey.awk caps > keyindex.c
-
-FRC:
diff --git a/usr/src/lib/libxcurses/Makefile.com b/usr/src/lib/libxcurses/Makefile.com
index 49a6648ed1..65374166ef 100644
--- a/usr/src/lib/libxcurses/Makefile.com
+++ b/usr/src/lib/libxcurses/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -97,7 +96,8 @@ m_mbstow.o	m_wcsdup.o	wio_get.o	wio_put.o
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
+SRCDIR =	../src
+
 SRCS=		$(XCURSES:%.o=../src/libc/xcurses/%.c) \
 		$(GEN:%.o=../src/libc/gen/%.c) \
 		$(I18N:%.o=../src/libc/i18n/%.c) \
@@ -117,7 +117,6 @@ $(LINTLIB):= CPPFLAGS += -D_XOPEN_SOURCE_EXTENDED
 
 LINTSRC=	$(LINTLIB:%.ln=%)
 
-DYNFLAGS +=	-M$(MAPFILE)
 LDLIBS += -lc
 
 CPPFLAGS = -I../h -I../h/solaris2 -I../src/libc/xcurses $(CPPFLAGS.master)
@@ -126,7 +125,7 @@ CPPFLAGS = -I../h -I../h/solaris2 -I../src/libc/xcurses $(CPPFLAGS.master)
 # If and when somebody gets around to messaging this, CLOBBERFILE should not
 # be cleared (so that any .po file will be clobbered.
 #
-CLOBBERFILES=	libcurses.so libcurses.so$(VERS) $(MAPFILE)
+CLOBBERFILES=	libcurses.so libcurses.so$(VERS)
 
 .KEEP_STATE:
 
@@ -134,11 +133,6 @@ all: $(LIBS)
 
 lint: lintcheck
 
-$(DYNLIB): 	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 #
 # Include library targets
 #
diff --git a/usr/src/lib/libxcurses/amd64/Makefile b/usr/src/lib/libxcurses/amd64/Makefile
index 33b9ac3cba..b3e73192e3 100644
--- a/usr/src/lib/libxcurses/amd64/Makefile
+++ b/usr/src/lib/libxcurses/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libxcurses/i386/Makefile b/usr/src/lib/libxcurses/i386/Makefile
index 6da811dd72..10fd8452e5 100644
--- a/usr/src/lib/libxcurses/i386/Makefile
+++ b/usr/src/lib/libxcurses/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libxcurses/i386/Makefile
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
diff --git a/usr/src/lib/libxcurses/sparc/Makefile b/usr/src/lib/libxcurses/sparc/Makefile
index 9265d61171..ce1080de7c 100644
--- a/usr/src/lib/libxcurses/sparc/Makefile
+++ b/usr/src/lib/libxcurses/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libxcurses/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libxcurses/sparcv9/Makefile b/usr/src/lib/libxcurses/sparcv9/Makefile
index bd061fa150..b3e73192e3 100644
--- a/usr/src/lib/libxcurses/sparcv9/Makefile
+++ b/usr/src/lib/libxcurses/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libxcurses/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libxcurses/src/mapfile-vers b/usr/src/lib/libxcurses/src/mapfile-vers
new file mode 100644
index 0000000000..da666d0f89
--- /dev/null
+++ b/usr/src/lib/libxcurses/src/mapfile-vers
@@ -0,0 +1,421 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+	COLOR_PAIRS;
+	COLORS;
+	COLS;
+	curscr;
+	cur_term;
+	LINES;
+	putp;
+	stdscr;
+	tparm;
+	tputs;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	addch;
+	addchnstr;
+	addchstr;
+	addnstr;
+	addnwstr;
+	addstr;
+	add_wch;
+	add_wchnstr;
+	addwstr;
+	attr_get;
+	attr_off;
+	attroff;
+	attr_on;
+	attron;
+	attr_set;
+	attrset;
+	baudrate;
+	beep;
+	bkgd;
+	bkgdset;
+	bkgrnd;
+	bkgrndset;
+	border;
+	border_set;
+	box;
+	box_set;
+	can_change_color;
+	cbreak;
+	chgat;
+	clear;
+	clearok;
+	clrtobot;
+	clrtoeol;
+	color_content;
+	COLOR_PAIR;
+	color_set;
+	copywin;
+	curs_set;
+	def_prog_mode;
+	def_shell_mode;
+	delay_output;
+	delch;
+	del_curterm;
+	deleteln;
+	delscreen;
+	delwin;
+	derwin;
+	doupdate;
+	dupwin;
+	echo;
+	echochar;
+	echo_wchar;
+	endwin;
+	erase;
+	erasechar;
+	erasewchar;
+	filter;
+	flash;
+	flushinp;
+	getbkgd;
+	getbkgrnd;
+	getcchar;
+	getch;
+	getnstr;
+	getn_wstr;
+	getstr;
+	get_wch;
+	getwin;
+	get_wstr;
+	halfdelay;
+	has_colors;
+	has_ic;
+	has_il;
+	hline;
+	hline_set;
+	idcok;
+	idlok;
+	immedok;
+	inch;
+	inchnstr;
+	inchstr;
+	init_color;
+	init_pair;
+	initscr;
+	innstr;
+	innwstr;
+	insch;
+	insdelln;
+	insertln;
+	insnstr;
+	ins_nwstr;
+	insstr;
+	instr;
+	ins_wch;
+	ins_wstr;
+	intrflush;
+	in_wch;
+	in_wchnstr;
+	in_wchstr;
+	inwstr;
+	isendwin;
+	is_linetouched;
+	is_wintouched;
+	key_name;
+	keyname;
+	keypad;
+	killchar;
+	killwchar;
+	leaveok;
+	longname;
+	meta;
+	move;
+	mvaddch;
+	mvaddchnstr;
+	mvaddchstr;
+	mvaddnstr;
+	mvaddnwstr;
+	mvaddstr;
+	mvadd_wch;
+	mvadd_wchnstr;
+	mvadd_wchstr;
+	mvaddwstr;
+	mvchgat;
+	mvcur;
+	mvdelch;
+	mvderwin;
+	mvgetch;
+	mvgetnstr;
+	mvgetn_wstr;
+	mvgetstr;
+	mvget_wch;
+	mvhline;
+	mvhline_set;
+	mvinch;
+	mvinchnstr;
+	mvinchstr;
+	mvinnstr;
+	mvinnwstr;
+	mvinsch;
+	mvinsnstr;
+	mvins_nwstr;
+	mvinsstr;
+	mvinstr;
+	mvins_wch;
+	mvins_wstr;
+	mvin_wch;
+	mvin_wchnstr;
+	mvin_wchstr;
+	mvinwstr;
+	mvprintw;
+	mvscanw;
+	mvvline;
+	mvvline_set;
+	mvwaddch;
+	mvwaddchnstr;
+	mvwaddchstr;
+	mvwaddnstr;
+	mvwaddnwstr;
+	mvwaddstr;
+	mvwadd_wch;
+	mvwadd_wchnstr;
+	mvwadd_wchstr;
+	mvwaddwstr;
+	mvwchgat;
+	mvwdelch;
+	mvwgetch;
+	mvwgetnstr;
+	mvwgetn_wstr;
+	mvwgetstr;
+	mvwget_wch;
+	mvwget_wstr;
+	mvwhline;
+	mvwhline_set;
+	mvwin;
+	mvwinch;
+	mvwinchnstr;
+	mvwinchstr;
+	mvwinnstr;
+	mvwinnwstr;
+	mvwinsch;
+	mvwinsnstr;
+	mvwins_nwstr;
+	mvwinsstr;
+	mvwinstr;
+	mvwins_wch;
+	mvwins_wstr;
+	mvwin_wch;
+	mvwin_wchnstr;
+	mvwin_wchstr;
+	mvwinwstr;
+	mvwprintw;
+	mvwscanw;
+	mvwvline;
+	mvwvline_set;
+	napms;
+	newpad;
+	newterm;
+	newwin;
+	nl;
+	nocbreak;
+	nodelay;
+	noecho;
+	nonl;
+	noqiflush;
+	noraw;
+	notimeout;
+	overlay;
+	overwrite;
+	pair_content;
+	PAIR_NUMBER;
+	pechochar;
+	pecho_wchar;
+	pnoutrefresh;
+	prefresh;
+	printw;
+	putwin;
+	qiflush;
+	raw;
+	redrawwin;
+	refresh;
+	reset_prog_mode;
+	reset_shell_mode;
+	resetty;
+	restartterm;
+	ripoffline;
+	savetty;
+	scanw;
+	scr_dump;
+	scr_init;
+	scrl;
+	scroll;
+	scrollok;
+	scr_restore;
+	scr_set;
+	setcchar;
+	set_curterm;
+	setscrreg;
+	set_term;
+	setupterm;
+	slk_attr_off;
+	slk_attroff;
+	slk_attr_on;
+	slk_attron;
+	slk_attr_set;
+	slk_attrset;
+	slk_clear;
+	slk_color;
+	slk_init;
+	slk_label;
+	slk_noutrefresh;
+	slk_refresh;
+	slk_restore;
+	slk_set;
+	slk_touch;
+	slk_wset;
+	standend;
+	standout;
+	start_color;
+	subpad;
+	subwin;
+	syncok;
+	term_attrs;
+	termattrs;
+	termname;
+	tgetent;
+	tgetflag;
+	tgetnum;
+	tgetstr;
+	tgoto;
+	tigetflag;
+	tigetnum;
+	tigetstr;
+	timeout;
+	touchline;
+	touchwin;
+	tstp;
+	typeahead;
+	unctrl;
+	ungetch;
+	unget_wch;
+	untouchwin;
+	use_env;
+	vid_attr;
+	vidattr;
+	vid_puts;
+	vidputs;
+	vline;
+	vline_set;
+	vw_printw;
+	vwprintw;
+	vw_scanw;
+	vwscanw;
+	waddch;
+	waddchnstr;
+	waddchstr;
+	waddnstr;
+	waddnwstr;
+	waddstr;
+	wadd_wch;
+	wadd_wchnstr;
+	wadd_wchstr;
+	waddwstr;
+	wattr_get;
+	wattr_off;
+	wattroff;
+	wattr_on;
+	wattron;
+	wattr_set;
+	wattrset;
+	wbkgd;
+	wbkgdset;
+	wbkgrnd;
+	wbkgrndset;
+	wborder;
+	wborder_set;
+	wchgat;
+	wclear;
+	wclrtobot;
+	wclrtoeol;
+	wcolor_set;
+	wcursyncup;
+	wdelch;
+	wdeleteln;
+	wechochar;
+	wecho_wchar;
+	werase;
+	wgetbkgrnd;
+	wgetch;
+	wgetnstr;
+	wgetn_wstr;
+	wgetstr;
+	wget_wch;
+	wget_wstr;
+	whline;
+	whline_set;
+	winch;
+	winchnstr;
+	winchstr;
+	winnstr;
+	winnwstr;
+	winsch;
+	winsdelln;
+	winsertln;
+	winsnstr;
+	wins_nwstr;
+	winsstr;
+	winstr;
+	wins_wch;
+	wins_wstr;
+	win_wch;
+	win_wchnstr;
+	win_wchstr;
+	winwstr;
+	wmove;
+	wnoutrefresh;
+	wprintw;
+	wredrawln;
+	wrefresh;
+	wscanw;
+	wscrl;
+	wsetscrreg;
+	wstandend;
+	wstandout;
+	wsyncdown;
+	wsyncup;
+	wtimeout;
+	wtouchln;
+	wunctrl;
+	wvline;
+	wvline_set;
+};
+
+SUNWprivate_1.1 {
+    global:
+	SUNWprivate_1.1;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libxcurses2/Makefile b/usr/src/lib/libxcurses2/Makefile
index c21b2f7d31..c4acc11245 100644
--- a/usr/src/lib/libxcurses2/Makefile
+++ b/usr/src/lib/libxcurses2/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1995-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libxcurses/Makefile
 
 include	../Makefile.lib
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
 install :=	TARGET= install
@@ -79,7 +78,7 @@ check: $(HDRS)
 
 install_h: $(ROOTHDRS)
 
-$(MACH) $(MACH64) spec: $(GENERATED)
+$(SUBDIRS):	$(GENERATED)
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 # derived C files
@@ -96,5 +95,3 @@ h/term.h : src/libc/xcurses/mkterm.awk src/libc/xcurses/caps
 src/libc/xcurses/keyindex.c : src/libc/xcurses/mkkey.awk src/libc/xcurses/caps
 	$(RM) $@
 	cd src/libc/xcurses; nawk -f mkkey.awk caps > keyindex.c
-
-FRC:
diff --git a/usr/src/lib/libxcurses2/Makefile.com b/usr/src/lib/libxcurses2/Makefile.com
index 6aee49f905..022b180a59 100644
--- a/usr/src/lib/libxcurses2/Makefile.com
+++ b/usr/src/lib/libxcurses2/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -79,7 +78,8 @@ WIDE= wio_get.o	wio_put.o
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
+SRCDIR =	../src
+
 SRCS=		$(XCURSES:%.o=../src/libc/xcurses/%.c) \
 		$(MKS:%.o=../src/libc/mks/%.c) \
 		$(WIDE:%.o=../src/libc/wide/%.c)
@@ -95,7 +95,6 @@ $(LINTLIB):= SRCS=../src/libc/llib-lcurses
 
 LINTSRC=	$(LINTLIB:%.ln=%)
 
-DYNFLAGS +=	-M$(MAPFILE)
 LDLIBS += -lc
 
 CPPFLAGS = -I../h -I../src/libc/xcurses $(CPPFLAGS.master)
@@ -104,7 +103,7 @@ CPPFLAGS = -I../h -I../src/libc/xcurses $(CPPFLAGS.master)
 # If and when somebody gets around to messaging this, CLOBBERFILE should not
 # be cleared (so that any .po file will be clobbered.
 #
-CLOBBERFILES=	libcurses.so libcurses.so$(VERS) $(MAPFILE)
+CLOBBERFILES=	libcurses.so libcurses.so$(VERS)
 
 .KEEP_STATE:
 
@@ -112,11 +111,6 @@ all: $(LIBS)
 
 lint: lintcheck
 
-$(DYNLIB): 	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 #
 # Include library targets
 #
diff --git a/usr/src/lib/libxcurses2/amd64/Makefile b/usr/src/lib/libxcurses2/amd64/Makefile
index cb86d986a2..80a8e6fcb2 100644
--- a/usr/src/lib/libxcurses2/amd64/Makefile
+++ b/usr/src/lib/libxcurses2/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libxcurses2/i386/Makefile b/usr/src/lib/libxcurses2/i386/Makefile
index 4a4afb5133..4351f4cf5f 100644
--- a/usr/src/lib/libxcurses2/i386/Makefile
+++ b/usr/src/lib/libxcurses2/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libxcurses/i386/Makefile
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
diff --git a/usr/src/lib/libxcurses2/sparc/Makefile b/usr/src/lib/libxcurses2/sparc/Makefile
index 09f1ded02b..14b8ae0ed1 100644
--- a/usr/src/lib/libxcurses2/sparc/Makefile
+++ b/usr/src/lib/libxcurses2/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libxcurses/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/libxcurses2/sparcv9/Makefile b/usr/src/lib/libxcurses2/sparcv9/Makefile
index 322a04ade1..80a8e6fcb2 100644
--- a/usr/src/lib/libxcurses2/sparcv9/Makefile
+++ b/usr/src/lib/libxcurses2/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-# Copyright (c) 1998-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/libxcurses/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/libxcurses2/src/mapfile-vers b/usr/src/lib/libxcurses2/src/mapfile-vers
new file mode 100644
index 0000000000..7920d52e45
--- /dev/null
+++ b/usr/src/lib/libxcurses2/src/mapfile-vers
@@ -0,0 +1,460 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.2 {
+    global:
+	add_wchstr;
+	COLOR_PAIRS;
+	COLORS;
+	COLS;
+	curscr;
+	cur_term;
+	LINES;
+	mvget_wstr;
+	putp;
+	stdscr;
+	tparm;
+	tputs;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	addch;
+	addchnstr;
+	addchstr;
+	addnstr;
+	addnwstr;
+	addstr;
+	add_wch;
+	add_wchnstr;
+	addwstr;
+	attr_get;
+	attr_off;
+	attroff;
+	attr_on;
+	attron;
+	attr_set;
+	attrset;
+	baudrate;
+	beep;
+	bkgd;
+	bkgdset;
+	bkgrnd;
+	bkgrndset;
+	border;
+	border_set;
+	box;
+	box_set;
+	can_change_color;
+	cbreak;
+	chgat;
+	clear;
+	clearok;
+	clrtobot;
+	clrtoeol;
+	color_content;
+	COLOR_PAIR;
+	color_set;
+	copywin;
+	curs_set;
+	def_prog_mode;
+	def_shell_mode;
+	delay_output;
+	delch;
+	del_curterm;
+	deleteln;
+	delscreen;
+	delwin;
+	derwin;
+	doupdate;
+	dupwin;
+	echo;
+	echochar;
+	echo_wchar;
+	endwin;
+	erase;
+	erasechar;
+	erasewchar;
+	filter;
+	flash;
+	flushinp;
+	getbkgd;
+	getbkgrnd;
+	getcchar;
+	getch;
+	getnstr;
+	getn_wstr;
+	getstr;
+	get_wch;
+	getwin;
+	get_wstr;
+	halfdelay;
+	has_colors;
+	has_ic;
+	has_il;
+	hline;
+	hline_set;
+	idcok;
+	idlok;
+	immedok;
+	inch;
+	inchnstr;
+	inchstr;
+	init_color;
+	init_pair;
+	initscr;
+	innstr;
+	innwstr;
+	insch;
+	insdelln;
+	insertln;
+	insnstr;
+	ins_nwstr;
+	insstr;
+	instr;
+	ins_wch;
+	ins_wstr;
+	intrflush;
+	in_wch;
+	in_wchnstr;
+	in_wchstr;
+	inwstr;
+	isendwin;
+	is_linetouched;
+	is_wintouched;
+	key_name;
+	keyname;
+	keypad;
+	killchar;
+	killwchar;
+	leaveok;
+	longname;
+	meta;
+	move;
+	mvaddch;
+	mvaddchnstr;
+	mvaddchstr;
+	mvaddnstr;
+	mvaddnwstr;
+	mvaddstr;
+	mvadd_wch;
+	mvadd_wchnstr;
+	mvadd_wchstr;
+	mvaddwstr;
+	mvchgat;
+	mvcur;
+	mvdelch;
+	mvderwin;
+	mvgetch;
+	mvgetnstr;
+	mvgetn_wstr;
+	mvgetstr;
+	mvget_wch;
+	mvhline;
+	mvhline_set;
+	mvinch;
+	mvinchnstr;
+	mvinchstr;
+	mvinnstr;
+	mvinnwstr;
+	mvinsch;
+	mvinsnstr;
+	mvins_nwstr;
+	mvinsstr;
+	mvinstr;
+	mvins_wch;
+	mvins_wstr;
+	mvin_wch;
+	mvin_wchnstr;
+	mvin_wchstr;
+	mvinwstr;
+	mvprintw;
+	mvscanw;
+	mvvline;
+	mvvline_set;
+	mvwaddch;
+	mvwaddchnstr;
+	mvwaddchstr;
+	mvwaddnstr;
+	mvwaddnwstr;
+	mvwaddstr;
+	mvwadd_wch;
+	mvwadd_wchnstr;
+	mvwadd_wchstr;
+	mvwaddwstr;
+	mvwchgat;
+	mvwdelch;
+	mvwgetch;
+	mvwgetnstr;
+	mvwgetn_wstr;
+	mvwgetstr;
+	mvwget_wch;
+	mvwget_wstr;
+	mvwhline;
+	mvwhline_set;
+	mvwin;
+	mvwinch;
+	mvwinchnstr;
+	mvwinchstr;
+	mvwinnstr;
+	mvwinnwstr;
+	mvwinsch;
+	mvwinsnstr;
+	mvwins_nwstr;
+	mvwinsstr;
+	mvwinstr;
+	mvwins_wch;
+	mvwins_wstr;
+	mvwin_wch;
+	mvwin_wchnstr;
+	mvwin_wchstr;
+	mvwinwstr;
+	mvwprintw;
+	mvwscanw;
+	mvwvline;
+	mvwvline_set;
+	napms;
+	newpad;
+	newterm;
+	newwin;
+	nl;
+	nocbreak;
+	nodelay;
+	noecho;
+	nonl;
+	noqiflush;
+	noraw;
+	notimeout;
+	overlay;
+	overwrite;
+	pair_content;
+	PAIR_NUMBER;
+	pechochar;
+	pecho_wchar;
+	pnoutrefresh;
+	prefresh;
+	printw;
+	putwin;
+	qiflush;
+	raw;
+	redrawwin;
+	refresh;
+	reset_prog_mode;
+	reset_shell_mode;
+	resetty;
+	restartterm;
+	ripoffline;
+	savetty;
+	scanw;
+	scr_dump;
+	scr_init;
+	scrl;
+	scroll;
+	scrollok;
+	scr_restore;
+	scr_set;
+	setcchar;
+	set_curterm;
+	setscrreg;
+	set_term;
+	setupterm;
+	slk_attr_off;
+	slk_attroff;
+	slk_attr_on;
+	slk_attron;
+	slk_attr_set;
+	slk_attrset;
+	slk_clear;
+	slk_color;
+	slk_init;
+	slk_label;
+	slk_noutrefresh;
+	slk_refresh;
+	slk_restore;
+	slk_set;
+	slk_touch;
+	slk_wset;
+	standend;
+	standout;
+	start_color;
+	subpad;
+	subwin;
+	syncok;
+	term_attrs;
+	termattrs;
+	termname;
+	tgetent;
+	tgetflag;
+	tgetnum;
+	tgetstr;
+	tgoto;
+	tigetflag;
+	tigetnum;
+	tigetstr;
+	timeout;
+	touchline;
+	touchwin;
+	typeahead;
+	unctrl;
+	ungetch;
+	unget_wch;
+	untouchwin;
+	use_env;
+	vid_attr;
+	vidattr;
+	vid_puts;
+	vidputs;
+	vline;
+	vline_set;
+	vw_printw;
+	vwprintw;
+	vw_scanw;
+	vwscanw;
+	waddch;
+	waddchnstr;
+	waddchstr;
+	waddnstr;
+	waddnwstr;
+	waddstr;
+	wadd_wch;
+	wadd_wchnstr;
+	wadd_wchstr;
+	waddwstr;
+	wattr_get;
+	wattr_off;
+	wattroff;
+	wattr_on;
+	wattron;
+	wattr_set;
+	wattrset;
+	wbkgd;
+	wbkgdset;
+	wbkgrnd;
+	wbkgrndset;
+	wborder;
+	wborder_set;
+	wchgat;
+	wclear;
+	wclrtobot;
+	wclrtoeol;
+	wcolor_set;
+	wcursyncup;
+	wdelch;
+	wdeleteln;
+	wechochar;
+	wecho_wchar;
+	werase;
+	wgetbkgrnd;
+	wgetch;
+	wgetnstr;
+	wgetn_wstr;
+	wgetstr;
+	wget_wch;
+	wget_wstr;
+	whline;
+	whline_set;
+	winch;
+	winchnstr;
+	winchstr;
+	winnstr;
+	winnwstr;
+	winsch;
+	winsdelln;
+	winsertln;
+	winsnstr;
+	wins_nwstr;
+	winsstr;
+	winstr;
+	wins_wch;
+	wins_wstr;
+	win_wch;
+	win_wchnstr;
+	win_wchstr;
+	winwstr;
+	wmove;
+	wnoutrefresh;
+	wprintw;
+	wredrawln;
+	wrefresh;
+	wscanw;
+	wscrl;
+	wsetscrreg;
+	wstandend;
+	wstandout;
+	wsyncdown;
+	wsyncup;
+	wtimeout;
+	wtouchln;
+	wunctrl;
+	wvline;
+	wvline_set;
+};
+
+SUNWprivate_1.1 {
+    global:
+	boolcodes;
+	boolfnames;
+	boolnames;
+	__cht1;
+	__cht2;
+	numcodes;
+	numfnames;
+	numnames;
+	__pcht1;
+	__pcht2;
+	strcodes;
+	strfnames;
+	strnames;
+	__w1;
+	__WACS_BLOCK;
+	__WACS_BOARD;
+	__WACS_BTEE;
+	__WACS_BULLET;
+	__WACS_CKBOARD;
+	__WACS_DARROW;
+	__WACS_DEGREE;
+	__WACS_DIAMOND;
+	__WACS_HLINE;
+	__WACS_LANTERN;
+	__WACS_LARROW;
+	__WACS_LLCORNER;
+	__WACS_LRCORNER;
+	__WACS_LTEE;
+	__WACS_PLMINUS;
+	__WACS_PLUS;
+	__WACS_RARROW;
+	__WACS_RTEE;
+	__WACS_S1;
+	__WACS_S9;
+	__WACS_TTEE;
+	__WACS_UARROW;
+	__WACS_ULCORNER;
+	__WACS_URCORNER;
+	__WACS_VLINE;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libxnet/Makefile.com b/usr/src/lib/libxnet/Makefile.com
index 9e6ba12bb3..93134f8b63 100644
--- a/usr/src/lib/libxnet/Makefile.com
+++ b/usr/src/lib/libxnet/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -35,8 +34,7 @@ include		../../Makefile.lib
 # install this library in the root filesystem
 include		../../Makefile.rootfs
 
-MAPFILES=	../common/mapfile-vers $(MAPFILE-FLTR)
-MAPOPTS=	$(MAPFILES:%=-M%)
+MAPFILES +=	$(MAPFILE-FLTR)
 
 SRCDIR=		../common
 LIBS=		$(DYNLIB) $(LINTLIB)
@@ -44,7 +42,7 @@ LIBS=		$(DYNLIB) $(LINTLIB)
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
 CFLAGS +=	$(CCVERBOSE)
-DYNFLAGS +=     $(ZLOADFLTR) $(MAPOPTS)
+DYNFLAGS +=     $(ZLOADFLTR)
 
 # Redefine shared object build rule to use $(LD) directly (this avoids .init
 # and .fini sections being added).
@@ -58,5 +56,3 @@ all:		$(LIBS) fnamecheck
 lint:		lintcheck
 
 include		../../Makefile.targ
-
-$(DYNLIB):	$(MAPFILES)
diff --git a/usr/src/lib/libzfs/Makefile b/usr/src/lib/libzfs/Makefile
index 5a5e6abd84..d940a6d3d3 100644
--- a/usr/src/lib/libzfs/Makefile
+++ b/usr/src/lib/libzfs/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include		../Makefile.lib
 
@@ -46,19 +46,17 @@ POFILE =	libzfs.po
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 $(POFILE):	pofile_MSGFILES
 
-lint: $(SUBDIRS)
-
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
 _msg: $(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libzfs/Makefile.com b/usr/src/lib/libzfs/Makefile.com
index 869da5228b..5f4b91680a 100644
--- a/usr/src/lib/libzfs/Makefile.com
+++ b/usr/src/lib/libzfs/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY= libzfs.a
 VERS= .1
@@ -41,6 +41,8 @@ include ../../Makefile.rootfs
 
 LIBS=	$(DYNLIB) $(LINTLIB)
 
+SRCDIR =	../common
+
 INCS += -I$(SRCDIR)
 INCS += -I../../../uts/common/fs/zfs
 INCS += -I../../../common/zfs
@@ -54,10 +56,6 @@ SRCS=	$(OBJS_COMMON:%.o=$(SRCDIR)/%.c)	\
 	$(OBJS_SHARED:%.o=$(SRC)/common/zfs/%.c)
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
-SRCDIR=		../common
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libzfs/common/mapfile-vers b/usr/src/lib/libzfs/common/mapfile-vers
new file mode 100644
index 0000000000..84ba2663c4
--- /dev/null
+++ b/usr/src/lib/libzfs/common/mapfile-vers
@@ -0,0 +1,128 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	libzfs_errno;
+	libzfs_error_action;
+	libzfs_error_description;
+	libzfs_fini;
+	libzfs_init;
+	libzfs_print_on_error;
+	zfs_clone;
+	zfs_close;
+	zfs_create;
+	zfs_destroy;
+	zfs_destroy_snaps;
+	zfs_get_handle;
+	zfs_get_name;
+	zfs_get_proplist;
+	zfs_get_type;
+	zfs_is_mounted;
+	zfs_is_shared;
+	zfs_iter_children;
+	zfs_iter_dependents;
+	zfs_iter_filesystems;
+	zfs_iter_root;
+	zfs_iter_snapshots;
+	zfs_mount;
+	zfs_name_to_prop;
+	zfs_name_valid;
+	zfs_nicenum;
+	zfs_nicestrtonum;
+	zfs_open;
+	zfs_promote;
+	zfs_prop_column_format;
+	zfs_prop_column_name;
+	zfs_prop_default_numeric;
+	zfs_prop_default_string;
+	zfs_prop_get;
+	zfs_prop_get_int;
+	zfs_prop_get_numeric;
+	zfs_prop_inherit;
+	zfs_prop_inheritable;
+	zfs_prop_is_string;
+	zfs_prop_readonly;
+	zfs_prop_set;
+	zfs_prop_to_name;
+	zfs_prop_validate;
+	zfs_prop_valid_for_type;
+	zfs_prop_values;
+	zfs_receive;
+	zfs_refresh_properties;
+	zfs_rename;
+	zfs_rollback;
+	zfs_send;
+	zfs_share;
+	zfs_snapshot;
+	zfs_type_to_name;
+	zfs_unmount;
+	zfs_unmountall;
+	zfs_unshare;
+	zfs_unshareall;
+	zpool_add;
+	zpool_clear;
+	zpool_close;
+	zpool_create;
+	zpool_create_zvol_links;
+	zpool_destroy;
+	zpool_export;
+	zpool_find_import;
+	zpool_find_vdev;
+	zpool_get_config;
+	zpool_get_errlog;
+	zpool_get_guid;
+	zpool_get_handle;
+	zpool_get_name;
+	zpool_get_root;
+	zpool_get_space_total;
+	zpool_get_space_used;
+	zpool_get_state;
+	zpool_get_status;
+	zpool_get_version;
+	zpool_import;
+	zpool_import_status;
+	zpool_in_use;
+	zpool_iter;
+	zpool_mount_datasets;
+	zpool_open;
+	zpool_open_canfail;
+	zpool_read_label;
+	zpool_refresh_stats;
+	zpool_remove_zvol_links;
+	zpool_scrub;
+	zpool_unmount_datasets;
+	zpool_upgrade;
+	zpool_vdev_attach;
+	zpool_vdev_detach;
+	zpool_vdev_name;
+	zpool_vdev_offline;
+	zpool_vdev_online;
+	zpool_vdev_remove;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libzfs_jni/Makefile b/usr/src/lib/libzfs_jni/Makefile
index d062bd767f..ded40b5865 100644
--- a/usr/src/lib/libzfs_jni/Makefile
+++ b/usr/src/lib/libzfs_jni/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include		../Makefile.lib
 
@@ -49,15 +49,13 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libzfs_jni/Makefile.com b/usr/src/lib/libzfs_jni/Makefile.com
index 8291e13d11..ac81f03073 100644
--- a/usr/src/lib/libzfs_jni/Makefile.com
+++ b/usr/src/lib/libzfs_jni/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY= libzfs_jni.a
 VERS= .1
@@ -47,12 +47,9 @@ LDLIBS +=	-lc -lnvpair -ldiskmgt -lzfs
 CPPFLAGS +=	$(INCS)
 $(NOT_RELEASE_BUILD) CPPFLAGS += -DDEBUG
 
+SRCDIR =	../common
 $(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
-SRCDIR=		../common
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/libzfs_jni/common/mapfile-vers b/usr/src/lib/libzfs_jni/common/mapfile-vers
new file mode 100644
index 0000000000..b638784db5
--- /dev/null
+++ b/usr/src/lib/libzfs_jni/common/mapfile-vers
@@ -0,0 +1,59 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	dmgt_avail_disk_iter;
+	dmgt_free_disk;
+	dmgt_free_slice;
+	dmgt_set_error_handler;
+	Java_com_sun_zfs_common_model_SystemDataModel_getAvailableDisks;
+	Java_com_sun_zfs_common_model_SystemDataModel_getDataset;
+	Java_com_sun_zfs_common_model_SystemDataModel_getDatasets;
+	Java_com_sun_zfs_common_model_SystemDataModel_getDependents;
+	Java_com_sun_zfs_common_model_SystemDataModel_getFileSystem;
+	Java_com_sun_zfs_common_model_SystemDataModel_getFileSystems;
+	Java_com_sun_zfs_common_model_SystemDataModel_getImportablePools;
+	Java_com_sun_zfs_common_model_SystemDataModel_getPool;
+	Java_com_sun_zfs_common_model_SystemDataModel_getPools;
+	Java_com_sun_zfs_common_model_SystemDataModel_getPropertyDefault;
+	Java_com_sun_zfs_common_model_SystemDataModel_getSnapshot;
+	Java_com_sun_zfs_common_model_SystemDataModel_getSnapshots;
+	Java_com_sun_zfs_common_model_SystemDataModel_getValidPropertyNames;
+	Java_com_sun_zfs_common_model_SystemDataModel_getVirtualDevice;
+	Java_com_sun_zfs_common_model_SystemDataModel_getVirtualDevices__Ljava_lang_String_2;
+	Java_com_sun_zfs_common_model_SystemDataModel_getVirtualDevices__Ljava_lang_String_2J;
+	Java_com_sun_zfs_common_model_SystemDataModel_getVolume;
+	Java_com_sun_zfs_common_model_SystemDataModel_getVolumes;
+	zjni_ipool_iter;
+	zjni_pool_state_to_str;
+	zjni_pool_status_to_str;
+	zjni_vdev_aux_to_str;
+	zjni_vdev_state_to_str;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libzonecfg/Makefile b/usr/src/lib/libzonecfg/Makefile
index d34f51aab1..513695f532 100644
--- a/usr/src/lib/libzonecfg/Makefile
+++ b/usr/src/lib/libzonecfg/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -70,17 +69,15 @@ $(XMLDIR)/%: %
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 $(POFILE):	pofile_MSGFILES
 
-lint:		$(SUBDIRS)
-
 install:	$(ROOTDTDS) $(ROOTXMLFILES)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-spec $(SUBDIRS):  FRC
+$(SUBDIRS):  FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libzonecfg/Makefile.com b/usr/src/lib/libzonecfg/Makefile.com
index e3bf9d2b7d..54caa0dd26 100644
--- a/usr/src/lib/libzonecfg/Makefile.com
+++ b/usr/src/lib/libzonecfg/Makefile.com
@@ -35,12 +35,10 @@ LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc -lsocket -lnsl -luuid -lnvpair -lsysevent -lsec
 # DYNLIB libraries do not have lint libs and are not linted
 $(DYNLIB) :=	LDLIBS += -lxml2
-CPPFLAGS +=	-I/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT
-$(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+CPPFLAGS +=	-I/usr/include/libxml2 -I$(SRCDIR) -D_REENTRANT
+$(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libzonecfg/common/mapfile-vers b/usr/src/lib/libzonecfg/common/mapfile-vers
new file mode 100644
index 0000000000..9654a93300
--- /dev/null
+++ b/usr/src/lib/libzonecfg/common/mapfile-vers
@@ -0,0 +1,178 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	endzoneent;
+	getzoneent;
+	getzoneent_private;
+	putzoneent;
+	setzoneent;
+	zonecfg_access;
+	zonecfg_add_attr;
+	zonecfg_add_dev;
+	zonecfg_add_ds;
+	zonecfg_add_filesystem;
+	zonecfg_add_fs_option;
+	zonecfg_add_ipd;
+	zonecfg_add_nwif;
+	zonecfg_add_rctl;
+	zonecfg_add_rctl_value;
+	zonecfg_add_scratch;
+	zonecfg_attach_manifest;
+	zonecfg_check_handle;
+	zonecfg_clear_deldevs;
+	zonecfg_close_scratch;
+	zonecfg_construct_rctlblk;
+	zonecfg_create_snapshot;
+	zonecfg_default_privset;
+	zonecfg_delete_attr;
+	zonecfg_delete_dev;
+	zonecfg_delete_ds;
+	zonecfg_delete_filesystem;
+	zonecfg_delete_ipd;
+	zonecfg_delete_nwif;
+	zonecfg_delete_rctl;
+	zonecfg_delete_scratch;
+	zonecfg_destroy;
+	zonecfg_destroy_snapshot;
+	zonecfg_detached;
+	zonecfg_detach_save;
+	zonecfg_devperms_apply;
+	zonecfg_devwalk;
+	zonecfg_endattrent;
+	zonecfg_enddevent;
+	zonecfg_enddevperment;
+	zonecfg_enddsent;
+	zonecfg_endfsent;
+	zonecfg_endipdent;
+	zonecfg_endnwifent;
+	zonecfg_endpatchent;
+	zonecfg_endpkgent;
+	zonecfg_endrctlent;
+	zonecfg_find_mounts;
+	zonecfg_find_scratch;
+	zonecfg_fini_handle;
+	zonecfg_free_fs_option_list;
+	zonecfg_free_rctl_value_list;
+	zonecfg_get_attach_handle;
+	zonecfg_get_attr_boolean;
+	zonecfg_getattrent;
+	zonecfg_get_attr_int;
+	zonecfg_get_attr_string;
+	zonecfg_get_attr_uint;
+	zonecfg_get_autoboot;
+	zonecfg_get_bootargs;
+	zonecfg_get_detach_info;
+	zonecfg_getdevent;
+	zonecfg_getdevperment;
+	zonecfg_getdsent;
+	zonecfg_getfsent;
+	zonecfg_get_handle;
+	zonecfg_getipdent;
+	zonecfg_get_limitpriv;
+	zonecfg_get_name;
+	zonecfg_get_name_by_uuid;
+	zonecfg_getnwifent;
+	zonecfg_getpatchent;
+	zonecfg_getpkgent;
+	zonecfg_get_pool;
+	zonecfg_get_privset;
+	zonecfg_getrctlent;
+	zonecfg_get_root;
+	zonecfg_get_scratch;
+	zonecfg_get_snapshot_handle;
+	zonecfg_get_template_handle;
+	zonecfg_get_uuid;
+	zonecfg_get_zonepath;
+	zonecfg_has_deldevs;
+	zonecfg_in_alt_root;
+	zonecfg_init_handle;
+	zonecfg_is_rctl;
+	zonecfg_is_scratch;
+	zonecfg_lock_scratch;
+	zonecfg_lookup_attr;
+	zonecfg_lookup_dev;
+	zonecfg_lookup_ds;
+	zonecfg_lookup_filesystem;
+	zonecfg_lookup_ipd;
+	zonecfg_lookup_nwif;
+	zonecfg_lookup_rctl;
+	zonecfg_match_dev;
+	zonecfg_modify_attr;
+	zonecfg_modify_dev;
+	zonecfg_modify_ds;
+	zonecfg_modify_filesystem;
+	zonecfg_modify_ipd;
+	zonecfg_modify_nwif;
+	zonecfg_modify_rctl;
+	zonecfg_notify_bind;
+	zonecfg_notify_critical_abort;
+	zonecfg_notify_critical_enter;
+	zonecfg_notify_critical_exit;
+	zonecfg_notify_unbind;
+	zonecfg_open_scratch;
+	zonecfg_remove_fs_option;
+	zonecfg_remove_rctl_value;
+	zonecfg_reverse_scratch;
+	zonecfg_rm_detached;
+	zonecfg_same_net_address;
+	zonecfg_save;
+	zonecfg_setattrent;
+	zonecfg_set_autoboot;
+	zonecfg_set_bootargs;
+	zonecfg_setdevent;
+	zonecfg_setdevperment;
+	zonecfg_setdsent;
+	zonecfg_setfsent;
+	zonecfg_setipdent;
+	zonecfg_set_limitpriv;
+	zonecfg_set_name;
+	zonecfg_setnwifent;
+	zonecfg_setpatchent;
+	zonecfg_setpkgent;
+	zonecfg_set_pool;
+	zonecfg_setrctlent;
+	zonecfg_set_root;
+	zonecfg_set_zonepath;
+	zonecfg_should_deldev;
+	zonecfg_strerror;
+	zonecfg_validate_zonename;
+	zonecfg_valid_fs_type;
+	zonecfg_valid_net_address;
+	zonecfg_valid_rctl;
+	zonecfg_valid_rctlblk;
+	zonecfg_valid_rctlname;
+	zone_get_id;
+	zone_get_rootpath;
+	zone_get_state;
+	zone_get_zonepath;
+	zone_set_state;
+	zone_state_str;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libzoneinfo/Makefile b/usr/src/lib/libzoneinfo/Makefile
index 294b60b15f..291a026f98 100644
--- a/usr/src/lib/libzoneinfo/Makefile
+++ b/usr/src/lib/libzoneinfo/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
@@ -40,15 +39,13 @@ lint :=		TARGET = lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h: 	$(ROOTHDRS)
 
 check:		$(CHECKHDRS)
 
-spec $(SUBDIRS):  FRC
+$(SUBDIRS):  FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/libzoneinfo/Makefile.com b/usr/src/lib/libzoneinfo/Makefile.com
index aac8fe01d2..68108c3a0c 100644
--- a/usr/src/lib/libzoneinfo/Makefile.com
+++ b/usr/src/lib/libzoneinfo/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -39,11 +38,9 @@ TEXT_DOMAIN=	SUNW_OST_ZONEINFO
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 LDLIBS +=	-lc
-$(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+$(LINTLIB) := SRCS=	$(SRCDIR)/$(LINTSRC)
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/libzoneinfo/common/mapfile-vers b/usr/src/lib/libzoneinfo/common/mapfile-vers
new file mode 100644
index 0000000000..fd626b9aa1
--- /dev/null
+++ b/usr/src/lib/libzoneinfo/common/mapfile-vers
@@ -0,0 +1,42 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	conv_gmt;
+	free_timezones;
+	free_tz_continents;
+	free_tz_countries;
+	get_system_tz;
+	get_timezones_by_country;
+	get_tz_continents;
+	get_tz_countries;
+	isvalid_tz;
+	set_system_tz;
+    local:
+	*;
+};
diff --git a/usr/src/lib/libzpool/Makefile.com b/usr/src/lib/libzpool/Makefile.com
index 44a1b55287..5ec1573812 100644
--- a/usr/src/lib/libzpool/Makefile.com
+++ b/usr/src/lib/libzpool/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 LIBRARY= libzpool.a
 VERS= .1
@@ -46,6 +46,9 @@ LIST_SRCS=		$(LIST_OBJS:%.o=../../../uts/common/os/%.c)
 SRCS=$(ZFS_COMMON_SRCS) $(ZFS_SHARED_SRCS) $(KERNEL_SRCS) $(LIST_SRCS)
 SRCDIR=		../common
 
+# There should be a mapfile here
+MAPFILES =
+
 LIBS +=		$(LINTLIB)
 
 INCS += -I../common
diff --git a/usr/src/lib/lvm/libmeta/Makefile b/usr/src/lib/lvm/libmeta/Makefile
index ab4fe9337c..cff9bffbdc 100644
--- a/usr/src/lib/lvm/libmeta/Makefile
+++ b/usr/src/lib/lvm/libmeta/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -48,16 +47,14 @@ CPPFLAGS += -I$(SRC)/lib/lvm/libmeta/common/hdrs
 
 .KEEP_STATE:
 
-all debug install: spec .WAIT $(SUBDIRS)
+all debug install lint: $(SUBDIRS)
 
-clean: spec $(SUBDIRS)
+clean: $(SUBDIRS)
 	$(RM) $(MSGFILES) $(DCFILES)
 
-clobber: spec $(SUBDIRS)
+clobber: $(SUBDIRS)
 	$(RM) $(POFILE) $(DCFILE)
 
-lint: $(SUBDIRS)
-
 $(DCFILE):= XGETFLAGS = -c TRANSLATION_NOTE_LC_TIME -t
 
 $(DCFILE): $(DCFILES)
@@ -70,7 +67,7 @@ _msg: $(MSGDOMAINPOFILE)
 
 _dc: $(DCMSGDOMAINPOFILE)
 
-spec $(MACH): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/lvm/libmeta/Makefile.com b/usr/src/lib/lvm/libmeta/Makefile.com
index 5a2a89cf82..2c1e4091a3 100644
--- a/usr/src/lib/lvm/libmeta/Makefile.com
+++ b/usr/src/lib/lvm/libmeta/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -120,8 +119,6 @@ SPC_SRCS = 	$(SPC_OBJS:%.o=../common/%.c)
 
 include ../../../Makefile.lib
 
-MAPDIR=         $(SRC)/lib/lvm/libmeta/spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
 OBJECTS64 =	$(LOCAL_OBJS) $(DERIVED_OBJS) $(CMN_OBJS)
 OBJECTS =	$(OBJECTS64) $(SPC_OBJS)
 
diff --git a/usr/src/lib/lvm/libmeta/common/mapfile-vers b/usr/src/lib/lvm/libmeta/common/mapfile-vers
new file mode 100644
index 0000000000..dd1814c718
--- /dev/null
+++ b/usr/src/lib/lvm/libmeta/common/mapfile-vers
@@ -0,0 +1,969 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	add_key_name;
+	add_name;
+	add_self_name;
+	alloc_newdrvdesc;
+	alloc_olddrvdesc;
+	allsigs;
+	blkname;
+	Calloc;
+	checkdrive_onnode;
+	cl_get_setkey;
+	clnt_adddrvs;
+	clnt_add_drv_sidenms;
+	clnt_addhosts;
+	clnt_clr_mnsetlock;
+	clnt_createset;
+	clnt_deldrvs;
+	clnt_del_drv_sidenms;
+	clnt_delhosts;
+	clnt_delset;
+	clnt_devid;
+	clnt_devinfo;
+	clnt_devinfo_by_devid;
+	clnt_drvused;
+	clnt_getset;
+	clnt_gtimeout;
+	clnt_hostname;
+	clnt_imp_adddrvs;
+	clnt_joinset;
+	clnt_lock_set;
+	clnt_mdcommdctl;
+	clnt_med_get_data;
+	clnt_med_get_rec;
+	clnt_med_hostname;
+	clnt_med_null;
+	clnt_med_upd_data;
+	clnt_med_upd_rec;
+	clnt_mncreateset;
+	clnt_mngetset;
+	clnt_mn_is_stale;
+	clnt_mn_mirror_resync_all;
+	clnt_mnsetmaster;
+	clnt_mn_sp_update_abr;
+	clnt_mn_susp_res_io;
+	clnt_nullproc;
+	clnt_ownset;
+	clnt_reset_mirror_owner;
+	clnt_setnameok;
+	clnt_setnumbusy;
+	clnt_stimeout;
+	clnt_unlock_set;
+	clnt_upd_dr_dbinfo;
+	clnt_upd_dr_flags;
+	clnt_updmeds;
+	clnt_upd_nr_flags;
+	clnt_upd_sr_flags;
+	close_admin;
+	close_mnttab;
+	cl_set_setkey;
+	commd_get_outfile;
+	commd_get_verbosity;
+	commitset;
+	comp_state_to_name;
+	copy_msg;
+	copy_msg_1;
+	copy_result;
+	crcfreetab;
+	crcfunc;
+	ctlr_cache_add;
+	ctlr_cache_look;
+	dd_list_dup;
+	defmhiargs;
+	del_key_name;
+	del_key_names;
+	del_name;
+	del_self_name;
+	do_owner_ioctls;
+	dr_cache_add;
+	dr_cache_del;
+	drdup;
+	evdrv2evlib_typetab;
+	Free;
+	free_msg;
+	free_newdrvdesc;
+	free_olddrvdesc;
+	free_result;
+	free_sr;
+	get_db_rec;
+	get_devname;
+	getdevstamp;
+	getdrvnode;
+	get_hspname;
+	get_max_meds;
+	get_max_sets;
+	get_mdname;
+	getmyside;
+	getnodeside;
+	getsetbyname;
+	getsetbynum;
+	get_ur_rec;
+	halt_set;
+	hs_state_to_name;
+	is_existing_hsp;
+	is_existing_metadevice;
+	is_hspname;
+	is_metaname;
+	Malloc;
+	mdclrerror;
+	mdcomperror;
+	md_daemonize;
+	mddeverror;
+	mddserror;
+	mde_perror;
+	md_eprintf;
+	mderror;
+	mderrorextra;
+	mde_sperror;
+	md_exit;
+	md_got_sig;
+	mdhserror;
+	mdhsperror;
+	md_in_daemon;
+	md_init;
+	md_init_daemon;
+	md_init_nosig;
+	md_logpfx;
+	mdmddberror;
+	mdmderror;
+	md_med_def_timeout;
+	md_med_pmap_timeout;
+	mdmn_abort;
+	mdmn_allocate_changelog;
+	mdmn_comm_lock_1;
+	mdmn_comm_msglock_1;
+	mdmn_comm_reinit_set_1;
+	mdmn_comm_resume_1;
+	mdmn_comm_suspend_1;
+	mdmn_comm_unlock_1;
+	mdmn_create_msgid;
+	mdmn_get_changelogrec;
+	mdmn_get_handler;
+	mdmn_get_message_class;
+	mdmn_get_submessage_generator;
+	mdmn_get_timeout;
+	mdmn_log_msg;
+	mdmn_msgtype_lock;
+	mdmn_reinit_set;
+	mdmn_reset_changelog;
+	mdmn_resume;
+	mdmn_send_1;
+	mdmn_send_message;
+	mdmn_snarf_changelog;
+	mdmn_suspend;
+	mdmn_unlog_msg;
+	mdmn_wakeup_initiator_1;
+	mdmn_wakeup_master_1;
+	mdmn_work_1;
+	mdnullerror;
+	md_perror;
+	md_post_sig;
+	md_rb_sig_handling_off;
+	md_rb_sig_handling_on;
+	mdrpc_adddrvs_1;
+	mdrpc_adddrvs_2;
+	mdrpc_add_drv_sidenms_1;
+	mdrpc_add_drv_sidenms_2;
+	mdrpc_addhosts_1;
+	mdrpc_addhosts_2;
+	mdrpc_clr_mnsetlock_2;
+	mdrpccreateerror;
+	mdrpc_createset_1;
+	mdrpc_createset_2;
+	mdrpc_deldrvs_1;
+	mdrpc_deldrvs_2;
+	mdrpc_del_drv_sidenms_1;
+	mdrpc_del_drv_sidenms_2;
+	mdrpc_delhosts_1;
+	mdrpc_delhosts_2;
+	mdrpc_delset_1;
+	mdrpc_delset_2;
+	mdrpc_devinfo_2;
+	mdrpc_drvused_1;
+	mdrpc_drvused_2;
+	mdrpcerror;
+	mdrpc_flush_internal_1;
+	mdrpc_flush_internal_2;
+	mdrpc_getset_1;
+	mdrpc_getset_2;
+	mdrpc_gtimeout_1;
+	mdrpc_gtimeout_2;
+	mdrpc_hostname_1;
+	mdrpc_hostname_2;
+	mdrpc_imp_adddrvs_2;
+	mdrpc_lock_set_1;
+	mdrpc_lock_set_2;
+	mdrpc_mdcommdctl_2;
+	mdrpc_mncreateset_2;
+	mdrpc_mngetset_2;
+	mdrpc_mn_is_stale_2;
+	mdrpc_mn_mirror_resync_all_2;
+	mdrpc_mnsetmaster_2;
+	mdrpc_mn_sp_update_abr_2;
+	mdrpc_mn_susp_res_io_2;
+	mdrpc_nullproc_1;
+	mdrpc_nullproc_2;
+	mdrpc_ownset_1;
+	mdrpc_ownset_2;
+	mdrpc_reset_mirror_owner_2;
+	mdrpc_setnameok_1;
+	mdrpc_setnameok_2;
+	mdrpc_setnumbusy_1;
+	mdrpc_setnumbusy_2;
+	mdrpc_stimeout_1;
+	mdrpc_stimeout_2;
+	mdrpc_unlock_set_1;
+	mdrpc_unlock_set_2;
+	mdrpc_upd_dr_dbinfo_1;
+	mdrpc_upd_dr_dbinfo_2;
+	mdrpc_upd_dr_flags_1;
+	mdrpc_upd_dr_flags_2;
+	mdrpc_updmeds_1;
+	mdrpc_updmeds_2;
+	mdrpc_upd_nr_flags_2;
+	mdrpc_upd_sr_flags_1;
+	mdrpc_upd_sr_flags_2;
+	mdstealerror;
+	mdsyserror;
+	mduseerror;
+	md_which_sig;
+	meddstealerror;
+	med_errnum_to_str;
+	med_get_data_1;
+	med_get_rec_1;
+	med_hostname_1;
+	med_null_1;
+	med_null_err;
+	med_upd_data_1;
+	med_upd_rec_1;
+	meta_adjust_geom;
+	meta_canonicalize;
+	meta_check_column;
+	meta_check_component;
+	meta_check_devicesize;
+	meta_check_driveinset;
+	meta_check_drive_inuse;
+	meta_check_drivemounted;
+	meta_check_driveswapped;
+	meta_check_hotspare;
+	meta_check_hsp;
+	meta_check_inhsp;
+	meta_check_inmeta;
+	meta_check_inmirror;
+	meta_check_inraid;
+	meta_check_inreplica;
+	meta_check_inset;
+	meta_check_instripe;
+	meta_check_intrans;
+	meta_check_inuse;
+	meta_check_log;
+	meta_check_master;
+	meta_check_mirror;
+	meta_check_overlap;
+	meta_check_ownership;
+	meta_check_ownership_on_host;
+	meta_check_raid;
+	meta_check_replica;
+	meta_check_root;
+	meta_check_samedrive;
+	meta_check_stripe;
+	meta_check_submirror;
+	metachkcomp;
+	metachkdisk;
+	metachkhsp;
+	metachkmeta;
+	meta_client_create;
+	meta_client_create_retry;
+	meta_cmpldev;
+	meta_concat_generic;
+	meta_concat_parent;
+	meta_conv_drvdesc_new2old;
+	meta_conv_drvdesc_old2new;
+	meta_conv_drvname_new2old;
+	meta_conv_drvname_old2new;
+	meta_cook_syntax;
+	meta_create_hsp;
+	meta_create_mirror;
+	meta_create_non_dup_list;
+	meta_create_raid;
+	meta_create_stripe;
+	meta_db_addsidenms;
+	meta_db_attach;
+	meta_db_balance;
+	meta_db_delsidenm;
+	meta_db_detach;
+	meta_db_minreplica;
+	meta_db_patch;
+	meta_default_raid_interlace;
+	meta_default_stripe_interlace;
+	meta_deviceid_to_nmlist;
+	meta_dev_ismeta;
+	metadevname;
+	metad_getsetbyname;
+	metad_getsetbynum;
+	metad_isautotakebyname;
+	metad_isautotakebynum;
+	metadiskname;
+	metadrivedesc_append;
+	metadrivename;
+	metadrivenamelist;
+	metadrivenamelist_append;
+	meta_drivenamelist_append_wrapper;
+	metadrivename_withdrkey;
+	meta_drive_to_disk_status_list;
+	meta_enable_byname;
+	meta_exchange;
+	meta_expldev;
+	metafakesetname;
+	meta_find_erred_comp;
+	meta_fixdevid;
+	metaflushctlrcache;
+	metaflushdrivenames;
+	metaflushmetanames;
+	metaflushnames;
+	metaflushsetname;
+	metaflushsidenames;
+	metaflushstatcache;
+	meta_free_disk_status_list;
+	metafreedrivedesc;
+	meta_free_drive_info_list;
+	metafreedrivename;
+	metafreedrivenamelist;
+	meta_free_hsp;
+	metafreehspnamelist;
+	meta_free_im_set_desc;
+	meta_free_mirror;
+	metafreenamelist;
+	meta_free_nodelist;
+	meta_free_raid;
+	metafreereplicalist;
+	meta_free_sp;
+	meta_free_stripe;
+	meta_free_trans;
+	meta_free_unit;
+	metafreevtoc;
+	meta_getalldevs;
+	meta_get_and_report_set_info;
+	metagetcinfo;
+	meta_get_current_root;
+	meta_get_current_root_dev;
+	meta_getdev;
+	metagetdevicesname;
+	meta_get_devid;
+	meta_getdevs;
+	meta_getdidbykey;
+	meta_getdidminorbykey;
+	metaget_drivedesc;
+	metaget_drivedesc_fromnamelist;
+	metaget_drivedesc_sideno;
+	meta_get_drive_names;
+	metagetgeom;
+	meta_get_hotspare_names;
+	meta_get_hsp;
+	meta_get_hsp_common;
+	meta_get_hsp_names;
+	meta_gethspnmentbyid;
+	meta_get_hs_state;
+	metagetlabel;
+	meta_getmajor;
+	meta_get_mdunit;
+	meta_getminor;
+	meta_get_mirror;
+	meta_get_mirror_names;
+	metagetmiscname;
+	meta_get_mountp;
+	meta_getnextside_devinfo;
+	meta_getnmbykey;
+	meta_getnmentbydev;
+	meta_getnmentbykey;
+	meta_get_nunits;
+	metagetpartno;
+	meta_get_raid;
+	meta_get_raid_col_state;
+	meta_get_raid_common;
+	meta_get_raid_names;
+	meta_get_replica_names;
+	meta_get_reserved_names;
+	metagetset;
+	metaget_setdesc;
+	metaget_setownership;
+	metagetsize;
+	meta_get_sp;
+	meta_get_sp_common;
+	meta_get_sp_names;
+	metagetstart;
+	meta_get_stripe;
+	meta_get_stripe_common;
+	meta_get_stripe_names;
+	meta_get_stripe_state;
+	meta_gettimeofday;
+	meta_get_trans;
+	meta_get_trans_common;
+	meta_get_trans_names;
+	meta_get_tstate;
+	meta_get_unit;
+	meta_getuserflags;
+	meta_getvtoc;
+	metagetvtoc;
+	meta_h2hi;
+	metahasmddb;
+	meta_hi2h;
+	meta_hs_add;
+	meta_hs_delete;
+	meta_hs_enable;
+	metahsphspname;
+	metahspname;
+	metahspnamelist;
+	metahspnamelist_append;
+	meta_hsp_print;
+	meta_hsp_reset;
+	meta_hs_replace;
+	meta_imp_drvused;
+	meta_imp_set;
+	meta_init_hsp;
+	meta_init_make_device;
+	meta_init_mirror;
+	meta_init_name;
+	meta_init_raid;
+	meta_init_stripe;
+	meta_invalidate_hsp;
+	meta_invalidate_name;
+	metaioctl;
+	meta_is_all;
+	meta_is_devid_in_anyset;
+	meta_is_devid_in_thisset;
+	meta_is_drive_in_anyset;
+	meta_is_drive_in_thisset;
+	metaislocalset;
+	meta_is_member;
+	metaismeta;
+	meta_is_mn_name;
+	meta_is_mn_set;
+	meta_is_none;
+	meta_isopen;
+	metaissameset;
+	metakeyname;
+	meta_list_disks;
+	meta_list_drives;
+	meta_lock;
+	meta_lock_name;
+	meta_lock_nowait;
+	meta_lock_status;
+	metalogfp;
+	meta_logs_print;
+	metamakedev;
+	meta_match_enclosure;
+	meta_mc_log;
+	meta_med_hnm2ip;
+	meta_mirror_anycomp_is_err;
+	meta_mirror_attach;
+	meta_mirror_detach;
+	meta_mirror_enable;
+	meta_mirror_get_params;
+	meta_mirror_offline;
+	meta_mirror_online;
+	meta_mirror_print;
+	meta_mirror_replace;
+	meta_mirror_reset;
+	meta_mirror_resync;
+	meta_mirror_resync_all;
+	meta_mirror_resync_block_all;
+	meta_mirror_resync_kill;
+	meta_mirror_resync_kill_all;
+	meta_mirror_resync_unblock;
+	meta_mirror_resync_unblock_all;
+	meta_mirror_set_params;
+	meta_mn_change_owner;
+	meta_mnjoin_all;
+	meta_mn_mirror_resync_all;
+	meta_mn_send_command;
+	meta_mn_send_get_tstate;
+	meta_mn_send_metaclear_command;
+	meta_mn_send_resync_starting;
+	meta_mn_send_setsync;
+	meta_mn_send_suspend_writes;
+	meta_mn_singlenode;
+	meta_mn_sp_update_abr;
+	meta_mnsync_diskset_mddbs;
+	meta_mnsync_user_records;
+	metamnumname;
+	metaname;
+	metaname_fast;
+	meta_name_getname;
+	metanamelist;
+	metanamelist_append;
+	meta_notify_createq;
+	meta_notify_deleteq;
+	meta_notify_doputev;
+	meta_notify_flushq;
+	meta_notify_freeevlist;
+	meta_notify_getev;
+	meta_notify_getevlist;
+	meta_notify_listq;
+	meta_notify_putev;
+	meta_notify_putevlist;
+	meta_notify_sendev;
+	meta_notify_validq;
+	meta_number_to_string;
+	meta_patch_fsdev;
+	meta_patch_rootdev;
+	meta_patch_swapdev;
+	meta_patch_vfstab;
+	meta_ping_mnset;
+	meta_prbits;
+	meta_print_all;
+	meta_print_devid;
+	meta_print_hrtime;
+	meta_print_mirror_options;
+	meta_print_name;
+	meta_print_raid_options;
+	meta_print_stripe_options;
+	meta_print_time;
+	meta_prune_cnames;
+	meta_raid_anycomp_is_err;
+	meta_raid_attach;
+	meta_raid_check_interlace;
+	meta_raid_enable;
+	meta_raid_get_params;
+	meta_raid_print;
+	meta_raid_regen_byname;
+	meta_raid_replace;
+	meta_raid_reset;
+	meta_raid_resync;
+	meta_raid_resync_all;
+	meta_raid_set_params;
+	meta_raid_state_cnt;
+	meta_raid_valid;
+	meta_read_nodelist;
+	meta_reconfig_choose_master;
+	meta_recover_sp;
+	meta_rel_own;
+	meta_rename;
+	meta_repartition_drive;
+	meta_replace_byname;
+	metareplicalist;
+	meta_replica_quorum;
+	meta_replicaslice;
+	meta_reset;
+	meta_reset_all;
+	meta_reset_by_name;
+	meta_resync_all;
+	meta_resync_byname;
+	metarpcclose;
+	metarpccloseall;
+	metarpcopen;
+	meta_set_adddrives;
+	meta_set_addhosts;
+	meta_set_addmeds;
+	meta_set_auto_take;
+	meta_set_balance;
+	meta_set_checkname;
+	meta_set_deletedrives;
+	meta_set_deletehosts;
+	meta_set_deletemeds;
+	meta_set_destroy;
+	meta_setdid;
+	meta_set_join;
+	meta_setmdvtoc;
+	metasetname;
+	metasetnosetname;
+	meta_set_purge;
+	meta_set_query;
+	meta_set_release;
+	meta_set_take;
+	meta_setup_db_locations;
+	meta_setup_geom;
+	meta_setuserflags;
+	meta_setvtoc;
+	metasetvtoc;
+	meta_set_withdraw;
+	metaslicename;
+	meta_smf_disable;
+	meta_smf_enable;
+	meta_smf_getmask;
+	meta_smf_isonline;
+	meta_sp_attach;
+	meta_sp_can_create_sps;
+	meta_sp_can_create_sps_on_drive;
+	meta_sp_get_free_space;
+	meta_sp_get_free_space_on_drive;
+	meta_sp_get_number_of_possible_sps;
+	meta_sp_get_number_of_possible_sps_on_drive;
+	meta_sp_get_possible_sp_size;
+	meta_sp_get_possible_sp_size_on_drive;
+	meta_sp_issp;
+	meta_sp_parsesize;
+	meta_sp_reset_component;
+	meta_sp_setstatus;
+	meta_sp_update_abr;
+	meta_stat;
+	meta_status_own;
+	meta_stripe_anycomp_is_err;
+	meta_stripe_attach;
+	meta_stripe_check_interlace;
+	meta_stripe_get_params;
+	meta_stripe_print;
+	meta_stripe_replace;
+	meta_stripe_reset;
+	meta_stripe_set_params;
+	meta_svm_sysevent;
+	meta_sync_db_locations;
+	metasyslog;
+	meta_systemfile_append_mddb;
+	meta_systemfile_append_mdroot;
+	meta_systemfile_copy;
+	meta_tab_find;
+	meta_tab_free;
+	meta_tab_parse;
+	meta_take_own;
+	meta_trans_detach;
+	meta_trans_print;
+	meta_trans_replace;
+	meta_trans_reset;
+	meta_unlock;
+	meta_update_devtree;
+	meta_update_mb;
+	meta_update_md_cf;
+	meta_upd_ctdnames;
+	meta_write_nodelist;
+	mhd_list_1;
+	mhd_null_error;
+	mhd_relown_1;
+	mhd_status_1;
+	mhd_tkown_1;
+	mhstealerror;
+	mnnr_cache_add;
+	mnnr_cache_del;
+	mnsetdup;
+	mt_flags_to_action;
+	mt_flags_to_name;
+	mt_l_error_to_action;
+	mt_l_error_to_name;
+	myname;
+	mynode;
+	name_to_pass_num;
+	name_to_rd_opt;
+	name_to_wr_opt;
+	nodehasset;
+	nodesuniq;
+	open_admin;
+	open_mnttab;
+	own_set;
+	parse_interlace;
+	pathname_reload;
+	pick_good_disk;
+	print_concise_entry;
+	procsigs;
+	raid_col_state_to_name;
+	raid_state_to_action;
+	raid_state_to_name;
+	rb_test;
+	rd_opt_to_name;
+	read_master_block;
+	Realloc;
+	rel_own_bydd;
+	resnarf_set;
+	resync_genid;
+	s_delrec;
+	s_delset;
+	sdssc_add_hosts;
+	sdssc_bindclusterdevs;
+	sdssc_binddevs;
+	sdssc_bind_library;
+	sdssc_clnt_bind_devs;
+	sdssc_clnt_proxy_cmd;
+	sdssc_cmd_proxy;
+	sdssc_cm_nid2nm;
+	sdssc_cm_nm2nid;
+	sdssc_cm_sr_nid2nm;
+	sdssc_cm_sr_nm2nid;
+	sdssc_convert_cluster_path;
+	sdssc_convert_ctd_path;
+	sdssc_convert_path_free;
+	sdssc_create_begin;
+	sdssc_create_end;
+	sdssc_delete_begin;
+	sdssc_delete_end;
+	sdssc_delete_hosts;
+	sdssc_free_mdcerr_list;
+	sdssc_freenodelist;
+	sdssc_get_index;
+	sdssc_getnodelist;
+	sdssc_get_primary_host;
+	sdssc_get_priv_ipaddr;
+	sdssc_get_services;
+	sdssc_get_services_free;
+	sdssc_gettransportbynode;
+	sdssc_mo_create_begin;
+	sdssc_notify_service;
+	sdssc_property_get;
+	sdssc_property_set;
+	sdssc_suspend;
+	sdssc_version;
+	setdevstamp;
+	setdup;
+	set_snarf;
+	setup_db_bydd;
+	setup_mc_log;
+	setup_med_cfg;
+	short_circuit_getset;
+	sm_state_to_action;
+	sm_state_to_name;
+	snarf_set;
+	s_ownset;
+	splicename;
+	splitname;
+	sr2setdesc;
+	sr_cache_add;
+	sr_cache_del;
+	sr_cache_flush;
+	sr_cache_flush_setno;
+	sr_del_drv;
+	sr_validate;
+	start_time;
+	Strdup;
+	strinlst;
+	tag2obj_typetab;
+	tk_own_bydd;
+	transstats;
+	verbosity;
+	wr_opt_to_name;
+	xdr_clnt_stat;
+	xdr_comp_state_t;
+	xdr_comp_t;
+	xdr_daddr_t;
+	xdr_dev_t;
+	xdr_diskaddr_t;
+	xdr_hotspare_states_t;
+	xdr_hsp_t;
+	xdr_hs_t;
+	xdr_md_alias_ip_t;
+	xdr_md_alias_nm_t;
+	xdr_mdcinfo_t;
+	xdr_md_common_t;
+	xdr_md_comp_errno_t;
+	xdr_md_comp_error_t;
+	xdr_md_comp_t;
+	xdr_mddb_cfgcmd_t;
+	xdr_mddb_recid_t;
+	xdr_mddb_recstatus_t;
+	xdr_mddb_type_t;
+	xdr_mddb_usercmd_t;
+	xdr_mddb_userrec_t;
+	xdr_md_dev64_t;
+	xdr_md_dev_errno_t;
+	xdr_md_dev_error_t;
+	xdr_md_drive_desc;
+	xdr_mddrivenamelist_t;
+	xdr_mddrivename_t;
+	xdr_md_drive_record;
+	xdr_md_ds_errno_t;
+	xdr_md_ds_error_t;
+	xdr_md_errclass_t;
+	xdr_md_error_info_t;
+	xdr_md_error_t;
+	xdr_mdgeom_t;
+	xdr_md_h_arr_t;
+	xdr_md_hi_arr_t;
+	xdr_md_hi_t;
+	xdr_md_hs_errno_t;
+	xdr_md_hs_error_t;
+	xdr_md_hsp_errno_t;
+	xdr_md_hsp_error_t;
+	xdr_mdhspnamelist_t;
+	xdr_mdhspname_t;
+	xdr_md_hsp_t;
+	xdr_md_hs_t;
+	xdr_md_h_t;
+	xdr_mdkey_t;
+	xdr_md_mddb_errno_t;
+	xdr_md_mddb_error_t;
+	xdr_md_md_errno_t;
+	xdr_md_md_error_t;
+	xdr_md_med_errno_t;
+	xdr_md_mirror_t;
+	xdr_md_mn_msg_t;
+	xdr_md_mn_nodeid_t;
+	xdr_mdnamelist_t;
+	xdr_md_name_prefix;
+	xdr_md_name_suffix;
+	xdr_mdname_t;
+	xdr_mdnmtype_t;
+	xdr_md_node_nm_arr_t;
+	xdr_md_node_nm_t;
+	xdr_md_parent_t;
+	xdr_mdpart_t;
+	xdr_md_raidcol_t;
+	xdr_md_raid_t;
+	xdr_md_replicalist_t;
+	xdr_md_replica_recerr_t;
+	xdr_md_replica_t;
+	xdr_md_riflags_t;
+	xdr_md_row_t;
+	xdr_mdrpc_bool_res;
+	xdr_mdrpc_createset_2_args;
+	xdr_mdrpc_createset_args;
+	xdr_mdrpc_devid_2_args;
+	xdr_mdrpc_devid_args;
+	xdr_mdrpc_devid_name_2_args;
+	xdr_mdrpc_devid_res;
+	xdr_mdrpc_devidstr_args;
+	xdr_mdrpc_devinfo_2_args;
+	xdr_mdrpc_devinfo_2_res;
+	xdr_mdrpc_devinfo_args;
+	xdr_mdrpc_devinfo_res;
+	xdr_mdrpc_drives_2_args;
+	xdr_mdrpc_drives_args;
+	xdr_mdrpc_drv_sidenm_2_args;
+	xdr_mdrpc_drv_sidenm_args;
+	xdr_mdrpc_drvused_2_args;
+	xdr_mdrpc_drvused_args;
+	xdr_md_rpc_error_t;
+	xdr_mdrpc_generic_res;
+	xdr_mdrpc_getdrivedesc_res;
+	xdr_mdrpc_getset_2_args;
+	xdr_mdrpc_getset_args;
+	xdr_mdrpc_getset_res;
+	xdr_mdrpc_gtimeout_res;
+	xdr_mdrpc_host_2_args;
+	xdr_mdrpc_host_args;
+	xdr_mdrpc_hostname_res;
+	xdr_mdrpc_mdcommdctl_2_args;
+	xdr_mdrpc_mdcommdctl_args;
+	xdr_mdrpc_mncreateset_2_args;
+	xdr_mdrpc_mngetset_res;
+	xdr_mdrpc_mnsetmaster_2_args;
+	xdr_mdrpc_mn_susp_res_io_2_args;
+	xdr_mdrpc_mn_susp_res_io_args;
+	xdr_mdrpc_nodeid_2_args;
+	xdr_mdrpc_nodeid_args;
+	xdr_mdrpc_null_args;
+	xdr_mdrpc_setlock_res;
+	xdr_mdrpc_setno_2_args;
+	xdr_mdrpc_setno_args;
+	xdr_mdrpc_sp_2_args;
+	xdr_mdrpc_sp_args;
+	xdr_mdrpc_sp_flags_2_args;
+	xdr_mdrpc_sp_flags_args;
+	xdr_mdrpc_stimeout_2_args;
+	xdr_mdrpc_stimeout_args;
+	xdr_mdrpc_upd_dr_flags_2_args;
+	xdr_mdrpc_upd_dr_flags_args;
+	xdr_mdrpc_updmeds_2_args;
+	xdr_mdrpc_updmeds_args;
+	xdr_mdrpc_upd_nr_flags_2_args;
+	xdr_mdrpc_upd_sr_flags_2_args;
+	xdr_mdrpc_upd_sr_flags_args;
+	xdr_md_set_desc;
+	xdr_md_setkey_t;
+	xdr_mdsetnamelist_t;
+	xdr_mdsetname_t;
+	xdr_md_set_nm_t;
+	xdr_md_set_params_t;
+	xdr_md_set_record;
+	xdr_md_shared_t;
+	xdr_mdsidenames_t;
+	xdr_md_splitname;
+	xdr_md_stackcap_t;
+	xdr_md_status_t;
+	xdr_md_stripe_t;
+	xdr_md_submirror_t;
+	xdr_md_sys_error_t;
+	xdr_md_timeval32_t;
+	xdr_md_trans_t;
+	xdr_md_types_t;
+	xdr_md_ur_get_cmd_t;
+	xdr_md_use_errno_t;
+	xdr_md_use_error_t;
+	xdr_md_void_errno_t;
+	xdr_md_void_error_t;
+	xdr_mdvtoc_t;
+	xdr_med_args_t;
+	xdr_med_data_t;
+	xdr_med_err_t;
+	xdr_med_get_data_res_t;
+	xdr_med_get_rec_res_t;
+	xdr_med_hnm_res_t;
+	xdr_med_med_t;
+	xdr_med_rec_t;
+	xdr_med_res_t;
+	xdr_med_upd_data_args_t;
+	xdr_med_upd_rec_args_t;
+	xdr_mhd_cinfo_t;
+	xdr_mhd_ctlrtype_t;
+	xdr_mhd_did_flags_t;
+	xdr_mhd_drive_id_t;
+	xdr_mhd_drive_info_list_t;
+	xdr_mhd_drive_info_t;
+	xdr_mhd_drivename_t;
+	xdr_mhd_drive_status_t;
+	xdr_mhd_error_t;
+	xdr_mhd_ff_mode_t;
+	xdr_mhd_list_args_t;
+	xdr_mhd_list_res_t;
+	xdr_mhd_mhiargs_t;
+	xdr_mhd_mhioctkown_t;
+	xdr_mhd_opts_t;
+	xdr_mhd_relown_args_t;
+	xdr_mhd_serial_t;
+	xdr_mhd_set_t;
+	xdr_mhd_status_args_t;
+	xdr_mhd_status_res_t;
+	xdr_mhd_tkown_args_t;
+	xdr_minor_or_hsp_t;
+	xdr_minor_t;
+	xdr_mm_params_t;
+	xdr_mm_pass_num_t;
+	xdr_mm_rd_opt_t;
+	xdr_mm_wr_opt_t;
+	xdr_mp_unit_t;
+	xdr_mr_params_t;
+	xdr_ms_params_t;
+	xdr_mt_debug_t;
+	xdr_mt_flags_t;
+	xdr_mt_l_error_t;
+	xdr_off_t;
+	xdr_rcs_flags_t;
+	xdr_rcs_state_t;
+	xdr_replica_flags_t;
+	xdr_rus_state_t;
+	xdr_set_t;
+	xdr_side_t;
+	xdr_size_t;
+	xdr_sm_flags_t;
+	xdr_sm_state_t;
+	xdr_stringarray;
+	xdr_timeval;
+	xdr_unit_t;
+	Zalloc;
+    local:
+	*;
+};
diff --git a/usr/src/lib/lvm/libpreen/Makefile b/usr/src/lib/lvm/libpreen/Makefile
index ca1bb50937..ff99b0c5c4 100644
--- a/usr/src/lib/lvm/libpreen/Makefile
+++ b/usr/src/lib/lvm/libpreen/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1998-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
@@ -39,11 +38,9 @@ debug :=	TARGET= debug
 
 .KEEP_STATE:
 
-all clean clobber debug install: spec .WAIT $(SUBDIRS)
+all clean clobber debug install lint: $(SUBDIRS)
 
-lint: $(SUBDIRS)
-
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/lvm/libpreen/Makefile.com b/usr/src/lib/lvm/libpreen/Makefile.com
index fdfee4627d..8e15d6d753 100644
--- a/usr/src/lib/lvm/libpreen/Makefile.com
+++ b/usr/src/lib/lvm/libpreen/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -38,9 +37,6 @@ CPPFLAGS +=	-D_FILE_OFFSET_BITS=64
 LDLIBS +=	-lmeta -lc
 ZDEFS=
 
-MAPDIR=         $(SRC)/lib/lvm/libpreen/spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/lvm/libpreen/common/mapfile-vers b/usr/src/lib/lvm/libpreen/common/mapfile-vers
new file mode 100644
index 0000000000..4273789ce2
--- /dev/null
+++ b/usr/src/lib/lvm/libpreen/common/mapfile-vers
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	preen_build_devs;
+    local:
+	*;
+};
diff --git a/usr/src/lib/lvm/libsvm/Makefile b/usr/src/lib/lvm/libsvm/Makefile
index 1917939812..b849f639bf 100644
--- a/usr/src/lib/lvm/libsvm/Makefile
+++ b/usr/src/lib/lvm/libsvm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
@@ -42,15 +41,13 @@ debug :=	TARGET= debug
 
 .KEEP_STATE:
 
-all clean clobber debug install: spec .WAIT $(SUBDIRS)
+all clean clobber debug install lint: $(SUBDIRS)
 
 install_h: $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-lint: $(SUBDIRS)
-
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/lvm/libsvm/Makefile.com b/usr/src/lib/lvm/libsvm/Makefile.com
index 3a87715a12..7df4a4b39f 100644
--- a/usr/src/lib/lvm/libsvm/Makefile.com
+++ b/usr/src/lib/lvm/libsvm/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -54,9 +53,6 @@ CPPFLAGS +=	-D_FILE_OFFSET_BITS=64
 CPPFLAGS +=	-I$(SRC)/lib/lvm/libsvm/common/hdrs
 ZDEFS =
 
-MAPDIR=         $(SRC)/lib/lvm/libsvm/spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 .KEEP_STATE:
 
 all: $(LIBS)
diff --git a/usr/src/lib/lvm/libsvm/common/mapfile-vers b/usr/src/lib/lvm/libsvm/common/mapfile-vers
new file mode 100644
index 0000000000..50bde1cfdd
--- /dev/null
+++ b/usr/src/lib/lvm/libsvm/common/mapfile-vers
@@ -0,0 +1,39 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	svm_alloc;
+	svm_check;
+	svm_free;
+	svm_get_components;
+	svm_is_md;
+	svm_start;
+	svm_stop;
+    local:
+	*;
+};
diff --git a/usr/src/lib/madv/Makefile.com b/usr/src/lib/madv/Makefile.com
index 2e1b865e4d..0957b2b510 100644
--- a/usr/src/lib/madv/Makefile.com
+++ b/usr/src/lib/madv/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,6 +33,9 @@ include ../../Makefile.lib
 
 SRCDIR =	../common
 
+# There should be a mapfile here
+MAPFILES =
+
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lc -lgen
 CFLAGS +=	$(CCVERBOSE)
diff --git a/usr/src/lib/mpss/Makefile.com b/usr/src/lib/mpss/Makefile.com
index 4a2d0ef677..2b6d6fbd0a 100644
--- a/usr/src/lib/mpss/Makefile.com
+++ b/usr/src/lib/mpss/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,6 +33,9 @@ include ../../Makefile.lib
 
 SRCDIR =	../common
 
+# There should be a mapfile here
+MAPFILES =
+
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lc -lgen
 CFLAGS +=	$(CCVERBOSE) 
diff --git a/usr/src/lib/nametoaddr/straddr/Makefile b/usr/src/lib/nametoaddr/straddr/Makefile
index d0b669ad41..7e3af4622b 100644
--- a/usr/src/lib/nametoaddr/straddr/Makefile
+++ b/usr/src/lib/nametoaddr/straddr/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -39,11 +38,9 @@ lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
-lint: $(SUBDIRS)
-
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/nametoaddr/straddr/Makefile.com b/usr/src/lib/nametoaddr/straddr/Makefile.com
index da00736188..21739f4331 100644
--- a/usr/src/lib/nametoaddr/straddr/Makefile.com
+++ b/usr/src/lib/nametoaddr/straddr/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -42,8 +41,6 @@ LIBS =		$(DYNLIB)
 LDLIBS +=	-lnsl -lc
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
 
 CPPFLAGS +=	-D_REENTRANT
 
diff --git a/usr/src/lib/nametoaddr/straddr/common/mapfile-vers b/usr/src/lib/nametoaddr/straddr/common/mapfile-vers
new file mode 100644
index 0000000000..9be14d2c49
--- /dev/null
+++ b/usr/src/lib/nametoaddr/straddr/common/mapfile-vers
@@ -0,0 +1,37 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_2.1 {
+    global:
+	_netdir_getbyaddr;
+	_netdir_getbyname;
+	_netdir_options;
+	_taddr2uaddr;
+	_uaddr2taddr;
+    local:
+	*;
+};
diff --git a/usr/src/lib/ncad_addr/Makefile b/usr/src/lib/ncad_addr/Makefile
index 47d1dda5f8..143c41fe5a 100644
--- a/usr/src/lib/ncad_addr/Makefile
+++ b/usr/src/lib/ncad_addr/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,8 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1999-2001 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
@@ -39,11 +38,9 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all install clean clobber: spec .WAIT $(SUBDIRS)
+all install clean clobber lint: $(SUBDIRS)
 
-lint: $(SUBDIRS)
-
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/ncad_addr/Makefile.com b/usr/src/lib/ncad_addr/Makefile.com
index 7caf98fd43..aaf827792a 100644
--- a/usr/src/lib/ncad_addr/Makefile.com
+++ b/usr/src/lib/ncad_addr/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -33,8 +32,8 @@ OBJECTS =	ncad_addr.o
 include ../../Makefile.lib
 
 SRCDIR =	../common
-MAPDIR =	../spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
+
+MAPFILES +=	mapfile-vers
 
 LIBS =		$(DYNLIB)
 LDLIBS +=	-lc -lnsl
diff --git a/usr/src/lib/ncad_addr/amd64/mapfile-vers b/usr/src/lib/ncad_addr/amd64/mapfile-vers
new file mode 100644
index 0000000000..4167500eb0
--- /dev/null
+++ b/usr/src/lib/ncad_addr/amd64/mapfile-vers
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_0.7 {
+    global:
+	bind;
+};
diff --git a/usr/src/lib/ncad_addr/common/mapfile-vers b/usr/src/lib/ncad_addr/common/mapfile-vers
new file mode 100644
index 0000000000..fff8143a5c
--- /dev/null
+++ b/usr/src/lib/ncad_addr/common/mapfile-vers
@@ -0,0 +1,70 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+# The following version madness was mistakenly inherited from
+# libsocket in Solaris 9, when this library was created.
+# See the isa-specific mapfiles for the contents of SUNW_0.7
+
+SUNW_1.4 {		# SunOS 5.9 (Solaris 9)
+    global:
+	SUNW_1.4;
+} SUNW_1.3;
+
+SUNW_1.3 {
+    global:
+	SUNW_1.3;
+} SUNW_1.2;
+
+SUNW_1.2 {
+    global:
+	SUNW_1.2;
+} SUNW_1.1;
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+} SUNW_0.7;
+
+# There really should be only one SUNWprivate version.
+# Don't add any more.  Add new private symbols to SUNWprivate_1.3
+
+SUNWprivate_1.3 {
+    global:
+	SUNWprivate_1.3;
+} SUNWprivate_1.2;
+
+SUNWprivate_1.2 {
+    global:
+	SUNWprivate_1.2;
+} SUNWprivate_1.1;
+
+SUNWprivate_1.1 {
+    global:
+	SUNWprivate_1.1;
+    local:
+	*;
+};
diff --git a/usr/src/lib/ncad_addr/i386/mapfile-vers b/usr/src/lib/ncad_addr/i386/mapfile-vers
new file mode 100644
index 0000000000..4167500eb0
--- /dev/null
+++ b/usr/src/lib/ncad_addr/i386/mapfile-vers
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_0.7 {
+    global:
+	bind;
+};
diff --git a/usr/src/lib/ncad_addr/sparc/mapfile-vers b/usr/src/lib/ncad_addr/sparc/mapfile-vers
new file mode 100644
index 0000000000..2d6b0716a4
--- /dev/null
+++ b/usr/src/lib/ncad_addr/sparc/mapfile-vers
@@ -0,0 +1,36 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_0.7 {
+    global:
+	SUNW_0.7;
+} SISCD_2.3;
+
+SISCD_2.3 {
+    global:
+	bind;
+};
diff --git a/usr/src/lib/ncad_addr/sparcv9/mapfile-vers b/usr/src/lib/ncad_addr/sparcv9/mapfile-vers
new file mode 100644
index 0000000000..4167500eb0
--- /dev/null
+++ b/usr/src/lib/ncad_addr/sparcv9/mapfile-vers
@@ -0,0 +1,31 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_0.7 {
+    global:
+	bind;
+};
diff --git a/usr/src/lib/nsswitch/Makefile.com b/usr/src/lib/nsswitch/Makefile.com
index 0a6f66bbd8..ea411ea488 100644
--- a/usr/src/lib/nsswitch/Makefile.com
+++ b/usr/src/lib/nsswitch/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,19 +19,15 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/nsswitch/Makefile.com
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
-# include global library definitions.
 include		$(SRC)/lib/Makefile.lib
 
-SRCS =		$(OBJECTS:%.o=../common/%.c)
-
-MAPFILE =	../common/mapfile-vers
+SRCDIR =	../common
 
 ROOT32DYNLIB =	$(ROOTLIBDIR)/$(DYNLIB1)
 ROOT64DYNLIB =	$(ROOTLIBDIR64)/$(DYNLIB1)
@@ -44,7 +39,6 @@ CPPFLAGS +=	-D_REENTRANT
 
 LDLIBS +=	-lc
 HSONAME =
-DYNFLAGS +=	-M $(MAPFILE)
 
 CLEANFILES +=	$(LINTOUT)
 CLOBBERFILES +=	$(DYNLIB1)
diff --git a/usr/src/lib/nsswitch/Makefile.targ b/usr/src/lib/nsswitch/Makefile.targ
index e8b197badf..399d9be82c 100644
--- a/usr/src/lib/nsswitch/Makefile.targ
+++ b/usr/src/lib/nsswitch/Makefile.targ
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# lib/nsswitch/Makefile.targ
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 all:		$(LIBS)
 
@@ -41,7 +39,7 @@ $(DYNLIB1) :=	CTFMERGE_POST = $(CTFMERGE_LIB)
 # DYNLIB1 is used rather than DYNLIB to prevent the automagic expansion and
 # creation of a libXXXX.so$(VERS) target.
 
-$(DYNLIB1):	$(MAPFILE) pics .WAIT $$(PICS)
+$(DYNLIB1):	pics .WAIT $$(PICS)
 		$(BUILD.SO)
 		$(POST_PROCESS_SO)
 
diff --git a/usr/src/lib/openssl/Makefile.com b/usr/src/lib/openssl/Makefile.com
index fb4ec8cca9..416c6ea583 100644
--- a/usr/src/lib/openssl/Makefile.com
+++ b/usr/src/lib/openssl/Makefile.com
@@ -76,7 +76,7 @@ ROOTLIBPC64 = $(LIBPCSRC:%=$(ROOTLIBPCDIR64)/%)
 $(ROOTLIBPCDIR):
 	$(INS.dir)
 
-$(ROOTLIBPCDIR)/%: $(ROOTLIBPCDIR) $(SRCDIR)/%
+$(ROOTLIBPCDIR)/%: $(ROOTLIBPCDIR) %
 	$(INS.file)
 
 $(ROOTLIBPCDIR64):
diff --git a/usr/src/lib/openssl/libcrypto/Makefile.com b/usr/src/lib/openssl/libcrypto/Makefile.com
index f972fa42b9..aeb7c97f2c 100644
--- a/usr/src/lib/openssl/libcrypto/Makefile.com
+++ b/usr/src/lib/openssl/libcrypto/Makefile.com
@@ -24,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/openssl/Makefile.com
-#
 
 LIBRARY = libcrypto.a
 
@@ -235,10 +233,9 @@ CFLAGS +=	-K PIC
 CFLAGS64 +=	-K PIC
 LDLIBS +=	-lc -lsocket -lnsl
 
-MAPFILES =	../common/mapfile
-MAPOPTS =	$(MAPFILES:%=-M %)
+DYNFLAGS +=	$(OPENSSL_FILTER_FLAG) $(OPENSSL_DYNFLAGS)
 
-DYNFLAGS +=	$(OPENSSL_FILTER_FLAG) $(OPENSSL_DYNFLAGS) $(MAPOPTS)
+MAPFILES =	../common/mapfile
 
 LIBS =		$(DYNLIB) $(LINTLIB)
 SRCDIR =	$(OPENSSL_SRC)/crypto
@@ -247,7 +244,8 @@ $(LINTLIB) := 	SRCS = $(SRCDIR)/$(LINTSRC)
 
 # We do not want to give the CFLAGS and build date information
 # so we define the magic NO_WINDOWS_BRAINDEATH to suppress this
-pics/cversion.o := CPPFLAGS += -DNO_WINDOWS_BRAINDEATH
+pics/cversion.o :=	CPPFLAGS += -DNO_WINDOWS_BRAINDEATH
+lint :=			CPPFLAGS += -DNO_WINDOWS_BRAINDEATH
 
 .KEEP_STATE:
 
diff --git a/usr/src/lib/openssl/libcrypto/sparc/Makefile b/usr/src/lib/openssl/libcrypto/sparc/Makefile
index 950884993c..506c55bef6 100644
--- a/usr/src/lib/openssl/libcrypto/sparc/Makefile
+++ b/usr/src/lib/openssl/libcrypto/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -31,6 +30,10 @@ include ../Makefile.com
 # Override the default specified in Makefile.com
 BN_ASM = bn/asm/sparcv8.o
 
+# lint doesn't like asm files
+lint :=	MD5_OBJ_ASM =
+lint :=	BN_ASM =
+
 CFLAGS += -DBN_DIV2W
 
 install: all $(ROOTLIBS) $(ROOTLINKS) $(ROOTLINT)
diff --git a/usr/src/lib/openssl/libcrypto/sparcv9/Makefile b/usr/src/lib/openssl/libcrypto/sparcv9/Makefile
index 3d47ec3870..772ef82bd3 100644
--- a/usr/src/lib/openssl/libcrypto/sparcv9/Makefile
+++ b/usr/src/lib/openssl/libcrypto/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,23 +19,26 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.com
+include ../../../Makefile.lib.64
 
 # Override the default specified in ../Makefile.com
 MD5_OBJ_ASM=	md5/asm/md5-sparcv9.o
 
-include ../../../Makefile.lib.64
+# lint doesn't like asm files
+lint :=	MD5_OBJ_ASM =
+lint :=	BN_ASM =
 
 CFLAGS64 += -DMD5_ASM \
 	-erroff=E_TYP_STORAGE_CLASS_OBSOLESCENT \
 	-erroff=E_CONST_PROMOTED_UNSIGNED_LONG
 
-pics/$(MD5_OBJ_ASM) := CFLAGS64 += -DMD5_BLOCK_DATA_ORDER
+pics/md5/asm/md5-sparcv9.o := CFLAGS64 += -DMD5_BLOCK_DATA_ORDER
 
 install: all $(ROOTLIBS64) $(ROOTLINKS64) $(ROOTLINT64)
diff --git a/usr/src/lib/openssl/libcrypto_extra/Makefile.com b/usr/src/lib/openssl/libcrypto_extra/Makefile.com
index 7c6056f69e..57ce7d28e4 100644
--- a/usr/src/lib/openssl/libcrypto_extra/Makefile.com
+++ b/usr/src/lib/openssl/libcrypto_extra/Makefile.com
@@ -24,7 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/openssl/libcrypto_extra/Makefile.com
 
 LIBRARY = libcrypto_extra.a
 
@@ -48,6 +47,9 @@ BF_ENC =	bf/bf_enc.o
 
 include ../../Makefile.com
 
+# There should be a mapfile here
+MAPFILES =
+
 CFLAGS +=	-K PIC -DCRYPTO_UNLIMITED
 CFLAGS64 +=	-K PIC -DCRYPTO_UNLIMITED
 ZDEFS =		-znodefs
@@ -56,7 +58,6 @@ SONAME =        $(LIBRARY:.a=.so)$(VERS)
 
 LIBS =		$(DYNLIB)
 SRCDIR =	$(OPENSSL_SRC)/crypto
-SRCS =		$(OBJECTS:%.o=$(SRCDIR)/%.c)
 
 $(LINTLIB) := 	SRCS = $(SRCDIR)/$(LINTSRC)
 
@@ -64,6 +65,8 @@ $(LINTLIB) := 	SRCS = $(SRCDIR)/$(LINTSRC)
 
 all:		subdirs $(LIBS)
 
+lint:		lintcheck
+
 subdirs:	FRC
 	@mkdir -p \
 		pics/aes \
diff --git a/usr/src/lib/openssl/libssl/Makefile.com b/usr/src/lib/openssl/libssl/Makefile.com
index 69d5be31d1..bd1f3b6419 100644
--- a/usr/src/lib/openssl/libssl/Makefile.com
+++ b/usr/src/lib/openssl/libssl/Makefile.com
@@ -24,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/openssl/ssl/Makefile.com
-#
 
 LIBRARY = libssl.a
 
@@ -56,6 +54,9 @@ OBJECTS = bio_ssl.o							\
 
 include ../../Makefile.com
 
+# There should be a mapfile here
+MAPFILES =
+
 LIBS =		$(DYNLIB) $(LINTLIB)
 SRCDIR =	../../../../common/openssl/ssl
 
diff --git a/usr/src/lib/openssl/libssl_extra/Makefile.com b/usr/src/lib/openssl/libssl_extra/Makefile.com
index 728238dd7c..570a7300e0 100644
--- a/usr/src/lib/openssl/libssl_extra/Makefile.com
+++ b/usr/src/lib/openssl/libssl_extra/Makefile.com
@@ -24,7 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/openssl/libssl_extra/Makefile.com
 
 LIBRARY = libssl_extra.a
 
@@ -32,12 +31,14 @@ OBJECTS = ssl_algs.o ssl_ciph.o ssl_lib.o
 
 include ../../Makefile.com
 
+# There should be a mapfile here
+MAPFILES =
+
 CPPFLAGS +=	-DCRYPTO_UNLIMITED
 LDLIBS +=	$(ROOT)/$(SFWLIBDIR)/libcrypto_extra.so$(VERS)
 LDLIBS +=	$(OPENSSL_LDFLAGS) -lcrypto -lssl -lc
 DYNFLAGS +=	$(OPENSSL_DYNFLAGS)
 
-
 LIBS =		$(DYNLIB)
 SRCDIR =	$(OPENSSL_SRC)/ssl
 
@@ -47,4 +48,6 @@ $(LINTLIB) := 	SRCS = $(SRCDIR)/$(LINTSRC)
 
 all:		$(LIBS)
 
+lint:		lintcheck
+
 include $(SRC)/lib/Makefile.targ
diff --git a/usr/src/lib/pam_modules/Makefile.pam_modules b/usr/src/lib/pam_modules/Makefile.pam_modules
index b86bbce545..12d28ed1cb 100644
--- a/usr/src/lib/pam_modules/Makefile.pam_modules
+++ b/usr/src/lib/pam_modules/Makefile.pam_modules
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,27 +19,25 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # Common build macros used by (most every) PAM module.
 #
 
 include		$(SRC)/lib/Makefile.lib
 
 TEXT_DOMAIN=	SUNW_OST_SYSOSPAM
-SRCDIR=		..
 
 LIBS=		$(DYNLIB)
 
 CFLAGS		+= $(CCVERBOSE)
 CPPFLAGS	+= -D_REENTRANT
 
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 ROOTLIBDIR=	$(ROOT)/usr/lib/security
 ROOTLIBDIR64=	$(ROOT)/usr/lib/security/$(MACH64)
 
diff --git a/usr/src/lib/pam_modules/allow/Makefile b/usr/src/lib/pam_modules/allow/Makefile
index 3acd2da41b..99f0e3a31c 100644
--- a/usr/src/lib/pam_modules/allow/Makefile
+++ b/usr/src/lib/pam_modules/allow/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include		../../Makefile.lib
@@ -43,13 +42,11 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/allow/mapfile-vers b/usr/src/lib/pam_modules/allow/mapfile-vers
new file mode 100644
index 0000000000..4850072e96
--- /dev/null
+++ b/usr/src/lib/pam_modules/allow/mapfile-vers
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_acct_mgmt;
+	pam_sm_authenticate;
+	pam_sm_chauthtok;
+	pam_sm_close_session;
+	pam_sm_open_session;
+	pam_sm_setcred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/authtok_check/Makefile b/usr/src/lib/pam_modules/authtok_check/Makefile
index 27cd22eb8c..61bc9201a9 100644
--- a/usr/src/lib/pam_modules/authtok_check/Makefile
+++ b/usr/src/lib/pam_modules/authtok_check/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/authtok_check/Makefile
-#
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include 	../../Makefile.lib
 
@@ -44,13 +42,11 @@ lint	:=	TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg: $(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/authtok_check/mapfile-vers b/usr/src/lib/pam_modules/authtok_check/mapfile-vers
new file mode 100644
index 0000000000..07f2c5c008
--- /dev/null
+++ b/usr/src/lib/pam_modules/authtok_check/mapfile-vers
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_chauthtok;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/authtok_get/Makefile b/usr/src/lib/pam_modules/authtok_get/Makefile
index d1fe03a48d..a7ef66e32d 100644
--- a/usr/src/lib/pam_modules/authtok_get/Makefile
+++ b/usr/src/lib/pam_modules/authtok_get/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/authtok_get/Makefile
-#
 
 include 	../../Makefile.lib
 
@@ -45,13 +42,11 @@ lint	:=	TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg: $(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/authtok_get/mapfile-vers b/usr/src/lib/pam_modules/authtok_get/mapfile-vers
new file mode 100644
index 0000000000..36e3e8809b
--- /dev/null
+++ b/usr/src/lib/pam_modules/authtok_get/mapfile-vers
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_authenticate;
+	pam_sm_chauthtok;
+	pam_sm_setcred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/authtok_store/Makefile b/usr/src/lib/pam_modules/authtok_store/Makefile
index 7a92712c7e..2237eccf27 100644
--- a/usr/src/lib/pam_modules/authtok_store/Makefile
+++ b/usr/src/lib/pam_modules/authtok_store/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-#
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/authtok_store/Makefile
-#
 
 include 	../../Makefile.lib
 
@@ -46,13 +42,11 @@ lint	:=	TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/authtok_store/mapfile-vers b/usr/src/lib/pam_modules/authtok_store/mapfile-vers
new file mode 100644
index 0000000000..07f2c5c008
--- /dev/null
+++ b/usr/src/lib/pam_modules/authtok_store/mapfile-vers
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_chauthtok;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/deny/Makefile b/usr/src/lib/pam_modules/deny/Makefile
index 5ad6c12e0e..bb8685eb35 100644
--- a/usr/src/lib/pam_modules/deny/Makefile
+++ b/usr/src/lib/pam_modules/deny/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include		../../Makefile.lib
@@ -43,13 +42,11 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/deny/mapfile-vers b/usr/src/lib/pam_modules/deny/mapfile-vers
new file mode 100644
index 0000000000..4850072e96
--- /dev/null
+++ b/usr/src/lib/pam_modules/deny/mapfile-vers
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_acct_mgmt;
+	pam_sm_authenticate;
+	pam_sm_chauthtok;
+	pam_sm_close_session;
+	pam_sm_open_session;
+	pam_sm_setcred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/dhkeys/Makefile b/usr/src/lib/pam_modules/dhkeys/Makefile
index 5b35d37bf0..619aaeb110 100644
--- a/usr/src/lib/pam_modules/dhkeys/Makefile
+++ b/usr/src/lib/pam_modules/dhkeys/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/dhkeys/Makefile
 
 include ../../Makefile.lib
 
@@ -48,13 +46,11 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:	$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg: $(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/dhkeys/mapfile-vers b/usr/src/lib/pam_modules/dhkeys/mapfile-vers
new file mode 100644
index 0000000000..36e3e8809b
--- /dev/null
+++ b/usr/src/lib/pam_modules/dhkeys/mapfile-vers
@@ -0,0 +1,35 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_authenticate;
+	pam_sm_chauthtok;
+	pam_sm_setcred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/dial_auth/Makefile b/usr/src/lib/pam_modules/dial_auth/Makefile
index 5cc75ea69a..bdccadb1e5 100644
--- a/usr/src/lib/pam_modules/dial_auth/Makefile
+++ b/usr/src/lib/pam_modules/dial_auth/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/dial_auth/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include		../../Makefile.lib
@@ -45,11 +42,11 @@ lint	:=	TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install lint: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/dial_auth/mapfile-vers b/usr/src/lib/pam_modules/dial_auth/mapfile-vers
new file mode 100644
index 0000000000..57327a8593
--- /dev/null
+++ b/usr/src/lib/pam_modules/dial_auth/mapfile-vers
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_authenticate;
+	pam_sm_setcred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/krb5/Makefile b/usr/src/lib/pam_modules/krb5/Makefile
index 2afa6cd681..87724bcd62 100644
--- a/usr/src/lib/pam_modules/krb5/Makefile
+++ b/usr/src/lib/pam_modules/krb5/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/krb5/Makefile
-#
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include		../../Makefile.lib
@@ -53,16 +50,14 @@ CRYPT_SRC :=	TARGET= CRYPT_SRC
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 $(POFILE):	$(MSGFILES)
 	$(BUILDPO.msgfiles)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 # EXPORT DELETE START
diff --git a/usr/src/lib/pam_modules/krb5/mapfile-vers b/usr/src/lib/pam_modules/krb5/mapfile-vers
new file mode 100644
index 0000000000..4850072e96
--- /dev/null
+++ b/usr/src/lib/pam_modules/krb5/mapfile-vers
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_acct_mgmt;
+	pam_sm_authenticate;
+	pam_sm_chauthtok;
+	pam_sm_close_session;
+	pam_sm_open_session;
+	pam_sm_setcred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/krb5_migrate/Makefile b/usr/src/lib/pam_modules/krb5_migrate/Makefile
index 786b1cc911..190282d0bb 100644
--- a/usr/src/lib/pam_modules/krb5_migrate/Makefile
+++ b/usr/src/lib/pam_modules/krb5_migrate/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/krb5_migrate/Makefile
-#
 
 include 	../../Makefile.lib
 
@@ -45,16 +42,14 @@ lint	:=	TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 $(POFILE): $(MSGFILES)
 	$(BUILDPO.msgfiles)
 
 _msg: $(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/krb5_migrate/mapfile-vers b/usr/src/lib/pam_modules/krb5_migrate/mapfile-vers
new file mode 100644
index 0000000000..57327a8593
--- /dev/null
+++ b/usr/src/lib/pam_modules/krb5_migrate/mapfile-vers
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_authenticate;
+	pam_sm_setcred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/ldap/Makefile b/usr/src/lib/pam_modules/ldap/Makefile
index c180e8abc7..4a5995bb82 100644
--- a/usr/src/lib/pam_modules/ldap/Makefile
+++ b/usr/src/lib/pam_modules/ldap/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/ldap/Makefile
-#
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include		../../Makefile.lib
 
@@ -45,16 +43,14 @@ lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 $(POFILE):	$(MSGFILES)
 	$(BUILDPO.msgfiles)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec:      FRC
+$(SUBDIRS):      FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/ldap/mapfile-vers b/usr/src/lib/pam_modules/ldap/mapfile-vers
new file mode 100644
index 0000000000..4850072e96
--- /dev/null
+++ b/usr/src/lib/pam_modules/ldap/mapfile-vers
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_acct_mgmt;
+	pam_sm_authenticate;
+	pam_sm_chauthtok;
+	pam_sm_close_session;
+	pam_sm_open_session;
+	pam_sm_setcred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/passwd_auth/Makefile b/usr/src/lib/pam_modules/passwd_auth/Makefile
index ee47780cac..b93feb4aa8 100644
--- a/usr/src/lib/pam_modules/passwd_auth/Makefile
+++ b/usr/src/lib/pam_modules/passwd_auth/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/passwd_auth/Makefile
-#
 
 include 	../../Makefile.lib
 
@@ -45,13 +42,11 @@ lint	:=	TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg: $(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/passwd_auth/mapfile-vers b/usr/src/lib/pam_modules/passwd_auth/mapfile-vers
new file mode 100644
index 0000000000..57327a8593
--- /dev/null
+++ b/usr/src/lib/pam_modules/passwd_auth/mapfile-vers
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_authenticate;
+	pam_sm_setcred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/projects/Makefile b/usr/src/lib/pam_modules/projects/Makefile
index 759300fe8d..3c645684dc 100644
--- a/usr/src/lib/pam_modules/projects/Makefile
+++ b/usr/src/lib/pam_modules/projects/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/projects/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 include		../../Makefile.lib
 
@@ -40,13 +38,11 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg:
 
-$(SUBDIRS) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/projects/mapfile-vers b/usr/src/lib/pam_modules/projects/mapfile-vers
new file mode 100644
index 0000000000..7d83091a21
--- /dev/null
+++ b/usr/src/lib/pam_modules/projects/mapfile-vers
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_acct_mgmt;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/rhosts_auth/Makefile b/usr/src/lib/pam_modules/rhosts_auth/Makefile
index 508e312a48..f37449cda6 100644
--- a/usr/src/lib/pam_modules/rhosts_auth/Makefile
+++ b/usr/src/lib/pam_modules/rhosts_auth/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/rhosts_auth/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 include		../../Makefile.lib
 
@@ -44,13 +42,11 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:	$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg:	$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/rhosts_auth/mapfile-vers b/usr/src/lib/pam_modules/rhosts_auth/mapfile-vers
new file mode 100644
index 0000000000..57327a8593
--- /dev/null
+++ b/usr/src/lib/pam_modules/rhosts_auth/mapfile-vers
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_authenticate;
+	pam_sm_setcred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/roles/Makefile b/usr/src/lib/pam_modules/roles/Makefile
index feb5226b3b..1851f68225 100644
--- a/usr/src/lib/pam_modules/roles/Makefile
+++ b/usr/src/lib/pam_modules/roles/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,10 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include		../../Makefile.lib
@@ -43,13 +42,11 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/roles/mapfile-vers b/usr/src/lib/pam_modules/roles/mapfile-vers
new file mode 100644
index 0000000000..7d83091a21
--- /dev/null
+++ b/usr/src/lib/pam_modules/roles/mapfile-vers
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_acct_mgmt;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/sample/Makefile b/usr/src/lib/pam_modules/sample/Makefile
index f6903b407e..c9a7427362 100644
--- a/usr/src/lib/pam_modules/sample/Makefile
+++ b/usr/src/lib/pam_modules/sample/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/sample/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 include 	../../Makefile.lib
 
@@ -44,13 +42,11 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/sample/mapfile-vers b/usr/src/lib/pam_modules/sample/mapfile-vers
new file mode 100644
index 0000000000..4850072e96
--- /dev/null
+++ b/usr/src/lib/pam_modules/sample/mapfile-vers
@@ -0,0 +1,38 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_acct_mgmt;
+	pam_sm_authenticate;
+	pam_sm_chauthtok;
+	pam_sm_close_session;
+	pam_sm_open_session;
+	pam_sm_setcred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/unix_account/Makefile b/usr/src/lib/pam_modules/unix_account/Makefile
index 1aa11f2e60..7870eaa9b2 100644
--- a/usr/src/lib/pam_modules/unix_account/Makefile
+++ b/usr/src/lib/pam_modules/unix_account/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/unix_account/Makefile
-#
 
 include		../../Makefile.lib
 
@@ -45,9 +42,7 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:	$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 # need rule here
 $(POFILE): $(MSGFILES)
@@ -55,7 +50,7 @@ $(POFILE): $(MSGFILES)
 
 _msg: $(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/unix_account/mapfile-vers b/usr/src/lib/pam_modules/unix_account/mapfile-vers
new file mode 100644
index 0000000000..7d83091a21
--- /dev/null
+++ b/usr/src/lib/pam_modules/unix_account/mapfile-vers
@@ -0,0 +1,33 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_acct_mgmt;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/unix_auth/Makefile b/usr/src/lib/pam_modules/unix_auth/Makefile
index 63e0895743..7379dc399b 100644
--- a/usr/src/lib/pam_modules/unix_auth/Makefile
+++ b/usr/src/lib/pam_modules/unix_auth/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/unix_auth/Makefile
-#
 # ident	"%Z%%M%	%I%	%E% SMI"
+#
 
 include		 ../../Makefile.lib
 
@@ -44,13 +42,11 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:	$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg: $(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/unix_auth/mapfile-vers b/usr/src/lib/pam_modules/unix_auth/mapfile-vers
new file mode 100644
index 0000000000..57327a8593
--- /dev/null
+++ b/usr/src/lib/pam_modules/unix_auth/mapfile-vers
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_authenticate;
+	pam_sm_setcred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/unix_cred/Makefile b/usr/src/lib/pam_modules/unix_cred/Makefile
index ce16582c4f..3c3962f06a 100644
--- a/usr/src/lib/pam_modules/unix_cred/Makefile
+++ b/usr/src/lib/pam_modules/unix_cred/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/pam_modules/unix_cred/Makefile
-#
 
 include		../../Makefile.lib
 
@@ -45,13 +42,11 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:		$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg:		$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/unix_cred/mapfile-vers b/usr/src/lib/pam_modules/unix_cred/mapfile-vers
new file mode 100644
index 0000000000..57327a8593
--- /dev/null
+++ b/usr/src/lib/pam_modules/unix_cred/mapfile-vers
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_authenticate;
+	pam_sm_setcred;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pam_modules/unix_session/Makefile b/usr/src/lib/pam_modules/unix_session/Makefile
index 1989728bda..8cd0cb4374 100644
--- a/usr/src/lib/pam_modules/unix_session/Makefile
+++ b/usr/src/lib/pam_modules/unix_session/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# usr/src/lib/pam_modules/unix_session/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
 
 include		../../Makefile.lib
 
@@ -44,13 +42,11 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint:	$(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 _msg:	$(MSGDOMAINPOFILE)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pam_modules/unix_session/mapfile-vers b/usr/src/lib/pam_modules/unix_session/mapfile-vers
new file mode 100644
index 0000000000..82e8adf020
--- /dev/null
+++ b/usr/src/lib/pam_modules/unix_session/mapfile-vers
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	pam_sm_close_session;
+	pam_sm_open_session;
+    local:
+	*;
+};
diff --git a/usr/src/lib/passwdutil/Makefile b/usr/src/lib/passwdutil/Makefile
index b4cf7992a0..e09cd44703 100644
--- a/usr/src/lib/passwdutil/Makefile
+++ b/usr/src/lib/passwdutil/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,10 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# lib/passwdutil/Makefile
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include		../Makefile.lib
@@ -44,15 +41,13 @@ lint	:=	TARGET= lint
  
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h:	$(ROOTHDRS)
 
 check:		$(CHECKHDRS)
 
-$(SUBDIRS) spec:	FRC
+$(SUBDIRS):	FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/passwdutil/Makefile.com b/usr/src/lib/passwdutil/Makefile.com
index 730c845131..573e057162 100644
--- a/usr/src/lib/passwdutil/Makefile.com
+++ b/usr/src/lib/passwdutil/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -25,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# usr/src/lib/passwdutil/Makefile.com
-#
 
 LIBRARY=	passwdutil.a
 VERS=		.1
@@ -60,13 +57,9 @@ include	../../Makefile.lib
 LIBNAME=	passwdutil
 
 LIBS=		$(DYNLIB) $(LINTLIB)
-SRCDIR=		..
 $(LINTLIB) :=	SRCS= $(SRCDIR)/$(LINTSRC)
 LDLIBS		+= -lcmd -lsldap -lnsl -lc
 
-MAPDIR=		../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
-
 CPPFLAGS	+= -DENABLE_SUNOS_AGING -D_REENTRANT \
 		   -I$(SRC)/lib/libsldap/common -I$(SRC)/lib/libnsl/include
 CFLAGS		+= $(CCVERBOSE)
diff --git a/usr/src/lib/passwdutil/mapfile-vers b/usr/src/lib/passwdutil/mapfile-vers
new file mode 100644
index 0000000000..56263cb201
--- /dev/null
+++ b/usr/src/lib/passwdutil/mapfile-vers
@@ -0,0 +1,39 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	__check_history;
+	__get_authtoken_attr;
+	__incr_failed_count;
+	__rst_failed_count;
+	__set_authtoken_attr;
+	__user_to_authenticate;
+	__verify_rpc_passwd;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pkcs11/Makefile.softtoken.com b/usr/src/lib/pkcs11/Makefile.softtoken.com
index 53e6d0db5c..84a7fc7989 100644
--- a/usr/src/lib/pkcs11/Makefile.softtoken.com
+++ b/usr/src/lib/pkcs11/Makefile.softtoken.com
@@ -24,8 +24,6 @@
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/pkcs11/Makefile.softtoken.com
-#
 
 LCL_OBJECTS = \
 	softGeneral.o 		\
@@ -149,9 +147,6 @@ SRCS =	\
 LIBS    =       $(DYNLIB)
 LDLIBS  +=      -lc -lmd -lcryptoutil
 
-MAPDIR  = ../spec/$(TRANSMACH)
-SPECMAPFILE = $(MAPDIR)/mapfile
-
 CFLAGS 	+=      $(CCVERBOSE)
 CPPFLAGS += -I$(AESDIR) -I$(BLOWFISHDIR) -I$(ARCFOURDIR) -I$(DESDIR) \
 	    -I$(RSADIR) -I$(SRCDIR) -I$(BIGNUMDIR) -D_POSIX_PTHREAD_SEMANTICS
diff --git a/usr/src/lib/pkcs11/libpkcs11/Makefile b/usr/src/lib/pkcs11/libpkcs11/Makefile
index 6bd5700390..ab4729a4d3 100644
--- a/usr/src/lib/pkcs11/libpkcs11/Makefile
+++ b/usr/src/lib/pkcs11/libpkcs11/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,18 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/pkcs11/libpkcs11/Makefile
 
 include		../../../Makefile.master
 include		../../Makefile.lib
 
 SUBDIRS=	$(MACH)
-
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
@@ -43,11 +40,9 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pkcs11/libpkcs11/Makefile.com b/usr/src/lib/pkcs11/libpkcs11/Makefile.com
index 8c04d41f68..411567d1d2 100644
--- a/usr/src/lib/pkcs11/libpkcs11/Makefile.com
+++ b/usr/src/lib/pkcs11/libpkcs11/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -70,13 +69,9 @@ SRCDIR=		../common
 INCDIR=		../../include
 
 LIBS =		$(DYNLIB) $(LINTLIB)
-SRCS =		$(OBJECTS:%.o=$(SRCDIR)/%.c)
 $(LINTLIB) :=	SRCS = $(SRCDIR)/$(LINTSRC)
 LDLIBS +=	-lcryptoutil -lc
 
-MAPDIR	= ../spec/$(TRANSMACH)
-SPECMAPFILE = $(MAPDIR)/mapfile
-
 CFLAGS	+=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(INCDIR) -I$(SRCDIR) -D_REENTRANT
 
diff --git a/usr/src/lib/pkcs11/libpkcs11/common/mapfile-vers b/usr/src/lib/pkcs11/libpkcs11/common/mapfile-vers
new file mode 100644
index 0000000000..e01651db19
--- /dev/null
+++ b/usr/src/lib/pkcs11/libpkcs11/common/mapfile-vers
@@ -0,0 +1,102 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	C_CancelFunction;
+	C_CloseAllSessions;
+	C_CloseSession;
+	C_CopyObject;
+	C_CreateObject;
+	C_Decrypt;
+	C_DecryptDigestUpdate;
+	C_DecryptFinal;
+	C_DecryptInit;
+	C_DecryptUpdate;
+	C_DecryptVerifyUpdate;
+	C_DeriveKey;
+	C_DestroyObject;
+	C_Digest;
+	C_DigestEncryptUpdate;
+	C_DigestFinal;
+	C_DigestInit;
+	C_DigestKey;
+	C_DigestUpdate;
+	C_Encrypt;
+	C_EncryptFinal;
+	C_EncryptInit;
+	C_EncryptUpdate;
+	C_Finalize;
+	C_FindObjects;
+	C_FindObjectsFinal;
+	C_FindObjectsInit;
+	C_GenerateKey;
+	C_GenerateKeyPair;
+	C_GenerateRandom;
+	C_GetAttributeValue;
+	C_GetFunctionList;
+	C_GetFunctionStatus;
+	C_GetInfo;
+	C_GetMechanismInfo;
+	C_GetMechanismList;
+	C_GetObjectSize;
+	C_GetOperationState;
+	C_GetSessionInfo;
+	C_GetSlotInfo;
+	C_GetSlotList;
+	C_GetTokenInfo;
+	C_Initialize;
+	C_InitPIN;
+	C_InitToken;
+	C_Login;
+	C_Logout;
+	C_OpenSession;
+	C_SeedRandom;
+	C_SetAttributeValue;
+	C_SetOperationState;
+	C_SetPIN;
+	C_Sign;
+	C_SignEncryptUpdate;
+	C_SignFinal;
+	C_SignInit;
+	C_SignRecover;
+	C_SignRecoverInit;
+	C_SignUpdate;
+	C_UnwrapKey;
+	C_Verify;
+	C_VerifyFinal;
+	C_VerifyInit;
+	C_VerifyRecover;
+	C_VerifyRecoverInit;
+	C_VerifyUpdate;
+	C_WaitForSlotEvent;
+	C_WrapKey;
+	SUNW_C_GetMechSession;
+	SUNW_C_KeyToObject;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile
index 5f561fd550..ead030d990 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile
+++ b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/pkcs11/pkcs11_kernel/Makefile
 
 include		$(SRC)/lib/Makefile.lib
 
@@ -41,11 +39,9 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
-lint: $(SUBDIRS)
-
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com
index b7f4de86b3..a222fe3389 100644
--- a/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com
+++ b/usr/src/lib/pkcs11/pkcs11_kernel/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/pkcs11/pkcs11_kernel/Makefile.com
-#
 
 LIBRARY= pkcs11_kernel.a
 VERS= .1
@@ -69,9 +66,6 @@ SRCDIR=		../common
 LIBS	=	$(DYNLIB)
 LDLIBS  +=      -lc -lcryptoutil
 
-MAPDIR  = ../spec/$(TRANSMACH)
-SPECMAPFILE = $(MAPDIR)/mapfile
-
 CFLAGS  +=      $(CCVERBOSE)  
 
 ROOTLIBDIR=     $(ROOT)/usr/lib/security
diff --git a/usr/src/lib/pkcs11/pkcs11_kernel/common/mapfile-vers b/usr/src/lib/pkcs11/pkcs11_kernel/common/mapfile-vers
new file mode 100644
index 0000000000..ae754147a7
--- /dev/null
+++ b/usr/src/lib/pkcs11/pkcs11_kernel/common/mapfile-vers
@@ -0,0 +1,100 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	C_CancelFunction;
+	C_CloseAllSessions;
+	C_CloseSession;
+	C_CopyObject;
+	C_CreateObject;
+	C_Decrypt;
+	C_DecryptDigestUpdate;
+	C_DecryptFinal;
+	C_DecryptInit;
+	C_DecryptUpdate;
+	C_DecryptVerifyUpdate;
+	C_DeriveKey;
+	C_DestroyObject;
+	C_Digest;
+	C_DigestEncryptUpdate;
+	C_DigestFinal;
+	C_DigestInit;
+	C_DigestKey;
+	C_DigestUpdate;
+	C_Encrypt;
+	C_EncryptFinal;
+	C_EncryptInit;
+	C_EncryptUpdate;
+	C_Finalize;
+	C_FindObjects;
+	C_FindObjectsFinal;
+	C_FindObjectsInit;
+	C_GenerateKey;
+	C_GenerateKeyPair;
+	C_GenerateRandom;
+	C_GetAttributeValue;
+	C_GetFunctionList;
+	C_GetFunctionStatus;
+	C_GetInfo;
+	C_GetMechanismInfo;
+	C_GetMechanismList;
+	C_GetObjectSize;
+	C_GetOperationState;
+	C_GetSessionInfo;
+	C_GetSlotInfo;
+	C_GetSlotList;
+	C_GetTokenInfo;
+	C_Initialize;
+	C_InitPIN;
+	C_InitToken;
+	C_Login;
+	C_Logout;
+	C_OpenSession;
+	C_SeedRandom;
+	C_SetAttributeValue;
+	C_SetOperationState;
+	C_SetPIN;
+	C_Sign;
+	C_SignEncryptUpdate;
+	C_SignFinal;
+	C_SignInit;
+	C_SignRecover;
+	C_SignRecoverInit;
+	C_SignUpdate;
+	C_UnwrapKey;
+	C_Verify;
+	C_VerifyFinal;
+	C_VerifyInit;
+	C_VerifyRecover;
+	C_VerifyRecoverInit;
+	C_VerifyUpdate;
+	C_WaitForSlotEvent;
+	C_WrapKey;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile
index 802b0ac99f..cdeea1697a 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/pkcs11/pkcs11_softtoken/Makefile
 
 include         $(SRC)/lib/Makefile.lib
 
 SUBDIRS=	$(MACH)
-
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
@@ -42,11 +39,9 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all check clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all check clean clobber install lint: $(SUBDIRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken/common/mapfile-vers b/usr/src/lib/pkcs11/pkcs11_softtoken/common/mapfile-vers
new file mode 100644
index 0000000000..ae754147a7
--- /dev/null
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken/common/mapfile-vers
@@ -0,0 +1,100 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	C_CancelFunction;
+	C_CloseAllSessions;
+	C_CloseSession;
+	C_CopyObject;
+	C_CreateObject;
+	C_Decrypt;
+	C_DecryptDigestUpdate;
+	C_DecryptFinal;
+	C_DecryptInit;
+	C_DecryptUpdate;
+	C_DecryptVerifyUpdate;
+	C_DeriveKey;
+	C_DestroyObject;
+	C_Digest;
+	C_DigestEncryptUpdate;
+	C_DigestFinal;
+	C_DigestInit;
+	C_DigestKey;
+	C_DigestUpdate;
+	C_Encrypt;
+	C_EncryptFinal;
+	C_EncryptInit;
+	C_EncryptUpdate;
+	C_Finalize;
+	C_FindObjects;
+	C_FindObjectsFinal;
+	C_FindObjectsInit;
+	C_GenerateKey;
+	C_GenerateKeyPair;
+	C_GenerateRandom;
+	C_GetAttributeValue;
+	C_GetFunctionList;
+	C_GetFunctionStatus;
+	C_GetInfo;
+	C_GetMechanismInfo;
+	C_GetMechanismList;
+	C_GetObjectSize;
+	C_GetOperationState;
+	C_GetSessionInfo;
+	C_GetSlotInfo;
+	C_GetSlotList;
+	C_GetTokenInfo;
+	C_Initialize;
+	C_InitPIN;
+	C_InitToken;
+	C_Login;
+	C_Logout;
+	C_OpenSession;
+	C_SeedRandom;
+	C_SetAttributeValue;
+	C_SetOperationState;
+	C_SetPIN;
+	C_Sign;
+	C_SignEncryptUpdate;
+	C_SignFinal;
+	C_SignInit;
+	C_SignRecover;
+	C_SignRecoverInit;
+	C_SignUpdate;
+	C_UnwrapKey;
+	C_Verify;
+	C_VerifyFinal;
+	C_VerifyInit;
+	C_VerifyRecover;
+	C_VerifyRecoverInit;
+	C_VerifyUpdate;
+	C_WaitForSlotEvent;
+	C_WrapKey;
+    local:
+	*;
+};
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/Makefile b/usr/src/lib/pkcs11/pkcs11_softtoken_extra/Makefile
index a73985131f..cdeea1697a 100644
--- a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/Makefile
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken_extra/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/pkcs11/pkcs11_softtoken_extra/Makefile
 
 include         $(SRC)/lib/Makefile.lib
 
 SUBDIRS=	$(MACH)
-
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
@@ -42,11 +39,9 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all check clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all check clean clobber install lint: $(SUBDIRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 
diff --git a/usr/src/lib/pkcs11/pkcs11_softtoken_extra/common/mapfile-vers b/usr/src/lib/pkcs11/pkcs11_softtoken_extra/common/mapfile-vers
new file mode 100644
index 0000000000..ae754147a7
--- /dev/null
+++ b/usr/src/lib/pkcs11/pkcs11_softtoken_extra/common/mapfile-vers
@@ -0,0 +1,100 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	C_CancelFunction;
+	C_CloseAllSessions;
+	C_CloseSession;
+	C_CopyObject;
+	C_CreateObject;
+	C_Decrypt;
+	C_DecryptDigestUpdate;
+	C_DecryptFinal;
+	C_DecryptInit;
+	C_DecryptUpdate;
+	C_DecryptVerifyUpdate;
+	C_DeriveKey;
+	C_DestroyObject;
+	C_Digest;
+	C_DigestEncryptUpdate;
+	C_DigestFinal;
+	C_DigestInit;
+	C_DigestKey;
+	C_DigestUpdate;
+	C_Encrypt;
+	C_EncryptFinal;
+	C_EncryptInit;
+	C_EncryptUpdate;
+	C_Finalize;
+	C_FindObjects;
+	C_FindObjectsFinal;
+	C_FindObjectsInit;
+	C_GenerateKey;
+	C_GenerateKeyPair;
+	C_GenerateRandom;
+	C_GetAttributeValue;
+	C_GetFunctionList;
+	C_GetFunctionStatus;
+	C_GetInfo;
+	C_GetMechanismInfo;
+	C_GetMechanismList;
+	C_GetObjectSize;
+	C_GetOperationState;
+	C_GetSessionInfo;
+	C_GetSlotInfo;
+	C_GetSlotList;
+	C_GetTokenInfo;
+	C_Initialize;
+	C_InitPIN;
+	C_InitToken;
+	C_Login;
+	C_Logout;
+	C_OpenSession;
+	C_SeedRandom;
+	C_SetAttributeValue;
+	C_SetOperationState;
+	C_SetPIN;
+	C_Sign;
+	C_SignEncryptUpdate;
+	C_SignFinal;
+	C_SignInit;
+	C_SignRecover;
+	C_SignRecoverInit;
+	C_SignUpdate;
+	C_UnwrapKey;
+	C_Verify;
+	C_VerifyFinal;
+	C_VerifyInit;
+	C_VerifyRecover;
+	C_VerifyRecoverInit;
+	C_VerifyUpdate;
+	C_WaitForSlotEvent;
+	C_WrapKey;
+    local:
+	*;
+};
diff --git a/usr/src/lib/print/libhttp-core/Makefile.com b/usr/src/lib/print/libhttp-core/Makefile.com
index c027f93270..cfb8ae8730 100644
--- a/usr/src/lib/print/libhttp-core/Makefile.com
+++ b/usr/src/lib/print/libhttp-core/Makefile.com
@@ -34,22 +34,21 @@ ROOTLIBDIR =	$(ROOT)/usr/lib/print
 include ../../../Makefile.lib
 include ../../../Makefile.rootfs
 
+SRCDIR =	../common
+
 ROOTLIBDIR=	$(ROOT)/usr/lib/print
 ROOTLIBDIR64=	$(ROOT)/usr/lib/print/$(MACH)
 
 LIBS =			$(DYNLIB)
 
-SRCS = $(OBJECTS:%.o = $(SRCDIR)/%.c)
-
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	../common
-MAPFILE =	$(SRCDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
 CPPFLAGS +=	-I../../libpapi-common/common
-DYNFLAGS +=	-M $(MAPFILE)
+
+MAPFILES =	$(SRCDIR)/mapfile
+
 LDLIBS +=	-lsocket -lnsl -lc
 
 .KEEP_STATE:
diff --git a/usr/src/lib/print/libipp-core/Makefile.com b/usr/src/lib/print/libipp-core/Makefile.com
index 56099a4aa9..2b16288cbe 100644
--- a/usr/src/lib/print/libipp-core/Makefile.com
+++ b/usr/src/lib/print/libipp-core/Makefile.com
@@ -32,21 +32,20 @@ OBJECTS = ipp.o ipp_types.o read.o strings.o write.o
 include ../../../Makefile.lib
 include ../../../Makefile.rootfs
 
+SRCDIR =	../common
+
 ROOTLIBDIR=	$(ROOT)/usr/lib
 
 LIBS =			$(DYNLIB)
 
-SRCS = $(OBJECTS:%.o = $(SRCDIR)/%.c)
-
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	../common
-MAPFILE =	$(SRCDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
 CPPFLAGS +=	-I../../libpapi-common/common
-DYNFLAGS +=	-M $(MAPFILE)
+
+MAPFILES =	$(SRCDIR)/mapfile
+
 LDLIBS +=	-lpapi-common -lc
 
 .KEEP_STATE:
diff --git a/usr/src/lib/print/libipp-listener/Makefile.com b/usr/src/lib/print/libipp-listener/Makefile.com
index 75672ad6d6..74db2efd60 100644
--- a/usr/src/lib/print/libipp-listener/Makefile.com
+++ b/usr/src/lib/print/libipp-listener/Makefile.com
@@ -39,23 +39,22 @@ OBJECTS = \
 include ../../../Makefile.lib
 include ../../../Makefile.rootfs
 
+SRCDIR =	../common
+
 ROOTLIBDIR=	$(ROOT)/usr/lib
 
 LIBS =			$(DYNLIB)
 
-SRCS = $(OBJECTS:%.o = $(SRCDIR)/%.c)
-
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	../common
-MAPFILE =	$(SRCDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-DSOLARIS_PRIVATE_POST_0_9
 CPPFLAGS +=	-I$(SRCDIR)
 CPPFLAGS +=	-I../../libpapi-common/common
 CPPFLAGS +=	-I../../libipp-core/common
-DYNFLAGS +=	-M $(MAPFILE)
+
+MAPFILES =	$(SRCDIR)/mapfile
+
 LDLIBS +=	-lipp-core -lpapi -lc
 
 .KEEP_STATE:
diff --git a/usr/src/lib/print/libpapi-common/Makefile.com b/usr/src/lib/print/libpapi-common/Makefile.com
index 3d21ee6c40..f7669307d2 100644
--- a/usr/src/lib/print/libpapi-common/Makefile.com
+++ b/usr/src/lib/print/libpapi-common/Makefile.com
@@ -34,18 +34,17 @@ include ../../../Makefile.rootfs
 
 ROOTLIBDIR=	$(ROOT)/usr/lib
 
-LIBS =			$(DYNLIB)
+SRCDIR =	../common
 
-SRCS = $(OBJECTS:%.o = $(SRCDIR)/%.c)
+LIBS =			$(DYNLIB)
 
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	../common
-MAPFILE =	$(SRCDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
-DYNFLAGS +=	-M $(MAPFILE)
+
+MAPFILES =	$(SRCDIR)/mapfile
+
 LDLIBS +=	-lc
 
 .KEEP_STATE:
diff --git a/usr/src/lib/print/libpapi-dynamic/Makefile.com b/usr/src/lib/print/libpapi-dynamic/Makefile.com
index a47484edd7..ae0c5d93e8 100644
--- a/usr/src/lib/print/libpapi-dynamic/Makefile.com
+++ b/usr/src/lib/print/libpapi-dynamic/Makefile.com
@@ -32,17 +32,15 @@ OBJECTS = job.o nss.o printer.o psm.o service.o
 include ../../../Makefile.lib
 include ../../../Makefile.rootfs
 
+SRCDIR =	../common
+
 ROOTLIBDIR=	$(ROOT)/usr/lib
 
 LIBS =			$(DYNLIB)
 
-SRCS = $(OBJECTS:%.o = $(SRCDIR)/%.c)
-
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	../common
-MAPFILE =	$(SRCDIR)/mapfile
-DYNFLAGS +=	-M $(MAPFILE)
+MAPFILES =	$(SRCDIR)/mapfile
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
diff --git a/usr/src/lib/print/libpapi-ipp/Makefile.com b/usr/src/lib/print/libpapi-ipp/Makefile.com
index 12c748773d..c141ab545e 100644
--- a/usr/src/lib/print/libpapi-ipp/Makefile.com
+++ b/usr/src/lib/print/libpapi-ipp/Makefile.com
@@ -1,5 +1,4 @@
 #
-#
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
@@ -34,6 +33,8 @@ ROOTLIBDIR =	$(ROOT)/usr/lib/print
 include ../../../Makefile.lib
 include ../../../Makefile.rootfs
 
+SRCDIR =	../common
+
 ROOTLIBDIR=	$(ROOT)/usr/lib/print
 ROOTLIBDIR64=	$(ROOT)/usr/lib/print/$(MACH)
 
@@ -43,19 +44,18 @@ $(EXTRALINKS):	$(ROOTLINKS)
 
 LIBS =			$(DYNLIB)
 
-SRCS = $(OBJECTS:%.o = $(SRCDIR)/%.c)
-
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	../common
-MAPFILE =	$(SRCDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
 CPPFLAGS +=	-I../../libpapi-common/common
 CPPFLAGS +=	-I../../libipp-core/common
 CPPFLAGS +=	-I../../libhttp-core/common
-DYNFLAGS +=	$(BDIRECT) -M $(MAPFILE)
+
+DYNFLAGS +=	$(BDIRECT)
+
+MAPFILES =	$(SRCDIR)/mapfile
+
 LDLIBS +=	-L$(ROOTLIBDIR) -R/usr/lib/print -lhttp-core -lmd5
 LDLIBS +=	-lipp-core -lc
 
diff --git a/usr/src/lib/print/libpapi-lpd/Makefile.com b/usr/src/lib/print/libpapi-lpd/Makefile.com
index eac0eddaac..2896f25913 100644
--- a/usr/src/lib/print/libpapi-lpd/Makefile.com
+++ b/usr/src/lib/print/libpapi-lpd/Makefile.com
@@ -34,6 +34,8 @@ OBJECTS = job.o library.o lpd-cancel.o lpd-job.o lpd-query.o printer.o \
 include ../../../Makefile.lib
 include ../../../Makefile.rootfs
 
+SRCDIR =	../common
+
 ROOTLIBDIR=	$(ROOT)/usr/lib/print
 ROOTLIBDIR64=	$(ROOT)/usr/lib/print/$(MACH)
 
@@ -43,17 +45,16 @@ $(EXTRALINKS):	$(ROOTLINKS)
 
 LIBS =			$(DYNLIB)
 
-SRCS = $(OBJECTS:%.o = $(SRCDIR)/%.c)
-
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	../common
-MAPFILE =	$(SRCDIR)/mapfile
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
 CPPFLAGS +=	-I../../libpapi-common/common
-DYNFLAGS +=	$(BDIRECT) -M $(MAPFILE)
+
+DYNFLAGS +=	$(BDIRECT)
+
+MAPFILES =	$(SRCDIR)/mapfile
+
 LDLIBS +=	-lc
 
 .KEEP_STATE:
diff --git a/usr/src/lib/print/libprint/Makefile.com b/usr/src/lib/print/libprint/Makefile.com
index 6b7e190b11..98415ad821 100644
--- a/usr/src/lib/print/libprint/Makefile.com
+++ b/usr/src/lib/print/libprint/Makefile.com
@@ -34,21 +34,18 @@ OBJECTS = \
 include ../../../Makefile.lib
 include ../../../Makefile.rootfs
 
+SRCDIR =	../common
+
 ROOTLIBDIR=	$(ROOT)/usr/lib
 
 LIBS =			$(DYNLIB)
 
-SRCS = $(OBJECTS:%.o = $(SRCDIR)/%.c)
-
 $(LINTLIB):=	SRCS = $(SRCDIR)/$(LINTSRC)
 
-SRCDIR =	../common
-MAPFILE =	$(SRCDIR)/mapfile-vers
-
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I$(SRCDIR)
 CPPFLAGS +=	-I../../head -D_REENTRANT
-DYNFLAGS +=	-M $(MAPFILE)
+
 LDLIBS +=	-lnsl -lsocket -lc -lldap
 
 
diff --git a/usr/src/lib/print/mod_ipp/Makefile b/usr/src/lib/print/mod_ipp/Makefile
index 8531fb213f..2afbc75d45 100644
--- a/usr/src/lib/print/mod_ipp/Makefile
+++ b/usr/src/lib/print/mod_ipp/Makefile
@@ -48,7 +48,6 @@ LIBS =			$(DYNLIB)
 
 SRCS = $(OBJECTS:%.o = %.c)
 
-MMAPFILE =	mapfile
 
 CFLAGS +=	$(CCVERBOSE)
 CPPFLAGS +=	-I../libipp-listener/common
@@ -56,7 +55,9 @@ CPPFLAGS +=	-I../libipp-core/common
 CPPFLAGS +=	-I/usr/apache/include
 CPPFLAGS +=	-DEAPI
 ZDEFS =		$(ZNODEFS)
-DYNFLAGS +=	-M$(MMAPFILE)
+
+MAPFILES =	mapfile
+
 LDLIBS +=	-lipp-listener -lipp-core -lpapi -lc
 
 #	SMF manifest
diff --git a/usr/src/lib/req.flg b/usr/src/lib/req.flg
index 743b8c3c6c..c7537ef5ba 100644
--- a/usr/src/lib/req.flg
+++ b/usr/src/lib/req.flg
@@ -3,9 +3,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -21,7 +20,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -32,11 +31,5 @@ echo_file usr/src/lib/Makefile.targ
 echo_file usr/src/lib/Makefile.mach
 echo_file usr/src/lib/Makefile.lib.64
 echo_file usr/src/lib/Makefile.rootfs
-echo_file usr/src/lib/Makefile.spec
-echo_file usr/src/lib/Makefile.spec.arch
-echo_file usr/src/lib/Makefile.spec.psm
 find_files "s.*" usr/src/lib/common
 exec_file usr/src/cmd/req.flg
-echo_file usr/src/lib/abi/Makefile
-find_files "s.*" usr/src/lib/abi/apptrace
-exec_file usr/src/lib/abi/req.flg
diff --git a/usr/src/lib/rpcsec_gss/Makefile.com b/usr/src/lib/rpcsec_gss/Makefile.com
index a7a3531ed5..942aeb68bb 100644
--- a/usr/src/lib/rpcsec_gss/Makefile.com
+++ b/usr/src/lib/rpcsec_gss/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -34,9 +33,6 @@ OBJECTS=rpcsec_gss.o rpcsec_gss_misc.o rpcsec_gss_utils.o svc_rpcsec_gss.o
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE=	../mapfile-vers
-SRCS=	$(OBJECTS:%.o=../%.c)
-
 CPPFLAGS +=     -D_REENTRANT -I$(SRC)/uts/common/gssapi/include  \
 		-I$(SRC)/uts/common
 CFLAGS += $(XFFLAG)
@@ -46,7 +42,6 @@ LINTSRC=	$(LINTLIB:%.ln=%)
 LIBS  = $(DYNLIB)
 
 LDLIBS += -lgss -lnsl -lc
-DYNFLAGS += -M$(MAPFILE)
 
 .KEEP_STATE:
 
@@ -60,5 +55,3 @@ include ../../Makefile.targ
 pics/%.o: ../%.c
 	$(COMPILE.c)  -o $@ $<
 	$(POST_PROCESS_O)
-
-$(DYNLIB) : $(MAPFILE)
diff --git a/usr/src/lib/sasl_plugins/Makefile b/usr/src/lib/sasl_plugins/Makefile
index 75276acb75..e32bd6d7e1 100644
--- a/usr/src/lib/sasl_plugins/Makefile
+++ b/usr/src/lib/sasl_plugins/Makefile
@@ -1,5 +1,25 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -20,13 +40,11 @@ lint :=		TARGET= lint
 
 .KEEP_STATE:
 
-all clean clobber install: $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
 install_h check:
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/sasl_plugins/Makefile.com b/usr/src/lib/sasl_plugins/Makefile.com
index 4482f21022..4311d88ccb 100644
--- a/usr/src/lib/sasl_plugins/Makefile.com
+++ b/usr/src/lib/sasl_plugins/Makefile.com
@@ -1,5 +1,25 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -13,12 +33,11 @@ include $(SRC)/lib/Makefile.lib
 CPPFLAGS +=	-I$(SRC)/lib/libsasl/include
 
 LIBS =		$(DYNLIB)
-SRCS=		$(PLUG_OBJS:%.o=../%.c) $(COMMONOBJS:%.o=../../%.c)
+SRCS=		$(PLUG_OBJS:%.o=../%.c) \
+		$(COMMONOBJS:%.o=$(SRC)/lib/libsasl/plugin/%.c)
 LDLIBS +=	-lsocket -lc $(PLUG_LIBS)
-SRCDIR=		..
 
-MAPDIR= 	../spec/$(TRANSMACH)
-SPECMAPFILE=	$(MAPDIR)/mapfile
+MAPFILES =	../../mapfile-vers
 
 ROOTLIBDIR=	$(ROOT)/usr/lib/sasl
 ROOTLIBDIR64=	$(ROOT)/usr/lib/sasl/$(MACH64)
diff --git a/usr/src/lib/sasl_plugins/Makefile.subdirs b/usr/src/lib/sasl_plugins/Makefile.subdirs
index cba9aa690b..68de866d06 100644
--- a/usr/src/lib/sasl_plugins/Makefile.subdirs
+++ b/usr/src/lib/sasl_plugins/Makefile.subdirs
@@ -1,5 +1,25 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -17,11 +37,9 @@ install :=	TARGET= install
 lint :=		TARGET= lint
 .KEEP_STATE:
 
-all clean clobber install: spec .WAIT $(SUBDIRS)
-
-lint: $(SUBDIRS)
+all clean clobber install lint: $(SUBDIRS)
 
-$(SUBDIRS) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/lib/sasl_plugins/mapfile-vers b/usr/src/lib/sasl_plugins/mapfile-vers
new file mode 100644
index 0000000000..57377c73f6
--- /dev/null
+++ b/usr/src/lib/sasl_plugins/mapfile-vers
@@ -0,0 +1,34 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNWprivate_1.1 {
+    global:
+	sasl_client_plug_init;
+	sasl_server_plug_init;
+    local:
+	*;
+};
diff --git a/usr/src/lib/udapl/libdat/Makefile b/usr/src/lib/udapl/libdat/Makefile
index a1a1284347..6c5caac2a0 100644
--- a/usr/src/lib/udapl/libdat/Makefile
+++ b/usr/src/lib/udapl/libdat/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -60,19 +59,17 @@ debug :=	TARGET= debug
 
 .KEEP_STATE:
 
-all debug install: $(ROOTETCDATFILES) spec .WAIT $(SUBDIRS)
+all debug install: $(ROOTETCDATFILES) .WAIT $(SUBDIRS)
 
 $(ROOTETCDATFILES): $(ROOTETCDAT)
 
-clean clobber: spec $(SUBDIRS)
-
-lint: $(SUBDIRS)
+clean clobber lint: $(SUBDIRS)
 
 install_h: $(ROOTHDRDIR) .WAIT $(ROOTHDRS)
 
 check: $(CHECKHDRS)
 
-spec $(SUBDIRS): FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 $(ROOTHDRDIR):
diff --git a/usr/src/lib/udapl/libdat/Makefile.com b/usr/src/lib/udapl/libdat/Makefile.com
index c82dd1da4c..22d7dc9e00 100644
--- a/usr/src/lib/udapl/libdat/Makefile.com
+++ b/usr/src/lib/udapl/libdat/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -47,8 +46,6 @@ LIBS = 	$(DYNLIB) $(LINTLIB)
 LDLIBS += -lc
 
 SRCDIR =	../common
-MAPDIR =	$(SRC)/lib/udapl/libdat/spec/$(TRANSMACH)
-SPECMAPFILE =	$(MAPDIR)/mapfile
 
 CPPFLAGS +=     -I../include 
 CFLAGS +=	$(CCVERBOSE)
diff --git a/usr/src/lib/udapl/libdat/common/mapfile-vers b/usr/src/lib/udapl/libdat/common/mapfile-vers
new file mode 100644
index 0000000000..641e598455
--- /dev/null
+++ b/usr/src/lib/udapl/libdat/common/mapfile-vers
@@ -0,0 +1,104 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	dat_cno_create;
+	dat_cno_free;
+	dat_cno_modify_agent;
+	dat_cno_query;
+	dat_cno_wait;
+	dat_cr_accept;
+	dat_cr_handoff;
+	dat_cr_query;
+	dat_cr_reject;
+	dat_ep_connect;
+	dat_ep_create;
+	dat_ep_create_with_srq;
+	dat_ep_disconnect;
+	dat_ep_dup_connect;
+	dat_ep_free;
+	dat_ep_get_status;
+	dat_ep_modify;
+	dat_ep_post_rdma_read;
+	dat_ep_post_rdma_write;
+	dat_ep_post_recv;
+	dat_ep_post_send;
+	dat_ep_query;
+	dat_ep_recv_query;
+	dat_ep_reset;
+	dat_ep_set_watermark;
+	dat_evd_clear_unwaitable;
+	dat_evd_create;
+	dat_evd_dequeue;
+	dat_evd_disable;
+	dat_evd_enable;
+	dat_evd_free;
+	dat_evd_modify_cno;
+	dat_evd_post_se;
+	dat_evd_query;
+	dat_evd_resize;
+	dat_evd_set_unwaitable;
+	dat_evd_wait;
+	dat_get_consumer_context;
+	dat_get_handle_type;
+	dat_ia_close;
+	dat_ia_openv;
+	dat_ia_query;
+	dat_lmr_create;
+	dat_lmr_free;
+	dat_lmr_query;
+	dat_lmr_sync_rdma_read;
+	dat_lmr_sync_rdma_write;
+	dat_psp_create;
+	dat_psp_create_any;
+	dat_psp_free;
+	dat_psp_query;
+	dat_pz_create;
+	dat_pz_free;
+	dat_pz_query;
+	dat_registry_add_provider;
+	dat_registry_list_providers;
+	dat_registry_remove_provider;
+	dat_rmr_bind;
+	dat_rmr_create;
+	dat_rmr_free;
+	dat_rmr_query;
+	dat_rsp_create;
+	dat_rsp_free;
+	dat_rsp_query;
+	dat_set_consumer_context;
+	dat_srq_create;
+	dat_srq_free;
+	dat_srq_post_recv;
+	dat_srq_query;
+	dat_srq_resize;
+	dat_srq_set_lw;
+	dat_strerror;
+    local:
+	*;
+};
diff --git a/usr/src/lib/watchmalloc/Makefile b/usr/src/lib/watchmalloc/Makefile
index a7ee145acb..a25c865700 100644
--- a/usr/src/lib/watchmalloc/Makefile
+++ b/usr/src/lib/watchmalloc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,16 +19,15 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1996-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/watchmalloc/Makefile
 
 include	../Makefile.lib
 
-SUBDIRS=	spec .WAIT $(MACH)
+SUBDIRS=	$(MACH)
 $(BUILD64)SUBDIRS += $(MACH64)
 
 all :=		TARGET= all
diff --git a/usr/src/lib/watchmalloc/Makefile.com b/usr/src/lib/watchmalloc/Makefile.com
index 74f6b4221c..4c7eb9f66d 100644
--- a/usr/src/lib/watchmalloc/Makefile.com
+++ b/usr/src/lib/watchmalloc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,12 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/watchmalloc/Makefile.com
 
 LIBRARY = watchmalloc.a
 VERS = .1
@@ -35,17 +33,14 @@ OBJECTS = malloc.o
 # include library definitions
 include ../../Makefile.lib
 
-MAPFILE = $(MAPDIR)/mapfile
-CLOBBERFILES +=	$(MAPFILE)
-
-SRCS = $(OBJECTS:%.o=../common/%.c)
+SRCDIR = ../common
 
 LIBS = $(DYNLIB)
 LDLIBS += -lc
 CFLAGS += $(CCVERBOSE)
 CFLAGS64 += $(CCVERBOSE)
 CPPFLAGS += -D_REENTRANT -I../common
-DYNFLAGS += -M$(MAPFILE) $(ZINTERPOSE)
+DYNFLAGS += $(ZINTERPOSE)
 
 .KEEP_STATE:
 
@@ -54,11 +49,6 @@ all: $(LIBS)
 lint:
 	$(LINT.c) $(SRCS) $(LDLIBS)
 
-$(DYNLIB): $(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 # include library targets
 include ../../Makefile.targ
 
diff --git a/usr/src/lib/watchmalloc/amd64/Makefile b/usr/src/lib/watchmalloc/amd64/Makefile
index bbaac16a41..b4a264fcbc 100644
--- a/usr/src/lib/watchmalloc/amd64/Makefile
+++ b/usr/src/lib/watchmalloc/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/watchmalloc/common/mapfile-vers b/usr/src/lib/watchmalloc/common/mapfile-vers
new file mode 100644
index 0000000000..0097c20482
--- /dev/null
+++ b/usr/src/lib/watchmalloc/common/mapfile-vers
@@ -0,0 +1,51 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	calloc = NODIRECT;
+	cfree = NODIRECT;
+	_cfree = NODIRECT;
+	free = NODIRECT;
+	mallinfo = NODIRECT;
+	_mallinfo = NODIRECT;
+	malloc = NODIRECT;
+	mallopt = NODIRECT;
+	_mallopt = NODIRECT;
+	memalign = NODIRECT;
+	_memalign = NODIRECT;
+	realloc = NODIRECT;
+	valloc = NODIRECT;
+	_valloc = NODIRECT;
+};
+
+SUNWprivate_1.1 {
+    global:
+	SUNWprivate_1.1;
+    local:
+	*;
+};
diff --git a/usr/src/lib/watchmalloc/i386/Makefile b/usr/src/lib/watchmalloc/i386/Makefile
index 42e5e35db6..6a777cf0a2 100644
--- a/usr/src/lib/watchmalloc/i386/Makefile
+++ b/usr/src/lib/watchmalloc/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/watchmalloc/i386/Makefile
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/watchmalloc/sparc/Makefile b/usr/src/lib/watchmalloc/sparc/Makefile
index 681956ef17..6a777cf0a2 100644
--- a/usr/src/lib/watchmalloc/sparc/Makefile
+++ b/usr/src/lib/watchmalloc/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/watchmalloc/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 .KEEP_STATE:
diff --git a/usr/src/lib/watchmalloc/sparcv9/Makefile b/usr/src/lib/watchmalloc/sparcv9/Makefile
index ff5e5d1bc9..b4a264fcbc 100644
--- a/usr/src/lib/watchmalloc/sparcv9/Makefile
+++ b/usr/src/lib/watchmalloc/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/watchmalloc/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../Makefile.lib.64
 
diff --git a/usr/src/lib/wrsm/Makefile.com b/usr/src/lib/wrsm/Makefile.com
index b3ad184440..e926e87505 100644
--- a/usr/src/lib/wrsm/Makefile.com
+++ b/usr/src/lib/wrsm/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -51,7 +50,8 @@ RSMLINKSUNFIRE15K64 = $(RSMLIBSUNFIRE15K64)/$(LIBLINKS)
 RSMLINKREL64 = ../../../../SUNW,Sun-Fire/lib/rsmlib/$(MACH64)/$(LIBLINKS)$(VERS)
 RSMLINKS64= $(RSMLINKSUNFIRE15K64)
 
-SRCDIR = ..
+# There should be a mapfile here
+MAPFILES =
 
 LIBS = $(DYNLIB)
 SRCS = $(SRCDIR)/librsmwrsm.c $(SRCDIR)/wrsmlib.s
diff --git a/usr/src/stand/lib/Makefile.com b/usr/src/stand/lib/Makefile.com
index 8229b48949..4449d7ac78 100644
--- a/usr/src/stand/lib/Makefile.com
+++ b/usr/src/stand/lib/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,11 +19,13 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
-# 
+#
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
+
+#
 # Common macro definitions and pattern rules for stand libraries.
 # Basically just a trivial wrapper around $(SRC)/lib/Makefile.lib.
 #
@@ -32,6 +33,7 @@
 include $(SRC)/lib/Makefile.lib
 include $(SRC)/stand/lib/Makefile.$(MACH)
 
+SRCDIR =	.
 LIBS +=		$(LIBRARY) $(LINTLIB)
 CFLAGS +=	$(CCVERBOSE)
 LDFLAGS =	-r
diff --git a/usr/src/tools/findunref/exception_list b/usr/src/tools/findunref/exception_list
index 673ff8b4f0..8240de7ad7 100644
--- a/usr/src/tools/findunref/exception_list
+++ b/usr/src/tools/findunref/exception_list
@@ -130,8 +130,8 @@
 ./src/lib/gss_mechs/mech_dh/dh1024/mapfile-vers
 ./src/lib/gss_mechs/mech_dh/dh192/mapfile-vers
 ./src/lib/gss_mechs/mech_dh/dh640/mapfile-vers
-./src/lib/gss_mechs/mech_krb5/spec/krb5_clean.spec
-./src/lib/gss_mechs/mech_spnego/spec/clean.spec
+./src/lib/gss_mechs/mech_krb5/mapfile-vers-clean
+./src/lib/gss_mechs/mech_spnego/mapfile-vers-clean
 ./src/lib/pkcs11/pkcs11_softtoken/common/Makefile
 ./src/uts/common/Makefile
 ./src/uts/common/crypto/io/Makefile
diff --git a/usr/src/tools/tokenize/Makefile b/usr/src/tools/tokenize/Makefile
index 433574d652..976939c4f1 100644
--- a/usr/src/tools/tokenize/Makefile
+++ b/usr/src/tools/tokenize/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1998-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -40,6 +39,8 @@ include ../Makefile.tools
 
 LIBS = $(DYNLIB)
 
+MAPFILES =
+
 DYNFLAGS += -z interpose
 LDLIBS = -lc -ldl
 
diff --git a/usr/src/ucblib/libcurses/Makefile b/usr/src/ucblib/libcurses/Makefile
index 53f9d7d216..e672661b7d 100644
--- a/usr/src/ucblib/libcurses/Makefile
+++ b/usr/src/ucblib/libcurses/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1989-2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# The builds occur in ISA subdirectories.
-#
 
 include ../Makefile.ucb
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS = $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
 install :=	TARGET= install
@@ -42,7 +40,7 @@ lint :=		TARGET= lint
 
 all install clean clobber lint: $(SUBDIRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/ucblib/libcurses/Makefile.com b/usr/src/ucblib/libcurses/Makefile.com
index 58f1fb012a..6172001c28 100644
--- a/usr/src/ucblib/libcurses/Makefile.com
+++ b/usr/src/ucblib/libcurses/Makefile.com
@@ -1,11 +1,29 @@
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libcurses/Makefile.com
-#
 
 LIBRARY=	libcurses.a
 VERS=		.1
@@ -58,9 +76,6 @@ include $(SRC)/lib/Makefile.lib
 ROOTLIBDIR=	$(ROOT)/usr/ucblib
 ROOTLIBDIR64=	$(ROOT)/usr/ucblib/$(MACH64)
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS=		$(OBJECTS:%.o=../%.c)
-
 LIBS = $(DYNLIB) $(LINTLIB)
 
 LINTSRC= $(LINTLIB:%.ln=%)
@@ -80,8 +95,8 @@ $(LINTLIB):= SRCS=../llib-lcurses
 CFLAGS	+=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
 DYNFLAGS +=	
-DYNFLAGS32 =	-M$(MAPFILE) -R/usr/ucblib
-DYNFLAGS64 =	-M$(MAPFILE) -R/usr/ucblib/$(MACH64)
+DYNFLAGS32 =	-R/usr/ucblib
+DYNFLAGS64 =	-R/usr/ucblib/$(MACH64)
 LDLIBS +=	-ltermcap -lucb -lc
 
 CPPFLAGS = -I$(ROOT)/usr/ucbinclude -I../../../lib/libc/inc $(CPPFLAGS.master)
@@ -92,11 +107,6 @@ all: $(LIBS)
 
 lint: lintcheck
 
-$(DYNLIB): 	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 #
 # Include library targets
 #
diff --git a/usr/src/ucblib/libcurses/amd64/Makefile b/usr/src/ucblib/libcurses/amd64/Makefile
index 55925aa48f..121bc4c173 100644
--- a/usr/src/ucblib/libcurses/amd64/Makefile
+++ b/usr/src/ucblib/libcurses/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../../lib/Makefile.lib.64
 
diff --git a/usr/src/ucblib/libcurses/i386/Makefile b/usr/src/ucblib/libcurses/i386/Makefile
index 9557263181..7ec09c4a9c 100644
--- a/usr/src/ucblib/libcurses/i386/Makefile
+++ b/usr/src/ucblib/libcurses/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libcurses/i386/Makefile
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
diff --git a/usr/src/ucblib/libcurses/mapfile-vers b/usr/src/ucblib/libcurses/mapfile-vers
new file mode 100644
index 0000000000..8acfa2d663
--- /dev/null
+++ b/usr/src/ucblib/libcurses/mapfile-vers
@@ -0,0 +1,181 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	AL;
+	AL_PARM;
+	AM;
+	BC;
+	box;
+	BS;
+	BT;
+	CA;
+	CD;
+	CE;
+	CL;
+	CM;
+	COLS;
+	CR;
+	CS;
+	curscr;
+	DA;
+	DB;
+	DC;
+	Def_term;
+	delwin;
+	DL;
+	DL_PARM;
+	DM;
+	DO;
+	DOWN_PARM;
+	_echoit;
+	ED;
+	EI;
+	endwin;
+	_endwin;
+	EO;
+	getcap;
+	gettmode;
+	GT;
+	HC;
+	HO;
+	HZ;
+	IC;
+	idlok;
+	IM;
+	IN;
+	initscr;
+	IP;
+	K0;
+	K1;
+	K2;
+	K3;
+	K4;
+	K5;
+	K6;
+	K7;
+	K8;
+	K9;
+	KD;
+	KE;
+	KH;
+	KL;
+	KR;
+	KS;
+	KU;
+	LEFT_PARM;
+	LINES;
+	LL;
+	longname;
+	MA;
+	MI;
+	MS;
+	mvcur;
+	mvprintw;
+	mvscanw;
+	mvwin;
+	mvwprintw;
+	mvwscanw;
+	My_term;
+	NC;
+	ND;
+	newwin;
+	NL;
+	NONL;
+	normtty;
+	NS;
+	OS;
+	overlay;
+	overwrite;
+	PC;
+	_pfast;
+	printw;
+	_rawmode;
+	RC;
+	_res_flg;
+	RIGHT_PARM;
+	SC;
+	scanw;
+	scroll;
+	SE;
+	setterm;
+	SF;
+	SO;
+	SR;
+	stdscr;
+	subwin;
+	TA;
+	TE;
+	TI;
+	touchline;
+	touchwin;
+	_tty;
+	_tty_ch;
+	ttytype;
+	UC;
+	UE;
+	UL;
+	_unctrl;
+	UP;
+	UP_PARM;
+	UPPERCASE;
+	US;
+	VB;
+	VE;
+	VS;
+	waddch;
+	waddstr;
+	wclear;
+	wclrtobot;
+	wclrtoeol;
+	wdelch;
+	wdeleteln;
+	werase;
+	wgetch;
+	wgetstr;
+	winsch;
+	winsertln;
+	wmove;
+	wprintw;
+	wrefresh;
+	wscanw;
+	wstandend;
+	wstandout;
+	XB;
+	XN;
+	XS;
+	XT;
+	XX;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_putchar;
+    local:
+	*;
+};
diff --git a/usr/src/ucblib/libcurses/sparc/Makefile b/usr/src/ucblib/libcurses/sparc/Makefile
index 35bd270df4..d88f114405 100644
--- a/usr/src/ucblib/libcurses/sparc/Makefile
+++ b/usr/src/ucblib/libcurses/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libcurses/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
diff --git a/usr/src/ucblib/libcurses/sparcv9/Makefile b/usr/src/ucblib/libcurses/sparcv9/Makefile
index 890b579237..121bc4c173 100644
--- a/usr/src/ucblib/libcurses/sparcv9/Makefile
+++ b/usr/src/ucblib/libcurses/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libcurses/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../../lib/Makefile.lib.64
 
diff --git a/usr/src/ucblib/libdbm/Makefile b/usr/src/ucblib/libdbm/Makefile
index 8c94a6bcb1..eeb42a40c4 100644
--- a/usr/src/ucblib/libdbm/Makefile
+++ b/usr/src/ucblib/libdbm/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1989-1999, 2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# The builds occur in isa subdirectories.
-#
 
 include ../Makefile.ucb
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS = $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 install :=	TARGET= install
 clean :=	TARGET= clean
@@ -41,7 +39,7 @@ lint :=		TARGET= lint
 
 all install clean clobber lint : $(SUBDIRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/ucblib/libdbm/Makefile.com b/usr/src/ucblib/libdbm/Makefile.com
index ac659af6d6..18157757c9 100644
--- a/usr/src/ucblib/libdbm/Makefile.com
+++ b/usr/src/ucblib/libdbm/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libdbm/Makefile.com
-#
 
 LIBRARY=	libdbm.a
 VERS=		.1
@@ -39,10 +36,6 @@ include $(SRC)/lib/Makefile.lib
 ROOTLIBDIR=	$(ROOT)/usr/ucblib
 ROOTLIBDIR64=	$(ROOT)/usr/ucblib/$(MACH64)
 
-MAPFILE=	$(MAPDIR)/mapfile
-CLOBBERFILES += $(MAPFILE)
-SRCS=		$(OBJECTS:%.o=../%.c)
-
 LIBS = $(DYNLIB) $(LINTLIB)
 
 LINTSRC= $(LINTLIB:%.ln=%)
@@ -60,7 +53,6 @@ $(ROOTLINTDIR64)/%: ../%
 $(LINTLIB):= SRCS=../llib-ldbm
 
 CFLAGS	+=	$(CCVERBOSE)
-DYNFLAGS +=	-M$(MAPFILE)
 LDLIBS +=	-lc
 
 CPPFLAGS = -I$(ROOT)/usr/ucbinclude $(CPPFLAGS.master)
@@ -71,11 +63,6 @@ all: $(LIBS)
 
 lint: lintcheck
 
-$(DYNLIB): 	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 #
 # Include library targets
 #
diff --git a/usr/src/ucblib/libdbm/amd64/Makefile b/usr/src/ucblib/libdbm/amd64/Makefile
index 15a2c25314..5b91d3c694 100644
--- a/usr/src/ucblib/libdbm/amd64/Makefile
+++ b/usr/src/ucblib/libdbm/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include ../../../lib/Makefile.lib.64
 
diff --git a/usr/src/ucblib/libdbm/i386/Makefile b/usr/src/ucblib/libdbm/i386/Makefile
index cf1a8db8ea..e2080593d5 100644
--- a/usr/src/ucblib/libdbm/i386/Makefile
+++ b/usr/src/ucblib/libdbm/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libdbm/i386/Makefile
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
diff --git a/usr/src/ucblib/libdbm/mapfile-vers b/usr/src/ucblib/libdbm/mapfile-vers
new file mode 100644
index 0000000000..1bed2b5763
--- /dev/null
+++ b/usr/src/ucblib/libdbm/mapfile-vers
@@ -0,0 +1,55 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	bitno;
+	blkno;
+	dbmclose;
+	dbminit;
+	dbrdonly;
+	delete;
+	dirbuf;
+	dirf;
+	fetch;
+	firstkey;
+	hmask;
+	maxbno;
+	nextkey;
+	pagbuf;
+	pagf;
+	store;
+};
+
+SUNWprivate_1.1 {
+    global:
+	calchash;
+	hashinc;
+	makdatum;
+    local:
+	*;
+};
diff --git a/usr/src/ucblib/libdbm/sparc/Makefile b/usr/src/ucblib/libdbm/sparc/Makefile
index 1e40791671..e2a26e9aea 100644
--- a/usr/src/ucblib/libdbm/sparc/Makefile
+++ b/usr/src/ucblib/libdbm/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libdbm/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
diff --git a/usr/src/ucblib/libdbm/sparcv9/Makefile b/usr/src/ucblib/libdbm/sparcv9/Makefile
index 81ff39f279..5b91d3c694 100644
--- a/usr/src/ucblib/libdbm/sparcv9/Makefile
+++ b/usr/src/ucblib/libdbm/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libdbm/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include ../../../lib/Makefile.lib.64
 
diff --git a/usr/src/ucblib/librpcsoc/Makefile b/usr/src/ucblib/librpcsoc/Makefile
index d096da99ff..5259b54094 100644
--- a/usr/src/ucblib/librpcsoc/Makefile
+++ b/usr/src/ucblib/librpcsoc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,24 +19,23 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/librpcsoc/Makefile
-#
 
 include $(SRC)/Makefile.master
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS = $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # install rule for install_h target
 $(ROOTHDRDIR)/%: %
 	$(INS.file)
 
 #conditional assignments
-all :=		TARGET=all
+all :=		TARGET= all
 install :=      TARGET= install
 clean :=        TARGET= clean
 clobber :=      TARGET= clobber
@@ -45,7 +43,7 @@ lint :=         TARGET= lint
 
 .KEEP_STATE:
 
-all:	.WAIT $(SUBDIRS)
+all:	$(SUBDIRS)
 
 install: all .WAIT $(SUBDIRS)
 
@@ -53,7 +51,7 @@ install_h: $(ROOTHDRS)
 
 clean clobber lint: $(SUBDIRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/ucblib/librpcsoc/Makefile.com b/usr/src/ucblib/librpcsoc/Makefile.com
index 574265d24a..b4f8320cad 100644
--- a/usr/src/ucblib/librpcsoc/Makefile.com
+++ b/usr/src/ucblib/librpcsoc/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/librpcsoc/Makefile.com
-#
 
 LIBRARY= librpcsoc.a
 VERS = .1
@@ -39,10 +36,6 @@ OBJECTS= clnt_tcp.o clnt_udp.o getrpcport.o rtime.o svc_tcp.o svc_udp.o get_myad
 # include library definitions
 include $(SRC)/lib/Makefile.lib
 
-MAPFILE=	$(MAPDIR)/mapfile
-CLOBBERFILES += $(MAPFILE)
-SRCS=		$(OBJECTS:%.o=../%.c)
-
 objs/%.o pics/%.o: ../%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
@@ -51,7 +44,6 @@ LIBS = $(DYNLIB)
 
 LDLIBS += -lnsl -lsocket -lc
 CPPFLAGS += -DPORTMAP
-DYNFLAGS += -M $(MAPFILE)
 
 ROOTLIBDIR=	$(ROOT)/usr/ucblib
 ROOTLIBDIR64=   $(ROOT)/usr/ucblib/$(MACH64)
@@ -63,11 +55,6 @@ CPPFLAGS = -I$(ROOT)/usr/ucbinclude -I../../../lib/libc/inc $(CPPFLAGS.master)
 
 .KEEP_STATE:
 
-$(DYNLIB):	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 lint: lintcheck
 
 # include library targets
diff --git a/usr/src/ucblib/librpcsoc/amd64/Makefile b/usr/src/ucblib/librpcsoc/amd64/Makefile
index 306722bed4..57275bc453 100644
--- a/usr/src/ucblib/librpcsoc/amd64/Makefile
+++ b/usr/src/ucblib/librpcsoc/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
diff --git a/usr/src/ucblib/librpcsoc/i386/Makefile b/usr/src/ucblib/librpcsoc/i386/Makefile
index aff760668d..2912bdb172 100644
--- a/usr/src/ucblib/librpcsoc/i386/Makefile
+++ b/usr/src/ucblib/librpcsoc/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/librpcsoc/i386/Makefile
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
diff --git a/usr/src/ucblib/librpcsoc/mapfile-vers b/usr/src/ucblib/librpcsoc/mapfile-vers
new file mode 100644
index 0000000000..17040f0871
--- /dev/null
+++ b/usr/src/ucblib/librpcsoc/mapfile-vers
@@ -0,0 +1,48 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	clnttcp_create;
+	clntudp_bufcreate;
+	clntudp_create;
+	get_myaddress;
+	getrpcport;
+	rtime;
+	svcfd_create;
+	svctcp_create;
+	svcudp_bufcreate;
+	svcudp_create;
+	svcudp_enablecache;
+    local:
+	*;
+};
diff --git a/usr/src/ucblib/librpcsoc/sparc/Makefile b/usr/src/ucblib/librpcsoc/sparc/Makefile
index 26383e5faf..3dffb149aa 100644
--- a/usr/src/ucblib/librpcsoc/sparc/Makefile
+++ b/usr/src/ucblib/librpcsoc/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1998-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# lib/librpcsoc/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
diff --git a/usr/src/ucblib/librpcsoc/sparcv9/Makefile b/usr/src/ucblib/librpcsoc/sparcv9/Makefile
index 87a5c694c2..57275bc453 100644
--- a/usr/src/ucblib/librpcsoc/sparcv9/Makefile
+++ b/usr/src/ucblib/librpcsoc/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/librpcsoc/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
diff --git a/usr/src/ucblib/libtermcap/Makefile b/usr/src/ucblib/libtermcap/Makefile
index c70d123c17..75b99dde09 100644
--- a/usr/src/ucblib/libtermcap/Makefile
+++ b/usr/src/ucblib/libtermcap/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,19 +19,16 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 1989-1997,2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ucblib/libtermcap/Makefile
-#
-# The builds occur in isa subdirectories.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.ucb
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS = $(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
 install :=	TARGET= install
@@ -44,7 +40,7 @@ lint :=		TARGET= lint
 
 all install clean clobber lint : $(SUBDIRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/ucblib/libtermcap/Makefile.com b/usr/src/ucblib/libtermcap/Makefile.com
index af6729f0f7..4f98d37dfd 100644
--- a/usr/src/ucblib/libtermcap/Makefile.com
+++ b/usr/src/ucblib/libtermcap/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libtermcap/Makefile.com
-#
 
 LIBRARY=	libtermcap.a
 VERS=		.1
@@ -41,9 +38,6 @@ include $(SRC)/lib/Makefile.lib
 ROOTLIBDIR=	$(ROOT)/usr/ucblib
 ROOTLIBDIR64=	$(ROOT)/usr/ucblib/$(MACH64)
 
-MAPFILE=	$(MAPDIR)/mapfile
-SRCS=		$(OBJECTS:%.o=../%.c)
-
 LIBS = $(DYNLIB) $(LINTLIB)
 
 LINTSRC= $(LINTLIB:%.ln=%)
@@ -62,9 +56,6 @@ $(LINTLIB):= SRCS=../llib-ltermcap
 
 CFLAGS	+=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
-DYNFLAGS +=	
-DYNFLAGS32 =	-M$(MAPFILE)
-DYNFLAGS64 =	-M$(MAPFILE)
 LDLIBS +=	-lc
 
 DEFS= -DCM_N -DCM_GT -DCM_B -DCM_D
@@ -76,11 +67,6 @@ all: $(LIBS)
 
 lint: lintcheck
 
-$(DYNLIB): 	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
 #
 # Include library targets
 #
diff --git a/usr/src/ucblib/libtermcap/amd64/Makefile b/usr/src/ucblib/libtermcap/amd64/Makefile
index 5834f4af40..5567585245 100644
--- a/usr/src/ucblib/libtermcap/amd64/Makefile
+++ b/usr/src/ucblib/libtermcap/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,13 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
 
-MAPDIR=	../spec/amd64
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
diff --git a/usr/src/ucblib/libtermcap/i386/Makefile b/usr/src/ucblib/libtermcap/i386/Makefile
index 91f52b2d58..e2080593d5 100644
--- a/usr/src/ucblib/libtermcap/i386/Makefile
+++ b/usr/src/ucblib/libtermcap/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libtermcap/i386/Makefile
 
-MAPDIR=	../spec/i386
 include ../Makefile.com
 
-DYNFLAGS += $(DYNFLAGS32)
 BUILD.SO= $(CC) -o $@ $(GSHARED) $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
 
 .KEEP_STATE:
diff --git a/usr/src/ucblib/libtermcap/mapfile-vers b/usr/src/ucblib/libtermcap/mapfile-vers
new file mode 100644
index 0000000000..9856c51159
--- /dev/null
+++ b/usr/src/ucblib/libtermcap/mapfile-vers
@@ -0,0 +1,42 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	BC;
+	ospeed;
+	PC;
+	tgetent;
+	tgetflag;
+	tgetnum;
+	tgetstr;
+	tgoto;
+	tputs;
+	UP;
+    local:
+	*;
+};
diff --git a/usr/src/ucblib/libtermcap/sparc/Makefile b/usr/src/ucblib/libtermcap/sparc/Makefile
index d53ad322f5..e2a26e9aea 100644
--- a/usr/src/ucblib/libtermcap/sparc/Makefile
+++ b/usr/src/ucblib/libtermcap/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,17 +19,14 @@
 # CDDL HEADER END
 #
 #
-# Copyright 1997-2003 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libtermcap/sparc/Makefile
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
-DYNFLAGS += $(DYNFLAGS32)
 BUILD.SO= $(CC) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/ucblib $(LDLIBS)
 
 .KEEP_STATE:
diff --git a/usr/src/ucblib/libtermcap/sparcv9/Makefile b/usr/src/ucblib/libtermcap/sparcv9/Makefile
index 57a580afe2..5567585245 100644
--- a/usr/src/ucblib/libtermcap/sparcv9/Makefile
+++ b/usr/src/ucblib/libtermcap/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,12 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1998 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libtermcap/sparcv9/Makefile
 
-MAPDIR=	../spec/sparcv9
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
diff --git a/usr/src/ucblib/libucb/Makefile b/usr/src/ucblib/libucb/Makefile
index 60ae097c14..ebb837a4e3 100644
--- a/usr/src/ucblib/libucb/Makefile
+++ b/usr/src/ucblib/libucb/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,19 +19,16 @@
 # CDDL HEADER END
 #
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
-#
-# Copyright 1989-1999,2002 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
-# ucblib/libucb/Makefile
-#
-# The builds occur in isa subdirectories.
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
 
 include ../Makefile.ucb
 
-SUBDIRS = spec .WAIT $(MACH) $(BUILD64) $(MACH64)
+SUBDIRS =	$(MACH)
+$(BUILD64)SUBDIRS += $(MACH64)
 
 # conditional assignments
 install :=	TARGET= install
@@ -44,7 +40,7 @@ lint :=		TARGET= lint
 
 all install clean clobber lint : $(SUBDIRS)
 
-$(MACH) $(MACH64) spec: FRC
+$(SUBDIRS): FRC
 	@cd $@; pwd; $(MAKE) $(TARGET)
 
 FRC:
diff --git a/usr/src/ucblib/libucb/Makefile.com b/usr/src/ucblib/libucb/Makefile.com
index 5075d43068..079a9a94d9 100644
--- a/usr/src/ucblib/libucb/Makefile.com
+++ b/usr/src/ucblib/libucb/Makefile.com
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,14 +19,11 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libucb/Makefile.com
-# common part for i386/amd64/sparc/sparcv9
-#
 
 LIBRARY=	libucb.a
 VERS=		.1
@@ -85,8 +81,7 @@ include $(SRC)/lib/Makefile.lib
 ROOTLIBDIR=	$(ROOT)/usr/ucblib
 ROOTLIBDIR64=	$(ROOT)/usr/ucblib/$(MACH64)
 
-MAPFILE=	$(MAPDIR)/mapfile
-MAPOPTS=	$(MAPFILE:%=-M%)
+MAPFILES =	../port/mapfile-vers mapfile-vers
 
 SRCS=		$(PORTGENOBJS:%.o=../port/gen/%.c) \
 		$(PORTSTDIOOBJS:%.o=../port/stdio/%.c) \
@@ -110,7 +105,6 @@ $(LINTLIB):= SRCS=../port/llib-lucb
 
 CFLAGS	+=	$(CCVERBOSE)
 CFLAGS64 +=	$(CCVERBOSE)
-DYNFLAGS +=	$(MAPOPTS)
 LDLIBS +=	-lelf -lc
 
 CPPFLAGS = -D$(MACH) -I$(ROOT)/usr/ucbinclude -I../inc \
@@ -130,27 +124,22 @@ all: $(LIBS)
 
 lint: lintcheck
 
-$(DYNLIB): 	$(MAPFILE)
-
-$(MAPFILE):
-	@cd $(MAPDIR); $(MAKE) mapfile
-
-objs/%.o pics/%.o: ../port/gen/%.c
+pics/%.o: ../port/gen/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
-objs/%.o pics/%.o: ../port/stdio/%.c
+pics/%.o: ../port/stdio/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
-objs/%.o pics/%.o: ../port/sys/%.c
+pics/%.o: ../port/sys/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
 
 # shared (sparc/sparcv9/i386/amd64) platform-specific rule
-objs/%.o pics/%.o: sys/%.c
+pics/%.o: sys/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
 
-objs/%.o pics/%.o: ../$(MACH)/sys/%.s
+pics/%.o: ../$(MACH)/sys/%.s
 	$(BUILD.s)
 	$(POST_PROCESS_O)
 
diff --git a/usr/src/ucblib/libucb/amd64/Makefile b/usr/src/ucblib/libucb/amd64/Makefile
index a6b20549c9..99d85cfe7c 100644
--- a/usr/src/ucblib/libucb/amd64/Makefile
+++ b/usr/src/ucblib/libucb/amd64/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
@@ -28,8 +27,6 @@
 
 SYSOBJS= signal.o
 
-MAPDIR=	../spec/amd64
-
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
@@ -37,7 +34,7 @@ DYNFLAGS += $(DYNFLAGS64)
 BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/lib/$(MACH64) $(LDLIBS)
 
 # amd64-specific rule
-objs/%.o pics/%.o: ../$(MACH)/sys/%.c
+pics/%.o: ../$(MACH)/sys/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
 
diff --git a/usr/src/ucblib/libucb/amd64/mapfile-vers b/usr/src/ucblib/libucb/amd64/mapfile-vers
new file mode 100644
index 0000000000..5b41590128
--- /dev/null
+++ b/usr/src/ucblib/libucb/amd64/mapfile-vers
@@ -0,0 +1,98 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	SUNW_1.1;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	alphasort;
+	bcmp;
+	bcopy;
+	bzero;
+	flock;
+	fopen;
+	fprintf;
+	freopen;
+	fstatfs;
+	ftime;
+	getdtablesize;
+	gethostid;
+	gethostname;
+	getpagesize;
+	getrusage = FUNCTION FILTER libc.so.1;
+	gettimeofday;
+	getwd;
+	index;
+	killpg;
+	mctl;
+	nice;
+	nlist;
+	printf;
+	psignal;
+	rand;
+	readdir;
+	reboot;
+	re_comp;
+	re_exec;
+	rindex;
+	scandir;
+	setbuffer;
+	sethostname;
+	setlinebuf;
+	setpgrp;
+	settimeofday;
+	sigblock;
+	siginterrupt;
+	signal;
+	sigpause;
+	sigsetmask;
+	sigstack;
+	sigvec;
+	sigvechandler;
+	sleep = FUNCTION FILTER libc.so.1;
+	sprintf;
+	srand;
+	statfs;
+	sys_siglist;
+	times;
+	ualarm = FUNCTION FILTER libc.so.1;
+	usignal;
+	usigpause;
+	usleep = FUNCTION FILTER libc.so.1;
+	vfprintf;
+	vprintf;
+	vsprintf;
+	wait3;
+	wait4;
+};
+
+SUNWprivate_1.1 {
+    global:
+};
diff --git a/usr/src/ucblib/libucb/i386/Makefile b/usr/src/ucblib/libucb/i386/Makefile
index 53067fd898..8edc02b3de 100644
--- a/usr/src/ucblib/libucb/i386/Makefile
+++ b/usr/src/ucblib/libucb/i386/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,20 +19,17 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libucb/i386/Makefile
 
 SYSOBJS=	 	\
 	signal.o
 
 NOCTFOBJS=
 
-MAPDIR=	../spec/i386
-
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
diff --git a/usr/src/ucblib/libucb/i386/mapfile-vers b/usr/src/ucblib/libucb/i386/mapfile-vers
new file mode 100644
index 0000000000..7ca55e7ea4
--- /dev/null
+++ b/usr/src/ucblib/libucb/i386/mapfile-vers
@@ -0,0 +1,108 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	alphasort64;
+	fopen64;
+	freopen64;
+	readdir64;
+	scandir64;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	alphasort;
+	bcmp;
+	bcopy;
+	bzero;
+	flock;
+	fopen;
+	fprintf;
+	freopen;
+	fstatfs;
+	ftime;
+	getdtablesize;
+	gethostid;
+	gethostname;
+	getpagesize;
+	getrusage = FUNCTION FILTER libc.so.1;
+	gettimeofday;
+	getwd;
+	index;
+	killpg;
+	longjmp = FUNCTION FILTER libc.so.1;
+	mctl;
+	nice;
+	nlist;
+	printf;
+	psignal;
+	rand;
+	readdir;
+	reboot;
+	re_comp;
+	re_exec;
+	rindex;
+	scandir;
+	setbuffer;
+	sethostname;
+	setjmp = FUNCTION FILTER libc.so.1;
+	setlinebuf;
+	setpgrp;
+	settimeofday;
+	sigblock;
+	siginterrupt;
+	signal;
+	sigpause;
+	sigsetmask;
+	sigstack;
+	sigvec;
+	sigvechandler;
+	sleep = FUNCTION FILTER libc.so.1;
+	sprintf;
+	srand;
+	statfs;
+	sys_siglist;
+	times;
+	ualarm = FUNCTION FILTER libc.so.1;
+	usignal;
+	usigpause;
+	usleep = FUNCTION FILTER libc.so.1;
+	vfprintf;
+	vprintf;
+	vsprintf;
+	wait3;
+	wait4;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_longjmp = FUNCTION FILTER libc.so.1;
+	_setjmp = FUNCTION FILTER libc.so.1;
+	_syscall = FUNCTION FILTER libc.so.1;
+	_times = FUNCTION FILTER libc.so.1;
+};
diff --git a/usr/src/ucblib/libucb/port/mapfile-vers b/usr/src/ucblib/libucb/port/mapfile-vers
new file mode 100644
index 0000000000..36fed01e1c
--- /dev/null
+++ b/usr/src/ucblib/libucb/port/mapfile-vers
@@ -0,0 +1,60 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.3 {
+    global:
+	_siguhandler;
+} SUNW_1.2;
+
+# Due to mistakes made early in the history of this library, there are
+# no SUNW_1.2 symbols, but the version is now kept as a placeholder.
+# Don't add any symbols to this version.
+
+SUNW_1.2 {
+    global:
+	SUNW_1.2;
+} SUNW_1.1;
+
+SUNWprivate_1.1 {
+    global:
+	_doprnt;
+	_getarg;
+	_mkarglst;
+	_sigblock;
+	_siginterrupt;
+	_sigsetmask;
+	_sigstack;
+	_sigvec;
+	_sigvechandler;
+	ucbsigblock;
+	ucbsiginterrupt;
+	ucbsigpause;
+	ucbsigsetmask;
+	ucbsigvec;
+    local:
+	*;
+};
diff --git a/usr/src/ucblib/libucb/sparc/Makefile b/usr/src/ucblib/libucb/sparc/Makefile
index 4150e7b8b6..ceceefc9ba 100644
--- a/usr/src/ucblib/libucb/sparc/Makefile
+++ b/usr/src/ucblib/libucb/sparc/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,25 +19,23 @@
 # CDDL HEADER END
 #
 #
-# Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
 # ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libucb/sparc/Makefile
 
 SYSOBJS=	 	\
 	setjmp.o	\
 	signal.o
 
-MAPDIR=	../spec/sparc
 include ../Makefile.com
 
 DYNFLAGS += $(DYNFLAGS32)
 BUILD.s=	$(AS) $(ASFLAGS) $< -o $@
 
 # sparc-specific rule
-objs/%.o pics/%.o: sys/%.s
+pics/%.o: sys/%.s
 	$(BUILD.s)
 	$(POST_PROCESS_O)
 
diff --git a/usr/src/ucblib/libucb/sparc/mapfile-vers b/usr/src/ucblib/libucb/sparc/mapfile-vers
new file mode 100644
index 0000000000..0066c68ca2
--- /dev/null
+++ b/usr/src/ucblib/libucb/sparc/mapfile-vers
@@ -0,0 +1,108 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	alphasort64;
+	fopen64;
+	freopen64;
+	readdir64;
+	scandir64;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	alphasort;
+	bcmp;
+	bcopy;
+	bzero;
+	flock;
+	fopen;
+	fprintf;
+	freopen;
+	fstatfs;
+	ftime;
+	getdtablesize;
+	gethostid;
+	gethostname;
+	getpagesize;
+	getrusage = FUNCTION FILTER libc.so.1;
+	gettimeofday;
+	getwd;
+	index;
+	killpg;
+	longjmp;
+	mctl;
+	nice;
+	nlist;
+	printf;
+	psignal;
+	rand;
+	readdir;
+	reboot;
+	re_comp;
+	re_exec;
+	rindex;
+	scandir;
+	setbuffer;
+	sethostname;
+	setjmp;
+	setlinebuf;
+	setpgrp;
+	settimeofday;
+	sigblock;
+	siginterrupt;
+	signal;
+	sigpause;
+	sigsetmask;
+	sigstack;
+	sigvec;
+	sigvechandler;
+	sleep = FUNCTION FILTER libc.so.1;
+	sprintf;
+	srand;
+	statfs;
+	sys_siglist;
+	times;
+	ualarm = FUNCTION FILTER libc.so.1;
+	usignal;
+	usigpause;
+	usleep = FUNCTION FILTER libc.so.1;
+	vfprintf;
+	vprintf;
+	vsprintf;
+	wait3;
+	wait4;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_longjmp;
+	_setjmp;
+	__sigcleanup;
+	syscall = FUNCTION FILTER libc.so.1;
+};
diff --git a/usr/src/ucblib/libucb/sparcv9/Makefile b/usr/src/ucblib/libucb/sparcv9/Makefile
index a708a444bc..90e748660f 100644
--- a/usr/src/ucblib/libucb/sparcv9/Makefile
+++ b/usr/src/ucblib/libucb/sparcv9/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,19 +19,16 @@
 # CDDL HEADER END
 #
 #
-# Copyright (c) 1997-1999 by Sun Microsystems, Inc.
-# All rights reserved.
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
 #
-#ident	"%Z%%M%	%I%	%E% SMI"
+# ident	"%Z%%M%	%I%	%E% SMI"
 #
-# ucblib/libucb/sparcv9/Makefile
 
 SYSOBJS=	 	\
 	setjmp.o	\
 	signal.o
 
-MAPDIR=	../spec/sparcv9
-
 include ../Makefile.com
 include $(SRC)/lib/Makefile.lib.64
 
@@ -41,11 +37,11 @@ BUILD.SO= $(CC) $(CFLAGS) -o $@ -G $(DYNFLAGS) $(PICS) -L $(ROOT)/usr/lib/$(MACH
 BUILD.s=	$(AS) $(ASFLAGS) -xarch=v9 -D__sparcv9 $< -o $@
 
 # sparcv9-specific rule
-objs/%.o pics/%.o: ../sparc/sys/%.c
+pics/%.o: ../sparc/sys/%.c
 	$(COMPILE.c) -o $@ $<
 	$(POST_PROCESS_O)
 
-objs/%.o pics/%.o: sys/%.s
+pics/%.o: sys/%.s
 	$(BUILD.s)
 	$(POST_PROCESS_O)
 
diff --git a/usr/src/ucblib/libucb/sparcv9/mapfile-vers b/usr/src/ucblib/libucb/sparcv9/mapfile-vers
new file mode 100644
index 0000000000..39dad7d2d7
--- /dev/null
+++ b/usr/src/ucblib/libucb/sparcv9/mapfile-vers
@@ -0,0 +1,103 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+# ident	"%Z%%M%	%I%	%E% SMI"
+#
+
+SUNW_1.1 {
+    global:
+	alphasort;
+	bcmp;
+	bcopy;
+	bzero;
+	flock;
+	fopen;
+	fprintf;
+	freopen;
+	fstatfs;
+	ftime;
+	getdtablesize;
+	gethostid;
+	gethostname;
+	getpagesize;
+	getrusage = FUNCTION FILTER libc.so.1;
+	gettimeofday;
+	getwd;
+	index;
+	killpg;
+	longjmp;
+	mctl;
+	nice;
+	nlist;
+	printf;
+	psignal;
+	rand;
+	readdir;
+	reboot;
+	re_comp;
+	re_exec;
+	rindex;
+	scandir;
+	setbuffer;
+	sethostname;
+	setjmp;
+	setlinebuf;
+	setpgrp;
+	settimeofday;
+	sigblock;
+	siginterrupt;
+	signal;
+	sigpause;
+	sigsetmask;
+	sigstack;
+	sigvec;
+	sigvechandler;
+	sleep = FUNCTION FILTER libc.so.1;
+	sprintf;
+	srand;
+	statfs;
+	sys_siglist;
+	times;
+	ualarm = FUNCTION FILTER libc.so.1;
+	usignal;
+	usigpause;
+	usleep = FUNCTION FILTER libc.so.1;
+	vfprintf;
+	vprintf;
+	vsprintf;
+	wait3;
+	wait4;
+} SUNW_0.7;
+
+SUNW_0.7 {
+    global:
+	SUNW_0.7;
+};
+
+SUNWprivate_1.1 {
+    global:
+	_longjmp;
+	_setjmp;
+	__sigcleanup;
+};
diff --git a/usr/src/xmod/xmod_files b/usr/src/xmod/xmod_files
index d40dfece4a..2b1c57989f 100644
--- a/usr/src/xmod/xmod_files
+++ b/usr/src/xmod/xmod_files
@@ -80,7 +80,7 @@ lib/libresolv2/dnssafe
 ../closed/lib/gss_mechs/mech_dh/dh640/mapfile-vers-export
 ../closed/lib/gss_mechs/mech_dummy/Makefile.export
 ../closed/lib/gss_mechs/mech_krb5/Makefile.export
-../closed/lib/gss_mechs/mech_krb5/spec/krb5_export.spec
+../closed/lib/gss_mechs/mech_krb5/mapfile-vers-export
 ../closed/lib/gss_mechs/mech_spnego/Makefile.export
-../closed/lib/gss_mechs/mech_spnego/spec/export.spec
+../closed/lib/gss_mechs/mech_spnego/mapfile-vers-export
 ../closed/lib/libgss/Makefile.export