--- a/components/a2ps/a2ps.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/a2ps/a2ps.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -341,8 +341,4 @@
 file path=usr/share/ogonkify/ptmbi-o.ps
 file path=usr/share/ogonkify/ptmr-o.ps
 file path=usr/share/ogonkify/ptmri-o.ps
-legacy pkg=SUNWa2psr desc="a2ps - GNU Any to PostScript filter (root)" \
-    name="a2ps - GNU Any to PostScript filter (root)"
-legacy pkg=SUNWa2psu desc="a2ps - GNU Any to PostScript filter (usr)" \
-    name="a2ps - GNU Any to PostScript filter (usr)"
 license a2ps.license license=GPLv3

--- a/components/ant/ant.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/ant/ant.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -1643,6 +1643,4 @@
 file path=usr/share/lib/ant/mmetrics-frames.xsl
 file path=usr/share/lib/ant/tagdiff.xsl
 file ant.1.sunman path=usr/share/man/man1/ant.1
-legacy pkg=SUNWant desc="The Jakarta ANT Java/XML-based build tool" \
-    name="Jakarta ANT"
 license ant.license license="Apache v2.0"

--- a/components/antlr/antlr.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/antlr/antlr.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -125,9 +125,6 @@
 file path=usr/share/doc/antlr-2.7.7/trees.html facet.doc.html=true
 file path=usr/share/doc/antlr-2.7.7/vocab.html facet.doc.html=true
 file antlr.1 path=usr/share/man/man1/antlr.1
-legacy pkg=SUNWantlr2 \
-    desc="ANTLR, (AN)other (T)ool for (L)anguage (R)ecognition" \
-    name="ANTLR, (AN)other (T)ool for (L)anguage (R)ecognition"
 license antlr.license license="Public Domain"
 
 # antlr-2 was previously in the 'desktop' consolidation. This optional

--- a/components/bash/bash.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/bash/bash.p5m	Mon May 01 08:43:32 2017 -0700
@@ -167,11 +167,4 @@
 file path=usr/share/man/man1/bashbug.1
 file rbash.1 path=usr/share/man/man1/rbash.1
 #
-legacy pkg=SUNWbash desc="GNU Bourne-Again shell (bash) version 4.2" \
-    name="GNU Bourne-Again shell (bash)"
-legacy pkg=SUNWbashr \
-    desc="GNU Bourne-Again shell (bash) version 4.2  (root package)" \
-    name="GNU Bourne-Again shell (bash) (root)"
-#
 license bash.license license="GPLv3, FDLv1.3"
-

--- a/components/bind/bind.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/bind/bind.p5m	Mon May 01 08:43:32 2017 -0700
@@ -73,8 +73,4 @@
 file path=usr/sbin/pkcs11-tokens
 file path=usr/sbin/rndc-confgen
 link path=usr/sbin/tsig-keygen target=ddns-confgen
-legacy pkg=SUNWbind desc="BIND DNS Name server" name="BIND DNS Name server"
-legacy pkg=SUNWbindr desc="BIND Name server Manifest" \
-    name="BIND Name server Manifest"
 license bind.license license="ISC license"
-

--- a/components/binutils/binutils.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/binutils/binutils.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.*$ -> default mangler.man.stability uncommitted>
 <transform link path=usr/bin/g.* -> default facet.compat.gnulinks true>
@@ -438,6 +438,4 @@
     target=../../../gnu/share/man/man1/strings.1
 link path=usr/share/man/man1/gstrip.1 \
     target=../../../gnu/share/man/man1/gstrip.1
-legacy pkg=SUNWbinutils desc="GNU binutils - Binary file utilities" \
-    name="binutils - GNU binutils"
 license binutils.license license="GPLv3, FDLv1.3"

--- a/components/bison/bison.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/bison/bison.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability "pass-through volatile">
@@ -107,8 +107,6 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/bison.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/bison.mo
 file path=usr/share/man/man1/bison.1
-legacy pkg=SUNWbison desc="GNU bison - A YACC Replacement" \
-    name="bison - A YACC Replacement"
 
 
 license bison.license license="GPLv3, FDLv1.3"

--- a/components/bzip2/bzip2.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/bzip2/bzip2.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -69,6 +69,4 @@
 file path=usr/share/man/man1/bzless.1
 file manpages/bzmore.1 path=usr/share/man/man1/bzmore.1
 file manpages/libbz2.3 path=usr/share/man/man3/libbz2.3
