From owner-svn-ports-head@FreeBSD.ORG  Thu Oct 31 11:30:43 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id AEBDC8C9;
 Thu, 31 Oct 2013 11:30:43 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
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 9BCC324A4;
 Thu, 31 Oct 2013 11:30:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9VBUhhq058939;
 Thu, 31 Oct 2013 11:30:43 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9VBUhhj058937;
 Thu, 31 Oct 2013 11:30:43 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201310311130.r9VBUhhj058937@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Thu, 31 Oct 2013 11:30:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r332226 - in head/net-mgmt: nsca nsca27
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.14
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: Thu, 31 Oct 2013 11:30:43 -0000

Author: bapt
Date: Thu Oct 31 11:30:42 2013
New Revision: 332226
URL: http://svnweb.freebsd.org/changeset/ports/332226

Log:
  Fix pkgname collision
  
  With hat:	portmgr

Modified:
  head/net-mgmt/nsca/Makefile
  head/net-mgmt/nsca27/Makefile

Modified: head/net-mgmt/nsca/Makefile
==============================================================================
--- head/net-mgmt/nsca/Makefile	Thu Oct 31 11:26:52 2013	(r332225)
+++ head/net-mgmt/nsca/Makefile	Thu Oct 31 11:30:42 2013	(r332226)
@@ -18,11 +18,10 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	mcrypt:${PORTSDIR}/security/libmcrypt
 
 .if !defined(_BUILDING_NSCA_CLIENT)
-LATEST_LINK=	nsca
-CONFLICTS=	nsca-2.7.*
+CONFLICTS=	nsca-2.7.* nsca27-*
 .else
-LATEST_LINK=	nsca-client
-CONFLICTS=	nsca-client-2.7.*
+PKGNAMESUFFIX-	-client
+CONFLICTS=	nsca-client-2.7.* nsca27-*
 .endif
 
 GNU_CONFIGURE=	yes

Modified: head/net-mgmt/nsca27/Makefile
==============================================================================
--- head/net-mgmt/nsca27/Makefile	Thu Oct 31 11:26:52 2013	(r332225)
+++ head/net-mgmt/nsca27/Makefile	Thu Oct 31 11:30:42 2013	(r332226)
@@ -18,10 +18,10 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	mcrypt:${PORTSDIR}/security/libmcrypt
 
 .if !defined(_BUILDING_NSCA_CLIENT)
-LATEST_LINK=	nsca27
+PKGNAMESUFFIX=	27
 CONFLICTS=	nsca-2.9.*
 .else
-LATEST_LINK=	nsca27-client
+PKGNAMESUFFIX=	27-client
 CONFLICTS=	nsca-client-2.9.*
 .endif