diff options
| author | mm <mm@FreeBSD.org> | 2007-09-05 21:24:55 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2007-09-05 21:24:55 +0800 |
| commit | 78db142c50db5840f92e652a4ebacf4f61e3982c (patch) | |
| tree | b6f37313b7df3d46a0f7d369089d5ea35c0036b0 /net-im/jabberd | |
| parent | 41833f511351ab1f6daf484e0022b781f898ba92 (diff) | |
| download | freebsd-ports-gnome-78db142c50db5840f92e652a4ebacf4f61e3982c.tar.gz freebsd-ports-gnome-78db142c50db5840f92e652a4ebacf4f61e3982c.tar.zst freebsd-ports-gnome-78db142c50db5840f92e652a4ebacf4f61e3982c.zip | |
- Add choice between GNU SASL and Cyrus SASL
- Use SQLite3 with threads on WITH_SQLITE
- Bump PORTREVISION
PR: ports/116072
Submitted by: Alex Deiter <tiamat at komi.mts.ru>
Approved by: mm (maintainer, implicit)
Diffstat (limited to 'net-im/jabberd')
| -rw-r--r-- | net-im/jabberd/Makefile | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile index 44ac4fc33b93..f501be9dd516 100644 --- a/net-im/jabberd/Makefile +++ b/net-im/jabberd/Makefile @@ -7,6 +7,7 @@ PORTNAME= jabberd PORTVERSION= 2.1.15 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= http://ftp.xiaoka.com/jabberd2/releases/ DIST_SUBDIR= jabber @@ -15,7 +16,6 @@ MAINTAINER= mm@FreeBSD.org COMMENT= Online presence and instant messaging server LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - gsasl.10:${PORTSDIR}/security/gsasl \ idn.16:${PORTSDIR}/dns/libidn OPTIONS= MYSQL "Support MySQL (storage/auth/reg)" on \ @@ -27,6 +27,8 @@ OPTIONS= MYSQL "Support MySQL (storage/auth/reg)" on \ 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 @@ -79,7 +81,7 @@ PLIST_SUB+= SUB_PGSQL="@comment " .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 @@ -149,6 +151,18 @@ PLIST_SUB+= SUB_ANON="" PLIST_SUB+= SUB_ANON="@comment " .endif +.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.10:${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 post-patch: |