7 files changed, 195 insertions, 52 deletions

diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index c0c639088a57..a9c250764fa5 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	jabberd
-PORTVERSION=	2.0.11
-PORTREVISION=	2
+PORTVERSION=	2.1.10
 CATEGORIES=	net-im
-MASTER_SITES=	http://jabberstudio.rediris.es/jabberd2/ \
-		http://jabberstudio.2nw.net/jabberd2/
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}s${PORTVERSION:E}
+MASTER_SITES=	http://ftp.xiaoka.com/jabberd2/releases/
 DIST_SUBDIR=	jabber
 
-MAINTAINER=	kirk@strauser.com
+MAINTAINER=	mm@FreeBSD.org
 COMMENT=	Online presence and instant messaging server
 
-LIB_DEPENDS=	idn.16:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
+		gsasl.10:${PORTSDIR}/security/gsasl \
+		idn.16:${PORTSDIR}/dns/libidn
 
 OPTIONS=	POSTGRESQL "Use PostgreSQL for storage and authentication" off \
 		MYSQL "Use MySQL for storage and authentication" off \
@@ -26,19 +25,40 @@ OPTIONS=	POSTGRESQL "Use PostgreSQL for storage and authentication" off \
 		SQLITE "Use SQLITE3 for storage" off \
 		PAM "Use PAM for authentication" off \
 		PIPE "Enable pipe auth/reg support" off \
-		AVATAR "Enable avatar support in vCard" 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.sh
-CONFIGURE_ARGS=	--localstatedir=/var \
+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} \
+		--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)
@@ -48,15 +68,19 @@ CONFIGURE_ARGS+=--enable-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)
@@ -64,54 +88,70 @@ USE_MYSQL=	yes
 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_AVATAR)
-PATCH_SITES+=	http://www.deepdarc.com/
-PATCHFILES+=	vcard-avatar.diff
+.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:
-	@${CHOWN} -R jabber:jabber ${PREFIX}/etc/jabberd
+	@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
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.mysql ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/tools/db-setup.pgsql ${DATADIR}
+.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>
diff --git a/net-im/jabberd/distinfo b/net-im/jabberd/distinfo
index 2f80d167d6ee..3709c00350f5 100644
--- a/net-im/jabberd/distinfo
+++ b/net-im/jabberd/distinfo
@@ -1,6 +1,3 @@
-MD5 (jabber/jabberd-2.0s11.tar.gz) = 67d1663ed97a5ba707d5d145b1d19c55
-SHA256 (jabber/jabberd-2.0s11.tar.gz) = 0ef0f668f5d86b8c22ce0ae2366bff0be9d4c961d6f48b7b849ebe749bdb213a
-SIZE (jabber/jabberd-2.0s11.tar.gz) = 777466
-MD5 (jabber/vcard-avatar.diff) = adf9078a9c68c40a8fbe37cf282d37a4
-SHA256 (jabber/vcard-avatar.diff) = 5e42dc7e31e6c222c3cabc3e8916c8989b37723c800e9afc69e28d2731d4ca9b
-SIZE (jabber/vcard-avatar.diff) = 5463
+MD5 (jabber/jabberd-2.1.10.tar.gz) = d0d938395c1eda5d37b2af4f99477ccd
+SHA256 (jabber/jabberd-2.1.10.tar.gz) = 9acc8bdfc0f24bd40c6b95ca84f4213d5e17fb4020f969adfa5798b8b7790c58
+SIZE (jabber/jabberd-2.1.10.tar.gz) = 1397275
diff --git a/net-im/jabberd/files/jabberd.sh.in b/net-im/jabberd/files/jabberd.in
index ecd5511ec49f..258d5a88adac 100644
--- a/net-im/jabberd/files/jabberd.sh.in
+++ b/net-im/jabberd/files/jabberd.in
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-# Start or stop jabberd
 # $FreeBSD$
 
 # PROVIDE: jabberd
@@ -16,9 +15,9 @@ prefix=%%PREFIX%%
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
-jabberd_chdir=${jabberd_chdir-"/var/jabberd/pid"}
+jabberd_chdir=${jabberd_chdir-"%%JABBER_RUNDIR%%/pid"}
 jabberd_enable=${jabberd_enable-"NO"}
-jabberd_user=${jabberd_user-"jabber"}
+jabberd_user=${jabberd_user-"%%JABBER_USER%%"}
 
 . %%RC_SUBR%%
 
