Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Mar 2014 20:48:24 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r347323 - head/Mk
Message-ID:  <201403062048.s26KmOom094713@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403062048.s26KmOom094713>