Date: Tue, 15 Feb 2011 14:24:20 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/154795: [PATCH] Mk/bsd.python.mk: style changes Message-ID: <20110215062420.5F3C72AEC4A4@sunpoet.net> Resent-Message-ID: <201102150630.p1F6UA0W026035@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20110215062420.5F3C72AEC4A4>