svn commit: r338613 - in head/archivers: rpm rpm4 rpm5

[Baptiste Daroussin]

Author: bapt
Date: Sat Jan  4 00:54:13 2014
New Revision: 338613
URL: http://svnweb.freebsd.org/changeset/ports/338613

Log:
  Fix pkgname conflicts

Modified:
  head/archivers/rpm/Makefile
  head/archivers/rpm4/Makefile
  head/archivers/rpm5/Makefile

Modified: head/archivers/rpm/Makefile
==============================================================================
--- head/archivers/rpm/Makefile	Sat Jan  4 00:51:17 2014	(r338612)
+++ head/archivers/rpm/Makefile	Sat Jan  4 00:54:13 2014	(r338613)
@@ -14,7 +14,7 @@ COMMENT=	The Red Hat Package Manager
 
 LIB_DEPENDS=	libpopt.so:${PORTSDIR}/devel/popt
 
-CONFLICTS=	rpm-[45].*
+CONFLICTS=	rpm-[45].* rpm[45]-*
 
 NO_STAGE=	yes
 USES=		gmake

Modified: head/archivers/rpm4/Makefile
==============================================================================
--- head/archivers/rpm4/Makefile	Sat Jan  4 00:51:17 2014	(r338612)
+++ head/archivers/rpm4/Makefile	Sat Jan  4 00:54:13 2014	(r338613)
@@ -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 \

Modified: head/archivers/rpm5/Makefile
==============================================================================
--- head/archivers/rpm5/Makefile	Sat Jan  4 00:51:17 2014	(r338612)
+++ head/archivers/rpm5/Makefile	Sat Jan  4 00:54:13 2014	(r338613)
@@ -6,6 +6,7 @@ PORTVERSION=	5.2.1
 PORTREVISION=	3
 CATEGORIES=	archivers
 MASTER_SITES=	http://rpm5.org/files/rpm/rpm-${PORTVERSION:R}/
+PKGNAMESUFFIX=	5
 
 MAINTAINER=	afb at rpm5.org
 COMMENT=	The RPM Package Manager
@@ -36,8 +37,7 @@ CONFIGURE_ARGS=	--without-js
 USES=		gmake perl5
 USE_PERL5=	build
 USE_LDCONFIG=	yes
-LATEST_LINK=	rpm5
-CONFLICTS=	rpm-3.* rpm-4.*
+CONFLICTS=	rpm-3.* rpm-4.* rpm4-*
 
 .include <bsd.port.options.mk>