On Fri, Oct 12, 2012 at 05:58:28PM +0200, Remi Pointel wrote:
> Hi,
>
> this is the diff to make these variables internal in python.port.mk:
>
> _MODPY_DEFAULT_VERSION_2
> _MODPY_DEFAULT_VERSION_3
> _MODPY_PRE_BUILD_STEPS
> _MODPY_BIN_ADJ
>
> Are you ok?
>
> Cheers,
>
> Remi.
> Index: python.port.mk
> ===================================================================
> RCS file: /cvs/ports/lang/python/python.port.mk,v
> retrieving revision 1.54
> diff -u -r1.54 python.port.mk
> --- python.port.mk 28 Aug 2012 19:10:45 -0000 1.54
> +++ python.port.mk 12 Oct 2012 15:55:00 -0000
> @@ -6,8 +6,8 @@
> CATEGORIES+= lang/python
>
> # define the default versions
> -MODPY_DEFAULT_VERSION_2 = 2.7
> -MODPY_DEFAULT_VERSION_3 = 3.2
> +_MODPY_DEFAULT_VERSION_2 = 2.7
> +_MODPY_DEFAULT_VERSION_3 = 3.2
>
> .if !defined(MODPY_VERSION)
>
> @@ -15,10 +15,10 @@
>
> . if ${FLAVOR:L:Mpython3}
> # define default version 3
> -MODPY_VERSION?= ${MODPY_DEFAULT_VERSION_3}
> +MODPY_VERSION?= ${_MODPY_DEFAULT_VERSION_3}
> . else
> # without flavor, assume we use the default version 2
> -MODPY_VERSION?= ${MODPY_DEFAULT_VERSION_2}
> +MODPY_VERSION?= ${_MODPY_DEFAULT_VERSION_2}
> . endif
>
> # verify if MODPY_VERSION forced is correct
> @@ -84,7 +84,7 @@
> SHARED_ONLY= Yes
> .endif
>
> -MODPY_PRE_BUILD_STEPS = @:
> +_MODPY_PRE_BUILD_STEPS = @:
> .if defined(MODPY_SETUPTOOLS) && ${MODPY_SETUPTOOLS:L} == "yes"
> # The setuptools module provides a package locator (site.py) that is
> # required at runtime for the pkg_resources stuff to work
> @@ -105,7 +105,7 @@
> # but the final plist will be different if it's present.
> _MODPY_SETUPUTILS_FAKE_DIR = \
> ${WRKDIR}/lib/python${MODPY_VERSION}/site-packages/setuptools
> -MODPY_PRE_BUILD_STEPS += \
> +_MODPY_PRE_BUILD_STEPS += \
> ;mkdir -p ${_MODPY_SETUPUTILS_FAKE_DIR} \
> ;exec >${_MODPY_SETUPUTILS_FAKE_DIR}/__init__.py \
> ;echo 'def setup(*args, **kwargs):' \
> @@ -127,7 +127,7 @@
>
> .if defined(MODPY_BADEGGS)
> . for egg in ${MODPY_BADEGGS}
> -MODPY_PRE_BUILD_STEPS += ;mkdir -p ${WRKBUILD}/${egg}.egg-info
> +_MODPY_PRE_BUILD_STEPS += ;mkdir -p ${WRKBUILD}/${egg}.egg-info
> . endfor
> .endif
>
> @@ -157,7 +157,7 @@
> SUBST_VARS := MODPY_PYCACHE MODPY_COMMENT MODPY_PYC_MAGIC_TAG
> MODPY_BIN MODPY_EGG_VERSION MODPY_VERSION MODPY_BIN_SUFFIX MODPY_PY_PREFIX
> ${SUBST_VARS}
>
> # set MODPY_BIN for executable scripts
> -MODPY_BIN_ADJ = perl -pi \
> +_MODPY_BIN_ADJ = perl -pi \
> -e '$$. == 1 && s|^.*env python.*$$|\#!${MODPY_BIN}|;' \
> -e '$$. == 1 && s|^.*bin/python.*$$|\#!${MODPY_BIN}|;' \
> -e 'close ARGV if eof;'
> @@ -165,14 +165,14 @@
> MODPY_ADJ_FILES ?=
> .if !empty(MODPY_ADJ_FILES)
> MODPYTHON_pre-configure += for f in ${MODPY_ADJ_FILES}; do \
> - ${MODPY_BIN_ADJ} ${WRKSRC}/$${f}; done
> + ${_MODPY_BIN_ADJ} ${WRKSRC}/$${f}; done
> .endif
>
> # dirty way to do it with no modifications in bsd.port.mk
> .if empty(CONFIGURE_STYLE)
> . if !target(do-build)
> do-build:
> - ${MODPY_PRE_BUILD_STEPS}
> + ${_MODPY_PRE_BUILD_STEPS}
> ${_MODPY_CMD} ${MODPY_DISTUTILS_BUILD} ${MODPY_DISTUTILS_BUILDARGS}
> . endif
>
If it doesn't break anything, definitely !!!
