From owner-svn-ports-head@freebsd.org Mon Jul 3 07:40:18 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2AE799E021E; Mon, 3 Jul 2017 07:40:18 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DEFD41025; Mon, 3 Jul 2017 07:40:17 +0000 (UTC) (envelope-from demon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v637eHpR065301; Mon, 3 Jul 2017 07:40:17 GMT (envelope-from demon@FreeBSD.org) Received: (from demon@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v637eGJB065299; Mon, 3 Jul 2017 07:40:16 GMT (envelope-from demon@FreeBSD.org) Message-Id: <201707030740.v637eGJB065299@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: demon set sender to demon@FreeBSD.org using -f From: Dmitry Sivachenko Date: Mon, 3 Jul 2017 07:40:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r444916 - in head: devel/hadoop2 www/yarn X-SVN-Group: ports-head X-SVN-Commit-Author: demon X-SVN-Commit-Paths: in head: devel/hadoop2 www/yarn X-SVN-Commit-Revision: 444916 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Jul 2017 07:40:18 -0000 Author: demon Date: Mon Jul 3 07:40:16 2017 New Revision: 444916 URL: https://svnweb.freebsd.org/changeset/ports/444916 Log: Register conflict with hadoop2 and www/yarn because of bin/yarn binary until better solution is found. PR: 220337 Submitted by: hakan@siktas.com Modified: head/devel/hadoop2/Makefile head/www/yarn/Makefile Modified: head/devel/hadoop2/Makefile ============================================================================== --- head/devel/hadoop2/Makefile Mon Jul 3 06:30:29 2017 (r444915) +++ head/devel/hadoop2/Makefile Mon Jul 3 07:40:16 2017 (r444916) @@ -31,7 +31,7 @@ LIB_DEPENDS= libsnappy.so:archivers/snappy RUN_DEPENDS= bash:shells/bash \ ssid:sysutils/ssid -CONFLICTS_INSTALL= hadoop-1* +CONFLICTS_INSTALL= hadoop-1* yarn USES= cpe shebangfix CPE_VENDOR= apache @@ -55,7 +55,7 @@ HADOOP_GROUP= hadoop USERS= ${HDFS_USER} ${MAPRED_USER} GROUPS= ${HADOOP_GROUP} -SUB_FILES= hadoop-layout.sh httpfs-env.sh kms-env.sh +SUB_FILES= hadoop-layout.sh httpfs-env.sh kms-env.sh USE_RC_SUBR= historyserver nodemanager resourcemanager webappproxyserver datanode namenode secondarynamenode journalnode zkfc PLIST_SUB= PORTVERSION="${PORTVERSION}" \ Modified: head/www/yarn/Makefile ============================================================================== --- head/www/yarn/Makefile Mon Jul 3 06:30:29 2017 (r444915) +++ head/www/yarn/Makefile Mon Jul 3 07:40:16 2017 (r444916) @@ -25,6 +25,8 @@ NODE_RUN_DEPENDS= node>=0.8.0:www/node NODE6_RUN_DEPENDS= node6>=0.8.0:www/node6 NODE4_RUN_DEPENDS= node4>=0.8.0:www/node4 +CONFLICTS_INSTALL= hadoop-2* + NO_ARCH= yes NO_BUILD= yes