7 files changed, 19 insertions, 19 deletions
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 6150eb539be..ad8cef3f7bc 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2013/06/27 16:37:16 taca Exp $
+# $NetBSD: Makefile,v 1.55 2014/03/13 17:06:42 taca Exp $
 
 DISTNAME=	# empty
 PKGNAME=	ruby-${RUBY_VERSION_FULL}
@@ -17,7 +17,7 @@ NO_BUILD=	yes
 
 .include "../../lang/ruby/rubyversion.mk"
 
-DEPENDS+= ${RUBY_PKGPREFIX}-base>=${RUBY_VERSION}:../../lang/${RUBY_PKGPREFIX}-base
+DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 
 RUBY_COMMANDS=	erb irb ruby testrb
 .if ${RUBY_VER} == "18"
@@ -41,7 +41,7 @@ GENERATE_PLIST+=	${ECHO} man/man1/ruby.1;
 do-install:
 .if ${RUBY_NAME} != "ruby"
 .  for f in ${RUBY_COMMANDS}
-	${LN} -sf ${f}${RUBY_VER} ${DESTDIR}${PREFIX}/bin/${f}
+	${LN} -sf ${f}${RUBY_SUFFIX} ${DESTDIR}${PREFIX}/bin/${f}
 .  endfor
 	${LN} -sf ${RUBY_NAME}.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ruby.1
 .endif
diff --git a/lang/ruby/Makefile.common b/lang/ruby/Makefile.common
index d088de29db1..32750c22a8a 100644
--- a/lang/ruby/Makefile.common
+++ b/lang/ruby/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2012/10/17 00:17:50 taca Exp $
+# $NetBSD: Makefile.common,v 1.30 2014/03/13 17:06:42 taca Exp $
 #
 # Ruby base distribution common definition
 # used by databases/ruby-gdbm/Makefile
@@ -46,7 +46,7 @@ MASTER_SITE_RUBY?= \
 	ftp://ftp.idaemons.org/pub/mirror/ftp.ruby-lang.org/ruby/${RUBY_SITE_SUBDIR}/
 
 # Ruby distribution
-RUBY_DISTINFO_FILE=	${RUBY_SRCDIR}/distinfo
+RUBY_DISTINFO_FILE=	${.CURDIR}/${RUBY_SRCDIR}/distinfo
 
 RUBY_HOMEPAGE=		http://www.ruby-lang.org/en/
 
@@ -66,8 +66,8 @@ PLIST_SUBST+=		RUBY_SHLIBVER=${RUBY_SHLIBVER:Q} \
 .if !empty(RUBY_EXTNAME)
 
 PKGNAME?=		${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION_FULL}
-DISTINFO_FILE=		${.CURDIR}/../../lang/${RUBY_BASE}/distinfo
-PATCHDIR=		${.CURDIR}/../../lang/${RUBY_BASE}/patches
+DISTINFO_FILE=		${.CURDIR}/${RUBY_SRCDIR}/distinfo
+PATCHDIR=		${.CURDIR}/${RUBY_SRCDIR}/patches
 do-patch:
 	${_PKG_SILENT}${_PKG_DEBUG}	\
 	cd ${WRKSRC};			\
diff --git a/lang/ruby/buildlink3.mk b/lang/ruby/buildlink3.mk
index ba386ec9f54..fcc86c0d375 100644
--- a/lang/ruby/buildlink3.mk
+++ b/lang/ruby/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2012/05/07 02:45:47 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2014/03/13 17:06:42 taca Exp $
 
 BUILDLINK_TREE+=	${RUBY_BASE}
 
@@ -11,15 +11,15 @@ RUBY_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.${RUBY_BASE}+=	${RUBY_BASE}>=${RUBY_VERSION}
 BUILDLINK_ABI_DEPENDS.${RUBY_BASE}+=	${RUBY_BASE}>=${RUBY_ABI_VERSION}
-BUILDLINK_PKGSRCDIR.${RUBY_BASE}?=	../../lang/${RUBY_BASE}
-BUILDLINK_FILES.${RUBY_BASE}+=		lib/libruby${RUBY_VER}.*
+BUILDLINK_PKGSRCDIR.${RUBY_BASE}?=	${RUBY_SRCDIR}
+BUILDLINK_FILES.${RUBY_BASE}+=		lib/libruby${RUBY_SUFFIX}.*
 BUILDLINK_FILES.${RUBY_BASE}+=	lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h
 
 BUILDLINK_TARGETS+=	buildlink-bin-ruby
 
 buildlink-bin-ruby:
 	${RUN} \
