[Midnightbsd-cvs] mports: net-im/jabberd: Update to 2.1.18.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Dec 28 15:38:44 EST 2007


Log Message:
-----------
Update to 2.1.18.  Add GPL2 license.  Add gsasl support with libntlm.

Modified Files:
--------------
    mports/net-im/jabberd:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)
        pkg-deinstall (r1.1 -> r1.2)
        pkg-descr (r1.1 -> r1.2)
        pkg-install (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-install
===================================================================
RCS file: /home/cvs/mports/net-im/jabberd/pkg-install,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net-im/jabberd/pkg-install -L net-im/jabberd/pkg-install -u -r1.1 -r1.2
--- net-im/jabberd/pkg-install
+++ net-im/jabberd/pkg-install
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $MidnightBSD$
 # $FreeBSD: ports/net-im/jabberd/pkg-install,v 1.3 2004/01/09 11:30:09 demon Exp $
 #
 
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/net-im/jabberd/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net-im/jabberd/pkg-descr -L net-im/jabberd/pkg-descr -u -r1.1 -r1.2
--- net-im/jabberd/pkg-descr
+++ 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/
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/net-im/jabberd/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net-im/jabberd/pkg-plist -L net-im/jabberd/pkg-plist -u -r1.1 -r1.2
--- net-im/jabberd/pkg-plist
+++ net-im/jabberd/pkg-plist
@@ -1,4 +1,4 @@
- at unexec [ ! -f /var/jabberd/pid/router.pid ] || %D/etc/rc.d/jabberd.sh stop || true
+ at 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/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
+ at 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/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
- at 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
+%%SUB_FS%%lib/jabberd/storage_fs.la
+%%SUB_FS%%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
+ at dirrm lib/jabberd
 @dirrmtry etc/jabberd/templates
 @dirrmtry etc/jabberd
Index: pkg-deinstall
===================================================================
RCS file: /home/cvs/mports/net-im/jabberd/pkg-deinstall,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net-im/jabberd/pkg-deinstall -L net-im/jabberd/pkg-deinstall -u -r1.1 -r1.2
--- net-im/jabberd/pkg-deinstall
+++ net-im/jabberd/pkg-deinstall
@@ -1,4 +1,5 @@
 #!/bin/sh
+# $MidnightBSD$
 # $FreeBSD: ports/net-im/jabberd/pkg-deinstall,v 1.3 2004/01/01 13:21:15 demon Exp $
 #
 
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net-im/jabberd/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net-im/jabberd/Makefile -L net-im/jabberd/Makefile -u -r1.1 -r1.2
--- net-im/jabberd/Makefile
+++ net-im/jabberd/Makefile
@@ -3,116 +3,186 @@
 # Whom:					Dmitry Sivachenko <demon at FreeBSD.org>
 #
 # $MidnightBSD$
-# $FreeBSD: ports/net-im/jabberd/Makefile,v 1.39 2006/10/07 14:35:12 pav Exp $
+# $FreeBSD: ports/net-im/jabberd/Makefile,v 1.51 2007/10/21 20:56:17 mm Exp $
 #
 
 PORTNAME=	jabberd
-PORTVERSION=	2.0.11
-PORTREVISION=	2
+PORTVERSION=	2.1.18
 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=	ports at MidnightBSD.org
 COMMENT=	Online presence and instant messaging server
+LICENSE=	gpl2
 
-LIB_DEPENDS=	idn.16:${PORTSDIR}/dns/libidn
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
+		idn.16:${PORTSDIR}/dns/libidn
 
-OPTIONS=	POSTGRESQL "Use PostgreSQL for storage and authentication" off \
-		MYSQL "Use MySQL for storage and authentication" off \
-		LDAP "Use LDAP for authentication" off \
-		BDB "Use BDB 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 \
-		DEBUG "Compile with debug information" on
+OPTIONS=	MYSQL "Support MySQL (storage/auth/reg)" on \
+		POSTGRESQL "Support PostgreSQL (storage/auth/reg)" off \
+		LDAP "Support OpenLDAP (storage/auth/reg)" off \
+		BDB "Support BerkeleyDB (storage/auth/reg)" off \
+		SQLITE "Support SQLite3 (storage/auth/reg)" off \
+		PAM "Enable PAM (auth/reg)" off \
+		PIPE "Enable pipe (auth/reg)" off \
+		ANON "Enable anonymous (auth/reg)" off \
+		FS "Filesystem storage (only for testing)" off \
+		GSASL "Authenticate via GNU SASL" on \
+		CYRUS_SASL "Authenticate via Cyrus SASL" off \
+		DEBUG "Compile with debug messages" on
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
 USE_ICONV=	yes
-USE_RC_SUBR=	jabberd.sh
-CONFIGURE_ARGS=	--localstatedir=/var \
-		--enable-ssl \
-		--with-extra-include-path=${LOCALBASE}/include${EIP} \
-		--with-extra-library-path=${LOCALBASE}/lib${ELP} \
-		--enable-fs
+USE_RC_SUBR=	jabberd
+USE_LDCONFIG=	${PREFIX}/lib/jabberd
+CONFIGURE_ARGS+=	--localstatedir=/var \
+		--sysconfdir=${PREFIX}/etc/jabberd \
+		--enable-ssl --enable-mio=poll \
+		--with-extra-include-path="${LOCALBASE}/include ${EIP}" \
+		--with-extra-library-path="${LOCALBASE}/lib ${ELP}"
+
+JABBER_USER=	jabber
+JABBER_UID=	93
+JABBER_GROUP=	${JABBER_USER}
+JABBER_GID=	${JABBER_UID}
+JABBER_ETCDIR=	"${PREFIX}/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 COPYING ChangeLog INSTALL NEWS PROTOCOL README \
+		TODO UPGRADE
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_DEBUG)
+ELP+=	${OPENSSLLIB}
+EIP+=	${OPENSSLINC}
+
+.if !defined(WITHOUT_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 .endif
 
 .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
+LIB_DEPENDS+=	sqlite3.8:${PORTSDIR}/databases/sqlite3-threads
+CFLAGS+=	${PTHREAD_CFLAGS}
+PLIST_SUB+=	SUB_SQLITE=""
 .else
 CONFIGURE_ARGS+=--disable-sqlite
+PLIST_SUB+=	SUB_SQLITE="@comment "
 .endif
 
-.if defined(WITH_MYSQL)
+.if !defined(WITHOUT_MYSQL)
 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
+USE_BDB=	41+
 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_FS)
