pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/www/webkit-gtk prevent using lang/ruby, it will confli...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/08813b424bbf
branches:  trunk
changeset: 612365:08813b424bbf
user:      obache <obache%pkgsrc.org@localhost>
date:      Wed Dec 19 08:14:42 2012 +0000

description:
prevent using lang/ruby, it will conflict with pkg_alternatives.

diffstat:

 www/webkit-gtk/Makefile.common |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (20 lines):

diff -r 355e812f2754 -r 08813b424bbf www/webkit-gtk/Makefile.common
--- a/www/webkit-gtk/Makefile.common    Wed Dec 19 07:32:17 2012 +0000
+++ b/www/webkit-gtk/Makefile.common    Wed Dec 19 08:14:42 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2012/10/30 12:46:30 drochner Exp $
+# $NetBSD: Makefile.common,v 1.18 2012/12/19 08:14:42 obache Exp $
 # used by www/webkit-gtk/Makefile
 # used by www/webkit-gtk3/Makefile
 
@@ -41,7 +41,9 @@
                Source/WebCore/make-hash-tools.pl \
                Source/WebCore/platform/text/mac/*.pl
 
-BUILD_DEPENDS+=        ruby-[0-9]*:../../lang/ruby
+.include "../../lang/ruby/rubyversion.mk"
+BUILD_DEPENDS+=        ${RUBY_BASE}>=${RUBY_VERSION}:../../lang/${RUBY_BASE}
+CONFIGURE_ENV+=        RUBY=${RUBY}
 
 PYTHON_FOR_BUILD_ONLY= yes
 .include "../../lang/python/application.mk"



Home | Main Index | Thread Index | Old Index