[pkgsrc/trunk]: pkgsrc Fix SMF manifests that were not populated properly.

[fhajny <fhajny%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f462b40b573d
branches:  trunk
changeset: 632381:f462b40b573d
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Wed Mar 26 13:47:58 2014 +0000

description:
Fix SMF manifests that were not populated properly.

diffstat:

 mail/courier-imap/files/smf/manifest.xml        |  54 ++++++++++++------------
 security/courier-authlib/files/smf/manifest.xml |  42 +++++++++---------
 2 files changed, 48 insertions(+), 48 deletions(-)

diffs (130 lines):

diff -r 892391c4d1ec -r f462b40b573d mail/courier-imap/files/smf/manifest.xml
--- a/mail/courier-imap/files/smf/manifest.xml  Wed Mar 26 13:45:12 2014 +0000
+++ b/mail/courier-imap/files/smf/manifest.xml  Wed Mar 26 13:47:58 2014 +0000
@@ -2,6 +2,8 @@
 <!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
 <service_bundle type='manifest' name='@SMF_NAME@'>
   <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
+    <create_default_instance enabled="false" />
+    <single_instance />
     <dependency name='fs-local' grouping='require_all' restart_on='none' type='service'>
       <service_fmri value='svc:/system/filesystem/local' />
     </dependency>
@@ -11,33 +13,31 @@
     <dependency name='system-log' grouping='optional_all' restart_on='none' type='service'>
       <service_fmri value='svc:/system/system-log' />
     </dependency>
-    <instance name='@SMF_INSTANCE@' enabled='false'>
-      <dependency name='config-files' grouping='require_any' restart_on='refresh' type='path'>
-        <service_fmri value='file://localhost@PKG_SYSCONFDIR@/pop3d-ssl' />
-        <service_fmri value='file://localhost@PKG_SYSCONFDIR@/pop3d' />
-        <service_fmri value='file://localhost@PKG_SYSCONFDIR@/imapd-ssl' />
-        <service_fmri value='file://localhost@PKG_SYSCONFDIR@/imapd' />
-      </dependency>
-      <dependency name='authlib' grouping='require_all' restart_on='none' type='service'>
-        <service_fmri value='svc:/@SMF_PREFIX@/courier:authlib' />
-      </dependency>
-      <exec_method name='start' type='method' exec='@PREFIX@/@SMF_METHOD_FILE.courier-imap@ start' timeout_seconds='120' />
-      <exec_method name='stop' type='method' exec='@PREFIX@/@SMF_METHOD_FILE.courier-imap@ stop' timeout_seconds='60' />
-      <property_group name='startd' type='framework'>
-        <propval name='ignore_error' type='astring' value='core,signal' />
-      </property_group>
-      <property_group name='general' type='framework'>
-        <propval name='action_authorization' type='astring' value='solaris.smf.manage.courier-imap' />
-      </property_group>
-      <template>
-        <common_name>
-          <loctext xml:lang='C'>imap - Courier IMAP provides access to Maildirs</loctext>
-        </common_name>
-        <documentation>
-          <manpage title='imapd' section='8' manpath='@PREFIX@/@PKGMANDIR@' />
-        </documentation>
-      </template>
-    </instance>
+    <dependency name='config-files' grouping='require_any' restart_on='refresh' type='path'>
+      <service_fmri value='file://localhost@PKG_SYSCONFDIR@/pop3d-ssl' />
+      <service_fmri value='file://localhost@PKG_SYSCONFDIR@/pop3d' />
+      <service_fmri value='file://localhost@PKG_SYSCONFDIR@/imapd-ssl' />
+      <service_fmri value='file://localhost@PKG_SYSCONFDIR@/imapd' />
+    </dependency>
+    <dependency name='authlib' grouping='require_all' restart_on='none' type='service'>
+      <service_fmri value='svc:/@SMF_PREFIX@/courier-authlib' />
+    </dependency>
+    <exec_method name='start' type='method' exec='@PREFIX@/@SMF_METHOD_FILE.courier-imap@ start' timeout_seconds='120' />
+    <exec_method name='stop' type='method' exec='@PREFIX@/@SMF_METHOD_FILE.courier-imap@ stop' timeout_seconds='60' />
+    <property_group name='startd' type='framework'>
+      <propval name='ignore_error' type='astring' value='core,signal' />
+    </property_group>
+    <property_group name='general' type='framework'>
+      <propval name='action_authorization' type='astring' value='solaris.smf.manage.courier-imap' />
+    </property_group>
     <stability value='Evolving' />
+    <template>
+      <common_name>
+        <loctext xml:lang='C'>imap - Courier IMAP provides access to Maildirs</loctext>
+      </common_name>
+      <documentation>
+        <manpage title='imapd' section='8' manpath='@PREFIX@/@PKGMANDIR@' />
+      </documentation>
+    </template>
   </service>
 </service_bundle>
diff -r 892391c4d1ec -r f462b40b573d security/courier-authlib/files/smf/manifest.xml
--- a/security/courier-authlib/files/smf/manifest.xml   Wed Mar 26 13:45:12 2014 +0000
+++ b/security/courier-authlib/files/smf/manifest.xml   Wed Mar 26 13:47:58 2014 +0000
@@ -2,6 +2,8 @@
 <!DOCTYPE service_bundle SYSTEM '/usr/share/lib/xml/dtd/service_bundle.dtd.1'>
 <service_bundle type='manifest' name='@SMF_NAME@'>
   <service name='@SMF_PREFIX@/@SMF_NAME@' type='service' version='1'>
+    <create_default_instance enabled="false" />
+    <single_instance />
     <dependency name='fs-local' grouping='require_all' restart_on='none' type='service'>
       <service_fmri value='svc:/system/filesystem/local' />
     </dependency>
@@ -11,27 +13,25 @@
     <dependency name='system-log' grouping='optional_all' restart_on='none' type='service'>
       <service_fmri value='svc:/system/system-log' />
     </dependency>
-    <instance name='@SMF_INSTANCE@' enabled='false'>
-      <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
-        <service_fmri value='file://localhost@PKG_SYSCONFDIR@/authdaemonrc' />
-      </dependency>
-      <exec_method name='start' type='method' exec='@PREFIX@/sbin/authdaemond start' timeout_seconds='120' />
-      <exec_method name='stop' type='method' exec='@PREFIX@/sbin/authdaemond stop' timeout_seconds='60' />
-      <property_group name='startd' type='framework'>
-        <propval name='ignore_error' type='astring' value='core,signal' />
-      </property_group>
-      <property_group name='general' type='framework'>
-        <propval name='action_authorization' type='astring' value='solaris.smf.manage.courier-authlib' />
-      </property_group>
-      <template>
-        <common_name>
-          <loctext xml:lang='C'>authlib - Generic authentication API for Courier mail services</loctext>
-        </common_name>
-        <documentation>
-          <manpage title='authlib' section='3' manpath='@PREFIX@/@PKGMANDIR@' />
-        </documentation>
-      </template>
-    </instance>
+    <dependency name='config-file' grouping='require_all' restart_on='refresh' type='path'>
+      <service_fmri value='file://localhost@PKG_SYSCONFDIR@/authdaemonrc' />
+    </dependency>
+    <exec_method name='start' type='method' exec='@PREFIX@/sbin/authdaemond start' timeout_seconds='120' />
+    <exec_method name='stop' type='method' exec='@PREFIX@/sbin/authdaemond stop' timeout_seconds='60' />
+    <property_group name='startd' type='framework'>
+      <propval name='ignore_error' type='astring' value='core,signal' />
+    </property_group>
+    <property_group name='general' type='framework'>
+      <propval name='action_authorization' type='astring' value='solaris.smf.manage.courier-authlib' />
+    </property_group>
     <stability value='Evolving' />
+    <template>
+      <common_name>
+        <loctext xml:lang='C'>authlib - Generic authentication API for Courier mail services</loctext>
+      </common_name>
+      <documentation>
+        <manpage title='authlib' section='3' manpath='@PREFIX@/@PKGMANDIR@' />
+      </documentation>
+    </template>
   </service>
 </service_bundle>