summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2005-03-06 16:46:05 +0000
committertaca <taca@pkgsrc.org>2005-03-06 16:46:05 +0000
commitf4f48af2c5f9a35ca86c3336bbb651cc19b22d57 (patch)
treeb0bafab777be9a3da0090656b09476ef1b18c9e7 /lang
parentcde0471a8c33458f9525c79578bfb5cd55469b18 (diff)
downloadpkgsrc-f4f48af2c5f9a35ca86c3336bbb651cc19b22d57.tar.gz
Change depends to ruby16-base/ruby18-base package from ruby16/ruby18
package and tweak the package's COMMENT. Bump PKGREVISION.
Diffstat (limited to 'lang')
-rw-r--r--lang/ruby/Makefile8
-rw-r--r--lang/ruby/modules.mk7
2 files changed, 8 insertions, 7 deletions
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index 7db3b928561..8929613b6c6 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.32 2005/03/06 13:05:38 taca Exp $
+# $NetBSD: Makefile,v 1.33 2005/03/06 16:46:05 taca Exp $
# FreeBSD: ports/lang/ruby/Makefile,v 1.40 2001/01/18 19:53:38 knu Exp
DISTNAME= ruby-${RUBY_VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= lang ruby
MASTER_SITES= # empty
DISTFILES= # empty
MAINTAINER= taca@NetBSD.org
HOMEPAGE= http://www.ruby-lang.org/en/
-COMMENT= Ruby, object-oriented interpreted programming language
+COMMENT= Wrapper package for Ruby programming language
NO_CHECKSUM= yes
NO_CONFIGURE= yes
@@ -19,7 +19,7 @@ PLIST_SRC= ${WRKDIR}/PLIST
.include "../../lang/ruby/rubyversion.mk"
-DEPENDS+= ${RUBY_PKGPREFIX}>=${RUBY_VERSION}:../${RUBY_PKGPREFIX}
+DEPENDS+= ${RUBY_PKGPREFIX}-base>=${RUBY_VERSION}:../${RUBY_PKGPREFIX}-base
RUBY_COMMANDS= irb ruby
.if ${RUBY_VER} >= 18
diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk
index 9c2fcc4959b..9d3c4897975 100644
--- a/lang/ruby/modules.mk
+++ b/lang/ruby/modules.mk
@@ -1,13 +1,14 @@
-# $NetBSD: modules.mk,v 1.3 2004/12/16 07:11:55 taca Exp $
+# $NetBSD: modules.mk,v 1.4 2005/03/06 16:46:05 taca Exp $
.if !defined(_RUBY_MODULE_MK)
_RUBY_MODULE_MK= # defined
.include "../../lang/ruby/rubyversion.mk"
+
.if empty(USE_BUILDLINK3:M[nN][oO])
.include "../../lang/ruby/buildlink3.mk"
.elif !empty(RUBY_NOVERSION:M[nN][oO])
-DEPENDS+= ruby${RUBY_VER}>=${RUBY_REQD}:../../lang/ruby${RUBY_VER}
+DEPENDS+= ruby${RUBY_VER}-base>=${RUBY_REQD}:${RUBY_SRCDIR}
.endif
CONFIGURE_ENV+= RUBY=${RUBY} RDOC=${RDOC}
@@ -19,7 +20,7 @@ CONFIGURE_ENV+= RUBY=${RUBY} RDOC=${RDOC}
DIST_SUBDIR?= ${RUBY_DIST_SUBDIR}
.endif
-#
+#
# extconf.rb support
#
# RUBY_EXTCONF specify extconf script name (default: extconf.rb).