This switches the default ruby version used for ports from 2.1 to 2.2.
Ruby 2.2 has been out for over 6 months and has already had two patch
releases, so it's likely to be as stable as ruby 2.1.
I've run this through a bulk of all ports that depend on ruby, and
all fallout has been fixed, except for one port (logstash) that will
be staying on ruby 2.1.
OKs?
Thanks,
Jeremy
Index: devel/gitsh/Makefile
===================================================================
RCS file: /cvs/ports/devel/gitsh/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- devel/gitsh/Makefile 16 Jan 2015 00:35:14 -0000 1.2
+++ devel/gitsh/Makefile 16 Jul 2015 00:57:11 -0000
@@ -5,6 +5,7 @@ VERSION = 0.9
COMMENT = interactive shell for git
DISTNAME = gitsh-${VERSION}
+REVISION = 0
CATEGORIES = devel
Index: devel/ragel/Makefile
===================================================================
RCS file: /cvs/ports/devel/ragel/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- devel/ragel/Makefile 9 May 2015 15:08:24 -0000 1.4
+++ devel/ragel/Makefile 16 Jul 2015 00:58:00 -0000
@@ -3,6 +3,7 @@
COMMENT = state machine compiler
DISTNAME = ragel-6.9
+REVISION = 0
CATEGORIES = devel
HOMEPAGE = http://www.colm.net/open-source/ragel/
Index: devel/swig/Makefile
===================================================================
RCS file: /cvs/ports/devel/swig/Makefile,v
retrieving revision 1.58
diff -u -p -r1.58 Makefile
--- devel/swig/Makefile 20 Jan 2014 19:14:50 -0000 1.58
+++ devel/swig/Makefile 16 Jul 2015 00:58:17 -0000
@@ -4,7 +4,7 @@ COMMENT = simplified wrapper and interfa
SUBST_VARS = VERSION
VERSION = 2.0.11
-REVISION = 0
+REVISION = 1
DISTNAME = swig-${VERSION}
CATEGORIES = devel
Index: lang/ruby/ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.79
diff -u -p -r1.79 ruby.port.mk
--- lang/ruby/ruby.port.mk 8 Jan 2015 18:51:20 -0000 1.79
+++ lang/ruby/ruby.port.mk 16 Jul 2015 00:28:15 -0000
@@ -46,9 +46,9 @@ FULLPKGNAME?= ${MODRUBY_PKG_PREFIX}-${P
SUBST_VARS+= GEM_BIN_SUFFIX GEM_MAN_SUFFIX
FLAVOR?=
-# Without a FLAVOR, assume the use of ruby 2.1.
+# Without a FLAVOR, assume the use of ruby 2.2.
. if empty(FLAVOR)
-FLAVOR = ruby21
+FLAVOR = ruby22
. endif
# Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
@@ -75,8 +75,8 @@ PKG_ARGS+= -f ${PORTSDIR}/lang/ruby/ruby
.endif
# The default ruby version to use for non-gem/extconf ports. Defaults to ruby
-# 2.1 for consistency with the default ruby21 FLAVOR for gem/extconf ports.
-MODRUBY_REV?= 2.1
+# 2.2 for consistency with the default ruby22 FLAVOR for gem/extconf ports.
+MODRUBY_REV?= 2.2
# Because the rbx and jruby FLAVORs use same binary names but in
# different directories, GEM_MAN_SUFFIX is used for the man pages to avoid
Index: mail/mew/Makefile
===================================================================
RCS file: /cvs/ports/mail/mew/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- mail/mew/Makefile 29 May 2015 05:13:07 -0000 1.9
+++ mail/mew/Makefile 16 Jul 2015 00:59:10 -0000
@@ -5,7 +5,7 @@ COMMENT= emacs-based mail client
DISTNAME= mew-6.6
CATEGORIES= mail
HOMEPAGE= http://www.mew.org/
-REVISION= 1
+REVISION= 2
MAINTAINER= YASUOKA Masahiko <[email protected]>
Index: misc/tpp/Makefile
===================================================================
RCS file: /cvs/ports/misc/tpp/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- misc/tpp/Makefile 2 Oct 2014 12:50:42 -0000 1.15
+++ misc/tpp/Makefile 16 Jul 2015 00:59:26 -0000
@@ -3,7 +3,7 @@
COMMENT = text-based presentation program
DISTNAME = tpp-1.3.1
-REVISION = 7
+REVISION = 8
CATEGORIES = misc productivity
Index: multimedia/mkvtoolnix/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- multimedia/mkvtoolnix/Makefile 2 Jul 2015 08:30:24 -0000 1.38
+++ multimedia/mkvtoolnix/Makefile 16 Jul 2015 01:00:12 -0000
@@ -3,6 +3,7 @@
COMMENT= create, alter and inspect Matroska files
DISTNAME= mkvtoolnix-8.1.0
+REVISION= 0
CATEGORIES= multimedia x11
MASTER_SITES= ${HOMEPAGE}/sources/
EXTRACT_SUFX= .tar.xz
Index: net/rrdtool/Makefile
===================================================================
RCS file: /cvs/ports/net/rrdtool/Makefile,v
retrieving revision 1.89
diff -u -p -r1.89 Makefile
--- net/rrdtool/Makefile 10 Jun 2015 21:42:26 -0000 1.89
+++ net/rrdtool/Makefile 16 Jul 2015 01:00:37 -0000
@@ -17,6 +17,7 @@ PKGNAME-main= ${DISTNAME}
PKGNAME-update= rrdupdate-${VERSION}
PKGNAME-python= py-rrd-${VERSION}
PKGNAME-ruby= ruby-rrd-${VERSION}
+REVISION-ruby= 0
SHARED_LIBS += rrd 4.0 # 6.1
SHARED_LIBS += rrd_th 4.0 # 6.1
Index: net/weechat/Makefile
===================================================================
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- net/weechat/Makefile 19 Jan 2015 12:28:46 -0000 1.17
+++ net/weechat/Makefile 16 Jul 2015 01:01:40 -0000
@@ -15,6 +15,8 @@ PKGNAME-python= weechat-python-${V}
PKGNAME-ruby= weechat-ruby-${V}
PKGNAME-tcl= weechat-tcl-${V}
+REVISION-ruby= 0
+
CATEGORIES= net
HOMEPAGE= http://www.weechat.org/
Index: sysutils/god/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/god/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- sysutils/god/Makefile 27 Sep 2014 17:06:25 -0000 1.19
+++ sysutils/god/Makefile 16 Jul 2015 01:02:04 -0000
@@ -4,7 +4,7 @@ COMMENT= system monitoring framework wri
DISTNAME= god-0.7.22
FULLPKGNAME= ${DISTNAME}
-REVISION= 0
+REVISION= 1
CATEGORIES= sysutils
# MIT
Index: sysutils/mcollective/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/mcollective/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- sysutils/mcollective/Makefile 12 Jun 2015 18:01:26 -0000 1.30
+++ sysutils/mcollective/Makefile 16 Jul 2015 01:08:59 -0000
@@ -4,6 +4,7 @@ BROKEN-alpha= SIGABRT during make fake
COMMENT= framework for server orchestration/parallel job execution
DISTNAME= mcollective-2.8.2
+REVISION= 0
CATEGORIES= sysutils
Index: textproc/redland-bindings/Makefile
===================================================================
RCS file: /cvs/ports/textproc/redland-bindings/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- textproc/redland-bindings/Makefile 5 Jun 2015 06:00:22 -0000 1.11
+++ textproc/redland-bindings/Makefile 16 Jul 2015 01:11:16 -0000
@@ -16,6 +16,7 @@ PKGNAME-python= py-librdf-$V
PKGNAME-ruby= ruby-librdf-$V
REVISION-perl= 0
REVISION-php= 2
+REVISION-ruby= 0
HOMEPAGE= http://librdf.org/bindings/
Index: www/webkit/Makefile
===================================================================
RCS file: /cvs/ports/www/webkit/Makefile,v
retrieving revision 1.140
diff -u -p -r1.140 Makefile
--- www/webkit/Makefile 28 May 2015 10:17:25 -0000 1.140
+++ www/webkit/Makefile 16 Jul 2015 01:12:06 -0000
@@ -13,7 +13,7 @@ EPOCH = 1
CATEGORIES = www
DPB_PROPERTIES =parallel
EXTRACT_SUFX = .tar.xz
-REVISION = 1
+REVISION = 2
HOMEPAGE = http://webkitgtk.org/
MASTER_SITES = ${HOMEPAGE}/releases/
Index: www/webkitgtk4/Makefile
===================================================================
RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- www/webkitgtk4/Makefile 10 Jul 2015 14:05:12 -0000 1.22
+++ www/webkitgtk4/Makefile 16 Jul 2015 01:12:57 -0000
@@ -12,6 +12,7 @@ COMMENT = GTK+ port of the WebKit rende
V = 2.8.4
DISTNAME = webkitgtk-${V}
PKGNAME = webkitgtk4-${V}
+REVISION = 0
EXTRACT_SUFX = .tar.xz
API = 4.0
SUBST_VARS = API
Index: x11/gnome/code-assistance/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/code-assistance/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- x11/gnome/code-assistance/Makefile 3 May 2015 14:16:46 -0000 1.16
+++ x11/gnome/code-assistance/Makefile 16 Jul 2015 01:13:28 -0000
@@ -4,6 +4,7 @@ COMMENT= code assistance services for G
GNOME_PROJECT= gnome-code-assistance
GNOME_VERSION= 3.16.0
+REVISION= 0
CATEGORIES= devel
Index: x11/kde4/korundum/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/korundum/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- x11/kde4/korundum/Makefile 28 May 2015 10:17:28 -0000 1.13
+++ x11/kde4/korundum/Makefile 16 Jul 2015 01:14:01 -0000
@@ -2,7 +2,7 @@
COMMENT = KDE bindings for Ruby
DISTNAME = korundum-${MODKDE4_VERSION}
-REVISION = 1
+REVISION = 2
WANTLIB = c m pthread ${MODRUBY_WANTLIB}
WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg
Index: x11/kde4/kross-interpreters/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/kross-interpreters/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- x11/kde4/kross-interpreters/Makefile 28 May 2015 10:17:29 -0000
1.11
+++ x11/kde4/kross-interpreters/Makefile 16 Jul 2015 01:14:46 -0000
@@ -6,7 +6,7 @@ DISTNAME = kross-interpreters-${MODKDE4_
PKGNAME-main = ${PKGNAME}
PKGNAME-java = ${PKGNAME:C/interpreters/java/}
REVISION-java = 0
-REVISION-main = 0
+REVISION-main = 1
MULTI_PACKAGES = -main -java
Index: x11/kde4/webdev/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/webdev/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- x11/kde4/webdev/Makefile 26 Jun 2015 09:18:39 -0000 1.24
+++ x11/kde4/webdev/Makefile 16 Jul 2015 01:16:23 -0000
@@ -3,7 +3,7 @@
COMMENT = web development tools for KDE
DISTNAME = kdewebdev-${MODKDE4_VERSION}
PKGSPEC = kdewebdev-${MODKDE4_SPEC}
-REVISION = 2
+REVISION = 3
SHARED_LIBS = klinkstatuscommon 51.0
SHARED_LIBS += kommandercore 51.0
Index: x11/kde4/workspace/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/workspace/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- x11/kde4/workspace/Makefile 2 Jul 2015 00:10:16 -0000 1.40
+++ x11/kde4/workspace/Makefile 16 Jul 2015 01:17:10 -0000
@@ -2,6 +2,7 @@
COMMENT = KDE workspace
DISTNAME = kde-workspace-4.11.21
+REVISION = 0
MASTER_SITES = ${MASTER_SITE_KDE:=stable/applications/15.04.3/src/}