-legacy pkg=SUNWbzip desc="The bzip compression utility" \
-    name="The bzip compression utility"
 license bzip2.license license="bzip2 license"

--- a/components/cdrtools/cdrtools.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/cdrtools/cdrtools.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -98,5 +98,4 @@
 file path=usr/share/man/man8/mkisofs.8
 
 
-legacy pkg=SUNWmkcd desc="CD creation utilities" name="CD creation utilities"
 license cdrtools.license license="CDDLv1.0, GPLv2, LGPLv2.1, BSD 2 clause"

--- a/components/common/gcmn.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/common/gcmn.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -38,6 +38,3 @@
 dir  path=usr/sfw/share/man
 dir  path=usr/sfw/share/src
 link path=usr/sfw/src target=share/src
-
-
-legacy pkg=SUNWgcmn desc="Common GNU package" name="gcmn - Common GNU package"

--- a/components/flex/flex.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/flex/flex.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability "pass-through volatile">
@@ -64,7 +64,5 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/flex.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/flex.mo
 file path=usr/share/man/man1/flex.1
-legacy pkg=SUNWflexlex desc="The Flex Lexer - A lex replacement/substitute" \
-    name="Flex Lexer"
 license COPYING license=BSD
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/gnu/bin/m4

--- a/components/foomatic/filters/foomatic-rip.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/foomatic/filters/foomatic-rip.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -39,11 +39,5 @@
 file usr/bin/foomatic-rip path=usr/lib/cups/filter/foomatic-rip mode=0555
 file path=usr/share/man/man1/foomatic-rip.1
 #
-legacy pkg=SUNWffiltersr \
-    desc="foomatic-filters - Foomatic Print Filters (root)" \
-    name="foomatic-filters - Foomatic Print Filters (root)"
-legacy pkg=SUNWffiltersu \
-    desc="foomatic-filters - Foomatic Print Filters (user)" \
-    name="foomatic-filters - Foomatic Print Filters (user)"
 license COPYING license=GPLv2
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/a2ps

--- a/components/foomatic/fppd/foomatic-ppds.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/foomatic/fppd/foomatic-ppds.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -4206,6 +4206,4 @@
 file path=usr/share/ppd/SUNWfoomatic/Xerox/Xerox-WorkCentre_Pro_128-Postscript.ppd.gz
 file path=usr/share/ppd/SUNWfoomatic/Xerox/Xerox-WorkCentre_Pro_133-Postscript.ppd.gz
 file path=usr/share/ppd/SUNWfoomatic/Xerox/Xerox-WorkCentre_XK35c-lex5700.ppd.gz
-legacy pkg=SUNWfppd desc="foomatic_ppds - Foomatic Print PPDs" \
-    name="foomatic_ppds - Foomatic Print PPDs"
 license COPYING license=GPLv2

--- a/components/gcc3/gcc-3-runtime.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/gcc3/gcc-3-runtime.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 # All libraries directly installed under /usr/gcc/3.4/lib should have
@@ -70,8 +70,4 @@
 #
 link path=usr/sfw/lib/64 target=$(MACH64)
 #
-legacy pkg=SUNWgccruntime \
-    desc="GCC Runtime - Shared libraries used by gcc and other gnu components" \
-    name="GCC Runtime libraries"
-#
 license gcc.license license=GPLv2

--- a/components/gcc3/gcc-3.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/gcc3/gcc-3.p5m	Mon May 01 08:43:32 2017 -0700
@@ -463,8 +463,6 @@
     mediator-version=3.4
 file usr/gcc/3.4/share/info/dir path=var/info/usr_gcc_3.4_share_info_dir \
     mode=0644 preserve=true
-legacy pkg=SUNWgcc desc="GNU C - The GNU C compiler" \
-    name="gcc - The GNU C compiler"
 license gcc.license license=GPLv2
 
 # gcc 3.4.3 on x86 uses the CRT files in /usr/lib plus the GNU assembler,

--- a/components/ggrep/gnu-grep.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/ggrep/gnu-grep.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -100,6 +100,4 @@
 link path=usr/share/man/man1/ggrep.1 target=../../../gnu/share/man/man1/grep.1 \
     facet.compat.gnulinks=all
 #
-legacy pkg=SUNWggrp desc="ggrep - GNU grep utilities" \
-    name="ggrep - GNU grep utilities"
 license gnu-grep.license license="GPLv3, FDLv1.3"

