cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use default version of ruby when building KDE4 ports.

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

OK zhuk@
This commit is contained in:
jeremy 2014-10-08 02:16:34 +00:00
parent 1ebed9c305
commit 5f6b5984a6
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/kde4/korundum/Makefile
View File

@ -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}

5
x11/kde4/kross-interpreters/Makefile
View File

@ -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}

3
x11/kde4/ruby-qt/Makefile
View File

@ -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

4
x11/kde4/webdev/Makefile
View File

@ -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}

4
x11/kde4/workspace/Makefile
View File

@ -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 \