- Update to 0.9.9

- Don't abuse WITH_LDAP and convert to WITH_LDAP_BACKEND
- OPENLDAP_VER 12 is no longer supported in Mk/bsd.ldap.mk

PR:             ports/139794
Submitted by:   MURAOKA Daisuke <raia@muj.biglobe.ne.jp>
Tweaked by:     myself (pgollucci)
Approved by:    maintainer timeout (stas ; 317 days)
Sponsored by:   RideCharge Inc. / TaxiMagic

5 files changed, 14 insertions, 111 deletions

diff --git a/net/ruby-ldap/Makefile b/net/ruby-ldap/Makefile
index 5eccc752bea0..97c26600305d 100644
--- a/net/ruby-ldap/Makefile
+++ b/net/ruby-ldap/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ldap
-PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTVERSION=	0.9.9
 CATEGORIES=	net ruby
-MASTER_SITES=	SF/ruby-${PORTNAME}/ruby-${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	RF
+MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
@@ -17,56 +17,31 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Ruby interface to LDAP API based on RFC1823
 
-WITH_LDAP?=	openldap2
+WITH_LDAP_BACKEND?=	openldap2
 
-.if ${WITH_LDAP} == openldap1
-USE_OPENLDAP=	yes
-WANT_OPENLDAP_VER=	12
-.elif ${WITH_LDAP} == openldap2
-USE_OPENLDAP=	yes
-.elif ${WITH_LDAP} == ldapsdk
+.if ${WITH_LDAP_BACKEND} == ldapsdk
 LIB_DEPENDS=	${LOCALBASE}/mozilla/directory/lib/libldap.so.1:${PORTSDIR}/net/ldapsdk
 .else
-IGNORE=		you should set WITH_LDAP variable to openldap1, openldap2 or ldapsdk
+USE_OPENLDAP=	yes
 .endif
 
+USE_BZIP2=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
 .include <bsd.port.pre.mk>
 
-.if ${WITH_LDAP} == openldap2
-. if exists(${LOCALBASE}/bin/ldapwhoami)
-_OPENLDAP_VER!= ${LOCALBASE}/bin/ldapwhoami -VV 2>&1 | ${GREP} ldapwhoami | ${SED} -E 's/.*OpenLDAP: ldapwhoami (2)\.(3|4).*/\1\2/'
-. endif
-
-. if defined(_OPENLDAP_VER)
-LDAPVER=	${_OPENLDAP_VER}
-. elif defined(DEFAULT_OPENLDAP_VER)
-LDAPVER=	${DEFAULT_OPENLDAP_VER}
-. else
-LDAPVER=	24
-. endif
-. if ${LDAPVER} == 24
-EXTRA_PATCHES=	${FILESDIR}/extra::patch-ldap.c ${FILESDIR}/extra::patch-conn.c
-. endif
-.endif
-
 # Configure options:
 #   --with-ldap		specify the ldap directory
 #   --with-ldap-incdir	specify the directory which contains ldap.h and lber.h
 #   --with-ldap-libdir	specify the directory which contains ldap libraries
 #   --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
-.if ${WITH_LDAP} == openldap1
-CONFIGURE_ARGS?=	--with-openldap1 \
-			--with-ldap-dir="${LOCALBASE}"
-.elif ${WITH_LDAP} == openldap2
+.if ${WITH_LDAP_BACKEND} == openldap2
 USE_OPENSSL=		yes
 CONFIGURE_ARGS?=	--with-openldap2 \
 			--with-ldap-dir="${LOCALBASE}"
-.elif ${WITH_LDAP} == ldapsdk
+.elif ${WITH_LDAP_BACKEND} == ldapsdk
 CONFIGURE_ARGS?=	--with-netscape \
 			--with-ldap-dir="${LOCALBASE}/mozilla/directory"
 .endif
diff --git a/net/ruby-ldap/distinfo b/net/ruby-ldap/distinfo
index 05283f6e4963..c55e2fb62a18 100644
--- a/net/ruby-ldap/distinfo
+++ b/net/ruby-ldap/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-ldap-0.9.7.tar.gz) = 373d07cb833fac6d907652f7c8ac7480
-SHA256 (ruby/ruby-ldap-0.9.7.tar.gz) = be8db063c98ff9de317983860048b3391e311ff8c961851bd01c29f0bdc8edec
-SIZE (ruby/ruby-ldap-0.9.7.tar.gz) = 63870
+MD5 (ruby/ruby-ldap-0.9.9.tar.bz2) = 77ae221f2232ad6e24f88d7cf652d1b1
+SHA256 (ruby/ruby-ldap-0.9.9.tar.bz2) = 59459bb38eb24953fa817cee7a62959904119602daab36ad70fe8b78bb958aab
+SIZE (ruby/ruby-ldap-0.9.9.tar.bz2) = 55225
diff --git a/net/ruby-ldap/files/extra::patch-conn.c b/net/ruby-ldap/files/extra::patch-conn.c
index dfd19436d93a..e69de29bb2d1 100644
--- a/net/ruby-ldap/files/extra::patch-conn.c
+++ b/net/ruby-ldap/files/extra::patch-conn.c
@@ -1,48 +0,0 @@
---- conn.c.orig	2009-02-19 21:50:36.000000000 +0300
-+++ conn.c	2009-02-19 21:52:45.000000000 +0300
-@@ -497,8 +497,20 @@
- #ifdef LDAP_OPT_X_TLS_KEYFILE
-     case LDAP_OPT_X_TLS_KEYFILE:
- #endif
--#ifdef LDAP_OPT_X_TLS_PROTOCOL
--    case LDAP_OPT_X_TLS_PROTOCOL:
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL2
-+    case LDAP_OPT_X_TLS_PROTOCOL_SSL2:
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3
-+    case LDAP_OPT_X_TLS_PROTOCOL_SSL3:
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3
-+    case LDAP_OPT_X_TLS_PROTOCOL_TLS1_0:
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3
-+    case LDAP_OPT_X_TLS_PROTOCOL_TLS1_1:
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3
-+    case LDAP_OPT_X_TLS_PROTOCOL_TLS1_2:
- #endif
- #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
-     case LDAP_OPT_X_TLS_CIPHER_SUITE:
-@@ -627,8 +639,20 @@
- #ifdef LDAP_OPT_X_TLS_KEYFILE
- 	case LDAP_OPT_X_TLS_KEYFILE:
- #endif
--#ifdef LDAP_OPT_X_TLS_PROTOCOL
--	case LDAP_OPT_X_TLS_PROTOCOL:
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL2
-+	case LDAP_OPT_X_TLS_PROTOCOL_SSL2:
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3
-+	case LDAP_OPT_X_TLS_PROTOCOL_SSL3:
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3
-+	case LDAP_OPT_X_TLS_PROTOCOL_TLS1_0:
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3
-+	case LDAP_OPT_X_TLS_PROTOCOL_TLS1_1:
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3
-+	case LDAP_OPT_X_TLS_PROTOCOL_TLS1_2:
- #endif
- #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
- 	case LDAP_OPT_X_TLS_CIPHER_SUITE:
diff --git a/net/ruby-ldap/files/extra::patch-ldap.c b/net/ruby-ldap/files/extra::patch-ldap.c
index 1eaefd2c6783..e69de29bb2d1 100644
--- a/net/ruby-ldap/files/extra::patch-ldap.c
+++ b/net/ruby-ldap/files/extra::patch-ldap.c
@@ -1,25 +0,0 @@
---- ldap.c.orig	2009-02-19 21:53:02.000000000 +0300
-+++ ldap.c	2009-02-19 21:53:58.000000000 +0300
-@@ -420,8 +420,20 @@
- #ifdef LDAP_OPT_X_TLS
-   rb_ldap_define_opt (LDAP_OPT_X_TLS);
- #endif
--#ifdef LDAP_OPT_X_TLS_PROTOCOL
--  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL);
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL2
-+  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_SSL2);
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_SSL3
-+  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_SSL3);
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_TLS1_0
-+  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_TLS1_0);
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_TLS1_1
-+  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_TLS1_1);
-+#endif
-+#ifdef LDAP_OPT_X_TLS_PROTOCOL_TLS1_2
-+  rb_ldap_define_opt (LDAP_OPT_X_TLS_PROTOCOL_TLS1_2);
- #endif
- #ifdef LDAP_OPT_X_TLS_CIPHER_SUITE
-   rb_ldap_define_opt (LDAP_OPT_X_TLS_CIPHER_SUITE);
diff --git a/net/ruby-ldap/pkg-descr b/net/ruby-ldap/pkg-descr
index 1f063e82f8b2..9c3a5bf3a48f 100644
--- a/net/ruby-ldap/pkg-descr
+++ b/net/ruby-ldap/pkg-descr
@@ -5,4 +5,5 @@ Supported LDAP libraries are OpenLDAP, Michigan LDAP, and NetscapeSDK.
 
 Author:	Takaaki Tateishi <ttate@users.sourceforge.net>
 Author: Ian Macdonald <ian@caliban.org>
-WWW:	http://ruby-ldap.sourceforge.net/
+Author: Alexey Chebotar <alexey.chebotar@gmail.com>
+WWW:	http://rubyforge.org/projects/ruby-ldap/