--- a/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/gnu-gs-fonts-other/gnu-gs-fonts-other.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 set name=pkg.fmri \
     value=pkg:/print/filter/ghostscript/fonts/gnu-gs-fonts-other@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -91,6 +91,4 @@
 file path=usr/share/ghostscript/fonts/u004006t.afm
 file path=usr/share/ghostscript/fonts/u004006t.gsf
 file path=usr/share/ghostscript/fonts/u004006t.pfm
-legacy pkg=SUNWgsfot desc="GNU Ghostscript Fonts (Other)" \
-    name="GNU Ghostscript Fonts (Other)"
 license gnu-gs-fonts-other.license license=GPLv2

--- a/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/gnu-gs-fonts-std/gnu-gs-fonts-std.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -139,6 +139,4 @@
 file path=usr/share/ghostscript/fonts/z003034l.afm
 file path=usr/share/ghostscript/fonts/z003034l.pfb
 file path=usr/share/ghostscript/fonts/z003034l.pfm
-legacy pkg=SUNWgsfst desc="GNU Ghostscript Fonts (Standard)" \
-    name="GNU Ghostscript Fonts (Standard)"
 license gnu-gs-fonts-std.license license=GPLv2

--- a/components/gpatch/patch.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/gpatch/patch.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -39,5 +39,4 @@
 link path=usr/share/man/man1/gpatch.1 \
     target=../../../gnu/share/man/man1/patch.1 facet.compat.gnulinks=all
 link path=usr/share/man/man1/patch.1 target=../../../gnu/share/man/man1/patch.1
-legacy pkg=SUNWgpch desc="The GNU Patch utility" name="The GNU Patch utility"
 license patch.license license=GPLv3

--- a/components/gtar/gtar.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/gtar/gtar.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
@@ -81,9 +81,6 @@
 file path=usr/share/locale/zh_TW/LC_MESSAGES/tar.mo
 link path=usr/share/man/man1/gtar.1 target=../../../gnu/share/man/man1/tar.1 \
     facet.compat.gnulinks=all
-legacy pkg=SUNWgtar \
-    desc="GNU tar - A utility used to store, backup, and transport files (gtar)" \
-    name="gtar - GNU tar"
 license gtar.license license="GPLv3, FDLv1.3"
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/bzip2
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/bin/compress

--- a/components/gutenprint/gutenprint.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/gutenprint/gutenprint.p5m	Mon May 01 08:43:32 2017 -0700
@@ -381,7 +381,4 @@
 file path=usr/share/man/man8/cups-calibrate.8
 file path=usr/share/man/man8/cups-genppd.8
 file path=usr/share/man/man8/cups-genppdupdate.8
-legacy pkg=SUNWgimpprint \
-    desc="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers" \
-    name="gutenprint - Drivers for Canon, Epson, Lexmark & PCL printers"
 license gutenprint.license license="GPLv2, FDLv1.2"

--- a/components/gzip/gzip.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/gzip/gzip.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -61,8 +61,6 @@
 file path=usr/share/man/man1/gzless.1
 file path=usr/share/man/man1/gzmore.1
 file path=usr/share/man/man1/gznew.1
-legacy pkg=SUNWgzip desc="The GNU Zip (gzip) compression utility" \
-    name="The GNU Zip (gzip) compression utility"
 license gzip.license license="GPLv3, FDLv1.3"
 
 # znew requires python, see patches/znew.patch for details

--- a/components/hplip/hplip.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/hplip/hplip.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 # hplip install its PYTHON modules into usr/share/hplip so it brings problems:
@@ -47,8 +47,6 @@
 file path=usr/share/hplip/installer/pluginhandler.py
 file path=usr/share/hplip/toolbox.py
 #
-legacy pkg=SUNWhpijs desc="hpijs - HP InkJet Server" \
-    name="hpijs - HP InkJet Server"
 license COPYING license="GPLv2 BSD MIT"
 depend type=require fmri=pkg:/library/python/pygobject-27
 depend type=require fmri=pkg:/print/filter/hplip-core

--- a/components/imagemagick/imagemagick.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/imagemagick/imagemagick.p5m	Mon May 01 08:43:32 2017 -0700
@@ -1609,12 +1609,7 @@
 file path=usr/share/man/man1/mogrify.1
 file path=usr/share/man/man1/montage.1
 file path=usr/share/man/man1/stream.1
-
-# Legacy
 #
