6 files changed, 90 insertions, 20 deletions

diff --git a/net-im/mu-conference/files/README.FreeBSD.external.in b/net-im/mu-conference/files/README.FreeBSD.external.in
new file mode 100644
index 000000000000..4b83ff16a4c6
--- /dev/null
+++ b/net-im/mu-conference/files/README.FreeBSD.external.in
@@ -0,0 +1,14 @@
+# MU-Conference and external jabber servers on FreeBSD
+# README by Martin Matuska <mm_at_FreeBSD_dot_org>
+
+If you did not select WITH_JABBER, WITH_JABBERD or WITH_EJABBERD, you may want
+to use another or external jabber server. To run the transport locally, you may
+need to create the pid and spool directories manually.
+
+Default pahts of the current installation are:
+%%JABBER_PIDDIR%%
+%%JABBER_SPOOLDIR%%
+
+You should make these paths writable for the service user.
+Default service user for this installation:
+%%JABBER_USER%%
diff --git a/net-im/mu-conference/files/README.FreeBSD.jabberd14.in b/net-im/mu-conference/files/README.FreeBSD.jabberd14.in
new file mode 100644
index 000000000000..34fbc1292004
--- /dev/null
+++ b/net-im/mu-conference/files/README.FreeBSD.jabberd14.in
@@ -0,0 +1,38 @@
+# MU-Conference and jabberd14 (net-im/jabber) on FreeBSD
+# README by Martin Matuska <mm_at_FreeBSD_dot_org>
+
+The sample configuration file for jabberd14 may be located in:
+%%TARGETDIR%%/etc/jabber.xml.sample
+
+Please make all necessary changes to your configuration file which may be:
+%%TARGETDIR%%/etc/jabber.xml
+
+NOTE: if you want this service to be accessible from other servers,
+ change any 'conference.localhost' listed below to a fully qualified 
+ domain name! Please make sure that your directives are _NOT_ in an XML 
+ comment: there are many multi-line comments. 
+
+To activate MU-Conference for your Jabber server, 
+add the following to your configuration file and adjust to your settings
+(around line 921 in the sample configuration file):
+-------------------------------------------------------------------------------
+
+  <service id="conference.localhost">
+    <accept>
+      <ip>127.0.0.1</ip>
+      <port>7009</port>
+      <secret>password</secret>
+    </accept>
+  </service>
+
+-------------------------------------------------------------------------------
+Add this section to the browse area of the jsm to advertise it to
+your users (around line 382 of the sample config):
+-------------------------------------------------------------------------------
+
+	<item category="conference" type="public" jid="conference.localhost" name="Public Conferencing">
+	  <ns>jabber:iq:conference</ns>
+	</item>
+
+-------------------------------------------------------------------------------
+Be sure to restart your server after reconfiguring.
diff --git a/net-im/mu-conference/files/README.FreeBSD.jabberd2.in b/net-im/mu-conference/files/README.FreeBSD.jabberd2.in
new file mode 100644
index 000000000000..cc534420bb66
--- /dev/null
+++ b/net-im/mu-conference/files/README.FreeBSD.jabberd2.in
@@ -0,0 +1,11 @@
+# MU-Conference and jabberd2 (net-im/jabberd) on FreeBSD
+# README by Martin Matuska <mm_at_FreeBSD_dot_org>
+
+The configuration for jabberd2 is located in:
+%%TARGETDIR%%/etc/jabberd
+
+If you are using Jabberd2 then you shouldn't have to do much configuration.
+Make sure the 'mainServer' setting is the IP or hostname of your Jabber server,
+and set 'port' to 5347. Double-check that the secret for legacy components 
+in router.xml (for Jabberd2) is the same as the secret setting in config.py. 
+That should be all. You don't even need to restart Jabberd2.
diff --git a/net-im/mu-conference/files/mu-conference.sh.in b/net-im/mu-conference/files/mu-conference.in
index 9c7c2550eab4..dcea13b2c5fd 100644
--- a/net-im/mu-conference/files/mu-conference.sh.in
+++ b/net-im/mu-conference/files/mu-conference.in
@@ -1,16 +1,14 @@
 #!/bin/sh
