--- //SpectraBSD_ports/main/net/openldap24-server/Makefile	2013-09-09 22:53:39.000000000 -0600
+++ /usr/home/justing/perforce/SpectraBSD_ports/net/openldap24-server/Makefile	2013-09-09 22:53:39.000000000 -0600
@@ -59,7 +59,7 @@
 PORTREVISION_SERVER=	0
 OPENLDAP_SHLIB_MAJOR=	8
 
-OPTIONS_DEFINE=	FETCH
+OPTIONS_DEFINE=	DEBUG FETCH
 
 FETCH_DESC=	Enable fetch(3) support
 
@@ -73,6 +73,7 @@
 
 OPTIONS_DEFAULT=	BDB TCP_WRAPPERS SEQMOD SYNCPROV DYNAMIC_BACKENDS
 
+DEBUG_DESC=		With diagnostic logging features
 DYNACL_DESC=		Run-time loadable ACL (experimental)
 ACI_DESC=		Per-object ACI (experimental)
 BDB_DESC=		With BerkeleyDB backend
@@ -170,8 +171,11 @@
 			--enable-dynamic
 
 # XXX FreeBSD does not implement O_DSYNC and fdatasync at this time.
-CFLAGS+=		-DMDB_DSYNC=O_SYNC -Dfdatasync=fsync \
-			-DLDAP_CONNECTIONLESS
+CFLAGS+=		-DMDB_DSYNC=O_SYNC -Dfdatasync=fsync
+
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--enable-debug
+.endif
 
 .if !${PORT_OPTIONS:MFETCH}
 CONFIGURE_ARGS+=	--without-fetch
@@ -476,11 +480,8 @@
 # end of client/server specific configuration
 .endif
 
-.if defined(WITH_CLDAP)
-CPPFLAGS+=		-DLDAP_CONNECTIONLESS
-.endif
-
-CPPFLAGS+=		${PTHREAD_CFLAGS} \
+CPPFLAGS+=		-DLDAP_CONNECTIONLESS \
+			${PTHREAD_CFLAGS} \
 			-I${LOCALBASE}/include
 LDFLAGS+=		-L${LOCALBASE}/lib
 #LIBS+=			${PTHREAD_LIBS}
