Update to 2.4.5 beta.

9 files changed, 74 insertions, 168 deletions

diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 541cff0f4942..f80acb0337a5 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=		openldap
-DISTVERSION=		2.4.4alpha
+DISTVERSION=		2.4.5beta
 PORTREVISION=		${OPENLDAP_PORTREVISION}
 CATEGORIES=		net databases
 MASTER_SITES=		ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -38,8 +38,8 @@ WANT_OPENLDAP_VER?=	24
 BROKEN=			incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
 .endif
 
-PORTREVISION_CLIENT=	1
-PORTREVISION_SERVER=	3
+PORTREVISION_CLIENT=	0
+PORTREVISION_SERVER=	0
 
 .if !defined(CLIENT_ONLY)
 OPTIONS=	SASL "With (Cyrus) SASL2 support" off \
@@ -73,8 +73,7 @@ OPTIONS=	SASL "With (Cyrus) SASL2 support" off \
 		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 \
-		SLURPD "Build slurpd replication daemon" on
+		DYNAMIC_BACKENDS "Build dynamic backends" on
 .endif
 
 .if defined(CLIENT_ONLY)
@@ -132,11 +131,9 @@ SCHEMATA=		collective corba core cosine duaconf dyngroup \
 LDAP_RUN_DIR?=		/var/run/openldap
 LOCALSTATEDIR?=		/var/db
 DATABASEDIR?=		${LOCALSTATEDIR}/openldap-data
-SLURPDIR?=		${LOCALSTATEDIR}/openldap-slurp
 
 SUB_LIST+=		LDAP_RUN_DIR=${LDAP_RUN_DIR} \
 			DATABASEDIR=${DATABASEDIR} \
-			SLURPDIR=${SLURPDIR} \
 			PKGNAME=${PKGNAME}
 
 CONFIGURE_ARGS=		--with-threads=posix \
@@ -169,7 +166,7 @@ USE_LDCONFIG=		yes
 
 USE_LDCONFIG=		${PREFIX}/libexec/openldap
 SUB_FILES+=		pkg-install pkg-message pkg-deinstall
-USE_RC_SUBR=		slapd.sh ${SLURPDSH}
+USE_RC_SUBR=		slapd.sh
 
 EXTRA_PATCHES+=		${FILESDIR}/extrapatch-Makefile.in
 
@@ -289,11 +286,11 @@ PLIST_SUB+=		BACK_BDB="@comment " \
 			BACK_HDB="@comment "
 .else
 
-WITH_BDB_VER?=		44
-INVALID_BDB_VER=	46
+WITH_BDB_VER?=		46
+INVALID_BDB_VER=	42
 USE_BDB=		yes
 
-.if ${WITH_BDB_VER} >= 42
+.if ${WITH_BDB_VER} >= 43
 CONFIGURE_ARGS+=	--enable-bdb=${BACKEND_ENABLE} \
 			--enable-hdb=${BACKEND_ENABLE}
 PLIST_SUB+=		BACK_BDB=${BACKEND_PLIST} \
@@ -392,14 +389,6 @@ 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/distinfo b/net/openldap24-server/distinfo
index ddbed5afaa65..34f617eb6daf 100644
--- a/net/openldap24-server/distinfo
+++ b/net/openldap24-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (openldap-2.4.4alpha.tgz) = 0d74f2b928e75842be72b9dfaf5f4c79
-SHA256 (openldap-2.4.4alpha.tgz) = 4904826fab5adaf5f9a714fb0205482c0e01754723bc2074d00a5ec2d7f9130a
-SIZE (openldap-2.4.4alpha.tgz) = 3847806
+MD5 (openldap-2.4.5beta.tgz) = 08236989511265ed768c867bdffd8c72
+SHA256 (openldap-2.4.5beta.tgz) = 305f475ba44194b9d9e7c591cb2a64918ce12a702fe2a4de5074edf08a0e72a3
+SIZE (openldap-2.4.5beta.tgz) = 3985441
diff --git a/net/openldap24-server/files/manpages b/net/openldap24-server/files/manpages
index 429a4d55ec64..f68cb8869011 100644
--- a/net/openldap24-server/files/manpages
+++ b/net/openldap24-server/files/manpages
@@ -50,30 +50,30 @@ MAN3+=	lber-decode.3 \
 	ldap_tls.3 \
 	ldap_url.3
 MLINKS+= \
-	lber-decode.3 ber_first_element.3 \
-	lber-decode.3 ber_get_bitstring.3 \
-	lber-decode.3 ber_get_boolean.3 \
-	lber-decode.3 ber_get_enum.3 \
-	lber-decode.3 ber_get_int.3 \
 	lber-decode.3 ber_get_next.3 \
-	lber-decode.3 ber_get_null.3 \
+	lber-decode.3 ber_skip_tag.3 \
+	lber-decode.3 ber_peek_tag.3 \
+	lber-decode.3 ber_scanf.3 \
+	lber-decode.3 ber_get_int.3 \
 	lber-decode.3 ber_get_stringa.3 \
 	lber-decode.3 ber_get_stringb.3 \
+	lber-decode.3 ber_get_null.3 \
+	lber-decode.3 ber_get_enum.3 \
+	lber-decode.3 ber_get_boolean.3 \
+	lber-decode.3 ber_get_bitstring.3 \
+	lber-decode.3 ber_first_element.3 \
 	lber-decode.3 ber_next_element.3 \
-	lber-decode.3 ber_peek_tag.3 \
-	lber-decode.3 ber_scanf.3 \
-	lber-decode.3 ber_skip_tag.3 \
 	lber-encode.3 ber_alloc_t.3 \
 	lber-encode.3 ber_flush.3 \
 	lber-encode.3 ber_printf.3 \
-	lber-encode.3 ber_put_enum.3 \
 	lber-encode.3 ber_put_int.3 \
-	lber-encode.3 ber_put_null.3 \
 	lber-encode.3 ber_put_ostring.3 \
-	lber-encode.3 ber_put_seq.3 \
-	lber-encode.3 ber_put_set.3 \
 	lber-encode.3 ber_put_string.3 \
+	lber-encode.3 ber_put_null.3 \
+	lber-encode.3 ber_put_enum.3 \
 	lber-encode.3 ber_start_set.3 \
+	lber-encode.3 ber_put_seq.3 \
+	lber-encode.3 ber_put_set.3 \
 	lber-types.3 ber_bvarray_add.3 \
 	lber-types.3 ber_bvarray_free.3 \
 	lber-types.3 ber_bvdup.3 \
@@ -86,113 +86,110 @@ MLINKS+= \
 	lber-types.3 ber_free.3 \
 	lber-types.3 ber_str2bv.3 \
 	ldap_abandon.3 ldap_abandon_ext.3 \
+	ldap_add.3 ldap_add_s.3 \
 	ldap_add.3 ldap_add_ext.3 \
 	ldap_add.3 ldap_add_ext_s.3 \
-	ldap_add.3 ldap_add_s.3 \
 	ldap_bind.3 ldap_bind_s.3 \
-	ldap_bind.3 ldap_kerberos_bind1.3 \
-	ldap_bind.3 ldap_kerberos_bind1_s.3 \
-	ldap_bind.3 ldap_kerberos_bind2.3 \
-	ldap_bind.3 ldap_kerberos_bind2_s.3 \
-	ldap_bind.3 ldap_kerberos_bind_s.3 \
-	ldap_bind.3 ldap_sasl_bind.3 \
-	ldap_bind.3 ldap_sasl_bind_s.3 \
-	ldap_bind.3 ldap_set_rebind_proc.3 \
 	ldap_bind.3 ldap_simple_bind.3 \
 	ldap_bind.3 ldap_simple_bind_s.3 \
+	ldap_bind.3 ldap_sasl_bind.3 \
+	ldap_bind.3 ldap_sasl_bind_s.3 \
 	ldap_bind.3 ldap_unbind.3 \
 	ldap_bind.3 ldap_unbind_ext.3 \
-	ldap_bind.3 ldap_unbind_ext_s.3 \
 	ldap_bind.3 ldap_unbind_s.3 \
+	ldap_bind.3 ldap_unbind_ext_s.3 \
+	ldap_bind.3 ldap_set_rebind_proc.3 \
+	ldap_compare.3 ldap_compare_s.3 \
 	ldap_compare.3 ldap_compare_ext.3 \
 	ldap_compare.3 ldap_compare_ext_s.3 \
-	ldap_compare.3 ldap_compare_s.3 \
-	ldap_controls.3 ldap_create_control.3 \
-	ldap_controls.3 ldap_find_control.3 \
+	ldap_controls.3 ldap_control_create.3 \
+	ldap_controls.3 ldap_control_find.3 \
+	ldap_controls.3 ldap_control_dup.3 \
+	ldap_controls.3 ldap_controls_dup.3 \
 	ldap_controls.3 ldap_control_free.3 \
 	ldap_controls.3 ldap_controls_free.3 \
+	ldap_delete.3 ldap_delete_s.3 \
 	ldap_delete.3 ldap_delete_ext.3 \
 	ldap_delete.3 ldap_delete_ext_s.3 \
-	ldap_delete.3 ldap_delete_s.3 \
-	ldap_error.3 ld_errno.3 \
-	ldap_error.3 ldap_err2string.3 \
-	ldap_error.3 ldap_errlist.3 \
 	ldap_error.3 ldap_perror.3 \
+	ldap_error.3 ld_errno.3 \
 	ldap_error.3 ldap_result2error.3 \
+	ldap_error.3 ldap_errlist.3 \
+	ldap_error.3 ldap_err2string.3 \
 	ldap_extended_operation.3 ldap_extended_operation_s.3 \
 	ldap_first_attribute.3 ldap_next_attribute.3 \
-	ldap_first_entry.3 ldap_count_entries.3 \
 	ldap_first_entry.3 ldap_next_entry.3 \
-	ldap_first_message.3 ldap_count_messages.3 \
+	ldap_first_entry.3 ldap_count_entries.3 \
 	ldap_first_message.3 ldap_next_message.3 \
-	ldap_first_reference.3 ldap_count_references.3 \
+	ldap_first_message.3 ldap_count_messages.3 \
 	ldap_first_reference.3 ldap_next_reference.3 \
-	ldap_get_dn.3 ldap_dcedn2dn.3 \
-	ldap_get_dn.3 ldap_dn2ad_canonical.3 \
-	ldap_get_dn.3 ldap_dn2dcedn.3 \
-	ldap_get_dn.3 ldap_dn2str.3 \
-	ldap_get_dn.3 ldap_dn2ufn.3 \
+	ldap_first_reference.3 ldap_count_references.3 \
 	ldap_get_dn.3 ldap_explode_dn.3 \
 	ldap_get_dn.3 ldap_explode_rdn.3 \
+	ldap_get_dn.3 ldap_dn2ufn.3 \
 	ldap_get_dn.3 ldap_str2dn.3 \
+	ldap_get_dn.3 ldap_dn2str.3 \
+	ldap_get_dn.3 ldap_dn2dcedn.3 \
+	ldap_get_dn.3 ldap_dcedn2dn.3 \
+	ldap_get_dn.3 ldap_dn2ad_canonical.3 \
 	ldap_get_option.3 ldap_set_option.3 \
-	ldap_get_values.3 ldap_count_values.3 \
-	ldap_get_values.3 ldap_count_values_len.3 \
 	ldap_get_values.3 ldap_get_values_len.3 \
 	ldap_get_values.3 ldap_value_free.3 \
 	ldap_get_values.3 ldap_value_free_len.3 \
