Fix tests, update dependencies, cleanup makefile.

databases/p5-ldap/Makefile

@@ -1,32 +1,34 @@
-COMMENT=	client interface to LDAP servers
+COMMENT =	client interface to LDAP servers
 
-VERSION=	0.68
-EPOCH=		0
-DISTNAME=	perl-ldap-${VERSION}
-PKGNAME=	p5-ldap-${VERSION}
-CATEGORIES=	databases
-MODULES=	cpan
-PKG_ARCH=	*
+VERSION =	0.68
+REVISION =	0
+EPOCH =		0
+DISTNAME =	perl-ldap-${VERSION}
+PKGNAME =	p5-ldap-${VERSION}
+CPAN_AUTHOR =	MARSCHAP
 
-CPAN_AUTHOR=	MARSCHAP
+CATEGORIES =	databases
 
-HOMEPAGE=	http://ldap.perl.org/
-
-RUN_DEPENDS=	converters/p5-Convert-ASN1 \
-		net/p5-IO-Socket-INET6 \
-		security/p5-Authen-SASL \
-		security/p5-IO-Socket-SSL \
-		textproc/p5-XML-Parser \
-		textproc/p5-XML-SAX-Writer \
-		www/p5-URI
-BUILD_DEPENDS=	${RUN_DEPENDS}
-
-TEST_DEPENDS=databases/openldap,-server
+HOMEPAGE =	http://ldap.perl.org/
 
 # Perl
-PERMIT_PACKAGE=	Yes
+PERMIT_PACKAGE =	Yes
 
-CONFIGURE_STYLE=	modinst
+MODULES =		cpan
+
+RUN_DEPENDS =		converters/p5-Convert-ASN1>=0.20 \
+			net/p5-IO-Socket-INET6 \
+			security/p5-Authen-SASL>=2.00 \
+			security/p5-IO-Socket-SSL>=1.26 \
+			textproc/p5-XML-Parser \
+			textproc/p5-XML-SAX-Writer \
+			www/p5-URI>=1.10
+TEST_DEPENDS =		databases/openldap,-server \
+			textproc/p5-Text-Soundex
+
+CONFIGURE_STYLE =	modinst
+
+PKG_ARCH =		*
 
 pre-test:
 	${SUBST_CMD} ${WRKSRC}/test.cfg

databases/p5-ldap/patches/patch-data_slapd_conf_in

@@ -0,0 +1,12 @@
+Index: data/slapd.conf.in
+--- data/slapd.conf.in.orig
++++ data/slapd.conf.in
+@@ -11,7 +11,7 @@ include $SLAPD_SCHEMA_DIR/openldap.schema
+ # get required dynmaic modules
+ #modulepath     $SLAPD_MODULE_DIR
+ #moduleload     back_$SLAPD_DB
+-#moduleload	sssvlv
++moduleload	sssvlv
+ 
+ # PID & args file
+ pidfile         $TESTDB/slapd.pid

databases/p5-ldap/patches/patch-t_60cancel_t

@@ -0,0 +1,17 @@
+This test is not reliable, skip it on OpenBSD to see regressions.
+
+Index: t/60cancel.t
+--- t/60cancel.t.orig
++++ t/60cancel.t
+@@ -60,8 +60,11 @@ SKIP: {
+ 
+   # cancel the running search => should work [may fail, as it depends on the server's speed]
+   $cancel = $ldap->cancel($search);
++  SKIP: {
++  skip("This test may fail because the server is too fast", 1);
+   ok(!$cancel->code, "cancel a running operation: " . $cancel->code . ": " . $cancel->error)
+     or diag("This test may have failed because the server was too fast");
++  }
+ }
+ 
+ 

databases/p5-ldap/patches/patch-test_cfg

@@ -1,6 +1,7 @@
---- test.cfg.orig	Sun Jun  1 12:35:49 2014
-+++ test.cfg	Mon Feb 16 15:32:28 2015
-@@ -4,22 +4,22 @@
+Index: test.cfg
+--- test.cfg.orig
++++ test.cfg
+@@ -4,19 +4,19 @@
  
  # Set this to the full path of your LDAP server executable
  # (e.g '/usr/sbin/slapd')
@@ -22,8 +23,4 @@
 +$SLAPD_SCHEMA_DIR = '${SYSCONFDIR}/openldap/schema';
  
  # OpenLDAP DB type: default is mdb, alternatives: hdb, bdb, ...
--#$SLAPD_DB = 'mdb';
-+$SLAPD_DB = 'hdb';
- 
- # Set this to the slapd module directory if your $SLAPD_DB is dynamically built
- # (e.g. '/usr/lib/ldap/')
+ #$SLAPD_DB = 'mdb';