Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
Lionel Sambuc
2016-10-14 07:49:11 +02:00
committed by Lionel Sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949749 additions and 377083 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lang/python/distutils.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: distutils.mk,v 1.7 2014/12/31 13:57:28 wiz Exp $
# $NetBSD: distutils.mk,v 1.8 2016/08/28 09:40:35 richard Exp $
#
# Common logic for python distributions that use distutils.
#
@@ -28,5 +28,7 @@ PY_NO_EGG?= no
PLIST_SUBST+= EGG_FILE=${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
PRINT_PLIST_AWK+= { gsub("${EGG_NAME}-py${PYVERSSUFFIX}.egg-info", \
"$${EGG_FILE}") }
PRINT_PLIST_AWK+= { gsub(/${PYVERSSUFFIX}/, \
"$${PYVERSSUFFIX}") }
.include "../../lang/python/extension.mk"

15
lang/python/egg.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: egg.mk,v 1.20 2014/12/31 13:57:28 wiz Exp $
# $NetBSD: egg.mk,v 1.24 2016/08/28 09:40:35 richard Exp $
#
# Common logic to handle Python Eggs
#
@@ -32,14 +32,21 @@ PRINT_PLIST_AWK+= { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}.egg-info/, \
"$${EGG_INFODIR}") }
PRINT_PLIST_AWK+= { gsub(/${EGG_NAME}-py${PYVERSSUFFIX}-nspkg.pth/, \
"$${EGG_NAME}-nspkg.pth") }
PRINT_PLIST_AWK+= { gsub(/${PYVERSSUFFIX}/, \
"$${PYVERSSUFFIX}") }
_PYSETUPTOOLSINSTALLARGS= --single-version-externally-managed
.if ${_USE_DESTDIR} == "no"
_PYSETUPTOOLSINSTALLARGS+= --root=/
.endif
DEPENDS+= ${PYPKGPREFIX}-setuptools>=0.8:../../devel/py-setuptools
INSTALLATION_DIRS+= ${PYSITELIB}
privileged-install-hook: fixup-egg-info
.PHONY: fixup-egg-info
fixup-egg-info: # ensure egg-info directory contents are always 644
if ${TEST} -d "${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_INFODIR}"; then \
${FIND} ${DESTDIR}${PREFIX}/${PYSITELIB}/${EGG_INFODIR} -type f \
-exec ${CHMOD} ${SHAREMODE} '{}' +; \
fi
.include "../../lang/python/extension.mk"

