summaryrefslogtreecommitdiff
path: root/archivers/rpm4
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2014-01-04 00:54:13 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2014-01-04 00:54:13 +0000
commitdd8200698158cd065efddcd114f88214431d9b13 (patch)
tree282105d1534b821136343dde77bd34bd5520668c /archivers/rpm4
parentFix pkgname conflicts (diff)
Fix pkgname conflicts
Notes
Notes: svn path=/head/; revision=338613
Diffstat (limited to 'archivers/rpm4')
-rw-r--r--archivers/rpm4/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index f53ab58ecc61..5e8ee8ca6289 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -27,7 +27,7 @@ USE_BDB= 46+
INVALID_BDB_VER=51
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFLICTS_INSTALL= rpm-[35].*
+CONFLICTS_INSTALL= rpm-[35].* rpm5-*
SHEBANG_FILES= scripts/brp-python-bytecompile scripts/check-prereqs \
scripts/check-rpaths-worker scripts/pythondeps.sh \
scripts/mono-find-requires scripts/mono-find-provides \