MODRUBY_ICONV_DEPENDS only makes sense on ruby 1.8. There are only
three ports that depend on ruby 1.8 that still need it, and those
can hard code it. Other ports we don't build ruby 1.8 versions of
by default, so we can just remove the dependency.
OKs?
Thanks,
Jeremy
Index: converters/ruby-json/Makefile
===================================================================
RCS file: /cvs/ports/converters/ruby-json/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- converters/ruby-json/Makefile 18 Jul 2015 04:03:48 -0000 1.28
+++ converters/ruby-json/Makefile 18 Jul 2015 17:12:21 -0000
@@ -17,8 +17,7 @@ MODULES= lang/ruby
CONFIGURE_STYLE= ruby gem ext
MODRUBY_TEST= rake
-TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH} \
- ${MODRUBY_ICONV_DEPENDS}
+TEST_DEPENDS = ${FULLPKGNAME}:${BUILD_PKGPATH}
do-test:
cd ${WRKSRC} && /usr/bin/env -i ${MAKE_ENV} RUBYOPT=-rubygems \
Index: databases/ruby-sqlite3/Makefile
===================================================================
RCS file: /cvs/ports/databases/ruby-sqlite3/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- databases/ruby-sqlite3/Makefile 18 Jul 2015 15:46:11 -0000 1.34
+++ databases/ruby-sqlite3/Makefile 18 Jul 2015 17:05:50 -0000
@@ -22,7 +22,6 @@ CONFIGURE_STYLE= ruby gem ext
MODRUBY_TEST= rake
TEST_DEPENDS= devel/ruby-mocha,${MODRUBY_FLAVOR} \
- ${MODRUBY_ICONV_DEPENDS} \
${FULLPKGNAME}:${BUILD_PKGPATH}
do-test:
Index: devel/ruby-gettext/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-gettext/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- devel/ruby-gettext/Makefile 11 Oct 2014 19:54:46 -0000 1.19
+++ devel/ruby-gettext/Makefile 18 Jul 2015 17:06:09 -0000
@@ -3,7 +3,7 @@
COMMENT= Ruby interface to gettext
DISTNAME= gettext-2.0.4
-REVISION = 8
+REVISION = 9
CATEGORIES= devel
HOMEPAGE= http://www.yotabanana.com/hiki/ruby-gettext.html
@@ -14,8 +14,7 @@ PERMIT_PACKAGE_CDROM= Yes
MODULES= lang/ruby
BUILD_DEPENDS= devel/ruby-locale,${MODRUBY_FLAVOR}
-RUN_DEPENDS= ${MODRUBY_ICONV_DEPENDS} \
- devel/ruby-locale,${MODRUBY_FLAVOR}
+RUN_DEPENDS= devel/ruby-locale,${MODRUBY_FLAVOR}
CONFIGURE_STYLE= ruby gem
Index: devel/ruby-ole/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-ole/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- devel/ruby-ole/Makefile 11 Oct 2014 19:54:46 -0000 1.7
+++ devel/ruby-ole/Makefile 18 Jul 2015 17:06:23 -0000
@@ -4,7 +4,7 @@ COMMENT = provides read/write access to
DISTNAME = ruby-ole-1.2.11.4
PKGNAME = ${DISTNAME:S/ruby-//}
-REVISION = 1
+REVISION = 2
CATEGORIES = devel
# MIT
@@ -15,7 +15,5 @@ MODULES = lang/ruby
CONFIGURE_STYLE = ruby gem
MODRUBY_TEST = rake
-
-RUN_DEPENDS = ${MODRUBY_ICONV_DEPENDS}
.include <bsd.port.mk>
Index: devel/ruby-rb-gsl/Makefile
===================================================================
RCS file: /cvs/ports/devel/ruby-rb-gsl/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- devel/ruby-rb-gsl/Makefile 23 Jun 2015 07:52:11 -0000 1.7
+++ devel/ruby-rb-gsl/Makefile 18 Jul 2015 17:06:40 -0000
@@ -4,6 +4,7 @@ COMMENT = Ruby interface to GSL
DISTNAME = rb-gsl-1.16.0.4
PKGNAME = ${DISTNAME:S/rb-//}
+REVISION = 0
CATEGORIES = devel
# GPLv2
@@ -14,8 +15,7 @@ MODULES = lang/ruby
WANTLIB += gsl gslcblas
BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = ${MODRUBY_ICONV_DEPENDS} \
- devel/ruby-narray,${MODRUBY_FLAVOR}
+RUN_DEPENDS = devel/ruby-narray,${MODRUBY_FLAVOR}
LIB_DEPENDS = devel/gsl
CONFIGURE_STYLE =ruby gem ext
Index: sysutils/ruby-puppet/Makefile.inc
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/Makefile.inc,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile.inc
--- sysutils/ruby-puppet/Makefile.inc 18 Jul 2015 15:46:11 -0000 1.30
+++ sysutils/ruby-puppet/Makefile.inc 18 Jul 2015 17:07:01 -0000
@@ -34,8 +34,7 @@ BUILD_DEPENDS +=${RUN_DEPENDS}
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 \
- ${MODRUBY_ICONV_DEPENDS}
+ sysutils/ruby-shadow,${MODRUBY_FLAVOR}>=2.3.4p1
# Apache2
PERMIT_PACKAGE_CDROM= Yes
Index: textproc/ruby-maruku/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-maruku/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- textproc/ruby-maruku/Makefile 11 Oct 2014 19:54:47 -0000 1.7
+++ textproc/ruby-maruku/Makefile 18 Jul 2015 17:07:20 -0000
@@ -3,7 +3,7 @@
COMMENT = Ruby markdown interpreter
DISTNAME = maruku-0.6.1
-REVISION = 1
+REVISION = 2
CATEGORIES = textproc
HOMEPAGE = http://maruku.rubyforge.org/
@@ -14,8 +14,7 @@ PERMIT_PACKAGE_CDROM = Yes
MODULES = lang/ruby
BUILD_DEPENDS = ${RUN_DEPENDS}
-RUN_DEPENDS = textproc/ruby-syntax,${MODRUBY_FLAVOR} \
- ${MODRUBY_ICONV_DEPENDS}
+RUN_DEPENDS = textproc/ruby-syntax,${MODRUBY_FLAVOR}
CONFIGURE_STYLE = ruby gem
Index: lang/ruby/ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.80
diff -u -p -r1.80 ruby.port.mk
--- lang/ruby/ruby.port.mk 16 Jul 2015 17:27:08 -0000 1.80
+++ lang/ruby/ruby.port.mk 18 Jul 2015 16:51:47 -0000
@@ -199,12 +199,6 @@ MODRUBY_LIB_DEPENDS= ${MODRUBY_RUN_DEPEN
MODRUBY_BUILD_DEPENDS= ${MODRUBY_RUN_DEPENDS}
-.if ${MODRUBY_REV} == 1.8
-MODRUBY_ICONV_DEPENDS= ruby-iconv->=1.8,<1.9:lang/ruby/${MODRUBY_REV},-iconv
-.else
-MODRUBY_ICONV_DEPENDS= ${MODRUBY_RUN_DEPENDS}
-.endif
-
# location of ruby libraries
.if ${MODRUBY_REV} == jruby
MODRUBY_LIBDIR= ${LOCALBASE}/jruby/lib/ruby
Index: games/easyrpg/Makefile
===================================================================
RCS file: /cvs/ports/games/easyrpg/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- games/easyrpg/Makefile 17 Mar 2015 23:43:25 -0000 1.10
+++ games/easyrpg/Makefile 18 Jul 2015 16:52:58 -0000
@@ -28,8 +28,8 @@ MODULES += converters/libiconv \
# iconv is deprecated with ruby>1.8
MODRUBY_REV = 1.8
-BUILD_DEPENDS = ${MODRUBY_ICONV_DEPENDS} \
- devel/boost
+BUILD_DEPENDS = devel/boost \
+ lang/ruby/1.8,-iconv
LIB_DEPENDS = audio/libsndfile \
audio/openal \
Index: textproc/gonzui/Makefile
===================================================================
RCS file: /cvs/ports/textproc/gonzui/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- textproc/gonzui/Makefile 8 Sep 2014 17:04:51 -0000 1.34
+++ textproc/gonzui/Makefile 18 Jul 2015 16:53:45 -0000
@@ -23,13 +23,13 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE
BUILD_DEPENDS= databases/db/v4 \
databases/ruby-bdb,${MODRUBY_FLAVOR} \
- ${MODRUBY_ICONV_DEPENDS}
+ lang/ruby/1.8,-iconv
RUN_DEPENDS= archivers/bzip2 \
archivers/unzip \
archivers/xz \
databases/db/v4 \
databases/ruby-bdb,${MODRUBY_FLAVOR} \
- ${MODRUBY_ICONV_DEPENDS} \
+ lang/ruby/1.8,-iconv \
textproc/p5-PPI
MODRUBY_ADJ_FILES= gonzui-db \
Index: www/puppet-dashboard/Makefile
===================================================================
RCS file: /cvs/ports/www/puppet-dashboard/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- www/puppet-dashboard/Makefile 15 Jul 2015 14:59:15 -0000 1.38
+++ www/puppet-dashboard/Makefile 18 Jul 2015 16:54:01 -0000
@@ -21,7 +21,7 @@ MASTER_SITES= http://puppetlabs.com/down
RUN_DEPENDS= databases/ruby-mysql,${MODRUBY_FLAVOR} \
devel/ruby-rake,${MODRUBY_FLAVOR} \
www/ruby-rack,${MODRUBY_FLAVOR} \
- ${MODRUBY_ICONV_DEPENDS}
+ lang/ruby/1.8,-iconv
PKG_ARCH= *
NO_BUILD= Yes