+CONFIGURE_ARGS+=--enable-fs
+PLIST_SUB+=	SUB_FS=""
+.else
+CONFIGURE_ARGS+=--disable-fs
+PLIST_SUB+=	SUB_FS="@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
 
-.if defined(WITH_AVATAR)
-PATCH_SITES+=	http://www.deepdarc.com/
-PATCHFILES+=	vcard-avatar.diff
+.if defined(WITH_GSASL) && defined(WITH_CYRUS_SASL)
+IGNORE=	cannot be compiled with both, gsasl and cyrus-sasl. Please (re)run 'make config' and deselect either GSASL or CYRUS_SASL
+.elif defined(WITHOUT_GSASL) && !defined(WITH_CYRUS_SASL)
+IGNORE=	is useless without a sasl library. Please (re)run 'make config' and choose either GSASL or CYRUS_SASL
+.elif defined(WITH_GSASL)
+CONFIGURE_ARGS+=	--enable-sasl=gsasl
+LIB_DEPENDS+=		gsasl.11:${PORTSDIR}/security/gsasl
+.elif defined(WITH_CYRUS_SASL)
+CONFIGURE_ARGS+=	--enable-sasl=cyrus
+LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 .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-patch:
+	@${REINPLACE_CMD} -e 's|"-lsqlite3|"-lsqlite3 ${PTHREAD_LIBS}|g' \
+		${WRKSRC}/configure
 
 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>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/net-im/jabberd/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L net-im/jabberd/distinfo -L net-im/jabberd/distinfo -u -r1.1 -r1.2
--- net-im/jabberd/distinfo
+++ 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.18.tar.gz) = 53c5a5b6661c35d8231ed4f12104a3cb
+SHA256 (jabber/jabberd-2.1.18.tar.gz) = 8348fac1a8c28b2c5d3b6dbf4dc77e21621162ab4e628bf4b050bb35dc388b82
+SIZE (jabber/jabberd-2.1.18.tar.gz) = 809384


More information about the Midnightbsd-cvs mailing list