Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 31 Aug 2016 21:49:37 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
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
Message-ID:  <201608312149.u7VLnb3X026126@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608312149.u7VLnb3X026126>