+	ldap_get_values.3 ldap_count_values.3 \
+	ldap_get_values.3 ldap_count_values_len.3 \
 	ldap_memory.3 ldap_memfree.3 \
 	ldap_memory.3 ldap_memvfree.3 \
 	ldap_memory.3 ldap_memalloc.3 \
 	ldap_memory.3 ldap_memcalloc.3 \
 	ldap_memory.3 ldap_memrealloc.3 \
 	ldap_memory.3 ldap_strdup.3 \
+	ldap_modify.3 ldap_modify_s.3 \
 	ldap_modify.3 ldap_modify_ext.3 \
 	ldap_modify.3 ldap_modify_ext_s.3 \
-	ldap_modify.3 ldap_modify_s.3 \
 	ldap_modify.3 ldap_mods_free.3 \
+	ldap_modrdn.3 ldap_modrdn_s.3 \
 	ldap_modrdn.3 ldap_modrdn2.3 \
 	ldap_modrdn.3 ldap_modrdn2_s.3 \
-	ldap_modrdn.3 ldap_modrdn_s.3 \
 	ldap_open.3 ldap_init.3 \
 	ldap_open.3 ldap_initialize.3 \
-	ldap_parse_result.3 ldap_parse_extended_result.3 \
 	ldap_parse_result.3 ldap_parse_sasl_bind_result.3 \
+	ldap_parse_result.3 ldap_parse_extended_result.3 \
 	ldap_rename.3 ldap_rename_s.3 \
 	ldap_result.3 ldap_msgfree.3 \
-	ldap_result.3 ldap_msgid.3 \
 	ldap_result.3 ldap_msgtype.3 \
-	ldap_schema.3 ldap_attributetype2name.3 \
-	ldap_schema.3 ldap_attributetype2str.3 \
-	ldap_schema.3 ldap_attributetype_free.3 \
-	ldap_schema.3 ldap_matchingrule2name.3 \
+	ldap_result.3 ldap_msgid.3 \
+	ldap_schema.3 ldap_str2syntax.3 \
+	ldap_schema.3 ldap_syntax2str.3 \
+	ldap_schema.3 ldap_syntax2name.3 \
+	ldap_schema.3 ldap_syntax_free.3 \
+	ldap_schema.3 ldap_str2matchingrule.3 \
 	ldap_schema.3 ldap_matchingrule2str.3 \
+	ldap_schema.3 ldap_matchingrule2name.3 \
 	ldap_schema.3 ldap_matchingrule_free.3 \
-	ldap_schema.3 ldap_objectclass2name.3 \
+	ldap_schema.3 ldap_str2attributetype.3 \
+	ldap_schema.3 ldap_attributetype2str.3 \
+	ldap_schema.3 ldap_attributetype2name.3 \
+	ldap_schema.3 ldap_attributetype_free.3 \
+	ldap_schema.3 ldap_str2objectclass.3 \
 	ldap_schema.3 ldap_objectclass2str.3 \
+	ldap_schema.3 ldap_objectclass2name.3 \
 	ldap_schema.3 ldap_objectclass_free.3 \
 	ldap_schema.3 ldap_scherr2str.3 \
-	ldap_schema.3 ldap_str2attributetype.3 \
-	ldap_schema.3 ldap_str2matchingrule.3 \
-	ldap_schema.3 ldap_str2objectclass.3 \
-	ldap_schema.3 ldap_str2syntax.3 \
-	ldap_schema.3 ldap_syntax2name.3 \
-	ldap_schema.3 ldap_syntax2str.3 \
-	ldap_schema.3 ldap_syntax_free.3 \
-	ldap_search.3 ldap_search_ext.3 \
-	ldap_search.3 ldap_search_ext_s.3 \
 	ldap_search.3 ldap_search_s.3 \
 	ldap_search.3 ldap_search_st.3 \
+	ldap_search.3 ldap_search_ext.3 \
+	ldap_search.3 ldap_search_ext_s.3 \
 	ldap_sort.3 ldap_sort_entries.3 \
