Change the service_bundle name to "export" to reduce diffs between the

original manifest.xml file and the output from "svccfg export".

47 files changed, 48 insertions, 48 deletions

diff --git a/chat/prosody/files/smf/manifest.xml b/chat/prosody/files/smf/manifest.xml
index 4c21f47007e..10795ff16fe 100644
--- a/chat/prosody/files/smf/manifest.xml
+++ b/chat/prosody/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/chat/spectrum/files/smf/manifest.xml b/chat/spectrum/files/smf/manifest.xml
index 7fbe9636f09..f0e734b6a79 100644
--- a/chat/spectrum/files/smf/manifest.xml
+++ b/chat/spectrum/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <dependency name="network" grouping="require_all" restart_on="error" type="service">
       <service_fmri value="svc:/milestone/network:default" />
diff --git a/chat/unrealircd/files/smf/manifest.xml b/chat/unrealircd/files/smf/manifest.xml
index 860cfd0cbf7..1f6e474aef8 100644
--- a/chat/unrealircd/files/smf/manifest.xml
+++ b/chat/unrealircd/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/comms/asterisk/files/smf/manifest.xml b/comms/asterisk/files/smf/manifest.xml
index c864833cac6..d7815b331b1 100644
--- a/comms/asterisk/files/smf/manifest.xml
+++ b/comms/asterisk/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/comms/asterisk13/files/smf/manifest.xml b/comms/asterisk13/files/smf/manifest.xml
index c864833cac6..d7815b331b1 100644
--- a/comms/asterisk13/files/smf/manifest.xml
+++ b/comms/asterisk13/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/databases/apache-cassandra/files/smf/manifest.xml b/databases/apache-cassandra/files/smf/manifest.xml
index b94c96aeb4b..03bf0be493c 100644
--- a/databases/apache-cassandra/files/smf/manifest.xml
+++ b/databases/apache-cassandra/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/databases/couchdb/files/smf/manifest.xml b/databases/couchdb/files/smf/manifest.xml
index a65ea028553..ef194fff391 100644
--- a/databases/couchdb/files/smf/manifest.xml
+++ b/databases/couchdb/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/databases/pgbouncer/files/smf/manifest.xml b/databases/pgbouncer/files/smf/manifest.xml
index b54484f11d7..cb69a2a9ff1 100644
--- a/databases/pgbouncer/files/smf/manifest.xml
+++ b/databases/pgbouncer/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/databases/pgpool2/files/smf/manifest.xml b/databases/pgpool2/files/smf/manifest.xml
index d694707aad8..b68107bc6a8 100644
--- a/databases/pgpool2/files/smf/manifest.xml
+++ b/databases/pgpool2/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="pgpool">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/databases/redis/files/smf/manifest.xml b/databases/redis/files/smf/manifest.xml
index d8aea5cbf7a..7663c20fc5d 100644
--- a/databases/redis/files/smf/manifest.xml
+++ b/databases/redis/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/databases/sqlrelay/files/smf/manifest.xml b/databases/sqlrelay/files/smf/manifest.xml
index 0d6ee7141bd..40e93725567 100644
--- a/databases/sqlrelay/files/smf/manifest.xml
+++ b/databases/sqlrelay/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <dependency name="network" grouping="require_all" restart_on="error" type="service">
       <service_fmri value="svc:/milestone/network:default" />
diff --git a/devel/zookeeper/files/smf/manifest.xml b/devel/zookeeper/files/smf/manifest.xml
index 6b3bf0f3fcc..e1358cd7982 100644
--- a/devel/zookeeper/files/smf/manifest.xml
+++ b/devel/zookeeper/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="zookeeper">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/zookeeper" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/lang/erlang/files/smf/manifest.xml b/lang/erlang/files/smf/manifest.xml
index 23f00e59be8..0d774c766de 100644
--- a/lang/erlang/files/smf/manifest.xml
+++ b/lang/erlang/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/mail/amavisd-new/files/smf/manifest.xml b/mail/amavisd-new/files/smf/manifest.xml
index 5178d250563..aeb85e184ad 100644
--- a/mail/amavisd-new/files/smf/manifest.xml
+++ b/mail/amavisd-new/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/mail/dovecot/files/smf/manifest.xml b/mail/dovecot/files/smf/manifest.xml
index 714f9739a27..8ac377adcf8 100644
--- a/mail/dovecot/files/smf/manifest.xml
+++ b/mail/dovecot/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/mail/dovecot2/files/smf/manifest.xml b/mail/dovecot2/files/smf/manifest.xml
index 714f9739a27..8ac377adcf8 100644
--- a/mail/dovecot2/files/smf/manifest.xml
+++ b/mail/dovecot2/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/mail/exim/files/smf/manifest.xml b/mail/exim/files/smf/manifest.xml
index ead3180fb0c..bc669c4b05c 100644
--- a/mail/exim/files/smf/manifest.xml
+++ b/mail/exim/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
     <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
 
         <create_default_instance enabled="false"/>
