ports/109404: [UPDATE] net-im/jabber-conference
Martin Matuska
martin at matuska.org
Wed Feb 21 20:20:09 UTC 2007
>Number: 109404
>Category: ports
>Synopsis: [UPDATE] net-im/jabber-conference
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Feb 21 20:20:06 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Martin Matuska
>Release: FreeBSD 6.2-RELEASE
>Organization:
>Environment:
System: FreeBSD 6.2-RELEASE
>Description:
This update fixes compatibility with jabber-1.6.0 ( ports/109259 , latest followup )
Update of jabberd has to be commited first. I request maintainership for this port.
Patch:
http://www.matuska.org/martin/freebsd/ports/patches/net-im_jabber-conference.patch
.tar.gz of the port:
http://www.matuska.org/martin/freebsd/ports/patches/net-im_jabber-conference.tar.gz
SVN tree:
http://www.matuska.org/martin/cgi/viewvc.cgi/ports/net-im/jabber-conference
Tinderbox log:
http://tinderbox.vx.sk/logs/6.2-FreeBSD-amd64/jabber-conference-0.4.1_2.log
portlint -a:
WARN: Makefile: only one MASTER_SITE configured. Consider adding additional mirrors.
0 fatal errors and 1 warning found.
Link to jabber-patch 1.4.4->1.6.0 ( ports/109259 ):
http://www.matuska.org/martin/freebsd/ports/patches/net-im_jabber.patch
>How-To-Repeat:
>Fix:
diff -Nbur net-im/jabber-conference.orig/Makefile net-im/jabber-conference/Makefile
--- net-im/jabber-conference.orig/Makefile Wed Feb 21 17:26:15 2007
+++ net-im/jabber-conference/Makefile Wed Feb 21 17:35:57 2007
@@ -6,29 +6,46 @@
PORTNAME= conference
PORTVERSION= 0.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-im
MASTER_SITES= http://freebsd.unixfreunde.de/sources/
PKGNAMEPREFIX= jabber-
DIST_SUBDIR= jabber
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= martin at matuska.org
COMMENT= Jabber Conferencing module
-BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net-im/jabber
+LIB_DEPENDS= jabberd.1:${PORTSDIR}/net-im/jabber
-PLIST_FILES= lib/jabber/conference.so
USE_GMAKE= yes
-CONFIGURE_ARGS+= --with-jabberd=${PREFIX}/include/jabber
+CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/jabber \
+ -I${LOCALBASE}/include/pth
-post-patch:
- @echo "${PREFIX}" > ${WRKSRC}/.prefix-freebsd
+MAKE_ARGS+= MCFLAGS="-shared" \
+ LDFLAGS="-L${LOCALBASE}/lib/pth -L${LOCALBASE}/lib/jabber"
+
+SUB_FILES+= pkg-message README.jabberd14
+DOCSDIR= ${TARGETDIR}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
+
+.if !defined(NOPORTDOCS)
+PKGMESSAGE= ${WRKDIR}/pkg-message
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
+CFLAGS+= -fPIC
+.endif
do-install:
- ${INSTALL_DATA} ${WRKSRC}/conference.so ${PREFIX}/lib/jabber/
+ ${INSTALL_PROGRAM} ${WRKSRC}/conference.so ${TARGETDIR}/lib/jabber/
post-install:
- @cat pkg-message
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKDIR}/README.jabberd14 ${DOCSDIR}
+ @${CAT} ${PKGMESSAGE}
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -Nbur net-im/jabber-conference.orig/files/README.jabberd14.in net-im/jabber-conference/files/README.jabberd14.in
--- net-im/jabber-conference.orig/files/README.jabberd14.in Thu Jan 1 01:00:00 1970
+++ net-im/jabber-conference/files/README.jabberd14.in Wed Feb 21 17:22:16 2007
@@ -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 at conference.localhost">
+ <name>Assistance Zone</name>
+ <privacy/>
+ </room>
+ <room jid="admin at 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 -Nbur net-im/jabber-conference.orig/files/patch-Makefile net-im/jabber-conference/files/patch-Makefile
--- net-im/jabber-conference.orig/files/patch-Makefile Thu Jan 1 01:00:00 1970
+++ net-im/jabber-conference/files/patch-Makefile Wed Feb 21 15:44:25 2007
@@ -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 -Nbur net-im/jabber-conference.orig/files/patch-aa net-im/jabber-conference/files/patch-aa
--- net-im/jabber-conference.orig/files/patch-aa Wed Feb 21 17:26:15 2007
+++ net-im/jabber-conference/files/patch-aa Thu Jan 1 01:00:00 1970
@@ -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 -Nbur net-im/jabber-conference.orig/files/pkg-message.in net-im/jabber-conference/files/pkg-message.in
--- net-im/jabber-conference.orig/files/pkg-message.in Thu Jan 1 01:00:00 1970
+++ net-im/jabber-conference/files/pkg-message.in Wed Feb 21 17:24:58 2007
@@ -0,0 +1,2 @@
+You can find a configuration example in:
+%%DOCSDIR%%/README.jabberd14
diff -Nbur net-im/jabber-conference.orig/pkg-message net-im/jabber-conference/pkg-message
--- net-im/jabber-conference.orig/pkg-message Wed Feb 21 17:26:15 2007
+++ net-im/jabber-conference/pkg-message Thu Jan 1 01:00:00 1970
@@ -1,75 +0,0 @@
-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 446 in the sample configuration file):
-
- <service id='private.localhost'>
- <load><conference>${PREFIX}/lib/jabber/conference.so</conference></load>
- <conference xmlns="jabberd: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 246 of the sample config file):
-
- <conference type="private" jid="private.localhost" name="Private Conferencing"/>
-
-
-Conference can ALSO be configured as a public chatroom server (add this
-around line 446 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>${PREFIX}/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 at conference.localhost">
- <name>Assistance Zone</name>
- <privacy/>
- </room>
- <room jid="admin at 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):
-
- <conference type="public" jid="conference.localhost" name="Public Chatrooms"/>
-
diff -Nbur net-im/jabber-conference.orig/pkg-plist net-im/jabber-conference/pkg-plist
--- net-im/jabber-conference.orig/pkg-plist Thu Jan 1 01:00:00 1970
+++ net-im/jabber-conference/pkg-plist Wed Feb 21 17:43:41 2007
@@ -0,0 +1,3 @@
+lib/jabber/conference.so
+%%PORTDOCS%%%%DOCSDIR%%/README.jabberd14
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list