Date: Thu, 1 Sep 2005 11:46:19 -0300 (BRT) From: Marcus Grando <marcus@corp.grupos.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Cc: perky@FreeBSD.org Subject: ports/85574: Update port: Mk/bsd.python.mk fix TABs Message-ID: <200509011446.j81EkJlG037544@marcus.grupos.com.br> Resent-Message-ID: <200509011450.j81Eo6nA037724@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 85574
>Category: ports
>Synopsis: Update port: Mk/bsd.python.mk fix TABs
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Sep 01 14:50:06 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Marcus Grando
>Release: FreeBSD 6.0-BETA3 i386
>Organization:
Grupos Internet S/A
>Environment:
System: FreeBSD marcus.grupos.com.br 6.0-BETA3 FreeBSD 6.0-BETA3 #33: Wed Aug 31 12:46:26 BRT 2005 root@marcus.grupos.com.br:/usr/obj/usr/src/sys/MARCUS i386
>Description:
- Fix TABs (cosmetic)
>How-To-Repeat:
>Fix:
--- bsd.python.mk.patch begins here ---
Index: bsd.python.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.python.mk,v
retrieving revision 1.67
diff -u -r1.67 bsd.python.mk
--- bsd.python.mk 28 Jul 2005 08:29:31 -0000 1.67
+++ bsd.python.mk 1 Sep 2005 14:42:14 -0000
@@ -6,7 +6,7 @@
.if !defined(_POSTMKINCLUDED) && !defined(Python_Pre_Include)
-Python_Pre_Include= bsd.python.mk
+Python_Pre_Include= bsd.python.mk
Python_Include_MAINTAINER= perky@FreeBSD.org
# This file contains some variable definitions that are supposed to
@@ -19,68 +19,68 @@
#
# The variables:
#
-# PYTHONBASE: Python port's installation prefix.
+# PYTHONBASE: Python port's installation prefix.
# default: ${LOCALBASE}
#
-# PYTHON_CMD: Python's command line file name, including the version
+# PYTHON_CMD: Python's command line file name, including the version
# number (used for dependencies).
# default: ${PYTHONBASE}/bin/${PYTHON_VERSION}
#
-# PYTHON_DISTFILE: The ${DISTFILE} for your python version. Needed for
-# extensions like Tkinter, py-gdbm and py-expat, which
-# are built from sources contained in the Python
-# distribution.
-#
-# PYTHON_MASTER_SITES: The ${MASTER_SITES} for your python version. (You must
-# use this instead of ${MASTER_SITE_PYTHON} to support
-# python-devel port.)
+# PYTHON_DISTFILE: The ${DISTFILE} for your python version. Needed for
+# extensions like Tkinter, py-gdbm and py-expat, which
+# are built from sources contained in the Python
+# distribution.
+#
+# PYTHON_MASTER_SITES: The ${MASTER_SITES} for your python version. (You must
+# use this instead of ${MASTER_SITE_PYTHON} to support
+# python-devel port.)
#
# PYTHON_MASTER_SITE_SUBDIR: The ${MASTER_SITE_SUBDIR} for your python
-# version.
+# version.
#
-# PYTHON_INCLUDEDIR: Location of the Python include files.
-# default: ${PYTHONBASE}/include/${PYTHON_VERSION}
+# PYTHON_INCLUDEDIR: Location of the Python include files.
+# default: ${PYTHONBASE}/include/${PYTHON_VERSION}
#
-# PYTHON_LIBDIR: Base of the python library tree
-# default: ${PYTHONBASE}/lib/${PYTHON_VERSION}
+# PYTHON_LIBDIR: Base of the python library tree
+# default: ${PYTHONBASE}/lib/${PYTHON_VERSION}
#
-# PYTHON_PKGNAMEPREFIX: Use this as a ${PKGNAMEPREFIX} to distinguish
-# packages for different Python versions.
-# default: py${PYTHON_SUFFIX}-
+# PYTHON_PKGNAMEPREFIX: Use this as a ${PKGNAMEPREFIX} to distinguish
+# packages for different Python versions.
+# default: py${PYTHON_SUFFIX}-
#
-# PYTHON_PKGNAMESUFFIX: If your port's name is more popular without `py-'
-# prefix, use this as a ${PKGNAMESUFFIX} alternatively.
-# default: -py${PYTHON_SUFFIX}
+# PYTHON_PKGNAMESUFFIX: If your port's name is more popular without `py-'
+# prefix, use this as a ${PKGNAMESUFFIX} alternatively.
+# default: -py${PYTHON_SUFFIX}
#
-# PYTHON_PLATFORM: Python's idea of the OS release.
-# XXX This is faked with ${OPSYS} and ${OSREL} until I
-# find out how to delay defining a variable until after
-# a certain target has been built.
+# PYTHON_PLATFORM: Python's idea of the OS release.
+# XXX This is faked with ${OPSYS} and ${OSREL} until I
+# find out how to delay defining a variable until after
+# a certain target has been built.
#
-# PYTHON_PORTSDIR: The source of your binary's port. Needed for the
-# RUN_DEPENDS.
+# PYTHON_PORTSDIR: The source of your binary's port. Needed for the
+# RUN_DEPENDS.
#
-# PYTHON_PORTVERSION: Version number suitable for ${PORTVERSION}.
+# PYTHON_PORTVERSION: Version number suitable for ${PORTVERSION}.
#
-# PYTHON_REL: Version number in numerical format, to ease
-# comparison in makefiles
+# PYTHON_REL: Version number in numerical format, to ease
+# comparison in makefiles
#
-# PYTHON_SITELIBDIR: Location of the site-packages tree. Don't change,
-# unless you know what you do.
-# default: ${PYTHON_LIBDIR}/site-packages
+# PYTHON_SITELIBDIR: Location of the site-packages tree. Don't change,
+# unless you know what you do.
+# default: ${PYTHON_LIBDIR}/site-packages
#
-# PYTHON_SUFFIX: Yet another short version number, primarily intended
-# for ${PYTHON_PKGNAMEPREFIX}.
+# PYTHON_SUFFIX: Yet another short version number, primarily intended
+# for ${PYTHON_PKGNAMEPREFIX}.
#
-# PYTHON_VERSION: Version of the python binary in your ${PATH}, in the
-# format "python2.0". Set this in your makefile in case you
-# want to build extensions with an older binary.
-# default: depends on the version of your python binary
+# PYTHON_VERSION: Version of the python binary in your ${PATH}, in the
+# format "python2.0". Set this in your makefile in case you
+# want to build extensions with an older binary.
+# default: depends on the version of your python binary
#
-# PYTHON_WRKSRC: The ${WRKSRC} for your python version. Needed for
-# extensions like Tkinter, py-gdbm and py-expat, which
-# are built from sources contained in the Python
-# distribution.
+# PYTHON_WRKSRC: The ${WRKSRC} for your python version. Needed for
+# extensions like Tkinter, py-gdbm and py-expat, which
+# are built from sources contained in the Python
+# distribution.
#
# There are PREFIX-clean variants of the PYTHON_*DIR variables above.
# They are meant to be used in the installation targets.
@@ -89,41 +89,41 @@
# PYTHONPREFIX_LIBDIR: default: ${PREFIX}/lib/${PYTHON_VERSION}
# PYTHONPREFIX_SITELIBDIR: default: ${PYTHONPREFIX_LIBDIR}/site-packages
#
-# PYDISTUTILS: Dependency line for the distutils extension. As of Python-2.0,
+# PYDISTUTILS: Dependency line for the distutils extension. As of Python-2.0,
# the distutils are in the base distribution.
#
-# PYNUMERIC: Dependency line for the numeric extension. Py-Numeric-17
+# PYNUMERIC: Dependency line for the numeric extension. Py-Numeric-17
# is the last release that works with Python versions older
# than 1.6.
#
-# PYXML: Dependency line for the XML extension. As of Python-2.0,
+# PYXML: Dependency line for the XML extension. As of Python-2.0,
# this extension is in the base distribution.
#
-# USE_PYTHON_PREFIX: Says that the port installs in ${PYTHONBASE}.
+# USE_PYTHON_PREFIX: Says that the port installs in ${PYTHONBASE}.
#
-# USE_PYDISTUTILS: Use distutils as do-configure, do-build and do-install
-# targets.
+# USE_PYDISTUTILS: Use distutils as do-configure, do-build and do-install
+# targets.
#
# PYDISTUTILS_CONFIGUREARGS: Arguments to config with distutils.
-# default: <empty>
+# default: <empty>
#
# PYDISTUTILS_BUILDARGS: Arguments to build with distutils.
-# default: <empty>
+# default: <empty>
#
# PYDISTUTILS_INSTALLARGS: Arguments to install with distutils.
-# default: -c -O1 --prefix=${PREFIX}
+# default: -c -O1 --prefix=${PREFIX}
#
-# PYSETUP: Name of the setup script used by the distutils package.
+# PYSETUP: Name of the setup script used by the distutils package.
# default: setup.py
#
-# USE_TWISTED: If this option is just yes then
+# USE_TWISTED: If this option is just yes then
# the dependence to twistedCore is added. Alternatively here
# can be listed specific components of twisted framework,
# available components are: web, lore, news, words, pair,
# mail, names, xish, runner, flow and conch. Note that
# core component is required for any of this optional components.
#
-# USE_ZOPE: Use Zope - an object-based web application platform, this
+# USE_ZOPE: Use Zope - an object-based web application platform, this
# also sets up ZOPEBASEDIR - relative base directory of zope
# server, SZOPEBASEDIR - absolute base directory of zope that
# is ${LOCALBASE}/${SZOPEBASEDIR} by default,
@@ -131,7 +131,7 @@
# found. Note that USE_ZOPE require python2.3
#
-_PYTHON_PORTBRANCH= 2.4
+_PYTHON_PORTBRANCH= 2.4
_PYTHON_ALLBRANCHES= 2.4 2.3 2.2 2.1 2.5 # preferred first
.if defined(USE_ZOPE)
@@ -151,7 +151,7 @@
_PYTHON_CMD= ${LOCALBASE}/bin/python
.endif
_PYTHON_VERSION!= ${_PYTHON_CMD} -c \
- 'import sys; print sys.version[:3]' 2> /dev/null \
+ 'import sys; print sys.version[:3]' 2> /dev/null \
|| ${ECHO_CMD} ${_PYTHON_PORTBRANCH}
.endif # defined(PYTHON_VERSION)
@@ -170,24 +170,24 @@
# Validate Python version whether it meets USE_PYTHON version restriction.
_PYTHON_VERSION_CHECK!= ${ECHO_CMD} "${USE_PYTHON}" | \
- ${SED} 's/^\([1-9]\.[0-9]\)$$/\1-\1/'
+ ${SED} 's/^\([1-9]\.[0-9]\)$$/\1-\1/'
_PYTHON_VERSION_MINIMUM!= ${ECHO_CMD} "${_PYTHON_VERSION_CHECK}" | \
- ${SED} -n 's/.*\([1-9]\.[0-9]\)[-+].*/\1/p'
+ ${SED} -n 's/.*\([1-9]\.[0-9]\)[-+].*/\1/p'
_PYTHON_VERSION_MAXIMUM!= ${ECHO_CMD} "${_PYTHON_VERSION_CHECK}" | \
- ${SED} -n 's/.*-\([1-9]\.[0-9]\).*/\1/p'
+ ${SED} -n 's/.*-\([1-9]\.[0-9]\).*/\1/p'
.if !empty(_PYTHON_VERSION_MINIMUM) && ( \
- ${_PYTHON_VERSION} < ${_PYTHON_VERSION_MINIMUM})
+ ${_PYTHON_VERSION} < ${_PYTHON_VERSION_MINIMUM})
_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MINIMUM} at least
.elif !empty(_PYTHON_VERSION_MAXIMUM) && ( \
- ${_PYTHON_VERSION} > ${_PYTHON_VERSION_MAXIMUM})
+ ${_PYTHON_VERSION} > ${_PYTHON_VERSION_MAXIMUM})
_PYTHON_VERSION_NONSUPPORTED= ${_PYTHON_VERSION_MAXIMUM} at most
.endif
# If we have an unsupported version of Python, try another.
.if defined(_PYTHON_VERSION_NONSUPPORTED)
.if defined(PYTHON_VERSION) || defined(PYTHON_CMD)
-IGNORE= needs Python ${_PYTHON_VERSION_NONSUPPORTED}.\
- But you specified ${_PYTHON_VERSION}
+IGNORE= needs Python ${_PYTHON_VERSION_NONSUPPORTED}.\
+ But you specified ${_PYTHON_VERSION}
.else
.undef _PYTHON_VERSION
.for ver in ${_PYTHON_ALLBRANCHES}
@@ -202,7 +202,7 @@
.endif
.endfor
.if !defined(_PYTHON_VERSION)
-IGNORE= needs an unsupported version of Python
+IGNORE= needs an unsupported version of Python
_PYTHON_VERSION= ${_PYTHON_PORTBRANCH} # just to avoid version sanity checking.
.endif
.endif # defined(PYTHON_VERSION) || defined(PYTHON_CMD)
@@ -211,10 +211,10 @@
PYTHON_VERSION?= python${_PYTHON_VERSION}
PYTHON_CMD?= ${_PYTHON_CMD}
PYTHONBASE!= (${PYTHON_CMD} -c 'import sys; print sys.prefix') \
- 2> /dev/null || ${ECHO_CMD} ${LOCALBASE}
+ 2> /dev/null || ${ECHO_CMD} ${LOCALBASE}
DEPENDS_ARGS+= PYTHON_VERSION=${PYTHON_VERSION}
_PYTHON_PORTVERSION!= (${PYTHON_CMD} -c 'import string, sys; \
- print string.split(sys.version)[0]') 2> /dev/null || ${TRUE}
+ print string.split(sys.version)[0]') 2> /dev/null || ${TRUE}
.if !defined(PYTHON_NO_DEPENDS) && !empty(_PYTHON_PORTVERSION)
PYTHON_PORTVERSION= ${_PYTHON_PORTVERSION}
.endif
@@ -262,9 +262,9 @@
PYTHON_PORTSDIR= # empty
PYTHON_NO_DEPENDS= YES
PYTHON_REL!= ${PYTHON_CMD} -c 'import sys; h = "%x" % sys.hexversion; \
- print h[0]+h[2]+h[4]'
+ print h[0]+h[2]+h[4]'
PYTHON_SUFFIX!= ${PYTHON_CMD} -c 'import sys; h = "%x" % sys.hexversion; \
- print h[0]+h[2]'
+ print h[0]+h[2]'
.else
check-makevars::
@@ -281,18 +281,18 @@
.if defined(PYTHON_REL) && ${PYTHON_REL} == 250
PYTHON_MASTER_SITES= ${MASTER_SITE_LOCAL}
PYTHON_MASTER_SITE_SUBDIR= perky
-PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION}.tgz
+PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION}.tgz
.else
PYTHON_MASTER_SITES= ${MASTER_SITE_PYTHON}
PYTHON_MASTER_SITE_SUBDIR= ftp/python/${PYTHON_PORTVERSION}
-PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION}.tgz
+PYTHON_DISTFILE= Python-${PYTHON_PORTVERSION}.tgz
.endif # defined(PYTHON_REL) && ${PYTHON_REL} == 250
-PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION}
+PYTHON_WRKSRC= ${WRKDIR}/Python-${PYTHON_PORTVERSION}
PYTHON_INCLUDEDIR= ${PYTHONBASE}/include/${PYTHON_VERSION}
PYTHON_LIBDIR= ${PYTHONBASE}/lib/${PYTHON_VERSION}
-PYTHON_PKGNAMEPREFIX= py${PYTHON_SUFFIX}-
-PYTHON_PKGNAMESUFFIX= -py${PYTHON_SUFFIX}
+PYTHON_PKGNAMEPREFIX= py${PYTHON_SUFFIX}-
+PYTHON_PKGNAMESUFFIX= -py${PYTHON_SUFFIX}
PYTHON_PLATFORM!= ${EXPR} ${OPSYS:L}${OSREL} : '\([a-z]*[0-9]*\)\.'
PYTHON_SITELIBDIR= ${PYTHON_LIBDIR}/site-packages
@@ -300,7 +300,7 @@
PYTHONPREFIX_LIBDIR= ${PYTHON_LIBDIR:S;${PYTHONBASE};${PREFIX};}
PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};}
-PYSETUP?= setup.py
+PYSETUP?= setup.py
PYDISTUTILS_CONFIGUREARGS?=
PYDISTUTILS_BUILDARGS?=
PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PREFIX}
@@ -313,17 +313,17 @@
.endif
PYDISTUTILS= ${PYTHON_LIBDIR}/distutils/core.py:${PYTHON_PORTSDIR}
-PYNUMERIC= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
-PYXML= ${PYTHON_SITELIBDIR}/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml
+PYNUMERIC= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
+PYXML= ${PYTHON_SITELIBDIR}/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml
.if defined(PYTHON_REL) && ${PYTHON_REL} < 232
-PYEXPAT= ${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat
+PYEXPAT= ${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat
.else
-PYEXPAT= ${PYTHON_LIBDIR}/lib-dynload/pyexpat.so:${PYTHON_PORTSDIR}
+PYEXPAT= ${PYTHON_LIBDIR}/lib-dynload/pyexpat.so:${PYTHON_PORTSDIR}
.endif
# dependencies
-PYTHON_NO_DEPENDS?= NO
+PYTHON_NO_DEPENDS?= NO
.if ${PYTHON_NO_DEPENDS} == "NO"
.if defined(USE_PYTHON_BUILD)
@@ -340,22 +340,22 @@
# set $PREFIX as Python's one
.if defined(USE_PYTHON_PREFIX)
-PREFIX= ${PYTHONBASE}
+PREFIX= ${PYTHONBASE}
.endif
# Substitutions for pkg-plist
# Use a short form of the PYTHONPREFIX_*DIR variables; we don't need the
# base directory in the plist file.
-PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
- PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} \
- PYTHON_PLATFORM=${PYTHON_PLATFORM} \
- PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
- PYTHON_VERSION=${PYTHON_VERSION}
+PLIST_SUB+= PYTHON_INCLUDEDIR=${PYTHONPREFIX_INCLUDEDIR:S;${PREFIX}/;;} \
+ PYTHON_LIBDIR=${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} \
+ PYTHON_PLATFORM=${PYTHON_PLATFORM} \
+ PYTHON_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} \
+ PYTHON_VERSION=${PYTHON_VERSION}
# Zope specific substitutions
.if defined(USE_ZOPE)
-PLIST_SUB+= ZOPEBASEDIR=${SZOPEBASEDIR} \
- ZOPEPRODUCTDIR=${SZOPEBASEDIR}/${ZOPEPRODUCTDIR}
+PLIST_SUB+= ZOPEBASEDIR=${SZOPEBASEDIR} \
+ ZOPEPRODUCTDIR=${SZOPEBASEDIR}/${ZOPEPRODUCTDIR}
.endif
# Twisted specific routines
@@ -404,7 +404,7 @@
.if defined(_POSTMKINCLUDED) && !defined(Python_Post_Include)
-Python_Post_Include= bsd.python.mk
+Python_Post_Include= bsd.python.mk
# py-distutils support
.if defined(USE_PYDISTUTILS)
--- 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?200509011446.j81EkJlG037544>