Index: head/net-im/jabberd/Makefile =================================================================== --- head/net-im/jabberd/Makefile (revision 400538) +++ head/net-im/jabberd/Makefile (revision 400539) @@ -1,168 +1,168 @@ # Created by: Dmitry Sivachenko # $FreeBSD$ PORTNAME= jabberd -PORTVERSION= 2.3.3 +PORTVERSION= 2.3.4 CATEGORIES= net-im MASTER_SITES= https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \ LOCAL/matthew/${PORTNAME} MAINTAINER= mm@FreeBSD.org COMMENT= Online presence and instant messaging server LICENSE= GPLv2 LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ libidn.so:${PORTSDIR}/dns/libidn \ libudns.so:${PORTSDIR}/dns/udns OPTIONS_DEFINE= MYSQL PGSQL LDAP BDB SQLITE PAM PIPE ANON FS DEBUG REQUIRES \ DOCS SUPERSEDED EXPERIMENTAL GSASL OPTIONS_DEFAULT=MYSQL DEBUG GSASL OPTIONS_SUB= yes GNU_CONFIGURE= yes INSTALL_TARGET= install-strip USES= compiler:c11 iconv libtool perl5 tar:xz USE_PERL5= run USE_OPENSSL= yes USE_RC_SUBR= jabberd USE_LDCONFIG= ${PREFIX}/lib/jabberd CONFIGURE_ARGS= --localstatedir=/var \ --sysconfdir=${PREFIX}/etc/jabberd \ --enable-ssl --enable-mio=kqueue \ --disable-tests \ --with-extra-include-path="${LOCALBASE}/include ${EIP}" \ --with-extra-library-path="${LOCALBASE}/lib ${ELP}" JABBER_USER= jabber JABBER_GROUP= jabber USERS= ${JABBER_USER} GROUPS= ${JABBER_GROUP} JABBER_ETCDIR= "${PREFIX}/etc/jabberd" JABBER_RUNDIR= "/var/jabberd" PLIST_SUB+= JABBER_USER=${JABBER_USER} \ JABBER_GROUP=${JABBER_GROUP} \ JABBER_ETCDIR="${JABBER_ETCDIR}" \ JABBER_RUNDIR="${JABBER_RUNDIR}" SUB_LIST+= JABBER_USER=${JABBER_USER} \ JABBER_RUNDIR="${JABBER_RUNDIR}" \ PERL="${PERL}" PORTDOCS= * DOCFILES= AUTHORS ChangeLog NEWS README README.config \ README.protocol TODO _REQUIRE= LOGIN ELP+= ${OPENSSLLIB} EIP+= ${OPENSSLINC} DEBUG_CONFIGURE_ENABLE= debug PGSQL_USES= pgsql PGSQL_CONFIGURE_ENABLE= pgsql SQLITE_CONFIGURE_ENABLE=sqlite SQLITE_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 MYSQL_USE= MYSQL=yes MYSQL_CONFIGURE_ENABLE= mysql BDB_USE= BDB=41+ BDB_CONFIGURE_ENABLE= db BDB_CONFIGURE_ON= --oldincludedir=/nonexistant LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_ENABLE= ldap FS_CONFIGURE_ENABLE= fs FS_DESC= Filesystem storage (only for testing) PAM_CONFIGURE_ENABLE= pam PIPE_CONFIGURE_ENABLE= pipe PIPE_DESC= Enable pipe (auth/reg) ANON_CONFIGURE_ENABLE= anon ANON_DESC= Enable anonymous (auth/reg) #CYRUS_CONFIGURE_ON= --with-sasl=cyrus #CYRUS_DESC= Use Cyrus SASL backend (not supported) #CYRUS_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 GSASL_CONFIGURE_ON= --with-sasl=gsasl GSASL_DESC= Use GSASL backend GSASL_LIB_DEPENDS= libgsasl.so:${PORTSDIR}/security/gsasl SUPERSEDED_CONFIGURE_ENABLE= superseded SUPERSEDED_DESC= Enable superseded features (ns_TIME) EXPERIMENTAL_CONFIGURE_ENABLE= experimental EXPERIMENTAL_DESC= Enable experimental features (TLS-Everywhere) .include .if (${OPSYS} != FreeBSD || ${OSVERSION} < 1000000) WITH_OPENSSL_PORT= yes .endif .if ${PORT_OPTIONS:MPGSQL} _REQUIRE+= postgresql .endif .if ${PORT_OPTIONS:MMYSQL} EIP+=${LOCALBASE}/include/mysql ELP+=${LOCALBASE}/lib/mysql _REQUIRE+= mysql .endif .if ${PORT_OPTIONS:MBDB} EIP+=${BDB_INCLUDE_DIR} ELP+=${BDB_LIB_DIR} .endif .if ${PORT_OPTIONS:MLDAP} _REQUIRE+= slapd .endif .if ${PORT_OPTIONS:MREQUIRES} SUB_LIST+= REQUIRE="${_REQUIRE}" .else SUB_LIST+= REQUIRE="LOGIN" .endif REQUIRES_DESC= Add backend requires to startup script post-patch: .for FILE in c2s.xml jabberd.cfg router-filter.xml router-users.xml \ router.xml s2s.xml sm.xml templates/roster.xml @${MV} ${WRKSRC}/etc/${FILE}.dist.in ${WRKSRC}/etc/${FILE}.sample.in .endfor @${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|g' \ ${WRKSRC}/tools/jabberd.in #.if ${PORT_OPTIONS:MCYRUS} # @${REINPLACE_CMD} -e '/^#error /d' \ # ${WRKSRC}/sx/sasl_cyrus.c #.endif post-install: .for DIR in db logs pid @${MKDIR} ${STAGEDIR}${JABBER_RUNDIR}/${DIR} .endfor @${CHMOD} -R go= ${STAGEDIR}${JABBER_RUNDIR} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in ${DOCFILES} ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor .for FILE in db-setup.mysql db-setup.pgsql db-setup.sqlite ${INSTALL_DATA} ${WRKSRC}/tools/${FILE} ${STAGEDIR}${DOCSDIR} .endfor .endif .include Index: head/net-im/jabberd/distinfo =================================================================== --- head/net-im/jabberd/distinfo (revision 400538) +++ head/net-im/jabberd/distinfo (revision 400539) @@ -1,2 +1,2 @@ -SHA256 (jabberd-2.3.3.tar.xz) = c6c2f34d0811e90c5c791143018bb5b07ecbe2ea5d8cc10140235d25815cb030 -SIZE (jabberd-2.3.3.tar.xz) = 1457340 +SHA256 (jabberd-2.3.4.tar.xz) = 9a17fae72460dd4454814edb48a7a1af7071cf331dabc2b0b6029661a36bb671 +SIZE (jabberd-2.3.4.tar.xz) = 1482736 Index: head/net-im/jabberd/files/patch-sx__plugins.h =================================================================== --- head/net-im/jabberd/files/patch-sx__plugins.h (nonexistent) +++ head/net-im/jabberd/files/patch-sx__plugins.h (revision 400539) @@ -0,0 +1,22 @@ +diff --git a/sx/plugins.h b/sx/plugins.h +index b5d3934..65dae93 100644 +--- a/sx/plugins.h ++++ sx/plugins.h +@@ -159,7 +159,7 @@ typedef struct _sx_compress_conn_st { + JABBERD2_API int sx_ack_init(sx_env_t env, sx_plugin_t p, va_list args); + + /* websocket wrapper plugin */ +-//#ifdef USE_WEBSOCKET ++#ifdef USE_WEBSOCKET + #include + #include + +@@ -183,7 +183,7 @@ typedef struct _sx_websocket_conn_st { + xht headers; + void *frame; + } *_sx_websocket_conn_t; +-//#endif ++#endif + + #ifdef __cplusplus + } Property changes on: head/net-im/jabberd/files/patch-sx__plugins.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property