19
lang/python/extension.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: extension.mk,v 1.39 2015/04/14 11:40:31 wiz Exp $
# $NetBSD: extension.mk,v 1.49 2016/08/27 20:42:47 wiz Exp $
.include "../../lang/python/pyversion.mk"
@@ -21,9 +21,7 @@ PYSETUPARGS?= #empty
PYSETUPINSTALLARGS?= #empty
PYSETUPOPTARGS?= -c -O1
_PYSETUPINSTALLARGS= ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
.if ${_USE_DESTDIR} != "no"
_PYSETUPINSTALLARGS+= --root=${DESTDIR:Q}
.endif
PY_PATCHPLIST?= yes
PYSETUPINSTALLARGS?= #empty
PYSETUPTESTTARGET?= test
@@ -37,11 +35,11 @@ do-build:
do-install:
(cd ${WRKSRC}/${PYSETUPSUBDIR} && ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
${PYTHONBIN} ${PYSETUP} ${PYSETUPARGS} "install" ${_PYSETUPINSTALLARGS})
.if !target(do-test) && !(defined(TEST_TARGET) && !empty(TEST_TARGET))
. if !target(do-test) && !(defined(TEST_TARGET) && !empty(TEST_TARGET))
do-test:
(cd ${WRKSRC}/${PYSETUPSUBDIR} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} \
${PYSETUP} ${PYSETUPARGS} ${PYSETUPTESTTARGET} ${PYSETUPTESTARGS})
.endif
. endif
.endif
@@ -59,17 +57,22 @@ INSTALL_ENV+= PKGSRC_PYTHON_NO_EGG=defined
.if defined(PY_PATCHPLIST)
PLIST_SUBST+= PYINC=${PYINC} PYLIB=${PYLIB} PYSITELIB=${PYSITELIB}
PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
.endif
# mostly for ALTERNATIVES files
FILES_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX}
# prepare Python>=3.2 bytecode file location change
# http://www.python.org/dev/peps/pep-3147/
.if empty(_PYTHON_VERSION:M2?)
PY_PEP3147?= yes
PY_PEP3147?= yes
.endif
.if defined(PY_PEP3147) && !empty(PY_PEP3147:M[yY][eE][sS])
PLIST_AWK+= -f ${PKGSRCDIR}/lang/python/plist-python.awk
PLIST_AWK_ENV+= PYTHON_SOABI="cpython-${_PYTHON_VERSION}"
PLIST_AWK+= -f ${PKGSRCDIR}/lang/python/plist-python.awk
PLIST_AWK_ENV+= PYVERS="${PYVERSSUFFIX:S/.//}"
PRINT_PLIST_AWK+= /^[^@]/ && /[^\/]+\.py[co]$$/ {
PRINT_PLIST_AWK+= gsub(/__pycache__\//, "")
PRINT_PLIST_AWK+= gsub(/opt-1\.pyc$$/, "pyo")
PRINT_PLIST_AWK+= gsub(/\.cpython-${_PYTHON_VERSION}/, "")}
.endif

15
lang/python/plist-python.awk
View File

@@ -1,4 +1,4 @@
# $NetBSD: plist-python.awk,v 1.1 2012/05/13 12:54:54 obache Exp $
# $NetBSD: plist-python.awk,v 1.2 2015/12/05 17:12:13 adam Exp $
#
# Copyright (c) 2012 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -34,17 +34,18 @@
###
### Certain environment variables must be set prior to running this script:
###
### PY_SOABI is the python SO ABI.
### PYVERS
###
BEGIN {
PYTHON_SOABI = getenv_or_die("PYTHON_SOABI")
PYVERS = getenv_or_die("PYVERS")
}
###
### For each python bytecode file entry, convert directory and file name
### using cache sub directory and SOABI.
### For each python bytecode file entry, convert directory and file name.
###
/^[^@]/ && /[^\/]+\.py[co]$/ {
sub(/[^\/]+\.py[co]$/, "__pycache__/&")
sub(/\.py[co]$/, "." PYTHON_SOABI "&")
sub(/\.py[co]$/, ".cpython-" PYVERS "&")
if (PYVERS ~ /^3[5-9]$/ && $0 ~ /\.pyo$/) {
sub(/\.pyo$/, ".opt-1.pyc")
}
}

77
lang/python/pyversion.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: pyversion.mk,v 1.117 2015/04/13 23:12:44 rodent Exp $
# $NetBSD: pyversion.mk,v 1.122 2016/07/09 13:03:53 wiz Exp $
# This file determines which Python version is used as a dependency for
# a package.
@@ -8,7 +8,7 @@
# PYTHON_VERSION_DEFAULT
# The preferred Python version to use.
#
# Possible values: 27 33 34
# Possible values: 27 34 35
# Default: 27
#
# === Infrastructure variables ===
@@ -27,13 +27,13 @@
# order of the entries matters, since earlier entries are
# preferred over later ones.
#
# Possible values: 34 33 27
# Default: 34 33 27
# Possible values: 35 34 27
# Default: 35 34 27
#
# PYTHON_VERSIONS_INCOMPATIBLE
# The Python versions that are NOT acceptable for the package.
#
# Possible values: 27 33 34
# Possible values: 27 34 35
# Default: (empty)
#
# PYTHON_FOR_BUILD_ONLY
@@ -73,10 +73,10 @@ PYTHON_PYVERSION_MK= defined
# optionally handled quoted package names
.if defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:Mpy[0-9][0-9]-*) || \
defined(PKGNAME_REQD) && !empty(PKGNAME_REQD:M*-py[0-9][0-9]-*)
PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
PYTHON_VERSION_REQD?= ${PKGNAME_REQD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
.elif defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:Mpy[0-9][0-9]-*) || \
defined(PKGNAME_OLD) && !empty(PKGNAME_OLD:M*-py[0-9][0-9]-*)
PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
PYTHON_VERSION_REQD?= ${PKGNAME_OLD:C/(^.*-|^)py([0-9][0-9])-.*/\2/}
.endif
.include "../../mk/bsd.prefs.mk"
@@ -85,15 +85,15 @@ BUILD_DEFS+= PYTHON_VERSION_DEFAULT
BUILD_DEFS_EFFECTS+= PYPACKAGE
PYTHON_VERSION_DEFAULT?= 27
PYTHON_VERSIONS_ACCEPTED?= 34 33 27
PYTHON_VERSIONS_ACCEPTED?= 35 34 27
PYTHON_VERSIONS_INCOMPATIBLE?= # empty by default
# transform the list into individual variables
.for pv in ${PYTHON_VERSIONS_ACCEPTED}
.if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv})
. if empty(PYTHON_VERSIONS_INCOMPATIBLE:M${pv})
_PYTHON_VERSION_${pv}_OK= yes
_PYTHON_VERSIONS_ACCEPTED+= ${pv}
.endif
. endif
.endfor
#
@@ -103,24 +103,24 @@ _PYTHON_VERSIONS_ACCEPTED+= ${pv}
# if a version is explicitely required, take it
.if defined(PYTHON_VERSION_REQD)
# but check if it is acceptable first, error out otherwise
. if defined(_PYTHON_VERSION_${PYTHON_VERSION_REQD}_OK)
. if defined(_PYTHON_VERSION_${PYTHON_VERSION_REQD}_OK)
_PYTHON_VERSION= ${PYTHON_VERSION_REQD}
. endif
. endif
.else
# if the default is accepted, it is first choice
. if !defined(_PYTHON_VERSION)
. if defined(_PYTHON_VERSION_${PYTHON_VERSION_DEFAULT}_OK)
. if !defined(_PYTHON_VERSION)
. if defined(_PYTHON_VERSION_${PYTHON_VERSION_DEFAULT}_OK)
_PYTHON_VERSION= ${PYTHON_VERSION_DEFAULT}
. endif
. endif
. endif
. endif
# prefer an already installed version, in order of "accepted"
. if !defined(_PYTHON_VERSION)
. for pv in ${PYTHON_VERSIONS_ACCEPTED}
. if defined(_PYTHON_VERSION_${pv}_OK)
. if !defined(_PYTHON_VERSION)
. for pv in ${PYTHON_VERSIONS_ACCEPTED}
. if defined(_PYTHON_VERSION_${pv}_OK)
_PYTHON_VERSION?= ${pv}
. endif
. endfor
. endif
. endif
. endfor
. endif
.endif
#
@@ -135,27 +135,27 @@ PKG_FAIL_REASON+= "No valid Python version"
# Additional CONFLICTS
.if ${PYTHON_SELF_CONFLICT:U:tl} == "yes"
.for i in ${PYTHON_VERSIONS_ACCEPTED:N${_PYTHON_VERSION}}
CONFLICTS += ${PKGNAME:S/py${_PYTHON_VERSION}/py${i}/:C/-[0-9].*$/-[0-9]*/}
.endfor
. for i in ${PYTHON_VERSIONS_ACCEPTED:N${_PYTHON_VERSION}}
CONFLICTS+= ${PKGNAME:S/py${_PYTHON_VERSION}/py${i}/:C/-[0-9].*$/-[0-9]*/}
. endfor
.endif # PYCONFLICTS
#
PLIST_VARS+= py2x py3x
.if empty(_PYTHON_VERSION:Mnone)
PYPACKAGE= python${_PYTHON_VERSION}
PYVERSSUFFIX= ${_PYTHON_VERSION:C/^([0-9])/\1./1}
BUILDLINK_API_DEPENDS.${PYPACKAGE}?= ${PYPACKAGE}>=${PYVERSSUFFIX}
PYPKGSRCDIR= ../../lang/${PYPACKAGE}
PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.${PYPACKAGE}}:${PYPKGSRCDIR}
PYPKGPREFIX= py${_PYTHON_VERSION}
PYPACKAGE= python${_PYTHON_VERSION}
PYVERSSUFFIX= ${_PYTHON_VERSION:C/^([0-9])/\1./1}
BUILDLINK_API_DEPENDS.${PYPACKAGE}?= ${PYPACKAGE}>=${PYVERSSUFFIX}
PYPKGSRCDIR= ../../lang/${PYPACKAGE}
PYDEPENDENCY= ${BUILDLINK_API_DEPENDS.${PYPACKAGE}}:${PYPKGSRCDIR}
PYPKGPREFIX= py${_PYTHON_VERSION}
.endif
.if !empty(_PYTHON_VERSION:M3*)
PLIST.py3x= yes
PLIST.py3x= yes
.endif
.if !empty(_PYTHON_VERSION:M2*)
PLIST.py2x= yes
PLIST.py2x= yes
.endif
PTHREAD_OPTS+= require
@@ -196,15 +196,14 @@ PRINT_PLIST_AWK+= /^${PYLIB:S|/|\\/|g}/ \
{ gsub(/${PYLIB:S|/|\\/|g}/, "$${PYLIB}") }
.endif
ALL_ENV+= PYTHON=${PYTHONBIN}
ALL_ENV+= PYTHON=${PYTHONBIN}
.if defined(USE_CMAKE)
# used by FindPythonInterp.cmake and FindPythonLibs.cmake
CMAKE_ARGS+= -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX}
.if ${OPSYS} == "Darwin"
CMAKE_ARGS+= -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX}
# set this explicitly, as by default it will prefer the built in framework
CMAKE_ARGS+= -DPYTHON_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
CMAKE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
.endif
CMAKE_ARGS.Darwin+= -DPYTHON_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
CMAKE_ARGS.Darwin+= -DPYTHON_INCLUDE_PATH:PATH=${BUILDLINK_DIR}/${PYINC}
CMAKE_ARGS.Darwin+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
.endif
.endif # PYTHON_PYVERSION_MK

