From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Feb 15 06:30:11 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 1FF881065674 for ; Tue, 15 Feb 2011 06:30:11 +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 D17708FC16 for ; Tue, 15 Feb 2011 06:30:10 +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 p1F6UA7V026038 for ; Tue, 15 Feb 2011 06:30:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p1F6UA0W026035; Tue, 15 Feb 2011 06:30:10 GMT (envelope-from gnats) Resent-Date: Tue, 15 Feb 2011 06:30:10 GMT Resent-Message-Id: <201102150630.p1F6UA0W026035@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 397B4106566C for ; Tue, 15 Feb 2011 06:24:27 +0000 (UTC) (envelope-from sunpoet@sunpoet.net) Received: from mail-gw0-f54.google.com (mail-gw0-f54.google.com [74.125.83.54]) by mx1.freebsd.org (Postfix) with ESMTP id F32338FC16 for ; Tue, 15 Feb 2011 06:24:26 +0000 (UTC) Received: by gwj21 with SMTP id 21so2502094gwj.13 for ; Mon, 14 Feb 2011 22:24:26 -0800 (PST) Received: by 10.90.52.5 with SMTP id z5mr5719932agz.181.1297751065188; Mon, 14 Feb 2011 22:24:25 -0800 (PST) Received: from sunpoet.net (sunpoet.net [220.133.12.240]) by mx.google.com with ESMTPS id d15sm4578325ana.35.2011.02.14.22.24.23 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 14 Feb 2011 22:24:24 -0800 (PST) Received: by sunpoet.net (Postfix, from userid 1000) id 5F3C72AEC4A4; Tue, 15 Feb 2011 14:24:20 +0800 (CST) Message-Id: <20110215062420.5F3C72AEC4A4@sunpoet.net> Date: Tue, 15 Feb 2011 14:24:20 +0800 (CST) From: Sunpoet Po-Chuan Hsieh Sender: Sunpoet Hsieh To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/154795: [PATCH] Mk/bsd.python.mk: style 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, 15 Feb 2011 06:30:11 -0000 >Number: 154795 >Category: ports >Synopsis: [PATCH] Mk/bsd.python.mk: style 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 Feb 15 06:30:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 8.2-PRERELEASE amd64 >Organization: The FreeBSD Project >Environment: System: FreeBSD bonjour.sunpoet.net 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Sat Feb 5 00:35:18 CST 2011 sunpoet@bonjour.sunpoet.net:/usr/obj/usr/src/sys/bonjour amd64 >Description: - 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.124 diff -u -r1.124 bsd.python.mk --- bsd.python.mk 14 Dec 2010 06:31:19 -0000 1.124 +++ bsd.python.mk 15 Feb 2011 06:17:48 -0000 @@ -164,14 +164,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. @@ -298,7 +298,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 @@ -468,7 +468,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} @@ -506,7 +506,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: