From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jul 5 09:20:08 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EE30106566B for ; Tue, 5 Jul 2011 09:20:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id E43D18FC17 for ; Tue, 5 Jul 2011 09:20:07 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p659K7IK098455 for ; Tue, 5 Jul 2011 09:20:07 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p659K71Y098454; Tue, 5 Jul 2011 09:20:07 GMT (envelope-from gnats) Resent-Date: Tue, 5 Jul 2011 09:20:07 GMT Resent-Message-Id: <201107050920.p659K71Y098454@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sunpoet Po-Chuan Hsieh Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EC45B106566C for ; Tue, 5 Jul 2011 09:13:53 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from sunpoet.net (sunpoet.net [220.133.12.240]) by mx1.freebsd.org (Postfix) with ESMTP id 8976C8FC1D for ; Tue, 5 Jul 2011 09:13:53 +0000 (UTC) Received: by sunpoet.net (Postfix, from userid 1000) id 3C17452B4; Tue, 5 Jul 2011 17:13:29 +0800 (CST) Message-Id: <20110705091329.3C17452B4@sunpoet.net> Date: Tue, 5 Jul 2011 17:13:29 +0800 (CST) From: Sunpoet Po-Chuan Hsieh To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/158662: [PATCH] Mk/bsd.python.mk: multiple changes X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Sunpoet Po-Chuan Hsieh List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Jul 2011 09:20:08 -0000 >Number: 158662 >Category: ports >Synopsis: [PATCH] Mk/bsd.python.mk: multiple changes >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jul 05 09:20:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 8.2-STABLE amd64 >Organization: SUNPOET.net >Environment: System: FreeBSD bonjour.sunpoet.net 8.2-STABLE FreeBSD 8.2-STABLE #0: Mon Jun 20 21:52:00 CST 2011 sunpoet@bonjour.sunpoet.net:/usr/obj/usr/src/sys/bonjour amd64 >Description: - Introduce PYTHON_ABIVER: fix PYTHON_INCLUDEDIR for python32 users (PYMALLOC and UCS4 are on by default) - Use devel/py-distribute as setuptools for python 3.x users - Minor changes (ports/154795), including: - Use py${PYTHON_VER} instead of ${PYTHON_VERSION:S/thon//} - Use "yes" >How-To-Repeat: >Fix: --- bsd.python.mk.patch begins here --- Index: bsd.python.mk =================================================================== RCS file: /home/pcvs/ports/Mk/bsd.python.mk,v retrieving revision 1.133 diff -u -r1.133 bsd.python.mk --- bsd.python.mk 27 Jun 2011 02:37:39 -0000 1.133 +++ bsd.python.mk 30 Jun 2011 06:27:05 -0000 @@ -152,14 +152,14 @@ # # PYDISTUTILS_EGGINFO # - Canonical name for egg-info. -# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info +# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info # # PYDISTUTILS_NOEGGINFO # - Skip an egg-info entry from plist when defined. # # PYEASYINSTALL_EGG # - Canonical directory name for easy_install egg packages. -# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg +# default: ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}${PYEASYINSTALL_OSARCH}.egg # # PYEASYINSTALL_OSARCH # - Platform identifier for easy_install. @@ -286,7 +286,7 @@ .elif defined(USE_PYTHON_RUN) USE_PYTHON= ${USE_PYTHON_RUN} .else -USE_PYTHON= any +USE_PYTHON= yes .endif # defined(USE_PYTHON_BUILD) .else USE_PYTHON_BUILD= yes @@ -364,6 +364,9 @@ PYTHON_REL= 320 PYTHON_SUFFIX= 32 PYTHON_VER= 3.2 +.if exists(${PYTHON_CMD}-config) +PYTHON_ABIVER!= ${PYTHON_CMD}-config --abiflags +.endif # Python-3.1 .elif ${PYTHON_VERSION} == "python3.1" @@ -433,7 +436,8 @@ PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION:S/.rc/rc/}.tgz PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION:S/.rc/rc/} -PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/${PYTHON_VERSION} +PYTHON_ABIVER?= # empty +PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/${PYTHON_VERSION}${PYTHON_ABIVER} PYTHON_LIBDIR= ${PYTHONBASE}/lib/${PYTHON_VERSION} PYTHON_PKGNAMEPREFIX= py${PYTHON_SUFFIX}- PYTHON_PKGNAMESUFFIX= -py${PYTHON_SUFFIX} @@ -446,8 +450,13 @@ # setuptools support .if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install" +.if ${PYTHON_SUFFIX} < 30 BUILD_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools RUN_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools +.else +BUILD_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-distribute +RUN_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-distribute +.endif PYDISTUTILS_BUILD_TARGET?= bdist_egg PYDISTUTILS_INSTALL_TARGET?= easy_install @@ -465,7 +474,7 @@ .endif PYEASYINSTALL_OSARCH?= -${OPSYS:L}-${_OSRELEASE}-${ARCH} .endif -PYEASYINSTALL_EGG?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg +PYEASYINSTALL_EGG?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}${PYEASYINSTALL_OSARCH}.egg PYEASYINSTALL_CMD?= ${LOCALBASE}/bin/easy_install-${PYTHON_VER} PYEASYINSTALL_BINDIR?= ${PREFIX}/bin PYEASYINSTALL_SITELIBDIR?= ${PYTHONPREFIX_SITELIBDIR} @@ -503,7 +512,7 @@ PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PREFIX} PYDISTUTILS_PKGNAME?= ${PORTNAME} PYDISTUTILS_PKGVERSION?=${PORTVERSION} -PYDISTUTILS_EGGINFO?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}.egg-info +PYDISTUTILS_EGGINFO?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info PYDISTUTILS_EGGINFODIR?=${PYTHONPREFIX_SITELIBDIR} .if !defined(PYDISTUTILS_NOEGGINFO) && \ --- bsd.python.mk.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: