Remove MODRUBY_RAKE_DEPENDS. Only necessary on ruby 1.8, and none of

the ports that use it are still built with ruby 1.8.

OK ajacoutot@
This commit is contained in:
jeremy 2015-07-19 02:10:31 +00:00
parent 9906df3b62
commit 3b2e299ff9
13 changed files with 31 additions and 53 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2014/01/15 02:13:58 jeremy Exp $
# $OpenBSD: Makefile,v 1.18 2015/07/19 02:10:31 jeremy Exp $
COMMENT = cross-platform dynamic library loading for ruby
DISTNAME = ffi-1.2.0
REVISION = 3
REVISION = 4
CATEGORIES = devel
HOMEPAGE= https://github.com/ffi/ffi
@ -15,9 +15,6 @@ PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/ruby
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = ${MODRUBY_RAKE_DEPENDS}
WANTLIB = ffi
LIB_DEPENDS = devel/libffi

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2014/10/11 19:54:46 jeremy Exp $
# $OpenBSD: Makefile,v 1.18 2015/07/19 02:10:31 jeremy Exp $
COMMENT= install Ruby gems as plugins
DISTNAME= gem_plugin-0.2.3
REVISION= 8
REVISION= 9
CATEGORIES= devel
# RubyLicense
@ -13,7 +13,4 @@ MODULES= lang/ruby
CONFIGURE_STYLE=ruby gem
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ${MODRUBY_RAKE_DEPENDS}
.include <bsd.port.mk>

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.24 2014/10/11 19:54:46 jeremy Exp $
# $OpenBSD: Makefile,v 1.25 2015/07/19 02:10:31 jeremy Exp $
COMMENT= simple rake/rubygems helper for project Rakefiles
DISTNAME= hoe-3.12.0
REVISION = 0
REVISION = 1
CATEGORIES= devel
# MIT
@ -11,9 +11,6 @@ PERMIT_PACKAGE_CDROM= Yes
MODULES= lang/ruby
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ${MODRUBY_RAKE_DEPENDS}
CONFIGURE_STYLE=ruby gem
# Tests require minitest > 5.3, which isn't in ports.

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2013/10/26 23:55:35 jeremy Exp $
# $OpenBSD: Makefile,v 1.7 2015/07/19 02:10:31 jeremy Exp $
COMMENT = simple helper for creating rubygem projects
DISTNAME = jeweler-1.8.4
REVISION = 0
REVISION = 1
CATEGORIES = devel
HOMEPAGE = https://github.com/technicalpickles/jeweler
@ -17,7 +17,6 @@ CONFIGURE_STYLE = ruby gem
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = devel/ruby-git,${MODRUBY_FLAVOR}>=1.2.5 \
devel/ruby-bundler,${MODRUBY_FLAVOR}>=1.0,<2.0 \
${MODRUBY_RAKE_DEPENDS}
devel/ruby-bundler,${MODRUBY_FLAVOR}>=1.0,<2.0
.include <bsd.port.mk>

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.19 2014/01/15 12:33:45 jasper Exp $
# $OpenBSD: Makefile,v 1.20 2015/07/19 02:10:31 jeremy Exp $
COMMENT = Ruby library for mocking and stubbing
DISTNAME = mocha-0.13.3
REVISION = 0
REVISION = 1
CATEGORIES = devel
HOMEPAGE = http://mocha.rubyforge.org/
@ -14,8 +14,7 @@ PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/ruby
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = ${MODRUBY_RAKE_DEPENDS} \
devel/ruby-metaclass,${MODRUBY_FLAVOR}
RUN_DEPENDS = devel/ruby-metaclass,${MODRUBY_FLAVOR}
CONFIGURE_STYLE = ruby gem

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.11 2014/10/11 19:54:46 jeremy Exp $
# $OpenBSD: Makefile,v 1.12 2015/07/19 02:10:31 jeremy Exp $
COMMENT = build and package Ruby extensions using Rake as glue
DISTNAME = rake-compiler-0.7.9
REVISION = 5
REVISION = 6
CATEGORIES = devel
HOMEPAGE = https://github.com/luislavena/rake-compiler
@ -17,9 +17,6 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = ${MODRUBY_RAKE_DEPENDS}
pre-configure:
${SUBST_CMD} -DMAKE_PROGRAM=${MAKE_PROGRAM} \
${WRKSRC}/lib/rake/extensiontask.rb \

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2014/09/19 20:12:26 jeremy Exp $
# $OpenBSD: Makefile,v 1.3 2015/07/19 02:10:31 jeremy Exp $
COMMENT= extending Rake with remote task goodness
DISTNAME= rake-remote_task-2.2.2
REVISION= 0
REVISION= 1
CATEGORIES= devel
# MIT
@ -14,7 +14,6 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ${MODRUBY_RAKE_DEPENDS} \
devel/ruby-open4,${MODRUBY_FLAVOR}
RUN_DEPENDS= devel/ruby-open4,${MODRUBY_FLAVOR}
.include <bsd.port.mk>

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.15 2013/10/26 23:55:36 jeremy Exp $
# $OpenBSD: Makefile,v 1.16 2015/07/19 02:10:31 jeremy Exp $
COMMENT= embed C/++ external module code in your Ruby script
@ -19,8 +19,7 @@ CONFIGURE_STYLE= ruby gem
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= devel/ruby-zentest,${MODRUBY_FLAVOR}>=4.3,<5.0
TEST_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH} \
${MODRUBY_RAKE_DEPENDS}
TEST_DEPENDS= ${FULLPKGNAME}:${BUILD_PKGPATH}
do-test:
@cd ${WRKBUILD} && ${RUBY} -Ilib/ ./test/test_inline.rb

