From owner-svn-ports-head@FreeBSD.ORG  Sun Nov 17 16:03:24 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 ESMTPS id 3A5EE904;
 Sun, 17 Nov 2013 16:03:24 +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 27B01251A;
 Sun, 17 Nov 2013 16:03:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAHG3OFA056765;
 Sun, 17 Nov 2013 16:03:24 GMT
 (envelope-from skreuzer@svn.freebsd.org)
Received: (from skreuzer@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAHG3NHq056763;
 Sun, 17 Nov 2013 16:03:23 GMT
 (envelope-from skreuzer@svn.freebsd.org)
Message-Id: <201311171603.rAHG3NHq056763@svn.freebsd.org>
From: Steven Kreuzer <skreuzer@FreeBSD.org>
Date: Sun, 17 Nov 2013 16:03:23 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r334096 - in head/net: ptpd2 ptpd2-devel
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.16
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: Sun, 17 Nov 2013 16:03:24 -0000

Author: skreuzer
Date: Sun Nov 17 16:03:23 2013
New Revision: 334096
URL: http://svnweb.freebsd.org/changeset/ports/334096

Log:
  Fix package name collision

Modified:
  head/net/ptpd2-devel/Makefile
  head/net/ptpd2/Makefile

Modified: head/net/ptpd2-devel/Makefile
==============================================================================
--- head/net/ptpd2-devel/Makefile	Sun Nov 17 15:58:38 2013	(r334095)
+++ head/net/ptpd2-devel/Makefile	Sun Nov 17 16:03:23 2013	(r334096)
@@ -5,6 +5,7 @@ PORTNAME=	ptpd
 DISTVERSION=	2-RC-0
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/$(PORTNAME)/2-RC/
+PKGNAMESUFFIX=	2-devel
 
 MAINTAINER=	gnn@FreeBSD.org
 COMMENT=	Release candidate for the precision time protocol IEEE 1588-2008
@@ -13,8 +14,7 @@ LICENSE=	BSD
 
 WRKSRC=		${WRKDIR}/ptpd-${DISTVERSION}/src
 
-CONFLICTS=	ptpd-2.[0-9].*
-LATEST_LINK=	ptpd2-devel
+CONFLICTS=	ptpd2-2.[0-9].*
 
 PLIST_FILES=	sbin/ptpd2
 PORTDOCS=	*

Modified: head/net/ptpd2/Makefile
==============================================================================
--- head/net/ptpd2/Makefile	Sun Nov 17 15:58:38 2013	(r334095)
+++ head/net/ptpd2/Makefile	Sun Nov 17 16:03:23 2013	(r334096)
@@ -6,13 +6,14 @@ DISTVERSION=	2.2.2
 PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	SF
+PKGNAMESUFFIX=	2
 
 MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Implementation of the precision time protocol IEEE 1588-2008
 
 LICENSE=	BSD
 
-CONFLICTS=	ptpd-2.r.*
+CONFLICTS=	ptpd2-devel.*
 
 WRKSRC=		${WRKDIR}/ptpd-${DISTVERSION}/src