-legacy pkg=SUNWimagick \
-    desc="ImageMagick - Image Manipulation Utilities and Libraries" \
-    name="ImageMagick - Image Manipulation Utilities and Libraries"
 license LICENSE license="Apache 2.0 license"
 license imagemagick.copyrights license="ImageMagick copyrights"
 

--- a/components/ksh93/developer-astdev93.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/ksh93/developer-astdev93.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 # The man pages are all at the top of a "files" directory; setting the hash to
@@ -54,8 +54,6 @@
 file path=usr/share/man/man1/msgcvt.1
 file path=usr/share/man/man1/msggen.1
 file path=usr/share/man/man1/msgget.1
-legacy pkg=SUNWastdev desc="AT&T AST development utilities" \
-    name="AT&T AST development utilities"
 license ksh93.license license=EPL1.0
 # Ensure that we upgrade the old package to the version where it's
 # renamed.

--- a/components/less/less.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/less/less.p5m	Mon May 01 08:43:32 2017 -0700
@@ -41,5 +41,4 @@
 file path=usr/share/man/man1/less.1
 file path=usr/share/man/man1/lessecho.1
 file path=usr/share/man/man1/lesskey.1
-legacy pkg=SUNWless desc="The GNU pager (less)" name="The GNU pager (less)"
 license LICENSE license="Less License"

--- a/components/libexpat/expat.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/libexpat/expat.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -47,6 +47,4 @@
 link path=usr/lib/libexpat.so.1 target=libexpat.so.1.6.2
 file path=usr/lib/libexpat.so.1.6.2
 file path=usr/lib/pkgconfig/expat.pc
-legacy pkg=SUNWlexpt desc="libexpat - XML parser library" \
-    name="libexpat - XML parser library"
 license COPYING license="expat license"

--- a/components/libtecla/libtecla.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/libtecla/libtecla.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 # The man pages are all at the top of a "files" directory; setting the hash to
@@ -139,6 +139,4 @@
 file path=usr/share/man/man7/tecla.7
 file path=usr/share/man/man7/teclarc.7
 file enhance.1.zh_CN.UTF-8 path=usr/share/man/zh_CN.UTF-8/man1/enhance.1
-legacy pkg=SUNWtecla desc="Tecla command-line editing library" \
-    name="Tecla command-line editing library"
 license libtecla.license license=MIT-like

--- a/components/libusb/ugen/libusbugen.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/libusb/ugen/libusbugen.p5m	Mon May 01 08:43:32 2017 -0700
@@ -37,6 +37,4 @@
 link path=usr/lib/libusb_plugins/64 target=$(MACH64)
 link path=usr/lib/libusb_plugins/libusbugen.so target=libusbugen.so.1
 file $(MACH32)/libusbugen.so.1 path=usr/lib/libusb_plugins/libusbugen.so.1
-legacy pkg=SUNWlibusbugen desc="libusb - User level usb ugen library" \
-    name="SUN libusb ugen plugin"
 license libusbugen.license license=CDDL

--- a/components/libusb/wrapper/libusb.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/libusb/wrapper/libusb.p5m	Mon May 01 08:43:32 2017 -0700
@@ -47,7 +47,5 @@
 # This page is pre-Solarified, so no mangling needed.
 $(SOLARIS_11_4_ONLY)file libusb.3lib path=usr/share/man/man3lib/libusb.3lib \
     $(SOLARIS_11_4_ONLY)mangler.bypass=true
-legacy pkg=SUNWlibusb desc="Sun wrapper library for libusb" \
-    name="Sun wrapper library for libusb"
 license libusb.license license=BSD
 depend type=require fmri=system/library/usb/libusbugen

--- a/components/libxml2/libxml2.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/libxml2/libxml2.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -108,7 +108,6 @@
 file path=usr/share/man/man1/xmllint.1
 file path=usr/share/man/man3/libxml.3
 file libxml2.3 path=usr/share/man/man3/libxml2.3
-legacy pkg=SUNWlxml desc="The XML library" name="The XML library"
 license libxml2.license license="libxml license"
 depend type=conditional \
     fmri=library/python/libxml2-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \

--- a/components/libxslt/libxslt.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/libxslt/libxslt.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -173,7 +173,6 @@
 file path=usr/share/man/man1/xsltproc.1
 file path=usr/share/man/man3/libexslt.3
 file path=usr/share/man/man3/libxslt.3
-legacy pkg=SUNWlxsl desc="The XSLT library" name="The XSLT library"
 license xsl.license license=SUNWlxsl.copyright
 depend type=conditional \
     fmri=library/python/libxsl-27@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) \

