- Fix compatibility with jabber 1.6.0

- Add plist support
- Pass maintainership to submitter

NOTES:  Please read the UPDATING

PR:             109404
Submitted by:   Martin Matuska <martin@matuska.org>

4 files changed, 101 insertions, 12 deletions

diff --git a/net-im/jabber-conference/files/README.jabberd14.in b/net-im/jabber-conference/files/README.jabberd14.in
new file mode 100644
index 000000000000..61c86b1105b4
--- /dev/null
+++ b/net-im/jabber-conference/files/README.jabberd14.in
@@ -0,0 +1,89 @@
+The sample configuration file for jabberd14 may be located in:
+%%TARGETDIR%%/etc/jabber.xml.sample
+
+Please make 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' or 'private.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.
+
+Conference can be configured as a private conferencing server (no browse,
+all rooms locked up).  Add the following to make a private conferencing
+server (around line 921 in the sample configuration file):
+-------------------------------------------------------------------------------
+
+  <service id='private.localhost'>
+    <load><conference>%%TARGETDIR%%/lib/jabber/conference.so</conference></load>
+    <conference xmlns="jabber:config:conference">
+      <private/>
+      <history>30</history>
+      <vCard>
+        <FN>Private Conferences</FN>
+        <DESC>This service is for private conferencing rooms.</DESC>
+        <URL>http://foo.bar/</URL>
+      </vCard>
+      <notice>
+        <join> has become available</join>
+        <leave> has left</leave>
+        <rename> is now known as </rename>
+      </notice>
+    </conference>
+  </service>
+
+-------------------------------------------------------------------------------
+Add this section to the browse area of the jsm service to advertise it
+to your users (around line 382 of the sample config file):
+-------------------------------------------------------------------------------
+
+	<item category="conference" type="text" jid="private.localhost" name="Private Conferencing"/>
+
+-------------------------------------------------------------------------------
+Conference can ALSO be configured as a public chatroom server 
+(add this around line 921 in the sample config file):
+
+(NOTE: don't forget to change the secret and note that this is transmitted
+  in plain text.)
+-------------------------------------------------------------------------------
+
+  <service id='conference.localhost'>
+    <load><conference>%%TARGETDIR%%/lib/jabber/conference.so</conference></load>
+    <conference xmlns="jabber:config:conference">
+      <public/>
+      <vCard>
+        <FN>Public Chatrooms</FN>
+        <DESC>This service is for public chatrooms.</DESC>
+        <URL>http://foo.bar/</URL>
+      </vCard>
+      <history>20</history>
+      <notice>
+        <join> has become available</join>
+        <leave> has left</leave>
+        <rename> is now known as </rename>
+      </notice>
+      <room jid="help@conference.localhost">
+        <name>Assistance Zone</name>
+        <privacy/>
+      </room>
+      <room jid="admin@conference.localhost">
+        <name>Adminz only</name>
+        <secret>con0r</secret>
+        <notice>
+          <join> just rocks!</join>
+          <leave> gets lost</leave>
+          <rename> feels it is more important to be known as </rename>
+        </notice>
+      </room>
+    </conference>
+  </service>
+
+-------------------------------------------------------------------------------
+Add this section to the browse area of the jsm service to advertise it 
+to your users (around line 246 of the sample configuration file):
+-------------------------------------------------------------------------------
+
+	<item category="conference" type="text" jid="conference.localhost" name="Public Chatrooms"/>
+
+-------------------------------------------------------------------------------
+Be sure to restart your server after reconfiguring.
diff --git a/net-im/jabber-conference/files/patch-Makefile b/net-im/jabber-conference/files/patch-Makefile
new file mode 100644
index 000000000000..d30c58ee3a34
--- /dev/null
+++ b/net-im/jabber-conference/files/patch-Makefile
@@ -0,0 +1,10 @@
+--- Makefile.orig	Wed Feb 21 15:43:41 2007
++++ Makefile	Wed Feb 21 15:44:15 2007
+@@ -1,7 +1,3 @@
+-include ../platform-settings
+-
+-CFLAGS:=$(CFLAGS) -I../jabberd
+-
+ conference_OBJECTS=conference.o conference_room.o conference_user.o
+ 
+ all: conference
diff --git a/net-im/jabber-conference/files/patch-aa b/net-im/jabber-conference/files/patch-aa
deleted file mode 100644
index f430df919a23..000000000000
--- a/net-im/jabber-conference/files/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
---- Makefile.orig	Mon Apr 15 00:17:50 2002
-+++ Makefile	Mon Apr 15 00:18:33 2002
-@@ -1,6 +1,7 @@
--include ../platform-settings
-+INCDIR=	${PREFIX}/include/jabber
-+include ${INCDIR}/platform-settings
- 
--CFLAGS:=$(CFLAGS) -I../jabberd
-+CFLAGS:=$(CFLAGS) -I${INCDIR}
- 
- conference_OBJECTS=conference.o conference_room.o conference_user.o
- 
diff --git a/net-im/jabber-conference/files/pkg-message.in b/net-im/jabber-conference/files/pkg-message.in
new file mode 100644
index 000000000000..c51d212244f8
--- /dev/null
+++ b/net-im/jabber-conference/files/pkg-message.in
@@ -0,0 +1,2 @@
+You can find a configuration example in:
+%%DOCSDIR%%/README.jabberd14