diff options
| -rw-r--r-- | net/ruby-ldap/Makefile | 9 | ||||
| -rw-r--r-- | net/ruby-ldap/distinfo | 2 | ||||
| -rw-r--r-- | net/ruby-ldap/files/patch-test.sh | 54 | ||||
| -rw-r--r-- | net/ruby-ldap/pkg-plist | 7 |
4 files changed, 12 insertions, 60 deletions
diff --git a/net/ruby-ldap/Makefile b/net/ruby-ldap/Makefile index 19c0fe290a58..e6636a57cccf 100644 --- a/net/ruby-ldap/Makefile +++ b/net/ruby-ldap/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ldap -PORTVERSION= 0.3.4 +PORTVERSION= 0.3.5 CATEGORIES= net ruby MASTER_SITES= http://kt-www.jaist.ac.jp/~ttate/ftp/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -55,14 +55,13 @@ INSTALL_TARGET= site-install DOCS_EN= README README.html post-patch: - ${RM} ${WRKSRC}/test/test.sh.orig - ${RUBY} -i -pe 'gsub /!!PREFIX!!/, "${PREFIX}"' \ - -e 'gsub /!!RUBY!!/, "${RUBY}"' ${WRKSRC}/test/test.sh + ${RUBY} -i -pe 'gsub %r|/usr/local/openldap|, "${PREFIX}"' \ + -e 'gsub /ruby-1\.6/, "${RUBY}"' ${WRKSRC}/test/test.sh post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${RUBY_EXAMPLESDIR}/ldap - ${CP} -R ${WRKSRC}/test/* ${RUBY_EXAMPLESDIR}/ldap/ + ${CP} -R ${WRKSRC}/test/* ${WRKSRC}/example/* ${RUBY_EXAMPLESDIR}/ldap/ ${LN} -s . ${RUBY_EXAMPLESDIR}/ldap/test ${MKDIR} ${RUBY_DOCDIR}/ldap .for f in ${DOCS_EN} diff --git a/net/ruby-ldap/distinfo b/net/ruby-ldap/distinfo index a14260a1a7bd..cadd6ba02620 100644 --- a/net/ruby-ldap/distinfo +++ b/net/ruby-ldap/distinfo @@ -1 +1 @@ -MD5 (ruby/ruby-ldap-0.3.4.tar.gz) = 0725119c0bb8ba940198b050495f10be +MD5 (ruby/ruby-ldap-0.3.5.tar.gz) = 8515ef7411ef5ea8923f28a817e3ef33 diff --git a/net/ruby-ldap/files/patch-test.sh b/net/ruby-ldap/files/patch-test.sh deleted file mode 100644 index f2750262a49c..000000000000 --- a/net/ruby-ldap/files/patch-test.sh +++ /dev/null @@ -1,54 +0,0 @@ ---- 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 -- LDAPD=/usr/local/openldap-1.2.11/libexec/slapd -+ LDAPD=!!PREFIX!!/libexec/slapd - CONFIG=$TESTDIR/slapd.conf - DBDIR=$TESTDIR/test-db - PIDFILE=$DBDIR/slapd.pid - PORT=6666 -- 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 -- LDAPD=/usr/local/openldap/libexec/slapd -+ LDAPD=!!PREFIX!!/libexec/slapd - CONFIG=$TESTDIR/slapd.conf - DBDIR=$TESTDIR/test-db - PIDFILE=$DBDIR/slapd.pid - PORT=6666 -- RUBY=ruby-1.6 -+ RUBY=!!RUBY!! - LOGFILE=test.log - 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 cd470ea8caf0..42e41ec194bc 100644 --- a/net/ruby-ldap/pkg-plist +++ b/net/ruby-ldap/pkg-plist @@ -2,6 +2,8 @@ %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/add.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/bind-ssl.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/bind.rb +%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/cgi/search.cgi +%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/cgi/search.html %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/conf.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/delete.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/modrdn.rb @@ -20,18 +22,23 @@ %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/openldap2/schema/openldap.schema %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/openldap2/slapd-ssl.conf %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/openldap2/slapd.conf +%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/openssl/openssl.cnf +%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/openssl/ssl.sh + %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/search.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/search2.rb %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/search3.rb %%PORTDOCS%%@unexec rm -f %D/%%RUBY_EXAMPLESDIR%%/ldap/test 2>/dev/null || true %%PORTDOCS%%@unexec rm -f %D/%%RUBY_EXAMPLESDIR%%/ldap/test.log 2>/dev/null || true %%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/ldap/test.sh +%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/ldap/openssl %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/ldap/openldap2/test-db %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/ldap/openldap2/schema %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/ldap/openldap2 %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/ldap/openldap1/test-db %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/ldap/openldap1/schema %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/ldap/openldap1 +%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/ldap/cgi %%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/ldap %%PORTDOCS%%%%RUBY_DOCDIR%%/ldap/README %%PORTDOCS%%%%RUBY_DOCDIR%%/ldap/README.html |