From owner-svn-ports-all@FreeBSD.ORG  Tue Sep 25 13:39:59 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 67C6E106564A;
	Tue, 25 Sep 2012 13:39:59 +0000 (UTC)
	(envelope-from kuriyama@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5221C8FC17;
	Tue, 25 Sep 2012 13:39:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8PDdxof038607;
	Tue, 25 Sep 2012 13:39:59 GMT
	(envelope-from kuriyama@svn.freebsd.org)
Received: (from kuriyama@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8PDdxPx038604;
	Tue, 25 Sep 2012 13:39:59 GMT
	(envelope-from kuriyama@svn.freebsd.org)
Message-Id: <201209251339.q8PDdxPx038604@svn.freebsd.org>
From: Jun Kuriyama <kuriyama@FreeBSD.org>
Date: Tue, 25 Sep 2012 13:39:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304836 - head/sysutils/rubygem-fluentd
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
	<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Sep 2012 13:39:59 -0000

Author: kuriyama
Date: Tue Sep 25 13:39:58 2012
New Revision: 304836
URL: http://svn.freebsd.org/changeset/ports/304836

Log:
  Unbreak and mark ignore when ruby18 is installed.

Modified:
  head/sysutils/rubygem-fluentd/Makefile

Modified: head/sysutils/rubygem-fluentd/Makefile
==============================================================================
--- head/sysutils/rubygem-fluentd/Makefile	Tue Sep 25 13:00:54 2012	(r304835)
+++ head/sysutils/rubygem-fluentd/Makefile	Tue Sep 25 13:39:58 2012	(r304836)
@@ -20,12 +20,16 @@ RUN_DEPENDS=	\
 	rubygem-cool.io>=1.1.0:${PORTSDIR}/devel/rubygem-cool.io \
 	rubygem-http_parser.rb>=0.5.1:${PORTSDIR}/net/rubygem-http_parser.rb
 
-BROKEN=		conflicting dependencies
-
 USE_RUBY=	yes
-RUBY_VER=	1.9
+#RUBY_VER=	1.9	# Please set RUBY_DEFAULT_VER=1.9 in /etc/make.conf
 USE_RUBYGEMS=	yes
 PLIST_FILES=	bin/fluent-cat bin/fluent-gem bin/fluentd
 RUBYGEM_AUTOPLIST=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${RUBY_VER} == "1.8"
+IGNORE=		requires Ruby 1.9, please install this first
+.endif
+
+.include <bsd.port.post.mk>