I would like to change the default version of Ruby in the ports tree
from 2.6 to 2.7. It's a good time in the release cycle for this change,
the fiber issues in 2.7 have been worked around (with better fixes
coming shortly), and I've done the necessary preparation.
I've tested this switch on amd64 by running partial bulks of the ruby
ports before and after the switch. The patch below contains the
ruby.port.mk change and the necessary dependency bumps. I'll update
ruby-module(5) after commit.
OKs to switch the default Ruby version to 2.7?
Thanks,
Jeremy
Index: lang/ruby/ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.101
diff -u -p -r1.101 ruby.port.mk
--- lang/ruby/ruby.port.mk 5 Oct 2020 16:33:09 -0000 1.101
+++ lang/ruby/ruby.port.mk 11 Nov 2020 02:14:15 -0000
@@ -45,9 +45,9 @@ FULLPKGNAME?= ${MODRUBY_PKG_PREFIX}-${P
SUBST_VARS+= GEM_BIN_SUFFIX GEM_MAN_SUFFIX
FLAVOR?=
-# Without a FLAVOR, assume the use of ruby 2.6.
+# Without a FLAVOR, assume the use of ruby 2.7.
. if empty(FLAVOR)
-FLAVOR = ruby26
+FLAVOR = ruby27
. endif
# Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
@@ -66,8 +66,8 @@ ERRORS += "Fatal: Conflicting flavors us
.endif
# The default ruby version to use for non-gem ports. Defaults to ruby
-# 2.6 for consistency with the default ruby26 FLAVOR for gem ports.
-MODRUBY_REV?= 2.6
+# 2.7 for consistency with the default ruby27 FLAVOR for gem ports.
+MODRUBY_REV?= 2.7
# Because the jruby FLAVORs use same binary names but in
# different directories, GEM_MAN_SUFFIX is used for the man pages to avoid
Index: devel/gitsh/Makefile
===================================================================
RCS file: /cvs/ports/devel/gitsh/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- devel/gitsh/Makefile 12 Jul 2019 20:44:09 -0000 1.12
+++ devel/gitsh/Makefile 10 Nov 2020 05:09:04 -0000
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.12 2019/07/12 20:44:09 sthen Exp $
VERSION = 0.13
-REVISION = 0
+REVISION = 1
COMMENT = interactive shell for git
Index: devel/ragel/Makefile
===================================================================
RCS file: /cvs/ports/devel/ragel/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- devel/ragel/Makefile 12 Jul 2019 21:02:18 -0000 1.11
+++ devel/ragel/Makefile 10 Nov 2020 05:20:44 -0000
@@ -3,7 +3,7 @@
COMMENT = state machine compiler
DISTNAME = ragel-6.9
-REVISION = 3
+REVISION = 4
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.70
diff -u -p -r1.70 Makefile
--- devel/swig/Makefile 12 Jul 2019 20:46:02 -0000 1.70
+++ devel/swig/Makefile 10 Nov 2020 05:10:50 -0000
@@ -7,7 +7,7 @@ VERSION = 3.0.12
DISTNAME = swig-${VERSION}
CATEGORIES = devel
-REVISION = 0
+REVISION = 1
HOMEPAGE = http://www.swig.org/
Index: devel/vim-command-t/Makefile
===================================================================
RCS file: /cvs/ports/devel/vim-command-t/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- devel/vim-command-t/Makefile 12 Jul 2019 20:46:03 -0000 1.10
+++ devel/vim-command-t/Makefile 10 Nov 2020 05:11:00 -0000
@@ -4,7 +4,7 @@ COMMENT = fast, intuitive file opening
V = 1.11.2
DISTNAME = vim-command-t-${V}
-REVISION = 3
+REVISION = 4
CATEGORIES = devel editors
Index: editors/vim/Makefile
===================================================================
RCS file: /cvs/ports/editors/vim/Makefile,v
retrieving revision 1.205
diff -u -p -r1.205 Makefile
--- editors/vim/Makefile 6 Oct 2020 16:21:00 -0000 1.205
+++ editors/vim/Makefile 10 Nov 2020 05:11:41 -0000
@@ -7,6 +7,7 @@ V= 8.2.1805
GH_ACCOUNT= vim
GH_PROJECT= vim
GH_TAGNAME= v$V
+REVISION= 0
T= ${V:C/\.0+/./}
PKGNAME-main= vim-$T
Index: lang/mruby/Makefile
===================================================================
RCS file: /cvs/ports/lang/mruby/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- lang/mruby/Makefile 10 Apr 2020 14:07:14 -0000 1.17
+++ lang/mruby/Makefile 10 Nov 2020 05:12:10 -0000
@@ -8,7 +8,7 @@ COMMENT = lightweight, embeddable imple
GH_ACCOUNT = mruby
GH_PROJECT = mruby
GH_TAGNAME = 2.0.1
-REVISION = 0
+REVISION = 1
CATEGORIES = lang
HOMEPAGE = https://mruby.org/
Index: mail/mew/Makefile
===================================================================
RCS file: /cvs/ports/mail/mew/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- mail/mew/Makefile 12 Jul 2019 20:47:29 -0000 1.18
+++ mail/mew/Makefile 10 Nov 2020 05:12:34 -0000
@@ -3,7 +3,7 @@
COMMENT= emacs-based mail client
DISTNAME= mew-6.8
-REVISION= 1
+REVISION= 2
CATEGORIES= mail
HOMEPAGE= http://www.mew.org/
Index: misc/tpp/Makefile
===================================================================
RCS file: /cvs/ports/misc/tpp/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- misc/tpp/Makefile 12 Jul 2019 20:47:54 -0000 1.21
+++ misc/tpp/Makefile 10 Nov 2020 05:12:43 -0000
@@ -3,7 +3,7 @@
COMMENT = text-based presentation program
DISTNAME = tpp-1.3.1
-REVISION = 12
+REVISION = 13
CATEGORIES = misc productivity
Index: net/munin/Makefile
===================================================================
RCS file: /cvs/ports/net/munin/Makefile,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile
--- net/munin/Makefile 3 Nov 2020 08:17:58 -0000 1.98
+++ net/munin/Makefile 10 Nov 2020 05:14:32 -0000
@@ -11,6 +11,9 @@ PKGNAME-main = munin-node-$V
PKGNAME-server =munin-server-$V
CATEGORIES = net
+REVISION-main = 0
+REVISION-server = 0
+
HOMEPAGE = http://munin-monitoring.org/
MASTER_SITES = http://downloads.munin-monitoring.org/munin/stable/$V/
Index: net/ocserv/Makefile
===================================================================
RCS file: /cvs/ports/net/ocserv/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- net/ocserv/Makefile 4 Oct 2020 14:36:12 -0000 1.44
+++ net/ocserv/Makefile 10 Nov 2020 05:15:03 -0000
@@ -5,6 +5,8 @@ COMMENT= server implementing the AnyConn
DISTNAME= ocserv-1.1.1
EXTRACT_SUFX= .tar.xz
+REVISION= 0
+
CATEGORIES= net
HOMEPAGE= https://ocserv.gitlab.io/www/
Index: net/weechat/Makefile
===================================================================
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- net/weechat/Makefile 23 Jul 2020 04:38:21 -0000 1.49
+++ net/weechat/Makefile 10 Nov 2020 05:15:44 -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.11
diff -u -p -r1.11 Makefile
--- net/whatweb/Makefile 12 Jul 2019 20:48:52 -0000 1.11
+++ net/whatweb/Makefile 10 Nov 2020 05:16:01 -0000
@@ -6,7 +6,7 @@ GH_TAGNAME = v0.4.9
GH_PROJECT= WhatWeb
GH_ACCOUNT= urbanadventurer
-REVISION = 1
+REVISION = 2
CATEGORIES= net www
Index: security/arirang/Makefile
===================================================================
RCS file: /cvs/ports/security/arirang/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- security/arirang/Makefile 17 Jul 2019 14:39:42 -0000 1.39
+++ security/arirang/Makefile 10 Nov 2020 05:16:11 -0000
@@ -4,7 +4,7 @@ COMMENT = powerful webserver security sc
DISTNAME = arirang-2.03
CATEGORIES = security
-REVISION = 6
+REVISION = 7
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.84
diff -u -p -r1.84 Makefile
--- sysutils/facter/Makefile 5 Nov 2020 08:26:15 -0000 1.84
+++ sysutils/facter/Makefile 10 Nov 2020 05:16: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.57
diff -u -p -r1.57 Makefile
--- sysutils/mcollective/Makefile 22 Oct 2019 09:17:04 -0000 1.57
+++ sysutils/mcollective/Makefile 10 Nov 2020 05:16:52 -0000
@@ -4,6 +4,8 @@ BROKEN-alpha= SIGABRT during make fake
COMMENT= framework for server orchestration/parallel job execution
DISTNAME= mcollective-2.12.5
+REVISION= 0
+
CATEGORIES= sysutils
HOMEPAGE= https://puppet.com/docs/mcollective/current/index.html
Index: sysutils/ruby-puppet/5/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/5/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- sysutils/ruby-puppet/5/Makefile 6 Nov 2020 20:48:19 -0000 1.29
+++ sysutils/ruby-puppet/5/Makefile 10 Nov 2020 05:17:03 -0000
@@ -3,6 +3,7 @@
PORTROACH= limit:^5
VERSION= 5.5.22
+REVISION= 0
RUN_DEPENDS+= databases/ruby-hiera3,${MODRUBY_FLAVOR} \
devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.28,<1 \
Index: sysutils/ruby-puppet/6/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/6/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- sysutils/ruby-puppet/6/Makefile 5 Nov 2020 20:27:59 -0000 1.9
+++ sysutils/ruby-puppet/6/Makefile 10 Nov 2020 05:17:12 -0000
@@ -3,6 +3,7 @@
PORTROACH= limit:^6
VERSION= 6.19.1
+REVISION= 0
MAINTAINER= Klemens Nanni <[email protected]>
Index: www/h2o/Makefile
===================================================================
RCS file: /cvs/ports/www/h2o/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- www/h2o/Makefile 7 Jan 2020 10:18:30 -0000 1.7
+++ www/h2o/Makefile 10 Nov 2020 05:17:47 -0000
@@ -11,7 +11,7 @@ CATEGORIES = www
GH_ACCOUNT = h2o
GH_PROJECT = h2o
GH_TAGNAME = v2.2.6
-REVISION = 1
+REVISION = 2
HOMEPAGE = https://h2o.examp1e.net/
MAINTAINER = Otto Moerbeek <[email protected]>
Index: www/webkitgtk4/Makefile
===================================================================
RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
retrieving revision 1.129
diff -u -p -r1.129 Makefile
--- www/webkitgtk4/Makefile 24 Oct 2020 09:22:18 -0000 1.129
+++ www/webkitgtk4/Makefile 10 Nov 2020 05:18:20 -0000
@@ -21,6 +21,8 @@ API = 4.0
SUBST_VARS = API
DPB_PROPERTIES = parallel
+REVISION = 0
+
SHARED_LIBS += javascriptcoregtk-${API} 3.3 # 18.13.3
SHARED_LIBS += webkit2gtk-${API} 3.3 # 37.37.2
Index: x11/kde-applications/kross-interpreters/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde-applications/kross-interpreters/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- x11/kde-applications/kross-interpreters/Makefile 3 Nov 2020 16:12:38
-0000 1.2
+++ x11/kde-applications/kross-interpreters/Makefile 10 Nov 2020 05:19:08
-0000
@@ -4,6 +4,7 @@ COMMENT = Kross interpreter plugins for
DISTNAME = kross-interpreters-${VERSION}
PKGNAME = kross-interpreters-kf5-${VERSION}
CATEGORIES = devel
+REVISION = 0
WANTLIB += ${COMPILER_LIBCXX} KF5KrossCore Qt5Core Qt5Gui Qt5Script
WANTLIB += Qt5Widgets Qt5Xml m ${MODPY_WANTLIB}
Index: x11/qt5/qtwebkit/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- x11/qt5/qtwebkit/Makefile 7 Aug 2020 14:30:10 -0000 1.26
+++ x11/qt5/qtwebkit/Makefile 10 Nov 2020 05:19:23 -0000
@@ -14,7 +14,7 @@ PKGNAME = qtwebkit-${VERSION}
PKGSPEC = qtwebkit->=${VERSION}v0
EPOCH= 0
-REVISION = 1
+REVISION = 2
SHARED_LIBS += Qt5WebKit 3.1 # 5.9
Index: security/wpscan/Makefile
===================================================================
RCS file: /cvs/ports/security/wpscan/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- security/wpscan/Makefile 14 Sep 2020 19:17:20 -0000 1.14
+++ security/wpscan/Makefile 10 Nov 2020 05:19:38 -0000
@@ -4,6 +4,7 @@ COMMENT = WordPress security scanner
DISTNAME = wpscan-3.8.7
CATEGORIES = security
+REVISION = 0
HOMEPAGE = https://wpscan.org/
MAINTAINER = Sebastian Reitenbach <[email protected]>
Index: sysutils/tmuxinator/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/tmuxinator/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- sysutils/tmuxinator/Makefile 28 Jan 2020 20:49:52 -0000 1.19
+++ sysutils/tmuxinator/Makefile 10 Nov 2020 05:19:43 -0000
@@ -3,7 +3,7 @@
COMMENT = create and manage complex tmux sessions easily
DISTNAME = tmuxinator-1.1.3
-REVISION = 0
+REVISION = 1
FULLPKGNAME = ${DISTNAME}
CATEGORIES = sysutils
Index: textproc/asciidoctor/Makefile
===================================================================
RCS file: /cvs/ports/textproc/asciidoctor/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- textproc/asciidoctor/Makefile 1 Apr 2020 17:05:17 -0000 1.1.1.1
+++ textproc/asciidoctor/Makefile 10 Nov 2020 05:19:52 -0000
@@ -5,6 +5,7 @@ COMMENT = better AsciiDoc text proc/publ
V = 2.0.10
DISTNAME = asciidoctor-${V}
FULLPKGNAME = ${DISTNAME}
+REVISION = 0
CATEGORIES = textproc
Index: www/sass/Makefile
===================================================================
RCS file: /cvs/ports/www/sass/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- www/sass/Makefile 12 Jun 2020 04:43:27 -0000 1.6
+++ www/sass/Makefile 10 Nov 2020 05:20:00 -0000
@@ -3,7 +3,7 @@
COMMENT = extension language for CSS
DISTNAME = sass-3.4.22
-REVISION = 3
+REVISION = 4
CATEGORIES = www devel
HOMEPAGE = http://sass-lang.com
Index: www/nginx/Makefile
===================================================================
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.146
diff -u -p -r1.146 Makefile
--- www/nginx/Makefile 23 Oct 2020 15:20:30 -0000 1.146
+++ www/nginx/Makefile 10 Nov 2020 05:24:53 -0000
@@ -23,6 +23,7 @@ CATEGORIES= www
REVISION-main= 1
REVISION-xslt= 0
+REVISION-passenger= 0
VERSION-rtmp= 1.2.1
Index: databases/puppetdb5/Makefile
===================================================================
RCS file: /cvs/ports/databases/puppetdb5/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- databases/puppetdb5/Makefile 6 Nov 2020 20:47:43 -0000 1.26
+++ databases/puppetdb5/Makefile 10 Nov 2020 05:26:25 -0000
@@ -8,6 +8,8 @@ DISTNAME= puppetdb-$V
PKGNAME-main= ${DISTNAME}
PKGNAME-plugin= puppetdb-termini-$V
CATEGORIES= databases
+REVISION-main= 0
+REVISION-plugin=0
HOMEPAGE= https://puppet.com/docs/puppetdb/
