* force linking against pthread, so some modules do not fail to dlopen()

* sed, rather than patch, config files to meet pkgsrc needs

7 files changed, 25 insertions, 288 deletions

diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile
index 7836152c925..7f40a053166 100644
--- a/chat/jabberd2/Makefile
+++ b/chat/jabberd2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2010/11/09 07:33:10 adam Exp $
+# $NetBSD: Makefile,v 1.62 2011/01/28 13:35:49 adam Exp $
 
 DISTNAME=	jabberd-2.2.11
 CATEGORIES=	chat
@@ -24,6 +24,10 @@ CONFIGURE_ARGS+=	--enable-ssl
 CONFIGURE_ARGS+=	--enable-fs
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
+# XXX force linking against pthread, so some modules do not fail to dlopen()
+LDFLAGS+=	${PTHREAD_LDFLAGS}
+LIBS+=		${PTHREAD_LIBS}
+
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	configure
@@ -83,13 +87,24 @@ post-extract:
 
 pre-configure:
 .for f in ${FILES}
-	sed	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"		\
-		-e "s|@PIDDIR@|${JABBERD_PIDDIR}|g"			\
-		-e "s|@LOGDIR@|${JABBERD_LOGDIR}|g"			\
-		-e "s|@SSLCERTS@|${SSLCERTS}|g"				\
-		-e "s|@BINDIR@|${PREFIX}/bin|g"				\
-		-e "s|@DBDIR@|${JABBERD_DBDIR}|g"			\
+	sed	-e "s|@bindir@|${PREFIX}/bin|g"				\
+		-e "s|@jabberd_router_bin@|router|g"			\
+		-e "s|@jabberd_c2s_bin@|c2s|g"				\
+		-e "s|@jabberd_s2s_bin@|s2s|g"				\
+		-e "s|@jabberd_sm_bin@|sm|g"				\
+		-e "s|@localstatedir@/jabberd/db|${JABBERD_DBDIR}|g"	\
+		-e "s|@localstatedir@/jabberd/log|${JABBERD_LOGDIR}|g"	\
+		-e "s|@localstatedir@/jabberd/pid|${JABBERD_PIDDIR}|g"	\
+		-e "s|@localstatedir@/jabberd/run|${JABBERD_PIDDIR}|g"	\
+		-e "s|@localstatedir@/jabberd/stats|${JABBERD_LOGDIR}|g"\
+		-e "s|@localstatedir@/lib/jabberd2|${JABBERD_DBDIR}|g"	\
 		-e "s|@pkglibdir@|${PREFIX}/lib/jabberd|g"		\
+		-e "s|<cachain>@sysconfdir@|<cachain>${SSLCERTS}|g"	\
+		-e "s|<pemfile>@sysconfdir@|<pemfile>${SSLCERTS}|g"	\
+		-e "s|cachain='@sysconfdir@|cachain='${SSLCERTS}|g"	\
+		-e "s|pemfile='@sysconfdir@|pemfile='${SSLCERTS}|g"	\
+		-e "s|@sysconfdir@/templates|${PKG_SYSCONFDIR}|g"	\
+		-e "s|@sysconfdir@|${PKG_SYSCONFDIR}|g"			\
 		${WRKSRC}/etc/${f}.in > ${WRKSRC}/etc/${f}
 .endfor
 
@@ -113,4 +128,6 @@ post-install:
 .include "../../net/udns/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/jabberd2/distinfo b/chat/jabberd2/distinfo
index a3bbbb6efc2..107c1d97488 100644
--- a/chat/jabberd2/distinfo
+++ b/chat/jabberd2/distinfo
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.22 2010/11/09 07:33:11 adam Exp $
+$NetBSD: distinfo,v 1.23 2011/01/28 13:35:51 adam Exp $
 
 SHA1 (jabberd-2.2.11.tar.bz2) = 32956231dd5ab5a242545907341fab9bc6007d22
 RMD160 (jabberd-2.2.11.tar.bz2) = d4bac0f0cbf41788e5504ca1796f910b27c813d1
 Size (jabberd-2.2.11.tar.bz2) = 659500 bytes
 SHA1 (patch-aa) = 0db128003f37425a1b7b315f526828f2e328ddb4
