From 262044c06025297689d2ac9eab400cd70fcb43a3 Mon Sep 17 00:00:00 2001 From: miwi Date: Tue, 27 Feb 2007 13:14:16 +0000 Subject: - 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 --- net-im/jabber-conference/Makefile | 37 ++++++--- net-im/jabber-conference/files/README.jabberd14.in | 89 ++++++++++++++++++++++ net-im/jabber-conference/files/patch-Makefile | 10 +++ net-im/jabber-conference/files/patch-aa | 12 --- net-im/jabber-conference/files/pkg-message.in | 2 + net-im/jabber-conference/pkg-message | 75 ------------------ net-im/jabber-conference/pkg-plist | 3 + 7 files changed, 131 insertions(+), 97 deletions(-) create mode 100644 net-im/jabber-conference/files/README.jabberd14.in create mode 100644 net-im/jabber-conference/files/patch-Makefile delete mode 100644 net-im/jabber-conference/files/patch-aa create mode 100644 net-im/jabber-conference/files/pkg-message.in delete mode 100644 net-im/jabber-conference/pkg-message create mode 100644 net-im/jabber-conference/pkg-plist (limited to 'net-im/jabber-conference') diff --git a/net-im/jabber-conference/Makefile b/net-im/jabber-conference/Makefile index e6777192b0c4..3008b6489070 100644 --- a/net-im/jabber-conference/Makefile +++ b/net-im/jabber-conference/Makefile @@ -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@FreeBSD.org +MAINTAINER= martin@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 + +.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 +.include 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): +------------------------------------------------------------------------------- + + + %%TARGETDIR%%/lib/jabber/conference.so + + + 30 + + Private Conferences + This service is for private conferencing rooms. + http://foo.bar/ + + + has become available + has left + is now known as + + + + +------------------------------------------------------------------------------- +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): +------------------------------------------------------------------------------- + + + +------------------------------------------------------------------------------- +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.) +------------------------------------------------------------------------------- + + + %%TARGETDIR%%/lib/jabber/conference.so + + + + Public Chatrooms + This service is for public chatrooms. + http://foo.bar/ + + 20 + + has become available + has left + is now known as + + + Assistance Zone + + + + Adminz only + con0r + + just rocks! + gets lost + feels it is more important to be known as + + + + + +------------------------------------------------------------------------------- +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): +------------------------------------------------------------------------------- + + + +------------------------------------------------------------------------------- +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 diff --git a/net-im/jabber-conference/pkg-message b/net-im/jabber-conference/pkg-message deleted file mode 100644 index e69d51816582..000000000000 --- a/net-im/jabber-conference/pkg-message +++ /dev/null @@ -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): - - - ${PREFIX}/lib/jabber/conference.so - - - 30 - - Private Conferences - This service is for private conferencing rooms. - http://foo.bar/ - - - has become available - has left - is now known as - - - - -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 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.) - - - ${PREFIX}/lib/jabber/conference.so - - - - Public Chatrooms - This service is for public chatrooms. - http://foo.bar/ - - 20 - - has become available - has left - is now known as - - - Assistance Zone - - - - Adminz only - con0r - - just rocks! - gets lost - feels it is more important to be known as - - - - - -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): - - - diff --git a/net-im/jabber-conference/pkg-plist b/net-im/jabber-conference/pkg-plist new file mode 100644 index 000000000000..09bfdfd18b29 --- /dev/null +++ b/net-im/jabber-conference/pkg-plist @@ -0,0 +1,3 @@ +lib/jabber/conference.so +%%PORTDOCS%%%%DOCSDIR%%/README.jabberd14 +%%PORTDOCS%%@dirrm %%DOCSDIR%% -- cgit