--- a/components/m4/m4.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/m4/m4.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -45,5 +45,4 @@
 file path=usr/share/info/m4.info-2
 link path=usr/share/man/man1/gm4.1 target=../../../gnu/share/man/man1/m4.1 \
     facet.compat.gnulinks=all
-legacy pkg=SUNWgm4 desc="GNU m4 - A macro processor (gm4)" name="GNU m4"
 license m4.license license="GPLv3, FDLv1.3"

--- a/components/make/make.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/make/make.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -73,7 +73,4 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/make.mo
 link path=usr/share/man/man1/gmake.1 target=../../../gnu/share/man/man1/make.1 \
     facet.compat.gnulinks=all
-legacy pkg=SUNWgmake \
-    desc="GNU make - A utility used to build software (gmake)" \
-    name="gmake - GNU make"
 license make.license license="GPLv3, FDLv1.3"

--- a/components/mrtg/mrtg.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/mrtg/mrtg.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -124,6 +124,4 @@
 file path=usr/share/mrtg2/icons/mrtg-r.png
 file path=usr/share/mrtg2/icons/mrtg-ti.gif
 file path=usr/share/mrtg2/icons/mrtg-ti.png
-legacy pkg=SUNWmrtg desc="mrtg - The Multi Router Traffic Grapher (2.16.2)" \
-    name="mrtg - The Multi Router Traffic Grapher"
 license mrtg.license license="GPLv2+, Artistic"

--- a/components/ntp/ntp.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/ntp/ntp.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr/share/doc/ntp/(.+$) -> set action.hash html/%<1> >
@@ -294,10 +294,4 @@
 file scripts/lib/NTP/Util.pm path=usr/share/ntp/lib/NTP/Util.pm
 dir  path=var/ntp owner=daemon group=daemon
 dir  path=var/ntp/ntpstats owner=daemon group=daemon
-legacy pkg=SUNWntpr \
-    desc="Network Time Protocol v4, NTP Daemon and Utilities (root)" \
-    name="Network Time Protocol Daemon v4 (root)"
-legacy pkg=SUNWntpu \
-    desc="Network Time Protocol v4, NTP Daemon and Utilities (usr)" \
-    name="Network Time Protocol Daemon v4 (usr)"
 license ntp.license license="ntp license"

--- a/components/open-fabrics/open-fabrics.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/open-fabrics/open-fabrics.p5m	Mon May 01 08:43:32 2017 -0700
@@ -400,9 +400,6 @@
 file path=usr/share/man/man8/smpquery.8
 
 
-legacy pkg=SUNWofusr \
-    desc="Oracle Solaris OpenFabrics userland libraries and applications" \
-    name="Oracle Solaris OpenFabrics userland libraries and applications"
 license libsif/libsif.license license=BSD3 \
     com.oracle.info.description="The OpenFabrics Verbs support for Oracle SIF Driver" \
     com.oracle.info.name=libsif \

--- a/components/openssh/network-ssh.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/openssh/network-ssh.p5m	Mon May 01 08:43:32 2017 -0700
@@ -54,14 +54,6 @@
 file path=usr/share/man/man1/ssh-keyscan.1 mode=0444
 file path=usr/share/man/man1/ssh.1 mode=0444
 file path=usr/share/man/man5/ssh_config.5
-legacy pkg=SUNWsshcu desc="Secure Shell protocol common Utilities" \
-    name="SSH Common, (Usr)"
-legacy pkg=SUNWsshr \
-    desc="Secure Shell protocol Client and associated Utilities" \
-    name="SSH Client and utilities, (Root)"
-legacy pkg=SUNWsshu \
-    desc="Secure Shell protocol Client and associated Utilities" \
-    name="SSH Client and utilities, (Usr)"
 license openssh.license license="BSD, BSD-like (OpenSSH)" \
     com.oracle.info.description="OpenSSH, a suite of tools that help secure network connections" \
     com.oracle.info.name=openssh com.oracle.info.tpno=$(TPNO_OPENSSH) \

--- a/components/openssh/service-network-ssh.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/openssh/service-network-ssh.p5m	Mon May 01 08:43:32 2017 -0700
@@ -67,10 +67,6 @@
 group groupname=sshd gid=22
 user username=sshd ftpuser=false gcos-field="sshd privsep" group=sshd \
     home-dir=/var/empty login-shell=/bin/false uid=22
