Attachment #80065 for bug #114932

View | Details | Raw Unified | Return to bug 114932
Collapse All | Expand All




#

PORTNAME=	jabberd
PORTVERSION=	2.1.10
PORTREVISION=	2
CATEGORIES=	net-im
MASTER_SITES=	http://ftp.xiaoka.com/jabberd2/releases/
		http://jabberstudio.2nw.net/jabberd2/
DISTNAME=	${PORTNAME}-${PORTVERSION:R}s${PORTVERSION:E}
DIST_SUBDIR=	jabber

MAINTAINER=	mm@FreeBSD.org
COMMENT=	Online presence and instant messaging server

LIB_DEPENDS=	idn.16:${PORTSDIR}/dns/libidn \
		gsasl.10:${PORTSDIR}/security/gsasl

OPTIONS=	POSTGRESQL "Use PostgreSQL for storage and authentication" off \
		MYSQL "Use MySQL for storage and authentication" off \

		SQLITE "Use SQLITE3 for storage" off \
		PAM "Use PAM for authentication" off \
		PIPE "Enable pipe auth/reg support" off \
		ANON "Enable anonymous auth/reg support" off \
		DEBUG "Compile with debug information" on

GNU_CONFIGURE=	yes
USE_OPENSSL=	yes
USE_ICONV=	yes
USE_RC_SUBR=	jabberd
USE_LDCONFIG=	${TARGETDIR}/lib/jabberd
CONFIGURE_ARGS=	--localstatedir=/var \
		--sysconfdir=${PREFIX}/etc/jabberd \
		--enable-ssl \
		--with-extra-include-path="${LOCALBASE}/include ${EIP}" \
		--with-extra-library-path="${LOCALBASE}/lib ${ELP}" \
		--enable-fs

JABBER_USER=	jabber
JABBER_UID=	93
JABBER_GROUP=	${JABBER_USER}
JABBER_GID=	${JABBER_UID}
JABBER_ETCDIR=	"${TARGETDIR}/etc/jabberd"
JABBER_RUNDIR=	"/var/jabberd"

SUB_LIST+=	JABBER_USER=${JABBER_USER} JABBER_UID=${JABBER_UID} \
		JABBER_GROUP=${JABBER_GROUP} JABBER_GID=${JABBER_GID} \
		JABBER_ETCDIR="${JABBER_ETCDIR}" \
		JABBER_RUNDIR="${JABBER_RUNDIR}"

SUB_FILES+=	pkg-install pkg-deinstall

PORTDOCS=	*

DOCFILES=	AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROTOCOL README \
		TODO UPGRADE

.include <bsd.port.pre.mk>

.if defined(WITH_DEBUG)

.if defined(WITH_POSTGRESQL)
USE_PGSQL=	yes
CONFIGURE_ARGS+=--enable-pgsql
PLIST_SUB+=	SUB_PGSQL=""
.else
CONFIGURE_ARGS+=--disable-pgsql
PLIST_SUB+=	SUB_PGSQL="@comment "
.endif

.if defined(WITH_SQLITE)
CONFIGURE_ARGS+=--enable-sqlite
LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3
PLIST_SUB+=	SUB_SQLITE=""
.else
CONFIGURE_ARGS+=--disable-sqlite
PLIST_SUB+=	SUB_SQLITE="@comment "
.endif

.if defined(WITH_MYSQL)

CONFIGURE_ARGS+=--enable-mysql
EIP+=:${LOCALBASE}/include/mysql
ELP+=:${LOCALBASE}/lib/mysql
PLIST_SUB+=	SUB_MYSQL=""
.else
CONFIGURE_ARGS+=--disable-mysql
PLIST_SUB+=	SUB_MYSQL="@comment "
.endif

.if defined(WITH_BDB)
USE_BDB=	yes
WANT_BDB_VER=	43
CONFIGURE_ARGS+=--enable-db
CONFIGURE_ARGS+=--oldincludedir=/nonexistant
EIP+=:${BDB_INCLUDE_DIR}
ELP+=:${BDB_LIB_DIR}
PLIST_SUB+=	SUB_BDB=""
.else
CONFIGURE_ARGS+=--disable-db
PLIST_SUB+=	SUB_BDB="@comment "
.endif

.if defined(WITH_LDAP)
USE_OPENLDAP=	yes
CONFIGURE_ARGS+=--enable-ldap
PLIST_SUB+=	SUB_LDAP=""
.else
CONFIGURE_ARGS+=--disable-ldap
PLIST_SUB+=	SUB_LDAP="@comment "
.endif

.if defined(WITH_PAM)
CONFIGURE_ARGS+=--enable-pam
PLIST_SUB+=	SUB_PAM=""
.else
CONFIGURE_ARGS+=--disable-pam
PLIST_SUB+=	SUB_PAM="@comment "
.endif

.if defined(WITH_PIPE)
CONFIGURE_ARGS+=--enable-pipe
PLIST_SUB+=	SUB_PIPE=""
.else
PLIST_SUB+=	SUB_PIPE="@comment "
.endif

.if defined(WITH_ANON)
CONFIGURE_ARGS+=--enable-anon
PLIST_SUB+=	SUB_ANON=""
.else
PLIST_SUB+=	SUB_ANON="@comment "
.endif

MAN8=		c2s.8 jabberd.8 resolver.8 router.8 s2s.8 sm.8

pre-install:
	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

post-install:
	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
	@${CHOWN} -R ${JABBER_USER}:${JABBER_GROUP} ${PREFIX}/etc/jabberd
	@${FIND} ${PREFIX}/etc/jabberd -type d | ${XARGS} ${CHMOD} 750
	@${FIND} ${PREFIX}/etc/jabberd -type f | ${XARGS} ${CHMOD} 660
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}
.for FILE in ${DOCFILES}
	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