-	ldap_sort.3 ldap_sort_strcasecmp.3 \
 	ldap_sort.3 ldap_sort_values.3 \
+	ldap_sort.3 ldap_sort_strcasecmp.3 \
 	ldap_tls.3 ldap_start_tls.3 \
 	ldap_tls.3 ldap_start_tls_s.3 \
 	ldap_tls.3 ldap_tls_inplace.3 \
 	ldap_tls.3 ldap_install_tls.3 \
-	ldap_url.3 ldap_free_urldesc.3 \
 	ldap_url.3 ldap_is_ldap_url.3 \
-	ldap_url.3 ldap_url_parse.3
+	ldap_url.3 ldap_url_parse.3 \
+	ldap_url.3 ldap_free_urldesc.3
 
 MAN5+=	ldap.conf.5 \
 	ldif.5 \
@@ -215,12 +212,14 @@ MAN5+=	ldap.conf.5 \
 	slapd.conf.5 \
 	slapd.overlays.5 \
 	slapd.plugin.5 \
-	slapd.replog.5 \
 	slapo-accesslog.5 \
 	slapo-auditlog.5 \
 	slapo-chain.5 \
+	slapo-constraint.5 \
 	slapo-dds.5 \
+	slapo-dyngroup.5 \
 	slapo-dynlist.5 \
+	slapo-memberof.5 \
 	slapo-pcache.5 \
 	slapo-ppolicy.5 \
 	slapo-refint.5 \
@@ -241,5 +240,4 @@ MAN8+=	slapacl.8 \
 	slapdn.8 \
 	slapindex.8 \
 	slappasswd.8 \
-	slaptest.8 \
-	slurpd.8
+	slaptest.8
diff --git a/net/openldap24-server/files/patch-43tty b/net/openldap24-server/files/patch-43tty
deleted file mode 100644
index 157fe6c3b0fe..000000000000
--- a/net/openldap24-server/files/patch-43tty
+++ /dev/null
@@ -1,22 +0,0 @@
---- include/ac/termios.h	Tue Jan  2 22:43:47 2007
-+++ include/ac/termios.h	Fri Mar 16 13:48:00 2007
-@@ -17,7 +17,7 @@
- #ifndef _AC_TERMIOS_H
- #define _AC_TERMIOS_H
- 
--#ifdef HAVE_POSIX_TERMIOS
-+#ifdef HAVE_TERMIOS_H
- #include <termios.h>
- 
- #ifdef GCWINSZ_IN_SYS_IOCTL
---- libraries/liblutil/getpass.c	Tue Jan  2 22:43:52 2007
-+++ libraries/liblutil/getpass.c	Fri Mar 16 13:47:52 2007
-@@ -60,7 +60,7 @@
- char *
- lutil_getpass( const char *prompt )
- {
--#if !defined(HAVE_POSIX_TERMIOS) && !defined(HAVE_SGTTY_H)
-+#if !defined(HAVE_TERMIOS_H) && !defined(HAVE_SGTTY_H)
- 	static char buf[256];
- 	int i, c;
- 
diff --git a/net/openldap24-server/files/patch-servers_slapd_overlays_Makefile.in b/net/openldap24-server/files/patch-servers_slapd_overlays_Makefile.in
deleted file mode 100644
index 67062675dbeb..000000000000
--- a/net/openldap24-server/files/patch-servers_slapd_overlays_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- servers/slapd/overlays/Makefile.in.orig	Fri Sep  2 03:28:11 2005
-+++ servers/slapd/overlays/Makefile.in	Sun Sep  4 16:11:22 2005
-@@ -30,6 +30,9 @@
- 	valsort.c
- OBJS = overlays.o \
- 	@SLAPD_STATIC_OVERLAYS@
-+LIBTOOL_OBJS = overlays.lo \
-+	       glue.lo \
-+	       version.lo
- 
- # Add here the objs that are needed by overlays, but do not make it
- # into SLAPD_STATIC_OVERLAYS...
diff --git a/net/openldap24-server/files/pkg-deinstall.in b/net/openldap24-server/files/pkg-deinstall.in
index 2a5ec1ef8f65..2ead1eeb89a9 100644
--- a/net/openldap24-server/files/pkg-deinstall.in
+++ b/net/openldap24-server/files/pkg-deinstall.in
@@ -18,16 +18,10 @@ POST-DEINSTALL)
     ${ECHO_CMD} "  rm -Rf %%DATABASEDIR%%"
     ${ECHO_CMD}
   fi
