From owner-svn-ports-head@freebsd.org Wed Aug 31 21:49:38 2016 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 8F9E2BCADDE; Wed, 31 Aug 2016 21:49:38 +0000 (UTC) (envelope-from mat@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 44272E90; Wed, 31 Aug 2016 21:49:38 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7VLnbHX026129; Wed, 31 Aug 2016 21:49:37 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7VLnb3X026126; Wed, 31 Aug 2016 21:49:37 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201608312149.u7VLnb3X026126@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Wed, 31 Aug 2016 21:49:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421195 - in head/sysutils: qjail qjail2 qjail4 X-SVN-Group: ports-head 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.22 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: Wed, 31 Aug 2016 21:49:38 -0000 Author: mat Date: Wed Aug 31 21:49:37 2016 New Revision: 421195 URL: https://svnweb.freebsd.org/changeset/ports/421195 Log: Remove the CONFLICTS_INSTALL lines, they can't conflict, they can't be installed at the same time. Submitted by: maintainer Sponsored by: Absolight Modified: head/sysutils/qjail/Makefile (contents, props changed) head/sysutils/qjail2/Makefile (contents, props changed) head/sysutils/qjail4/Makefile (contents, props changed) Modified: head/sysutils/qjail/Makefile ============================================================================== --- head/sysutils/qjail/Makefile Wed Aug 31 21:22:48 2016 (r421194) +++ head/sysutils/qjail/Makefile Wed Aug 31 21:49:37 2016 (r421195) @@ -24,8 +24,6 @@ USES= tar:bzip2 NO_BUILD= yes NO_ARCH= yes -CONFLICTS_INSTALL= qjail[24]-* - IGNORE_FreeBSD_9= Only for FreeBSD 11+ IGNORE_FreeBSD_10= Only for FreeBSD 11+ Modified: head/sysutils/qjail2/Makefile ============================================================================== --- head/sysutils/qjail2/Makefile Wed Aug 31 21:22:48 2016 (r421194) +++ head/sysutils/qjail2/Makefile Wed Aug 31 21:49:37 2016 (r421195) @@ -14,8 +14,6 @@ COMMENT= Utility to quickly deploy and m USES= tar:bzip2 NO_BUILD= yes -CONFLICTS_INSTALL= qjail-* qjail4-* - IGNORE_FreeBSD_10= Only for FreeBSD 8 and 9 IGNORE_FreeBSD_11= Only for FreeBSD 8 and 9 IGNORE_FreeBSD_12= Only for FreeBSD 8 and 9 Modified: head/sysutils/qjail4/Makefile ============================================================================== --- head/sysutils/qjail4/Makefile Wed Aug 31 21:22:48 2016 (r421194) +++ head/sysutils/qjail4/Makefile Wed Aug 31 21:49:37 2016 (r421195) @@ -25,8 +25,6 @@ USES= tar:bzip2 NO_BUILD= yes NO_ARCH= yes -CONFLICTS_INSTALL= qjail-* qjail2-* - IGNORE_FreeBSD_9= Only for FreeBSD 10.x IGNORE_FreeBSD_11= Only for FreeBSD 10.x IGNORE_FreeBSD_12= Only for FreeBSD 10.x