.endfor
.for FILE in db-setup.mysql db-setup.pgsql db-setup.sqlite
	@${INSTALL_DATA} ${WRKSRC}/tools/${FILE} ${DOCSDIR}
.endfor
.endif

.include <bsd.port.post.mk>

Lines 1-6 Link Here

(-)ports/net-im/jabberd/distinfo (-6 / +3 lines)
1	MD5 (jabber/jabberd-2.0s11.tar.gz) = 67d1663ed97a5ba707d5d145b1d19c55	1	MD5 (jabber/jabberd-2.1.10.tar.gz) = d0d938395c1eda5d37b2af4f99477ccd
2	SHA256 (jabber/jabberd-2.0s11.tar.gz) = 0ef0f668f5d86b8c22ce0ae2366bff0be9d4c961d6f48b7b849ebe749bdb213a	2	SHA256 (jabber/jabberd-2.1.10.tar.gz) = 9acc8bdfc0f24bd40c6b95ca84f4213d5e17fb4020f969adfa5798b8b7790c58
3	SIZE (jabber/jabberd-2.0s11.tar.gz) = 777466	3	SIZE (jabber/jabberd-2.1.10.tar.gz) = 1397275
4	MD5 (jabber/vcard-avatar.diff) = adf9078a9c68c40a8fbe37cf282d37a4
5	SHA256 (jabber/vcard-avatar.diff) = 5e42dc7e31e6c222c3cabc3e8916c8989b37723c800e9afc69e28d2731d4ca9b
6	SIZE (jabber/vcard-avatar.diff) = 5463




#!/bin/sh
# $FreeBSD: ports/net-im/jabberd/pkg-deinstall,v 1.3 2004/01/01 13:21:15 demon Exp $
#

if [ "$2" != "POST-DEINSTALL" ]; then
    exit 0
fi

USER=jabber

if pw usershow "${USER}" 2>/dev/null 1>&2; then
	echo "To delete Jabber user permanently, use 'pw userdel ${USER}'"
fi

if pw groupshow "${USER}" 2>/dev/null 1>&2; then
	echo "To delete Jabber group permanently, use 'pw groupdel ${USER}'"
fi

echo "If you wish to delete jabber data files, remove '/var/jabberd' directory."

exit 0

Lines 1-4 Link Here

(-)ports/net-im/jabberd/pkg-descr (-3 / +4 lines)
1	The Jabber server (jabberd) is a daemon for Jabber clients to connect	1	jabberd 2.x series is the next generation of the Jabber/XMPP server.
2	and communicate with.	2	It has been rewritten from the ground up to be scalable, architecturally
		3	sound and to support the latest protocol extensions coming out of the XSF.
3		4
4	WWW: http://jabberd.jabberstudio.org/	5	WWW: http://jabberd2.xiaoka.com/




#!/bin/sh
# $FreeBSD: ports/net-im/jabberd/pkg-install,v 1.3 2004/01/09 11:30:09 demon Exp $
#

if [ "$2" != "PRE-INSTALL" ]; then
    exit 0
fi

USER=jabber
GROUP=${USER}
UID=93
GID=${UID}

if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
	if pw groupadd ${GROUP} -g ${GID}; then
		echo "Added group \"${GROUP}\"."
	else
		echo "Adding group \"${GROUP}\" failed..."
		exit 1
	fi
fi

if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
		-s "/sbin/nologin" -d "/nonexistent" \
		-c "Jabber Daemon"; \
	then
		echo "Added user \"${USER}\"."
	else
		echo "Adding user \"${USER}\" failed..."
		exit 1
	fi
fi

mkdir -m 750 /var/jabberd /var/jabberd/db /var/jabberd/pid /var/jabberd/log
chown jabber:jabber /var/jabberd /var/jabberd/db /var/jabberd/pid /var/jabberd/log

exit 0




@unexec [ ! -f /var/jabberd/pid/router.pid ] || %D/etc/rc.d/jabberd stop || true
bin/c2s
bin/jabberd
bin/resolver

etc/jabberd/sm.xml.dist
@unexec if cmp -s %D/etc/jabberd/templates/roster.xml %D/etc/jabberd/templates/roster.xml.dist; then rm -f %D/etc/jabberd/templates/roster.xml; fi
etc/jabberd/templates/roster.xml.dist
%%SUB_ANON%%lib/jabberd/authreg_anon.la
%%SUB_ANON%%lib/jabberd/authreg_anon.so
%%SUB_BDB%%lib/jabberd/authreg_db.la
%%SUB_BDB%%lib/jabberd/authreg_db.so
%%SUB_LDAP%%lib/jabberd/authreg_ldap.la
%%SUB_LDAP%%lib/jabberd/authreg_ldap.so
%%SUB_MYSQL%%lib/jabberd/authreg_mysql.la
%%SUB_MYSQL%%lib/jabberd/authreg_mysql.so
%%SUB_PAM%%lib/jabberd/authreg_pam.la
%%SUB_PAM%%lib/jabberd/authreg_pam.so
%%SUB_PIPE%%lib/jabberd/authreg_pipe.la
%%SUB_PIPE%%lib/jabberd/authreg_pipe.so
%%SUB_PGSQL%%lib/jabberd/authreg_pgsql.la
%%SUB_PGSQL%%lib/jabberd/authreg_pgsql.so
%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.la
%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.so
lib/jabberd/mod_active.la
lib/jabberd/mod_active.so
lib/jabberd/mod_active.so.0
lib/jabberd/mod_amp.la
lib/jabberd/mod_amp.so
lib/jabberd/mod_amp.so.0
lib/jabberd/mod_announce.la
lib/jabberd/mod_announce.so
lib/jabberd/mod_announce.so.0
lib/jabberd/mod_deliver.la
lib/jabberd/mod_deliver.so
lib/jabberd/mod_deliver.so.0
lib/jabberd/mod_disco-publish.la
lib/jabberd/mod_disco-publish.so
lib/jabberd/mod_disco-publish.so.0
lib/jabberd/mod_disco.la
lib/jabberd/mod_disco.so
lib/jabberd/mod_disco.so.0
lib/jabberd/mod_echo.la
lib/jabberd/mod_echo.so
lib/jabberd/mod_echo.so.0
lib/jabberd/mod_help.la
lib/jabberd/mod_help.so
lib/jabberd/mod_help.so.0
lib/jabberd/mod_iq-last.la
lib/jabberd/mod_iq-last.so
lib/jabberd/mod_iq-last.so.0
lib/jabberd/mod_iq-ping.la
lib/jabberd/mod_iq-ping.so
lib/jabberd/mod_iq-ping.so.0
lib/jabberd/mod_iq-private.la
lib/jabberd/mod_iq-private.so
lib/jabberd/mod_iq-private.so.0
lib/jabberd/mod_iq-time.la
lib/jabberd/mod_iq-time.so
lib/jabberd/mod_iq-time.so.0
lib/jabberd/mod_iq-vcard.la
lib/jabberd/mod_iq-vcard.so
lib/jabberd/mod_iq-vcard.so.0
lib/jabberd/mod_iq-version.la
lib/jabberd/mod_iq-version.so
lib/jabberd/mod_iq-version.so.0
lib/jabberd/mod_offline.la
lib/jabberd/mod_offline.so
lib/jabberd/mod_offline.so.0
lib/jabberd/mod_presence.la
lib/jabberd/mod_presence.so
lib/jabberd/mod_presence.so.0
lib/jabberd/mod_privacy.la
lib/jabberd/mod_privacy.so
lib/jabberd/mod_privacy.so.0
lib/jabberd/mod_roster.la
lib/jabberd/mod_roster.so
lib/jabberd/mod_roster.so.0
lib/jabberd/mod_session.la
lib/jabberd/mod_session.so
lib/jabberd/mod_session.so.0
lib/jabberd/mod_status.la
lib/jabberd/mod_status.so
lib/jabberd/mod_status.so.0
lib/jabberd/mod_template-roster.la
lib/jabberd/mod_template-roster.so
lib/jabberd/mod_template-roster.so.0
lib/jabberd/mod_vacation.la
lib/jabberd/mod_vacation.so
lib/jabberd/mod_vacation.so.0
lib/jabberd/mod_validate.la
lib/jabberd/mod_validate.so
lib/jabberd/mod_validate.so.0
lib/jabberd/storage_fs.la
lib/jabberd/storage_fs.so
%%SUB_BDB%%lib/jabberd/storage_db.la
%%SUB_BDB%%lib/jabberd/storage_db.so
%%SUB_MYSQL%%lib/jabberd/storage_mysql.la
%%SUB_MYSQL%%lib/jabberd/storage_mysql.so
%%SUB_PGSQL%%lib/jabberd/storage_pgsql.la
%%SUB_PGSQL%%lib/jabberd/storage_pgsql.so
%%SUB_SQLITE%%lib/jabberd/storage_sqlite.la
%%SUB_SQLITE%%lib/jabberd/storage_sqlite.so
@dirrm lib/jabberd
@dirrmtry etc/jabberd/templates
@dirrmtry etc/jabberd




#!/bin/sh

# $FreeBSD$

# PROVIDE: jabberd
# REQUIRE: DAEMON
# BEFORE: LOGIN
# KEYWORD: shutdown
#
prefix=%%PREFIX%%

# Define these jabberd_* variables in one of these files:
#       /etc/rc.conf
#       /etc/rc.conf.local
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
jabberd_chdir=${jabberd_chdir-"%%JABBER_RUNDIR%%/pid"}
jabberd_enable=${jabberd_enable-"NO"}
jabberd_user=${jabberd_user-"%%JABBER_USER%%"}

. %%RC_SUBR%%

name="jabberd"
rcvar=`set_rcvar`
command="${prefix}/bin/jabberd"
command_args="&"
procname="${prefix}/bin/router"

load_rc_config $name

pidfile="${jabberd_chdir}/router.pid"

case "$1" in
	stop|faststop|onestop)
		echo "Stopping Jabber2"
		killall -u ${jabberd_user} jabberd c2s resolver router s2s sm
		for file in c2s resolver router s2s sm; do
			rm -f ${jabberd_chdir}/$file.pid
		done
	;;
	*)
		run_rc_command "$1"
	;;
esac




#!/bin/sh

# Start or stop jabberd
# $FreeBSD: ports/net-im/jabberd/files/jabberd.sh.in,v 1.2 2006/02/20 20:47:32 dougb Exp $

# PROVIDE: jabberd
# REQUIRE: DAEMON
# BEFORE: LOGIN
# KEYWORD: shutdown
#
prefix=%%PREFIX%%

# Define these jabberd_* variables in one of these files:
#       /etc/rc.conf
#       /etc/rc.conf.local
#
# DO NOT CHANGE THESE DEFAULT VALUES HERE
#
jabberd_chdir=${jabberd_chdir-"/var/jabberd/pid"}
jabberd_enable=${jabberd_enable-"NO"}
jabberd_user=${jabberd_user-"jabber"}

. %%RC_SUBR%%

name="jabberd"
rcvar=`set_rcvar`
command="${prefix}/bin/jabberd"
command_args="&"
procname="${prefix}/bin/router"

load_rc_config $name

pidfile="${jabberd_chdir}/router.pid"

case "$1" in
	stop|faststop|onestop)
		echo "Stopping Jabber2"
		killall -u ${jabberd_user} jabberd c2s resolver router s2s sm
		for file in c2s resolver router s2s sm; do
			rm -f ${jabberd_chdir}/$file.pid
		done
	;;
	*)
		run_rc_command "$1"
	;;
esac




#!/bin/sh

if [ "$2" != "POST-DEINSTALL" ]; then
    exit 0
fi

USER=%%JABBER_USER%%
GROUP=%%JABBER_GROUP%%
RUNDIR="%%JABBER_RUNDIR%%"

if pw usershow "${USER}" 2>/dev/null 1>&2; then
	echo "To delete Jabber user permanently, use 'pw userdel ${USER}'"
fi

if pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
	echo "To delete Jabber group permanently, use 'pw groupdel ${USER}'"
fi

echo "You may want to delete the following directories:"
echo "${RUNDIR}" 

exit 0




#!/bin/sh

if [ "$2" != "POST-INSTALL" ]; then
    exit 0
fi

USER=%%JABBER_USER%%
GROUP=%%JABBER_GROUP%%
UID=%%JABBER_UID%%
GID=%%JABBER_GID%%
ETCDIR=%%JABBER_ETCDIR%%
RUNDIR=%%JABBER_RUNDIR%%

if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
	if pw groupadd ${GROUP} -g ${GID}; then
		echo "Added group \"${GROUP}\"."
	else
		echo "Adding group \"${GROUP}\" failed..."
		exit 1
	fi
fi

if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
		-s "/sbin/nologin" -d "/nonexistent" \
		-c "Jabber Daemon"; \
	then
		echo "Added user \"${USER}\"."
	else
		echo "Adding user \"${USER}\" failed..."
		exit 1
	fi
fi

if [ ! -d ${RUNDIR} ]; then
	echo "Creating \"${RUNDIR}\"."
	mkdir -p ${RUNDIR}/pid ${RUNDIR}/db ${RUNDIR}/logs
fi

echo "Fixing ownerships and modes in \"${ETCDIR}\"."
chown -R ${USER}:${GROUP} ${ETCDIR}
chmod -R go= ${ETCDIR}

echo "Fixing ownerships and modes in \"${RUNDIR}\"."
chown -R ${USER}:${GROUP} ${RUNDIR}
chmod -R go= ${RUNDIR}

Return to bug 114932

Lines 6-23 Link Here

(-)ports/net-im/jabberd/Makefile (-22 / +61 lines)
6	#	6	#
7		7
8	PORTNAME= jabberd	8	PORTNAME= jabberd
9	PORTVERSION= 2.0.11	9	PORTVERSION= 2.1.10
10	PORTREVISION= 2
11	CATEGORIES= net-im	10	CATEGORIES= net-im
12	MASTER_SITES= http://jabberstudio.rediris.es/jabberd2/ \	11	MASTER_SITES= http://ftp.xiaoka.com/jabberd2/releases/
13	http://jabberstudio.2nw.net/jabberd2/
14	DISTNAME= ${PORTNAME}-${PORTVERSION:R}s${PORTVERSION:E}
15	DIST_SUBDIR= jabber	12	DIST_SUBDIR= jabber
16		13
17	MAINTAINER= kirk@strauser.com	14	MAINTAINER= mm@FreeBSD.org
18	COMMENT= Online presence and instant messaging server	15	COMMENT= Online presence and instant messaging server
19		16
20	LIB_DEPENDS= idn.16:${PORTSDIR}/dns/libidn	17	LIB_DEPENDS= idn.16:${PORTSDIR}/dns/libidn \
		18	gsasl.10:${PORTSDIR}/security/gsasl
21		19
22	OPTIONS= POSTGRESQL "Use PostgreSQL for storage and authentication" off \	20	OPTIONS= POSTGRESQL "Use PostgreSQL for storage and authentication" off \
23	MYSQL "Use MySQL for storage and authentication" off \	21	MYSQL "Use MySQL for storage and authentication" off \
Lines 26-44 Link Here
26	SQLITE "Use SQLITE3 for storage" off \	24	SQLITE "Use SQLITE3 for storage" off \
27	PAM "Use PAM for authentication" off \	25	PAM "Use PAM for authentication" off \
28	PIPE "Enable pipe auth/reg support" off \	26	PIPE "Enable pipe auth/reg support" off \
29	AVATAR "Enable avatar support in vCard" off \	27	ANON "Enable anonymous auth/reg support" off \
30	DEBUG "Compile with debug information" on	28	DEBUG "Compile with debug information" on
31		29
32	GNU_CONFIGURE= yes	30	GNU_CONFIGURE= yes
33	USE_OPENSSL= yes	31	USE_OPENSSL= yes
34	USE_ICONV= yes	32	USE_ICONV= yes
35	USE_RC_SUBR= jabberd.sh	33	USE_RC_SUBR= jabberd
		34	USE_LDCONFIG= ${TARGETDIR}/lib/jabberd
36	CONFIGURE_ARGS= --localstatedir=/var \	35	CONFIGURE_ARGS= --localstatedir=/var \
		36	--sysconfdir=${PREFIX}/etc/jabberd \
