From 04527497793503e4b2f9bfecc6316e4d095f6231 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Tue, 31 Oct 2000 12:11:39 +0000
Subject: Update to 0.3.

Use OpenLDAP2 by default.  It doesn't work well with OpenLDAP1 in this
version temporarily, but should be fixed in the next version.
---
 net/ruby-ldap/Makefile | 26 ++++++++++++++++++++++----
 net/ruby-ldap/distinfo |  2 +-
 2 files changed, 23 insertions(+), 5 deletions(-)

(limited to 'net/ruby-ldap')

diff --git a/net/ruby-ldap/Makefile b/net/ruby-ldap/Makefile
index 63eddde3dd91..b431d4f5c662 100644
--- a/net/ruby-ldap/Makefile
+++ b/net/ruby-ldap/Makefile
@@ -6,17 +6,25 @@
 #
 
 PORTNAME=	ldap
-PORTVERSION=	0.3.p2
+PORTVERSION=	0.3
 CATEGORIES=	net ruby
 MASTER_SITES=	http://kt-www.jaist.ac.jp:8000/~ttate/ftp/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	ruby-${PORTNAME}-${PORTVERSION:S/.p/-pre/}
+DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	knu@FreeBSD.org
 
-.if !defined(WITHOUT_OPENLDAP1)
+WITH_LDAP?=	openldap2
+
+.if ${WITH_LDAP} == openldap1
 LIB_DEPENDS=	ldap.1:${PORTSDIR}/net/openldap
+.elif ${WITH_LDAP} == openldap2
+LIB_DEPENDS=	ldap.2:${PORTSDIR}/net/openldap2
+.elif ${WITH_LDAP} == ldapsdk
+LIB_DEPENDS=	${LOCALBASE}/mozilla/directory/lib/libldap.so.1:${PORTSDIR}/net/ldapsdk
+.else
+.error WITH_LDAP must be set to one of "openldap1", "openldap2" and "ldapsdk".
 .endif
 
 USE_RUBY=	yes
@@ -29,7 +37,17 @@ USE_RUBY_EXTCONF=	yes
 #   --with-netscape	specify this to use Netscape SDK
 #   --with-openldap1	specify this to use OpenLDAP-1.x
 #   --with-openldap2	specify this to use OpenLDAP-2.x
-CONFIGURE_ARGS?=	--with-openldap1 --with-ldap="${LOCALBASE}"
+.if ${WITH_LDAP} == openldap1
+CONFIGURE_ARGS?=	--with-openldap1 \
+			--with-ldap-dir="${LOCALBASE}"
+.elif ${WITH_LDAP} == openldap2
+USE_OPENSSL=		yes
+CONFIGURE_ARGS?=	--with-openldap2 \
+			--with-ldap-dir="${LOCALBASE}"
+.elif ${WITH_LDAP} == ldapsdk
+CONFIGURE_ARGS?=	--with-netscape \
+			--with-ldap-dir="${LOCALBASE}/mozilla/directory"
+.endif
 
 INSTALL_TARGET=	site-install
 
diff --git a/net/ruby-ldap/distinfo b/net/ruby-ldap/distinfo
index 8f6e8f5d38e1..613dc1c2a3a6 100644
--- a/net/ruby-ldap/distinfo
+++ b/net/ruby-ldap/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-ldap-0.3-pre2.tar.gz) = 38b2d103323c4bae39e8ab2cdfe10f0c
+MD5 (ruby/ruby-ldap-0.3.tar.gz) = b38ec2f8c2629f61714d43758543c616
-- 
cgit v1.2.3