From owner-svn-ports-head@FreeBSD.ORG  Mon Oct 20 20:13:32 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B9E41A8D;
 Mon, 20 Oct 2014 20:13:32 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A60672A9;
 Mon, 20 Oct 2014 20:13:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9KKDWUS078062;
 Mon, 20 Oct 2014 20:13:32 GMT (envelope-from antoine@FreeBSD.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9KKDW59078060;
 Mon, 20 Oct 2014 20:13:32 GMT (envelope-from antoine@FreeBSD.org)
Message-Id: <201410202013.s9KKDW59078060@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: antoine set sender to
 antoine@FreeBSD.org using -f
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Mon, 20 Oct 2014 20:13:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r371297 - in head/devel: omniORB omniORB-4.1
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Oct 2014 20:13:32 -0000

Author: antoine
Date: Mon Oct 20 20:13:31 2014
New Revision: 371297
URL: https://svnweb.freebsd.org/changeset/ports/371297
QAT: https://qat.redports.org/buildarchive/r371297/

Log:
  Fix duplicate pkgnames

Modified:
  head/devel/omniORB-4.1/Makefile
  head/devel/omniORB/Makefile

Modified: head/devel/omniORB-4.1/Makefile
==============================================================================
--- head/devel/omniORB-4.1/Makefile	Mon Oct 20 20:08:54 2014	(r371296)
+++ head/devel/omniORB-4.1/Makefile	Mon Oct 20 20:13:31 2014	(r371297)
@@ -5,6 +5,7 @@ PORTNAME=	omniORB
 PORTVERSION=	4.1.7
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME:tl}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+PKGNAMESUFFIX=	41
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Robust high performance CORBA ORB for C++ and Python

Modified: head/devel/omniORB/Makefile
==============================================================================
--- head/devel/omniORB/Makefile	Mon Oct 20 20:08:54 2014	(r371296)
+++ head/devel/omniORB/Makefile	Mon Oct 20 20:13:31 2014	(r371297)
@@ -11,7 +11,7 @@ COMMENT=	Robust high performance CORBA O
 
 LICENSE=	GPLv2
 
-CONFLICTS=	omniORB-4.1.*
+CONFLICTS=	omniORB41-4.1.*
 PLIST_SUB+=	SONUM=${PORTVERSION:C/.*\.//}
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes