Now that Ruby 2.5.3 has been released and we are at a good point in the
release cycle, here's a diff to switch the default Ruby version in the
ports tree from Ruby 2.4 to Ruby 2.5. At the same time, we can drop
support for building with Ruby 2.3, since Ruby 2.3 will go out of
support before OpenBSD 6.5 is released.
Other than the ruby.port.mk changes, most of this diff is just bumps for
the packages that need bumping, with the following exceptions:
databases/xapian-bindings: Drop ruby as a RDEP on the -main (perl) and
-python subpackages (my mistake when I added the -ruby subpackage)
x11/kde4/ruby-qt: Drop ruby21 and ruby22 FLAVORs as well, which would
have been broken.
x11/ruby-tk: Drop FLAVORS, as going forward the FLAVORs from
ruby.port.mk will be fine.
I built all ruby dependencies before the switch, and rebuilt all ruby
dependencies after the switch, so hopefully I've caught all the affected
ports. Historically I've missed 1-2 ports per default version switch.
I plan to commit this on Friday unless I hear objections.
Thanks,
Jeremy
Index: lang/ruby/ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.94
diff -u -p -r1.94 ruby.port.mk
--- lang/ruby/ruby.port.mk 27 May 2018 11:37:31 -0000 1.94
+++ lang/ruby/ruby.port.mk 23 Oct 2018 14:45:09 -0000
@@ -24,7 +24,7 @@ MODRUBY_HANDLE_FLAVORS ?= No
# If ruby.pork.mk should handle FLAVORs, define a separate FLAVOR
# for each ruby interpreter
. if !defined(FLAVORS)
-FLAVORS= ruby23 ruby24 ruby25
+FLAVORS= ruby24 ruby25
. if !${CONFIGURE_STYLE:L:Mext}
FLAVORS+= jruby
. endif
@@ -45,18 +45,17 @@ FULLPKGNAME?= ${MODRUBY_PKG_PREFIX}-${P
SUBST_VARS+= GEM_BIN_SUFFIX GEM_MAN_SUFFIX
FLAVOR?=
-# Without a FLAVOR, assume the use of ruby 2.4.
+# Without a FLAVOR, assume the use of ruby 2.5.
. if empty(FLAVOR)
-FLAVOR = ruby24
+FLAVOR = ruby25
. endif
# Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
# on the FLAVOR.
-. for i in ruby23 ruby24 ruby25 jruby
+. for i in ruby24 ruby25 jruby
. if ${FLAVOR:M$i}
MODRUBY_REV = ${i:C/ruby([0-9])/\1./}
-. if ${FLAVOR:N$i:Mruby23} || \
- ${FLAVOR:N$i:Mruby24} || \
+. if ${FLAVOR:N$i:Mruby24} || \
${FLAVOR:N$i:Mruby25} || \
${FLAVOR:N$i:Mjruby}
ERRORS += "Fatal: Conflicting flavors used: ${FLAVOR}"
@@ -67,8 +66,8 @@ ERRORS += "Fatal: Conflicting flavors us
.endif
# The default ruby version to use for non-gem ports. Defaults to ruby
-# 2.4 for consistency with the default ruby24 FLAVOR for gem ports.
-MODRUBY_REV?= 2.4
+# 2.5 for consistency with the default ruby25 FLAVOR for gem ports.
+MODRUBY_REV?= 2.5
# Because the jruby FLAVORs use same binary names but in
# different directories, GEM_MAN_SUFFIX is used for the man pages to avoid
Index: databases/xapian-bindings/Makefile
===================================================================
RCS file: /cvs/ports/databases/xapian-bindings/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- databases/xapian-bindings/Makefile 18 Jul 2018 22:01:13 -0000 1.12
+++ databases/xapian-bindings/Makefile 23 Oct 2018 19:14:35 -0000
@@ -11,7 +11,8 @@ PKGNAME-main= xapian-bindings-perl-${V}
PKGNAME-python= xapian-bindings-python-${V}
PKGNAME-ruby= ruby${MODRUBY_BINREV}-xapian-${V}
-REVISION-python= 0
+REVISION-main= 0
+REVISION-python= 1
REVISION-ruby= 0
MODULES= lang/python \
@@ -38,6 +39,8 @@ BUILD_DEPENDS= textproc/py-sphinx
WANTLIB += ${COMPILER_LIBCXX} m uuid z xapian
WANTLIB-main = ${WANTLIB} c perl
+
+MODRUBY_RUNDEP = No
RUN_DEPENDS-python = textproc/py-sphinx
RUN_DEPENDS-ruby = ${MODRUBY_RUN_DEPENDS}
Index: devel/gitsh/Makefile
===================================================================
RCS file: /cvs/ports/devel/gitsh/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- devel/gitsh/Makefile 2 Feb 2018 21:08:09 -0000 1.8
+++ devel/gitsh/Makefile 23 Oct 2018 15:07:16 -0000
@@ -5,6 +5,7 @@ VERSION = 0.12
COMMENT = interactive shell for git
DISTNAME = gitsh-${VERSION}
+REVISION = 0
CATEGORIES = devel
Index: devel/subversion/Makefile
===================================================================
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.167
diff -u -p -r1.167 Makefile
--- devel/subversion/Makefile 16 Oct 2018 11:09:03 -0000 1.167
+++ devel/subversion/Makefile 23 Oct 2018 15:00:27 -0000
@@ -21,7 +21,7 @@ FULLPKGPATH-ap2= devel/subversion,-ap2
FULLPKGNAME-gnome-keyring= gnome-keyring-subversion-${VERSION}
FULLPKGPATH-gnome-keyring= devel/subversion,-gnome-keyring
-MODRUBY_REV ?= 2.4
+MODRUBY_REV ?= 2.5
# Work around for SHARED_LIBS not picking up MODRUBY_BINREV from ruby module
MODRUBY_BINREV= ${MODRUBY_REV:S/.//}
Index: devel/vim-command-t/Makefile
===================================================================
RCS file: /cvs/ports/devel/vim-command-t/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- devel/vim-command-t/Makefile 1 Nov 2017 10:12:25 -0000 1.7
+++ devel/vim-command-t/Makefile 23 Oct 2018 15:07:56 -0000
@@ -4,7 +4,7 @@ COMMENT = fast, intuitive file opening
V = 1.11.2
DISTNAME = vim-command-t-${V}
-REVISION = 1
+REVISION = 2
CATEGORIES = devel editors
Index: editors/vim/Makefile
===================================================================
RCS file: /cvs/ports/editors/vim/Makefile,v
retrieving revision 1.176
diff -u -p -r1.176 Makefile
--- editors/vim/Makefile 29 Sep 2018 22:47:36 -0000 1.176
+++ editors/vim/Makefile 23 Oct 2018 15:08:46 -0000
@@ -13,6 +13,7 @@ PKGNAME-main= vim-$V
PKGNAME-lang= vim-lang-$V
P= vim${V:R:S/.//}
CATEGORIES= editors
+REVISION-main= 0
HOMEPAGE= https://www.vim.org/
Index: lang/mruby/Makefile
===================================================================
RCS file: /cvs/ports/lang/mruby/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- lang/mruby/Makefile 1 May 2018 22:36:21 -0000 1.8
+++ lang/mruby/Makefile 23 Oct 2018 15:11:32 -0000
@@ -6,6 +6,7 @@ COMMENT = lightweight, embeddable imple
VERSION = 1.4.1
DISTNAME = mruby-${VERSION}
+REVISION = 0
CATEGORIES = lang
HOMEPAGE = https://github.com/mruby/mruby
Index: mail/mew/Makefile
===================================================================
RCS file: /cvs/ports/mail/mew/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- mail/mew/Makefile 15 Jun 2018 23:31:22 -0000 1.15
+++ mail/mew/Makefile 23 Oct 2018 15:11:51 -0000
@@ -3,6 +3,7 @@
COMMENT= emacs-based mail client
DISTNAME= mew-6.8
+REVISION= 0
CATEGORIES= mail
HOMEPAGE= http://www.mew.org/
Index: misc/tpp/Makefile
===================================================================
RCS file: /cvs/ports/misc/tpp/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- misc/tpp/Makefile 1 Nov 2017 10:12:25 -0000 1.18
+++ misc/tpp/Makefile 23 Oct 2018 15:12:08 -0000
@@ -3,7 +3,7 @@
COMMENT = text-based presentation program
DISTNAME = tpp-1.3.1
-REVISION = 10
+REVISION = 11
CATEGORIES = misc productivity
Index: net/weechat/Makefile
===================================================================
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- net/weechat/Makefile 28 Jul 2018 08:08:11 -0000 1.37
+++ net/weechat/Makefile 23 Oct 2018 15:13:09 -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= https://www.weechat.org/
Index: net/whatweb/Makefile
===================================================================
RCS file: /cvs/ports/net/whatweb/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- net/whatweb/Makefile 28 Nov 2017 12:08:41 -0000 1.8
+++ net/whatweb/Makefile 23 Oct 2018 15:13:42 -0000
@@ -6,6 +6,8 @@ GH_TAGNAME = v0.4.9
GH_PROJECT= WhatWeb
GH_ACCOUNT= urbanadventurer
+REVISION = 0
+
CATEGORIES= net www
HOMEPAGE= http://www.morningstarsecurity.com/research/whatweb
Index: security/arirang/Makefile
===================================================================
RCS file: /cvs/ports/security/arirang/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- security/arirang/Makefile 4 Dec 2017 17:56:27 -0000 1.35
+++ security/arirang/Makefile 23 Oct 2018 15:13:50 -0000
@@ -4,7 +4,7 @@ COMMENT = powerful webserver security sc
DISTNAME = arirang-2.03
CATEGORIES = security
-REVISION = 3
+REVISION = 4
FIX_EXTRACT_PERMISSIONS=Yes
MASTER_SITES = http://monkey.org/~pilot/arirang/ \
Index: sysutils/facter/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/facter/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- sysutils/facter/Makefile 27 Sep 2018 21:49:31 -0000 1.59
+++ sysutils/facter/Makefile 23 Oct 2018 15:14:28 -0000
@@ -11,6 +11,8 @@ SHARED_LIBS += facter
PKGSPEC = facter->=3.0,<4.0
CATEGORIES = sysutils
+REVISION = 0
+
MAINTAINER = Sebastian Reitenbach <[email protected]>
# Apache2
Index: sysutils/mcollective/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/mcollective/Makefile,v
retrieving revision 1.52
diff -u -p -r1.52 Makefile
--- sysutils/mcollective/Makefile 18 Sep 2018 21:10:31 -0000 1.52
+++ sysutils/mcollective/Makefile 23 Oct 2018 15:14:47 -0000
@@ -3,6 +3,7 @@
BROKEN-alpha= SIGABRT during make fake
COMMENT= framework for server orchestration/parallel job execution
DISTNAME= mcollective-2.12.3
+REVISION= 0
CATEGORIES= sysutils
Index: sysutils/ruby-puppet/4/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/4/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- sysutils/ruby-puppet/4/Makefile 4 Sep 2018 12:46:23 -0000 1.32
+++ sysutils/ruby-puppet/4/Makefile 23 Oct 2018 15:15:13 -0000
@@ -4,7 +4,7 @@ PORTROACH= limit:^4
VERSION= 4.10.9
EPOCH= 0
-REVISION= 0
+REVISION= 1
RUN_DEPENDS+= databases/ruby-hiera3,${MODRUBY_FLAVOR} \
devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.10,<1 \
Index: sysutils/ruby-puppet/5/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/5/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- sysutils/ruby-puppet/5/Makefile 18 Sep 2018 21:09:46 -0000 1.10
+++ sysutils/ruby-puppet/5/Makefile 23 Oct 2018 15:15:20 -0000
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.10 2018/09/18 21:09:46 sebastia Exp $
VERSION= 5.5.6
+REVISION= 0
RUN_DEPENDS+= databases/ruby-hiera3,${MODRUBY_FLAVOR} \
devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.28,<1 \
Index: sysutils/tmuxinator/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/tmuxinator/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- sysutils/tmuxinator/Makefile 9 Jul 2018 12:16:46 -0000 1.11
+++ sysutils/tmuxinator/Makefile 23 Oct 2018 15:18:45 -0000
@@ -6,6 +6,8 @@ DISTNAME = tmuxinator-0.12.0
FULLPKGNAME = ${DISTNAME}
CATEGORIES = sysutils
+REVISION = 0
+
MAINTAINER = Jasper Lievisse Adriaanse <[email protected]>
# MIT
Index: www/sass/Makefile
===================================================================
RCS file: /cvs/ports/www/sass/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- www/sass/Makefile 1 Nov 2017 10:12:25 -0000 1.2
+++ www/sass/Makefile 23 Oct 2018 15:18:51 -0000
@@ -3,7 +3,7 @@
COMMENT = extension language for CSS
DISTNAME = sass-3.4.22
-REVISION = 0
+REVISION = 1
CATEGORIES = www devel
HOMEPAGE = http://sass-lang.com
Index: x11/gnome/code-assistance/Makefile
===================================================================
RCS file: /cvs/ports/x11/gnome/code-assistance/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- x11/gnome/code-assistance/Makefile 6 Jul 2018 06:04:44 -0000 1.33
+++ x11/gnome/code-assistance/Makefile 23 Oct 2018 15:16:19 -0000
@@ -4,7 +4,7 @@ COMMENT= code assistance services for G
GNOME_PROJECT= gnome-code-assistance
GNOME_VERSION= 3.16.1
-REVISION= 8
+REVISION= 9
CATEGORIES= devel
Index: x11/kde4/korundum/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/korundum/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- x11/kde4/korundum/Makefile 27 Jun 2018 21:04:17 -0000 1.22
+++ x11/kde4/korundum/Makefile 23 Oct 2018 15:16:44 -0000
@@ -2,7 +2,7 @@
COMMENT = KDE bindings for Ruby
DISTNAME = korundum-${MODKDE4_VERSION}
-REVISION = 8
+REVISION = 9
WANTLIB = ${MODRUBY_WANTLIB}
WANTLIB += ${COMPILER_LIBCXX}
Index: x11/kde4/kross-interpreters/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/kross-interpreters/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- x11/kde4/kross-interpreters/Makefile 1 Nov 2017 10:12:25 -0000
1.17
+++ x11/kde4/kross-interpreters/Makefile 23 Oct 2018 15:16:58 -0000
@@ -6,7 +6,7 @@ DISTNAME = kross-interpreters-${MODKDE4_
PKGNAME-main = ${PKGNAME}
PKGNAME-java = ${PKGNAME:C/interpreters/java/}
REVISION-java = 2
-REVISION-main = 5
+REVISION-main = 6
MULTI_PACKAGES = -main -java
Index: x11/kde4/ruby-qt/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/ruby-qt/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- x11/kde4/ruby-qt/Makefile 30 Oct 2017 13:55:11 -0000 1.27
+++ x11/kde4/ruby-qt/Makefile 23 Oct 2018 15:17:33 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel x11/kde4
COMMENT = Ruby bindings for Qt4
DISTNAME = qtruby-${MODKDE4_VERSION}
PKGNAME = qt4-${MODKDE4_VERSION}
-REVISION = 6
+REVISION = 7
HOMEPAGE = http://techbase.kde.org/Development/Languages/Ruby
@@ -29,9 +29,8 @@ WANTLIB += qscintilla2_qt4
MODULES = multimedia/phonon lang/ruby
MODKDE4_USE =
-# Ruby 1.8 not supported as it requires LD_PRELOAD hacks for pthreads.
# Remember update @conflict markers in PLIST when changing FLAVORS.
-FLAVORS = ruby21 ruby22 ruby23 ruby24
+FLAVORS = ruby24 ruby25
MODRUBY_HANDLE_FLAVORS= Yes
MODRUBY_ADJ_FILES = *.rb rbqtapi
SUBST_VARS = MODRUBY_FLAVOR
Index: x11/kde4/ruby-qt/pkg/PLIST
===================================================================
RCS file: /cvs/ports/x11/kde4/ruby-qt/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- x11/kde4/ruby-qt/pkg/PLIST 6 Jan 2017 16:06:05 -0000 1.8
+++ x11/kde4/ruby-qt/pkg/PLIST 23 Oct 2018 14:23:42 -0000
@@ -6,6 +6,7 @@
@conflict ruby22-qt4-*
@conflict ruby23-qt4-*
@conflict ruby24-qt4-*
+@conflict ruby25-qt4-*
@pkgpath x11/ruby-qt4,${MODRUBY_FLAVOR}
bin/rbqtapi
@bin bin/rbrcc
Index: x11/kde4/webdev/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/webdev/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- x11/kde4/webdev/Makefile 29 Jun 2018 22:16:32 -0000 1.30
+++ x11/kde4/webdev/Makefile 23 Oct 2018 15:17:48 -0000
@@ -3,7 +3,7 @@
COMMENT = web development tools for KDE
DISTNAME = kdewebdev-${MODKDE4_VERSION}
PKGSPEC = kdewebdev-${MODKDE4_SPEC}
-REVISION = 8
+REVISION = 9
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.66
diff -u -p -r1.66 Makefile
--- x11/kde4/workspace/Makefile 9 Jul 2018 15:09:43 -0000 1.66
+++ x11/kde4/workspace/Makefile 23 Oct 2018 15:18:11 -0000
@@ -2,7 +2,7 @@
COMMENT = KDE workspace
DISTNAME = kde-workspace-4.11.21
-REVISION = 24
+REVISION = 25
MASTER_SITES = ${MASTER_SITE_KDE:=Attic/applications/15.04.3/src/}
Index: x11/ruby-tk/Makefile
===================================================================
RCS file: /cvs/ports/x11/ruby-tk/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- x11/ruby-tk/Makefile 13 Jun 2018 22:26:53 -0000 1.3
+++ x11/ruby-tk/Makefile 30 Jun 2018 03:17:10 -0000
@@ -15,8 +15,6 @@ PERMIT_PACKAGE_CDROM= Yes
MODULES= lang/ruby
-FLAVORS = ruby24 ruby25
-
CONFIGURE_STYLE= ruby gem ext
MODRUBY_TEST= rake
