summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2016-01-08 23:57:17 +0000
committerryoon <ryoon@pkgsrc.org>2016-01-08 23:57:17 +0000
commit60d2627e9f38ea5bd339b5b6a2734245649a811b (patch)
tree088a8d24f5f5a3e642c05913a5a7f15646aed4cd /misc
parent5931b640cec0e72e5348300da8cbc0847d533ec8 (diff)
downloadpkgsrc-60d2627e9f38ea5bd339b5b6a2734245649a811b.tar.gz
Add conflict pattern for libreoffice5-bin
As a part of PR pkg/50617.
Diffstat (limited to 'misc')
-rw-r--r--misc/libreoffice4-bin/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/misc/libreoffice4-bin/Makefile b/misc/libreoffice4-bin/Makefile
index e548320d603..17ce70162ca 100644
--- a/misc/libreoffice4-bin/Makefile
+++ b/misc/libreoffice4-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2015/12/13 14:27:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.15 2016/01/08 23:57:17 ryoon Exp $
DISTNAME= libreoffice4-bin # overridden below
PKGNAME= libreoffice4-bin-${OO_RELEASE}
@@ -18,6 +18,7 @@ CONFLICTS+= openoffice3-[0-9]*
CONFLICTS+= openoffice3-bin-[0-9]*
CONFLICTS+= openoffice-linux-[0-9]*
CONFLICTS+= libreoffice3-bin-[0-9]*
+CONFLICTS+= libreoffice5-bin-[0-9]*
OO_VER= 4
OO_BASEVER= ${OO_VER}.4