Replace more paths in two configuration files, reported by Mr. Martti

Kuparinen.

3 files changed, 29 insertions, 11 deletions

diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index 5d5523d953c..6738b3cb843 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.13 2007/08/26 09:10:54 xtraeme Exp $
+$NetBSD: distinfo,v 1.14 2007/08/27 08:41:06 xtraeme Exp $
 
 SHA1 (jabberd-2.1.14.tar.bz2) = dd12ed8956ffc0118e6bfd0424d788d4bd1c128c
 RMD160 (jabberd-2.1.14.tar.bz2) = 3a6f1c2104ce0d88c4535139fd705e06da564863
 Size (jabberd-2.1.14.tar.bz2) = 1046630 bytes
 SHA1 (patch-aa) = bd62fd5956cb6722f7cb4b5bdca05ee502f43e46
 SHA1 (patch-ab) = de1c8ec12b55117223bcca2071499c42ab145a34
-SHA1 (patch-ac) = 6750c724910a7be4b19488af02d57784ff06af3d
+SHA1 (patch-ac) = 768d98497682017a2b80bad02a719f817fd0dd87
 SHA1 (patch-ad) = 3a4b9f80912c70fb1cdc7756b6d4dcc12feadb5a
 SHA1 (patch-ae) = 56cb29f139c9f6e74afd9bb0361d70fe4fad0c47
 SHA1 (patch-af) = 83b16643caae2a0c5ca396793f0a80c0bb5d83e7
-SHA1 (patch-ag) = 34965f9b001fbf66bca500f115c60f0450ce92ab
+SHA1 (patch-ag) = fd65428b7253eb1137799ef40d654e14083bc8d9
 SHA1 (patch-ah) = f896a30c9ee44bb0bd19a9c848a455e94eefcdb4
diff --git a/chat/jabberd2/patches/patch-ac b/chat/jabberd2/patches/patch-ac
index d913f57014e..7bf4c4b6923 100644
--- a/chat/jabberd2/patches/patch-ac
+++ b/chat/jabberd2/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2007/05/26 11:50:13 xtraeme Exp $
+$NetBSD: patch-ac,v 1.3 2007/08/27 08:41:06 xtraeme Exp $
 
---- etc/sm.xml.in.orig	2007-05-26 12:01:56.000000000 +0200
-+++ etc/sm.xml.in	2007-05-26 12:03:46.000000000 +0200
+--- etc/sm.xml.in.orig	2007-07-30 21:07:08.000000000 +0200
++++ etc/sm.xml.in	2007-08-27 10:32:36.000000000 +0200
 @@ -9,7 +9,7 @@
    <!-- The process ID file. comment this out if you don't need to know
         to know the process ID from outside the process (eg for control
@@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.2 2007/05/26 11:50:13 xtraeme Exp $
      -->
    </log>
  
-@@ -128,7 +128,7 @@
+@@ -136,7 +136,7 @@
      <!-- Berkeley DB driver configuration -->
      <db>
        <!-- Directory to store database files under -->
@@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.2 2007/05/26 11:50:13 xtraeme Exp $
  
        <!-- Synchronize the database to disk after each write. If you
             disable this, database accesses may be faster, but data may
-@@ -153,7 +153,7 @@
+@@ -161,7 +161,7 @@
      <!-- SQLite driver configuration -->
      <sqlite>
        <!-- Database name -->
@@ -47,3 +47,12 @@ $NetBSD: patch-ac,v 1.2 2007/05/26 11:50:13 xtraeme Exp $
  
        <!-- Transacation support. If this is commented out, transactions
             will be disabled. This might make database accesses faster,
+@@ -430,7 +430,7 @@
+          stored in the users data store when they are created. -->
+     <template>
+       <!--
+-      <roster>@sysconfdir@/templates/roster.xml</roster>
++      <roster>@PKG_SYSCONFDIR@/roster.xml</roster>
+       -->
+     </template>
+   </user>
diff --git a/chat/jabberd2/patches/patch-ag b/chat/jabberd2/patches/patch-ag
index de8419b5e3c..d52a4ec0baa 100644
--- a/chat/jabberd2/patches/patch-ag
+++ b/chat/jabberd2/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.5 2007/08/26 09:10:54 xtraeme Exp $
+$NetBSD: patch-ag,v 1.6 2007/08/27 08:41:06 xtraeme Exp $
 
---- etc/c2s.xml.in.orig	2007-08-26 10:52:06.000000000 +0200
-+++ etc/c2s.xml.in	2007-08-26 10:53:53.000000000 +0200
+--- etc/c2s.xml.in.orig	2007-08-14 00:29:45.000000000 +0200
++++ etc/c2s.xml.in	2007-08-27 10:31:18.000000000 +0200
 @@ -6,7 +6,7 @@
    <!-- The process ID file. comment this out if you don't need to know
         to know the process ID from outside the process (eg for control
@@ -29,6 +29,15 @@ $NetBSD: patch-ag,v 1.5 2007/08/26 09:10:54 xtraeme Exp $
      -->
    </log>
  
+@@ -113,7 +113,7 @@
+     <id register-enable='true'>localhost</id>
+     <!-- or
+     <id realm='company'
+-        pemfile='@sysconfdir@/server.pem'
++        pemfile='@SSLCERTS@/server.pem'
+         verify-mode='7'
+         require-starttls='true'
+         register-enable='true'
 @@ -147,7 +147,7 @@
           If this is commented out, clients will not be offered
           the STARTTLS stream extension -->