[pkgsrc/trunk]: pkgsrc/lang Move buildlinks from ruby18-base/Makefile to ruby...

[taca <taca%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c78bac222627
branches:  trunk
changeset: 518194:c78bac222627
user:      taca <taca%pkgsrc.org@localhost>
date:      Sun Sep 03 02:53:13 2006 +0000

description:
Move buildlinks from ruby18-base/Makefile to ruby/rubyversion.mk.
It should help for fixing the build problem of some extention libraries.

diffstat:

 lang/ruby/rubyversion.mk  |  15 ++++++++++++++-
 lang/ruby18-base/Makefile |  11 +----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diffs (57 lines):

diff -r 0999488aefbe -r c78bac222627 lang/ruby/rubyversion.mk
--- a/lang/ruby/rubyversion.mk  Sun Sep 03 01:43:28 2006 +0000
+++ b/lang/ruby/rubyversion.mk  Sun Sep 03 02:53:13 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.21 2006/01/05 07:04:47 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.22 2006/09/03 02:53:13 taca Exp $
 #
 
 .if !defined(_RUBYVERSION_MK)
@@ -214,4 +214,17 @@
                        RUBY_DLEXT=${RUBY_DLEXT:Q} \
                        ${PLIST_RUBY_DIRS:S,DIR="${PREFIX}/,DIR=",}
 
+.if !empty(RUBY_NOVERSION:M[nN][oO])
+#
+# Use Berkley DB unless a system has real ndbm(3).
+#
+.include "../../mk/dlopen.buildlink3.mk"
+.if !exists(/usr/include/ndbm.h)
+.include "../../mk/bdb.buildlink3.mk"
+.endif
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.endif
+
 .endif # _RUBY_MK
diff -r 0999488aefbe -r c78bac222627 lang/ruby18-base/Makefile
--- a/lang/ruby18-base/Makefile Sun Sep 03 01:43:28 2006 +0000
+++ b/lang/ruby18-base/Makefile Sun Sep 03 02:53:13 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2006/08/02 07:02:44 taca Exp $
+# $NetBSD: Makefile,v 1.24 2006/09/03 02:53:13 taca Exp $
 #
 
 DISTNAME=      ${RUBY_DISTNAME}
@@ -43,13 +43,6 @@
 FILES_SUBST+=  DATE=${DATE:Q}
 
 #
-# Use Berkley DB unless a system has real ndbm(3).
-#
-.if !exists(/usr/include/ndbm.h)
-.include "../../mk/bdb.buildlink3.mk"
-.endif
-
-#
 # IRIX work around which should be fixed.
 #
 .if ${OPSYS} == "IRIX"
@@ -135,6 +128,4 @@
 .endfor
 
 .include "../../lang/ruby/Makefile.common"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"