3 files changed, 29 insertions, 20 deletions

diff --git a/net/ruby-ldap/Makefile b/net/ruby-ldap/Makefile
index 3961b43ebd3f..daa2e71e88b0 100644
--- a/net/ruby-ldap/Makefile
+++ b/net/ruby-ldap/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ldap
-PORTVERSION=	0.9.5
+PORTVERSION=	0.9.7
 CATEGORIES=	net ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ruby-${PORTNAME}
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
 DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Ruby interface to LDAP API based on RFC1823
 
 WITH_LDAP?=	openldap2
@@ -27,7 +27,7 @@ USE_OPENLDAP=	yes
 .elif ${WITH_LDAP} == ldapsdk
 LIB_DEPENDS=	${LOCALBASE}/mozilla/directory/lib/libldap.so.1:${PORTSDIR}/net/ldapsdk
 .else
-IGNORE=	Cannot install: WITH_LDAP must be set to one of "openldap1", "openldap2" and "ldapsdk"
+IGNORE=		you should set WITH_LDAP variable to openldap1, openldap2 or ldapsdk
 .endif
 
 USE_RUBY=	yes
@@ -52,11 +52,17 @@ CONFIGURE_ARGS?=	--with-netscape \
 			--with-ldap-dir="${LOCALBASE}/mozilla/directory"
 .endif
 
-#WRKSRC=		${WRKDIR}/ruby-${PORTNAME}
 INSTALL_TARGET=	site-install
 
 DOCS_EN=	ChangeLog FAQ README TODO
 
+# XXX: exists untill it will be committed to bsd.port.mk
+COPYTREE_SHARE=	${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \
+		2>&1) && \
+		${CHOWN} -R ${SHAREOWN}:${SHAREGRP} $$1 && \
+		${FIND} $$1/ -type d -exec ${CHMOD} 755 {} \; && \
+		${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' --
+
 post-patch:
 	${RUBY} -i -pe 'gsub %r|/usr/local/openldap|, "${PREFIX}"' \
 		-e 'gsub /ruby-1\.6/, "${RUBY}"' ${WRKSRC}/test/test.sh
@@ -64,12 +70,10 @@ post-patch:
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${RUBY_MODEXAMPLESDIR}
-	${CP} -R ${WRKSRC}/test/* ${WRKSRC}/example/* ${RUBY_MODEXAMPLESDIR}/
-	${LN} -fs . ${RUBY_MODEXAMPLESDIR}/test
 	${MKDIR} ${RUBY_MODDOCDIR}
-.for f in ${DOCS_EN}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
-.endfor
+	@(cd ${WRKSRC}/test/ && ${COPYTREE_SHARE} \* ${RUBY_MODEXAMPLESDIR}/)
+	@(cd ${WRKSRC}/example/ && ${COPYTREE_SHARE} \* ${RUBY_MODEXAMPLESDIR}/)
+	${INSTALL_DATA} ${DOCS_EN:S,^,${WRKSRC}/,} ${RUBY_MODDOCDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/ruby-ldap/distinfo b/net/ruby-ldap/distinfo
index 69645ce400b7..05283f6e4963 100644
--- a/net/ruby-ldap/distinfo
+++ b/net/ruby-ldap/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-ldap-0.9.5.tar.gz) = 3d2200205eb8198858d77e8294a0b6f6
-SHA256 (ruby/ruby-ldap-0.9.5.tar.gz) = 044c70ccc7ebe99eb353e709f78bf909583492b3fd4aa59619c28f24d5d46d2a
-SIZE (ruby/ruby-ldap-0.9.5.tar.gz) = 63375
+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
diff --git a/net/ruby-ldap/pkg-plist b/net/ruby-ldap/pkg-plist
index 329660d9533e..429940993c7a 100644
--- a/net/ruby-ldap/pkg-plist
+++ b/net/ruby-ldap/pkg-plist
@@ -2,7 +2,10 @@
 %%RUBY_SITELIBDIR%%/ldap/control.rb
 %%RUBY_SITELIBDIR%%/ldap/ldif.rb
 %%RUBY_SITELIBDIR%%/ldap/schema.rb
-@dirrm %%RUBY_SITELIBDIR%%/ldap
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/FAQ
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/add.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/add2.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/add3.rb
@@ -47,17 +50,19 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_ldif.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_schema.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/tc_search.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ts_ldap.rb
-%%PORTDOCS%%@unexec rm -f %D/%%RUBY_MODEXAMPLESDIR%%/test 2>/dev/null || true
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.sh
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ts_ldap.rb
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/openssl
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/openldap2
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/openldap1
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/cgi
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/data
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/cgi
 %%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/FAQ
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO
+%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
+%%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
+@dirrm %%RUBY_SITELIBDIR%%/ldap
+@dirrmtry %%RUBY_SITEARCHLIBDIR%%
+@dirrmtry %%RUBY_SITELIBDIR%%
+@dirrmtry lib/ruby/site_ruby
+@dirrmtry lib/ruby