-legacy pkg=SUNWsshdr desc="Secure Shell protocol Server" \
-    name="SSH Server, (Root)"
-legacy pkg=SUNWsshdu desc="Secure Shell protocol Server" \
-    name="SSH Server, (Usr)"
 license openssh.license license="BSD, BSD-like (OpenSSH)" \
     com.oracle.info.description="OpenSSH, a suite of tools that help secure network connections" \
     com.oracle.info.name=openssh com.oracle.info.tpno=$(TPNO_OPENSSH) \

--- a/components/openssl/openssl-default/openssl-default.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/openssl/openssl-default/openssl-default.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability "pass-through uncommitted">
@@ -2227,8 +2227,6 @@
 # openssl.7 is pre-Solarified, so bypass the mangler.
 file files/openssl.7 path=usr/share/man/man7/openssl.7 mangler.bypass=true
 file path=usr/share/man/man7openssl/des_modes.7openssl
-legacy pkg=SUNWopensslr desc="OpenSSL Libraries (Root)" \
-    name="OpenSSL Libraries (Root)"
 license openssl-default.license license="OpenSSL, SSLeay"
 # force a dependency on the Perl runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=perl \

--- a/components/perl_modules/xml-parser/xml-parser-GENFRAG.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/perl_modules/xml-parser/xml-parser-GENFRAG.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,12 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 # force the perl version agnostic package to component version 5.12.1 because
 # the desktop delivered it at that version instead of the component version
 <transform set name=pkg.fmri value=(pkg:/library/perl-5/xml-parser)@$(IPS_COMPONENT_VERSION),($(BUILD_VERSION)$) -> set value %<1>@5.12.1,%<2> >
-legacy pkg=SUNWperl-xml-parser \
-    desc="Perl XML::Parser and XML::Simple PERL modules - development files" \
-    name="Perl XML::Parser and XML::Simple PERL modules"

--- a/components/procmail/procmail.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/procmail/procmail.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -66,8 +66,6 @@
 file path=usr/share/man/man5/procmailex.5
 file path=usr/share/man/man5/procmailrc.5
 file path=usr/share/man/man5/procmailsc.5
-legacy pkg=SUNWprocmail desc="Procmail Mail Processing Program" \
-    name="Procmail Mail Processing Program"
 license procmail.license license="GPLv2+ or Artistic"
 # procmail was previously in the 'desktop' consolidation. This optional
 # dependency is here to facilitate the safe transfer of the package

--- a/components/proftpd/proftpd.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/proftpd/proftpd.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 # PSARC/2011/088
@@ -207,7 +207,6 @@
 user username=ftp ftpuser=false gcos-field="FTPD Reserved UID" group=ftp uid=21
 #
 # pkg meta
-legacy pkg=SUNWftpu desc="FTP Server and Utilities" name="FTP Server, (Usr)"
 license proftpd.license license="GPLv2 (mod_gss)" \
     com.oracle.info.description="the ProFPTD GSS Engine" \
     com.oracle.info.name=mod_gss com.oracle.info.tpno=$(TPNO_MOD_GSS) \

--- a/components/psutils/psutils.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/psutils/psutils.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
 set name=pkg.fmri \
@@ -77,6 +77,4 @@
 file path=usr/share/man/man1/pstops.1
 file path=usr/share/psutils/md68_0.ps
 file path=usr/share/psutils/md71_0.ps
-legacy pkg=SUNWpsutils desc="psutils - PostScript utilities" \
-    name="psutils - PostScript utilities"
 license psutils.license license="psutils license"

--- a/components/python/setuptools/setuptools-GENFRAG.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/python/setuptools/setuptools-GENFRAG.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,13 +18,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
-legacy pkg=SUNWpython-setuptools \
-    desc="Download, build, install, upgrade, and uninstall Python packages easily" \
-    name=setuptools
-
 # force the rename with an optional dependency on the old name
 depend type=optional \
     fmri=library/python-2/[email protected],5.12-5.12.0.0.0.41.0

--- a/components/rpm2cpio/rpm2cpio.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/rpm2cpio/rpm2cpio.p5m	Mon May 01 08:43:32 2017 -0700
@@ -37,6 +37,4 @@
 set name=org.opensolaris.arc-caseid value=PSARC/1999/555
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 file rpm2cpio.pl path=usr/bin/rpm2cpio
-legacy pkg=SUNWrpm desc="Utilities for processing RPM archives" \
-    name="Utilities for processing RPM archives"
 license rpm2cpio.license license=BSD-like