37	--enable-ssl \	37	--enable-ssl \
38	--with-extra-include-path=${LOCALBASE}/include${EIP} \	38	--with-extra-include-path="${LOCALBASE}/include ${EIP}" \
39	--with-extra-library-path=${LOCALBASE}/lib${ELP} \	39	--with-extra-library-path="${LOCALBASE}/lib ${ELP}" \
40	--enable-fs	40	--enable-fs
41		41
		42	JABBER_USER= jabber
		43	JABBER_UID= 93
		44	JABBER_GROUP= ${JABBER_USER}
		45	JABBER_GID= ${JABBER_UID}
		46	JABBER_ETCDIR= "${TARGETDIR}/etc/jabberd"
		47	JABBER_RUNDIR= "/var/jabberd"
		48
		49	SUB_LIST+= JABBER_USER=${JABBER_USER} JABBER_UID=${JABBER_UID} \
		50	JABBER_GROUP=${JABBER_GROUP} JABBER_GID=${JABBER_GID} \
		51	JABBER_ETCDIR="${JABBER_ETCDIR}" \
		52	JABBER_RUNDIR="${JABBER_RUNDIR}"
		53
		54	SUB_FILES+= pkg-install pkg-deinstall
		55
		56	PORTDOCS= *
		57
		58	DOCFILES= AUTHORS BUGS COPYING ChangeLog INSTALL NEWS PROTOCOL README \
		59	TODO UPGRADE
		60
42	.include <bsd.port.pre.mk>	61	.include <bsd.port.pre.mk>
43		62
44	.if defined(WITH_DEBUG)	63	.if defined(WITH_DEBUG)
Lines 48-62 Link Here
48	.if defined(WITH_POSTGRESQL)	67	.if defined(WITH_POSTGRESQL)
49	USE_PGSQL= yes	68	USE_PGSQL= yes
50	CONFIGURE_ARGS+=--enable-pgsql	69	CONFIGURE_ARGS+=--enable-pgsql
		70	PLIST_SUB+= SUB_PGSQL=""
51	.else	71	.else
52	CONFIGURE_ARGS+=--disable-pgsql	72	CONFIGURE_ARGS+=--disable-pgsql
		73	PLIST_SUB+= SUB_PGSQL="@comment "
53	.endif	74	.endif
54		75
55	.if defined(WITH_SQLITE)	76	.if defined(WITH_SQLITE)
56	CONFIGURE_ARGS+=--enable-sqlite	77	CONFIGURE_ARGS+=--enable-sqlite
57	LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3	78	LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3
		79	PLIST_SUB+= SUB_SQLITE=""
58	.else	80	.else
59	CONFIGURE_ARGS+=--disable-sqlite	81	CONFIGURE_ARGS+=--disable-sqlite
		82	PLIST_SUB+= SUB_SQLITE="@comment "
60	.endif	83	.endif
61		84
62	.if defined(WITH_MYSQL)	85	.if defined(WITH_MYSQL)
Lines 64-117 Link Here
64	CONFIGURE_ARGS+=--enable-mysql	87	CONFIGURE_ARGS+=--enable-mysql
65	EIP+=:${LOCALBASE}/include/mysql	88	EIP+=:${LOCALBASE}/include/mysql
66	ELP+=:${LOCALBASE}/lib/mysql	89	ELP+=:${LOCALBASE}/lib/mysql
		90	PLIST_SUB+= SUB_MYSQL=""
67	.else	91	.else
68	CONFIGURE_ARGS+=--disable-mysql	92	CONFIGURE_ARGS+=--disable-mysql
		93	PLIST_SUB+= SUB_MYSQL="@comment "
69	.endif	94	.endif
70		95
71	.if defined(WITH_BDB)	96	.if defined(WITH_BDB)
72	USE_BDB= yes	97	USE_BDB= yes
73	WANT_BDB_VER= 43
74	CONFIGURE_ARGS+=--enable-db	98	CONFIGURE_ARGS+=--enable-db
75	CONFIGURE_ARGS+=--oldincludedir=/nonexistant	99	CONFIGURE_ARGS+=--oldincludedir=/nonexistant
76	EIP+=:${BDB_INCLUDE_DIR}	100	EIP+=:${BDB_INCLUDE_DIR}
77	ELP+=:${BDB_LIB_DIR}	101	ELP+=:${BDB_LIB_DIR}
		102	PLIST_SUB+= SUB_BDB=""
78	.else	103	.else
79	CONFIGURE_ARGS+=--disable-db	104	CONFIGURE_ARGS+=--disable-db
		105	PLIST_SUB+= SUB_BDB="@comment "
80	.endif	106	.endif
81		107
82	.if defined(WITH_LDAP)	108	.if defined(WITH_LDAP)
83	USE_OPENLDAP= yes	109	USE_OPENLDAP= yes
84	CONFIGURE_ARGS+=--enable-ldap	110	CONFIGURE_ARGS+=--enable-ldap
		111	PLIST_SUB+= SUB_LDAP=""
85	.else	112	.else
86	CONFIGURE_ARGS+=--disable-ldap	113	CONFIGURE_ARGS+=--disable-ldap
		114	PLIST_SUB+= SUB_LDAP="@comment "
87	.endif	115	.endif
88		116
89	.if defined(WITH_PAM)	117	.if defined(WITH_PAM)
90	CONFIGURE_ARGS+=--enable-pam	118	CONFIGURE_ARGS+=--enable-pam
		119	PLIST_SUB+= SUB_PAM=""
91	.else	120	.else
92	CONFIGURE_ARGS+=--disable-pam	121	CONFIGURE_ARGS+=--disable-pam
		122	PLIST_SUB+= SUB_PAM="@comment "
93	.endif	123	.endif
94		124
95	.if defined(WITH_PIPE)	125	.if defined(WITH_PIPE)
96	CONFIGURE_ARGS+=--enable-pipe	126	CONFIGURE_ARGS+=--enable-pipe
		127	PLIST_SUB+= SUB_PIPE=""
		128	.else
		129	PLIST_SUB+= SUB_PIPE="@comment "
97	.endif	130	.endif
98		131
99	.if defined(WITH_AVATAR)	132	.if defined(WITH_ANON)
100	PATCH_SITES+= http://www.deepdarc.com/	133	CONFIGURE_ARGS+=--enable-anon
101	PATCHFILES+= vcard-avatar.diff	134	PLIST_SUB+= SUB_ANON=""
		135	.else
		136	PLIST_SUB+= SUB_ANON="@comment "
102	.endif	137	.endif
103		138
104	MAN8= c2s.8 jabberd.8 resolver.8 router.8 s2s.8 sm.8	139	MAN8= c2s.8 jabberd.8 resolver.8 router.8 s2s.8 sm.8
105		140
106	pre-install:
107	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
108
109	post-install:	141	post-install:
110	@${CHOWN} -R jabber:jabber ${PREFIX}/etc/jabberd	142	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
		143	@${CHOWN} -R ${JABBER_USER}:${JABBER_GROUP} ${PREFIX}/etc/jabberd
111	@${FIND} ${PREFIX}/etc/jabberd -type d \| ${XARGS} ${CHMOD} 750	144	@${FIND} ${PREFIX}/etc/jabberd -type d \| ${XARGS} ${CHMOD} 750
112	@${FIND} ${PREFIX}/etc/jabberd -type f \| ${XARGS} ${CHMOD} 660	145	@${FIND} ${PREFIX}/etc/jabberd -type f \| ${XARGS} ${CHMOD} 660
113	@${MKDIR} ${DATADIR}	146	.if !defined(NOPORTDOCS)
114	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.mysql ${DATADIR}	147	@${MKDIR} ${DOCSDIR}
115	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.pgsql ${DATADIR}	148	.for FILE in ${DOCFILES}
		149	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
		150	.endfor
		151	.for FILE in db-setup.mysql db-setup.pgsql db-setup.sqlite
		152	@${INSTALL_DATA} ${WRKSRC}/tools/${FILE} ${DOCSDIR}
		153	.endfor
		154	.endif
116		155
117	.include <bsd.port.post.mk>	156	.include <bsd.port.post.mk>

Removed Link Here

(-)ports/net-im/jabberd/pkg-deinstall (-21 lines)
1	#!/bin/sh
2	# $FreeBSD: ports/net-im/jabberd/pkg-deinstall,v 1.3 2004/01/01 13:21:15 demon Exp $
3	#
4
5	if [ "$2" != "POST-DEINSTALL" ]; then
6	exit 0
7	fi
8
9	USER=jabber
10
11	if pw usershow "${USER}" 2>/dev/null 1>&2; then
12	echo "To delete Jabber user permanently, use 'pw userdel ${USER}'"
13	fi
14
15	if pw groupshow "${USER}" 2>/dev/null 1>&2; then
16	echo "To delete Jabber group permanently, use 'pw groupdel ${USER}'"
17	fi
18
19	echo "If you wish to delete jabber data files, remove '/var/jabberd' directory."
20
21	exit 0

Removed Link Here

(-)ports/net-im/jabberd/pkg-install (-38 lines)
1	#!/bin/sh
2	# $FreeBSD: ports/net-im/jabberd/pkg-install,v 1.3 2004/01/09 11:30:09 demon Exp $
3	#
4
5	if [ "$2" != "PRE-INSTALL" ]; then
6	exit 0
7	fi
8
9	USER=jabber
10	GROUP=${USER}
11	UID=93
12	GID=${UID}
13
14	if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
15	if pw groupadd ${GROUP} -g ${GID}; then
16	echo "Added group \"${GROUP}\"."
17	else
18	echo "Adding group \"${GROUP}\" failed..."
19	exit 1
20	fi
21	fi
22
23	if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
24	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
25	-s "/sbin/nologin" -d "/nonexistent" \
26	-c "Jabber Daemon"; \
27	then
28	echo "Added user \"${USER}\"."
29	else
30	echo "Adding user \"${USER}\" failed..."
31	exit 1
32	fi
33	fi
34
35	mkdir -m 750 /var/jabberd /var/jabberd/db /var/jabberd/pid /var/jabberd/log
36	chown jabber:jabber /var/jabberd /var/jabberd/db /var/jabberd/pid /var/jabberd/log
37
38	exit 0

Lines 1-4 Link Here

