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

Add a @conflict marker after adding ruby21 to FLAVORS, and a comment

Browse Source 
reminding to do this in the future.
This commit is contained in:
zhuk 2014-01-16 08:30:34 +00:00
parent 143000e872
commit 02b8efae87
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.11 2014/01/15 22:32:08 zhuk Exp $
# $OpenBSD: Makefile,v 1.12 2014/01/16 08:30:34 zhuk Exp $
BROKEN-hppa = relocation error
CATEGORIES = devel lang/ruby x11/kde4
COMMENT = Ruby bindings for Qt4
DISTNAME = qtruby-${MODKDE4_VERSION}
PKGNAME = qt4-${MODKDE4_VERSION}
REVISION = 0
HOMEPAGE = http://techbase.kde.org/Development/Languages/Ruby
SHARED_LIBS = qtruby4shared 51.0 # 2.0
@ -26,7 +28,8 @@ WANTLIB += qscintilla2
MODULES = multimedia/phonon lang/ruby
MODKDE4_USE =
# ruby 1.8 not supported as it requires LD_PRELOAD hacks for pthreads
# 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

3
x11/kde4/ruby-qt/pkg/PLIST
View File

@ -1,7 +1,8 @@
@comment $OpenBSD: PLIST,v 1.5 2013/12/08 19:13:34 zhuk Exp $
@comment $OpenBSD: PLIST,v 1.6 2014/01/16 08:30:34 zhuk Exp $
@conflict kdebindings-<4
@conflict ruby19-qt4-*
@conflict ruby20-qt4-*
@conflict ruby21-qt4-*
@pkgpath x11/ruby-qt4,${MODRUBY_FLAVOR}
bin/rbqtapi
@bin bin/rbrcc