Index: head/net-im/jabberd/Makefile =================================================================== --- head/net-im/jabberd/Makefile (revision 229427) +++ head/net-im/jabberd/Makefile (revision 229428) @@ -1,191 +1,191 @@ # New ports collection makefile for: jabberd # Date created: 29 December 2003 # Whom: Dmitry Sivachenko # # $FreeBSD$ # PORTNAME= jabberd -PORTVERSION= 2.2.7 +PORTVERSION= 2.2.7.1 CATEGORIES= net-im MASTER_SITES= http://ftp.xiaoka.com/jabberd2/releases/ DIST_SUBDIR= jabber MAINTAINER= mm@FreeBSD.org COMMENT= Online presence and instant messaging server LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ gsasl.13:${PORTSDIR}/security/gsasl \ idn.16:${PORTSDIR}/dns/libidn \ udns.0:${PORTSDIR}/dns/udns 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 \ DEBUG "Compile with debug messages" on \ REQUIRES "Add backend requires to startup script" off GNU_CONFIGURE= yes USE_PERL5_RUN= yes USE_OPENSSL= yes USE_ICONV= yes USE_RC_SUBR= jabberd USE_BZIP2= yes 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}" \ PERL="${PERL}" SUB_FILES+= pkg-install pkg-deinstall PORTDOCS= * DOCFILES= AUTHORS COPYING ChangeLog INSTALL NEWS README \ TODO UPGRADE _REQUIRE= LOGIN .include 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="" _REQUIRE+= postgresql .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 CFLAGS+= ${PTHREAD_CFLAGS} PLIST_SUB+= SUB_SQLITE="" .else CONFIGURE_ARGS+=--disable-sqlite PLIST_SUB+= SUB_SQLITE="@comment " .endif .if !defined(WITHOUT_MYSQL) USE_MYSQL= yes CONFIGURE_ARGS+=--enable-mysql EIP+=:${LOCALBASE}/include/mysql ELP+=:${LOCALBASE}/lib/mysql PLIST_SUB+= SUB_MYSQL="" _REQUIRE+= mysql .else CONFIGURE_ARGS+=--disable-mysql PLIST_SUB+= SUB_MYSQL="@comment " .endif .if defined(WITH_BDB) 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="" _REQUIRE+= slapd .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_REQUIRES) SUB_LIST+= REQUIRE="${_REQUIRE}" .else SUB_LIST+= REQUIRE="LOGIN" .endif MAN8= c2s.8 jabberd.8 router.8 s2s.8 sm.8 post-patch: @${REINPLACE_CMD} -e 's|"-lsqlite3|"-lsqlite3 ${PTHREAD_LIBS}|g' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|g' \ ${WRKSRC}/tools/jabberd.in 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 Property changes on: head/net-im/jabberd/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.69 \ No newline at end of property +1.70 \ No newline at end of property Index: head/net-im/jabberd/distinfo =================================================================== --- head/net-im/jabberd/distinfo (revision 229427) +++ head/net-im/jabberd/distinfo (revision 229428) @@ -1,3 +1,3 @@ -MD5 (jabber/jabberd-2.2.7.tar.bz2) = f06fd9aa38b96a407e66b7a1267f3342 -SHA256 (jabber/jabberd-2.2.7.tar.bz2) = 3abb5e0cd157d2b1ce8de83b9d7723b933ac1c7845d17f9764818571f82b1adf -SIZE (jabber/jabberd-2.2.7.tar.bz2) = 646193 +MD5 (jabber/jabberd-2.2.7.1.tar.bz2) = 9a6fe560206c7982cd1d72a920b5162f +SHA256 (jabber/jabberd-2.2.7.1.tar.bz2) = a121d044031a45f8b18fa7cce9ad94f33bcb152dde556ef6b2b8fd06008f4698 +SIZE (jabber/jabberd-2.2.7.1.tar.bz2) = 645779 Property changes on: head/net-im/jabberd/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.31 \ No newline at end of property +1.32 \ No newline at end of property Index: head/net-im/jabberd/files/patch-util-util_compat.h =================================================================== --- head/net-im/jabberd/files/patch-util-util_compat.h (nonexistent) +++ head/net-im/jabberd/files/patch-util-util_compat.h (revision 229428) @@ -0,0 +1,13 @@ +--- util/util_compat.h.orig 2009-03-03 13:18:33.000000000 +0100 ++++ util/util_compat.h 2009-03-03 13:18:38.000000000 +0100 +@@ -100,6 +100,10 @@ + }; + #endif /* NO_SOCKADDR_STORAGE */ + ++#ifndef SSL_OP_NO_TICKET ++#define SSL_OP_NO_TICKET 0x00004000L ++#endif ++ + #ifdef __cplusplus + } + #endif Property changes on: head/net-im/jabberd/files/patch-util-util_compat.h ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property