--- a/components/rsync/rsync.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/rsync/rsync.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -42,8 +42,4 @@
 file path=usr/share/man/man1/rsync.1
 file path=usr/share/man/man5/rsyncd.conf.5
 #
-legacy pkg=SUNWrsync \
-    desc="rsync - A utility that provides fast incremental file transfer and copy." \
-    name="rsync - faster, flexible replacement for rcp"
-#
 license rsync.license license="GPLv3, Zlib"

--- a/components/samba/samba.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/samba/samba.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -198,12 +198,6 @@
 dir  path=var/spool/samba mode=1777
 
 #
-legacy pkg=SUNWsmbar \
-    desc="samba - A Windows SMB/CIFS fileserver for UNIX (Root)" \
-    name="samba - A Windows SMB/CIFS fileserver for UNIX (Root)"
-legacy pkg=SUNWsmbau \
-    desc="samba - A Windows SMB/CIFS fileserver for UNIX (Usr)" \
-    name="samba - A Windows SMB/CIFS fileserver for UNIX (Usr)"
 license samba.license license=GPLv3
 
 # Samba can be used in Asian multibyte language envs. so we need this

--- a/components/sendmail/sendmail.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/sendmail/sendmail.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 # The man pages are all at the top of a "files" directory; set the hash to
@@ -215,8 +215,6 @@
 user username=smmsp ftpuser=false \
     gcos-field="SendMail Message Submission Program" group=smmsp home-dir=/ \
     password=NP uid=25
-legacy pkg=SUNWsndmr desc="Sendmail Configuration Files" name="Sendmail (root)"
-legacy pkg=SUNWsndmu desc="Sendmail Utilities" name="Sendmail (/usr)"
 license LICENSE license=sendmail
 # sendmail's default LDA is mail.local, so specify a dependency on its
 # package, but not at any particular version.

--- a/components/sg3_utils/sg3_utils.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/sg3_utils/sg3_utils.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
@@ -128,12 +128,6 @@
 file path=usr/share/man/man8/sg_write_buffer.8
 file path=usr/share/man/man8/sg_write_long.8
 file path=usr/share/man/man8/sg_write_same.8
-legacy pkg=SUNWsg3utilsr \
-    desc="sg3 - package of utilities for sending SCSI commands 1.26 (root)" \
-    name="sg3_utils - a package of utilities for sending SCSI commands (root)"
-legacy pkg=SUNWsg3utilsu \
-    desc="sg3 - package of utilities for sending SCSI commands 1.26 (usr)" \
-    name="sg3_utils - a package of utilities for sending SCSI commands (usr)"
 license sg3_utils.license license="GPLv2+ and BSD"
 
 # sg3_utils was previously in the 'desktop' consolidation. This optional

--- a/components/stdcxx/stdcxx.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/stdcxx/stdcxx.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
 <transform dir file link hardlink path=usr/share/stdcxx4/.* -> \
@@ -2133,7 +2133,4 @@
 file path=usr/share/stdcxx4/locale/zh_TW.EUC-TW/LC_NUMERIC
 file path=usr/share/stdcxx4/locale/zh_TW.EUC-TW/LC_TIME
 #
-legacy pkg=SUNWlibstdcxx4 desc="The Apache Standard C++ Library" \
-    name="Apache Standard C++ Library"
-#
 license stdcxx.license license="Apache v2.0"

--- a/components/tcl/tcl/tcl.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/tcl/tcl/tcl.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
@@ -1276,6 +1276,4 @@
 link path=usr/share/man/man3tcl/ckalloc.3tcl target=Tcl_Alloc.3tcl
 link path=usr/share/man/man3tcl/ckfree.3tcl target=Tcl_Alloc.3tcl
 link path=usr/share/man/man3tcl/ckrealloc.3tcl target=Tcl_Alloc.3tcl
-legacy pkg=SUNWTcl desc="Tcl - Tool Command Language" \
-    name="Tcl - Tool Command Language"
 license tcl.license license=BSD-like

--- a/components/tcl/tk/tk.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/tcl/tk/tk.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 <transform file path=usr.*/man/.+ -> default mangler.man.stability uncommitted>
 set name=pkg.fmri \
@@ -676,6 +676,4 @@
 link path=usr/share/man/man3tk/Ttk_RelievePadding.3tk target=Ttk_MakeBox.3tk
 link path=usr/share/man/man3tk/Ttk_StickBox.3tk target=Ttk_MakeBox.3tk
 link path=usr/share/man/man3tk/Ttk_UniformPadding.3tk target=Ttk_MakeBox.3tk