diff --git a/mail/mailman/files/smf/manifest.xml b/mail/mailman/files/smf/manifest.xml
index 67c0516c6cf..8ec60383dae 100644
--- a/mail/mailman/files/smf/manifest.xml
+++ b/mail/mailman/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/mail/opendkim/files/smf/manifest.xml b/mail/opendkim/files/smf/manifest.xml
index 809b457d4fe..3d5942c39b0 100644
--- a/mail/opendkim/files/smf/manifest.xml
+++ b/mail/opendkim/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/mail/rspamd/files/smf/manifest.xml b/mail/rspamd/files/smf/manifest.xml
index 90b10841428..76899a2efea 100644
--- a/mail/rspamd/files/smf/manifest.xml
+++ b/mail/rspamd/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
 
     <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
 
diff --git a/mail/sqlgrey/files/smf/manifest.xml b/mail/sqlgrey/files/smf/manifest.xml
index db6e5064fb5..5a7058e2b74 100644
--- a/mail/sqlgrey/files/smf/manifest.xml
+++ b/mail/sqlgrey/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/net/ddclient/files/smf/manifest.xml b/net/ddclient/files/smf/manifest.xml
index 1558d1bcb44..41d8db90977 100644
--- a/net/ddclient/files/smf/manifest.xml
+++ b/net/ddclient/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/net/haproxy/files/smf/manifest.xml b/net/haproxy/files/smf/manifest.xml
index 5795a6665a4..2d018753b79 100644
--- a/net/haproxy/files/smf/manifest.xml
+++ b/net/haproxy/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/net/nagios-base/files/smf/manifest.xml b/net/nagios-base/files/smf/manifest.xml
index 17f9c1b03f9..b5be5a2886e 100644
--- a/net/nagios-base/files/smf/manifest.xml
+++ b/net/nagios-base/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/net/nagios-nrpe/files/smf/manifest.xml b/net/nagios-nrpe/files/smf/manifest.xml
index 5e941b5a6d9..4d1c90e715a 100644
--- a/net/nagios-nrpe/files/smf/manifest.xml
+++ b/net/nagios-nrpe/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/net/nsd/files/smf/manifest.xml b/net/nsd/files/smf/manifest.xml
index cb836f1ec7e..3067cea9684 100644
--- a/net/nsd/files/smf/manifest.xml
+++ b/net/nsd/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
 	<service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
 		<create_default_instance enabled="false"/>
 		<single_instance/>
diff --git a/net/powerdns-recursor/files/smf/manifest.xml b/net/powerdns-recursor/files/smf/manifest.xml
index ad19e62dfc2..1f64d5c2367 100644
--- a/net/powerdns-recursor/files/smf/manifest.xml
+++ b/net/powerdns-recursor/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="pdns">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/pdns-recursor" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/net/powerdns/files/smf/manifest.xml b/net/powerdns/files/smf/manifest.xml
index b6bfc01b350..b8b7de77c15 100644
--- a/net/powerdns/files/smf/manifest.xml
+++ b/net/powerdns/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="pdns">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/pdns" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/net/proftpd/files/smf/manifest.xml b/net/proftpd/files/smf/manifest.xml
index 316cd4072eb..0273485e8d4 100644
--- a/net/proftpd/files/smf/manifest.xml
+++ b/net/proftpd/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled='false'/>
     <single_instance/>
diff --git a/net/rabbitmq/files/smf/manifest.xml b/net/rabbitmq/files/smf/manifest.xml
index cdd578c81c5..3e088571217 100644
--- a/net/rabbitmq/files/smf/manifest.xml
+++ b/net/rabbitmq/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/net/rsync/files/smf/manifest.xml b/net/rsync/files/smf/manifest.xml
index 2329b526e1d..8d39947186c 100644
--- a/net/rsync/files/smf/manifest.xml
+++ b/net/rsync/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/net/unbound/files/smf/manifest.xml b/net/unbound/files/smf/manifest.xml
index 1573ca6b910..1f3a7c6be47 100644
--- a/net/unbound/files/smf/manifest.xml
+++ b/net/unbound/files/smf/manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<!-- $NetBSD: manifest.xml,v 1.1 2015/10/21 21:30:14 joerg Exp $ -->
+<!-- $NetBSD: manifest.xml,v 1.2 2016/06/08 09:46:04 jperkin Exp $ -->
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/parallel/ganglia-monitor-core/files/smf/manifest.xml b/parallel/ganglia-monitor-core/files/smf/manifest.xml
index 605f4aa9b1d..08b875afcf5 100644
--- a/parallel/ganglia-monitor-core/files/smf/manifest.xml
+++ b/parallel/ganglia-monitor-core/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="gmetad">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/ganglia" type="service" version="1">
     <dependency name="network" grouping="require_all" restart_on="error" type="service">
       <service_fmri value="svc:/milestone/network:default" />
diff --git a/security/spiped/files/smf/manifest.xml b/security/spiped/files/smf/manifest.xml
index b164e5ad14c..ec2845c1a9d 100644
--- a/security/spiped/files/smf/manifest.xml
+++ b/security/spiped/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
 	<service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
 		<create_default_instance enabled="false"/>
 
diff --git a/sysutils/cfengine3/files/smf/manifest.xml b/sysutils/cfengine3/files/smf/manifest.xml
index 5a30c0aaee8..e25701cbdc6 100644
--- a/sysutils/cfengine3/files/smf/manifest.xml
+++ b/sysutils/cfengine3/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="cfexecd">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/cfengine" type="service" version="1">
     <dependency name="network" grouping="require_all" restart_on="error" type="service">
       <service_fmri value="svc:/milestone/network:default" />
diff --git a/sysutils/munin-node/files/smf/manifest.xml b/sysutils/munin-node/files/smf/manifest.xml
index a2a75f8f0a5..a72e4ee9b7c 100644
--- a/sysutils/munin-node/files/smf/manifest.xml
+++ b/sysutils/munin-node/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/sysutils/rsyslog/files/smf/manifest.xml b/sysutils/rsyslog/files/smf/manifest.xml
index c4d15405272..9d320f2f892 100644
--- a/sysutils/rsyslog/files/smf/manifest.xml
+++ b/sysutils/rsyslog/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="rsyslog">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/sysutils/salt/files/smf/manifest.xml b/sysutils/salt/files/smf/manifest.xml
index 8bc76ae160d..db759c7df77 100644
--- a/sysutils/salt/files/smf/manifest.xml
+++ b/sysutils/salt/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <dependency name='network' grouping='require_all' restart_on='error' type='service'>
       <service_fmri value='svc:/milestone/network:default' />
diff --git a/sysutils/syslog-ng/files/smf/manifest.xml b/sysutils/syslog-ng/files/smf/manifest.xml
index e2111a91898..9b2d7f30f97 100644
--- a/sysutils/syslog-ng/files/smf/manifest.xml
+++ b/sysutils/syslog-ng/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="syslog-ng">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/syslog-ng" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/www/apache-tomcat6/files/smf/manifest.xml b/www/apache-tomcat6/files/smf/manifest.xml
index e18f6210114..466e73b56c7 100644
--- a/www/apache-tomcat6/files/smf/manifest.xml
+++ b/www/apache-tomcat6/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/www/apache-tomcat7/files/smf/manifest.xml b/www/apache-tomcat7/files/smf/manifest.xml
index e18f6210114..466e73b56c7 100644
--- a/www/apache-tomcat7/files/smf/manifest.xml
+++ b/www/apache-tomcat7/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/www/apache-tomcat8/files/smf/manifest.xml b/www/apache-tomcat8/files/smf/manifest.xml
index e18f6210114..466e73b56c7 100644
--- a/www/apache-tomcat8/files/smf/manifest.xml
+++ b/www/apache-tomcat8/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/www/lighttpd/files/smf/manifest.xml b/www/lighttpd/files/smf/manifest.xml
index c762cda6667..f8b07becd70 100644
--- a/www/lighttpd/files/smf/manifest.xml
+++ b/www/lighttpd/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/www/nginx-devel/files/smf/manifest.xml b/www/nginx-devel/files/smf/manifest.xml
index 9045e81a24b..8ec1785c53b 100644
--- a/www/nginx-devel/files/smf/manifest.xml
+++ b/www/nginx-devel/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/www/nginx/files/smf/manifest.xml b/www/nginx/files/smf/manifest.xml
index 9045e81a24b..8ec1785c53b 100644
--- a/www/nginx/files/smf/manifest.xml
+++ b/www/nginx/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/www/php-fpm/files/smf/manifest.xml b/www/php-fpm/files/smf/manifest.xml
index 5bd7d2f2847..e26aef48b48 100644
--- a/www/php-fpm/files/smf/manifest.xml
+++ b/www/php-fpm/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="@SMF_NAME@">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />
diff --git a/www/varnish/files/smf/manifest.xml b/www/varnish/files/smf/manifest.xml
index d374d5a98a4..1e8526aae68 100644
--- a/www/varnish/files/smf/manifest.xml
+++ b/www/varnish/files/smf/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
-<service_bundle type="manifest" name="varnish">
+<service_bundle type="manifest" name="export">
   <service name="@SMF_PREFIX@/@SMF_NAME@" type="service" version="1">
     <create_default_instance enabled="false" />
     <single_instance />