From owner-svn-ports-all@FreeBSD.ORG Sat Jan 4 00:54:14 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9143A686; Sat, 4 Jan 2014 00:54:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 642F41193; Sat, 4 Jan 2014 00:54:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s040sE1k035206; Sat, 4 Jan 2014 00:54:14 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s040sDgH035203; Sat, 4 Jan 2014 00:54:13 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201401040054.s040sDgH035203@svn.freebsd.org> From: Baptiste Daroussin Date: Sat, 4 Jan 2014 00:54:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338613 - in head/archivers: rpm rpm4 rpm5 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 00:54:14 -0000 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@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