4 files changed, 36 insertions, 17 deletions

diff --git a/net/ruby-ldap/Makefile b/net/ruby-ldap/Makefile
index aa106f214450..ef7b094a2282 100644
--- a/net/ruby-ldap/Makefile
+++ b/net/ruby-ldap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ldap
-PORTVERSION=	0.3.2
+PORTVERSION=	0.3.3
 CATEGORIES=	net ruby
 MASTER_SITES=	http://kt-www.jaist.ac.jp:8000/~ttate/ftp/
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -49,15 +49,11 @@ CONFIGURE_ARGS?=	--with-netscape \
 			--with-ldap-dir="${LOCALBASE}/mozilla/directory"
 .endif
 
-WRKSRC=		${WRKDIR}/ruby-${PORTNAME}
+#WRKSRC=		${WRKDIR}/ruby-${PORTNAME}
 INSTALL_TARGET=	site-install
 
 DOCS_EN=	README		README.html
 
-post-extract:
-	find ${WRKSRC} -name CVS -type d | xargs ${RM} -r
-	${CHMOD} 644 ${WRKSRC}/test/*.rb
-
 post-patch:
 	${RM} ${WRKSRC}/test/test.sh.orig
 	${RUBY} -i -pe 'gsub /!!PREFIX!!/, "${PREFIX}"' \
diff --git a/net/ruby-ldap/distinfo b/net/ruby-ldap/distinfo
index 6843cbc46497..0bac7c6fb2ea 100644
--- a/net/ruby-ldap/distinfo
+++ b/net/ruby-ldap/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-ldap-0.3.2.tar.gz) = 84244e2cf3022d8563d08619bb405c70
+MD5 (ruby/ruby-ldap-0.3.3.tar.gz) = 533e3ca0cf42874c4eaeebe09748c926
diff --git a/net/ruby-ldap/files/patch-test.sh b/net/ruby-ldap/files/patch-test.sh
index f5856bcf3fff..f2750262a49c 100644
--- a/net/ruby-ldap/files/patch-test.sh
+++ b/net/ruby-ldap/files/patch-test.sh
@@ -1,6 +1,6 @@
---- test/test.sh.orig	Sun Nov 19 02:46:14 2000
-+++ test/test.sh	Sun Nov 19 06:55:30 2000
-@@ -4,24 +4,24 @@
+--- test/test.sh.orig	Wed Nov 22 01:21:08 2000
++++ test/test.sh	Wed Nov 22 02:12:48 2000
+@@ -4,12 +4,12 @@
  'openldap1')
    # for OpenLDAP1
    TESTDIR=./test/openldap1
@@ -13,8 +13,9 @@
 -  RUBY=ruby-1.6
 +  RUBY=!!RUBY!!
    LOGFILE=test.log
+   SERVERLOG=serv.log
    LDAPDOPT="-d 2 -f $CONFIG -p $PORT"
-   ;;
+@@ -18,12 +18,12 @@
  'openldap2')
    # for OpenLDAP2
    TESTDIR=./test/openldap2
@@ -27,5 +28,27 @@
 -  RUBY=ruby-1.6
 +  RUBY=!!RUBY!!
    LOGFILE=test.log
-   LDAPURL=ldap://127.0.0.1:$PORT/
-   LDAPDOPT="-d 2 -f $CONFIG -h $LDAPURL"
+   SERVERLOG=serv.log
+   LDAPURL="ldap://127.0.0.1:$PORT/"
+@@ -33,13 +33,13 @@
+ 'openldap2-ssl')
+   # -- experimental -- OpenLDAP2 with SSL,SASL
+   TESTDIR=./test/openldap2
+-  LDAPD=/usr/local/openldap/libexec/slapd
++  LDAPD=!!PREFIX!!/libexec/slapd
+   CONFIG=$TESTDIR/slapd-ssl.conf
+   DBDIR=$TESTDIR/test-db
+   PIDFILE=$DBDIR/slapd.pid
+   PORT=6666
+   SSLPORT=6667
+-  RUBY=ruby-1.6
++  RUBY=!!RUBY!!
+   LOGFILE=test.log
+   SERVERLOG=serv.log
+   LDAPURL="ldaps://127.0.0.1:$SSLPORT/ ldap://127.0.0.1:$PORT/"
+@@ -133,4 +133,4 @@
+ rm -rf $DBDIR
+ if [ "$CERTFILE" != "" ]; then
+   rm -f $CERTFILE $KEYFILE
+-fi
++fi
diff --git a/net/ruby-ldap/pkg-plist b/net/ruby-ldap/pkg-plist
index 2f967ad3b627..b798f2ec836d 100644
--- a/net/ruby-ldap/pkg-plist
+++ b/net/ruby-ldap/pkg-plist
@@ -1,11 +1,9 @@
 %%RUBY_SITEARCHLIBDIR%%/ldap.so
 %%RUBY_EXAMPLESDIR%%/ldap/add.rb
+%%RUBY_EXAMPLESDIR%%/ldap/bind-ssl.rb
 %%RUBY_EXAMPLESDIR%%/ldap/bind.rb
 %%RUBY_EXAMPLESDIR%%/ldap/conf.rb
 %%RUBY_EXAMPLESDIR%%/ldap/delete.rb
-%%RUBY_EXAMPLESDIR%%/ldap/ldif/passwd.ldif
-%%RUBY_EXAMPLESDIR%%/ldap/ldif/referrals.ldif
-%%RUBY_EXAMPLESDIR%%/ldap/ldif/test1.ldif
 %%RUBY_EXAMPLESDIR%%/ldap/modrdn.rb
 %%RUBY_EXAMPLESDIR%%/ldap/openldap1/schema/slapd.at.conf
 %%RUBY_EXAMPLESDIR%%/ldap/openldap1/schema/slapd.oc.conf
@@ -20,6 +18,7 @@
 %%RUBY_EXAMPLESDIR%%/ldap/openldap2/schema/nadf.schema
 %%RUBY_EXAMPLESDIR%%/ldap/openldap2/schema/nis.schema
 %%RUBY_EXAMPLESDIR%%/ldap/openldap2/schema/openldap.schema
+%%RUBY_EXAMPLESDIR%%/ldap/openldap2/slapd-ssl.conf
 %%RUBY_EXAMPLESDIR%%/ldap/openldap2/slapd.conf
 %%RUBY_EXAMPLESDIR%%/ldap/search.rb
 %%RUBY_EXAMPLESDIR%%/ldap/search2.rb
@@ -27,11 +26,12 @@
 %%RUBY_EXAMPLESDIR%%/ldap/test
 %%RUBY_EXAMPLESDIR%%/ldap/test.sh
 @unexec rm -f %D/%%RUBY_EXAMPLESDIR%%/ldap/test.log 2>/dev/null || true
+@dirrm %%RUBY_EXAMPLESDIR%%/ldap/openldap2/test-db
 @dirrm %%RUBY_EXAMPLESDIR%%/ldap/openldap2/schema
 @dirrm %%RUBY_EXAMPLESDIR%%/ldap/openldap2
+@dirrm %%RUBY_EXAMPLESDIR%%/ldap/openldap1/test-db
 @dirrm %%RUBY_EXAMPLESDIR%%/ldap/openldap1/schema
 @dirrm %%RUBY_EXAMPLESDIR%%/ldap/openldap1
-@dirrm %%RUBY_EXAMPLESDIR%%/ldap/ldif
 @dirrm %%RUBY_EXAMPLESDIR%%/ldap
 %%RUBY_DOCDIR%%/ldap/README
 %%RUBY_DOCDIR%%/ldap/README.html