5166 sendmail package should be replaceable

@@ -54,10 +54,12 @@
 dir path=usr/lib
 dir path=usr/lib/help
 dir path=usr/lib/help/auths
 dir path=usr/lib/help/auths/locale
 dir path=usr/lib/help/auths/locale/C
+dir path=usr/lib/smtp
+dir path=usr/lib/smtp/sendmail
 dir path=usr/sbin
 dir path=usr/share/man
 dir path=usr/share/man/man1
 dir path=usr/share/man/man1m
 dir path=usr/share/man/man4

@@ -165,11 +167,10 @@
 file path=lib/svc/manifest/network/smtp-sendmail.xml group=sys mode=0444
 file path=lib/svc/method/sendmail-client mode=0555
 file path=lib/svc/method/smtp-sendmail mode=0555
 file path=lib/svc/share/sendmail_include.sh mode=0444
 file path=usr/bin/mailcompat mode=0555
-file path=usr/bin/mailq mode=4555
 file path=usr/bin/mailstats mode=0555
 file path=usr/bin/mconnect mode=0555
 file path=usr/bin/praliases mode=0555
 file path=usr/bin/vacation mode=0555
 file path=usr/include/libmilter/README

@@ -179,12 +180,13 @@
 file path=usr/lib/help/auths/locale/C/MailQueue.html
 file path=usr/lib/libmilter.so.1
 file path=usr/lib/llib-lmilter
 file path=usr/lib/llib-lmilter.ln
 file path=usr/lib/mail.local mode=0555
-file path=usr/lib/sendmail group=smmsp mode=2555
 file path=usr/lib/smrsh mode=0555
+file path=usr/lib/smtp/sendmail/mailq mode=4555
+file path=usr/lib/smtp/sendmail/sendmail group=smmsp mode=2555
 file path=usr/sbin/check-hostname group=mail mode=0555
 file path=usr/sbin/check-permissions group=mail mode=0555
 file path=usr/sbin/editmap mode=0555
 file path=usr/sbin/etrn mode=0555
 file path=usr/sbin/makemap mode=0555

@@ -210,11 +212,12 @@
 legacy pkg=SUNWsndmu desc="Sendmail Utilities" name="Sendmail (/usr)"
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 license usr/src/cmd/sendmail/THIRDPARTYLICENSE \
     license=usr/src/cmd/sendmail/THIRDPARTYLICENSE
-link path=etc/aliases target=./mail/aliases
+link path=etc/aliases mediator=mta mediator-implementation=sendmail \
+    target=./mail/aliases
 link path=etc/mail/cf/cf/main.cf target=sendmail.cf
 link path=etc/mail/cf/cf/main.mc target=sendmail.mc
 link path=etc/mail/cf/cf/subsidiary.cf target=sendmail.cf
 link path=etc/mail/cf/cf/subsidiary.mc target=sendmail.mc
 link path=etc/mail/cf/sh/check-hostname \

@@ -222,14 +225,21 @@
 link path=etc/mail/cf/sh/check-permissions \
     target=../../../../usr/sbin/check-permissions
 link path=etc/mail/main.cf target=sendmail.cf
 link path=etc/mail/sendmail.hf target=helpfile
 link path=etc/mail/subsidiary.cf target=sendmail.cf
+link path=usr/bin/mailq mediator=mta mediator-implementation=sendmail \
+    target=../lib/smtp/sendmail/mailq
 link path=usr/lib/libmilter.so target=libmilter.so.1
 link path=usr/lib/mail target=../../etc/mail/cf
-link path=usr/sbin/newaliases target=../lib/sendmail
-link path=usr/sbin/sendmail target=../lib/sendmail
+link path=usr/lib/sendmail mediator=mta mediator-implementation=sendmail \
+    target=../lib/smtp/sendmail/sendmail
+link path=usr/lib/smtp/sendmail/newaliases target=sendmail
+link path=usr/sbin/newaliases mediator=mta mediator-implementation=sendmail \
+    target=../lib/smtp/sendmail/newaliases
+link path=usr/sbin/sendmail mediator=mta mediator-implementation=sendmail \
+    target=../lib/smtp/sendmail/sendmail
 link path=usr/share/man/man4/addresses.4 target=aliases.4
 link path=usr/share/man/man4/forward.4 target=aliases.4
 link path=usr/share/man/man4/sendmail.cf.4 target=sendmail.4
 link path=usr/share/man/man4/submit.cf.4 target=sendmail.4
 depend fmri=runtime/perl$(PERL_PKGVERS) type=require