Date: Wed, 30 Aug 2006 14:25:45 +0400 (MSD) From: Stanislav Sedov <ssedov@mbsd.msk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/102687: [PATCH] net/ruby-ldap: update to 0.9.7, take maintainership Message-ID: <20060830102545.85CDC11B5F@fonon.realnet> Resent-Message-ID: <200608301030.k7UAULrk076594@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102687
>Category: ports
>Synopsis: [PATCH] net/ruby-ldap: update to 0.9.7, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 30 10:30:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Stanislav Sedov
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
MBSD labs, Inc.
>Environment:
System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Wed Aug 2 21:44:37 MSD
>Description:
- Update to 0.9.7
- Make prefix-clean
- Garantee permissions safety
- Take maintainership
This PR depends on ports/102685
>How-To-Repeat:
>Fix:
--- ruby18-ldap-0.9.7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/ruby-ldap/Makefile /var/tmp/ruby-ldap/Makefile
--- /usr/ports/net/ruby-ldap/Makefile Fri Jun 9 00:41:30 2006
+++ /var/tmp/ruby-ldap/Makefile Wed Aug 30 14:12:42 2006
@@ -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 @@
DISTNAME= ruby-${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= ruby
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= ssedov@mbsd.msk.ru
COMMENT= Ruby interface to LDAP API based on RFC1823
WITH_LDAP?= openldap2
@@ -27,7 +27,7 @@
.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 @@
--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-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 -ruN --exclude=CVS /usr/ports/net/ruby-ldap/distinfo /var/tmp/ruby-ldap/distinfo
--- /usr/ports/net/ruby-ldap/distinfo Fri Jun 9 00:41:30 2006
+++ /var/tmp/ruby-ldap/distinfo Wed Aug 30 14:10:09 2006
@@ -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 -ruN --exclude=CVS /usr/ports/net/ruby-ldap/pkg-plist /var/tmp/ruby-ldap/pkg-plist
--- /usr/ports/net/ruby-ldap/pkg-plist Mon Sep 5 17:12:45 2005
+++ /var/tmp/ruby-ldap/pkg-plist Wed Aug 30 14:25:18 2006
@@ -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
--- ruby18-ldap-0.9.7.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060830102545.85CDC11B5F>