From 5f6b5984a667d61a12b66681b6d7e3e63bec0e9a Mon Sep 17 00:00:00 2001
From: jeremy <jeremy@openbsd.org>
Date: Wed, 8 Oct 2014 02:16:34 +0000
Subject: [PATCH] Use default version of ruby when building KDE4 ports.

Removal of FLAVOR setting in ruby-qt4 recommended by zhuk@.

OK zhuk@
---
 x11/kde4/korundum/Makefile           | 4 ++--
 x11/kde4/kross-interpreters/Makefile | 5 ++---
 x11/kde4/ruby-qt/Makefile            | 3 +--
 x11/kde4/webdev/Makefile             | 4 ++--
 x11/kde4/workspace/Makefile          | 4 ++--
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/x11/kde4/korundum/Makefile b/x11/kde4/korundum/Makefile
index 6161d38371a..54a1b39c0f9 100644
--- a/x11/kde4/korundum/Makefile
+++ b/x11/kde4/korundum/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2014/07/09 20:03:27 zhuk Exp $
+# $OpenBSD: Makefile,v 1.10 2014/10/08 02:16:34 jeremy Exp $
 
 COMMENT =	KDE bindings for Ruby
 DISTNAME =	korundum-${MODKDE4_VERSION}
+REVISION =	0
 
 WANTLIB =  c m pthread ${MODRUBY_WANTLIB}
 WANTLIB += lib/qt4/QtDBus lib/qt4/QtGui lib/qt4/QtNetwork lib/qt4/QtSvg
@@ -30,7 +31,6 @@ WANTLIB += qtruby4shared soprano
 MODULES =	lang/ruby
 MODKDE4_USE =	libs pim
 
-MODRUBY_REV =		2.0
 MODRUBY_ADJ_FILES =	*.rb
 CONFIGURE_ARGS =	-DRUBY_EXECUTABLE=${RUBY}
 
diff --git a/x11/kde4/kross-interpreters/Makefile b/x11/kde4/kross-interpreters/Makefile
index b8bea6783e6..367b2aa0578 100644
--- a/x11/kde4/kross-interpreters/Makefile
+++ b/x11/kde4/kross-interpreters/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2014/07/09 20:03:27 zhuk Exp $
+# $OpenBSD: Makefile,v 1.9 2014/10/08 02:16:34 jeremy Exp $
 
 COMMENT-main =	KDE bindings for running interpreters
 COMMENT-java =	KDE Java bindings
 DISTNAME =	kross-interpreters-${MODKDE4_VERSION}
 PKGNAME-main =	${PKGNAME}
 PKGNAME-java =	${PKGNAME:C/interpreters/java/}
+REVISION-main =	0
 
 MULTI_PACKAGES =	-main -java
 
@@ -26,9 +27,7 @@ MODKDE4_USE =		libs
 # Unported
 CONFIGURE_ARGS =	-DCMAKE_DISABLE_FIND_PACKAGE_FALCON:Bool=Yes
 
-# TODO: Ruby 2.0 should be acceptable choice probably, too
 MODULES =		lang/python lang/ruby
-MODRUBY_REV =		2.0
 CONFIGURE_ARGS +=	-DRUBY_EXECUTABLE=${RUBY}
 
 .if ${FLAVOR:Mno_java}
diff --git a/x11/kde4/ruby-qt/Makefile b/x11/kde4/ruby-qt/Makefile
index 8cd4af99405..f931bf0584e 100644
--- a/x11/kde4/ruby-qt/Makefile
+++ b/x11/kde4/ruby-qt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2014/07/11 12:15:53 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2014/10/08 02:16:34 jeremy Exp $
 
 BROKEN-hppa =	relocation error
 CATEGORIES =	devel lang/ruby x11/kde4
@@ -31,7 +31,6 @@ 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 =		ruby19 ruby20 ruby21
-FLAVOR ?=		ruby20
 MODRUBY_HANDLE_FLAVORS=	Yes
 MODRUBY_ADJ_FILES =	*.rb rbqtapi
 SUBST_VARS =		MODRUBY_FLAVOR
diff --git a/x11/kde4/webdev/Makefile b/x11/kde4/webdev/Makefile
index 9b0019a1748..8ea9790bdb9 100644
--- a/x11/kde4/webdev/Makefile
+++ b/x11/kde4/webdev/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.18 2014/07/18 08:17:14 zhuk Exp $
+# $OpenBSD: Makefile,v 1.19 2014/10/08 02:16:34 jeremy Exp $
 
 COMMENT =	web development tools for KDE
 DISTNAME =	kdewebdev-${MODKDE4_VERSION}
+REVISION =	0
 
 SHARED_LIBS =	klinkstatuscommon	51.0
 SHARED_LIBS +=	kommandercore		51.0
@@ -20,7 +21,6 @@ WANTLIB += ${KDE4LIB}/threadweaver
 WANTLIB += soprano tidyp
 
 MODULES =	multimedia/phonon lang/ruby
-MODRUBY_REV =	1.9
 MODKDE4_USE =	pim
 CONFIGURE_ARGS =	-DRUBY_EXECUTABLE=${RUBY}
 
diff --git a/x11/kde4/workspace/Makefile b/x11/kde4/workspace/Makefile
index a10528e3ef7..72797079e35 100644
--- a/x11/kde4/workspace/Makefile
+++ b/x11/kde4/workspace/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2014/10/04 16:08:07 zhuk Exp $
+# $OpenBSD: Makefile,v 1.27 2014/10/08 02:16:34 jeremy Exp $
 
 COMMENT =	KDE workspace
 MODKDE4_VERSION =	4.11.12
 DISTNAME =	kde-workspace-${MODKDE4_VERSION}
+REVISION =	0
 
 MASTER_SITES =	${MASTER_SITE_KDE:=stable/4.14.1/src/}
 
@@ -87,7 +88,6 @@ WANTLIB += usb xml2 xmms
 MODULES =	devel/gettext multimedia/phonon lang/python lang/ruby
 MODKDE4_USE =	pim
 
-MODRUBY_REV =		1.9
 MODRUBY_BUILDDEP =	No
 
 BUILD_DEPENDS =	misc/shared-desktop-ontologies \