-  if [ -d %%SLURPDIR%% ]; then
-    ${ECHO_CMD} "- to remove the OpenLDAP replication directory:"
-    ${ECHO_CMD} "  rm -Rf %%SLURPDIR%%"
-    ${ECHO_CMD}
-  fi
   ${ECHO_CMD} "- to remove the OpenLDAP user:"
   ${ECHO_CMD} "  pw userdel ldap"
   ${ECHO_CMD}
-  ${ECHO_CMD} "If you are upgrading, don't forget to restart"
-  ${ECHO_CMD} "slapd and slurpd."
+  ${ECHO_CMD} "If you are upgrading, don't forget to restart slapd."
   ${ECHO_CMD}
   ;;
 esac
diff --git a/net/openldap24-server/files/slurpd.sh.in b/net/openldap24-server/files/slurpd.sh.in
deleted file mode 100644
index ea5e5b0642b6..000000000000
--- a/net/openldap24-server/files/slurpd.sh.in
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: slurpd
-# REQUIRE: slapd
-# BEFORE:
-# KEYWORD: shutdown
-
-# Add the following line to /etc/rc.conf to enable slurpd:
-#
-#slurpd_enable="YES"
-#
-# See slurpd(8) for more flags
-#
-
-. "%%RC_SUBR%%"
-
-name="slurpd"
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/libexec/slurpd"
-required_files="%%PREFIX%%/etc/openldap/slapd.conf"
-
-# read settings, set defaults
-load_rc_config $name
-: ${slurpd_enable="NO"}
-if [ -n "${slurpd_args+set}" ]; then
-  warn "slurpd_args is deprecated, use slurpd_flags"
-  : ${slurpd_flags="$slurpd_args"}
-else
-  : ${slurpd_flags=""}
-fi
-
-run_rc_command "$1"
diff --git a/net/openldap24-server/pkg-descr b/net/openldap24-server/pkg-descr
index bf8624a82d43..e7e414ed5708 100644
--- a/net/openldap24-server/pkg-descr
+++ b/net/openldap24-server/pkg-descr
@@ -4,7 +4,6 @@ clients, utilities and development tools.
 This package includes the following major components:
 
  * slapd - a stand-alone LDAP directory server
- * slurpd - a stand-alone LDAP replication server
  * LDIF tools - data conversion tools for use with slapd
 
 These releases are meant for testing purposes only, they are not for
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index facd768599ec..d9b24b2bbf6b 100644
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@@ -1,6 +1,5 @@
 @comment $FreeBSD$
 @unexec %%RC_DIR%%/etc/rc.d/slapd%%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/cosine.ldif
@@ -66,7 +65,6 @@ etc/openldap/DB_CONFIG.example
 %%BACK_SQL%%libexec/openldap/back_sql.la
 %%BACK_SQL%%libexec/openldap/back_sql.so
 libexec/slapd
-%%SLURPD%%libexec/slurpd
 @dirrmtry libexec/openldap
 sbin/slapacl
 sbin/slapadd
@@ -81,6 +79,4 @@ sbin/slaptest
 @dirrmtry %%LDAP_RUN_DIR%%
 @exec mkdir -p %%DATABASEDIR%%
 @dirrmtry %%DATABASEDIR%%
-%%SLURPD%%@exec mkdir -p %%SLURPDIR%%
-%%SLURPD%%@dirrmtry %%SLURPDIR%%
 @cwd %%PREFIX%%