diff options
| author | Xin LI <delphij@FreeBSD.org> | 2006-05-26 15:26:26 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2006-05-26 15:26:26 +0000 |
| commit | 92dba44fb2753a51be3de7478940fef49a7c4cb9 (patch) | |
| tree | 6e2b66aea969788bdc6f7fb6c831b3a5429b75f3 /net/openldap24-server | |
| parent | 8a3cbd8945b21aa92da226e1a7cf609daac94d4a (diff) | |
| download | ports-92dba44fb2753a51be3de7478940fef49a7c4cb9.tar.gz ports-92dba44fb2753a51be3de7478940fef49a7c4cb9.zip | |
Merged from openldap23-server:
New option: SLURPD which makes the user to be able to choose whether to
build and install slurpd. The option is unconditionally disabled when
threading is disabled (i.e. shell backend is enabled).
Notes
Notes:
svn path=/head/; revision=163495
Diffstat (limited to 'net/openldap24-server')
| -rw-r--r-- | net/openldap24-server/Makefile | 16 | ||||
| -rw-r--r-- | net/openldap24-server/pkg-plist | 8 |
2 files changed, 17 insertions, 7 deletions
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile index 59dd634d3fe5..40b7bfc505c6 100644 --- a/net/openldap24-server/Makefile +++ b/net/openldap24-server/Makefile @@ -40,7 +40,7 @@ BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER} .endif PORTREVISION_CLIENT= 0 -PORTREVISION_SERVER= 0 +PORTREVISION_SERVER= 1 .if !defined(CLIENT_ONLY) OPTIONS= SASL "With (Cyrus) SASL2 support" on \ @@ -74,7 +74,8 @@ OPTIONS= SASL "With (Cyrus) SASL2 support" on \ VALSORT "With Value Sorting overlay" off \ ACI "With per-object ACIs (experimental)" off \ DYNACL "With run-time loadable ACLs (experimental)" off \ - DYNAMIC_BACKENDS "Build dynamic backends" on + DYNAMIC_BACKENDS "Build dynamic backends" on \ + SLURPD "Build slurpd replication daemon" on .endif .if defined(CLIENT_ONLY) @@ -166,7 +167,7 @@ INSTALLS_SHLIB= yes # server specific configuration SUB_FILES+= pkg-install pkg-message pkg-deinstall -USE_RC_SUBR= slapd.sh slurpd.sh +USE_RC_SUBR= slapd.sh ${SLURPDSH} EXTRA_PATCHES+= ${FILESDIR}/extrapatch-Makefile.in @@ -337,6 +338,7 @@ CONFIGURE_ARGS+= --without-threads --enable-shell=${BACKEND_ENABLE} PLIST_SUB+= BACK_SHELL=${BACKEND_PLIST} .else PLIST_SUB+= BACK_SHELL="@comment " +WANT_OPENLDAP_THREADS= yes .endif .if defined(WITH_PERL) @@ -387,6 +389,14 @@ CONFIGURE_ARGS+= --enable-slp LIB_DEPENDS+= slp.1:${PORTSDIR}/net/openslp .endif +.if defined(WANT_OPENLDAP_THREADS) && !defined(WITHOUT_SLURPD) +SLURPDSH= slurpd.sh +PLIST_SUB+= SLURPD="" +.else +PLIST_SUB+= SLURPD="@comment " +CONFIGURE_ARGS+= --disable-slurpd +.endif + # Include tcp-wrapper support .if !defined(WITHOUT_TCP_WRAPPERS) && exists(/usr/include/tcpd.h) CONFIGURE_ARGS+= --enable-wrappers diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist index caec3cf746bd..247cd7aa489d 100644 --- a/net/openldap24-server/pkg-plist +++ b/net/openldap24-server/pkg-plist @@ -1,6 +1,6 @@ @comment $FreeBSD$ @unexec %%RC_DIR%%/etc/rc.d/slapd%%RC_SUFX%% stop 2>&1 >/dev/null || true -@unexec %%RC_DIR%%/etc/rc.d/slurpd%%RC_SUFX%% stop 2>&1 >/dev/null || true +%%SLURPD%%@unexec %%RC_DIR%%/etc/rc.d/slurpd%%RC_SUFX%% stop 2>&1 >/dev/null || true etc/openldap/schema/README etc/openldap/schema/core.ldif etc/openldap/schema/openldap.ldif @@ -63,7 +63,7 @@ etc/openldap/DB_CONFIG.example %%BACK_SQL%%libexec/openldap/back_sql.la %%BACK_SQL%%libexec/openldap/back_sql.so libexec/slapd -libexec/slurpd +%%SLURPD%%libexec/slurpd @dirrmtry libexec/openldap sbin/slapacl sbin/slapadd @@ -77,5 +77,5 @@ sbin/slaptest @dirrmtry %%LDAP_RUN_DIR%% @exec mkdir -p %%DATABASEDIR%% @dirrmtry %%DATABASEDIR%% -@exec mkdir -p %%SLURPDIR%% -@dirrmtry %%SLURPDIR%% +%%SLURPD%%@exec mkdir -p %%SLURPDIR%% +%%SLURPD%%@dirrmtry %%SLURPDIR%% |