[pkgsrc/trunk]: pkgsrc/databases Fix SMF manifests that had stale placeholders.

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

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

description:
Fix SMF manifests that had stale placeholders.

diffstat:

 databases/postgresql84-server/files/smf/manifest.xml |  18 +++++++++---------
 databases/postgresql90-server/files/smf/manifest.xml |   4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diffs (49 lines):

diff -r c014341242bf -r f0965bcbb3bf databases/postgresql84-server/files/smf/manifest.xml
--- a/databases/postgresql84-server/files/smf/manifest.xml      Wed Mar 26 12:26:08 2014 +0000
+++ b/databases/postgresql84-server/files/smf/manifest.xml      Wed Mar 26 13:19:13 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='network' grouping='require_all' restart_on='none' type='service'>
       <service_fmri value='svc:/milestone/network:default' />
     </dependency>
@@ -14,15 +16,13 @@
         <envvar name="LD_PRELOAD_32" value="/usr/lib/extendedFILE.so.1" />
       </method_environment>
     </method_context>
-    <instance name='@SMF_INSTANCE@' enabled='false'>
-      <exec_method type='method' name='start' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ start' timeout_seconds='300' />
-      <exec_method type='method' name='stop' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ stop' timeout_seconds='300' />
-      <exec_method type='method' name='refresh' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ refresh' timeout_seconds='60' />
-      <property_group name='config' type='application'>
-        <propval name='data' type='astring' value='@PGHOME@/data84' />
-        <propval name='log' type='astring' value='@PGLOGFILE@' />
-      </property_group>
-    </instance>
+    <exec_method type='method' name='start' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ start' timeout_seconds='300' />
+    <exec_method type='method' name='stop' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ stop' timeout_seconds='300' />
+    <exec_method type='method' name='refresh' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ refresh' timeout_seconds='60' />
+    <property_group name='config' type='application'>
+      <propval name='data' type='astring' value='@PGHOME@/data' />
+      <propval name='log' type='astring' value='@VARBASE@/log/postgresql.log' />
+    </property_group>
     <stability value='Evolving' />
     <template>
       <common_name>
diff -r c014341242bf -r f0965bcbb3bf databases/postgresql90-server/files/smf/manifest.xml
--- a/databases/postgresql90-server/files/smf/manifest.xml      Wed Mar 26 12:26:08 2014 +0000
+++ b/databases/postgresql90-server/files/smf/manifest.xml      Wed Mar 26 13:19:13 2014 +0000
@@ -20,8 +20,8 @@
     <exec_method type='method' name='stop' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ stop' timeout_seconds='300' />
     <exec_method type='method' name='refresh' exec='@PREFIX@/@SMF_METHOD_FILE.postgresql@ refresh' timeout_seconds='60' />
     <property_group name='config' type='application'>
-      <propval name='data' type='astring' value='@PGDATA@' />
-      <propval name='log' type='astring' value='@PGLOGFILE@' />
+      <propval name='data' type='astring' value='@PGHOME@/data' />
+      <propval name='log' type='astring' value='@VARBASE@/log/postgresql.log' />
     </property_group>
     <stability value='Evolving' />
     <template>