Correct content to really buildlink3.mk; fix many mistakes.

1 files changed, 15 insertions, 61 deletions

diff --git a/lang/ruby/buildlink3.mk b/lang/ruby/buildlink3.mk
index ef334931c59..befc5877e49 100644
--- a/lang/ruby/buildlink3.mk
+++ b/lang/ruby/buildlink3.mk
@@ -1,72 +1,26 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/11/29 10:31:28 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/03/06 16:44:04 taca Exp $
 
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-RUBY_BASE_BUILDLINK3_MK:=	${RUBY_BASE_BUILDLINK3_MK}+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+RUBY_BUILDLINK3_MK:=	${RUBY_BUILDLINK3_MK}+
 
+.if !defined(_RUBYVERSION_MK)
 .include "../../lang/ruby/rubyversion.mk"
-
-RUBY_MD_LIBDIR=			${RUBY_ARCH}
+.endif
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	${RUBY_NAME}
+BUILDLINK_DEPENDS+=	${RUBY_BASE}
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nruby}
-BUILDLINK_PACKAGES+=	${RUBY_NAME}
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:N${RUBY_BASE}}
+BUILDLINK_PACKAGES+=	${RUBY_BASE}
 
-.if !empty(RUBY_BASE_BUILDLINK3_MK:M+)
-.if ${RUBY_VER} == "16"
-RUBYSRCDIR=			../../lang/ruby16
-BUILDLINK_DEPENDS.ruby16?=	ruby16>=${RUBY_REQD}
-BUILDLINK_PKGSRCDIR.ruby16?=	${RUBYSRCDIR}
-EVAL_PREFIX+=			BUILDLINK_PREFIX.ruby16=${RUBY_NAME}
-BUILDLINK_PREFIX.ruby16_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.ruby16=	lib/libruby${RUBY_VER}.*
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/config.h
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/defines.h
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/dln.h
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/env.h
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/intern.h
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/libruby${RUBY_VER}.a
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/node.h
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/rbconfig.rb
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/re.h
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/regex.h
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/ruby.h
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/rubyio.h
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/rubysig.h
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/st.h
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/util.h
-BUILDLINK_FILES.ruby16+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/version.h
-.elif ${RUBY_VER} == "18"
-RUBYSRCDIR=			../../lang/ruby18
-BUILDLINK_DEPENDS.ruby18?=	ruby18>=${RUBY_REQD}
-BUILDLINK_PKGSRCDIR.ruby18?=	${RUBYSRCDIR}
-EVAL_PREFIX+=			BUILDLINK_PREFIX.ruby18=${RUBY_NAME}
-BUILDLINK_FILES.ruby18=	lib/libruby${RUBY_VER}.*
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/config.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/defines.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/dl.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/dlconfig.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/dln.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/env.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/intern.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/libruby${RUBY_VER}.a
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/missing.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/node.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/rbconfig.rb
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/re.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/regex.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/ruby.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/rubyio.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/rubysig.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/st.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/util.h
-BUILDLINK_FILES.ruby18+= lib/ruby/${RUBY_VER_DIR}/${RUBY_MD_LIBDIR}/version.h
-.endif
+.if !empty(RUBY_BUILDLINK3_MK:M+)
 
-BUILDLINK_PREFIX.ruby-base_DEFAULT=	${LOCALBASE}
+BUILDLINK_DEPENDS.${RUBY_BASE}?=	${RUBY_BASE}>=${RUBY_REQD}
+BUILDLINK_PKGSRCDIR.${RUBY_BASE}?=	../../lang/${RUBY_BASE}
+BUILDLINK_FILES.${RUBY_BASE}+=		lib/libruby${RUBY_VER}.*
+BUILDLINK_FILES.${RUBY_BASE}+=	lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h
 
-.endif	# RUBY_BASE_BUILDLINK3_MK
+.endif	# RUBY_BUILDLINK3_MK
 
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}