From owner-svn-ports-head@FreeBSD.ORG Sun Mar 9 16:26:11 2014 Return-Path: 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 365CBC4C; Sun, 9 Mar 2014 16:26:11 +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 23704B3B; Sun, 9 Mar 2014 16:26:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s29GQBVW038493; Sun, 9 Mar 2014 16:26:11 GMT (envelope-from sunpoet@svn.freebsd.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s29GQAKd038491; Sun, 9 Mar 2014 16:26:11 GMT (envelope-from sunpoet@svn.freebsd.org) Message-Id: <201403091626.s29GQAKd038491@svn.freebsd.org> From: Sunpoet Po-Chuan Hsieh Date: Sun, 9 Mar 2014 16:26:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347658 - 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Mar 2014 16:26:11 -0000 Author: sunpoet Date: Sun Mar 9 16:26:10 2014 New Revision: 347658 URL: http://svnweb.freebsd.org/changeset/ports/347658 QAT: https://qat.redports.org/buildarchive/r347658/ Log: - Fix following error message when "make update" with python{32,33} as default python interpreter make[1]: "/usr/ports/Mk/bsd.python.mk" line 343: Malformed conditional (exists(${PYTHON_CMD}-config) && ${PORTNAME} != python33) make[1]: Fatal errors encountered -- cannot continuemake: "/usr/ports/Mk/bsd.port.subdir.mk" line 123: warning: "make -V PYTHONBASE USE_PYTHON=1 -f /usr/ports/Mk/bsd.port.mk" returned non-zero status Approved by: antoine (portmgr) Modified: head/Mk/bsd.python.mk Modified: head/Mk/bsd.python.mk ============================================================================== --- head/Mk/bsd.python.mk Sun Mar 9 16:19:51 2014 (r347657) +++ head/Mk/bsd.python.mk Sun Mar 9 16:26:10 2014 (r347658) @@ -340,7 +340,7 @@ PYTHON_PORTSDIR= ${PORTSDIR}/lang/python PYTHON_REL= 334 PYTHON_SUFFIX= 33 PYTHON_VER= 3.3 -.if exists(${PYTHON_CMD}-config) && ${PORTNAME} != python33 +.if exists(${PYTHON_CMD}-config) && defined(PORTNAME) && ${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) && ${PORTNAME} != python32 +.if exists(${PYTHON_CMD}-config) && defined(PORTNAME) && ${PORTNAME} != python32 PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags .endif