No need to replace ruby with ${RUBY}.

lang/ruby/buildlink3.mk take care it.

2 files changed, 3 insertions, 62 deletions

diff --git a/databases/qdbm/distinfo b/databases/qdbm/distinfo
index eca03a3e3d8..66bb8f65a10 100644
--- a/databases/qdbm/distinfo
+++ b/databases/qdbm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2007/11/16 11:50:45 obache Exp $
+$NetBSD: distinfo,v 1.21 2008/02/07 12:40:16 obache Exp $
 
 SHA1 (qdbm-1.8.77.tar.gz) = e277e77bc0209cc4c8eb205a9082ef880048445c
 RMD160 (qdbm-1.8.77.tar.gz) = 3c684a4127204faf32472d29d7fd64a07e394332
@@ -8,5 +8,5 @@ SHA1 (patch-ab) = 973e4e2e4e88f6a999456347380aedc19b3f0425
 SHA1 (patch-ac) = 7986596c900d20d2b26a8906eca1d925060bec91
 SHA1 (patch-ad) = 38b1852cabca8c064bd2a6a4639368e812869448
 SHA1 (patch-ae) = aa90ad3e228f765b0ac0a8a6744f7af0f4cf9a7f
-SHA1 (patch-af) = db3cfc3b08a16f82b925fb4fe961eef4c936fd86
+SHA1 (patch-af) = 547e0c7b5d4689f8e80e490819b6df76d8f72ecd
 SHA1 (patch-ag) = 57987329cf7dd5a87b2fcd80c9b6e38bd556b742
diff --git a/databases/qdbm/patches/patch-af b/databases/qdbm/patches/patch-af
index b92a9b26175..c45c022263b 100644
--- a/databases/qdbm/patches/patch-af
+++ b/databases/qdbm/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2006/10/01 07:48:38 obache Exp $
+$NetBSD: patch-af,v 1.3 2008/02/07 12:40:16 obache Exp $
 
 --- ruby/Makefile.in.orig	2006-09-06 12:37:33.000000000 +0900
 +++ ruby/Makefile.in
@@ -11,62 +11,3 @@ $NetBSD: patch-af,v 1.2 2006/10/01 07:48:38 obache Exp $
  DESTDIR =
  
  # Building binaries
-@@ -35,9 +35,9 @@ RUNENV = LD_LIBRARY_PATH=.:..:../..:/usr
- 
- 
- all :
--	cd depot && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
--	cd curia && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
--	cd villa && [ -f Makefile ] || $(RUNENV) ruby extconf.rb ; $(RUNENV) make
-+	cd depot && [ -f Makefile ] || $(RUNENV) ${RUBY} extconf.rb ; $(RUNENV) make
-+	cd curia && [ -f Makefile ] || $(RUNENV) ${RUBY} extconf.rb ; $(RUNENV) make
-+	cd villa && [ -f Makefile ] || $(RUNENV) ${RUBY} extconf.rb ; $(RUNENV) make
- 	@printf '\n'
- 	@printf '#================================================================\n'
- 	@printf '# Ready to install.\n'
-@@ -69,7 +69,7 @@ install :
- 
- 
- uninstall :
--	pprefix=`ruby -e '$$:.each() do |path| ; printf("%s\n", path) ; end' | grep -v '^\.'` ; \
-+	pprefix=`${RUBY} -e '$$:.each() do |path| ; printf("%s\n", path) ; end' | grep -v '^\.'` ; \
- 	  find $$pprefix -print | sort | uniq | \
- 	  egrep '(mod_depot\.so|depot\.rb|mod_curia\.so|curia\.rb|mod_villa\.so|villa\.rb)' | \
- 	  xargs rm -f
-@@ -85,27 +85,27 @@ check :
- 	sync ; sync
- 	cd depot && rm -rf casket
- 	cd depot && \
--	  $(RUNENV) ruby -w -Ilib rbdptest write casket 10000 1000
-+	  $(RUNENV) ${RUBY} -w -Ilib rbdptest write casket 10000 1000
- 	cd depot && \
--	  $(RUNENV) ruby -w -Ilib rbdptest read casket
-+	  $(RUNENV) ${RUBY} -w -Ilib rbdptest read casket
- 	cd depot && \
--	  $(RUNENV) ruby -w -Ilib rbdptest misc casket
-+	  $(RUNENV) ${RUBY} -w -Ilib rbdptest misc casket
- 	cd depot && rm -rf casket
- 	cd curia && rm -rf casket
- 	cd curia && \
--	  $(RUNENV) ruby -w -Ilib rbcrtest write casket 10000 1000 10
-+	  $(RUNENV) ${RUBY} -w -Ilib rbcrtest write casket 10000 1000 10
- 	cd curia && \
--	  $(RUNENV) ruby -w -Ilib rbcrtest read casket
-+	  $(RUNENV) ${RUBY} -w -Ilib rbcrtest read casket
- 	cd curia && \
--	  $(RUNENV) ruby -w -Ilib rbcrtest misc casket
-+	  $(RUNENV) ${RUBY} -w -Ilib rbcrtest misc casket
- 	cd curia && rm -rf casket
- 	cd villa && rm -rf casket
- 	cd villa && \
--	  $(RUNENV) ruby -w -Ilib rbvltest write casket 10000
-+	  $(RUNENV) ${RUBY} -w -Ilib rbvltest write casket 10000
- 	cd villa && \
--	  $(RUNENV) ruby -w -Ilib rbvltest read casket
-+	  $(RUNENV) ${RUBY} -w -Ilib rbvltest read casket
- 	cd villa && \
--	  $(RUNENV) ruby -w -Ilib rbvltest misc casket
-+	  $(RUNENV) ${RUBY} -w -Ilib rbvltest misc casket
- 	cd villa && rm -rf casket
- 	@printf '\n'
- 	@printf '#================================================================\n'