-	f=${BUILDLINK_PREFIX.${RUBY_BASE}:Q}"/bin/ruby${RUBY_VER}"; \
+	f=${BUILDLINK_PREFIX.${RUBY_BASE}:Q}"/bin/ruby${RUBY_SUFFIX}"; \
 	if ${TEST} -f $$f; then \
 		${LN} -s $$f ${BUILDLINK_DIR}/bin/ruby; \
 	fi
diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk
index ac0f52f8488..352c1c15e33 100644
--- a/lang/ruby/modules.mk
+++ b/lang/ruby/modules.mk
@@ -1,4 +1,4 @@
-# $NetBSD: modules.mk,v 1.34 2013/06/15 09:11:27 obache Exp $
+# $NetBSD: modules.mk,v 1.35 2014/03/13 17:06:42 taca Exp $
 
 .if !defined(_RUBY_MODULE_MK)
 _RUBY_MODULE_MK=	# defined
@@ -15,7 +15,7 @@ USE_TOOLS+=		expr
 PKGNAME?=	${RUBY_PKGPREFIX}-${DISTNAME}
 
 .if defined(NO_BUILD) && empty(NO_BUILD:M[Nn][Oo])
-DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_VERSION}:../../lang/${RUBY_BASE}
+DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION}:${RUBY_SRCDIR}
 .else
 .include "../../lang/ruby/buildlink3.mk"
 .endif
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 2b949b010ea..7840c233b07 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2012/02/16 16:46:24 taca Exp $
+# $NetBSD: Makefile,v 1.23 2014/03/13 17:06:42 taca Exp $
 #
 
 DISTNAME=	# empty
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v2 OR ruby-license
 
 META_PACKAGE=		yes
 
-DEPENDS+= ${RUBY_PKGPREFIX}-base>=${RUBY_VERSION_FULL}:../../lang/${RUBY_NAME}-base
+DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION_FULL}:${RUBY_SRCDIR}
 DEPENDS+= ${RUBY_PKGPREFIX}-gdbm>=${RUBY_VERSION_FULL}:../../databases/ruby-gdbm
 DEPENDS+= ${RUBY_PKGPREFIX}-curses>=${RUBY_VERSION_FULL}:../../devel/ruby-curses
 DEPENDS+= ${RUBY_PKGPREFIX}-readline>=${RUBY_VERSION_FULL}:../../devel/ruby-readline
diff --git a/lang/ruby193/Makefile b/lang/ruby193/Makefile
index 3fa59b53aeb..6d915d1cc46 100644
--- a/lang/ruby193/Makefile
+++ b/lang/ruby193/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2011/11/08 16:12:25 taca Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 17:06:42 taca Exp $
 #
 
 DISTNAME=	# empty
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v2 OR ruby-license
 
 META_PACKAGE=		yes
 
-DEPENDS+= ${RUBY_PKGPREFIX}-base>=${RUBY_VERSION_FULL}:../../lang/${RUBY_NAME}-base
+DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION_FULL}:${RUBY_SRCDIR}
 DEPENDS+= ${RUBY_PKGPREFIX}-gdbm>=${RUBY_VERSION_FULL}:../../databases/ruby-gdbm
 DEPENDS+= ${RUBY_PKGPREFIX}-curses>=${RUBY_VERSION_FULL}:../../devel/ruby-curses
 DEPENDS+= ${RUBY_PKGPREFIX}-fiddle>=${RUBY_VERSION_FULL}:../../devel/ruby-fiddle
diff --git a/lang/ruby200/Makefile b/lang/ruby200/Makefile
index 6b7a509963e..46c210ea2df 100644
--- a/lang/ruby200/Makefile
+++ b/lang/ruby200/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2013/07/21 02:36:38 taca Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/13 17:06:43 taca Exp $
 #
 
 DISTNAME=	# empty
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v2 OR ruby-license
 
 META_PACKAGE=		yes
 
-DEPENDS+= ${RUBY_PKGPREFIX}-base>=${RUBY_VERSION_FULL}:../../lang/${RUBY_NAME}-base
+DEPENDS+= ${RUBY_BASE}>=${RUBY_VERSION_FULL}:${RUBY_SRCDIR}
 DEPENDS+= ${RUBY_PKGPREFIX}-gdbm>=${RUBY_VERSION_FULL}:../../databases/ruby-gdbm
 DEPENDS+= ${RUBY_PKGPREFIX}-curses>=${RUBY_VERSION_FULL}:../../devel/ruby-curses
 DEPENDS+= ${RUBY_PKGPREFIX}-fiddle>=${RUBY_VERSION_FULL}:../../devel/ruby-fiddle