View File

@ -1,4 +1,4 @@
# $OpenBSD: ruby.port.mk,v 1.81 2015/07/18 21:07:40 jeremy Exp $
# $OpenBSD: ruby.port.mk,v 1.82 2015/07/19 02:10:31 jeremy Exp $
# ruby module
@ -132,7 +132,6 @@ MODRUBY_FLAVOR = rbx
GEM_MAN_SUFFIX = -${MODRUBY_FLAVOR}
.endif
MODRUBY_RAKE_DEPENDS =
MODRUBY_RSPEC_DEPENDS = devel/ruby-rspec/1,${MODRUBY_FLAVOR}<2.0
MODRUBY_RSPEC3_DEPENDS = devel/ruby-rspec/3/rspec,${MODRUBY_FLAVOR}>=3.0
@ -156,7 +155,6 @@ RUBY= ${LOCALBASE}/bin/ruby${MODRUBY_BINREV}
RAKE= ${LOCALBASE}/bin/rake${MODRUBY_BINREV}
MODRUBY_BIN_TESTRB = ${LOCALBASE}/bin/testrb${MODRUBY_BINREV}
. if ${MODRUBY_REV} == 1.8
MODRUBY_RAKE_DEPENDS = devel/ruby-rake
RSPEC= ${LOCALBASE}/bin/spec
MODRUBY_BIN_RSPEC = ${LOCALBASE}/bin/rspec
. else
@ -242,8 +240,8 @@ BUILD_DEPENDS+= ${MODRUBY_BUILD_DEPENDS}
RUN_DEPENDS+= ${MODRUBY_RUN_DEPENDS}
.endif
.if ${MODRUBY_TEST:L:Mrake}
TEST_DEPENDS+= ${MODRUBY_RAKE_DEPENDS}
.if ${MODRUBY_TEST:L:Mrake} && ${MODRUBY_REV} == 1.8
TEST_DEPENDS+= devel/ruby-rake
.endif
.if ${MODRUBY_TEST:L:Mrspec}
TEST_DEPENDS+= ${MODRUBY_RSPEC_DEPENDS}

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.17 2015/05/13 05:25:52 jasper Exp $
# $OpenBSD: Makefile,v 1.18 2015/07/19 02:10:31 jeremy Exp $
COMMENT= pragmatic application deployment automation
DISTNAME= vlad-2.6.4
REVISION= 0
CATEGORIES= sysutils
HOMEPAGE= http://rubyhitsquad.com/Vlad_the_Deployer.html
@ -15,8 +16,7 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= ${MODRUBY_RAKE_DEPENDS} \
devel/ruby-rake-remote_task,${MODRUBY_FLAVOR}
RUN_DEPENDS= devel/ruby-rake-remote_task,${MODRUBY_FLAVOR}
MODRUBY_TEST= rake
TEST_DEPENDS= devel/ruby-hoe,${MODRUBY_FLAVOR} \

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2015/06/25 18:53:07 jasper Exp $
# $OpenBSD: Makefile,v 1.22 2015/07/19 02:10:31 jeremy Exp $
COMMENT= flexible HTML parser
@ -10,8 +10,6 @@ HOMEPAGE= http://code.whytheluckystiff.net/hpricot/
# BSD
PERMIT_PACKAGE_CDROM= Yes
BUILD_DEPENDS= ${MODRUBY_RAKE_DEPENDS}
MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem ext

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2013/10/26 23:55:38 jeremy Exp $
# $OpenBSD: Makefile,v 1.13 2015/07/19 02:10:31 jeremy Exp $
COMMENT= automate interaction with websites
@ -11,8 +11,7 @@ HOMEPAGE= http://mechanize.rubyforge.org/mechanize
# BSD
PERMIT_PACKAGE_CDROM= Yes
BUILD_DEPENDS= ${RUN_DEPENDS} \
${MODRUBY_RAKE_DEPENDS}
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= textproc/ruby-nokogiri,${MODRUBY_FLAVOR}
MODULES= lang/ruby

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.41 2015/07/17 14:36:29 jeremy Exp $
# $OpenBSD: Makefile,v 1.42 2015/07/19 02:10:31 jeremy Exp $
COMMENT-main = Nginx module for deploying ruby applications
COMMENT-standalone = ruby web application server
@ -8,7 +8,7 @@ BROKEN-hppa = rake fails when linking PassengerHelperAgent
PASS_VERSION = 4.0.44
NGINX_VERSION = 1.4.7
DISTNAME = passenger-${PASS_VERSION}
REVISION = 3
REVISION = 4
FULLPKGNAME-main = ${MODRUBY_PKG_PREFIX}-${DISTNAME}
FULLPKGNAME-standalone = ${MODRUBY_PKG_PREFIX}-passenger-standalone-${PASS_VERSION}.${NGINX_VERSION}
FULLPKGPATH-main = ${BASE_PKGPATH},-main
@ -51,8 +51,7 @@ WANTLIB-standalone = c crypto curl ev idn m pcre pthread ssl stdc++ z
# also uses BSD make.
BUILD_DEPENDS = ${RUN_DEPENDS-main} \
devel/gmake
RUN_DEPENDS-main = ${MODRUBY_RAKE_DEPENDS} \
devel/ruby-daemon_controller,${MODRUBY_FLAVOR}>=1.2.0 \
RUN_DEPENDS-main = devel/ruby-daemon_controller,${MODRUBY_FLAVOR}>=1.2.0 \
www/ruby-rack,${MODRUBY_FLAVOR}
LIB_DEPENDS-main = ${MODRUBY_LIB_DEPENDS} \
${LIB_DEPENDS-standalone}