Attachment 116680 Details for Bug 158662 – bsd.python.mk.patch

[patch] bsd.python.mk.patch

bsd.python.mk.patch (text/plain), 3.64 KB, created by Po-Chuan Hsieh on 2011-07-05 10:20:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Po-Chuan Hsieh

Created: 2011-07-05 10:20:07 UTC

Size: 3.64 KB

patch

obsolete

>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) && \

Actions: View | Diff

Attachments on bug 158662: 116680