From owner-svn-ports-all@freebsd.org Mon Aug 29 15:59:26 2016 Return-Path: Delivered-To: svn-ports-all@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 C10C4BC76CB; Mon, 29 Aug 2016 15:59:26 +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 8EC9085F; Mon, 29 Aug 2016 15:59:26 +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 u7TFxPh4092163; Mon, 29 Aug 2016 15:59:25 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7TFxPNY092161; Mon, 29 Aug 2016 15:59:25 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201608291559.u7TFxPNY092161@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 29 Aug 2016 15:59:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421079 - in head/sysutils: 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-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Aug 2016 15:59:26 -0000 Author: mat Date: Mon Aug 29 15:59:25 2016 New Revision: 421079 URL: https://svnweb.freebsd.org/changeset/ports/421079 Log: Fixup CONFLICTS_INSTALL. Sponsored by: Absolight Modified: head/sysutils/qjail2/Makefile (contents, props changed) head/sysutils/qjail4/Makefile (contents, props changed) Modified: head/sysutils/qjail2/Makefile ============================================================================== --- head/sysutils/qjail2/Makefile Mon Aug 29 15:55:07 2016 (r421078) +++ head/sysutils/qjail2/Makefile Mon Aug 29 15:59:25 2016 (r421079) @@ -14,7 +14,7 @@ COMMENT= Utility to quickly deploy and m USES= tar:bzip2 NO_BUILD= yes -CONFLICTS_INSTALL= qjail-* +CONFLICTS_INSTALL= qjail-* qjail4-* IGNORE_FreeBSD_10= Only for FreeBSD 8 and 9 IGNORE_FreeBSD_11= Only for FreeBSD 8 and 9 Modified: head/sysutils/qjail4/Makefile ============================================================================== --- head/sysutils/qjail4/Makefile Mon Aug 29 15:55:07 2016 (r421078) +++ head/sysutils/qjail4/Makefile Mon Aug 29 15:59:25 2016 (r421079) @@ -25,7 +25,7 @@ USES= tar:bzip2 NO_BUILD= yes NO_ARCH= yes -CONFLICTS_INSTALL= qjail-* +CONFLICTS_INSTALL= qjail-* qjail2-* IGNORE_FreeBSD_9= Only for FreeBSD 10.x IGNORE_FreeBSD_11= Only for FreeBSD 10.x