-
-# Start or stop jabber's mu-conference
+#
 # $FreeBSD$
 
 # PROVIDE: mu_conference
-# REQUIRE: DAEMON jabberd
+# REQUIRE: %%JABBER_REQUIRE%%
 # KEYWORD: shutdown
-#
+
 # Define these mu_conference_* variables in one of these files:
 #       /etc/rc.conf
 #       /etc/rc.conf.local
-#       /etc/rc.conf.d/mu_conference
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
@@ -27,7 +25,7 @@ name="mu_conference"
 rcvar=`set_rcvar`
 
 command="%%PREFIX%%/bin/mu-conference"
-pidfile="/var/jabberd/pid/mu-conference.pid"
+pidfile=${mu_conference_pidfile:-"%%JABBER_PIDDIR%%/mu-conference.pid"}
 
 stop_postcmd="mu_conference_stop_post"
 
@@ -39,9 +37,8 @@ load_rc_config $name
 
 : ${mu_conference_config="%%PREFIX%%/etc/muc.xml"}
 : ${mu_conference_enable="NO"}
-: ${mu_conference_user="jabber"}
+: ${mu_conference_user="%%JABBER_USER%%"}
 
-command_args="-c $mu_conference_config -B"
+command_args="-c ${mu_conference_config} -B >/dev/null 2>&1"
 
 run_rc_command "$1"
-
diff --git a/net-im/mu-conference/files/patch-src-jcomp.mk b/net-im/mu-conference/files/patch-src-jcomp.mk
deleted file mode 100644
index 36114f01d1e4..000000000000
--- a/net-im/mu-conference/files/patch-src-jcomp.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/jcomp.mk.orig	Sun Oct 26 15:35:19 2003
-+++ src/jcomp.mk	Mon Feb  9 16:03:18 2004
-@@ -25,7 +25,7 @@
- #CFLAGS:=$(CFLAGS) -pipe -Os -I../../jabberd -I../include 
- #LIBS:=$(LIBS) /usr/local/lib/ccmalloc-gcc.o -lccmalloc 
- #LIBS:=$(LIBS) -lmemusage
--LIBS:=$(LIBS) -ljcomp -lm `pkg-config --libs glib-2.0` `pkg-config --libs gthread-2.0`
-+LIBS:=-ljcomp -lm `pkg-config --libs glib-2.0` `pkg-config --libs gthread-2.0`
- LDFLAGS:=-L../../lib 
- 
- conference_OBJECTS=conference.o conference_room.o conference_user.o utils.o xdata.o admin.o roles.o xdb.o hash.o main.o
diff --git a/net-im/mu-conference/files/pkg-message.in b/net-im/mu-conference/files/pkg-message.in
new file mode 100644
index 000000000000..4561c840e920
--- /dev/null
+++ b/net-im/mu-conference/files/pkg-message.in
@@ -0,0 +1,21 @@
+******************************************************************************
+Remember to edit %%PREFIX%%/etc/muc.xml to suit your needs.
+
+If necessary, please create directories owned by user "%%JABBER_USER%%":
+%%JABBER_SPOOLDIR%%/conference.localhost
+%%JABBER_SPOOLDIR%%/conference.localhost/logs
+%%MUC_LOGDIR%%
+
+Please read instructions for different jabber daemons you desire to use:
+- jabberd14 (net-im/jabber): 
+	%%DOCSDIR%%/README.FreeBSD.jabberd14
+- jabberd2 (net-im/jabberd): 
+	%%DOCSDIR%%/README.FreeBSD.jabberd2
+
+If you did not select WITH_JABBER, WITH_JABBERD or WITH_EJABBERD, you may want
+to use another or an external jabber server. Please read instructions from:
+%%DOCSDIR%%/README.FreeBSD.external
+
+If you are using MySQL, sample database script can be found in:
+%%DOCSDIR%%/mu-conference.sql
+******************************************************************************