summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Pekala <pawel@FreeBSD.org>2013-07-05 16:21:49 +0000
committerPawel Pekala <pawel@FreeBSD.org>2013-07-05 16:21:49 +0000
commit33beb08e7b5aa7e9e825a5067e30eb0e3a4d3e51 (patch)
tree32e437203a55145dd856636fb92589ebf3be772d
parentwww/dojo: update to 1.9.1 (diff)
Register install conflicts with version 1.x
Submitted by: maintainer via private email
-rw-r--r--sysutils/qjail/Makefile2
-rw-r--r--sysutils/qjail2/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/sysutils/qjail/Makefile b/sysutils/qjail/Makefile
index 2921ff5c4867..ca224dd4103d 100644
--- a/sysutils/qjail/Makefile
+++ b/sysutils/qjail/Makefile
@@ -14,7 +14,7 @@ NO_BUILD= yes
MAN8= qjail.8 qjail-intro.8 qjail-howto.8
-CONFLICTS_INSTALL= qjail-2.*
+CONFLICTS_INSTALL= qjail-1.* qjail-2.*
post-patch:
@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \
diff --git a/sysutils/qjail2/Makefile b/sysutils/qjail2/Makefile
index 03312bc072f0..49534b39a273 100644
--- a/sysutils/qjail2/Makefile
+++ b/sysutils/qjail2/Makefile
@@ -15,7 +15,7 @@ LATEST_LINK= ${PORTNAME}2
MAN8= qjail.8 qjail-intro.8 qjail.conf.8 qjail-howto.8
-CONFLICTS_INSTALL= qjail-3.*
+CONFLICTS_INSTALL= qjail-1.* qjail-3.*
post-patch:
@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \