[pkgsrc/trunk]: pkgsrc/textproc/ruby-rdtool Merge rdversion.mk into buildlink...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/685123a2f8fc
branches:  trunk
changeset: 508031:685123a2f8fc
user:      taca <taca%pkgsrc.org@localhost>
date:      Mon Feb 13 15:23:28 2006 +0000

description:
Merge rdversion.mk into buildlink3.mk and obsolete it.

diffstat:

 textproc/ruby-rdtool/buildlink3.mk |  12 +++++++++---
 textproc/ruby-rdtool/rdversion.mk  |  15 ---------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diffs (48 lines):

diff -r 09b260919267 -r 685123a2f8fc textproc/ruby-rdtool/buildlink3.mk
--- a/textproc/ruby-rdtool/buildlink3.mk        Mon Feb 13 15:23:03 2006 +0000
+++ b/textproc/ruby-rdtool/buildlink3.mk        Mon Feb 13 15:23:28 2006 +0000
@@ -1,9 +1,7 @@
-# $NetBSD: buildlink3.mk,v 1.4 2005/12/11 13:34:31 taca Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2006/02/13 15:23:28 taca Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 
-.include "rdversion.mk"
-
 RUBY_RDTOOL_BUILDLINK3_MK:=    ${RUBY_RDTOOL_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
@@ -14,6 +12,14 @@
 BUILDLINK_PACKAGES+=   ${RUBY_PKGPREFIX}-rdtool
 
 .if !empty(RUBY_RDTOOL_BUILDLINK3_MK:M+)
+
+RUBY_RD=               rd2
+RUBY_RD_VERSION =      0.6.18
+RUBY_RD_REQD=          0.6.14
+
+# create string for dependency list
+RUBY_RD_LIST=  ${RUBY_VERSION_LIST:C/([1-9][0-9]*)/ruby&-rdtool/g}
+
 BUILDLINK_FILES.ruby18-rdtool+=                bin/rd2
 BUILDLINK_DEPMETHOD.ruby18-rdtool?=    build
 BUILDLINK_DEPENDS.ruby18-rdtool+=      {${RUBY_RD_LIST}}>=0.6.14
diff -r 09b260919267 -r 685123a2f8fc textproc/ruby-rdtool/rdversion.mk
--- a/textproc/ruby-rdtool/rdversion.mk Mon Feb 13 15:23:03 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-# $NetBSD: rdversion.mk,v 1.5 2005/12/05 20:51:08 rillig Exp $
-#
-
-.if !defined(_RD_VERSION_MK)
-_RD_VERSION_MK=                # defined
-
-.include "../../lang/ruby/rubyversion.mk"
-
-RUBY_RD=               ${LOCALBASE}/bin/rd2
-RUBY_RD_VERSION =      0.6.14
-RUBY_RD_REQD=          0.6.14
-
-# create string for dependency list
-RUBY_RD_LIST=  ${RUBY_VERSION_LIST:C/([1-9][0-9]*)/ruby&-rdtool/g}
-.endif