diff options
| author | taca <taca@pkgsrc.org> | 2006-02-13 15:23:28 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2006-02-13 15:23:28 +0000 |
| commit | 8f6a3924ae47fe1b6baccaf36d1fbe05e1f843e0 (patch) | |
| tree | e6016ff4eaf52890d0710b2a6f0c38bb3fcf4dcc /textproc | |
| parent | 03b9fc9f7aa1d19febda402d4046a2a0c5e53767 (diff) | |
| download | pkgsrc-8f6a3924ae47fe1b6baccaf36d1fbe05e1f843e0.tar.gz | |
Merge rdversion.mk into buildlink3.mk and obsolete it.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/ruby-rdtool/buildlink3.mk | 12 | ||||
| -rw-r--r-- | textproc/ruby-rdtool/rdversion.mk | 15 |
2 files changed, 9 insertions, 18 deletions
diff --git a/textproc/ruby-rdtool/buildlink3.mk b/textproc/ruby-rdtool/buildlink3.mk index 01c758946c8..ed914c7b625 100644 --- a/textproc/ruby-rdtool/buildlink3.mk +++ b/textproc/ruby-rdtool/buildlink3.mk @@ -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:= ${BUILDLINK_PACKAGES:N${RUBY_PKGPREFIX}-rdtool} 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 --git a/textproc/ruby-rdtool/rdversion.mk b/textproc/ruby-rdtool/rdversion.mk deleted file mode 100644 index e5682519726..00000000000 --- a/textproc/ruby-rdtool/rdversion.mk +++ /dev/null @@ -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 |