-legacy pkg=SUNWTk desc="Tk - TCL GUI Toolkit" name="Tk - TCL GUI Toolkit"
 license tk.license license=BSD-like
-

--- a/components/texinfo/texinfo.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/texinfo/texinfo.p5m	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 # Note for the next texinfo maintainer:
 # if "file path=usr/lib/$(MACH64)/charset.alias" is in your texinfo.p5m file,
@@ -502,8 +502,6 @@
 file path=usr/share/texinfo/texindex.awk
 file path=usr/share/texinfo/texinfo.dtd
 file usr/share/info/dir path=var/info/usr_share_info_dir mode=0644 preserve=true
-legacy pkg=SUNWtexi desc="GNU texinfo (texinfo)" \
-    name="GNU texinfo - Texinfo utilities (texinfo)"
 license FDLv1.3 license=FDLv1.3 \
     com.oracle.info.description="the GNU documentation system" \
     com.oracle.info.name=texinfo com.oracle.info.tpno=$(TPNO_TEXINFO)

--- a/components/wget/wget.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/wget/wget.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -79,7 +79,4 @@
 file path=usr/share/locale/zh_CN/LC_MESSAGES/wget.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/wget.mo
 file path=usr/share/man/man1/wget.1
-legacy pkg=SUNWwget \
-    desc="GNU wget - a utility to retrieve files from the World Wide Web" \
-    name="wget - GNU wget"
 license wget.license license="GPLv3, FDLv1.3"

--- a/components/zip/zip.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/zip/zip.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -42,6 +42,4 @@
 file path=usr/share/man/man1/zipcloak.1
 file path=usr/share/man/man1/zipnote.1
 file path=usr/share/man/man1/zipsplit.1
-legacy pkg=SUNWzip desc="The Info-Zip (zip) compression utility" \
-    name="The Info-Zip (zip) compression utility"
 license info-zip.license license=Info-ZIP

--- a/components/zlib/zlib.p5m	Wed Apr 19 21:56:10 2017 +0000
+++ b/components/zlib/zlib.p5m	Mon May 01 08:43:32 2017 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability committed>
@@ -54,7 +54,4 @@
 file usr/share/man/man3/zlib.3 path=usr/share/man/man3/libz.3
 file zlib.3.sunman path=usr/share/man/man3/zlib.3
 #
-legacy pkg=SUNWzlib desc="The Zip compression library" \
-    name="The Zip compression library"
-#
 license zlib.license license="zlib license"

--- a/tools/python/pkglint/userland.py	Wed Apr 19 21:56:10 2017 +0000
+++ b/tools/python/pkglint/userland.py	Mon May 01 08:43:32 2017 -0700
@@ -21,7 +21,7 @@
 #
 
 #
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 # Some userland consolidation specific lint checks
@@ -458,6 +458,17 @@
 
 	file_action.pkglint_desc = _("Paths should exist in the proto area.")
 
+	def legacy_action(self, action, manifest, engine, pkglint_id="005"):
+		"""Checks for deprecated legacy actions."""
+
+		if action.name not in ["legacy"]:
+			return
+
+		engine.error(_("legacy actions are deprecated"),
+			msgid="%s%s.0" % (self.name, pkglint_id))
+
+	legacy_action.pkglint_desc = _("legacy actions are deprecated.")
+
 	def link_resolves(self, action, manifest, engine, pkglint_id="002"):
 		"""Checks for link resolution."""
 

--- a/transforms/defaults	Wed Apr 19 21:56:10 2017 +0000
+++ b/transforms/defaults	Mon May 01 08:43:32 2017 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 
 #
@@ -69,18 +69,6 @@
 set name=com.oracle.info.consolidation.repository-url \
     value="$(CONSOLIDATION_REPOSITORY_URL)"
 
-
-#
-# Defaults for legacy metadata for SVR4 package information
-#
-<transform legacy -> default vendor "Oracle Corporation">
-<transform legacy -> default hotline \
-	"Please contact your local service provider">
-<transform legacy -> default arch $(MACH)>
-<transform legacy -> default category "system">
-# This is set to the final version number delivered as SVR4 format
-<transform legacy -> default version "11.11.0,REV=2010.05.25.01.00">
-
 #
 # Set the default Python for mediated links
 #