Remove unnecessary dependency on ruby-json.

The json library is shipped with ruby 1.9+, and these ports support the
json library that comes with ruby.  While here, remove some
MODRUBY_ICONV_DEPENDS as those only are necessary on ruby 1.8.

OK jasper@
This commit is contained in:
jeremy 2015-07-18 15:46:11 +00:00
parent 88a52fdf3e
commit aa3fa6c794
8 changed files with 19 additions and 25 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.33 2014/07/09 17:13:26 jeremy Exp $
# $OpenBSD: Makefile,v 1.34 2015/07/18 15:46:11 jeremy Exp $
COMMENT= access a SQLite3 database from ruby
@ -22,7 +22,6 @@ CONFIGURE_STYLE= ruby gem ext
MODRUBY_TEST= rake
TEST_DEPENDS= devel/ruby-mocha,${MODRUBY_FLAVOR} \
converters/ruby-json,${MODRUBY_FLAVOR} \
${MODRUBY_ICONV_DEPENDS} \
${FULLPKGNAME}:${BUILD_PKGPATH}

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2015/06/23 07:21:13 jasper Exp $
# $OpenBSD: Makefile,v 1.15 2015/07/18 15:46:11 jeremy Exp $
COMMENT= Ruby library to physically locate iPhones
DISTNAME= findmyiphone-0.2.1
REVISION= 0
CATEGORIES= geo
HOMEPAGE= https://github.com/mattb/findmyiphone
@ -15,9 +16,7 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= www/ruby-mechanize,${MODRUBY_FLAVOR} \
converters/ruby-json,${MODRUBY_FLAVOR} \
${MODRUBY_ICONV_DEPENDS}
RUN_DEPENDS= www/ruby-mechanize,${MODRUBY_FLAVOR}
MODRUBY_TEST= rake

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.1.1.1 2014/08/15 12:09:41 jasper Exp $
# $OpenBSD: Makefile,v 1.2 2015/07/18 15:46:11 jeremy Exp $
COMMENT= integration with Ubiquiti mFi sensors and devices
DISTNAME= mfi-0.9.1
REVISION= 0
CATEGORIES= net
MAINTAINER= Jasper Lievisse Adriaanse <jasper@openbsd.org>
@ -15,7 +16,6 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= converters/ruby-json,${MODRUBY_FLAVOR}>=1.8.1 \
net/ruby-net-ssh,${MODRUBY_FLAVOR}
RUN_DEPENDS= net/ruby-net-ssh,${MODRUBY_FLAVOR}
.include <bsd.port.mk>

View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.3 2014/10/03 07:24:28 jasper Exp $
# $OpenBSD: Makefile,v 1.4 2015/07/18 15:46:11 jeremy Exp $
COMMENT= web scanner
# git clone of b495eda
DISTNAME= whatweb-0.4.7.1
REVISION= 0
CATEGORIES= net www
@ -19,9 +20,6 @@ MODULES= lang/ruby
# WIP support for Ruby 1.9/2.0, but no 2.1 yet.
MODRUBY_REV= 2.0
RUN_DEPENDS= converters/ruby-json,${MODRUBY_FLAVOR} \
${MODRUBY_ICONV_DEPENDS}
MODRUBY_ADJ_FILES= whatweb
PKG_ARCH= *

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.31 2015/07/16 17:27:09 jeremy Exp $
# $OpenBSD: Makefile,v 1.32 2015/07/18 15:46:11 jeremy Exp $
BROKEN-alpha= SIGABRT during make fake
COMMENT= framework for server orchestration/parallel job execution
DISTNAME= mcollective-2.8.2
REVISION= 0
REVISION= 1
CATEGORIES= sysutils
@ -21,8 +21,7 @@ MODULES= lang/ruby
NO_BUILD= Yes
BUILD_DEPENDS= lang/ruby/${MODRUBY_REV}
RUN_DEPENDS= converters/ruby-json,${MODRUBY_FLAVOR} \
net/ruby-stomp,${MODRUBY_FLAVOR}>=1.3.4
RUN_DEPENDS= net/ruby-stomp,${MODRUBY_FLAVOR}>=1.3.4
PKG_ARCH= *
NO_TEST= Yes

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.114 2015/07/17 18:09:55 jasper Exp $
# $OpenBSD: Makefile,v 1.115 2015/07/18 15:46:11 jeremy Exp $
PORTROACH= limit:^3
VERSION= 3.8.1
REVISION= 3
REVISION= 4
RUN_DEPENDS+= archivers/gtar \
devel/ruby-rgen,${MODRUBY_FLAVOR}

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.29 2014/11/25 13:19:28 jasper Exp $
# $OpenBSD: Makefile.inc,v 1.30 2015/07/18 15:46:11 jeremy Exp $
PKG_ARCH ?= *
COMMENT ?= centralised configuration management for networks
@ -31,8 +31,7 @@ SUBST_VARS += RUBY
MODULES += lang/ruby
BUILD_DEPENDS +=${RUN_DEPENDS}
RUN_DEPENDS += converters/ruby-json,${MODRUBY_FLAVOR} \
databases/ruby-hiera,${MODRUBY_FLAVOR} \
RUN_DEPENDS += databases/ruby-hiera,${MODRUBY_FLAVOR} \
sysutils/ruby-augeas,${MODRUBY_FLAVOR} \
sysutils/ruby-facter>=2.0.1p0 \
sysutils/ruby-shadow,${MODRUBY_FLAVOR}>=2.3.4p1 \

View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.9 2015/04/01 20:55:45 jeremy Exp $
# $OpenBSD: Makefile,v 1.10 2015/07/18 15:46:11 jeremy Exp $
COMMENT = capybara driver that uses WebKit
DISTNAME = capybara-webkit-1.5.0
REVISION = 0
CATEGORIES = www
HOMEPAGE= https://github.com/thoughtbot/capybara-webkit
@ -18,8 +19,7 @@ WANTLIB += GL Qt5Core Qt5Gui Qt5Network Qt5WebKit Qt5WebKitWidgets
WANTLIB += Qt5Widgets stdc++
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS = converters/ruby-json,${MODRUBY_FLAVOR} \
www/ruby-capybara,${MODRUBY_FLAVOR}>=2.3.0,<2.5.0 \
RUN_DEPENDS = www/ruby-capybara,${MODRUBY_FLAVOR}>=2.3.0,<2.5.0 \
x11/qt5
.include <bsd.port.mk>