From owner-svn-ports-head@FreeBSD.ORG  Thu Dec  4 15:08:43 2014
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.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id CF330353;
 Thu,  4 Dec 2014 15:08:43 +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 BC49B124;
 Thu,  4 Dec 2014 15:08:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB4F8hqO066580;
 Thu, 4 Dec 2014 15:08:43 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB4F8h50066578;
 Thu, 4 Dec 2014 15:08:43 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201412041508.sB4F8h50066578@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: feld set sender to feld@FreeBSD.org
 using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 4 Dec 2014 15:08:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r373932 - head/security/polarssl13
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: Thu, 04 Dec 2014 15:08:43 -0000

Author: feld
Date: Thu Dec  4 15:08:43 2014
New Revision: 373932
URL: https://svnweb.freebsd.org/changeset/ports/373932
QAT: https://qat.redports.org/buildarchive/r373932/

Log:
  This really needed a PKGNAMESUFFIX to prevent collision with polarssl
  and a CONFLICTS so pkg can better handle this.
  
  Pointyhat -> me
  
  PR:		195527

Modified:
  head/security/polarssl13/Makefile

Modified: head/security/polarssl13/Makefile
==============================================================================
--- head/security/polarssl13/Makefile	Thu Dec  4 15:08:39 2014	(r373931)
+++ head/security/polarssl13/Makefile	Thu Dec  4 15:08:43 2014	(r373932)
@@ -5,6 +5,7 @@ PORTVERSION=	1.3.9
 DISTVERSIONSUFFIX=	-gpl
 CATEGORIES=	security devel
 MASTER_SITES=	http://polarssl.org/download/
+PKGNAMESUFFIX=	13
 
 MAINTAINER=	chris@bsdjunk.com
 COMMENT=	Open Source embedded SSL/TLS cryptographic library
@@ -18,11 +19,7 @@ USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-# PolarSSL 1.3 branch introduces API changes that would best be served at this
-# time by a new/seperate polarssl13 port. Therefore, limit Portscout to the
-# 1.2 branch for this port.
-#Why ?
-#PORTSCOUT=	limit:^1\.2\.
+CONFLICTS=	polarssl-[0-9]*
 
 DOCFILES=	ChangeLog README.rst LICENSE
 BINFILES=	aescrypt2 benchmark dh_client dh_genprime dh_server hello \