(-)ports/net-im/jabberd/pkg-plist (-4 / +97 lines)
1	@unexec [ ! -f /var/jabberd/pid/router.pid ] \|\| %D/etc/rc.d/jabberd.sh stop \|\| true	1	@unexec [ ! -f /var/jabberd/pid/router.pid ] \|\| %D/etc/rc.d/jabberd stop \|\| true
2	bin/c2s	2	bin/c2s
3	bin/jabberd	3	bin/jabberd
4	bin/resolver	4	bin/resolver
Lines 21-28 Link Here
21	etc/jabberd/sm.xml.dist	21	etc/jabberd/sm.xml.dist
22	@unexec if cmp -s %D/etc/jabberd/templates/roster.xml %D/etc/jabberd/templates/roster.xml.dist; then rm -f %D/etc/jabberd/templates/roster.xml; fi	22	@unexec if cmp -s %D/etc/jabberd/templates/roster.xml %D/etc/jabberd/templates/roster.xml.dist; then rm -f %D/etc/jabberd/templates/roster.xml; fi
23	etc/jabberd/templates/roster.xml.dist	23	etc/jabberd/templates/roster.xml.dist
24	%%DATADIR%%/db-setup.mysql	24	%%SUB_ANON%%lib/jabberd/authreg_anon.la
25	%%DATADIR%%/db-setup.pgsql	25	%%SUB_ANON%%lib/jabberd/authreg_anon.so
26	@dirrm %%DATADIR%%	26	%%SUB_BDB%%lib/jabberd/authreg_db.la
		27	%%SUB_BDB%%lib/jabberd/authreg_db.so
		28	%%SUB_LDAP%%lib/jabberd/authreg_ldap.la
		29	%%SUB_LDAP%%lib/jabberd/authreg_ldap.so
		30	%%SUB_MYSQL%%lib/jabberd/authreg_mysql.la
		31	%%SUB_MYSQL%%lib/jabberd/authreg_mysql.so
		32	%%SUB_PAM%%lib/jabberd/authreg_pam.la
		33	%%SUB_PAM%%lib/jabberd/authreg_pam.so
		34	%%SUB_PIPE%%lib/jabberd/authreg_pipe.la
		35	%%SUB_PIPE%%lib/jabberd/authreg_pipe.so
		36	%%SUB_PGSQL%%lib/jabberd/authreg_pgsql.la
		37	%%SUB_PGSQL%%lib/jabberd/authreg_pgsql.so
		38	%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.la
		39	%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.so
		40	lib/jabberd/mod_active.la
		41	lib/jabberd/mod_active.so
		42	lib/jabberd/mod_active.so.0
		43	lib/jabberd/mod_amp.la
		44	lib/jabberd/mod_amp.so
		45	lib/jabberd/mod_amp.so.0
		46	lib/jabberd/mod_announce.la
		47	lib/jabberd/mod_announce.so
		48	lib/jabberd/mod_announce.so.0
		49	lib/jabberd/mod_deliver.la
		50	lib/jabberd/mod_deliver.so
		51	lib/jabberd/mod_deliver.so.0
		52	lib/jabberd/mod_disco-publish.la
		53	lib/jabberd/mod_disco-publish.so
		54	lib/jabberd/mod_disco-publish.so.0
		55	lib/jabberd/mod_disco.la
		56	lib/jabberd/mod_disco.so
		57	lib/jabberd/mod_disco.so.0
		58	lib/jabberd/mod_echo.la
		59	lib/jabberd/mod_echo.so
		60	lib/jabberd/mod_echo.so.0
		61	lib/jabberd/mod_help.la
		62	lib/jabberd/mod_help.so
		63	lib/jabberd/mod_help.so.0
		64	lib/jabberd/mod_iq-last.la
		65	lib/jabberd/mod_iq-last.so
		66	lib/jabberd/mod_iq-last.so.0
		67	lib/jabberd/mod_iq-ping.la
		68	lib/jabberd/mod_iq-ping.so
		69	lib/jabberd/mod_iq-ping.so.0
		70	lib/jabberd/mod_iq-private.la
		71	lib/jabberd/mod_iq-private.so
		72	lib/jabberd/mod_iq-private.so.0
		73	lib/jabberd/mod_iq-time.la
		74	lib/jabberd/mod_iq-time.so
		75	lib/jabberd/mod_iq-time.so.0
		76	lib/jabberd/mod_iq-vcard.la
		77	lib/jabberd/mod_iq-vcard.so
		78	lib/jabberd/mod_iq-vcard.so.0
		79	lib/jabberd/mod_iq-version.la
		80	lib/jabberd/mod_iq-version.so
		81	lib/jabberd/mod_iq-version.so.0
		82	lib/jabberd/mod_offline.la
		83	lib/jabberd/mod_offline.so
		84	lib/jabberd/mod_offline.so.0
		85	lib/jabberd/mod_presence.la
		86	lib/jabberd/mod_presence.so
		87	lib/jabberd/mod_presence.so.0
		88	lib/jabberd/mod_privacy.la
		89	lib/jabberd/mod_privacy.so
		90	lib/jabberd/mod_privacy.so.0
91	lib/jabberd/mod_roster.la
92	lib/jabberd/mod_roster.so
93	lib/jabberd/mod_roster.so.0
94	lib/jabberd/mod_session.la
95	lib/jabberd/mod_session.so
96	lib/jabberd/mod_session.so.0
97	lib/jabberd/mod_status.la
98	lib/jabberd/mod_status.so
99	lib/jabberd/mod_status.so.0
100	lib/jabberd/mod_template-roster.la
101	lib/jabberd/mod_template-roster.so
102	lib/jabberd/mod_template-roster.so.0
103	lib/jabberd/mod_vacation.la
104	lib/jabberd/mod_vacation.so
105	lib/jabberd/mod_vacation.so.0
106	lib/jabberd/mod_validate.la
107	lib/jabberd/mod_validate.so
108	lib/jabberd/mod_validate.so.0
109	lib/jabberd/storage_fs.la
110	lib/jabberd/storage_fs.so
111	%%SUB_BDB%%lib/jabberd/storage_db.la
112	%%SUB_BDB%%lib/jabberd/storage_db.so
113	%%SUB_MYSQL%%lib/jabberd/storage_mysql.la
114	%%SUB_MYSQL%%lib/jabberd/storage_mysql.so
115	%%SUB_PGSQL%%lib/jabberd/storage_pgsql.la
116	%%SUB_PGSQL%%lib/jabberd/storage_pgsql.so
117	%%SUB_SQLITE%%lib/jabberd/storage_sqlite.la
118	%%SUB_SQLITE%%lib/jabberd/storage_sqlite.so
119	@dirrm lib/jabberd
27	@dirrmtry etc/jabberd/templates	120	@dirrmtry etc/jabberd/templates
28	@dirrmtry etc/jabberd	121	@dirrmtry etc/jabberd

Added Link Here

(-)ports/net-im/jabberd/files/jabberd.in (+45 lines)
1	#!/bin/sh
2
3	# $FreeBSD$
4
5	# PROVIDE: jabberd
6	# REQUIRE: DAEMON
7	# BEFORE: LOGIN
8	# KEYWORD: shutdown
9	#
10	prefix=%%PREFIX%%
11
12	# Define these jabberd_* variables in one of these files:
13	# /etc/rc.conf
14	# /etc/rc.conf.local
15	#
16	# DO NOT CHANGE THESE DEFAULT VALUES HERE
17	#
18	jabberd_chdir=${jabberd_chdir-"%%JABBER_RUNDIR%%/pid"}
19	jabberd_enable=${jabberd_enable-"NO"}
20	jabberd_user=${jabberd_user-"%%JABBER_USER%%"}
21
22	. %%RC_SUBR%%
23
24	name="jabberd"
25	rcvar=`set_rcvar`
26	command="${prefix}/bin/jabberd"
27	command_args="&"
28	procname="${prefix}/bin/router"
29
30	load_rc_config $name
31
32	pidfile="${jabberd_chdir}/router.pid"
33
34	case "$1" in
35	stop\|faststop\|onestop)
36	echo "Stopping Jabber2"
37	killall -u ${jabberd_user} jabberd c2s resolver router s2s sm
38	for file in c2s resolver router s2s sm; do
39	rm -f ${jabberd_chdir}/$file.pid
40	done
41	;;
42	*)
43	run_rc_command "$1"
44	;;
45	esac

Removed Link Here

(-)ports/net-im/jabberd/files/jabberd.sh.in (-46 lines)
1	#!/bin/sh
2
3	# Start or stop jabberd
4	# $FreeBSD: ports/net-im/jabberd/files/jabberd.sh.in,v 1.2 2006/02/20 20:47:32 dougb Exp $
5
6	# PROVIDE: jabberd
7	# REQUIRE: DAEMON
8	# BEFORE: LOGIN
9	# KEYWORD: shutdown
10	#
11	prefix=%%PREFIX%%
12
13	# Define these jabberd_* variables in one of these files:
14	# /etc/rc.conf
15	# /etc/rc.conf.local
16	#
17	# DO NOT CHANGE THESE DEFAULT VALUES HERE
18	#
19	jabberd_chdir=${jabberd_chdir-"/var/jabberd/pid"}
20	jabberd_enable=${jabberd_enable-"NO"}
21	jabberd_user=${jabberd_user-"jabber"}
22
23	. %%RC_SUBR%%
24
25	name="jabberd"
26	rcvar=`set_rcvar`
27	command="${prefix}/bin/jabberd"
28	command_args="&"
29	procname="${prefix}/bin/router"
30
31	load_rc_config $name
32
33	pidfile="${jabberd_chdir}/router.pid"
34
35	case "$1" in
36	stop\|faststop\|onestop)
37	echo "Stopping Jabber2"
38	killall -u ${jabberd_user} jabberd c2s resolver router s2s sm
39	for file in c2s resolver router s2s sm; do
40	rm -f ${jabberd_chdir}/$file.pid
41	done
42	;;
43	*)
44	run_rc_command "$1"
45	;;
46	esac

Added Link Here

(-)ports/net-im/jabberd/files/pkg-deinstall.in (+22 lines)
1	#!/bin/sh
2
3	if [ "$2" != "POST-DEINSTALL" ]; then
4	exit 0
5	fi
6
7	USER=%%JABBER_USER%%
8	GROUP=%%JABBER_GROUP%%
9	RUNDIR="%%JABBER_RUNDIR%%"
10
11	if pw usershow "${USER}" 2>/dev/null 1>&2; then
12	echo "To delete Jabber user permanently, use 'pw userdel ${USER}'"
13	fi
14
15	if pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
16	echo "To delete Jabber group permanently, use 'pw groupdel ${USER}'"
17	fi
18
19	echo "You may want to delete the following directories:"
20	echo "${RUNDIR}"
21
22	exit 0

Added Link Here

(-)ports/net-im/jabberd/files/pkg-install.in (+46 lines)
1	#!/bin/sh
2
3	if [ "$2" != "POST-INSTALL" ]; then
4	exit 0
5	fi
6
7	USER=%%JABBER_USER%%
8	GROUP=%%JABBER_GROUP%%
9	UID=%%JABBER_UID%%
10	GID=%%JABBER_GID%%
11	ETCDIR=%%JABBER_ETCDIR%%
12	RUNDIR=%%JABBER_RUNDIR%%
13
14	if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
15	if pw groupadd ${GROUP} -g ${GID}; then
16	echo "Added group \"${GROUP}\"."
17	else
18	echo "Adding group \"${GROUP}\" failed..."
19	exit 1
20	fi
21	fi
22
23	if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
24	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
25	-s "/sbin/nologin" -d "/nonexistent" \
26	-c "Jabber Daemon"; \
27	then
28	echo "Added user \"${USER}\"."
29	else
30	echo "Adding user \"${USER}\" failed..."
31	exit 1
32	fi
33	fi
34
35	if [ ! -d ${RUNDIR} ]; then
36	echo "Creating \"${RUNDIR}\"."
37	mkdir -p ${RUNDIR}/pid ${RUNDIR}/db ${RUNDIR}/logs
38	fi
39
40	echo "Fixing ownerships and modes in \"${ETCDIR}\"."
41	chown -R ${USER}:${GROUP} ${ETCDIR}
42	chmod -R go= ${ETCDIR}
43
44	echo "Fixing ownerships and modes in \"${RUNDIR}\"."
45	chown -R ${USER}:${GROUP} ${RUNDIR}
46	chmod -R go= ${RUNDIR}