On 06/20 07:30, Jeremy Evans wrote:
> This makes ruby 2.3 the default version of ruby. This has gone through
> a bulk of the ruby ports on amd64, and maintainers have notified about
> the few small issues it uncovered. After these issues have been
> addressed in the tree, I'd like to commit this. OKs?
Here's an updated diff that makes ruby 2.3 the default version of ruby,
and also removes support for building with ruby 2.0, per our standard
ruby support policy. This has survived a bulk build of ruby's
dependencies on amd64, with no issues.. The first part of the diff is
the ruby.port.mk change, the rest is needed bumps to dependencies to
handle the switch from ruby 2.2 to ruby 2.3.
OKs? After this goes in I'll be updating ruby-module.5, and removing
ruby 2.0.
Thanks,
Jeremy
Index: lang/ruby/ruby.port.mk
===================================================================
RCS file: /cvs/ports/lang/ruby/ruby.port.mk,v
retrieving revision 1.88
diff -u -p -r1.88 ruby.port.mk
--- lang/ruby/ruby.port.mk 27 May 2016 17:04:35 -0000 1.88
+++ lang/ruby/ruby.port.mk 30 Aug 2016 16:49:33 -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= ruby18 ruby20 ruby21 ruby22 ruby23
+FLAVORS= ruby18 ruby21 ruby22 ruby23
. if !${CONFIGURE_STYLE:L:Mext} && !${CONFIGURE_STYLE:L:Mextconf}
FLAVORS+= jruby
. endif
@@ -46,18 +46,18 @@ FULLPKGNAME?= ${MODRUBY_PKG_PREFIX}-${P
SUBST_VARS+= GEM_BIN_SUFFIX GEM_MAN_SUFFIX
FLAVOR?=
-# Without a FLAVOR, assume the use of ruby 2.2.
+# Without a FLAVOR, assume the use of ruby 2.3.
. if empty(FLAVOR)
-FLAVOR = ruby22
+FLAVOR = ruby23
. endif
# Check for conflicting FLAVORs and set MODRUBY_REV appropriately based
# on the FLAVOR.
-. for i in ruby18 ruby20 ruby21 ruby22 ruby23 jruby
+. for i in ruby18 ruby21 ruby22 ruby23 jruby
. if ${FLAVOR:M$i}
MODRUBY_REV = ${i:C/ruby([0-9])/\1./}
. if ${FLAVOR:N$i:Mruby18} || \
- ${FLAVOR:N$i:Mruby20} || ${FLAVOR:N$i:Mruby21} || \
+ ${FLAVOR:N$i:Mruby21} || \
${FLAVOR:N$i:Mruby22} || ${FLAVOR:N$i:Mruby23} || \
${FLAVOR:N$i:Mjruby}
ERRORS += "Fatal: Conflicting flavors used: ${FLAVOR}"
@@ -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.2 for consistency with the default ruby22 FLAVOR for gem/extconf ports.
-MODRUBY_REV?= 2.2
+# 2.3 for consistency with the default ruby23 FLAVOR for gem/extconf ports.
+MODRUBY_REV?= 2.3
# 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
@@ -92,11 +92,6 @@ MODRUBY_BINREV = 18
MODRUBY_PKG_PREFIX = ruby
MODRUBY_FLAVOR = ruby18
GEM_BIN_SUFFIX = 18
-.elif ${MODRUBY_REV} == 2.0
-MODRUBY_LIBREV = 2.0
-MODRUBY_BINREV = 20
-MODRUBY_FLAVOR = ruby20
-GEM_BIN_SUFFIX = 20
.elif ${MODRUBY_REV} == 2.1
MODRUBY_LIBREV = 2.1
MODRUBY_BINREV = 21
@@ -245,10 +240,7 @@ MODRUBY_pre-configure += ${MODRUBY_ADJ_R
MODRUBY_WANTLIB+= c m
.if ${MODRUBY_REV} != 1.8
-MODRUBY_WANTLIB+= pthread
-.endif
-.if ${MODRUBY_REV} == 2.1 || ${MODRUBY_REV} == 2.2 || ${MODRUBY_REV} == 2.3
-MODRUBY_WANTLIB+= gmp
+MODRUBY_WANTLIB+= gmp pthread
.endif
.if ${CONFIGURE_STYLE:L:Mext} || ${CONFIGURE_STYLE:L:Mextconf}
@@ -287,7 +279,7 @@ BUILD_DEPENDS+= lang/ruby/2.1>=2.1.0p0
# Pure ruby gem ports without C extensions are arch-independent.
. if !${CONFIGURE_STYLE:L:Mext}
PKG_ARCH= *
-. elif ${MODRUBY_REV} == 2.1 || ${MODRUBY_REV} == 2.2 || ${MODRUBY_REV} == 2.3
+. elif ${MODRUBY_REV} != 1.8
# Add build complete file to package so rubygems doesn't complain
# or build extensions at runtime
GEM_EXTENSIONS_DIR ?=
${GEM_LIB}/extensions/${MODRUBY_ARCH:S/i386/x86/}/${MODRUBY_REV}/${DISTNAME}
@@ -414,7 +406,7 @@ MODRUBY_TEST_BIN ?= ${RSPEC}
. elif ${MODRUBY_TEST:L:Mrspec3}
MODRUBY_TEST_BIN ?= ${MODRUBY_BIN_RSPEC}
. elif ${MODRUBY_TEST:L:Mtestrb}
-. if ${MODRUBY_REV} == "1.8" || ${MODRUBY_REV} == "2.0" ||
${MODRUBY_REV} == "2.1"
+. if ${MODRUBY_REV} == "1.8" || ${MODRUBY_REV} == "2.1"
MODRUBY_TEST_BIN ?= ${MODRUBY_BIN_TESTRB}
. else
MODRUBY_TEST_BIN ?= ${RUBY} ${PORTSDIR}/lang/ruby/files/testrb.rb
Index: devel/gitsh/Makefile
===================================================================
RCS file: /cvs/ports/devel/gitsh/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- devel/gitsh/Makefile 15 Sep 2015 06:05:29 -0000 1.4
+++ devel/gitsh/Makefile 1 Sep 2016 19:18:54 -0000
@@ -5,6 +5,7 @@ VERSION = 0.10
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.5
diff -u -p -r1.5 Makefile
--- devel/ragel/Makefile 16 Jul 2015 17:27:08 -0000 1.5
+++ devel/ragel/Makefile 1 Sep 2016 19:18:54 -0000
@@ -3,7 +3,7 @@
COMMENT = state machine compiler
DISTNAME = ragel-6.9
-REVISION = 0
+REVISION = 1
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.60
diff -u -p -r1.60 Makefile
--- devel/swig/Makefile 21 Jul 2015 03:27:25 -0000 1.60
+++ devel/swig/Makefile 1 Sep 2016 19:18:54 -0000
@@ -4,7 +4,7 @@ COMMENT = simplified wrapper and interfa
SUBST_VARS = VERSION
VERSION = 2.0.11
-REVISION = 2
+REVISION = 3
DISTNAME = swig-${VERSION}
CATEGORIES = devel
Index: mail/mew/Makefile
===================================================================
RCS file: /cvs/ports/mail/mew/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- mail/mew/Makefile 15 Oct 2015 14:06:16 -0000 1.12
+++ mail/mew/Makefile 1 Sep 2016 19:18:54 -0000
@@ -5,7 +5,7 @@ COMMENT= emacs-based mail client
DISTNAME= mew-6.7
CATEGORIES= mail
HOMEPAGE= http://www.mew.org/
-REVISION= 0
+REVISION= 1
MAINTAINER= YASUOKA Masahiko <[email protected]>
Index: misc/tpp/Makefile
===================================================================
RCS file: /cvs/ports/misc/tpp/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- misc/tpp/Makefile 16 Jul 2015 17:27:09 -0000 1.16
+++ misc/tpp/Makefile 1 Sep 2016 19:18:54 -0000
@@ -3,7 +3,7 @@
COMMENT = text-based presentation program
DISTNAME = tpp-1.3.1
-REVISION = 8
+REVISION = 9
CATEGORIES = misc productivity
Index: multimedia/mkvtoolnix/Makefile
===================================================================
RCS file: /cvs/ports/multimedia/mkvtoolnix/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- multimedia/mkvtoolnix/Makefile 28 Aug 2016 07:39:17 -0000 1.55
+++ multimedia/mkvtoolnix/Makefile 1 Sep 2016 19:18:54 -0000
@@ -3,6 +3,7 @@
COMMENT= create, alter and inspect Matroska files
DISTNAME= mkvtoolnix-9.4.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.97
diff -u -p -r1.97 Makefile
--- net/rrdtool/Makefile 26 Apr 2016 15:57:28 -0000 1.97
+++ net/rrdtool/Makefile 1 Sep 2016 19:18:54 -0000
@@ -9,6 +9,7 @@ MODPY_EGG_VERSION= 0.2.2
VERSION= 1.6.0
REVISION-main= 0
DISTNAME= rrdtool-${VERSION}
+REVISION = 0
PKGNAME-main= ${DISTNAME}
PKGNAME-update= rrdupdate-${VERSION}
PKGNAME-python= py-rrd-${VERSION}
Index: net/weechat/Makefile
===================================================================
RCS file: /cvs/ports/net/weechat/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- net/weechat/Makefile 11 May 2016 00:31:47 -0000 1.25
+++ net/weechat/Makefile 1 Sep 2016 19:18:54 -0000
@@ -8,6 +8,7 @@ COMMENT-tcl= Tcl bindings for weechat
V= 1.5
DISTNAME= weechat-${V}
+REVISION = 0
PKGNAME-main= weechat-${V}
PKGNAME-lua= weechat-lua-${V}
Index: net/whatweb/Makefile
===================================================================
RCS file: /cvs/ports/net/whatweb/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- net/whatweb/Makefile 19 Jul 2015 21:15:36 -0000 1.5
+++ net/whatweb/Makefile 1 Sep 2016 19:18:55 -0000
@@ -3,6 +3,7 @@
COMMENT= web scanner
DISTNAME= whatweb-0.4.8
+REVISION = 0
GH_PROJECT= WhatWeb
GH_ACCOUNT= urbanadventurer
Index: sysutils/facter/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/facter/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- sysutils/facter/Makefile 30 Aug 2016 11:03:33 -0000 1.35
+++ sysutils/facter/Makefile 1 Sep 2016 19:21:33 -0000
@@ -4,6 +4,7 @@
COMMENT = collect and display system facts
DISTNAME = facter-3.4.1
+REVISION= 0
SHARED_LIBS += facter 3.0 # 3.2
PKGSPEC = facter->=3.0,<4.0
CATEGORIES = sysutils
Index: sysutils/mcollective/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/mcollective/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- sysutils/mcollective/Makefile 30 Aug 2016 11:55:47 -0000 1.36
+++ sysutils/mcollective/Makefile 1 Sep 2016 19:18:55 -0000
@@ -4,6 +4,7 @@ BROKEN-alpha= SIGABRT during make fake
COMMENT= framework for server orchestration/parallel job execution
DISTNAME= mcollective-2.9.0
+REVISION = 0
CATEGORIES= sysutils
Index: sysutils/ruby-facter/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-facter/Makefile,v
retrieving revision 1.85
diff -u -p -r1.85 Makefile
--- sysutils/ruby-facter/Makefile 29 Jun 2016 16:14:44 -0000 1.85
+++ sysutils/ruby-facter/Makefile 1 Sep 2016 19:18:55 -0000
@@ -5,7 +5,7 @@ PORTROACH= limit:^2
COMMENT= Ruby library for retrieving facts from operating systems
VERSION= 2.4.6
-REVISION = 0
+REVISION = 1
DISTNAME= facter-${VERSION}
PKGSPEC= facter->=2.0,<3.0
CATEGORIES= sysutils
Index: sysutils/ruby-puppet/3/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/3/Makefile,v
retrieving revision 1.137
diff -u -p -r1.137 Makefile
--- sysutils/ruby-puppet/3/Makefile 29 Jun 2016 16:14:44 -0000 1.137
+++ sysutils/ruby-puppet/3/Makefile 1 Sep 2016 19:18:55 -0000
@@ -3,7 +3,7 @@
PORTROACH= limit:^3
VERSION= 3.8.7
-REVISION= 6
+REVISION= 7
RUN_DEPENDS+= databases/ruby-hiera,${MODRUBY_FLAVOR} \
sysutils/ruby-facter>=2.0.1p0
Index: sysutils/ruby-puppet/4/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/4/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- sysutils/ruby-puppet/4/Makefile 30 Aug 2016 12:09:07 -0000 1.11
+++ sysutils/ruby-puppet/4/Makefile 1 Sep 2016 19:21:38 -0000
@@ -3,10 +3,11 @@
PORTROACH= limit:^4
VERSION= 4.6.1
+REVISION= 0
RUN_DEPENDS+= databases/ruby-hiera3,${MODRUBY_FLAVOR} \
devel/ruby-rgen,${MODRUBY_FLAVOR} \
- sysutils/facter
+ sysutils/facter,>=3.4.1p0
pre-install:
${SUBST_CMD} ${WRKDIST}/lib/puppet/provider/package/gem.rb \
Index: textproc/redland-bindings/Makefile
===================================================================
RCS file: /cvs/ports/textproc/redland-bindings/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- textproc/redland-bindings/Makefile 1 Jul 2016 11:45:50 -0000 1.14
+++ textproc/redland-bindings/Makefile 1 Sep 2016 19:18:55 -0000
@@ -9,6 +9,7 @@ CATEGORIES= textproc
V= 1.0.17.1
DISTNAME= redland-bindings-$V
+REVISION = 0
PKGNAME-main= p5-librdf-$V
#PKGNAME-lua= lua-librdf-$V
PKGNAME-php= php-librdf-$V
Index: textproc/ruby-rss/Makefile
===================================================================
RCS file: /cvs/ports/textproc/ruby-rss/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- textproc/ruby-rss/Makefile 10 Jan 2016 20:32:44 -0000 1.9
+++ textproc/ruby-rss/Makefile 1 Sep 2016 19:18:55 -0000
@@ -4,6 +4,7 @@ COMMENT= improved ruby RSS and Atom pars
DISTNAME= rss-0.2.6
PKGNAME= ${MODRUBY_PKG_PREFIX}-${DISTNAME}
+REVISION = 0
CATEGORIES= textproc devel
# ruby
Index: www/webkit/Makefile
===================================================================
RCS file: /cvs/ports/www/webkit/Makefile,v
retrieving revision 1.149
diff -u -p -r1.149 Makefile
--- www/webkit/Makefile 1 Sep 2016 15:50:30 -0000 1.149
+++ www/webkit/Makefile 2 Sep 2016 18:59:13 -0000
@@ -11,6 +11,7 @@ BROKEN-hppa = error: Compiler GCC >= 4.7
V = 2.4.11
DISTNAME = webkitgtk-${V}
PKGNAME = webkit-${V}
+REVISION = 0
EPOCH = 1
CATEGORIES = www
DPB_PROPERTIES =parallel
Index: www/webkitgtk4/Makefile
===================================================================
RCS file: /cvs/ports/www/webkitgtk4/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- www/webkitgtk4/Makefile 1 Sep 2016 08:27:17 -0000 1.46
+++ www/webkitgtk4/Makefile 2 Sep 2016 18:59:13 -0000
@@ -15,7 +15,7 @@ COMMENT = GTK+ port of the WebKit rende
V = 2.12.4
DISTNAME = webkitgtk-${V}
PKGNAME = webkitgtk4-${V}
-REVISION = 0
+REVISION = 1
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.23
diff -u -p -r1.23 Makefile
--- x11/gnome/code-assistance/Makefile 5 Jul 2016 06:30:39 -0000 1.23
+++ x11/gnome/code-assistance/Makefile 1 Sep 2016 19:19:43 -0000
@@ -4,6 +4,7 @@ COMMENT= code assistance services for G
GNOME_PROJECT= gnome-code-assistance
GNOME_VERSION= 3.16.1
+REVISION= 0
CATEGORIES= devel
Index: x11/kde4/korundum/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/korundum/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- x11/kde4/korundum/Makefile 27 Aug 2015 14:38:36 -0000 1.15
+++ x11/kde4/korundum/Makefile 1 Sep 2016 19:18:55 -0000
@@ -2,7 +2,7 @@
COMMENT = KDE bindings for Ruby
DISTNAME = korundum-${MODKDE4_VERSION}
-REVISION = 3
+REVISION = 4
WANTLIB = ${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.13
diff -u -p -r1.13 Makefile
--- x11/kde4/kross-interpreters/Makefile 27 Aug 2015 14:38:36 -0000
1.13
+++ x11/kde4/kross-interpreters/Makefile 1 Sep 2016 19:18:55 -0000
@@ -3,6 +3,7 @@
COMMENT-main = KDE bindings for running interpreters
COMMENT-java = KDE Java bindings
DISTNAME = kross-interpreters-${MODKDE4_VERSION}
+REVISION = 0
PKGNAME-main = ${PKGNAME}
PKGNAME-java = ${PKGNAME:C/interpreters/java/}
REVISION-java = 0
Index: x11/kde4/ruby-qt/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/ruby-qt/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- x11/kde4/ruby-qt/Makefile 7 Jan 2016 00:59:04 -0000 1.23
+++ x11/kde4/ruby-qt/Makefile 1 Sep 2016 19:18:55 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel x11/kde4
COMMENT = Ruby bindings for Qt4
DISTNAME = qtruby-${MODKDE4_VERSION}
PKGNAME = qt4-${MODKDE4_VERSION}
-REVISION = 2
+REVISION = 3
HOMEPAGE = http://techbase.kde.org/Development/Languages/Ruby
Index: x11/kde4/webdev/Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/webdev/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- x11/kde4/webdev/Makefile 16 Jul 2015 17:27:09 -0000 1.25
+++ x11/kde4/webdev/Makefile 1 Sep 2016 19:18:55 -0000
@@ -3,7 +3,7 @@
COMMENT = web development tools for KDE
DISTNAME = kdewebdev-${MODKDE4_VERSION}
PKGSPEC = kdewebdev-${MODKDE4_SPEC}
-REVISION = 3
+REVISION = 4
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.54
diff -u -p -r1.54 Makefile
--- x11/kde4/workspace/Makefile 30 Aug 2016 09:54:14 -0000 1.54
+++ x11/kde4/workspace/Makefile 1 Sep 2016 19:18:55 -0000
@@ -2,7 +2,7 @@
COMMENT = KDE workspace
DISTNAME = kde-workspace-4.11.21
-REVISION = 13
+REVISION = 14
MASTER_SITES = ${MASTER_SITE_KDE:=stable/applications/15.04.3/src/}
Index: x11/qt5/Makefile
===================================================================
RCS file: /cvs/ports/x11/qt5/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- x11/qt5/Makefile 20 Mar 2016 15:58:26 -0000 1.51
+++ x11/qt5/Makefile 1 Sep 2016 19:18:55 -0000
@@ -6,6 +6,7 @@ BROKEN-powerpc = never built - gcc ICE
VERSION = 5.5.1
ENGINIO_VERSION = 1.2.1
DISTNAME = qt-everywhere-opensource-src-${VERSION}
+REVISION = 0
COMMENT-main = C++ general-purpose toolkit
COMMENT-examples = examples for Qt5