-SHA1 (patch-ab) = c33cefcb0ddbcec732e475eaf5b931cdc8dd6cc7
-SHA1 (patch-ac) = 9bb5547c01fa3cc0f4df2133007a843aaed66bef
-SHA1 (patch-ad) = 2930f23bc8616ba2a5783cc8bb2a42c5d1c5eff7
-SHA1 (patch-ae) = 0c57279c309ef4f6a226d65a491fd040e03ae4f0
 SHA1 (patch-af) = 0a30ddc50345278eb8a20825f87754c914720b05
-SHA1 (patch-ag) = 2423bc1f7aced7d0010b51949fb2f9b5ddb44cc0
diff --git a/chat/jabberd2/patches/patch-ab b/chat/jabberd2/patches/patch-ab
deleted file mode 100644
index ae0a023c0b7..00000000000
--- a/chat/jabberd2/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2009/08/21 02:28:12 schnoebe Exp $
-
---- etc/jabberd.cfg.in.orig
-+++ etc/jabberd.cfg.in
-@@ -12,7 +12,7 @@
- # program   [ path to config file ]
- #
- 
--@jabberd_router_bin@      @sysconfdir@/router.xml
--@jabberd_sm_bin@          @sysconfdir@/sm.xml
--@jabberd_s2s_bin@         @sysconfdir@/s2s.xml
--@jabberd_c2s_bin@         @sysconfdir@/c2s.xml
-+router		@PKG_SYSCONFDIR@/router.xml
-+sm		@PKG_SYSCONFDIR@/sm.xml
-+s2s		@PKG_SYSCONFDIR@/s2s.xml
-+c2s		@PKG_SYSCONFDIR@/c2s.xml
diff --git a/chat/jabberd2/patches/patch-ac b/chat/jabberd2/patches/patch-ac
deleted file mode 100644
index 5b811fcc386..00000000000
--- a/chat/jabberd2/patches/patch-ac
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2010/06/16 07:56:30 adam Exp $
-
---- etc/sm.xml.in.orig	2010-06-11 11:44:58.000000000 +0000
-+++ etc/sm.xml.in
-@@ -5,7 +5,7 @@
- 
-   <!-- The process ID file. Comment this out if you don't need to know
-        the process ID from outside the process (eg for control scripts) -->
--  <pidfile>@localstatedir@/jabberd/pid/sm.pid</pidfile>
-+  <pidfile>@PIDDIR@/sm.pid</pidfile>
- 
-   <!-- Router connection configuration -->
-   <router>
-@@ -27,7 +27,7 @@
-          If this is commented out, or the file can't be read, no attempt
-          will be made to establish an encrypted channel with the router. -->
-     <!--
--    <pemfile>@sysconfdir@/server.pem</pemfile>
-+    <pemfile>@SSLCERTS@/server.pem</pemfile>
-     -->
- 
-     <!-- Router connection retry -->
-@@ -60,7 +60,7 @@
- 
-     <!-- If logging to file, this is the filename of the logfile -->
-     <!--
--    <file>@localstatedir@/jabberd/log/sm.log</file>
-+    <file>@LOGDIR@/sm.log</file>
-     -->
-   </log>
- 
-@@ -114,7 +114,7 @@
-     <!-- SQLite driver configuration -->
-     <sqlite>
-       <!-- Database name -->
--      <dbname>@localstatedir@/jabberd/db/sqlite.db</dbname>
-+      <dbname>@DBDIR@/sqlite.db</dbname>
- 
-       <!-- Transacation support. If this is commented out, transactions
-            will be disabled. This might make database accesses faster,
-@@ -180,7 +180,7 @@
-          implementation does not implement the 'count' callback). -->
-     <db>
-       <!-- Directory to store database files under -->
--      <path>@localstatedir@/jabberd/db</path>
-+      <path>@DBDIR@</path>
- 
-       <!-- Synchronize the database to disk after each write. If you
-            disable this, database accesses may be faster, but data may
-@@ -205,7 +205,7 @@
-     <!-- Filesystem driver configuration -->
-     <fs>
-       <!-- Directory to store database files under. -->
--      <path>@localstatedir@/lib/jabberd2/fs</path>
-+      <path>@DBDIR@/fs</path>
-     </fs>
- 
-     <!-- LDAPVCARD driver configuration -->
-@@ -679,7 +679,7 @@
-            stored in the users data store when they are created. -->
-       <!-- If you defined publish, you should comment-out <roster> -->
-       <!--
--      <roster>@sysconfdir@/templates/roster.xml</roster>
-+      <roster>@PKG_SYSCONFDIR@/roster.xml</roster>
-       -->
-     </template>
-   </user>
diff --git a/chat/jabberd2/patches/patch-ad b/chat/jabberd2/patches/patch-ad
deleted file mode 100644
index dd8090fca4e..00000000000
--- a/chat/jabberd2/patches/patch-ad
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ad,v 1.4 2009/08/21 02:28:13 schnoebe Exp $
-
---- etc/s2s.xml.in.orig	2009-07-05 16:54:18.000000000 -0500
-+++ etc/s2s.xml.in
-@@ -5,7 +5,7 @@
- 
-   <!-- The process ID file. Comment this out if you don't need to know
-        the process ID from outside the process (eg for control scripts) -->
--  <pidfile>@localstatedir@/jabberd/pid/s2s.pid</pidfile>
-+  <pidfile>@PIDDIR@/s2s.pid</pidfile>
- 
-   <!-- Router connection configuration -->
-   <router>
-@@ -37,7 +37,7 @@
-          If this is commented out, or the file can't be read, no attempt
-          will be made to establish an encrypted channel with the router. -->
-     <!--
--    <pemfile>@sysconfdir@/server.pem</pemfile>
-+    <pemfile>@SSLCERTS@/server.pem</pemfile>
-     -->
- 
-     <!-- Router connection retry -->
-@@ -70,7 +70,7 @@
- 
-     <!-- if logging to file, this is the filename of the logfile -->
-     <!--
--    <file>@localstatedir@/jabberd/log/s2s.log</file>
-+    <file>@LOGDIR@/s2s.log</file>
-     -->
-   </log>
- 
-@@ -106,7 +106,7 @@
-          If this is commented out, or the file can't be read, no attempt will be
-          made to establish encrypted connections with other servers. -->
-     <!--
--    <pemfile>@sysconfdir@/server.pem</pemfile>
-+    <pemfile>@SSLCERTS@/server.pem</pemfile>
-     -->
- 
-     <!-- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter -->
-@@ -117,7 +117,7 @@
-     <!-- File containing an optional SSL certificate chain file for SSL
-          connections. -->
-     <!--
--    <cachain>@sysconfdir@/cachain.pem</cachain>
-+    <cachain>@SSLCERTS@/cachain.pem</cachain>
-     -->
- 
-   </local>
-@@ -227,7 +227,7 @@
-   <stats>
-     <!-- file containing count of packets that went through -->
-     <!--
--    <packet>@localstatedir@/jabberd/stats/s2s.packets</packet>
-+    <packet>@LOGDIR@/jabberd.s2s.packets</packet>
-     -->
-   </stats>
- 
diff --git a/chat/jabberd2/patches/patch-ae b/chat/jabberd2/patches/patch-ae
deleted file mode 100644
index 25ef6fdf3e2..00000000000
--- a/chat/jabberd2/patches/patch-ae
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2009/08/21 02:28:13 schnoebe Exp $
-
---- etc/router.xml.in.orig	2008-07-16 04:36:58.000000000 -0500
-+++ etc/router.xml.in
-@@ -5,7 +5,7 @@
- 
-   <!-- The process ID file. Comment this out if you don't need to know
-        the process ID from outside the process (eg for control scripts) -->
--  <pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
-+  <pidfile>@PIDDIR@/router.pid</pidfile>
- 
-   <!-- Log configuration - type is "syslog", "file" or "stdout" -->
-   <log type='syslog'>
-@@ -18,7 +18,7 @@
- 
-     <!-- If logging to file, this is the filename of the logfile -->
-     <!--
--    <file>@localstatedir@/jabberd/log/router.log</file>
-+    <file>@LOGDIR@/router.log</file>
-     -->
-   </log>
- 
-@@ -33,7 +33,7 @@
-     <!-- File containing the user table. This is where the router gets
-          its component and secret information from for component
-          authentication.-->
--    <users>@sysconfdir@/router-users.xml</users>
-+    <users>@PKG_SYSCONFDIR@/router-users.xml</users>
- 
-     <!-- Shared secret used to identify XEP-0114 components (that is,
-          "jabber:component:accept" components that authenticate using
-@@ -52,7 +52,7 @@
-          If this is commented out, connecting components will not be able
-          to request an SSL-encrypted channel. -->
-     <!--
--    <pemfile>@sysconfdir@/server.pem</pemfile>
-+    <pemfile>@SSLCERTS@/server.pem</pemfile>
-     -->
-   </local>
- 
-@@ -191,7 +191,7 @@
- 
-     <!-- File containing packet filter rules.
-          May be used for fine grained packet routing control. -->
--    <filter>@sysconfdir@/router-filter.xml</filter>
-+    <filter>@PKG_SYSCONFDIR@/router-filter.xml</filter>
- 
-   </aci>
- 
diff --git a/chat/jabberd2/patches/patch-ag b/chat/jabberd2/patches/patch-ag
deleted file mode 100644
index 923c3c9aaba..00000000000
--- a/chat/jabberd2/patches/patch-ag
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-ag,v 1.9 2010/06/16 07:56:30 adam Exp $
-
---- etc/c2s.xml.in.orig	2010-06-11 11:44:58.000000000 +0000
-+++ etc/c2s.xml.in
-@@ -5,7 +5,7 @@
- 
-   <!-- The process ID file. Comment this out if you don't need to know
-        the process ID from outside the process (eg for control scripts) -->
--  <pidfile>@localstatedir@/jabberd/pid/c2s.pid</pidfile>
-+  <pidfile>@PIDDIR@/c2s.pid</pidfile>
- 
-   <!-- Router connection configuration -->
-   <router>
-@@ -27,7 +27,7 @@
-          If this is commented out, or the file can't be read, no attempt
-          will be made to establish an encrypted channel with the router. -->
-     <!--
--    <pemfile>@sysconfdir@/server.pem</pemfile>
-+    <pemfile>@SSLCERTS@/server.pem</pemfile>
-     -->
- 
-     <!-- Router connection retry -->
-@@ -60,7 +60,7 @@
- 
-     <!-- If logging to file, this is the filename of the logfile -->
-     <!--
--    <file>@localstatedir@/jabberd/log/c2s.log</file>
-+    <file>@LOGDIR@/c2s.log</file>
-     -->
-   </log>
- 
-@@ -136,7 +136,7 @@
-     <id register-enable='true'>localhost.localdomain</id>
-     <!-- or
-     <id realm='company.int'
--        pemfile='@sysconfdir@/server.pem'
-+        pemfile='@SSLCERTS@/server.pem'
-         verify-mode='7'
-         cachain='@sysconfdir@/client_ca_certs.pem'
-         require-starttls='true'
-@@ -176,7 +176,7 @@
-          use STARTTLS over the standard XMPP port 5222 then you
-          MUST specify the pemfile in the 'id' tag above. -->
-     <!--
--    <pemfile>@sysconfdir@/server.pem</pemfile>
-+    <pemfile>@SSLCERTS@/server.pem</pemfile>
-     -->
- 
-     <!-- SSL verify mode - see SSL_CTX_set_verify(3), mode parameter -->
-@@ -329,7 +329,7 @@
-   <stats>
-     <!-- file containing count of packets that went through -->
-     <!--
--    <packet>@localstatedir@/jabberd/stats/c2s.packets</packet>
-+    <packet>@LOGDIR@/c2s.packets</packet>
-     -->
-   </stats>
- 
-@@ -399,7 +399,7 @@
-     <!-- SQLite driver configuration -->
-     <sqlite>
-       <!-- Database name -->
--      <dbname>@localstatedir@/jabberd/db/sqlite.db</dbname>
-+      <dbname>@DBDIR@/sqlite.db</dbname>
- 
-       <!-- Transacation support. If this is commented out, transactions
-            will be disabled. This might make database accesses faster,
-@@ -476,7 +476,7 @@
-     <!-- Berkeley DB module configuration -->
-     <db>
-       <!-- Directory to store database files under -->
--      <path>@localstatedir@/jabberd/db</path>
-+      <path>@DBDIR@</path>
- 
-       <!-- Synchronize the database to disk after each write. If you
-            disable this, database accesses may be faster, but data may
-@@ -604,7 +604,7 @@
-     <!-- Pipe module configuration -->
-     <pipe>
-       <!-- Program to execute -->
--      <exec>@bindir@/pipe-auth.pl</exec>
-+      <exec>@BINDIR@/pipe-auth.pl</exec>
-     </pipe>
- 
-   </authreg>