From e2ec2feed5e5775c9850623d7fd8d46a07d0faa8 Mon Sep 17 00:00:00 2001 From: Mark Linimon Date: Sat, 17 Dec 2011 03:26:22 +0000 Subject: [PATCH] Work around duplicate ruby 1.8/1.9 dependency if RUBY_VER is 1.9. Discussed with: pgollucci --- security/flowtag/Makefile | 9 +++++---- www/redmine/Makefile | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/security/flowtag/Makefile b/security/flowtag/Makefile index bea505ce5abc..4d8cbb3a689f 100644 --- a/security/flowtag/Makefile +++ b/security/flowtag/Makefile @@ -16,13 +16,14 @@ EXTRACT_SUFX= .tgz MAINTAINER= lee@writequit.org COMMENT= A collaborative attack-analysis tool for security researchers -BUILD_DEPENDS= ruby:${PORTSDIR}/lang/ruby18 -RUN_DEPENDS= ${LOCALBASE}/lib/ruby/1.8/tk/canvas.rb:${PORTSDIR}/x11-toolkits/ruby-tk - USE_RUBY= yes USE_RUBY_SETUP= yes MAN1= flowtag.1 listflows.1 pcap2flowdb.1 printflow.1 MANCOMPRESSED= yes -.include +.include + +RUN_DEPENDS+= ${RUBY_SITELIBDIR}/tk/canvas.rb:${PORTSDIR}/x11-toolkits/ruby-tk + +.include diff --git a/www/redmine/Makefile b/www/redmine/Makefile index 2f9dbcf8da17..9df54d716441 100644 --- a/www/redmine/Makefile +++ b/www/redmine/Makefile @@ -18,7 +18,11 @@ COMMENT= A flexible project management web application RUN_DEPENDS= rackup:${PORTSDIR}/www/rubygem-rack \ rubygem-i18n>=0.4.2:${PORTSDIR}/devel/rubygem-i18n +.if defined(RUBY_VER) && ${RUBY_VER} != "1.8" +IGNORE= requires ruby1.8, but you have RUBY_VER set to 1.9 +.else RUBY_VER= 1.8 +.endif USE_RUBY= yes USE_RUBY_FEATURES= iconv USE_RAKE= yes