6
lang/python/srcdist.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: srcdist.mk,v 1.34 2010/09/17 07:11:41 obache Exp $
# $NetBSD: srcdist.mk,v 1.35 2015/12/05 20:44:22 adam Exp $
.include "../../lang/python/pyversion.mk"
@@ -11,6 +11,10 @@ WRKSRC= ${WRKDIR}/${PYSUBDIR}
# This is used for standard modules shipped with Python but build as
# separate packages.
. if ${PYVERSSUFFIX} == "3.5"
EXTRACT_ELEMENTS+= ${PYSUBDIR}/Modules/clinic
. endif
python-std-patchsetup:
${SED} ${PY_SETUP_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/} \
<${FILESDIR}/setup.py >${WRKSRC}/setup.py

55
lang/python/versioned_dependencies.mk
View File

@@ -1,4 +1,4 @@
# $NetBSD: versioned_dependencies.mk,v 1.21 2015/07/12 21:42:23 rodent Exp $
# $NetBSD: versioned_dependencies.mk,v 1.25 2016/07/09 10:00:26 rillig Exp $
#
# This file determines which separate distribution of a Python
# package is used as dependency, depending on the Python version
@@ -15,42 +15,41 @@
.include "../../lang/python/pyversion.mk"
_SUPPORTED_PACKAGES=# empty
_SUPPORTED_PACKAGES+=Pmw x11/py-Pmw x11/py-Pmw2
_SUPPORTED_PACKAGES+=X textproc/py-X2 textproc/py-X
_SUPPORTED_PACKAGES+=cairo graphics/py-cairo graphics/py-cairo3
_SUPPORTED_PACKAGES+=dateutil time/py-dateutil time/py-dateutil
_SUPPORTED_PACKAGES+=dialog devel/py-dialog2 devel/py-dialog
_SUPPORTED_PACKAGES+=dns net/py-dns net/py-dns3
_SUPPORTED_PACKAGES+=ephem math/py-ephem math/py-ephem3
_SUPPORTED_PACKAGES+=flup www/py-flup www/py-flup3
_SUPPORTED_PACKAGES+=gobject devel/py-gobject devel/py-gobject3
_SUPPORTED_PACKAGES+=google-api-python-client www/py-google-api-python-client www/py-google-api-python-client-py3
_SUPPORTED_PACKAGES+=jsonlib textproc/py-jsonlib textproc/py-jsonlib3
_SUPPORTED_PACKAGES+=python-digest www/py-python-digest www/py-python3-digest
_SUPPORTED_PACKAGES= # empty
_SUPPORTED_PACKAGES+= Pmw x11/py-Pmw x11/py-Pmw2
_SUPPORTED_PACKAGES+= X textproc/py-X2 textproc/py-X
_SUPPORTED_PACKAGES+= cairo graphics/py-cairo graphics/py-cairo3
_SUPPORTED_PACKAGES+= dateutil time/py-dateutil time/py-dateutil
_SUPPORTED_PACKAGES+= dialog devel/py-dialog2 devel/py-dialog
_SUPPORTED_PACKAGES+= ephem math/py-ephem math/py-ephem3
_SUPPORTED_PACKAGES+= flup www/py-flup www/py-flup3
_SUPPORTED_PACKAGES+= gobject devel/py-gobject devel/py-gobject3
_SUPPORTED_PACKAGES+= google-api-python-client www/py-google-api-python-client www/py-google-api-python-client-py3
_SUPPORTED_PACKAGES+= jsonlib textproc/py-jsonlib textproc/py-jsonlib3
_SUPPORTED_PACKAGES+= python-digest www/py-python-digest www/py-python3-digest
.for pattern in ${PYTHON_VERSIONED_DEPENDENCIES}
_PKG_MATCHED= no
pkg:= ${pattern:C/:.*//}
type:= ${pattern:C/[^:]*//}
.for name py2dir py3dir in ${_SUPPORTED_PACKAGES}
.if "${pkg}" == "${name}"
. for name py2dir py3dir in ${_SUPPORTED_PACKAGES}
. if "${pkg}" == "${name}"
_PKG_MATCHED= yes
.if ${PYPKGPREFIX} == "py27"
. if ${PYPKGPREFIX} == "py27"
dir:= ${py2dir}
.else
. else
dir:= ${py3dir}
.endif
.if "${type}" == ":link"
. endif
. if "${type}" == ":link"
.include "../../${dir}/buildlink3.mk"
.elif "${type}" == ":build"
. elif "${type}" == ":build"
BUILD_DEPENDS:= ${BUILD_DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir}
.else
. else
DEPENDS:= ${DEPENDS} ${PYPKGPREFIX}-${pkg}-[0-9]*:../../${dir}
.endif
.endif
.endfor
.if ${_PKG_MATCHED} == "no"
PKG_FAIL_REASON= "${pkg} unsupported in PYTHON_VERSIONED_DEPENDENCIES"
.endif
. endif
. endif
. endfor
. if ${_PKG_MATCHED} == "no"
PKG_FAIL_REASON+= "${pkg} unsupported in PYTHON_VERSIONED_DEPENDENCIES"
. endif
.endfor