From owner-svn-ports-all@FreeBSD.ORG  Thu Mar  6 20:48:24 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 5E4CD2F5;
 Thu,  6 Mar 2014 20:48: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 4B758978;
 Thu,  6 Mar 2014 20:48:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26KmO3J094714;
 Thu, 6 Mar 2014 20:48:24 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26KmOom094713;
 Thu, 6 Mar 2014 20:48:24 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201403062048.s26KmOom094713@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Thu, 6 Mar 2014 20:48:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347323 - head/Mk
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 <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Mar 2014 20:48:24 -0000

Author: antoine
Date: Thu Mar  6 20:48:23 2014
New Revision: 347323
URL: http://svnweb.freebsd.org/changeset/ports/347323
QAT: https://qat.redports.org/buildarchive/r347323/

Log:
  Fix packaging of python32 and python33 when they are already installed
  The ABIVER was appended twice to some files in the plist
  
  Reported and tested by:	demon

Modified:
  head/Mk/bsd.python.mk

Modified: head/Mk/bsd.python.mk
==============================================================================
--- head/Mk/bsd.python.mk	Thu Mar  6 20:44:49 2014	(r347322)
+++ head/Mk/bsd.python.mk	Thu Mar  6 20:48:23 2014	(r347323)
@@ -340,7 +340,7 @@ PYTHON_PORTSDIR=	${PORTSDIR}/lang/python
 PYTHON_REL=		334
 PYTHON_SUFFIX=		33
 PYTHON_VER=		3.3
-.if exists(${PYTHON_CMD}-config)
+.if exists(${PYTHON_CMD}-config) && ${PORTNAME} != python33
 PYTHON_ABIVER!=		${PYTHON_CMD}-config --abiflags
 .endif
 
@@ -351,7 +351,7 @@ PYTHON_PORTSDIR=	${PORTSDIR}/lang/python
 PYTHON_REL=		325
 PYTHON_SUFFIX=		32
 PYTHON_VER=		3.2
-.if exists(${PYTHON_CMD}-config)
+.if exists(${PYTHON_CMD}-config) && ${PORTNAME} != python32
 PYTHON_ABIVER!=		${PYTHON_CMD}-config --abiflags
 .endif