diff --git a/net-im/jabberd/pkg-deinstall b/net-im/jabberd/files/pkg-deinstall.in
index 8a4fe0fcabf9..248fa7fe1ea9 100644
--- a/net-im/jabberd/pkg-deinstall
+++ b/net-im/jabberd/files/pkg-deinstall.in
@@ -1,21 +1,23 @@
 #!/bin/sh
 # $FreeBSD$
-#
 
 if [ "$2" != "POST-DEINSTALL" ]; then
     exit 0
 fi
 
-USER=jabber
+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 "${USER}" 2>/dev/null 1>&2; then
+if pw groupshow "${GROUP}" 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."
+echo "You may want to delete the following directories:"
+echo "${RUNDIR}" 
 
 exit 0
diff --git a/net-im/jabberd/pkg-install b/net-im/jabberd/files/pkg-install.in
index e5031c96599b..76753f90a3da 100644
--- a/net-im/jabberd/pkg-install
+++ b/net-im/jabberd/files/pkg-install.in
@@ -1,15 +1,16 @@
 #!/bin/sh
 # $FreeBSD$
-#
 
-if [ "$2" != "PRE-INSTALL" ]; then
+if [ "$2" != "POST-INSTALL" ]; then
     exit 0
 fi
 
-USER=jabber
-GROUP=${USER}
-UID=93
-GID=${UID}
+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
@@ -32,7 +33,15 @@ if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
 	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
+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}
 
-exit 0
+echo "Fixing ownerships and modes in \"${RUNDIR}\"."
+chown -R ${USER}:${GROUP} ${RUNDIR}
+chmod -R go= ${RUNDIR}
diff --git a/net-im/jabberd/pkg-descr b/net-im/jabberd/pkg-descr
index c01a6f35705f..55dc3d4a0150 100644
--- a/net-im/jabberd/pkg-descr
+++ b/net-im/jabberd/pkg-descr
@@ -1,4 +1,5 @@
-The Jabber server (jabberd) is a daemon for Jabber clients to connect
-and communicate with.
+jabberd 2.x series is the next generation of the Jabber/XMPP server.
+It has been rewritten from the ground up to be scalable, architecturally 
+sound and to support the latest protocol extensions coming out of the XSF. 
 
-WWW: http://jabberd.jabberstudio.org/
+WWW: http://jabberd2.xiaoka.com/
diff --git a/net-im/jabberd/pkg-plist b/net-im/jabberd/pkg-plist
index 28009d733bfa..dd981e31e260 100644
--- a/net-im/jabberd/pkg-plist
+++ b/net-im/jabberd/pkg-plist
@@ -1,4 +1,4 @@
-@unexec [ ! -f /var/jabberd/pid/router.pid ] || %D/etc/rc.d/jabberd.sh stop || true
+@unexec [ ! -f /var/jabberd/pid/router.pid ] || %D/etc/rc.d/jabberd stop || true
 bin/c2s
 bin/jabberd
 bin/resolver
@@ -11,6 +11,8 @@ etc/jabberd/c2s.xml.dist
 etc/jabberd/jabberd.cfg.dist
 @unexec if cmp -s %D/etc/jabberd/resolver.xml %D/etc/jabberd/resolver.xml.dist; then rm -f %D/etc/jabberd/resolver.xml; fi
 etc/jabberd/resolver.xml.dist
+@unexec if cmp -s %D/etc/jabberd/router-filter.xml %D/etc/jabberd/router-filter.xml.dist; then rm -f %D/etc/jabberd/router-filter.xml; fi
+etc/jabberd/router-filter.xml.dist
 @unexec if cmp -s %D/etc/jabberd/router-users.xml %D/etc/jabberd/router-users.xml.dist; then rm -f %D/etc/jabberd/router-users.xml; fi
 etc/jabberd/router-users.xml.dist
 @unexec if cmp -s %D/etc/jabberd/router.xml %D/etc/jabberd/router.xml.dist; then rm -f %D/etc/jabberd/router.xml; fi
@@ -21,8 +23,101 @@ etc/jabberd/s2s.xml.dist
 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
-%%DATADIR%%/db-setup.mysql
-%%DATADIR%%/db-setup.pgsql
-@dirrm %%DATADIR%%
+%%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