--- a/src/pkg/manifests/developer%2Fopensolaris%2Fpkg5.p5m	Sun Jun 05 00:53:26 2011 +0100
+++ b/src/pkg/manifests/developer%2Fopensolaris%2Fpkg5.p5m	Sun Jun 05 00:53:41 2011 +0100
@@ -36,7 +36,7 @@
 depend fmri=pkg:/gnome/accessibility/gnome-a11y-libs type=require
 depend fmri=pkg:/library/python-2/setuptools-26 type=require
 depend fmri=pkg:/package/svr4 type=require
-depend fmri=pkg:/runtime/perl-584/extra type=require
+depend fmri=pkg:/runtime/perl-510/extra type=require
 depend fmri=pkg:/system/zones/internal type=require
 depend fmri=pkg:/text/tidy type=require
 depend fmri=pkg:/web/server/apache-22 type=require

--- a/src/pkg/manifests/group%2fsystem%2fsolaris-auto-install.p5m	Sun Jun 05 00:53:26 2011 +0100
+++ b/src/pkg/manifests/group%2fsystem%2fsolaris-auto-install.p5m	Sun Jun 05 00:53:41 2011 +0100
@@ -226,8 +226,8 @@
 depend fmri=package/svr4 type=group
 depend fmri=release/name type=group
 depend fmri=release/notices type=group
-depend fmri=runtime/perl-584 type=group
-depend fmri=runtime/perl-584/extra type=group
+depend fmri=runtime/perl-510 type=group
+depend fmri=runtime/perl-510/extra type=group
 depend fmri=runtime/python-26 type=group
 depend fmri=runtime/tcl-8 type=group
 depend fmri=runtime/tk-8 type=group

--- a/src/pkg/manifests/group%2fsystem%2fsolaris-desktop.p5m	Sun Jun 05 00:53:26 2011 +0100
+++ b/src/pkg/manifests/group%2fsystem%2fsolaris-desktop.p5m	Sun Jun 05 00:53:41 2011 +0100
@@ -492,9 +492,8 @@
 depend fmri=release/os-welcome type=group
 depend fmri=release/registration type=group
 depend fmri=runtime/java type=group
-depend fmri=runtime/perl-584 type=group
-depend fmri=runtime/perl-584/extra type=group
-depend fmri=runtime/perl-584/manual type=group
+depend fmri=runtime/perl-510 type=group
+depend fmri=runtime/perl-510/extra type=group
 depend fmri=runtime/python-26 type=group
 depend fmri=runtime/tcl-8 type=group
 depend fmri=runtime/tk-8 type=group

--- a/src/pkg/manifests/group%2fsystem%2fsolaris-large-server.p5m	Sun Jun 05 00:53:26 2011 +0100
+++ b/src/pkg/manifests/group%2fsystem%2fsolaris-large-server.p5m	Sun Jun 05 00:53:41 2011 +0100
@@ -262,9 +262,8 @@
 depend fmri=release/notices type=group
 depend fmri=release/registration type=group
 depend fmri=runtime/java type=group
-depend fmri=runtime/perl-584 type=group
-depend fmri=runtime/perl-584/extra type=group
-depend fmri=runtime/perl-584/manual type=group
+depend fmri=runtime/perl-510 type=group
+depend fmri=runtime/perl-510/extra type=group
 depend fmri=runtime/python-26 type=group
 depend fmri=runtime/tcl-8 type=group
 depend fmri=runtime/tk-8 type=group

--- a/src/pkg/manifests/group%2fsystem%2fsolaris-small-server.p5m	Sun Jun 05 00:53:26 2011 +0100
+++ b/src/pkg/manifests/group%2fsystem%2fsolaris-small-server.p5m	Sun Jun 05 00:53:41 2011 +0100
@@ -38,10 +38,10 @@
 depend fmri=compress/zip type=group
 depend fmri=developer/dtrace type=group
 depend fmri=developer/linker type=group
-depend fmri=editor/vim/vim-core type=group
+depend fmri=editor/vim type=group
 depend fmri=naming/ldap type=group
 depend fmri=network/dns/bind type=group
-depend fmri=network/ping type=group
+depend fmri=network/ftp type=group
 depend fmri=network/ssh type=group
 depend fmri=network/ssh/ssh-key type=group
 depend fmri=package/pkg type=group
@@ -55,7 +55,6 @@
 depend fmri=system/file-system/autofs type=group
 depend fmri=system/file-system/nfs type=group
 depend fmri=system/install type=group
-depend fmri=system/install/configuration type=group
 depend fmri=system/library/install type=group
 depend fmri=system/management/sysidtool type=group
 depend fmri=system/network type=group